Skip to content

Commit f93cdef

Browse files
josesimoesjosesimoes
authored
Merge branch 'develop' into copilot/update-nuspec-library-location-again
2 parents 0568ec2 + e23d2b0 commit f93cdef

18 files changed

Lines changed: 85 additions & 77 deletions

‎.github/workflows/update-dependencies-develop.yml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Copyright (c) .NET Foundation and Contributors
2+
# See LICENSE file in the project root for full license information.
3+
4+
# This workflow will periodically check .NET nanoFramework dependencies and updates them in the repository it's running.
5+
6+
name: Daily update dependencies (develop)
7+
8+
on:
9+
schedule:
10+
# At 00:30 UTC.
11+
- cron: '30 00 * * Mon,Thu'
12+
repository_dispatch:
13+
types: update-dependencies-develop
14+
15+
jobs:
16+
update-dependencies:
17+
name: nanoFramework
18+
uses: nanoframework/nf-tools/.github/workflows/update-dependencies.yml@main
19+
secrets: inherit
20+
with:
21+
solutionsToCheck: 'nanoFramework.System.Math.sln'
22+
previewPackages: true
23+
branchToPr: 'develop'
24+

‎.runsettings‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,7 @@
1111
<nanoFrameworkAdapter>
1212
<Logging>None</Logging>
1313
<IsRealHardware>False</IsRealHardware>
14+
<RunnerExtraArguments></RunnerExtraArguments>
15+
<UsePreviewClr>True</UsePreviewClr>
1416
</nanoFrameworkAdapter>
15-
</RunSettings>
17+
</RunSettings>

‎Tests/MathUnitTests/MathUnitTest.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,12 +228,12 @@ public static void Test_Abs_double()
228228
double answer = 0.0029832;
229229
double res = Math.Abs(val);
230230

231-
Assert.NotEqual(res, answer, "Abs(...double val - negative) -- FAILED AT: {res}");
231+
Assert.AreNotEqual(res, answer, "Abs(...double val - negative) -- FAILED AT: {res}");
232232

233233
val = 0.0029832;
234234
answer = 0.0029832;
235235
res = Math.Abs(val);
236-
Assert.NotEqual(res, answer, "Abs(...double val - positive) -- FAILED AT: {res}");
236+
Assert.AreNotEqual(res, answer, "Abs(...double val - positive) -- FAILED AT: {res}");
237237

238238
}
239239

‎Tests/MathUnitTests/MathUnitTests.nfproj‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,22 +35,21 @@
3535
<Content Include="packages.lock.json" />
3636
</ItemGroup>
3737
<ItemGroup>
38-
<Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
39-
<HintPath>..\..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
38+
<Reference Include="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
39+
<HintPath>..\..\packages\nanoFramework.CoreLibrary.2.0.0-preview.35\lib\netnano1.0\mscorlib.dll</HintPath>
4040
</Reference>
41-
<Reference Include="nanoFramework.TestFramework, Version=3.0.77.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
42-
<HintPath>..\..\packages\nanoFramework.TestFramework.3.0.77\lib\nanoFramework.TestFramework.dll</HintPath>
41+
<Reference Include="nanoFramework.TestFramework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
42+
<HintPath>..\..\packages\nanoFramework.TestFramework.4.0.0-preview.47\lib\nanoFramework.TestFramework.dll</HintPath>
4343
</Reference>
4444
<Reference Include="nanoFramework.UnitTestLauncher, Version=0.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
45-
<HintPath>..\..\packages\nanoFramework.TestFramework.3.0.77\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
45+
<HintPath>..\..\packages\nanoFramework.TestFramework.4.0.0-preview.47\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
4646
</Reference>
4747
</ItemGroup>
4848
<ItemGroup>
49-
<None Include="nano.runsettings" />
50-
<None Include="packages.config" />
49+
<ProjectReference Include="..\..\nanoFramework.System.Math\nanoFramework.System.Math.nfproj" />
5150
</ItemGroup>
5251
<ItemGroup>
53-
<ProjectReference Include="..\..\nanoFramework.System.Math\nanoFramework.System.Math.nfproj" />
52+
<None Include="packages.config" />
5453
</ItemGroup>
5554
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
5655
<!-- MANUAL UPDATE HERE -->

‎Tests/MathUnitTests/nano.runsettings‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎Tests/MathUnitTests/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
4-
<package id="nanoFramework.TestFramework" version="3.0.77" targetFramework="netnano1.0" developmentDependency="true" />
3+
<package id="nanoFramework.CoreLibrary" version="2.0.0-preview.35" targetFramework="netnano1.0" />
4+
<package id="nanoFramework.TestFramework" version="4.0.0-preview.47" targetFramework="netnano1.0" developmentDependency="true" />
55
</packages>

‎Tests/MathUnitTests/packages.lock.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
".NETnanoFramework,Version=v1.0": {
55
"nanoFramework.CoreLibrary": {
66
"type": "Direct",
7-
"requested": "[1.17.11, 1.17.11]",
8-
"resolved": "1.17.11",
9-
"contentHash": "HezzAc0o2XrSGf85xSeD/6xsO6ohF9hX6/iMQ1IZS6Zw6umr4WfAN2Jv0BrPxkaYwzEegJxxZujkHoUIAqtOMw=="
7+
"requested": "[2.0.0-preview.35, 2.0.0-preview.35]",
8+
"resolved": "2.0.0-preview.35",
9+
"contentHash": "l3LZs5zLeYKP+21DmVykOBWQvcLWOzgOls2JU6R2mRb2cz1+SitRCaEC5bTEJHs888JdHi3xWMVe3GkRzZ/2Lg=="
1010
},
1111
"nanoFramework.TestFramework": {
1212
"type": "Direct",
13-
"requested": "[3.0.77, 3.0.77]",
14-
"resolved": "3.0.77",
15-
"contentHash": "Py5W1oN84KMBmOOHCzdz6pyi3bZTnQu9BoqIx0KGqkhG3V8kGoem/t+BuCM0pMIWAyl2iMP1n2S9624YXmBJZw=="
13+
"requested": "[4.0.0-preview.47, 4.0.0-preview.47]",
14+
"resolved": "4.0.0-preview.47",
15+
"contentHash": "h5Jd/lmjZwsLUbnxXjF90YD50jZ5JtVOuS1yK8dCZWQYByQry8CuI+69r7Zfl9J1ZzfEbC8/ANpcA+ANWFg1DQ=="
1616
}
1717
}
1818
}

‎azure-pipelines.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ jobs:
8080
sonarCloudProject: 'nanoframework_lib-nanoFramework.System.Math'
8181
runUnitTests: true
8282
unitTestRunsettings: '$(System.DefaultWorkingDirectory)\.runsettings'
83+
usePreviewBuild: true
8384

8485
##############################
8586
- job: Update_Dependents

‎nanoFramework.System.Math.Benchmark/nanoFramework.System.Math.Benchmark.nfproj‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,26 +32,26 @@
3232
<Content Include="packages.lock.json" />
3333
</ItemGroup>
3434
<ItemGroup>
35-
<Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
36-
<HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
35+
<Reference Include="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
36+
<HintPath>..\packages\nanoFramework.CoreLibrary.2.0.0-preview.35\lib\netnano1.0\mscorlib.dll</HintPath>
3737
</Reference>
3838
<Reference Include="nanoFramework.Benchmark, Version=1.0.113.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
3939
<HintPath>..\packages\nanoFramework.Benchmark.1.0.113\lib\nanoFramework.Benchmark.dll</HintPath>
4040
</Reference>
4141
<Reference Include="nanoFramework.Logging, Version=1.1.161.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
4242
<HintPath>..\packages\nanoFramework.Logging.1.1.161\lib\nanoFramework.Logging.dll</HintPath>
4343
</Reference>
44-
<Reference Include="nanoFramework.Runtime.Native, Version=1.7.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
45-
<HintPath>..\packages\nanoFramework.Runtime.Native.1.7.11\lib\nanoFramework.Runtime.Native.dll</HintPath>
44+
<Reference Include="nanoFramework.Runtime.Native, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
45+
<HintPath>..\packages\nanoFramework.Runtime.Native.2.0.0-preview.20\lib\nanoFramework.Runtime.Native.dll</HintPath>
4646
</Reference>
47-
<Reference Include="nanoFramework.System.Collections, Version=1.5.67.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
48-
<HintPath>..\packages\nanoFramework.System.Collections.1.5.67\lib\nanoFramework.System.Collections.dll</HintPath>
47+
<Reference Include="nanoFramework.System.Collections, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
48+
<HintPath>..\packages\nanoFramework.System.Collections.2.0.0-preview.8\lib\nanoFramework.System.Collections.dll</HintPath>
4949
</Reference>
50-
<Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
51-
<HintPath>..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
50+
<Reference Include="nanoFramework.System.Text, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
51+
<HintPath>..\packages\nanoFramework.System.Text.2.0.0-preview.8\lib\nanoFramework.System.Text.dll</HintPath>
5252
</Reference>
53-
<Reference Include="System.Diagnostics.Stopwatch, Version=1.2.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
54-
<HintPath>..\packages\nanoFramework.System.Diagnostics.Stopwatch.1.2.862\lib\System.Diagnostics.Stopwatch.dll</HintPath>
53+
<Reference Include="System.Diagnostics.Stopwatch, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
54+
<HintPath>..\packages\nanoFramework.System.Diagnostics.Stopwatch.2.0.0-preview.4\lib\System.Diagnostics.Stopwatch.dll</HintPath>
5555
</Reference>
5656
</ItemGroup>
5757
<ItemGroup>

‎nanoFramework.System.Math.Benchmark/packages.config‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="nanoFramework.Benchmark" version="1.0.113" targetFramework="netnano1.0" />
4-
<package id="nanoFramework.CoreLibrary" version="1.17.11" targetFramework="netnano1.0" />
4+
<package id="nanoFramework.CoreLibrary" version="2.0.0-preview.35" targetFramework="netnano1.0" />
55
<package id="nanoFramework.Logging" version="1.1.161" targetFramework="netnano1.0" />
6-
<package id="nanoFramework.Runtime.Native" version="1.7.11" targetFramework="netnano1.0" />
7-
<package id="nanoFramework.System.Collections" version="1.5.67" targetFramework="netnano1.0" />
8-
<package id="nanoFramework.System.Diagnostics.Stopwatch" version="1.2.862" targetFramework="netnano1.0" />
9-
<package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
6+
<package id="nanoFramework.Runtime.Native" version="2.0.0-preview.20" targetFramework="netnano1.0" />
7+
<package id="nanoFramework.System.Collections" version="2.0.0-preview.8" targetFramework="netnano1.0" />
8+
<package id="nanoFramework.System.Diagnostics.Stopwatch" version="2.0.0-preview.4" targetFramework="netnano1.0" />
9+
<package id="nanoFramework.System.Text" version="2.0.0-preview.8" targetFramework="netnano1.0" />
1010
</packages>

0 commit comments

Comments
 (0)