Fix Netstandard2.0 regression on UWP/Xamarin, upgrading the AMQP library dependency (#990)

CIPop · abhipsaMisra · commit ec9f2365d7b2 · 2019-06-28T16:59:12.000-07:00
* Updating AMQP to latest, fixing wrong ifdef pragma, updating build badges.

* Better RID for perf/stress tests.

* Switching to the new DevOps UX links.

* Incrementing versions for NuGets
diff --git a/e2e/stress/IoTClientPerf/Program.cs b/e2e/stress/IoTClientPerf/Program.cs
@@ -120,7 +120,7 @@ public static int Main(string[] args)
             int n = 1;
             string a = "sas";
             int c = -1;
-            string i = Guid.NewGuid().ToString();
+            string i = null;
             string f = null;
 
             while (param_counter + 1 < args.Length)
@@ -185,6 +185,11 @@ public static int Main(string[] args)
                 return -1;
             }
 
+            if (i == null)
+            {
+                i = $"{DateTime.UtcNow.ToString("yyyy-MM-ddTHH:mm:ss.ffZ")}_dotNet_{f}";
+            }
+
             Tuple<string, Func<PerfScenarioConfig, PerfScenario>> scenario;
             Func<PerfScenarioConfig, PerfScenario> scenarioFactory;
             if (!s_scenarios.TryGetValue(f, out scenario))
diff --git a/iothub/device/src/Microsoft.Azure.Devices.Client.csproj b/iothub/device/src/Microsoft.Azure.Devices.Client.csproj
@@ -22,7 +22,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Version>1.20.2</Version>
+    <Version>1.20.3</Version>
     <Title>Microsoft Azure IoT Device Client SDK</Title>
     <Authors>Microsoft</Authors>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
@@ -41,7 +41,7 @@
   <ItemGroup>
     <PackageReference Include="DotNetty.Codecs.Mqtt" Version="0.6.0" />
     <PackageReference Include="DotNetty.Handlers" Version="0.6.0" />
-    <PackageReference Include="Microsoft.Azure.Amqp" Version="2.4.1" />
+    <PackageReference Include="Microsoft.Azure.Amqp" Version="2.4.2" />
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
     <PackageReference Include="WindowsAzure.Storage" Version="9.3.2" />
   </ItemGroup>
diff --git a/iothub/device/src/Transport/Amqp/AmqpConnector.cs b/iothub/device/src/Transport/Amqp/AmqpConnector.cs
@@ -318,7 +318,7 @@ private void OnWriteHeaderComplete(TransportAsyncCallbackArgs args)
         #region Authentication
         protected static bool InitializeDisableServerCertificateValidation()
         {
-#if NETSTANDARD1_3 // No System.Configuration.ConfigurationManager in NetStandard1.3
+#if !NET451
             bool flag;
             if (!AppContext.TryGetSwitch("DisableServerCertificateValidationKeyName", out flag))
             {
diff --git a/iothub/device/tests/Microsoft.Azure.Devices.Client.Test.csproj b/iothub/device/tests/Microsoft.Azure.Devices.Client.Test.csproj
@@ -20,7 +20,7 @@
     <PackageReference Include="Moq" Version="4.10.1" />
     <PackageReference Include="DotNetty.Codecs.Mqtt" Version="0.6.0" />
     <PackageReference Include="DotNetty.Handlers" Version="0.6.0" />
-    <PackageReference Include="Microsoft.Azure.Amqp" Version="2.4.1" />
+    <PackageReference Include="Microsoft.Azure.Amqp" Version="2.4.2" />
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
   </ItemGroup>
 
diff --git a/iothub/service/src/Microsoft.Azure.Devices.csproj b/iothub/service/src/Microsoft.Azure.Devices.csproj
@@ -22,7 +22,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Version>1.18.0</Version>
+    <Version>1.18.1</Version>
     <Title>Microsoft Azure IoT Service Client SDK</Title>
     <Authors>Microsoft</Authors>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
@@ -106,7 +106,7 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
-    <PackageReference Include="Microsoft.Azure.Amqp" Version="2.4.1" />
+    <PackageReference Include="Microsoft.Azure.Amqp" Version="2.4.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/iothub/service/tests/Microsoft.Azure.Devices.Test.csproj b/iothub/service/tests/Microsoft.Azure.Devices.Test.csproj
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Amqp" Version="2.4.1" />
+    <PackageReference Include="Microsoft.Azure.Amqp" Version="2.4.2" />
     <PackageReference Include="Moq" Version="4.8.2" />
   </ItemGroup>
 
diff --git a/provisioning/transport/amqp/src/Microsoft.Azure.Devices.Provisioning.Transport.Amqp.csproj b/provisioning/transport/amqp/src/Microsoft.Azure.Devices.Provisioning.Transport.Amqp.csproj
@@ -19,7 +19,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Version>1.1.8</Version>
+    <Version>1.1.9</Version>
     <Title>Microsoft Azure IoT Provisioning Device Client AMQP Transport</Title>
     <Authors>Microsoft</Authors>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
@@ -82,7 +82,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Amqp" Version="2.4.1" />
+    <PackageReference Include="Microsoft.Azure.Amqp" Version="2.4.2" />
     <PackageReference Condition=" '$(Configuration)' == 'Debug' " Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.1" />
   </ItemGroup>
 </Project>
diff --git a/readme.md b/readme.md
@@ -31,9 +31,8 @@ Due to security considerations, build logs are not publicly available.
 
 | Service Environment      | Status |
 | ---                      | ---    |
-| WestUS                   | [![Build Status](https://azure-iot-sdks.visualstudio.com/azure-iot-sdks/_apis/build/status/csharp/csharp-westus1?branchName=master)](https://azure-iot-sdks.visualstudio.com/azure-iot-sdks/_build/latest?definitionId=44)|
-| Canary                   | [![Build Status](https://azure-iot-sdks.visualstudio.com/azure-iot-sdks/_apis/build/status/csharp/csharp-canary1?branchName=master)](https://azure-iot-sdks.visualstudio.com/azure-iot-sdks/_build/latest?definitionId=43)|
-| Dogfood                  | [![Build Status](https://azure-iot-sdks.visualstudio.com/azure-iot-sdks/_apis/build/status/csharp/csharp-df1?branchName=master)](https://azure-iot-sdks.visualstudio.com/azure-iot-sdks/_build/latest?definitionId=36)|
+| Master                   | [![Build Status](https://azure-iot-sdks.visualstudio.com/azure-iot-sdks/_apis/build/status/csharp/csharp-westus1?branchName=master)](https://azure-iot-sdks.visualstudio.com/azure-iot-sdks/_build?definitionId=44&_a=summary&repositoryFilter=9&branchFilter=23)|
+| Preview                   | [![Build Status](https://azure-iot-sdks.visualstudio.com/azure-iot-sdks/_apis/build/status/csharp/csharp-canary1?branchName=preview)](https://azure-iot-sdks.visualstudio.com/azure-iot-sdks/_build?definitionId=43&_a=summary&repositoryFilter=9&branchFilter=72)|
 
 ## OS platforms and hardware compatibility
 The IoT Hub device SDK for .NET can be used with a broad range of OS platforms and devices.
diff --git a/versions.csv b/versions.csv
@@ -1,9 +1,9 @@
 AssemblyPath, Version
-iothub\device\src\Microsoft.Azure.Devices.Client.csproj, 1.20.2
-iothub\service\src\Microsoft.Azure.Devices.csproj, 1.18.0
+iothub\device\src\Microsoft.Azure.Devices.Client.csproj, 1.20.3
+iothub\service\src\Microsoft.Azure.Devices.csproj, 1.18.1
 shared\src\Microsoft.Azure.Devices.Shared.csproj, 1.16.0
 provisioning\device\src\Microsoft.Azure.Devices.Provisioning.Client.csproj, 1.4.0
-provisioning\transport\amqp\src\Microsoft.Azure.Devices.Provisioning.Transport.Amqp.csproj, 1.1.8
+provisioning\transport\amqp\src\Microsoft.Azure.Devices.Provisioning.Transport.Amqp.csproj, 1.1.9
 provisioning\transport\http\src\Microsoft.Azure.Devices.Provisioning.Transport.Http.csproj, 1.1.6
 provisioning\transport\mqtt\src\Microsoft.Azure.Devices.Provisioning.Transport.Mqtt.csproj, 1.1.8
 security\tpm\src\Microsoft.Azure.Devices.Provisioning.Security.Tpm.csproj, 1.1.6

Original file line number	Diff line number	Diff line change
`@@ -318,7 +318,7 @@ private void OnWriteHeaderComplete(TransportAsyncCallbackArgs args)`
`318`	`318`	`#region Authentication`
`319`	`319`	`protected static bool InitializeDisableServerCertificateValidation()`
`320`	`320`	`{`
`321`		`-#if NETSTANDARD1_3 // No System.Configuration.ConfigurationManager in NetStandard1.3`
	`321`	`+#if !NET451`
`322`	`322`	`bool flag;`
`323`	`323`	`if (!AppContext.TryGetSwitch("DisableServerCertificateValidationKeyName", out flag))`
`324`	`324`	`{`