Skip to content

Commit ddeb43d

Browse files
josesimoesjosesimoes
authored
Update network samples (#200)
1 parent f21976a commit ddeb43d

File tree

68 files changed

+1284
-1057
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+1284
-1057
lines changed

Diff for: ‎samples/AMQP/Azure-IoT-Hub/Azure-IoT-Hub.nfproj

+33-27
Original file line numberDiff line numberDiff line change
@@ -26,53 +26,59 @@
2626
<HintPath>..\packages\AMQPNetLite.nanoFramework.2.4.4-preview.1\lib\Amqp.nanoFramework.dll</HintPath>
2727
<Private>True</Private>
2828
</Reference>
29-
<Reference Include="mscorlib, Version=1.10.5.4, Culture=neutral, PublicKeyToken=c07d481e9758c731">
30-
<HintPath>..\packages\nanoFramework.CoreLibrary.1.10.5\lib\mscorlib.dll</HintPath>
29+
<Reference Include="mscorlib, Version=1.11.7.2, Culture=neutral, PublicKeyToken=c07d481e9758c731">
30+
<HintPath>..\packages\nanoFramework.CoreLibrary.1.11.7\lib\mscorlib.dll</HintPath>
3131
<Private>True</Private>
32+
<SpecificVersion>True</SpecificVersion>
3233
</Reference>
33-
<Reference Include="nanoFramework.NetworkHelper, Version=1.3.3.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
34-
<HintPath>..\packages\nanoFramework.NetWorkHelper.1.3.3\lib\nanoFramework.NetworkHelper.dll</HintPath>
34+
<Reference Include="nanoFramework.ResourceManager, Version=1.1.3.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
35+
<HintPath>..\packages\nanoFramework.ResourceManager.1.1.3\lib\nanoFramework.ResourceManager.dll</HintPath>
3536
<Private>True</Private>
37+
<SpecificVersion>True</SpecificVersion>
3638
</Reference>
37-
<Reference Include="nanoFramework.ResourceManager, Version=1.1.2.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
38-
<HintPath>..\packages\nanoFramework.ResourceManager.1.1.2\lib\nanoFramework.ResourceManager.dll</HintPath>
39+
<Reference Include="nanoFramework.Runtime.Events, Version=1.10.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
40+
<HintPath>..\packages\nanoFramework.Runtime.Events.1.10.0-preview.1\lib\nanoFramework.Runtime.Events.dll</HintPath>
3941
<Private>True</Private>
42+
<SpecificVersion>True</SpecificVersion>
4043
</Reference>
41-
<Reference Include="nanoFramework.Runtime.Events, Version=1.9.1.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
42-
<HintPath>..\packages\nanoFramework.Runtime.Events.1.9.1\lib\nanoFramework.Runtime.Events.dll</HintPath>
44+
<Reference Include="nanoFramework.Runtime.Native, Version=1.5.2.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
45+
<HintPath>..\packages\nanoFramework.Runtime.Native.1.5.2\lib\nanoFramework.Runtime.Native.dll</HintPath>
4346
<Private>True</Private>
47+
<SpecificVersion>True</SpecificVersion>
4448
</Reference>
45-
<Reference Include="nanoFramework.Runtime.Native, Version=1.5.1.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
46-
<HintPath>..\packages\nanoFramework.Runtime.Native.1.5.1\lib\nanoFramework.Runtime.Native.dll</HintPath>
49+
<Reference Include="nanoFramework.System.Collections, Version=1.3.0.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
50+
<HintPath>..\packages\nanoFramework.System.Collections.1.3.0\lib\nanoFramework.System.Collections.dll</HintPath>
4751
<Private>True</Private>
52+
<SpecificVersion>True</SpecificVersion>
4853
</Reference>
49-
<Reference Include="nanoFramework.System.Collections, Version=1.2.0.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
50-
<HintPath>..\packages\nanoFramework.System.Collections.1.2.0\lib\nanoFramework.System.Collections.dll</HintPath>
54+
<Reference Include="nanoFramework.System.Text, Version=1.1.3.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
55+
<HintPath>..\packages\nanoFramework.System.Text.1.1.3-preview.4\lib\nanoFramework.System.Text.dll</HintPath>
5156
<Private>True</Private>
57+
<SpecificVersion>True</SpecificVersion>
5258
</Reference>
53-
<Reference Include="nanoFramework.System.Text, Version=1.1.1.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
54-
<HintPath>..\packages\nanoFramework.System.Text.1.1.1\lib\nanoFramework.System.Text.dll</HintPath>
59+
<Reference Include="System.Device.WiFi, Version=1.3.3.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
60+
<HintPath>..\packages\nanoFramework.System.Device.WiFi.1.3.3\lib\System.Device.WiFi.dll</HintPath>
5561
<Private>True</Private>
5662
</Reference>
57-
<Reference Include="System.Math, Version=1.4.1.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
58-
<HintPath>..\packages\nanoFramework.System.Math.1.4.1\lib\System.Math.dll</HintPath>
63+
<Reference Include="System.Math, Version=1.4.3.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
64+
<HintPath>..\packages\nanoFramework.System.Math.1.4.3\lib\System.Math.dll</HintPath>
5965
<Private>True</Private>
66+
<SpecificVersion>True</SpecificVersion>
6067
</Reference>
61-
<Reference Include="System.Net, Version=1.7.0.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
62-
<HintPath>..\packages\nanoFramework.System.Net.1.7.0\lib\System.Net.dll</HintPath>
68+
<Reference Include="System.Net, Version=1.8.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
69+
<HintPath>..\packages\nanoFramework.System.Net.1.8.0-preview.3\lib\System.Net.dll</HintPath>
6370
<Private>True</Private>
71+
<SpecificVersion>True</SpecificVersion>
6472
</Reference>
65-
<Reference Include="System.Threading, Version=1.0.2.2, Culture=neutral, PublicKeyToken=c07d481e9758c731">
66-
<HintPath>..\packages\nanoFramework.System.Threading.1.0.2\lib\System.Threading.dll</HintPath>
73+
<Reference Include="System.Threading, Version=1.0.3.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
74+
<HintPath>..\packages\nanoFramework.System.Threading.1.0.3\lib\System.Threading.dll</HintPath>
6775
<Private>True</Private>
76+
<SpecificVersion>True</SpecificVersion>
6877
</Reference>
69-
<Reference Include="Windows.Devices.Gpio, Version=1.5.2.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
70-
<HintPath>..\packages\nanoFramework.Windows.Devices.Gpio.1.5.2\lib\Windows.Devices.Gpio.dll</HintPath>
71-
<Private>True</Private>
72-
</Reference>
73-
<Reference Include="Windows.Devices.Wifi, Version=1.3.3.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
74-
<HintPath>..\packages\nanoFramework.Windows.Devices.Wifi.1.3.3\lib\Windows.Devices.Wifi.dll</HintPath>
78+
<Reference Include="Windows.Devices.Gpio, Version=1.5.4.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
79+
<HintPath>..\packages\nanoFramework.Windows.Devices.Gpio.1.5.4-preview.3\lib\Windows.Devices.Gpio.dll</HintPath>
7580
<Private>True</Private>
81+
<SpecificVersion>True</SpecificVersion>
7682
</Reference>
7783
</ItemGroup>
7884
<ItemGroup>
@@ -84,4 +90,4 @@
8490
<ProjectConfigurationsDeclaredAsItems />
8591
</ProjectCapabilities>
8692
</ProjectExtensions>
87-
</Project>
93+
</Project>

Diff for: ‎samples/AMQP/Azure-IoT-Hub/Program.cs

+14-6
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
using AmqpTrace = Amqp.Trace;
1313

1414
#if HAS_WIFI
15-
using Windows.Devices.WiFi;
15+
using System.Device.WiFi;
1616
#endif
1717

1818
namespace AmqpSamples.AzureIoTHub
@@ -50,17 +50,25 @@ public static void Main()
5050
bool success;
5151
CancellationTokenSource cs = new(60000);
5252
#if HAS_WIFI
53-
success = NetworkHelper.ConnectWifiDhcp(MySsid, MyPassword, setDateTime: true, token: cs.Token);
53+
success = WiFiNetworkHelper.ConnectDhcp(MySsid, MyPassword, requiresDateTime: true, token: cs.Token);
5454
#else
55-
success = NetworkHelper.WaitForValidIPAndDate(true, System.Net.NetworkInformation.NetworkInterfaceType.Ethernet, cs.Token);
55+
success = NetworkHelper.SetupAndConnectNetwork(cs.Token, true);
5656
#endif
5757
if (!success)
5858
{
59-
Debug.WriteLine($"Can't get a proper IP address and DateTime, error: {NetworkHelper.ConnectionError.Error}.");
60-
if (NetworkHelper.ConnectionError.Exception != null)
59+
#if HAS_WIFI
60+
Debug.WriteLine($"Can't get a proper IP address and DateTime, error: {WiFiNetworkHelper.Status}.");
61+
if (WiFiNetworkHelper.HelperException != null)
6162
{
62-
Debug.WriteLine($"Exception: {NetworkHelper.ConnectionError.Exception}");
63+
Debug.WriteLine($"Exception: {WiFiNetworkHelper.HelperException}");
6364
}
65+
#else
66+
Debug.WriteLine($"Can't get a proper IP address and DateTime, error: {NetworkHelper.Status}.");
67+
if (NetworkHelper.HelperException != null)
68+
{
69+
Debug.WriteLine($"Exception: {NetworkHelper.HelperException}");
70+
}
71+
#endif
6472
return;
6573
}
6674

Diff for: ‎samples/AMQP/Azure-IoT-Hub/packages.config

+11-12
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="AMQPNetLite.nanoFramework" version="2.4.4-preview.1" targetFramework="netnanoframework10" />
4-
<package id="nanoFramework.CoreLibrary" version="1.10.5" targetFramework="netnanoframework10" />
5-
<package id="nanoFramework.NetWorkHelper" version="1.3.3" targetFramework="netnanoframework10" />
6-
<package id="nanoFramework.ResourceManager" version="1.1.2" targetFramework="netnanoframework10" />
7-
<package id="nanoFramework.Runtime.Events" version="1.9.1" targetFramework="netnanoframework10" />
8-
<package id="nanoFramework.Runtime.Native" version="1.5.1" targetFramework="netnanoframework10" />
9-
<package id="nanoFramework.System.Collections" version="1.2.0" targetFramework="netnanoframework10" />
10-
<package id="nanoFramework.System.Math" version="1.4.1" targetFramework="netnanoframework10" />
11-
<package id="nanoFramework.System.Net" version="1.7.0" targetFramework="netnanoframework10" />
12-
<package id="nanoFramework.System.Text" version="1.1.1" targetFramework="netnanoframework10" />
13-
<package id="nanoFramework.System.Threading" version="1.0.2" />
14-
<package id="nanoFramework.Windows.Devices.Gpio" version="1.5.2" targetFramework="netnanoframework10" />
15-
<package id="nanoFramework.Windows.Devices.Wifi" version="1.3.3" targetFramework="netnanoframework10" />
4+
<package id="nanoFramework.CoreLibrary" version="1.11.7" targetFramework="netnanoframework10" />
5+
<package id="nanoFramework.ResourceManager" version="1.1.3" targetFramework="netnanoframework10" />
6+
<package id="nanoFramework.Runtime.Events" version="1.10.0-preview.1" targetFramework="netnanoframework10" />
7+
<package id="nanoFramework.Runtime.Native" version="1.5.2" targetFramework="netnanoframework10" />
8+
<package id="nanoFramework.System.Collections" version="1.3.0" targetFramework="netnanoframework10" />
9+
<package id="nanoFramework.System.Device.WiFi" version="1.4.0-preview.1" targetFramework="netnanoframework10" />
10+
<package id="nanoFramework.System.Math" version="1.4.3" targetFramework="netnanoframework10" />
11+
<package id="nanoFramework.System.Net" version="1.8.0-preview.3" targetFramework="netnanoframework10" />
12+
<package id="nanoFramework.System.Text" version="1.1.3-preview.4" targetFramework="netnanoframework10" />
13+
<package id="nanoFramework.System.Threading" version="1.0.3" targetFramework="netnanoframework10" />
14+
<package id="nanoFramework.Windows.Devices.Gpio" version="1.5.4-preview.3" targetFramework="netnanoframework10" />
1615
</packages>

Diff for: ‎samples/AMQP/Azure-ServiceBus-Sender/Azure-ServiceBus-Sender.nfproj

+32-26
Original file line numberDiff line numberDiff line change
@@ -26,53 +26,59 @@
2626
<HintPath>..\packages\AMQPNetLite.nanoFramework.2.4.4-preview.1\lib\Amqp.nanoFramework.dll</HintPath>
2727
<Private>True</Private>
2828
</Reference>
29-
<Reference Include="mscorlib, Version=1.10.5.4, Culture=neutral, PublicKeyToken=c07d481e9758c731">
30-
<HintPath>..\packages\nanoFramework.CoreLibrary.1.10.5\lib\mscorlib.dll</HintPath>
29+
<Reference Include="mscorlib, Version=1.11.7.2, Culture=neutral, PublicKeyToken=c07d481e9758c731">
30+
<HintPath>..\packages\nanoFramework.CoreLibrary.1.11.7\lib\mscorlib.dll</HintPath>
3131
<Private>True</Private>
32+
<SpecificVersion>True</SpecificVersion>
3233
</Reference>
33-
<Reference Include="nanoFramework.NetworkHelper, Version=1.3.3.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
34-
<HintPath>..\packages\nanoFramework.NetWorkHelper.1.3.3\lib\nanoFramework.NetworkHelper.dll</HintPath>
34+
<Reference Include="nanoFramework.ResourceManager, Version=1.1.3.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
35+
<HintPath>..\packages\nanoFramework.ResourceManager.1.1.3\lib\nanoFramework.ResourceManager.dll</HintPath>
3536
<Private>True</Private>
37+
<SpecificVersion>True</SpecificVersion>
3638
</Reference>
37-
<Reference Include="nanoFramework.ResourceManager, Version=1.1.2.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
38-
<HintPath>..\packages\nanoFramework.ResourceManager.1.1.2\lib\nanoFramework.ResourceManager.dll</HintPath>
39+
<Reference Include="nanoFramework.Runtime.Events, Version=1.10.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
40+
<HintPath>..\packages\nanoFramework.Runtime.Events.1.10.0-preview.1\lib\nanoFramework.Runtime.Events.dll</HintPath>
3941
<Private>True</Private>
42+
<SpecificVersion>True</SpecificVersion>
4043
</Reference>
41-
<Reference Include="nanoFramework.Runtime.Events, Version=1.9.1.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
42-
<HintPath>..\packages\nanoFramework.Runtime.Events.1.9.1\lib\nanoFramework.Runtime.Events.dll</HintPath>
44+
<Reference Include="nanoFramework.Runtime.Native, Version=1.5.2.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
45+
<HintPath>..\packages\nanoFramework.Runtime.Native.1.5.2\lib\nanoFramework.Runtime.Native.dll</HintPath>
4346
<Private>True</Private>
47+
<SpecificVersion>True</SpecificVersion>
4448
</Reference>
45-
<Reference Include="nanoFramework.Runtime.Native, Version=1.5.1.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
46-
<HintPath>..\packages\nanoFramework.Runtime.Native.1.5.1\lib\nanoFramework.Runtime.Native.dll</HintPath>
49+
<Reference Include="nanoFramework.System.Collections, Version=1.3.0.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
50+
<HintPath>..\packages\nanoFramework.System.Collections.1.3.0\lib\nanoFramework.System.Collections.dll</HintPath>
4751
<Private>True</Private>
52+
<SpecificVersion>True</SpecificVersion>
4853
</Reference>
49-
<Reference Include="nanoFramework.System.Collections, Version=1.2.0.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
50-
<HintPath>..\packages\nanoFramework.System.Collections.1.2.0\lib\nanoFramework.System.Collections.dll</HintPath>
54+
<Reference Include="nanoFramework.System.Text, Version=1.1.3.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
55+
<HintPath>..\packages\nanoFramework.System.Text.1.1.3-preview.4\lib\nanoFramework.System.Text.dll</HintPath>
5156
<Private>True</Private>
57+
<SpecificVersion>True</SpecificVersion>
5258
</Reference>
53-
<Reference Include="nanoFramework.System.Text, Version=1.1.1.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
54-
<HintPath>..\packages\nanoFramework.System.Text.1.1.1\lib\nanoFramework.System.Text.dll</HintPath>
59+
<Reference Include="System.Device.WiFi, Version=1.4.0-preview.1.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
60+
<HintPath>..\packages\nanoFramework.System.Device.WiFi.1.4.0-preview.1\lib\System.Device.WiFi.dll</HintPath>
5561
<Private>True</Private>
5662
</Reference>
57-
<Reference Include="System.Math, Version=1.4.1.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
58-
<HintPath>..\packages\nanoFramework.System.Math.1.4.1\lib\System.Math.dll</HintPath>
63+
<Reference Include="System.Math, Version=1.4.3.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
64+
<HintPath>..\packages\nanoFramework.System.Math.1.4.3\lib\System.Math.dll</HintPath>
5965
<Private>True</Private>
66+
<SpecificVersion>True</SpecificVersion>
6067
</Reference>
61-
<Reference Include="System.Net, Version=1.7.0.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
62-
<HintPath>..\packages\nanoFramework.System.Net.1.7.0\lib\System.Net.dll</HintPath>
68+
<Reference Include="System.Net, Version=1.8.0.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
69+
<HintPath>..\packages\nanoFramework.System.Net.1.8.0-preview.3\lib\System.Net.dll</HintPath>
6370
<Private>True</Private>
71+
<SpecificVersion>True</SpecificVersion>
6472
</Reference>
65-
<Reference Include="System.Threading, Version=1.0.2.2, Culture=neutral, PublicKeyToken=c07d481e9758c731">
66-
<HintPath>..\packages\nanoFramework.System.Threading.1.0.2\lib\System.Threading.dll</HintPath>
73+
<Reference Include="System.Threading, Version=1.0.3.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
74+
<HintPath>..\packages\nanoFramework.System.Threading.1.0.3\lib\System.Threading.dll</HintPath>
6775
<Private>True</Private>
76+
<SpecificVersion>True</SpecificVersion>
6877
</Reference>
69-
<Reference Include="Windows.Devices.Gpio, Version=1.5.2.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
70-
<HintPath>..\packages\nanoFramework.Windows.Devices.Gpio.1.5.2\lib\Windows.Devices.Gpio.dll</HintPath>
71-
<Private>True</Private>
72-
</Reference>
73-
<Reference Include="Windows.Devices.Wifi, Version=1.3.3.3, Culture=neutral, PublicKeyToken=c07d481e9758c731">
74-
<HintPath>..\packages\nanoFramework.Windows.Devices.Wifi.1.3.3\lib\Windows.Devices.Wifi.dll</HintPath>
78+
<Reference Include="Windows.Devices.Gpio, Version=1.5.4.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
79+
<HintPath>..\packages\nanoFramework.Windows.Devices.Gpio.1.5.4-preview.3\lib\Windows.Devices.Gpio.dll</HintPath>
7580
<Private>True</Private>
81+
<SpecificVersion>True</SpecificVersion>
7682
</Reference>
7783
</ItemGroup>
7884
<ItemGroup>

Diff for: ‎samples/AMQP/Azure-ServiceBus-Sender/Program.cs

+15-6
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
using AmqpTrace = Amqp.Trace;
1515

1616
#if HAS_WIFI
17-
using Windows.Devices.WiFi;
17+
using System.Device.WiFi;
1818
#endif
1919

2020
namespace AmqpSamples.AzureSB.Sender
@@ -44,17 +44,26 @@ public static void Main()
4444
bool success;
4545
CancellationTokenSource cs = new(60000);
4646
#if HAS_WIFI
47-
success = NetworkHelper.ConnectWifiDhcp(MySsid, MyPassword, setDateTime: true, token: cs.Token);
47+
success = WiFiNetworkHelper.ConnectDhcp(MySsid, MyPassword, requiresDateTime: true, token: cs.Token);
4848
#else
49-
success = NetworkHelper.WaitForValidIPAndDate(true, System.Net.NetworkInformation.NetworkInterfaceType.Ethernet, cs.Token);
49+
success = NetworkHelper.SetupAndConnectNetwork(cs.Token, true);
5050
#endif
5151
if (!success)
5252
{
53-
Debug.WriteLine($"Can't get a proper IP address and DateTime, error: {NetworkHelper.ConnectionError.Error}.");
54-
if (NetworkHelper.ConnectionError.Exception != null)
53+
#if HAS_WIFI
54+
Debug.WriteLine($"Can't get a proper IP address and DateTime, error: {WiFiNetworkHelper.Status}.");
55+
if (WiFiNetworkHelper.HelperException != null)
56+
{
57+
Debug.WriteLine($"Exception: {WiFiNetworkHelper.HelperException}");
58+
}
59+
#else
60+
Debug.WriteLine($"Can't get a proper IP address and DateTime, error: {NetworkHelper.Status}.");
61+
if (NetworkHelper.HelperException != null)
5562
{
56-
Debug.WriteLine($"Exception: {NetworkHelper.ConnectionError.Exception}");
63+
Debug.WriteLine($"Exception: {NetworkHelper.HelperException}");
5764
}
65+
#endif
66+
5867
return;
5968
}
6069

0 commit comments

Comments
 (0)