Patch LTS to fix Dotnetty threading and DeviceClient NRE exception is…

…sue. (#2287) * Adding Common 0.7.1 (#2272) * fix(DeviceClient): Avoid NRE after client dispose (#2286) * Exclude low pri .net targets in PR builds (#2277) * Update package versions Co-authored-by: jamdavi <[email protected]> Co-authored-by: David R. Williamson <[email protected]>
Azure · Jan 18, 2022 · 4515e44 · 4515e44
1 parent e4d52d0
commit 4515e44
Show file tree

Hide file tree

Showing 11 changed files with 317 additions and 108 deletions.
diff --git a/e2e/test/iothub/service/IoTHubCertificateValidationE2ETest.cs b/e2e/test/iothub/service/IoTHubCertificateValidationE2ETest.cs
@@ -13,6 +13,7 @@ namespace Microsoft.Azure.Devices.E2ETests.Iothub.Service
 {
     [TestClass]
     [TestCategory("InvalidServiceCertificate")]
+    [Ignore("TODO: Enable when invalid cert server is back online.")]
     public class IoTHubCertificateValidationE2ETest : E2EMsTestBase
     {
         [LoggedTestMethod]

diff --git a/e2e/test/provisioning/ProvisioningCertificateValidationE2ETest.cs b/e2e/test/provisioning/ProvisioningCertificateValidationE2ETest.cs
@@ -13,6 +13,7 @@ namespace Microsoft.Azure.Devices.E2ETests.Provisioning
 {
     [TestClass]
     [TestCategory("InvalidServiceCertificate")]
+    [Ignore("TODO: Enable when invalid cert server is back online.")]
     public class ProvisioningCertificateValidationE2ETest : E2EMsTestBase
     {
         [LoggedTestMethod]

diff --git a/iothub/device/src/DeviceClient.cs b/iothub/device/src/DeviceClient.cs
@@ -625,7 +625,6 @@ protected virtual void Dispose(bool disposing)
             if (disposing)
             {
                 InternalClient?.Dispose();
-                InternalClient = null;
             }
         }
 

diff --git a/iothub/device/src/InternalClient.cs b/iothub/device/src/InternalClient.cs
@@ -1888,7 +1888,6 @@ internal void ValidateModuleTransportHandler(string apiName)
         public void Dispose()
         {
             InnerHandler?.Dispose();
-            InnerHandler = null;
             _methodsDictionarySemaphore?.Dispose();
             _moduleReceiveMessageSemaphore?.Dispose();
             _fileUploadHttpTransportHandler?.Dispose();

diff --git a/iothub/device/src/Microsoft.Azure.Devices.Client.csproj b/iothub/device/src/Microsoft.Azure.Devices.Client.csproj
@@ -25,7 +25,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Version>1.36.3</Version>
+    <Version>1.36.4</Version>
     <Title>Microsoft Azure IoT Device Client SDK</Title>
     <IncludeSource>True</IncludeSource>
     <IncludeSymbols>True</IncludeSymbols>
@@ -69,6 +69,8 @@
     <Compile Include="ModernDotNet\HsmAuthentication\Transport\HttpRequestResponseSerializer.cs" />
     <Compile Include="ModernDotNet\HsmAuthentication\Transport\UnixDomainSocketEndPoint.cs" />
     <PackageReference Include="DotNetty.Codecs.Mqtt" Version="0.7.0" />
+    <!-- We will need to keep this reference to DotNetty.Common until the next release of DotNetty includes this dependency -->
+    <PackageReference Include="DotNetty.Common" Version="0.7.1" />
     <PackageReference Include="DotNetty.Handlers" Version="0.7.0" />
   </ItemGroup>
 

diff --git a/iothub/device/tests/Microsoft.Azure.Devices.Client.Tests.csproj b/iothub/device/tests/Microsoft.Azure.Devices.Client.Tests.csproj
@@ -14,20 +14,19 @@
     <DefaultItemExcludes>HsmAuthentication/**;$(DefaultItemExcludes)</DefaultItemExcludes>
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' != 'net451' ">
-    <Compile Include="HsmAuthentication\**" />
-    <PackageReference Include="DotNetty.Codecs.Mqtt" Version="0.7.0" />
-    <PackageReference Include="DotNetty.Handlers" Version="0.7.0" />
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
+    <PackageReference Include="DotNetty.Codecs.Mqtt" Version="0.6.0" />
+    <PackageReference Include="DotNetty.Handlers" Version="0.6.0" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' != 'net451' ">
+    <Compile Include="HsmAuthentication\**" />
     <Compile Remove="ClientWebSocketTransportTests.cs" />
     <Compile Remove="Mqtt\ClientWebSocketChannelTests.cs" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <PackageReference Include="DotNetty.Codecs.Mqtt" Version="0.6.0" />
-    <PackageReference Include="DotNetty.Handlers" Version="0.6.0" />
+    <PackageReference Include="DotNetty.Codecs.Mqtt" Version="0.7.0" />
+    <!-- We will need to keep this reference to DotNetty.Common until the next release of DotNetty includes this dependency -->
+    <PackageReference Include="DotNetty.Common" Version="0.7.1" />
+    <PackageReference Include="DotNetty.Handlers" Version="0.7.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/provisioning/service/src/Query.cs b/provisioning/service/src/Query.cs
@@ -20,8 +20,15 @@ namespace Microsoft.Azure.Devices.Provisioning.Service
     /// <remarks>
     /// The <see cref="Query"/> iterator is the result of the query factory for
     /// <list type="bullet">
-    ///     <item><b>IndividualEnrollment:</b>
-    ///         <see cref="ProvisioningServiceClient.CreateIndividualEnrollmentQuery(QuerySpecification, int)"/>
+    ///     <item>
+    ///         <description>
+    ///         <see cref="ProvisioningServiceClient.CreateIndividualEnrollmentQuery(QuerySpecification, int)">IndividualEnrollment</see>
+    ///     </description>
+    ///     </item>
+    ///     <item>
+    ///         <description>
+    ///         <see cref="ProvisioningServiceClient.CreateEnrollmentGroupQuery(QuerySpecification, int)">EnrollmentGroup</see>
+    ///         </description>
     ///     </item>
     ///     <item><b>EnrollmentGroup:</b>
     ///         <see cref="ProvisioningServiceClient.CreateEnrollmentGroupQuery(QuerySpecification, int)"/>

diff --git a/provisioning/transport/mqtt/src/Microsoft.Azure.Devices.Provisioning.Transport.Mqtt.csproj b/provisioning/transport/mqtt/src/Microsoft.Azure.Devices.Provisioning.Transport.Mqtt.csproj
@@ -20,7 +20,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Version>1.14.1</Version>
+    <Version>1.14.2</Version>
     <Title>Microsoft Azure IoT Provisioning Device Client MQTT Transport</Title>
     <IncludeSource>True</IncludeSource>
     <IncludeSymbols>True</IncludeSymbols>
@@ -98,6 +98,8 @@
 
   <ItemGroup>
     <PackageReference Include="DotNetty.Codecs.Mqtt" Version="0.7.0" />
+    <!-- We will need to keep this reference to DotNetty.Common until the next release of DotNetty includes this dependency -->
+    <PackageReference Include="DotNetty.Common" Version="0.7.1" />
     <PackageReference Include="DotNetty.Handlers" Version="0.7.0" />
 
     <!-- FXCop -->
-Original file line number
+Diff line change
@@ Expand Up / @@ -625,7 +625,6 @@ protected virtual void Dispose(bool disposing) @@
                 if (disposing)
                 {
                     InternalClient?.Dispose();
-                    InternalClient = null;
                 }
             }
@@ Expand Down @@