Skip to content

Commit 1aae0ca

Browse files
authored
Merge branch 'main' into nfbot/update-dependencies/ed6111bb-2ca9-40ab-87a9-afe8a1d849f2
2 parents b867025 + aafa260 commit 1aae0ca

28 files changed

+64
-64
lines changed

nanoFramework.AtomLite/nanoFramework.AtomLite.nfproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@
8686
<PropertyGroup>
8787
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText>
8888
</PropertyGroup>
89-
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.6.146\build\Nerdbank.GitVersioning.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.6.146\build\Nerdbank.GitVersioning.props'))" />
90-
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.6.146\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.6.146\build\Nerdbank.GitVersioning.targets'))" />
89+
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.7.112\build\Nerdbank.GitVersioning.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.7.112\build\Nerdbank.GitVersioning.props'))" />
90+
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.7.112\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.7.112\build\Nerdbank.GitVersioning.targets'))" />
9191
</Target>
92-
<Import Project="..\packages\Nerdbank.GitVersioning.3.6.146\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.6.146\build\Nerdbank.GitVersioning.targets')" />
92+
<Import Project="..\packages\Nerdbank.GitVersioning.3.7.112\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.7.112\build\Nerdbank.GitVersioning.targets')" />
9393
</Project>

nanoFramework.AtomLite/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212
<package id="nanoFramework.System.Device.Gpio" version="1.1.41" targetFramework="netnano1.0" />
1313
<package id="nanoFramework.System.Device.I2c" version="1.1.16" targetFramework="netnano1.0" />
1414
<package id="nanoFramework.System.Device.Spi" version="1.3.52" targetFramework="netnano1.0" />
15-
<package id="Nerdbank.GitVersioning" version="3.6.146" developmentDependency="true" targetFramework="netnano1.0" />
15+
<package id="Nerdbank.GitVersioning" version="3.7.112" developmentDependency="true" targetFramework="netnano1.0" />
1616
</packages>

nanoFramework.AtomLite/packages.lock.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@
7676
},
7777
"Nerdbank.GitVersioning": {
7878
"type": "Direct",
79-
"requested": "[3.6.146, 3.6.146]",
80-
"resolved": "3.6.146",
81-
"contentHash": "W1eQ8hD9Y/cZ2+ilgxECl003xr1hybpN3fMxoTlMqg++BixETBMWzS4y9s08oHJKXgKtudsoxhITNOEf1OR66w=="
79+
"requested": "[3.7.112, 3.7.112]",
80+
"resolved": "3.7.112",
81+
"contentHash": "j0jcfnTjvhytRanVR34Gaj6RFKk8EDmVhRW7929nWjCo8tzBxsa3XmFmbSGDA6nWXGhfehTixWhPgGWAbz+NQA=="
8282
}
8383
}
8484
}

nanoFramework.AtomMatrix/nanoFramework.AtomMatrix.nfproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@
105105
<PropertyGroup>
106106
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText>
107107
</PropertyGroup>
108-
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.6.146\build\Nerdbank.GitVersioning.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.6.146\build\Nerdbank.GitVersioning.props'))" />
109-
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.6.146\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.6.146\build\Nerdbank.GitVersioning.targets'))" />
108+
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.7.112\build\Nerdbank.GitVersioning.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.7.112\build\Nerdbank.GitVersioning.props'))" />
109+
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.7.112\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.7.112\build\Nerdbank.GitVersioning.targets'))" />
110110
</Target>
111-
<Import Project="..\packages\Nerdbank.GitVersioning.3.6.146\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.6.146\build\Nerdbank.GitVersioning.targets')" />
111+
<Import Project="..\packages\Nerdbank.GitVersioning.3.7.112\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.6.146\build\Nerdbank.GitVersioning.targets')" />
112112
</Project>

nanoFramework.AtomMatrix/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
<package id="nanoFramework.System.Device.Spi" version="1.3.52" targetFramework="netnano1.0" />
1818
<package id="nanoFramework.System.Math" version="1.5.43" targetFramework="netnano1.0" />
1919
<package id="nanoFramework.System.Numerics" version="1.2.670" targetFramework="netnano1.0" />
20-
<package id="Nerdbank.GitVersioning" version="3.6.146" developmentDependency="true" targetFramework="netnano1.0" />
20+
<package id="Nerdbank.GitVersioning" version="3.7.112" developmentDependency="true" targetFramework="netnano1.0" />
2121
<package id="UnitsNet.nanoFramework.Temperature" version="5.60.0" targetFramework="netnano1.0" />
2222
</packages>

nanoFramework.AtomMatrix/packages.lock.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,9 @@
106106
},
107107
"Nerdbank.GitVersioning": {
108108
"type": "Direct",
109-
"requested": "[3.6.146, 3.6.146]",
110-
"resolved": "3.6.146",
111-
"contentHash": "W1eQ8hD9Y/cZ2+ilgxECl003xr1hybpN3fMxoTlMqg++BixETBMWzS4y9s08oHJKXgKtudsoxhITNOEf1OR66w=="
109+
"requested": "[3.7.112, 3.7.112]",
110+
"resolved": "3.7.112",
111+
"contentHash": "j0jcfnTjvhytRanVR34Gaj6RFKk8EDmVhRW7929nWjCo8tzBxsa3XmFmbSGDA6nWXGhfehTixWhPgGWAbz+NQA=="
112112
},
113113
"UnitsNet.nanoFramework.Temperature": {
114114
"type": "Direct",

nanoFramework.CoreInk/nanoFramework.CoreInk.nfproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@
9999
<PropertyGroup>
100100
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText>
101101
</PropertyGroup>
102-
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.6.146\build\Nerdbank.GitVersioning.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.6.146\build\Nerdbank.GitVersioning.props'))" />
103-
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.6.146\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.6.146\build\Nerdbank.GitVersioning.targets'))" />
102+
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.7.112\build\Nerdbank.GitVersioning.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.7.112\build\Nerdbank.GitVersioning.props'))" />
103+
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.7.112\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.7.112\build\Nerdbank.GitVersioning.targets'))" />
104104
</Target>
105-
<Import Project="..\packages\Nerdbank.GitVersioning.3.6.146\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.6.146\build\Nerdbank.GitVersioning.targets')" />
105+
<Import Project="..\packages\Nerdbank.GitVersioning.3.7.112\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.7.112\build\Nerdbank.GitVersioning.targets')" />
106106
</Project>

nanoFramework.CoreInk/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<package id="nanoFramework.System.Device.Spi" version="1.3.52" targetFramework="netnano1.0" />
1818
<package id="nanoFramework.System.Math" version="1.5.43" targetFramework="netnano1.0" />
1919
<package id="nanoFramework.System.Threading" version="1.1.32" targetFramework="netnano1.0" />
20-
<package id="Nerdbank.GitVersioning" version="3.6.146" developmentDependency="true" targetFramework="netnano1.0" />
20+
<package id="Nerdbank.GitVersioning" version="3.7.112" developmentDependency="true" targetFramework="netnano1.0" />
2121
<package id="UnitsNet.nanoFramework.Frequency" version="5.60.0" targetFramework="netnano1.0" />
2222
<package id="UnitsNet.nanoFramework.Temperature" version="5.60.0" targetFramework="netnano1.0" />
2323
</packages>

nanoFramework.CoreInk/packages.lock.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,9 @@
106106
},
107107
"Nerdbank.GitVersioning": {
108108
"type": "Direct",
109-
"requested": "[3.6.146, 3.6.146]",
110-
"resolved": "3.6.146",
111-
"contentHash": "W1eQ8hD9Y/cZ2+ilgxECl003xr1hybpN3fMxoTlMqg++BixETBMWzS4y9s08oHJKXgKtudsoxhITNOEf1OR66w=="
109+
"requested": "[3.7.112, 3.7.112]",
110+
"resolved": "3.7.112",
111+
"contentHash": "j0jcfnTjvhytRanVR34Gaj6RFKk8EDmVhRW7929nWjCo8tzBxsa3XmFmbSGDA6nWXGhfehTixWhPgGWAbz+NQA=="
112112
},
113113
"UnitsNet.nanoFramework.Frequency": {
114114
"type": "Direct",

nanoFramework.Fire/nanoFramework.Fire.nfproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,8 @@
155155
<PropertyGroup>
156156
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText>
157157
</PropertyGroup>
158-
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.6.146\build\Nerdbank.GitVersioning.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.6.146\build\Nerdbank.GitVersioning.props'))" />
159-
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.6.146\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.6.146\build\Nerdbank.GitVersioning.targets'))" />
158+
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.7.112\build\Nerdbank.GitVersioning.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.7.112\build\Nerdbank.GitVersioning.props'))" />
159+
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.7.112\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.7.112\build\Nerdbank.GitVersioning.targets'))" />
160160
</Target>
161-
<Import Project="..\packages\Nerdbank.GitVersioning.3.6.146\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.6.146\build\Nerdbank.GitVersioning.targets')" />
161+
<Import Project="..\packages\Nerdbank.GitVersioning.3.7.112\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.7.112\build\Nerdbank.GitVersioning.targets')" />
162162
</Project>

0 commit comments

Comments
 (0)