Fix build scripts.

Add support for net6.0.
Align default values for connection options with MQTTv5 spec.
2026-10-15 00:15:15 +08:00 · 2021-12-05 13:45:25 +01:00 · 2021-12-03 09:26:48 +01:00 · 2021-12-01 22:14:51 +01:00 · 2021-12-01 22:05:52 +01:00 · 2021-12-01 20:49:05 +01:00
389 changed files with 7016 additions and 8951 deletions
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-<package >
-  <metadata>
-    <id>MQTTnet.AspNetCore</id>
-    <version>0.0.0</version>
-    <authors>The contributors of MQTTnet</authors>
-    <owners>Christian Kratky</owners>
-    <license type="file">LICENSE</license>
-    <projectUrl>https://github.com/chkr1011/MQTTnet</projectUrl>
-    <iconUrl>https://raw.githubusercontent.com/chkr1011/MQTTnet/master/Images/Logo_128x128.png</iconUrl>
-    <icon>images\Logo_128x128.png</icon>
-    <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <description>This is a support library to integrate MQTTnet into AspNetCore.</description>
-    <releaseNotes>For release notes please go to MQTTnet release notes (https://www.nuget.org/packages/MQTTnet/).</releaseNotes>
-    <copyright>Copyright Christian Kratky 2016-2021</copyright>
-    <tags>MQTT Message Queue Telemetry Transport MQTTClient MQTTServer Server MQTTBroker Broker NETStandard IoT InternetOfThings Messaging Hardware Arduino Sensor Actuator M2M ESP Smart Home Cities Automation Xamarin Blazor</tags>
-    <dependencies>
-      <group targetFramework="netstandard2.0">
-        <dependency id="MQTTnet" version="$nugetVersion" />
-        <dependency id="Microsoft.AspNetCore.Http.Connections" version="1.0.0"  />
-      </group>
-
-      <group targetFramework="netcoreapp3.1">
-        <dependency id="MQTTnet" version="$nugetVersion" />
-      </group>
-
-      <group targetFramework="net5.0">
-        <dependency id="MQTTnet" version="$nugetVersion" />
-      </group>
-    </dependencies>
-  </metadata>
-
-  <files>
-    <!-- License -->
-    <file src="..\LICENSE" />
-
-    <!-- Images -->
-    <file src="..\Images\Logo_128x128.png" target="images\" />
-
-    <!-- .NET 5.0 -->
-    <file src="..\Source\MQTTnet.AspNetCore\bin\Release\net5.0\MQTTnet.AspNetCore.*" target="lib\net5.0\" />
-
-    <!-- .NET Standard 2.0 -->
-    <file src="..\Source\MQTTnet.AspNetCore\bin\Release\netstandard2.0\MQTTnet.AspNetCore.*" target="lib\netstandard2.0\" />
-
-    <!-- .NET Core App 3.1 -->
-    <file src="..\Source\MQTTnet.AspNetCore\bin\Release\netcoreapp3.1\MQTTnet.AspNetCore.*" target="lib\netcoreapp3.1\" />
-  </files>
-</package>
@@ -1,52 +0,0 @@
-<?xml version="1.0"?>
-<package >
-  <metadata>
-    <id>MQTTnet.Extensions.ManagedClient</id>
-    <version>0.0.0</version>
-    <authors>The contributors of MQTTnet</authors>
-    <owners>Christian Kratky</owners>
-    <license type="file">LICENSE</license>
-    <projectUrl>https://github.com/chkr1011/MQTTnet</projectUrl>
-    <iconUrl>https://raw.githubusercontent.com/chkr1011/MQTTnet/master/Images/Logo_128x128.png</iconUrl>
-    <icon>images\Logo_128x128.png</icon>
-    <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <description>This is an extension library which provides a managed MQTT client with additional features using MQTTnet.</description>
-    <releaseNotes>For release notes please go to MQTTnet release notes (https://www.nuget.org/packages/MQTTnet/).</releaseNotes>
-    <copyright>Copyright Christian Kratky 2016-2021</copyright>
-    <tags>MQTT Message Queue Telemetry Transport MQTTClient MQTTServer Server MQTTBroker Broker NETStandard IoT InternetOfThings Messaging Hardware Arduino Sensor Actuator M2M ESP Smart Home Cities Automation Xamarin Blazor</tags>
-    <dependencies>
-      <dependency id="MQTTnet" version="$nugetVersion" />
-    </dependencies>
-  </metadata>
-
-  <files>
-    <!-- License -->
-    <file src="..\LICENSE" />
-
-    <!-- Images -->
-    <file src="..\Images\Logo_128x128.png" target="images\" />
-
-    <!-- .NET 5.0 -->
-    <file src="..\Source\MQTTnet.Extensions.ManagedClient\bin\Release\net5.0\MQTTnet.Extensions.ManagedClient.*" target="lib\net5.0\" />
-
-    <!-- .NET Standard 1.3 -->
-    <file src="..\Source\MQTTnet.Extensions.ManagedClient\bin\Release\netstandard1.3\MQTTnet.Extensions.ManagedClient.*" target="lib\netstandard1.3\" />
-
-    <!-- .NET Standard 2.0 -->
-    <file src="..\Source\MQTTnet.Extensions.ManagedClient\bin\Release\netstandard2.0\MQTTnet.Extensions.ManagedClient.*" target="lib\netstandard2.0\" />
-
-    <!-- .NET Standard 2.1 -->
-    <file src="..\Source\MQTTnet.Extensions.ManagedClient\bin\Release\netstandard2.1\MQTTnet.Extensions.ManagedClient.*" target="lib\netstandard2.1\" />
-
-    <!-- Universal Windows -->
-    <file src="..\Source\MQTTnet.Extensions.ManagedClient\bin\Release\uap10.0\MQTTnet.Extensions.ManagedClient.*" target="lib\uap10.0\" />
-
-    <!-- .NET Framework -->
-    <file src="..\Source\MQTTnet.Extensions.ManagedClient\bin\Release\net452\MQTTnet.Extensions.ManagedClient.*" target="lib\net452\" />
-
-    <!-- .NET Framework 4.6.0 will use binaries from 4.5.2. -->
-    <file src="..\Source\MQTTnet.Extensions.ManagedClient\bin\Release\net461\MQTTnet.Extensions.ManagedClient.*" target="lib\net461\" />
-
-    <!-- Everything above .NET Framework 4.6.1 will use the binaries from 4.6.1. -->
-  </files>
-</package>
@@ -1,52 +0,0 @@
-<?xml version="1.0"?>
-<package >
-  <metadata>
-    <id>MQTTnet.Extensions.Rpc</id>
-    <version>0.0.0</version>
-    <authors>The contributors of MQTTnet</authors>
-    <owners>Christian Kratky</owners>
-    <license type="file">LICENSE</license>
-    <projectUrl>https://github.com/chkr1011/MQTTnet</projectUrl>
-    <iconUrl>https://raw.githubusercontent.com/chkr1011/MQTTnet/master/Images/Logo_128x128.png</iconUrl>
-    <icon>images\Logo_128x128.png</icon>
-    <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <description>This is an extension library which allows executing synchronous device calls including a response using MQTTnet.</description>
-    <releaseNotes>For release notes please go to MQTTnet release notes (https://www.nuget.org/packages/MQTTnet/).</releaseNotes>
-    <copyright>Copyright Christian Kratky 2016-2021</copyright>
-    <tags>MQTT Message Queue Telemetry Transport MQTTClient MQTTServer Server MQTTBroker Broker NETStandard IoT InternetOfThings Messaging Hardware Arduino Sensor Actuator M2M ESP Smart Home Cities Automation Xamarin Blazor</tags>
-    <dependencies>
-      <dependency id="MQTTnet" version="$nugetVersion" />
-    </dependencies>
-  </metadata>
-
-  <files>
-    <!-- License -->
-    <file src="..\LICENSE" />
-
-    <!-- Images -->
-    <file src="..\Images\Logo_128x128.png" target="images\" />
-
-    <!-- .NET 5.0 -->
-    <file src="..\Source\MQTTnet.Extensions.Rpc\bin\Release\net5.0\MQTTnet.Extensions.Rpc.*" target="lib\net5.0\" />
-
-    <!-- .NET Standard 1.3 -->
-    <file src="..\Source\MQTTnet.Extensions.Rpc\bin\Release\netstandard1.3\MQTTnet.Extensions.Rpc.*" target="lib\netstandard1.3\" />
-
-    <!-- .NET Standard 2.0 -->
-    <file src="..\Source\MQTTnet.Extensions.Rpc\bin\Release\netstandard2.0\MQTTnet.Extensions.Rpc.*" target="lib\netstandard2.0\" />
-
-    <!-- .NET Standard 2.1 -->
-    <file src="..\Source\MQTTnet.Extensions.Rpc\bin\Release\netstandard2.1\MQTTnet.Extensions.Rpc.*" target="lib\netstandard2.1\" />
-
-    <!-- Universal Windows -->
-    <file src="..\Source\MQTTnet.Extensions.Rpc\bin\Release\uap10.0\MQTTnet.Extensions.Rpc.*" target="lib\uap10.0\" />
-
-    <!-- .NET Framework -->
-    <file src="..\Source\MQTTnet.Extensions.Rpc\bin\Release\net452\MQTTnet.Extensions.Rpc.*" target="lib\net452\" />
-
-    <!-- .NET Framework 4.6.0 will use binaries from 4.5.2. -->
-    <file src="..\Source\MQTTnet.Extensions.Rpc\bin\Release\net461\MQTTnet.Extensions.Rpc.*" target="lib\net461\" />
-
-    <!-- Everything above .NET Framework 4.6.1 will use the binaries from 4.6.1. -->
-  </files>
-</package>
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-<package >
-  <metadata>
-    <id>MQTTnet.Extensions.WebSocket4Net</id>
-    <version>0.0.0</version>
-    <authors>The contributors of MQTTnet</authors>
-    <owners>Christian Kratky</owners>
-    <license type="file">LICENSE</license>
-    <projectUrl>https://github.com/chkr1011/MQTTnet</projectUrl>
-    <iconUrl>https://raw.githubusercontent.com/chkr1011/MQTTnet/master/Images/Logo_128x128.png</iconUrl>
-    <icon>images\Logo_128x128.png</icon>
-    <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <description>This is an extension library which allows using _WebSocket4Net_ as transport for MQTTnet clients.</description>
-    <releaseNotes>For release notes please go to MQTTnet release notes (https://www.nuget.org/packages/MQTTnet/).</releaseNotes>
-    <copyright>Copyright Christian Kratky 2016-2021</copyright>
-    <tags>MQTT Message Queue Telemetry Transport MQTTClient MQTTServer Server MQTTBroker Broker NETStandard IoT InternetOfThings Messaging Hardware Arduino Sensor Actuator M2M ESP Smart Home Cities Automation Xamarin Blazor</tags>
-    <dependencies>
-      <dependency id="MQTTnet" version="$nugetVersion" />
-      <dependency id="WebSocket4Net" version="0.15.2" />
-    </dependencies>
-  </metadata>
-
-  <files>
-    <!-- License -->
-    <file src="..\LICENSE" />
-
-    <!-- Images -->
-    <file src="..\Images\Logo_128x128.png" target="images\" />
-
-    <!-- .NET 5.0 -->
-    <file src="..\Source\MQTTnet.Extensions.WebSocket4Net\bin\Release\net5.0\MQTTnet.Extensions.WebSocket4Net.*" target="lib\net5.0\" />
-
-    <!-- .NET Standard 1.3 -->
-    <file src="..\Source\MQTTnet.Extensions.WebSocket4Net\bin\Release\netstandard1.3\MQTTnet.Extensions.WebSocket4Net.*" target="lib\netstandard1.3\" />
-
-    <!-- .NET Standard 2.0 -->
-    <file src="..\Source\MQTTnet.Extensions.WebSocket4Net\bin\Release\netstandard2.0\MQTTnet.Extensions.WebSocket4Net.*" target="lib\netstandard2.0\" />
-
-    <!-- .NET Standard 2.1 -->
-    <file src="..\Source\MQTTnet.Extensions.WebSocket4Net\bin\Release\netstandard2.1\MQTTnet.Extensions.WebSocket4Net.*" target="lib\netstandard2.1\" />
-
-    <!-- Universal Windows -->
-    <file src="..\Source\MQTTnet.Extensions.WebSocket4Net\bin\Release\uap10.0\MQTTnet.Extensions.WebSocket4Net.*" target="lib\uap10.0\" />
-
-    <!-- .NET Framework -->
-    <file src="..\Source\MQTTnet.Extensions.WebSocket4Net\bin\Release\net452\MQTTnet.Extensions.WebSocket4Net.*" target="lib\net452\" />
-
-    <!-- .NET Framework 4.6.0 will use binaries from 4.5.2. -->
-    <file src="..\Source\MQTTnet.Extensions.WebSocket4Net\bin\Release\net461\MQTTnet.Extensions.WebSocket4Net.*" target="lib\net461\" />
-
-    <!-- Everything above .NET Framework 4.6.1 will use the binaries from 4.6.1. -->
-  </files>
-</package>
@@ -1,76 +0,0 @@
-<?xml version="1.0"?>
-<package >
-  <metadata>
-    <id>MQTTnet</id>
-    <version>0.0.0</version>
-    <authors>The contributors of MQTTnet</authors>
-    <owners>Christian Kratky</owners>
-    <license type="file">LICENSE</license>
-    <projectUrl>https://github.com/chkr1011/MQTTnet</projectUrl>
-    <iconUrl>https://raw.githubusercontent.com/chkr1011/MQTTnet/master/Images/Logo_128x128.png</iconUrl>
-    <icon>images\Logo_128x128.png</icon>
-    <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <description>MQTTnet is a high performance .NET library for MQTT based communication. It provides a MQTT client and a MQTT server (broker) and supports v3.1.0, v3.1.1 and v5.0.0 of the MQTT protocol.</description>
-    <releaseNotes>
-* [Core] Removed IDisposable from MqttClientConnection.cs (#1284).
-* [Core] Improved message of timeout exception (#1302, thanks to @patagonaa).
-* [RpcClient] Filling response topic when using MQTTv5. (#1295, thanks to @MD-V).
-* [Server] Fixed 'SessionIsPresent' handling for MQTTv5 (#1300, thanks to @logicaloud).
-* [Server] Improved session management for MQTTv5 (#1294, thanks to @logicaloud).
-Git commit: $gitCommit
-    </releaseNotes>
-    <copyright>Copyright Christian Kratky 2016-2021</copyright>
-    <tags>MQTT Message Queue Telemetry Transport MQTTClient MQTTServer Server MQTTBroker Broker NETStandard IoT InternetOfThings Messaging Hardware Arduino Sensor Actuator M2M ESP Smart Home Cities Automation Xamarin Blazor</tags>
-    <dependencies>
-      <group targetFramework="net452" />
-      <group targetFramework="net461" />
-      <group targetFramework="netstandard1.3">
-        <dependency id="NETStandard.Library" version="1.6.1" />
-        <dependency id="System.Net.Security" version="4.3.2" />
-        <dependency id="System.Net.WebSockets" version="4.3.0" />
-        <dependency id="System.Net.WebSockets.Client" version="4.3.2" />
-      </group>
-      <group targetFramework="netstandard2.0" />
-      <group targetFramework="netstandard2.1" />
-      <group targetFramework="netcoreapp3.1" />
-      <group targetFramework="net5.0" />
-      <group targetFramework="uap10.0">
-        <dependency id="Microsoft.NETCore.UniversalWindowsPlatform" version="6.2.10" />
-      </group>
-    </dependencies>
-  </metadata>
-
-  <files>
-    <!-- License -->
-    <file src="..\LICENSE" />
-
-    <!-- Images -->
-    <file src="..\Images\Logo_128x128.png" target="images\" />
-
-    <!-- .NET 5.0 -->
-    <file src="..\Source\MQTTnet\bin\Release\net5.0\MQTTnet.*" target="lib\net5.0\" />
-
-    <!-- .NET Standard 1.3 -->
-    <file src="..\Source\MQTTnet\bin\Release\netstandard1.3\MQTTnet.*" target="lib\netstandard1.3\" />
-
-    <!-- .NET Standard 2.0 -->
-    <file src="..\Source\MQTTnet\bin\Release\netstandard2.0\MQTTnet.*" target="lib\netstandard2.0\" />
-
-    <!-- .NET Standard 2.1 -->
-    <file src="..\Source\MQTTnet\bin\Release\netstandard2.1\MQTTnet.*" target="lib\netstandard2.1\" />
-
-    <!-- .NET Standard 3.1 -->
-    <file src="..\Source\MQTTnet\bin\Release\netcoreapp3.1\MQTTnet.*" target="lib\netcoreapp3.1\" />
-
-    <!-- Universal Windows -->
-    <file src="..\Source\MQTTnet\bin\Release\uap10.0\MQTTnet.*" target="lib\uap10.0\" />
-
-    <!-- .NET Framework -->
-    <file src="..\Source\MQTTnet\bin\Release\net452\MQTTnet.*" target="lib\net452\" />
-
-    <!-- .NET Framework 4.6.0 will use binaries from 4.5.2. -->
-    <file src="..\Source\MQTTnet\bin\Release\net461\MQTTnet.*" target="lib\net461\" />
-
-    <!-- Everything above .NET Framework 4.6.1 will use the binaries from 4.6.1. -->
-  </files>
-</package>
@@ -12,87 +12,30 @@ Write-Host "Nuget version    = $nugetVersion"
 Write-Host "MSBuild path     = $msbuild"
 Write-Host

-Invoke-WebRequest -Uri "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" -OutFile "nuget.exe"
-
-.\nuget.exe restore ..\MQTTnet.sln
+# Cleanup
+Get-ChildItem -Path ".\..\" -Filter "*.nupkg" -Recurse | Remove-Item
+Get-ChildItem -Path ".\..\" -Filter "*.snupkg" -Recurse | Remove-Item

 # Build and execute tests
-&$msbuild ..\Tests\MQTTnet.Core.Tests\MQTTnet.Tests.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netcoreapp3.1" /verbosity:m
-&$msbuild ..\Tests\MQTTnet.AspNetCore.Tests\MQTTnet.AspNetCore.Tests.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netcoreapp3.1" /verbosity:m
+&$msbuild ..\Tests\MQTTnet.Core.Tests\MQTTnet.Tests.csproj /t:Clean /t:Restore /t:Build /p:Configuration="Release" /p:TargetFramework="net5.0" /verbosity:m
+&$msbuild ..\Tests\MQTTnet.AspNetCore.Tests\MQTTnet.AspNetCore.Tests.csproj /t:Clean /t:Restore /t:Build /p:Configuration="Release" /p:TargetFramework="net5.0" /verbosity:m

-vstest.console.exe ..\Tests\MQTTnet.Core.Tests\bin\Release\netcoreapp3.1\MQTTnet.Tests.dll
-vstest.console.exe ..\Tests\MQTTnet.AspNetCore.Tests\bin\Release\netcoreapp3.1\MQTTnet.AspNetCore.Tests.dll
+vstest.console.exe ..\Tests\MQTTnet.Core.Tests\bin\Release\net5.0\MQTTnet.Tests.dll
+vstest.console.exe ..\Tests\MQTTnet.AspNetCore.Tests\bin\Release\net5.0\MQTTnet.AspNetCore.Tests.dll
+
+$certificate = ".\..\..\Build\codeSigningKey.pfx"

 # Build the core library
-&$msbuild ..\Source\MQTTnet\MQTTnet.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="net452" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
-&$msbuild ..\Source\MQTTnet\MQTTnet.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="net461" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
-&$msbuild ..\Source\MQTTnet\MQTTnet.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netstandard1.3" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
-&$msbuild ..\Source\MQTTnet\MQTTnet.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netstandard2.0" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
-&$msbuild ..\Source\MQTTnet\MQTTnet.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netstandard2.1" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
-&$msbuild ..\Source\MQTTnet\MQTTnet.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netcoreapp3.1" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
-&$msbuild ..\Source\MQTTnet\MQTTnet.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="uap10.0" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
-&$msbuild ..\Source\MQTTnet\MQTTnet.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="net5.0" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
+&$msbuild ..\Source\MQTTnet\MQTTnet.csproj /t:Clean /t:Restore /t:Build /p:Configuration="Release" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /p:PackageVersion=$nugetVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$certificate

-# Build the ASP.NET Core 2.0 extension
-&$msbuild ..\Source\MQTTnet.AspNetCore\MQTTnet.AspNetCore.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netstandard2.0" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
-&$msbuild ..\Source\MQTTnet.AspNetCore\MQTTnet.AspNetCore.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netcoreapp3.1" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
-&$msbuild ..\Source\MQTTnet.AspNetCore\MQTTnet.AspNetCore.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="net5.0" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
+# Build the ASP.NET extension
+&$msbuild ..\Source\MQTTnet.AspNetCore\MQTTnet.AspNetCore.csproj /t:Clean /t:Restore /t:Build /p:Configuration="Release" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /p:PackageVersion=$nugetVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$certificate

 # Build the RPC extension
-&$msbuild ..\Source\MQTTnet.Extensions.Rpc\MQTTnet.Extensions.Rpc.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="net452" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
-&$msbuild ..\Source\MQTTnet.Extensions.Rpc\MQTTnet.Extensions.Rpc.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="net461" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
-&$msbuild ..\Source\MQTTnet.Extensions.Rpc\MQTTnet.Extensions.Rpc.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netstandard1.3" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
-&$msbuild ..\Source\MQTTnet.Extensions.Rpc\MQTTnet.Extensions.Rpc.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netstandard2.0" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
-&$msbuild ..\Source\MQTTnet.Extensions.Rpc\MQTTnet.Extensions.Rpc.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netstandard2.1" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
-&$msbuild ..\Source\MQTTnet.Extensions.Rpc\MQTTnet.Extensions.Rpc.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="uap10.0" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
-&$msbuild ..\Source\MQTTnet.Extensions.Rpc\MQTTnet.Extensions.Rpc.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="net5.0" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
+&$msbuild ..\Source\MQTTnet.Extensions.Rpc\MQTTnet.Extensions.Rpc.csproj /t:Clean /t:Restore /t:Build /p:Configuration="Release" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /p:PackageVersion=$nugetVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$certificate

 # Build the Managed Client extension
-&$msbuild ..\Source\MQTTnet.Extensions.ManagedClient\MQTTnet.Extensions.ManagedClient.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="net452" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
-&$msbuild ..\Source\MQTTnet.Extensions.ManagedClient\MQTTnet.Extensions.ManagedClient.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="net461" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
-&$msbuild ..\Source\MQTTnet.Extensions.ManagedClient\MQTTnet.Extensions.ManagedClient.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netstandard1.3" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
-&$msbuild ..\Source\MQTTnet.Extensions.ManagedClient\MQTTnet.Extensions.ManagedClient.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netstandard2.0" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
-&$msbuild ..\Source\MQTTnet.Extensions.ManagedClient\MQTTnet.Extensions.ManagedClient.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netstandard2.1" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
-&$msbuild ..\Source\MQTTnet.Extensions.ManagedClient\MQTTnet.Extensions.ManagedClient.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="uap10.0" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
-&$msbuild ..\Source\MQTTnet.Extensions.ManagedClient\MQTTnet.Extensions.ManagedClient.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="net5.0" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
+&$msbuild ..\Source\MQTTnet.Extensions.ManagedClient\MQTTnet.Extensions.ManagedClient.csproj /t:Clean /t:Restore /t:Build /p:Configuration="Release" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /p:PackageVersion=$nugetVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$certificate

 # Build the WebSocket4Net extension
-&$msbuild ..\Source\MQTTnet.Extensions.WebSocket4Net\MQTTnet.Extensions.WebSocket4Net.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="net452" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
-&$msbuild ..\Source\MQTTnet.Extensions.WebSocket4Net\MQTTnet.Extensions.WebSocket4Net.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="net461" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
-&$msbuild ..\Source\MQTTnet.Extensions.WebSocket4Net\MQTTnet.Extensions.WebSocket4Net.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netstandard1.3" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
-&$msbuild ..\Source\MQTTnet.Extensions.WebSocket4Net\MQTTnet.Extensions.WebSocket4Net.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netstandard2.0" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
-&$msbuild ..\Source\MQTTnet.Extensions.WebSocket4Net\MQTTnet.Extensions.WebSocket4Net.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netstandard2.1" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
-&$msbuild ..\Source\MQTTnet.Extensions.WebSocket4Net\MQTTnet.Extensions.WebSocket4Net.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="uap10.0" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
-&$msbuild ..\Source\MQTTnet.Extensions.WebSocket4Net\MQTTnet.Extensions.WebSocket4Net.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="net5.0" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
-
-# Create NuGet packages.
-
-Remove-Item .\NuGet -Force -Recurse -ErrorAction SilentlyContinue
-
-$gitCommit = git log -1 --format=%h
-
-Copy-Item MQTTnet.nuspec -Destination MQTTnet.nuspec.old -Force
-(Get-Content MQTTnet.nuspec) -replace '\$gitCommit', $gitCommit | Set-Content MQTTnet.nuspec
-Copy-Item MQTTnet.AspNetCore.nuspec -Destination MQTTnet.AspNetCore.nuspec.old -Force
-(Get-Content MQTTnet.AspNetCore.nuspec) -replace '\$nugetVersion', $nugetVersion | Set-Content MQTTnet.AspNetCore.nuspec
-Copy-Item MQTTnet.Extensions.Rpc.nuspec -Destination MQTTnet.Extensions.Rpc.nuspec.old -Force
-(Get-Content MQTTnet.Extensions.Rpc.nuspec) -replace '\$nugetVersion', $nugetVersion | Set-Content MQTTnet.Extensions.Rpc.nuspec
-Copy-Item MQTTnet.Extensions.ManagedClient.nuspec -Destination MQTTnet.Extensions.ManagedClient.nuspec.old -Force
-(Get-Content MQTTnet.Extensions.ManagedClient.nuspec) -replace '\$nugetVersion', $nugetVersion | Set-Content MQTTnet.Extensions.ManagedClient.nuspec
-Copy-Item MQTTnet.Extensions.WebSocket4Net.nuspec -Destination MQTTnet.Extensions.WebSocket4Net.nuspec.old -Force
-(Get-Content MQTTnet.Extensions.WebSocket4Net.nuspec) -replace '\$nugetVersion', $nugetVersion | Set-Content MQTTnet.Extensions.WebSocket4Net.nuspec
-
-New-Item -ItemType Directory -Force -Path .\NuGet
-.\nuget.exe pack MQTTnet.nuspec -Verbosity detailed -Symbols -SymbolPackageFormat snupkg -OutputDir "NuGet" -Version $nugetVersion
-.\nuget.exe pack MQTTnet.AspNetCore.nuspec -Verbosity detailed -Symbols -SymbolPackageFormat snupkg -OutputDir "NuGet" -Version $nugetVersion
-.\nuget.exe pack MQTTnet.Extensions.Rpc.nuspec -Verbosity detailed -Symbols -SymbolPackageFormat snupkg -OutputDir "NuGet" -Version $nugetVersion
-.\nuget.exe pack MQTTnet.Extensions.ManagedClient.nuspec -Verbosity detailed -Symbols -SymbolPackageFormat snupkg -OutputDir "NuGet" -Version $nugetVersion
-.\nuget.exe pack MQTTnet.Extensions.WebSocket4Net.nuspec -Verbosity detailed -Symbols -SymbolPackageFormat snupkg -OutputDir "NuGet" -Version $nugetVersion
-
-Move-Item MQTTnet.nuspec.old -Destination MQTTnet.nuspec -Force
-Move-Item MQTTnet.AspNetCore.nuspec.old -Destination MQTTnet.AspNetCore.nuspec -Force
-Move-Item MQTTnet.Extensions.Rpc.nuspec.old -Destination MQTTnet.Extensions.Rpc.nuspec -Force
-Move-Item MQTTnet.Extensions.ManagedClient.nuspec.old -Destination MQTTnet.Extensions.ManagedClient.nuspec -Force
-Move-Item MQTTnet.Extensions.WebSocket4Net.nuspec.old -Destination MQTTnet.Extensions.WebSocket4Net.nuspec -Force
-
-Remove-Item "nuget.exe" -Force -Recurse -ErrorAction SilentlyContinue
+&$msbuild ..\Source\MQTTnet.Extensions.WebSocket4Net\MQTTnet.Extensions.WebSocket4Net.csproj /t:Clean /t:Restore /t:Build /p:Configuration="Release" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /p:PackageVersion=$nugetVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=$certificate
@@ -1,10 +0,0 @@
-Package: mqttnet-server
-Version: VERSIONPLACEHOLDER
-Section: base
-Priority: optional
-Architecture: amd64
-Depends: libssl1.1
-Suggests:
-Maintainer: Damian Wolgast <packages@asymetrixs.net>
-Description:
-  MQTTnet Server is a standalone cross platform MQTT server (like mosquitto) basing on this library.
@@ -1,26 +0,0 @@
-The source of MQTTnet is at:
-https://github.com/chkr1011/MQTTnet
-Project is maintained by Christian Kratky
-
-
-MIT License
-
-Copyright (c) 2021 Damian Wolgast
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-# Check if user exits
-USER=mqttnetsrv
-USEREXISTS=$(id -u $USER >/dev/null 2>&1; echo $?)
-EC=0
-BASEPATH=/opt
-INSTALLPATH=$BASEPATH/MQTTnetServer
-
-# If user does not exist, create it
-if (( $USEREXISTS == 1 )); then
-    useradd -d $INSTALLPATH  -r $USER
-    EC=$(echo $?)
-
-    if (( $EC == 1 )); then
-        exit 1;
-    fi
-fi
-
-# Set permissions on files
-chown -R root:root $INSTALLPATH
-
-# Check if config does not exist and create it
-if [ ! -f "$INSTALLPATH/appsettings.json" ]; then
-    cp $INSTALLPATH/appsettings.template.json $INSTALLPATH/appsettings.json
-fi
-
-
-# Check if setcap exists, does not exist in docker containers
-SCAP=$(which setcap >/dev/null; echo $?)
-if [ "$SCAP" -eq "0" ]; then
-    # Enable MQTTServer.NET to bind to IP interface
-    setcap CAP_NET_BIND_SERVICE=+eip $INSTALLPATH/MQTTnet.Server
-fi
-
-chmod 644 /etc/systemd/system/mqttnet-server.service
-
-# Check if systemctl exists, does not exist in docker containers
-SCTL=$(which systemctl >/dev/null; echo $?)
-
-if [ "$SCTL" -eq "0" ]; then
-    # Reload systemd because of new service file
-    systemctl daemon-reload
-fi
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# Check if systemctl exists, does not exist in docker containers
-SCTL=$(which systemctl >/dev/null; echo $?)
-if [ "$SCTL" -eq "0" ]; then
-    # Reload systemd because of new service file
-    systemctl daemon-reload
-fi
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-BASEPATH=/opt
-INSTALLPATH=$BASEPATH/MQTTnetServer
-
-# Check if systemctl exists, does not exist in docker containers
-SCTL=$(which systemctl >/dev/null; echo $?)
-if [ "$SCTL" -eq "0" ]; then
-    # Stop service before uninstalling
-    systemctl stop mqttnet-server
-fi
-
-# Check if setcap exists, does not exist in docker containers
-SCAP=$(which setcap >/dev/null; echo $?)
-if [ "$SCAP" -eq "0" ]; then
-    # Remove permission to open ports
-    setcap CAP_NET_BIND_SERVICE=-eip $INSTALLPATH/MQTTnet.Server
-fi
@@ -1,14 +0,0 @@
-[Unit]
-Description=MQTTnetServer
-After=network.target
-
-[Service]
-ExecStart=/opt/MQTTnetServer/MQTTnet.Server
-WorkingDirectory=/opt/MQTTnetServer
-StandardOutput=inherit
-StandardError=inherit
-Restart=always
-User=mqttnetsrv
-
-[Install]
-WantedBy=multi-user.target
@@ -2,12 +2,12 @@ param([string]$apiKey)

 Invoke-WebRequest -Uri "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" -OutFile "nuget.exe"

-$files = Get-ChildItem -Path ".\NuGet" -Filter "*.nupkg"
+$files = Get-ChildItem -Path ".\..\Source" -Recurse -Filter "*.nupkg"
 foreach ($file in $files)
 {
 	Write-Host "Uploading: " $file

-	.\nuget.exe push $file.Fullname $apiKey -Source https://api.nuget.org/v3/index.json
+	#.\nuget.exe push $file.Fullname $apiKey -Source https://api.nuget.org/v3/index.json
 }

 Remove-Item "nuget.exe" -Force -Recurse -ErrorAction SilentlyContinue
@@ -1,7 +1,7 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29009.5
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31919.166
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.Tests", "Tests\MQTTnet.Core.Tests\MQTTnet.Tests.csproj", "{A7FF0C91-25DE-4BA6-B39E-F54E8DADF1CC}"
 EndProject
@@ -14,11 +14,6 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{67C28AC1-BC3A-420A-BE9C-FA2401431CF9}"
 	ProjectSection(SolutionItems) = preProject
 		Build\build.ps1 = Build\build.ps1
-		Build\MQTTnet.AspNetCore.nuspec = Build\MQTTnet.AspNetCore.nuspec
-		Build\MQTTnet.Extensions.ManagedClient.nuspec = Build\MQTTnet.Extensions.ManagedClient.nuspec
-		Build\MQTTnet.Extensions.Rpc.nuspec = Build\MQTTnet.Extensions.Rpc.nuspec
-		Build\MQTTnet.Extensions.WebSocket4Net.nuspec = Build\MQTTnet.Extensions.WebSocket4Net.nuspec
-		Build\MQTTnet.nuspec = Build\MQTTnet.nuspec
 		Build\upload.ps1 = Build\upload.ps1
 	EndProjectSection
 EndProject
@@ -29,6 +24,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		appveyor.yml = appveyor.yml
 		LICENSE = LICENSE
 		README.md = README.md
+		ReleaseNotes.md = ReleaseNotes.md
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.TestApp.NetCore", "Tests\MQTTnet.TestApp.NetCore\MQTTnet.TestApp.NetCore.csproj", "{3D283AAD-AAA8-4339-8394-52F80B6304DB}"
@@ -49,14 +45,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.AspNetCore.Tests",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.Extensions.WebSocket4Net", "Source\MQTTnet.Extensions.WebSocket4Net\MQTTnet.Extensions.WebSocket4Net.csproj", "{2BD01D53-4CA5-4142-BE8D-313876395E3E}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Blazor", "Blazor", "{61B165A0-5AA8-4E04-A53D-A22A84AA6EB7}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.Test.BlazorApp.Server", "Tests\MQTTnet.Test.BlazorApp\Server\MQTTnet.Test.BlazorApp.Server.csproj", "{A9662AF3-3520-4BF8-9DFF-C55C0C33D08F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.Test.BlazorApp.Client", "Tests\MQTTnet.Test.BlazorApp\Client\MQTTnet.Test.BlazorApp.Client.csproj", "{D260D63D-7902-4C55-9665-84C5CACBBB24}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.Test.BlazorApp.Shared", "Tests\MQTTnet.Test.BlazorApp\Shared\MQTTnet.Test.BlazorApp.Shared.csproj", "{DDB069BA-6E1A-48C7-B374-5D903B553CAD}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -229,54 +217,6 @@ Global
 		{2BD01D53-4CA5-4142-BE8D-313876395E3E}.Release|x64.Build.0 = Release|Any CPU
 		{2BD01D53-4CA5-4142-BE8D-313876395E3E}.Release|x86.ActiveCfg = Release|Any CPU
 		{2BD01D53-4CA5-4142-BE8D-313876395E3E}.Release|x86.Build.0 = Release|Any CPU
-		{A9662AF3-3520-4BF8-9DFF-C55C0C33D08F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A9662AF3-3520-4BF8-9DFF-C55C0C33D08F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A9662AF3-3520-4BF8-9DFF-C55C0C33D08F}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{A9662AF3-3520-4BF8-9DFF-C55C0C33D08F}.Debug|ARM.Build.0 = Debug|Any CPU
-		{A9662AF3-3520-4BF8-9DFF-C55C0C33D08F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A9662AF3-3520-4BF8-9DFF-C55C0C33D08F}.Debug|x64.Build.0 = Debug|Any CPU
-		{A9662AF3-3520-4BF8-9DFF-C55C0C33D08F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A9662AF3-3520-4BF8-9DFF-C55C0C33D08F}.Debug|x86.Build.0 = Debug|Any CPU
-		{A9662AF3-3520-4BF8-9DFF-C55C0C33D08F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A9662AF3-3520-4BF8-9DFF-C55C0C33D08F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A9662AF3-3520-4BF8-9DFF-C55C0C33D08F}.Release|ARM.ActiveCfg = Release|Any CPU
-		{A9662AF3-3520-4BF8-9DFF-C55C0C33D08F}.Release|ARM.Build.0 = Release|Any CPU
-		{A9662AF3-3520-4BF8-9DFF-C55C0C33D08F}.Release|x64.ActiveCfg = Release|Any CPU
-		{A9662AF3-3520-4BF8-9DFF-C55C0C33D08F}.Release|x64.Build.0 = Release|Any CPU
-		{A9662AF3-3520-4BF8-9DFF-C55C0C33D08F}.Release|x86.ActiveCfg = Release|Any CPU
-		{A9662AF3-3520-4BF8-9DFF-C55C0C33D08F}.Release|x86.Build.0 = Release|Any CPU
-		{D260D63D-7902-4C55-9665-84C5CACBBB24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D260D63D-7902-4C55-9665-84C5CACBBB24}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D260D63D-7902-4C55-9665-84C5CACBBB24}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{D260D63D-7902-4C55-9665-84C5CACBBB24}.Debug|ARM.Build.0 = Debug|Any CPU
-		{D260D63D-7902-4C55-9665-84C5CACBBB24}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D260D63D-7902-4C55-9665-84C5CACBBB24}.Debug|x64.Build.0 = Debug|Any CPU
-		{D260D63D-7902-4C55-9665-84C5CACBBB24}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D260D63D-7902-4C55-9665-84C5CACBBB24}.Debug|x86.Build.0 = Debug|Any CPU
-		{D260D63D-7902-4C55-9665-84C5CACBBB24}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D260D63D-7902-4C55-9665-84C5CACBBB24}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D260D63D-7902-4C55-9665-84C5CACBBB24}.Release|ARM.ActiveCfg = Release|Any CPU
-		{D260D63D-7902-4C55-9665-84C5CACBBB24}.Release|ARM.Build.0 = Release|Any CPU
-		{D260D63D-7902-4C55-9665-84C5CACBBB24}.Release|x64.ActiveCfg = Release|Any CPU
-		{D260D63D-7902-4C55-9665-84C5CACBBB24}.Release|x64.Build.0 = Release|Any CPU
-		{D260D63D-7902-4C55-9665-84C5CACBBB24}.Release|x86.ActiveCfg = Release|Any CPU
-		{D260D63D-7902-4C55-9665-84C5CACBBB24}.Release|x86.Build.0 = Release|Any CPU
-		{DDB069BA-6E1A-48C7-B374-5D903B553CAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DDB069BA-6E1A-48C7-B374-5D903B553CAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DDB069BA-6E1A-48C7-B374-5D903B553CAD}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{DDB069BA-6E1A-48C7-B374-5D903B553CAD}.Debug|ARM.Build.0 = Debug|Any CPU
-		{DDB069BA-6E1A-48C7-B374-5D903B553CAD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DDB069BA-6E1A-48C7-B374-5D903B553CAD}.Debug|x64.Build.0 = Debug|Any CPU
-		{DDB069BA-6E1A-48C7-B374-5D903B553CAD}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DDB069BA-6E1A-48C7-B374-5D903B553CAD}.Debug|x86.Build.0 = Debug|Any CPU
-		{DDB069BA-6E1A-48C7-B374-5D903B553CAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DDB069BA-6E1A-48C7-B374-5D903B553CAD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DDB069BA-6E1A-48C7-B374-5D903B553CAD}.Release|ARM.ActiveCfg = Release|Any CPU
-		{DDB069BA-6E1A-48C7-B374-5D903B553CAD}.Release|ARM.Build.0 = Release|Any CPU
-		{DDB069BA-6E1A-48C7-B374-5D903B553CAD}.Release|x64.ActiveCfg = Release|Any CPU
-		{DDB069BA-6E1A-48C7-B374-5D903B553CAD}.Release|x64.Build.0 = Release|Any CPU
-		{DDB069BA-6E1A-48C7-B374-5D903B553CAD}.Release|x86.ActiveCfg = Release|Any CPU
-		{DDB069BA-6E1A-48C7-B374-5D903B553CAD}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -286,16 +226,12 @@ Global
 		{3587E506-55A2-4EB3-99C7-DC01E42D25D2} = {32A630A7-2598-41D7-B625-204CD906F5FB}
 		{3D283AAD-AAA8-4339-8394-52F80B6304DB} = {9248C2E1-B9D6-40BF-81EC-86004D7765B4}
 		{C6FF8AEA-0855-41EC-A1F3-AC262225BAB9} = {9248C2E1-B9D6-40BF-81EC-86004D7765B4}
-		{F10C4060-F7EE-4A83-919F-FF723E72F94A} = {32A630A7-2598-41D7-B625-204CD906F5FB}
+		{F10C4060-F7EE-4A83-919F-FF723E72F94A} = {12816BCC-AF9E-44A9-9AE5-C246AF2A0587}
 		{C444E9C8-95FA-430E-9126-274129DE16CD} = {12816BCC-AF9E-44A9-9AE5-C246AF2A0587}
 		{998D04DD-7CB0-45F5-A393-E2495C16399E} = {9248C2E1-B9D6-40BF-81EC-86004D7765B4}
 		{C400533A-8EBA-4F0B-BF4D-295C3708604B} = {12816BCC-AF9E-44A9-9AE5-C246AF2A0587}
 		{61B62223-F5D0-48E4-BBD6-2CBA9353CB5E} = {9248C2E1-B9D6-40BF-81EC-86004D7765B4}
 		{2BD01D53-4CA5-4142-BE8D-313876395E3E} = {12816BCC-AF9E-44A9-9AE5-C246AF2A0587}
-		{61B165A0-5AA8-4E04-A53D-A22A84AA6EB7} = {9248C2E1-B9D6-40BF-81EC-86004D7765B4}
-		{A9662AF3-3520-4BF8-9DFF-C55C0C33D08F} = {61B165A0-5AA8-4E04-A53D-A22A84AA6EB7}
-		{D260D63D-7902-4C55-9665-84C5CACBBB24} = {61B165A0-5AA8-4E04-A53D-A22A84AA6EB7}
-		{DDB069BA-6E1A-48C7-B374-5D903B553CAD} = {61B165A0-5AA8-4E04-A53D-A22A84AA6EB7}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {07536672-5CBC-4BE3-ACE0-708A431A7894}
@@ -1,14 +1,215 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FOR/@EntryValue">Required</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FOREACH/@EntryValue">Required</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_IFELSE/@EntryValue">Required</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_WHILE/@EntryValue">Required</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHIN_METHOD_CALL_PARENTHESES/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHIN_METHOD_PARENTHESES/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHIN_PARENTHESES/@EntryValue">False</s:Boolean>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LIMIT/@EntryValue">180</s:Int64>
+	<s:String x:Key="/Default/CodeStyle/CSharpFileLayoutPatterns/Pattern/@EntryValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&#xD;
+&lt;Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns"&gt;&#xD;
+  &lt;TypePattern DisplayName="Non-reorderable types"&gt;&#xD;
+    &lt;TypePattern.Match&gt;&#xD;
+      &lt;Or&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Kind Is="Interface" /&gt;&#xD;
+          &lt;Or&gt;&#xD;
+            &lt;HasAttribute Name="System.Runtime.InteropServices.InterfaceTypeAttribute" /&gt;&#xD;
+            &lt;HasAttribute Name="System.Runtime.InteropServices.ComImport" /&gt;&#xD;
+          &lt;/Or&gt;&#xD;
+        &lt;/And&gt;&#xD;
+        &lt;Kind Is="Struct" /&gt;&#xD;
+        &lt;HasAttribute Name="JetBrains.Annotations.NoReorderAttribute" /&gt;&#xD;
+        &lt;HasAttribute Name="JetBrains.Annotations.NoReorder" /&gt;&#xD;
+      &lt;/Or&gt;&#xD;
+    &lt;/TypePattern.Match&gt;&#xD;
+  &lt;/TypePattern&gt;&#xD;
+  &lt;TypePattern DisplayName="xUnit.net Test Classes" RemoveRegions="All"&gt;&#xD;
+    &lt;TypePattern.Match&gt;&#xD;
+      &lt;And&gt;&#xD;
+        &lt;Kind Is="Class" /&gt;&#xD;
+        &lt;HasMember&gt;&#xD;
+          &lt;And&gt;&#xD;
+            &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;HasAttribute Name="Xunit.FactAttribute" Inherited="True" /&gt;&#xD;
+            &lt;HasAttribute Name="Xunit.TheoryAttribute" Inherited="True" /&gt;&#xD;
+          &lt;/And&gt;&#xD;
+        &lt;/HasMember&gt;&#xD;
+      &lt;/And&gt;&#xD;
+    &lt;/TypePattern.Match&gt;&#xD;
+    &lt;Entry DisplayName="Setup/Teardown Methods"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;Or&gt;&#xD;
+          &lt;Kind Is="Constructor" /&gt;&#xD;
+          &lt;And&gt;&#xD;
+            &lt;Kind Is="Method" /&gt;&#xD;
+            &lt;ImplementsInterface Name="System.IDisposable" /&gt;&#xD;
+          &lt;/And&gt;&#xD;
+        &lt;/Or&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+      &lt;Entry.SortBy&gt;&#xD;
+        &lt;Kind Order="Constructor" /&gt;&#xD;
+      &lt;/Entry.SortBy&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+    &lt;Entry DisplayName="All other members" /&gt;&#xD;
+    &lt;Entry Priority="100" DisplayName="Test Methods"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Kind Is="Method" /&gt;&#xD;
+          &lt;HasAttribute Name="Xunit.FactAttribute" /&gt;&#xD;
+          &lt;HasAttribute Name="Xunit.TheoryAttribute" /&gt;&#xD;
+        &lt;/And&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+      &lt;Entry.SortBy&gt;&#xD;
+        &lt;Name /&gt;&#xD;
+      &lt;/Entry.SortBy&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+  &lt;/TypePattern&gt;&#xD;
+  &lt;TypePattern DisplayName="NUnit Test Fixtures" RemoveRegions="All"&gt;&#xD;
+    &lt;TypePattern.Match&gt;&#xD;
+      &lt;And&gt;&#xD;
+        &lt;Kind Is="Class" /&gt;&#xD;
+        &lt;Or&gt;&#xD;
+          &lt;HasAttribute Name="NUnit.Framework.TestFixtureAttribute" Inherited="True" /&gt;&#xD;
+          &lt;HasAttribute Name="NUnit.Framework.TestFixtureSourceAttribute" Inherited="True" /&gt;&#xD;
+          &lt;HasMember&gt;&#xD;
+            &lt;And&gt;&#xD;
+              &lt;Kind Is="Method" /&gt;&#xD;
+              &lt;HasAttribute Name="NUnit.Framework.TestAttribute" /&gt;&#xD;
+              &lt;HasAttribute Name="NUnit.Framework.TestCaseAttribute" /&gt;&#xD;
+              &lt;HasAttribute Name="NUnit.Framework.TestCaseSourceAttribute" /&gt;&#xD;
+            &lt;/And&gt;&#xD;
+          &lt;/HasMember&gt;&#xD;
+        &lt;/Or&gt;&#xD;
+      &lt;/And&gt;&#xD;
+    &lt;/TypePattern.Match&gt;&#xD;
+    &lt;Entry DisplayName="Setup/Teardown Methods"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Kind Is="Method" /&gt;&#xD;
+          &lt;Or&gt;&#xD;
+            &lt;HasAttribute Name="NUnit.Framework.SetUpAttribute" Inherited="True" /&gt;&#xD;
+            &lt;HasAttribute Name="NUnit.Framework.TearDownAttribute" Inherited="True" /&gt;&#xD;
+            &lt;HasAttribute Name="NUnit.Framework.TestFixtureSetUpAttribute" Inherited="True" /&gt;&#xD;
+            &lt;HasAttribute Name="NUnit.Framework.TestFixtureTearDownAttribute" Inherited="True" /&gt;&#xD;
+            &lt;HasAttribute Name="NUnit.Framework.OneTimeSetUpAttribute" Inherited="True" /&gt;&#xD;
+            &lt;HasAttribute Name="NUnit.Framework.OneTimeTearDownAttribute" Inherited="True" /&gt;&#xD;
+          &lt;/Or&gt;&#xD;
+        &lt;/And&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+    &lt;Entry DisplayName="All other members" /&gt;&#xD;
+    &lt;Entry Priority="100" DisplayName="Test Methods"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Kind Is="Method" /&gt;&#xD;
+          &lt;HasAttribute Name="NUnit.Framework.TestAttribute" /&gt;&#xD;
+          &lt;HasAttribute Name="NUnit.Framework.TestCaseAttribute" /&gt;&#xD;
+          &lt;HasAttribute Name="NUnit.Framework.TestCaseSourceAttribute" /&gt;&#xD;
+        &lt;/And&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+      &lt;Entry.SortBy&gt;&#xD;
+        &lt;Name /&gt;&#xD;
+      &lt;/Entry.SortBy&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+  &lt;/TypePattern&gt;&#xD;
+  &lt;TypePattern DisplayName="Default Pattern"&gt;&#xD;
+    &lt;Entry Priority="100" DisplayName="Public Delegates"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Access Is="Public" /&gt;&#xD;
+          &lt;Kind Is="Delegate" /&gt;&#xD;
+        &lt;/And&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+      &lt;Entry.SortBy&gt;&#xD;
+        &lt;Name /&gt;&#xD;
+      &lt;/Entry.SortBy&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+    &lt;Entry Priority="100" DisplayName="Public Enums"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Access Is="Public" /&gt;&#xD;
+          &lt;Kind Is="Enum" /&gt;&#xD;
+        &lt;/And&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+      &lt;Entry.SortBy&gt;&#xD;
+        &lt;Name /&gt;&#xD;
+      &lt;/Entry.SortBy&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+    &lt;Entry DisplayName="Static Fields and Constants"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;Or&gt;&#xD;
+          &lt;Kind Is="Constant" /&gt;&#xD;
+          &lt;And&gt;&#xD;
+            &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;Static /&gt;&#xD;
+          &lt;/And&gt;&#xD;
+        &lt;/Or&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+      &lt;Entry.SortBy&gt;&#xD;
+        &lt;Kind Order="Constant Field" /&gt;&#xD;
+      &lt;/Entry.SortBy&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+    &lt;Entry DisplayName="Fields"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Kind Is="Field" /&gt;&#xD;
+          &lt;Not&gt;&#xD;
+            &lt;Static /&gt;&#xD;
+          &lt;/Not&gt;&#xD;
+        &lt;/And&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+      &lt;Entry.SortBy&gt;&#xD;
+        &lt;Readonly /&gt;&#xD;
+        &lt;Name /&gt;&#xD;
+      &lt;/Entry.SortBy&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+    &lt;Entry DisplayName="Constructors"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;Kind Is="Constructor" /&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+      &lt;Entry.SortBy&gt;&#xD;
+        &lt;Static /&gt;&#xD;
+      &lt;/Entry.SortBy&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+    &lt;Entry DisplayName="Events"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;Kind Is="Event" /&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+      &lt;Entry.SortBy&gt;&#xD;
+        &lt;Name /&gt;&#xD;
+      &lt;/Entry.SortBy&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+    &lt;Entry DisplayName="Properties, Indexers"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;Or&gt;&#xD;
+          &lt;Kind Is="Property" /&gt;&#xD;
+          &lt;Kind Is="Indexer" /&gt;&#xD;
+        &lt;/Or&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+    &lt;Entry DisplayName="All other members"&gt;&#xD;
+      &lt;Entry.SortBy&gt;&#xD;
+        &lt;Access Order="Public Internal Protected Private" /&gt;&#xD;
+        &lt;Name /&gt;&#xD;
+      &lt;/Entry.SortBy&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+    &lt;Entry DisplayName="Nested Types"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;Kind Is="Type" /&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+  &lt;/TypePattern&gt;&#xD;
+&lt;/Patterns&gt;</s:String>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
 	<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>
@@ -0,0 +1,14 @@
+* [Core] Improved memory management when working with large payloads.
+* [Core] Added support for .NET 6.0.
+* [Core] nuget packages are now created by MSBuild including more information (i.e. commit hash).
+* [Client] The OS will now choose the best TLS version to use. It is no longer fixed to 1.3 etc. (thanks to @patagonaa, #1271).
+* [Client] Exposed user properties and reason string in subscribe result.
+* [Client] Exposed user properties and reason string in unsubscribe result.
+* [Server] Added support for returning individual subscription errors (#80 thanks to @jimch)
+* [Server] Improved topic filter comparisons (support for $).
+* [Server] Added more MQTTv5 response information to all interceptors (BREAKING CHANGE!).
+* [Server] Improved session management for MQTT v5 (#1294, thanks to @logicaloud).
+* [Server] All interceptors and events are migrated from interfaces to simple events. All existing APIs are availble but must be migrated to corresponding events (BREAKING CHANGE!).
+* [Server] Removed all interceptor and event interfaces including the delegate implementations etc. (BREAKING CHANGE!).
+* [Server] Renamed a lot of classes and adjsuted namespaces (BREAKING CHANGE!).
+* [Server] Introduced a new queueing approach for internal message process (packet bus).
@@ -1,15 +1,16 @@
 using MQTTnet.Adapter;
 using MQTTnet.AspNetCore.Client.Tcp;
-using MQTTnet.Client.Options;
 using MQTTnet.Formatter;
 using System;
 using System.Net;
+using MQTTnet.Client;
+using MQTTnet.Diagnostics;

 namespace MQTTnet.AspNetCore.Client
 {
    public class MqttClientConnectionContextFactory : IMqttClientAdapterFactory
    {
-        public IMqttChannelAdapter CreateClientAdapter(IMqttClientOptions options)
+        public IMqttChannelAdapter CreateClientAdapter(IMqttClientOptions options, IMqttNetLogger logger)
        {
            if (options == null) throw new ArgumentNullException(nameof(options));

@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Connections;
+using Microsoft.AspNetCore.Connections;
 using Microsoft.AspNetCore.Http.Features;
 using MQTTnet.Exceptions;
 using System;
@@ -40,7 +40,7 @@ namespace MQTTnet.AspNetCore.Client.Tcp
            _sender = new SocketSender(_socket, PipeScheduler.ThreadPool);
            _receiver = new SocketReceiver(_socket, PipeScheduler.ThreadPool);
        }
-#if NETCOREAPP3_1 || NET5_0
+#if NETCOREAPP3_1 || NET5_0_OR_GREATER
        public override ValueTask DisposeAsync()
 #else
        public Task DisposeAsync()
@@ -53,7 +53,7 @@ namespace MQTTnet.AspNetCore.Client.Tcp

            _socket?.Dispose();

-#if NETCOREAPP3_1 || NET5_0
+#if NETCOREAPP3_1 || NET5_0_OR_GREATER

            return base.DisposeAsync();
        }
@@ -36,9 +36,9 @@ namespace MQTTnet.AspNetCore.Extensions
            return app;
        }

-        public static IApplicationBuilder UseMqttServer(this IApplicationBuilder app, Action<IMqttServer> configure)
+        public static IApplicationBuilder UseMqttServer(this IApplicationBuilder app, Action<MqttServer> configure)
        {
-            var server = app.ApplicationServices.GetRequiredService<IMqttServer>();
+            var server = app.ApplicationServices.GetRequiredService<MqttServer>();

            configure(server);

@@ -1,5 +1,5 @@
-
-#if NETCOREAPP3_1 || NET5_0
+
+#if NETCOREAPP3_1 || NET5_0_OR_GREATER

 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Routing;
@@ -3,7 +3,6 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using MQTTnet.Adapter;
 using MQTTnet.Diagnostics;
-using MQTTnet.Diagnostics.Logger;
 using MQTTnet.Implementations;
 using MQTTnet.Server;

@@ -11,7 +10,7 @@ namespace MQTTnet.AspNetCore.Extensions
 {
    public static class ServiceCollectionExtensions
    {
-        public static IServiceCollection AddHostedMqttServer(this IServiceCollection services, IMqttServerOptions options)
+        public static IServiceCollection AddHostedMqttServer(this IServiceCollection services, MqttServerOptions options)
        {
            if (options == null) throw new ArgumentNullException(nameof(options));

@@ -24,7 +23,7 @@ namespace MQTTnet.AspNetCore.Extensions

        public static IServiceCollection AddHostedMqttServer(this IServiceCollection services, Action<MqttServerOptionsBuilder> configure)
        {
-            services.AddSingleton<IMqttServerOptions>(s =>
+            services.AddSingleton<MqttServerOptions>(s =>
            {
                var builder = new MqttServerOptionsBuilder();
                configure(builder);
@@ -38,7 +37,7 @@ namespace MQTTnet.AspNetCore.Extensions

        public static IServiceCollection AddHostedMqttServerWithServices(this IServiceCollection services, Action<AspNetMqttServerOptionsBuilder> configure)
        {
-            services.AddSingleton<IMqttServerOptions>(s =>
+            services.AddSingleton<MqttServerOptions>(s =>
            {
                var builder = new AspNetMqttServerOptionsBuilder(s);
                configure(builder);
@@ -50,24 +49,24 @@ namespace MQTTnet.AspNetCore.Extensions
            return services;
        }

-        public static IServiceCollection AddHostedMqttServer<TOptions>(this IServiceCollection services)
-            where TOptions : class, IMqttServerOptions
-        {
-            services.AddSingleton<IMqttServerOptions, TOptions>();
+        // public static IServiceCollection AddHostedMqttServer<TOptions>(this IServiceCollection services)
+        //     where TOptions : MqttServerOptions
+        // {
+        //     services.AddSingleton<MqttServerOptions, TOptions>();
+        //
+        //     services.AddHostedMqttServer();
+        //
+        //     return services;
+        // }

-            services.AddHostedMqttServer();
-
-            return services;
-        }
-
-        private static IServiceCollection AddHostedMqttServer(this IServiceCollection services)
+        static IServiceCollection AddHostedMqttServer(this IServiceCollection services)
        {
            var logger = new MqttNetEventLogger();

            services.AddSingleton<IMqttNetLogger>(logger);
            services.AddSingleton<MqttHostedServer>();
            services.AddSingleton<IHostedService>(s => s.GetService<MqttHostedServer>());
-            services.AddSingleton<IMqttServer>(s => s.GetService<MqttHostedServer>());
+            services.AddSingleton<MqttServer>(s => s.GetService<MqttHostedServer>());

            return services;
        }
@@ -1,36 +1,70 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

-  <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
-    <Product />
-    <Company />
-    <Authors />
-    <PackageId />
-    <LangVersion>7.2</LangVersion>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFrameworks>netstandard2.0;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>

-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-  </ItemGroup>
+        <AssemblyName>MQTTnet.AspNetCore</AssemblyName>
+        <RootNamespace>MQTTnet.AspNetCore</RootNamespace>
+        <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+        <Company>The contributors of MQTTnet</Company>
+        <Product>MQTTnet</Product>
+        <Description>MQTTnet is a high performance .NET library for MQTT based communication. It provides a MQTT client and a MQTT server (broker) and supports v3.1.0, v3.1.1 and v5.0.0 of the MQTT protocol.</Description>
+        <Authors>The contributors of MQTTnet</Authors>
+        <PackageId>MQTTnet.AspNetCore</PackageId>
+        <SignAssembly>false</SignAssembly>
+        <DelaySign>false</DelaySign>
+        <PublishRepositoryUrl>true</PublishRepositoryUrl>
+        <IncludeSymbols>true</IncludeSymbols>
+        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+        <Copyright>Christian Kratky 2016-2021</Copyright>
+        <PackageProjectUrl>https://github.com/chkr1011/MQTTnet</PackageProjectUrl>
+        <RepositoryUrl>https://github.com/chkr1011/MQTTnet.git</RepositoryUrl>
+        <RepositoryType>git</RepositoryType>
+        <PackageTags>MQTT Message Queue Telemetry Transport MQTTClient MQTTServer Server MQTTBroker Broker NETStandard IoT InternetOfThings Messaging Hardware Arduino Sensor Actuator M2M ESP Smart Home Cities Automation Xamarin Blazor</PackageTags>
+        <NeutralLanguage>en-US</NeutralLanguage>
+        <EnableNETAnalyzers>True</EnableNETAnalyzers>
+        <EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
+        <PackageIcon>nuget.png</PackageIcon>
+        <EmbedUntrackedSources>true</EmbedUntrackedSources>
+        <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+        <PackageLicenseFile>LICENSE</PackageLicenseFile>
+        <PackageReleaseNotes>For release notes please go to MQTTnet release notes (https://www.nuget.org/packages/MQTTnet/).</PackageReleaseNotes>
+        
+        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DefineConstants>RELEASE;NETSTANDARD2_0</DefineConstants>
-  </PropertyGroup>
+    <ItemGroup>
+        <None Include="..\..\Images\nuget.png">
+            <Pack>True</Pack>
+            <PackagePath>\</PackagePath>
+        </None>
+    </ItemGroup>

-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0' ">
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-  </ItemGroup>
-    
-  <ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp3.1' and '$(TargetFramework)' != 'net5.0' ">
-    <PackageReference Include="Microsoft.AspNetCore.Http.Connections" Version="1.1.0" />
-  </ItemGroup>
+    <ItemGroup>
+        <None Include="..\..\LICENSE">
+            <Pack>True</Pack>
+            <PackagePath>\</PackagePath>
+        </None>
+    </ItemGroup>

-  <ItemGroup>
-    <ProjectReference Include="..\MQTTnet\MQTTnet.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+    </ItemGroup>
+
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+        <DefineConstants>RELEASE;NETSTANDARD2_0</DefineConstants>
+    </PropertyGroup>
+
+    <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' ">
+        <PackageReference Include="Microsoft.AspNetCore.Http.Connections" Version="1.1.0" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\MQTTnet\MQTTnet.csproj" />
+    </ItemGroup>

 </Project>
@@ -84,7 +84,7 @@ namespace MQTTnet.AspNetCore
            _output = Connection.Transport.Output;
        }

-        public Task DisconnectAsync(TimeSpan timeout, CancellationToken cancellationToken)
+        public Task DisconnectAsync(CancellationToken cancellationToken)
        {
            _input?.Complete();
            _output?.Complete();
@@ -173,7 +173,7 @@ namespace MQTTnet.AspNetCore
            using (await _writerLock.WaitAsync(cancellationToken).ConfigureAwait(false))
            {
                var buffer = formatter.Encode(packet);
-                var msg = buffer.AsMemory();
+                var msg = buffer.ToArray().AsMemory();
                var output = _output;
                var result = await output.WriteAsync(msg, cancellationToken).ConfigureAwait(false);
                if (result.IsCompleted)
@@ -4,6 +4,7 @@ using MQTTnet.Adapter;
 using MQTTnet.Server;
 using System;
 using System.Threading.Tasks;
+using MQTTnet.Diagnostics;
 using MQTTnet.Formatter;

 namespace MQTTnet.AspNetCore
@@ -33,7 +34,7 @@ namespace MQTTnet.AspNetCore
            }
        }

-        public Task StartAsync(IMqttServerOptions options)
+        public Task StartAsync(MqttServerOptions options, IMqttNetLogger logger)
        {
            return Task.CompletedTask;
        }
@@ -1,27 +1,23 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Hosting;
 using MQTTnet.Adapter;
-using MQTTnet.Diagnostics.Logger;
+using MQTTnet.Diagnostics;
 using MQTTnet.Server;

 namespace MQTTnet.AspNetCore
 {
    public sealed class MqttHostedServer : MqttServer, IHostedService
    {
-        readonly IMqttServerOptions _options;
-
-        public MqttHostedServer(IMqttServerOptions options, IEnumerable<IMqttServerAdapter> adapters, IMqttNetLogger logger) 
-            : base(adapters, logger)
+        public MqttHostedServer(MqttServerOptions options, IEnumerable<IMqttServerAdapter> adapters, IMqttNetLogger logger) 
+            : base(options, adapters, logger)
        {
-            _options = options ?? throw new ArgumentNullException(nameof(options));
        }

        public Task StartAsync(CancellationToken cancellationToken)
        {
-            _ = StartAsync(_options);
+            _ =  StartAsync();
            return Task.CompletedTask;
        }

@@ -30,4 +26,4 @@ namespace MQTTnet.AspNetCore
            return StopAsync();
        }
    }
-}
+}
@@ -6,23 +6,19 @@ using MQTTnet.Server;
 using System;
 using System.Net.WebSockets;
 using System.Threading.Tasks;
-using MQTTnet.Diagnostics.Logger;
+using MQTTnet.Diagnostics;

 namespace MQTTnet.AspNetCore
 {
    public sealed class MqttWebSocketServerAdapter : IMqttServerAdapter
    {
-        readonly IMqttNetLogger _rootLogger;
-
-        public MqttWebSocketServerAdapter(IMqttNetLogger logger)
-        {
-            _rootLogger = logger ?? throw new ArgumentNullException(nameof(logger));
-        }
-
+        IMqttNetLogger _logger = new MqttNetNullLogger();
+        
        public Func<IMqttChannelAdapter, Task> ClientHandler { get; set; }

-        public Task StartAsync(IMqttServerOptions options)
+        public Task StartAsync(MqttServerOptions options, IMqttNetLogger logger)
        {
+            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
            return Task.CompletedTask;
        }

@@ -49,7 +45,7 @@ namespace MQTTnet.AspNetCore
                    var formatter = new MqttPacketFormatterAdapter(writer);
                    var channel = new MqttWebSocketChannel(webSocket, endpoint, isSecureConnection, clientCertificate);

-                    using (var channelAdapter = new MqttChannelAdapter(channel, formatter, null, _rootLogger))
+                    using (var channelAdapter = new MqttChannelAdapter(channel, formatter, null, _logger))
                    {
                        await clientHandler(channelAdapter).ConfigureAwait(false);
                    }
@@ -1,14 +1,13 @@
-using MQTTnet.Client.Connecting;
-using MQTTnet.Client.Disconnecting;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using MQTTnet.Client;
+using MQTTnet.Packets;

 namespace MQTTnet.Extensions.ManagedClient
 {
-    public interface IManagedMqttClient : IApplicationMessageReceiver, IApplicationMessagePublisher, IDisposable
+    public interface IManagedMqttClient : IMqttApplicationMessageReceiver, IMqttApplicationMessagePublisher, IDisposable
    {
        /// <summary>
        /// Gets the internally used MQTT client.
@@ -1,5 +1,5 @@
 using System;
-using MQTTnet.Client.Options;
+using MQTTnet.Client;
 using MQTTnet.Server;

 namespace MQTTnet.Extensions.ManagedClient
@@ -1,40 +1,71 @@
 <Project Sdk="Microsoft.NET.Sdk">

-  <PropertyGroup>
-    <TargetFrameworks>netstandard1.3;netstandard2.0;netstandard2.1;net5.0</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net452;net461</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' AND '$(MSBuildRuntimeType)' != 'Core' AND '$(SolutionName)' != 'MQTTnet.noUWP' ">$(TargetFrameworks);uap10.0</TargetFrameworks>
-    <Product />
-    <Company />
-    <Authors />
-    <PackageId />
-    <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
-    <SignAssembly>false</SignAssembly>
-    <DelaySign>false</DelaySign>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFrameworks>netstandard1.3;netstandard2.0;netstandard2.1;net5.0;net6.0</TargetFrameworks>
+        <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net452;net461</TargetFrameworks>
+        <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' AND '$(MSBuildRuntimeType)' != 'Core' AND '$(SolutionName)' != 'MQTTnet.noUWP' ">$(TargetFrameworks);uap10.0</TargetFrameworks>

-  <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
-    <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
-    <NugetTargetMoniker>UAP,Version=v10.0</NugetTargetMoniker>
-    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
-    <TargetFrameworkIdentifier>.NETCore</TargetFrameworkIdentifier>
-    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
-    <DefineConstants>$(DefineConstants);WINDOWS_UWP</DefineConstants>
-    <DefaultLanguage>en</DefaultLanguage>
-    <LanguageTargets>$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets</LanguageTargets>
-  </PropertyGroup>
+        <AssemblyName>MQTTnet.Extensions.ManagedClient</AssemblyName>
+        <RootNamespace>MQTTnet.Extensions.ManagedClient</RootNamespace>
+        <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+        <Company>The contributors of MQTTnet</Company>
+        <Product>MQTTnet</Product>
+        <Description>This is an extension library which provides a managed MQTT client with additional features using MQTTnet.</Description>
+        <Authors>The contributors of MQTTnet</Authors>
+        <PackageId>MQTTnet.Extensions.ManagedClient</PackageId>
+        <SignAssembly>false</SignAssembly>
+        <DelaySign>false</DelaySign>
+        <PublishRepositoryUrl>true</PublishRepositoryUrl>
+        <IncludeSymbols>true</IncludeSymbols>
+        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+        <Copyright>Christian Kratky 2016-2021</Copyright>
+        <PackageProjectUrl>https://github.com/chkr1011/MQTTnet</PackageProjectUrl>
+        <RepositoryUrl>https://github.com/chkr1011/MQTTnet.git</RepositoryUrl>
+        <RepositoryType>git</RepositoryType>
+        <PackageTags>MQTT Message Queue Telemetry Transport MQTTClient MQTTServer Server MQTTBroker Broker NETStandard IoT InternetOfThings Messaging Hardware Arduino Sensor Actuator M2M ESP Smart Home Cities Automation Xamarin Blazor</PackageTags>
+        <NeutralLanguage>en-US</NeutralLanguage>
+        <EnableNETAnalyzers>True</EnableNETAnalyzers>
+        <EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
+        <PackageIcon>nuget.png</PackageIcon>
+        <EmbedUntrackedSources>true</EmbedUntrackedSources>
+        <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+        <PackageLicenseFile>LICENSE</PackageLicenseFile>
+        <PackageReleaseNotes>For release notes please go to MQTTnet release notes (https://www.nuget.org/packages/MQTTnet/).</PackageReleaseNotes>
+    </PropertyGroup>

-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-  </ItemGroup>
+    <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
+        <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
+        <NugetTargetMoniker>UAP,Version=v10.0</NugetTargetMoniker>
+        <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
+        <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
+        <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
+        <TargetFrameworkIdentifier>.NETCore</TargetFrameworkIdentifier>
+        <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
+        <DefineConstants>$(DefineConstants);WINDOWS_UWP</DefineConstants>
+        <DefaultLanguage>en</DefaultLanguage>
+        <LanguageTargets>$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets</LanguageTargets>
+    </PropertyGroup>

-  <ItemGroup>
-    <ProjectReference Include="..\MQTTnet\MQTTnet.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <None Include="..\..\Images\nuget.png">
+            <Pack>True</Pack>
+            <PackagePath>\</PackagePath>
+        </None>
+    </ItemGroup>
+
+    <ItemGroup>
+        <None Include="..\..\LICENSE">
+            <Pack>True</Pack>
+            <PackagePath>\</PackagePath>
+        </None>
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\MQTTnet\MQTTnet.csproj" />
+    </ItemGroup>

 </Project>
@@ -1,9 +1,4 @@
 using MQTTnet.Client;
-using MQTTnet.Client.Connecting;
-using MQTTnet.Client.Disconnecting;
-using MQTTnet.Client.Publishing;
-using MQTTnet.Client.Receiving;
-using MQTTnet.Diagnostics;
 using MQTTnet.Exceptions;
 using MQTTnet.Internal;
 using MQTTnet.Protocol;
@@ -13,14 +8,16 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using MQTTnet.Diagnostics.Logger;
+using MQTTnet.Diagnostics;
+using MQTTnet.Packets;
+using IMqttClient = MQTTnet.Client.IMqttClient;

 namespace MQTTnet.Extensions.ManagedClient
 {
-    public class ManagedMqttClient : Disposable, IManagedMqttClient
+    public sealed class ManagedMqttClient : Disposable, IManagedMqttClient
    {
        readonly BlockingQueue<ManagedMqttApplicationMessage> _messageQueue = new BlockingQueue<ManagedMqttApplicationMessage>();
-
+        
        /// <summary>
        /// The subscriptions are managed in 2 separate buckets:
        /// <see cref="_subscriptions"/> and <see cref="_unsubscriptions"/> are processed during normal operation
@@ -29,7 +26,6 @@ namespace MQTTnet.Extensions.ManagedClient
        ///  at reconnect and are solely owned by <see cref="MaintainConnectionAsync"/>.
        /// </summary>
        readonly Dictionary<string, MqttQualityOfServiceLevel> _reconnectSubscriptions = new Dictionary<string, MqttQualityOfServiceLevel>();
-
        readonly Dictionary<string, MqttQualityOfServiceLevel> _subscriptions = new Dictionary<string, MqttQualityOfServiceLevel>();
        readonly HashSet<string> _unsubscriptions = new HashSet<string>();
        readonly SemaphoreSlim _subscriptionsQueuedSignal = new SemaphoreSlim(0);
@@ -73,11 +69,11 @@ namespace MQTTnet.Extensions.ManagedClient
            get => InternalClient.DisconnectedHandler;
            set => InternalClient.DisconnectedHandler = value;
        }
-
-        public IMqttApplicationMessageReceivedHandler ApplicationMessageReceivedHandler
+        
+        public event Func<MqttApplicationMessageReceivedEventArgs, Task> ApplicationMessageReceivedAsync
        {
-            get => InternalClient.ApplicationMessageReceivedHandler;
-            set => InternalClient.ApplicationMessageReceivedHandler = value;
+            add => InternalClient.ApplicationMessageReceivedAsync += value;
+            remove => InternalClient.ApplicationMessageReceivedAsync -= value;
        }

        public IApplicationMessageProcessedHandler ApplicationMessageProcessedHandler { get; set; }
@@ -1,12 +1,10 @@
-using MQTTnet.Client.Connecting;
-using MQTTnet.Client.Disconnecting;
-using MQTTnet.Client.Publishing;
-using MQTTnet.Client.Receiving;
-using MQTTnet.Protocol;
+using MQTTnet.Protocol;
 using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using MQTTnet.Client;
+using MQTTnet.Packets;

 namespace MQTTnet.Extensions.ManagedClient
 {
@@ -75,42 +73,7 @@ namespace MQTTnet.Extensions.ManagedClient
            client.DisconnectedHandler = handler;
            return client;
        }
-
-        public static TReceiver UseApplicationMessageReceivedHandler<TReceiver>(this TReceiver receiver, Func<MqttApplicationMessageReceivedEventArgs, Task> handler)
-            where TReceiver : IApplicationMessageReceiver
-        {
-            if (receiver == null) throw new ArgumentNullException(nameof(receiver));
-
-            if (handler == null)
-            {
-                return receiver.UseApplicationMessageReceivedHandler((IMqttApplicationMessageReceivedHandler)null);
-            }
-
-            return receiver.UseApplicationMessageReceivedHandler(new MqttApplicationMessageReceivedHandlerDelegate(handler));
-        }
-
-        public static TReceiver UseApplicationMessageReceivedHandler<TReceiver>(this TReceiver receiver, Action<MqttApplicationMessageReceivedEventArgs> handler)
-            where TReceiver : IApplicationMessageReceiver
-        {
-            if (receiver == null) throw new ArgumentNullException(nameof(receiver));
-
-            if (handler == null)
-            {
-                return receiver.UseApplicationMessageReceivedHandler((IMqttApplicationMessageReceivedHandler)null);
-            }
-
-            return receiver.UseApplicationMessageReceivedHandler(new MqttApplicationMessageReceivedHandlerDelegate(handler));
-        }
-
-        public static TReceiver UseApplicationMessageReceivedHandler<TReceiver>(this TReceiver receiver, IMqttApplicationMessageReceivedHandler handler)
-            where TReceiver : IApplicationMessageReceiver
-        {
-            if (receiver == null) throw new ArgumentNullException(nameof(receiver));
-
-            receiver.ApplicationMessageReceivedHandler = handler;
-            return receiver;
-        }
-
+        
        public static Task SubscribeAsync(this IManagedMqttClient client, params MqttTopicFilter[] topicFilters)
        {
            if (client == null) throw new ArgumentNullException(nameof(client));
@@ -141,7 +104,7 @@ namespace MQTTnet.Extensions.ManagedClient
            return client.UnsubscribeAsync(topicFilters);
        }

-        public static async Task PublishAsync(this IApplicationMessagePublisher publisher, IEnumerable<MqttApplicationMessage> applicationMessages)
+        public static async Task PublishAsync(this IMqttApplicationMessagePublisher publisher, IEnumerable<MqttApplicationMessage> applicationMessages)
        {
            if (publisher == null) throw new ArgumentNullException(nameof(publisher));
            if (applicationMessages == null) throw new ArgumentNullException(nameof(applicationMessages));
@@ -152,7 +115,7 @@ namespace MQTTnet.Extensions.ManagedClient
            }
        }

-        public static Task<MqttClientPublishResult> PublishAsync(this IApplicationMessagePublisher publisher, MqttApplicationMessage applicationMessage)
+        public static Task<MqttClientPublishResult> PublishAsync(this IMqttApplicationMessagePublisher publisher, MqttApplicationMessage applicationMessage)
        {
            if (publisher == null) throw new ArgumentNullException(nameof(publisher));
            if (applicationMessage == null) throw new ArgumentNullException(nameof(applicationMessage));
@@ -160,7 +123,7 @@ namespace MQTTnet.Extensions.ManagedClient
            return publisher.PublishAsync(applicationMessage, CancellationToken.None);
        }

-        public static async Task PublishAsync(this IApplicationMessagePublisher publisher, params MqttApplicationMessage[] applicationMessages)
+        public static async Task PublishAsync(this IMqttApplicationMessagePublisher publisher, params MqttApplicationMessage[] applicationMessages)
        {
            if (publisher == null) throw new ArgumentNullException(nameof(publisher));
            if (applicationMessages == null) throw new ArgumentNullException(nameof(applicationMessages));
@@ -171,7 +134,7 @@ namespace MQTTnet.Extensions.ManagedClient
            }
        }

-        public static Task<MqttClientPublishResult> PublishAsync(this IApplicationMessagePublisher publisher, string topic)
+        public static Task<MqttClientPublishResult> PublishAsync(this IMqttApplicationMessagePublisher publisher, string topic)
        {
            if (publisher == null) throw new ArgumentNullException(nameof(publisher));
            if (topic == null) throw new ArgumentNullException(nameof(topic));
@@ -180,7 +143,7 @@ namespace MQTTnet.Extensions.ManagedClient
                .WithTopic(topic));
        }

-        public static Task<MqttClientPublishResult> PublishAsync(this IApplicationMessagePublisher publisher, string topic, string payload)
+        public static Task<MqttClientPublishResult> PublishAsync(this IMqttApplicationMessagePublisher publisher, string topic, string payload)
        {
            if (publisher == null) throw new ArgumentNullException(nameof(publisher));
            if (topic == null) throw new ArgumentNullException(nameof(topic));
@@ -190,7 +153,7 @@ namespace MQTTnet.Extensions.ManagedClient
                .WithPayload(payload));
        }

-        public static Task<MqttClientPublishResult> PublishAsync(this IApplicationMessagePublisher publisher, string topic, string payload, MqttQualityOfServiceLevel qualityOfServiceLevel)
+        public static Task<MqttClientPublishResult> PublishAsync(this IMqttApplicationMessagePublisher publisher, string topic, string payload, MqttQualityOfServiceLevel qualityOfServiceLevel)
        {
            if (publisher == null) throw new ArgumentNullException(nameof(publisher));
            if (topic == null) throw new ArgumentNullException(nameof(topic));
@@ -201,7 +164,7 @@ namespace MQTTnet.Extensions.ManagedClient
                .WithQualityOfServiceLevel(qualityOfServiceLevel));
        }

-        public static Task<MqttClientPublishResult> PublishAsync(this IApplicationMessagePublisher publisher, string topic, string payload, MqttQualityOfServiceLevel qualityOfServiceLevel, bool retain)
+        public static Task<MqttClientPublishResult> PublishAsync(this IMqttApplicationMessagePublisher publisher, string topic, string payload, MqttQualityOfServiceLevel qualityOfServiceLevel, bool retain)
        {
            if (publisher == null) throw new ArgumentNullException(nameof(publisher));
            if (topic == null) throw new ArgumentNullException(nameof(topic));
@@ -213,7 +176,7 @@ namespace MQTTnet.Extensions.ManagedClient
                .WithRetainFlag(retain));
        }

-        public static Task<MqttClientPublishResult> PublishAsync(this IApplicationMessagePublisher publisher, Func<MqttApplicationMessageBuilder, MqttApplicationMessageBuilder> builder, CancellationToken cancellationToken)
+        public static Task<MqttClientPublishResult> PublishAsync(this IMqttApplicationMessagePublisher publisher, Func<MqttApplicationMessageBuilder, MqttApplicationMessageBuilder> builder, CancellationToken cancellationToken)
        {
            if (publisher == null) throw new ArgumentNullException(nameof(publisher));

@@ -221,7 +184,7 @@ namespace MQTTnet.Extensions.ManagedClient
            return publisher.PublishAsync(message, cancellationToken);
        }

-        public static Task<MqttClientPublishResult> PublishAsync(this IApplicationMessagePublisher publisher, Func<MqttApplicationMessageBuilder, MqttApplicationMessageBuilder> builder)
+        public static Task<MqttClientPublishResult> PublishAsync(this IMqttApplicationMessagePublisher publisher, Func<MqttApplicationMessageBuilder, MqttApplicationMessageBuilder> builder)
        {
            if (publisher == null) throw new ArgumentNullException(nameof(publisher));

@@ -1,5 +1,5 @@
 using System;
-using MQTTnet.Client.Options;
+using MQTTnet.Client;
 using MQTTnet.Server;

 namespace MQTTnet.Extensions.ManagedClient
@@ -1,5 +1,5 @@
 using System;
-using MQTTnet.Client.Options;
+using MQTTnet.Client;
 using MQTTnet.Server;

 namespace MQTTnet.Extensions.ManagedClient
@@ -1,18 +1,18 @@
 using System;
-using MQTTnet.Diagnostics.Logger;
+using MQTTnet.Diagnostics;

 namespace MQTTnet.Extensions.ManagedClient
 {
    public static class MqttFactoryExtensions
    {
-        public static IManagedMqttClient CreateManagedMqttClient(this IMqttFactory factory)
+        public static IManagedMqttClient CreateManagedMqttClient(this MqttFactory factory)
        {
            if (factory == null) throw new ArgumentNullException(nameof(factory));

            return new ManagedMqttClient(factory.CreateMqttClient(), factory.DefaultLogger);
        }

-        public static IManagedMqttClient CreateManagedMqttClient(this IMqttFactory factory, IMqttNetLogger logger)
+        public static IManagedMqttClient CreateManagedMqttClient(this MqttFactory factory, IMqttNetLogger logger)
        {
            if (factory == null) throw new ArgumentNullException(nameof(factory));
            if (logger == null) throw new ArgumentNullException(nameof(logger));
@@ -1,40 +1,71 @@
 <Project Sdk="Microsoft.NET.Sdk">

-  <PropertyGroup>
-    <TargetFrameworks>netstandard1.3;netstandard2.0;netstandard2.1;net5.0</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net452;net461</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' AND '$(MSBuildRuntimeType)' != 'Core' AND '$(SolutionName)' != 'MQTTnet.noUWP' ">$(TargetFrameworks);uap10.0</TargetFrameworks>
-    <Product />
-    <Company />
-    <Authors />
-    <PackageId />
-    <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
-    <SignAssembly>false</SignAssembly>
-    <DelaySign>false</DelaySign>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFrameworks>netstandard1.3;netstandard2.0;netstandard2.1;net5.0;net6.0</TargetFrameworks>
+        <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net452;net461</TargetFrameworks>
+        <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' AND '$(MSBuildRuntimeType)' != 'Core' AND '$(SolutionName)' != 'MQTTnet.noUWP' ">$(TargetFrameworks);uap10.0</TargetFrameworks>

-  <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
-    <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
-    <NugetTargetMoniker>UAP,Version=v10.0</NugetTargetMoniker>
-    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
-    <TargetFrameworkIdentifier>.NETCore</TargetFrameworkIdentifier>
-    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
-    <DefineConstants>$(DefineConstants);WINDOWS_UWP</DefineConstants>
-    <DefaultLanguage>en</DefaultLanguage>
-    <LanguageTargets>$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets</LanguageTargets>
-  </PropertyGroup>
+        <AssemblyName>MQTTnet.Extensions.Rpc</AssemblyName>
+        <RootNamespace>MQTTnet.Extensions.Rpc</RootNamespace>
+        <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+        <Company>The contributors of MQTTnet</Company>
+        <Product>MQTTnet</Product>
+        <Description>This is an extension library which allows executing synchronous device calls including a response using MQTTnet.</Description>
+        <Authors>The contributors of MQTTnet</Authors>
+        <PackageId>MQTTnet.Extensions.Rpc</PackageId>
+        <SignAssembly>false</SignAssembly>
+        <DelaySign>false</DelaySign>
+        <PublishRepositoryUrl>true</PublishRepositoryUrl>
+        <IncludeSymbols>true</IncludeSymbols>
+        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+        <Copyright>Christian Kratky 2016-2021</Copyright>
+        <PackageProjectUrl>https://github.com/chkr1011/MQTTnet</PackageProjectUrl>
+        <RepositoryUrl>https://github.com/chkr1011/MQTTnet.git</RepositoryUrl>
+        <RepositoryType>git</RepositoryType>
+        <PackageTags>MQTT Message Queue Telemetry Transport MQTTClient MQTTServer Server MQTTBroker Broker NETStandard IoT InternetOfThings Messaging Hardware Arduino Sensor Actuator M2M ESP Smart Home Cities Automation Xamarin Blazor</PackageTags>
+        <NeutralLanguage>en-US</NeutralLanguage>
+        <EnableNETAnalyzers>True</EnableNETAnalyzers>
+        <EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
+        <PackageIcon>nuget.png</PackageIcon>
+        <EmbedUntrackedSources>true</EmbedUntrackedSources>
+        <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+        <PackageLicenseFile>LICENSE</PackageLicenseFile>
+        <PackageReleaseNotes>For release notes please go to MQTTnet release notes (https://www.nuget.org/packages/MQTTnet/).</PackageReleaseNotes>
+    </PropertyGroup>

-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-  </ItemGroup>
+    <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
+        <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
+        <NugetTargetMoniker>UAP,Version=v10.0</NugetTargetMoniker>
+        <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
+        <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
+        <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
+        <TargetFrameworkIdentifier>.NETCore</TargetFrameworkIdentifier>
+        <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
+        <DefineConstants>$(DefineConstants);WINDOWS_UWP</DefineConstants>
+        <DefaultLanguage>en</DefaultLanguage>
+        <LanguageTargets>$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets</LanguageTargets>
+    </PropertyGroup>

-  <ItemGroup>
-    <ProjectReference Include="..\MQTTnet\MQTTnet.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <None Include="..\..\Images\nuget.png">
+            <Pack>True</Pack>
+            <PackagePath>\</PackagePath>
+        </None>
+    </ItemGroup>
+
+    <ItemGroup>
+        <None Include="..\..\LICENSE">
+            <Pack>True</Pack>
+            <PackagePath>\</PackagePath>
+        </None>
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\MQTTnet\MQTTnet.csproj" />
+    </ItemGroup>

 </Project>
@@ -7,7 +7,6 @@ using System;
 using System.Collections.Concurrent;
 using System.Threading;
 using System.Threading.Tasks;
-using MQTTnet.Client.Subscribing;
 using MQTTnet.Implementations;

 namespace MQTTnet.Extensions.Rpc
@@ -17,23 +16,13 @@ namespace MQTTnet.Extensions.Rpc
        readonly ConcurrentDictionary<string, TaskCompletionSource<byte[]>> _waitingCalls = new ConcurrentDictionary<string, TaskCompletionSource<byte[]>>();
        readonly IMqttClient _mqttClient;
        readonly IMqttRpcClientOptions _options;
-        readonly RpcAwareApplicationMessageReceivedHandler _applicationMessageReceivedHandler;
-
-        [Obsolete("Use MqttRpcClient(IMqttClient mqttClient, IMqttRpcClientOptions options).")]
-        public MqttRpcClient(IMqttClient mqttClient) : this(mqttClient, new MqttRpcClientOptions())
-        {
-        }
-
+        
        public MqttRpcClient(IMqttClient mqttClient, IMqttRpcClientOptions options)
        {
            _mqttClient = mqttClient ?? throw new ArgumentNullException(nameof(mqttClient));
            _options = options ?? throw new ArgumentNullException(nameof(options));

-            _applicationMessageReceivedHandler = new RpcAwareApplicationMessageReceivedHandler(
-                mqttClient.ApplicationMessageReceivedHandler,
-                HandleApplicationMessageReceivedAsync);
-
-            _mqttClient.ApplicationMessageReceivedHandler = _applicationMessageReceivedHandler;
+            _mqttClient.ApplicationMessageReceivedAsync += HandleApplicationMessageReceivedAsync;
        }

        public async Task<byte[]> ExecuteAsync(TimeSpan timeout, string methodName, byte[] payload, MqttQualityOfServiceLevel qualityOfServiceLevel)
@@ -59,12 +48,7 @@ namespace MQTTnet.Extensions.Rpc
        public async Task<byte[]> ExecuteAsync(string methodName, byte[] payload, MqttQualityOfServiceLevel qualityOfServiceLevel, CancellationToken cancellationToken)
        {
            if (methodName == null) throw new ArgumentNullException(nameof(methodName));
-
-            if (!(_mqttClient.ApplicationMessageReceivedHandler is RpcAwareApplicationMessageReceivedHandler))
-            {
-                throw new InvalidOperationException("The application message received handler was modified.");
-            }
-
+            
            var topicNames = _options.TopicGenerationStrategy.CreateRpcTopics(new TopicGenerationContext
            {
                MethodName = methodName,
@@ -147,7 +131,7 @@ namespace MQTTnet.Extensions.Rpc

        public void Dispose()
        {
-            _mqttClient.ApplicationMessageReceivedHandler = _applicationMessageReceivedHandler.OriginalHandler;
+            _mqttClient.ApplicationMessageReceivedAsync -= HandleApplicationMessageReceivedAsync;

            foreach (var tcs in _waitingCalls)
            {
@@ -1,32 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using MQTTnet.Client.Receiving;
-
-namespace MQTTnet.Extensions.Rpc
-{
-    public sealed class RpcAwareApplicationMessageReceivedHandler : IMqttApplicationMessageReceivedHandler
-    {
-        readonly Func<MqttApplicationMessageReceivedEventArgs, Task> _handleReceivedApplicationMessageAsync;
-
-        public RpcAwareApplicationMessageReceivedHandler(
-            IMqttApplicationMessageReceivedHandler originalHandler,
-            Func<MqttApplicationMessageReceivedEventArgs, Task> handleReceivedApplicationMessageAsync)
-        {
-            OriginalHandler = originalHandler;
-            _handleReceivedApplicationMessageAsync = handleReceivedApplicationMessageAsync ?? throw new ArgumentNullException(nameof(handleReceivedApplicationMessageAsync));
-        }
-
-        public IMqttApplicationMessageReceivedHandler OriginalHandler { get; }
-
-        public async Task HandleApplicationMessageReceivedAsync(MqttApplicationMessageReceivedEventArgs eventArgs)
-        {
-            // First try to check if there is a pending RPC call! 
-            await _handleReceivedApplicationMessageAsync(eventArgs).ConfigureAwait(false);
-            
-            if (OriginalHandler != null)
-            {
-                await OriginalHandler.HandleApplicationMessageReceivedAsync(eventArgs).ConfigureAwait(false);
-            }
-        }
-    }
-}
@@ -1,44 +1,75 @@
 <Project Sdk="Microsoft.NET.Sdk">

-  <PropertyGroup>
-    <TargetFrameworks>netstandard1.3;netstandard2.0;netstandard2.1;net5.0</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net452;net461</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' AND '$(MSBuildRuntimeType)' != 'Core' AND '$(SolutionName)' != 'MQTTnet.noUWP' ">$(TargetFrameworks);uap10.0</TargetFrameworks>
-    <Product />
-    <Company />
-    <Authors />
-    <PackageId />
-    <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
-    <SignAssembly>false</SignAssembly>
-    <DelaySign>false</DelaySign>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFrameworks>netstandard1.3;netstandard2.0;netstandard2.1;net5.0;net6.0</TargetFrameworks>
+        <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net452;net461</TargetFrameworks>
+        <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' AND '$(MSBuildRuntimeType)' != 'Core' AND '$(SolutionName)' != 'MQTTnet.noUWP' ">$(TargetFrameworks);uap10.0</TargetFrameworks>

-  <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
-    <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
-    <NugetTargetMoniker>UAP,Version=v10.0</NugetTargetMoniker>
-    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
-    <TargetFrameworkIdentifier>.NETCore</TargetFrameworkIdentifier>
-    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
-    <DefineConstants>$(DefineConstants);WINDOWS_UWP</DefineConstants>
-    <DefaultLanguage>en</DefaultLanguage>
-    <LanguageTargets>$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets</LanguageTargets>
-  </PropertyGroup>
+        <AssemblyName>MQTTnet.Extensions.WebSocket4Net</AssemblyName>
+        <RootNamespace>MQTTnet.Extensions.WebSocket4Net</RootNamespace>
+        <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+        <Company>The contributors of MQTTnet</Company>
+        <Product>MQTTnet</Product>
+        <Description>This is an extension library which allows using _WebSocket4Net_ as transport for MQTTnet clients.</Description>
+        <Authors>The contributors of MQTTnet</Authors>
+        <PackageId>MQTTnet.Extensions.WebSocket4Net</PackageId>
+        <SignAssembly>false</SignAssembly>
+        <DelaySign>false</DelaySign>
+        <PublishRepositoryUrl>true</PublishRepositoryUrl>
+        <IncludeSymbols>true</IncludeSymbols>
+        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+        <Copyright>Christian Kratky 2016-2021</Copyright>
+        <PackageProjectUrl>https://github.com/chkr1011/MQTTnet</PackageProjectUrl>
+        <RepositoryUrl>https://github.com/chkr1011/MQTTnet.git</RepositoryUrl>
+        <RepositoryType>git</RepositoryType>
+        <PackageTags>MQTT Message Queue Telemetry Transport MQTTClient MQTTServer Server MQTTBroker Broker NETStandard IoT InternetOfThings Messaging Hardware Arduino Sensor Actuator M2M ESP Smart Home Cities Automation Xamarin Blazor</PackageTags>
+        <NeutralLanguage>en-US</NeutralLanguage>
+        <EnableNETAnalyzers>True</EnableNETAnalyzers>
+        <EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
+        <PackageIcon>nuget.png</PackageIcon>
+        <EmbedUntrackedSources>true</EmbedUntrackedSources>
+        <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+        <PackageLicenseFile>LICENSE</PackageLicenseFile>
+        <PackageReleaseNotes>For release notes please go to MQTTnet release notes (https://www.nuget.org/packages/MQTTnet/).</PackageReleaseNotes>
+    </PropertyGroup>

-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-  </ItemGroup>
+    <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
+        <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
+        <NugetTargetMoniker>UAP,Version=v10.0</NugetTargetMoniker>
+        <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
+        <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
+        <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
+        <TargetFrameworkIdentifier>.NETCore</TargetFrameworkIdentifier>
+        <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
+        <DefineConstants>$(DefineConstants);WINDOWS_UWP</DefineConstants>
+        <DefaultLanguage>en</DefaultLanguage>
+        <LanguageTargets>$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets</LanguageTargets>
+    </PropertyGroup>

-  <ItemGroup>
-    <PackageReference Include="WebSocket4Net" Version="0.15.2" />
-  </ItemGroup>
+    <ItemGroup>
+        <None Include="..\..\Images\nuget.png">
+            <Pack>True</Pack>
+            <PackagePath>\</PackagePath>
+        </None>
+    </ItemGroup>

-  <ItemGroup>
-    <ProjectReference Include="..\MQTTnet\MQTTnet.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <None Include="..\..\LICENSE">
+            <Pack>True</Pack>
+            <PackagePath>\</PackagePath>
+        </None>
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="WebSocket4Net" Version="0.15.2" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\MQTTnet\MQTTnet.csproj" />
+    </ItemGroup>

 </Project>
@@ -4,11 +4,11 @@ namespace MQTTnet.Extensions.WebSocket4Net
 {
    public static class MqttFactoryExtensions
    {
-        public static IMqttFactory UseWebSocket4Net(this IMqttFactory mqttFactory)
+        public static MqttFactory UseWebSocket4Net(this MqttFactory mqttFactory)
        {
            if (mqttFactory == null) throw new ArgumentNullException(nameof(mqttFactory));

-            return mqttFactory.UseClientAdapterFactory(new WebSocket4NetMqttClientAdapterFactory(mqttFactory.DefaultLogger));
+            return mqttFactory.UseClientAdapterFactory(new WebSocket4NetMqttClientAdapterFactory());
        }
    }
 }
@@ -8,9 +8,8 @@ using System.Security.Cryptography.X509Certificates;
 using System.Threading;
 using System.Threading.Tasks;
 using MQTTnet.Channel;
-using MQTTnet.Client.Options;
+using MQTTnet.Client;
 using MQTTnet.Exceptions;
-using MQTTnet.Internal;
 using SuperSocket.ClientEngine;
 using WebSocket4Net;

@@ -205,25 +204,36 @@ namespace MQTTnet.Extensions.WebSocket4Net
                _webSocket.Open();
 #pragma warning restore AsyncFixer02 // Long-running or blocking operations inside an async method

-                var exception = await MqttTaskTimeout.WaitAsync(c =>
+                using (var timeoutCts = new CancellationTokenSource(_clientOptions.CommunicationTimeout))
+                using (var linkedCts = CancellationTokenSource.CreateLinkedTokenSource(timeoutCts.Token, cancellationToken))
                {
-                    c.Register(() => taskCompletionSource.TrySetCanceled());
-                    return taskCompletionSource.Task;
-                }, _clientOptions.CommunicationTimeout, cancellationToken).ConfigureAwait(false);
-
-                if (exception != null)
-                {
-                    if (exception is AuthenticationException authenticationException)
+                    using (linkedCts.Token.Register(() => taskCompletionSource.TrySetCanceled()))
                    {
-                        throw new MqttCommunicationException(authenticationException.InnerException);
-                    }
+                        try
+                        {
+                            await taskCompletionSource.Task.ConfigureAwait(false);
+                        }
+                        catch (Exception exception)
+                        {
+                            var timeoutReached = timeoutCts.IsCancellationRequested && !cancellationToken.IsCancellationRequested;
+                            if (timeoutReached)
+                            {
+                                throw new MqttCommunicationTimedOutException(exception);
+                            }
+                            
+                            if (exception is AuthenticationException authenticationException)
+                            {
+                                throw new MqttCommunicationException(authenticationException.InnerException);
+                            }

-                    if (exception is OperationCanceledException)
-                    {
-                        throw new MqttCommunicationTimedOutException();
-                    }
+                            if (exception is OperationCanceledException)
+                            {
+                                throw new MqttCommunicationTimedOutException();
+                            }

-                    throw new MqttCommunicationException(exception);
+                            throw new MqttCommunicationException(exception);
+                        }
+                    }
                }
            }
            catch (OperationCanceledException)
@@ -1,23 +1,15 @@
 using MQTTnet.Adapter;
-using MQTTnet.Client.Options;
-using MQTTnet.Diagnostics;
 using MQTTnet.Formatter;
 using MQTTnet.Implementations;
 using System;
-using MQTTnet.Diagnostics.Logger;
+using MQTTnet.Client;
+using MQTTnet.Diagnostics;

 namespace MQTTnet.Extensions.WebSocket4Net
 {
    public sealed class WebSocket4NetMqttClientAdapterFactory : IMqttClientAdapterFactory
    {
-        readonly IMqttNetLogger _logger;
-
-        public WebSocket4NetMqttClientAdapterFactory(IMqttNetLogger logger)
-        {
-            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-        }
-
-        public IMqttChannelAdapter CreateClientAdapter(IMqttClientOptions options)
+        public IMqttChannelAdapter CreateClientAdapter(IMqttClientOptions options, IMqttNetLogger logger)
        {
            if (options == null) throw new ArgumentNullException(nameof(options));

@@ -29,7 +21,7 @@ namespace MQTTnet.Extensions.WebSocket4Net
                        new MqttTcpChannel(options),
                        new MqttPacketFormatterAdapter(options.ProtocolVersion),
                        options.PacketInspector,
-                        _logger);
+                        logger);
                }

                case MqttClientWebSocketOptions webSocketOptions:
@@ -38,7 +30,7 @@ namespace MQTTnet.Extensions.WebSocket4Net
                        new WebSocket4NetMqttChannel(options, webSocketOptions),
                        new MqttPacketFormatterAdapter(options.ProtocolVersion), 
                        options.PacketInspector,
-                        _logger);
+                        logger);
                }

                default:
@@ -25,7 +25,7 @@ namespace MQTTnet.Adapter

        Task ConnectAsync(TimeSpan timeout, CancellationToken cancellationToken);

-        Task DisconnectAsync(TimeSpan timeout, CancellationToken cancellationToken);
+        Task DisconnectAsync(CancellationToken cancellationToken);

        Task SendPacketAsync(MqttBasePacket packet, CancellationToken cancellationToken);

@@ -1,9 +1,10 @@
-using MQTTnet.Client.Options;
+using MQTTnet.Client;
+using MQTTnet.Diagnostics;

 namespace MQTTnet.Adapter
 {
    public interface IMqttClientAdapterFactory
    {
-        IMqttChannelAdapter CreateClientAdapter(IMqttClientOptions options);
+        IMqttChannelAdapter CreateClientAdapter(IMqttClientOptions options, IMqttNetLogger logger);
    }
 }
@@ -1,5 +1,6 @@
 using System;
 using System.Threading.Tasks;
+using MQTTnet.Diagnostics;
 using MQTTnet.Server;

 namespace MQTTnet.Adapter
@@ -8,7 +9,7 @@ namespace MQTTnet.Adapter
    {
        Func<IMqttChannelAdapter, Task> ClientHandler { get; set; }

-        Task StartAsync(IMqttServerOptions options);
+        Task StartAsync(MqttServerOptions options, IMqttNetLogger logger);
        Task StopAsync();
    }
 }
@@ -11,8 +11,6 @@ using System.Runtime.InteropServices;
 using System.Security.Cryptography.X509Certificates;
 using System.Threading;
 using System.Threading.Tasks;
-using MQTTnet.Diagnostics.Logger;
-using MQTTnet.Diagnostics.PacketInspection;

 namespace MQTTnet.Adapter
 {
@@ -76,40 +74,28 @@ namespace MQTTnet.Adapter
            }
            catch (Exception exception)
            {
-                if (IsWrappedException(exception))
+                if (!WrapAndThrowException(exception))
                {
                    throw;
                }
-
-                WrapAndThrowException(exception);
            }
        }

-        public async Task DisconnectAsync(TimeSpan timeout, CancellationToken cancellationToken)
+        public async Task DisconnectAsync(CancellationToken cancellationToken)
        {
            cancellationToken.ThrowIfCancellationRequested();
            ThrowIfDisposed();

            try
            {
-                if (timeout == TimeSpan.Zero)
-                {
-                    await _channel.DisconnectAsync(cancellationToken).ConfigureAwait(false);
-                }
-                else
-                {
-                    await MqttTaskTimeout.WaitAsync(
-                        t => _channel.DisconnectAsync(t), timeout, cancellationToken).ConfigureAwait(false);
-                }
+                await _channel.DisconnectAsync(cancellationToken).ConfigureAwait(false);
            }
            catch (Exception exception)
            {
-                if (IsWrappedException(exception))
+                if (!WrapAndThrowException(exception))
                {
                    throw;
                }
-
-                WrapAndThrowException(exception);
            }
        }

@@ -128,20 +114,18 @@ namespace MQTTnet.Adapter
                    var packetData = PacketFormatterAdapter.Encode(packet);
                    _packetInspectorHandler.BeginSendPacket(packetData);

-                    await _channel.WriteAsync(packetData.Array, packetData.Offset, packetData.Count, cancellationToken).ConfigureAwait(false);
-
-                    Interlocked.Add(ref _bytesReceived, packetData.Count);
-
-                    _logger.Verbose("TX ({0} bytes) >>> {1}", packetData.Count, packet);
+                    _logger.Verbose("TX ({0} bytes) >>> {1}", packetData.Length, packet);
+                    
+                    await packetData.WriteToAsync(_channel, cancellationToken).ConfigureAwait(false);
+                    
+                    Interlocked.Add(ref _bytesReceived, packetData.Length);
                }
                catch (Exception exception)
                {
-                    if (IsWrappedException(exception))
+                    if (!WrapAndThrowException(exception))
                    {
                        throw;
                    }
-
-                    WrapAndThrowException(exception);
                }
                finally
                {
@@ -192,12 +176,10 @@ namespace MQTTnet.Adapter
            }
            catch (Exception exception)
            {
-                if (IsWrappedException(exception))
+                if (!WrapAndThrowException(exception))
                {
                    throw;
                }
-
-                WrapAndThrowException(exception);
            }

            return null;
@@ -386,17 +368,17 @@ namespace MQTTnet.Adapter

            return value;
        }
-
-        static bool IsWrappedException(Exception exception)
-        {
-            return exception is OperationCanceledException ||
-                   exception is MqttCommunicationTimedOutException ||
-                   exception is MqttCommunicationException ||
-                   exception is MqttProtocolViolationException;
-        }
-
-        static void WrapAndThrowException(Exception exception)
+        
+        static bool WrapAndThrowException(Exception exception)
        {
+            if (exception is OperationCanceledException ||
+                exception is MqttCommunicationTimedOutException ||
+                exception is MqttCommunicationException ||
+                exception is MqttProtocolViolationException)
+            {
+                return false;
+            }
+            
            if (exception is IOException && exception.InnerException is SocketException innerException)
            {
                exception = innerException;
@@ -1,5 +1,5 @@
 using System;
-using MQTTnet.Client.Connecting;
+using MQTTnet.Client;
 using MQTTnet.Exceptions;

 namespace MQTTnet.Adapter
@@ -2,8 +2,7 @@ using System;
 using System.IO;
 using System.Linq;
 using MQTTnet.Diagnostics;
-using MQTTnet.Diagnostics.Logger;
-using MQTTnet.Diagnostics.PacketInspection;
+using MQTTnet.Formatter;

 namespace MQTTnet.Adapter
 {
@@ -44,7 +43,7 @@ namespace MQTTnet.Adapter
            InspectPacket(buffer, MqttPacketFlowDirection.Inbound);
        }

-        public void BeginSendPacket(ArraySegment<byte> buffer)
+        public void BeginSendPacket(MqttPacketBuffer buffer)
        {
            if (_packetInspector == null)
            {
@@ -56,7 +55,7 @@ namespace MQTTnet.Adapter
            // intended for debugging etc. so that this is OK.
            var bufferCopy = buffer.ToArray();

-            InspectPacket(bufferCopy, MqttPacketFlowDirection.Outbound);
+            InspectPacket(bufferCopy.ToArray(), MqttPacketFlowDirection.Outbound);
        }

        public void FillReceiveBuffer(byte[] buffer)
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;

-namespace MQTTnet.Client.Connecting
+namespace MQTTnet.Client
 {
    public interface IMqttClientConnectedHandler
    {
@@ -2,7 +2,7 @@
 using MQTTnet.Packets;
 using MQTTnet.Protocol;

-namespace MQTTnet.Client.Connecting
+namespace MQTTnet.Client
 {
    public sealed class MqttClientConnectResult
    {
@@ -1,4 +1,4 @@
-namespace MQTTnet.Client.Connecting
+namespace MQTTnet.Client
 {
    public enum MqttClientConnectResultCode
    {
@@ -0,0 +1,103 @@
+using System;
+using MQTTnet.Exceptions;
+using MQTTnet.Formatter;
+using MQTTnet.Packets;
+using MQTTnet.Protocol;
+
+namespace MQTTnet.Client
+{
+    public sealed class MqttClientConnectResultFactory
+    {
+        public MqttClientConnectResult Create(MqttConnAckPacket connAckPacket, MqttProtocolVersion protocolVersion)
+        {
+            if (connAckPacket == null) throw new ArgumentNullException(nameof(connAckPacket));
+
+            if (protocolVersion == MqttProtocolVersion.V500)
+            {
+                return CreateForMqtt500(connAckPacket);
+            }
+
+            return CreateForMqtt311(connAckPacket);
+        }
+        
+        static MqttClientConnectResult CreateForMqtt500(MqttConnAckPacket connAckPacket)
+        {
+            if (connAckPacket == null) throw new ArgumentNullException(nameof(connAckPacket));
+
+            return new MqttClientConnectResult
+            {
+                IsSessionPresent = connAckPacket.IsSessionPresent,
+                ResultCode = (MqttClientConnectResultCode) (int) connAckPacket.ReasonCode,
+                WildcardSubscriptionAvailable = connAckPacket.Properties.WildcardSubscriptionAvailable,
+                RetainAvailable = connAckPacket.Properties.RetainAvailable,
+                AssignedClientIdentifier = connAckPacket.Properties.AssignedClientIdentifier,
+                AuthenticationMethod = connAckPacket.Properties.AuthenticationMethod,
+                AuthenticationData = connAckPacket.Properties.AuthenticationData,
+                MaximumPacketSize = connAckPacket.Properties.MaximumPacketSize,
+                ReasonString = connAckPacket.Properties.ReasonString,
+                ReceiveMaximum = connAckPacket.Properties.ReceiveMaximum,
+                MaximumQoS = connAckPacket.Properties.MaximumQoS ?? MqttQualityOfServiceLevel.ExactlyOnce,
+                ResponseInformation = connAckPacket.Properties.ResponseInformation,
+                TopicAliasMaximum = connAckPacket.Properties.TopicAliasMaximum,
+                ServerReference = connAckPacket.Properties.ServerReference,
+                ServerKeepAlive = connAckPacket.Properties.ServerKeepAlive,
+                SessionExpiryInterval = connAckPacket.Properties?.SessionExpiryInterval,
+                SubscriptionIdentifiersAvailable = connAckPacket.Properties.SubscriptionIdentifiersAvailable,
+                SharedSubscriptionAvailable = connAckPacket.Properties.SharedSubscriptionAvailable,
+                UserProperties = connAckPacket.Properties.UserProperties 
+            };
+        }
+        
+        static MqttClientConnectResult CreateForMqtt311(MqttConnAckPacket connAckPacket)
+        {
+            if (connAckPacket == null) throw new ArgumentNullException(nameof(connAckPacket));
+
+            return new MqttClientConnectResult
+            {
+                RetainAvailable = true, // Always true because v3.1.1 does not have a way to "disable" that feature.
+                WildcardSubscriptionAvailable = true, // Always true because v3.1.1 does not have a way to "disable" that feature.
+                IsSessionPresent = connAckPacket.IsSessionPresent,
+                ResultCode = ConvertReturnCodeToResultCode(connAckPacket.ReturnCode)
+            };
+        }
+
+        static MqttClientConnectResultCode ConvertReturnCodeToResultCode(MqttConnectReturnCode connectReturnCode)
+        {
+            switch (connectReturnCode)
+            {
+                case MqttConnectReturnCode.ConnectionAccepted:
+                {
+                    return MqttClientConnectResultCode.Success;
+                }
+
+                case MqttConnectReturnCode.ConnectionRefusedUnacceptableProtocolVersion:
+                {
+                    return MqttClientConnectResultCode.UnsupportedProtocolVersion;
+                }
+
+                case MqttConnectReturnCode.ConnectionRefusedNotAuthorized:
+                {
+                    return MqttClientConnectResultCode.NotAuthorized;
+                }
+
+                case MqttConnectReturnCode.ConnectionRefusedBadUsernameOrPassword:
+                {
+                    return MqttClientConnectResultCode.BadUserNameOrPassword;
+                }
+
+                case MqttConnectReturnCode.ConnectionRefusedIdentifierRejected:
+                {
+                    return MqttClientConnectResultCode.ClientIdentifierNotValid;
+                }
+
+                case MqttConnectReturnCode.ConnectionRefusedServerUnavailable:
+                {
+                    return MqttClientConnectResultCode.ServerUnavailable;
+                }
+
+                default:
+                    throw new MqttProtocolViolationException("Received unexpected return code.");
+            }
+        }
+    }
+}
@@ -1,6 +1,6 @@
 using System;

-namespace MQTTnet.Client.Connecting
+namespace MQTTnet.Client
 {
    public class MqttClientConnectedEventArgs : EventArgs
    {
@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;

-namespace MQTTnet.Client.Connecting
+namespace MQTTnet.Client
 {
    public class MqttClientConnectedHandlerDelegate : IMqttClientConnectedHandler
    {
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;

-namespace MQTTnet.Client.Disconnecting
+namespace MQTTnet.Client
 {
    public interface IMqttClientDisconnectedHandler
    {
@@ -1,4 +1,4 @@
-namespace MQTTnet.Client.Disconnecting
+namespace MQTTnet.Client
 {
    public sealed class MqttClientDisconnectOptions
    {
@@ -6,7 +6,7 @@
        /// Gets or sets the reason code.
        /// Hint: MQTT 5 feature only.
        /// </summary>
-        public MqttClientDisconnectReason ReasonCode { get; set; } = MqttClientDisconnectReason.NormalDisconnection;
+        public MqttClientDisconnectReason Reason { get; set; } = MqttClientDisconnectReason.NormalDisconnection;

        /// <summary>
        /// Gets or sets the reason string.
@@ -0,0 +1,29 @@
+namespace MQTTnet.Client
+{
+    public sealed class MqttClientDisconnectOptionsBuilder
+    {
+        MqttClientDisconnectReason _reason = MqttClientDisconnectReason.NormalDisconnection;
+        string _reasonString;
+        
+        public MqttClientDisconnectOptionsBuilder WithReasonString(string value)
+        {
+            _reasonString = value;
+            return this;
+        }
+        
+        public MqttClientDisconnectOptionsBuilder WithReason(MqttClientDisconnectReason value)
+        {
+            _reason = value;
+            return this;
+        }
+        
+        public MqttClientDisconnectOptions Build()
+        {
+            return new MqttClientDisconnectOptions
+            {
+                Reason = _reason,
+                ReasonString = _reasonString
+            };
+        }
+    }
+}
@@ -1,4 +1,4 @@
-namespace MQTTnet.Client.Disconnecting
+namespace MQTTnet.Client
 {
    public enum MqttClientDisconnectReason
    {
@@ -1,7 +1,6 @@
 using System;
-using MQTTnet.Client.Connecting;

-namespace MQTTnet.Client.Disconnecting
+namespace MQTTnet.Client
 {
    public sealed class MqttClientDisconnectedEventArgs : EventArgs
    {
@@ -12,7 +11,9 @@ namespace MQTTnet.Client.Disconnecting
            ConnectResult = connectResult;
            Reason = reason;

+#pragma warning disable 618
            ReasonCode = reason;
+#pragma warning restore 618
        }

        public bool ClientWasConnected { get; }
@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;

-namespace MQTTnet.Client.Disconnecting
+namespace MQTTnet.Client
 {
    public class MqttClientDisconnectedHandlerDelegate : IMqttClientDisconnectedHandler
    {
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;

-namespace MQTTnet.Client.ExtendedAuthenticationExchange
+namespace MQTTnet.Client
 {
    public interface IMqttExtendedAuthenticationExchangeHandler
    {
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using MQTTnet.Packets;
 using MQTTnet.Protocol;

-namespace MQTTnet.Client.ExtendedAuthenticationExchange
+namespace MQTTnet.Client
 {
    public class MqttExtendedAuthenticationExchangeContext
    {
@@ -2,7 +2,7 @@
 using MQTTnet.Packets;
 using MQTTnet.Protocol;

-namespace MQTTnet.Client.ExtendedAuthenticationExchange
+namespace MQTTnet.Client
 {
    public class MqttExtendedAuthenticationExchangeData
    {
@@ -1,16 +1,10 @@
-using MQTTnet.Client.Connecting;
-using MQTTnet.Client.Disconnecting;
-using MQTTnet.Client.ExtendedAuthenticationExchange;
-using MQTTnet.Client.Options;
-using MQTTnet.Client.Subscribing;
-using MQTTnet.Client.Unsubscribing;
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;

 namespace MQTTnet.Client
 {
-    public interface IMqttClient : IApplicationMessageReceiver, IApplicationMessagePublisher, IDisposable
+    public interface IMqttClient : IMqttApplicationMessageReceiver, IMqttApplicationMessagePublisher, IDisposable
    {
        bool IsConnected { get; }

@@ -22,17 +16,27 @@ namespace MQTTnet.Client
        /// </summary>
        IMqttClientConnectedHandler ConnectedHandler { get; set; }

+        /// <summary>
+        /// Fired when the client is connected.
+        /// </summary>
+        event Func<MqttClientConnectedEventArgs, Task> ConnectedAsync;
+        
        /// <summary>
        /// Gets or sets the disconnected handler that is fired after the client has disconnected from the server.
        /// Hint: Initialize handlers before you connect the client to avoid issues.
        /// </summary>
        IMqttClientDisconnectedHandler DisconnectedHandler { get; set; }

-        Task<MqttClientConnectResult> ConnectAsync(IMqttClientOptions options, CancellationToken cancellationToken);
+        /// <summary>
+        /// Fired when the client is disconnected.
+        /// </summary>
+        event Func<MqttClientDisconnectedEventArgs, Task> DisconnectedAsync;
+        
+        Task<MqttClientConnectResult> ConnectAsync(IMqttClientOptions options, CancellationToken cancellationToken = default);

-        Task DisconnectAsync(MqttClientDisconnectOptions options, CancellationToken cancellationToken);
+        Task DisconnectAsync(MqttClientDisconnectOptions options, CancellationToken cancellationToken = default);

-        Task PingAsync(CancellationToken cancellationToken);
+        Task PingAsync(CancellationToken cancellationToken = default);

        /// <summary>
        /// Sends extended authentication data.
@@ -41,10 +45,10 @@ namespace MQTTnet.Client
        /// <param name="data">The extended data.</param>
        /// <param name="cancellationToken">A cancellation token to stop the task.</param>
        /// <returns>A <see cref="Task"/> representing any asynchronous operation.</returns>
-        Task SendExtendedAuthenticationExchangeDataAsync(MqttExtendedAuthenticationExchangeData data, CancellationToken cancellationToken);
+        Task SendExtendedAuthenticationExchangeDataAsync(MqttExtendedAuthenticationExchangeData data, CancellationToken cancellationToken = default);

-        Task<MqttClientSubscribeResult> SubscribeAsync(MqttClientSubscribeOptions options, CancellationToken cancellationToken);
+        Task<MqttClientSubscribeResult> SubscribeAsync(MqttClientSubscribeOptions options, CancellationToken cancellationToken = default);

-        Task<MqttClientUnsubscribeResult> UnsubscribeAsync(MqttClientUnsubscribeOptions options, CancellationToken cancellationToken);
+        Task<MqttClientUnsubscribeResult> UnsubscribeAsync(MqttClientUnsubscribeOptions options, CancellationToken cancellationToken = default);
    }
 }
@@ -1,28 +0,0 @@
-using MQTTnet.Adapter;
-using MQTTnet.Diagnostics;
-using MQTTnet.Diagnostics.Logger;
-using MQTTnet.LowLevelClient;
-
-namespace MQTTnet.Client
-{
-    public interface IMqttClientFactory
-    {
-        IMqttFactory UseClientAdapterFactory(IMqttClientAdapterFactory clientAdapterFactory);
-
-        ILowLevelMqttClient CreateLowLevelMqttClient();
-
-        ILowLevelMqttClient CreateLowLevelMqttClient(IMqttNetLogger logger);
-
-        ILowLevelMqttClient CreateLowLevelMqttClient(IMqttClientAdapterFactory clientAdapterFactory);
-
-        ILowLevelMqttClient CreateLowLevelMqttClient(IMqttNetLogger logger, IMqttClientAdapterFactory clientAdapterFactory);
-
-        IMqttClient CreateMqttClient();
-
-        IMqttClient CreateMqttClient(IMqttNetLogger logger);
-
-        IMqttClient CreateMqttClient(IMqttClientAdapterFactory adapterFactory);
-
-        IMqttClient CreateMqttClient(IMqttNetLogger logger, IMqttClientAdapterFactory adapterFactory);
-    }
-}
@@ -1,13 +1,4 @@
 using MQTTnet.Adapter;
-using MQTTnet.Client.Connecting;
-using MQTTnet.Client.Disconnecting;
-using MQTTnet.Client.ExtendedAuthenticationExchange;
-using MQTTnet.Client.Options;
-using MQTTnet.Client.Publishing;
-using MQTTnet.Client.Receiving;
-using MQTTnet.Client.Subscribing;
-using MQTTnet.Client.Unsubscribing;
-using MQTTnet.Diagnostics;
 using MQTTnet.Exceptions;
 using MQTTnet.Internal;
 using MQTTnet.PacketDispatcher;
@@ -16,18 +7,25 @@ using MQTTnet.Protocol;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using MQTTnet.Diagnostics.Logger;
+using MQTTnet.Diagnostics;
+using MQTTnet.Formatter;
 using MQTTnet.Implementations;

 namespace MQTTnet.Client
 {
-    public class MqttClient : Disposable, IMqttClient
+    public sealed class MqttClient : Disposable, IMqttClient
    {
+        readonly MqttPacketFactories _packetFactories = new MqttPacketFactories();
        readonly MqttPacketIdentifierProvider _packetIdentifierProvider = new MqttPacketIdentifierProvider();
        readonly MqttPacketDispatcher _packetDispatcher = new MqttPacketDispatcher();
        readonly object _disconnectLock = new object();

+        readonly AsyncEvent<MqttClientConnectedEventArgs> _connectedEvent = new AsyncEvent<MqttClientConnectedEventArgs>();
+        readonly AsyncEvent<MqttClientDisconnectedEventArgs> _disconnectedEvent = new AsyncEvent<MqttClientDisconnectedEventArgs>();
+        readonly AsyncEvent<MqttApplicationMessageReceivedEventArgs> _applicationMessageReceivedEvent = new AsyncEvent<MqttApplicationMessageReceivedEventArgs>();
+
        readonly IMqttClientAdapterFactory _adapterFactory;
+        readonly IMqttNetLogger _rootLogger;
        readonly MqttNetSourceLogger _logger;

        CancellationTokenSource _backgroundCancellationTokenSource;
@@ -44,20 +42,35 @@ namespace MQTTnet.Client
        MqttClientDisconnectReason _disconnectReason;

        DateTime _lastPacketSentTimestamp;
-
+        
        public MqttClient(IMqttClientAdapterFactory channelFactory, IMqttNetLogger logger)
        {
-            if (logger == null) throw new ArgumentNullException(nameof(logger));
-
            _adapterFactory = channelFactory ?? throw new ArgumentNullException(nameof(channelFactory));
+            _rootLogger = logger ?? throw new ArgumentNullException(nameof(logger));
            _logger = logger.WithSource(nameof(MqttClient));
        }

        public IMqttClientConnectedHandler ConnectedHandler { get; set; }

+        public event Func<MqttClientConnectedEventArgs, Task> ConnectedAsync
+        {
+            add => _connectedEvent.AddHandler(value);
+            remove => _connectedEvent.RemoveHandler(value);
+        }
+        
        public IMqttClientDisconnectedHandler DisconnectedHandler { get; set; }

-        public IMqttApplicationMessageReceivedHandler ApplicationMessageReceivedHandler { get; set; }
+        public event Func<MqttClientDisconnectedEventArgs, Task> DisconnectedAsync
+        {
+            add => _disconnectedEvent.AddHandler(value);
+            remove => _disconnectedEvent.RemoveHandler(value);
+        }
+        
+        public event Func<MqttApplicationMessageReceivedEventArgs, Task> ApplicationMessageReceivedAsync
+        {
+            add => _applicationMessageReceivedEvent.AddHandler(value);
+            remove => _applicationMessageReceivedEvent.RemoveHandler(value);
+        }

        public bool IsConnected => (MqttClientConnectionStatus)_connectionStatus == MqttClientConnectionStatus.Connected;

@@ -89,13 +102,13 @@ namespace MQTTnet.Client
                _backgroundCancellationTokenSource = new CancellationTokenSource();
                var backgroundCancellationToken = _backgroundCancellationTokenSource.Token;

-                var adapter = _adapterFactory.CreateClientAdapter(options);
+                var adapter = _adapterFactory.CreateClientAdapter(options, _rootLogger);
                _adapter = adapter;

-                using (var combined = CancellationTokenSource.CreateLinkedTokenSource(backgroundCancellationToken, cancellationToken))
+                using (var effectiveCancellationToken = CancellationTokenSource.CreateLinkedTokenSource(backgroundCancellationToken, cancellationToken))
                {
                    _logger.Verbose("Trying to connect with server '{0}' (Timeout={1}).", options.ChannelOptions, options.CommunicationTimeout);
-                    await adapter.ConnectAsync(options.CommunicationTimeout, combined.Token).ConfigureAwait(false);
+                    await adapter.ConnectAsync(options.CommunicationTimeout, effectiveCancellationToken.Token).ConfigureAwait(false);
                    _logger.Verbose("Connection with server established.");

                    _publishPacketReceiverQueue = new AsyncQueue<MqttPublishPacket>();
@@ -103,7 +116,7 @@ namespace MQTTnet.Client

                    _packetReceiverTask = Task.Run(() => TryReceivePacketsAsync(backgroundCancellationToken), backgroundCancellationToken);

-                    connectResult = await AuthenticateAsync(adapter, options.WillMessage, combined.Token).ConfigureAwait(false);
+                    connectResult = await AuthenticateAsync(options, effectiveCancellationToken.Token).ConfigureAwait(false);
                }

                _lastPacketSentTimestamp = DateTime.UtcNow;
@@ -117,12 +130,15 @@ namespace MQTTnet.Client

                _logger.Info("Connected.");

+                var eventArgs = new MqttClientConnectedEventArgs(connectResult);
                var connectedHandler = ConnectedHandler;
                if (connectedHandler != null)
                {
                    await connectedHandler.HandleConnectedAsync(new MqttClientConnectedEventArgs(connectResult)).ConfigureAwait(false);
                }

+                await _connectedEvent.InvokeAsync(eventArgs).ConfigureAwait(false);
+
                return connectResult;
            }
            catch (Exception exception)
@@ -156,7 +172,7 @@ namespace MQTTnet.Client

                if (clientWasConnected)
                {
-                    var disconnectPacket = _adapter.PacketFormatterAdapter.DataConverter.CreateDisconnectPacket(options);
+                    var disconnectPacket = _packetFactories.Disconnect.Create(options);
                    await SendAsync(disconnectPacket, cancellationToken).ConfigureAwait(false);
                }
            }
@@ -178,17 +194,20 @@ namespace MQTTnet.Client
            ThrowIfDisposed();
            ThrowIfNotConnected();

-            return SendAsync(new MqttAuthPacket
+            var authPacket = new MqttAuthPacket
            {
-                Properties = new MqttAuthPacketProperties
+                Properties =
                {
                    // This must always be equal to the value from the CONNECT packet. So we use it here to ensure that.
                    AuthenticationMethod = Options.AuthenticationMethod,
                    AuthenticationData = data.AuthenticationData,
-                    ReasonString = data.ReasonString,
-                    UserProperties = data.UserProperties
+                    ReasonString = data.ReasonString
                }
-            }, cancellationToken);
+            };
+            
+            authPacket.Properties.UserProperties.AddRange(data.UserProperties);
+            
+            return SendAsync(authPacket, cancellationToken);
        }

        public async Task<MqttClientSubscribeResult> SubscribeAsync(MqttClientSubscribeOptions options, CancellationToken cancellationToken)
@@ -203,11 +222,13 @@ namespace MQTTnet.Client
            ThrowIfDisposed();
            ThrowIfNotConnected();

-            var subscribePacket = _adapter.PacketFormatterAdapter.DataConverter.CreateSubscribePacket(options);
+            var subscribePacket = _packetFactories.Subscribe.Create(options);
            subscribePacket.PacketIdentifier = _packetIdentifierProvider.GetNextPacketIdentifier();

            var subAckPacket = await SendAndReceiveAsync<MqttSubAckPacket>(subscribePacket, cancellationToken).ConfigureAwait(false);
-            return _adapter.PacketFormatterAdapter.DataConverter.CreateClientSubscribeResult(subscribePacket, subAckPacket);
+
+            var clientSubscribeResultFactory = new MqttClientSubscribeResultFactory();
+            return clientSubscribeResultFactory.Create(subscribePacket, subAckPacket);
        }

        public async Task<MqttClientUnsubscribeResult> UnsubscribeAsync(MqttClientUnsubscribeOptions options, CancellationToken cancellationToken)
@@ -216,12 +237,14 @@ namespace MQTTnet.Client

            ThrowIfDisposed();
            ThrowIfNotConnected();
-
-            var unsubscribePacket = _adapter.PacketFormatterAdapter.DataConverter.CreateUnsubscribePacket(options);
+            
+            var unsubscribePacket = _packetFactories.Unsubscribe.Create(options);
            unsubscribePacket.PacketIdentifier = _packetIdentifierProvider.GetNextPacketIdentifier();

            var unsubAckPacket = await SendAndReceiveAsync<MqttUnsubAckPacket>(unsubscribePacket, cancellationToken).ConfigureAwait(false);
-            return _adapter.PacketFormatterAdapter.DataConverter.CreateClientUnsubscribeResult(unsubscribePacket, unsubAckPacket);
+
+            var clientUnsubscribeResultFactory = new MqttClientUnsubscribeResultFactory();
+            return clientUnsubscribeResultFactory.Create(unsubscribePacket, unsubAckPacket);
        }

        public Task<MqttClientPublishResult> PublishAsync(MqttApplicationMessage applicationMessage, CancellationToken cancellationToken)
@@ -233,7 +256,7 @@ namespace MQTTnet.Client
            ThrowIfDisposed();
            ThrowIfNotConnected();

-            var publishPacket = _adapter.PacketFormatterAdapter.DataConverter.CreatePublishPacket(applicationMessage);
+            var publishPacket = _packetFactories.Publish.Create(applicationMessage);

            switch (applicationMessage.QualityOfServiceLevel)
            {
@@ -284,18 +307,18 @@ namespace MQTTnet.Client
            base.Dispose(disposing);
        }

-        async Task<MqttClientConnectResult> AuthenticateAsync(IMqttChannelAdapter channelAdapter, MqttApplicationMessage willApplicationMessage, CancellationToken cancellationToken)
+        async Task<MqttClientConnectResult> AuthenticateAsync(IMqttClientOptions options, CancellationToken cancellationToken)
        {
            MqttClientConnectResult result;

            try
            {
-                var connectPacket = channelAdapter.PacketFormatterAdapter.DataConverter.CreateConnectPacket(
-                    willApplicationMessage,
-                    Options);
+                var connectPacket = _packetFactories.Connect.Create(options);

                var connAckPacket = await SendAndReceiveAsync<MqttConnAckPacket>(connectPacket, cancellationToken).ConfigureAwait(false);
-                result = channelAdapter.PacketFormatterAdapter.DataConverter.CreateClientConnectResult(connAckPacket);
+
+                var clientConnectResultFactory = new MqttClientConnectResultFactory();
+                result = clientConnectResultFactory.Create(connAckPacket, options.ProtocolVersion);
            }
            catch (Exception exception)
            {
@@ -322,7 +345,10 @@ namespace MQTTnet.Client

        void ThrowIfConnected(string message)
        {
-            if (IsConnected) throw new MqttProtocolViolationException(message);
+            if (IsConnected)
+            {
+                throw new MqttProtocolViolationException(message);
+            }
        }

        Task DisconnectInternalAsync(Task sender, Exception exception, MqttClientConnectResult connectResult)
@@ -346,7 +372,11 @@ namespace MQTTnet.Client
                if (_adapter != null)
                {
                    _logger.Verbose("Disconnecting [Timeout={0}]", Options.CommunicationTimeout);
-                    await _adapter.DisconnectAsync(Options.CommunicationTimeout, CancellationToken.None).ConfigureAwait(false);
+
+                    using (var timeout = new CancellationTokenSource(Options.CommunicationTimeout))
+                    {
+                        await _adapter.DisconnectAsync(timeout.Token).ConfigureAwait(false);
+                    }
                }

                _logger.Verbose("Disconnected from adapter.");
@@ -376,13 +406,17 @@ namespace MQTTnet.Client

                _logger.Info("Disconnected.");

+                var eventArgs = new MqttClientDisconnectedEventArgs(clientWasConnected, exception, connectResult, _disconnectReason);
+                
                var disconnectedHandler = DisconnectedHandler;
                if (disconnectedHandler != null)
                {
                    // This handler must be executed in a new thread because otherwise a dead lock may happen
                    // when trying to reconnect in that handler etc.
-                    Task.Run(() => disconnectedHandler.HandleDisconnectedAsync(new MqttClientDisconnectedEventArgs(clientWasConnected, exception, connectResult, _disconnectReason))).RunInBackground(_logger);
+                    Task.Run(() => disconnectedHandler.HandleDisconnectedAsync(eventArgs)).RunInBackground(_logger);
                }
+
+                Task.Run(() => _disconnectedEvent.InvokeAsync(eventArgs)).RunInBackground(_logger);
            }
        }

@@ -420,7 +454,7 @@ namespace MQTTnet.Client
                packetIdentifier = packetWithIdentifier.PacketIdentifier;
            }

-            using (var packetAwaiter = _packetDispatcher.AddAwaitable<TResponsePacket>(packetIdentifier))
+            using (var packetAwaitable = _packetDispatcher.AddAwaitable<TResponsePacket>(packetIdentifier))
            {
                try
                {
@@ -429,12 +463,12 @@ namespace MQTTnet.Client
                catch (Exception exception)
                {
                    _logger.Warning(exception, "Error when sending request packet ({0}).", requestPacket.GetType().Name);
-                    packetAwaiter.Fail(exception);
+                    packetAwaitable.Fail(exception);
                }

                try
                {
-                    return await packetAwaiter.WaitOneAsync(Options.CommunicationTimeout).ConfigureAwait(false);
+                    return await packetAwaitable.WaitOneAsync(Options.CommunicationTimeout).ConfigureAwait(false);
                }
                catch (Exception exception)
                {
@@ -672,7 +706,7 @@ namespace MQTTnet.Client
            {
                if (!eventArgs.ProcessingFailed)
                {
-                    var pubAckPacket = _adapter.PacketFormatterAdapter.DataConverter.CreatePubAckPacket(eventArgs.PublishPacket, eventArgs.ReasonCode);
+                    var pubAckPacket = _packetFactories.PubAck.Create(eventArgs);
                    return SendAsync(pubAckPacket, cancellationToken);
                }
            }
@@ -680,7 +714,7 @@ namespace MQTTnet.Client
            {
                if (!eventArgs.ProcessingFailed)
                {
-                    var pubRecPacket = _adapter.PacketFormatterAdapter.DataConverter.CreatePubRecPacket(eventArgs.PublishPacket, eventArgs.ReasonCode);
+                    var pubRecPacket = _packetFactories.PubRec.Create(eventArgs);
                    return SendAsync(pubRecPacket, cancellationToken);
                }
            }
@@ -698,7 +732,7 @@ namespace MQTTnet.Client
            {
                // The packet is unknown. Probably due to a restart of the client.
                // So wen send this to the server to trigger a full resend of the message.
-                var pubRelPacket = _adapter.PacketFormatterAdapter.DataConverter.CreatePubRelPacket(pubRecPacket, MqttApplicationMessageReceivedReasonCode.PacketIdentifierNotFound);
+                var pubRelPacket = _packetFactories.PubRel.Create(pubRecPacket, MqttApplicationMessageReceivedReasonCode.PacketIdentifierNotFound);
                return SendAsync(pubRelPacket, cancellationToken);
            }

@@ -707,13 +741,13 @@ namespace MQTTnet.Client

        Task ProcessReceivedPubRelPacket(MqttPubRelPacket pubRelPacket, CancellationToken cancellationToken)
        {
-            var pubCompPacket = _adapter.PacketFormatterAdapter.DataConverter.CreatePubCompPacket(pubRelPacket, MqttApplicationMessageReceivedReasonCode.Success);
+            var pubCompPacket = _packetFactories.PubComp.Create(pubRelPacket, MqttApplicationMessageReceivedReasonCode.Success);
            return SendAsync(pubCompPacket, cancellationToken);
        }

        Task ProcessReceivedDisconnectPacket(MqttDisconnectPacket disconnectPacket)
        {
-            _disconnectReason = (MqttClientDisconnectReason) (disconnectPacket.ReasonCode ?? MqttDisconnectReasonCode.NormalDisconnection);
+            _disconnectReason = (MqttClientDisconnectReason) disconnectPacket.ReasonCode;

            // Also dispatch disconnect to waiting threads to generate a proper exception.
            _packetDispatcher.FailAll(new MqttUnexpectedDisconnectReceivedException(disconnectPacket));
@@ -736,7 +770,8 @@ namespace MQTTnet.Client
        {
            // No packet identifier is used for QoS 0 [3.3.2.2 Packet Identifier]
            await SendAsync(publishPacket, cancellationToken).ConfigureAwait(false);
-            return _adapter.PacketFormatterAdapter.DataConverter.CreateClientPublishResult(null);
+            
+            return new MqttClientPublishResultFactory().Create(null);
        }

        async Task<MqttClientPublishResult> PublishAtLeastOnceAsync(MqttPublishPacket publishPacket, CancellationToken cancellationToken)
@@ -744,8 +779,9 @@ namespace MQTTnet.Client
            publishPacket.PacketIdentifier = _packetIdentifierProvider.GetNextPacketIdentifier();
            
            var pubAckPacket = await SendAndReceiveAsync<MqttPubAckPacket>(publishPacket, cancellationToken).ConfigureAwait(false);
-            
-            return _adapter.PacketFormatterAdapter.DataConverter.CreateClientPublishResult(pubAckPacket);
+
+            var clientPublishResultFactory = new MqttClientPublishResultFactory();
+            return clientPublishResultFactory.Create(pubAckPacket);
        }

        async Task<MqttClientPublishResult> PublishExactlyOnceAsync(MqttPublishPacket publishPacket, CancellationToken cancellationToken)
@@ -754,23 +790,21 @@ namespace MQTTnet.Client

            var pubRecPacket = await SendAndReceiveAsync<MqttPubRecPacket>(publishPacket, cancellationToken).ConfigureAwait(false);

-            var pubRelPacket = _adapter.PacketFormatterAdapter.DataConverter.CreatePubRelPacket(pubRecPacket, MqttApplicationMessageReceivedReasonCode.Success);
+            var pubRelPacket = _packetFactories.PubRel.Create(pubRecPacket, MqttApplicationMessageReceivedReasonCode.Success);

            var pubCompPacket = await SendAndReceiveAsync<MqttPubCompPacket>(pubRelPacket, cancellationToken).ConfigureAwait(false);

-            return _adapter.PacketFormatterAdapter.DataConverter.CreateClientPublishResult(pubRecPacket, pubCompPacket);
+            var clientPublishResultFactory = new MqttClientPublishResultFactory();
+            return clientPublishResultFactory.Create(pubRecPacket, pubCompPacket);
        }

        async Task<MqttApplicationMessageReceivedEventArgs> HandleReceivedApplicationMessageAsync(MqttPublishPacket publishPacket)
        {
-            var applicationMessage = _adapter.PacketFormatterAdapter.DataConverter.CreateApplicationMessage(publishPacket);
+            var applicationMessageFactory = new MqttApplicationMessageFactory();
+            var applicationMessage = applicationMessageFactory.Create(publishPacket);
            var eventArgs = new MqttApplicationMessageReceivedEventArgs(Options.ClientId, applicationMessage, publishPacket, AcknowledgeReceivedPublishPacket);
-
-            var handler = ApplicationMessageReceivedHandler;
-            if (handler != null)
-            {
-                await handler.HandleApplicationMessageReceivedAsync(eventArgs).ConfigureAwait(false);
-            }
+            
+            await _applicationMessageReceivedEvent.InvokeAsync(eventArgs).ConfigureAwait(false);

            return eventArgs;
        }
@@ -1,16 +1,9 @@
-using MQTTnet.Client.Connecting;
-using MQTTnet.Client.Disconnecting;
-using MQTTnet.Client.ExtendedAuthenticationExchange;
-using MQTTnet.Client.Options;
-using MQTTnet.Client.Publishing;
-using MQTTnet.Client.Receiving;
-using MQTTnet.Client.Subscribing;
-using MQTTnet.Client.Unsubscribing;
 using MQTTnet.Protocol;
 using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using MQTTnet.Packets;

 namespace MQTTnet.Client
 {
@@ -79,39 +72,7 @@ namespace MQTTnet.Client
            client.DisconnectedHandler = handler;
            return client;
        }
-
-        public static IMqttClient UseApplicationMessageReceivedHandler(this IMqttClient client, Func<MqttApplicationMessageReceivedEventArgs, Task> handler)
-        {
-            if (client == null) throw new ArgumentNullException(nameof(client));
-
-            if (handler == null)
-            {
-                return client.UseApplicationMessageReceivedHandler((IMqttApplicationMessageReceivedHandler)null);
-            }
-
-            return client.UseApplicationMessageReceivedHandler(new MqttApplicationMessageReceivedHandlerDelegate(handler));
-        }
-
-        public static IMqttClient UseApplicationMessageReceivedHandler(this IMqttClient client, Action<MqttApplicationMessageReceivedEventArgs> handler)
-        {
-            if (client == null) throw new ArgumentNullException(nameof(client));
-
-            if (handler == null)
-            {
-                return client.UseApplicationMessageReceivedHandler((IMqttApplicationMessageReceivedHandler)null);
-            }
-
-            return client.UseApplicationMessageReceivedHandler(new MqttApplicationMessageReceivedHandlerDelegate(handler));
-        }
-
-        public static IMqttClient UseApplicationMessageReceivedHandler(this IMqttClient client, IMqttApplicationMessageReceivedHandler handler)
-        {
-            if (client == null) throw new ArgumentNullException(nameof(client));
-
-            client.ApplicationMessageReceivedHandler = handler;
-            return client;
-        }
-
+        
        public static Task<MqttClientConnectResult> ReconnectAsync(this IMqttClient client)
        {
            if (client == null) throw new ArgumentNullException(nameof(client));
@@ -149,8 +110,19 @@ namespace MQTTnet.Client

            return client.DisconnectAsync(options, CancellationToken.None);
        }
+        
+        public static Task DisconnectAsync(this IMqttClient client, MqttClientDisconnectReason reason, string reasonString = null)
+        {
+            if (client == null) throw new ArgumentNullException(nameof(client));

-        public static Task DisconnectAsync(this IMqttClient client, CancellationToken cancellationToken)
+            return client.DisconnectAsync(new MqttClientDisconnectOptions
+            {
+                Reason = reason,
+                ReasonString = reasonString
+            }, CancellationToken.None);
+        }
+
+        public static Task DisconnectAsync(this IMqttClient client, CancellationToken cancellationToken = default)
        {
            if (client == null) throw new ArgumentNullException(nameof(client));

@@ -194,43 +166,14 @@ namespace MQTTnet.Client

            return client.UnsubscribeAsync(options);
        }
-
-        public static Task<MqttClientConnectResult> ConnectAsync(this IMqttClient client, IMqttClientOptions options)
-        {
-            if (client == null) throw new ArgumentNullException(nameof(client));
-
-            return client.ConnectAsync(options, CancellationToken.None);
-        }
-
+        
        public static Task SendExtendedAuthenticationExchangeDataAsync(this IMqttClient client, MqttExtendedAuthenticationExchangeData data)
        {
            if (client == null) throw new ArgumentNullException(nameof(client));

            return client.SendExtendedAuthenticationExchangeDataAsync(data, CancellationToken.None);
        }
-
-        public static Task<MqttClientSubscribeResult> SubscribeAsync(this IMqttClient client, MqttClientSubscribeOptions options)
-        {
-            if (client == null) throw new ArgumentNullException(nameof(client));
-
-            return client.SubscribeAsync(options, CancellationToken.None);
-        }
-
-        public static Task<MqttClientUnsubscribeResult> UnsubscribeAsync(this IMqttClient client, MqttClientUnsubscribeOptions options)
-        {
-            if (client == null) throw new ArgumentNullException(nameof(client));
-
-            return client.UnsubscribeAsync(options, CancellationToken.None);
-        }
-
-        public static Task<MqttClientPublishResult> PublishAsync(this IMqttClient client, MqttApplicationMessage applicationMessage)
-        {
-            if (client == null) throw new ArgumentNullException(nameof(client));
-            if (applicationMessage == null) throw new ArgumentNullException(nameof(applicationMessage));
-
-            return client.PublishAsync(applicationMessage, CancellationToken.None);
-        }
-
+        
        public static async Task PublishAsync(this IMqttClient client, IEnumerable<MqttApplicationMessage> applicationMessages)
        {
            if (client == null) throw new ArgumentNullException(nameof(client));
@@ -1,4 +1,4 @@
-namespace MQTTnet.Client.Options
+namespace MQTTnet.Client
 {
    public interface IMqttClientChannelOptions
    {
@@ -1,4 +1,4 @@
-namespace MQTTnet.Client.Options
+namespace MQTTnet.Client
 {
    public interface IMqttClientCredentials
    {
@@ -1,11 +1,10 @@
-using MQTTnet.Client.ExtendedAuthenticationExchange;
-using MQTTnet.Formatter;
-using MQTTnet.Packets;
 using System;
 using System.Collections.Generic;
-using MQTTnet.Diagnostics.PacketInspection;
+using MQTTnet.Diagnostics;
+using MQTTnet.Formatter;
+using MQTTnet.Packets;

-namespace MQTTnet.Client.Options
+namespace MQTTnet.Client
 {
    public interface IMqttClientOptions
    {
@@ -80,25 +79,25 @@ namespace MQTTnet.Client.Options
        /// Gets the request problem information.
        /// Hint: MQTT 5 feature only.
        /// </summary>
-        bool? RequestProblemInformation { get; }
+        bool RequestProblemInformation { get; }

        /// <summary>
        /// Gets the request response information.
        /// Hint: MQTT 5 feature only.
        /// </summary>
-        bool? RequestResponseInformation { get; }
+        bool RequestResponseInformation { get; }

        /// <summary>
        /// Gets the session expiry interval.
        /// The time after a session expires when it's not actively used.
        /// </summary>
-        uint? SessionExpiryInterval { get; }
+        uint SessionExpiryInterval { get; }

        /// <summary>
        /// Gets the topic alias maximum.
        /// This gives the maximum length of the topic alias.
        /// </summary>
-        ushort? TopicAliasMaximum { get; }
+        ushort TopicAliasMaximum { get; }

        /// <summary>
        /// Gets or sets the user properties.
@@ -1,7 +1,7 @@
 using System.Net.Security;
 using System.Security.Cryptography.X509Certificates;

-namespace MQTTnet.Client.Options
+namespace MQTTnet.Client
 {
    public class MqttClientCertificateValidationCallbackContext
    {
@@ -1,4 +1,4 @@
-namespace MQTTnet.Client.Options
+namespace MQTTnet.Client
 {
    public class MqttClientCredentials : IMqttClientCredentials
    {
@@ -1,11 +1,10 @@
-using MQTTnet.Client.ExtendedAuthenticationExchange;
-using MQTTnet.Formatter;
-using MQTTnet.Packets;
 using System;
 using System.Collections.Generic;
-using MQTTnet.Diagnostics.PacketInspection;
+using MQTTnet.Diagnostics;
+using MQTTnet.Formatter;
+using MQTTnet.Packets;

-namespace MQTTnet.Client.Options
+namespace MQTTnet.Client
 {
    public class MqttClientOptions : IMqttClientOptions
    {
@@ -80,25 +79,25 @@ namespace MQTTnet.Client.Options
        /// Gets or sets the request problem information.
        /// Hint: MQTT 5 feature only.
        /// </summary>
-        public bool? RequestProblemInformation { get; set; }
+        public bool RequestProblemInformation { get; set; } = true;

        /// <summary>
        /// Gets or sets the request response information.
        /// Hint: MQTT 5 feature only.
        /// </summary>
-        public bool? RequestResponseInformation { get; set; }
+        public bool RequestResponseInformation { get; set; }

        /// <summary>
        /// Gets or sets the session expiry interval.
        /// The time after a session expires when it's not actively used.
        /// </summary>
-        public uint? SessionExpiryInterval { get; set; }
+        public uint SessionExpiryInterval { get; set; }

        /// <summary>
        /// Gets or sets the topic alias maximum.
        /// This gives the maximum length of the topic alias.
        /// </summary>
-        public ushort? TopicAliasMaximum { get; set; }
+        public ushort TopicAliasMaximum { get; set; }

        /// <summary>
        /// Gets or sets the user properties.
@@ -1,13 +1,12 @@
-using MQTTnet.Client.ExtendedAuthenticationExchange;
-using MQTTnet.Formatter;
-using MQTTnet.Packets;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using MQTTnet.Diagnostics.PacketInspection;
+using MQTTnet.Diagnostics;
+using MQTTnet.Formatter;
+using MQTTnet.Packets;

-namespace MQTTnet.Client.Options
+namespace MQTTnet.Client
 {
    public class MqttClientOptionsBuilder
    {
@@ -83,7 +82,7 @@ namespace MQTTnet.Client.Options
            return this;
        }

-        public MqttClientOptionsBuilder WithTopicAliasMaximum(ushort? topicAliasMaximum)
+        public MqttClientOptionsBuilder WithTopicAliasMaximum(ushort topicAliasMaximum)
        {
            _options.TopicAliasMaximum = topicAliasMaximum;
            return this;
@@ -101,19 +100,19 @@ namespace MQTTnet.Client.Options
            return this;
        }

-        public MqttClientOptionsBuilder WithRequestProblemInformation(bool? requestProblemInformation = true)
+        public MqttClientOptionsBuilder WithRequestProblemInformation(bool requestProblemInformation = true)
        {
            _options.RequestProblemInformation = requestProblemInformation;
            return this;
        }

-        public MqttClientOptionsBuilder WithRequestResponseInformation(bool? requestResponseInformation = true)
+        public MqttClientOptionsBuilder WithRequestResponseInformation(bool requestResponseInformation = true)
        {
            _options.RequestResponseInformation = requestResponseInformation;
            return this;
        }

-        public MqttClientOptionsBuilder WithSessionExpiryInterval(uint? sessionExpiryInterval)
+        public MqttClientOptionsBuilder WithSessionExpiryInterval(uint sessionExpiryInterval)
        {
            _options.SessionExpiryInterval = sessionExpiryInterval;
            return this;
@@ -301,7 +300,7 @@ namespace MQTTnet.Client.Options
 #pragma warning disable CS0618 // Type or member is obsolete
                        CertificateValidationCallback = _tlsParameters.CertificateValidationCallback,
 #pragma warning restore CS0618 // Type or member is obsolete
-#if NETCOREAPP3_1 || NET5_0
+#if NETCOREAPP3_1 || NET5_0_OR_GREATER
                        ApplicationProtocols = _tlsParameters.ApplicationProtocols,
 #endif
                        CertificateValidationHandler = _tlsParameters.CertificateValidationHandler,
@@ -4,7 +4,7 @@ using System.Net.Security;
 using System.Security.Authentication;
 using System.Security.Cryptography.X509Certificates;

-namespace MQTTnet.Client.Options
+namespace MQTTnet.Client
 {
    public class MqttClientOptionsBuilderTlsParameters
    {
@@ -27,8 +27,8 @@ namespace MQTTnet.Client.Options
        public IEnumerable<X509Certificate> Certificates { get; set; }
 #endif

-#if NETCOREAPP3_1 || NET5_0
-	    public List<SslApplicationProtocol> ApplicationProtocols { get;set; }
+#if NETCOREAPP3_1 || NET5_0_OR_GREATER
+        public List<SslApplicationProtocol> ApplicationProtocols { get;set; }
 #endif

 	    public bool AllowUntrustedCertificates { get; set; }
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Net;

-namespace MQTTnet.Client.Options
+namespace MQTTnet.Client
 {
    public class MqttClientOptionsBuilderWebSocketParameters
    {
@@ -1,6 +1,6 @@
 using System.Net.Sockets;

-namespace MQTTnet.Client.Options
+namespace MQTTnet.Client
 {
    public class MqttClientTcpOptions : IMqttClientChannelOptions
    {
@@ -1,6 +1,6 @@
 using System;

-namespace MQTTnet.Client.Options
+namespace MQTTnet.Client
 {
    public static class MqttClientTcpOptionsExtensions
    {
@@ -4,7 +4,7 @@ using System.Net.Security;
 using System.Security.Authentication;
 using System.Security.Cryptography.X509Certificates;

-namespace MQTTnet.Client.Options
+namespace MQTTnet.Client
 {
    public class MqttClientTlsOptions
    {
@@ -22,7 +22,7 @@ namespace MQTTnet.Client.Options
        public List<X509Certificate> Certificates { get; set; }
 #endif

-#if NETCOREAPP3_1 || NET5_0
+#if NETCOREAPP3_1 || NET5_0_OR_GREATER
        public List<SslApplicationProtocol> ApplicationProtocols { get; set; }
 #endif

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Net;

-namespace MQTTnet.Client.Options
+namespace MQTTnet.Client
 {
    public class MqttClientWebSocketOptions : IMqttClientChannelOptions
    {
@@ -1,4 +1,4 @@
-namespace MQTTnet.Client.Options
+namespace MQTTnet.Client
 {
    public class MqttClientWebSocketProxyOptions
    {
@@ -1,8 +1,9 @@
-namespace MQTTnet.Client.Publishing
+namespace MQTTnet.Client
 {
    public enum MqttClientPublishReasonCode
    {
        Success = 0,
+        
        NoMatchingSubscribers = 16,
        UnspecifiedError = 128,
        ImplementationSpecificError = 131,
@@ -1,11 +1,13 @@
-
-using System.Collections.Generic;
+using System.Collections.Generic;
 using MQTTnet.Packets;

-namespace MQTTnet.Client.Publishing
+namespace MQTTnet.Client
 {
-    public class MqttClientPublishResult
+    public sealed class MqttClientPublishResult
    {
+        /// <summary>
+        /// Gets the packet identifier which was used for this publish.
+        /// </summary>
        public ushort? PacketIdentifier { get; set; }

        /// <summary>
@@ -27,6 +29,6 @@ namespace MQTTnet.Client.Publishing
        /// The feature is very similar to the HTTP header concept.
        /// Hint: MQTT 5 feature only.
        /// </summary>
-        public List<MqttUserProperty> UserProperties { get; set; }
+        public List<MqttUserProperty> UserProperties { get; } = new List<MqttUserProperty>();
    }
 }
@@ -0,0 +1,74 @@
+using MQTTnet.Packets;
+using MQTTnet.Protocol;
+
+namespace MQTTnet.Client
+{
+    public sealed class MqttClientPublishResultFactory
+    {
+        public MqttClientPublishResult Create(MqttPubAckPacket pubAckPacket)
+        {
+            var result = new MqttClientPublishResult
+            {
+                ReasonCode = MqttClientPublishReasonCode.Success,
+            };
+
+            if (pubAckPacket != null)
+            {
+                result.ReasonString = pubAckPacket.Properties.ReasonString;
+                result.UserProperties.AddRange(pubAckPacket.Properties.UserProperties);
+                
+                // QoS 0 has no response. So we treat it as a success always.
+                // Both enums have the same values. So it can be easily converted.
+                result.ReasonCode = (MqttClientPublishReasonCode) (int) pubAckPacket.ReasonCode;
+
+                result.PacketIdentifier = pubAckPacket.PacketIdentifier;
+            }
+
+            return result;
+        }
+
+        public MqttClientPublishResult Create(MqttPubRecPacket pubRecPacket, MqttPubCompPacket pubCompPacket)
+        {
+            if (pubRecPacket == null || pubCompPacket == null)
+            {
+                return new MqttClientPublishResult
+                {
+                    ReasonCode = MqttClientPublishReasonCode.UnspecifiedError
+                };
+            }
+
+            MqttClientPublishResult result;
+            
+            // The PUBCOMP is the last packet in QoS 2. So we use the results from that instead of PUBREC.
+            if (pubCompPacket.ReasonCode == MqttPubCompReasonCode.PacketIdentifierNotFound)
+            {
+                result = new MqttClientPublishResult
+                {
+                    PacketIdentifier = pubCompPacket.PacketIdentifier,
+                    ReasonCode = MqttClientPublishReasonCode.UnspecifiedError,
+                    ReasonString = pubCompPacket.Properties.ReasonString
+                };
+                
+                result.UserProperties.AddRange(pubCompPacket.Properties.UserProperties);
+                return result;
+            }
+
+            result = new MqttClientPublishResult
+            {
+                PacketIdentifier = pubCompPacket.PacketIdentifier,
+                ReasonCode = MqttClientPublishReasonCode.Success,
+                ReasonString = pubCompPacket.Properties.ReasonString
+            };
+            
+            result.UserProperties.AddRange(pubCompPacket.Properties.UserProperties);
+
+            if (pubRecPacket.ReasonCode != MqttPubRecReasonCode.Success)
+            {
+                // Both enums share the same values.
+                result.ReasonCode = (MqttClientPublishReasonCode) pubRecPacket.ReasonCode;
+            }
+
+            return result;
+        }
+    }
+}
@@ -1,9 +0,0 @@
-using System.Threading.Tasks;
-
-namespace MQTTnet.Client.Receiving
-{
-    public interface IMqttApplicationMessageReceivedHandler
-    {
-        Task HandleApplicationMessageReceivedAsync(MqttApplicationMessageReceivedEventArgs eventArgs);
-    }
-}
@@ -1,9 +1,10 @@
 using System;
+using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using MQTTnet.Packets;

-namespace MQTTnet
+namespace MQTTnet.Client
 {
    public sealed class MqttApplicationMessageReceivedEventArgs : EventArgs
    {
@@ -23,7 +24,7 @@ namespace MQTTnet
            _acknowledgeHandler = acknowledgeHandler;
        }

-        internal MqttPublishPacket PublishPacket { get; }
+        internal MqttPublishPacket PublishPacket { get; set; }
        
        /// <summary>
        /// Gets the client identifier.
@@ -35,7 +36,20 @@ namespace MQTTnet

        public bool ProcessingFailed { get; set; }

+        /// <summary>
+        /// Gets or sets the reason code which will be sent to the server.
+        /// </summary>
        public MqttApplicationMessageReceivedReasonCode ReasonCode { get; set; } = MqttApplicationMessageReceivedReasonCode.Success;
+
+        /// <summary>
+        /// Gets or sets the user properties which will be sent to the server in the ACK packet etc.
+        /// </summary>
+        public List<MqttUserProperty> ResponseUserProperties { get; } = new List<MqttUserProperty>();
+
+        /// <summary>
+        /// Gets or sets the reason string which will be sent to the server in the ACK packet.
+        /// </summary>
+        public string ResponseReasonString { get; set; }
        
        /// <summary>
        /// Gets or sets whether this message was handled.
@@ -1,32 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using MQTTnet.Implementations;
-
-namespace MQTTnet.Client.Receiving
-{
-    public sealed class MqttApplicationMessageReceivedHandlerDelegate : IMqttApplicationMessageReceivedHandler
-    {
-        readonly Func<MqttApplicationMessageReceivedEventArgs, Task> _handler;
-
-        public MqttApplicationMessageReceivedHandlerDelegate(Action<MqttApplicationMessageReceivedEventArgs> handler)
-        {
-            if (handler == null) throw new ArgumentNullException(nameof(handler));
-
-            _handler = context =>
-            {
-                handler(context);
-                return PlatformAbstractionLayer.CompletedTask;
-            };
-        }
-
-        public MqttApplicationMessageReceivedHandlerDelegate(Func<MqttApplicationMessageReceivedEventArgs, Task> handler)
-        {
-            _handler = handler ?? throw new ArgumentNullException(nameof(handler));
-        }
-
-        public Task HandleApplicationMessageReceivedAsync(MqttApplicationMessageReceivedEventArgs context)
-        {
-            return _handler(context);
-        }
-    }
-}
@@ -1,4 +1,4 @@
-namespace MQTTnet
+namespace MQTTnet.Client
 {
    public enum MqttApplicationMessageReceivedReasonCode
    {
@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using MQTTnet.Packets;

-namespace MQTTnet.Client.Subscribing
+namespace MQTTnet.Client
 {
-    public class MqttClientSubscribeOptions
+    public sealed class MqttClientSubscribeOptions
    {
        /// <summary>
        /// Gets or sets a list of topic filters the client wants to subscribe to.
@@ -1,10 +1,10 @@
-using MQTTnet.Packets;
-using MQTTnet.Protocol;
-using System;
+using System;
 using System.Collections.Generic;
 using MQTTnet.Exceptions;
+using MQTTnet.Packets;
+using MQTTnet.Protocol;

-namespace MQTTnet.Client.Subscribing
+namespace MQTTnet.Client
 {
    public sealed class MqttClientSubscribeOptionsBuilder
    {
@@ -1,9 +1,22 @@
 using System.Collections.Generic;
+using MQTTnet.Packets;

-namespace MQTTnet.Client.Subscribing
+namespace MQTTnet.Client
 {
-    public class MqttClientSubscribeResult
+    public sealed class MqttClientSubscribeResult
    {
        public List<MqttClientSubscribeResultItem> Items { get; } = new List<MqttClientSubscribeResultItem>();
+        
+        /// <summary>
+        /// Gets the user properties which were part of the SUBACK packet.
+        /// MQTTv5 only.
+        /// </summary>
+        public List<MqttUserProperty> UserProperties { get; } = new List<MqttUserProperty>();
+        
+        /// <summary>
+        /// Gets the reason string.
+        /// MQTTv5 only.
+        /// </summary>
+        public string ReasonString { get; internal set; }
    }
-}
+}
@@ -1,11 +1,12 @@
-namespace MQTTnet.Client.Subscribing
+namespace MQTTnet.Client
 {
    public enum MqttClientSubscribeResultCode
    {
-        GrantedQoS0 = 0,
-        GrantedQoS1 = 1,
-        GrantedQoS2 = 2,
-        UnspecifiedError = 128,
+        GrantedQoS0 = 0x00,
+        GrantedQoS1 = 0x01,
+        GrantedQoS2 = 0x02,
+        UnspecifiedError = 0x80,
+        
        ImplementationSpecificError = 131,
        NotAuthorized = 135,
        TopicFilterInvalid = 143,
@@ -0,0 +1,48 @@
+using System;
+using System.Linq;
+using MQTTnet.Exceptions;
+using MQTTnet.Packets;
+
+namespace MQTTnet.Client
+{
+    public sealed class MqttClientSubscribeResultFactory
+    {
+        public MqttClientSubscribeResult Create(MqttSubscribePacket subscribePacket, MqttSubAckPacket subAckPacket)
+        {
+            if (subscribePacket == null) throw new ArgumentNullException(nameof(subscribePacket));
+            if (subAckPacket == null) throw new ArgumentNullException(nameof(subAckPacket));
+            
+            // MQTTv5.0.0 handling.
+            if (subAckPacket.ReasonCodes.Any() && subAckPacket.ReasonCodes.Count != subscribePacket.TopicFilters.Count)
+            {
+                throw new MqttProtocolViolationException(
+                    "The reason codes are not matching the topic filters [MQTT-3.9.3-1].");
+            }
+            
+            var result = new MqttClientSubscribeResult
+            {
+                ReasonString = subAckPacket.Properties.ReasonString
+            };
+
+            result.UserProperties.AddRange(subAckPacket.Properties.UserProperties);
+            
+            for (var i = 0; i < subscribePacket.TopicFilters.Count; i++)
+            {
+                result.Items.Add(CreateSubscribeResultItem(i, subscribePacket, subAckPacket));
+            }
+            
+            return result;
+        }
+
+        static MqttClientSubscribeResultItem CreateSubscribeResultItem(int index, MqttSubscribePacket subscribePacket, MqttSubAckPacket subAckPacket)
+        {
+            var resultCode = (MqttClientSubscribeResultCode) subAckPacket.ReasonCodes[index];
+
+            return new MqttClientSubscribeResultItem
+            {
+                TopicFilter = subscribePacket.TopicFilters[index],
+                ResultCode = resultCode
+            };
+        }
+    }
+}
@@ -1,25 +1,19 @@
-using System;
+using MQTTnet.Packets;

-namespace MQTTnet.Client.Subscribing
+namespace MQTTnet.Client
 {
-    public class MqttClientSubscribeResultItem
+    public sealed class MqttClientSubscribeResultItem
    {
-        public MqttClientSubscribeResultItem(MqttTopicFilter topicFilter, MqttClientSubscribeResultCode resultCode)
-        {
-            TopicFilter = topicFilter ?? throw new ArgumentNullException(nameof(topicFilter));
-            ResultCode = resultCode;
-        }
-
        /// <summary>
        /// Gets or sets the topic filter.
        /// The topic filter can contain topics and wildcards.
        /// </summary>
-        public MqttTopicFilter TopicFilter { get; }
+        public MqttTopicFilter TopicFilter { get; internal set; }

        /// <summary>
        /// Gets or sets the result code.
        /// Hint: MQTT 5 feature only.
        /// </summary>
-        public MqttClientSubscribeResultCode ResultCode { get; }
+        public MqttClientSubscribeResultCode ResultCode { get; internal set; }
    }
 }
@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using MQTTnet.Packets;

-namespace MQTTnet.Client.Unsubscribing
+namespace MQTTnet.Client
 {
-    public class MqttClientUnsubscribeOptions
+    public sealed class MqttClientUnsubscribeOptions
    {
        /// <summary>
        /// Gets or sets a list of topic filters the client wants to unsubscribe from.
@@ -1,8 +1,8 @@
-using MQTTnet.Packets;
-using System;
+using System;
 using System.Collections.Generic;
+using MQTTnet.Packets;

-namespace MQTTnet.Client.Unsubscribing
+namespace MQTTnet.Client
 {
    public class MqttClientUnsubscribeOptionsBuilder
    {
@@ -1,9 +1,22 @@
 using System.Collections.Generic;
+using MQTTnet.Packets;

-namespace MQTTnet.Client.Unsubscribing
+namespace MQTTnet.Client
 {
-    public class MqttClientUnsubscribeResult
+    public sealed class MqttClientUnsubscribeResult
    {
        public List<MqttClientUnsubscribeResultItem> Items { get; }  =new List<MqttClientUnsubscribeResultItem>();
+
+        /// <summary>
+        /// Gets the user properties which were part of the UNSUBACK packet.
+        /// MQTTv5 only.
+        /// </summary>
+        public List<MqttUserProperty> UserProperties { get; } = new List<MqttUserProperty>();
+        
+        /// <summary>
+        /// Gets the reason string.
+        /// MQTTv5 only.
+        /// </summary>
+        public string ReasonString { get; internal set; }
    }
 }
@@ -1,4 +1,4 @@
-namespace MQTTnet.Client.Unsubscribing
+namespace MQTTnet.Client
 {
    public enum MqttClientUnsubscribeResultCode
    {
@@ -0,0 +1,54 @@
+using System;
+using System.Linq;
+using MQTTnet.Exceptions;
+using MQTTnet.Packets;
+
+namespace MQTTnet.Client
+{
+    public sealed class MqttClientUnsubscribeResultFactory
+    {
+        public MqttClientUnsubscribeResult Create(MqttUnsubscribePacket unsubscribePacket, MqttUnsubAckPacket unsubAckPacket)
+        {
+            if (unsubscribePacket == null) throw new ArgumentNullException(nameof(unsubscribePacket));
+            if (unsubAckPacket == null) throw new ArgumentNullException(nameof(unsubAckPacket));
+
+            // MQTTv3.1.1 has no reason code at all!
+            if (unsubAckPacket.ReasonCodes.Count != 0 && unsubAckPacket.ReasonCodes.Count != unsubscribePacket.TopicFilters.Count)
+            {
+                throw new MqttProtocolViolationException(
+                    "The return codes are not matching the topic filters [MQTT-3.9.3-1].");
+            }
+
+            var result = new MqttClientUnsubscribeResult
+            {
+                ReasonString = unsubAckPacket.Properties.ReasonString
+            };
+
+            result.UserProperties.AddRange(unsubAckPacket.Properties.UserProperties);
+            
+            for (var i = 0; i < unsubscribePacket.TopicFilters.Count; i++)
+            {
+                result.Items.Add(CreateUnsubscribeResultItem(i, unsubscribePacket, unsubAckPacket));
+            }
+
+            return result;
+        }
+        
+        static MqttClientUnsubscribeResultItem CreateUnsubscribeResultItem(int index, MqttUnsubscribePacket unsubscribePacket, MqttUnsubAckPacket unsubAckPacket)
+        {
+            var resultCode = MqttClientUnsubscribeResultCode.Success;
+            
+            if (unsubAckPacket.ReasonCodes.Any())
+            {
+                // MQTTv3.1.1 has no reason code and no return code!.
+                resultCode = (MqttClientUnsubscribeResultCode) unsubAckPacket.ReasonCodes[index];
+            }
+            
+            return new MqttClientUnsubscribeResultItem
+            {
+                TopicFilter = unsubscribePacket.TopicFilters[index],
+                ResultCode = resultCode
+            };
+        }
+    }
+}
@@ -1,25 +1,22 @@
 using System;

-namespace MQTTnet.Client.Unsubscribing
+namespace MQTTnet.Client
 {
-    public class MqttClientUnsubscribeResultItem
+    public sealed class MqttClientUnsubscribeResultItem
    {
-        public MqttClientUnsubscribeResultItem(string topicFilter, MqttClientUnsubscribeResultCode reasonCode)
-        {
-            TopicFilter = topicFilter ?? throw new ArgumentNullException(nameof(topicFilter));
-            ReasonCode = reasonCode;
-        }
-
        /// <summary>
        /// Gets or sets the topic filter.
        /// The topic filter can contain topics and wildcards.
        /// </summary>
-        public string TopicFilter { get; }
+        public string TopicFilter { get; internal set; }
+
+        [Obsolete("Use ResultCode instead. This property will be removed soon.")]
+        public MqttClientUnsubscribeResultCode ReasonCode => ResultCode;

        /// <summary>
        /// Gets or sets the result code.
        /// Hint: MQTT 5 feature only.
        /// </summary>
-        public MqttClientUnsubscribeResultCode ReasonCode { get; }
+        public MqttClientUnsubscribeResultCode ResultCode { get; internal set; }
    }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Christian	2ca838cbfa	Fix build scripts.	2021-12-05 13:45:25 +01:00
Christian	37b598c009	Add support for net6.0.	2021-12-03 09:26:48 +01:00
Christian	49c5e3a9cc	Align default values for connection options with MQTTv5 spec.	2021-12-01 22:14:51 +01:00
Christian	46b54fd751	Fix build errors.	2021-12-01 22:05:52 +01:00
Christian	a9fcbd77e9	Merge branch 'master' into feature/Reason_Code_In_Subscription_Interceptor	2021-12-01 20:49:05 +01:00
Christian	5301d1b894	Fix build error.	2021-12-01 20:32:21 +01:00
Christian	2d1b4b68e6	Fix build warnings.	2021-12-01 20:28:59 +01:00
Christian	2da2658035	Refactor nuget package generation.	2021-12-01 20:20:33 +01:00
Christian	360b5644ad	Remove Blazor test app.	2021-12-01 20:17:04 +01:00
Christian	24629449cb	Update MQTTnet.sln.DotSettings	2021-11-28 12:48:20 +01:00
Christian	c59969067c	Adjust namespaces.	2021-11-20 10:48:18 +01:00
Christian	28310c69bb	Fix build errors.	2021-11-13 10:28:56 +01:00
Christian	b5b713570f	Squashed commit of the following: commit `2d94abdde3` Author: Christian <christian.kratky@googlemail.com> Date: Sat Nov 13 10:09:59 2021 +0100 Update MQTTnet.nuspec Update docs. commit `f0ea13c07f` Author: logicaloud <47704763+logicaloud@users.noreply.github.com> Date: Sat Nov 13 22:05:54 2021 +1300 Fix MQTT 3.1.1 session persistence when CleanSession=1 (#1294) commit `47cd5aa3cd` Author: Volker Milbrandt <milbrandt@users.noreply.github.com> Date: Sat Nov 13 10:02:55 2021 +0100 test ResultCode for invalid credentials (no userName but password) (#1270) fix order of parameters in exceptions AreEqual(expected, actual) commit `258df6bb14` Author: HansM <HansM2013@gmx.de> Date: Thu Nov 11 20:10:35 2021 +0100 Removed IDisposable from MqttClientConnection class. (#1288) commit `85c3c0b352` Author: SeppPenner <HansM2013@gmx.de> Date: Mon Nov 8 08:50:59 2021 +0100 MQTTnet.noUWP.sln: Removed no longer present MQTTnet.Server project.	2021-11-13 10:24:46 +01:00
Christian	7993db2d82	Merge branch 'master' of https://github.com/chkr1011/MQTTnet into feature/Reason_Code_In_Subscription_Interceptor # Conflicts: # Build/MQTTnet.nuspec	2021-11-01 17:36:04 +01:00
Christian	22ccdf10c6	Migrate retained messages to the event based approach.	2021-11-01 11:20:46 +01:00
Christian	9ab85b3592	Merge branch 'master' of https://github.com/chkr1011/MQTTnet into feature/Reason_Code_In_Subscription_Interceptor # Conflicts: # Source/MQTTnet/Server/Internal/MqttClientConnectionStatistics.cs	2021-10-30 10:19:08 +02:00
Christian	9d982eab5e	Fix UnitTests.	2021-10-29 22:35:32 +02:00
Christian	6bad9f183c	Merge branch 'master' of https://github.com/chkr1011/MQTTnet into feature/Reason_Code_In_Subscription_Interceptor # Conflicts: # Build/MQTTnet.nuspec # Source/MQTTnet/Server/Internal/MqttClientSessionsManager.cs	2021-10-29 21:58:57 +02:00
Christian	d5237bb3f5	Merge master.	2021-10-27 23:30:52 +02:00
Christian	1c6d4b9484	Remove obsolete code.	2021-10-27 23:27:18 +02:00
Christian	a3f6a501dc	Add interceptor for all packets.	2021-10-27 23:11:20 +02:00
Christian	369b262e07	Restore undelivered event.	2021-10-27 22:10:42 +02:00
Christian	d411aa4f97	Move events to server level instead of options.	2021-10-27 22:01:45 +02:00
Christian	7297336786	Fix packet bus cancellation.	2021-10-26 22:12:34 +02:00
Christian	905306c312	Add more handling options to interceptor contexts.	2021-10-26 22:00:47 +02:00
Christian	131afc6ff2	Delete wrong Unit Tests.	2021-10-24 21:37:44 +02:00
Christian	43e4038212	Refactor code.	2021-10-24 21:19:40 +02:00
Christian	5af54963a0	Merge branch 'master' of https://github.com/chkr1011/MQTTnet into feature/Reason_Code_In_Subscription_Interceptor # Conflicts: # Source/MQTTnet/Server/Internal/MqttClientSessionsManager.cs	2021-10-23 13:16:57 +02:00
Christian	0d985cff12	Remove obsolete data converter.	2021-10-23 13:12:02 +02:00
Christian	5974e2644e	Create more factories for packets.	2021-10-23 10:58:21 +02:00
Christian	47bc8b4d31	Update docs.	2021-10-23 10:37:31 +02:00
Christian	1677db286c	Start migration of server to new packet bus.	2021-10-22 22:44:06 +02:00
Christian	3835deb3d1	Refactor code.	2021-10-21 19:23:58 +02:00
Christian	212d88f167	Add new APIs.	2021-10-21 19:15:57 +02:00
Christian	a15fbf532e	Add session to subscribe interceptor.	2021-10-14 21:50:16 +02:00
Christian	87df9367a7	Improve Unit Tests.	2021-10-10 12:20:24 +02:00
Christian	8c9460337f	Extend interceptors.	2021-10-10 10:56:14 +02:00
Christian	db00682c75	Improve topic comparer.	2021-10-02 20:44:12 +02:00