Skip to content

Commit e730aed

Browse files
josesimoesjosesimoes
committed
Migrate mscorlib to v2
- Update pipelines configs and references. - Bump native assembly version. - Improvements in unit tests.
1 parent d0eadda commit e730aed

19 files changed

+177
-137
lines changed

‎.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
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.Text.sln'
22+
previewPackages: true
23+
branchToPr: 'develop'
24+

‎.runsettings‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
<TargetPlatform>x64</TargetPlatform>
1010
</RunConfiguration>
1111
<nanoFrameworkAdapter>
12-
<Logging>None</Logging>
13-
<IsRealHardware>False</IsRealHardware>
14-
</nanoFrameworkAdapter>
12+
<Logging>Verbose</Logging>
13+
<IsRealHardware>False</IsRealHardware>
14+
<RunnerExtraArguments></RunnerExtraArguments>
15+
<UsePreviewClr>True</UsePreviewClr>
16+
</nanoFrameworkAdapter>
1517
</RunSettings>

‎Tests/NFUnitTestEncoding/NFUnitTestEncoding.nfproj‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,25 @@
2727
<Compile Include="EncodingTests.cs" />
2828
<Compile Include="Properties\AssemblyInfo.cs" />
2929
</ItemGroup>
30+
<ItemGroup>
31+
<ProjectReference Include="..\..\nanoFramework.System.Text\nanoFramework.System.Text.nfproj" />
32+
</ItemGroup>
3033
<ItemGroup>
3134
<Reference Include="mscorlib">
32-
<HintPath>..\..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
35+
<HintPath>..\..\packages\nanoFramework.CoreLibrary.2.0.0-preview.29\lib\netnano1.0\mscorlib.dll</HintPath>
3336
</Reference>
3437
<Reference Include="nanoFramework.TestFramework">
35-
<HintPath>..\..\packages\nanoFramework.TestFramework.3.0.77\lib\nanoFramework.TestFramework.dll</HintPath>
38+
<HintPath>..\..\packages\nanoFramework.TestFramework.4.0.0-preview.45\lib\nanoFramework.TestFramework.dll</HintPath>
3639
</Reference>
3740
<Reference Include="nanoFramework.UnitTestLauncher">
38-
<HintPath>..\..\packages\nanoFramework.TestFramework.3.0.77\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
41+
<HintPath>..\..\packages\nanoFramework.TestFramework.4.0.0-preview.45\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
3942
</Reference>
4043
</ItemGroup>
4144
<ItemGroup>
4245
<None Include="packages.config" />
4346
</ItemGroup>
4447
<ItemGroup>
45-
<ProjectReference Include="..\..\nanoFramework.System.Text\nanoFramework.System.Text.nfproj" />
48+
<Content Include="packages.lock.json" />
4649
</ItemGroup>
4750
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
4851
</Project>

‎Tests/NFUnitTestEncoding/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.29" targetFramework="netnano1.0" />
4+
<package id="nanoFramework.TestFramework" version="4.0.0-preview.45" targetFramework="netnano1.0" developmentDependency="true" />
55
</packages>

‎Tests/NFUnitTestEncoding/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.29, 2.0.0-preview.29]",
8+
"resolved": "2.0.0-preview.29",
9+
"contentHash": "7NDp9Sda9FTFBDN//X34r23rJBHUkCvyGvrFh9s5B8H2nMoet4J0OlEOiZRUsEPBXlsNpZFVp+Cd6OSjnLSg5A=="
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.45, 4.0.0-preview.45]",
14+
"resolved": "4.0.0-preview.45",
15+
"contentHash": "QnRl5gAJW4uoH4k4oQMT+gVnI57lGnST8F/PuK31M+j0AekWFvcSHKDirWrY9rs/JJTLPwgllaKiQGioTfBwPg=="
1616
}
1717
}
1818
}

‎Tests/NFUnitTestStringBuilder/NFUnitTestStringBuilder.nfproj‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,24 @@
3030
<Compile Include="StringBuilderTests.cs" />
3131
</ItemGroup>
3232
<ItemGroup>
33-
<Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
34-
<HintPath>..\..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
35-
</Reference>
36-
<Reference Include="nanoFramework.TestFramework, Version=3.0.77.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
37-
<HintPath>..\..\packages\nanoFramework.TestFramework.3.0.77\lib\nanoFramework.TestFramework.dll</HintPath>
38-
</Reference>
39-
<Reference Include="nanoFramework.UnitTestLauncher, Version=0.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
40-
<HintPath>..\..\packages\nanoFramework.TestFramework.3.0.77\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
41-
</Reference>
33+
<Content Include="packages.lock.json" />
4234
</ItemGroup>
4335
<ItemGroup>
44-
<None Include="packages.config" />
36+
<ProjectReference Include="..\..\nanoFramework.System.Text\nanoFramework.System.Text.nfproj" />
4537
</ItemGroup>
4638
<ItemGroup>
47-
<Content Include="packages.lock.json" />
39+
<Reference Include="mscorlib">
40+
<HintPath>..\..\packages\nanoFramework.CoreLibrary.2.0.0-preview.29\lib\netnano1.0\mscorlib.dll</HintPath>
41+
</Reference>
42+
<Reference Include="nanoFramework.TestFramework">
43+
<HintPath>..\..\packages\nanoFramework.TestFramework.4.0.0-preview.45\lib\nanoFramework.TestFramework.dll</HintPath>
44+
</Reference>
45+
<Reference Include="nanoFramework.UnitTestLauncher">
46+
<HintPath>..\..\packages\nanoFramework.TestFramework.4.0.0-preview.45\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
47+
</Reference>
4848
</ItemGroup>
4949
<ItemGroup>
50-
<ProjectReference Include="..\..\nanoFramework.System.Text\nanoFramework.System.Text.nfproj" />
50+
<None Include="packages.config" />
5151
</ItemGroup>
5252
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
5353
<!-- MANUAL UPDATE HERE -->

‎Tests/NFUnitTestStringBuilder/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.29" targetFramework="netnano1.0" />
4+
<package id="nanoFramework.TestFramework" version="4.0.0-preview.45" targetFramework="netnano1.0" developmentDependency="true" />
55
</packages>

‎Tests/NFUnitTestStringBuilder/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.29, 2.0.0-preview.29]",
8+
"resolved": "2.0.0-preview.29",
9+
"contentHash": "7NDp9Sda9FTFBDN//X34r23rJBHUkCvyGvrFh9s5B8H2nMoet4J0OlEOiZRUsEPBXlsNpZFVp+Cd6OSjnLSg5A=="
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.45, 4.0.0-preview.45]",
14+
"resolved": "4.0.0-preview.45",
15+
"contentHash": "QnRl5gAJW4uoH4k4oQMT+gVnI57lGnST8F/PuK31M+j0AekWFvcSHKDirWrY9rs/JJTLPwgllaKiQGioTfBwPg=="
1616
}
1717
}
1818
}

‎azure-pipelines.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ jobs:
7272
sonarCloudProject: 'nanoframework_lib-nanoFramework.System.Text'
7373
runUnitTests: true
7474
unitTestRunsettings: '$(System.DefaultWorkingDirectory)\.runsettings'
75+
usePreviewBuild: true
7576

7677
##############################
7778
- job: Update_Dependents

0 commit comments

Comments
 (0)