Improving twin property reporting (#18)

Author: Ellerbach

Azure.Devices.DeviceClient/Azure.Devices.DeviceClient.nfproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="Globals">
-    <NanoFrameworkProjectSystemPath>$(MSBuildToolsPath)..\..\..\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
+    <NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
   </PropertyGroup>
   <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')" />
   <PropertyGroup>
@@ -59,9 +59,8 @@
       <Private>True</Private>
       <SpecificVersion>True</SpecificVersion>
     </Reference>
-    <Reference Include="nanoFramework.Json, Version=2.1.0.2, Culture=neutral, PublicKeyToken=c07d481e9758c731">
-      <HintPath>..\packages\nanoFramework.Json.2.1.0\lib\nanoFramework.Json.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="nanoFramework.Json">
+      <HintPath>..\packages\nanoFramework.Json.2.1.1-preview.6\lib\nanoFramework.Json.dll</HintPath>
     </Reference>
     <Reference Include="nanoFramework.M2Mqtt, Version=5.0.2.0, Culture=neutral, PublicKeyToken=c07d481e9758c731">
       <HintPath>..\packages\nanoFramework.M2Mqtt.5.0.2-preview.18\lib\nanoFramework.M2Mqtt.dll</HintPath>
@@ -113,4 +112,4 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.4.220\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.4.220\build\Nerdbank.GitVersioning.targets'))" />
   </Target>
-</Project>
+</Project>

Azure.Devices.DeviceClient/DeviceClient.cs

@@ -247,24 +247,22 @@ public bool UpdateReportedProperties(TwinCollection reported, CancellationToken
             string twin = reported.ToJson();
             Debug.WriteLine($"update twin: {twin}");
             var rid = _mqttc.Publish($"{TwinReportedPropertiesTopic}?$rid={Guid.NewGuid()}", Encoding.UTF8.GetBytes(twin), MqttQoSLevel.AtLeastOnce, false);
+            ConfirmationStatus conf = new(rid);
             _ioTHubStatus.Status = Status.TwinUpdated;
             _ioTHubStatus.Message = string.Empty;
             StatusUpdated?.Invoke(this, new StatusUpdatedEventArgs(_ioTHubStatus));
 
             if (cancellationToken.CanBeCanceled)
-            {
-                ConfirmationStatus conf = new(rid);
+            {                
                 _waitForConfirmation.Add(conf);
                 while (!conf.Received && !cancellationToken.IsCancellationRequested)
                 {
                     cancellationToken.WaitHandle.WaitOne(200, true);
                 }
-
-                _waitForConfirmation.Remove(conf);
-                return conf.Received;
             }
 
-            return false;
+            _waitForConfirmation.Remove(conf);
+            return conf.Received;
         }
 
         /// <summary>

Azure.Devices.DeviceClient/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="nanoFramework.CoreLibrary" version="1.10.5" targetFramework="netnanoframework10" />
-  <package id="nanoFramework.Json" version="2.1.0" targetFramework="netnanoframework10" />
+  <package id="nanoFramework.Json" version="2.1.1-preview.6" targetFramework="netnanoframework10" />
   <package id="nanoFramework.M2Mqtt" version="5.0.2-preview.18" targetFramework="netnanoframework10" />
   <package id="nanoFramework.Runtime.Events" version="1.9.2-preview.8" targetFramework="netnanoframework10" />
   <package id="nanoFramework.Runtime.Native" version="1.5.1" targetFramework="netnanoframework10" />

nanoFramework.Azure.Devices.Client.nuspec

@@ -21,7 +21,7 @@ This is an SDK for Azure IoT Hub using MQTT broker.</description>
     <tags>nanoFramework C# csharp netmf netnf Microsoft.Azure.Devices nanoFramework.Azure.Devices</tags>
     <dependencies>
       <dependency id="nanoFramework.CoreLibrary" version="1.10.5" />
-      <dependency id="nanoFramework.Json" version="2.1.0" />
+      <dependency id="nanoFramework.Json" version="2.1.1-preview.6" />
       <dependency id="nanoFramework.M2Mqtt" version="5.0.2-preview.18" />
       <dependency id="nanoFramework.Runtime.Events" version="1.9.2-preview.8" />
       <dependency id="nanoFramework.Runtime.Native" version="1.5.1" />