Skip to content

Commit c97f0ab

Browse files
EllerbachEllerbach
authored
Merge branch 'main' into add-hardware-tests
2 parents 727367b + ad02aab commit c97f0ab

File tree

9 files changed

+27
-27
lines changed

9 files changed

+27
-27
lines changed

‎nanoFramework.Json.Benchmark/nanoFramework.Json.Benchmark.nfproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@
4444
<Reference Include="mscorlib, Version=1.15.6.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
4545
<HintPath>..\packages\nanoFramework.CoreLibrary.1.15.5\lib\mscorlib.dll</HintPath>
4646
</Reference>
47-
<Reference Include="nanoFramework.Benchmark, Version=1.0.80.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
48-
<HintPath>..\packages\nanoFramework.Benchmark.1.0.80\lib\nanoFramework.Benchmark.dll</HintPath>
47+
<Reference Include="nanoFramework.Benchmark, Version=1.0.81.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
48+
<HintPath>..\packages\nanoFramework.Benchmark.1.0.81\lib\nanoFramework.Benchmark.dll</HintPath>
4949
</Reference>
50-
<Reference Include="nanoFramework.Logging, Version=1.1.113.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
51-
<HintPath>..\packages\nanoFramework.Logging.1.1.113\lib\nanoFramework.Logging.dll</HintPath>
50+
<Reference Include="nanoFramework.Logging, Version=1.1.120.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
51+
<HintPath>..\packages\nanoFramework.Logging.1.1.120\lib\nanoFramework.Logging.dll</HintPath>
5252
</Reference>
5353
<Reference Include="nanoFramework.Runtime.Native, Version=1.7.1.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
5454
<HintPath>..\packages\nanoFramework.Runtime.Native.1.7.1\lib\nanoFramework.Runtime.Native.dll</HintPath>

‎nanoFramework.Json.Benchmark/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="nanoFramework.Benchmark" version="1.0.80" targetFramework="netnano1.0" />
3+
<package id="nanoFramework.Benchmark" version="1.0.81" targetFramework="netnano1.0" />
44
<package id="nanoFramework.CoreLibrary" version="1.15.5" targetFramework="netnano1.0" />
5-
<package id="nanoFramework.Logging" version="1.1.113" targetFramework="netnano1.0" />
5+
<package id="nanoFramework.Logging" version="1.1.120" targetFramework="netnano1.0" />
66
<package id="nanoFramework.Runtime.Native" version="1.7.1" targetFramework="netnano1.0" />
77
<package id="nanoFramework.System.Collections" version="1.5.45" targetFramework="netnano1.0" />
88
<package id="nanoFramework.System.Diagnostics.Stopwatch" version="1.2.670" targetFramework="netnano1.0" />

‎nanoFramework.Json.Benchmark/packages.lock.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
".NETnanoFramework,Version=v1.0": {
55
"nanoFramework.Benchmark": {
66
"type": "Direct",
7-
"requested": "[1.0.80, 1.0.80]",
8-
"resolved": "1.0.80",
9-
"contentHash": "2aSEfktojZuG0Zs1b1tox3/h8xbmn9ON1SsKHV3rYlI9pjIc0ELveD6NCDyMZh3yBYtF1MqZZJGVLESqP6aYTQ=="
7+
"requested": "[1.0.81, 1.0.81]",
8+
"resolved": "1.0.81",
9+
"contentHash": "MraCs+hjBZy3cT/d0goTCZs/K+zMljkr70e0GHFgu9BqkXuxXc05xQy5wjkr6JaRjzujF1UoJTmq3dvYK1lCbg=="
1010
},
1111
"nanoFramework.CoreLibrary": {
1212
"type": "Direct",
@@ -16,9 +16,9 @@
1616
},
1717
"nanoFramework.Logging": {
1818
"type": "Direct",
19-
"requested": "[1.1.113, 1.1.113]",
20-
"resolved": "1.1.113",
21-
"contentHash": "v4XYqo64KgwVGSIqCNcoqPm4PUnOD4b93xlMShnvI7y28lEbJgZ1Mv3XUkv+SpUi9B3rANJ0QVVrorNSLJhCTA=="
19+
"requested": "[1.1.120, 1.1.120]",
20+
"resolved": "1.1.120",
21+
"contentHash": "zqAYYtN0uPVBGBB3MnYQtaW/hFpj8SwW4nGn+r3/afndC03oqRnYtxWsIL79813PhsWpbvzYivytnOAkjV7iwA=="
2222
},
2323
"nanoFramework.Runtime.Native": {
2424
"type": "Direct",

‎nanoFramework.Json.Test/nanoFramework.Json.Test.nfproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,11 @@
7676
<Reference Include="nanoFramework.System.Text">
7777
<HintPath>..\packages\nanoFramework.System.Text.1.2.54\lib\nanoFramework.System.Text.dll</HintPath>
7878
</Reference>
79-
<Reference Include="nanoFramework.TestFramework, Version=2.1.113.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
80-
<HintPath>..\packages\nanoFramework.TestFramework.2.1.113\lib\nanoFramework.TestFramework.dll</HintPath>
79+
<Reference Include="nanoFramework.TestFramework, Version=3.0.47.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
80+
<HintPath>..\packages\nanoFramework.TestFramework.3.0.47\lib\nanoFramework.TestFramework.dll</HintPath>
8181
</Reference>
8282
<Reference Include="nanoFramework.UnitTestLauncher, Version=0.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
83-
<HintPath>..\packages\nanoFramework.TestFramework.2.1.113\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
83+
<HintPath>..\packages\nanoFramework.TestFramework.3.0.47\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
8484
</Reference>
8585
<Reference Include="System.IO.Streams">
8686
<HintPath>..\packages\nanoFramework.System.IO.Streams.1.1.59\lib\System.IO.Streams.dll</HintPath>

‎nanoFramework.Json.Test/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
<package id="nanoFramework.System.Collections" version="1.5.45" targetFramework="netnano1.0" />
55
<package id="nanoFramework.System.IO.Streams" version="1.1.59" targetFramework="netnano1.0" />
66
<package id="nanoFramework.System.Text" version="1.2.54" targetFramework="netnano1.0" />
7-
<package id="nanoFramework.TestFramework" version="2.1.113" targetFramework="netnano1.0" developmentDependency="true" />
7+
<package id="nanoFramework.TestFramework" version="3.0.47" targetFramework="netnano1.0" developmentDependency="true" />
88
</packages>

‎nanoFramework.Json.Test/packages.lock.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
},
2929
"nanoFramework.TestFramework": {
3030
"type": "Direct",
31-
"requested": "[2.1.113, 2.1.113]",
32-
"resolved": "2.1.113",
33-
"contentHash": "+aFNv9Kew1rxYL7boHO1WUdLRIFeqkUW23770dxQwynUquqob56nI1c5I4E4QAaCQg6TnZm+SLEIa2USHRuoRg=="
31+
"requested": "[3.0.47, 3.0.47]",
32+
"resolved": "3.0.47",
33+
"contentHash": "CpUrBWmxgw2Blp3nkMcI+aI21Kj0VeLc4NU28OiA9IHxUsX6WXe6ruDjw71Ff4mb9nuLT55C4wg4CpD7+Iaw0g=="
3434
}
3535
}
3636
}

‎nanoFramework.Json/nanoFramework.Json.nfproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\Nerdbank.GitVersioning.3.6.146\build\Nerdbank.GitVersioning.props" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.6.146\build\Nerdbank.GitVersioning.props')" />
3+
<Import Project="..\packages\Nerdbank.GitVersioning.3.7.112\build\Nerdbank.GitVersioning.props" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.7.112\build\Nerdbank.GitVersioning.props')" />
44
<PropertyGroup Label="Globals">
55
<NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
66
</PropertyGroup>
@@ -104,8 +104,8 @@
104104
<PropertyGroup>
105105
<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>
106106
</PropertyGroup>
107-
<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'))" />
108-
<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'))" />
107+
<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'))" />
108+
<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'))" />
109109
</Target>
110-
<Import Project="..\packages\Nerdbank.GitVersioning.3.6.146\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.6.146\build\Nerdbank.GitVersioning.targets')" />
110+
<Import Project="..\packages\Nerdbank.GitVersioning.3.7.112\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.7.112\build\Nerdbank.GitVersioning.targets')" />
111111
</Project>

‎nanoFramework.Json/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
<package id="nanoFramework.System.Collections" version="1.5.45" targetFramework="netnano1.0" />
55
<package id="nanoFramework.System.IO.Streams" version="1.1.59" targetFramework="netnano1.0" />
66
<package id="nanoFramework.System.Text" version="1.2.54" targetFramework="netnano1.0" />
7-
<package id="Nerdbank.GitVersioning" version="3.6.146" targetFramework="netnano1.0" developmentDependency="true" />
7+
<package id="Nerdbank.GitVersioning" version="3.7.112" targetFramework="netnano1.0" developmentDependency="true" />
88
</packages>

‎nanoFramework.Json/packages.lock.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
},
2929
"Nerdbank.GitVersioning": {
3030
"type": "Direct",
31-
"requested": "[3.6.146, 3.6.146]",
32-
"resolved": "3.6.146",
33-
"contentHash": "W1eQ8hD9Y/cZ2+ilgxECl003xr1hybpN3fMxoTlMqg++BixETBMWzS4y9s08oHJKXgKtudsoxhITNOEf1OR66w=="
31+
"requested": "[3.7.112, 3.7.112]",
32+
"resolved": "3.7.112",
33+
"contentHash": "j0jcfnTjvhytRanVR34Gaj6RFKk8EDmVhRW7929nWjCo8tzBxsa3XmFmbSGDA6nWXGhfehTixWhPgGWAbz+NQA=="
3434
}
3535
}
3636
}

0 commit comments

Comments
 (0)