Merge pull request #171 from Azure-Samples/azabbasi/fixQuickStart - Fix QuickStart samples build

azabbasi · web-flow · commit 39c99b24402b · 2020-12-09T19:18:33.000Z
diff --git a/iot-hub/Quickstarts/device-streams-proxy/device/DeviceLocalProxyStreamingSample.csproj b/iot-hub/Quickstarts/device-streams-proxy/device/DeviceLocalProxyStreamingSample.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-	<PackageReference Include="Microsoft.Azure.Devices.Client" Version="1.29.0-preview-*" />
+    <PackageReference Include="Microsoft.Azure.Devices.Client" Version="1.32.0-preview-001" />
   </ItemGroup>
-  
+
 </Project>
diff --git a/iot-hub/Quickstarts/device-streams-proxy/device/DeviceStreamSample.cs b/iot-hub/Quickstarts/device-streams-proxy/device/DeviceStreamSample.cs
@@ -14,11 +14,11 @@ namespace Microsoft.Azure.Devices.Client.Samples
 {
     public class DeviceStreamSample
     {
-        private DeviceClient _deviceClient;
-        private String _host;
-        private int _port;
+        private readonly DeviceClient _deviceClient;
+        private readonly string _host;
+        private readonly int _port;
 
-        public DeviceStreamSample(DeviceClient deviceClient, String host, int port)
+        public DeviceStreamSample(DeviceClient deviceClient, string host, int port)
         {
             _deviceClient = deviceClient;
             _host = host;
@@ -44,7 +44,7 @@ private static async Task HandleOutgoingDataAsync(NetworkStream localStream, Cli
             while (localStream.CanRead)
             {
                 int receiveCount = await localStream.ReadAsync(buffer, 0, buffer.Length).ConfigureAwait(false);
-                    
+
                 await remoteStream.SendAsync(new ArraySegment<byte>(buffer, 0, receiveCount), WebSocketMessageType.Binary, true, cancellationToken).ConfigureAwait(false);
             }
         }
@@ -75,7 +75,7 @@ public async Task RunSampleAsync(bool acceptDeviceStreamingRequest, Cancellation
                 {
                     await _deviceClient.AcceptDeviceStreamRequestAsync(streamRequest, cancellationTokenSource.Token).ConfigureAwait(false);
 
-                    using (ClientWebSocket webSocket = await DeviceStreamingCommon.GetStreamingClientAsync(streamRequest.Url, streamRequest.AuthorizationToken, cancellationTokenSource.Token).ConfigureAwait(false))
+                    using (ClientWebSocket webSocket = await DeviceStreamingCommon.GetStreamingClientAsync(streamRequest.Uri, streamRequest.AuthorizationToken, cancellationTokenSource.Token).ConfigureAwait(false))
                     {
                         using (TcpClient tcpClient = new TcpClient())
                         {
@@ -93,7 +93,7 @@ await Task.WhenAny(
                             }
                         }
 
-                        await webSocket.CloseAsync(WebSocketCloseStatus.NormalClosure, String.Empty, cancellationTokenSource.Token).ConfigureAwait(false);
+                        await webSocket.CloseAsync(WebSocketCloseStatus.NormalClosure, string.Empty, cancellationTokenSource.Token).ConfigureAwait(false);
                     }
                 }
                 else
diff --git a/iot-hub/Quickstarts/device-streams-proxy/device/Program.cs b/iot-hub/Quickstarts/device-streams-proxy/device/Program.cs
@@ -9,7 +9,7 @@ namespace Microsoft.Azure.Devices.Client.Samples
 {
     public static class Program
     {
-        // String containing Hostname, Device Id & Device Key in one of the following formats:
+        // String containing Host Name, Device Id & Device Key in one of the following formats:
         //  "HostName=<iothub_host_name>;DeviceId=<device_id>;SharedAccessKey=<device_key>"
         //  "HostName=<iothub_host_name>;CredentialType=SharedAccessSignature;DeviceId=<device_id>;SharedAccessSignature=SharedAccessSignature sr=<iot_host>/devices/<device_id>&sig=<token>&se=<expiry_time>";
 
@@ -32,10 +32,10 @@ public static class Program
         private static string s_port = Environment.GetEnvironmentVariable("REMOTE_PORT");
 
         // Select one of the following transports used by DeviceClient to connect to IoT Hub.
-        private static TransportType s_transportType = TransportType.Amqp;
-        //private static TransportType s_transportType = TransportType.Mqtt;
-        //private static TransportType s_transportType = TransportType.Amqp_WebSocket_Only;
-        //private static TransportType s_transportType = TransportType.Mqtt_WebSocket_Only;
+        private static readonly TransportType s_transportType = TransportType.Amqp;
+        //private static readonly TransportType s_transportType = TransportType.Mqtt;
+        //private static readonly TransportType s_transportType = TransportType.Amqp_WebSocket_Only;
+        //private static readonly TransportType s_transportType = TransportType.Mqtt_WebSocket_Only;
 
         public static int Main(string[] args)
         {
diff --git a/iot-hub/Quickstarts/device-streams-proxy/service/DeviceStreamSample.cs b/iot-hub/Quickstarts/device-streams-proxy/service/DeviceStreamSample.cs
@@ -14,11 +14,11 @@ namespace Microsoft.Azure.Devices.Samples
 {
     public class DeviceStreamSample
     {
-        private ServiceClient _serviceClient;
-        private String _deviceId;
-        private int _localPort;
+        private readonly ServiceClient _serviceClient;
+        private readonly string _deviceId;
+        private readonly int _localPort;
 
-        public DeviceStreamSample(ServiceClient deviceClient, String deviceId, int localPort)
+        public DeviceStreamSample(ServiceClient deviceClient, string deviceId, int localPort)
         {
             _serviceClient = deviceClient;
             _deviceId = deviceId;
@@ -66,7 +66,7 @@ private static async void HandleIncomingConnectionsAndCreateStreams(string devic
                     try
                     {
                         using (var cancellationTokenSource = new CancellationTokenSource())
-                        using (var remoteStream = await DeviceStreamingCommon.GetStreamingClientAsync(result.Url, result.AuthorizationToken, cancellationTokenSource.Token).ConfigureAwait(false))
+                        using (var remoteStream = await DeviceStreamingCommon.GetStreamingClientAsync(result.Uri, result.AuthorizationToken, cancellationTokenSource.Token).ConfigureAwait(false))
                         {
                             Console.WriteLine("Starting streaming");
 
@@ -75,7 +75,7 @@ await Task.WhenAny(
                                 HandleOutgoingDataAsync(localStream, remoteStream, cancellationTokenSource.Token)).ConfigureAwait(false);
                         }
 
-                            Console.WriteLine("Done streaming");
+                        Console.WriteLine("Done streaming");
                     }
                     catch (Exception ex)
                     {
diff --git a/iot-hub/Quickstarts/device-streams-proxy/service/Program.cs b/iot-hub/Quickstarts/device-streams-proxy/service/Program.cs
@@ -29,8 +29,8 @@ public static class Program
         private static string s_port = Environment.GetEnvironmentVariable("LOCAL_PORT");
 
         // Select one of the following transports used by ServiceClient to connect to IoT Hub.
-        private static TransportType s_transportType = TransportType.Amqp;
-        //private static TransportType s_transportType = TransportType.Amqp_WebSocket_Only;
+        private static readonly TransportType s_transportType = TransportType.Amqp;
+        //private static readonly TransportType s_transportType = TransportType.Amqp_WebSocket_Only;
 
         public static int Main(string[] args)
         {
diff --git a/iot-hub/Quickstarts/device-streams-proxy/service/ServiceLocalProxyStreamingSample.csproj b/iot-hub/Quickstarts/device-streams-proxy/service/ServiceLocalProxyStreamingSample.csproj
@@ -10,9 +10,9 @@
   </ItemGroup>
 
   <ItemGroup>
-  	<PackageReference Include="Microsoft.Azure.Devices" Version="1.27.0-preview-*" />
+    <PackageReference Include="Microsoft.Azure.Devices" Version="1.28.0-preview-001" />
   </ItemGroup>
-  
+
   <ItemGroup>
     <PackageReference Include="System.Net.WebSockets.Client" Version="4.3.2" />
   </ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -14,11 +14,11 @@ namespace Microsoft.Azure.Devices.Client.Samples`
`14`	`14`	`{`
`15`	`15`	`public class DeviceStreamSample`
`16`	`16`	`{`
`17`		`- private DeviceClient _deviceClient;`
`18`		`- private String _host;`
`19`		`- private int _port;`
	`17`	`+ private readonly DeviceClient _deviceClient;`
	`18`	`+ private readonly string _host;`
	`19`	`+ private readonly int _port;`
`20`	`20`
`21`		`- public DeviceStreamSample(DeviceClient deviceClient, String host, int port)`
	`21`	`+ public DeviceStreamSample(DeviceClient deviceClient, string host, int port)`
`22`	`22`	`{`
`23`	`23`	`_deviceClient = deviceClient;`
`24`	`24`	`_host = host;`
`@@ -44,7 +44,7 @@ private static async Task HandleOutgoingDataAsync(NetworkStream localStream, Cli`
`44`	`44`	`while (localStream.CanRead)`
`45`	`45`	`{`
`46`	`46`	`int receiveCount = await localStream.ReadAsync(buffer, 0, buffer.Length).ConfigureAwait(false);`
`47`		`-`
	`47`	`+`
`48`	`48`	`await remoteStream.SendAsync(new ArraySegment<byte>(buffer, 0, receiveCount), WebSocketMessageType.Binary, true, cancellationToken).ConfigureAwait(false);`
`49`	`49`	`}`
`50`	`50`	`}`
`@@ -75,7 +75,7 @@ public async Task RunSampleAsync(bool acceptDeviceStreamingRequest, Cancellation`
`75`	`75`	`{`
`76`	`76`	`await _deviceClient.AcceptDeviceStreamRequestAsync(streamRequest, cancellationTokenSource.Token).ConfigureAwait(false);`
`77`	`77`
`78`		`- using (ClientWebSocket webSocket = await DeviceStreamingCommon.GetStreamingClientAsync(streamRequest.Url, streamRequest.AuthorizationToken, cancellationTokenSource.Token).ConfigureAwait(false))`
	`78`	`+ using (ClientWebSocket webSocket = await DeviceStreamingCommon.GetStreamingClientAsync(streamRequest.Uri, streamRequest.AuthorizationToken, cancellationTokenSource.Token).ConfigureAwait(false))`
`79`	`79`	`{`
`80`	`80`	`using (TcpClient tcpClient = new TcpClient())`
`81`	`81`	`{`
`@@ -93,7 +93,7 @@ await Task.WhenAny(`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`
`96`		`- await webSocket.CloseAsync(WebSocketCloseStatus.NormalClosure, String.Empty, cancellationTokenSource.Token).ConfigureAwait(false);`
	`96`	`+ await webSocket.CloseAsync(WebSocketCloseStatus.NormalClosure, string.Empty, cancellationTokenSource.Token).ConfigureAwait(false);`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`	`else`
Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@ public static class Program`
`29`	`29`	`private static string s_port = Environment.GetEnvironmentVariable("LOCAL_PORT");`
`30`	`30`
`31`	`31`	`// Select one of the following transports used by ServiceClient to connect to IoT Hub.`
`32`		`- private static TransportType s_transportType = TransportType.Amqp;`
`33`		`- //private static TransportType s_transportType = TransportType.Amqp_WebSocket_Only;`
	`32`	`+ private static readonly TransportType s_transportType = TransportType.Amqp;`
	`33`	`+ //private static readonly TransportType s_transportType = TransportType.Amqp_WebSocket_Only;`
`34`	`34`
`35`	`35`	`public static int Main(string[] args)`
`36`	`36`	`{`