Skip to content

Commit 080668d

Browse files
Cristian PopabhipsaMisra
Cristian Pop
authored and
abhipsaMisra
committed
Incrementing dotNetty version, Force TLS1.2, use AMQP 2.3.2 for
APT compat.
1 parent ad002bf commit 080668d

File tree

59 files changed

+358
-449
lines changed

Some content is hidden

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

59 files changed

+358
-449
lines changed

‎common/src/service/Utils.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public static string GetClientVersion()
6161
#if WINDOWS_UWP || NETSTANDARD1_3
6262
// System.Reflection.Assembly.GetExecutingAssembly() does not exist for UWP, therefore use a hard-coded version name
6363
// (This string is picked up by the bump_version script, so don't change the line below)
64-
var UWPAssemblyVersion = "1.5.1";
64+
var UWPAssemblyVersion = "1.5.2";
6565
return UWPAssemblyVersion;
6666
#else
6767
var a = Assembly.GetExecutingAssembly();

‎device/Microsoft.Azure.Devices.Client.NetStandard/Microsoft.Azure.Devices.Client.NetStandard.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@
4343
</PropertyGroup>
4444

4545
<ItemGroup>
46-
<PackageReference Include="DotNetty.Codecs.Mqtt" Version="0.4.7" />
47-
<PackageReference Include="DotNetty.Handlers" Version="0.4.7" />
48-
<PackageReference Include="Microsoft.Azure.Amqp" Version="2.1.3" />
46+
<PackageReference Include="DotNetty.Codecs.Mqtt" Version="0.6.0" />
47+
<PackageReference Include="DotNetty.Handlers" Version="0.6.0" />
48+
<PackageReference Include="Microsoft.Azure.Amqp" Version="2.3.2" />
4949
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
5050
<PackageReference Include="System.AppContext" Version="4.3.0" />
5151
<PackageReference Include="System.Collections.Specialized" Version="4.3.0" />

‎device/Microsoft.Azure.Devices.Client.NetStandard/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@
3939

4040
// Version information for an assembly follows semantic versioning 1.0.0 (because
4141
// NuGet didn't support semver 2.0.0 before VS 2015). See semver.org for details.
42-
[assembly: AssemblyInformationalVersion("1.6.3")]
42+
[assembly: AssemblyInformationalVersion("1.6.4")]

‎device/Microsoft.Azure.Devices.Client.UWP/Microsoft.Azure.Devices.Client.UWP.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,25 +172,25 @@
172172
</ItemGroup>
173173
<ItemGroup>
174174
<PackageReference Include="DotNetty.Buffers">
175-
<Version>0.4.7</Version>
175+
<Version>0.6.0</Version>
176176
</PackageReference>
177177
<PackageReference Include="DotNetty.Codecs">
178-
<Version>0.4.7</Version>
178+
<Version>0.6.0</Version>
179179
</PackageReference>
180180
<PackageReference Include="DotNetty.Codecs.Mqtt">
181-
<Version>0.4.7</Version>
181+
<Version>0.6.0</Version>
182182
</PackageReference>
183183
<PackageReference Include="DotNetty.Common">
184-
<Version>0.4.7</Version>
184+
<Version>0.6.0</Version>
185185
</PackageReference>
186186
<PackageReference Include="DotNetty.Transport">
187-
<Version>0.4.7</Version>
187+
<Version>0.6.0</Version>
188188
</PackageReference>
189189
<PackageReference Include="EnterpriseLibrary.TransientFaultHandling">
190190
<Version>6.0.1304</Version>
191191
</PackageReference>
192192
<PackageReference Include="Microsoft.Azure.Amqp">
193-
<Version>2.1.3</Version>
193+
<Version>2.3.2</Version>
194194
</PackageReference>
195195
<PackageReference Include="Microsoft.Extensions.Logging">
196196
<Version>2.0.0</Version>

‎device/Microsoft.Azure.Devices.Client.UWP/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@
3030

3131
// Version information for an assembly follows semantic versioning 1.0.0 (because
3232
// NuGet didn't support semver 2.0.0 before VS 2015). See semver.org for details.
33-
[assembly: AssemblyInformationalVersion("1.6.3")]
33+
[assembly: AssemblyInformationalVersion("1.6.4")]

‎device/Microsoft.Azure.Devices.Client/Common/BufferedInputStream.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ namespace Microsoft.Azure.Devices.Client
88
using System.Threading;
99

1010
class BufferedInputStream : Stream
11-
#if !WINDOWS_UWP
12-
, ICloneable
11+
#if !NETSTANDARD1_3
12+
, ICloneable
1313
#endif
1414
{
1515
BufferManagerByteArray data;
@@ -96,7 +96,7 @@ public override int Read(byte[] buffer, int offset, int count)
9696

9797
// Note: this is the old style async model (APM) that we don't need to support. It is not supported in UWP
9898
// I'm leaving it in place for the code owners to review and decide. ArturL 8/14/15
99-
#if !WINDOWS_UWP && !PCL && !NETSTANDARD1_3
99+
#if !NETSTANDARD1_3
100100
override
101101
#endif
102102
public IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
@@ -105,7 +105,7 @@ public IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallbac
105105
return new CompletedAsyncResultT<int>(this.innerStream.Read(buffer, offset, count), callback, state);
106106
}
107107

108-
#if !WINDOWS_UWP && !PCL && !NETSTANDARD1_3
108+
#if !NETSTANDARD1_3
109109
override
110110
#endif
111111
public int EndRead(IAsyncResult asyncResult)

‎device/Microsoft.Azure.Devices.Client/DeviceClient.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ namespace Microsoft.Azure.Devices.Client
2121
#endif
2222
#endif
2323

24+
#if !NETSTANDARD1_3 && !WINDOWS_UWP && !PCL
25+
using System.Net;
26+
#endif
27+
2428
/// <summary>
2529
/// Delegate for desired property update callbacks. This will be called
2630
/// every time we receive a PATCH from the service.
@@ -251,6 +255,10 @@ private T GetDelegateHandler<T>() where T: DefaultDelegatingHandler
251255

252256
DeviceClient(IotHubConnectionString iotHubConnectionString, ITransportSettings[] transportSettings, IDeviceClientPipelineBuilder pipelineBuilder)
253257
{
258+
#if !NETSTANDARD1_3 && !WINDOWS_UWP && !PCL
259+
ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12 | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls;
260+
#endif
261+
254262
this.iotHubConnectionString = iotHubConnectionString;
255263

256264
var pipelineContext = new PipelineContext();

‎device/Microsoft.Azure.Devices.Client/Microsoft.Azure.Devices.Client.csproj‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -76,26 +76,26 @@
7676
</Otherwise>
7777
</Choose>
7878
<ItemGroup>
79-
<Reference Include="DotNetty.Buffers, Version=0.4.7.0, Culture=neutral, PublicKeyToken=bc13ca065fa06c29, processorArchitecture=MSIL">
80-
<HintPath>..\packages\DotNetty.Buffers.0.4.7\lib\net45\DotNetty.Buffers.dll</HintPath>
79+
<Reference Include="DotNetty.Buffers, Version=0.6.0.0, Culture=neutral, PublicKeyToken=bc13ca065fa06c29, processorArchitecture=MSIL">
80+
<HintPath>..\packages\DotNetty.Buffers.0.6.0\lib\net45\DotNetty.Buffers.dll</HintPath>
8181
</Reference>
82-
<Reference Include="DotNetty.Codecs, Version=0.4.7.0, Culture=neutral, PublicKeyToken=bc13ca065fa06c29, processorArchitecture=MSIL">
83-
<HintPath>..\packages\DotNetty.Codecs.0.4.7\lib\net45\DotNetty.Codecs.dll</HintPath>
82+
<Reference Include="DotNetty.Codecs, Version=0.6.0.0, Culture=neutral, PublicKeyToken=bc13ca065fa06c29, processorArchitecture=MSIL">
83+
<HintPath>..\packages\DotNetty.Codecs.0.6.0\lib\net45\DotNetty.Codecs.dll</HintPath>
8484
</Reference>
85-
<Reference Include="DotNetty.Codecs.Mqtt, Version=0.4.7.0, Culture=neutral, PublicKeyToken=bc13ca065fa06c29, processorArchitecture=MSIL">
86-
<HintPath>..\packages\DotNetty.Codecs.Mqtt.0.4.7\lib\net45\DotNetty.Codecs.Mqtt.dll</HintPath>
85+
<Reference Include="DotNetty.Codecs.Mqtt, Version=0.6.0.0, Culture=neutral, PublicKeyToken=bc13ca065fa06c29, processorArchitecture=MSIL">
86+
<HintPath>..\packages\DotNetty.Codecs.Mqtt.0.6.0\lib\net45\DotNetty.Codecs.Mqtt.dll</HintPath>
8787
</Reference>
88-
<Reference Include="DotNetty.Common, Version=0.4.7.0, Culture=neutral, PublicKeyToken=bc13ca065fa06c29, processorArchitecture=MSIL">
89-
<HintPath>..\packages\DotNetty.Common.0.4.7\lib\net45\DotNetty.Common.dll</HintPath>
88+
<Reference Include="DotNetty.Common, Version=0.6.0.0, Culture=neutral, PublicKeyToken=bc13ca065fa06c29, processorArchitecture=MSIL">
89+
<HintPath>..\packages\DotNetty.Common.0.6.0\lib\net45\DotNetty.Common.dll</HintPath>
9090
</Reference>
91-
<Reference Include="DotNetty.Handlers, Version=0.4.7.0, Culture=neutral, PublicKeyToken=bc13ca065fa06c29, processorArchitecture=MSIL">
92-
<HintPath>..\packages\DotNetty.Handlers.0.4.7\lib\net45\DotNetty.Handlers.dll</HintPath>
91+
<Reference Include="DotNetty.Handlers, Version=0.6.0.0, Culture=neutral, PublicKeyToken=bc13ca065fa06c29, processorArchitecture=MSIL">
92+
<HintPath>..\packages\DotNetty.Handlers.0.6.0\lib\net45\DotNetty.Handlers.dll</HintPath>
9393
</Reference>
94-
<Reference Include="DotNetty.Transport, Version=0.4.7.0, Culture=neutral, PublicKeyToken=bc13ca065fa06c29, processorArchitecture=MSIL">
95-
<HintPath>..\packages\DotNetty.Transport.0.4.7\lib\net45\DotNetty.Transport.dll</HintPath>
94+
<Reference Include="DotNetty.Transport, Version=0.6.0.0, Culture=neutral, PublicKeyToken=bc13ca065fa06c29, processorArchitecture=MSIL">
95+
<HintPath>..\packages\DotNetty.Transport.0.6.0\lib\net45\DotNetty.Transport.dll</HintPath>
9696
</Reference>
97-
<Reference Include="Microsoft.Azure.Amqp, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
98-
<HintPath>..\packages\Microsoft.Azure.Amqp.2.1.3\lib\net45\Microsoft.Azure.Amqp.dll</HintPath>
97+
<Reference Include="Microsoft.Azure.Amqp, Version=2.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
98+
<HintPath>..\packages\Microsoft.Azure.Amqp.2.3.2\lib\net45\Microsoft.Azure.Amqp.dll</HintPath>
9999
</Reference>
100100
<Reference Include="Microsoft.Azure.KeyVault.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
101101
<HintPath>..\packages\Microsoft.Azure.KeyVault.Core.2.0.4\lib\net45\Microsoft.Azure.KeyVault.Core.dll</HintPath>
@@ -147,8 +147,8 @@
147147
</Reference>
148148
<Reference Include="System.Net.Http.WebRequest" />
149149
<Reference Include="System.Numerics" />
150-
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
151-
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.4.0\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
150+
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
151+
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
152152
</Reference>
153153
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
154154
<HintPath>$(SolutionDir)\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>

‎device/Microsoft.Azure.Devices.Client/ProductInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public override string ToString()
2020
string userAgent = $"{Name}/{Version} (PCL)";
2121
#else
2222
// DO NOT EDIT the following line; it is updated by the bump_version script (https://github.com/Azure/iot-sdks-internals/blob/master/release/csharp/inputs.js)
23-
const string Version = "1.6.3"; // CommonAssemblyVersion
23+
const string Version = "1.6.4"; // CommonAssemblyVersion
2424

2525
string runtime = RuntimeInformation.FrameworkDescription.Trim();
2626
string operatingSystem = RuntimeInformation.OSDescription.Trim();

‎device/Microsoft.Azure.Devices.Client/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@
3333

3434
// Version information for an assembly follows semantic versioning 1.0.0 (because
3535
// NuGet didn't support semver 2.0.0 before VS 2015). See semver.org for details.
36-
[assembly: AssemblyInformationalVersion("1.6.3")]
36+
[assembly: AssemblyInformationalVersion("1.6.4")]

0 commit comments

Comments
 (0)