Update docs.

Client cancel task

.bettercodehub.yml

@@ -1,8 +1,3 @@
-exclude:
-- /Frameworks/.*
-- /MQTTnet.TestApp.NetCore/Program.cs
-- /Tests/MQTTnet.TestApp.NetFramework/.*
-- /Tests/MQTTnet.TestApp.UniversalWindows/.*
-component_depth: 1
+component_depth: 2
 languages:
 - csharp

.gitignore

@@ -291,3 +291,5 @@ __pycache__/
 Build/nuget.exe
 *.js
 *.map
+
+/Tests/MQTTnet.TestApp.NetCore/RetainedMessages.json

Build/MQTTnet.AspNetCore.nuspec

@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>MQTTnet.AspNetCore</id>
-    <version>2.5.1</version>
+    <version>0.0.0</version>
     <authors>Christian Kratky</authors>
     <owners>Christian Kratky</owners>
     <licenseUrl>https://github.com/chkr1011/MQTTnet/blob/master/LICENSE</licenseUrl>
@@ -10,19 +10,20 @@
     <iconUrl>https://raw.githubusercontent.com/chkr1011/MQTTnet/master/Images/Logo_128x128.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>This is a support library to integrate MQTTnet into AspNetCore.</description>
-    <releaseNotes>* Updated to MQTTnet 2.5.1.
+    <releaseNotes>* For more release notes please check the MQTTnet release notes.
     </releaseNotes>
-    <copyright>Copyright Christian Kratky 2016-2017</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</tags> 
+    <copyright>Copyright Christian Kratky 2016-2018</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</tags>
     <dependencies>
-      <group targetFramework="netstandard2.0">
-        <dependency id="MQTTnet" version="2.5.1" />
-      </group>
+      <dependency id="MQTTnet" version="2.8.3" />
+      <dependency id="Microsoft.AspNetCore.Connections.Abstractions" version="2.1.0" />
+      <dependency id="Microsoft.AspNetCore.WebSockets" version="2.0.1" />
+      <dependency id="Microsoft.Extensions.Hosting.Abstractions" version="2.0.1" />
     </dependencies>
   </metadata>
 
   <files>
     <!-- .NET Standard 2.0 -->
-    <file src="..\Frameworks\MQTTnet.AspNetCore\bin\Release\netstandard2.0\MQTTnet.AspNetCore.*" target="lib\netstandard2.0\"/>
+    <file src="..\Source\MQTTnet.AspNetCore\bin\Release\netstandard2.0\MQTTnet.AspNetCore.*" target="lib\netstandard2.0\"/>
   </files>
-</package>
+</package>

Build/MQTTnet.Extensions.ManagedClient.nuspec

@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<package >
+  <metadata>
+    <id>MQTTnet.Extensions.ManagedClient</id>
+    <version>0.0.0</version>
+    <authors>Christian Kratky</authors>
+    <owners>Christian Kratky</owners>
+    <licenseUrl>https://github.com/chkr1011/MQTTnet/blob/master/LICENSE</licenseUrl>
+    <projectUrl>https://github.com/chkr1011/MQTTnet</projectUrl>
+    <iconUrl>https://raw.githubusercontent.com/chkr1011/MQTTnet/master/Images/Logo_128x128.png</iconUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>This is an extension library which provides a managed MQTT client with additional features using MQTTnet.</description>
+    <releaseNotes>* For more release notes please check the MQTTnet release notes.
+    </releaseNotes>
+    <copyright>Copyright Christian Kratky 2016-2018</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</tags> 
+    <dependencies>
+      <dependency id="MQTTnet" version="2.8.3" />
+    </dependencies>
+  </metadata>
+
+  <files>
+    <!-- .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\"/>
+
+    <!-- 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\"/>
+
+    <file src="..\Source\MQTTnet.Extensions.ManagedClient\bin\Release\netstandard2.0\MQTTnet.Extensions.ManagedClient.*" target="lib\net461\"/>
+    <file src="..\Source\MQTTnet.Extensions.ManagedClient\bin\Release\netstandard2.0\MQTTnet.Extensions.ManagedClient.*" target="lib\net462\"/>
+    <file src="..\Source\MQTTnet.Extensions.ManagedClient\bin\Release\netstandard2.0\MQTTnet.Extensions.ManagedClient.*" target="lib\net470\"/>
+    <file src="..\Source\MQTTnet.Extensions.ManagedClient\bin\Release\netstandard2.0\MQTTnet.Extensions.ManagedClient.*" target="lib\net471\"/>
+    <file src="..\Source\MQTTnet.Extensions.ManagedClient\bin\Release\netstandard2.0\MQTTnet.Extensions.ManagedClient.*" target="lib\net472\"/>
+  </files>
+</package>

Build/MQTTnet.Extensions.Rpc.nuspec

@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<package >
+  <metadata>
+    <id>MQTTnet.Extensions.Rpc</id>
+    <version>0.0.0</version>
+    <authors>Christian Kratky</authors>
+    <owners>Christian Kratky</owners>
+    <licenseUrl>https://github.com/chkr1011/MQTTnet/blob/master/LICENSE</licenseUrl>
+    <projectUrl>https://github.com/chkr1011/MQTTnet</projectUrl>
+    <iconUrl>https://raw.githubusercontent.com/chkr1011/MQTTnet/master/Images/Logo_128x128.png</iconUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>This is an extension library which allows executing synchronous device calls including a response using MQTTnet.</description>
+    <releaseNotes>* For more release notes please check the MQTTnet release notes.
+    </releaseNotes>
+    <copyright>Copyright Christian Kratky 2016-2018</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</tags> 
+    <dependencies>
+      <dependency id="MQTTnet" version="2.8.3" />
+    </dependencies>
+  </metadata>
+
+  <files>
+    <!-- .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\"/>
+
+    <!-- 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\"/>
+
+    <file src="..\Source\MQTTnet.Extensions.Rpc\bin\Release\netstandard2.0\MQTTnet.Extensions.Rpc.*" target="lib\net461\"/>
+    <file src="..\Source\MQTTnet.Extensions.Rpc\bin\Release\netstandard2.0\MQTTnet.Extensions.Rpc.*" target="lib\net462\"/>
+    <file src="..\Source\MQTTnet.Extensions.Rpc\bin\Release\netstandard2.0\MQTTnet.Extensions.Rpc.*" target="lib\net470\"/>
+    <file src="..\Source\MQTTnet.Extensions.Rpc\bin\Release\netstandard2.0\MQTTnet.Extensions.Rpc.*" target="lib\net471\"/>
+    <file src="..\Source\MQTTnet.Extensions.Rpc\bin\Release\netstandard2.0\MQTTnet.Extensions.Rpc.*" target="lib\net472\"/>
+  </files>
+</package>

Build/MQTTnet.nuspec

@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>MQTTnet</id>
-    <version>2.5.1</version>
+    <version>0.0.0</version>
     <authors>Christian Kratky</authors>
     <owners>Christian Kratky</owners>
     <licenseUrl>https://github.com/chkr1011/MQTTnet/blob/master/LICENSE</licenseUrl>
@@ -10,67 +10,53 @@
     <iconUrl>https://raw.githubusercontent.com/chkr1011/MQTTnet/master/Images/Logo_128x128.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>MQTTnet is a high performance .NET library for MQTT based communication. It provides a MQTT client and a MQTT server (broker).</description>
-    <releaseNotes>* Fixed several library reference issues.
-* [Client] Fixed issue in _MqttClientOptionsBuilder_ when using no certificates (Thanks to 1iveowl).
+    <releaseNotes>* [Core] Added all factory methods to the factory interface.
+* [Core] Fixed an issue with cancellation token handling (thanks to @acrabb).
+* [Server] Added a new overload for configuring the ASP.net integration (thanks to @JanEggers).
+* [Server] Added a method for clearing all retained messages.
     </releaseNotes>
-    <copyright>Copyright Christian Kratky 2016-2017</copyright>
+    <copyright>Copyright Christian Kratky 2016-2018</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</tags> 
     <dependencies>
-
       <group targetFramework="netstandard1.3">
-        <dependency id="NETStandard.Library" version="1.6.1" />
-        <dependency id="Microsoft.Extensions.DependencyInjection" version="1.1.1" />
-        <dependency id="Microsoft.Extensions.Logging" version="1.1.2" />
-        <dependency id="Microsoft.Extensions.Options" version="1.1.2" />
+        <dependency id="NETStandard.Library" version="1.3.0" />
         <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.1" />
-        <dependency id="System.Threading.Thread" version="4.3.0" />
+        <dependency id="System.Net.WebSockets.Client" version="4.3.1" />      
       </group>
-
       <group targetFramework="netstandard2.0">
         <dependency id="NETStandard.Library" version="2.0.0" />
-        <dependency id="Microsoft.Extensions.DependencyInjection" version="2.0.0" />
-        <dependency id="Microsoft.Extensions.Logging" version="2.0.0" />
-        <dependency id="Microsoft.Extensions.Options" version="2.0.0" />
         <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.1" />
-        <dependency id="System.Threading.Thread" version="4.3.0" />
+        <dependency id="System.Net.WebSockets.Client" version="4.3.2" />
       </group>
-      
       <group targetFramework="uap10.0">
-        <dependency id="Microsoft.NETCore.UniversalWindowsPlatform" version="5.4.0" />
-        <dependency id="Microsoft.Extensions.DependencyInjection" version="1.1.1" />
-        <dependency id="Microsoft.Extensions.Logging" version="1.1.2" />
-        <dependency id="Microsoft.Extensions.Options" version="1.1.2" />
+        <dependency id="Microsoft.NETCore.UniversalWindowsPlatform" version="6.1.4" />
       </group>
-        
       <group targetFramework="net452">
-        <dependency id="Microsoft.Extensions.DependencyInjection" version="1.1.1" />
-        <dependency id="Microsoft.Extensions.Logging" version="1.1.2" />
-        <dependency id="Microsoft.Extensions.Options" version="1.1.2" />
       </group>
-
+      <group targetFramework="net461">
+      </group>
     </dependencies>
   </metadata>
 
   <files>
     <!-- .NET Standard 1.3 -->
-    <file src="..\Frameworks\MQTTnet.Netstandard\bin\Release\netstandard1.3\MQTTnet.Core.*" target="lib\netstandard1.3\"/>
-    <file src="..\Frameworks\MQTTnet.Netstandard\bin\Release\netstandard1.3\MQTTnet.*" target="lib\netstandard1.3\"/>
+    <file src="..\Source\MQTTnet\bin\Release\netstandard1.3\MQTTnet.*" target="lib\netstandard1.3\"/>
     
     <!-- .NET Standard 2.0 -->
-    <file src="..\Frameworks\MQTTnet.Netstandard\bin\Release\netstandard2.0\MQTTnet.Core.*" target="lib\netstandard2.0\"/>
-    <file src="..\Frameworks\MQTTnet.Netstandard\bin\Release\netstandard2.0\MQTTnet.*" target="lib\netstandard2.0\"/>
+    <file src="..\Source\MQTTnet\bin\Release\netstandard2.0\MQTTnet.*" target="lib\netstandard2.0\"/>
 
     <!-- Universal Windows -->
-    <file src="..\Frameworks\MQTTnet.Netstandard\bin\Release\uap10.0\MQTTnet.Core.*" target="lib\uap10.0\"/>
-    <file src="..\Frameworks\MQTTnet.Netstandard\bin\Release\uap10.0\MQTTnet.*" target="lib\uap10.0\"/>
+    <file src="..\Source\MQTTnet\bin\Release\uap10.0\MQTTnet.*" target="lib\uap10.0\"/>
 
     <!-- .NET Framework -->
-    <file src="..\Frameworks\MQTTnet.Netstandard\bin\Release\net452\MQTTnet.Core.*" target="lib\net452\"/>
-    <file src="..\Frameworks\MQTTnet.Netstandard\bin\Release\net452\MQTTnet.*" target="lib\net452\"/>
-    
+    <file src="..\Source\MQTTnet\bin\Release\net452\MQTTnet.*" target="lib\net452\"/>
+
+    <file src="..\Source\MQTTnet\bin\Release\netstandard2.0\MQTTnet.*" target="lib\net461\"/>
+    <file src="..\Source\MQTTnet\bin\Release\netstandard2.0\MQTTnet.*" target="lib\net462\"/>
+    <file src="..\Source\MQTTnet\bin\Release\netstandard2.0\MQTTnet.*" target="lib\net470\"/>
+    <file src="..\Source\MQTTnet\bin\Release\netstandard2.0\MQTTnet.*" target="lib\net471\"/>
+    <file src="..\Source\MQTTnet\bin\Release\netstandard2.0\MQTTnet.*" target="lib\net472\"/>
   </files>
 </package>

Build/build.ps1

@@ -1,6 +1,11 @@
-param([string]$version)
+param([string]$assemblyVersion, [string]$nugetVersion)
 
-if ([string]::IsNullOrEmpty($version)) {$version = "0.0.1"}
+if ([string]::IsNullOrEmpty($assemblyVersion)) {$assemblyVersion = "0.0.1"}
+if ([string]::IsNullOrEmpty($nugetVersion)) {$nugetVersion = "0.0.1"}
+
+Write-Host "Assembly version = $assemblyVersion"
+Write-Host "Nuget version    = $nugetVersion"
+Write-Host
 
 $vswhere = ${Env:\ProgramFiles(x86)} + '\Microsoft Visual Studio\Installer\vswhere'
 
@@ -8,16 +13,35 @@ $path = &$vswhere -latest -products * -requires Microsoft.Component.MSBuild -pro
 if ($path) {
     $msbuild = join-path $path 'MSBuild\15.0\Bin\MSBuild.exe'
 
-    &$msbuild ..\Frameworks\MQTTnet.Netstandard\MQTTnet.Netstandard.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="net452" /p:FileVersion=$version /p:AssemblyVersion=$version /verbosity:m
-    &$msbuild ..\Frameworks\MQTTnet.Netstandard\MQTTnet.Netstandard.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netstandard1.3" /p:FileVersion=$version /p:AssemblyVersion=$version /verbosity:m
-    &$msbuild ..\Frameworks\MQTTnet.Netstandard\MQTTnet.Netstandard.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netstandard2.0" /p:FileVersion=$version /p:AssemblyVersion=$version /verbosity:m
-    &$msbuild ..\Frameworks\MQTTnet.Netstandard\MQTTnet.Netstandard.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="uap10.0" /p:FileVersion=$version /p:AssemblyVersion=$version /verbosity:m
+	# 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="uap10.0" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
     
-	&$msbuild ..\Frameworks\MQTTnet.AspNetCore\MQTTnet.AspNetCore.csproj /t:Build /p:Configuration="Release" /p:TargetFramework="netstandard2.0" /p:FileVersion=$version /p:AssemblyVersion=$version /verbosity:m
+	# 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"
+
+	# 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="uap10.0" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
+
+	# 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="uap10.0" /p:FileVersion=$assemblyVersion /p:AssemblyVersion=$assemblyVersion /verbosity:m /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=".\..\..\Build\codeSigningKey.pfx"
+
+	Remove-Item .\NuGet -Force -Recurse -ErrorAction SilentlyContinue
 
-    Remove-Item .\NuGet -Force -Recurse
     New-Item -ItemType Directory -Force -Path .\NuGet
-    .\NuGet.exe pack MQTTnet.nuspec -Verbosity detailed -Symbols -OutputDir "NuGet" -Version $version
-    .\NuGet.exe pack MQTTnet.AspNetCore.nuspec -Verbosity detailed -Symbols -OutputDir "NuGet" -Version $version
-}
-
+    .\nuget.exe pack MQTTnet.nuspec -Verbosity detailed -Symbols -OutputDir "NuGet" -Version $nugetVersion
+    .\nuget.exe pack MQTTnet.AspNetCore.nuspec -Verbosity detailed -Symbols -OutputDir "NuGet" -Version $nugetVersion
+	.\nuget.exe pack MQTTnet.Extensions.Rpc.nuspec -Verbosity detailed -Symbols -OutputDir "NuGet" -Version $nugetVersion
+	.\nuget.exe pack MQTTnet.Extensions.ManagedClient.nuspec -Verbosity detailed -Symbols -OutputDir "NuGet" -Version $nugetVersion
+}

Build/upload.ps1

@@ -0,0 +1,9 @@
+param([string]$apiKey)
+
+$files = Get-ChildItem -Path ".\NuGet" -Filter "*.nupkg"
+foreach ($file in $files)
+{
+	Write-Host "Uploading: " $file
+
+	.\nuget.exe push $file.Fullname $apiKey -NoSymbols -Source https://api.nuget.org/v3/index.json
+}

Documents/Import_CodeSigningKey.md

@@ -0,0 +1,9 @@
+# Import codeSigningKey.pfx
+In order to import the key for code signing on a new developer machine use the following command within the VS developer command line:
+
+> sn –i codeSigningKey.pfx VS_KEY_EFCA4C5B6DFD4B4F
+
+The container name may be different.
+
+# Check if the assembly has a strong name
+> sn -vf MQTTnet.dll

Frameworks/MQTTnet.AspnetCore/ApplicationBuilderExtensions.cs

@@ -1,41 +0,0 @@
-using System;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.Extensions.DependencyInjection;
-using MQTTnet.Core.Server;
-
-namespace MQTTnet.AspNetCore
-{
-    public static class ApplicationBuilderExtensions
-    {
-        public static IApplicationBuilder UseMqttEndpoint(this IApplicationBuilder app, string path = "/mqtt")
-        {
-            app.UseWebSockets();
-            app.Use(async (context, next) =>
-            {
-                if (context.Request.Path == path && context.WebSockets.IsWebSocketRequest)
-                {
-                    var adapter = app.ApplicationServices.GetRequiredService<MqttWebSocketServerAdapter>();
-                    using (var webSocket = await context.WebSockets.AcceptWebSocketAsync("mqtt"))
-                    {
-                        await adapter.AcceptWebSocketAsync(webSocket);
-                    }
-                }
-                else
-                {
-                    await next();
-                }
-            });
-
-            return app;
-        }
-
-        public static IApplicationBuilder UseMqttServer(this IApplicationBuilder app, Action<IMqttServer> configure)
-        {
-            var server = app.ApplicationServices.GetRequiredService<IMqttServer>();
-
-            configure(server);
-
-            return app;
-        }
-    }
-}

Frameworks/MQTTnet.AspnetCore/MQTTnet.AspnetCore.csproj

@@ -1,17 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.WebSockets" Version="2.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.0.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\MQTTnet.Netstandard\MQTTnet.NetStandard.csproj" />
-  </ItemGroup>
-
-</Project>

Frameworks/MQTTnet.AspnetCore/MqttHostedServer.cs

@@ -1,35 +0,0 @@
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using MQTTnet.Core.Adapter;
-using MQTTnet.Core.Server;
-
-namespace MQTTnet.AspNetCore
-{
-    public class MqttHostedServer : MqttServer, IHostedService
-    {
-        public MqttHostedServer(
-            IOptions<MqttServerOptions> options,
-            IEnumerable<IMqttServerAdapter> adapters,
-            ILogger<MqttServer> logger, 
-            MqttClientSessionsManager clientSessionsManager,
-            IMqttClientRetainedMessageManager clientRetainedMessageManager
-            ) 
-            : base(options, adapters, logger, clientSessionsManager, clientRetainedMessageManager)
-        {
-        }
-
-        public Task StartAsync(CancellationToken cancellationToken)
-        {
-            return StartAsync();
-        }
-
-        public Task StopAsync(CancellationToken cancellationToken)
-        {
-            return StopAsync();
-        }
-    }
-}

Frameworks/MQTTnet.AspnetCore/MqttWebSocketServerAdapter.cs

@@ -1,93 +0,0 @@
-using System;
-using System.IO;
-using System.Net.WebSockets;
-using System.Threading;
-using System.Threading.Tasks;
-using MQTTnet.Core.Adapter;
-using MQTTnet.Core.Channel;
-using MQTTnet.Core.Server;
-using MQTTnet.Implementations;
-
-namespace MQTTnet.AspNetCore
-{
-    public class MqttWebSocketServerAdapter : IMqttServerAdapter, IDisposable
-    {
-        private readonly IMqttCommunicationAdapterFactory _mqttCommunicationAdapterFactory;
-
-        public MqttWebSocketServerAdapter(IMqttCommunicationAdapterFactory mqttCommunicationAdapterFactory)
-        {
-            _mqttCommunicationAdapterFactory = mqttCommunicationAdapterFactory ?? throw new ArgumentNullException(nameof(mqttCommunicationAdapterFactory));
-        }
-
-        public event EventHandler<MqttServerAdapterClientAcceptedEventArgs> ClientAccepted;
-
-        public Task StartAsync(MqttServerOptions options)
-        {
-            return Task.CompletedTask;
-        }
-
-        public Task StopAsync()
-        {
-            return Task.CompletedTask;
-        }
-
-        public Task AcceptWebSocketAsync(WebSocket webSocket)
-        {
-            if (webSocket == null) throw new ArgumentNullException(nameof(webSocket));
-
-            var channel = new MqttWebSocketServerChannel(webSocket);
-            var clientAdapter = _mqttCommunicationAdapterFactory.CreateServerCommunicationAdapter(channel);
-
-            var eventArgs = new MqttServerAdapterClientAcceptedEventArgs(clientAdapter);
-            ClientAccepted?.Invoke(this, eventArgs);
-            return eventArgs.SessionTask;
-        }
-        
-        public void Dispose()
-        {
-            StopAsync();
-        }
-
-        private class MqttWebSocketServerChannel : IMqttCommunicationChannel, IDisposable
-        {
-            private readonly WebSocket _webSocket;
-
-            public MqttWebSocketServerChannel(WebSocket webSocket)
-            {
-                _webSocket = webSocket ?? throw new ArgumentNullException(nameof(webSocket));
-
-                RawReceiveStream = new WebSocketStream(_webSocket);
-            }
-
-            public Stream SendStream => RawReceiveStream;
-            public Stream ReceiveStream => RawReceiveStream;
-            public Stream RawReceiveStream { get; }
-
-            public Task ConnectAsync()
-            {
-                return Task.CompletedTask;
-            }
-
-            public Task DisconnectAsync()
-            {
-                RawReceiveStream?.Dispose();
-
-                if (_webSocket == null)
-                {
-                    return Task.CompletedTask;
-                }
-
-                return _webSocket.CloseAsync(WebSocketCloseStatus.NormalClosure, string.Empty, CancellationToken.None);
-            }
-
-            public void Dispose()
-            {
-                RawReceiveStream?.Dispose();
-                SendStream?.Dispose();
-                ReceiveStream?.Dispose();
-
-                _webSocket?.Dispose();
-            }
-        }
-    }
-}

Frameworks/MQTTnet.AspnetCore/ServiceCollectionExtensions.cs

@@ -1,24 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using MQTTnet.Core.Adapter;
-using MQTTnet.Core.Server;
-
-namespace MQTTnet.AspNetCore
-{
-    public static class ServiceCollectionExtensions
-    {
-        public static IServiceCollection AddHostedMqttServer(this IServiceCollection services)
-        {
-            services.AddMqttServerServices();
-
-            services.AddSingleton<IHostedService>(s => s.GetService<MqttHostedServer>());
-            services.AddSingleton<IMqttServer>(s => s.GetService<MqttHostedServer>());
-            services.AddSingleton<MqttHostedServer>();
-            
-            services.AddSingleton<MqttWebSocketServerAdapter>();
-            services.AddSingleton<IMqttServerAdapter>(s => s.GetService<MqttWebSocketServerAdapter>());
-
-            return services;
-        }
-    }
-}

Frameworks/MQTTnet.NetStandard/Implementations/MqttServerAdapter.Uwp.cs

@@ -1,76 +0,0 @@
-#if WINDOWS_UWP
-using System;
-using System.Threading.Tasks;
-using MQTTnet.Core.Adapter;
-using MQTTnet.Core.Server;
-using Windows.Networking.Sockets;
-using Microsoft.Extensions.Logging;
-
-namespace MQTTnet.Implementations
-{
-    public class MqttServerAdapter : IMqttServerAdapter, IDisposable
-    {
-        private readonly ILogger<MqttServerAdapter> _logger;
-        private readonly IMqttCommunicationAdapterFactory _communicationAdapterFactory;
-        private StreamSocketListener _defaultEndpointSocket;
-
-        public MqttServerAdapter(ILogger<MqttServerAdapter> logger, IMqttCommunicationAdapterFactory communicationAdapterFactory)
-        {
-            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-            _communicationAdapterFactory = communicationAdapterFactory ?? throw new ArgumentNullException(nameof(communicationAdapterFactory));
-        }
-
-        public event EventHandler<MqttServerAdapterClientAcceptedEventArgs> ClientAccepted;
-
-        public async Task StartAsync(MqttServerOptions options)
-        {
-            if (options == null) throw new ArgumentNullException(nameof(options));
-
-            if (_defaultEndpointSocket != null) throw new InvalidOperationException("Server is already started.");
-            
-            if (options.DefaultEndpointOptions.IsEnabled)
-            {
-                _defaultEndpointSocket = new StreamSocketListener();
-                await _defaultEndpointSocket.BindServiceNameAsync(options.GetDefaultEndpointPort().ToString(), SocketProtectionLevel.PlainSocket);
-                _defaultEndpointSocket.ConnectionReceived += AcceptDefaultEndpointConnectionsAsync;
-            }
-
-            if (options.TlsEndpointOptions.IsEnabled)
-            {
-                throw new NotSupportedException("TLS servers are not supported for UWP apps.");
-            }
-        }
-
-        public Task StopAsync()
-        {
-            if (_defaultEndpointSocket != null)
-            {
-                _defaultEndpointSocket.ConnectionReceived -= AcceptDefaultEndpointConnectionsAsync;
-            }
-
-            _defaultEndpointSocket?.Dispose();
-            _defaultEndpointSocket = null;
-
-            return Task.FromResult(0);
-        }
-
-        public void Dispose()
-        {
-            StopAsync();
-        }
-
-        private void AcceptDefaultEndpointConnectionsAsync(StreamSocketListener sender, StreamSocketListenerConnectionReceivedEventArgs args)
-        {
-            try
-            {
-                var clientAdapter = _communicationAdapterFactory.CreateServerCommunicationAdapter(new MqttTcpChannel(args.Socket));
-                ClientAccepted?.Invoke(this, new MqttServerAdapterClientAcceptedEventArgs(clientAdapter));
-            }
-            catch (Exception exception)
-            {
-                _logger.LogError(new EventId(), exception, "Error while accepting connection at default endpoint.");
-            }
-        }
-    }
-}
-#endif

Frameworks/MQTTnet.NetStandard/Implementations/MqttServerAdapter.cs

@@ -1,148 +0,0 @@
-#if NET452 || NETSTANDARD1_3 || NETSTANDARD2_0
-using System;
-using System.Net;
-using System.Net.Security;
-using System.Net.Sockets;
-using System.Security.Authentication;
-using System.Security.Cryptography.X509Certificates;
-using System.Threading;
-using System.Threading.Tasks;
-using MQTTnet.Core.Adapter;
-using MQTTnet.Core.Server;
-using Microsoft.Extensions.Logging;
-
-namespace MQTTnet.Implementations
-{
-    public class MqttServerAdapter : IMqttServerAdapter, IDisposable
-    {
-        private readonly ILogger<MqttServerAdapter> _logger;
-        private readonly IMqttCommunicationAdapterFactory _communicationAdapterFactory;
-
-        private CancellationTokenSource _cancellationTokenSource;
-        private Socket _defaultEndpointSocket;
-        private Socket _tlsEndpointSocket;
-        private X509Certificate2 _tlsCertificate;
-
-        public MqttServerAdapter(ILogger<MqttServerAdapter> logger, IMqttCommunicationAdapterFactory communicationAdapterFactory)
-        {
-            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-            _communicationAdapterFactory = communicationAdapterFactory ?? throw new ArgumentNullException(nameof(communicationAdapterFactory));
-        }
-
-        public event EventHandler<MqttServerAdapterClientAcceptedEventArgs> ClientAccepted;
-
-        public Task StartAsync(MqttServerOptions options)
-        {
-            if (_cancellationTokenSource != null) throw new InvalidOperationException("Server is already started.");
-
-            _cancellationTokenSource = new CancellationTokenSource();
-
-            if (options.DefaultEndpointOptions.IsEnabled)
-            {
-                _defaultEndpointSocket = new Socket(SocketType.Stream, ProtocolType.Tcp);
-                _defaultEndpointSocket.Bind(new IPEndPoint(IPAddress.Any, options.GetDefaultEndpointPort()));
-                _defaultEndpointSocket.Listen(options.ConnectionBacklog);
-
-                Task.Run(() => AcceptDefaultEndpointConnectionsAsync(_cancellationTokenSource.Token), _cancellationTokenSource.Token);
-            }
-
-            if (options.TlsEndpointOptions.IsEnabled)
-            {
-                if (options.TlsEndpointOptions.Certificate == null)
-                {
-                    throw new ArgumentException("TLS certificate is not set.");
-                }
-
-                _tlsCertificate = new X509Certificate2(options.TlsEndpointOptions.Certificate);
-                if (!_tlsCertificate.HasPrivateKey)
-                {
-                    throw new InvalidOperationException("The certificate for TLS encryption must contain the private key.");
-                }
-
-                _tlsEndpointSocket = new Socket(SocketType.Stream, ProtocolType.Tcp);
-                _tlsEndpointSocket.Bind(new IPEndPoint(IPAddress.Any, options.GetTlsEndpointPort()));
-                _tlsEndpointSocket.Listen(options.ConnectionBacklog);
-
-                Task.Run(() => AcceptTlsEndpointConnectionsAsync(_cancellationTokenSource.Token), _cancellationTokenSource.Token);
-            }
-
-            return Task.FromResult(0);
-        }
-
-        public Task StopAsync()
-        {
-            _cancellationTokenSource?.Cancel(false);
-            _cancellationTokenSource?.Dispose();
-            _cancellationTokenSource = null;
-
-            _defaultEndpointSocket?.Dispose();
-            _defaultEndpointSocket = null;
-
-            _tlsCertificate = null;
-            
-            _tlsEndpointSocket?.Dispose();
-            _tlsEndpointSocket = null;
-
-            return Task.FromResult(0);
-        }
-
-        public void Dispose()
-        {
-            StopAsync();
-        }
-
-        private async Task AcceptDefaultEndpointConnectionsAsync(CancellationToken cancellationToken)
-        {
-            while (!cancellationToken.IsCancellationRequested)
-            {
-                try
-                {
-                    //todo: else branch can be used with min dependency NET46
-#if NET452
-                    var clientSocket = await Task.Factory.FromAsync(_defaultEndpointSocket.BeginAccept, _defaultEndpointSocket.EndAccept, null).ConfigureAwait(false);
-#else
-                    var clientSocket = await _defaultEndpointSocket.AcceptAsync().ConfigureAwait(false);
-#endif
-                    var clientAdapter = _communicationAdapterFactory.CreateServerCommunicationAdapter(new MqttTcpChannel(clientSocket, null));
-                    ClientAccepted?.Invoke(this, new MqttServerAdapterClientAcceptedEventArgs(clientAdapter));
-                }
-                catch (Exception exception)
-                {
-                    _logger.LogError(new EventId(), exception, "Error while accepting connection at default endpoint.");
-
-                    //excessive CPU consumed if in endless loop of socket errors
-                    await Task.Delay(TimeSpan.FromSeconds(1), cancellationToken).ConfigureAwait(false);
-                }
-            }
-        }
-
-        private async Task AcceptTlsEndpointConnectionsAsync(CancellationToken cancellationToken)
-        {
-            while (!cancellationToken.IsCancellationRequested)
-            {
-                try
-                {
-#if NET452
-                    var clientSocket = await Task.Factory.FromAsync(_tlsEndpointSocket.BeginAccept, _tlsEndpointSocket.EndAccept, null).ConfigureAwait(false);
-#else
-                    var clientSocket = await _tlsEndpointSocket.AcceptAsync().ConfigureAwait(false);
-#endif
-
-                    var sslStream = new SslStream(new NetworkStream(clientSocket));
-                    await sslStream.AuthenticateAsServerAsync(_tlsCertificate, false, SslProtocols.Tls12, false).ConfigureAwait(false);
-
-                    var clientAdapter = _communicationAdapterFactory.CreateServerCommunicationAdapter(new MqttTcpChannel(clientSocket, sslStream));
-                    ClientAccepted?.Invoke(this, new MqttServerAdapterClientAcceptedEventArgs(clientAdapter));
-                }
-                catch (Exception exception)
-                {
-                    _logger.LogError(new EventId(), exception, "Error while accepting connection at TLS endpoint.");
-
-                    //excessive CPU consumed if in endless loop of socket errors
-                    await Task.Delay(TimeSpan.FromSeconds(1), cancellationToken).ConfigureAwait(false);
-                }
-            }
-        }
-    }
-}
-#endif

Frameworks/MQTTnet.NetStandard/Implementations/MqttTcpChannel.cs

@@ -1,158 +0,0 @@
-#if NET452 || NETSTANDARD1_3 || NETSTANDARD2_0
-using System;
-using System.Net.Security;
-using System.Net.Sockets;
-using System.Security.Authentication;
-using System.Security.Cryptography.X509Certificates;
-using System.Threading.Tasks;
-using MQTTnet.Core.Channel;
-using MQTTnet.Core.Client;
-using System.IO;
-using System.Linq;
-
-namespace MQTTnet.Implementations
-{
-    public sealed class MqttTcpChannel : IMqttCommunicationChannel, IDisposable
-    {
-        private readonly MqttClientTcpOptions _options;
-
-        //todo: this can be used with min dependency NetStandard1.6
-#if NET452
-        // ReSharper disable once MemberCanBePrivate.Global
-        // ReSharper disable once AutoPropertyCanBeMadeGetOnly.Global
-        public static int BufferSize { get; set; } = 4096 * 20; // Can be changed for fine tuning by library user.
-#endif
-
-        private Socket _socket;
-        private SslStream _sslStream;
-
-        /// <summary>
-        /// called on client sockets are created in connect
-        /// </summary>
-        public MqttTcpChannel(MqttClientTcpOptions options)
-        {
-            _options = options ?? throw new ArgumentNullException(nameof(options));
-        }
-
-        /// <summary>
-        /// called on server, sockets are passed in
-        /// connect will not be called
-        /// </summary>
-        public MqttTcpChannel(Socket socket, SslStream sslStream)
-        {
-            _socket = socket ?? throw new ArgumentNullException(nameof(socket));
-            _sslStream = sslStream;
-
-            CreateStreams(socket, sslStream);
-        }
-
-        public Stream SendStream { get; private set; }
-        public Stream ReceiveStream { get; private set; }
-
-        public static Func<X509Certificate, X509Chain, SslPolicyErrors, MqttClientTcpOptions, bool> CustomCertificateValidationCallback { get; set; }
-
-        public async Task ConnectAsync()
-        {
-            if (_socket == null)
-            {
-                _socket = new Socket(SocketType.Stream, ProtocolType.Tcp);
-            }
-
-            //todo: else brach can be used with min dependency NET46
-#if NET452
-            await Task.Factory.FromAsync(_socket.BeginConnect, _socket.EndConnect, _options.Server, _options.GetPort(), null).ConfigureAwait(false);
-#else
-            await _socket.ConnectAsync(_options.Server, _options.GetPort()).ConfigureAwait(false);
-#endif
-
-            if (_options.TlsOptions.UseTls)
-            {
-                _sslStream = new SslStream(new NetworkStream(_socket, true), false, InternalUserCertificateValidationCallback);
-                await _sslStream.AuthenticateAsClientAsync(_options.Server, LoadCertificates(_options), SslProtocols.Tls12, _options.TlsOptions.IgnoreCertificateRevocationErrors).ConfigureAwait(false);
-            }
-
-            CreateStreams(_socket, _sslStream);
-        }
-
-        public Task DisconnectAsync()
-        {
-            Dispose();
-            return Task.FromResult(0);
-        }
-
-        public void Dispose()
-        {
-            _socket?.Dispose();
-            _socket = null;
-
-            _sslStream?.Dispose();
-            _sslStream = null;
-        }
-
-        private bool InternalUserCertificateValidationCallback(object sender, X509Certificate x509Certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors)
-        {
-            if (CustomCertificateValidationCallback != null)
-            {
-                return CustomCertificateValidationCallback(x509Certificate, chain, sslPolicyErrors, _options);
-            }
-
-            if (sslPolicyErrors == SslPolicyErrors.None)
-            {
-                return true;
-            }
-
-            if (chain.ChainStatus.Any(c => c.Status == X509ChainStatusFlags.RevocationStatusUnknown || c.Status == X509ChainStatusFlags.Revoked || c.Status == X509ChainStatusFlags.RevocationStatusUnknown))
-            {
-                if (!_options.TlsOptions.IgnoreCertificateRevocationErrors)
-                {
-                    return false;
-                }
-            }
-
-            if (chain.ChainStatus.Any(c => c.Status == X509ChainStatusFlags.PartialChain))
-            {
-                if (!_options.TlsOptions.IgnoreCertificateChainErrors)
-                {
-                    return false;
-                }
-            }
-
-            return _options.TlsOptions.AllowUntrustedCertificates;
-        }
-
-        private static X509CertificateCollection LoadCertificates(MqttClientTcpOptions options)
-        {
-            var certificates = new X509CertificateCollection();
-            if (options.TlsOptions.Certificates == null)
-            {
-                return certificates;
-            }
-
-            foreach (var certificate in options.TlsOptions.Certificates)
-            {
-                certificates.Add(new X509Certificate(certificate));
-            }
-
-            return certificates;
-        }
-
-        private void CreateStreams(Socket socket, Stream sslStream)
-        {
-            var stream = sslStream ?? new NetworkStream(socket);
-
-            //cannot use this as default buffering prevents from receiving the first connect message
-            //need two streams otherwise read and write have to be synchronized
-
-            //todo: if branch can be used with min dependency NetStandard1.6
-#if NET452
-            SendStream = new BufferedStream(stream, BufferSize);
-            ReceiveStream = new BufferedStream(stream, BufferSize);
-#else
-            SendStream = stream;
-            ReceiveStream = stream;
-#endif
-        }
-
-    }
-}
-#endif

Frameworks/MQTTnet.NetStandard/Implementations/MqttWebSocketChannel.cs

@@ -1,91 +0,0 @@
-using MQTTnet.Core.Channel;
-using MQTTnet.Core.Client;
-using System;
-using System.IO;
-using System.Net.WebSockets;
-using System.Security.Cryptography.X509Certificates;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace MQTTnet.Implementations
-{
-    public sealed class MqttWebSocketChannel : IMqttCommunicationChannel, IDisposable
-    {
-        private readonly MqttClientWebSocketOptions _options;
-        private ClientWebSocket _webSocket;
-
-        public MqttWebSocketChannel(MqttClientWebSocketOptions options)
-        {
-            _options = options ?? throw new ArgumentNullException(nameof(options));
-        }
-
-        public Stream SendStream => RawReceiveStream;
-        public Stream ReceiveStream => RawReceiveStream;
-        public Stream RawReceiveStream { get; private set; }
-
-        public async Task ConnectAsync()
-        {
-            var uri = _options.Uri;
-            if (!uri.StartsWith("ws://", StringComparison.OrdinalIgnoreCase))
-            {
-                uri = "ws://" + uri;
-            }
-
-            _webSocket = new ClientWebSocket();
-
-            if (_options.RequestHeaders != null)
-            {
-                foreach (var requestHeader in _options.RequestHeaders)
-                {
-                    _webSocket.Options.SetRequestHeader(requestHeader.Key, requestHeader.Value);
-                }    
-            }
-
-            if (_options.SubProtocols != null)
-            {
-                foreach (var subProtocol in _options.SubProtocols)
-                {
-                    _webSocket.Options.AddSubProtocol(subProtocol);
-                }
-            }
-
-            if (_options.CookieContainer != null)
-            {
-                _webSocket.Options.Cookies = _options.CookieContainer;
-            }
-
-            if (_options.TlsOptions?.UseTls == true && _options.TlsOptions?.Certificates != null)
-            {
-                _webSocket.Options.ClientCertificates = new X509CertificateCollection();
-                foreach (var certificate in _options.TlsOptions.Certificates)
-                {
-                    _webSocket.Options.ClientCertificates.Add(new X509Certificate(certificate));
-                }
-            }
-
-            await _webSocket.ConnectAsync(new Uri(uri), CancellationToken.None).ConfigureAwait(false);
-            RawReceiveStream = new WebSocketStream(_webSocket);
-        }
-
-        public async Task DisconnectAsync()
-        {
-            RawReceiveStream = null;
-
-            if (_webSocket == null)
-            {
-                return;
-            }
-
-            if (_webSocket.State == WebSocketState.Open || _webSocket.State == WebSocketState.Connecting)
-            {
-                await _webSocket.CloseAsync(WebSocketCloseStatus.NormalClosure, string.Empty, CancellationToken.None).ConfigureAwait(false);
-            }
-        }
-
-        public void Dispose()
-        {
-            _webSocket?.Dispose();
-            _webSocket = null;
-        }
-    }
-}

Frameworks/MQTTnet.NetStandard/Implementations/WebSocketStream.cs

@@ -1,86 +0,0 @@
-using System;
-using System.IO;
-using System.Net.WebSockets;
-using System.Threading;
-using System.Threading.Tasks;
-using MQTTnet.Core.Exceptions;
-
-namespace MQTTnet.Implementations
-{
-    public class WebSocketStream : Stream
-    {
-        private readonly WebSocket _webSocket;
-        
-        public WebSocketStream(WebSocket webSocket)
-        {
-            _webSocket = webSocket ?? throw new ArgumentNullException(nameof(webSocket));
-        }
-
-        public override bool CanRead => true;
-
-        public override bool CanSeek => false;
-
-        public override bool CanWrite => true;
-
-        public override long Length => throw new NotSupportedException();
-
-        public override long Position
-        {
-            get => throw new NotSupportedException();
-            set => throw new NotSupportedException();
-        }
-
-        public override void Flush()
-        {
-        }
-
-        public override async Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
-        {
-            var currentOffset = offset;
-            var targetOffset = offset + count;
-            while (_webSocket.State == WebSocketState.Open && currentOffset < targetOffset)
-            {
-                var response = await _webSocket.ReceiveAsync(new ArraySegment<byte>(buffer, currentOffset, count), cancellationToken).ConfigureAwait(false);
-                currentOffset += response.Count;
-                count -= response.Count;
-
-                if (response.MessageType == WebSocketMessageType.Close)
-                {
-                    await _webSocket.CloseAsync(WebSocketCloseStatus.NormalClosure, string.Empty, cancellationToken).ConfigureAwait(false);
-                }
-            }
-
-            if (_webSocket.State == WebSocketState.Closed)
-            {
-                throw new MqttCommunicationException( "connection closed" );
-            }
-
-            return currentOffset - offset;
-        }
-
-        public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
-        {
-            return _webSocket.SendAsync(new ArraySegment<byte>(buffer, offset, count), WebSocketMessageType.Binary, true, cancellationToken);
-        }
-
-        public override int Read(byte[] buffer, int offset, int count)
-        {
-            return ReadAsync(buffer, offset, count).GetAwaiter().GetResult();
-        }
-
-        public override void Write(byte[] buffer, int offset, int count)
-        {
-            WriteAsync(buffer, offset, count).GetAwaiter().GetResult();
-        }
-
-        public override long Seek(long offset, SeekOrigin origin)
-        {
-            throw new NotSupportedException();
-        }
-
-        public override void SetLength(long value)
-        {
-            throw new NotSupportedException();
-        }
-    }
-}

Frameworks/MQTTnet.NetStandard/MqttFactory.cs

@@ -1,132 +0,0 @@
-using System;
-using MQTTnet.Core.Adapter;
-using MQTTnet.Core.Client;
-using MQTTnet.Core.Serializer;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
-using MQTTnet.Implementations;
-using MQTTnet.Core.ManagedClient;
-using MQTTnet.Core.Server;
-using MQTTnet.Core.Channel;
-
-namespace MQTTnet
-{
-    public class MqttFactory : IMqttCommunicationAdapterFactory, IMqttClientSesssionFactory, IMqttClientFactory, IMqttServerFactory
-    {
-        private readonly IServiceProvider _serviceProvider;
-
-        public MqttFactory()
-            : this(BuildServiceProvider())
-        {
-        }
-
-        public MqttFactory(IServiceProvider serviceProvider)
-        {
-            _serviceProvider = serviceProvider;
-        }
-
-        public ILoggerFactory GetLoggerFactory()
-        {
-            return _serviceProvider.GetRequiredService<ILoggerFactory>();
-        }
-
-        public IMqttCommunicationAdapter CreateClientCommunicationAdapter(IMqttClientOptions options)
-        {
-            var logger = _serviceProvider.GetRequiredService<ILogger<MqttChannelCommunicationAdapter>>();
-            return new MqttChannelCommunicationAdapter(CreateCommunicationChannel(options.ChannelOptions), CreateSerializer(options.ProtocolVersion), logger);
-        }
-
-        public IMqttCommunicationAdapter CreateServerCommunicationAdapter(IMqttCommunicationChannel channel)
-        {
-            var serializer = _serviceProvider.GetRequiredService<IMqttPacketSerializer>();
-            var logger = _serviceProvider.GetRequiredService<ILogger<MqttChannelCommunicationAdapter>>();
-            return new MqttChannelCommunicationAdapter(channel, serializer, logger);
-        }
-
-        public IMqttCommunicationChannel CreateCommunicationChannel(IMqttClientChannelOptions options)
-        {
-            if (options == null) throw new ArgumentNullException(nameof(options));
-
-            switch (options)
-            {
-                case MqttClientTcpOptions tcpOptions:
-                    return CreateTcpChannel(tcpOptions);
-                case MqttClientWebSocketOptions webSocketOptions:
-                    return CreateWebSocketChannel(webSocketOptions);
-                default:
-                    throw new NotSupportedException();
-            }
-        }
-
-        public MqttTcpChannel CreateTcpChannel(MqttClientTcpOptions tcpOptions)
-        {
-            return new MqttTcpChannel(tcpOptions);
-        }
-
-        public MqttWebSocketChannel CreateWebSocketChannel(MqttClientWebSocketOptions webSocketOptions)
-        {
-            return new MqttWebSocketChannel(webSocketOptions);
-        }
-
-        public MqttPacketSerializer CreateSerializer(MqttProtocolVersion protocolVersion)
-        {
-            return new MqttPacketSerializer
-            {
-                ProtocolVersion = protocolVersion
-            };
-        }
-
-        public MqttClientSession CreateClientSession(string clientId, MqttClientSessionsManager clientSessionsManager)
-        {
-            return new MqttClientSession(
-                clientId,
-                _serviceProvider.GetRequiredService<IOptions<MqttServerOptions>>(),
-                clientSessionsManager,
-                _serviceProvider.GetRequiredService<MqttClientSubscriptionsManager>(),
-                _serviceProvider.GetRequiredService<ILogger<MqttClientSession>>(),
-                _serviceProvider.GetRequiredService<ILogger<MqttClientPendingMessagesQueue>>(),
-                _serviceProvider.GetRequiredService<IMqttClientRetainedMessageManager>()
-                );
-        }
-
-        public IMqttClient CreateMqttClient()
-        {
-            return _serviceProvider.GetRequiredService<IMqttClient>();
-        }
-
-        public IManagedMqttClient CreateManagedMqttClient()
-        {
-            return _serviceProvider.GetRequiredService<IManagedMqttClient>();
-        }
-
-        public IMqttServer CreateMqttServer()
-        {
-            return _serviceProvider.GetRequiredService<IMqttServer>();
-        }
-
-        public IMqttServer CreateMqttServer(Action<MqttServerOptions> configure)
-        {
-            if (configure == null) throw new ArgumentNullException(nameof(configure));
-
-            var options = _serviceProvider.GetRequiredService<IOptions<MqttServerOptions>>();
-            configure(options.Value);
-
-            return _serviceProvider.GetRequiredService<IMqttServer>();
-        }
-
-        private static IServiceProvider BuildServiceProvider()
-        {
-            var serviceProvider = new ServiceCollection()
-                .AddMqttClient()
-                .AddMqttServer()
-                .AddLogging()
-                .BuildServiceProvider();
-
-            serviceProvider.GetRequiredService<ILoggerFactory>()
-                .AddMqttTrace();
-
-            return serviceProvider;
-        }
-    }
-}

Frameworks/MQTTnet.NetStandard/ServiceCollectionExtensions.cs

@@ -1,70 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using MQTTnet.Core.Adapter;
-using MQTTnet.Core.Client;
-using MQTTnet.Core.ManagedClient;
-using MQTTnet.Core.Serializer;
-using MQTTnet.Core.Server;
-using MQTTnet.Implementations;
-using System;
-using Microsoft.Extensions.Logging;
-using MQTTnet.Core.Diagnostics;
-
-namespace MQTTnet
-{
-    public static class ServiceCollectionExtensions
-    {
-        public static IServiceCollection AddMqttServer(this IServiceCollection services)
-        {
-            services.AddMqttServerServices();
-            
-            services.AddSingleton<IMqttServer>(s => s.GetService<MqttServer>());
-            services.AddSingleton<MqttServer>();
-
-            return services;
-        }
-
-        public static IServiceCollection AddMqttServerServices(this IServiceCollection services)
-        {
-            services.AddOptions();
-            services.AddSingleton<MqttFactory>();
-            services.AddSingleton<IMqttCommunicationAdapterFactory>(s => s.GetService<MqttFactory>());
-            services.AddSingleton<IMqttClientSesssionFactory>(s => s.GetService<MqttFactory>());
-
-            services.AddTransient<IMqttServerAdapter, MqttServerAdapter>();
-            services.AddTransient<IMqttPacketSerializer, MqttPacketSerializer>();
-
-            services.AddSingleton<MqttClientSessionsManager>();
-            services.AddTransient<MqttClientSubscriptionsManager>();
-            services.AddSingleton<IMqttClientRetainedMessageManager, MqttClientRetainedMessagesManager>();
-            return services;
-        }
-
-        public static IServiceCollection AddMqttServer(this IServiceCollection services, Action<MqttServerOptions> configureOptions)
-        {
-            return services
-                .AddMqttServer()
-                .Configure(configureOptions);
-        }
-
-        public static IServiceCollection AddMqttClient(this IServiceCollection services)
-        {
-            services.AddSingleton<MqttFactory>();
-            services.AddSingleton<IMqttCommunicationAdapterFactory>(s => s.GetService<MqttFactory>());
-
-            services.AddTransient<IMqttClient, MqttClient>();
-            services.AddTransient<MqttClient>();
-            services.AddTransient<IManagedMqttClient, ManagedMqttClient>();
-            services.AddTransient<ManagedMqttClient>();
-            services.AddTransient<IMqttPacketSerializer, MqttPacketSerializer>();
-            services.AddTransient<MqttPacketDispatcher>();
-
-            return services;
-        }
-
-        public static ILoggerFactory AddMqttTrace(this ILoggerFactory factory)
-        {
-            factory.AddProvider(new MqttNetTrace());
-            return factory;
-        }
-    }
-}

MQTTnet.Core/Adapter/IMqttCommunicationAdapter.cs

@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using MQTTnet.Core.Packets;
-using MQTTnet.Core.Serializer;
-
-namespace MQTTnet.Core.Adapter
-{
-    public interface IMqttCommunicationAdapter
-    {
-        IMqttPacketSerializer PacketSerializer { get; }
-
-        Task ConnectAsync(TimeSpan timeout);
-
-        Task DisconnectAsync(TimeSpan timeout);
-
-        Task SendPacketsAsync(TimeSpan timeout, CancellationToken cancellationToken, IEnumerable<MqttBasePacket> packets);
-
-        Task<MqttBasePacket> ReceivePacketAsync(TimeSpan timeout, CancellationToken cancellationToken);
-    }
-}

MQTTnet.Core/Adapter/IMqttCommunicationAdapterFactory.cs

@@ -1,12 +0,0 @@
-using MQTTnet.Core.Client;
-using MQTTnet.Core.Channel;
-
-namespace MQTTnet.Core.Adapter
-{
-    public interface IMqttCommunicationAdapterFactory
-    {
-        IMqttCommunicationAdapter CreateClientCommunicationAdapter(IMqttClientOptions options);
-
-        IMqttCommunicationAdapter CreateServerCommunicationAdapter(IMqttCommunicationChannel channel);
-    }
-}

MQTTnet.Core/Adapter/MqttChannelCommunicationAdapter.cs

@@ -1,219 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-using MQTTnet.Core.Channel;
-using MQTTnet.Core.Exceptions;
-using MQTTnet.Core.Internal;
-using MQTTnet.Core.Packets;
-using MQTTnet.Core.Serializer;
-using Microsoft.Extensions.Logging;
-
-namespace MQTTnet.Core.Adapter
-{
-    public class MqttChannelCommunicationAdapter : IMqttCommunicationAdapter
-    {
-        private readonly SemaphoreSlim _semaphore = new SemaphoreSlim(1, 1);
-        private readonly ILogger<MqttChannelCommunicationAdapter> _logger;
-        private readonly IMqttCommunicationChannel _channel;
-        
-        public MqttChannelCommunicationAdapter(IMqttCommunicationChannel channel, IMqttPacketSerializer serializer, ILogger<MqttChannelCommunicationAdapter> logger)
-        {
-            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-            _channel = channel ?? throw new ArgumentNullException(nameof(channel));
-            PacketSerializer = serializer ?? throw new ArgumentNullException(nameof(serializer));
-        }
-
-        public IMqttPacketSerializer PacketSerializer { get; }
-
-        public async Task ConnectAsync(TimeSpan timeout)
-        {
-            try
-            {
-                await _channel.ConnectAsync().TimeoutAfter(timeout).ConfigureAwait(false);
-            }
-            catch (TaskCanceledException)
-            {
-                throw;
-            }
-            catch (OperationCanceledException)
-            {
-                throw;
-            }
-            catch (MqttCommunicationTimedOutException)
-            {
-                throw;
-            }
-            catch (MqttCommunicationException)
-            {
-                throw;
-            }
-            catch (Exception exception)
-            {
-                throw new MqttCommunicationException(exception);
-            }
-        }
-
-        public async Task DisconnectAsync(TimeSpan timeout)
-        {
-            try
-            {
-                await _channel.DisconnectAsync().TimeoutAfter(timeout).ConfigureAwait(false);
-            }
-            catch (TaskCanceledException)
-            {
-                throw;
-            }
-            catch (OperationCanceledException)
-            {
-                throw;
-            }
-            catch (MqttCommunicationTimedOutException)
-            {
-                throw;
-            }
-            catch (MqttCommunicationException)
-            {
-                throw;
-            }
-            catch (Exception exception)
-            {
-                throw new MqttCommunicationException(exception);
-            }
-        }
-
-        public async Task SendPacketsAsync(TimeSpan timeout, CancellationToken cancellationToken, IEnumerable<MqttBasePacket> packets)
-        {
-            try
-            {
-                await _semaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
-
-                foreach (var packet in packets)
-                {
-                    if (packet == null)
-                    {
-                        continue;
-                    }
-
-                    _logger.LogInformation("TX >>> {0} [Timeout={1}]", packet, timeout);
-
-                    var writeBuffer = PacketSerializer.Serialize(packet);
-                    await _channel.SendStream.WriteAsync(writeBuffer, 0, writeBuffer.Length, cancellationToken).ConfigureAwait(false);
-                }
-
-                if (timeout > TimeSpan.Zero)
-                {
-                    await _channel.SendStream.FlushAsync(cancellationToken).TimeoutAfter(timeout).ConfigureAwait(false);
-                }
-                else
-                {
-                    await _channel.SendStream.FlushAsync(cancellationToken).ConfigureAwait(false);
-                }
-            }
-            catch (TaskCanceledException)
-            {
-                throw;
-            }
-            catch (OperationCanceledException)
-            {
-                throw;
-            }
-            catch (MqttCommunicationTimedOutException)
-            {
-                throw;
-            }
-            catch (MqttCommunicationException)
-            {
-                throw;
-            }
-            catch (Exception exception)
-            {
-                throw new MqttCommunicationException(exception);
-            }
-            finally
-            {
-                _semaphore.Release();
-            }
-        }
-
-        public async Task<MqttBasePacket> ReceivePacketAsync(TimeSpan timeout, CancellationToken cancellationToken)
-        {
-            ReceivedMqttPacket receivedMqttPacket = null;
-            try
-            {
-                if (timeout > TimeSpan.Zero)
-                {
-                    receivedMqttPacket = await ReceiveAsync(_channel.ReceiveStream, cancellationToken).TimeoutAfter(timeout).ConfigureAwait(false);
-                }
-                else
-                {
-                    receivedMqttPacket = await ReceiveAsync(_channel.ReceiveStream, cancellationToken).ConfigureAwait(false);
-                }
-
-                if (receivedMqttPacket == null || cancellationToken.IsCancellationRequested)
-                {
-                    throw new TaskCanceledException();
-                }
-
-                var packet = PacketSerializer.Deserialize(receivedMqttPacket);
-                if (packet == null)
-                {
-                    throw new MqttProtocolViolationException("Received malformed packet.");
-                }
-
-                _logger.LogInformation("RX <<< {0}", packet);
-                return packet;
-            }
-            catch (TaskCanceledException)
-            {
-                throw;
-            }
-            catch (OperationCanceledException)
-            {
-                throw;
-            }
-            catch (MqttCommunicationTimedOutException)
-            {
-                throw;
-            }
-            catch (MqttCommunicationException)
-            {
-                throw;
-            }
-            catch (Exception exception)
-            {
-                throw new MqttCommunicationException(exception);
-            }
-            finally
-            {
-                receivedMqttPacket?.Dispose();
-            }
-        }
-
-        private static async Task<ReceivedMqttPacket> ReceiveAsync(Stream stream, CancellationToken cancellationToken)
-        {
-            var header = MqttPacketReader.ReadHeaderFromSource(stream, cancellationToken);
-            if (header == null)
-            {
-                return null;
-            }
-
-            if (header.BodyLength == 0)
-            {
-                return new ReceivedMqttPacket(header, new MemoryStream(0));
-            }
-
-            var body = new byte[header.BodyLength];
-
-            var offset = 0;
-            do
-            {
-                var readBytesCount = await stream.ReadAsync(body, offset, body.Length - offset, cancellationToken).ConfigureAwait(false);
-                offset += readBytesCount;
-            } while (offset < header.BodyLength);
-
-            return new ReceivedMqttPacket(header, new MemoryStream(body, 0, body.Length));
-        }
-    }
-}

MQTTnet.Core/Adapter/MqttCommunicationAdapterExtensions.cs

@@ -1,17 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using MQTTnet.Core.Packets;
-
-namespace MQTTnet.Core.Adapter
-{
-    public static class MqttCommunicationAdapterExtensions
-    {
-        public static Task SendPacketsAsync(this IMqttCommunicationAdapter adapter, TimeSpan timeout, CancellationToken cancellationToken, params MqttBasePacket[] packets)
-        {
-            if (adapter == null) throw new ArgumentNullException(nameof(adapter));
-
-            return adapter.SendPacketsAsync(timeout, cancellationToken, packets);
-        }
-    }
-}

MQTTnet.Core/Adapter/ReceivedMqttPacket.cs

@@ -1,24 +0,0 @@
-using System;
-using System.IO;
-using MQTTnet.Core.Packets;
-
-namespace MQTTnet.Core.Adapter
-{
-    public sealed class ReceivedMqttPacket : IDisposable
-    {
-        public ReceivedMqttPacket(MqttPacketHeader header, MemoryStream body)
-        {
-            Header = header ?? throw new ArgumentNullException(nameof(header));
-            Body = body ?? throw new ArgumentNullException(nameof(body));
-        }
-
-        public MqttPacketHeader Header { get; }
-
-        public MemoryStream Body { get; }
-
-        public void Dispose()
-        {
-            Body?.Dispose();
-        }
-    }
-}

MQTTnet.Core/ApplicationMessagePublisherExtensions.cs

@@ -1,16 +0,0 @@
-using System;
-using System.Threading.Tasks;
-
-namespace MQTTnet.Core
-{
-    public static class ApplicationMessagePublisherExtensions
-    {
-        public static Task PublishAsync(this IApplicationMessagePublisher client, params MqttApplicationMessage[] applicationMessages)
-        {
-            if (client == null) throw new ArgumentNullException(nameof(client));
-            if (applicationMessages == null) throw new ArgumentNullException(nameof(applicationMessages));
-
-            return client.PublishAsync(applicationMessages);
-        }
-    }
-}

MQTTnet.Core/Channel/IMqttCommunicationChannel.cs

@@ -1,14 +0,0 @@
-using System.Threading.Tasks;
-using System.IO;
-
-namespace MQTTnet.Core.Channel
-{
-    public interface IMqttCommunicationChannel
-    {
-        Stream SendStream { get; }
-        Stream ReceiveStream { get; }
-
-        Task ConnectAsync();
-        Task DisconnectAsync();
-    }
-}

MQTTnet.Core/Client/IMqttClientFactory.cs

@@ -1,11 +0,0 @@
-using MQTTnet.Core.ManagedClient;
-
-namespace MQTTnet.Core.Client
-{
-    public interface IMqttClientFactory
-    {
-        IMqttClient CreateMqttClient();
-
-        IManagedMqttClient CreateManagedMqttClient();
-    }
-}

MQTTnet.Core/Client/MqttClient.cs

@@ -1,473 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using MQTTnet.Core.Adapter;
-using MQTTnet.Core.Exceptions;
-using MQTTnet.Core.Internal;
-using MQTTnet.Core.Packets;
-using MQTTnet.Core.Protocol;
-using Microsoft.Extensions.Logging;
-
-namespace MQTTnet.Core.Client
-{
-    public class MqttClient : IMqttClient
-    {
-        private readonly HashSet<ushort> _unacknowledgedPublishPackets = new HashSet<ushort>();
-        private readonly MqttPacketDispatcher _packetDispatcher;
-        private readonly IMqttCommunicationAdapterFactory _communicationAdapterFactory;
-        private readonly ILogger<MqttClient> _logger;
-
-        private IMqttClientOptions _options;
-        private bool _isReceivingPackets;
-        private int _latestPacketIdentifier;
-        private CancellationTokenSource _cancellationTokenSource;
-        private IMqttCommunicationAdapter _adapter;
-        private IDisposable _scopeHandle;
-
-        public MqttClient(IMqttCommunicationAdapterFactory communicationAdapterFactory, ILogger<MqttClient> logger, MqttPacketDispatcher packetDispatcher)
-        {
-            _communicationAdapterFactory = communicationAdapterFactory ?? throw new ArgumentNullException(nameof(communicationAdapterFactory));
-            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-            _packetDispatcher = packetDispatcher ?? throw new ArgumentNullException(nameof(packetDispatcher));
-        }
-
-        public event EventHandler<MqttClientConnectedEventArgs> Connected;
-        public event EventHandler<MqttClientDisconnectedEventArgs> Disconnected;
-        public event EventHandler<MqttApplicationMessageReceivedEventArgs> ApplicationMessageReceived;
-
-        public bool IsConnected { get; private set; }
-
-        public async Task<MqttClientConnectResult> ConnectAsync(IMqttClientOptions options)
-        {
-            if (options == null) throw new ArgumentNullException(nameof(options));
-            if (options.ChannelOptions == null) throw new ArgumentException("ChannelOptions are not set.");
-
-            ThrowIfConnected("It is not allowed to connect with a server after the connection is established.");
-
-            try
-            {
-                _options = options;
-                _cancellationTokenSource = new CancellationTokenSource();
-                _latestPacketIdentifier = 0;
-                _packetDispatcher.Reset();
-
-                _adapter = _communicationAdapterFactory.CreateClientCommunicationAdapter(options);
-
-                _scopeHandle = _logger.BeginScope(options.LogId ?? options.ClientId);
-                _logger.LogTrace("Trying to connect with server.");
-                await _adapter.ConnectAsync(_options.CommunicationTimeout).ConfigureAwait(false);
-                _logger.LogTrace("Connection with server established.");
-
-                await SetupIncomingPacketProcessingAsync().ConfigureAwait(false);
-                var connectResponse = await AuthenticateAsync(options.WillMessage).ConfigureAwait(false);
-
-                _logger.LogTrace("MQTT connection with server established.");
-
-                if (_options.KeepAlivePeriod != TimeSpan.Zero)
-                {
-                    StartSendKeepAliveMessages(_cancellationTokenSource.Token);
-                }
-
-                IsConnected = true;
-                Connected?.Invoke(this, new MqttClientConnectedEventArgs(connectResponse.IsSessionPresent));
-                return new MqttClientConnectResult(connectResponse.IsSessionPresent);
-            }
-            catch (Exception exception)
-            {
-                _logger.LogError(new EventId(), exception, "Error while connecting with server.");
-                await DisconnectInternalAsync().ConfigureAwait(false);
-                throw;
-            }
-        }
-
-        public async Task DisconnectAsync()
-        {
-            if (!IsConnected)
-            {
-                return;
-            }
-
-            try
-            {
-                await SendAsync(new MqttDisconnectPacket()).ConfigureAwait(false);
-            }
-            finally
-            {
-                await DisconnectInternalAsync().ConfigureAwait(false);
-                _scopeHandle.Dispose();
-            }
-        }
-
-        public async Task<IList<MqttSubscribeResult>> SubscribeAsync(IEnumerable<TopicFilter> topicFilters)
-        {
-            if (topicFilters == null) throw new ArgumentNullException(nameof(topicFilters));
-
-            ThrowIfNotConnected();
-
-            var subscribePacket = new MqttSubscribePacket
-            {
-                PacketIdentifier = GetNewPacketIdentifier(),
-                TopicFilters = topicFilters.ToList()
-            };
-
-            var response = await SendAndReceiveAsync<MqttSubAckPacket>(subscribePacket).ConfigureAwait(false);
-
-            if (response.SubscribeReturnCodes.Count != subscribePacket.TopicFilters.Count)
-            {
-                throw new MqttProtocolViolationException("The return codes are not matching the topic filters [MQTT-3.9.3-1].");
-            }
-
-            return subscribePacket.TopicFilters.Select((t, i) => new MqttSubscribeResult(t, response.SubscribeReturnCodes[i])).ToList();
-        }
-
-        public async Task UnsubscribeAsync(IEnumerable<string> topicFilters)
-        {
-            if (topicFilters == null) throw new ArgumentNullException(nameof(topicFilters));
-
-            ThrowIfNotConnected();
-
-            var unsubscribePacket = new MqttUnsubscribePacket
-            {
-                PacketIdentifier = GetNewPacketIdentifier(),
-                TopicFilters = topicFilters.ToList()
-            };
-
-            await SendAndReceiveAsync<MqttUnsubAckPacket>(unsubscribePacket);
-        }
-
-        public async Task PublishAsync(IEnumerable<MqttApplicationMessage> applicationMessages)
-        {
-            ThrowIfNotConnected();
-
-            var publishPackets = applicationMessages.Select(m => m.ToPublishPacket());
-
-            foreach (var qosGroup in publishPackets.GroupBy(p => p.QualityOfServiceLevel))
-            {
-                var qosPackets = qosGroup.ToArray();
-                switch (qosGroup.Key)
-                {
-                    case MqttQualityOfServiceLevel.AtMostOnce:
-                    {
-                        // No packet identifier is used for QoS 0 [3.3.2.2 Packet Identifier]
-                        await _adapter.SendPacketsAsync(_options.CommunicationTimeout, _cancellationTokenSource.Token, qosPackets).ConfigureAwait(false);
-                        break;
-                    }
-                    case MqttQualityOfServiceLevel.AtLeastOnce:
-                    {
-                        foreach (var publishPacket in qosPackets)
-                        {
-                            publishPacket.PacketIdentifier = GetNewPacketIdentifier();
-                            await SendAndReceiveAsync<MqttPubAckPacket>(publishPacket).ConfigureAwait(false);
-                        }
-
-                        break;
-                    }
-                    case MqttQualityOfServiceLevel.ExactlyOnce:
-                    {
-                        foreach (var publishPacket in qosPackets)
-                        {
-                            publishPacket.PacketIdentifier = GetNewPacketIdentifier();
-                            var pubRecPacket = await SendAndReceiveAsync<MqttPubRecPacket>(publishPacket).ConfigureAwait(false);
-                            await SendAndReceiveAsync<MqttPubCompPacket>(pubRecPacket.CreateResponse<MqttPubRelPacket>()).ConfigureAwait(false);
-                        }
-
-                        break;
-                    }
-                    default:
-                    {
-                        throw new InvalidOperationException();
-                    }
-                }
-            }
-        }
-
-        private async Task<MqttConnAckPacket> AuthenticateAsync(MqttApplicationMessage willApplicationMessage)
-        {
-            var connectPacket = new MqttConnectPacket
-            {
-                ClientId = _options.ClientId,
-                Username = _options.Credentials?.Username,
-                Password = _options.Credentials?.Password,
-                CleanSession = _options.CleanSession,
-                KeepAlivePeriod = (ushort) _options.KeepAlivePeriod.TotalSeconds,
-                WillMessage = willApplicationMessage
-            };
-
-            var response = await SendAndReceiveAsync<MqttConnAckPacket>(connectPacket).ConfigureAwait(false);
-            if (response.ConnectReturnCode != MqttConnectReturnCode.ConnectionAccepted)
-            {
-                throw new MqttConnectingFailedException(response.ConnectReturnCode);
-            }
-
-            return response;
-        }
-
-        private async Task SetupIncomingPacketProcessingAsync()
-        {
-            _isReceivingPackets = false;
-
-#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
-            Task.Factory.StartNew(
-                () => ReceivePackets(_cancellationTokenSource.Token),
-                _cancellationTokenSource.Token,
-                TaskCreationOptions.LongRunning,
-                TaskScheduler.Default).ConfigureAwait(false);
-#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
-
-            while (!_isReceivingPackets && _cancellationTokenSource != null && !_cancellationTokenSource.IsCancellationRequested)
-            {
-                await Task.Delay(TimeSpan.FromMilliseconds(100)).ConfigureAwait(false);
-            }
-        }
-
-        private void ThrowIfNotConnected()
-        {
-            if (!IsConnected) throw new MqttCommunicationException("The client is not connected.");
-        }
-
-        private void ThrowIfConnected(string message)
-        {
-            if (IsConnected) throw new MqttProtocolViolationException(message);
-        }
-
-        private async Task DisconnectInternalAsync()
-        {
-            var clientWasConnected = IsConnected;
-            IsConnected = false;
-
-            var cts = _cancellationTokenSource;
-            if (cts == null || cts.IsCancellationRequested)
-            {
-                return;
-            }
-
-            cts.Cancel(false);
-            cts.Dispose();
-            _cancellationTokenSource = null;
-
-            try
-            {
-                await _adapter.DisconnectAsync(_options.CommunicationTimeout).ConfigureAwait(false);
-                _logger.LogInformation("Disconnected from adapter.");
-            }
-            catch (Exception exception)
-            {
-                _logger.LogWarning(new EventId(), exception, "Error while disconnecting from adapter.");
-            }
-            finally
-            {
-                Disconnected?.Invoke(this, new MqttClientDisconnectedEventArgs(clientWasConnected));
-            }
-        }
-
-        private async Task ProcessReceivedPacketAsync(MqttBasePacket packet)
-        {
-            try
-            {
-                _logger.LogInformation("Received <<< {0}", packet);
-
-                if (packet is MqttPingReqPacket)
-                {
-                    await SendAsync(new MqttPingRespPacket());
-                    return;
-                }
-
-                if (packet is MqttDisconnectPacket)
-                {
-                    await DisconnectAsync();
-                    return;
-                }
-
-                if (packet is MqttPublishPacket publishPacket)
-                {
-                    await ProcessReceivedPublishPacket(publishPacket);
-                    return;
-                }
-
-                if (packet is MqttPubRelPacket pubRelPacket)
-                {
-                    await ProcessReceivedPubRelPacket(pubRelPacket);
-                    return;
-                }
-
-                _packetDispatcher.Dispatch(packet);
-            }
-            catch (Exception exception)
-            {
-                _logger.LogError(new EventId(), exception, "Unhandled exception while processing received packet.");
-            }
-        }
-
-        private void FireApplicationMessageReceivedEvent(MqttPublishPacket publishPacket)
-        {
-            try
-            {
-                var applicationMessage = publishPacket.ToApplicationMessage();
-                ApplicationMessageReceived?.Invoke(this, new MqttApplicationMessageReceivedEventArgs(_options.ClientId, applicationMessage));
-            }
-            catch (Exception exception)
-            {
-                _logger.LogError(new EventId(), exception, "Unhandled exception while handling application message.");
-            }
-        }
-
-        private async Task ProcessReceivedPublishPacket(MqttPublishPacket publishPacket)
-        {
-            if (publishPacket.QualityOfServiceLevel == MqttQualityOfServiceLevel.AtMostOnce)
-            {
-                FireApplicationMessageReceivedEvent(publishPacket);
-                return;
-            }
-
-            if (publishPacket.QualityOfServiceLevel == MqttQualityOfServiceLevel.AtLeastOnce)
-            {
-                FireApplicationMessageReceivedEvent(publishPacket);
-                await SendAsync(new MqttPubAckPacket {PacketIdentifier = publishPacket.PacketIdentifier});
-                return;
-            }
-
-            if (publishPacket.QualityOfServiceLevel == MqttQualityOfServiceLevel.ExactlyOnce)
-            {
-                // QoS 2 is implement as method "B" [4.3.3 QoS 2: Exactly once delivery]
-                lock (_unacknowledgedPublishPackets)
-                {
-                    _unacknowledgedPublishPackets.Add(publishPacket.PacketIdentifier);
-                }
-
-                FireApplicationMessageReceivedEvent(publishPacket);
-                await SendAsync(new MqttPubRecPacket {PacketIdentifier = publishPacket.PacketIdentifier});
-                return;
-            }
-
-            throw new MqttCommunicationException("Received a not supported QoS level.");
-        }
-
-        private Task ProcessReceivedPubRelPacket(MqttPubRelPacket pubRelPacket)
-        {
-            lock (_unacknowledgedPublishPackets)
-            {
-                _unacknowledgedPublishPackets.Remove(pubRelPacket.PacketIdentifier);
-            }
-
-            return SendAsync(pubRelPacket.CreateResponse<MqttPubCompPacket>());
-        }
-
-        private Task SendAsync(MqttBasePacket packet)
-        {
-            return _adapter.SendPacketsAsync(_options.CommunicationTimeout, _cancellationTokenSource.Token, packet);
-        }
-
-        private async Task<TResponsePacket> SendAndReceiveAsync<TResponsePacket>(MqttBasePacket requestPacket) where TResponsePacket : MqttBasePacket
-        {
-            var packetAwaiter = _packetDispatcher.WaitForPacketAsync(requestPacket, typeof(TResponsePacket), _options.CommunicationTimeout);
-            await _adapter.SendPacketsAsync(_options.CommunicationTimeout, _cancellationTokenSource.Token, requestPacket).ConfigureAwait(false);
-            return (TResponsePacket) await packetAwaiter.ConfigureAwait(false);
-        }
-
-        private ushort GetNewPacketIdentifier()
-        {
-            return (ushort) Interlocked.Increment(ref _latestPacketIdentifier);
-        }
-
-        private async Task SendKeepAliveMessagesAsync(CancellationToken cancellationToken)
-        {
-            _logger.LogInformation("Start sending keep alive packets.");
-
-            try
-            {
-                while (!cancellationToken.IsCancellationRequested)
-                {
-                    await Task.Delay(_options.KeepAlivePeriod, cancellationToken).ConfigureAwait(false);
-                    if (cancellationToken.IsCancellationRequested)
-                    {
-                        return;
-                    }
-
-                    await SendAndReceiveAsync<MqttPingRespPacket>(new MqttPingReqPacket()).ConfigureAwait(false);
-                }
-            }
-            catch (OperationCanceledException)
-            {
-            }
-            catch (MqttCommunicationException exception)
-            {
-                if (cancellationToken.IsCancellationRequested)
-                {
-                    return;
-                }
-
-                _logger.LogWarning(new EventId(), exception, "MQTT communication exception while sending/receiving keep alive packets.");
-                await DisconnectInternalAsync().ConfigureAwait(false);
-            }
-            catch (Exception exception)
-            {
-                _logger.LogWarning(new EventId(), exception, "Unhandled exception while sending/receiving keep alive packets.");
-                await DisconnectInternalAsync().ConfigureAwait(false);
-            }
-            finally
-            {
-                _logger.LogInformation("Stopped sending keep alive packets.");
-            }
-        }
-
-        private async Task ReceivePackets(CancellationToken cancellationToken)
-        {
-            _logger.LogInformation("Start receiving packets.");
-
-            try
-            {
-                while (!cancellationToken.IsCancellationRequested)
-                {
-                    _isReceivingPackets = true;
-
-                    var packet = await _adapter.ReceivePacketAsync(TimeSpan.Zero, cancellationToken).ConfigureAwait(false);
-                    if (cancellationToken.IsCancellationRequested)
-                    {
-                        return;
-                    }
-
-                    StartProcessReceivedPacket(packet, cancellationToken);
-                }
-            }
-            catch (OperationCanceledException)
-            {
-            }
-            catch (MqttCommunicationException exception)
-            {
-                if (cancellationToken.IsCancellationRequested)
-                {
-                    return;
-                }
-
-                _logger.LogWarning(new EventId(), exception, "MQTT communication exception while receiving packets.");
-                await DisconnectInternalAsync().ConfigureAwait(false);
-            }
-            catch (Exception exception)
-            {
-                _logger.LogError(new EventId(), exception, "Unhandled exception while receiving packets.");
-                await DisconnectInternalAsync().ConfigureAwait(false);
-            }
-            finally
-            {
-                _logger.LogInformation(nameof(MqttClient), "Stopped receiving packets.");
-            }
-        }
-
-        private void StartProcessReceivedPacket(MqttBasePacket packet, CancellationToken cancellationToken)
-        {
-#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
-            Task.Run(() => ProcessReceivedPacketAsync(packet), cancellationToken).ConfigureAwait(false);
-#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
-        }
-
-        private void StartSendKeepAliveMessages(CancellationToken cancellationToken)
-        {
-#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
-            Task.Factory.StartNew(() => SendKeepAliveMessagesAsync(cancellationToken), cancellationToken, TaskCreationOptions.LongRunning, TaskScheduler.Default)
-                .ConfigureAwait(false);
-#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
-        }
-    }
-}

MQTTnet.Core/Client/MqttClientExtensions.cs

@@ -1,26 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace MQTTnet.Core.Client
-{
-    public static class MqttClientExtensions
-    {
-        public static Task<IList<MqttSubscribeResult>> SubscribeAsync(this IMqttClient client, params TopicFilter[] topicFilters)
-        {
-            if (client == null) throw new ArgumentNullException(nameof(client));
-            if (topicFilters == null) throw new ArgumentNullException(nameof(topicFilters));
-
-            return client.SubscribeAsync(topicFilters.ToList());
-        }
-
-        public static Task UnsubscribeAsync(this IMqttClient client, params string[] topicFilters)
-        {
-            if (client == null) throw new ArgumentNullException(nameof(client));
-            if (topicFilters == null) throw new ArgumentNullException(nameof(topicFilters));
-
-            return client.UnsubscribeAsync(topicFilters.ToList());
-        }
-    }
-}

MQTTnet.Core/Client/MqttClientTlsOptions.cs

@@ -1,17 +0,0 @@
-using System.Collections.Generic;
-
-namespace MQTTnet.Core.Client
-{
-    public class MqttClientTlsOptions
-    {
-        public bool UseTls { get; set; }
-
-        public bool IgnoreCertificateRevocationErrors { get; set; }
-
-        public bool IgnoreCertificateChainErrors { get; set; }
-
-        public bool AllowUntrustedCertificates { get; set; }
-
-        public List<byte[]> Certificates { get; set; }
-    }
-}

MQTTnet.Core/Client/MqttPacketDispatcher.cs

@@ -1,103 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Threading.Tasks;
-using MQTTnet.Core.Exceptions;
-using MQTTnet.Core.Internal;
-using MQTTnet.Core.Packets;
-using Microsoft.Extensions.Logging;
-
-namespace MQTTnet.Core.Client
-{
-    public class MqttPacketDispatcher
-    {
-        private readonly ConcurrentDictionary<Type, TaskCompletionSource<MqttBasePacket>> _packetByResponseType = new ConcurrentDictionary<Type, TaskCompletionSource<MqttBasePacket>>();
-        private readonly ConcurrentDictionary<Type, ConcurrentDictionary<ushort, TaskCompletionSource<MqttBasePacket>>> _packetByResponseTypeAndIdentifier = new ConcurrentDictionary<Type, ConcurrentDictionary<ushort, TaskCompletionSource<MqttBasePacket>>>();
-        private readonly ILogger<MqttPacketDispatcher> _logger;
-
-        public MqttPacketDispatcher(ILogger<MqttPacketDispatcher> logger)
-        {
-            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-        }
-
-        public async Task<MqttBasePacket> WaitForPacketAsync(MqttBasePacket request, Type responseType, TimeSpan timeout)
-        {
-            if (request == null) throw new ArgumentNullException(nameof(request));
-
-            var packetAwaiter = AddPacketAwaiter(request, responseType);
-            try
-            {
-                return await packetAwaiter.Task.TimeoutAfter(timeout).ConfigureAwait(false);
-            }
-            catch (MqttCommunicationTimedOutException)
-            {
-                _logger.LogWarning("Timeout while waiting for packet of type '{0}'.", responseType.Name);
-                throw;
-            }
-            finally
-            {
-                RemovePacketAwaiter(request, responseType);
-            }
-        }
-
-        public void Dispatch(MqttBasePacket packet)
-        {
-            if (packet == null) throw new ArgumentNullException(nameof(packet));
-
-            var type = packet.GetType();
-            if (packet is IMqttPacketWithIdentifier withIdentifier)
-            {
-                if (_packetByResponseTypeAndIdentifier.TryGetValue(type, out var byid))
-                {
-                    if (byid.TryRemove(withIdentifier.PacketIdentifier, out var tcs))
-                    {
-                        tcs.TrySetResult(packet);
-                        return;
-                    }
-                }
-            }
-            else if (_packetByResponseType.TryRemove(type, out var tcs))
-            {
-                tcs.TrySetResult(packet);
-                return;
-            }
-
-            throw new InvalidOperationException($"Packet of type '{type.Name}' not handled or dispatched.");
-        }
-
-        public void Reset()
-        {
-            _packetByResponseTypeAndIdentifier.Clear();
-            _packetByResponseType.Clear();
-        }
-
-        private TaskCompletionSource<MqttBasePacket> AddPacketAwaiter(MqttBasePacket request, Type responseType)
-        {
-            var tcs = new TaskCompletionSource<MqttBasePacket>();
-
-            if (request is IMqttPacketWithIdentifier requestWithIdentifier)
-            {
-                var byId = _packetByResponseTypeAndIdentifier.GetOrAdd(responseType, key => new ConcurrentDictionary<ushort, TaskCompletionSource<MqttBasePacket>>());
-                byId[requestWithIdentifier.PacketIdentifier] = tcs;
-            }
-            else
-            {
-                _packetByResponseType[responseType] = tcs;
-            }
-
-            return tcs;
-        }
-
-        private void RemovePacketAwaiter(MqttBasePacket request, Type responseType)
-        {
-            if (request is IMqttPacketWithIdentifier requestWithIdentifier)
-            {
-                var byId = _packetByResponseTypeAndIdentifier.GetOrAdd(responseType, key => new ConcurrentDictionary<ushort, TaskCompletionSource<MqttBasePacket>>());
-                byId.TryRemove(requestWithIdentifier.PacketIdentifier, out var _);
-            }
-            else
-            {
-                _packetByResponseType.TryRemove(responseType, out var _);
-            }
-        }
-    }
-}

MQTTnet.Core/Diagnostics/MqttNetLogger.cs

@@ -1,53 +0,0 @@
-using System;
-using Microsoft.Extensions.Logging;
-
-namespace MQTTnet.Core.Diagnostics
-{
-    public class MqttNetLogger : ILogger
-    {
-        private readonly string _categoryName;
-        private readonly MqttNetTrace _mqttNetTrace;
-
-        public MqttNetLogger(string categoryName, MqttNetTrace mqttNetTrace)
-        {
-            _categoryName = categoryName;
-            _mqttNetTrace = mqttNetTrace;
-        }
-
-        public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
-        {
-            if (formatter == null)
-            {
-                throw new ArgumentNullException(nameof(formatter));
-            }
-
-            if (!MqttNetTrace.HasListeners)
-            {
-                return;
-            }
-
-            var message = formatter(state, exception);
-            var traceMessage = new MqttNetTraceMessage(DateTime.Now, Environment.CurrentManagedThreadId, _categoryName, logLevel, message, exception);
-            _mqttNetTrace.Publish(traceMessage);
-        }
-
-        public bool IsEnabled(LogLevel logLevel)
-        {
-            return MqttNetTrace.HasListeners;
-        }
-
-        //not supported: async local requires netstandard1.3
-        //for implementation see https://github.com/aspnet/Logging/blob/dev/src/Microsoft.Extensions.Logging.Console/ConsoleLogScope.cs
-        public IDisposable BeginScope<TState>(TState state)
-        {
-            return new DisposableScope();
-        }
-
-        private class DisposableScope : IDisposable
-        {
-            public void Dispose()
-            {
-            }
-        }
-    }
-}

MQTTnet.Core/Diagnostics/MqttNetTrace.cs

@@ -1,35 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using Microsoft.Extensions.Logging;
-
-namespace MQTTnet.Core.Diagnostics
-{
-    public class MqttNetTrace : ILoggerProvider
-    {
-        private readonly ConcurrentDictionary<string, MqttNetLogger> _loggers = new ConcurrentDictionary<string, MqttNetLogger>();
-
-        public static event EventHandler<MqttNetTraceMessagePublishedEventArgs> TraceMessagePublished;
-
-        public static bool HasListeners => TraceMessagePublished != null;
-
-        public void Publish(MqttNetTraceMessage traceMessage)
-        {
-            TraceMessagePublished?.Invoke(this, new MqttNetTraceMessagePublishedEventArgs(traceMessage));
-        }
-
-        public void Dispose()
-        {
-            TraceMessagePublished = null;
-        }
-
-        public ILogger CreateLogger(string categoryName)
-        {
-            return _loggers.GetOrAdd(categoryName, CreateLoggerImplementation);
-        }
-
-        private MqttNetLogger CreateLoggerImplementation(string categoryName)
-        {
-            return new MqttNetLogger(categoryName, this);
-        }
-    }
-}

MQTTnet.Core/Diagnostics/MqttNetTraceMessagePublishedEventArgs.cs

@@ -1,14 +0,0 @@
-using System;
-
-namespace MQTTnet.Core.Diagnostics
-{
-    public sealed class MqttNetTraceMessagePublishedEventArgs : EventArgs
-    {
-        public MqttNetTraceMessagePublishedEventArgs(MqttNetTraceMessage traceMessage)
-        {
-            TraceMessage = traceMessage ?? throw new ArgumentNullException(nameof(traceMessage));
-        }
-
-        public MqttNetTraceMessage TraceMessage { get; }
-    }
-}

MQTTnet.Core/Diagnostics/MqttTraceMessage.cs

@@ -1,30 +0,0 @@
-using System;
-using Microsoft.Extensions.Logging;
-
-namespace MQTTnet.Core.Diagnostics
-{
-    public sealed class MqttNetTraceMessage
-    {
-        public MqttNetTraceMessage(DateTime timestamp, int threadId, string source, LogLevel level, string message, Exception exception)
-        {
-            Timestamp = timestamp;
-            ThreadId = threadId;
-            Source = source;
-            Level = level;
-            Message = message;
-            Exception = exception;
-        }
-
-        public DateTime Timestamp { get; }
-
-        public int ThreadId { get; }
-
-        public string Source { get; }
-
-        public LogLevel Level { get; }
-
-        public string Message { get; }
-
-        public Exception Exception { get; }
-    }
-}

MQTTnet.Core/Exceptions/MqttCommunicationTimedOutException.cs

@@ -1,6 +0,0 @@
-namespace MQTTnet.Core.Exceptions
-{
-    public sealed class MqttCommunicationTimedOutException : MqttCommunicationException
-    {
-    }
-}

MQTTnet.Core/IApplicationMessagePublisher.cs

@@ -1,10 +0,0 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace MQTTnet.Core
-{
-    public interface IApplicationMessagePublisher
-    {
-        Task PublishAsync(IEnumerable<MqttApplicationMessage> applicationMessages);
-    }
-}

MQTTnet.Core/Internal/TaskExtensions.cs

@@ -1,74 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using MQTTnet.Core.Exceptions;
-
-namespace MQTTnet.Core.Internal
-{
-    public static class TaskExtensions
-    {
-        public static async Task TimeoutAfter(this Task task, TimeSpan timeout)
-        {
-            using (var cancellationTokenSource = new CancellationTokenSource())
-            {
-                try
-                {
-                    var timeoutTask = Task.Delay(timeout, cancellationTokenSource.Token);
-                    var finishedTask = await Task.WhenAny(timeoutTask, task).ConfigureAwait(false);
-
-                    if (finishedTask == timeoutTask)
-                    {
-                        throw new MqttCommunicationTimedOutException();
-                    }
-
-                    if (task.IsCanceled)
-                    {
-                        throw new TaskCanceledException();
-                    }
-
-                    if (task.IsFaulted)
-                    {
-                        throw new MqttCommunicationException(task.Exception.GetBaseException());
-                    }
-                }
-                finally
-                {
-                    cancellationTokenSource.Cancel();
-                }
-            }
-        }
-
-        public static async Task<TResult> TimeoutAfter<TResult>(this Task<TResult> task, TimeSpan timeout)
-        {
-            using (var cancellationTokenSource = new CancellationTokenSource())
-            {
-                try
-                {
-                    var timeoutTask = Task.Delay(timeout, cancellationTokenSource.Token);
-                    var finishedTask = await Task.WhenAny(timeoutTask, task).ConfigureAwait(false);
-
-                    if (finishedTask == timeoutTask)
-                    {
-                        throw new MqttCommunicationTimedOutException();
-                    }
-
-                    if (task.IsCanceled)
-                    {
-                        throw new TaskCanceledException();
-                    }
-
-                    if (task.IsFaulted)
-                    {
-                        throw new MqttCommunicationException(task.Exception.GetBaseException());
-                    }
-
-                    return task.Result;
-                }
-                finally
-                {
-                    cancellationTokenSource.Cancel();
-                }
-            }
-        }
-    }
-}

MQTTnet.Core/MQTTnet.Core.csproj

@@ -1,31 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard1.1</TargetFramework>
-    <AssemblyName>MQTTnet.Core</AssemblyName>
-    <RootNamespace>MQTTnet.Core</RootNamespace>
-    <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
-    <DebugType>Full</DebugType>
-    <Description></Description>
-    <Product></Product>
-    <Company></Company>
-    <Authors></Authors>
-    <Version>0.0.0.0</Version>
-    <PackageId></PackageId>
-    <Copyright></Copyright>
-    <PackageProjectUrl></PackageProjectUrl>
-    <PackageIconUrl></PackageIconUrl>
-    <RepositoryUrl></RepositoryUrl>
-    <PackageTags></PackageTags>
-    <FileVersion>2.5.0.0</FileVersion>
-    <AssemblyVersion>2.5.0.0</AssemblyVersion>
-    <PackageLicenseUrl></PackageLicenseUrl>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.1.2" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="1.1.2" />
-    <PackageReference Include="System.Threading" Version="4.3.0" />
-  </ItemGroup>
-
-</Project>

MQTTnet.Core/ManagedClient/IManagedMqttClient.cs

@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using MQTTnet.Core.Client;
-
-namespace MQTTnet.Core.ManagedClient
-{
-    public interface IManagedMqttClient : IApplicationMessageReceiver, IApplicationMessagePublisher
-    {
-        bool IsConnected { get; }
-
-        event EventHandler<MqttClientConnectedEventArgs> Connected;
-        event EventHandler<MqttClientDisconnectedEventArgs> Disconnected;
-
-        Task StartAsync(IManagedMqttClientOptions options);
-        Task StopAsync();
-
-        Task SubscribeAsync(IEnumerable<TopicFilter> topicFilters);
-        Task UnsubscribeAsync(IEnumerable<TopicFilter> topicFilters);
-    }
-}

MQTTnet.Core/ManagedClient/IManagedMqttClientStorage.cs

@@ -1,12 +0,0 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace MQTTnet.Core.ManagedClient
-{
-    public interface IManagedMqttClientStorage
-    {
-        Task SaveQueuedMessagesAsync(IList<MqttApplicationMessage> messages);
-
-        Task<IList<MqttApplicationMessage>> LoadQueuedMessagesAsync();
-    }
-}

MQTTnet.Core/ManagedClient/ManagedMqttClient.cs

@@ -1,303 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using MQTTnet.Core.Client;
-using MQTTnet.Core.Exceptions;
-using MQTTnet.Core.Protocol;
-using Microsoft.Extensions.Logging;
-
-namespace MQTTnet.Core.ManagedClient
-{
-    public class ManagedMqttClient : IManagedMqttClient
-    {
-        private readonly ManagedMqttClientStorageManager _storageManager = new ManagedMqttClientStorageManager();
-        private readonly BlockingCollection<MqttApplicationMessage> _messageQueue = new BlockingCollection<MqttApplicationMessage>();
-        private readonly HashSet<TopicFilter> _subscriptions = new HashSet<TopicFilter>();
-
-        private readonly IMqttClient _mqttClient;
-        private readonly ILogger<ManagedMqttClient> _logger;
-
-        private CancellationTokenSource _connectionCancellationToken;
-        private CancellationTokenSource _publishingCancellationToken;
-
-        private IManagedMqttClientOptions _options;
-        private bool _subscriptionsNotPushed;
-        
-        public ManagedMqttClient(ILogger<ManagedMqttClient> logger, IMqttClient mqttClient)
-        {
-            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-            _mqttClient = mqttClient ?? throw new ArgumentNullException(nameof(mqttClient));
-
-            _mqttClient.Connected += OnConnected;
-            _mqttClient.Disconnected += OnDisconnected;
-            _mqttClient.ApplicationMessageReceived += OnApplicationMessageReceived;
-        }
-
-        public bool IsConnected => _mqttClient.IsConnected;
-
-        public event EventHandler<MqttClientConnectedEventArgs> Connected;
-        public event EventHandler<MqttClientDisconnectedEventArgs> Disconnected;
-        public event EventHandler<MqttApplicationMessageReceivedEventArgs> ApplicationMessageReceived;
-
-        public async Task StartAsync(IManagedMqttClientOptions options)
-        {
-            if (options == null) throw new ArgumentNullException(nameof(options));
-            if (options.ClientOptions == null) throw new ArgumentException("The client options are not set.", nameof(options));
-
-            if (!options.ClientOptions.CleanSession)
-            {
-                throw new NotSupportedException("The managed client does not support existing sessions.");
-            }
-
-            if (_connectionCancellationToken != null)
-            {
-                throw new InvalidOperationException("The managed client is already started.");
-            }
-
-            _options = options;
-            await _storageManager.SetStorageAsync(_options.Storage).ConfigureAwait(false);
-
-            if (_options.Storage != null)
-            {
-                var loadedMessages = await _options.Storage.LoadQueuedMessagesAsync().ConfigureAwait(false);
-                foreach (var loadedMessage in loadedMessages)
-                {
-                    _messageQueue.Add(loadedMessage);    
-                }
-            }
-
-            _connectionCancellationToken = new CancellationTokenSource();
-            
-#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
-            Task.Factory.StartNew(() => MaintainConnectionAsync(_connectionCancellationToken.Token), _connectionCancellationToken.Token, TaskCreationOptions.LongRunning, TaskScheduler.Default).ConfigureAwait(false);
-#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
-
-            _logger.LogInformation("Started");
-        }
-
-        public Task StopAsync()
-        {
-            _connectionCancellationToken?.Cancel(false);
-            _connectionCancellationToken = null;
-
-            while (_messageQueue.Any())
-            {
-                _messageQueue.Take();
-            }
-
-            return Task.FromResult(0);
-        }
-
-        public async Task PublishAsync(IEnumerable<MqttApplicationMessage> applicationMessages)
-        {
-            if (applicationMessages == null) throw new ArgumentNullException(nameof(applicationMessages));
-
-            foreach (var applicationMessage in applicationMessages)
-            {
-                await _storageManager.AddAsync(applicationMessage).ConfigureAwait(false);
-                _messageQueue.Add(applicationMessage);
-            }
-        }
-
-        public Task SubscribeAsync(IEnumerable<TopicFilter> topicFilters)
-        {
-            if (topicFilters == null) throw new ArgumentNullException(nameof(topicFilters));
-
-            lock (_subscriptions)
-            {
-                foreach (var topicFilter in topicFilters)
-                {
-                    if (_subscriptions.Add(topicFilter))
-                    {
-                        _subscriptionsNotPushed = true;
-                    }
-                }
-            }
-
-            return Task.FromResult(0);
-        }
-
-        public Task UnsubscribeAsync(IEnumerable<TopicFilter> topicFilters)
-        {
-            lock (_subscriptions)
-            {
-                foreach (var topicFilter in topicFilters)
-                {
-                    if (_subscriptions.Remove(topicFilter))
-                    {
-                        _subscriptionsNotPushed = true;
-                    }
-                }
-            }
-
-            return Task.FromResult(0);
-        }
-
-        private async Task MaintainConnectionAsync(CancellationToken cancellationToken)
-        {
-            try
-            {
-                while (!cancellationToken.IsCancellationRequested)
-                {
-                    var connectionState = await ReconnectIfRequiredAsync().ConfigureAwait(false);
-                    if (connectionState == ReconnectionResult.NotConnected)
-                    {
-                        _publishingCancellationToken?.Cancel(false);
-                        _publishingCancellationToken = null;
-
-                        await Task.Delay(_options.AutoReconnectDelay, cancellationToken).ConfigureAwait(false);
-                        continue;
-                    }
-
-                    if (connectionState == ReconnectionResult.Reconnected || _subscriptionsNotPushed)
-                    {
-                        await PushSubscriptionsAsync();
-
-                        _publishingCancellationToken = new CancellationTokenSource();
-
-#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
-                        Task.Factory.StartNew(() => PublishQueuedMessagesAsync(_publishingCancellationToken.Token), _publishingCancellationToken.Token, TaskCreationOptions.LongRunning, TaskScheduler.Default).ConfigureAwait(false);
-#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
-
-                        continue;
-                    }
-
-                    if (connectionState == ReconnectionResult.StillConnected)
-                    {
-                        await Task.Delay(100, _connectionCancellationToken.Token).ConfigureAwait(false); // Consider using the _Disconnected_ event here. (TaskCompletionSource)
-                    }
-                }
-            }
-            catch (OperationCanceledException)
-            {
-            }
-            catch (MqttCommunicationException exception)
-            {
-                _logger.LogWarning(new EventId(), exception, "Communication exception while maintaining connection.");
-            }
-            catch (Exception exception)
-            {
-                _logger.LogError(new EventId(), exception, "Unhandled exception while maintaining connection.");
-            }
-            finally
-            {
-                await _mqttClient.DisconnectAsync().ConfigureAwait(false);
-                _logger.LogInformation("Stopped");
-            }
-        }
-
-        private async Task PublishQueuedMessagesAsync(CancellationToken cancellationToken)
-        {
-            try
-            {
-                while (!cancellationToken.IsCancellationRequested)
-                {
-                    var message = _messageQueue.Take(cancellationToken);
-                    if (message == null)
-                    {
-                        continue;
-                    }
-
-                    if (cancellationToken.IsCancellationRequested)
-                    {
-                        continue;
-                    }
-
-                    await TryPublishQueuedMessageAsync(message).ConfigureAwait(false);
-                    await _storageManager.RemoveAsync(message).ConfigureAwait(false);
-                }
-            }
-            catch (OperationCanceledException)
-            {
-            }
-            finally
-            {
-                _logger.LogInformation("Stopped publishing messages");
-            }
-        }
-
-        private async Task TryPublishQueuedMessageAsync(MqttApplicationMessage message)
-        {
-            try
-            {
-                await _mqttClient.PublishAsync(message).ConfigureAwait(false);
-            }
-            catch (MqttCommunicationException exception)
-            {
-                _logger.LogWarning(new EventId(), exception, "Publishing application message failed.");
-
-                if (message.QualityOfServiceLevel > MqttQualityOfServiceLevel.AtMostOnce)
-                {
-                    _messageQueue.Add(message);
-                }
-            }
-            catch (Exception exception)
-            {
-                _logger.LogError(new EventId(), exception, "Unhandled exception while publishing queued application message.");
-            }
-        }
-
-        private async Task PushSubscriptionsAsync()
-        {
-            _logger.LogInformation(nameof(ManagedMqttClient), "Synchronizing subscriptions");
-
-            List<TopicFilter> subscriptions;
-            lock (_subscriptions)
-            {
-                subscriptions = _subscriptions.ToList();
-                _subscriptionsNotPushed = false;
-            }
-
-            if (!_subscriptions.Any())
-            {
-                return;
-            }
-
-            try
-            {
-                await _mqttClient.SubscribeAsync(subscriptions).ConfigureAwait(false);
-            }
-            catch (Exception exception)
-            {
-                _logger.LogWarning(new EventId(), exception, "Synchronizing subscriptions failed");
-                _subscriptionsNotPushed = true;
-            }
-        }
-
-        private async Task<ReconnectionResult> ReconnectIfRequiredAsync()
-        {
-            if (_mqttClient.IsConnected)
-            {
-                return ReconnectionResult.StillConnected;
-            }
-
-            try
-            {
-                await _mqttClient.ConnectAsync(_options.ClientOptions).ConfigureAwait(false);
-                return ReconnectionResult.Reconnected;
-            }
-            catch (Exception)
-            {
-                return ReconnectionResult.NotConnected;
-            }
-        }
-
-        private void OnApplicationMessageReceived(object sender, MqttApplicationMessageReceivedEventArgs eventArgs)
-        {
-            ApplicationMessageReceived?.Invoke(this, eventArgs);
-        }
-
-        private void OnDisconnected(object sender, MqttClientDisconnectedEventArgs eventArgs)
-        {
-            Disconnected?.Invoke(this, eventArgs);
-        }
-
-        private void OnConnected(object sender, MqttClientConnectedEventArgs eventArgs)
-        {
-            Connected?.Invoke(this, eventArgs);
-        }
-    }
-}

MQTTnet.Core/ManagedClient/ManagedMqttClientExtensions.cs

@@ -1,22 +0,0 @@
-using System;
-using System.Threading.Tasks;
-
-namespace MQTTnet.Core.ManagedClient
-{
-    public static class ManagedMqttClientExtensions
-    {
-        public static Task SubscribeAsync(this IManagedMqttClient managedClient, params TopicFilter[] topicFilters)
-        {
-            if (managedClient == null) throw new ArgumentNullException(nameof(managedClient));
-
-            return managedClient.SubscribeAsync(topicFilters);
-        }
-
-        public static Task UnsubscribeAsync(this IManagedMqttClient managedClient, params TopicFilter[] topicFilters)
-        {
-            if (managedClient == null) throw new ArgumentNullException(nameof(managedClient));
-
-            return managedClient.UnsubscribeAsync(topicFilters);
-        }
-    }
-}

MQTTnet.Core/ManagedClient/ManagedMqttClientStorageManager.cs

@@ -1,75 +0,0 @@
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace MQTTnet.Core.ManagedClient
-{
-    public class ManagedMqttClientStorageManager
-    {
-        private readonly List<MqttApplicationMessage> _applicationMessages = new List<MqttApplicationMessage>();
-        private readonly SemaphoreSlim _semaphore = new SemaphoreSlim(1, 1);
-        private IManagedMqttClientStorage _storage;
-
-        public async Task SetStorageAsync(IManagedMqttClientStorage storage)
-        {
-            await _semaphore.WaitAsync().ConfigureAwait(false);
-            try
-            {
-                _storage = storage;
-            }
-            finally
-            {
-                _semaphore.Release();
-            }
-        }
-
-        public async Task AddAsync(MqttApplicationMessage applicationMessage)
-        {
-            await _semaphore.WaitAsync().ConfigureAwait(false);
-            try
-            {
-                if (_storage == null)
-                {
-                    return;
-                }
-
-                _applicationMessages.Add(applicationMessage);
-                await SaveAsync().ConfigureAwait(false);
-            }
-            finally
-            {
-                _semaphore.Release();
-            }
-        }
-
-        public async Task RemoveAsync(MqttApplicationMessage applicationMessage)
-        {
-            await _semaphore.WaitAsync().ConfigureAwait(false);
-            try
-            {
-                if (_storage == null)
-                {
-                    return;
-                }
-
-                var index = _applicationMessages.IndexOf(applicationMessage);
-                if (index == -1)
-                {
-                    return;
-                }
-
-                _applicationMessages.RemoveAt(index);
-                await SaveAsync().ConfigureAwait(false);
-            }
-            finally
-            {
-                _semaphore.Release();
-            }
-        }
-
-        private Task SaveAsync()
-        {
-            return _storage.SaveQueuedMessagesAsync(_applicationMessages);
-        }
-    }
-}

MQTTnet.Core/MqttApplicationMessage.cs

@@ -1,29 +0,0 @@
-using System;
-using MQTTnet.Core.Protocol;
-
-namespace MQTTnet.Core
-{
-    public sealed class MqttApplicationMessage
-    {
-        public MqttApplicationMessage()
-        {
-        }
-
-        [Obsolete("Use object initializer or _MqttApplicationMessageBuilder_ instead.")]
-        public MqttApplicationMessage(string topic, byte[] payload, MqttQualityOfServiceLevel qualityOfServiceLevel, bool retain)
-        {
-            Topic = topic ?? throw new ArgumentNullException(nameof(topic));
-            Payload = payload ?? throw new ArgumentNullException(nameof(payload));
-            QualityOfServiceLevel = qualityOfServiceLevel;
-            Retain = retain;
-        }
-
-        public string Topic { get; set; }
-
-        public byte[] Payload { get; set; }
-
-        public MqttQualityOfServiceLevel QualityOfServiceLevel { get; set; }
-
-        public bool Retain { get; set; }
-    }
-}

MQTTnet.Core/Packets/IMqttPacketWithIdentifier.cs

@@ -1,7 +0,0 @@
-namespace MQTTnet.Core.Packets
-{
-    public interface IMqttPacketWithIdentifier
-    {
-        ushort PacketIdentifier { get; set; }
-    }
-}

MQTTnet.Core/Packets/MqttConnAckPacket.cs

@@ -1,16 +0,0 @@
-using MQTTnet.Core.Protocol;
-
-namespace MQTTnet.Core.Packets
-{
-    public sealed class MqttConnAckPacket : MqttBasePacket
-    {
-        public bool IsSessionPresent { get; set; }
-
-        public MqttConnectReturnCode ConnectReturnCode { get; set; }
-
-        public override string ToString()
-        {
-            return nameof(MqttConnAckPacket) + ": [ConnectReturnCode=" + ConnectReturnCode + "] [IsSessionPresent=" + IsSessionPresent + "]";
-        }
-    }
-}

MQTTnet.Core/Packets/MqttDisconnectPacket.cs

@@ -1,6 +0,0 @@
-namespace MQTTnet.Core.Packets
-{
-    public sealed class MqttDisconnectPacket : MqttBasePacket
-    {
-    }
-}

MQTTnet.Core/Packets/MqttPacketExtensions.cs

@@ -1,26 +0,0 @@
-using System;
-
-namespace MQTTnet.Core.Packets
-{
-    public static class MqttPacketExtensions
-    {
-        public static TResponsePacket CreateResponse<TResponsePacket>(this MqttBasePacket packet)
-        {
-            if (packet == null) throw new ArgumentNullException(nameof(packet));
-
-            var responsePacket = Activator.CreateInstance<TResponsePacket>();
-
-            if (responsePacket is IMqttPacketWithIdentifier responsePacketWithIdentifier)
-            {
-                if (!(packet is IMqttPacketWithIdentifier requestPacketWithIdentifier))
-                {
-                    throw new InvalidOperationException("Response packet has PacketIdentifier but request packet does not.");
-                }
-
-                responsePacketWithIdentifier.PacketIdentifier = requestPacketWithIdentifier.PacketIdentifier;
-            }
-
-            return responsePacket;
-        }
-    }
-}

MQTTnet.Core/Packets/MqttPacketHeader.cs

@@ -1,13 +0,0 @@
-using MQTTnet.Core.Protocol;
-
-namespace MQTTnet.Core.Packets
-{
-    public class MqttPacketHeader
-    {
-        public MqttControlPacketType ControlPacketType { get; set; }
-
-        public byte FixedHeader { get; set; }
-
-        public int BodyLength { get; set; }
-    }
-}

MQTTnet.Core/Packets/MqttPingReqPacket.cs

@@ -1,10 +0,0 @@
-namespace MQTTnet.Core.Packets
-{
-    public sealed class MqttPingReqPacket : MqttBasePacket
-    {
-        public override string ToString()
-        {
-            return nameof(MqttPingReqPacket);
-        }
-    }
-}

MQTTnet.Core/Packets/MqttPingRespPacket.cs

@@ -1,10 +0,0 @@
-namespace MQTTnet.Core.Packets
-{
-    public sealed class MqttPingRespPacket : MqttBasePacket
-    {
-        public override string ToString()
-        {
-            return nameof(MqttPingRespPacket);
-        }
-    }
-}

MQTTnet.Core/Packets/MqttPubAckPacket.cs

@@ -1,6 +0,0 @@
-namespace MQTTnet.Core.Packets
-{
-    public sealed class MqttPubAckPacket : MqttBasePublishPacket
-    {
-    }
-}

MQTTnet.Core/Packets/MqttPubCompPacket.cs

@@ -1,6 +0,0 @@
-namespace MQTTnet.Core.Packets
-{
-    public sealed class MqttPubCompPacket : MqttBasePublishPacket
-    {
-    }
-}

MQTTnet.Core/Packets/MqttPubRecPacket.cs

@@ -1,6 +0,0 @@
-namespace MQTTnet.Core.Packets
-{
-    public sealed class MqttPubRecPacket : MqttBasePublishPacket
-    {
-    }
-}

MQTTnet.Core/Packets/MqttPubRelPacket.cs

@@ -1,6 +0,0 @@
-namespace MQTTnet.Core.Packets
-{
-    public sealed class MqttPubRelPacket : MqttBasePublishPacket
-    {
-    }
-}

MQTTnet.Core/Packets/MqttUnsubAckPacket.cs

@@ -1,7 +0,0 @@
-namespace MQTTnet.Core.Packets
-{
-    public sealed class MqttUnsubAckPacket : MqttBasePacket, IMqttPacketWithIdentifier
-    {
-        public ushort PacketIdentifier { get; set; }
-    }
-}

MQTTnet.Core/Packets/MqttUnsubscribe.cs

@@ -1,11 +0,0 @@
-using System.Collections.Generic;
-
-namespace MQTTnet.Core.Packets
-{
-    public sealed class MqttUnsubscribePacket : MqttBasePacket, IMqttPacketWithIdentifier
-    {
-        public ushort PacketIdentifier { get; set; }
-
-        public IList<string> TopicFilters { get; set; } = new List<string>();
-    }
-}

MQTTnet.Core/Serializer/ByteReader.cs

@@ -1,48 +0,0 @@
-using System;
-
-namespace MQTTnet.Core.Serializer
-{
-    public sealed class ByteReader
-    {
-        private readonly int _source;
-        private int _index;
-
-        public ByteReader(int source)
-        {
-            _source = source;
-        }
-
-        public bool Read()
-        {
-            if (_index >= 8)
-            {
-                throw new InvalidOperationException("End of byte reached.");
-            }
-
-            var result = ((1 << _index) & _source) > 0;
-            _index++;
-            return result;
-        }
-
-        public int Read(int count)
-        {
-            if (_index + count > 8)
-            {
-                throw new InvalidOperationException("End of byte will be reached.");
-            }
-
-            var result = 0;
-            for (var i = 0; i < count; i++)
-            {
-                if (((1 << _index) & _source) > 0)
-                {
-                    result |= 1 << i;
-                }
-
-                _index++;
-            }
-
-            return result;
-        }
-    }
-}

MQTTnet.Core/Serializer/ByteWriter.cs

@@ -1,36 +0,0 @@
-using System;
-
-namespace MQTTnet.Core.Serializer
-{
-    public sealed class ByteWriter
-    {
-        private int _index;
-        private int _byte;
-
-        public byte Value => (byte)_byte;
-
-        public void Write(int @byte, int count)
-        {
-            for (var i = 0; i < count; i++)
-            {
-                var value = ((1 << i) & @byte) > 0;
-                Write(value);
-            }
-        }
-
-        public void Write(bool bit)
-        {
-            if (_index >= 8)
-            {
-                throw new InvalidOperationException("End of the byte reached.");
-            }
-
-            if (bit)
-            {
-                _byte |= 1 << _index;
-            }
-
-            _index++;
-        }
-    }
-}

MQTTnet.Core/Serializer/MqttPacketReader.cs

@@ -1,109 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using MQTTnet.Core.Adapter;
-using MQTTnet.Core.Exceptions;
-using MQTTnet.Core.Protocol;
-using MQTTnet.Core.Packets;
-
-namespace MQTTnet.Core.Serializer
-{
-    public sealed class MqttPacketReader : BinaryReader
-    {
-        private readonly ReceivedMqttPacket _receivedMqttPacket;
-
-        public MqttPacketReader(ReceivedMqttPacket receivedMqttPacket)
-            : base(receivedMqttPacket.Body, Encoding.UTF8, true)
-        {
-            _receivedMqttPacket = receivedMqttPacket;
-        }
-
-        public bool EndOfRemainingData => BaseStream.Position == _receivedMqttPacket.Header.BodyLength;
-
-        public static MqttPacketHeader ReadHeaderFromSource(Stream stream, CancellationToken cancellationToken)
-        {
-            var buffer = stream.ReadByte();
-            if (buffer == -1)
-            {
-                return null;
-            }
-
-            var fixedHeader = (byte)buffer;
-            var controlPacketType = (MqttControlPacketType)(fixedHeader >> 4);
-            var bodyLength = ReadBodyLengthFromSource(stream, cancellationToken);
-
-            return new MqttPacketHeader
-            {
-                FixedHeader = fixedHeader,
-                ControlPacketType = controlPacketType,
-                BodyLength = bodyLength
-            };
-        }
-
-        public override ushort ReadUInt16()
-        {
-            var buffer = ReadBytes(2);
-
-            var temp = buffer[0];
-            buffer[0] = buffer[1];
-            buffer[1] = temp;
-
-            return BitConverter.ToUInt16(buffer, 0);
-        }
-
-        public string ReadStringWithLengthPrefix()
-        {
-            var buffer = ReadWithLengthPrefix();
-            return Encoding.UTF8.GetString(buffer, 0, buffer.Length);
-        }
-
-        public byte[] ReadWithLengthPrefix()
-        {
-            var length = ReadUInt16();
-            return ReadBytes(length);
-        }
-
-        public byte[] ReadRemainingData()
-        {
-            return ReadBytes(_receivedMqttPacket.Header.BodyLength - (int)BaseStream.Position);
-        }
-
-        private static int ReadBodyLengthFromSource(Stream stream, CancellationToken cancellationToken)
-        {
-            // Alorithm taken from http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html.
-            var multiplier = 1;
-            var value = 0;
-            byte encodedByte;
-
-            var readBytes = new List<int>();
-            do
-            {
-                if (cancellationToken.IsCancellationRequested)
-                {
-                    throw new TaskCanceledException();
-                }
-
-                var buffer = stream.ReadByte();
-                readBytes.Add(buffer);
-
-                if (buffer == -1)
-                {
-                    break;
-                }
-
-                encodedByte = (byte)buffer;
-                value += (byte)(encodedByte & 127) * multiplier;
-                multiplier *= 128;
-                if (multiplier > 128 * 128 * 128)
-                {
-                    throw new MqttProtocolViolationException($"Remaining length is invalid (Data={string.Join(",", readBytes)}).");
-                }
-            } while ((encodedByte & 128) != 0);
-
-            return value;
-        }
-    }
-}

MQTTnet.Core/Serializer/MqttPacketSerializer.cs

@@ -1,514 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using MQTTnet.Core.Adapter;
-using MQTTnet.Core.Exceptions;
-using MQTTnet.Core.Packets;
-using MQTTnet.Core.Protocol;
-
-namespace MQTTnet.Core.Serializer
-{
-    public sealed class MqttPacketSerializer : IMqttPacketSerializer
-    {
-        private static byte[] ProtocolVersionV311Name { get; } = Encoding.UTF8.GetBytes("MQTT");
-        private static byte[] ProtocolVersionV310Name { get; } = Encoding.UTF8.GetBytes("MQIs");
-
-        public MqttProtocolVersion ProtocolVersion { get; set; } = MqttProtocolVersion.V311;
-
-        public byte[] Serialize(MqttBasePacket packet)
-        {
-            if (packet == null) throw new ArgumentNullException(nameof(packet));
-
-            using (var stream = new MemoryStream())
-            using (var writer = new MqttPacketWriter(stream))
-            {
-                var fixedHeader = SerializePacket(packet, writer);
-                var headerBuffer = new List<byte> { fixedHeader };
-                MqttPacketWriter.WriteRemainingLength((int)stream.Length, headerBuffer);
-
-                var header = headerBuffer.ToArray();
-                var body = stream.ToArray();
-
-                var buffer = new byte[header.Length + body.Length];
-                Buffer.BlockCopy(header, 0, buffer, 0, header.Length);
-                Buffer.BlockCopy(body, 0, buffer, header.Length, body.Length);
-
-                return buffer;
-            }
-        }
-
-        public MqttBasePacket Deserialize(ReceivedMqttPacket receivedMqttPacket)
-        {
-            if (receivedMqttPacket == null) throw new ArgumentNullException(nameof(receivedMqttPacket));
-
-            using (var reader = new MqttPacketReader(receivedMqttPacket))
-            {
-                return Deserialize(receivedMqttPacket.Header, reader);
-            }
-        }
-
-        private byte SerializePacket(MqttBasePacket packet, MqttPacketWriter writer)
-        {
-            switch (packet)
-            {
-                case MqttConnectPacket connectPacket: return Serialize(connectPacket, writer);
-                case MqttConnAckPacket connAckPacket: return Serialize(connAckPacket, writer);
-                case MqttDisconnectPacket _: return SerializeEmptyPacket(MqttControlPacketType.Disconnect);
-                case MqttPingReqPacket _: return SerializeEmptyPacket(MqttControlPacketType.PingReq);
-                case MqttPingRespPacket _: return SerializeEmptyPacket(MqttControlPacketType.PingResp);
-                case MqttPublishPacket publishPacket: return Serialize(publishPacket, writer);
-                case MqttPubAckPacket pubAckPacket: return Serialize(pubAckPacket, writer);
-                case MqttPubRecPacket pubRecPacket: return Serialize(pubRecPacket, writer);
-                case MqttPubRelPacket pubRelPacket: return Serialize(pubRelPacket, writer);
-                case MqttPubCompPacket pubCompPacket: return Serialize(pubCompPacket, writer);
-                case MqttSubscribePacket subscribePacket: return Serialize(subscribePacket, writer);
-                case MqttSubAckPacket subAckPacket: return Serialize(subAckPacket, writer);
-                case MqttUnsubscribePacket unsubscribePacket: return Serialize(unsubscribePacket, writer);
-                case MqttUnsubAckPacket unsubAckPacket: return Serialize(unsubAckPacket, writer);
-                default: throw new MqttProtocolViolationException("Packet type invalid.");
-            }
-        }
-
-        private static MqttBasePacket Deserialize(MqttPacketHeader header, MqttPacketReader reader)
-        {
-            switch (header.ControlPacketType)
-            {
-                case MqttControlPacketType.Connect: return DeserializeConnect(reader);
-                case MqttControlPacketType.ConnAck: return DeserializeConnAck(reader);
-                case MqttControlPacketType.Disconnect: return new MqttDisconnectPacket();
-                case MqttControlPacketType.Publish: return DeserializePublish(reader, header);
-                case MqttControlPacketType.PubAck: return DeserializePubAck(reader);
-                case MqttControlPacketType.PubRec: return DeserializePubRec(reader);
-                case MqttControlPacketType.PubRel: return DeserializePubRel(reader);
-                case MqttControlPacketType.PubComp: return DeserializePubComp(reader);
-                case MqttControlPacketType.PingReq: return new MqttPingReqPacket();
-                case MqttControlPacketType.PingResp: return new MqttPingRespPacket();
-                case MqttControlPacketType.Subscribe: return DeserializeSubscribe(reader);
-                case MqttControlPacketType.SubAck: return DeserializeSubAck(reader);
-                case MqttControlPacketType.Unsubscibe: return DeserializeUnsubscribe(reader);
-                case MqttControlPacketType.UnsubAck: return DeserializeUnsubAck(reader);
-                default: throw new MqttProtocolViolationException($"Packet type ({(int)header.ControlPacketType}) not supported.");
-            }
-        }
-
-        private static MqttBasePacket DeserializeUnsubAck(MqttPacketReader reader)
-        {
-            return new MqttUnsubAckPacket
-            {
-                PacketIdentifier = reader.ReadUInt16()
-            };
-        }
-
-        private static MqttBasePacket DeserializePubComp(MqttPacketReader reader)
-        {
-            return new MqttPubCompPacket
-            {
-                PacketIdentifier = reader.ReadUInt16()
-            };
-        }
-
-        private static MqttBasePacket DeserializePubRel(MqttPacketReader reader)
-        {
-            return new MqttPubRelPacket
-            {
-                PacketIdentifier = reader.ReadUInt16()
-            };
-        }
-
-        private static MqttBasePacket DeserializePubRec(MqttPacketReader reader)
-        {
-            return new MqttPubRecPacket
-            {
-                PacketIdentifier = reader.ReadUInt16()
-            };
-        }
-
-        private static MqttBasePacket DeserializePubAck(MqttPacketReader reader)
-        {
-            return new MqttPubAckPacket
-            {
-                PacketIdentifier = reader.ReadUInt16()
-            };
-        }
-
-        private static MqttBasePacket DeserializeUnsubscribe(MqttPacketReader reader)
-        {
-            var packet = new MqttUnsubscribePacket
-            {
-                PacketIdentifier = reader.ReadUInt16(),
-            };
-
-            while (!reader.EndOfRemainingData)
-            {
-                packet.TopicFilters.Add(reader.ReadStringWithLengthPrefix());
-            }
-
-            return packet;
-        }
-
-        private static MqttBasePacket DeserializeSubscribe(MqttPacketReader reader)
-        {
-            var packet = new MqttSubscribePacket
-            {
-                PacketIdentifier = reader.ReadUInt16()
-            };
-
-            while (!reader.EndOfRemainingData)
-            {
-                packet.TopicFilters.Add(new TopicFilter(
-                    reader.ReadStringWithLengthPrefix(),
-                    (MqttQualityOfServiceLevel)reader.ReadByte()));
-            }
-
-            return packet;
-        }
-
-        private static MqttBasePacket DeserializePublish(MqttPacketReader reader, MqttPacketHeader mqttPacketHeader)
-        {
-            var fixedHeader = new ByteReader(mqttPacketHeader.FixedHeader);
-            var retain = fixedHeader.Read();
-            var qualityOfServiceLevel = (MqttQualityOfServiceLevel)fixedHeader.Read(2);
-            var dup = fixedHeader.Read();
-
-            var topic = reader.ReadStringWithLengthPrefix();
-
-            ushort packetIdentifier = 0;
-            if (qualityOfServiceLevel > MqttQualityOfServiceLevel.AtMostOnce)
-            {
-                packetIdentifier = reader.ReadUInt16();
-            }
-
-            var packet = new MqttPublishPacket
-            {
-                Retain = retain,
-                QualityOfServiceLevel = qualityOfServiceLevel,
-                Dup = dup,
-                Topic = topic,
-                Payload = reader.ReadRemainingData(),
-                PacketIdentifier = packetIdentifier
-            };
-
-            return packet;
-        }
-
-        private static MqttBasePacket DeserializeConnect(MqttPacketReader reader)
-        {
-            reader.ReadBytes(2); // Skip 2 bytes
-
-            MqttProtocolVersion protocolVersion;
-            var protocolName = reader.ReadBytes(4);
-            if (protocolName.SequenceEqual(ProtocolVersionV310Name))
-            {
-                reader.ReadBytes(2);
-                protocolVersion = MqttProtocolVersion.V310;
-            }
-            else if (protocolName.SequenceEqual(ProtocolVersionV311Name))
-            {
-                protocolVersion = MqttProtocolVersion.V311;
-            }
-            else
-            {
-                throw new MqttProtocolViolationException("Protocol name is not supported.");
-            }
-
-            reader.ReadByte(); // Skip protocol level
-            var connectFlags = reader.ReadByte();
-
-            var connectFlagsReader = new ByteReader(connectFlags);
-            connectFlagsReader.Read(); // Reserved.
-
-            var packet = new MqttConnectPacket
-            {
-                ProtocolVersion = protocolVersion,
-                CleanSession = connectFlagsReader.Read()
-            };
-
-            var willFlag = connectFlagsReader.Read();
-            var willQoS = connectFlagsReader.Read(2);
-            var willRetain = connectFlagsReader.Read();
-            var passwordFlag = connectFlagsReader.Read();
-            var usernameFlag = connectFlagsReader.Read();
-
-            packet.KeepAlivePeriod = reader.ReadUInt16();
-            packet.ClientId = reader.ReadStringWithLengthPrefix();
-
-            if (willFlag)
-            {
-                packet.WillMessage = new MqttApplicationMessage
-                {
-                    Topic = reader.ReadStringWithLengthPrefix(),
-                    Payload = reader.ReadWithLengthPrefix(),
-                    QualityOfServiceLevel = (MqttQualityOfServiceLevel)willQoS,
-                    Retain = willRetain
-                };
-            }
-
-            if (usernameFlag)
-            {
-                packet.Username = reader.ReadStringWithLengthPrefix();
-            }
-
-            if (passwordFlag)
-            {
-                packet.Password = reader.ReadStringWithLengthPrefix();
-            }
-
-            ValidateConnectPacket(packet);
-            return packet;
-        }
-
-        private static MqttBasePacket DeserializeSubAck(MqttPacketReader reader)
-        {
-            var packet = new MqttSubAckPacket
-            {
-                PacketIdentifier = reader.ReadUInt16()
-            };
-
-            while (!reader.EndOfRemainingData)
-            {
-                packet.SubscribeReturnCodes.Add((MqttSubscribeReturnCode)reader.ReadByte());
-            }
-
-            return packet;
-        }
-
-        private static MqttBasePacket DeserializeConnAck(MqttPacketReader reader)
-        {
-            var variableHeader1 = reader.ReadByte();
-            var variableHeader2 = reader.ReadByte();
-
-            var packet = new MqttConnAckPacket
-            {
-                IsSessionPresent = new ByteReader(variableHeader1).Read(),
-                ConnectReturnCode = (MqttConnectReturnCode)variableHeader2
-            };
-
-            return packet;
-        }
-
-        private static void ValidateConnectPacket(MqttConnectPacket packet)
-        {
-            if (packet == null) throw new ArgumentNullException(nameof(packet));
-
-            if (string.IsNullOrEmpty(packet.ClientId) && !packet.CleanSession)
-            {
-                throw new MqttProtocolViolationException("CleanSession must be set if ClientId is empty [MQTT-3.1.3-7].");
-            }
-        }
-
-        private static void ValidatePublishPacket(MqttPublishPacket packet)
-        {
-            if (packet == null) throw new ArgumentNullException(nameof(packet));
-
-            if (packet.QualityOfServiceLevel == 0 && packet.Dup)
-            {
-                throw new MqttProtocolViolationException("Dup flag must be false for QoS 0 packets [MQTT-3.3.1-2].");
-            }
-        }
-
-        private byte Serialize(MqttConnectPacket packet, MqttPacketWriter writer)
-        {
-            ValidateConnectPacket(packet);
-
-            // Write variable header
-            writer.Write(0x00, 0x04); // 3.1.2.1 Protocol Name
-            if (ProtocolVersion == MqttProtocolVersion.V311)
-            {
-                writer.Write(ProtocolVersionV311Name);
-                writer.Write(0x04); // 3.1.2.2 Protocol Level (4)
-            }
-            else
-            {
-                writer.Write(ProtocolVersionV310Name);
-                writer.Write(0x64, 0x70, 0x03); // Protocol Level (0x03)
-            }
-
-            var connectFlags = new ByteWriter(); // 3.1.2.3 Connect Flags
-            connectFlags.Write(false); // Reserved
-            connectFlags.Write(packet.CleanSession);
-            connectFlags.Write(packet.WillMessage != null);
-
-            if (packet.WillMessage != null)
-            {
-                connectFlags.Write((int)packet.WillMessage.QualityOfServiceLevel, 2);
-                connectFlags.Write(packet.WillMessage.Retain);
-            }
-            else
-            {
-                connectFlags.Write(0, 2);
-                connectFlags.Write(false);
-            }
-
-            connectFlags.Write(packet.Password != null);
-            connectFlags.Write(packet.Username != null);
-
-            writer.Write(connectFlags);
-            writer.Write(packet.KeepAlivePeriod);
-            writer.WriteWithLengthPrefix(packet.ClientId);
-
-            if (packet.WillMessage != null)
-            {
-                writer.WriteWithLengthPrefix(packet.WillMessage.Topic);
-                writer.WriteWithLengthPrefix(packet.WillMessage.Payload);
-            }
-
-            if (packet.Username != null)
-            {
-                writer.WriteWithLengthPrefix(packet.Username);
-            }
-
-            if (packet.Password != null)
-            {
-                writer.WriteWithLengthPrefix(packet.Password);
-            }
-
-            return MqttPacketWriter.BuildFixedHeader(MqttControlPacketType.Connect);
-        }
-
-        private byte Serialize(MqttConnAckPacket packet, MqttPacketWriter writer)
-        {
-            var connectAcknowledgeFlags = new ByteWriter();
-
-            if (ProtocolVersion == MqttProtocolVersion.V311)
-            {
-                connectAcknowledgeFlags.Write(packet.IsSessionPresent);
-            }
-
-            writer.Write(connectAcknowledgeFlags);
-            writer.Write((byte)packet.ConnectReturnCode);
-
-            return MqttPacketWriter.BuildFixedHeader(MqttControlPacketType.ConnAck);
-        }
-
-        private static byte Serialize(MqttPubRelPacket packet, MqttPacketWriter writer)
-        {
-            writer.Write(packet.PacketIdentifier);
-
-            return MqttPacketWriter.BuildFixedHeader(MqttControlPacketType.PubRel, 0x02);
-        }
-
-        private static byte Serialize(MqttPublishPacket packet, MqttPacketWriter writer)
-        {
-            ValidatePublishPacket(packet);
-
-            writer.WriteWithLengthPrefix(packet.Topic);
-
-            if (packet.QualityOfServiceLevel > MqttQualityOfServiceLevel.AtMostOnce)
-            {
-                writer.Write(packet.PacketIdentifier);
-            }
-            else
-            {
-                if (packet.PacketIdentifier > 0)
-                {
-                    throw new MqttProtocolViolationException("Packet identifier must be empty if QoS == 0 [MQTT-2.3.1-5].");
-                }
-            }
-
-            if (packet.Payload?.Length > 0)
-            {
-                writer.Write(packet.Payload);
-            }
-
-            byte fixedHeader = 0;
-
-            if (packet.Retain)
-            {
-                fixedHeader |= 0x01;
-            }
-
-            fixedHeader |= (byte)((byte)packet.QualityOfServiceLevel << 1);
-
-            if (packet.Dup)
-            {
-                fixedHeader |= 0x08;
-            }
-
-            return MqttPacketWriter.BuildFixedHeader(MqttControlPacketType.Publish, fixedHeader);
-        }
-
-        private static byte Serialize(MqttPubAckPacket packet, MqttPacketWriter writer)
-        {
-            writer.Write(packet.PacketIdentifier);
-
-            return MqttPacketWriter.BuildFixedHeader(MqttControlPacketType.PubAck);
-        }
-
-        private static byte Serialize(MqttPubRecPacket packet, MqttPacketWriter writer)
-        {
-            writer.Write(packet.PacketIdentifier);
-
-            return MqttPacketWriter.BuildFixedHeader(MqttControlPacketType.PubRec);
-        }
-
-        private static byte Serialize(MqttPubCompPacket packet, MqttPacketWriter writer)
-        {
-            writer.Write(packet.PacketIdentifier);
-
-            return MqttPacketWriter.BuildFixedHeader(MqttControlPacketType.PubComp);
-        }
-
-        private static byte Serialize(MqttSubscribePacket packet, MqttPacketWriter writer)
-        {
-            if (!packet.TopicFilters.Any()) throw new MqttProtocolViolationException("At least one topic filter must be set [MQTT-3.8.3-3].");
-
-            writer.Write(packet.PacketIdentifier);
-
-            if (packet.TopicFilters?.Count > 0)
-            {
-                foreach (var topicFilter in packet.TopicFilters)
-                {
-                    writer.WriteWithLengthPrefix(topicFilter.Topic);
-                    writer.Write((byte)topicFilter.QualityOfServiceLevel);
-                }
-            }
-
-            return MqttPacketWriter.BuildFixedHeader(MqttControlPacketType.Subscribe, 0x02);
-        }
-
-        private static byte Serialize(MqttSubAckPacket packet, MqttPacketWriter writer)
-        {
-            writer.Write(packet.PacketIdentifier);
-
-            if (packet.SubscribeReturnCodes?.Any() == true)
-            {
-                foreach (var packetSubscribeReturnCode in packet.SubscribeReturnCodes)
-                {
-                    writer.Write((byte)packetSubscribeReturnCode);
-                }
-            }
-
-            return MqttPacketWriter.BuildFixedHeader(MqttControlPacketType.SubAck);
-        }
-
-        private static byte Serialize(MqttUnsubscribePacket packet, MqttPacketWriter writer)
-        {
-            if (!packet.TopicFilters.Any()) throw new MqttProtocolViolationException("At least one topic filter must be set [MQTT-3.10.3-2].");
-
-            writer.Write(packet.PacketIdentifier);
-
-            if (packet.TopicFilters?.Any() == true)
-            {
-                foreach (var topicFilter in packet.TopicFilters)
-                {
-                    writer.WriteWithLengthPrefix(topicFilter);
-                }
-            }
-
-            return MqttPacketWriter.BuildFixedHeader(MqttControlPacketType.Unsubscibe, 0x02);
-        }
-
-        private static byte Serialize(IMqttPacketWithIdentifier packet, BinaryWriter writer)
-        {
-            writer.Write(packet.PacketIdentifier);
-            return MqttPacketWriter.BuildFixedHeader(MqttControlPacketType.UnsubAck);
-        }
-
-        private static byte SerializeEmptyPacket(MqttControlPacketType type)
-        {
-            return MqttPacketWriter.BuildFixedHeader(type);
-        }
-    }
-}

MQTTnet.Core/Serializer/MqttPacketWriter.cs

@@ -1,82 +0,0 @@
-using System;
-using System.IO;
-using System.Text;
-using MQTTnet.Core.Protocol;
-using System.Collections.Generic;
-
-namespace MQTTnet.Core.Serializer
-{
-    public sealed class MqttPacketWriter : BinaryWriter
-    {
-        public MqttPacketWriter(Stream stream)
-            : base(stream, Encoding.UTF8, true)
-        {
-        }
-
-        public static byte BuildFixedHeader(MqttControlPacketType packetType, byte flags = 0)
-        {
-            var fixedHeader = (int)packetType << 4;
-            fixedHeader |= flags;
-            return (byte)fixedHeader;
-        }
-
-        public override void Write(ushort value)
-        {
-            var buffer = BitConverter.GetBytes(value);
-            Write(buffer[1], buffer[0]);
-        }
-
-        public new void Write(params byte[] values)
-        {
-            base.Write(values);
-        }
-
-        public new void Write(byte value)
-        {
-            base.Write(value);
-        }
-
-        public void Write(ByteWriter value)
-        {
-            if (value == null) throw new ArgumentNullException(nameof(value));
-
-            Write(value.Value);
-        }
-
-        public void WriteWithLengthPrefix(string value)
-        {
-            WriteWithLengthPrefix(Encoding.UTF8.GetBytes(value ?? string.Empty));
-        }
-
-        public void WriteWithLengthPrefix(byte[] value)
-        {
-            var length = (ushort)value.Length;
-
-            Write(length);
-            Write(value);
-        }
-
-        public static void WriteRemainingLength(int length, List<byte> target)
-        {
-            if (length == 0)
-            {
-                target.Add(0);
-                return;
-            }
-
-            // Alorithm taken from http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html.
-            var x = length;
-            do
-            {
-                var encodedByte = x % 128;
-                x = x / 128;
-                if (x > 0)
-                {
-                    encodedByte = encodedByte | 128;
-                }
-
-                target.Add((byte)encodedByte);
-            } while (x > 0);
-        }
-    }
-}

MQTTnet.Core/Server/ConnectedMqttClient.cs

@@ -1,11 +0,0 @@
-using MQTTnet.Core.Serializer;
-
-namespace MQTTnet.Core.Server
-{
-    public class ConnectedMqttClient
-    {
-        public string ClientId { get; set; }
-
-        public MqttProtocolVersion ProtocolVersion { get; set; }
-    }
-}

MQTTnet.Core/Server/IMqttClientRetainedMessageManager.cs

@@ -1,15 +0,0 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using MQTTnet.Core.Packets;
-
-namespace MQTTnet.Core.Server
-{
-    public interface IMqttClientRetainedMessageManager
-    {
-        Task LoadMessagesAsync();
-
-        Task HandleMessageAsync(string clientId, MqttApplicationMessage applicationMessage);
-
-        Task<List<MqttApplicationMessage>> GetSubscribedMessagesAsync(MqttSubscribePacket subscribePacket);
-    }
-}

MQTTnet.Core/Server/IMqttClientSesssionFactory.cs

@@ -1,7 +0,0 @@
-namespace MQTTnet.Core.Server
-{
-    public interface IMqttClientSesssionFactory
-    {
-        MqttClientSession CreateClientSession(string sessionId, MqttClientSessionsManager mqttClientSessionsManager);
-    }
-}

MQTTnet.Core/Server/IMqttServer.cs

@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace MQTTnet.Core.Server
-{
-    public interface IMqttServer : IApplicationMessageReceiver, IApplicationMessagePublisher
-    {
-        event EventHandler<MqttClientConnectedEventArgs> ClientConnected;
-        event EventHandler<MqttClientDisconnectedEventArgs> ClientDisconnected;
-        event EventHandler<MqttServerStartedEventArgs> Started;
-
-        IList<ConnectedMqttClient> GetConnectedClients();
-        void Publish(IEnumerable<MqttApplicationMessage> applicationMessages);
-
-        Task StartAsync();
-        Task StopAsync();
-    }
-}

MQTTnet.Core/Server/IMqttServerFactory.cs

@@ -1,11 +0,0 @@
-using System;
-
-namespace MQTTnet.Core.Server
-{
-    public interface IMqttServerFactory
-    {
-        IMqttServer CreateMqttServer();
-
-        IMqttServer CreateMqttServer(Action<MqttServerOptions> configure);
-    }
-}

MQTTnet.Core/Server/MqttApplicationMessageInterceptorContext.cs

@@ -1,7 +0,0 @@
-namespace MQTTnet.Core.Server
-{
-    public class MqttApplicationMessageInterceptorContext
-    {
-        public MqttApplicationMessage ApplicationMessage { get; set; }
-    }
-}

MQTTnet.Core/Server/MqttClientConnectedEventArgs.cs

@@ -1,14 +0,0 @@
-using System;
-
-namespace MQTTnet.Core.Server
-{
-    public class MqttClientConnectedEventArgs : EventArgs
-    {
-        public MqttClientConnectedEventArgs(ConnectedMqttClient client)
-        {
-            Client = client ?? throw new ArgumentNullException(nameof(client));
-        }
-
-        public ConnectedMqttClient Client { get; }
-    }
-}

MQTTnet.Core/Server/MqttClientDisconnectedEventArgs.cs

@@ -1,14 +0,0 @@
-using System;
-
-namespace MQTTnet.Core.Server
-{
-    public class MqttClientDisconnectedEventArgs : EventArgs
-    {
-        public MqttClientDisconnectedEventArgs(ConnectedMqttClient client)
-        {
-            Client = client ?? throw new ArgumentNullException(nameof(client));
-        }
-        
-        public ConnectedMqttClient Client { get; }
-    }
-}

MQTTnet.Core/Server/MqttClientPendingMessagesQueue.cs

@@ -1,103 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Threading;
-using System.Threading.Tasks;
-using MQTTnet.Core.Adapter;
-using MQTTnet.Core.Exceptions;
-using MQTTnet.Core.Packets;
-using MQTTnet.Core.Protocol;
-using Microsoft.Extensions.Logging;
-
-namespace MQTTnet.Core.Server
-{
-    public sealed class MqttClientPendingMessagesQueue
-    {
-        private readonly BlockingCollection<MqttPublishPacket> _pendingPublishPackets = new BlockingCollection<MqttPublishPacket>();
-        private readonly MqttServerOptions _options;
-        private readonly MqttClientSession _session;
-        private readonly ILogger<MqttClientPendingMessagesQueue> _logger;
-
-        public MqttClientPendingMessagesQueue(MqttServerOptions options, MqttClientSession session, ILogger<MqttClientPendingMessagesQueue> logger)
-        {
-            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-            _session = session ?? throw new ArgumentNullException(nameof(session));
-            _options = options ?? throw new ArgumentNullException(nameof(options));
-        }
-
-        public void Start(IMqttCommunicationAdapter adapter, CancellationToken cancellationToken)
-        {
-            if (adapter == null) throw new ArgumentNullException(nameof(adapter));
-
-            if (cancellationToken.IsCancellationRequested)
-            {
-                return;
-            }
-
-            Task.Run(async () => await SendPendingPublishPacketsAsync(adapter, cancellationToken), cancellationToken).ConfigureAwait(false);
-        }
-
-        public void Enqueue(MqttPublishPacket publishPacket)
-        {
-            if (publishPacket == null) throw new ArgumentNullException(nameof(publishPacket));
-
-            _pendingPublishPackets.Add(publishPacket);
-            _logger.LogTrace("Enqueued packet (ClientId: {0}).", _session.ClientId);
-        }
-
-        private async Task SendPendingPublishPacketsAsync(IMqttCommunicationAdapter adapter, CancellationToken cancellationToken)
-        {
-            try
-            {
-                while (!cancellationToken.IsCancellationRequested)
-                {
-                    await SendPendingPublishPacketAsync(adapter, cancellationToken);
-                }
-            }
-            catch (OperationCanceledException)
-            {
-            }
-            catch (Exception exception)
-            {
-                _logger.LogError(new EventId(), exception, "Unhandled exception while sending enqueued packet (ClientId: {0}).", _session.ClientId);
-            }
-        }
-
-        private async Task SendPendingPublishPacketAsync(IMqttCommunicationAdapter adapter, CancellationToken cancellationToken)
-        {
-            MqttPublishPacket packet = null;
-            try
-            {
-                packet = _pendingPublishPackets.Take(cancellationToken);
-                await adapter.SendPacketsAsync(_options.DefaultCommunicationTimeout, cancellationToken, packet).ConfigureAwait(false);
-
-                _logger.LogTrace("Enqueued packet sent (ClientId: {0}).", _session.ClientId);
-            }
-            catch (Exception exception)
-            {
-                if (exception is MqttCommunicationTimedOutException)
-                {
-                    _logger.LogWarning(new EventId(), exception, "Sending publish packet failed due to timeout (ClientId: {0}).", _session.ClientId);
-                }
-                else if (exception is MqttCommunicationException)
-                {
-                    _logger.LogWarning(new EventId(), exception, "Sending publish packet failed due to communication exception (ClientId: {0}).", _session.ClientId);
-                }
-                else if (exception is OperationCanceledException)
-                {
-                }
-                else
-                {
-                    _logger.LogError(new EventId(), exception, "Sending publish packet failed (ClientId: {0}).", _session.ClientId);
-                }
-
-                if (packet != null && packet.QualityOfServiceLevel > MqttQualityOfServiceLevel.AtMostOnce)
-                {
-                    packet.Dup = true;
-                    _pendingPublishPackets.Add(packet, CancellationToken.None);
-                }
-
-                _session.Stop();
-            }
-        }
-    }
-}

MQTTnet.Core/Server/MqttClientRetainedMessagesManager.cs

@@ -1,141 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using MQTTnet.Core.Packets;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-
-namespace MQTTnet.Core.Server
-{
-    public sealed class MqttClientRetainedMessagesManager : IMqttClientRetainedMessageManager
-    {
-        private readonly Dictionary<string, MqttApplicationMessage> _retainedMessages = new Dictionary<string, MqttApplicationMessage>();
-        private readonly SemaphoreSlim _gate = new SemaphoreSlim(1, 1);
-        private readonly ILogger<MqttClientRetainedMessagesManager> _logger;
-        private readonly MqttServerOptions _options;
-
-        public MqttClientRetainedMessagesManager(IOptions<MqttServerOptions> options, ILogger<MqttClientRetainedMessagesManager> logger)
-        {
-            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-            _options = options.Value ?? throw new ArgumentNullException(nameof(options));
-        }
-
-        public async Task LoadMessagesAsync()
-        {
-            if (_options.Storage == null)
-            {
-                return;
-            }
-
-            await _gate.WaitAsync();
-            try
-            {
-                var retainedMessages = await _options.Storage.LoadRetainedMessagesAsync();
-
-                _retainedMessages.Clear();
-                foreach (var retainedMessage in retainedMessages)
-                {
-                    _retainedMessages[retainedMessage.Topic] = retainedMessage;
-                }
-            }
-            catch (Exception exception)
-            {
-                _logger.LogError(new EventId(), exception, "Unhandled exception while loading retained messages.");
-            }
-            finally
-            {
-                _gate.Release();
-            }
-        }
-
-        public async Task HandleMessageAsync(string clientId, MqttApplicationMessage applicationMessage)
-        {
-            if (applicationMessage == null) throw new ArgumentNullException(nameof(applicationMessage));
-
-            await _gate.WaitAsync().ConfigureAwait(false);
-            try
-            {
-                var saveIsRequired = false;
-
-                if (applicationMessage.Payload?.Any() == false)
-                {
-                    saveIsRequired = _retainedMessages.Remove(applicationMessage.Topic);
-                    _logger.LogInformation("Client '{0}' cleared retained message for topic '{1}'.", clientId, applicationMessage.Topic);
-                }
-                else
-                {
-                    if (!_retainedMessages.ContainsKey(applicationMessage.Topic))
-                    {
-                        _retainedMessages[applicationMessage.Topic] = applicationMessage;
-                        saveIsRequired = true;
-                    }
-                    else
-                    {
-                        var existingMessage = _retainedMessages[applicationMessage.Topic];
-                        if (existingMessage.QualityOfServiceLevel != applicationMessage.QualityOfServiceLevel || !existingMessage.Payload.SequenceEqual(applicationMessage.Payload ?? new byte[0]))
-                        {
-                            _retainedMessages[applicationMessage.Topic] = applicationMessage;
-                            saveIsRequired = true;
-                        }
-                    }
-                    
-                    _logger.LogInformation("Client '{0}' set retained message for topic '{1}'.", clientId, applicationMessage.Topic);
-                }
-
-                if (!saveIsRequired)
-                {
-                    _logger.LogTrace("Skipped saving retained messages because no changes were detected.");
-                }
-
-                if (saveIsRequired && _options.Storage != null)
-                {
-                    await _options.Storage.SaveRetainedMessagesAsync(_retainedMessages.Values.ToList());
-                }
-            }
-            catch (Exception exception)
-            {
-                _logger.LogError(new EventId(), exception, "Unhandled exception while handling retained messages.");
-            }
-            finally
-            {
-                _gate.Release();
-            }
-        }
-
-        public async Task<List<MqttApplicationMessage>> GetSubscribedMessagesAsync(MqttSubscribePacket subscribePacket)
-        {
-            var retainedMessages = new List<MqttApplicationMessage>();
-
-            await _gate.WaitAsync().ConfigureAwait(false);
-            try
-            {
-                foreach (var retainedMessage in _retainedMessages.Values)
-                {
-                    foreach (var topicFilter in subscribePacket.TopicFilters)
-                    {
-                        if (retainedMessage.QualityOfServiceLevel < topicFilter.QualityOfServiceLevel)
-                        {
-                            continue;
-                        }
-
-                        if (!MqttTopicFilterComparer.IsMatch(retainedMessage.Topic, topicFilter.Topic))
-                        {
-                            continue;
-                        }
-
-                        retainedMessages.Add(retainedMessage);
-                        break;
-                    }
-                }
-            }
-            finally
-            {
-                _gate.Release();
-            }
-
-            return retainedMessages;
-        }
-    }
-}

MQTTnet.Core/Server/MqttClientSession.cs

@@ -1,281 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using MQTTnet.Core.Adapter;
-using MQTTnet.Core.Exceptions;
-using MQTTnet.Core.Internal;
-using MQTTnet.Core.Packets;
-using MQTTnet.Core.Protocol;
-using MQTTnet.Core.Serializer;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-
-namespace MQTTnet.Core.Server
-{
-    public sealed class MqttClientSession
-    {
-        private readonly HashSet<ushort> _unacknowledgedPublishPackets = new HashSet<ushort>();
-
-        private readonly IMqttClientRetainedMessageManager _clientRetainedMessageManager;
-        private readonly MqttClientSubscriptionsManager _subscriptionsManager;
-        private readonly MqttClientSessionsManager _sessionsManager;
-        private readonly MqttClientPendingMessagesQueue _pendingMessagesQueue;
-        private readonly MqttServerOptions _options;
-        private readonly ILogger<MqttClientSession> _logger;
-
-        private IMqttCommunicationAdapter _adapter;
-        private CancellationTokenSource _cancellationTokenSource;
-        private MqttApplicationMessage _willMessage;
-
-        public MqttClientSession(
-            string clientId,
-            IOptions<MqttServerOptions> options,
-            MqttClientSessionsManager sessionsManager,
-            MqttClientSubscriptionsManager subscriptionsManager,
-            ILogger<MqttClientSession> logger,
-            ILogger<MqttClientPendingMessagesQueue> messageQueueLogger,
-            IMqttClientRetainedMessageManager clientRetainedMessageManager)
-        {
-            _clientRetainedMessageManager = clientRetainedMessageManager ?? throw new ArgumentNullException(nameof(clientRetainedMessageManager));
-            _sessionsManager = sessionsManager ?? throw new ArgumentNullException(nameof(sessionsManager));
-            _subscriptionsManager = subscriptionsManager ?? throw new ArgumentNullException(nameof(subscriptionsManager));
-            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-
-            ClientId = clientId;
-
-            _options = options.Value;
-            _pendingMessagesQueue = new MqttClientPendingMessagesQueue(_options, this, messageQueueLogger);
-        }
-
-        public string ClientId { get; }
-
-        public MqttProtocolVersion? ProtocolVersion => _adapter?.PacketSerializer.ProtocolVersion;
-
-        public bool IsConnected => _adapter != null;
-
-        public async Task RunAsync(MqttApplicationMessage willMessage, IMqttCommunicationAdapter adapter)
-        {
-            if (adapter == null) throw new ArgumentNullException(nameof(adapter));
-
-            try
-            {
-                var cancellationTokenSource = new CancellationTokenSource();
-
-                _willMessage = willMessage;
-                _adapter = adapter;
-                _cancellationTokenSource = cancellationTokenSource;
-
-                _pendingMessagesQueue.Start(adapter, cancellationTokenSource.Token);
-                await ReceivePacketsAsync(adapter, cancellationTokenSource.Token).ConfigureAwait(false);
-            }
-            catch (OperationCanceledException)
-            {
-            }
-            catch (MqttCommunicationException exception)
-            {
-                _logger.LogWarning(new EventId(), exception, "Client '{0}': Communication exception while processing client packets.", ClientId);
-            }
-            catch (Exception exception)
-            {
-                _logger.LogError(new EventId(), exception, "Client '{0}': Unhandled exception while processing client packets.", ClientId);
-            }
-        }
-
-        public void Stop()
-        {
-            try
-            {
-                _cancellationTokenSource?.Cancel(false);
-                _cancellationTokenSource?.Dispose();
-                _cancellationTokenSource = null;
-
-                _adapter = null;
-
-                _logger.LogInformation("Client '{0}': Disconnected.", ClientId);
-            }
-            finally
-            {
-                var willMessage = _willMessage; 
-                if (willMessage != null)
-                {
-                    _willMessage = null; //clear willmessage so it is send just once
-                    _sessionsManager.DispatchApplicationMessage(this, willMessage);
-                }
-            }
-        }
-
-        public void EnqueuePublishPacket(MqttPublishPacket publishPacket)
-        {
-            if (publishPacket == null) throw new ArgumentNullException(nameof(publishPacket));
-
-            if (!_subscriptionsManager.IsSubscribed(publishPacket))
-            {
-                return;
-            }
-
-            _pendingMessagesQueue.Enqueue(publishPacket);
-        }
-
-        private async Task ReceivePacketsAsync(IMqttCommunicationAdapter adapter, CancellationToken cancellationToken)
-        {
-            try
-            {
-                while (!cancellationToken.IsCancellationRequested)
-                {
-                    var packet = await adapter.ReceivePacketAsync(TimeSpan.Zero, cancellationToken).ConfigureAwait(false);
-                    await ProcessReceivedPacketAsync(adapter, packet, cancellationToken).ConfigureAwait(false);
-                }
-            }
-            catch (OperationCanceledException)
-            {
-            }
-            catch (MqttCommunicationException exception)
-            {
-                _logger.LogWarning(new EventId(), exception, "Client '{0}': Communication exception while processing client packets.", ClientId);
-                Stop();
-            }
-            catch (Exception exception)
-            {
-                _logger.LogError(new EventId(), exception, "Client '{0}': Unhandled exception while processing client packets.", ClientId);
-                Stop();
-            }
-        }
-
-        private Task ProcessReceivedPacketAsync(IMqttCommunicationAdapter adapter, MqttBasePacket packet, CancellationToken cancellationToken)
-        {
-            if (packet is MqttPingReqPacket)
-            {
-                return adapter.SendPacketsAsync(_options.DefaultCommunicationTimeout, cancellationToken, new MqttPingRespPacket());
-            }
-
-            if (packet is MqttPublishPacket publishPacket)
-            {
-                return HandleIncomingPublishPacketAsync(adapter, publishPacket, cancellationToken);
-            }
-
-            if (packet is MqttPubRelPacket pubRelPacket)
-            {
-                return HandleIncomingPubRelPacketAsync(adapter, pubRelPacket, cancellationToken);
-            }
-
-            if (packet is MqttPubRecPacket pubRecPacket)
-            {
-                return adapter.SendPacketsAsync(_options.DefaultCommunicationTimeout, cancellationToken, pubRecPacket.CreateResponse<MqttPubRelPacket>());
-            }
-
-            if (packet is MqttPubAckPacket || packet is MqttPubCompPacket)
-            {
-                // Discard message.
-                return Task.FromResult(0);
-            }
-
-            if (packet is MqttSubscribePacket subscribePacket)
-            {
-                return HandleIncomingSubscribePacketAsync(adapter, subscribePacket, cancellationToken);
-            }
-
-            if (packet is MqttUnsubscribePacket unsubscribePacket)
-            {
-                return adapter.SendPacketsAsync(_options.DefaultCommunicationTimeout, cancellationToken, _subscriptionsManager.Unsubscribe(unsubscribePacket));
-            }
-
-            if (packet is MqttDisconnectPacket || packet is MqttConnectPacket)
-            {
-                Stop();
-                return Task.FromResult(0);
-            }
-
-            _logger.LogWarning("Client '{0}': Received not supported packet ({1}). Closing connection.", ClientId, packet);
-            Stop();
-
-            return Task.FromResult(0);
-        }
-
-        private async Task HandleIncomingSubscribePacketAsync(IMqttCommunicationAdapter adapter, MqttSubscribePacket subscribePacket, CancellationToken cancellationToken)
-        {
-            var subscribeResult = _subscriptionsManager.Subscribe(subscribePacket, ClientId);
-
-            await adapter.SendPacketsAsync(_options.DefaultCommunicationTimeout, cancellationToken, subscribeResult.ResponsePacket).ConfigureAwait(false);
-            await EnqueueSubscribedRetainedMessagesAsync(subscribePacket).ConfigureAwait(false);
-
-            if (subscribeResult.CloseConnection)
-            {
-                await adapter.SendPacketsAsync(_options.DefaultCommunicationTimeout, cancellationToken, new MqttDisconnectPacket()).ConfigureAwait(false);
-                Stop();
-            }
-        }
-
-        private async Task EnqueueSubscribedRetainedMessagesAsync(MqttSubscribePacket subscribePacket)
-        {
-            var retainedMessages = await _clientRetainedMessageManager.GetSubscribedMessagesAsync(subscribePacket).ConfigureAwait(false);
-            foreach (var publishPacket in retainedMessages)
-            {
-                EnqueuePublishPacket(publishPacket.ToPublishPacket());
-            }
-        }
-
-        private async Task HandleIncomingPublishPacketAsync(IMqttCommunicationAdapter adapter, MqttPublishPacket publishPacket, CancellationToken cancellationToken)
-        {
-            var applicationMessage = publishPacket.ToApplicationMessage();
-
-            var interceptorContext = new MqttApplicationMessageInterceptorContext
-            {
-                ApplicationMessage = applicationMessage
-            };
-
-            _options.ApplicationMessageInterceptor?.Invoke(interceptorContext);
-            applicationMessage = interceptorContext.ApplicationMessage;
-
-            if (applicationMessage.Retain)
-            {
-                await _clientRetainedMessageManager.HandleMessageAsync(ClientId, applicationMessage).ConfigureAwait(false);
-            }
-
-            switch (applicationMessage.QualityOfServiceLevel)
-            {
-                case MqttQualityOfServiceLevel.AtMostOnce:
-                    {
-                        _sessionsManager.DispatchApplicationMessage(this, applicationMessage);
-                        return;
-                    }
-                case MqttQualityOfServiceLevel.AtLeastOnce:
-                    {
-                        _sessionsManager.DispatchApplicationMessage(this, applicationMessage);
-
-                        await adapter.SendPacketsAsync(_options.DefaultCommunicationTimeout, cancellationToken,
-                            new MqttPubAckPacket { PacketIdentifier = publishPacket.PacketIdentifier });
-
-                        return;
-                    }
-                case MqttQualityOfServiceLevel.ExactlyOnce:
-                    {
-                        // QoS 2 is implement as method "B" [4.3.3 QoS 2: Exactly once delivery]
-                        lock (_unacknowledgedPublishPackets)
-                        {
-                            _unacknowledgedPublishPackets.Add(publishPacket.PacketIdentifier);
-                        }
-
-                        _sessionsManager.DispatchApplicationMessage(this, applicationMessage);
-
-                        await adapter.SendPacketsAsync(_options.DefaultCommunicationTimeout, cancellationToken,
-                            new MqttPubRecPacket { PacketIdentifier = publishPacket.PacketIdentifier }).ConfigureAwait(false);
-
-                        return;
-                    }
-                default:
-                    throw new MqttCommunicationException("Received a not supported QoS level.");
-            }
-        }
-
-        private Task HandleIncomingPubRelPacketAsync(IMqttCommunicationAdapter adapter, MqttPubRelPacket pubRelPacket, CancellationToken cancellationToken)
-        {
-            lock (_unacknowledgedPublishPackets)
-            {
-                _unacknowledgedPublishPackets.Remove(pubRelPacket.PacketIdentifier);
-            }
-
-            return adapter.SendPacketsAsync(_options.DefaultCommunicationTimeout, cancellationToken, new MqttPubCompPacket { PacketIdentifier = pubRelPacket.PacketIdentifier });
-        }
-    }
-}

MQTTnet.Core/Server/MqttClientSessionsManager.cs

@@ -1,193 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using MQTTnet.Core.Adapter;
-using MQTTnet.Core.Exceptions;
-using MQTTnet.Core.Internal;
-using MQTTnet.Core.Packets;
-using MQTTnet.Core.Protocol;
-using MQTTnet.Core.Serializer;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-
-namespace MQTTnet.Core.Server
-{
-    public sealed class MqttClientSessionsManager
-    {
-        private readonly Dictionary<string, MqttClientSession> _clientSessions = new Dictionary<string, MqttClientSession>();
-        private readonly ILogger<MqttClientSessionsManager> _logger;
-        private readonly IMqttClientSesssionFactory _clientSesssionFactory;
-        private readonly MqttServerOptions _options;
-
-        public MqttClientSessionsManager(
-            IOptions<MqttServerOptions> options, 
-            ILogger<MqttClientSessionsManager> logger,
-            IMqttClientSesssionFactory clientSesssionFactory)
-        {
-            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-            _options = options.Value ?? throw new ArgumentNullException(nameof(options));
-            _clientSesssionFactory = clientSesssionFactory ?? throw new ArgumentNullException(nameof(clientSesssionFactory));
-        }
-
-        public event EventHandler<MqttClientConnectedEventArgs> ClientConnected;
-        public event EventHandler<MqttClientDisconnectedEventArgs> ClientDisconnected;
-        public event EventHandler<MqttApplicationMessageReceivedEventArgs> ApplicationMessageReceived;
-
-        public async Task RunClientSessionAsync(IMqttCommunicationAdapter clientAdapter, CancellationToken cancellationToken)
-        {
-            var clientId = string.Empty;
-            try
-            {
-                if (!(await clientAdapter.ReceivePacketAsync(_options.DefaultCommunicationTimeout, cancellationToken).ConfigureAwait(false) is MqttConnectPacket connectPacket))
-                {
-                    throw new MqttProtocolViolationException("The first packet from a client must be a 'CONNECT' packet [MQTT-3.1.0-1].");
-                }
-
-                clientId = connectPacket.ClientId;
-
-                // Switch to the required protocol version before sending any response.
-                clientAdapter.PacketSerializer.ProtocolVersion = connectPacket.ProtocolVersion;
-
-                var connectReturnCode = ValidateConnection(connectPacket);
-                if (connectReturnCode != MqttConnectReturnCode.ConnectionAccepted)
-                {
-                    await clientAdapter.SendPacketsAsync(_options.DefaultCommunicationTimeout, cancellationToken, new MqttConnAckPacket
-                    {
-                        ConnectReturnCode = connectReturnCode
-                    }).ConfigureAwait(false);
-
-                    return;
-                }
-
-                var clientSession = GetOrCreateClientSession(connectPacket);
-
-                await clientAdapter.SendPacketsAsync(_options.DefaultCommunicationTimeout, cancellationToken, new MqttConnAckPacket
-                {
-                    ConnectReturnCode = connectReturnCode,
-                    IsSessionPresent = clientSession.IsExistingSession
-                }).ConfigureAwait(false);
-
-                ClientConnected?.Invoke(this, new MqttClientConnectedEventArgs(new ConnectedMqttClient
-                {
-                    ClientId = clientId,
-                    ProtocolVersion = clientAdapter.PacketSerializer.ProtocolVersion
-                }));
-
-                using (_logger.BeginScope(clientId))
-                {
-                    await clientSession.Session.RunAsync(connectPacket.WillMessage, clientAdapter).ConfigureAwait(false);
-                }
-            }
-            catch (Exception exception)
-            {
-                _logger.LogError(new EventId(), exception, exception.Message);
-            }
-            finally
-            {
-                try
-                {
-                    await clientAdapter.DisconnectAsync(_options.DefaultCommunicationTimeout).ConfigureAwait(false);
-                }
-                catch (Exception)
-                {
-                    //ignored
-                }
-
-                ClientDisconnected?.Invoke(this, new MqttClientDisconnectedEventArgs(new ConnectedMqttClient
-                {
-                    ClientId = clientId,
-                    ProtocolVersion = clientAdapter.PacketSerializer.ProtocolVersion
-                }));
-            }
-        }
-
-        public void Clear()
-        {
-            lock (_clientSessions)
-            {
-                _clientSessions.Clear();
-            }
-        }
-
-        public IList<ConnectedMqttClient> GetConnectedClients()
-        {
-            lock (_clientSessions)
-            {
-                return _clientSessions.Where(s => s.Value.IsConnected).Select(s => new ConnectedMqttClient
-                {
-                    ClientId = s.Value.ClientId,
-                    ProtocolVersion = s.Value.ProtocolVersion ?? MqttProtocolVersion.V311
-                }).ToList();
-            }
-        }
-
-        public void DispatchApplicationMessage(MqttClientSession senderClientSession, MqttApplicationMessage applicationMessage)
-        {
-            try
-            {
-                var eventArgs = new MqttApplicationMessageReceivedEventArgs(senderClientSession?.ClientId, applicationMessage);
-                ApplicationMessageReceived?.Invoke(this, eventArgs);
-            }
-            catch (Exception exception)
-            {
-                _logger.LogError(new EventId(), exception, "Error while processing application message");
-            }
-
-            lock (_clientSessions)
-            {
-                foreach (var clientSession in _clientSessions.Values.ToList())
-                {
-                    clientSession.EnqueuePublishPacket(applicationMessage.ToPublishPacket());
-                }
-            }
-        }
-
-        private MqttConnectReturnCode ValidateConnection(MqttConnectPacket connectPacket)
-        {
-            if (_options.ConnectionValidator != null)
-            {
-                return _options.ConnectionValidator(connectPacket);
-            }
-
-            return MqttConnectReturnCode.ConnectionAccepted;
-        }
-
-        private GetOrCreateClientSessionResult GetOrCreateClientSession(MqttConnectPacket connectPacket)
-        {
-            lock (_clientSessions)
-            {
-                var isSessionPresent = _clientSessions.TryGetValue(connectPacket.ClientId, out var clientSession);
-                if (isSessionPresent)
-                {
-                    if (connectPacket.CleanSession)
-                    {
-                        _clientSessions.Remove(connectPacket.ClientId);
-                        clientSession.Stop();
-                        clientSession = null;
-
-                        _logger.LogTrace("Stopped existing session of client '{0}'.", connectPacket.ClientId);
-                    }
-                    else
-                    {
-                        _logger.LogTrace("Reusing existing session of client '{0}'.", connectPacket.ClientId);
-                    }
-                }
-
-                var isExistingSession = true;
-                if (clientSession == null)
-                {
-                    isExistingSession = false;
-
-                    clientSession = _clientSesssionFactory.CreateClientSession(connectPacket.ClientId, this);
-                    _clientSessions[connectPacket.ClientId] = clientSession;
-
-                    _logger.LogTrace("Created a new session for client '{0}'.", connectPacket.ClientId);
-                }
-
-                return new GetOrCreateClientSessionResult { IsExistingSession = isExistingSession, Session = clientSession };
-            }
-        }
-    }
-}

MQTTnet.Core/Server/MqttClientSubscriptionsManager.cs

@@ -1,93 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.Extensions.Options;
-using MQTTnet.Core.Packets;
-using MQTTnet.Core.Protocol;
-
-namespace MQTTnet.Core.Server
-{
-    public sealed class MqttClientSubscriptionsManager
-    {
-        private readonly Dictionary<string, MqttQualityOfServiceLevel> _subscribedTopics = new Dictionary<string, MqttQualityOfServiceLevel>();
-        private readonly MqttServerOptions _options;
-
-        public MqttClientSubscriptionsManager(IOptions<MqttServerOptions> options)
-        {
-            _options = options?.Value ?? throw new ArgumentNullException(nameof(options));
-        }
-
-        public MqttClientSubscribeResult Subscribe(MqttSubscribePacket subscribePacket, string clientId)
-        {
-            if (subscribePacket == null) throw new ArgumentNullException(nameof(subscribePacket));
-
-            var responsePacket = subscribePacket.CreateResponse<MqttSubAckPacket>();
-            var closeConnection = false;
-
-            lock (_subscribedTopics)
-            {
-                foreach (var topicFilter in subscribePacket.TopicFilters)
-                {
-                    var interceptorContext = new MqttSubscriptionInterceptorContext(clientId, topicFilter);
-                    _options.SubscriptionsInterceptor?.Invoke(interceptorContext);
-                    responsePacket.SubscribeReturnCodes.Add(interceptorContext.AcceptSubscription ? MqttSubscribeReturnCode.SuccessMaximumQoS1 : MqttSubscribeReturnCode.Failure);
-                    
-                    if (interceptorContext.CloseConnection)
-                    {
-                        closeConnection = true;
-                    }
-
-                    if (interceptorContext.AcceptSubscription)
-                    {
-                        _subscribedTopics[topicFilter.Topic] = topicFilter.QualityOfServiceLevel;
-                    }
-                }
-            }
-
-            return new MqttClientSubscribeResult
-            {
-                ResponsePacket = responsePacket,
-                CloseConnection = closeConnection
-            };
-        }
-
-        public MqttUnsubAckPacket Unsubscribe(MqttUnsubscribePacket unsubscribePacket)
-        {
-            if (unsubscribePacket == null) throw new ArgumentNullException(nameof(unsubscribePacket));
-
-            lock (_subscribedTopics)
-            {
-                foreach (var topicFilter in unsubscribePacket.TopicFilters)
-                {
-                    _subscribedTopics.Remove(topicFilter);
-                }
-            }
-
-            return unsubscribePacket.CreateResponse<MqttUnsubAckPacket>();
-        }
-
-        public bool IsSubscribed(MqttPublishPacket publishPacket)
-        {
-            if (publishPacket == null) throw new ArgumentNullException(nameof(publishPacket));
-
-            lock (_subscribedTopics)
-            {
-                foreach (var subscribedTopic in _subscribedTopics)
-                {
-                    if (publishPacket.QualityOfServiceLevel > subscribedTopic.Value)
-                    {
-                        continue;
-                    }
-
-                    if (!MqttTopicFilterComparer.IsMatch(publishPacket.Topic, subscribedTopic.Key))
-                    {
-                        continue;
-                    }
-
-                    return true;
-                }
-            }
-
-            return false;
-        }
-    }
-}

MQTTnet.Core/Server/MqttServer.cs

@@ -1,138 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using MQTTnet.Core.Adapter;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using System.Linq;
-
-namespace MQTTnet.Core.Server
-{
-    public class MqttServer : IMqttServer
-    {
-        private readonly IMqttClientRetainedMessageManager _clientRetainedMessageManager;
-        private readonly ILogger<MqttServer> _logger;
-        private readonly MqttClientSessionsManager _clientSessionsManager;
-        private readonly ICollection<IMqttServerAdapter> _adapters;
-        private readonly MqttServerOptions _options;
-
-        private CancellationTokenSource _cancellationTokenSource;
-
-        public MqttServer(
-            IOptions<MqttServerOptions> options, 
-            IEnumerable<IMqttServerAdapter> adapters,
-            ILogger<MqttServer> logger,
-            MqttClientSessionsManager clientSessionsManager,
-            IMqttClientRetainedMessageManager clientRetainedMessageManager
-            )
-        {
-            _options = options.Value ?? throw new ArgumentNullException(nameof(options));
-            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-            _clientSessionsManager = clientSessionsManager ?? throw new ArgumentNullException(nameof(clientSessionsManager));
-            _clientRetainedMessageManager = clientRetainedMessageManager ?? throw new ArgumentNullException(nameof(clientRetainedMessageManager));
-
-            if (adapters == null)
-            {
-                throw new ArgumentNullException(nameof(adapters));
-            }            
-
-            _adapters = adapters.ToList();
-
-            _clientSessionsManager.ApplicationMessageReceived += (s, e) => ApplicationMessageReceived?.Invoke(s, e);
-            _clientSessionsManager.ClientConnected += OnClientConnected;
-            _clientSessionsManager.ClientDisconnected += OnClientDisconnected;
-        }
-
-        public IList<ConnectedMqttClient> GetConnectedClients()
-        {
-            return _clientSessionsManager.GetConnectedClients();
-        }
-
-        public event EventHandler<MqttServerStartedEventArgs> Started;
-        public event EventHandler<MqttClientConnectedEventArgs> ClientConnected;
-        public event EventHandler<MqttClientDisconnectedEventArgs> ClientDisconnected;
-        public event EventHandler<MqttApplicationMessageReceivedEventArgs> ApplicationMessageReceived;
-
-        public void Publish(IEnumerable<MqttApplicationMessage> applicationMessages)
-        {
-            if (applicationMessages == null) throw new ArgumentNullException(nameof(applicationMessages));
-
-            if (_cancellationTokenSource == null)
-            {
-                throw new InvalidOperationException("The server is not started.");
-            }
-
-            foreach (var applicationMessage in applicationMessages)
-            {
-                var interceptorContext = new MqttApplicationMessageInterceptorContext
-                {
-                    ApplicationMessage = applicationMessage
-                };
-
-                _options.ApplicationMessageInterceptor?.Invoke(interceptorContext);
-                
-                _clientSessionsManager.DispatchApplicationMessage(null, interceptorContext.ApplicationMessage);
-            }
-        }
-
-        public Task PublishAsync(IEnumerable<MqttApplicationMessage> applicationMessages)
-        {
-            Publish(applicationMessages);
-            return Task.FromResult(0);
-        }
-
-        public async Task StartAsync()
-        {
-            if (_cancellationTokenSource != null) throw new InvalidOperationException("The MQTT server is already started.");
-
-            _cancellationTokenSource = new CancellationTokenSource();
-
-            await _clientRetainedMessageManager.LoadMessagesAsync();
-
-            foreach (var adapter in _adapters)
-            {
-                adapter.ClientAccepted += OnClientAccepted;
-                await adapter.StartAsync(_options);
-            }
-
-            _logger.LogInformation("Started.");
-
-            Started?.Invoke(this, new MqttServerStartedEventArgs());
-        }
-
-        public async Task StopAsync()
-        {
-            _cancellationTokenSource?.Cancel(false);
-            _cancellationTokenSource?.Dispose();
-            _cancellationTokenSource = null;
-
-            foreach (var adapter in _adapters)
-            {
-                adapter.ClientAccepted -= OnClientAccepted;
-                await adapter.StopAsync();
-            }
-
-            _clientSessionsManager.Clear();
-
-            _logger.LogInformation("Stopped.");
-        }
-
-        private void OnClientAccepted(object sender, MqttServerAdapterClientAcceptedEventArgs eventArgs)
-        {
-            eventArgs.SessionTask = Task.Run(async () => await _clientSessionsManager.RunClientSessionAsync(eventArgs.Client, _cancellationTokenSource.Token), _cancellationTokenSource.Token);
-        }
-
-        private void OnClientConnected(object sender, MqttClientConnectedEventArgs eventArgs)
-        {
-            _logger.LogInformation("Client '{0}': Connected.", eventArgs.Client.ClientId);
-            ClientConnected?.Invoke(this, eventArgs);
-        }
-
-        private void OnClientDisconnected(object sender, MqttClientDisconnectedEventArgs eventArgs)
-        {
-            _logger.LogInformation("Client '{0}': Disconnected.", eventArgs.Client.ClientId);
-            ClientDisconnected?.Invoke(this, eventArgs);
-        }
-    }
-}

MQTTnet.Core/Server/MqttServerDefaultEndpointOptions.cs

@@ -1,9 +0,0 @@
-namespace MQTTnet.Core.Server
-{
-    public sealed class MqttServerDefaultEndpointOptions
-    {
-        public bool IsEnabled { get; set; } = true;
-
-        public int? Port { get; set; }
-    }
-}

MQTTnet.Core/Server/MqttServerOptions.cs

@@ -1,25 +0,0 @@
-using System;
-using MQTTnet.Core.Packets;
-using MQTTnet.Core.Protocol;
-
-namespace MQTTnet.Core.Server
-{
-    public class MqttServerOptions
-    {
-        public MqttServerDefaultEndpointOptions DefaultEndpointOptions { get; } = new MqttServerDefaultEndpointOptions();
-
-        public MqttServerTlsEndpointOptions TlsEndpointOptions { get; } = new MqttServerTlsEndpointOptions();
-
-        public int ConnectionBacklog { get; set; } = 10;
-
-        public TimeSpan DefaultCommunicationTimeout { get; set; } = TimeSpan.FromSeconds(15);
-
-        public Func<MqttConnectPacket, MqttConnectReturnCode> ConnectionValidator { get; set; }
-
-        public Action<MqttApplicationMessageInterceptorContext> ApplicationMessageInterceptor { get; set; }
-
-        public Action<MqttSubscriptionInterceptorContext> SubscriptionsInterceptor { get; set; }
-
-        public IMqttServerStorage Storage { get; set; }
-    }
-}

MQTTnet.Core/Server/MqttServerOptionsExtensions.cs

@@ -1,31 +0,0 @@
-using System;
-
-namespace MQTTnet.Core.Server
-{
-    public static class MqttServerOptionsExtensions
-    {
-        public static int GetTlsEndpointPort(this MqttServerOptions options)
-        {
-            if (options == null) throw new ArgumentNullException(nameof(options));
-
-            if (!options.TlsEndpointOptions.Port.HasValue)
-            {
-                return 8883;
-            }
-
-            return options.TlsEndpointOptions.Port.Value;
-        }
-
-        public static int GetDefaultEndpointPort(this MqttServerOptions options)
-        {
-            if (options == null) throw new ArgumentNullException(nameof(options));
-
-            if (!options.DefaultEndpointOptions.Port.HasValue)
-            {
-                return 1883;
-            }
-
-            return options.DefaultEndpointOptions.Port.Value;
-        }
-    }
-}

MQTTnet.Core/Server/MqttServerStartedEventArgs.cs

@@ -1,8 +0,0 @@
-using System;
-
-namespace MQTTnet.Core.Server
-{
-    public class MqttServerStartedEventArgs : EventArgs
-    {
-    }
-}

MQTTnet.Core/Server/MqttServerTlsEndpointOptions.cs

@@ -1,11 +0,0 @@
-namespace MQTTnet.Core.Server
-{
-    public sealed class MqttServerTlsEndpointOptions
-    {
-        public bool IsEnabled { get; set; }
-
-        public int? Port { get; set; }
-
-        public byte[] Certificate { get; set; }
-    }
-}

MQTTnet.Core/Server/MqttTopicFilterComparer.cs

@@ -1,44 +0,0 @@
-using System;
-
-namespace MQTTnet.Core.Server
-{
-    public static class MqttTopicFilterComparer
-    {
-        private static readonly char[] TopicLevelSeparator = { '/' };
-
-        public static bool IsMatch(string topic, string filter)
-        {
-            if (topic == null) throw new ArgumentNullException(nameof(topic));
-            if (filter == null) throw new ArgumentNullException(nameof(filter));
-
-            if (string.Equals(topic, filter, StringComparison.Ordinal))
-            {
-                return true;
-            }
-
-            var fragmentsTopic = topic.Split(TopicLevelSeparator, StringSplitOptions.None);
-            var fragmentsFilter = filter.Split(TopicLevelSeparator, StringSplitOptions.None);
-
-            for (var i = 0; i < fragmentsFilter.Length; i++)
-            {
-                switch (fragmentsFilter[i])
-                {
-                    case "+": continue;
-                    case "#" when i == fragmentsFilter.Length - 1: return true;
-                }
-
-                if (i >= fragmentsTopic.Length)
-                {
-                    return false;
-                }
-
-                if (!string.Equals(fragmentsFilter[i], fragmentsTopic[i], StringComparison.Ordinal))
-                {
-                    return false;
-                }
-            }
-
-            return fragmentsTopic.Length <= fragmentsFilter.Length;
-        }
-    }
-}

MQTTnet.sln

@@ -1,30 +1,32 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.27004.2006
+VisualStudioVersion = 15.0.27004.2010
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.Core.Tests", "Tests\MQTTnet.Core.Tests\MQTTnet.Core.Tests.csproj", "{A7FF0C91-25DE-4BA6-B39E-F54E8DADF1CC}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{9248C2E1-B9D6-40BF-81EC-86004D7765B4}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Frameworks", "Frameworks", "{32A630A7-2598-41D7-B625-204CD906F5FB}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.Core", "MQTTnet.Core\MQTTnet.Core.csproj", "{2ECB99E4-72D0-4C23-99BA-93D511D3967D}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Source", "Source", "{32A630A7-2598-41D7-B625-204CD906F5FB}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MQTTnet.TestApp.UniversalWindows", "Tests\MQTTnet.TestApp.UniversalWindows\MQTTnet.TestApp.UniversalWindows.csproj", "{FF1F72D6-9524-4422-9497-3CC0002216ED}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.NetStandard", "Frameworks\MQTTnet.Netstandard\MQTTnet.NetStandard.csproj", "{3587E506-55A2-4EB3-99C7-DC01E42D25D2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet", "Source\MQTTnet\MQTTnet.csproj", "{3587E506-55A2-4EB3-99C7-DC01E42D25D2}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{67C28AC1-BC3A-420A-BE9C-FA2401431CF9}"
 	ProjectSection(SolutionItems) = preProject
-		appveyor.yml = appveyor.yml
 		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.nuspec = Build\MQTTnet.nuspec
+		Build\upload.ps1 = Build\upload.ps1
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B3F60ECB-45BA-4C66-8903-8BB89CA67998}"
 	ProjectSection(SolutionItems) = preProject
+		.bettercodehub.yml = .bettercodehub.yml
+		appveyor.yml = appveyor.yml
 		LICENSE = LICENSE
 		README.md = README.md
 	EndProjectSection
@@ -33,7 +35,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.TestApp.NetCore", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.TestApp.AspNetCore2", "Tests\MQTTnet.TestApp.AspNetCore2\MQTTnet.TestApp.AspNetCore2.csproj", "{C6FF8AEA-0855-41EC-A1F3-AC262225BAB9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.AspNetCore", "Frameworks\MQTTnet.AspnetCore\MQTTnet.AspNetCore.csproj", "{F10C4060-F7EE-4A83-919F-FF723E72F94A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.AspNetCore", "Source\MQTTnet.AspnetCore\MQTTnet.AspNetCore.csproj", "{F10C4060-F7EE-4A83-919F-FF723E72F94A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions", "Extensions", "{12816BCC-AF9E-44A9-9AE5-C246AF2A0587}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.Extensions.Rpc", "Source\MQTTnet.Extensions.Rpc\MQTTnet.Extensions.Rpc.csproj", "{C444E9C8-95FA-430E-9126-274129DE16CD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.Benchmarks", "Tests\MQTTnet.Benchmarks\MQTTnet.Benchmarks.csproj", "{998D04DD-7CB0-45F5-A393-E2495C16399E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.Extensions.ManagedClient", "Source\MQTTnet.Extensions.ManagedClient\MQTTnet.Extensions.ManagedClient.csproj", "{C400533A-8EBA-4F0B-BF4D-295C3708604B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.AspNetCore.Tests", "Tests\MQTTnet.AspNetCore.Tests\MQTTnet.AspNetCore.Tests.csproj", "{61B62223-F5D0-48E4-BBD6-2CBA9353CB5E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -63,24 +75,9 @@ Global
 		{A7FF0C91-25DE-4BA6-B39E-F54E8DADF1CC}.Release|x64.Build.0 = Release|Any CPU
 		{A7FF0C91-25DE-4BA6-B39E-F54E8DADF1CC}.Release|x86.ActiveCfg = Release|Any CPU
 		{A7FF0C91-25DE-4BA6-B39E-F54E8DADF1CC}.Release|x86.Build.0 = Release|Any CPU
-		{2ECB99E4-72D0-4C23-99BA-93D511D3967D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2ECB99E4-72D0-4C23-99BA-93D511D3967D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2ECB99E4-72D0-4C23-99BA-93D511D3967D}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{2ECB99E4-72D0-4C23-99BA-93D511D3967D}.Debug|ARM.Build.0 = Debug|Any CPU
-		{2ECB99E4-72D0-4C23-99BA-93D511D3967D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2ECB99E4-72D0-4C23-99BA-93D511D3967D}.Debug|x64.Build.0 = Debug|Any CPU
-		{2ECB99E4-72D0-4C23-99BA-93D511D3967D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2ECB99E4-72D0-4C23-99BA-93D511D3967D}.Debug|x86.Build.0 = Debug|Any CPU
-		{2ECB99E4-72D0-4C23-99BA-93D511D3967D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2ECB99E4-72D0-4C23-99BA-93D511D3967D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2ECB99E4-72D0-4C23-99BA-93D511D3967D}.Release|ARM.ActiveCfg = Release|Any CPU
-		{2ECB99E4-72D0-4C23-99BA-93D511D3967D}.Release|ARM.Build.0 = Release|Any CPU
-		{2ECB99E4-72D0-4C23-99BA-93D511D3967D}.Release|x64.ActiveCfg = Release|Any CPU
-		{2ECB99E4-72D0-4C23-99BA-93D511D3967D}.Release|x64.Build.0 = Release|Any CPU
-		{2ECB99E4-72D0-4C23-99BA-93D511D3967D}.Release|x86.ActiveCfg = Release|Any CPU
-		{2ECB99E4-72D0-4C23-99BA-93D511D3967D}.Release|x86.Build.0 = Release|Any CPU
 		{FF1F72D6-9524-4422-9497-3CC0002216ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FF1F72D6-9524-4422-9497-3CC0002216ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FF1F72D6-9524-4422-9497-3CC0002216ED}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
 		{FF1F72D6-9524-4422-9497-3CC0002216ED}.Debug|ARM.ActiveCfg = Debug|ARM
 		{FF1F72D6-9524-4422-9497-3CC0002216ED}.Debug|ARM.Build.0 = Debug|ARM
 		{FF1F72D6-9524-4422-9497-3CC0002216ED}.Debug|ARM.Deploy.0 = Debug|ARM
@@ -165,6 +162,70 @@ Global
 		{F10C4060-F7EE-4A83-919F-FF723E72F94A}.Release|x64.Build.0 = Release|Any CPU
 		{F10C4060-F7EE-4A83-919F-FF723E72F94A}.Release|x86.ActiveCfg = Release|Any CPU
 		{F10C4060-F7EE-4A83-919F-FF723E72F94A}.Release|x86.Build.0 = Release|Any CPU
+		{C444E9C8-95FA-430E-9126-274129DE16CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C444E9C8-95FA-430E-9126-274129DE16CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C444E9C8-95FA-430E-9126-274129DE16CD}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{C444E9C8-95FA-430E-9126-274129DE16CD}.Debug|ARM.Build.0 = Debug|Any CPU
+		{C444E9C8-95FA-430E-9126-274129DE16CD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C444E9C8-95FA-430E-9126-274129DE16CD}.Debug|x64.Build.0 = Debug|Any CPU
+		{C444E9C8-95FA-430E-9126-274129DE16CD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C444E9C8-95FA-430E-9126-274129DE16CD}.Debug|x86.Build.0 = Debug|Any CPU
+		{C444E9C8-95FA-430E-9126-274129DE16CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C444E9C8-95FA-430E-9126-274129DE16CD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C444E9C8-95FA-430E-9126-274129DE16CD}.Release|ARM.ActiveCfg = Release|Any CPU
+		{C444E9C8-95FA-430E-9126-274129DE16CD}.Release|ARM.Build.0 = Release|Any CPU
+		{C444E9C8-95FA-430E-9126-274129DE16CD}.Release|x64.ActiveCfg = Release|Any CPU
+		{C444E9C8-95FA-430E-9126-274129DE16CD}.Release|x64.Build.0 = Release|Any CPU
+		{C444E9C8-95FA-430E-9126-274129DE16CD}.Release|x86.ActiveCfg = Release|Any CPU
+		{C444E9C8-95FA-430E-9126-274129DE16CD}.Release|x86.Build.0 = Release|Any CPU
+		{998D04DD-7CB0-45F5-A393-E2495C16399E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{998D04DD-7CB0-45F5-A393-E2495C16399E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{998D04DD-7CB0-45F5-A393-E2495C16399E}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{998D04DD-7CB0-45F5-A393-E2495C16399E}.Debug|ARM.Build.0 = Debug|Any CPU
+		{998D04DD-7CB0-45F5-A393-E2495C16399E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{998D04DD-7CB0-45F5-A393-E2495C16399E}.Debug|x64.Build.0 = Debug|Any CPU
+		{998D04DD-7CB0-45F5-A393-E2495C16399E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{998D04DD-7CB0-45F5-A393-E2495C16399E}.Debug|x86.Build.0 = Debug|Any CPU
+		{998D04DD-7CB0-45F5-A393-E2495C16399E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{998D04DD-7CB0-45F5-A393-E2495C16399E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{998D04DD-7CB0-45F5-A393-E2495C16399E}.Release|ARM.ActiveCfg = Release|Any CPU
+		{998D04DD-7CB0-45F5-A393-E2495C16399E}.Release|ARM.Build.0 = Release|Any CPU
+		{998D04DD-7CB0-45F5-A393-E2495C16399E}.Release|x64.ActiveCfg = Release|Any CPU
+		{998D04DD-7CB0-45F5-A393-E2495C16399E}.Release|x64.Build.0 = Release|Any CPU
+		{998D04DD-7CB0-45F5-A393-E2495C16399E}.Release|x86.ActiveCfg = Release|Any CPU
+		{998D04DD-7CB0-45F5-A393-E2495C16399E}.Release|x86.Build.0 = Release|Any CPU
+		{C400533A-8EBA-4F0B-BF4D-295C3708604B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C400533A-8EBA-4F0B-BF4D-295C3708604B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C400533A-8EBA-4F0B-BF4D-295C3708604B}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{C400533A-8EBA-4F0B-BF4D-295C3708604B}.Debug|ARM.Build.0 = Debug|Any CPU
+		{C400533A-8EBA-4F0B-BF4D-295C3708604B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C400533A-8EBA-4F0B-BF4D-295C3708604B}.Debug|x64.Build.0 = Debug|Any CPU
+		{C400533A-8EBA-4F0B-BF4D-295C3708604B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C400533A-8EBA-4F0B-BF4D-295C3708604B}.Debug|x86.Build.0 = Debug|Any CPU
+		{C400533A-8EBA-4F0B-BF4D-295C3708604B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C400533A-8EBA-4F0B-BF4D-295C3708604B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C400533A-8EBA-4F0B-BF4D-295C3708604B}.Release|ARM.ActiveCfg = Release|Any CPU
+		{C400533A-8EBA-4F0B-BF4D-295C3708604B}.Release|ARM.Build.0 = Release|Any CPU
+		{C400533A-8EBA-4F0B-BF4D-295C3708604B}.Release|x64.ActiveCfg = Release|Any CPU
+		{C400533A-8EBA-4F0B-BF4D-295C3708604B}.Release|x64.Build.0 = Release|Any CPU
+		{C400533A-8EBA-4F0B-BF4D-295C3708604B}.Release|x86.ActiveCfg = Release|Any CPU
+		{C400533A-8EBA-4F0B-BF4D-295C3708604B}.Release|x86.Build.0 = Release|Any CPU
+		{61B62223-F5D0-48E4-BBD6-2CBA9353CB5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{61B62223-F5D0-48E4-BBD6-2CBA9353CB5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{61B62223-F5D0-48E4-BBD6-2CBA9353CB5E}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{61B62223-F5D0-48E4-BBD6-2CBA9353CB5E}.Debug|ARM.Build.0 = Debug|Any CPU
+		{61B62223-F5D0-48E4-BBD6-2CBA9353CB5E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{61B62223-F5D0-48E4-BBD6-2CBA9353CB5E}.Debug|x64.Build.0 = Debug|Any CPU
+		{61B62223-F5D0-48E4-BBD6-2CBA9353CB5E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{61B62223-F5D0-48E4-BBD6-2CBA9353CB5E}.Debug|x86.Build.0 = Debug|Any CPU
+		{61B62223-F5D0-48E4-BBD6-2CBA9353CB5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{61B62223-F5D0-48E4-BBD6-2CBA9353CB5E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{61B62223-F5D0-48E4-BBD6-2CBA9353CB5E}.Release|ARM.ActiveCfg = Release|Any CPU
+		{61B62223-F5D0-48E4-BBD6-2CBA9353CB5E}.Release|ARM.Build.0 = Release|Any CPU
+		{61B62223-F5D0-48E4-BBD6-2CBA9353CB5E}.Release|x64.ActiveCfg = Release|Any CPU
+		{61B62223-F5D0-48E4-BBD6-2CBA9353CB5E}.Release|x64.Build.0 = Release|Any CPU
+		{61B62223-F5D0-48E4-BBD6-2CBA9353CB5E}.Release|x86.ActiveCfg = Release|Any CPU
+		{61B62223-F5D0-48E4-BBD6-2CBA9353CB5E}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -176,6 +237,10 @@ Global
 		{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}
+		{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}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {07536672-5CBC-4BE3-ACE0-708A431A7894}

MQTTnet.sln.DotSettings

@@ -1,7 +1,13 @@
 <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/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: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_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@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></wpf:ResourceDictionary>

README.md

@@ -1,10 +1,14 @@
 <p align="center">
 <img src="https://github.com/chkr1011/MQTTnet/blob/master/Images/Logo_128x128.png?raw=true" width="128">
+<br/>
+<br/>
 </p>
 
 [![NuGet Badge](https://buildstats.info/nuget/MQTTnet)](https://www.nuget.org/packages/MQTTnet)
-[![Build status](https://ci.appveyor.com/api/projects/status/ycit86voxfevm2aa/branch/master?svg=true)](https://ci.appveyor.com/project/chkr1011/mqttnet/branch/develop)
+[![Build status](https://ci.appveyor.com/api/projects/status/ycit86voxfevm2aa/branch/master?svg=true)](https://ci.appveyor.com/project/chkr1011/mqttnet)
 [![BCH compliance](https://bettercodehub.com/edge/badge/chkr1011/MQTTnet?branch=master)](https://bettercodehub.com/)
+[![OpenCollective](https://opencollective.com/mqttnet/backers/badge.svg)](https://opencollective.com/mqttnet) 
+[![OpenCollective](https://opencollective.com/mqttnet/sponsors/badge.svg)](https://opencollective.com/mqttnet)
 
 # MQTTnet
 
@@ -18,12 +22,12 @@ MQTTnet is a high performance .NET library for MQTT based communication. It prov
 * TLS 1.2 support for client and server (but not UWP servers)
 * Extensible communication channels (i.e. In-Memory, TCP, TCP+TLS, WS)
 * Lightweight (only the low level implementation of MQTT, no overhead)
-* Performance optimized (processing ~27.000 messages / second)*
+* Performance optimized (processing ~70.000 messages / second)*
 * Interfaces included for mocking and testing
 * Access to internal trace messages
-* Unit tested (70+ tests)
+* Unit tested (~90 tests)
 
-\* Tested on local machine with MQTTnet client and server running in the same process using the TCP channel. The app for verification is part of this repository and stored in _/Tests/MQTTnet.TestApp.NetCore_.
+\* Tested on local machine (Intel i7 8700K) with MQTTnet client and server running in the same process using the TCP channel. The app for verification is part of this repository and stored in _/Tests/MQTTnet.TestApp.NetCore_.
 
 ### Client
 
@@ -43,20 +47,22 @@ MQTTnet is a high performance .NET library for MQTT based communication. It prov
 * Retained messages are supported including persisting via interface methods (own implementation required)
 * WebSockets supported (via ASP.NET Core 2.0, separate nuget)
 * A custom message interceptor can be added which allows transforming or extending every received application message
+* Validate subscriptions and deny subscribing of certain topics depending on requesting clients
 
 ## Supported frameworks
 
 * .NET Standard 1.3+
 * .NET Core 1.1+
 * .NET Core App 1.1+
-* Universal Windows Platform (UWP) 10.0.10240+ (x86, x64, ARM, AnyCPU)
 * .NET Framework 4.5.2+ (x86, x64, AnyCPU)
 * Mono 5.2+
+* Universal Windows Platform (UWP) 10.0.10240+ (x86, x64, ARM, AnyCPU, Windows 10 IoT Core)
 * Xamarin.Android 7.5+
 * Xamarin.iOS 10.14+
 
 ## Supported MQTT versions
 
+* 5.0.0 (planned)
 * 3.1.1
 * 3.1.0
 
@@ -71,19 +77,24 @@ Please find examples and the documentation at the Wiki of this repository (<http
 ## Contributions
 
 If you want to contribute to this project just create a pull request. But only pull requests which are matching the code style of this library will be accepted. Before creating a pull request please have a look at the library to get an overview of the required style.
+Also additions and updates in the Wiki are welcome.
+
+This project also listed at Open Collective (https://opencollective.com/mqttnet).
 
 ## References
 
 This library is used in the following projects:
 
+* HA4IoT (Open Source Home Automation system for .NET, <https://github.com/chkr1011/HA4IoT>)
 * MQTT Client Rx (Wrapper for Reactive Extensions, <https://github.com/1iveowl/MQTTClient.rx>)
-* Wirehome (Open Source Home Automation system for .NET, <https://github.com/chkr1011/Wirehome>)
+* MQTT Tester (MQTT client test app for [Android](https://play.google.com/store/apps/details?id=com.liveowl.mqtttester) and [iOS](https://itunes.apple.com/us/app/mqtt-tester/id1278621826?mt=8))
+* Wirehome.Core (Open Source Home Automation system for .NET Core, <https://github.com/chkr1011/Wirehome.Core>)
 
 If you use this library and want to see your project here please let me know.
 
 ## MIT License
 
-Copyright (c) 2017 Christian Kratky
+Copyright (c) 2017-2018 Christian Kratky
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -101,4 +112,4 @@ 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.
+SOFTWARE.

Source/MQTTnet.AspnetCore/ApplicationBuilderExtensions.cs

@@ -0,0 +1,58 @@
+using System;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
+using System.Linq;
+using MQTTnet.Server;
+using System.Collections.Generic;
+
+namespace MQTTnet.AspNetCore
+{
+    public static class ApplicationBuilderExtensions
+    {
+        public static IApplicationBuilder UseMqttEndpoint(this IApplicationBuilder app, string path = "/mqtt")
+        {
+            app.UseWebSockets();
+            app.Use(async (context, next) =>
+            {
+                if (!context.WebSockets.IsWebSocketRequest || context.Request.Path != path)
+                {
+                    await next();
+                    return;
+                }
+
+                string subProtocol = null;
+
+                if (context.Request.Headers.TryGetValue("Sec-WebSocket-Protocol", out var requestedSubProtocolValues))
+                {
+                    subProtocol = SelectSubProtocol(requestedSubProtocolValues);
+                }
+
+                var adapter = app.ApplicationServices.GetRequiredService<MqttWebSocketServerAdapter>();
+                using (var webSocket = await context.WebSockets.AcceptWebSocketAsync(subProtocol))
+                {
+                    var endpoint = $"{context.Connection.RemoteIpAddress}:{context.Connection.RemotePort}";
+                    await adapter.RunWebSocketConnectionAsync(webSocket, endpoint);
+                }
+            });
+
+            return app;
+        }
+
+        public static string SelectSubProtocol(IList<string> requestedSubProtocolValues)
+        {
+            // Order the protocols to also match "mqtt", "mqttv-3.1", "mqttv-3.11" etc.
+            return requestedSubProtocolValues
+                .OrderByDescending(p => p.Length)
+                .FirstOrDefault(p => p.ToLower().StartsWith("mqtt"));
+        }
+
+        public static IApplicationBuilder UseMqttServer(this IApplicationBuilder app, Action<IMqttServer> configure)
+        {
+            var server = app.ApplicationServices.GetRequiredService<IMqttServer>();
+
+            configure(server);
+
+            return app;
+        }
+    }
+}

Source/MQTTnet.AspnetCore/AspNetMqttServerOptionsBuilder.cs

@@ -0,0 +1,15 @@
+using MQTTnet.Server;
+using System;
+
+namespace MQTTnet.AspNetCore
+{
+    public class AspNetMqttServerOptionsBuilder : MqttServerOptionsBuilder
+    {
+        public AspNetMqttServerOptionsBuilder(IServiceProvider serviceProvider)
+        {
+            ServiceProvider = serviceProvider;
+        }
+
+        public IServiceProvider ServiceProvider { get; }
+    }
+}

Source/MQTTnet.AspnetCore/Client/MqttClientConnectionContextFactory.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Net;
+using MQTTnet.Adapter;
+using MQTTnet.AspNetCore.Client.Tcp;
+using MQTTnet.Client;
+using MQTTnet.Diagnostics;
+using MQTTnet.Serializer;
+
+namespace MQTTnet.AspNetCore.Client
+{
+    public class MqttClientConnectionContextFactory : IMqttClientAdapterFactory
+    {
+        public IMqttChannelAdapter CreateClientAdapter(IMqttClientOptions options, IMqttNetChildLogger logger)
+        {
+            if (options == null) throw new ArgumentNullException(nameof(options));
+
+            var serializer = new MqttPacketSerializer { ProtocolVersion = options.ProtocolVersion };
+
+            switch (options.ChannelOptions)
+            {
+                case MqttClientTcpOptions tcpOptions:
+                    {
+                        var endpoint = new DnsEndPoint(tcpOptions.Server, tcpOptions.GetPort());
+                        var tcpConnection = new TcpConnection(endpoint);
+                        return new MqttConnectionContext(serializer, tcpConnection);
+                    }
+                default:
+                    {
+                        throw new NotSupportedException();
+                    }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,22 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace MQTTnet.AspNetCore.Client.Tcp
+{
+    public static class BufferExtensions
+    {
+        public static ArraySegment<byte> GetArray(this Memory<byte> memory)
+        {
+            return ((ReadOnlyMemory<byte>)memory).GetArray();
+        }
+
+        public static ArraySegment<byte> GetArray(this ReadOnlyMemory<byte> memory)
+        {
+            if (!MemoryMarshal.TryGetArray(memory, out var result))
+            {
+                throw new InvalidOperationException("Buffer backed by array was expected");
+            }
+            return result;
+        }
+    }
+}

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

@@ -0,0 +1,41 @@
+using System.IO.Pipelines;
+
+namespace MQTTnet.AspNetCore.Client.Tcp
+{
+    public class DuplexPipe : IDuplexPipe
+    {
+        public DuplexPipe(PipeReader reader, PipeWriter writer)
+        {
+            Input = reader;
+            Output = writer;
+        }
+
+        public PipeReader Input { get; }
+
+        public PipeWriter Output { get; }
+
+        public static DuplexPipePair CreateConnectionPair(PipeOptions inputOptions, PipeOptions outputOptions)
+        {
+            var input = new Pipe(inputOptions);
+            var output = new Pipe(outputOptions);
+
+            var transportToApplication = new DuplexPipe(output.Reader, input.Writer);
+            var applicationToTransport = new DuplexPipe(input.Reader, output.Writer);
+
+            return new DuplexPipePair(applicationToTransport, transportToApplication);
+        }
+
+        // This class exists to work around issues with value tuple on .NET Framework
+        public readonly struct DuplexPipePair
+        {
+            public IDuplexPipe Transport { get; }
+            public IDuplexPipe Application { get; }
+
+            public DuplexPipePair(IDuplexPipe transport, IDuplexPipe application)
+            {
+                Transport = transport;
+                Application = application;
+            }
+        }
+    }
+}

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

@@ -0,0 +1,70 @@
+using System;
+using System.Diagnostics;
+using System.IO.Pipelines;
+using System.Net.Sockets;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace MQTTnet.AspNetCore.Client.Tcp
+{
+    public class SocketAwaitable : ICriticalNotifyCompletion
+    {
+        private static readonly Action _callbackCompleted = () => { };
+
+        private readonly PipeScheduler _ioScheduler;
+
+        private Action _callback;
+        private int _bytesTransferred;
+        private SocketError _error;
+
+        public SocketAwaitable(PipeScheduler ioScheduler)
+        {
+            _ioScheduler = ioScheduler;
+        }
+
+        public bool IsCompleted => ReferenceEquals(_callback, _callbackCompleted);
+
+        public SocketAwaitable GetAwaiter() => this;
+
+        public int GetResult()
+        {
+            Debug.Assert(ReferenceEquals(_callback, _callbackCompleted));
+
+            _callback = null;
+
+            if (_error != SocketError.Success)
+            {
+                throw new SocketException((int)_error);
+            }
+
+            return _bytesTransferred;
+        }
+
+        public void OnCompleted(Action continuation)
+        {
+            if (ReferenceEquals(_callback, _callbackCompleted) ||
+                ReferenceEquals(Interlocked.CompareExchange(ref _callback, continuation, null), _callbackCompleted))
+            {
+                Task.Run(continuation);
+            }
+        }
+
+        public void UnsafeOnCompleted(Action continuation)
+        {
+            OnCompleted(continuation);
+        }
+
+        public void Complete(int bytesTransferred, SocketError socketError)
+        {
+            _error = socketError;
+            _bytesTransferred = bytesTransferred;
+            var continuation = Interlocked.Exchange(ref _callback, _callbackCompleted);
+
+            if (continuation != null)
+            {
+                _ioScheduler.Schedule(state => ((Action)state)(), continuation);
+            }
+        }
+    }
+}

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

@@ -0,0 +1,37 @@
+using System;
+using System.IO.Pipelines;
+using System.Net.Sockets;
+
+namespace MQTTnet.AspNetCore.Client.Tcp
+{
+    public class SocketReceiver
+    {
+        private readonly Socket _socket;
+        private readonly SocketAsyncEventArgs _eventArgs = new SocketAsyncEventArgs();
+        private readonly SocketAwaitable _awaitable;
+
+        public SocketReceiver(Socket socket, PipeScheduler scheduler)
+        {
+            _socket = socket;
+            _awaitable = new SocketAwaitable(scheduler);
+            _eventArgs.UserToken = _awaitable;
+            _eventArgs.Completed += (_, e) => ((SocketAwaitable)e.UserToken).Complete(e.BytesTransferred, e.SocketError);
+        }
+
+        public SocketAwaitable ReceiveAsync(Memory<byte> buffer)
+        {
+#if NETCOREAPP2_1
+            _eventArgs.SetBuffer(buffer);
+#else
+            var segment = buffer.GetArray();
+            _eventArgs.SetBuffer(segment.Array, segment.Offset, segment.Count);
+#endif
+            if (!_socket.ReceiveAsync(_eventArgs))
+            {
+                _awaitable.Complete(_eventArgs.BytesTransferred, _eventArgs.SocketError);
+            }
+
+            return _awaitable;
+        }
+    }
+}

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

@@ -0,0 +1,97 @@
+using System;
+using System.Buffers;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO.Pipelines;
+using System.Net.Sockets;
+
+namespace MQTTnet.AspNetCore.Client.Tcp
+{
+    public class SocketSender
+    {
+        private readonly Socket _socket;
+        private readonly SocketAsyncEventArgs _eventArgs = new SocketAsyncEventArgs();
+        private readonly SocketAwaitable _awaitable;
+
+        private List<ArraySegment<byte>> _bufferList;
+
+        public SocketSender(Socket socket, PipeScheduler scheduler)
+        {
+            _socket = socket;
+            _awaitable = new SocketAwaitable(scheduler);
+            _eventArgs.UserToken = _awaitable;
+            _eventArgs.Completed += (_, e) => ((SocketAwaitable)e.UserToken).Complete(e.BytesTransferred, e.SocketError);
+        }
+
+        public SocketAwaitable SendAsync(in ReadOnlySequence<byte> buffers)
+        {
+            if (buffers.IsSingleSegment)
+            {
+                return SendAsync(buffers.First);
+            }
+
+#if NETCOREAPP2_1
+            if (!_eventArgs.MemoryBuffer.Equals(Memory<byte>.Empty))
+#else
+            if (_eventArgs.Buffer != null)
+#endif
+            {
+                _eventArgs.SetBuffer(null, 0, 0);
+            }
+
+            _eventArgs.BufferList = GetBufferList(buffers);
+
+            if (!_socket.SendAsync(_eventArgs))
+            {
+                _awaitable.Complete(_eventArgs.BytesTransferred, _eventArgs.SocketError);
+            }
+
+            return _awaitable;
+        }
+
+        private SocketAwaitable SendAsync(ReadOnlyMemory<byte> memory)
+        {
+            // The BufferList getter is much less expensive then the setter.
+            if (_eventArgs.BufferList != null)
+            {
+                _eventArgs.BufferList = null;
+            }
+
+#if NETCOREAPP2_1
+            _eventArgs.SetBuffer(MemoryMarshal.AsMemory(memory));
+#else
+            var segment = memory.GetArray();
+            _eventArgs.SetBuffer(segment.Array, segment.Offset, segment.Count);
+#endif
+            if (!_socket.SendAsync(_eventArgs))
+            {
+                _awaitable.Complete(_eventArgs.BytesTransferred, _eventArgs.SocketError);
+            }
+
+            return _awaitable;
+        }
+
+        private List<ArraySegment<byte>> GetBufferList(in ReadOnlySequence<byte> buffer)
+        {
+            Debug.Assert(!buffer.IsEmpty);
+            Debug.Assert(!buffer.IsSingleSegment);
+
+            if (_bufferList == null)
+            {
+                _bufferList = new List<ArraySegment<byte>>();
+            }
+            else
+            {
+                // Buffers are pooled, so it's OK to root them until the next multi-buffer write.
+                _bufferList.Clear();
+            }
+
+            foreach (var b in buffer)
+            {
+                _bufferList.Add(b.GetArray());
+            }
+
+            return _bufferList;
+        }
+    }
+}

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

@@ -0,0 +1,258 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.IO.Pipelines;
+using System.Net;
+using System.Net.Sockets;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Connections;
+using Microsoft.AspNetCore.Http.Features;
+using MQTTnet.Exceptions;
+
+namespace MQTTnet.AspNetCore.Client.Tcp
+{
+    public class TcpConnection : ConnectionContext
+    {
+        private volatile bool _aborted;
+        private readonly EndPoint _endPoint;
+        private SocketSender _sender;
+        private SocketReceiver _receiver;
+
+        private Socket _socket;
+        private IDuplexPipe _application;
+
+        public bool IsConnected { get; private set; }
+        public override string ConnectionId { get; set; }
+        public override IFeatureCollection Features { get; }
+        public override IDictionary<object, object> Items { get; set; }
+        public override IDuplexPipe Transport { get; set; }
+
+        public TcpConnection(EndPoint endPoint)
+        {
+            _endPoint = endPoint;
+        }
+
+        public TcpConnection(Socket socket)
+        {
+            _socket = socket;
+            _endPoint = socket.RemoteEndPoint;
+
+            _sender = new SocketSender(_socket, PipeScheduler.ThreadPool);
+            _receiver = new SocketReceiver(_socket, PipeScheduler.ThreadPool);
+        }
+
+        public Task DisposeAsync()
+        {
+            IsConnected = false;
+
+            Transport?.Output.Complete();
+            Transport?.Input.Complete();
+
+            _socket?.Dispose();
+
+            return Task.CompletedTask;
+        }
+
+        public async Task StartAsync()
+        {
+            if (_socket == null)
+            {
+                _socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+                _sender = new SocketSender(_socket, PipeScheduler.ThreadPool);
+                _receiver = new SocketReceiver(_socket, PipeScheduler.ThreadPool);
+                await _socket.ConnectAsync(_endPoint);
+            }
+
+            var pair = DuplexPipe.CreateConnectionPair(PipeOptions.Default, PipeOptions.Default);
+
+            Transport = pair.Transport;
+            _application = pair.Application;
+
+            _ = ExecuteAsync();
+
+            IsConnected = true;
+        }
+
+        private async Task ExecuteAsync()
+        {
+            Exception sendError = null;
+            try
+            {
+                // Spawn send and receive logic
+                var receiveTask = DoReceive();
+                var sendTask = DoSend();
+
+                // If the sending task completes then close the receive
+                // We don't need to do this in the other direction because the kestrel
+                // will trigger the output closing once the input is complete.
+                if (await Task.WhenAny(receiveTask, sendTask) == sendTask)
+                {
+                    // Tell the reader it's being aborted
+                    _socket.Dispose();
+                }
+
+                // Now wait for both to complete
+                await receiveTask;
+                sendError = await sendTask;
+
+                // Dispose the socket(should noop if already called)
+                _socket.Dispose();
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"Unexpected exception in {nameof(TcpConnection)}.{nameof(StartAsync)}: " + ex);
+            }
+            finally
+            {
+                // Complete the output after disposing the socket
+                _application.Input.Complete(sendError);
+            }
+        }
+        private async Task DoReceive()
+        {
+            Exception error = null;
+
+            try
+            {
+                await ProcessReceives();
+            }
+            catch (SocketException ex) when (ex.SocketErrorCode == SocketError.ConnectionReset)
+            {
+                error = new MqttCommunicationException(ex);
+            }
+            catch (SocketException ex) when (ex.SocketErrorCode == SocketError.OperationAborted ||
+                                             ex.SocketErrorCode == SocketError.ConnectionAborted ||
+                                             ex.SocketErrorCode == SocketError.Interrupted ||
+                                             ex.SocketErrorCode == SocketError.InvalidArgument)
+            {
+                if (!_aborted)
+                {
+                    // Calling Dispose after ReceiveAsync can cause an "InvalidArgument" error on *nix.
+                    error = ConnectionAborted();
+                }
+            }
+            catch (ObjectDisposedException)
+            {
+                if (!_aborted)
+                {
+                    error = ConnectionAborted();
+                }
+            }
+            catch (IOException ex)
+            {
+                error = ex;
+            }
+            catch (Exception ex)
+            {
+                error = new IOException(ex.Message, ex);
+            }
+            finally
+            {
+                if (_aborted)
+                {
+                    error = error ?? ConnectionAborted();
+                }
+
+                _application.Output.Complete(error);
+            }
+        }
+
+        private async Task ProcessReceives()
+        {
+            while (true)
+            {
+                // Ensure we have some reasonable amount of buffer space
+                var buffer = _application.Output.GetMemory();
+
+                var bytesReceived = await _receiver.ReceiveAsync(buffer);
+
+                if (bytesReceived == 0)
+                {
+                    // FIN
+                    break;
+                }
+
+                _application.Output.Advance(bytesReceived);
+
+                var flushTask = _application.Output.FlushAsync();
+
+                if (!flushTask.IsCompleted)
+                {
+                    await flushTask;
+                }
+
+                var result = flushTask.GetAwaiter().GetResult();
+                if (result.IsCompleted)
+                {
+                    // Pipe consumer is shut down, do we stop writing
+                    break;
+                }
+            }
+        }
+
+        private Exception ConnectionAborted()
+        {
+            return new MqttCommunicationException("Connection Aborted");
+        }
+
+        private async Task<Exception> DoSend()
+        {
+            Exception error = null;
+
+            try
+            {
+                await ProcessSends();
+            }
+            catch (SocketException ex) when (ex.SocketErrorCode == SocketError.OperationAborted)
+            {
+            }
+            catch (ObjectDisposedException)
+            {
+            }
+            catch (IOException ex)
+            {
+                error = ex;
+            }
+            catch (Exception ex)
+            {
+                error = new IOException(ex.Message, ex);
+            }
+            finally
+            {
+                _aborted = true;
+                _socket.Shutdown(SocketShutdown.Both);
+            }
+
+            return error;
+        }
+
+        private async Task ProcessSends()
+        {
+            while (true)
+            {
+                // Wait for data to write from the pipe producer
+                var result = await _application.Input.ReadAsync();
+                var buffer = result.Buffer;
+
+                if (result.IsCanceled)
+                {
+                    break;
+                }
+
+                var end = buffer.End;
+                var isCompleted = result.IsCompleted;
+                if (!buffer.IsEmpty)
+                {
+                    await _sender.SendAsync(buffer);
+                }
+
+                _application.Input.AdvanceTo(end);
+
+                if (isCompleted)
+                {
+                    break;
+                }
+            }
+        }
+    }
+}

Source/MQTTnet.AspnetCore/ConnectionBuilderExtensions.cs

@@ -0,0 +1,12 @@
+using Microsoft.AspNetCore.Connections;
+
+namespace MQTTnet.AspNetCore
+{
+    public static class ConnectionBuilderExtensions
+    {
+        public static IConnectionBuilder UseMqtt(this IConnectionBuilder builder)
+        {
+            return builder.UseConnectionHandler<MqttConnectionHandler>();
+        }
+    }
+}

Source/MQTTnet.AspnetCore/MQTTnet.AspNetCore.csproj

@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <Product />
+    <Company />
+    <Authors />
+    <PackageId />
+    <LangVersion>7.2</LangVersion>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DefineConstants>RELEASE;NETSTANDARD2_0</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="2.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.WebSockets" Version="2.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.0.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\MQTTnet\MQTTnet.csproj" />
+  </ItemGroup>
+
+</Project>