diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 44f4ff89..a6b46f35 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -1,4 +1,6 @@ * [Core] Improved memory management when working with large payloads. +* [Core] Added support for .NET 6.0. +* [Core] nuget packages are now created by MSBuild including more information (i.e. commit hash). * [Client] The OS will now choose the best TLS version to use. It is no longer fixed to 1.3 etc. (thanks to @patagonaa, #1271). * [Client] Exposed user properties and reason string in subscribe result. * [Client] Exposed user properties and reason string in unsubscribe result. @@ -6,7 +8,7 @@ * [Server] Improved topic filter comparisons (support for $). * [Server] Added more MQTTv5 response information to all interceptors (BREAKING CHANGE!). * [Server] Improved session management for MQTT v5 (#1294, thanks to @logicaloud). -* [Server] All interceptors and events are migrated from interfaces to simple events. All existing APIs are availble but must be migrated to corresponding events. -* [Server] Removed all interceptor and event interfaces including the delegate implementations etc. -* [Server] Renamed a lot of classes and adjsuted namespaces. +* [Server] All interceptors and events are migrated from interfaces to simple events. All existing APIs are availble but must be migrated to corresponding events (BREAKING CHANGE!). +* [Server] Removed all interceptor and event interfaces including the delegate implementations etc. (BREAKING CHANGE!). +* [Server] Renamed a lot of classes and adjsuted namespaces (BREAKING CHANGE!). * [Server] Introduced a new queueing approach for internal message process (packet bus). \ No newline at end of file diff --git a/Source/MQTTnet.AspnetCore/Client/Tcp/TcpConnection.cs b/Source/MQTTnet.AspnetCore/Client/Tcp/TcpConnection.cs index 7814567b..f7a24e43 100644 --- a/Source/MQTTnet.AspnetCore/Client/Tcp/TcpConnection.cs +++ b/Source/MQTTnet.AspnetCore/Client/Tcp/TcpConnection.cs @@ -1,4 +1,4 @@ -using Microsoft.AspNetCore.Connections; +using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Http.Features; using MQTTnet.Exceptions; using System; @@ -40,7 +40,7 @@ namespace MQTTnet.AspNetCore.Client.Tcp _sender = new SocketSender(_socket, PipeScheduler.ThreadPool); _receiver = new SocketReceiver(_socket, PipeScheduler.ThreadPool); } -#if NETCOREAPP3_1 || NET5_0 +#if NETCOREAPP3_1 || NET5_0_OR_GREATER public override ValueTask DisposeAsync() #else public Task DisposeAsync() @@ -53,7 +53,7 @@ namespace MQTTnet.AspNetCore.Client.Tcp _socket?.Dispose(); -#if NETCOREAPP3_1 || NET5_0 +#if NETCOREAPP3_1 || NET5_0_OR_GREATER return base.DisposeAsync(); } diff --git a/Source/MQTTnet.AspnetCore/Extensions/EndpointRouterExtensions.cs b/Source/MQTTnet.AspnetCore/Extensions/EndpointRouterExtensions.cs index 7cbed8c8..053c5efc 100644 --- a/Source/MQTTnet.AspnetCore/Extensions/EndpointRouterExtensions.cs +++ b/Source/MQTTnet.AspnetCore/Extensions/EndpointRouterExtensions.cs @@ -1,5 +1,5 @@ - -#if NETCOREAPP3_1 || NET5_0 + +#if NETCOREAPP3_1 || NET5_0_OR_GREATER using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Routing; diff --git a/Source/MQTTnet.AspnetCore/MQTTnet.AspNetCore.csproj b/Source/MQTTnet.AspnetCore/MQTTnet.AspNetCore.csproj index b1cf7909..b0d53401 100644 --- a/Source/MQTTnet.AspnetCore/MQTTnet.AspNetCore.csproj +++ b/Source/MQTTnet.AspnetCore/MQTTnet.AspNetCore.csproj @@ -1,7 +1,7 @@ - netstandard2.0;netcoreapp2.1;netcoreapp3.1;net5.0 + netstandard2.0;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0 MQTTnet.AspNetCore MQTTnet.AspNetCore @@ -55,11 +55,11 @@ RELEASE;NETSTANDARD2_0 - + - + diff --git a/Source/MQTTnet.Extensions.ManagedClient/MQTTnet.Extensions.ManagedClient.csproj b/Source/MQTTnet.Extensions.ManagedClient/MQTTnet.Extensions.ManagedClient.csproj index 1ea1486e..44e3eb9c 100644 --- a/Source/MQTTnet.Extensions.ManagedClient/MQTTnet.Extensions.ManagedClient.csproj +++ b/Source/MQTTnet.Extensions.ManagedClient/MQTTnet.Extensions.ManagedClient.csproj @@ -1,7 +1,7 @@ - netstandard1.3;netstandard2.0;netstandard2.1;net5.0 + netstandard1.3;netstandard2.0;netstandard2.1;net5.0;net6.0 $(TargetFrameworks);net452;net461 $(TargetFrameworks);uap10.0 diff --git a/Source/MQTTnet.Extensions.Rpc/MQTTnet.Extensions.Rpc.csproj b/Source/MQTTnet.Extensions.Rpc/MQTTnet.Extensions.Rpc.csproj index 60ff1585..0bc1e871 100644 --- a/Source/MQTTnet.Extensions.Rpc/MQTTnet.Extensions.Rpc.csproj +++ b/Source/MQTTnet.Extensions.Rpc/MQTTnet.Extensions.Rpc.csproj @@ -1,7 +1,7 @@ - netstandard1.3;netstandard2.0;netstandard2.1;net5.0 + netstandard1.3;netstandard2.0;netstandard2.1;net5.0;net6.0 $(TargetFrameworks);net452;net461 $(TargetFrameworks);uap10.0 diff --git a/Source/MQTTnet.Extensions.WebSocket4Net/MQTTnet.Extensions.WebSocket4Net.csproj b/Source/MQTTnet.Extensions.WebSocket4Net/MQTTnet.Extensions.WebSocket4Net.csproj index 8e5ab93b..153548e4 100644 --- a/Source/MQTTnet.Extensions.WebSocket4Net/MQTTnet.Extensions.WebSocket4Net.csproj +++ b/Source/MQTTnet.Extensions.WebSocket4Net/MQTTnet.Extensions.WebSocket4Net.csproj @@ -1,7 +1,7 @@ - netstandard1.3;netstandard2.0;netstandard2.1;net5.0 + netstandard1.3;netstandard2.0;netstandard2.1;net5.0;net6.0 $(TargetFrameworks);net452;net461 $(TargetFrameworks);uap10.0 diff --git a/Source/MQTTnet/Client/Options/MqttClientOptionsBuilder.cs b/Source/MQTTnet/Client/Options/MqttClientOptionsBuilder.cs index 37d9fdf7..7d606137 100644 --- a/Source/MQTTnet/Client/Options/MqttClientOptionsBuilder.cs +++ b/Source/MQTTnet/Client/Options/MqttClientOptionsBuilder.cs @@ -300,7 +300,7 @@ namespace MQTTnet.Client #pragma warning disable CS0618 // Type or member is obsolete CertificateValidationCallback = _tlsParameters.CertificateValidationCallback, #pragma warning restore CS0618 // Type or member is obsolete -#if NETCOREAPP3_1 || NET5_0 +#if NETCOREAPP3_1 || NET5_0_OR_GREATER ApplicationProtocols = _tlsParameters.ApplicationProtocols, #endif CertificateValidationHandler = _tlsParameters.CertificateValidationHandler, diff --git a/Source/MQTTnet/Client/Options/MqttClientOptionsBuilderTlsParameters.cs b/Source/MQTTnet/Client/Options/MqttClientOptionsBuilderTlsParameters.cs index 4ede868a..0e62e3ef 100644 --- a/Source/MQTTnet/Client/Options/MqttClientOptionsBuilderTlsParameters.cs +++ b/Source/MQTTnet/Client/Options/MqttClientOptionsBuilderTlsParameters.cs @@ -27,8 +27,8 @@ namespace MQTTnet.Client public IEnumerable Certificates { get; set; } #endif -#if NETCOREAPP3_1 || NET5_0 - public List ApplicationProtocols { get;set; } +#if NETCOREAPP3_1 || NET5_0_OR_GREATER + public List ApplicationProtocols { get;set; } #endif public bool AllowUntrustedCertificates { get; set; } diff --git a/Source/MQTTnet/Client/Options/MqttClientTlsOptions.cs b/Source/MQTTnet/Client/Options/MqttClientTlsOptions.cs index 753fda2b..5b98ed6c 100644 --- a/Source/MQTTnet/Client/Options/MqttClientTlsOptions.cs +++ b/Source/MQTTnet/Client/Options/MqttClientTlsOptions.cs @@ -22,7 +22,7 @@ namespace MQTTnet.Client public List Certificates { get; set; } #endif -#if NETCOREAPP3_1 || NET5_0 +#if NETCOREAPP3_1 || NET5_0_OR_GREATER public List ApplicationProtocols { get; set; } #endif diff --git a/Source/MQTTnet/Diagnostics/Runtime/TargetFrameworkProvider.cs b/Source/MQTTnet/Diagnostics/Runtime/TargetFrameworkProvider.cs index a5e181dd..c5b54112 100644 --- a/Source/MQTTnet/Diagnostics/Runtime/TargetFrameworkProvider.cs +++ b/Source/MQTTnet/Diagnostics/Runtime/TargetFrameworkProvider.cs @@ -1,4 +1,4 @@ -namespace MQTTnet.Diagnostics +namespace MQTTnet.Diagnostics { public static class TargetFrameworkProvider { @@ -24,6 +24,8 @@ return "netcoreapp3.1"; #elif NET5_0 return "net5.0"; +#elif NET6_0 + return "net6.0"; #endif } } diff --git a/Source/MQTTnet/Implementations/MqttTcpChannel.cs b/Source/MQTTnet/Implementations/MqttTcpChannel.cs index 270a193e..a8a4aa17 100644 --- a/Source/MQTTnet/Implementations/MqttTcpChannel.cs +++ b/Source/MQTTnet/Implementations/MqttTcpChannel.cs @@ -83,7 +83,7 @@ namespace MQTTnet.Implementations var sslStream = new SslStream(networkStream, false, InternalUserCertificateValidationCallback); try { -#if NETCOREAPP3_1 || NET5_0 +#if NETCOREAPP3_1 || NET5_0_OR_GREATER var sslOptions = new SslClientAuthenticationOptions { ApplicationProtocols = _tcpOptions.TlsOptions.ApplicationProtocols, @@ -101,7 +101,7 @@ namespace MQTTnet.Implementations } catch { -#if NETSTANDARD2_1 || NETCOREAPP3_1 || NET5_0 +#if NETSTANDARD2_1 || NETCOREAPP3_1 || NET5_0_OR_GREATER await sslStream.DisposeAsync().ConfigureAwait(false); #else sslStream.Dispose(); diff --git a/Source/MQTTnet/MQTTnet.csproj b/Source/MQTTnet/MQTTnet.csproj index d6b07225..ac6b7066 100644 --- a/Source/MQTTnet/MQTTnet.csproj +++ b/Source/MQTTnet/MQTTnet.csproj @@ -10,7 +10,7 @@ - netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0 + netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0;net6.0 $(TargetFrameworks);net452;net461 $(TargetFrameworks);uap10.0 diff --git a/Tests/MQTTnet.AspNetCore.Tests/MQTTnet.AspNetCore.Tests.csproj b/Tests/MQTTnet.AspNetCore.Tests/MQTTnet.AspNetCore.Tests.csproj index 992e8676..e2444b9b 100644 --- a/Tests/MQTTnet.AspNetCore.Tests/MQTTnet.AspNetCore.Tests.csproj +++ b/Tests/MQTTnet.AspNetCore.Tests/MQTTnet.AspNetCore.Tests.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1;net461;net5.0 + netcoreapp3.1;net461;net5.0;net6.0 false diff --git a/Tests/MQTTnet.Benchmarks/MQTTnet.Benchmarks.csproj b/Tests/MQTTnet.Benchmarks/MQTTnet.Benchmarks.csproj index 75518747..6363e94c 100644 --- a/Tests/MQTTnet.Benchmarks/MQTTnet.Benchmarks.csproj +++ b/Tests/MQTTnet.Benchmarks/MQTTnet.Benchmarks.csproj @@ -1,9 +1,9 @@ - + Exe Full - net461;netcoreapp2.1;net5.0 + net461;netcoreapp2.1;net5.0;net6.0 netcoreapp2.1 7.2 @@ -21,6 +21,10 @@ + + + + diff --git a/Tests/MQTTnet.Core.Tests/MQTTnet.Tests.csproj b/Tests/MQTTnet.Core.Tests/MQTTnet.Tests.csproj index 63244d60..821ce049 100644 --- a/Tests/MQTTnet.Core.Tests/MQTTnet.Tests.csproj +++ b/Tests/MQTTnet.Core.Tests/MQTTnet.Tests.csproj @@ -1,7 +1,7 @@ - + - netcoreapp3.1;net461;net5.0 + netcoreapp3.1;net461;net5.0;net6.0 false diff --git a/Tests/MQTTnet.TestApp.NetCore/MQTTnet.TestApp.NetCore.csproj b/Tests/MQTTnet.TestApp.NetCore/MQTTnet.TestApp.NetCore.csproj index 124452ea..557f4fd1 100644 --- a/Tests/MQTTnet.TestApp.NetCore/MQTTnet.TestApp.NetCore.csproj +++ b/Tests/MQTTnet.TestApp.NetCore/MQTTnet.TestApp.NetCore.csproj @@ -1,9 +1,9 @@ - + Exe Full - netcoreapp2.1;net5.0 + netcoreapp2.1;net5.0;net6.0 $(TargetFrameworks);net452;net461