Skip to content

Commit d088ef3

Browse files
josesimoesjosesimoes
committed
Migrate to mscorlib v2
- Update references. - Bump versions. - Update unit tests. - Update nuspec.
1 parent ef7425e commit d088ef3

16 files changed

+113
-111
lines changed

Tests/NFUnitTestWifiConnection/nano.runsettings renamed to .runsettings

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@
1111
<nanoFrameworkAdapter>
1212
<Logging>None</Logging>
1313
<IsRealHardware>False</IsRealHardware>
14+
<UsePreviewClr>True</UsePreviewClr>
1415
</nanoFrameworkAdapter>
15-
</RunSettings>
16+
</RunSettings>

‎System.Device.Wifi/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
////////////////////////////////////////////////////////////////
1414
// update this whenever the native assembly signature changes //
15-
[assembly: AssemblyNativeVersion("100.0.6.5")]
15+
[assembly: AssemblyNativeVersion("100.2.0.0")]
1616
////////////////////////////////////////////////////////////////
1717

1818
// Setting ComVisible to false makes the types in this assembly not visible

‎System.Device.Wifi/System.Device.Wifi.nfproj‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
<ProjectGuid>a42bc265-9f96-48e2-aa2a-a5119b9b0b79</ProjectGuid>
1212
<OutputType>Library</OutputType>
1313
<FileAlignment>512</FileAlignment>
14-
<RootNamespace></RootNamespace>
14+
<RootNamespace>
15+
</RootNamespace>
1516
<AssemblyName>System.Device.Wifi</AssemblyName>
1617
<TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
1718
<NFTargetVersion>v1.0</NFTargetVersion>
@@ -59,23 +60,23 @@
5960
<None Include="packages.config" />
6061
</ItemGroup>
6162
<ItemGroup>
62-
<Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
63-
<HintPath>..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
63+
<Reference Include="mscorlib">
64+
<HintPath>..\packages\nanoFramework.CoreLibrary.2.0.0-preview.32\lib\netnano1.0\mscorlib.dll</HintPath>
6465
</Reference>
65-
<Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
66-
<HintPath>..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
66+
<Reference Include="nanoFramework.Runtime.Events">
67+
<HintPath>..\packages\nanoFramework.Runtime.Events.2.0.0-preview.6\lib\nanoFramework.Runtime.Events.dll</HintPath>
6768
</Reference>
68-
<Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
69-
<HintPath>..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
69+
<Reference Include="nanoFramework.System.Text">
70+
<HintPath>..\packages\nanoFramework.System.Text.2.0.0-preview.5\lib\nanoFramework.System.Text.dll</HintPath>
7071
</Reference>
71-
<Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
72-
<HintPath>..\packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
72+
<Reference Include="System.IO.Streams">
73+
<HintPath>..\packages\nanoFramework.System.IO.Streams.2.0.0-preview.7\lib\System.IO.Streams.dll</HintPath>
7374
</Reference>
74-
<Reference Include="System.Net, Version=1.11.47.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
75-
<HintPath>..\packages\nanoFramework.System.Net.1.11.47\lib\System.Net.dll</HintPath>
75+
<Reference Include="System.Net">
76+
<HintPath>..\packages\nanoFramework.System.Net.2.0.0-preview.1\lib\System.Net.dll</HintPath>
7677
</Reference>
77-
<Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
78-
<HintPath>..\packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
78+
<Reference Include="System.Threading">
79+
<HintPath>..\packages\nanoFramework.System.Threading.2.0.0-preview.4\lib\System.Threading.dll</HintPath>
7980
</Reference>
8081
</ItemGroup>
8182
<ItemGroup>

‎System.Device.Wifi/packages.config‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
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.Runtime.Events" version="1.11.32" targetFramework="netnano1.0" />
5-
<package id="nanoFramework.System.IO.Streams" version="1.1.96" targetFramework="netnano1.0" />
6-
<package id="nanoFramework.System.Net" version="1.11.47" targetFramework="netnano1.0" />
7-
<package id="nanoFramework.System.Text" version="1.3.42" targetFramework="netnano1.0" />
8-
<package id="nanoFramework.System.Threading" version="1.1.52" targetFramework="netnano1.0" />
3+
<package id="nanoFramework.CoreLibrary" version="2.0.0-preview.32" targetFramework="netnano1.0" />
4+
<package id="nanoFramework.Runtime.Events" version="2.0.0-preview.6" targetFramework="netnano1.0" />
5+
<package id="nanoFramework.System.IO.Streams" version="2.0.0-preview.7" targetFramework="netnano1.0" />
6+
<package id="nanoFramework.System.Net" version="2.0.0-preview.1" targetFramework="netnano1.0" />
7+
<package id="nanoFramework.System.Text" version="2.0.0-preview.5" targetFramework="netnano1.0" />
8+
<package id="nanoFramework.System.Threading" version="2.0.0-preview.4" targetFramework="netnano1.0" />
99
<package id="Nerdbank.GitVersioning" version="3.9.50" developmentDependency="true" targetFramework="netnano1.0" />
1010
</packages>

‎System.Device.Wifi/packages.lock.json‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,39 +4,39 @@
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.32, 2.0.0-preview.32]",
8+
"resolved": "2.0.0-preview.32",
9+
"contentHash": "DZ0CI92bJCTQ+2pGJiRxcqYEzmjMppg2elFZEZCGB6kUPjUoGV8o+NnFb5bn2X0Nl+b+8Wq5BLzGBbn8C05oKQ=="
1010
},
1111
"nanoFramework.Runtime.Events": {
1212
"type": "Direct",
13-
"requested": "[1.11.32, 1.11.32]",
14-
"resolved": "1.11.32",
15-
"contentHash": "NyLUIwJDlpl5VKSd+ljmdDtO2WHHBvPvruo1ccaL+hd79z+6XMYze1AccOVXKGiZenLBCwDmFHwpgIQyHkM7GA=="
13+
"requested": "[2.0.0-preview.6, 2.0.0-preview.6]",
14+
"resolved": "2.0.0-preview.6",
15+
"contentHash": "l7ZISc/+3eRSJ1caPDLZecGTrYgair8dzmXlgdNuy28YOhfHnNar6AK6ACpUM5pmH5ewCaQUgpNmIiiKp2XwBg=="
1616
},
1717
"nanoFramework.System.IO.Streams": {
1818
"type": "Direct",
19-
"requested": "[1.1.96, 1.1.96]",
20-
"resolved": "1.1.96",
21-
"contentHash": "kJSy4EJwChO4Vq3vGWP9gNRPFDnTsDU5HxzeI7NDO+RjbDsx7B8EhKymoeTPLJCxQq8y/0P1KG2XCxGpggW+fw=="
19+
"requested": "[2.0.0-preview.7, 2.0.0-preview.7]",
20+
"resolved": "2.0.0-preview.7",
21+
"contentHash": "ovwESoNwtZUq/7eQbhdIqUem4ZiO3ProaTOI4dg5sHwH4NJsfbhEAh9CloztolK7HtU+cGhMlIwt/WT2OlsBcQ=="
2222
},
2323
"nanoFramework.System.Net": {
2424
"type": "Direct",
25-
"requested": "[1.11.47, 1.11.47]",
26-
"resolved": "1.11.47",
27-
"contentHash": "fPjTPfaqDiirh9AysBLlEX5/KbaOliSxyspwpBTcM5OupCNjVXz0aZ9fOWex+BMjZei6GpG74kP8Z4ml912pcw=="
25+
"requested": "[2.0.0-preview.1, 2.0.0-preview.1]",
26+
"resolved": "2.0.0-preview.1",
27+
"contentHash": "IUklKRQyHTKrRh6EYx3Gg8Frv/PANGIAjm+s9hNSUksYVf8Xu0jy83a091RCLqgBnd8gGHgsf9Nz02v486Lgxw=="
2828
},
2929
"nanoFramework.System.Text": {
3030
"type": "Direct",
31-
"requested": "[1.3.42, 1.3.42]",
32-
"resolved": "1.3.42",
33-
"contentHash": "68HPjhersNpssbmEMUHdMw3073MHfGTfrkbRk9eILKbNPFfPFck7m4y9BlAi6DaguUJaeKxgyIojXF3SQrF8/A=="
31+
"requested": "[2.0.0-preview.5, 2.0.0-preview.5]",
32+
"resolved": "2.0.0-preview.5",
33+
"contentHash": "bSok7uDsUnic+RmoYo660XNlQhD631CrpIDUweiJtjuOtsNmwV4bwV28Xs0gpYF4xidYKUEk3nxt5lXU6ekATw=="
3434
},
3535
"nanoFramework.System.Threading": {
3636
"type": "Direct",
37-
"requested": "[1.1.52, 1.1.52]",
38-
"resolved": "1.1.52",
39-
"contentHash": "kv+US/+7QKV1iT/snxBh032vwZ+3krJ4vujlSsvmS2nNj/nK64R3bq/ST3bCFquxHDD0mog8irtCBCsFazr4kA=="
37+
"requested": "[2.0.0-preview.4, 2.0.0-preview.4]",
38+
"resolved": "2.0.0-preview.4",
39+
"contentHash": "R9uXKg2zP30eGGGXqK1LZyQxLUcCo3y/31FMnLg1nlfooafXCugcLEyWiYgtGUPSMDfXOvLbMPCfM9Sqf02tiQ=="
4040
},
4141
"Nerdbank.GitVersioning": {
4242
"type": "Direct",

‎Tests/NFUnitTestWifiConnection/ConnectToWifiFixIPAddressTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ public void TestFixIPAddress_01()
4242

4343
ConnectToWifiWithCredentialsTests.DisplayLastError(success);
4444

45-
Assert.True(success);
46-
Assert.Null(WifiNetworkHelper.HelperException);
45+
Assert.IsTrue(success);
46+
Assert.IsNull(WifiNetworkHelper.HelperException);
4747

4848
// need to reset this internal flag to allow calling the NetworkHelper again
4949
WifiNetworkHelper.ResetInstance();
@@ -59,7 +59,7 @@ public void TestFixedIPAddress_02()
5959
new[] { "192.168.1.1" }), true);
6060

6161
// wait 10 seconds to connect to the network
62-
Assert.True(WifiNetworkHelper.NetworkReady.WaitOne(10000, true));
62+
Assert.IsTrue(WifiNetworkHelper.NetworkReady.WaitOne(10000, true));
6363

6464
// need to reset this internal flag to allow calling the NetworkHelper again
6565
WifiNetworkHelper.ResetInstance();

‎Tests/NFUnitTestWifiConnection/ConnectToWifiWithCredentialsScanTests.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ public void TestNormalConnectionScanAndConnect()
3838

3939
ConnectToWifiWithCredentialsTests.DisplayLastError(success);
4040

41-
Assert.True(success);
42-
Assert.Null(WifiNetworkHelper.HelperException);
41+
Assert.IsTrue(success);
42+
Assert.IsNull(WifiNetworkHelper.HelperException);
4343

4444
// need to reset this internal flag to allow calling the NetworkHelper again
4545
WifiNetworkHelper.ResetInstance();
@@ -54,8 +54,8 @@ public void TestDhcp_01()
5454
requiresDateTime: true);
5555

5656
// wait 10 seconds to connect to the network and get an IP address
57-
Assert.True(WifiNetworkHelper.NetworkReady.WaitOne(10000, true));
58-
Assert.Null(WifiNetworkHelper.HelperException);
57+
Assert.IsTrue(WifiNetworkHelper.NetworkReady.WaitOne(10000, true));
58+
Assert.IsNull(WifiNetworkHelper.HelperException);
5959

6060
// need to reset this internal flag to allow calling the NetworkHelper again
6161
WifiNetworkHelper.ResetInstance();
@@ -67,7 +67,7 @@ public void TestDhcp_02()
6767
WifiNetworkHelper.SetupNetworkHelper(true);
6868

6969
// wait 10 seconds to connect to the network and get an IP address
70-
Assert.True(WifiNetworkHelper.NetworkReady.WaitOne(10000, true));
70+
Assert.IsTrue(WifiNetworkHelper.NetworkReady.WaitOne(10000, true));
7171

7272
// need to reset this internal flag to allow calling the NetworkHelper again
7373
WifiNetworkHelper.ResetInstance();
@@ -76,7 +76,7 @@ public void TestDhcp_02()
7676
[TestMethod]
7777
public void TestSingleUsage()
7878
{
79-
Assert.Throws(typeof(InvalidOperationException), () =>
79+
Assert.ThrowsException(typeof(InvalidOperationException), () =>
8080
{
8181
// call once, it's OK
8282
WifiNetworkHelper.SetupNetworkHelper();

‎Tests/NFUnitTestWifiConnection/ConnectToWifiWithCredentialsTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ public void TestNormalConnection()
5454

5555
DisplayLastError(success);
5656

57-
Assert.True(success);
58-
Assert.Null(WifiNetworkHelper.HelperException);
57+
Assert.IsTrue(success);
58+
Assert.IsNull(WifiNetworkHelper.HelperException);
5959

6060
// need to reset this internal flag to allow calling the NetworkHelper again
6161
WifiNetworkHelper.ResetInstance();

‎Tests/NFUnitTestWifiConnection/ConnectToWifiWithoutCredentialsTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ public void TestReconnection()
3030

3131
ConnectToWifiWithCredentialsTests.DisplayLastError(success);
3232

33-
Assert.True(success);
34-
Assert.Null(WifiNetworkHelper.HelperException);
33+
Assert.IsTrue(success);
34+
Assert.IsNull(WifiNetworkHelper.HelperException);
3535

3636
// need to reset this internal flag to allow calling the NetworkHelper again
3737
WifiNetworkHelper.ResetInstance();

‎Tests/NFUnitTestWifiConnection/NFUnitTestWifiConnection.nfproj‎

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@
2525
<RestoreLockedMode Condition="'$(TF_BUILD)' == 'True' or '$(ContinuousIntegrationBuild)' == 'True'">true</RestoreLockedMode>
2626
</PropertyGroup>
2727
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
28-
<PropertyGroup>
29-
<RunSettingsFilePath>$(MSBuildProjectDirectory)\nano.runsettings</RunSettingsFilePath>
30-
</PropertyGroup>
3128
<PropertyGroup>
3229
<SignAssembly>true</SignAssembly>
3330
</PropertyGroup>
@@ -45,37 +42,39 @@
4542
<Compile Include="Properties\AssemblyInfo.cs" />
4643
</ItemGroup>
4744
<ItemGroup>
48-
<Reference Include="mscorlib, Version=1.17.11.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
49-
<HintPath>..\..\packages\nanoFramework.CoreLibrary.1.17.11\lib\mscorlib.dll</HintPath>
45+
<None Include="packages.config" />
46+
</ItemGroup>
47+
<ItemGroup>
48+
<ProjectReference Include="..\..\System.Device.Wifi\System.Device.Wifi.nfproj" />
49+
</ItemGroup>
50+
<ItemGroup>
51+
<Reference Include="mscorlib">
52+
<HintPath>..\..\packages\nanoFramework.CoreLibrary.2.0.0-preview.32\lib\netnano1.0\mscorlib.dll</HintPath>
5053
</Reference>
51-
<Reference Include="nanoFramework.Runtime.Events, Version=1.11.32.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
52-
<HintPath>..\..\packages\nanoFramework.Runtime.Events.1.11.32\lib\nanoFramework.Runtime.Events.dll</HintPath>
54+
<Reference Include="nanoFramework.Runtime.Events">
55+
<HintPath>..\..\packages\nanoFramework.Runtime.Events.2.0.0-preview.6\lib\nanoFramework.Runtime.Events.dll</HintPath>
5356
</Reference>
54-
<Reference Include="nanoFramework.System.Text, Version=1.3.42.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
55-
<HintPath>..\..\packages\nanoFramework.System.Text.1.3.42\lib\nanoFramework.System.Text.dll</HintPath>
57+
<Reference Include="nanoFramework.System.Text">
58+
<HintPath>..\..\packages\nanoFramework.System.Text.2.0.0-preview.5\lib\nanoFramework.System.Text.dll</HintPath>
5659
</Reference>
57-
<Reference Include="nanoFramework.TestFramework, Version=3.0.77.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
58-
<HintPath>..\..\packages\nanoFramework.TestFramework.3.0.77\lib\nanoFramework.TestFramework.dll</HintPath>
60+
<Reference Include="nanoFramework.TestFramework">
61+
<HintPath>..\..\packages\nanoFramework.TestFramework.4.0.0-preview.47\lib\nanoFramework.TestFramework.dll</HintPath>
5962
</Reference>
60-
<Reference Include="nanoFramework.UnitTestLauncher, Version=0.0.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
61-
<HintPath>..\..\packages\nanoFramework.TestFramework.3.0.77\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
63+
<Reference Include="nanoFramework.UnitTestLauncher">
64+
<HintPath>..\..\packages\nanoFramework.TestFramework.4.0.0-preview.47\lib\nanoFramework.UnitTestLauncher.exe</HintPath>
6265
</Reference>
63-
<Reference Include="System.IO.Streams, Version=1.1.96.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
64-
<HintPath>..\..\packages\nanoFramework.System.IO.Streams.1.1.96\lib\System.IO.Streams.dll</HintPath>
66+
<Reference Include="System.IO.Streams">
67+
<HintPath>..\..\packages\nanoFramework.System.IO.Streams.2.0.0-preview.7\lib\System.IO.Streams.dll</HintPath>
6568
</Reference>
66-
<Reference Include="System.Net, Version=1.11.47.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
67-
<HintPath>..\..\packages\nanoFramework.System.Net.1.11.47\lib\System.Net.dll</HintPath>
69+
<Reference Include="System.Net">
70+
<HintPath>..\..\packages\nanoFramework.System.Net.2.0.0-preview.1\lib\System.Net.dll</HintPath>
6871
</Reference>
69-
<Reference Include="System.Threading, Version=1.1.52.34401, Culture=neutral, PublicKeyToken=c07d481e9758c731">
70-
<HintPath>..\..\packages\nanoFramework.System.Threading.1.1.52\lib\System.Threading.dll</HintPath>
72+
<Reference Include="System.Threading">
73+
<HintPath>..\..\packages\nanoFramework.System.Threading.2.0.0-preview.4\lib\System.Threading.dll</HintPath>
7174
</Reference>
7275
</ItemGroup>
7376
<ItemGroup>
74-
<None Include="nano.runsettings" />
75-
<None Include="packages.config" />
76-
</ItemGroup>
77-
<ItemGroup>
78-
<ProjectReference Include="..\..\System.Device.Wifi\System.Device.Wifi.nfproj" />
77+
<Content Include="packages.lock.json" />
7978
</ItemGroup>
8079
<Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.CSharp.targets')" />
8180
<!-- MANUAL UPDATE HERE -->
@@ -84,4 +83,4 @@
8483
<ProjectConfigurationsDeclaredAsItems />
8584
</ProjectCapabilities>
8685
</ProjectExtensions>
87-
</Project>
86+
</Project>

0 commit comments

Comments
 (0)