Merge branch 'master' into 1547-use-mqttclientdefaultcertificatevalidationhandlerhandle-by-default

.github/workflows/ReleaseNotes.md

@@ -1,20 +1 @@
-* [Core] Added net7.0 builds (#1635, thanks to @YAJeff).
-* [Core] Added support for payload segments (#1585, thanks to @xljiulang)
-* [Client] Added support for passing MQTT v5 options (User properties etc.) for disconnects.
-* [Client] An internal exception is no longer caught silently when calling _DisconnectAsync_ to indicate that the disconnect is not clean (BREAKING CHANGE).
-* [Client] MQTTv5 features are now checked and an exception is thrown if they are used when using protocol version 3.1.1 and lower. These checks can be disabled in client options. (BREAKING CHANGE!).
-* [Client] Added support for disabling packet fragmentation (required for i.e. AWS, #1690, thanks to @logicaloud).
-* [Client] Added new overloads for options builder.
-* [Client] Renamed _InspectPackage_ to _InspectPacketAsync_ (BREAKING CHANGE).
-* [ManagedClient] Exposed added and removed topics in _ManagedProcessFailedEventArgs_ (#1678, thanks to @scottbrogden-iheartmedia).
-* [Server] Exposed MQTT v5 sent properties from the affected client in _ClientDisconnectedAsync_ event.
-* [Server] Fixed wrong client ID passed to _InterceptingUnsubscriptionEventArgs_ (#1631, thanks to @ghord).
-* [Server] Exposed socket settings for TCP keep alive in TCP options (#1544).
-* [Server] Exposed server session items at server level and allow custom session items for injected application messages (#1638).
-* [Server] Improved performance for retained message handling when subscribing using "DoNotSendOnSubscribe" or "SendAtSubscribeIfNewSubscriptionOnly" (#1661, thanks to @Int32Overflow).
-* [Server] Added support for changing the used TLS certificate while the server is running (#1652, thanks to @YAJeff). The certificate provider will now be invoked for every new connection!
-* [Server] Added a new API method which allows reading a single retained message without the need to processing the entire set of retained messages (#1659).
-* [Server] Added a new event (InterceptingClientEnqueueAsync) which allows intercepting when an application message is enqueued for a client (#1648).
-* [Server] Fixed race condition when handling connections which leads to stopped message transfers (#1677, thanks to @RazvanEmilR).
-* [Server] Fixed not delivered packets to other sessions if the _InterceptingClientEnqueueEvent_ is used and accepting the packet is denied (#1685, thanks to @RossHNPC).
-* [Server] Added missing user properties to subscribe and unsubscribe interceptor (#1702).
+

.github/workflows/ci.yml

@@ -3,7 +3,7 @@ name: CI
 on: [push, pull_request]
 
 env:
-  VERSION: "4.2.0.${{github.run_number}}"
+  VERSION: "4.1.3.${{github.run_number}}"
 
 jobs:
   build:
@@ -22,7 +22,6 @@ jobs:
           dotnet-version: |
             3.1.x
             6.0.x
-            7.0.x
 
       - name: Setup MSBuild
         uses: microsoft/setup-msbuild@v1.1
@@ -61,4 +60,8 @@ jobs:
 
       - name: Publish MyGet nugets
         if: ${{ github.event_name == 'push' }}
-        run: dotnet nuget push **/*.nupkg -k ${{ secrets.MYGET_API_KEY }} -s https://www.myget.org/F/mqttnet/api/v3/index.json --skip-duplicate
+        run: dotnet nuget push **/*.nupkg -k ${{ secrets.MYGET_API_KEY }} -s https://www.myget.org/F/mqttnet/api/v3/index.json --skip-duplicate
+
+#      - name: Publish nugets
+#        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
+#        run: dotnet nuget push **/*.nupkg -k ${{ secrets.NUGET_API_KEY }} -s https://api.nuget.org/v3/index.json --skip-duplicate

MQTTnet.sln.DotSettings

@@ -240,14 +240,8 @@ See the LICENSE file in the project root for more information.</s:String>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=CONNACK/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=PINGREQ/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=PINGRESP/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=PUBACK/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=PUBCOMP/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=PUBREC/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=PUBREL/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=SUBACK/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Tnet/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=unsub/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=UNSUBACK/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=unsub/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

README.md

@@ -4,7 +4,7 @@
 </p>
 
 [![NuGet Badge](https://buildstats.info/nuget/MQTTnet)](https://www.nuget.org/packages/MQTTnet)
-[![CI](https://github.com/dotnet/MQTTnet/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/dotnet/MQTTnet/actions/workflows/ci.yml)
+[![CI](https://github.com/dotnet/MQTTnet/actions/workflows/ci.yml/badge.svg)](https://github.com/dotnet/MQTTnet/actions/workflows/ci.yml)
 [![MyGet](https://img.shields.io/myget/mqttnet/v/mqttnet?color=orange&label=MyGet-Preview)](https://www.myget.org/feed/mqttnet/package/nuget/MQTTnet)
 ![Size](https://img.shields.io/github/repo-size/dotnet/MQTTnet.svg)
 [![Join the chat at https://gitter.im/MQTTnet/community](https://badges.gitter.im/MQTTnet/community.svg)](https://gitter.im/MQTTnet/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
@@ -50,22 +50,6 @@ MQTTnet is a high performance .NET library for MQTT based communication. It prov
 * A custom message interceptor can be added which allows transforming or extending every received application message
 * Validate subscriptions and deny subscribing of certain topics depending on requesting clients
 
-## Getting Started
-
-MQTTnet is delivered via <b>NuGet</b> package manager. You can find the packages here: https://www.nuget.org/packages/MQTTnet/
-
-Use these command in the Package Manager console to install MQTTnet manually:
-```
-Install-Package MQTTnet
-```
-
-Samples for using MQTTnet are part of this repository. For starters these samples are recommended:
-
-- [Connect with a broker](https://github.com/dotnet/MQTTnet/blob/master/Samples/Client/Client_Connection_Samples.cs)
-- [Subscribing to data](https://github.com/dotnet/MQTTnet/blob/master/Samples/Client/Client_Subscribe_Samples.cs)
-- [Publishing data](https://github.com/dotnet/MQTTnet/blob/master/Samples/Client/Client_Publish_Samples.cs)
-- [Host own broker](https://github.com/dotnet/MQTTnet/blob/master/Samples/Server/Server_Simple_Samples.cs)
-
 ## Code of Conduct
 
 This project has adopted the code of conduct defined by the Contributor Covenant to clarify expected behavior in our community.

Samples/Client/Client_Connection_Samples.cs

@@ -16,28 +16,6 @@ namespace MQTTnet.Samples.Client;
 
 public static class Client_Connection_Samples
 {
-    public static async Task Clean_Disconnect()
-    {
-        /*
-         * This sample disconnects in a clean way. This will send a MQTT DISCONNECT packet
-         * to the server and close the connection afterwards.
-         *
-         * See sample _Connect_Client_ for more details.
-         */
-
-        var mqttFactory = new MqttFactory();
-
-        using (var mqttClient = mqttFactory.CreateMqttClient())
-        {
-            var mqttClientOptions = new MqttClientOptionsBuilder().WithTcpServer("broker.hivemq.com").Build();
-            await mqttClient.ConnectAsync(mqttClientOptions, CancellationToken.None);
-
-            // This will send the DISCONNECT packet. Calling _Dispose_ without DisconnectAsync the 
-            // connection is closed in a "not clean" way. See MQTT specification for more details.
-            await mqttClient.DisconnectAsync(new MqttClientDisconnectOptionsBuilder().WithReason(MqttClientDisconnectOptionsReason.NormalDisconnection).Build());
-        }
-    }
-
     public static async Task Connect_Client()
     {
         /*
@@ -70,32 +48,6 @@ public static class Client_Connection_Samples
             await mqttClient.DisconnectAsync(mqttClientDisconnectOptions, CancellationToken.None);
         }
     }
-    
-    public static async Task Connect_With_Amazon_AWS()
-    {
-        /*
-         * This sample creates a simple MQTT client and connects to an Amazon Web Services broker.
-         *
-         * The broker requires special settings which are set here.
-         */
-
-        var mqttFactory = new MqttFactory();
-
-        using (var mqttClient = mqttFactory.CreateMqttClient())
-        {
-            var mqttClientOptions = new MqttClientOptionsBuilder()
-                .WithTcpServer("amazon.web.services.broker")
-                // Disabling packet fragmentation is very important!  
-                .WithoutPacketFragmentation()
-                .Build();
-            
-            await mqttClient.ConnectAsync(mqttClientOptions, CancellationToken.None);
-
-            Console.WriteLine("The MQTT client is connected.");
-
-            await mqttClient.DisconnectAsync();
-        }
-    }
 
     public static async Task Connect_Client_Timeout()
     {
@@ -186,7 +138,7 @@ public static class Client_Connection_Samples
     {
         /*
          * This sample creates a simple MQTT client and connects to a public broker using a WebSocket connection.
-         * Instead of the .NET implementation of WebSockets the implementation from WebSocket4Net is used. It provides more
+         * Instead of the .NET implementation of WebSockets the implementaion from WebSocket4Net is used. It provides more
          * encryption algorithms and supports more platforms.
          * 
          * This is a modified version of the sample _Connect_Client_! See other sample for more details.
@@ -280,7 +232,7 @@ public static class Client_Connection_Samples
 
             // Calling _DisconnectAsync_ will send a DISCONNECT packet before closing the connection.
             // Using a reason code requires MQTT version 5.0.0!
-            await mqttClient.DisconnectAsync(MqttClientDisconnectOptionsReason.ImplementationSpecificError);
+            await mqttClient.DisconnectAsync(MqttClientDisconnectReason.ImplementationSpecificError);
         }
     }
 
@@ -345,7 +297,7 @@ public static class Client_Connection_Samples
         /*
          * This sample sends a PINGREQ packet to the server and waits for a reply.
          *
-         * This is only supported in MQTTv5.0.0+.
+         * This is only supported in METTv5.0.0+.
          */
 
         var mqttFactory = new MqttFactory();
@@ -434,4 +386,4 @@ public static class Client_Connection_Samples
                 });
         }
     }
-}
+}

Samples/Diagnostics/PackageInspection_Samples.cs

@@ -26,7 +26,7 @@ public static class PackageInspection_Samples
                 .WithTcpServer("broker.hivemq.com")
                 .Build();
             
-            mqttClient.InspectPacketAsync += OnInspectPacket;
+            mqttClient.InspectPackage += OnInspectPackage;
             
             await mqttClient.ConnectAsync(mqttClientOptions, CancellationToken.None);
             
@@ -39,7 +39,7 @@ public static class PackageInspection_Samples
         }
     }
 
-    static Task OnInspectPacket(InspectMqttPacketEventArgs eventArgs)
+    static Task OnInspectPackage(InspectMqttPacketEventArgs eventArgs)
     {
         if (eventArgs.Direction == MqttPacketFlowDirection.Inbound)
         {

Samples/MQTTnet.Samples.csproj

@@ -9,10 +9,12 @@
         <DisableImplicitAspNetCoreAnalyzers>true</DisableImplicitAspNetCoreAnalyzers>
         <EnableNETAnalyzers>false</EnableNETAnalyzers>
         <EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
-        <NoWarn>1591;NETSDK1138</NoWarn>
+        <NoWarn>1591</NoWarn>
     </PropertyGroup>
 
     <ItemGroup>
+        <PackageReference Include="Microsoft.CodeAnalysis.Compilers" Version="4.0.1" />
+        <PackageReference Include="Microsoft.Net.Compilers" Version="4.0.1" />
 
         <ProjectReference Include="..\Source\MQTTnet.AspnetCore\MQTTnet.AspNetCore.csproj" />
         <ProjectReference Include="..\Source\MQTTnet.Extensions.ManagedClient\MQTTnet.Extensions.ManagedClient.csproj" />

Samples/Program.cs

@@ -4,13 +4,7 @@
 
 using System.Reflection;
 
-Console.BackgroundColor = ConsoleColor.White;
-Console.BackgroundColor = ConsoleColor.Red;
-Console.Title = "Samples - MQTTnet";
-Console.WriteLine("----------------------------------------------");
-Console.WriteLine("-         Welcome to MQTTnet samples!        -");
-Console.WriteLine("----------------------------------------------");
-Console.ResetColor();
+Console.WriteLine("Welcome to MQTTnet samples!");
 Console.WriteLine();
 
 var sampleClasses = Assembly.GetExecutingAssembly().GetExportedTypes().OrderBy(c => c.Name).ToList();
@@ -22,11 +16,7 @@ foreach (var sampleClass in sampleClasses)
     index++;
 }
 
-Console.WriteLine();
-Console.ForegroundColor = ConsoleColor.Green;
 Console.Write("Please choose sample class (press Enter to continue): ");
-Console.ResetColor();
-
 var input = Console.ReadLine();
 var selectedIndex = int.Parse(input ?? "0");
 var selectedSampleClass = sampleClasses[selectedIndex];
@@ -39,19 +29,12 @@ foreach (var sampleMethod in sampleMethods)
     index++;
 }
 
-Console.WriteLine();
-Console.ForegroundColor = ConsoleColor.Green;
 Console.Write("Please choose sample (press Enter to continue): ");
-Console.ResetColor();
-
 input = Console.ReadLine();
 selectedIndex = int.Parse(input ?? "0");
 var selectedSampleMethod = sampleMethods[selectedIndex];
 
-Console.WriteLine();
-Console.ForegroundColor = ConsoleColor.White;
 Console.WriteLine("Executing sample...");
-Console.ResetColor();
 Console.WriteLine();
 
 try

Samples/Server/Server_Asp_Net_Samples.cs

@@ -17,7 +17,7 @@ using MQTTnet.Server;
 
 namespace MQTTnet.Samples.Server;
 
-public static class Server_ASP_NET_Samples
+public static class Server_Asp_Net_Samples
 {
     public static Task Start_Server_With_WebSockets_Support()
     {

Samples/Server/Server_Diagnostics_Samples.cs

@@ -1,53 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using MQTTnet.Internal;
-using MQTTnet.Packets;
-using MQTTnet.Server;
-
-namespace MQTTnet.Samples.Server;
-
-// ReSharper disable UnusedType.Global
-// ReSharper disable UnusedMember.Global
-// ReSharper disable InconsistentNaming
-// ReSharper disable EmptyConstructor
-// ReSharper disable MemberCanBeMadeStatic.Local
-
-public static class Server_Diagnostics_Samples
-{
-    public static async Task Get_Notified_When_Client_Received_Message()
-    {
-        /*
-         * This sample starts a MQTT server and attaches an event which gets fired whenever
-         * a client received and acknowledged a PUBLISH packet.
-         */
-        
-        var mqttFactory = new MqttFactory();
-        var mqttServerOptions = new MqttServerOptionsBuilder().WithDefaultEndpoint().Build();
-        
-        using (var mqttServer = mqttFactory.CreateMqttServer(mqttServerOptions))
-        {
-            // Attach the event handler.
-            mqttServer.ClientAcknowledgedPublishPacketAsync += e =>
-            {
-                Console.WriteLine($"Client '{e.ClientId}' acknowledged packet {e.PublishPacket.PacketIdentifier} with topic '{e.PublishPacket.Topic}'");
-                
-                // It is also possible to read additional data from the client response. This requires casting the response packet.
-                var qos1AcknowledgePacket = e.AcknowledgePacket as MqttPubAckPacket;
-                Console.WriteLine($"QoS 1 reason code: {qos1AcknowledgePacket?.ReasonCode}");
-                
-                var qos2AcknowledgePacket = e.AcknowledgePacket as MqttPubCompPacket;
-                Console.WriteLine($"QoS 2 reason code: {qos1AcknowledgePacket?.ReasonCode}");
-                return CompletedTask.Instance;
-            };
-            
-            await mqttServer.StartAsync();
-
-            Console.WriteLine("Press Enter to exit.");
-            Console.ReadLine();
-
-            await mqttServer.StopAsync();
-        }
-    }
-}

Samples/Server/Server_TLS_Samples.cs

@@ -1,75 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-// ReSharper disable UnusedType.Global
-// ReSharper disable UnusedMember.Global
-// ReSharper disable InconsistentNaming
-
-using System.Net;
-using System.Security.Cryptography;
-using System.Security.Cryptography.X509Certificates;
-using MQTTnet.Server;
-
-namespace MQTTnet.Samples.Server;
-
-public static class Server_TLS_Samples
-{
-    public static async Task Run_Server_With_Self_Signed_Certificate()
-    {
-        /*
-         * This sample starts a simple MQTT server which will accept any TCP connection.
-         * It also has an encrypted connection using a self signed TLS certificate.
-         *
-         * See sample "Run_Minimal_Server" for more details.
-         */
-
-        var mqttFactory = new MqttFactory();
-
-        // This certificate is self signed so that
-        var certificate = CreateSelfSignedCertificate("1.3.6.1.5.5.7.3.1");
-        
-        var mqttServerOptions = new MqttServerOptionsBuilder().WithEncryptionCertificate(certificate).WithEncryptedEndpoint().Build();
-
-        using (var mqttServer = mqttFactory.CreateMqttServer(mqttServerOptions))
-        {
-            await mqttServer.StartAsync();
-
-            Console.WriteLine("Press Enter to exit.");
-            Console.ReadLine();
-
-            // Stop and dispose the MQTT server if it is no longer needed!
-            await mqttServer.StopAsync();
-        }
-    }
-
-    static X509Certificate2 CreateSelfSignedCertificate(string oid)
-    {
-        var sanBuilder = new SubjectAlternativeNameBuilder();
-        sanBuilder.AddIpAddress(IPAddress.Loopback);
-        sanBuilder.AddIpAddress(IPAddress.IPv6Loopback);
-        sanBuilder.AddDnsName("localhost");
-
-        using (var rsa = RSA.Create())
-        {
-            var certRequest = new CertificateRequest("CN=localhost", rsa, HashAlgorithmName.SHA512, RSASignaturePadding.Pkcs1);
-
-            certRequest.CertificateExtensions.Add(
-                new X509KeyUsageExtension(X509KeyUsageFlags.DataEncipherment | X509KeyUsageFlags.KeyEncipherment | X509KeyUsageFlags.DigitalSignature, false));
-
-            certRequest.CertificateExtensions.Add(new X509EnhancedKeyUsageExtension(new OidCollection { new(oid) }, false));
-
-            certRequest.CertificateExtensions.Add(sanBuilder.Build());
-
-            using (var certificate = certRequest.CreateSelfSigned(DateTimeOffset.Now.AddMinutes(-10), DateTimeOffset.Now.AddMinutes(10)))
-            {
-                var pfxCertificate = new X509Certificate2(
-                    certificate.Export(X509ContentType.Pfx),
-                    (string)null!,
-                    X509KeyStorageFlags.MachineKeySet | X509KeyStorageFlags.Exportable);
-
-                return pfxCertificate;
-            }
-        }
-    }
-}

Source/MQTTnet.AspNetCore.Tests/MQTTnet.AspNetCore.Tests.csproj

@@ -12,6 +12,8 @@
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
         <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
         <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
+        <PackageReference Include="Microsoft.CodeAnalysis.Compilers" Version="4.0.1" />
+        <PackageReference Include="Microsoft.Net.Compilers" Version="4.0.1" />
     </ItemGroup>
 
     <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">

Source/MQTTnet.AspNetCore.Tests/MqttConnectionContextTest.cs

@@ -18,7 +18,7 @@ using MQTTnet.Exceptions;
 using MQTTnet.Formatter;
 using MQTTnet.Packets;
 using MQTTnet.Protocol;
-using MQTTnet.Tests.Helpers;
+using MQTTnet.Tests.Extensions;
 
 namespace MQTTnet.AspNetCore.Tests
 {
@@ -35,7 +35,7 @@ namespace MQTTnet.AspNetCore.Tests
             connection.Transport = pipe;
             var ctx = new MqttConnectionContext(serializer, connection);
 
-            await pipe.Receive.Writer.WriteAsync(writer.AddMqttHeader(MqttControlPacketType.Connect, Array.Empty<byte>()));
+            await pipe.Receive.Writer.WriteAsync(writer.AddMqttHeader(MqttControlPacketType.Connect, new byte[0]));
 
             await Assert.ThrowsExceptionAsync<MqttProtocolViolationException>(() => ctx.ReceivePacketAsync(CancellationToken.None));
 
@@ -103,7 +103,7 @@ namespace MQTTnet.AspNetCore.Tests
             connection.Transport = pipe;
             var ctx = new MqttConnectionContext(serializer, connection);
 
-            await ctx.SendPacketAsync(new MqttPublishPacket { PayloadSegment = new ArraySegment<byte>(new byte[20_000]) }, CancellationToken.None).ConfigureAwait(false);
+            await ctx.SendPacketAsync(new MqttPublishPacket { Payload = new byte[20_000] }, CancellationToken.None).ConfigureAwait(false);
 
             var readResult = await pipe.Send.Reader.ReadAsync();
             Assert.IsTrue(readResult.Buffer.Length > 20000);

Source/MQTTnet.AspNetCore.Tests/ReaderExtensionsTest.cs

@@ -19,7 +19,7 @@ namespace MQTTnet.AspNetCore.Tests
         {
             var serializer = new MqttPacketFormatterAdapter(MqttProtocolVersion.V311, new MqttBufferWriter(4096, 65535));
 
-            var buffer = serializer.Encode(new MqttPublishPacket {Topic = "a", PayloadSegment = new byte[5]}).Join();
+            var buffer = serializer.Encode(new MqttPublishPacket {Topic = "a", Payload = new byte[5]}).Join();
 
             var sequence = new ReadOnlySequence<byte>(buffer.Array, buffer.Offset, buffer.Count);
 

Source/MQTTnet.AspTestApp/MQTTnet.AspTestApp.csproj

@@ -8,15 +8,17 @@
         <DisableImplicitAspNetCoreAnalyzers>true</DisableImplicitAspNetCoreAnalyzers>
         <EnableNETAnalyzers>false</EnableNETAnalyzers>
         <EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
-        <NoWarn>1591;NETSDK1138</NoWarn>
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\Source\MQTTnet.AspnetCore\MQTTnet.AspNetCore.csproj" />
+        <ProjectReference Include="..\..\Source\MQTTnet.AspnetCore\MQTTnet.AspNetCore.csproj"/>
+
+        <PackageReference Include="Microsoft.CodeAnalysis.Compilers" Version="4.0.1" />
+        <PackageReference Include="Microsoft.Net.Compilers" Version="4.0.1" />
     </ItemGroup>
 
     <ItemGroup>
-        <Folder Include="wwwroot\" />
+        <Folder Include="wwwroot\"/>
     </ItemGroup>
 
 </Project>

Source/MQTTnet.AspnetCore/Client/Tcp/TcpConnection.cs

@@ -44,7 +44,7 @@ namespace MQTTnet.AspNetCore.Client.Tcp
             _sender = new SocketSender(_socket, PipeScheduler.ThreadPool);
             _receiver = new SocketReceiver(_socket, PipeScheduler.ThreadPool);
         }
-#if NETCOREAPP3_1_OR_GREATER
+#if NETCOREAPP3_1 || NET5_0_OR_GREATER
         public override ValueTask DisposeAsync()
 #else
         public Task DisposeAsync()
@@ -57,7 +57,7 @@ namespace MQTTnet.AspNetCore.Client.Tcp
 
             _socket?.Dispose();
 
-#if NETCOREAPP3_1_OR_GREATER
+#if NETCOREAPP3_1 || NET5_0_OR_GREATER
 
             return base.DisposeAsync();
         }

Source/MQTTnet.AspnetCore/EndpointRouterExtensions.cs

@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 
-#if NETCOREAPP3_1_OR_GREATER
+#if NETCOREAPP3_1 || NET5_0_OR_GREATER
 
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Routing;

Source/MQTTnet.AspnetCore/MQTTnet.AspNetCore.csproj

@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.0;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>netstandard2.0;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
 
         <AssemblyName>MQTTnet.AspNetCore</AssemblyName>
         <RootNamespace>MQTTnet.AspNetCore</RootNamespace>
@@ -32,8 +32,7 @@
         <DisableImplicitAspNetCoreAnalyzers>true</DisableImplicitAspNetCoreAnalyzers>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <NoWarn>1591;NETSDK1138</NoWarn>
-        <LangVersion>7.3</LangVersion>
+        <NoWarn>1591</NoWarn>
     </PropertyGroup>
 
     <ItemGroup>
@@ -51,11 +50,11 @@
         <DefineConstants>RELEASE;NETSTANDARD2_0</DefineConstants>
     </PropertyGroup>
 
-    <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0' or '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0' ">
+    <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0' or '$(TargetFramework)' == 'net6.0' ">
         <FrameworkReference Include="Microsoft.AspNetCore.App" />
     </ItemGroup>
 
-    <ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp3.1' and '$(TargetFramework)' != 'net5.0' and '$(TargetFramework)' != 'net6.0' and '$(TargetFramework)' != 'net7.0' ">
+    <ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp3.1' and '$(TargetFramework)' != 'net5.0' and '$(TargetFramework)' != 'net6.0' ">
         <PackageReference Include="Microsoft.AspNetCore.Http.Connections" Version="1.1.0" />
     </ItemGroup>
 

Source/MQTTnet.AspnetCore/MqttConnectionContext.cs

@@ -2,59 +2,38 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
-using System.IO.Pipelines;
-using System.Net;
-using System.Security.Cryptography.X509Certificates;
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Connections;
 using Microsoft.AspNetCore.Http.Connections.Features;
-using Microsoft.AspNetCore.Http.Features;
 using MQTTnet.Adapter;
 using MQTTnet.AspNetCore.Client.Tcp;
 using MQTTnet.Exceptions;
 using MQTTnet.Formatter;
-using MQTTnet.Internal;
 using MQTTnet.Packets;
+using System;
+using System.IO.Pipelines;
+using System.Security.Cryptography.X509Certificates;
+using System.Threading;
+using System.Threading.Tasks;
+using MQTTnet.Internal;
 
 namespace MQTTnet.AspNetCore
 {
     public sealed class MqttConnectionContext : IMqttChannelAdapter
     {
-        readonly ConnectionContext _connection;
         readonly AsyncLock _writerLock = new AsyncLock();
-
+        
         PipeReader _input;
         PipeWriter _output;
-
+        
         public MqttConnectionContext(MqttPacketFormatterAdapter packetFormatterAdapter, ConnectionContext connection)
         {
             PacketFormatterAdapter = packetFormatterAdapter ?? throw new ArgumentNullException(nameof(packetFormatterAdapter));
-            _connection = connection ?? throw new ArgumentNullException(nameof(connection));
+            Connection = connection ?? throw new ArgumentNullException(nameof(connection));
 
-            _input = connection.Transport.Input;
-            _output = connection.Transport.Output;
-        }
-
-        public long BytesReceived { get; private set; }
-
-        public long BytesSent { get; private set; }
-
-        public X509Certificate2 ClientCertificate
-        {
-            get
+            if (Connection.Transport != null)
             {
-                // mqtt over tcp
-                var tlsFeature = _connection.Features.Get<ITlsConnectionFeature>();
-                if (tlsFeature != null)
-                {
-                    return tlsFeature.ClientCertificate;
-                }
-
-                // mqtt over websocket
-                var httpFeature = _connection.Features.Get<IHttpContextFeature>();
-                return httpFeature?.HttpContext?.Connection.ClientCertificate;
+                _input = Connection.Transport.Input;
+                _output = Connection.Transport.Output;
             }
         }
 
@@ -62,59 +41,47 @@ namespace MQTTnet.AspNetCore
         {
             get
             {
-                // mqtt over tcp 
-#if NETCOREAPP3_1_OR_GREATER
-                if (_connection.RemoteEndPoint != null)
+#if NETCOREAPP3_1
+                if (Connection?.RemoteEndPoint != null)
                 {
-                    return _connection.RemoteEndPoint.ToString();
+                    return Connection.RemoteEndPoint.ToString();
                 }
 #endif
-                // mqtt over websocket
-                var httpFeature = _connection.Features.Get<IHttpConnectionFeature>();
-                if (httpFeature?.RemoteIpAddress != null)
+                var connection = Http?.HttpContext?.Connection;
+                if (connection == null)
                 {
-                    return new IPEndPoint(httpFeature.RemoteIpAddress, httpFeature.RemotePort).ToString();
+                    return Connection.ConnectionId;
                 }
 
-                return null;
+                return $"{connection.RemoteIpAddress}:{connection.RemotePort}";
             }
         }
 
+        public bool IsSecureConnection => Http?.HttpContext?.Request?.IsHttps ?? false;
+
+        public X509Certificate2 ClientCertificate => Http?.HttpContext?.Connection?.ClientCertificate;
+
+        public ConnectionContext Connection { get; }
+        
+        public MqttPacketFormatterAdapter PacketFormatterAdapter { get; }
+
+        public long BytesSent { get; set; }
+
+        public long BytesReceived { get; set; }
+
         public bool IsReadingPacket { get; private set; }
 
-        public bool IsSecureConnection
-        {
-            get
-            {
-                // mqtt over tcp
-                var tlsFeature = _connection.Features.Get<ITlsConnectionFeature>();
-                if (tlsFeature != null)
-                {
-                    return true;
-                }
-
-                // mqtt over websocket
-                var httpFeature = _connection.Features.Get<IHttpContextFeature>();
-                if (httpFeature?.HttpContext != null)
-                {
-                    return httpFeature.HttpContext.Request.IsHttps;
-                }
-
-                return false;
-            }
-        }
-
-        public MqttPacketFormatterAdapter PacketFormatterAdapter { get; }
+        IHttpContextFeature Http => Connection.Features.Get<IHttpContextFeature>();
 
         public async Task ConnectAsync(CancellationToken cancellationToken)
         {
-            if (_connection is TcpConnection tcp && !tcp.IsConnected)
+            if (Connection is TcpConnection tcp && !tcp.IsConnected)
             {
                 await tcp.StartAsync().ConfigureAwait(false);
             }
 
-            _input = _connection.Transport.Input;
-            _output = _connection.Transport.Output;
+            _input = Connection.Transport.Input;
+            _output = Connection.Transport.Output;
         }
 
         public Task DisconnectAsync(CancellationToken cancellationToken)
@@ -125,19 +92,16 @@ namespace MQTTnet.AspNetCore
             return Task.CompletedTask;
         }
 
-        public void Dispose()
-        {
-            _writerLock.Dispose();
-        }
-
         public async Task<MqttPacket> ReceivePacketAsync(CancellationToken cancellationToken)
         {
+            var input = Connection.Transport.Input;
+
             try
             {
                 while (!cancellationToken.IsCancellationRequested)
                 {
                     ReadResult readResult;
-                    var readTask = _input.ReadAsync(cancellationToken);
+                    var readTask = input.ReadAsync(cancellationToken);
                     if (readTask.IsCompleted)
                     {
                         readResult = readTask.Result;
@@ -177,15 +141,15 @@ namespace MQTTnet.AspNetCore
                         // The buffer was sliced up to where it was consumed, so we can just advance to the start.
                         // We mark examined as buffer.End so that if we didn't receive a full frame, we'll wait for more data
                         // before yielding the read again.
-                        _input.AdvanceTo(consumed, observed);
+                        input.AdvanceTo(consumed, observed);
                     }
                 }
             }
-            catch (Exception exception)
+            catch (Exception e)
             {
                 // completing the channel makes sure that there is no more data read after a protocol error
-                _input?.Complete(exception);
-                _output?.Complete(exception);
+                _input?.Complete(e);
+                _output?.Complete(e);
                 throw;
             }
             finally
@@ -205,44 +169,25 @@ namespace MQTTnet.AspNetCore
 
         public async Task SendPacketAsync(MqttPacket packet, CancellationToken cancellationToken)
         {
+            var formatter = PacketFormatterAdapter;
+            
             using (await _writerLock.EnterAsync(cancellationToken).ConfigureAwait(false))
             {
-                try
+                var buffer = formatter.Encode(packet);
+                var msg = buffer.Join().AsMemory();
+                var output = _output;
+                var result = await output.WriteAsync(msg, cancellationToken).ConfigureAwait(false);
+                if (result.IsCompleted)
                 {
-                    var buffer = PacketFormatterAdapter.Encode(packet);
-
-                    if (buffer.Payload.Count == 0)
-                    {
-                        // zero copy
-                        // https://github.com/dotnet/runtime/blob/e31ddfdc4f574b26231233dc10c9a9c402f40590/src/libraries/System.IO.Pipelines/src/System/IO/Pipelines/StreamPipeWriter.cs#L279
-                        await _output.WriteAsync(buffer.Packet, cancellationToken).ConfigureAwait(false);
-                    }
-                    else
-                    {
-                        WritePacketBuffer(_output, buffer);
-                        await _output.FlushAsync(cancellationToken).ConfigureAwait(false);
-                    }
-
-                    BytesSent += buffer.Length;
-                }
-                finally
-                {
-                    PacketFormatterAdapter.Cleanup();
+                    BytesSent += msg.Length;
                 }
+
+                PacketFormatterAdapter.Cleanup();
             }
         }
 
-        static void WritePacketBuffer(PipeWriter output, MqttPacketBuffer buffer)
+        public void Dispose()
         {
-            // copy MqttPacketBuffer's Packet and Payload to the same buffer block of PipeWriter
-            // MqttPacket will be transmitted within the bounds of a WebSocket frame after PipeWriter.FlushAsync
-
-            var span = output.GetSpan(buffer.Length);
-
-            buffer.Packet.AsSpan().CopyTo(span);
-            buffer.Payload.AsSpan().CopyTo(span.Slice(buffer.Packet.Count));
-
-            output.Advance(buffer.Length);
         }
     }
-}
+}

Source/MQTTnet.AspnetCore/MqttWebSocketServerAdapter.cs

@@ -2,34 +2,38 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
-using System.Net.WebSockets;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using MQTTnet.Adapter;
-using MQTTnet.Diagnostics;
 using MQTTnet.Formatter;
 using MQTTnet.Implementations;
 using MQTTnet.Server;
+using System;
+using System.Net.WebSockets;
+using System.Threading.Tasks;
+using MQTTnet.Diagnostics;
 
 namespace MQTTnet.AspNetCore
 {
     public sealed class MqttWebSocketServerAdapter : IMqttServerAdapter
     {
-        IMqttNetLogger _logger = MqttNetNullLogger.Instance;
-
+        IMqttNetLogger _logger = new MqttNetNullLogger();
+        
         public Func<IMqttChannelAdapter, Task> ClientHandler { get; set; }
 
-        public void Dispose()
+        public Task StartAsync(MqttServerOptions options, IMqttNetLogger logger)
         {
+            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+            return Task.CompletedTask;
+        }
+
+        public Task StopAsync()
+        {
+            return Task.CompletedTask;
         }
 
         public async Task RunWebSocketConnectionAsync(WebSocket webSocket, HttpContext httpContext)
         {
-            if (webSocket == null)
-            {
-                throw new ArgumentNullException(nameof(webSocket));
-            }
+            if (webSocket == null) throw new ArgumentNullException(nameof(webSocket));
 
             var endpoint = $"{httpContext.Connection.RemoteIpAddress}:{httpContext.Connection.RemotePort}";
 
@@ -44,7 +48,7 @@ namespace MQTTnet.AspNetCore
                     var formatter = new MqttPacketFormatterAdapter(new MqttBufferWriter(4096, 65535));
                     var channel = new MqttWebSocketChannel(webSocket, endpoint, isSecureConnection, clientCertificate);
 
-                    using (var channelAdapter = new MqttChannelAdapter(channel, formatter, _logger))
+                    using (var channelAdapter = new MqttChannelAdapter(channel, formatter, null, _logger))
                     {
                         await clientHandler(channelAdapter).ConfigureAwait(false);
                     }
@@ -56,15 +60,8 @@ namespace MQTTnet.AspNetCore
             }
         }
 
-        public Task StartAsync(MqttServerOptions options, IMqttNetLogger logger)
+        public void Dispose()
         {
-            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-            return Task.CompletedTask;
-        }
-
-        public Task StopAsync()
-        {
-            return Task.CompletedTask;
         }
     }
 }

Source/MQTTnet.AspnetCore/ReaderExtensions.cs

@@ -2,23 +2,21 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System;
+using System.Buffers;
 using MQTTnet.Adapter;
 using MQTTnet.Exceptions;
 using MQTTnet.Formatter;
 using MQTTnet.Packets;
-using System;
-using System.Buffers;
-using System.Linq;
-using System.Runtime.InteropServices;
 
 namespace MQTTnet.AspNetCore
 {
     public static class ReaderExtensions
     {
-        public static bool TryDecode(this MqttPacketFormatterAdapter formatter,
-            in ReadOnlySequence<byte> input,
-            out MqttPacket packet,
-            out SequencePosition consumed,
+        public static bool TryDecode(this MqttPacketFormatterAdapter formatter, 
+            in ReadOnlySequence<byte> input, 
+            out MqttPacket packet, 
+            out SequencePosition consumed, 
             out SequencePosition observed,
             out int bytesRead)
         {
@@ -35,22 +33,22 @@ namespace MQTTnet.AspNetCore
                 return false;
             }
 
-            if (!TryReadBodyLength(ref copy, out var headerLength, out var bodyLength))
+            var fixedHeader = copy.First.Span[0];
+            if (!TryReadBodyLength(ref copy, out int headerLength, out var bodyLength))
             {
                 return false;
             }
 
-            var fixedHeader = copy.First.Span[0];
-            copy = copy.Slice(headerLength);
             if (copy.Length < bodyLength)
             {
                 return false;
             }
 
             var bodySlice = copy.Slice(0, bodyLength);
-            var bodySegment = GetArraySegment(ref bodySlice); 
-    
-            var receivedMqttPacket = new ReceivedMqttPacket(fixedHeader, bodySegment, headerLength + bodyLength);
+            var buffer = bodySlice.GetMemory().ToArray();
+            
+            var receivedMqttPacket = new ReceivedMqttPacket(fixedHeader, new ArraySegment<byte>(buffer, 0, buffer.Length), buffer.Length + 2);
+
             if (formatter.ProtocolVersion == MqttProtocolVersion.Unknown)
             {
                 formatter.DetectProtocolVersion(receivedMqttPacket);
@@ -63,41 +61,18 @@ namespace MQTTnet.AspNetCore
             return true;
         }
 
-        static ArraySegment<byte> GetArraySegment(ref ReadOnlySequence<byte> input)
+        static ReadOnlyMemory<byte> GetMemory(this in ReadOnlySequence<byte> input)
         {
-            if (input.IsSingleSegment && MemoryMarshal.TryGetArray(input.First, out var segment))
+            if (input.IsSingleSegment)
             {
-                return segment;
+                return input.First;
             }
 
             // Should be rare
-            var array = input.ToArray();
-            return new ArraySegment<byte>(array);
+            return input.ToArray();
         }
 
         static bool TryReadBodyLength(ref ReadOnlySequence<byte> input, out int headerLength, out int bodyLength)
-        {
-            var valueSequence = input.Slice(0, Math.Min(5, input.Length));
-            if (valueSequence.IsSingleSegment)
-            {
-                var valueSpan =
-#if NET5_0_OR_GREATER
-                    valueSequence.FirstSpan;
-#else
-                    valueSequence.First.Span;
-#endif
-                return TryReadBodyLength(valueSpan, out headerLength, out bodyLength);
-            }
-            else
-            {
-                Span<byte> valueSpan = stackalloc byte[8];
-                valueSequence.CopyTo(valueSpan);
-                valueSpan = valueSpan.Slice(0, (int)valueSequence.Length);
-                return TryReadBodyLength(valueSpan, out headerLength, out bodyLength);
-            }
-        }
-
-        static bool TryReadBodyLength(ReadOnlySpan<byte> span, out int headerLength, out int bodyLength)
         {
             // Alorithm taken from https://docs.oasis-open.org/mqtt/mqtt/v3.1.1/errata01/os/mqtt-v3.1.1-errata01-os-complete.html.
             var multiplier = 1;
@@ -106,35 +81,33 @@ namespace MQTTnet.AspNetCore
             var index = 1;
             headerLength = 0;
             bodyLength = 0;
+            
+            var temp = input.Slice(0, Math.Min(5, input.Length)).GetMemory().Span;
 
             do
             {
-                if (index == span.Length)
+                if (index == temp.Length)
                 {
                     return false;
                 }
 
-                encodedByte = span[index];
+                encodedByte = temp[index];
                 index++;
 
                 value += (byte)(encodedByte & 127) * multiplier;
                 if (multiplier > 128 * 128 * 128)
                 {
-                    ThrowProtocolViolationException(span, index);
+                    throw new MqttProtocolViolationException($"Remaining length is invalid (Data={string.Join(",", temp.Slice(1, index).ToArray())}).");
                 }
 
                 multiplier *= 128;
             } while ((encodedByte & 128) != 0);
 
+            input = input.Slice(index);
+
             headerLength = index;
             bodyLength = value;
             return true;
         }
-
-
-        static void ThrowProtocolViolationException(ReadOnlySpan<byte> valueSpan, int index)
-        {
-            throw new MqttProtocolViolationException($"Remaining length is invalid (Data={string.Join(",", valueSpan.Slice(1, index).ToArray())}).");
-        }
     }
 }

Source/MQTTnet.Benchmarks/BaseBenchmark.cs

@@ -1,7 +1,3 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
 namespace MQTTnet.Benchmarks
 {
     public abstract class BaseBenchmark

Source/MQTTnet.Benchmarks/ChannelAdapterBenchmark.cs

@@ -2,25 +2,54 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using BenchmarkDotNet.Attributes;
+using MQTTnet.Adapter;
+using MQTTnet.Internal;
+using MQTTnet.Packets;
 using System;
 using System.IO;
 using System.Threading;
-using BenchmarkDotNet.Attributes;
-using MQTTnet.Adapter;
 using MQTTnet.Diagnostics;
 using MQTTnet.Formatter;
-using MQTTnet.Packets;
 using MQTTnet.Tests.Mockups;
 
 namespace MQTTnet.Benchmarks
 {
     [MemoryDiagnoser]
-    public sealed class ChannelAdapterBenchmark : BaseBenchmark
+    public sealed class ChannelAdapterBenchmark
     {
         MqttChannelAdapter _channelAdapter;
         int _iterations;
-        MqttPublishPacket _packet;
         MemoryStream _stream;
+        MqttPublishPacket _packet;
+
+        [GlobalSetup]
+        public void Setup()
+        {
+            _packet = new MqttPublishPacket
+            {
+                Topic = "A"
+            };
+
+            var serializer = new MqttPacketFormatterAdapter(MqttProtocolVersion.V311, new MqttBufferWriter(4096, 65535));
+            
+            var serializedPacket = Join(serializer.Encode(_packet).Join());
+
+            _iterations = 10000;
+
+            _stream = new MemoryStream(_iterations * serializedPacket.Length);
+
+            for (var i = 0; i < _iterations; i++)
+            {
+                _stream.Write(serializedPacket, 0, serializedPacket.Length);
+            }
+
+            _stream.Position = 0;
+
+            var channel = new MemoryMqttChannel(_stream);
+            
+            _channelAdapter = new MqttChannelAdapter(channel, serializer, null, new MqttNetEventLogger());
+        }
 
         [Benchmark]
         public void Receive_10000_Messages()
@@ -48,34 +77,6 @@ namespace MQTTnet.Benchmarks
             _stream.Position = 0;
         }
 
-        [GlobalSetup]
-        public void Setup()
-        {
-            _packet = new MqttPublishPacket
-            {
-                Topic = "A"
-            };
-
-            var serializer = new MqttPacketFormatterAdapter(MqttProtocolVersion.V311, new MqttBufferWriter(4096, 65535));
-
-            var serializedPacket = Join(serializer.Encode(_packet).Join());
-
-            _iterations = 10000;
-
-            _stream = new MemoryStream(_iterations * serializedPacket.Length);
-
-            for (var i = 0; i < _iterations; i++)
-            {
-                _stream.Write(serializedPacket, 0, serializedPacket.Length);
-            }
-
-            _stream.Position = 0;
-
-            var channel = new MemoryMqttChannel(_stream);
-
-            _channelAdapter = new MqttChannelAdapter(channel, serializer, new MqttNetEventLogger());
-        }
-
         static byte[] Join(params ArraySegment<byte>[] chunks)
         {
             var buffer = new MemoryStream();
@@ -87,4 +88,4 @@ namespace MQTTnet.Benchmarks
             return buffer.ToArray();
         }
     }
-}
+}

Source/MQTTnet.Benchmarks/Configurations/AllowNonOptimized.cs

@@ -0,0 +1,22 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using BenchmarkDotNet.Jobs;
+using BenchmarkDotNet.Validators;
+
+namespace MQTTnet.Benchmarks.Configurations
+{
+    /// <summary>
+    /// this options may be used to run benchmarks in debugmode and attach a performance profiler
+    /// https://benchmarkdotnet.org/Configs/Configs.htm
+    /// </summary>
+    public class AllowNonOptimized : BaseConfig
+    {
+        public AllowNonOptimized()
+        {
+            AddValidator(JitOptimizationsValidator.DontFailOnError); // ALLOW NON-OPTIMIZED DLLS
+            AddJob(Job.InProcess);
+        }
+    }
+}

Source/MQTTnet.Benchmarks/Configurations/BaseConfig.cs

@@ -0,0 +1,19 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using BenchmarkDotNet.Configs;
+using System.Linq;
+
+namespace MQTTnet.Benchmarks.Configurations
+{
+    public class BaseConfig : ManualConfig
+    {
+        public BaseConfig()
+        {
+            AddLogger(DefaultConfig.Instance.GetLoggers().ToArray()); // manual config has no loggers by default
+            AddExporter(DefaultConfig.Instance.GetExporters().ToArray()); // manual config has no exporters by default
+            AddColumnProvider(DefaultConfig.Instance.GetColumnProviders().ToArray()); // manual config has no columns by default
+        }
+    }
+}

Source/MQTTnet.Benchmarks/Configurations/RuntimeCompareConfig.cs

@@ -0,0 +1,19 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using BenchmarkDotNet.Environments;
+using BenchmarkDotNet.Jobs;
+using BenchmarkDotNet.Toolchains.CsProj;
+
+namespace MQTTnet.Benchmarks.Configurations
+{
+    public class RuntimeCompareConfig : BaseConfig
+    {
+        public RuntimeCompareConfig()
+        {
+            AddJob(Job.Default.WithRuntime(ClrRuntime.Net48));
+            AddJob(Job.Default.WithRuntime(CoreRuntime.Core50).WithToolchain(CsProjCoreToolchain.NetCoreApp50));
+        }
+    }
+}

Source/MQTTnet.Benchmarks/LoggerBenchmark.cs

@@ -11,7 +11,7 @@ namespace MQTTnet.Benchmarks
     [SimpleJob(RuntimeMoniker.Net60)]
     [RPlotExporter]
     [MemoryDiagnoser]
-    public class LoggerBenchmark : BaseBenchmark
+    public class LoggerBenchmark
     {
         MqttNetNullLogger _nullLogger;
         MqttNetSourceLogger _sourceNullLogger;

Source/MQTTnet.Benchmarks/MQTTnet.Benchmarks.csproj

@@ -1,16 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <OutputType>Exe</OutputType>
         <DebugType>Full</DebugType>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
         <LangVersion>7.2</LangVersion>
         <IsPackable>false</IsPackable>
         <EnableNETAnalyzers>false</EnableNETAnalyzers>
         <EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
         <DisableImplicitAspNetCoreAnalyzers>true</DisableImplicitAspNetCoreAnalyzers>
-        <NoWarn>1591;NETSDK1138</NoWarn>
     </PropertyGroup>
 
     <ItemGroup>
@@ -26,12 +24,11 @@
         <PackageReference Include="System.IO.Pipelines" Version="5.0.0" />
     </ItemGroup>
 
-    <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
-        <PackageReference Include="System.IO.Pipelines" Version="7.0.0" />
-    </ItemGroup>
-
     <ItemGroup>
         <ProjectReference Include="..\..\Source\MQTTnet.AspnetCore\MQTTnet.AspNetCore.csproj" />
+
+        <PackageReference Include="Microsoft.CodeAnalysis.Compilers" Version="4.0.1" />
+        <PackageReference Include="Microsoft.Net.Compilers" Version="4.0.1" />
         <ProjectReference Include="..\MQTTnet.Tests\MQTTnet.Tests.csproj" />
     </ItemGroup>
 

Source/MQTTnet.Benchmarks/MemoryCopyBenchmark.cs

@@ -1,40 +0,0 @@
-using BenchmarkDotNet.Attributes;
-using BenchmarkDotNet.Jobs;
-using System;
-
-
-namespace MQTTnet.Benchmarks
-{
-    [SimpleJob(RuntimeMoniker.Net60)]
-    [RPlotExporter, RankColumn]
-    [MemoryDiagnoser]
-    public class MemoryCopyBenchmark
-    {
-        const int max_length = 1024 * 8;
-        private byte[] source;
-        private byte[] target;
-
-        [Params(64 - 1, 128 - 1, 256 - 1, 512 - 1, 1024 - 1, 2048 - 1, 5096 - 1)]
-        public int Length { get; set; }
-
-        [GlobalSetup]
-        public void Setup()
-        {
-            source = new byte[max_length];
-            target = new byte[max_length];
-        }
-
-        [Benchmark(Baseline = true)]
-        public void Array_Copy()
-        {
-            Array.Copy(source, 0, target, 0, Length);
-        }
-
-        [Benchmark]
-        public void Memory_Copy()
-        {
-            MQTTnet.Internal.MqttMemoryHelper.Copy(source, 0, target, 0, Length);
-        }
-
-    }
-}

Source/MQTTnet.Benchmarks/MessageDeliveryBenchmark.cs

@@ -1,8 +1,5 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
 using BenchmarkDotNet.Attributes;
+using BenchmarkDotNet.Jobs;
 using MQTTnet.Client;
 using MQTTnet.Server;
 using System;
@@ -11,10 +8,14 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
+
 namespace MQTTnet.Benchmarks
 {
+    /// <summary>
+    /// Create a number of topics, publish, subscribe, and wait for response
+    /// </summary>
     [MemoryDiagnoser]
-    public class MessageDeliveryBenchmark : BaseBenchmark
+    public class MessageDeliveryBenchmark
     {
         List<MqttApplicationMessage> _topicPublishMessages;
 

Source/MQTTnet.Benchmarks/MessageProcessingBenchmark.cs

@@ -12,7 +12,7 @@ namespace MQTTnet.Benchmarks
     [SimpleJob(RuntimeMoniker.Net60)]
     [RPlotExporter, RankColumn]
     [MemoryDiagnoser]
-    public class MessageProcessingBenchmark : BaseBenchmark
+    public class MessageProcessingBenchmark
     {
         MqttServer _mqttServer;
         IMqttClient _mqttClient;

Source/MQTTnet.Benchmarks/MessageProcessingMqttConnectionContextBenchmark.cs

@@ -15,7 +15,7 @@ namespace MQTTnet.Benchmarks
 {
     [SimpleJob(RuntimeMoniker.Net60)]
     [MemoryDiagnoser]
-    public class MessageProcessingMqttConnectionContextBenchmark : BaseBenchmark
+    public class MessageProcessingMqttConnectionContextBenchmark
     {
         IWebHost _host;
         IMqttClient _mqttClient;

Source/MQTTnet.Benchmarks/MqttBufferReaderBenchmark.cs

@@ -1,43 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Text;
-using BenchmarkDotNet.Attributes;
-using BenchmarkDotNet.Jobs;
-using MQTTnet.Formatter;
-
-namespace MQTTnet.Benchmarks
-{
-    [SimpleJob(RuntimeMoniker.Net60)]
-    [MemoryDiagnoser]
-    public class MqttBufferReaderBenchmark
-    {
-        byte[] _buffer;
-        int _bufferLength;
-
-        [GlobalSetup]
-        public void GlobalSetup()
-        {
-            var writer = new MqttBufferWriter(1024, 1024);
-            writer.WriteString("hgfjkdfkjlghfdjghdfljkdfhgdlkjfshgsldkfjghsdflkjghdsflkjhrstiuoghlkfjbhnfbutghjoiöjhklötnbhtroliöuhbjntluiobkjzbhtdrlskbhtruhjkfthgbkftgjhgfiklhotriuöhbjtrsioöbtrsötrhträhtrühjtriüoätrhjtsrölbktrbnhtrulöbionhströloubinströoliubhnsöotrunbtöroisntröointröioujhgötiohjgötorshjnbgtöorihbnjtröoihbjntröobntröoibntrjhötrohjbtröoihntröoibnrtoiöbtrjnboöitrhjtnriohötrhjtöroihjtroöihjtroösibntsroönbotöirsbntöoihjntröoihntroöbtrboöitrnhoöitrhjntröoishbnjtröosbhtröbntriohjtröoijtöoitbjöotibjnhöotirhbjntroöibhnjrtoöibnhtroöibnhtörsbnhtöoirbnhtöroibntoörhjnbträöbtrbträbtrbtirbätrsibohjntrsöiobthnjiohjsrtoib");
-
-            _buffer = writer.GetBuffer();
-            _bufferLength = writer.Length;
-        }
-
-        [Benchmark]
-        public void Use_Span()
-        {
-            var span = _buffer.AsSpan(0, _bufferLength);
-            Encoding.UTF8.GetString(span);
-        }
-        
-        [Benchmark]
-        public void Use_Encoding()
-        {
-            Encoding.UTF8.GetString(_buffer, 0, _bufferLength);
-        }
-    }
-}

Source/MQTTnet.Benchmarks/MqttPacketReaderWriterBenchmark.cs

@@ -1,10 +1,7 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
 using System;
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Jobs;
+using MQTTnet.AspNetCore;
 using MQTTnet.Formatter;
 using MQTTnet.Tests.Mockups;
 
@@ -12,7 +9,7 @@ namespace MQTTnet.Benchmarks
 {
     [SimpleJob(RuntimeMoniker.Net60)]
     [MemoryDiagnoser]
-    public class MqttPacketReaderWriterBenchmark : BaseBenchmark
+    public class MqttPacketReaderWriterBenchmark
     {
         readonly byte[] _demoPayload = new byte[1024];
         

Source/MQTTnet.Benchmarks/MqttTcpChannelBenchmark.cs

@@ -17,7 +17,7 @@ namespace MQTTnet.Benchmarks
 {
     [SimpleJob(RuntimeMoniker.Net60)]
     [MemoryDiagnoser]
-    public class MqttTcpChannelBenchmark : BaseBenchmark
+    public sealed class MqttTcpChannelBenchmark
     {
         MqttServer _mqttServer;
         IMqttChannel _serverChannel;

Source/MQTTnet.Benchmarks/Program.cs

@@ -3,140 +3,85 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using BenchmarkDotNet.Loggers;
 using BenchmarkDotNet.Running;
+using MQTTnet.Benchmarks.Configurations;
 using MQTTnet.Diagnostics;
 
 namespace MQTTnet.Benchmarks
 {
     public static class Program
     {
-        static int _selectedBenchmarkIndex;
-        static List<Type> _benchmarks;
-
-        public static void Main(string[] arguments)
+        public static void Main(string[] args)
         {
-            _benchmarks = CollectBenchmarks();
-            HandleArguments(arguments);
+            Console.WriteLine($"MQTTnet - Benchmarks ({TargetFrameworkProvider.TargetFramework})");
+            Console.WriteLine("--------------------------------------------------------");
+            Console.WriteLine("1 = MessageProcessingBenchmark");
+            Console.WriteLine("2 = SerializerBenchmark");
+            Console.WriteLine("3 = LoggerBenchmark");
+            Console.WriteLine("4 = TopicFilterComparerBenchmark");
+            Console.WriteLine("5 = ChannelAdapterBenchmark");
+            Console.WriteLine("6 = MqttTcpChannelBenchmark");
+            Console.WriteLine("7 = TcpPipesBenchmark");
+            Console.WriteLine("8 = MessageProcessingMqttConnectionContextBenchmark");
+            Console.WriteLine("9 = ServerProcessingBenchmark");
+            Console.WriteLine("a = MqttPacketReaderWriterBenchmark");
+            Console.WriteLine("b = RoundtripBenchmark");
+            Console.WriteLine("c = SubscribeBenchmark");
+            Console.WriteLine("d = UnsubscribeBenchmark");
+            Console.WriteLine("e = MessageDeliveryBenchmark");
+            Console.WriteLine("f = AsyncLockBenchmark");
 
-            while (true)
+            var pressedKey = Console.ReadKey(true);
+            switch (pressedKey.KeyChar)
             {
-                RenderMenu();
-
-                var key = Console.ReadKey(true);
-
-                if (key.Key == ConsoleKey.DownArrow)
-                {
-                    _selectedBenchmarkIndex++;
-                    if (_selectedBenchmarkIndex > _benchmarks.Count - 1)
-                    {
-                        _selectedBenchmarkIndex = 0;
-                    }
-                }
-                else if (key.Key == ConsoleKey.UpArrow)
-                {
-                    _selectedBenchmarkIndex--;
-                    if (_selectedBenchmarkIndex < 0)
-                    {
-                        _selectedBenchmarkIndex = _benchmarks.Count - 1;
-                    }
-                }
-                else if (key.Key == ConsoleKey.Escape)
-                {
-                    Environment.Exit(0);
-                }
-                else if (key.Key == ConsoleKey.Enter)
-                {
+                case '1':
+                    BenchmarkRunner.Run<MessageProcessingBenchmark>();
+                    break;
+                case '2':
+                    BenchmarkRunner.Run<SerializerBenchmark>();
+                    break;
+                case '3':
+                    BenchmarkRunner.Run<LoggerBenchmark>();
+                    break;
+                case '4':
+                    BenchmarkRunner.Run<TopicFilterComparerBenchmark>();
+                    break;
+                case '5':
+                    BenchmarkRunner.Run<ChannelAdapterBenchmark>();
+                    break;
+                case '6':
+                    BenchmarkRunner.Run<MqttTcpChannelBenchmark>();
+                    break;
+                case '7':
+                    BenchmarkRunner.Run<TcpPipesBenchmark>();
+                    break;
+                case '8':
+                    BenchmarkRunner.Run<MessageProcessingMqttConnectionContextBenchmark>(new RuntimeCompareConfig());
+                    break;
+                case '9':
+                    BenchmarkRunner.Run<ServerProcessingBenchmark>();
+                    break;
+                case 'a':
+                    BenchmarkRunner.Run(typeof(MqttPacketReaderWriterBenchmark));
+                    break;
+                case 'b':
+                    BenchmarkRunner.Run<RoundtripProcessingBenchmark>();
+                    break;
+                case 'c':
+                    BenchmarkRunner.Run<SubscribeBenchmark>();
+                    break;
+                case 'd':
+                    BenchmarkRunner.Run<UnsubscribeBenchmark>();
+                    break;
+                case 'e':
+                    BenchmarkRunner.Run<MessageDeliveryBenchmark>();
+                    break;
+                case 'f':
+                    BenchmarkRunner.Run<AsyncLockBenchmark>();
                     break;
-                }
             }
 
-            BenchmarkRunner.Run(_benchmarks[_selectedBenchmarkIndex]);
-
-            Console.ForegroundColor = ConsoleColor.Yellow;
-            Console.WriteLine("Press any key to exit");
             Console.ReadLine();
         }
-
-        static List<Type> CollectBenchmarks()
-        {
-            var benchmarks = new List<Type>();
-
-            var types = typeof(Program).Assembly.GetExportedTypes();
-            foreach (var type in types)
-            {
-                if (typeof(BaseBenchmark).IsAssignableFrom(type))
-                {
-                    if (type != typeof(BaseBenchmark))
-                    {
-                        benchmarks.Add(type);        
-                    }
-                }
-            }
-
-            return benchmarks.OrderBy(b => b.Name).ToList();
-        }
-
-        static void HandleArguments(string[] arguments)
-        {
-            if (arguments.Length == 0)
-            {
-                return;
-            }
-
-            // Allow for preselection to avoid developer frustration.
-            
-            if (int.TryParse(arguments[0], out var benchmarkIndex))
-            {
-                _selectedBenchmarkIndex = benchmarkIndex;
-                return;
-            }
-
-            _selectedBenchmarkIndex = _benchmarks.FindIndex(b => b.Name.Equals(arguments[0]));
-
-            if (_selectedBenchmarkIndex < 0)
-            {
-                _selectedBenchmarkIndex = 0;
-            }
-
-            if (_selectedBenchmarkIndex > _benchmarks.Count - 1)
-            {
-                _selectedBenchmarkIndex = _benchmarks.Count - 1;
-            }
-        }
-
-        static void RenderMenu()
-        {
-            Console.Clear();
-
-            Console.WriteLine($"MQTTnet - Benchmarks ({TargetFrameworkProvider.TargetFramework})");
-            Console.WriteLine("-----------------------------------------------");
-            Console.ForegroundColor = ConsoleColor.Yellow;
-            Console.WriteLine("Press arrow keys for benchmark selection");
-            Console.WriteLine("Press Enter for benchmark execution");
-            Console.WriteLine("Press Esc for exit");
-            Console.ForegroundColor = ConsoleColor.White;
-            Console.WriteLine();
-
-            for (var index = 0; index < _benchmarks.Count; index++)
-            {
-                var benchmark = _benchmarks[index];
-
-                if (_selectedBenchmarkIndex == index)
-                {
-                    Console.Write("-> ");
-                }
-                else
-                {
-                    Console.Write("   ");
-                }
-
-                Console.WriteLine(benchmark.Name);
-            }
-
-            Console.WriteLine();
-        }
     }
-}
+}

Source/MQTTnet.Benchmarks/ReaderExtensionsBenchmark.cs

@@ -1,240 +0,0 @@
-using BenchmarkDotNet.Attributes;
-using BenchmarkDotNet.Jobs;
-using MQTTnet.Adapter;
-using MQTTnet.AspNetCore;
-using MQTTnet.Exceptions;
-using MQTTnet.Formatter;
-using MQTTnet.Packets;
-using System;
-using System.Buffers;
-using System.IO;
-using System.IO.Pipelines;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace MQTTnet.Benchmarks
-{
-    [SimpleJob(RuntimeMoniker.Net60)]
-    [RPlotExporter, RankColumn]
-    [MemoryDiagnoser]
-    public class ReaderExtensionsBenchmark
-    {
-        MqttPacketFormatterAdapter mqttPacketFormatter;
-        MemoryStream stream;
-
-        [GlobalSetup]
-        public void GlobalSetup()
-        {
-            mqttPacketFormatter = new MqttPacketFormatterAdapter(MqttProtocolVersion.V311, new MqttBufferWriter(4096, 65535));
-            var mqttMessage = new MqttApplicationMessageBuilder()
-            .WithTopic("topic")
-            .WithPayload(new byte[10 * 1024])
-            .Build();
-
-            var packet = MqttPacketFactories.Publish.Create(mqttMessage);
-
-            var buffer = mqttPacketFormatter.Encode(packet);
-            stream = new MemoryStream();
-            stream.Write(buffer.Packet);
-            stream.Write(buffer.Payload);
-            mqttPacketFormatter.Cleanup();
-        }
-
-        [Benchmark(Baseline = true)]
-        public async Task Before()
-        {
-            stream.Position = 0;
-            var input = PipeReader.Create(stream);
-
-            while (true)
-            {
-                ReadResult readResult;
-                var readTask = input.ReadAsync();
-                if (readTask.IsCompleted)
-                {
-                    readResult = readTask.Result;
-                }
-                else
-                {
-                    readResult = await readTask.ConfigureAwait(false);
-                }
-
-                var buffer = readResult.Buffer;
-
-                var consumed = buffer.Start;
-                var observed = buffer.Start;
-
-                try
-                {
-                    if (!buffer.IsEmpty)
-                    {
-                        if (ReaderExtensions_Before.TryDecode(mqttPacketFormatter, buffer, out var packet, out consumed, out observed, out var received))
-                        {
-                            break;
-                        }
-                    }
-                    else if (readResult.IsCompleted)
-                    {
-                        throw new MqttCommunicationException("Connection Aborted");
-                    }
-                }
-                finally
-                {
-                    // The buffer was sliced up to where it was consumed, so we can just advance to the start.
-                    // We mark examined as buffer.End so that if we didn't receive a full frame, we'll wait for more data
-                    // before yielding the read again.
-                    input.AdvanceTo(consumed, observed);
-                }
-            }
-        }
-
-        [Benchmark]
-        public async Task After()
-        {
-            stream.Position = 0;
-            var input = PipeReader.Create(stream);
-
-            while (true)
-            {
-                ReadResult readResult;
-                var readTask = input.ReadAsync();
-                if (readTask.IsCompleted)
-                {
-                    readResult = readTask.Result;
-                }
-                else
-                {
-                    readResult = await readTask.ConfigureAwait(false);
-                }
-
-                var buffer = readResult.Buffer;
-
-                var consumed = buffer.Start;
-                var observed = buffer.Start;
-
-                try
-                {
-                    if (!buffer.IsEmpty)
-                    {
-                        if (ReaderExtensions.TryDecode(mqttPacketFormatter, buffer, out var packet, out consumed, out observed, out var received))
-                        {
-                            break;
-                        }
-                    }
-                    else if (readResult.IsCompleted)
-                    {
-                        throw new MqttCommunicationException("Connection Aborted");
-                    }
-                }
-                finally
-                {
-                    // The buffer was sliced up to where it was consumed, so we can just advance to the start.
-                    // We mark examined as buffer.End so that if we didn't receive a full frame, we'll wait for more data
-                    // before yielding the read again.
-                    input.AdvanceTo(consumed, observed);
-                }
-            }
-        }
-
-        public static class ReaderExtensions_Before
-        {
-            public static bool TryDecode(MqttPacketFormatterAdapter formatter,
-                in ReadOnlySequence<byte> input,
-                out MqttPacket packet,
-                out SequencePosition consumed,
-                out SequencePosition observed,
-                out int bytesRead)
-            {
-                if (formatter == null) throw new ArgumentNullException(nameof(formatter));
-
-                packet = null;
-                consumed = input.Start;
-                observed = input.End;
-                bytesRead = 0;
-                var copy = input;
-
-                if (copy.Length < 2)
-                {
-                    return false;
-                }
-
-                var fixedHeader = copy.First.Span[0];
-                if (!TryReadBodyLength(ref copy, out int headerLength, out var bodyLength))
-                {
-                    return false;
-                }
-
-                if (copy.Length < bodyLength)
-                {
-                    return false;
-                }
-
-                var bodySlice = copy.Slice(0, bodyLength);
-                var buffer = GetMemory(bodySlice).ToArray();
-
-                var receivedMqttPacket = new ReceivedMqttPacket(fixedHeader, new ArraySegment<byte>(buffer, 0, buffer.Length), buffer.Length + 2);
-
-                if (formatter.ProtocolVersion == MqttProtocolVersion.Unknown)
-                {
-                    formatter.DetectProtocolVersion(receivedMqttPacket);
-                }
-
-                packet = formatter.Decode(receivedMqttPacket);
-                consumed = bodySlice.End;
-                observed = bodySlice.End;
-                bytesRead = headerLength + bodyLength;
-                return true;
-            }
-
-            static ReadOnlyMemory<byte> GetMemory(in ReadOnlySequence<byte> input)
-            {
-                if (input.IsSingleSegment)
-                {
-                    return input.First;
-                }
-
-                // Should be rare
-                return input.ToArray();
-            }
-
-            static bool TryReadBodyLength(ref ReadOnlySequence<byte> input, out int headerLength, out int bodyLength)
-            {
-                // Alorithm taken from https://docs.oasis-open.org/mqtt/mqtt/v3.1.1/errata01/os/mqtt-v3.1.1-errata01-os-complete.html.
-                var multiplier = 1;
-                var value = 0;
-                byte encodedByte;
-                var index = 1;
-                headerLength = 0;
-                bodyLength = 0;
-
-                var temp = GetMemory(input.Slice(0, Math.Min(5, input.Length))).Span;
-
-                do
-                {
-                    if (index == temp.Length)
-                    {
-                        return false;
-                    }
-
-                    encodedByte = temp[index];
-                    index++;
-
-                    value += (byte)(encodedByte & 127) * multiplier;
-                    if (multiplier > 128 * 128 * 128)
-                    {
-                        throw new MqttProtocolViolationException($"Remaining length is invalid (Data={string.Join(",", temp.Slice(1, index).ToArray())}).");
-                    }
-
-                    multiplier *= 128;
-                } while ((encodedByte & 128) != 0);
-
-                input = input.Slice(index);
-
-                headerLength = index;
-                bodyLength = value;
-                return true;
-            }
-        }
-
-    }
-}

Source/MQTTnet.Benchmarks/RoundtripProcessingBenchmark.cs

@@ -8,7 +8,7 @@ namespace MQTTnet.Benchmarks
     [SimpleJob(RuntimeMoniker.Net60)]
     [RPlotExporter, RankColumn]
     [MemoryDiagnoser]
-    public class RoundtripProcessingBenchmark : BaseBenchmark
+    public class RoundtripProcessingBenchmark
     {
         [GlobalSetup]
         public void GlobalSetup()

Source/MQTTnet.Benchmarks/SendPacketAsyncBenchmark.cs

@@ -1,68 +0,0 @@
-using BenchmarkDotNet.Attributes;
-using BenchmarkDotNet.Jobs;
-using MQTTnet.Formatter;
-using System;
-using System.IO;
-using System.IO.Pipelines;
-using System.Threading.Tasks;
-
-namespace MQTTnet.Benchmarks
-{
-    [SimpleJob(RuntimeMoniker.Net60)]
-    [RPlotExporter, RankColumn]
-    [MemoryDiagnoser]
-    public class SendPacketAsyncBenchmark : BaseBenchmark
-    {
-        MemoryStream stream;
-        MqttPacketBuffer buffer;
-
-        [GlobalSetup]
-        public void GlobalSetup()
-        {
-            stream = new MemoryStream(1024);
-            var packet = new ArraySegment<byte>(new byte[10]);
-            buffer = new MqttPacketBuffer(packet);
-        }
-
-        [Benchmark(Baseline = true)]
-        public async ValueTask Before()
-        {
-            stream.Position = 0;
-            var output = PipeWriter.Create(stream);
-
-            WritePacketBuffer(output, buffer);
-            await output.FlushAsync();
-        }
-
-        [Benchmark]
-        public async ValueTask After()
-        {
-            stream.Position = 0;
-            var output = PipeWriter.Create(stream);
-
-            if (buffer.Payload.Count == 0)
-            {
-                await output.WriteAsync(buffer.Packet).ConfigureAwait(false);
-            }
-            else
-            {
-                WritePacketBuffer(output, buffer);
-                await output.FlushAsync().ConfigureAwait(false);
-            }
-        }
-
-
-        static void WritePacketBuffer(PipeWriter output, MqttPacketBuffer buffer)
-        {
-            // copy MqttPacketBuffer's Packet and Payload to the same buffer block of PipeWriter
-            // MqttPacket will be transmitted within the bounds of a WebSocket frame after PipeWriter.FlushAsync
-
-            var span = output.GetSpan(buffer.Length);
-
-            buffer.Packet.AsSpan().CopyTo(span);
-            buffer.Payload.AsSpan().CopyTo(span.Slice(buffer.Packet.Count));
-
-            output.Advance(buffer.Length);
-        }
-    }
-}

Source/MQTTnet.Benchmarks/SerializerBenchmark.cs

@@ -54,7 +54,7 @@ namespace MQTTnet.Benchmarks
         public void Deserialize_10000_Messages()
         {
             var channel = new BenchmarkMqttChannel(_serializedPacket);
-            var reader = new MqttChannelAdapter(channel, new MqttPacketFormatterAdapter(new MqttBufferWriter(4096, 65535)), new MqttNetEventLogger());
+            var reader = new MqttChannelAdapter(channel, new MqttPacketFormatterAdapter(new MqttBufferWriter(4096, 65535)), null, new MqttNetEventLogger());
 
             for (var i = 0; i < 10000; i++)
             {

Source/MQTTnet.Benchmarks/ServerProcessingBenchmark.cs

@@ -1,7 +1,3 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Jobs;
 using MQTTnet.Tests.Mockups;
@@ -12,7 +8,7 @@ namespace MQTTnet.Benchmarks
     [SimpleJob(RuntimeMoniker.Net60)]
     [RPlotExporter, RankColumn]
     [MemoryDiagnoser]
-    public class ServerProcessingBenchmark : BaseBenchmark
+    public class ServerProcessingBenchmark
     {
         [GlobalSetup]
         public void GlobalSetup()

Source/MQTTnet.Benchmarks/SubscribeBenchmark.cs

@@ -1,7 +1,3 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Jobs;
 using MQTTnet.Client;
@@ -12,7 +8,7 @@ using System.Linq;
 namespace MQTTnet.Benchmarks
 {
     [MemoryDiagnoser]
-    public class SubscribeBenchmark : BaseBenchmark
+    public class SubscribeBenchmark
     {
         MqttServer _mqttServer;
         IMqttClient _mqttClient;

Source/MQTTnet.Benchmarks/TcpPipesBenchmark.cs

@@ -15,7 +15,7 @@ namespace MQTTnet.Benchmarks
 {
     [SimpleJob(RuntimeMoniker.Net60)]
     [MemoryDiagnoser]
-    public class TcpPipesBenchmark : BaseBenchmark
+    public class TcpPipesBenchmark
     {
         IDuplexPipe _client;
         IDuplexPipe _server;

Source/MQTTnet.Benchmarks/TopicFilterComparerBenchmark.cs

@@ -11,7 +11,7 @@ namespace MQTTnet.Benchmarks
     [SimpleJob(RuntimeMoniker.Net60)]
     [RPlotExporter]
     [MemoryDiagnoser]
-    public class TopicFilterComparerBenchmark : BaseBenchmark
+    public class TopicFilterComparerBenchmark
     {
         static readonly char[] TopicLevelSeparator = { '/' };
 

Source/MQTTnet.Benchmarks/TopicGenerator.cs

@@ -1,30 +1,31 @@
 using System;
 using System.Collections.Generic;
+using System.Text;
 
 namespace MQTTnet.Benchmarks
 {
     public class TopicGenerator
     {
         public static void Generate(
-            int numPublishers,
-            int numTopicsPerPublisher,
-            out Dictionary<string, List<string>> topicsByPublisher,
-            out Dictionary<string, List<string>> singleWildcardTopicsByPublisher,
-            out Dictionary<string, List<string>> multiWildcardTopicsByPublisher)
+           int numPublishers, int numTopicsPerPublisher,
+           out Dictionary<string, List<string>> topicsByPublisher,
+           out Dictionary<string, List<string>> singleWildcardTopicsByPublisher,
+           out Dictionary<string, List<string>> multiWildcardTopicsByPublisher
+           )
         {
             topicsByPublisher = new Dictionary<string, List<string>>();
             singleWildcardTopicsByPublisher = new Dictionary<string, List<string>>();
             multiWildcardTopicsByPublisher = new Dictionary<string, List<string>>();
 
             // Find some reasonable distribution across three topic levels
-            var topicsPerLevel = (int)Math.Pow(numTopicsPerPublisher, 1.0 / 3.0);
+            var topicsPerLevel = (int)Math.Pow(numTopicsPerPublisher, (1.0 / 3.0));
             if (topicsPerLevel <= 0)
             {
                 topicsPerLevel = 1;
             }
 
-            var numLevel1Topics = topicsPerLevel;
-            var numLevel2Topics = topicsPerLevel;
+            int numLevel1Topics = topicsPerLevel;
+            int numLevel2Topics = topicsPerLevel;
 
             var maxNumLevel3Topics = 1 + (int)((double)numTopicsPerPublisher / numLevel1Topics / numLevel2Topics);
             if (maxNumLevel3Topics <= 0)
@@ -34,7 +35,7 @@ namespace MQTTnet.Benchmarks
 
             for (var p = 0; p < numPublishers; ++p)
             {
-                var publisherTopicCount = 0;
+                int publisherTopicCount = 0;
                 var publisherName = "pub" + p;
                 for (var l1 = 0; l1 < numLevel1Topics; ++l1)
                 {
@@ -43,22 +44,19 @@ namespace MQTTnet.Benchmarks
                         for (var l3 = 0; l3 < maxNumLevel3Topics; ++l3)
                         {
                             if (publisherTopicCount >= numTopicsPerPublisher)
-                            {
                                 break;
-                            }
 
-                            var topic = $"{publisherName}/building{l1 + 1}/level{l2 + 1}/sensor{l3 + 1}";
+                            var topic = string.Format("{0}/building{1}/level{2}/sensor{3}", publisherName, l1 + 1, l2 + 1, l3 + 1);
                             AddPublisherTopic(publisherName, topic, topicsByPublisher);
 
                             if (l2 == 0)
                             {
-                                var singleWildcardTopic = $"{publisherName}/building{l1 + 1}/+/sensor{l3 + 1}";
+                                var singleWildcardTopic = string.Format("{0}/building{1}/+/sensor{2}", publisherName, l1 + 1, l3 + 1);
                                 AddPublisherTopic(publisherName, singleWildcardTopic, singleWildcardTopicsByPublisher);
                             }
-
-                            if (l1 == 0 && l3 == 0)
+                            if ((l1 == 0) && (l3 == 0))
                             {
-                                var multiWildcardTopic = $"{publisherName}/+/level{l2 + 1}/+";
+                                var multiWildcardTopic = string.Format("{0}/+/level{1}/+", publisherName, l2 + 1);
                                 AddPublisherTopic(publisherName, multiWildcardTopic, multiWildcardTopicsByPublisher);
                             }
 
@@ -77,8 +75,7 @@ namespace MQTTnet.Benchmarks
                 topicList = new List<string>();
                 topicsByPublisher.Add(publisherName, topicList);
             }
-
             topicList.Add(topic);
         }
     }
-}
+}

Source/MQTTnet.Benchmarks/UnsubscribeBenchmark.cs

@@ -1,7 +1,3 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
 using BenchmarkDotNet.Attributes;
 using MQTTnet.Client;
 using MQTTnet.Server;
@@ -11,7 +7,7 @@ using System.Linq;
 namespace MQTTnet.Benchmarks
 {
     [MemoryDiagnoser]
-    public class UnsubscribeBenchmark : BaseBenchmark 
+    public class UnsubscribeBenchmark
     {
         MqttServer _mqttServer;
         IMqttClient _mqttClient;

Source/MQTTnet.Benchmarks/packages.config

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="BenchmarkDotNet" version="0.10.14" targetFramework="net462" />
+  <package id="BenchmarkDotNet.Core" version="0.10.14" targetFramework="net462" />
+  <package id="BenchmarkDotNet.Toolchains.Roslyn" version="0.10.14" targetFramework="net462" />
+  <package id="Microsoft.CodeAnalysis.Analyzers" version="1.1.0" targetFramework="net462" />
+  <package id="Microsoft.CodeAnalysis.Common" version="2.6.1" targetFramework="net462" />
+  <package id="Microsoft.CodeAnalysis.CSharp" version="2.6.1" targetFramework="net462" />
+  <package id="Microsoft.DotNet.InternalAbstractions" version="1.0.0" targetFramework="net462" />
+  <package id="Microsoft.DotNet.PlatformAbstractions" version="1.1.1" targetFramework="net462" />
+  <package id="Microsoft.Win32.Registry" version="4.3.0" targetFramework="net462" />
+  <package id="System.AppContext" version="4.3.0" targetFramework="net462" />
+  <package id="System.Collections" version="4.3.0" targetFramework="net462" />
+  <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net462" />
+  <package id="System.Collections.Immutable" version="1.3.1" targetFramework="net462" />
+  <package id="System.Console" version="4.3.0" targetFramework="net462" />
+  <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net462" />
+  <package id="System.Diagnostics.FileVersionInfo" version="4.3.0" targetFramework="net462" />
+  <package id="System.Diagnostics.StackTrace" version="4.3.0" targetFramework="net462" />
+  <package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net462" />
+  <package id="System.Dynamic.Runtime" version="4.3.0" targetFramework="net462" />
+  <package id="System.Globalization" version="4.3.0" targetFramework="net462" />
+  <package id="System.IO.Compression" version="4.3.0" targetFramework="net462" />
+  <package id="System.IO.FileSystem" version="4.3.0" targetFramework="net462" />
+  <package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net462" />
+  <package id="System.Linq" version="4.3.0" targetFramework="net462" />
+  <package id="System.Linq.Expressions" version="4.3.0" targetFramework="net462" />
+  <package id="System.Reflection" version="4.3.0" targetFramework="net462" />
+  <package id="System.Reflection.Metadata" version="1.4.2" targetFramework="net462" />
+  <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net462" />
+  <package id="System.Runtime" version="4.3.0" targetFramework="net462" />
+  <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net462" />
+  <package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net462" />
+  <package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net462" />
+  <package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net462" />
+  <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net462" />
+  <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net462" />
+  <package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net462" />
+  <package id="System.Text.Encoding" version="4.3.0" targetFramework="net462" />
+  <package id="System.Text.Encoding.CodePages" version="4.3.0" targetFramework="net462" />
+  <package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net462" />
+  <package id="System.Threading" version="4.3.0" targetFramework="net462" />
+  <package id="System.Threading.Tasks" version="4.3.0" targetFramework="net462" />
+  <package id="System.Threading.Tasks.Extensions" version="4.3.0" targetFramework="net462" />
+  <package id="System.Threading.Tasks.Parallel" version="4.3.0" targetFramework="net462" />
+  <package id="System.Threading.Thread" version="4.3.0" targetFramework="net462" />
+  <package id="System.ValueTuple" version="4.3.0" targetFramework="net462" />
+  <package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net462" />
+  <package id="System.Xml.XDocument" version="4.3.0" targetFramework="net462" />
+  <package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="net462" />
+  <package id="System.Xml.XmlSerializer" version="4.3.0" targetFramework="net462" />
+  <package id="System.Xml.XPath" version="4.3.0" targetFramework="net462" />
+  <package id="System.Xml.XPath.XDocument" version="4.3.0" targetFramework="net462" />
+</packages>

Source/MQTTnet.Extensions.ManagedClient/MQTTnet.Extensions.ManagedClient.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
         <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net452;net461</TargetFrameworks>
         <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' AND '$(MSBuildRuntimeType)' != 'Core' ">$(TargetFrameworks);uap10.0</TargetFrameworks>
         
@@ -33,7 +33,7 @@
         <PackageReleaseNotes>For release notes please go to MQTTnet release notes (https://www.nuget.org/packages/MQTTnet/).</PackageReleaseNotes>
         <DisableImplicitAspNetCoreAnalyzers>true</DisableImplicitAspNetCoreAnalyzers>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <NoWarn>1591;NETSDK1138</NoWarn>
+        <NoWarn>1591</NoWarn>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">

Source/MQTTnet.Extensions.ManagedClient/ManagedMqttClient.cs

@@ -353,13 +353,13 @@ namespace MQTTnet.Extensions.ManagedClient
             return remainingTime < TimeSpan.Zero ? TimeSpan.Zero : remainingTime;
         }
 
-        async Task HandleSubscriptionExceptionAsync(Exception exception, List<MqttTopicFilter> addedSubscriptions, List<string> removedSubscriptions)
+        async Task HandleSubscriptionExceptionAsync(Exception exception)
         {
             _logger.Warning(exception, "Synchronizing subscriptions failed.");
 
             if (_synchronizingSubscriptionsFailedEvent.HasHandlers)
             {
-                await _synchronizingSubscriptionsFailedEvent.InvokeAsync(new ManagedProcessFailedEventArgs(exception, addedSubscriptions, removedSubscriptions)).ConfigureAwait(false);
+                await _synchronizingSubscriptionsFailedEvent.InvokeAsync(new ManagedProcessFailedEventArgs(exception)).ConfigureAwait(false);
             }
         }
 
@@ -457,13 +457,11 @@ namespace MQTTnet.Extensions.ManagedClient
         {
             _logger.Info("Publishing subscriptions at reconnect");
 
-            List<MqttTopicFilter> topicFilters = null;
-
             try
             {
                 if (_reconnectSubscriptions.Any())
                 {
-                    topicFilters = new List<MqttTopicFilter>();
+                    var topicFilters = new List<MqttTopicFilter>();
 
                     foreach (var sub in _reconnectSubscriptions)
                     {
@@ -481,7 +479,7 @@ namespace MQTTnet.Extensions.ManagedClient
             }
             catch (Exception exception)
             {
-                await HandleSubscriptionExceptionAsync(exception, topicFilters, null).ConfigureAwait(false);
+                await HandleSubscriptionExceptionAsync(exception).ConfigureAwait(false);
             }
         }
 
@@ -593,9 +591,6 @@ namespace MQTTnet.Extensions.ManagedClient
                     }
 
                     await InternalClient.UnsubscribeAsync(unsubscribeOptionsBuilder.Build()).ConfigureAwait(false);
-
-                    //clear because these worked, maybe the subscribe below will fail, only report those
-                    removedSubscriptions.Clear();
                 }
 
                 if (addedSubscriptions != null && addedSubscriptions.Any())
@@ -612,7 +607,7 @@ namespace MQTTnet.Extensions.ManagedClient
             }
             catch (Exception exception)
             {
-                await HandleSubscriptionExceptionAsync(exception, addedSubscriptions, removedSubscriptions).ConfigureAwait(false);
+                await HandleSubscriptionExceptionAsync(exception).ConfigureAwait(false);
             }
         }
 

Source/MQTTnet.Extensions.ManagedClient/ManagedMqttClientOptions.cs

@@ -24,7 +24,7 @@ namespace MQTTnet.Extensions.ManagedClient
 
         /// <summary>
         /// Defines the maximum amount of topic filters which will be sent in a SUBSCRIBE/UNSUBSCRIBE packet.
-        /// Amazon Web Services (AWS) limits this number to 8. The default is int.MaxValue.
+        /// Amazon AWS limits this number to 8. The default is int.MaxValue.
         /// </summary>
         public int MaxTopicFiltersInSubscribeUnsubscribePackets { get; set; } = int.MaxValue;
     }

Source/MQTTnet.Extensions.ManagedClient/ManagedProcessFailedEventArgs.cs

@@ -2,33 +2,17 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using MQTTnet.Packets;
 using System;
-using System.Collections.Generic;
-using System.Linq;
 
 namespace MQTTnet.Extensions.ManagedClient
 {
     public class ManagedProcessFailedEventArgs : EventArgs
     {
-        public ManagedProcessFailedEventArgs(Exception exception, List<MqttTopicFilter> addedSubscriptions, List<string> removedSubscriptions)
+        public ManagedProcessFailedEventArgs(Exception exception)
         {
             Exception = exception ?? throw new ArgumentNullException(nameof(exception));
-
-            if (addedSubscriptions != null)
-            {
-                AddedSubscriptions = new List<string>(addedSubscriptions.Select(item => item.Topic));
-            }
-
-            if (removedSubscriptions != null)
-            {
-                RemovedSubscriptions = new List<string>(removedSubscriptions);
-            }
         }
 
         public Exception Exception { get; }
-
-        public List<string> AddedSubscriptions { get; }
-        public List<string> RemovedSubscriptions { get; }
     }
 }

Source/MQTTnet.Extensions.Rpc/MQTTnet.Extensions.Rpc.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
         <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net452;net461</TargetFrameworks>
         <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' AND '$(MSBuildRuntimeType)' != 'Core' ">$(TargetFrameworks);uap10.0</TargetFrameworks>
         
@@ -33,8 +33,7 @@
         <PackageReleaseNotes>For release notes please go to MQTTnet release notes (https://www.nuget.org/packages/MQTTnet/).</PackageReleaseNotes>
         <DisableImplicitAspNetCoreAnalyzers>true</DisableImplicitAspNetCoreAnalyzers>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <NoWarn>1591;NETSDK1138</NoWarn>
-        <LangVersion>7.3</LangVersion>
+        <NoWarn>1591</NoWarn>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">

Source/MQTTnet.Extensions.Rpc/MqttFactoryExtensions.cs

@@ -11,12 +11,10 @@ namespace MQTTnet.Extensions.Rpc
     {
         public static IMqttRpcClient CreateMqttRpcClient(this MqttFactory factory, IMqttClient mqttClient)
         {
-            return factory.CreateMqttRpcClient(
-                mqttClient,
-                new MqttRpcClientOptions
-                {
-                    TopicGenerationStrategy = new DefaultMqttRpcClientTopicGenerationStrategy()
-                });
+            return factory.CreateMqttRpcClient(mqttClient, new MqttRpcClientOptions
+            {
+                TopicGenerationStrategy = new DefaultMqttRpcClientTopicGenerationStrategy()
+            });
         }
 
         public static IMqttRpcClient CreateMqttRpcClient(this MqttFactory _, IMqttClient mqttClient, MqttRpcClientOptions rpcClientOptions)

Source/MQTTnet.Extensions.Rpc/MqttRpcClient.cs

@@ -2,26 +2,23 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
-using System.Collections.Concurrent;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using MQTTnet.Client;
 using MQTTnet.Exceptions;
-using MQTTnet.Formatter;
-using MQTTnet.Internal;
 using MQTTnet.Protocol;
+using System;
+using System.Collections.Concurrent;
+using System.Threading;
+using System.Threading.Tasks;
+using MQTTnet.Internal;
 
 namespace MQTTnet.Extensions.Rpc
 {
     public sealed class MqttRpcClient : IMqttRpcClient
     {
+        readonly ConcurrentDictionary<string, TaskCompletionSource<byte[]>> _waitingCalls = new ConcurrentDictionary<string, TaskCompletionSource<byte[]>>();
         readonly IMqttClient _mqttClient;
         readonly MqttRpcClientOptions _options;
-
-        readonly ConcurrentDictionary<string, AsyncTaskCompletionSource<byte[]>> _waitingCalls = new ConcurrentDictionary<string, AsyncTaskCompletionSource<byte[]>>();
-
+        
         public MqttRpcClient(IMqttClient mqttClient, MqttRpcClientOptions options)
         {
             _mqttClient = mqttClient ?? throw new ArgumentNullException(nameof(mqttClient));
@@ -30,18 +27,6 @@ namespace MQTTnet.Extensions.Rpc
             _mqttClient.ApplicationMessageReceivedAsync += HandleApplicationMessageReceivedAsync;
         }
 
-        public void Dispose()
-        {
-            _mqttClient.ApplicationMessageReceivedAsync -= HandleApplicationMessageReceivedAsync;
-
-            foreach (var tcs in _waitingCalls)
-            {
-                tcs.Value.TrySetCanceled();
-            }
-
-            _waitingCalls.Clear();
-        }
-
         public async Task<byte[]> ExecuteAsync(TimeSpan timeout, string methodName, byte[] payload, MqttQualityOfServiceLevel qualityOfServiceLevel)
         {
             using (var timeoutToken = new CancellationTokenSource(timeout))
@@ -64,13 +49,15 @@ namespace MQTTnet.Extensions.Rpc
 
         public async Task<byte[]> ExecuteAsync(string methodName, byte[] payload, MqttQualityOfServiceLevel qualityOfServiceLevel, CancellationToken cancellationToken = default)
         {
-            if (methodName == null)
+            if (methodName == null) throw new ArgumentNullException(nameof(methodName));
+            
+            var topicNames = _options.TopicGenerationStrategy.CreateRpcTopics(new TopicGenerationContext
             {
-                throw new ArgumentNullException(nameof(methodName));
-            }
-
-            var context = new TopicGenerationContext(_mqttClient, _options, methodName, qualityOfServiceLevel);
-            var topicNames = _options.TopicGenerationStrategy.CreateRpcTopics(context);
+                MethodName = methodName,
+                QualityOfServiceLevel = qualityOfServiceLevel,
+                MqttClient = _mqttClient,
+                Options = _options
+            });
 
             var requestTopic = topicNames.RequestTopic;
             var responseTopic = topicNames.ResponseTopic;
@@ -85,34 +72,34 @@ namespace MQTTnet.Extensions.Rpc
                 throw new MqttProtocolViolationException("RPC response topic is empty.");
             }
 
-            var requestMessageBuilder = new MqttApplicationMessageBuilder().WithTopic(requestTopic).WithPayload(payload).WithQualityOfServiceLevel(qualityOfServiceLevel);
-
-            if (_mqttClient.Options.ProtocolVersion == MqttProtocolVersion.V500)
-            {
-                requestMessageBuilder.WithResponseTopic(responseTopic);
-            }
-
-            var requestMessage = requestMessageBuilder.Build();
+            var requestMessage = new MqttApplicationMessageBuilder()
+                .WithTopic(requestTopic)
+                .WithPayload(payload)
+                .WithQualityOfServiceLevel(qualityOfServiceLevel)
+                .WithResponseTopic(responseTopic)
+                .Build();
 
             try
             {
-                var awaitable = new AsyncTaskCompletionSource<byte[]>();
+#if NET452
+                var awaitable = new TaskCompletionSource<byte[]>();
+#else
+                var awaitable = new TaskCompletionSource<byte[]>(TaskCreationOptions.RunContinuationsAsynchronously);
+#endif
 
                 if (!_waitingCalls.TryAdd(responseTopic, awaitable))
                 {
                     throw new InvalidOperationException();
                 }
 
-                var subscribeOptions = new MqttClientSubscribeOptionsBuilder().WithTopicFilter(responseTopic, qualityOfServiceLevel).Build();
+                var subscribeOptions = new MqttClientSubscribeOptionsBuilder()
+                    .WithTopicFilter(responseTopic, qualityOfServiceLevel)
+                    .Build();
 
                 await _mqttClient.SubscribeAsync(subscribeOptions, cancellationToken).ConfigureAwait(false);
                 await _mqttClient.PublishAsync(requestMessage, cancellationToken).ConfigureAwait(false);
 
-                using (cancellationToken.Register(
-                           () =>
-                           {
-                               awaitable.TrySetCanceled();
-                           }))
+                using (cancellationToken.Register(() => { awaitable.TrySetCanceled(); }))
                 {
                     return await awaitable.Task.ConfigureAwait(false);
                 }
@@ -120,7 +107,8 @@ namespace MQTTnet.Extensions.Rpc
             finally
             {
                 _waitingCalls.TryRemove(responseTopic, out _);
-                await _mqttClient.UnsubscribeAsync(responseTopic, CancellationToken.None).ConfigureAwait(false);
+                
+                await _mqttClient.UnsubscribeAsync(responseTopic).ConfigureAwait(false);
             }
         }
 
@@ -131,13 +119,28 @@ namespace MQTTnet.Extensions.Rpc
                 return CompletedTask.Instance;
             }
 
-            var payloadBuffer = eventArgs.ApplicationMessage.PayloadSegment.ToArray();
-            awaitable.TrySetResult(payloadBuffer);
+#if NET452
+            Task.Run(() => awaitable.TrySetResult(eventArgs.ApplicationMessage.Payload));
+#else
+            awaitable.TrySetResult(eventArgs.ApplicationMessage.Payload);
+#endif
 
             // Set this message to handled to that other code can avoid execution etc.
             eventArgs.IsHandled = true;
 
             return CompletedTask.Instance;
         }
+
+        public void Dispose()
+        {
+            _mqttClient.ApplicationMessageReceivedAsync -= HandleApplicationMessageReceivedAsync;
+
+            foreach (var tcs in _waitingCalls)
+            {
+                tcs.Value.TrySetCanceled();
+            }
+
+            _waitingCalls.Clear();
+        }
     }
 }

Source/MQTTnet.Extensions.Rpc/Options/MqttRpcClientOptionsBuilder.cs

@@ -10,6 +10,13 @@ namespace MQTTnet.Extensions.Rpc
     {
         IMqttRpcClientTopicGenerationStrategy _topicGenerationStrategy = new DefaultMqttRpcClientTopicGenerationStrategy();
 
+        public MqttRpcClientOptionsBuilder WithTopicGenerationStrategy(IMqttRpcClientTopicGenerationStrategy value)
+        {
+            _topicGenerationStrategy = value ?? throw new ArgumentNullException(nameof(value));
+
+            return this;
+        }
+
         public MqttRpcClientOptions Build()
         {
             return new MqttRpcClientOptions
@@ -17,12 +24,5 @@ namespace MQTTnet.Extensions.Rpc
                 TopicGenerationStrategy = _topicGenerationStrategy
             };
         }
-
-        public MqttRpcClientOptionsBuilder WithTopicGenerationStrategy(IMqttRpcClientTopicGenerationStrategy value)
-        {
-            _topicGenerationStrategy = value ?? throw new ArgumentNullException(nameof(value));
-
-            return this;
-        }
     }
-}
+}

Source/MQTTnet.Extensions.Rpc/Options/TopicGeneration/DefaultMqttRpcClientTopicGenerationStrategy.cs

@@ -10,11 +10,6 @@ namespace MQTTnet.Extensions.Rpc
     {
         public MqttRpcTopicPair CreateRpcTopics(TopicGenerationContext context)
         {
-            if (context == null)
-            {
-                throw new ArgumentNullException(nameof(context));
-            }
-
             if (context.MethodName.Contains("/") || context.MethodName.Contains("+") || context.MethodName.Contains("#"))
             {
                 throw new ArgumentException("The method name cannot contain /, + or #.");

Source/MQTTnet.Extensions.Rpc/Options/TopicGeneration/TopicGenerationContext.cs

@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
 using MQTTnet.Client;
 using MQTTnet.Protocol;
 
@@ -10,29 +9,20 @@ namespace MQTTnet.Extensions.Rpc
 {
     public sealed class TopicGenerationContext
     {
-        public TopicGenerationContext(IMqttClient mqttClient, MqttRpcClientOptions options, string methodName, MqttQualityOfServiceLevel qualityOfServiceLevel)
-        {
-            MethodName = methodName ?? throw new ArgumentNullException(nameof(methodName));
-            QualityOfServiceLevel = qualityOfServiceLevel;
-            MqttClient = mqttClient ?? throw new ArgumentNullException(nameof(mqttClient));
-            Options = options ?? throw new ArgumentNullException(nameof(options));
-        }
-
-        public string MethodName { get; }
-
-        public IMqttClient MqttClient { get; }
-
-        public MqttRpcClientOptions Options { get; }
+        public string MethodName { get; set; }
 
         /// <summary>
-        ///     Gets or sets the quality of service level.
-        ///     The Quality of Service (QoS) level is an agreement between the sender of a message and the receiver of a message
-        ///     that defines the guarantee of delivery for a specific message.
-        ///     There are 3 QoS levels in MQTT:
-        ///     - At most once  (0): Message gets delivered no time, once or multiple times.
-        ///     - At least once (1): Message gets delivered at least once (one time or more often).
-        ///     - Exactly once  (2): Message gets delivered exactly once (It's ensured that the message only comes once).
+        /// Gets or sets the quality of service level.
+        /// The Quality of Service (QoS) level is an agreement between the sender of a message and the receiver of a message that defines the guarantee of delivery for a specific message.
+        /// There are 3 QoS levels in MQTT:
+        /// - At most once  (0): Message gets delivered no time, once or multiple times.
+        /// - At least once (1): Message gets delivered at least once (one time or more often).
+        /// - Exactly once  (2): Message gets delivered exactly once (It's ensured that the message only comes once).
         /// </summary>
-        public MqttQualityOfServiceLevel QualityOfServiceLevel { get; }
+        public MqttQualityOfServiceLevel QualityOfServiceLevel { get; set; }
+
+        public IMqttClient MqttClient { get; set; }
+
+        public MqttRpcClientOptions Options { get; set; }
     }
-}
+}

Source/MQTTnet.Extensions.WebSocket4Net/MQTTnet.Extensions.WebSocket4Net.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
         <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net452;net461</TargetFrameworks>
         <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' AND '$(MSBuildRuntimeType)' != 'Core' ">$(TargetFrameworks);uap10.0</TargetFrameworks>
         
@@ -33,8 +33,7 @@
         <PackageReleaseNotes>For release notes please go to MQTTnet release notes (https://www.nuget.org/packages/MQTTnet/).</PackageReleaseNotes>
         <DisableImplicitAspNetCoreAnalyzers>true</DisableImplicitAspNetCoreAnalyzers>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <NoWarn>1591;NETSDK1138</NoWarn>
-        <LangVersion>7.3</LangVersion>
+        <NoWarn>1591</NoWarn>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">

Source/MQTTnet.Extensions.WebSocket4Net/MqttFactoryExtensions.cs

@@ -10,12 +10,9 @@ namespace MQTTnet.Extensions.WebSocket4Net
     {
         public static MqttFactory UseWebSocket4Net(this MqttFactory mqttFactory)
         {
-            if (mqttFactory == null)
-            {
-                throw new ArgumentNullException(nameof(mqttFactory));
-            }
+            if (mqttFactory == null) throw new ArgumentNullException(nameof(mqttFactory));
 
             return mqttFactory.UseClientAdapterFactory(new WebSocket4NetMqttClientAdapterFactory());
         }
     }
-}
+}

Source/MQTTnet.Extensions.WebSocket4Net/WebSocket4NetMqttChannel.cs

@@ -5,7 +5,6 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Net;
 using System.Security.Authentication;
@@ -18,14 +17,14 @@ using MQTTnet.Exceptions;
 using MQTTnet.Internal;
 using SuperSocket.ClientEngine;
 using WebSocket4Net;
-using DataReceivedEventArgs = WebSocket4Net.DataReceivedEventArgs;
 
 namespace MQTTnet.Extensions.WebSocket4Net
 {
     public sealed class WebSocket4NetMqttChannel : IMqttChannel
     {
-        readonly MqttClientOptions _clientOptions;
         readonly BlockingCollection<byte> _receiveBuffer = new BlockingCollection<byte>();
+
+        readonly MqttClientOptions _clientOptions;
         readonly MqttClientWebSocketOptions _webSocketOptions;
 
         WebSocket _webSocket;
@@ -36,13 +35,13 @@ namespace MQTTnet.Extensions.WebSocket4Net
             _webSocketOptions = webSocketOptions ?? throw new ArgumentNullException(nameof(webSocketOptions));
         }
 
-        public X509Certificate2 ClientCertificate { get; }
-
         public string Endpoint => _webSocketOptions.Uri;
 
         public bool IsSecureConnection { get; private set; }
 
-        public Task ConnectAsync(CancellationToken cancellationToken)
+        public X509Certificate2 ClientCertificate { get; }
+
+        public async Task ConnectAsync(CancellationToken cancellationToken)
         {
             var uri = _webSocketOptions.Uri;
             if (!uri.StartsWith("ws://", StringComparison.OrdinalIgnoreCase) && !uri.StartsWith("wss://", StringComparison.OrdinalIgnoreCase))
@@ -56,13 +55,11 @@ namespace MQTTnet.Extensions.WebSocket4Net
                     uri = "wss://" + uri;
                 }
             }
-            
-            IsSecureConnection = uri.StartsWith("wss://", StringComparison.OrdinalIgnoreCase);
 
-#if NET48 || NETCOREAPP3_0_OR_GREATER
-            var sslProtocols = _webSocketOptions.TlsOptions?.SslProtocol ?? SslProtocols.Tls12 | SslProtocols.Tls13;
+#if NET48 || NETCOREAPP3_1 || NET5 || NET6
+            var sslProtocols = _webSocketOptions?.TlsOptions?.SslProtocol ?? SslProtocols.Tls12 | SslProtocols.Tls13;
 #else
-            var sslProtocols = _webSocketOptions.TlsOptions?.SslProtocol ?? SslProtocols.Tls12 | (SslProtocols)0x00003000 /*Tls13*/;
+            var sslProtocols = _webSocketOptions?.TlsOptions?.SslProtocol ?? SslProtocols.Tls12 | (SslProtocols)0x00003000 /*Tls13*/;
 #endif
 
             var subProtocol = _webSocketOptions.SubProtocols.FirstOrDefault() ?? string.Empty;
@@ -93,7 +90,7 @@ namespace MQTTnet.Extensions.WebSocket4Net
             var receiveBufferSize = 0;
 
             var certificates = new X509CertificateCollection();
-            if (_webSocketOptions.TlsOptions?.Certificates != null)
+            if (_webSocketOptions?.TlsOptions?.Certificates != null)
             {
                 foreach (var certificate in _webSocketOptions.TlsOptions.Certificates)
                 {
@@ -110,13 +107,15 @@ namespace MQTTnet.Extensions.WebSocket4Net
                 NoDelay = true,
                 Security =
                 {
-                    AllowUnstrustedCertificate = _webSocketOptions.TlsOptions?.AllowUntrustedCertificates == true,
-                    AllowCertificateChainErrors = _webSocketOptions.TlsOptions?.IgnoreCertificateChainErrors == true,
+                    AllowUnstrustedCertificate = _webSocketOptions?.TlsOptions?.AllowUntrustedCertificates == true,
+                    AllowCertificateChainErrors = _webSocketOptions?.TlsOptions?.IgnoreCertificateChainErrors == true,
                     Certificates = certificates
                 }
             };
 
-            return ConnectInternalAsync(cancellationToken);
+            await ConnectInternalAsync(cancellationToken).ConfigureAwait(false);
+            
+            IsSecureConnection = uri.StartsWith("wss://", StringComparison.OrdinalIgnoreCase);
         }
 
         public Task DisconnectAsync(CancellationToken cancellationToken)
@@ -125,23 +124,10 @@ namespace MQTTnet.Extensions.WebSocket4Net
             {
                 _webSocket.Close();
             }
-
+            
             return CompletedTask.Instance;
         }
 
-        public void Dispose()
-        {
-            if (_webSocket == null)
-            {
-                return;
-            }
-
-            _webSocket.DataReceived -= OnDataReceived;
-            _webSocket.Error -= OnError;
-            _webSocket.Dispose();
-            _webSocket = null;
-        }
-
         public Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
         {
             var readBytes = 0;
@@ -175,55 +161,75 @@ namespace MQTTnet.Extensions.WebSocket4Net
             return CompletedTask.Instance;
         }
 
+        public void Dispose()
+        {
+            if (_webSocket == null)
+            {
+                return;
+            }
+
+            _webSocket.DataReceived -= OnDataReceived;
+            _webSocket.Error -= OnError;
+            _webSocket.Dispose();
+            _webSocket = null;
+        }
+
+        static void OnError(object sender, ErrorEventArgs e)
+        {
+            System.Diagnostics.Debug.Write(e.Exception.ToString());
+        }
+
+        void OnDataReceived(object sender, DataReceivedEventArgs e)
+        {
+            foreach (var @byte in e.Data)
+            {
+                _receiveBuffer.Add(@byte);
+            }
+        }
+
         async Task ConnectInternalAsync(CancellationToken cancellationToken)
         {
             _webSocket.Error += OnError;
             _webSocket.DataReceived += OnDataReceived;
 
-            var promise = new AsyncTaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<Exception>();
 
             void ErrorHandler(object sender, ErrorEventArgs e)
             {
-                promise.TrySetException(e.Exception);
+                taskCompletionSource.TrySetResult(e.Exception);
             }
 
-            void OpenedHandler(object sender, EventArgs e)
+            void SuccessHandler(object sender, EventArgs e)
             {
-                promise.TrySetResult(true);
-            }
-
-            void ClosedHandler(object sender, EventArgs e)
-            {
-                promise.TrySetException(new MqttCommunicationException("Connection closed."));
+                taskCompletionSource.TrySetResult(null);
             }
 
             try
             {
-                _webSocket.Opened += OpenedHandler;
-                _webSocket.Closed += ClosedHandler;
+                _webSocket.Opened += SuccessHandler;
                 _webSocket.Error += ErrorHandler;
 
-                using (var timeout = new CancellationTokenSource(_clientOptions.Timeout))
-                using (var linkedCts = CancellationTokenSource.CreateLinkedTokenSource(timeout.Token, cancellationToken))
+#pragma warning disable AsyncFixer02 // Long-running or blocking operations inside an async method
+                _webSocket.Open();
+#pragma warning restore AsyncFixer02 // Long-running or blocking operations inside an async method
+
+                using (var timeoutCts = new CancellationTokenSource(_clientOptions.Timeout))
+                using (var linkedCts = CancellationTokenSource.CreateLinkedTokenSource(timeoutCts.Token, cancellationToken))
                 {
-                    using (linkedCts.Token.Register(() => promise.TrySetCanceled()))
+                    using (linkedCts.Token.Register(() => taskCompletionSource.TrySetCanceled()))
                     {
                         try
                         {
-                            // OpenAsync does basically the same but without support for a cancellation token.
-                            // So we do it on our own!
-                            _webSocket.Open();
-
-                            await promise.Task.ConfigureAwait(false);
+                            await taskCompletionSource.Task.ConfigureAwait(false);
                         }
                         catch (Exception exception)
                         {
-                            var timeoutReached = timeout.IsCancellationRequested && !cancellationToken.IsCancellationRequested;
+                            var timeoutReached = timeoutCts.IsCancellationRequested && !cancellationToken.IsCancellationRequested;
                             if (timeoutReached)
                             {
                                 throw new MqttCommunicationTimedOutException(exception);
                             }
-
+                            
                             if (exception is AuthenticationException authenticationException)
                             {
                                 throw new MqttCommunicationException(authenticationException.InnerException);
@@ -245,23 +251,9 @@ namespace MQTTnet.Extensions.WebSocket4Net
             }
             finally
             {
-                _webSocket.Opened -= OpenedHandler;
-                _webSocket.Closed -= ClosedHandler;
+                _webSocket.Opened -= SuccessHandler;
                 _webSocket.Error -= ErrorHandler;
             }
         }
-
-        void OnDataReceived(object sender, DataReceivedEventArgs e)
-        {
-            foreach (var @byte in e.Data)
-            {
-                _receiveBuffer.Add(@byte);
-            }
-        }
-
-        static void OnError(object sender, ErrorEventArgs e)
-        {
-            Debug.Write(e.Exception.ToString());
-        }
     }
-}
+}

Source/MQTTnet.Extensions.WebSocket4Net/WebSocket4NetMqttClientAdapterFactory.cs

@@ -2,12 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
 using MQTTnet.Adapter;
-using MQTTnet.Client;
-using MQTTnet.Diagnostics;
 using MQTTnet.Formatter;
 using MQTTnet.Implementations;
+using System;
+using MQTTnet.Client;
+using MQTTnet.Diagnostics;
 
 namespace MQTTnet.Extensions.WebSocket4Net
 {
@@ -15,10 +15,7 @@ namespace MQTTnet.Extensions.WebSocket4Net
     {
         public IMqttChannelAdapter CreateClientAdapter(MqttClientOptions options, MqttPacketInspector packetInspector, IMqttNetLogger logger)
         {
-            if (options == null)
-            {
-                throw new ArgumentNullException(nameof(options));
-            }
+            if (options == null) throw new ArgumentNullException(nameof(options));
 
             switch (options.ChannelOptions)
             {
@@ -26,29 +23,25 @@ namespace MQTTnet.Extensions.WebSocket4Net
                 {
                     return new MqttChannelAdapter(
                         new MqttTcpChannel(options),
-                        new MqttPacketFormatterAdapter(options.ProtocolVersion, new MqttBufferWriter(options.WriterBufferSize, options.WriterBufferSizeMax)),
-                        logger)
-                    {
-                        PacketInspector = packetInspector
-                    };
+                        new MqttPacketFormatterAdapter(options.ProtocolVersion, new MqttBufferWriter(4096, 65535)),
+                        packetInspector,
+                        logger);
                 }
 
                 case MqttClientWebSocketOptions webSocketOptions:
                 {
                     return new MqttChannelAdapter(
                         new WebSocket4NetMqttChannel(options, webSocketOptions),
-                        new MqttPacketFormatterAdapter(options.ProtocolVersion, new MqttBufferWriter(options.WriterBufferSize, options.WriterBufferSizeMax)),
-                        logger)
-                    {
-                        PacketInspector = packetInspector
-                    };
+                        new MqttPacketFormatterAdapter(options.ProtocolVersion, new MqttBufferWriter(4068, 65535)), 
+                        packetInspector,
+                        logger);
                 }
 
                 default:
-                {
-                    throw new NotSupportedException();
-                }
+                    {
+                        throw new NotSupportedException();
+                    }
             }
         }
     }
-}
+}

Source/MQTTnet.TestApp/ClientTest.cs

@@ -33,18 +33,9 @@ namespace MQTTnet.TestApp
 
                 client.ApplicationMessageReceivedAsync += e =>
                 {
-                    var payloadText = string.Empty;
-                    if (e.ApplicationMessage.PayloadSegment.Count > 0)
-                    {
-                        payloadText = Encoding.UTF8.GetString(
-                            e.ApplicationMessage.PayloadSegment.Array,
-                            e.ApplicationMessage.PayloadSegment.Offset,
-                            e.ApplicationMessage.PayloadSegment.Count);
-                    }
-                    
                     Console.WriteLine("### RECEIVED APPLICATION MESSAGE ###");
                     Console.WriteLine($"+ Topic = {e.ApplicationMessage.Topic}");
-                    Console.WriteLine($"+ Payload = {payloadText}");
+                    Console.WriteLine($"+ Payload = {Encoding.UTF8.GetString(e.ApplicationMessage.Payload)}");
                     Console.WriteLine($"+ QoS = {e.ApplicationMessage.QualityOfServiceLevel}");
                     Console.WriteLine($"+ Retain = {e.ApplicationMessage.Retain}");
                     Console.WriteLine();

Source/MQTTnet.TestApp/MQTTnet.TestApp.csproj

@@ -1,19 +1,20 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <DebugType>Full</DebugType>
-        <TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
         <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net452;net461</TargetFrameworks>
         <IsPackable>false</IsPackable>
         <EnableNETAnalyzers>false</EnableNETAnalyzers>
         <EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
         <DisableImplicitAspNetCoreAnalyzers>true</DisableImplicitAspNetCoreAnalyzers>
-        <NoWarn>1591;NETSDK1138</NoWarn>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+        <PackageReference Include="Microsoft.CodeAnalysis.Compilers" Version="4.0.1" />
+        <PackageReference Include="Microsoft.Net.Compilers" Version="4.0.1" />
     </ItemGroup>
 
     <ItemGroup>

Source/MQTTnet.TestApp/PerformanceTest.cs

@@ -196,7 +196,7 @@ namespace MQTTnet.TestApp
             return new MqttApplicationMessage
             {
                 Topic = "A/B/C",
-                PayloadSegment = new ArraySegment<byte>(Encoding.UTF8.GetBytes(Payload)),
+                Payload = Encoding.UTF8.GetBytes(Payload),
                 QualityOfServiceLevel = MqttQualityOfServiceLevel.AtLeastOnce
             };
         }
@@ -229,7 +229,7 @@ namespace MQTTnet.TestApp
                 var message = new MqttApplicationMessage
                 {
                     Topic = "A/B/C",
-                    PayloadSegment = new ArraySegment<byte>(Encoding.UTF8.GetBytes("Hello World")),
+                    Payload = Encoding.UTF8.GetBytes("Hello World"),
                     QualityOfServiceLevel = MqttQualityOfServiceLevel.ExactlyOnce
                 };
 
@@ -280,7 +280,7 @@ namespace MQTTnet.TestApp
                 var message = new MqttApplicationMessage
                 {
                     Topic = "A/B/C",
-                    PayloadSegment = new ArraySegment<byte>(Encoding.UTF8.GetBytes("Hello World")),
+                    Payload = Encoding.UTF8.GetBytes("Hello World"),
                     QualityOfServiceLevel = MqttQualityOfServiceLevel.AtLeastOnce
                 };
 
@@ -331,7 +331,7 @@ namespace MQTTnet.TestApp
                 var message = new MqttApplicationMessage
                 {
                     Topic = "A/B/C",
-                    PayloadSegment = new ArraySegment<byte>(Encoding.UTF8.GetBytes("Hello World")),
+                    Payload = Encoding.UTF8.GetBytes("Hello World"),
                     QualityOfServiceLevel = MqttQualityOfServiceLevel.AtMostOnce
                 };
 

Source/MQTTnet.TestApp/PublicBrokerTest.cs

@@ -2,12 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using MQTTnet.Client;
 using System;
 using System.Security.Authentication;
 using System.Threading;
 using System.Threading.Tasks;
-using MQTTnet.Client;
-using MQTTnet.Extensions.WebSocket4Net;
 using MQTTnet.Formatter;
 using MQTTnet.Internal;
 using MQTTnet.Protocol;
@@ -18,6 +17,10 @@ namespace MQTTnet.TestApp
     {
         public static async Task RunAsync()
         {
+            // MqttNetConsoleLogger.ForwardToConsole();
+
+            // For most of these connections to work, set output target to Net5.0.            
+
 #if NET5_0_OR_GREATER
             // TLS13 is only available in Net5.0
             var unsafeTls13 = new MqttClientOptionsBuilderTlsParameters
@@ -28,6 +31,7 @@ namespace MQTTnet.TestApp
                 CertificateValidationHandler = w => true
             };
 #endif
+
             // Also defining TLS12 for servers that don't seem no to support TLS13.
             var unsafeTls12 = new MqttClientOptionsBuilderTlsParameters
             {
@@ -38,37 +42,33 @@ namespace MQTTnet.TestApp
             };
 
             // mqtt.eclipseprojects.io
-            await ExecuteTestAsync(
-                "mqtt.eclipseprojects.io TCP",
-                new MqttClientOptionsBuilder().WithTcpServer("mqtt.eclipseprojects.io", 1883).WithProtocolVersion(MqttProtocolVersion.V311).Build());
+            await ExecuteTestAsync("mqtt.eclipseprojects.io TCP",
+                    new MqttClientOptionsBuilder().WithTcpServer("mqtt.eclipseprojects.io", 1883)
+                        .WithProtocolVersion(MqttProtocolVersion.V311).Build());
 
-            await ExecuteTestAsync(
-                "mqtt.eclipseprojects.io WS",
-                new MqttClientOptionsBuilder().WithWebSocketServer("mqtt.eclipseprojects.io:80/mqtt").WithProtocolVersion(MqttProtocolVersion.V311).Build());
+            await ExecuteTestAsync("mqtt.eclipseprojects.io WS",
+                new MqttClientOptionsBuilder().WithWebSocketServer("mqtt.eclipseprojects.io:80/mqtt")
+                    .WithProtocolVersion(MqttProtocolVersion.V311).Build());
 
 #if NET5_0_OR_GREATER
             await ExecuteTestAsync("mqtt.eclipseprojects.io WS TLS13",
                 new MqttClientOptionsBuilder().WithWebSocketServer("mqtt.eclipseprojects.io:443/mqtt")
                     .WithProtocolVersion(MqttProtocolVersion.V311).WithTls(unsafeTls13).Build());
-            
-            await ExecuteTestAsync("mqtt.eclipseprojects.io WS TLS13 (WebSocket4Net)",
-                new MqttClientOptionsBuilder().WithWebSocketServer("mqtt.eclipseprojects.io:443/mqtt")
-                    .WithProtocolVersion(MqttProtocolVersion.V311).WithTls(unsafeTls13).Build(),
-                    true);
 #endif
 
             // test.mosquitto.org
-            await ExecuteTestAsync(
-                "test.mosquitto.org TCP",
-                new MqttClientOptionsBuilder().WithTcpServer("test.mosquitto.org", 1883).WithProtocolVersion(MqttProtocolVersion.V311).Build());
+            await ExecuteTestAsync("test.mosquitto.org TCP",
+                new MqttClientOptionsBuilder().WithTcpServer("test.mosquitto.org", 1883)
+                    .WithProtocolVersion(MqttProtocolVersion.V311).Build());
 
-            await ExecuteTestAsync(
-                "test.mosquitto.org TCP - Authenticated",
-                new MqttClientOptionsBuilder().WithTcpServer("test.mosquitto.org", 1884).WithCredentials("rw", "readwrite").WithProtocolVersion(MqttProtocolVersion.V311).Build());
+            await ExecuteTestAsync("test.mosquitto.org TCP - Authenticated",
+                new MqttClientOptionsBuilder().WithTcpServer("test.mosquitto.org", 1884)
+                    .WithCredentials("rw", "readwrite")
+                    .WithProtocolVersion(MqttProtocolVersion.V311).Build());
 
-            await ExecuteTestAsync(
-                "test.mosquitto.org TCP TLS12",
-                new MqttClientOptionsBuilder().WithTcpServer("test.mosquitto.org", 8883).WithProtocolVersion(MqttProtocolVersion.V311).WithTls(unsafeTls12).Build());
+            await ExecuteTestAsync("test.mosquitto.org TCP TLS12",
+                new MqttClientOptionsBuilder().WithTcpServer("test.mosquitto.org", 8883)
+                    .WithProtocolVersion(MqttProtocolVersion.V311).WithTls(unsafeTls12).Build());
 
 #if NET5_0_OR_GREATER
             await ExecuteTestAsync("test.mosquitto.org TCP TLS13",
@@ -76,40 +76,27 @@ namespace MQTTnet.TestApp
                     .WithProtocolVersion(MqttProtocolVersion.V311).WithTls(unsafeTls13).Build());
 #endif
 
-            await ExecuteTestAsync(
-                "test.mosquitto.org TCP TLS12 - Authenticated",
+            await ExecuteTestAsync("test.mosquitto.org TCP TLS12 - Authenticated",
                 new MqttClientOptionsBuilder().WithTcpServer("test.mosquitto.org", 8885)
                     .WithCredentials("rw", "readwrite")
-                    .WithProtocolVersion(MqttProtocolVersion.V311)
-                    .WithTls(unsafeTls12)
-                    .Build());
+                    .WithProtocolVersion(MqttProtocolVersion.V311).WithTls(unsafeTls12).Build());
 
-            await ExecuteTestAsync(
-                "test.mosquitto.org WS",
-                new MqttClientOptionsBuilder().WithWebSocketServer("test.mosquitto.org:8080/mqtt").WithProtocolVersion(MqttProtocolVersion.V311).Build());
+            await ExecuteTestAsync("test.mosquitto.org WS",
+                new MqttClientOptionsBuilder().WithWebSocketServer("test.mosquitto.org:8080/mqtt")
+                    .WithProtocolVersion(MqttProtocolVersion.V311).Build());
 
-            await ExecuteTestAsync(
-                "test.mosquitto.org WS (WebSocket4Net)",
-                new MqttClientOptionsBuilder().WithWebSocketServer("test.mosquitto.org:8080/mqtt").WithProtocolVersion(MqttProtocolVersion.V311).Build(),
-                true);
-
-            await ExecuteTestAsync(
-                "test.mosquitto.org WS TLS12",
-                new MqttClientOptionsBuilder().WithWebSocketServer("test.mosquitto.org:8081/mqtt").WithProtocolVersion(MqttProtocolVersion.V311).WithTls(unsafeTls12).Build());
-
-            // await ExecuteTestAsync(
-            //     "test.mosquitto.org WS TLS12 (WebSocket4Net)",
-            //     new MqttClientOptionsBuilder().WithWebSocketServer("test.mosquitto.org:8081/mqtt").WithProtocolVersion(MqttProtocolVersion.V311).WithTls(unsafeTls12).Build(),
-            //     true);
+            await ExecuteTestAsync("test.mosquitto.org WS TLS12",
+                new MqttClientOptionsBuilder().WithWebSocketServer("test.mosquitto.org:8081/mqtt")
+                    .WithProtocolVersion(MqttProtocolVersion.V311).WithTls(unsafeTls12).Build());
 
             // broker.emqx.io
-            await ExecuteTestAsync(
-                "broker.emqx.io TCP",
-                new MqttClientOptionsBuilder().WithTcpServer("broker.emqx.io", 1883).WithProtocolVersion(MqttProtocolVersion.V311).Build());
+            await ExecuteTestAsync("broker.emqx.io TCP",
+                new MqttClientOptionsBuilder().WithTcpServer("broker.emqx.io", 1883)
+                     .WithProtocolVersion(MqttProtocolVersion.V311).Build());
 
-            await ExecuteTestAsync(
-                "broker.emqx.io TCP TLS12",
-                new MqttClientOptionsBuilder().WithTcpServer("broker.emqx.io", 8883).WithProtocolVersion(MqttProtocolVersion.V311).WithTls(unsafeTls12).Build());
+            await ExecuteTestAsync("broker.emqx.io TCP TLS12",
+                new MqttClientOptionsBuilder().WithTcpServer("broker.emqx.io", 8883)
+                    .WithProtocolVersion(MqttProtocolVersion.V311).WithTls(unsafeTls12).Build());
 
 #if NET5_0_OR_GREATER
             await ExecuteTestAsync("broker.emqx.io TCP TLS13",
@@ -117,37 +104,23 @@ namespace MQTTnet.TestApp
                     .WithProtocolVersion(MqttProtocolVersion.V311).WithTls(unsafeTls13).Build());
 #endif
 
-            await ExecuteTestAsync(
-                "broker.emqx.io WS",
-                new MqttClientOptionsBuilder().WithWebSocketServer("broker.emqx.io:8083/mqtt").WithProtocolVersion(MqttProtocolVersion.V311).Build());
+            await ExecuteTestAsync("broker.emqx.io WS",
+                new MqttClientOptionsBuilder().WithWebSocketServer("broker.emqx.io:8083/mqtt")
+                    .WithProtocolVersion(MqttProtocolVersion.V311).Build());
 
-            await ExecuteTestAsync(
-                "broker.emqx.io WS (WebSocket4Net)",
-                new MqttClientOptionsBuilder().WithWebSocketServer("broker.emqx.io:8084/mqtt").WithProtocolVersion(MqttProtocolVersion.V311).Build(),
-                true);
+            await ExecuteTestAsync("broker.emqx.io WS TLS12",
+                new MqttClientOptionsBuilder().WithWebSocketServer("broker.emqx.io:8084/mqtt")
+                    .WithProtocolVersion(MqttProtocolVersion.V311).WithTls(unsafeTls12).Build());
 
-            await ExecuteTestAsync(
-                "broker.emqx.io WS TLS12",
-                new MqttClientOptionsBuilder().WithWebSocketServer("broker.emqx.io:8084/mqtt").WithProtocolVersion(MqttProtocolVersion.V311).WithTls(unsafeTls12).Build());
-
-            await ExecuteTestAsync(
-                "broker.emqx.io WS TLS12 (WebSocket4Net)",
-                new MqttClientOptionsBuilder().WithWebSocketServer("broker.emqx.io:8084/mqtt").WithProtocolVersion(MqttProtocolVersion.V311).WithTls(unsafeTls12).Build(),
-                true);
 
             // broker.hivemq.com
-            await ExecuteTestAsync(
-                "broker.hivemq.com TCP",
-                new MqttClientOptionsBuilder().WithTcpServer("broker.hivemq.com", 1883).WithProtocolVersion(MqttProtocolVersion.V311).Build());
+            await ExecuteTestAsync("broker.hivemq.com TCP",
+                new MqttClientOptionsBuilder().WithTcpServer("broker.hivemq.com", 1883)
+                    .WithProtocolVersion(MqttProtocolVersion.V311).Build());
 
-            await ExecuteTestAsync(
-                "broker.hivemq.com WS",
-                new MqttClientOptionsBuilder().WithWebSocketServer("broker.hivemq.com:8000/mqtt").WithProtocolVersion(MqttProtocolVersion.V311).Build());
-
-            await ExecuteTestAsync(
-                "broker.hivemq.com WS (WebSocket4Net)",
-                new MqttClientOptionsBuilder().WithWebSocketServer("broker.hivemq.com:8000/mqtt").WithProtocolVersion(MqttProtocolVersion.V311).Build(),
-                true);
+            await ExecuteTestAsync("broker.hivemq.com WS",
+                new MqttClientOptionsBuilder().WithWebSocketServer("broker.hivemq.com:8000/mqtt")
+                    .WithProtocolVersion(MqttProtocolVersion.V311).Build());
 
             // mqtt.swifitch.cz: Does not seem to operate any more
 
@@ -157,43 +130,36 @@ namespace MQTTnet.TestApp
             Console.ReadLine();
         }
 
-        static async Task ExecuteTestAsync(string name, MqttClientOptions options, bool useWebSocket4Net = false)
+        static async Task ExecuteTestAsync(string name, MqttClientOptions options)
         {
             try
             {
                 Write("Testing '" + name + "'... ", ConsoleColor.Gray);
-
                 var factory = new MqttFactory();
-                if (useWebSocket4Net)
+                //factory.UseWebSocket4Net();
+                var client = factory.CreateMqttClient();
+                var topic = Guid.NewGuid().ToString();
+
+                MqttApplicationMessage receivedMessage = null;
+                client.ApplicationMessageReceivedAsync += e =>
                 {
-                    factory.UseWebSocket4Net();
+                    receivedMessage = e.ApplicationMessage;
+                    return CompletedTask.Instance;
+                };
+
+                await client.ConnectAsync(options);
+                await client.SubscribeAsync(topic, MqttQualityOfServiceLevel.AtLeastOnce);
+                await client.PublishStringAsync(topic, "Hello_World", MqttQualityOfServiceLevel.AtLeastOnce);
+
+                SpinWait.SpinUntil(() => receivedMessage != null, 5000);
+
+                if (receivedMessage?.Topic != topic || receivedMessage?.ConvertPayloadToString() != "Hello_World")
+                {
+                    throw new Exception("Message invalid.");
                 }
 
-                using (var client = factory.CreateMqttClient())
-                {
-                    MqttApplicationMessage receivedMessage = null;
-                    client.ApplicationMessageReceivedAsync += e =>
-                    {
-                        receivedMessage = e.ApplicationMessage;
-                        return CompletedTask.Instance;
-                    };
-
-                    await client.ConnectAsync(options).ConfigureAwait(false);
-
-                    var topic = Guid.NewGuid().ToString();
-                    await client.SubscribeAsync(topic, MqttQualityOfServiceLevel.AtLeastOnce).ConfigureAwait(false);
-                    await client.PublishStringAsync(topic, "Hello_World", MqttQualityOfServiceLevel.AtLeastOnce).ConfigureAwait(false);
-
-                    SpinWait.SpinUntil(() => receivedMessage != null, 5000);
-
-                    if (receivedMessage?.Topic != topic || receivedMessage?.ConvertPayloadToString() != "Hello_World")
-                    {
-                        throw new Exception("Message invalid.");
-                    }
-
-                    await client.UnsubscribeAsync(topic).ConfigureAwait(false);
-                    await client.DisconnectAsync().ConfigureAwait(false);
-                }
+                await client.UnsubscribeAsync(topic);
+                await client.DisconnectAsync();
 
                 Write("[OK]\n", ConsoleColor.Green);
             }
@@ -208,5 +174,6 @@ namespace MQTTnet.TestApp
             Console.ForegroundColor = color;
             Console.Write(message);
         }
+
     }
-}
+}

Source/MQTTnet.TestApp/ServerTest.cs

@@ -5,7 +5,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using MQTTnet.Diagnostics;
@@ -101,7 +100,7 @@ namespace MQTTnet.TestApp
                     {
                         // Replace the payload with the timestamp. But also extending a JSON 
                         // based payload with the timestamp is a suitable use case.
-                        e.ApplicationMessage.PayloadSegment = new ArraySegment<byte>(Encoding.UTF8.GetBytes(DateTime.Now.ToString("O")));
+                        e.ApplicationMessage.Payload = Encoding.UTF8.GetBytes(DateTime.Now.ToString("O"));
                     }
 
                     if (e.ApplicationMessage.Topic == "not_allowed_topic")
@@ -144,16 +143,10 @@ namespace MQTTnet.TestApp
                 
                 mqttServer.InterceptingPublishAsync += e =>
                 {
-                    var payloadText = string.Empty;
-                    if (e.ApplicationMessage.PayloadSegment.Count > 0)
-                    {
-                        payloadText = Encoding.UTF8.GetString(
-                            e.ApplicationMessage.PayloadSegment.Array,
-                            e.ApplicationMessage.PayloadSegment.Offset,
-                            e.ApplicationMessage.PayloadSegment.Count);
-                    }
+                    MqttNetConsoleLogger.PrintToConsole(
+                        $"'{e.ClientId}' reported '{e.ApplicationMessage.Topic}' > '{Encoding.UTF8.GetString(e.ApplicationMessage.Payload ?? new byte[0])}'",
+                        ConsoleColor.Magenta);
                     
-                    MqttNetConsoleLogger.PrintToConsole($"'{e.ClientId}' reported '{e.ApplicationMessage.Topic}' > '{payloadText}'", ConsoleColor.Magenta);
                     return CompletedTask.Instance;
                 };
 

Source/MQTTnet.Tests/Client/LowLevelMqttClient_Tests.cs

@@ -14,7 +14,7 @@ using MQTTnet.LowLevelClient;
 using MQTTnet.Packets;
 using MQTTnet.Protocol;
 
-namespace MQTTnet.Tests.Clients.LowLevelMqttClient
+namespace MQTTnet.Tests.Client
 {
     [TestClass]
     public sealed class LowLevelMqttClient_Tests : BaseTestClass

Source/MQTTnet.Tests/Client/ManagedMqttClient_Tests.cs

@@ -17,7 +17,7 @@ using MQTTnet.Protocol;
 using MQTTnet.Server;
 using MQTTnet.Tests.Mockups;
 
-namespace MQTTnet.Tests.Clients.ManagedMqttClient
+namespace MQTTnet.Tests.Client
 {
     [TestClass]
     public sealed class ManagedMqttClient_Tests : BaseTestClass
@@ -47,12 +47,10 @@ namespace MQTTnet.Tests.Clients.ManagedMqttClient
 
                 await managedClient.StartAsync(managedClientOptions);
                 await LongTestDelay();
-                await LongTestDelay();
                 
                 // Send test data.
                 await senderClient.PublishStringAsync("topic1");
                 await LongTestDelay();
-                await LongTestDelay();
                 
                 receivedMessages.AssertReceivedCountEquals(1);
 
@@ -164,7 +162,7 @@ namespace MQTTnet.Tests.Clients.ManagedMqttClient
                     .Build();
 
                 var dyingClient = testEnvironment.CreateClient();
-                var dyingManagedClient = new MQTTnet.Extensions.ManagedClient.ManagedMqttClient(dyingClient, testEnvironment.ClientLogger);
+                var dyingManagedClient = new ManagedMqttClient(dyingClient, testEnvironment.ClientLogger);
 
                 await dyingManagedClient.StartAsync(new ManagedMqttClientOptionsBuilder().WithClientOptions(clientOptions).Build());
 
@@ -199,7 +197,7 @@ namespace MQTTnet.Tests.Clients.ManagedMqttClient
             {
                 var server = await testEnvironment.StartServer();
 
-                var managedClient = new MQTTnet.Extensions.ManagedClient.ManagedMqttClient(testEnvironment.CreateClient(), new MqttNetEventLogger());
+                var managedClient = new ManagedMqttClient(testEnvironment.CreateClient(), new MqttNetEventLogger());
                 var clientOptions = new MqttClientOptionsBuilder().WithTcpServer("localhost", testEnvironment.ServerPort);
 
                 var connected = GetConnectedTask(managedClient);
@@ -226,7 +224,7 @@ namespace MQTTnet.Tests.Clients.ManagedMqttClient
 
                 await testEnvironment.StartServer();
 
-                var managedClient = new MQTTnet.Extensions.ManagedClient.ManagedMqttClient(testEnvironment.CreateClient(), new MqttNetEventLogger());
+                var managedClient = new ManagedMqttClient(testEnvironment.CreateClient(), new MqttNetEventLogger());
                 var clientOptions = new MqttClientOptionsBuilder().WithTcpServer("localhost", testEnvironment.ServerPort);
                 var storage = new ManagedMqttClientTestStorage();
 
@@ -331,7 +329,13 @@ namespace MQTTnet.Tests.Clients.ManagedMqttClient
                 await testEnvironment.StartServer().ConfigureAwait(false);
 
                 var sendingClient = await testEnvironment.ConnectClient().ConfigureAwait(false);
-                await sendingClient.PublishStringAsync("topic", "A", retain: true);
+                await sendingClient.PublishAsync(
+                    new MqttApplicationMessage
+                    {
+                        Topic = "topic",
+                        Payload = new byte[] { 1 },
+                        Retain = true
+                    });
 
                 // Wait a bit for the retained message to be available
                 await LongTestDelay();
@@ -353,15 +357,18 @@ namespace MQTTnet.Tests.Clients.ManagedMqttClient
 
                 await managedClient.SubscribeAsync("topic");
 
-                await managedClient.StartAsync(new ManagedMqttClientOptionsBuilder().WithClientOptions(clientOptions).WithAutoReconnectDelay(TimeSpan.FromSeconds(0.5)).Build());
+                await managedClient.StartAsync(new ManagedMqttClientOptionsBuilder().WithClientOptions(clientOptions).WithAutoReconnectDelay(TimeSpan.FromSeconds(1)).Build());
+
                 await LongTestDelay();
 
                 Assert.AreEqual(1, receivedManagedMessages.Count);
 
                 await managedClient.StopAsync();
+
                 await LongTestDelay();
 
-                await managedClient.StartAsync(new ManagedMqttClientOptionsBuilder().WithClientOptions(clientOptions).WithAutoReconnectDelay(TimeSpan.FromSeconds(0.5)).Build());
+                await managedClient.StartAsync(new ManagedMqttClientOptionsBuilder().WithClientOptions(clientOptions).WithAutoReconnectDelay(TimeSpan.FromSeconds(1)).Build());
+
                 await LongTestDelay();
 
                 // After reconnect and then some delay, the retained message must not be received,
@@ -370,6 +377,7 @@ namespace MQTTnet.Tests.Clients.ManagedMqttClient
 
                 // Make sure that it gets received after subscribing again.
                 await managedClient.SubscribeAsync("topic");
+                
                 await LongTestDelay();
                 
                 Assert.AreEqual(2, receivedManagedMessages.Count);
@@ -439,7 +447,7 @@ namespace MQTTnet.Tests.Clients.ManagedMqttClient
             }
         }
 
-        async Task<MQTTnet.Extensions.ManagedClient.ManagedMqttClient> CreateManagedClientAsync(
+        async Task<ManagedMqttClient> CreateManagedClientAsync(
             TestEnvironment testEnvironment,
             IMqttClient underlyingClient = null,
             TimeSpan? connectionCheckInterval = null,
@@ -456,7 +464,7 @@ namespace MQTTnet.Tests.Clients.ManagedMqttClient
             // at connection check intervals
             managedOptions.ConnectionCheckInterval = connectionCheckInterval ?? TimeSpan.FromSeconds(0.1);
 
-            var managedClient = new MQTTnet.Extensions.ManagedClient.ManagedMqttClient(underlyingClient ?? testEnvironment.CreateClient(), new MqttNetEventLogger());
+            var managedClient = new ManagedMqttClient(underlyingClient ?? testEnvironment.CreateClient(), new MqttNetEventLogger());
 
             var connected = GetConnectedTask(managedClient);
 
@@ -473,7 +481,7 @@ namespace MQTTnet.Tests.Clients.ManagedMqttClient
         ///         name="managedClient" />
         ///     has connected
         /// </summary>
-        Task GetConnectedTask(MQTTnet.Extensions.ManagedClient.ManagedMqttClient managedClient)
+        Task GetConnectedTask(ManagedMqttClient managedClient)
         {
             var connected = new TaskCompletionSource<bool>();
 
@@ -495,7 +503,7 @@ namespace MQTTnet.Tests.Clients.ManagedMqttClient
         ///         name="expectedNumberOfMessages" />
         ///     have been received
         /// </summary>
-        Task<List<MqttApplicationMessage>> SetupReceivingOfMessages(MQTTnet.Extensions.ManagedClient.ManagedMqttClient managedClient, int expectedNumberOfMessages)
+        Task<List<MqttApplicationMessage>> SetupReceivingOfMessages(ManagedMqttClient managedClient, int expectedNumberOfMessages)
         {
             var receivedMessages = new List<MqttApplicationMessage>();
             var result = new AsyncTaskCompletionSource<List<MqttApplicationMessage>>();

Source/MQTTnet.Tests/Client/MqttClientOptionsBuilder_Tests.cs

@@ -6,8 +6,9 @@ using System.Linq;
 using System.Text;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using MQTTnet.Client;
+using MQTTnet.Extensions;
 
-namespace MQTTnet.Tests.Clients
+namespace MQTTnet.Tests.Client
 {
     [TestClass]
     public class MqttClientOptionsBuilder_Tests

Source/MQTTnet.Tests/Client/MqttClient_Tests.cs

@@ -21,7 +21,7 @@ using MQTTnet.Tests.Mockups;
 
 // ReSharper disable InconsistentNaming
 
-namespace MQTTnet.Tests.Clients.MqttClient
+namespace MQTTnet.Tests.Client
 {
     [TestClass]
     public sealed class MqttClient_Tests : BaseTestClass
@@ -71,34 +71,60 @@ namespace MQTTnet.Tests.Clients.MqttClient
         }
 
         [TestMethod]
-        public async Task Connect_Disconnect_Connect()
+        [ExpectedException(typeof(MqttCommunicationException))]
+        public async Task Connect_To_Invalid_Server_Port_Not_Opened()
         {
-            using (var testEnvironment = CreateTestEnvironment())
+            var client = new MqttFactory().CreateMqttClient();
+            await client.ConnectAsync(new MqttClientOptionsBuilder().WithTcpServer("127.0.0.1", 12345).WithTimeout(TimeSpan.FromSeconds(5)).Build());
+        }
+
+        [TestMethod]
+        [ExpectedException(typeof(OperationCanceledException))]
+        public async Task Connect_To_Invalid_Server_Wrong_IP()
+        {
+            var client = new MqttFactory().CreateMqttClient();
+            using (var timeout = new CancellationTokenSource(TimeSpan.FromSeconds(2)))
             {
-                await testEnvironment.StartServer();
-
-                var clientOptions = testEnvironment.CreateDefaultClientOptions();
-                var client = testEnvironment.CreateClient();
-
-                await client.ConnectAsync(clientOptions);
-                await client.DisconnectAsync();
-                await client.ConnectAsync(clientOptions);
+                await client.ConnectAsync(new MqttClientOptionsBuilder().WithTcpServer("1.2.3.4").Build(), timeout.Token);
             }
         }
-        
+
         [TestMethod]
-        [ExpectedException(typeof(InvalidOperationException))]
-        public async Task Connect_Multiple_Times_Should_Fail()
+        [ExpectedException(typeof(MqttCommunicationException))]
+        public async Task Connect_To_Invalid_Server_Wrong_Protocol()
         {
-            using (var testEnvironment = CreateTestEnvironment())
+            var client = new MqttFactory().CreateMqttClient();
+            await client.ConnectAsync(new MqttClientOptionsBuilder().WithTcpServer("http://127.0.0.1", 12345).WithTimeout(TimeSpan.FromSeconds(2)).Build());
+        }
+
+        [TestMethod]
+        public async Task ConnectTimeout_Throws_Exception()
+        {
+            var factory = new MqttFactory();
+            using (var client = factory.CreateMqttClient())
             {
-                await testEnvironment.StartServer();
+                var disconnectHandlerCalled = false;
+                try
+                {
+                    client.DisconnectedAsync += args =>
+                    {
+                        disconnectHandlerCalled = true;
+                        return CompletedTask.Instance;
+                    };
 
-                var clientOptions = testEnvironment.CreateDefaultClientOptions();
-                var client = testEnvironment.CreateClient();
+                    await client.ConnectAsync(new MqttClientOptionsBuilder().WithTcpServer("1.2.3.4").Build());
 
-                await client.ConnectAsync(clientOptions);
-                await client.ConnectAsync(clientOptions);
+                    Assert.Fail("Must fail!");
+                }
+                catch (Exception exception)
+                {
+                    Assert.IsNotNull(exception);
+                    Assert.IsInstanceOfType(exception, typeof(MqttCommunicationException));
+                    //Assert.IsInstanceOfType(exception.InnerException, typeof(SocketException));
+                }
+
+                await LongTestDelay(); // disconnected handler is called async
+                Assert.IsTrue(disconnectHandlerCalled);
             }
         }
 

Source/MQTTnet.Tests/Clients/MqttClient/MqttClient_Connection_Tests.cs

@@ -1,166 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using MQTTnet.Client;
-using MQTTnet.Exceptions;
-using MQTTnet.Formatter;
-using MQTTnet.Internal;
-using MQTTnet.Protocol;
-using MQTTnet.Server;
-
-namespace MQTTnet.Tests.Clients.MqttClient
-{
-    [TestClass]
-    public sealed class MqttClient_Connection_Tests : BaseTestClass
-    {
-        [TestMethod]
-        [ExpectedException(typeof(MqttCommunicationException))]
-        public async Task Connect_To_Invalid_Server_Port_Not_Opened()
-        {
-            var client = new MqttFactory().CreateMqttClient();
-            using (var timeout = new CancellationTokenSource(TimeSpan.FromSeconds(5)))
-            {
-                await client.ConnectAsync(new MqttClientOptionsBuilder().WithTcpServer("127.0.0.1", 12345).Build(), timeout.Token);
-            }
-        }
-
-        [TestMethod]
-        [ExpectedException(typeof(OperationCanceledException))]
-        public async Task Connect_To_Invalid_Server_Wrong_IP()
-        {
-            var client = new MqttFactory().CreateMqttClient();
-            using (var timeout = new CancellationTokenSource(TimeSpan.FromSeconds(2)))
-            {
-                await client.ConnectAsync(new MqttClientOptionsBuilder().WithTcpServer("1.2.3.4").Build(), timeout.Token);
-            }
-        }
-
-        [TestMethod]
-        [ExpectedException(typeof(MqttCommunicationException))]
-        public async Task Connect_To_Invalid_Server_Wrong_Protocol()
-        {
-            var client = new MqttFactory().CreateMqttClient();
-            await client.ConnectAsync(new MqttClientOptionsBuilder().WithTcpServer("http://127.0.0.1", 12345).WithTimeout(TimeSpan.FromSeconds(2)).Build());
-        }
-
-        [TestMethod]
-        public async Task ConnectTimeout_Throws_Exception()
-        {
-            var factory = new MqttFactory();
-            using (var client = factory.CreateMqttClient())
-            {
-                var disconnectHandlerCalled = false;
-                try
-                {
-                    client.DisconnectedAsync += args =>
-                    {
-                        disconnectHandlerCalled = true;
-                        return CompletedTask.Instance;
-                    };
-
-                    await client.ConnectAsync(new MqttClientOptionsBuilder().WithTcpServer("1.2.3.4").Build());
-
-                    Assert.Fail("Must fail!");
-                }
-                catch (Exception exception)
-                {
-                    Assert.IsNotNull(exception);
-                    Assert.IsInstanceOfType(exception, typeof(MqttCommunicationException));
-                }
-
-                await LongTestDelay(); // disconnected handler is called async
-                Assert.IsTrue(disconnectHandlerCalled);
-            }
-        }
-
-        [TestMethod]
-        public async Task Disconnect_Clean()
-        {
-            using (var testEnvironment = CreateTestEnvironment(MqttProtocolVersion.V500))
-            {
-                var server = await testEnvironment.StartServer();
-
-                ClientDisconnectedEventArgs eventArgs = null;
-                server.ClientDisconnectedAsync += args =>
-                {
-                    eventArgs = args;
-                    return CompletedTask.Instance;
-                };
-
-                var client = await testEnvironment.ConnectClient();
-
-                var disconnectOptions = testEnvironment.Factory.CreateClientDisconnectOptionsBuilder().WithReason(MqttClientDisconnectOptionsReason.MessageRateTooHigh).Build();
-
-                // Perform a clean disconnect.
-                await client.DisconnectAsync(disconnectOptions);
-
-                await LongTestDelay();
-
-                Assert.IsNotNull(eventArgs);
-                Assert.AreEqual(MqttClientDisconnectType.Clean, eventArgs.DisconnectType);
-            }
-        }
-
-        [TestMethod]
-        public async Task Disconnect_Clean_With_Custom_Reason()
-        {
-            using (var testEnvironment = CreateTestEnvironment(MqttProtocolVersion.V500))
-            {
-                var server = await testEnvironment.StartServer();
-
-                ClientDisconnectedEventArgs eventArgs = null;
-                server.ClientDisconnectedAsync += args =>
-                {
-                    eventArgs = args;
-                    return CompletedTask.Instance;
-                };
-
-                var client = await testEnvironment.ConnectClient();
-
-                var disconnectOptions = testEnvironment.Factory.CreateClientDisconnectOptionsBuilder().WithReason(MqttClientDisconnectOptionsReason.MessageRateTooHigh).Build();
-
-                // Perform a clean disconnect.
-                await client.DisconnectAsync(disconnectOptions);
-
-                Assert.IsNotNull(eventArgs);
-                Assert.AreEqual(MqttDisconnectReasonCode.MessageRateTooHigh, eventArgs.ReasonCode);
-            }
-        }
-
-        [TestMethod]
-        public async Task Disconnect_Clean_With_User_Properties()
-        {
-            using (var testEnvironment = CreateTestEnvironment(MqttProtocolVersion.V500))
-            {
-                var server = await testEnvironment.StartServer();
-
-                ClientDisconnectedEventArgs eventArgs = null;
-                server.ClientDisconnectedAsync += args =>
-                {
-                    eventArgs = args;
-                    return CompletedTask.Instance;
-                };
-
-                var client = await testEnvironment.ConnectClient();
-
-                var disconnectOptions = testEnvironment.Factory.CreateClientDisconnectOptionsBuilder().WithUserProperty("test_name", "test_value").Build();
-
-                // Perform a clean disconnect.
-                await client.DisconnectAsync(disconnectOptions);
-
-                await LongTestDelay();
-                
-                Assert.IsNotNull(eventArgs);
-                Assert.IsNotNull(eventArgs.UserProperties);
-                Assert.AreEqual(1, eventArgs.UserProperties.Count);
-                Assert.AreEqual("test_name", eventArgs.UserProperties[0].Name);
-                Assert.AreEqual("test_value", eventArgs.UserProperties[0].Value);
-            }
-        }
-    }
-}

Source/MQTTnet.Tests/Diagnostics/PacketInspection_Tests.cs

@@ -30,7 +30,7 @@ namespace MQTTnet.Tests.Diagnostics
 
                     var packets = new List<string>();
                     
-                    mqttClient.InspectPacketAsync += eventArgs =>
+                    mqttClient.InspectPackage += eventArgs =>
                     {
                         packets.Add(eventArgs.Direction + ":" + Convert.ToBase64String(eventArgs.Buffer));
                         return CompletedTask.Instance;

Source/MQTTnet.Tests/Extensions/MqttPacketWriterExtensions.cs

@@ -5,7 +5,7 @@
 using MQTTnet.Formatter;
 using MQTTnet.Protocol;
 
-namespace MQTTnet.Tests.Helpers
+namespace MQTTnet.Tests.Extensions
 {
     public static class MqttPacketWriterExtensions
     {

Source/MQTTnet.Tests/Extensions/WebSocket4Net_Tests.cs

@@ -1,51 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Threading.Tasks;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using MQTTnet.Client;
-using MQTTnet.Exceptions;
-using MQTTnet.Extensions.WebSocket4Net;
-using MQTTnet.Tests.Helpers;
-
-namespace MQTTnet.Tests.Extensions
-{
-    [TestClass]
-    public sealed class WebSocket4Net_Tests
-    {
-        [TestMethod]
-        [ExpectedException(typeof(MqttCommunicationException))]
-        public async Task Connect_Failed_With_Invalid_Server()
-        {
-            var factory = new MqttFactory().UseWebSocket4Net();
-
-            using (var client = factory.CreateMqttClient())
-            {
-                var options = new MqttClientOptionsBuilder().WithWebSocketServer("ws://a.b/mqtt").WithTimeout(TimeSpan.FromSeconds(2)).Build();
-                await client.ConnectAsync(options).ConfigureAwait(false);
-            }
-        }
-
-        [TestMethod]
-        public void Use_Correct_Adapter()
-        {
-            // Should not throw exception
-            var factory = new MqttFactory().UseWebSocket4Net();
-            using (var client = factory.CreateMqttClient())
-            {
-                var adapterFactory = client.GetFieldValue("_adapterFactory");
-
-                Assert.IsInstanceOfType(adapterFactory, typeof(WebSocket4NetMqttClientAdapterFactory));
-            }
-        }
-
-        [TestMethod]
-        public void Use_WebSocket4Net()
-        {
-            // Should not throw exception
-            new MqttFactory().UseWebSocket4Net();
-        }
-    }
-}

Source/MQTTnet.Tests/Formatter/MqttBufferReader_Tests.cs

@@ -1,310 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using MQTTnet.Exceptions;
-using MQTTnet.Formatter;
-
-namespace MQTTnet.Tests.Formatter
-{
-    [TestClass]
-    public sealed class MqttBufferReader_Tests
-    {
-        [TestMethod]
-        [ExpectedException(typeof(MqttProtocolViolationException), "Expected at least 4 bytes but there are only 3 bytes")]
-        public void Fire_Exception_If_Not_Enough_Data()
-        {
-            var buffer = new byte[] { 0, 1, 2 };
-
-            var reader = new MqttBufferReader();
-
-            reader.SetBuffer(buffer, 0, 3);
-
-            // 1 byte is missing.
-            reader.ReadFourByteInteger();
-        }
-
-        [TestMethod]
-        [ExpectedException(typeof(MqttProtocolViolationException), "Expected at least 4 bytes but there are only 3 bytes")]
-        public void Fire_Exception_If_Not_Enough_Data_With_Longer_Buffer()
-        {
-            var buffer = new byte[] { 0, 1, 2, 3, 4, 5, 6 };
-
-            var reader = new MqttBufferReader();
-
-            reader.SetBuffer(buffer, 0, 3);
-
-            // 1 byte is missing.
-            reader.ReadFourByteInteger();
-        }
-
-        [TestMethod]
-        public void Is_EndOfStream_Without_Buffer()
-        {
-            var reader = new MqttBufferReader();
-
-            Assert.IsTrue(reader.EndOfStream);
-            Assert.AreEqual(0, reader.BytesLeft);
-        }
-
-        [TestMethod]
-        public void Read_Remaining_Data_From_Larger_Buffer()
-        {
-            var buffer = new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
-
-            var reader = new MqttBufferReader();
-
-            // The used buffer contains more data than used!
-            reader.SetBuffer(buffer, 0, 5);
-
-            // This should only read 5 bytes even if more data is in the buffer
-            // due to custom bounds.
-            var remainingData = reader.ReadRemainingData();
-
-            Assert.IsTrue(reader.EndOfStream);
-            Assert.AreEqual(0, reader.BytesLeft);
-            Assert.AreEqual(5, remainingData.Length);
-        }
-
-        [TestMethod]
-        public void Read_Various_Positions_and_Offsets()
-        {
-            const int NumBufferElements = 1000;
-            const int NumTestSequences = 10000;
-
-            const string TestString = "The quick brown fox jumps over the lazy dog.";
-
-            var rndSeed = Environment.TickCount;
-            // rndSeed = ...; // assign random seed here if there is an error so that it can be repeated
-            var rnd = new Random(rndSeed);
-            // rndSeed is printed when an assert fails
-
-            var bufferElements = new List<ElementReference>();
-
-            byte[] elementBuffer;
-
-            // Fill a buffer with strings or numbers in big endian format
-            using (var ms = new MemoryStream())
-            {
-                using (var bw = new BinaryWriter(ms))
-                {
-                    var bufferOffset = 0;
-
-                    for (var i = 0; i < NumBufferElements; i++)
-                    {
-                        var nextElementType = (ElementReference.BufferElementType)rnd.Next(ElementReference.NumBufferElementTypes);
-
-                        byte[] elementBytes = null;
-                        uint elementNumberValue = 0; // all element number values fit into uint
-                        string elementStringValue = null;
-                        var elementSize = 0;
-
-                        var alreadyBigEndian = false;
-                        switch (nextElementType)
-                        {
-                            case ElementReference.BufferElementType.Byte:
-                                var byteValue = (byte)i;
-                                elementNumberValue = byteValue;
-                                elementSize = sizeof(byte);
-                                elementBytes = new byte[1] { byteValue };
-                                alreadyBigEndian = true; // nothing to swap
-                                break;
-                            case ElementReference.BufferElementType.TwoByteInt:
-                                var ushortValue = (ushort)i;
-                                elementNumberValue = ushortValue;
-                                elementSize = sizeof(ushort);
-                                elementBytes = BitConverter.GetBytes(ushortValue);
-                                break;
-                            case ElementReference.BufferElementType.FourByteInt:
-                                var uintValue = (uint)i;
-                                elementNumberValue = uintValue;
-                                elementSize = sizeof(uint);
-                                elementBytes = BitConverter.GetBytes(uintValue);
-                                break;
-                            case ElementReference.BufferElementType.VariableSizeInt:
-                            {
-                                elementNumberValue = (uint)i;
-                                var writer = new MqttBufferWriter(4, 4);
-                                writer.WriteVariableByteInteger(elementNumberValue);
-                                elementSize = writer.Length;
-                                elementBytes = new byte[elementSize];
-                                var buffer = writer.GetBuffer();
-                                Array.Copy(buffer, elementBytes, elementSize);
-                                alreadyBigEndian = true; // nothing to swap
-                            }
-                                break;
-                            case ElementReference.BufferElementType.String:
-                            {
-                                var stringLen = rnd.Next(TestString.Length);
-                                elementStringValue = TestString.Substring(0, stringLen); // could be empty
-                                var writer = new MqttBufferWriter(stringLen + 1, stringLen + 1);
-                                writer.WriteString(elementStringValue);
-                                elementSize = writer.Length;
-                                elementBytes = new byte[elementSize];
-                                var buffer = writer.GetBuffer();
-                                Array.Copy(buffer, elementBytes, elementSize);
-                                alreadyBigEndian = true; // nothing to swap
-                            }
-                                break;
-                        }
-
-                        if (BitConverter.IsLittleEndian && !alreadyBigEndian)
-                        {
-                            Array.Reverse(elementBytes);
-                        }
-
-                        bw.Write(elementBytes);
-                        bufferElements.Add(new ElementReference(nextElementType, elementSize, elementNumberValue, elementStringValue, bufferOffset));
-                        bufferOffset += elementSize;
-                    }
-
-                    elementBuffer = ms.ToArray();
-                }
-            }
-
-            for (var i = 0; i < NumTestSequences; i++)
-            {
-                var firstElementIndex = rnd.Next(NumBufferElements - 1);
-                // segmentElementIndex will be < NumBufferElements - 1, which means there is at least one byte left for segment element count
-                var elementCount = rnd.Next(NumBufferElements - firstElementIndex) + 1;
-                var lastElementIndex = firstElementIndex + elementCount - 1;
-                // Use element index to get buffer offsets
-                var lastElement = bufferElements[lastElementIndex];
-                var segmentStartPosition = bufferElements[firstElementIndex].BufferOffset;
-                var segmentEndPosition = lastElement.BufferOffset + lastElement.Size;
-                var segmentLength = segmentEndPosition - segmentStartPosition;
-
-                var reader = new MqttBufferReader();
-                reader.SetBuffer(elementBuffer, segmentStartPosition, segmentLength);
-
-                // read all elements in the buffer segment; values should be as expected              
-                for (var n = 0; n < elementCount; n++)
-                {
-                    var element = bufferElements[firstElementIndex + n];
-                    uint elementNumberValue = 0;
-                    string elementStringValue = null;
-
-                    var expectedPosition = element.BufferOffset - segmentStartPosition;
-                    Assert.AreEqual(expectedPosition, reader.Position);
-
-                    switch (element.Type)
-                    {
-                        case ElementReference.BufferElementType.Byte:
-                        {
-                            elementNumberValue = reader.ReadByte();
-                        }
-                            break;
-                        case ElementReference.BufferElementType.TwoByteInt:
-                        {
-                            elementNumberValue = reader.ReadTwoByteInteger();
-                        }
-                            break;
-                        case ElementReference.BufferElementType.FourByteInt:
-                        {
-                            elementNumberValue = reader.ReadFourByteInteger();
-                        }
-                            break;
-                        case ElementReference.BufferElementType.VariableSizeInt:
-                        {
-                            elementNumberValue = reader.ReadVariableByteInteger();
-                        }
-                            break;
-                        case ElementReference.BufferElementType.String:
-                        {
-                            elementStringValue = reader.ReadString();
-                        }
-                            break;
-                    }
-
-                    if (elementStringValue != null)
-                    {
-                        Assert.AreEqual(elementStringValue, element.StringValue, $"'{elementStringValue}' not equal '{element.StringValue}' with random seed {rndSeed}.");
-                    }
-                    else
-                    {
-                        Assert.AreEqual(elementNumberValue, element.NumberValue, $"{elementNumberValue} not equal {element.NumberValue} with random seed {rndSeed}.");
-                    }
-                }
-
-                // confirm end of stream
-                Assert.AreEqual(0, reader.BytesLeft, "BytesLeft not zero as expected with random seed " + rndSeed);
-                Assert.IsTrue(reader.EndOfStream, "Not end of stream as expected with random seed " + rndSeed);
-            }
-        }
-
-        [TestMethod]
-        public void Report_Correct_Length_For_Full_Buffer()
-        {
-            var buffer = new byte[] { 5, 6, 7, 8, 9 };
-
-            var reader = new MqttBufferReader();
-            reader.SetBuffer(buffer, 0, 5);
-
-            Assert.IsFalse(reader.EndOfStream);
-            Assert.AreEqual(5, reader.BytesLeft);
-        }
-
-        [TestMethod]
-        public void Report_Correct_Length_For_Partial_End_Buffer()
-        {
-            var buffer = new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
-
-            var reader = new MqttBufferReader();
-
-            // The used buffer contains more data than used!
-            reader.SetBuffer(buffer, 5, 5);
-
-            Assert.IsFalse(reader.EndOfStream);
-            Assert.AreEqual(5, reader.BytesLeft);
-        }
-
-        [TestMethod]
-        public void Report_Correct_Length_For_Partial_Start_Buffer()
-        {
-            var buffer = new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
-
-            var reader = new MqttBufferReader();
-
-            // The used buffer contains more data than used!
-            reader.SetBuffer(buffer, 0, 5);
-
-            Assert.IsFalse(reader.EndOfStream);
-            Assert.AreEqual(5, reader.BytesLeft);
-        }
-
-
-        // Helper class to build up a reference to elements of various types in a buffer
-        class ElementReference
-        {
-            public enum BufferElementType
-            {
-                Byte,
-                TwoByteInt,
-                FourByteInt,
-                VariableSizeInt,
-                String
-            }
-
-            public const int NumBufferElementTypes = 5;
-
-            public ElementReference(BufferElementType type, int size, uint numberValue, string stringValue, int bufferOffset)
-            {
-                Type = type;
-                Size = size;
-                NumberValue = numberValue;
-                StringValue = stringValue;
-                BufferOffset = bufferOffset;
-            }
-
-            public int BufferOffset { get; }
-            public uint NumberValue { get; }
-            public int Size { get; }
-            public string StringValue { get; }
-            public BufferElementType Type { get; }
-        }
-    }
-}

Source/MQTTnet.Tests/Formatter/MqttPacketSerialization_V3_Binary_Tests.cs

@@ -15,7 +15,7 @@ using MQTTnet.Exceptions;
 using MQTTnet.Formatter;
 using MQTTnet.Packets;
 using MQTTnet.Protocol;
-using MQTTnet.Tests.Helpers;
+using MQTTnet.Tests.Extensions;
 using MQTTnet.Tests.Mockups;
 
 namespace MQTTnet.Tests.Formatter
@@ -111,7 +111,7 @@ namespace MQTTnet.Tests.Formatter
                 PacketIdentifier = 123,
                 Dup = true,
                 Retain = true,
-                PayloadSegment = new ArraySegment<byte>(Encoding.ASCII.GetBytes("HELLO")),
+                Payload = Encoding.ASCII.GetBytes("HELLO"),
                 QualityOfServiceLevel = MqttQualityOfServiceLevel.AtLeastOnce,
                 Topic = "A/B/C"
             };
@@ -318,9 +318,10 @@ namespace MQTTnet.Tests.Formatter
             var publishPacket = new MqttPublishPacket
             {
                 Topic = "abcdefghijklmnopqrstuvwxyz0123456789",
-                PayloadSegment = new ArraySegment<byte>(payload)
+                Payload = payload
             };
 
+
             var serializationHelper = new MqttPacketSerializationHelper();
 
             var buffer = serializationHelper.Encode(publishPacket);
@@ -328,17 +329,17 @@ namespace MQTTnet.Tests.Formatter
 
             Assert.IsNotNull(publishPacketCopy);
             Assert.AreEqual(publishPacket.Topic, publishPacketCopy.Topic);
-            CollectionAssert.AreEqual(publishPacket.PayloadSegment.ToArray(), publishPacketCopy.PayloadSegment.ToArray());
+            CollectionAssert.AreEqual(publishPacket.Payload, publishPacketCopy.Payload);
 
             // Now modify the payload and test again.
-            publishPacket.PayloadSegment = new ArraySegment<byte>(Encoding.UTF8.GetBytes("MQTT"));
+            publishPacket.Payload = Encoding.UTF8.GetBytes("MQTT");
 
             buffer = serializationHelper.Encode(publishPacket);
             var publishPacketCopy2 = serializationHelper.Decode(buffer) as MqttPublishPacket;
 
             Assert.IsNotNull(publishPacketCopy2);
             Assert.AreEqual(publishPacket.Topic, publishPacketCopy2.Topic);
-            CollectionAssert.AreEqual(publishPacket.PayloadSegment.ToArray(), publishPacketCopy2.PayloadSegment.ToArray());
+            CollectionAssert.AreEqual(publishPacket.Payload, publishPacketCopy2.Payload);
         }
 
         [TestMethod]
@@ -462,7 +463,7 @@ namespace MQTTnet.Tests.Formatter
                 PacketIdentifier = 123,
                 Dup = true,
                 Retain = true,
-                PayloadSegment = new ArraySegment<byte>(Encoding.ASCII.GetBytes("HELLO")),
+                Payload = Encoding.ASCII.GetBytes("HELLO"),
                 QualityOfServiceLevel = MqttQualityOfServiceLevel.AtLeastOnce,
                 Topic = "A/B/C"
             };
@@ -566,6 +567,7 @@ namespace MQTTnet.Tests.Formatter
                     using (var adapter = new MqttChannelAdapter(
                                channel,
                                new MqttPacketFormatterAdapter(protocolVersion, new MqttBufferWriter(4096, 65535)),
+                               null,
                                new MqttNetEventLogger()))
                     {
                         var receivedPacket = adapter.ReceivePacketAsync(CancellationToken.None).GetAwaiter().GetResult();
@@ -581,12 +583,19 @@ namespace MQTTnet.Tests.Formatter
         MqttProtocolVersion DeserializeAndDetectVersion(MqttPacketFormatterAdapter packetFormatterAdapter, byte[] buffer)
         {
             var channel = new MemoryMqttChannel(buffer);
-            var adapter = new MqttChannelAdapter(channel, packetFormatterAdapter, new MqttNetEventLogger());
+            var adapter = new MqttChannelAdapter(channel, packetFormatterAdapter, null, new MqttNetEventLogger());
 
             adapter.ReceivePacketAsync(CancellationToken.None).GetAwaiter().GetResult();
             return packetFormatterAdapter.ProtocolVersion;
         }
 
+        MqttBufferReader ReaderFactory(byte[] data)
+        {
+            var reader = new MqttBufferReader();
+            reader.SetBuffer(data, 0, data.Length);
+            return reader;
+        }
+
         TPacket Roundtrip<TPacket>(TPacket packet, MqttProtocolVersion protocolVersion = MqttProtocolVersion.V311, MqttBufferWriter bufferWriter = null) where TPacket : MqttPacket
         {
             var writer = bufferWriter ?? WriterFactory();
@@ -595,7 +604,7 @@ namespace MQTTnet.Tests.Formatter
 
             using (var channel = new MemoryMqttChannel(buffer.Join().ToArray()))
             {
-                var adapter = new MqttChannelAdapter(channel, new MqttPacketFormatterAdapter(protocolVersion, new MqttBufferWriter(4096, 65535)), new MqttNetEventLogger());
+                var adapter = new MqttChannelAdapter(channel, new MqttPacketFormatterAdapter(protocolVersion, new MqttBufferWriter(4096, 65535)), null, new MqttNetEventLogger());
                 return (TPacket)adapter.ReceivePacketAsync(CancellationToken.None).GetAwaiter().GetResult();
             }
         }

Source/MQTTnet.Tests/Formatter/MqttPacketSerialization_V3_Tests.cs

@@ -2,9 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using MQTTnet.Exceptions;
@@ -298,7 +296,7 @@ namespace MQTTnet.Tests.Formatter
                 PacketIdentifier = 123,
                 Dup = true,
                 Retain = true,
-                PayloadSegment = new ArraySegment<byte>(Encoding.ASCII.GetBytes("Payload")),
+                Payload = Encoding.ASCII.GetBytes("Payload"),
                 QualityOfServiceLevel = MqttQualityOfServiceLevel.AtLeastOnce,
                 Topic = "Topic",
                 ResponseTopic = "/Response",
@@ -322,7 +320,7 @@ namespace MQTTnet.Tests.Formatter
             Assert.AreEqual(publishPacket.PacketIdentifier, deserialized.PacketIdentifier);
             Assert.AreEqual(publishPacket.Dup, deserialized.Dup);
             Assert.AreEqual(publishPacket.Retain, deserialized.Retain);
-            CollectionAssert.AreEqual(publishPacket.PayloadSegment.ToArray(), deserialized.PayloadSegment.ToArray());
+            CollectionAssert.AreEqual(publishPacket.Payload, deserialized.Payload);
             Assert.AreEqual(publishPacket.QualityOfServiceLevel, deserialized.QualityOfServiceLevel);
             Assert.AreEqual(publishPacket.Topic, deserialized.Topic);
             Assert.AreEqual(null, deserialized.ResponseTopic); // Not supported in v3.1.1.

Source/MQTTnet.Tests/Formatter/MqttPacketSerialization_V5_Tests.cs

@@ -2,9 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using MQTTnet.Formatter;
@@ -259,7 +257,7 @@ namespace MQTTnet.Tests.Formatter
                 PacketIdentifier = 123,
                 Dup = true,
                 Retain = true,
-                PayloadSegment = new ArraySegment<byte>(Encoding.ASCII.GetBytes("Payload")),
+                Payload = Encoding.ASCII.GetBytes("Payload"),
                 QualityOfServiceLevel = MqttQualityOfServiceLevel.AtLeastOnce,
                 Topic = "Topic",
                 ResponseTopic = "/Response",
@@ -283,7 +281,7 @@ namespace MQTTnet.Tests.Formatter
             Assert.AreEqual(publishPacket.PacketIdentifier, deserialized.PacketIdentifier);
             Assert.AreEqual(publishPacket.Dup, deserialized.Dup);
             Assert.AreEqual(publishPacket.Retain, deserialized.Retain);
-            CollectionAssert.AreEqual(publishPacket.PayloadSegment.ToArray(), deserialized.PayloadSegment.ToArray());
+            CollectionAssert.AreEqual(publishPacket.Payload, deserialized.Payload);
             Assert.AreEqual(publishPacket.QualityOfServiceLevel, deserialized.QualityOfServiceLevel);
             Assert.AreEqual(publishPacket.Topic, deserialized.Topic);
             Assert.AreEqual(publishPacket.ResponseTopic, deserialized.ResponseTopic);

Source/MQTTnet.Tests/Helpers/MqttClientExtensions.cs

@@ -1,23 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using MQTTnet.Client;
-using MQTTnet.Tests.Mockups;
-
-namespace MQTTnet.Tests.Helpers
-{
-    public static class MqttClientExtensions
-    {
-        public static TestApplicationMessageReceivedHandler TrackReceivedMessages(this IMqttClient client)
-        {
-            if (client == null)
-            {
-                throw new ArgumentNullException(nameof(client));
-            }
-
-            return new TestApplicationMessageReceivedHandler(client);
-        }
-    }
-}

Source/MQTTnet.Tests/Helpers/ReflectionExtensions.cs

@@ -1,28 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Reflection;
-
-namespace MQTTnet.Tests.Helpers
-{
-    public static class ReflectionExtensions
-    {
-        public static object GetFieldValue(this object source, string fieldName)
-        {
-            if (source == null)
-            {
-                throw new ArgumentNullException(nameof(source));
-            }
-
-            var field = source.GetType().GetField(fieldName, BindingFlags.Instance | BindingFlags.NonPublic);
-            if (field == null)
-            {
-                throw new ArgumentException($"Field {fieldName} not found.");
-            }
-            
-            return field.GetValue(source);
-        }
-    }
-}

Source/MQTTnet.Tests/MQTTnet.Tests.csproj

@@ -1,26 +1,27 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net452;net461;net48;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net452;net461;net48;netcoreapp3.1;net6.0</TargetFrameworks>
         <IsPackable>false</IsPackable>
         <LangVersion>7.3</LangVersion>
         <EnableNETAnalyzers>false</EnableNETAnalyzers>
         <EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
         <DisableImplicitAspNetCoreAnalyzers>true</DisableImplicitAspNetCoreAnalyzers>
-        <NoWarn>1591;NETSDK1138</NoWarn>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
         <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+
+        <PackageReference Include="Microsoft.CodeAnalysis.Compilers" Version="4.0.1" />
+        <PackageReference Include="Microsoft.Net.Compilers" Version="4.0.1" />
     </ItemGroup>
 
     <ItemGroup>
         <ProjectReference Include="..\..\Source\MQTTnet.Extensions.ManagedClient\MQTTnet.Extensions.ManagedClient.csproj" />
         <ProjectReference Include="..\..\Source\MQTTnet.Extensions.Rpc\MQTTnet.Extensions.Rpc.csproj" />
         <ProjectReference Include="..\..\Source\MQTTnet\MQTTnet.csproj" />
-        <ProjectReference Include="..\MQTTnet.Extensions.WebSocket4Net\MQTTnet.Extensions.WebSocket4Net.csproj" />
     </ItemGroup>
 
 </Project>

Source/MQTTnet.Tests/MQTTv5/Server_Tests.cs

@@ -37,9 +37,9 @@ namespace MQTTnet.Tests.MQTTv5
                 await c1.SubscribeAsync(new MqttTopicFilterBuilder().WithTopic("#").Build());
 
                 var c2 = await testEnvironment.ConnectClient(clientOptions);
-                c2.Dispose(); // Dispose will not send a DISCONNECT packet first so the will message must be sent.
+                c2.Dispose(); // Dispose will not send a DISCONNECT pattern first so the will message must be sent.
 
-                await LongTestDelay();
+                await Task.Delay(1000);
 
                 Assert.AreEqual(1, receivedMessagesCount);
             }

Source/MQTTnet.Tests/Mockups/TestApplicationMessageReceivedHandler.cs

@@ -27,17 +27,6 @@ namespace MQTTnet.Tests.Mockups
             mqttClient.ApplicationMessageReceivedAsync += OnApplicationMessageReceivedAsync;
         }
 
-        public int Count
-        {
-            get
-            {
-                lock (_receivedEventArgs)
-                {
-                    return _receivedEventArgs.Count;
-                }
-            }
-        }
-
         public List<MqttApplicationMessageReceivedEventArgs> ReceivedEventArgs
         {
             get
@@ -51,7 +40,10 @@ namespace MQTTnet.Tests.Mockups
 
         public void AssertReceivedCountEquals(int expectedCount)
         {
-            Assert.AreEqual(expectedCount, Count);
+            lock (_receivedEventArgs)
+            {
+                Assert.AreEqual(expectedCount, _receivedEventArgs.Count);
+            }
         }
 
         public string GeneratePayloadSequence()

Source/MQTTnet.Tests/Mockups/TestEnvironment.cs

@@ -238,16 +238,6 @@ namespace MQTTnet.Tests.Mockups
             }
         }
 
-        public MqttClientOptions CreateDefaultClientOptions()
-        {
-            return CreateDefaultClientOptionsBuilder().Build();
-        }
-
-        public MqttClientOptionsBuilder CreateDefaultClientOptionsBuilder()
-        {
-            return Factory.CreateClientOptionsBuilder().WithProtocolVersion(_protocolVersion).WithTcpServer("127.0.0.1", ServerPort);
-        }
-
         public ILowLevelMqttClient CreateLowLevelClient()
         {
             lock (_clients)

Source/MQTTnet.Tests/MqttApplicationMessageTest.cs

@@ -1,48 +0,0 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MQTTnet.Tests
-{
-    [TestClass]
-    public class MqttApplicationMessageTest
-    {
-        [TestMethod]
-        public void PayloadSegment()
-        {
-            var message = new MqttApplicationMessage();
-            Assert.AreEqual(0, message.Payload.Length);
-            Assert.AreEqual(0, message.PayloadSegment.Count);
-
-            Assert.IsTrue(object.ReferenceEquals(message.Payload, message.Payload));
-            Assert.IsTrue(object.ReferenceEquals(message.Payload, message.PayloadSegment.Array));
-
-            message.Payload = new byte[] { 1, 2 };
-            Assert.AreEqual(2, message.Payload.Length);
-            Assert.AreEqual(2, message.PayloadSegment.Count);
-            Assert.IsTrue(object.ReferenceEquals(message.Payload, message.Payload));
-            Assert.IsTrue(object.ReferenceEquals(message.Payload, message.PayloadSegment.Array));
-
-            message.Payload = new byte[] { 1, 2, 3 };
-            Assert.AreEqual(3, message.Payload.Length);
-            Assert.AreEqual(3, message.PayloadSegment.Count);
-            Assert.IsTrue(object.ReferenceEquals(message.Payload, message.Payload));
-            Assert.IsTrue(object.ReferenceEquals(message.Payload, message.PayloadSegment.Array));
-
-            message.PayloadSegment = new ArraySegment<byte>(new byte[] { 1, 2, 3 });
-            Assert.AreEqual(3, message.Payload.Length);
-            Assert.AreEqual(3, message.PayloadSegment.Count);
-            Assert.IsTrue(object.ReferenceEquals(message.Payload, message.Payload));
-            Assert.IsTrue(object.ReferenceEquals(message.Payload, message.PayloadSegment.Array));
-
-            message.PayloadSegment = new ArraySegment<byte>(new byte[] { 1, 2, 3 }, 1, 1);
-            Assert.AreEqual(1, message.Payload.Length);
-            Assert.AreEqual(1, message.PayloadSegment.Count);
-            Assert.IsTrue(object.ReferenceEquals(message.Payload, message.Payload));
-            Assert.IsFalse(object.ReferenceEquals(message.Payload, message.PayloadSegment.Array));
-        }
-    }
-}

Source/MQTTnet.Tests/MqttApplicationMessageValidator_Tests.cs

@@ -1,44 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using MQTTnet.Formatter;
-
-namespace MQTTnet.Tests
-{
-    [TestClass]
-    public sealed class MqttApplicationMessageValidator_Tests
-    {
-        [TestMethod]
-        [ExpectedException(typeof(NotSupportedException))]
-        public void Succeed_When_Using_TopicAlias_And_MQTT_311()
-        {
-            MqttApplicationMessageValidator.ThrowIfNotSupported(new MqttApplicationMessageBuilder().WithTopicAlias(1).Build(), MqttProtocolVersion.V311);
-        }
-
-        [TestMethod]
-        public void Succeed_When_Using_TopicAlias_And_MQTT_500()
-        {
-            MqttApplicationMessageValidator.ThrowIfNotSupported(new MqttApplicationMessageBuilder().WithTopicAlias(1).Build(), MqttProtocolVersion.V500);
-        }
-
-        [TestMethod]
-        public void Succeed_When_Using_UserProperties_And_MQTT_500()
-        {
-            MqttApplicationMessageValidator.ThrowIfNotSupported(
-                new MqttApplicationMessageBuilder().WithTopic("A").WithUserProperty("User", "Property").Build(),
-                MqttProtocolVersion.V500);
-        }
-
-        [TestMethod]
-        [ExpectedException(typeof(NotSupportedException))]
-        public void Succeed_When_Using_WillUserProperties_And_MQTT_311()
-        {
-            MqttApplicationMessageValidator.ThrowIfNotSupported(
-                new MqttApplicationMessageBuilder().WithTopic("B").WithUserProperty("User", "Property").Build(),
-                MqttProtocolVersion.V311);
-        }
-    }
-}

Source/MQTTnet.Tests/MqttClientOptionsValidator_Tests.cs

@@ -1,54 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using MQTTnet.Client;
-using MQTTnet.Formatter;
-
-namespace MQTTnet.Tests
-{
-    [TestClass]
-    public sealed class MqttClientOptionsValidator_Tests
-    {
-        [TestMethod]
-        public void Succeed_When_Using_UserProperties_And_MQTT_500()
-        {
-            new MqttClientOptionsBuilder().WithProtocolVersion(MqttProtocolVersion.V500).WithUserProperty("User", "Property").WithTcpServer("FAKE").Build();
-        }
-
-        [TestMethod]
-        [ExpectedException(typeof(NotSupportedException))]
-        public void Succeed_When_Using_WillUserProperties_And_MQTT_311()
-        {
-            new MqttClientOptionsBuilder().WithProtocolVersion(MqttProtocolVersion.V311).WithWillUserProperty("User", "Property").WithTcpServer("FAKE").Build();
-        }
-
-        [TestMethod]
-        public void Succeed_When_Using_WillUserProperties_And_MQTT_500()
-        {
-            new MqttClientOptionsBuilder().WithProtocolVersion(MqttProtocolVersion.V500).WithWillUserProperty("User", "Property").WithTcpServer("FAKE").Build();
-        }
-
-        [TestMethod]
-        [ExpectedException(typeof(NotSupportedException))]
-        public void Throw_When_Using_UserProperties_And_MQTT_311()
-        {
-            new MqttClientOptionsBuilder().WithProtocolVersion(MqttProtocolVersion.V311).WithUserProperty("User", "Property").WithTcpServer("FAKE").Build();
-        }
-
-        [TestMethod]
-        [ExpectedException(typeof(NotSupportedException))]
-        public void Throw_When_Using_WithRequestResponseInformation_And_MQTT_311()
-        {
-            new MqttClientOptionsBuilder().WithProtocolVersion(MqttProtocolVersion.V311).WithRequestResponseInformation().WithTcpServer("FAKE").Build();
-        }
-
-        [TestMethod]
-        public void Throw_When_Using_WithRequestResponseInformation_And_MQTT_500()
-        {
-            new MqttClientOptionsBuilder().WithProtocolVersion(MqttProtocolVersion.V500).WithRequestResponseInformation().WithTcpServer("FAKE").Build();
-        }
-    }
-}

Source/MQTTnet.Tests/MqttPacketSerializationHelper.cs

@@ -31,7 +31,7 @@ namespace MQTTnet.Tests
             {
                 var formatterAdapter = new MqttPacketFormatterAdapter(_protocolVersion, new MqttBufferWriter(4096, 65535));
 
-                var adapter = new MqttChannelAdapter(channel, formatterAdapter, MqttNetNullLogger.Instance);
+                var adapter = new MqttChannelAdapter(channel, formatterAdapter, null, MqttNetNullLogger.Instance);
                 return adapter.ReceivePacketAsync(CancellationToken.None).GetAwaiter().GetResult();
             }
         }

Source/MQTTnet.Tests/MqttTopicValidator_Tests.cs

@@ -9,13 +9,19 @@ using MQTTnet.Protocol;
 namespace MQTTnet.Tests
 {
     [TestClass]
-    public sealed class MqttTopicValidator_Tests
+    public class MqttTopicValidator_Tests
     {
         [TestMethod]
-        [ExpectedException(typeof(MqttProtocolViolationException))]
-        public void Invalid_Topic_Empty()
+        public void Valid_Topic()
         {
-            MqttTopicValidator.ThrowIfInvalid(string.Empty);
+            MqttTopicValidator.ThrowIfInvalid("/a/b/c");
+        }
+
+        [TestMethod]
+        [ExpectedException(typeof(MqttProtocolViolationException))]
+        public void Invalid_Topic_Plus()
+        {
+            MqttTopicValidator.ThrowIfInvalid("/a/+/c");
         }
 
         [TestMethod]
@@ -27,15 +33,9 @@ namespace MQTTnet.Tests
 
         [TestMethod]
         [ExpectedException(typeof(MqttProtocolViolationException))]
-        public void Invalid_Topic_Plus()
+        public void Invalid_Topic_Empty()
         {
-            MqttTopicValidator.ThrowIfInvalid("/a/+/c");
-        }
-
-        [TestMethod]
-        public void Valid_Topic()
-        {
-            MqttTopicValidator.ThrowIfInvalid("/a/b/c");
+            MqttTopicValidator.ThrowIfInvalid(string.Empty);
         }
     }
-}
+}

Source/MQTTnet.Tests/Protocol_Tests.cs

@@ -8,48 +8,27 @@ using MQTTnet.Formatter;
 namespace MQTTnet.Tests
 {
     [TestClass]
-    public sealed class Protocol_Tests
+    public class Protocol_Tests
     {
         [TestMethod]
         public void Encode_Four_Byte_Integer()
         {
             var writer = new MqttBufferWriter(4, 4);
-
+            
             for (uint value = 0; value < 268435455; value++)
             {
                 writer.WriteVariableByteInteger(value);
-
+                
                 var buffer = writer.GetBuffer();
-
+                
                 var reader = new MqttBufferReader();
                 reader.SetBuffer(buffer, 0, writer.Length);
                 var checkValue = reader.ReadVariableByteInteger();
 
                 Assert.AreEqual(value, checkValue);
-
-                writer.Reset(0);
-            }
-        }
-
-        [TestMethod]
-        public void Encode_Two_Byte_Integer()
-        {
-            var writer = new MqttBufferWriter(2, 2);
-
-            for (ushort value = 0; value < ushort.MaxValue; value++)
-            {
-                writer.WriteTwoByteInteger(value);
-
-                var buffer = writer.GetBuffer();
-
-                var reader = new MqttBufferReader();
-                reader.SetBuffer(buffer, 0, writer.Length);
-                var checkValue = reader.ReadTwoByteInteger();
-
-                Assert.AreEqual(value, checkValue);
-
+                
                 writer.Reset(0);
             }
         }
     }
-}
+}

Source/MQTTnet.Tests/RPC_Tests.cs

@@ -6,93 +6,68 @@ using System;
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using MQTTnet.Tests.Mockups;
 using MQTTnet.Client;
 using MQTTnet.Exceptions;
 using MQTTnet.Extensions.Rpc;
-using MQTTnet.Formatter;
-using MQTTnet.Internal;
 using MQTTnet.Protocol;
-using MQTTnet.Tests.Mockups;
+using MQTTnet.Formatter;
+using MQTTnet.Implementations;
+using MQTTnet.Internal;
 
-namespace MQTTnet.Tests.Extensions
+namespace MQTTnet.Tests
 {
     [TestClass]
-    public sealed class Rpc_Tests : BaseTestClass
+    public sealed class RPC_Tests : BaseTestClass
     {
-        [TestMethod]
-        public async Task Execute_Success_MQTT_V5_Mixed_Clients()
-        {
-            using (var testEnvironment = CreateTestEnvironment())
-            {
-                await testEnvironment.StartServer();
-                var responseSender = await testEnvironment.ConnectClient();
-                await responseSender.SubscribeAsync("MQTTnet.RPC/+/ping");
-
-                responseSender.ApplicationMessageReceivedAsync += async e =>
-                {
-                    Assert.IsNull(e.ApplicationMessage.ResponseTopic);
-                    await responseSender.PublishStringAsync(e.ApplicationMessage.Topic + "/response", "pong");
-                };
-
-                var requestSender = await testEnvironment.ConnectClient(new MqttClientOptionsBuilder().WithProtocolVersion(MqttProtocolVersion.V500));
-
-                using (var rpcClient = new MqttRpcClient(requestSender, new MqttRpcClientOptionsBuilder().Build()))
-                {
-                    var response = await rpcClient.ExecuteAsync(TimeSpan.FromSeconds(5), "ping", "", MqttQualityOfServiceLevel.AtMostOnce);
-
-                    Assert.AreEqual("pong", Encoding.UTF8.GetString(response));
-                }
-            }
-        }
-
         [TestMethod]
         public Task Execute_Success_With_QoS_0()
         {
             return Execute_Success(MqttQualityOfServiceLevel.AtMostOnce, MqttProtocolVersion.V311);
         }
 
-        [TestMethod]
-        public Task Execute_Success_With_QoS_0_MQTT_V5()
-        {
-            return Execute_Success(MqttQualityOfServiceLevel.AtMostOnce, MqttProtocolVersion.V500);
-        }
-
-        [TestMethod]
-        public Task Execute_Success_With_QoS_0_MQTT_V5_Use_ResponseTopic()
-        {
-            return Execute_Success_MQTT_V5(MqttQualityOfServiceLevel.AtMostOnce);
-        }
-
         [TestMethod]
         public Task Execute_Success_With_QoS_1()
         {
             return Execute_Success(MqttQualityOfServiceLevel.AtLeastOnce, MqttProtocolVersion.V311);
         }
 
-        [TestMethod]
-        public Task Execute_Success_With_QoS_1_MQTT_V5()
-        {
-            return Execute_Success(MqttQualityOfServiceLevel.AtLeastOnce, MqttProtocolVersion.V500);
-        }
-
-        [TestMethod]
-        public Task Execute_Success_With_QoS_1_MQTT_V5_Use_ResponseTopic()
-        {
-            return Execute_Success_MQTT_V5(MqttQualityOfServiceLevel.AtLeastOnce);
-        }
-
         [TestMethod]
         public Task Execute_Success_With_QoS_2()
         {
             return Execute_Success(MqttQualityOfServiceLevel.ExactlyOnce, MqttProtocolVersion.V311);
         }
 
+        [TestMethod]
+        public Task Execute_Success_With_QoS_0_MQTT_V5()
+        {
+            return Execute_Success(MqttQualityOfServiceLevel.AtMostOnce, MqttProtocolVersion.V500);
+        }
+
+        [TestMethod]
+        public Task Execute_Success_With_QoS_1_MQTT_V5()
+        {
+            return Execute_Success(MqttQualityOfServiceLevel.AtLeastOnce, MqttProtocolVersion.V500);
+        }
+
         [TestMethod]
         public Task Execute_Success_With_QoS_2_MQTT_V5()
         {
             return Execute_Success(MqttQualityOfServiceLevel.ExactlyOnce, MqttProtocolVersion.V500);
         }
 
+        [TestMethod]
+        public Task Execute_Success_With_QoS_0_MQTT_V5_Use_ResponseTopic()
+        {
+            return Execute_Success_MQTT_V5(MqttQualityOfServiceLevel.AtMostOnce);
+        }
+
+        [TestMethod]
+        public Task Execute_Success_With_QoS_1_MQTT_V5_Use_ResponseTopic()
+        {
+            return Execute_Success_MQTT_V5(MqttQualityOfServiceLevel.AtLeastOnce);
+        }
+
         [TestMethod]
         public Task Execute_Success_With_QoS_2_MQTT_V5_Use_ResponseTopic()
         {
@@ -115,31 +90,6 @@ namespace MQTTnet.Tests.Extensions
             }
         }
 
-        [TestMethod]
-        [ExpectedException(typeof(MqttCommunicationTimedOutException))]
-        public async Task Execute_Timeout_MQTT_V5_Mixed_Clients()
-        {
-            using (var testEnvironment = new TestEnvironment(TestContext))
-            {
-                await testEnvironment.StartServer();
-                var responseSender = await testEnvironment.ConnectClient();
-                await responseSender.SubscribeAsync("MQTTnet.RPC/+/ping");
-
-                responseSender.ApplicationMessageReceivedAsync += async e =>
-                {
-                    Assert.IsNull(e.ApplicationMessage.ResponseTopic);
-                    await CompletedTask.Instance;
-                };
-
-                var requestSender = await testEnvironment.ConnectClient(new MqttClientOptionsBuilder().WithProtocolVersion(MqttProtocolVersion.V500));
-
-                using (var rpcClient = new MqttRpcClient(requestSender, new MqttRpcClientOptionsBuilder().Build()))
-                {
-                    var response = await rpcClient.ExecuteAsync(TimeSpan.FromSeconds(2), "ping", "", MqttQualityOfServiceLevel.AtMostOnce);
-                }
-            }
-        }
-
         [TestMethod]
         [ExpectedException(typeof(MqttCommunicationTimedOutException))]
         public async Task Execute_With_Custom_Topic_Names()
@@ -148,24 +98,14 @@ namespace MQTTnet.Tests.Extensions
             {
                 await testEnvironment.StartServer();
 
+                var requestSender = await testEnvironment.ConnectClient();
+
                 var rpcClient = await testEnvironment.ConnectRpcClient(new MqttRpcClientOptionsBuilder().WithTopicGenerationStrategy(new TestTopicStrategy()).Build());
 
                 await rpcClient.ExecuteAsync(TimeSpan.FromSeconds(2), "ping", "", MqttQualityOfServiceLevel.AtMostOnce);
             }
         }
 
-        [TestMethod]
-        public void Use_Factory()
-        {
-            var factory = new MqttFactory();
-            using (var client = factory.CreateMqttClient())
-            {
-                var rpcClient = factory.CreateMqttRpcClient(client);
-
-                Assert.IsNotNull(rpcClient);
-            }
-        }
-
         async Task Execute_Success(MqttQualityOfServiceLevel qosLevel, MqttProtocolVersion protocolVersion)
         {
             using (var testEnvironment = CreateTestEnvironment())
@@ -211,6 +151,57 @@ namespace MQTTnet.Tests.Extensions
             }
         }
 
+        [TestMethod]
+        public async Task Execute_Success_MQTT_V5_Mixed_Clients()
+        {
+            using (var testEnvironment = CreateTestEnvironment())
+            {
+                await testEnvironment.StartServer();
+                var responseSender = await testEnvironment.ConnectClient();
+                await responseSender.SubscribeAsync("MQTTnet.RPC/+/ping", MqttQualityOfServiceLevel.AtMostOnce);
+
+                responseSender.ApplicationMessageReceivedAsync += async e =>
+                {
+                    Assert.IsNull(e.ApplicationMessage.ResponseTopic);
+                    await responseSender.PublishStringAsync(e.ApplicationMessage.Topic + "/response", "pong");
+                };
+
+                var requestSender = await testEnvironment.ConnectClient(new MqttClientOptionsBuilder().WithProtocolVersion(MqttProtocolVersion.V500));
+
+                using (var rpcClient = new MqttRpcClient(requestSender, new MqttRpcClientOptionsBuilder().Build()))
+                {
+                    var response = await rpcClient.ExecuteAsync(TimeSpan.FromSeconds(5), "ping", "", MqttQualityOfServiceLevel.AtMostOnce);
+
+                    Assert.AreEqual("pong", Encoding.UTF8.GetString(response));
+                }
+            }
+        }
+
+        [TestMethod]
+        [ExpectedException(typeof(MqttCommunicationTimedOutException))]
+        public async Task Execute_Timeout_MQTT_V5_Mixed_Clients()
+        {
+            using (var testEnvironment = new TestEnvironment(TestContext))
+            {
+                await testEnvironment.StartServer();
+                var responseSender = await testEnvironment.ConnectClient();
+                await responseSender.SubscribeAsync("MQTTnet.RPC/+/ping", MqttQualityOfServiceLevel.AtMostOnce);
+
+                responseSender.ApplicationMessageReceivedAsync += async e =>
+                {
+                    Assert.IsNull(e.ApplicationMessage.ResponseTopic);
+                    await CompletedTask.Instance;
+                };
+
+                var requestSender = await testEnvironment.ConnectClient(new MqttClientOptionsBuilder().WithProtocolVersion(MqttProtocolVersion.V500));
+
+                using (var rpcClient = new MqttRpcClient(requestSender, new MqttRpcClientOptionsBuilder().Build()))
+                {
+                    var response = await rpcClient.ExecuteAsync(TimeSpan.FromSeconds(2), "ping", "", MqttQualityOfServiceLevel.AtMostOnce);
+                }
+            }
+        }
+
         class TestTopicStrategy : IMqttRpcClientTopicGenerationStrategy
         {
             public MqttRpcTopicPair CreateRpcTopics(TopicGenerationContext context)
@@ -223,4 +214,4 @@ namespace MQTTnet.Tests.Extensions
             }
         }
     }
-}
+}

Source/MQTTnet.Tests/Server/General.cs

@@ -636,7 +636,7 @@ namespace MQTTnet.Tests.Server
                 // nothing
 
                 Assert.AreEqual(false, c1.IsConnected);
-                await c1.TryDisconnectAsync();
+                await c1.DisconnectAsync();
                 Assert.AreEqual(false, c1.IsConnected);
 
                 await Task.Delay(500);
@@ -954,7 +954,7 @@ namespace MQTTnet.Tests.Server
 
                 var client = testEnvironment.CreateClient();
 
-                client.InspectPacketAsync += e =>
+                client.InspectPackage += e =>
                 {
                     if (e.Buffer.Length > 0)
                     {

Source/MQTTnet.Tests/Server/Injection_Tests.cs

@@ -1,7 +1,6 @@
 using System.Threading.Tasks;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using MQTTnet.Client;
-using MQTTnet.Internal;
 using MQTTnet.Server;
 
 namespace MQTTnet.Tests.Server
@@ -61,28 +60,5 @@ namespace MQTTnet.Tests.Server
                 Assert.AreEqual("InjectedOne", messageReceivedHandler.ReceivedEventArgs[0].ApplicationMessage.Topic);
             }
         }
-
-        [TestMethod]
-        public async Task Intercept_Injected_Application_Message()
-        {
-            using (var testEnvironment = CreateTestEnvironment())
-            {
-                var server = await testEnvironment.StartServer();
-
-                MqttApplicationMessage interceptedMessage = null;
-                server.InterceptingPublishAsync += eventArgs =>
-                {
-                    interceptedMessage = eventArgs.ApplicationMessage;
-                    return CompletedTask.Instance;
-                };
-
-                var injectedApplicationMessage = new MqttApplicationMessageBuilder().WithTopic("InjectedOne").Build();
-                await server.InjectApplicationMessage(new InjectedMqttApplicationMessage(injectedApplicationMessage));
-
-                await LongTestDelay();
-
-                Assert.IsNotNull(interceptedMessage);
-            }
-        }
     }
 }

Source/MQTTnet.Tests/Server/MqttSubscriptionsManager_Tests.cs

@@ -114,104 +114,6 @@ namespace MQTTnet.Tests.Server
             Assert.AreEqual(result.QualityOfServiceLevel, MqttQualityOfServiceLevel.AtLeastOnce);
         }
 
-        [TestMethod]
-        public async Task MqttSubscriptionsManager_SubscribeWildcard1()
-        {
-            await SubscribeToTopic("house/+/room");
-            await SubscribeToTopic("house/+/room/+");
-
-            CheckIsSubscribed("house/1/room");
-            CheckIsSubscribed("house/1/room/bed");
-            CheckIsSubscribed("house/1/room/chair");
-            CheckIsSubscribed("house/2/room/bed");
-            CheckIsSubscribed("house/2/room/chair");
-
-            CheckIsNotSubscribed("house/1/room/bed/cover");
-            CheckIsNotSubscribed("house/1/study/bed");
-        }
-
-        [TestMethod]
-        public async Task MqttSubscriptionsManager_SubscribeWildcard2()
-        {
-            await SubscribeToTopic("house/+/room");
-            await SubscribeToTopic("house/+/room/#");
-
-            CheckIsSubscribed("house/1/room");
-            CheckIsSubscribed("house/1/room/bed");
-            CheckIsSubscribed("house/2/room");
-            CheckIsSubscribed("house/2/room/bed");
-            CheckIsSubscribed("house/2/room/bed/cover");
-
-            CheckIsNotSubscribed("house/1/level");
-            CheckIsNotSubscribed("house/1/level/door");
-        }
-
-        [TestMethod]
-        public async Task MqttSubscriptionsManager_SubscribeWildcard3()
-        {
-            await SubscribeToTopic("house/1/room");
-            await SubscribeToTopic("house/1/room/+");
-
-            CheckIsSubscribed("house/1/room");
-            CheckIsSubscribed("house/1/room/bed");
-            CheckIsSubscribed("house/1/room/chair");
-
-            CheckIsNotSubscribed("house/2/room");
-            CheckIsNotSubscribed("house/2/room/bed/cover");
-        }
-
-        [TestMethod]
-        public async Task MqttSubscriptionsManager_SubscribeWildcard4()
-        {
-            await SubscribeToTopic("house/1/+/+");
-
-            CheckIsSubscribed("house/1/room/bed");
-            CheckIsSubscribed("house/1/room/chair");
-
-            CheckIsNotSubscribed("house/1/room");
-            CheckIsNotSubscribed("house/1/room/bed/cover");
-        }
-
-        [TestMethod]
-        public async Task MqttSubscriptionsManager_SubscribeWildcard5()
-        {
-            await SubscribeToTopic("house/1/+/#");
-
-            CheckIsSubscribed("house/1/room/bed");
-            CheckIsSubscribed("house/1/room/chair");
-            CheckIsSubscribed("house/1/room/chair/leg");
-            CheckIsSubscribed("house/1/level/window");
-            CheckIsSubscribed("house/1/level/door");
-
-            CheckIsNotSubscribed("house/2/room/bed");
-        }
-
-        async Task SubscribeToTopic(string topic)
-        {
-            var sp = new MqttSubscribePacket
-            {
-                TopicFilters = new List<MqttTopicFilter>
-                {
-                    new MqttTopicFilter { Topic = topic, QualityOfServiceLevel = MqttQualityOfServiceLevel.AtMostOnce },
-                }
-            };
-
-            await _subscriptionsManager.Subscribe(sp, CancellationToken.None);
-        }
-
-        void CheckIsSubscribed(string topic)
-        {
-            var result = CheckSubscriptions(topic, MqttQualityOfServiceLevel.AtMostOnce, "");
-            Assert.IsTrue(result.IsSubscribed);
-            Assert.AreEqual(result.QualityOfServiceLevel, MqttQualityOfServiceLevel.AtMostOnce);
-        }
-
-        void CheckIsNotSubscribed(string topic)
-        {
-            var result = CheckSubscriptions(topic, MqttQualityOfServiceLevel.AtMostOnce, "");
-            Assert.IsFalse(result.IsSubscribed);
-        }
-
         [TestInitialize]
         public void TestInitialize()
         {
@@ -228,7 +130,7 @@ namespace MQTTnet.Tests.Server
 
         CheckSubscriptionsResult CheckSubscriptions(string topic, MqttQualityOfServiceLevel applicationMessageQoSLevel, string senderClientId)
         {
-            MqttTopicHash.Calculate(topic, out var topicHash, out _, out _);
+            MqttSubscription.CalculateTopicHash(topic, out var topicHash, out _, out _);
             return _subscriptionsManager.CheckSubscriptions(topic, topicHash, applicationMessageQoSLevel, senderClientId);
         }
     }

Source/MQTTnet.Tests/Server/Publish_Tests.cs

@@ -0,0 +1,58 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Threading.Tasks;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using MQTTnet.Client;
+using MQTTnet.Formatter;
+using MQTTnet.Protocol;
+
+namespace MQTTnet.Tests.Server
+{
+    [TestClass]
+    public sealed class Publish_Tests : BaseTestClass
+    {
+        [TestMethod]
+        public async Task Return_Success_When_Subscribed()
+        {
+            using (var testEnvironment = CreateTestEnvironment(MqttProtocolVersion.V500))
+            {
+                await testEnvironment.StartServer();
+
+                var sender = await testEnvironment.ConnectClient();
+                var receiver = await testEnvironment.ConnectClient();
+
+                await receiver.SubscribeAsync("A");
+
+                // AtLeastOnce is required to get an ACK packet from the server.
+                var publishResult = await sender.PublishStringAsync("A", "Payload", MqttQualityOfServiceLevel.AtLeastOnce);
+                
+                Assert.AreEqual(MqttClientPublishReasonCode.Success, publishResult.ReasonCode);
+                
+                Assert.AreEqual(true, publishResult.IsSuccess);
+            }
+        }
+        
+        [TestMethod]
+        public async Task Return_NoMatchingSubscribers_When_Not_Subscribed()
+        {
+            using (var testEnvironment = CreateTestEnvironment(MqttProtocolVersion.V500))
+            {
+                await testEnvironment.StartServer();
+
+                var sender = await testEnvironment.ConnectClient();
+                var receiver = await testEnvironment.ConnectClient();
+             
+                await receiver.SubscribeAsync("A");
+
+                // AtLeastOnce is required to get an ACK packet from the server.
+                var publishResult = await sender.PublishStringAsync("B", "Payload", MqttQualityOfServiceLevel.AtLeastOnce);
+                
+                Assert.AreEqual(MqttClientPublishReasonCode.NoMatchingSubscribers, publishResult.ReasonCode);
+                
+                Assert.AreEqual(true, publishResult.IsSuccess);
+            }
+        }
+    }
+}

Source/MQTTnet.Tests/Server/Publishing_Tests.cs

@@ -5,8 +5,6 @@
 using System.Threading.Tasks;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using MQTTnet.Client;
-using MQTTnet.Formatter;
-using MQTTnet.Internal;
 using MQTTnet.Protocol;
 
 namespace MQTTnet.Tests.Server
@@ -29,118 +27,5 @@ namespace MQTTnet.Tests.Server
                 await client.PublishStringAsync("test", qualityOfServiceLevel: MqttQualityOfServiceLevel.AtLeastOnce);
             }
         }
-
-        [TestMethod]
-        public async Task Return_NoMatchingSubscribers_When_Not_Subscribed()
-        {
-            using (var testEnvironment = CreateTestEnvironment(MqttProtocolVersion.V500))
-            {
-                await testEnvironment.StartServer();
-
-                var sender = await testEnvironment.ConnectClient();
-                var receiver = await testEnvironment.ConnectClient();
-
-                await receiver.SubscribeAsync("A");
-
-                // AtLeastOnce is required to get an ACK packet from the server.
-                var publishResult = await sender.PublishStringAsync("B", "Payload", MqttQualityOfServiceLevel.AtLeastOnce);
-
-                Assert.AreEqual(MqttClientPublishReasonCode.NoMatchingSubscribers, publishResult.ReasonCode);
-
-                Assert.AreEqual(true, publishResult.IsSuccess);
-            }
-        }
-
-        [TestMethod]
-        public async Task Return_Success_When_Subscribed()
-        {
-            using (var testEnvironment = CreateTestEnvironment(MqttProtocolVersion.V500))
-            {
-                await testEnvironment.StartServer();
-
-                var sender = await testEnvironment.ConnectClient();
-                var receiver = await testEnvironment.ConnectClient();
-
-                await receiver.SubscribeAsync("A");
-
-                // AtLeastOnce is required to get an ACK packet from the server.
-                var publishResult = await sender.PublishStringAsync("A", "Payload", MqttQualityOfServiceLevel.AtLeastOnce);
-
-                Assert.AreEqual(MqttClientPublishReasonCode.Success, publishResult.ReasonCode);
-
-                Assert.AreEqual(true, publishResult.IsSuccess);
-            }
-        }
-
-        [TestMethod]
-        public async Task Intercept_Client_Enqueue()
-        {
-            using (var testEnvironment = CreateTestEnvironment())
-            {
-                var server = await testEnvironment.StartServer();
-                
-                var sender = await testEnvironment.ConnectClient();
-                
-                var receiver = await testEnvironment.ConnectClient();
-                await receiver.SubscribeAsync("A");
-                var receivedMessages = testEnvironment.CreateApplicationMessageHandler(receiver);
-                
-                await sender.PublishStringAsync("A", "Payload", MqttQualityOfServiceLevel.AtLeastOnce);
-
-                await LongTestDelay();
-                
-                receivedMessages.AssertReceivedCountEquals(1);
-                
-                server.InterceptingClientEnqueueAsync += e =>
-                {
-                    e.AcceptEnqueue = false;
-                    return CompletedTask.Instance;
-                };
-                
-                await sender.PublishStringAsync("A", "Payload", MqttQualityOfServiceLevel.AtLeastOnce);
-
-                await LongTestDelay();
-                
-                // Do not increase because the internal enqueue to the target client is not accepted!
-                receivedMessages.AssertReceivedCountEquals(1);
-            }
-        }
-
-        [TestMethod]
-        public async Task Intercept_Client_Enqueue_Multiple_Clients_Subscribed_Messages_Are_Filtered()
-        {
-            using (var testEnvironment = CreateTestEnvironment())
-            {
-                var server = await testEnvironment.StartServer();
-
-                var sender = await testEnvironment.ConnectClient();
-
-                var receiverOne = await testEnvironment.ConnectClient(o => o.WithClientId("One"));
-                await receiverOne.SubscribeAsync("A");
-                var receivedMessagesOne = testEnvironment.CreateApplicationMessageHandler(receiverOne);
-
-                var receiverTwo = await testEnvironment.ConnectClient(o => o.WithClientId("Two"));
-                await receiverTwo.SubscribeAsync("A");
-                var receivedMessagesTwo = testEnvironment.CreateApplicationMessageHandler(receiverTwo);
-
-                var receiverThree = await testEnvironment.ConnectClient(o => o.WithClientId("Three"));
-                await receiverThree.SubscribeAsync("A");
-                var receivedMessagesThree = testEnvironment.CreateApplicationMessageHandler(receiverThree);
-
-                server.InterceptingClientEnqueueAsync += e =>
-                {
-                    if (e.ReceiverClientId.Contains("Two")) e.AcceptEnqueue = false;
-                    return CompletedTask.Instance;
-                };
-
-                await sender.PublishStringAsync("A", "Payload", MqttQualityOfServiceLevel.AtLeastOnce);
-
-                await LongTestDelay();
-
-                receivedMessagesOne.AssertReceivedCountEquals(1);
-                receivedMessagesTwo.AssertReceivedCountEquals(0);
-                receivedMessagesThree.AssertReceivedCountEquals(1);
-            }
-        }
     }
 }

Source/MQTTnet.Tests/Server/QoS_Tests.cs

@@ -26,9 +26,6 @@ namespace MQTTnet.Tests.Server
                 var dummyClient = await testEnvironment.ConnectClient(o => o.WithClientId("A").WithCleanSession(false));
                 await dummyClient.SubscribeAsync("#", MqttQualityOfServiceLevel.AtLeastOnce);
                 dummyClient.Dispose();
-
-                await LongTestDelay();
-                await LongTestDelay();
                 
                 // Now inject messages which are appended to the queue of the client.
                 await server.InjectApplicationMessage("T", "0", qualityOfServiceLevel: MqttQualityOfServiceLevel.AtLeastOnce);

Source/MQTTnet.Tests/Server/Security_Tests.cs

@@ -164,7 +164,7 @@ namespace MQTTnet.Tests.Server
 
                 var clientOptions = new MqttClientOptionsBuilder().WithTcpServer("127.0.0.1", testEnvironment.ServerPort).WithCredentials(userName, password).Build();
 
-                var ex = await Assert.ThrowsExceptionAsync<MqttConnectingFailedException>(() => client.ConnectAsync(clientOptions));
+                var ex = await Assert.ThrowsExceptionAsync<MqttConnectingFailedException>(async () => await client.ConnectAsync(clientOptions));
                 Assert.AreEqual(MqttClientConnectResultCode.BadUserNameOrPassword, ex.Result.ResultCode);
             }
         }

Source/MQTTnet.Tests/Server/Session_Tests.cs

@@ -121,9 +121,10 @@ namespace MQTTnet.Tests.Server
                 Assert.AreEqual(true, session.Items["can_subscribe_x"]);
             }
         }
+
+        #if !NET452
         
         [TestMethod]
-        [DataRow(MqttProtocolVersion.V310)]
         [DataRow(MqttProtocolVersion.V311)]
         [DataRow(MqttProtocolVersion.V500)]
         public async Task Handle_Parallel_Connection_Attempts(MqttProtocolVersion protocolVersion)
@@ -149,6 +150,8 @@ namespace MQTTnet.Tests.Server
                 // Try to connect 50 clients at the same time.
                 var clients = await Task.WhenAll(Enumerable.Range(0, 50).Select(i => ConnectAndSubscribe(testEnvironment, options, OnReceive)));
 
+                await Task.Delay(TimeSpan.FromSeconds(10));
+                
                 var connectedClients = clients.Where(c => c?.TryPingAsync().GetAwaiter().GetResult() == true).ToList();
 
                 await LongTestDelay();
@@ -159,12 +162,13 @@ namespace MQTTnet.Tests.Server
                 var sendClient = await testEnvironment.ConnectClient(option2);
                 await sendClient.PublishStringAsync("aaa", "1");
 
-                await LongTestDelay();
+                await Task.Delay(TimeSpan.FromSeconds(5));
 
                 Assert.AreEqual(true, hasReceive);
             }
         }
- 
+#endif
+        
         [DataTestMethod]
         [DataRow(MqttQualityOfServiceLevel.ExactlyOnce)]
         [DataRow(MqttQualityOfServiceLevel.AtLeastOnce)]

Source/MQTTnet.Tests/Server/Subscribe_Tests.cs

@@ -13,56 +13,12 @@ using MQTTnet.Internal;
 using MQTTnet.Packets;
 using MQTTnet.Protocol;
 using MQTTnet.Server;
-using MQTTnet.Tests.Helpers;
 
 namespace MQTTnet.Tests.Server
 {
     [TestClass]
     public sealed class Subscribe_Tests : BaseTestClass
     {
-        [DataTestMethod]
-        [DataRow("A", "A", true)]
-        [DataRow("A", "B", false)]
-        [DataRow("A", "#", true)]
-        [DataRow("A", "+", true)]
-        [DataRow("A/B", "A/B", true)]
-        [DataRow("A/B", "A/+", true)]
-        [DataRow("A/B", "A/#", true)]
-        [DataRow("A/B/C", "A/B/C", true)]
-        [DataRow("A/B/C", "A/+/C", true)]
-        [DataRow("A/B/C", "A/+/+", true)]
-        [DataRow("A/B/C", "A/+/#", true)]
-        [DataRow("A/B/C/D", "A/B/C/D", true)]
-        [DataRow("A/B/C/D", "A/+/C/+", true)]
-        [DataRow("A/B/C/D", "A/+/C/#", true)]
-        [DataRow("A/B/C", "A/B/+", true)]
-        [DataRow("A/B1/B2/C", "A/+/C", false)]
-        public async Task Subscription_Roundtrip(string topic, string filter, bool shouldWork)
-        {
-            using (var testEnvironment = CreateTestEnvironment())
-            {
-                await testEnvironment.StartServer().ConfigureAwait(false);
-
-                var receiver = await testEnvironment.ConnectClient();
-                await receiver.SubscribeAsync(filter).ConfigureAwait(false);
-                var receivedMessages = receiver.TrackReceivedMessages();
-
-                var sender = await testEnvironment.ConnectClient();
-                await sender.PublishStringAsync(topic, "PAYLOAD").ConfigureAwait(false);
-
-                await LongTestDelay().ConfigureAwait(false);
-
-                if (shouldWork)
-                {
-                    Assert.AreEqual(1, receivedMessages.Count, message: "The filter should work!");
-                }
-                else
-                {
-                    Assert.AreEqual(0, receivedMessages.Count, message: "The filter should not work!");
-                }
-            }
-        }
-
         [TestMethod]
         public async Task Deny_Invalid_Topic()
         {
@@ -90,29 +46,6 @@ namespace MQTTnet.Tests.Server
             }
         }
 
-        [TestMethod]
-        public async Task Intercept_Subscribe_With_User_Properties()
-        {
-            using (var testEnvironment = CreateTestEnvironment(MqttProtocolVersion.V500))
-            {
-                var server = await testEnvironment.StartServer();
-
-                InterceptingSubscriptionEventArgs eventArgs = null;
-                server.InterceptingSubscriptionAsync += e =>
-                {
-                    eventArgs = e;
-                    return CompletedTask.Instance;
-                };
-
-                var client = await testEnvironment.ConnectClient();
-
-                var subscribeOptions = testEnvironment.Factory.CreateSubscribeOptionsBuilder().WithTopicFilter("X").WithUserProperty("A", "1").Build();
-                await client.SubscribeAsync(subscribeOptions);
-
-                CollectionAssert.AreEqual(subscribeOptions.UserProperties.ToList(), eventArgs.UserProperties);
-            }
-        }
-
         [TestMethod]
         [ExpectedException(typeof(MqttClientDisconnectedException))]
         public async Task Disconnect_While_Subscribing()
@@ -128,7 +61,7 @@ namespace MQTTnet.Tests.Server
                 await client.SubscribeAsync("#");
             }
         }
-
+        
         [TestMethod]
         public async Task Enqueue_Message_After_Subscription()
         {