Skip to content

Commit bbf8d80

Browse files
josesimoesjosesimoes
committed
Migrate mscorlib to v2
- Update references. - Bump versions. - Update AZDO and nuspec files.
1 parent 5687db4 commit bbf8d80

11 files changed

Lines changed: 34 additions & 29 deletions

‎.runsettings‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@
99
</RunConfiguration>
1010
<nanoFrameworkAdapter>
1111
<Logging>Verbose</Logging> <!--Set to the desired level of logging for Unit Test execution. Possible values are: None, Detailed, Verbose, Error. -->
12-
<IsRealHardware>True</IsRealHardware><!--Set to true to run tests on real hardware. -->
12+
<IsRealHardware>False</IsRealHardware><!--Set to true to run tests on real hardware. -->
1313
<RealHardwarePort>COM47</RealHardwarePort><!--Specify the COM port to use to connect to a nanoDevice. If none is specified, a device detection is performed and the 1st available one will be used. -->
1414
<CLRVersion></CLRVersion><!--Specify the nanoCLR version to use. If not specified, the latest available will be used. -->
1515
<PathToLocalCLRInstance></PathToLocalCLRInstance><!--Specify the path to a local nanoCLR instance. If not specified, the default one installed with nanoclr CLR witll be used. -->
16+
<UsePreviewClr>True</UsePreviewClr>
1617
</nanoFrameworkAdapter>
17-
</RunSettings>
18+
</RunSettings>

‎System.Security.Cryptography/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616

1717
////////////////////////////////////////////////////////////////
1818
// update this whenever the native assembly signature changes //
19-
[assembly: AssemblyNativeVersion("100.0.0.3")]
19+
[assembly: AssemblyNativeVersion("100.2.0.3")]
2020
////////////////////////////////////////////////////////////////

‎System.Security.Cryptography/System.Security.Cryptography.nfproj‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,13 @@
5353
<None Include="packages.config" />
5454
</ItemGroup>
5555
<ItemGroup>
56-
<Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
57-
<HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
56+
<Reference Include="mscorlib">
57+
<HintPath>..\packages\nanoFramework.CoreLibrary.2.0.0-preview.33\lib\netnano1.0\mscorlib.dll</HintPath>
5858
</Reference>
5959
</ItemGroup>
60+
<ItemGroup>
61+
<Content Include="packages.lock.json" />
62+
</ItemGroup>
6063
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
6164
<ProjectExtensions>
6265
<ProjectCapabilities>

‎System.Security.Cryptography/packages.config‎

Lines changed: 1 addition & 1 deletion
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" />
3+
<package id="nanoFramework.CoreLibrary" version="2.0.0-preview.33" targetFramework="netnano1.0" />
44
<package id="Nerdbank.GitVersioning" version="3.9.50" developmentDependency="true" targetFramework="netnano1.0" />
55
</packages>

‎System.Security.Cryptography/packages.lock.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
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.33, 2.0.0-preview.33]",
8+
"resolved": "2.0.0-preview.33",
9+
"contentHash": "VVr+TmThdBt9zzXFzFewB5GUsNm2BE8+/3OtaCiJVg76v0Wr87A0Mi6R74hm78otfIhPJ66aPaRd+fA23dmJjQ=="
1010
},
1111
"Nerdbank.GitVersioning": {
1212
"type": "Direct",

‎Tests/System.Security.CryptographyTests/System.Security.CryptographyTests.nfproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,24 +33,24 @@
3333
<Compile Include="Properties\AssemblyInfo.cs" />
3434
</ItemGroup>
3535
<ItemGroup>
36-
<Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
37-
<HintPath>..\..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
36+
<Reference Include="mscorlib">
37+
<HintPath>..\..\packages\nanoFramework.CoreLibrary.2.0.0-preview.33\lib\netnano1.0\mscorlib.dll</HintPath>
3838
</Reference>
39-
<Reference Include="nanoFramework.TestFramework, Version=3.0.77.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
40-
<HintPath>..\..\packages\nanoFramework.TestFramework.3.0.77\lib\nanoFramework.TestFramework.dll</HintPath>
39+
<Reference Include="nanoFramework.TestFramework">
40+
<HintPath>..\..\packages\nanoFramework.TestFramework.4.0.0-preview.47\lib\nanoFramework.TestFramework.dll</HintPath>
4141
</Reference>
42-
<Reference Include="nanoFramework.UnitTestLauncher, Version=0.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
43-
<HintPath>..\..\packages\nanoFramework.TestFramework.3.0.77\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
42+
<Reference Include="nanoFramework.UnitTestLauncher">
43+
<HintPath>..\..\packages\nanoFramework.TestFramework.4.0.0-preview.47\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
4444
</Reference>
4545
</ItemGroup>
46-
<ItemGroup>
47-
<None Include="packages.config" />
48-
</ItemGroup>
4946
<ItemGroup>
5047
<ProjectReference Include="..\..\System.Security.Cryptography\System.Security.Cryptography.nfproj" />
5148
</ItemGroup>
5249
<ItemGroup>
5350
<Content Include="packages.lock.json" />
5451
</ItemGroup>
52+
<ItemGroup>
53+
<None Include="packages.config" />
54+
</ItemGroup>
5555
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
5656
</Project>

‎Tests/System.Security.CryptographyTests/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.33" targetFramework="netnano1.0" />
4+
<package id="nanoFramework.TestFramework" version="4.0.0-preview.47" targetFramework="netnano1.0" developmentDependency="true" />
55
</packages>

‎Tests/System.Security.CryptographyTests/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.33, 2.0.0-preview.33]",
8+
"resolved": "2.0.0-preview.33",
9+
"contentHash": "VVr+TmThdBt9zzXFzFewB5GUsNm2BE8+/3OtaCiJVg76v0Wr87A0Mi6R74hm78otfIhPJ66aPaRd+fA23dmJjQ=="
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
@@ -53,6 +53,7 @@ steps:
5353
sonarCloudProject: 'nanoframework_System.Security.Cryptography'
5454
runUnitTests: false
5555
unitTestRunsettings: '$(System.DefaultWorkingDirectory)\.runsettings'
56+
usePreviewBuild: true
5657

5758
# step from template @ nf-tools repo
5859
# report error

‎nanoFramework.System.Security.Cryptography.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
This package requires a target with nanoFramework.System.Security.Cryptography v$nativeVersion$ (checksum $checksum$).</description>
2020
<tags>nanoFramework C# csharp netmf netnf </tags>
2121
<dependencies>
22-
<dependency id="nanoFramework.CoreLibrary" version="1.17.11" />
22+
<dependency id="nanoFramework.CoreLibrary" version="2.0.0-preview.33" />
2323
</dependencies>
2424
</metadata>
2525
<files>
@@ -34,4 +34,4 @@ This package requires a target with nanoFramework.System.Security.Cryptography v
3434
<file src="assets\nf-logo.png" target="images" />
3535
<file src="LICENSE.md" target="" />
3636
</files>
37-
</package>
37+
</package>

0 commit comments

Comments
 (0)