Add samples.

2026-10-15 17:00:03 +08:00 · 2022-08-07 12:34:10 +02:00
262 changed files with 4319 additions and 9860 deletions
@@ -1,8 +0,0 @@
-* [Core] Added net7.0 builds (#1635, thanks to @YAJeff).
-* [Client] Added support for passing MQTT v5 options (User properties etc.) for disconnects.
-* [Client] An internal exception is no longer caught silently when calling _DisconnectAsync_ to indicate that the disconnect is not clean (BREAKING CHANGE).
-* [Client] MQTTv5 features are now checked and an exception is thrown if they are used when using protocol version 3.1.1 and lower. These checks can be disabled in client options. (BREAKING CHANGE!).
-* [Server] Exposed MQTT v5 sent properties from the affected client in _ClientDisconnectedAsync_ event.
-* [Server] Fixed wrong client ID passed to _InterceptingUnsubscriptionEventArgs_ (#1631, thanks to @ghord). 
-* [Server] Exposed socket settings for TCP keep alive in TCP options (#1544).
-* [Server] Exposed server session items at server level and allow custom session items for injected application messages (#1638).
@@ -3,7 +3,7 @@ name: CI
 on: [push, pull_request]

 env:
-  VERSION: "4.2.0.${{github.run_number}}"
+  VERSION: "4.1.0.${{github.run_number}}"

 jobs:
  build:
@@ -22,7 +22,6 @@ jobs:
          dotnet-version: |
            3.1.x
            6.0.x
-            7.0.x

      - name: Setup MSBuild
        uses: microsoft/setup-msbuild@v1.1
@@ -61,4 +60,8 @@ jobs:

      - name: Publish MyGet nugets
        if: ${{ github.event_name == 'push' }}
-        run: dotnet nuget push **/*.nupkg -k ${{ secrets.MYGET_API_KEY }} -s https://www.myget.org/F/mqttnet/api/v3/index.json --skip-duplicate
+        run: dotnet nuget push **/*.nupkg -k ${{ secrets.MYGET_API_KEY }} -s https://www.myget.org/F/mqttnet/api/v3/index.json --skip-duplicate
+
+#      - name: Publish nugets
+#        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
+#        run: dotnet nuget push **/*.nupkg -k ${{ secrets.NUGET_API_KEY }} -s https://api.nuget.org/v3/index.json --skip-duplicate
@@ -1,67 +1,4 @@
 <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/CodeCleanup/Profiles/=MQTTnet/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="MQTTnet"&gt;&lt;CppReformatCode&gt;True&lt;/CppReformatCode&gt;&lt;ShaderLabReformatCode&gt;True&lt;/ShaderLabReformatCode&gt;&lt;XMLReformatCode&gt;True&lt;/XMLReformatCode&gt;&lt;HtmlReformatCode&gt;True&lt;/HtmlReformatCode&gt;&lt;VBReformatCode&gt;True&lt;/VBReformatCode&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSCodeStyleAttributes ArrangeVarStyle="True" ArrangeTypeAccessModifier="True" ArrangeTypeMemberAccessModifier="True" SortModifiers="True" ArrangeArgumentsStyle="True" RemoveRedundantParentheses="True" AddMissingParentheses="True" ArrangeBraces="True" ArrangeAttributes="True" ArrangeCodeBodyStyle="True" ArrangeTrailingCommas="True" ArrangeObjectCreation="True" ArrangeDefaultValue="True" ArrangeNamespaces="True" /&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;CSFixBuiltinTypeReferences&gt;True&lt;/CSFixBuiltinTypeReferences&gt;&lt;CppCodeStyleCleanupDescriptor ArrangeBraces="True" ArrangeAuto="True" ArrangeFunctionDeclarations="True" ArrangeNestedNamespaces="True" ArrangeTypeAliases="True" ArrangeCVQualifiers="True" ArrangeSlashesInIncludeDirectives="True" ArrangeOverridingFunctions="True" SortIncludeDirectives="True" SortMemberInitializers="True" /&gt;&lt;FormatAttributeQuoteDescriptor&gt;True&lt;/FormatAttributeQuoteDescriptor&gt;&lt;CSUpdateFileHeader&gt;True&lt;/CSUpdateFileHeader&gt;&lt;CppUpdateFileHeader&gt;True&lt;/CppUpdateFileHeader&gt;&lt;IDEA_SETTINGS&gt;&amp;lt;profile version="1.0"&amp;gt;&#xD;
-  &amp;lt;option name="myName" value="MQTTnet" /&amp;gt;&#xD;
-  &amp;lt;inspection_tool class="ConditionalExpressionWithIdenticalBranchesJS" enabled="true" level="WARNING" enabled_by_default="true" /&amp;gt;&#xD;
-  &amp;lt;inspection_tool class="ES6ShorthandObjectProperty" enabled="true" level="WARNING" enabled_by_default="true" /&amp;gt;&#xD;
-  &amp;lt;inspection_tool class="JSArrowFunctionBracesCanBeRemoved" enabled="true" level="WARNING" enabled_by_default="true" /&amp;gt;&#xD;
-  &amp;lt;inspection_tool class="JSRemoveUnnecessaryParentheses" enabled="true" level="WARNING" enabled_by_default="true" /&amp;gt;&#xD;
-  &amp;lt;inspection_tool class="TypeScriptExplicitMemberType" enabled="true" level="WARNING" enabled_by_default="true" /&amp;gt;&#xD;
-  &amp;lt;inspection_tool class="UnterminatedStatementJS" enabled="true" level="WARNING" enabled_by_default="true" /&amp;gt;&#xD;
-  &amp;lt;inspection_tool class="WrongPropertyKeyValueDelimiter" enabled="true" level="WARNING" enabled_by_default="true" /&amp;gt;&#xD;
-&amp;lt;/profile&amp;gt;&lt;/IDEA_SETTINGS&gt;&lt;RIDER_SETTINGS&gt;&amp;lt;profile&amp;gt;&#xD;
-  &amp;lt;Language id="CSS"&amp;gt;&#xD;
-    &amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
-    &amp;lt;Rearrange&amp;gt;true&amp;lt;/Rearrange&amp;gt;&#xD;
-  &amp;lt;/Language&amp;gt;&#xD;
-  &amp;lt;Language id="EditorConfig"&amp;gt;&#xD;
-    &amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
-  &amp;lt;/Language&amp;gt;&#xD;
-  &amp;lt;Language id="HTML"&amp;gt;&#xD;
-    &amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
-    &amp;lt;Rearrange&amp;gt;true&amp;lt;/Rearrange&amp;gt;&#xD;
-    &amp;lt;OptimizeImports&amp;gt;true&amp;lt;/OptimizeImports&amp;gt;&#xD;
-  &amp;lt;/Language&amp;gt;&#xD;
-  &amp;lt;Language id="HTTP Request"&amp;gt;&#xD;
-    &amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
-  &amp;lt;/Language&amp;gt;&#xD;
-  &amp;lt;Language id="Handlebars"&amp;gt;&#xD;
-    &amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
-  &amp;lt;/Language&amp;gt;&#xD;
-  &amp;lt;Language id="Ini"&amp;gt;&#xD;
-    &amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
-  &amp;lt;/Language&amp;gt;&#xD;
-  &amp;lt;Language id="JSON"&amp;gt;&#xD;
-    &amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
-  &amp;lt;/Language&amp;gt;&#xD;
-  &amp;lt;Language id="Jade"&amp;gt;&#xD;
-    &amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
-  &amp;lt;/Language&amp;gt;&#xD;
-  &amp;lt;Language id="JavaScript"&amp;gt;&#xD;
-    &amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
-    &amp;lt;Rearrange&amp;gt;true&amp;lt;/Rearrange&amp;gt;&#xD;
-    &amp;lt;OptimizeImports&amp;gt;true&amp;lt;/OptimizeImports&amp;gt;&#xD;
-  &amp;lt;/Language&amp;gt;&#xD;
-  &amp;lt;Language id="Markdown"&amp;gt;&#xD;
-    &amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
-  &amp;lt;/Language&amp;gt;&#xD;
-  &amp;lt;Language id="Properties"&amp;gt;&#xD;
-    &amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
-  &amp;lt;/Language&amp;gt;&#xD;
-  &amp;lt;Language id="RELAX-NG"&amp;gt;&#xD;
-    &amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
-  &amp;lt;/Language&amp;gt;&#xD;
-  &amp;lt;Language id="SQL"&amp;gt;&#xD;
-    &amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
-  &amp;lt;/Language&amp;gt;&#xD;
-  &amp;lt;Language id="XML"&amp;gt;&#xD;
-    &amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
-    &amp;lt;Rearrange&amp;gt;true&amp;lt;/Rearrange&amp;gt;&#xD;
-    &amp;lt;OptimizeImports&amp;gt;true&amp;lt;/OptimizeImports&amp;gt;&#xD;
-  &amp;lt;/Language&amp;gt;&#xD;
-  &amp;lt;Language id="yaml"&amp;gt;&#xD;
-    &amp;lt;Reformat&amp;gt;true&amp;lt;/Reformat&amp;gt;&#xD;
-  &amp;lt;/Language&amp;gt;&#xD;
-&amp;lt;/profile&amp;gt;&lt;/RIDER_SETTINGS&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;VBOptimizeImports&gt;True&lt;/VBOptimizeImports&gt;&lt;VBShortenReferences&gt;True&lt;/VBShortenReferences&gt;&lt;Xaml.RemoveRedundantNamespaceAlias&gt;True&lt;/Xaml.RemoveRedundantNamespaceAlias&gt;&lt;AspOptimizeRegisterDirectives&gt;True&lt;/AspOptimizeRegisterDirectives&gt;&lt;CSReorderTypeMembers&gt;True&lt;/CSReorderTypeMembers&gt;&lt;RemoveCodeRedundancies&gt;True&lt;/RemoveCodeRedundancies&gt;&lt;CSUseAutoProperty&gt;True&lt;/CSUseAutoProperty&gt;&lt;CSMakeFieldReadonly&gt;True&lt;/CSMakeFieldReadonly&gt;&lt;CSMakeAutoPropertyGetOnly&gt;True&lt;/CSMakeAutoPropertyGetOnly&gt;&lt;CppAddTypenameTemplateKeywords&gt;True&lt;/CppAddTypenameTemplateKeywords&gt;&lt;CppJoinDeclarationAndAssignmentDescriptor&gt;True&lt;/CppJoinDeclarationAndAssignmentDescriptor&gt;&lt;CppMakeLocalVarConstDescriptor&gt;True&lt;/CppMakeLocalVarConstDescriptor&gt;&lt;CppMakeMethodConst&gt;True&lt;/CppMakeMethodConst&gt;&lt;CppMakeMethodStatic&gt;True&lt;/CppMakeMethodStatic&gt;&lt;CppRemoveCastDescriptor&gt;True&lt;/CppRemoveCastDescriptor&gt;&lt;CppRemoveElseKeyword&gt;True&lt;/CppRemoveElseKeyword&gt;&lt;CppRemoveElaboratedTypeSpecifierDescriptor&gt;True&lt;/CppRemoveElaboratedTypeSpecifierDescriptor&gt;&lt;CppRemoveRedundantLambdaParameterListDescriptor&gt;True&lt;/CppRemoveRedundantLambdaParameterListDescriptor&gt;&lt;CppRemoveRedundantMemberInitializerDescriptor&gt;True&lt;/CppRemoveRedundantMemberInitializerDescriptor&gt;&lt;CppRemoveRedundantParentheses&gt;True&lt;/CppRemoveRedundantParentheses&gt;&lt;CppShortenQualifiedName&gt;True&lt;/CppShortenQualifiedName&gt;&lt;CppDeleteRedundantSpecifier&gt;True&lt;/CppDeleteRedundantSpecifier&gt;&lt;CppRemoveStatement&gt;True&lt;/CppRemoveStatement&gt;&lt;CppRemoveTemplateArgumentsDescriptor&gt;True&lt;/CppRemoveTemplateArgumentsDescriptor&gt;&lt;CppDeleteRedundantTypenameTemplateKeywords&gt;True&lt;/CppDeleteRedundantTypenameTemplateKeywords&gt;&lt;CppRemoveUnreachableCode&gt;True&lt;/CppRemoveUnreachableCode&gt;&lt;CppRemoveUnusedIncludes&gt;True&lt;/CppRemoveUnusedIncludes&gt;&lt;CppRemoveUnusedLambdaCaptures&gt;True&lt;/CppRemoveUnusedLambdaCaptures&gt;&lt;CppCStyleToStaticCastDescriptor&gt;True&lt;/CppCStyleToStaticCastDescriptor&gt;&lt;CppReplaceExpressionWithBooleanConst&gt;True&lt;/CppReplaceExpressionWithBooleanConst&gt;&lt;CppMakeIfConstexpr&gt;True&lt;/CppMakeIfConstexpr&gt;&lt;CppMakePostfixOperatorPrefix&gt;True&lt;/CppMakePostfixOperatorPrefix&gt;&lt;CppChangeSmartPointerToMakeFunction&gt;True&lt;/CppChangeSmartPointerToMakeFunction&gt;&lt;CppReplaceThrowWithRethrowFix&gt;True&lt;/CppReplaceThrowWithRethrowFix&gt;&lt;CppTypeTraitAliasDescriptor&gt;True&lt;/CppTypeTraitAliasDescriptor&gt;&lt;CppReplaceExpressionWithNullptr&gt;True&lt;/CppReplaceExpressionWithNullptr&gt;&lt;CppReplaceTieWithStructuredBindingDescriptor&gt;True&lt;/CppReplaceTieWithStructuredBindingDescriptor&gt;&lt;CppUseAssociativeContainsDescriptor&gt;True&lt;/CppUseAssociativeContainsDescriptor&gt;&lt;CppUseEraseAlgorithmDescriptor&gt;True&lt;/CppUseEraseAlgorithmDescriptor&gt;&lt;RemoveCodeRedundanciesVB&gt;True&lt;/RemoveCodeRedundanciesVB&gt;&lt;Xaml.RedundantFreezeAttribute&gt;True&lt;/Xaml.RedundantFreezeAttribute&gt;&lt;Xaml.RemoveRedundantModifiersAttribute&gt;True&lt;/Xaml.RemoveRedundantModifiersAttribute&gt;&lt;Xaml.RemoveRedundantNameAttribute&gt;True&lt;/Xaml.RemoveRedundantNameAttribute&gt;&lt;Xaml.RemoveRedundantResource&gt;True&lt;/Xaml.RemoveRedundantResource&gt;&lt;Xaml.RemoveRedundantCollectionProperty&gt;True&lt;/Xaml.RemoveRedundantCollectionProperty&gt;&lt;Xaml.RemoveRedundantAttachedPropertySetter&gt;True&lt;/Xaml.RemoveRedundantAttachedPropertySetter&gt;&lt;Xaml.RemoveRedundantStyledValue&gt;True&lt;/Xaml.RemoveRedundantStyledValue&gt;&lt;Xaml.RemoveForbiddenResourceName&gt;True&lt;/Xaml.RemoveForbiddenResourceName&gt;&lt;Xaml.RemoveRedundantGridDefinitionsAttribute&gt;True&lt;/Xaml.RemoveRedundantGridDefinitionsAttribute&gt;&lt;Xaml.RemoveRedundantUpdateSourceTriggerAttribute&gt;True&lt;/Xaml.RemoveRedundantUpdateSourceTriggerAttribute&gt;&lt;Xaml.RemoveRedundantBindingModeAttribute&gt;True&lt;/Xaml.RemoveRedundantBindingModeAttribute&gt;&lt;Xaml.RemoveRedundantGridSpanAttribut&gt;True&lt;/Xaml.RemoveRedundantGridSpanAttribut&gt;&lt;CSharpFormatDocComments&gt;True&lt;/CSharpFormatDocComments&gt;&lt;VBFormatDocComments&gt;True&lt;/VBFormatDocComments&gt;&lt;/Profile&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FOR/@EntryValue">Required</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FOREACH/@EntryValue">Required</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_IFELSE/@EntryValue">Required</s:String>
@@ -71,28 +8,23 @@
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_EXISTING_INITIALIZER_ARRANGEMENT/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_EXISTING_INVOCATION_PARENS_ARRANGEMENT/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_EXISTING_PROPERTY_PATTERNS_ARRANGEMENT/@EntryValue">False</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_EXISTING_SWITCH_EXPRESSION_ARRANGEMENT/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_USER_LINEBREAKS/@EntryValue">False</s:Boolean>
 	<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/PLACE_SIMPLE_ACCESSOR_ON_SINGLE_LINE/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_ANONYMOUSMETHOD_ON_SINGLE_LINE/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_EMBEDDED_STATEMENT_ON_SAME_LINE/@EntryValue">NEVER</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_INITIALIZER_ON_SINGLE_LINE/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_PROPERTY_PATTERN_ON_SINGLE_LINE/@EntryValue">False</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_WHILE_ON_NEW_LINE/@EntryValue">True</s:Boolean>
 	<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/CodeStyle/CodeFormatting/CSharpFormat/WRAP_AFTER_DECLARATION_LPAR/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_AFTER_INVOCATION_LPAR/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_ARGUMENTS_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_ARRAY_INITIALIZER_STYLE/@EntryValue">CHOP_ALWAYS</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_ARRAY_INITIALIZER_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_CHAINED_METHOD_CALLS/@EntryValue">CHOP_IF_LONG</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_EXTENDS_LIST_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LIMIT/@EntryValue">180</s:Int64>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_OBJECT_AND_COLLECTION_INITIALIZER_STYLE/@EntryValue">CHOP_ALWAYS</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_PARAMETERS_STYLE/@EntryValue">CHOP_IF_LONG</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_PROPERTY_PATTERN/@EntryValue">CHOP_ALWAYS</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/XmlDocFormatter/KeepUserLineBreaks/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/XmlDocFormatter/ProcessingInstructionAttributesFormat/@EntryValue">OnDifferentLines</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/XmlDocFormatter/TagAttributesFormat/@EntryValue">OnDifferentLines</s:String>
@@ -278,7 +210,6 @@
        &lt;/Or&gt;
      &lt;/Entry.Match&gt;
        &lt;Entry.SortBy&gt;
-            &lt;Access Order="Public Internal Protected Private" /&gt;
            &lt;Name /&gt;
        &lt;/Entry.SortBy&gt;
    &lt;/Entry&gt;
@@ -308,14 +239,6 @@ See the LICENSE file in the project root for more information.</s:String>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=CONNACK/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=PINGREQ/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=PINGRESP/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=PUBACK/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=PUBCOMP/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=PUBREC/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=PUBREL/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=SUBACK/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Tnet/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=unsub/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=UNSUBACK/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=unsub/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
@@ -4,7 +4,7 @@
 </p>

 [![NuGet Badge](https://buildstats.info/nuget/MQTTnet)](https://www.nuget.org/packages/MQTTnet)
-[![CI](https://github.com/dotnet/MQTTnet/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/dotnet/MQTTnet/actions/workflows/ci.yml)
+[![CI](https://github.com/dotnet/MQTTnet/actions/workflows/ci.yml/badge.svg)](https://github.com/dotnet/MQTTnet/actions/workflows/ci.yml)
 [![MyGet](https://img.shields.io/myget/mqttnet/v/mqttnet?color=orange&label=MyGet-Preview)](https://www.myget.org/feed/mqttnet/package/nuget/MQTTnet)
 ![Size](https://img.shields.io/github/repo-size/dotnet/MQTTnet.svg)
 [![Join the chat at https://gitter.im/MQTTnet/community](https://badges.gitter.im/MQTTnet/community.svg)](https://gitter.im/MQTTnet/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
@@ -12,7 +12,7 @@

 # MQTTnet

-MQTTnet is a high performance .NET library for MQTT based communication. It provides a MQTT client and a MQTT server (broker) and supports the MQTT protocol up to version 5. It is compatible with mostly any supported .NET Framework version and CPU architecture.
+MQTTnet is a high performance .NET library for MQTT based communication. It provides a MQTT client and a MQTT server (broker) and supports the MQTT protocol up to version 5.

 ## Features

@@ -50,6 +50,39 @@ MQTTnet is a high performance .NET library for MQTT based communication. It prov
 * A custom message interceptor can be added which allows transforming or extending every received application message
 * Validate subscriptions and deny subscribing of certain topics depending on requesting clients

+## Supported frameworks
+
+| Framwork           | Version     |
+| ------------------ | ----------- |
+|.NET                | 5.0+        |
+|.NET Framework      | 4.5.2+      |
+|.NET Standard       | 1.3+        |
+|.NET Core           | 1.1+        |
+|.NET Core App       | 1.1+        |
+| Mono               | 5.2+        |
+| UWP                | 10.0.10240+ |
+| Xamarin.Android    | 7.5+        |
+| Xamarin.iOS        | 10.14+      |
+| Blazor WebAssembly | 3.2.0+      |
+
+## References
+
+This library is used in the following projects:
+
+* Azure Functions MQTT Bindings, <https://github.com/keesschollaart81/CaseOnline.Azure.WebJobs.Extensions.Mqtt>)
+* 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>)
+* MQTT Client Rx (Managed Client Wrapper for Reactive Extensions, <https://github.com/mmuecke/RxMQTTnet>)
+* 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))
+* MQTTnet App (Cross platform client application for MQTT debugging, inspection etc., <https://github.com/chkr1011/MQTTnetApp>)
+* Wirehome.Core (Open Source Home Automation system for .NET Core, <https://github.com/chkr1011/Wirehome.Core>)
+* SparkplugNet (Sparkplug library for .Net, <https://github.com/SeppPenner/SparkplugNet>)
+* Silverback (Framework to build event-driven applications - support for MQTT, Kafka & RabbitMQ) <https://github.com/BEagle1984/silverback>
+
+Further projects using this project can be found under https://github.com/dotnet/MQTTnet/network/dependents.
+
+If you use this library and want to see your project here please create a pull request.
+
 ## Code of Conduct

 This project has adopted the code of conduct defined by the Contributor Covenant to clarify expected behavior in our community.
@@ -10,34 +10,12 @@ using System.Security.Authentication;
 using MQTTnet.Client;
 using MQTTnet.Extensions.WebSocket4Net;
 using MQTTnet.Formatter;
-using MQTTnet.Samples.Helpers;
+using MQTTnet.Samples.Shared;

 namespace MQTTnet.Samples.Client;

 public static class Client_Connection_Samples
 {
-    public static async Task Clean_Disconnect()
-    {
-        /*
-         * This sample disconnects in a clean way. This will send a MQTT DISCONNECT packet
-         * to the server and close the connection afterwards.
-         *
-         * See sample _Connect_Client_ for more details.
-         */
-
-        var mqttFactory = new MqttFactory();
-
-        using (var mqttClient = mqttFactory.CreateMqttClient())
-        {
-            var mqttClientOptions = new MqttClientOptionsBuilder().WithTcpServer("broker.hivemq.com").Build();
-            await mqttClient.ConnectAsync(mqttClientOptions, CancellationToken.None);
-
-            // This will send the DISCONNECT packet. Calling _Dispose_ without DisconnectAsync the 
-            // connection is closed in a "not clean" way. See MQTT specification for more details.
-            await mqttClient.DisconnectAsync(new MqttClientDisconnectOptionsBuilder().WithReason(MqttClientDisconnectOptionsReason.NormalDisconnection).Build());
-        }
-    }
-
    public static async Task Connect_Client()
    {
        /*
@@ -141,7 +119,7 @@ public static class Client_Connection_Samples
                        // The used public broker sometimes has invalid certificates. This sample accepts all
                        // certificates. This should not be used in live environments.
                        o.CertificateValidationHandler = _ => true;
-
+                        
                        // The default value is determined by the OS. Set manually to force version.
                        o.SslProtocol = SslProtocols.Tls12;
                    })
@@ -156,17 +134,15 @@ public static class Client_Connection_Samples
        }
    }

-    public static async Task Connect_Client_Using_WebSocket4Net()
+    public static async Task Connect_Client_Using_WebSockets()
    {
        /*
         * This sample creates a simple MQTT client and connects to a public broker using a WebSocket connection.
-         * Instead of the .NET implementation of WebSockets the implementation from WebSocket4Net is used. It provides more
-         * encryption algorithms and supports more platforms.
         * 
         * This is a modified version of the sample _Connect_Client_! See other sample for more details.
         */

-        var mqttFactory = new MqttFactory().UseWebSocket4Net();
+        var mqttFactory = new MqttFactory();

        using (var mqttClient = mqttFactory.CreateMqttClient())
        {
@@ -179,16 +155,18 @@ public static class Client_Connection_Samples
            response.DumpToConsole();
        }
    }
-
-    public static async Task Connect_Client_Using_WebSockets()
+    
+    public static async Task Connect_Client_Using_WebSocket4Net()
    {
        /*
         * This sample creates a simple MQTT client and connects to a public broker using a WebSocket connection.
+         * Instead of the .NET implementation of WebSockets the implementaion from WebSocket4Net is used. It provides more
+         * encryption algorithms and supports more platforms.
         * 
         * This is a modified version of the sample _Connect_Client_! See other sample for more details.
         */

-        var mqttFactory = new MqttFactory();
+        var mqttFactory = new MqttFactory().UseWebSocket4Net();

        using (var mqttClient = mqttFactory.CreateMqttClient())
        {
@@ -228,7 +206,7 @@ public static class Client_Connection_Samples
            using (var timeout = new CancellationTokenSource(5000))
            {
                var response = await mqttClient.ConnectAsync(mqttClientOptions, timeout.Token);
-
+                
                Console.WriteLine("The MQTT client is connected.");

                response.DumpToConsole();
@@ -236,49 +214,6 @@ public static class Client_Connection_Samples
        }
    }

-    public static async Task Disconnect_Clean()
-    {
-        /*
-         * This sample disconnects from the server with sending a DISCONNECT packet.
-         * This way of disconnecting is treated as a clean disconnect which will not
-         * trigger sending the last will etc.
-         */
-
-        var mqttFactory = new MqttFactory();
-
-        using (var mqttClient = mqttFactory.CreateMqttClient())
-        {
-            var mqttClientOptions = new MqttClientOptionsBuilder().WithTcpServer("broker.hivemq.com").Build();
-
-            await mqttClient.ConnectAsync(mqttClientOptions, CancellationToken.None);
-
-            // Calling _DisconnectAsync_ will send a DISCONNECT packet before closing the connection.
-            // Using a reason code requires MQTT version 5.0.0!
-            await mqttClient.DisconnectAsync(MqttClientDisconnectOptionsReason.ImplementationSpecificError);
-        }
-    }
-
-    public static async Task Disconnect_Non_Clean()
-    {
-        /*
-         * This sample disconnects from the server without sending a DISCONNECT packet.
-         * This way of disconnecting is treated as a non clean disconnect which will
-         * trigger sending the last will etc.
-         */
-
-        var mqttFactory = new MqttFactory();
-
-        var mqttClient = mqttFactory.CreateMqttClient();
-
-        var mqttClientOptions = new MqttClientOptionsBuilder().WithTcpServer("broker.hivemq.com").Build();
-
-        await mqttClient.ConnectAsync(mqttClientOptions, CancellationToken.None);
-
-        // Calling _Dispose_ or use of a _using_ statement will close the transport connection
-        // without sending a DISCONNECT packet to the server.
-        mqttClient.Dispose();
-    }
-
    public static async Task Inspect_Certificate_Validation_Errors()
    {
        /*
@@ -313,13 +248,13 @@ public static class Client_Connection_Samples
            }
        }
    }
-
+    
    public static async Task Ping_Server()
    {
        /*
         * This sample sends a PINGREQ packet to the server and waits for a reply.
         *
-         * This is only supported in MQTTv5.0.0+.
+         * This is only supported in METTv5.0.0+.
         */

        var mqttFactory = new MqttFactory();
@@ -386,12 +321,14 @@ public static class Client_Connection_Samples
                    {
                        try
                        {
-                            // This code will also do the very first connect! So no call to _ConnectAsync_ is required in the first place.
-                            if (!await mqttClient.TryPingAsync())
+                            // This code will also do the very first connect! So no call to _ConnectAsync_ is required
+                            // in the first place.
+                            if (!mqttClient.IsConnected)
                            {
                                await mqttClient.ConnectAsync(mqttClientOptions, CancellationToken.None);

                                // Subscribe to topics when session is clean etc.
+
                                Console.WriteLine("The MQTT client is connected.");
                            }
                        }
@@ -408,4 +345,4 @@ public static class Client_Connection_Samples
                });
        }
    }
-}
+}
@@ -40,53 +40,6 @@ public static class Client_Publish_Samples

            await mqttClient.PublishAsync(applicationMessage, CancellationToken.None);

-            await mqttClient.DisconnectAsync();
-            
-            Console.WriteLine("MQTT application message is published.");
-        }
-    }
-    
-    public static async Task Publish_Multiple_Application_Messages()
-    {
-        /*
-         * This sample pushes multiple simple application message including a topic and a payload.
-         *
-         * See sample _Publish_Application_Message_ for more details.
-         */
-
-        var mqttFactory = new MqttFactory();
-
-        using (var mqttClient = mqttFactory.CreateMqttClient())
-        {
-            var mqttClientOptions = new MqttClientOptionsBuilder()
-                .WithTcpServer("broker.hivemq.com")
-                .Build();
-
-            await mqttClient.ConnectAsync(mqttClientOptions, CancellationToken.None);
-
-            var applicationMessage = new MqttApplicationMessageBuilder()
-                .WithTopic("samples/temperature/living_room")
-                .WithPayload("19.5")
-                .Build();
-
-            await mqttClient.PublishAsync(applicationMessage, CancellationToken.None);
-            
-            applicationMessage = new MqttApplicationMessageBuilder()
-                .WithTopic("samples/temperature/living_room")
-                .WithPayload("20.0")
-                .Build();
-            
-            await mqttClient.PublishAsync(applicationMessage, CancellationToken.None);
-
-            applicationMessage = new MqttApplicationMessageBuilder()
-                .WithTopic("samples/temperature/living_room")
-                .WithPayload("21.0")
-                .Build();
-            
-            await mqttClient.PublishAsync(applicationMessage, CancellationToken.None);
-
-            await mqttClient.DisconnectAsync();
-            
            Console.WriteLine("MQTT application message is published.");
        }
    }
@@ -7,9 +7,7 @@
 // ReSharper disable InconsistentNaming

 using MQTTnet.Client;
-using MQTTnet.Packets;
-using MQTTnet.Protocol;
-using MQTTnet.Samples.Helpers;
+using MQTTnet.Samples.Shared;

 namespace MQTTnet.Samples.Client;

@@ -25,7 +23,9 @@ public static class Client_Subscribe_Samples

        using (var mqttClient = mqttFactory.CreateMqttClient())
        {
-            var mqttClientOptions = new MqttClientOptionsBuilder().WithTcpServer("broker.hivemq.com").Build();
+            var mqttClientOptions = new MqttClientOptionsBuilder()
+                .WithTcpServer("broker.hivemq.com")
+                .Build();

            // Setup message handling before connecting so that queued messages
            // are also handled properly. When there is no event handler attached all
@@ -41,11 +41,7 @@ public static class Client_Subscribe_Samples
            await mqttClient.ConnectAsync(mqttClientOptions, CancellationToken.None);

            var mqttSubscribeOptions = mqttFactory.CreateSubscribeOptionsBuilder()
-                .WithTopicFilter(
-                    f =>
-                    {
-                        f.WithTopic("mqttnet/samples/topic/2");
-                    })
+                .WithTopicFilter(f => { f.WithTopic("mqttnet/samples/topic/2"); })
                .Build();

            await mqttClient.SubscribeAsync(mqttSubscribeOptions, CancellationToken.None);
@@ -57,95 +53,6 @@ public static class Client_Subscribe_Samples
        }
    }

-    public static async Task Send_Responses()
-    {
-        /*
-         * This sample subscribes to a topic and sends a response to the broker. This requires at least QoS level 1 to work!
-         */
-
-        var mqttFactory = new MqttFactory();
-
-        using (var mqttClient = mqttFactory.CreateMqttClient())
-        {
-            mqttClient.ApplicationMessageReceivedAsync += delegate(MqttApplicationMessageReceivedEventArgs args)
-            {
-                // Do some work with the message...
-
-                // Now respond to the broker with a reason code other than success.
-                args.ReasonCode = MqttApplicationMessageReceivedReasonCode.ImplementationSpecificError;
-                args.ResponseReasonString = "That did not work!";
-
-                // User properties require MQTT v5!
-                args.ResponseUserProperties.Add(new MqttUserProperty("My", "Data"));
-
-                // Now the broker will resend the message again.
-                return Task.CompletedTask;
-            };
-
-            var mqttClientOptions = new MqttClientOptionsBuilder().WithTcpServer("broker.hivemq.com").Build();
-
-            await mqttClient.ConnectAsync(mqttClientOptions, CancellationToken.None);
-
-            var mqttSubscribeOptions = mqttFactory.CreateSubscribeOptionsBuilder()
-                .WithTopicFilter(
-                    f =>
-                    {
-                        f.WithTopic("mqttnet/samples/topic/1");
-                    })
-                .Build();
-
-            var response = await mqttClient.SubscribeAsync(mqttSubscribeOptions, CancellationToken.None);
-
-            Console.WriteLine("MQTT client subscribed to topic.");
-
-            // The response contains additional data sent by the server after subscribing.
-            response.DumpToConsole();
-        }
-    }
-
-    public static async Task Subscribe_Multiple_Topics()
-    {
-        /*
-         * This sample subscribes to several topics in a single request.
-         */
-
-        var mqttFactory = new MqttFactory();
-
-        using (var mqttClient = mqttFactory.CreateMqttClient())
-        {
-            var mqttClientOptions = new MqttClientOptionsBuilder().WithTcpServer("broker.hivemq.com").Build();
-
-            await mqttClient.ConnectAsync(mqttClientOptions, CancellationToken.None);
-
-            // Create the subscribe options including several topics with different options.
-            // It is also possible to all of these topics using a dedicated call of _SubscribeAsync_ per topic.
-            var mqttSubscribeOptions = mqttFactory.CreateSubscribeOptionsBuilder()
-                .WithTopicFilter(
-                    f =>
-                    {
-                        f.WithTopic("mqttnet/samples/topic/1");
-                    })
-                .WithTopicFilter(
-                    f =>
-                    {
-                        f.WithTopic("mqttnet/samples/topic/2").WithNoLocal();
-                    })
-                .WithTopicFilter(
-                    f =>
-                    {
-                        f.WithTopic("mqttnet/samples/topic/3").WithRetainHandling(MqttRetainHandling.SendAtSubscribe);
-                    })
-                .Build();
-
-            var response = await mqttClient.SubscribeAsync(mqttSubscribeOptions, CancellationToken.None);
-
-            Console.WriteLine("MQTT client subscribed to topics.");
-
-            // The response contains additional data sent by the server after subscribing.
-            response.DumpToConsole();
-        }
-    }
-
    public static async Task Subscribe_Topic()
    {
        /*
@@ -156,16 +63,14 @@ public static class Client_Subscribe_Samples

        using (var mqttClient = mqttFactory.CreateMqttClient())
        {
-            var mqttClientOptions = new MqttClientOptionsBuilder().WithTcpServer("broker.hivemq.com").Build();
+            var mqttClientOptions = new MqttClientOptionsBuilder()
+                .WithTcpServer("broker.hivemq.com")
+                .Build();

            await mqttClient.ConnectAsync(mqttClientOptions, CancellationToken.None);

            var mqttSubscribeOptions = mqttFactory.CreateSubscribeOptionsBuilder()
-                .WithTopicFilter(
-                    f =>
-                    {
-                        f.WithTopic("mqttnet/samples/topic/1");
-                    })
+                .WithTopicFilter(f => { f.WithTopic("mqttnet/samples/topic/1"); })
                .Build();

            var response = await mqttClient.SubscribeAsync(mqttSubscribeOptions, CancellationToken.None);
@@ -8,6 +8,7 @@

 using System.Text;
 using MQTTnet.Diagnostics;
+using MQTTnet.Samples.Shared;

 namespace MQTTnet.Samples.Diagnostics;

@@ -22,9 +23,7 @@ public static class Logger_Samples

        var mqttFactory = new MqttFactory(new MyLogger());

-        var mqttClientOptions = mqttFactory.CreateClientOptionsBuilder()
-            .WithTcpServer("broker.hivemq.com")
-            .Build();
+        var mqttClientOptions = mqttFactory.CreateClientOptionsBuilder().WithTcpServer("broker.hivemq.com").Build();

        using (var mqttClient = mqttFactory.CreateMqttClient())
        {
@@ -32,13 +31,31 @@ public static class Logger_Samples

            Console.WriteLine("MQTT client is connected.");

-            var mqttClientDisconnectOptions = mqttFactory.CreateClientDisconnectOptionsBuilder()
-                .Build();
+            var mqttClientDisconnectOptions = mqttFactory.CreateClientDisconnectOptionsBuilder().Build();

            await mqttClient.DisconnectAsync(mqttClientDisconnectOptions, CancellationToken.None);
        }
    }

+    public static async Task Log_To_Console()
+    {
+        /*
+       * This sample covers the creation of a custom logger which is used to log to the console.
+       */
+
+        var mqttFactory = new MqttFactory(new ConsoleLogger());
+
+        var mqttClientOptions = mqttFactory.CreateClientOptionsBuilder().WithTcpServer("broker.hivemq.com").Build();
+
+        using (var mqttClient = mqttFactory.CreateMqttClient())
+        {
+            await mqttClient.ConnectAsync(mqttClientOptions, CancellationToken.None);
+
+            Console.WriteLine("MQTT client is connected. Press any key to exit.");
+            Console.ReadKey(true);
+        }
+    }
+
    public static async Task Use_Event_Logger()
    {
        /*
@@ -64,9 +81,7 @@ public static class Logger_Samples

        var mqttFactory = new MqttFactory(mqttEventLogger);

-        var mqttClientOptions = mqttFactory.CreateClientOptionsBuilder()
-            .WithTcpServer("broker.hivemq.com")
-            .Build();
+        var mqttClientOptions = mqttFactory.CreateClientOptionsBuilder().WithTcpServer("broker.hivemq.com").Build();

        using (var mqttClient = mqttFactory.CreateMqttClient())
        {
@@ -74,8 +89,7 @@ public static class Logger_Samples

            Console.WriteLine("MQTT client is connected.");

-            var mqttClientDisconnectOptions = mqttFactory.CreateClientDisconnectOptionsBuilder()
-                .Build();
+            var mqttClientDisconnectOptions = mqttFactory.CreateClientDisconnectOptionsBuilder().Build();

            await mqttClient.DisconnectAsync(mqttClientDisconnectOptions, CancellationToken.None);
        }
@@ -83,7 +97,7 @@ public static class Logger_Samples

    sealed class MyLogger : IMqttNetLogger
    {
-        public bool IsEnabled { get; set; } = true;
+        public bool IsEnabled { get; } = true;

        public void Publish(MqttNetLogLevel logLevel, string source, string message, object[] parameters, Exception exception)
        {
@@ -9,10 +9,12 @@
        <DisableImplicitAspNetCoreAnalyzers>true</DisableImplicitAspNetCoreAnalyzers>
        <EnableNETAnalyzers>false</EnableNETAnalyzers>
        <EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
-        <NoWarn>1591;NETSDK1138</NoWarn>
+        <NoWarn>1591</NoWarn>
    </PropertyGroup>

    <ItemGroup>
+        <PackageReference Include="Microsoft.CodeAnalysis.Compilers" Version="4.0.1" />
+        <PackageReference Include="Microsoft.Net.Compilers" Version="4.0.1" />

        <ProjectReference Include="..\Source\MQTTnet.AspnetCore\MQTTnet.AspNetCore.csproj" />
        <ProjectReference Include="..\Source\MQTTnet.Extensions.ManagedClient\MQTTnet.Extensions.ManagedClient.csproj" />
@@ -44,9 +44,9 @@ public sealed class Managed_Client_Simple_Samples
            Console.WriteLine("The managed MQTT client is connected.");
            
            // Wait until the queue is fully processed.
-            SpinWait.SpinUntil(() => managedMqttClient.EnqueuedApplicationMessagesCount == 0, 10000);
+            SpinWait.SpinUntil(() => managedMqttClient.PendingApplicationMessagesCount == 0, 10000);
            
-            Console.WriteLine($"Pending messages = {managedMqttClient.EnqueuedApplicationMessagesCount}");
+            Console.WriteLine($"Pending messages = {managedMqttClient.PendingApplicationMessagesCount}");
        }
    }
 }
@@ -8,6 +8,7 @@ Console.WriteLine("Welcome to MQTTnet samples!");
 Console.WriteLine();

 var sampleClasses = Assembly.GetExecutingAssembly().GetExportedTypes().OrderBy(c => c.Name).ToList();
+sampleClasses.RemoveAll(c => c.Namespace.Contains(".Shared"));

 var index = 0;
 foreach (var sampleClass in sampleClasses)
@@ -1,53 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using MQTTnet.Internal;
-using MQTTnet.Packets;
-using MQTTnet.Server;
-
-namespace MQTTnet.Samples.Server;
-
-// ReSharper disable UnusedType.Global
-// ReSharper disable UnusedMember.Global
-// ReSharper disable InconsistentNaming
-// ReSharper disable EmptyConstructor
-// ReSharper disable MemberCanBeMadeStatic.Local
-
-public static class Server_Diagnostics_Samples
-{
-    public static async Task Get_Notified_When_Client_Received_Message()
-    {
-        /*
-         * This sample starts a MQTT server and attaches an event which gets fired whenever
-         * a client received and acknowledged a PUBLISH packet.
-         */
-        
-        var mqttFactory = new MqttFactory();
-        var mqttServerOptions = new MqttServerOptionsBuilder().WithDefaultEndpoint().Build();
-        
-        using (var mqttServer = mqttFactory.CreateMqttServer(mqttServerOptions))
-        {
-            // Attach the event handler.
-            mqttServer.ClientAcknowledgedPublishPacketAsync += e =>
-            {
-                Console.WriteLine($"Client '{e.ClientId}' acknowledged packet {e.PublishPacket.PacketIdentifier} with topic '{e.PublishPacket.Topic}'");
-                
-                // It is also possible to read additional data from the client response. This requires casting the response packet.
-                var qos1AcknowledgePacket = e.AcknowledgePacket as MqttPubAckPacket;
-                Console.WriteLine($"QoS 1 reason code: {qos1AcknowledgePacket?.ReasonCode}");
-                
-                var qos2AcknowledgePacket = e.AcknowledgePacket as MqttPubCompPacket;
-                Console.WriteLine($"QoS 2 reason code: {qos1AcknowledgePacket?.ReasonCode}");
-                return CompletedTask.Instance;
-            };
-            
-            await mqttServer.StartAsync();
-
-            Console.WriteLine("Press Enter to exit.");
-            Console.ReadLine();
-
-            await mqttServer.StopAsync();
-        }
-    }
-}
@@ -1,47 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-// ReSharper disable UnusedType.Global
-// ReSharper disable UnusedMember.Global
-// ReSharper disable InconsistentNaming
-// ReSharper disable EmptyConstructor
-// ReSharper disable MemberCanBeMadeStatic.Local
-
-using MQTTnet.Internal;
-using MQTTnet.Server;
-
-namespace MQTTnet.Samples.Server;
-
-public static class Server_Intercepting_Samples
-{
-    public static async Task Intercept_Application_Messages()
-    {
-        /*
-         * This sample starts a simple MQTT server which manipulate all processed application messages.
-         * Please see _Server_Simple_Samples_ for more details on how to start a server.
-         */
-
-        var mqttFactory = new MqttFactory();
-        var mqttServerOptions = new MqttServerOptionsBuilder().WithDefaultEndpoint().Build();
-
-        using (var mqttServer = mqttFactory.CreateMqttServer(mqttServerOptions))
-        {
-            mqttServer.InterceptingPublishAsync += args =>
-            {
-                // Here we only change the topic of the received application message.
-                // but also changing the payload etc. is required. Changing the QoS after
-                // transmitting is not supported and makes no sense at all.
-                args.ApplicationMessage.Topic += "/manipulated";
-
-                return CompletedTask.Instance;
-            };
-
-            await mqttServer.StartAsync();
-
-            Console.WriteLine("Press Enter to exit.");
-            Console.ReadLine();
-            await mqttServer.StopAsync();
-        }
-    }
-}
@@ -6,8 +6,8 @@
 // ReSharper disable UnusedMember.Global
 // ReSharper disable InconsistentNaming

-using MQTTnet.Diagnostics;
 using MQTTnet.Protocol;
+using MQTTnet.Samples.Shared;
 using MQTTnet.Server;

 namespace MQTTnet.Samples.Server;
@@ -170,50 +170,4 @@ public static class Server_Simple_Samples
        await server.StartAsync();
        return server;
    }
-
-    class ConsoleLogger : IMqttNetLogger
-    {
-        readonly object _consoleSyncRoot = new();
-
-        public bool IsEnabled => true;
-
-        public void Publish(MqttNetLogLevel logLevel, string source, string message, object[]? parameters, Exception? exception)
-        {
-            var foregroundColor = ConsoleColor.White;
-            switch (logLevel)
-            {
-                case MqttNetLogLevel.Verbose:
-                    foregroundColor = ConsoleColor.White;
-                    break;
-
-                case MqttNetLogLevel.Info:
-                    foregroundColor = ConsoleColor.Green;
-                    break;
-
-                case MqttNetLogLevel.Warning:
-                    foregroundColor = ConsoleColor.DarkYellow;
-                    break;
-
-                case MqttNetLogLevel.Error:
-                    foregroundColor = ConsoleColor.Red;
-                    break;
-            }
-
-            if (parameters?.Length > 0)
-            {
-                message = string.Format(message, parameters);
-            }
-
-            lock (_consoleSyncRoot)
-            {
-                Console.ForegroundColor = foregroundColor;
-                Console.WriteLine(message);
-
-                if (exception != null)
-                {
-                    Console.WriteLine(exception);
-                }
-            }
-        }
-    }
 }
@@ -0,0 +1,53 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using MQTTnet.Diagnostics;
+
+namespace MQTTnet.Samples.Shared;
+
+public sealed class ConsoleLogger : IMqttNetLogger
+{
+    readonly object _consoleSyncRoot = new();
+
+    public bool IsEnabled => true;
+
+    public void Publish(MqttNetLogLevel logLevel, string source, string message, object[]? parameters, Exception? exception)
+    {
+        var foregroundColor = ConsoleColor.White;
+        switch (logLevel)
+        {
+            case MqttNetLogLevel.Verbose:
+                foregroundColor = ConsoleColor.White;
+                break;
+
+            case MqttNetLogLevel.Info:
+                foregroundColor = ConsoleColor.Green;
+                break;
+
+            case MqttNetLogLevel.Warning:
+                foregroundColor = ConsoleColor.DarkYellow;
+                break;
+
+            case MqttNetLogLevel.Error:
+                foregroundColor = ConsoleColor.Red;
+                break;
+        }
+
+        if (parameters?.Length > 0)
+        {
+            message = string.Format(message, parameters);
+        }
+
+        lock (_consoleSyncRoot)
+        {
+            Console.ForegroundColor = foregroundColor;
+            Console.WriteLine(message);
+
+            if (exception != null)
+            {
+                Console.WriteLine(exception);
+            }
+        }
+    }
+}
@@ -4,7 +4,7 @@

 using System.Text.Json;

-namespace MQTTnet.Samples.Helpers;
+namespace MQTTnet.Samples.Shared;

 internal static class ObjectExtensions
 {
@@ -12,6 +12,8 @@
        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
        <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
        <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
+        <PackageReference Include="Microsoft.CodeAnalysis.Compilers" Version="4.0.1" />
+        <PackageReference Include="Microsoft.Net.Compilers" Version="4.0.1" />
    </ItemGroup>

    <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
@@ -0,0 +1,26 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Collections.Generic;
+using System.IO.Pipelines;
+using Microsoft.AspNetCore.Connections;
+using Microsoft.AspNetCore.Http.Features;
+
+namespace MQTTnet.AspNetCore.Tests.Mockups
+{
+    public class ConnectionContextMockup : ConnectionContext
+    {
+        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 ConnectionContextMockup()
+        {
+            //Transport = new DefaultConnectionContext
+        }
+    }
+}
@@ -2,24 +2,20 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using System;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Connections;
 using MQTTnet.Adapter;
-using MQTTnet.Diagnostics;
 using MQTTnet.Formatter;
 using MQTTnet.Server;
+using System;
+using System.Threading.Tasks;
+using MQTTnet.Diagnostics;

 namespace MQTTnet.AspNetCore.Tests.Mockups
 {
-    public sealed class ConnectionHandlerMockup : IMqttServerAdapter
+    public class ConnectionHandlerMockup: IMqttServerAdapter
    {
-        public Func<IMqttChannelAdapter, Task> ClientHandler { get; set; }
        public TaskCompletionSource<MqttConnectionContext> Context { get; } = new TaskCompletionSource<MqttConnectionContext>();
-
-        public void Dispose()
-        {
-        }
+        public Func<IMqttChannelAdapter, Task> ClientHandler { get; set; }

        public async Task OnConnectedAsync(ConnectionContext connection)
        {
@@ -46,5 +42,9 @@ namespace MQTTnet.AspNetCore.Tests.Mockups
        {
            return Task.CompletedTask;
        }
+
+        public void Dispose()
+        {
+        }
    }
-}
+}
@@ -6,7 +6,7 @@ using System.IO.Pipelines;

 namespace MQTTnet.AspNetCore.Tests.Mockups
 {
-    public sealed class DuplexPipeMockup : IDuplexPipe
+    public class DuplexPipeMockup : IDuplexPipe
    {
        public DuplexPipeMockup()
        {
@@ -20,8 +20,9 @@ namespace MQTTnet.AspNetCore.Tests.Mockups

        PipeWriter IDuplexPipe.Output => Send.Writer;

-        public Pipe Receive { get; } 

-        public Pipe Send { get; }
+        public Pipe Receive { get; set; } 
+
+        public Pipe Send { get; set; }
    }
 }
@@ -6,7 +6,7 @@ using System.Buffers;

 namespace MQTTnet.AspNetCore.Tests.Mockups
 {
-    public sealed class LimitedMemoryPool : MemoryPool<byte>
+    public class LimitedMemoryPool : MemoryPool<byte>
    {
        protected override void Dispose(bool disposing)
        {
@@ -7,9 +7,9 @@ using System.Buffers;

 namespace MQTTnet.AspNetCore.Tests.Mockups
 {
-    public sealed class MemoryOwner : IMemoryOwner<byte>
+    public class MemoryOwner : IMemoryOwner<byte>
    {
-        readonly byte[] _raw;
+        private readonly byte[] _raw;

        public MemoryOwner(int size)
        {
@@ -27,11 +27,11 @@ namespace MQTTnet.AspNetCore.Tests.Mockups
            Memory = _raw;
        }

-        public Memory<byte> Memory { get; }
-
        public void Dispose()
        {
            ArrayPool<byte>.Shared.Return(_raw);
        }
+
+        public Memory<byte> Memory { get; }
    }
 }
@@ -2,29 +2,44 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using System;
-using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Connections;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using System;
+using System.Net;
+using System.Threading;
+using System.Threading.Tasks;
 using MQTTnet.Adapter;
 using MQTTnet.AspNetCore.Tests.Mockups;
-using MQTTnet.Client;
 using MQTTnet.Exceptions;
 using MQTTnet.Formatter;
 using MQTTnet.Packets;
+using MQTTnet.Client;
 using MQTTnet.Protocol;
-using MQTTnet.Tests.Helpers;
+using MQTTnet.Tests.Extensions;

 namespace MQTTnet.AspNetCore.Tests
 {
    [TestClass]
    public class MqttConnectionContextTest
    {
+        [TestMethod]
+        public async Task TestReceivePacketAsyncThrowsWhenReaderCompleted()
+        {
+            var serializer = new MqttPacketFormatterAdapter(MqttProtocolVersion.V311, new MqttBufferWriter(4096, 65535));
+            var pipe = new DuplexPipeMockup();
+            var connection = new DefaultConnectionContext();
+            connection.Transport = pipe;
+            var ctx = new MqttConnectionContext(serializer, connection);
+
+            pipe.Receive.Writer.Complete();
+
+            await Assert.ThrowsExceptionAsync<MqttCommunicationException>(() => ctx.ReceivePacketAsync(CancellationToken.None));
+        }
+
        [TestMethod]
        public async Task TestCorruptedConnectPacket()
        {
@@ -34,43 +49,13 @@ namespace MQTTnet.AspNetCore.Tests
            var connection = new DefaultConnectionContext();
            connection.Transport = pipe;
            var ctx = new MqttConnectionContext(serializer, connection);
-
-            await pipe.Receive.Writer.WriteAsync(writer.AddMqttHeader(MqttControlPacketType.Connect, Array.Empty<byte>()));
+            
+            await pipe.Receive.Writer.WriteAsync(writer.AddMqttHeader(MqttControlPacketType.Connect, new byte[0]));

            await Assert.ThrowsExceptionAsync<MqttProtocolViolationException>(() => ctx.ReceivePacketAsync(CancellationToken.None));

            // the first exception should complete the pipes so if someone tries to use the connection after that it should throw immidiatly
-            await Assert.ThrowsExceptionAsync<InvalidOperationException>(() => ctx.ReceivePacketAsync(CancellationToken.None));
-        }
-
-        [TestMethod]
-        public async Task TestEndpoint()
-        {
-            var mockup = new ConnectionHandlerMockup();
-
-
-            using (var host = new WebHostBuilder().UseKestrel(kestrel => kestrel.ListenLocalhost(1883, listener => listener.Use((ctx, next) => mockup.OnConnectedAsync(ctx))))
-                       .UseStartup<Startup>()
-                       .ConfigureServices(
-                           (hostContext, services) =>
-                           {
-                               services.AddHostedMqttServer(o => o.WithoutDefaultEndpoint());
-                               services.AddSingleton<IMqttServerAdapter>(mockup);
-                           })
-                       .Build())
-
-            using (var client = new MqttFactory().CreateMqttClient())
-            {
-                host.Start();
-                await client.ConnectAsync(new MqttClientOptionsBuilder().WithTcpServer("localhost").Build(), CancellationToken.None);
-
-                var ctx = await mockup.Context.Task;
-#if NETCOREAPP3_1
-                var ep = IPEndPoint.Parse(ctx.Endpoint);
-                Assert.IsNotNull(ep);
-#endif
-                Assert.IsNotNull(ctx);
-            }
+            await Assert.ThrowsExceptionAsync<InvalidOperationException>(() =>  ctx.ReceivePacketAsync(CancellationToken.None));
        }

        // COMMENTED OUT DUE TO DEAD LOCK? OR VERY VERY SLOW PERFORMANCE ON LOCAL DEV MACHINE. TEST WAS STILL RUNNING AFTER SEVERAL MINUTES!
@@ -93,7 +78,7 @@ namespace MQTTnet.AspNetCore.Tests

        //    await Task.WhenAll(tasks).ConfigureAwait(false);
        //}
-
+        
        [TestMethod]
        public async Task TestLargePacket()
        {
@@ -109,25 +94,43 @@ namespace MQTTnet.AspNetCore.Tests
            Assert.IsTrue(readResult.Buffer.Length > 20000);
        }

-        [TestMethod]
-        public async Task TestReceivePacketAsyncThrowsWhenReaderCompleted()
-        {
-            var serializer = new MqttPacketFormatterAdapter(MqttProtocolVersion.V311, new MqttBufferWriter(4096, 65535));
-            var pipe = new DuplexPipeMockup();
-            var connection = new DefaultConnectionContext();
-            connection.Transport = pipe;
-            var ctx = new MqttConnectionContext(serializer, connection);
-
-            pipe.Receive.Writer.Complete();
-
-            await Assert.ThrowsExceptionAsync<MqttCommunicationException>(() => ctx.ReceivePacketAsync(CancellationToken.None));
-        }
-
-        class Startup
+        private class Startup 
        {
            public void Configure(IApplicationBuilder app)
-            {
+            { 
            }
        }
+
+        [TestMethod]
+        public async Task TestEndpoint()
+        {
+            var mockup = new ConnectionHandlerMockup();
+
+
+            using (var host = new WebHostBuilder()
+                .UseKestrel(kestrel => kestrel.ListenLocalhost(1883, listener => listener.Use((ctx, next) => mockup.OnConnectedAsync(ctx))))
+                .UseStartup<Startup>()
+                .ConfigureServices((hostContext, services) =>
+                {
+                    services.AddHostedMqttServer(o => o.WithoutDefaultEndpoint());
+                    services.AddSingleton<IMqttServerAdapter>(mockup);
+                })
+                .Build())
+                
+            using (var client = new MqttFactory().CreateMqttClient())
+            {
+                host.Start();
+                await client.ConnectAsync(new MqttClientOptionsBuilder()
+                    .WithTcpServer("localhost")
+                    .Build(), CancellationToken.None);
+
+                var ctx = await mockup.Context.Task;
+#if NETCOREAPP3_1
+                var ep = IPEndPoint.Parse(ctx.Endpoint);
+                Assert.IsNotNull(ep);
+#endif
+                Assert.IsNotNull(ctx);
+            }               
+        }
    }
-}
+}
@@ -12,7 +12,7 @@ using MQTTnet.Packets;
 namespace MQTTnet.AspNetCore.Tests
 {
    [TestClass]
-    public sealed class ReaderExtensionsTest
+    public class ReaderExtensionsTest
    {
        [TestMethod]
        public void TestTryDeserialize()
@@ -8,15 +8,17 @@
        <DisableImplicitAspNetCoreAnalyzers>true</DisableImplicitAspNetCoreAnalyzers>
        <EnableNETAnalyzers>false</EnableNETAnalyzers>
        <EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
-        <NoWarn>1591;NETSDK1138</NoWarn>
    </PropertyGroup>

    <ItemGroup>
-        <ProjectReference Include="..\..\Source\MQTTnet.AspnetCore\MQTTnet.AspNetCore.csproj" />
+        <ProjectReference Include="..\..\Source\MQTTnet.AspnetCore\MQTTnet.AspNetCore.csproj"/>
+
+        <PackageReference Include="Microsoft.CodeAnalysis.Compilers" Version="4.0.1" />
+        <PackageReference Include="Microsoft.Net.Compilers" Version="4.0.1" />
    </ItemGroup>

    <ItemGroup>
-        <Folder Include="wwwroot\" />
+        <Folder Include="wwwroot\"/>
    </ItemGroup>

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

            _socket?.Dispose();

-#if NETCOREAPP3_1_OR_GREATER
+#if NETCOREAPP3_1 || NET5_0_OR_GREATER

            return base.DisposeAsync();
        }
@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.


-#if NETCOREAPP3_1_OR_GREATER
+#if NETCOREAPP3_1 || NET5_0_OR_GREATER

 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Routing;
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

    <PropertyGroup>
-        <TargetFrameworks>netstandard2.0;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>netstandard2.0;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>

        <AssemblyName>MQTTnet.AspNetCore</AssemblyName>
        <RootNamespace>MQTTnet.AspNetCore</RootNamespace>
@@ -32,8 +32,7 @@
        <DisableImplicitAspNetCoreAnalyzers>true</DisableImplicitAspNetCoreAnalyzers>
        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
        <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <NoWarn>1591;NETSDK1138</NoWarn>
-        <LangVersion>7.3</LangVersion>
+        <NoWarn>1591</NoWarn>
    </PropertyGroup>

    <ItemGroup>
@@ -51,11 +50,11 @@
        <DefineConstants>RELEASE;NETSTANDARD2_0</DefineConstants>
    </PropertyGroup>

-    <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0' or '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0' ">
+    <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0' or '$(TargetFramework)' == 'net6.0' ">
        <FrameworkReference Include="Microsoft.AspNetCore.App" />
    </ItemGroup>

-    <ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp3.1' and '$(TargetFramework)' != 'net5.0' and '$(TargetFramework)' != 'net6.0' and '$(TargetFramework)' != 'net7.0' ">
+    <ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp3.1' and '$(TargetFramework)' != 'net5.0' and '$(TargetFramework)' != 'net6.0' ">
        <PackageReference Include="Microsoft.AspNetCore.Http.Connections" Version="1.1.0" />
    </ItemGroup>

@@ -2,59 +2,38 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using System;
-using System.IO.Pipelines;
-using System.Net;
-using System.Security.Cryptography.X509Certificates;
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Connections;
 using Microsoft.AspNetCore.Http.Connections.Features;
-using Microsoft.AspNetCore.Http.Features;
 using MQTTnet.Adapter;
 using MQTTnet.AspNetCore.Client.Tcp;
 using MQTTnet.Exceptions;
 using MQTTnet.Formatter;
-using MQTTnet.Internal;
 using MQTTnet.Packets;
+using System;
+using System.IO.Pipelines;
+using System.Security.Cryptography.X509Certificates;
+using System.Threading;
+using System.Threading.Tasks;
+using MQTTnet.Internal;

 namespace MQTTnet.AspNetCore
 {
    public sealed class MqttConnectionContext : IMqttChannelAdapter
    {
-        readonly ConnectionContext _connection;
        readonly AsyncLock _writerLock = new AsyncLock();
-
+        
        PipeReader _input;
        PipeWriter _output;
-
+        
        public MqttConnectionContext(MqttPacketFormatterAdapter packetFormatterAdapter, ConnectionContext connection)
        {
            PacketFormatterAdapter = packetFormatterAdapter ?? throw new ArgumentNullException(nameof(packetFormatterAdapter));
-            _connection = connection ?? throw new ArgumentNullException(nameof(connection));
+            Connection = connection ?? throw new ArgumentNullException(nameof(connection));

-            _input = connection.Transport.Input;
-            _output = connection.Transport.Output;
-        }
-
-        public long BytesReceived { get; private set; }
-
-        public long BytesSent { get; private set; }
-
-        public X509Certificate2 ClientCertificate
-        {
-            get
+            if (Connection.Transport != null)
            {
-                // mqtt over tcp
-                var tlsFeature = _connection.Features.Get<ITlsConnectionFeature>();
-                if (tlsFeature != null)
-                {
-                    return tlsFeature.ClientCertificate;
-                }
-
-                // mqtt over websocket
-                var httpFeature = _connection.Features.Get<IHttpContextFeature>();
-                return httpFeature?.HttpContext?.Connection.ClientCertificate;
+                _input = Connection.Transport.Input;
+                _output = Connection.Transport.Output;
            }
        }

@@ -62,59 +41,47 @@ namespace MQTTnet.AspNetCore
        {
            get
            {
-                // mqtt over tcp 
-#if NETCOREAPP3_1_OR_GREATER
-                if (_connection.RemoteEndPoint != null)
+#if NETCOREAPP3_1
+                if (Connection?.RemoteEndPoint != null)
                {
-                    return _connection.RemoteEndPoint.ToString();
+                    return Connection.RemoteEndPoint.ToString();
                }
 #endif
-                // mqtt over websocket
-                var httpFeature = _connection.Features.Get<IHttpConnectionFeature>();
-                if (httpFeature?.RemoteIpAddress != null)
+                var connection = Http?.HttpContext?.Connection;
+                if (connection == null)
                {
-                    return new IPEndPoint(httpFeature.RemoteIpAddress, httpFeature.RemotePort).ToString();
+                    return Connection.ConnectionId;
                }

-                return null;
+                return $"{connection.RemoteIpAddress}:{connection.RemotePort}";
            }
        }

+        public bool IsSecureConnection => Http?.HttpContext?.Request?.IsHttps ?? false;
+
+        public X509Certificate2 ClientCertificate => Http?.HttpContext?.Connection?.ClientCertificate;
+
+        public ConnectionContext Connection { get; }
+        
+        public MqttPacketFormatterAdapter PacketFormatterAdapter { get; }
+
+        public long BytesSent { get; set; }
+
+        public long BytesReceived { get; set; }
+
        public bool IsReadingPacket { get; private set; }

-        public bool IsSecureConnection
-        {
-            get
-            {
-                // mqtt over tcp
-                var tlsFeature = _connection.Features.Get<ITlsConnectionFeature>();
-                if (tlsFeature != null)
-                {
-                    return true;
-                }
-
-                // mqtt over websocket
-                var httpFeature = _connection.Features.Get<IHttpContextFeature>();
-                if (httpFeature?.HttpContext != null)
-                {
-                    return httpFeature.HttpContext.Request.IsHttps;
-                }
-
-                return false;
-            }
-        }
-
-        public MqttPacketFormatterAdapter PacketFormatterAdapter { get; }
+        IHttpContextFeature Http => Connection.Features.Get<IHttpContextFeature>();

        public async Task ConnectAsync(CancellationToken cancellationToken)
        {
-            if (_connection is TcpConnection tcp && !tcp.IsConnected)
+            if (Connection is TcpConnection tcp && !tcp.IsConnected)
            {
                await tcp.StartAsync().ConfigureAwait(false);
            }

-            _input = _connection.Transport.Input;
-            _output = _connection.Transport.Output;
+            _input = Connection.Transport.Input;
+            _output = Connection.Transport.Output;
        }

        public Task DisconnectAsync(CancellationToken cancellationToken)
@@ -125,19 +92,16 @@ namespace MQTTnet.AspNetCore
            return Task.CompletedTask;
        }

-        public void Dispose()
-        {
-            _writerLock.Dispose();
-        }
-
        public async Task<MqttPacket> ReceivePacketAsync(CancellationToken cancellationToken)
        {
+            var input = Connection.Transport.Input;
+
            try
            {
                while (!cancellationToken.IsCancellationRequested)
                {
                    ReadResult readResult;
-                    var readTask = _input.ReadAsync(cancellationToken);
+                    var readTask = input.ReadAsync(cancellationToken);
                    if (readTask.IsCompleted)
                    {
                        readResult = readTask.Result;
@@ -177,15 +141,15 @@ namespace MQTTnet.AspNetCore
                        // The buffer was sliced up to where it was consumed, so we can just advance to the start.
                        // We mark examined as buffer.End so that if we didn't receive a full frame, we'll wait for more data
                        // before yielding the read again.
-                        _input.AdvanceTo(consumed, observed);
+                        input.AdvanceTo(consumed, observed);
                    }
                }
            }
-            catch (Exception exception)
+            catch (Exception e)
            {
                // completing the channel makes sure that there is no more data read after a protocol error
-                _input?.Complete(exception);
-                _output?.Complete(exception);
+                _input?.Complete(e);
+                _output?.Complete(e);
                throw;
            }
            finally
@@ -205,44 +169,25 @@ namespace MQTTnet.AspNetCore

        public async Task SendPacketAsync(MqttPacket packet, CancellationToken cancellationToken)
        {
-            using (await _writerLock.EnterAsync(cancellationToken).ConfigureAwait(false))
+            var formatter = PacketFormatterAdapter;
+            
+            using (await _writerLock.WaitAsync(cancellationToken).ConfigureAwait(false))
            {
-                try
+                var buffer = formatter.Encode(packet);
+                var msg = buffer.Join().AsMemory();
+                var output = _output;
+                var result = await output.WriteAsync(msg, cancellationToken).ConfigureAwait(false);
+                if (result.IsCompleted)
                {
-                    var buffer = PacketFormatterAdapter.Encode(packet);
-
-                    if (buffer.Payload.Count == 0)
-                    {
-                        // zero copy
-                        // https://github.com/dotnet/runtime/blob/e31ddfdc4f574b26231233dc10c9a9c402f40590/src/libraries/System.IO.Pipelines/src/System/IO/Pipelines/StreamPipeWriter.cs#L279
-                        await _output.WriteAsync(buffer.Packet, cancellationToken).ConfigureAwait(false);
-                    }
-                    else
-                    {
-                        WritePacketBuffer(_output, buffer);
-                        await _output.FlushAsync(cancellationToken).ConfigureAwait(false);
-                    }
-
-                    BytesSent += buffer.Length;
-                }
-                finally
-                {
-                    PacketFormatterAdapter.Cleanup();
+                    BytesSent += msg.Length;
                }
+
+                PacketFormatterAdapter.Cleanup();
            }
        }

-        static void WritePacketBuffer(PipeWriter output, MqttPacketBuffer buffer)
+        public void Dispose()
        {
-            // copy MqttPacketBuffer's Packet and Payload to the same buffer block of PipeWriter
-            // MqttPacket will be transmitted within the bounds of a WebSocket frame after PipeWriter.FlushAsync
-
-            var span = output.GetSpan(buffer.Length);
-
-            buffer.Packet.AsSpan().CopyTo(span);
-            buffer.Payload.AsSpan().CopyTo(span.Slice(buffer.Packet.Count));
-
-            output.Advance(buffer.Length);
        }
    }
-}
+}
@@ -2,23 +2,21 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

+using System;
+using System.Buffers;
 using MQTTnet.Adapter;
 using MQTTnet.Exceptions;
 using MQTTnet.Formatter;
 using MQTTnet.Packets;
-using System;
-using System.Buffers;
-using System.Linq;
-using System.Runtime.InteropServices;

 namespace MQTTnet.AspNetCore
 {
    public static class ReaderExtensions
    {
-        public static bool TryDecode(this MqttPacketFormatterAdapter formatter,
-            in ReadOnlySequence<byte> input,
-            out MqttPacket packet,
-            out SequencePosition consumed,
+        public static bool TryDecode(this MqttPacketFormatterAdapter formatter, 
+            in ReadOnlySequence<byte> input, 
+            out MqttPacket packet, 
+            out SequencePosition consumed, 
            out SequencePosition observed,
            out int bytesRead)
        {
@@ -35,22 +33,22 @@ namespace MQTTnet.AspNetCore
                return false;
            }

-            if (!TryReadBodyLength(ref copy, out var headerLength, out var bodyLength))
+            var fixedHeader = copy.First.Span[0];
+            if (!TryReadBodyLength(ref copy, out int headerLength, out var bodyLength))
            {
                return false;
            }

-            var fixedHeader = copy.First.Span[0];
-            copy = copy.Slice(headerLength);
            if (copy.Length < bodyLength)
            {
                return false;
            }

            var bodySlice = copy.Slice(0, bodyLength);
-            var bodySegment = GetArraySegment(ref bodySlice); 
-    
-            var receivedMqttPacket = new ReceivedMqttPacket(fixedHeader, bodySegment, headerLength + bodyLength);
+            var buffer = bodySlice.GetMemory().ToArray();
+            
+            var receivedMqttPacket = new ReceivedMqttPacket(fixedHeader, new ArraySegment<byte>(buffer, 0, buffer.Length), buffer.Length + 2);
+
            if (formatter.ProtocolVersion == MqttProtocolVersion.Unknown)
            {
                formatter.DetectProtocolVersion(receivedMqttPacket);
@@ -63,41 +61,18 @@ namespace MQTTnet.AspNetCore
            return true;
        }

-        static ArraySegment<byte> GetArraySegment(ref ReadOnlySequence<byte> input)
+        static ReadOnlyMemory<byte> GetMemory(this in ReadOnlySequence<byte> input)
        {
-            if (input.IsSingleSegment && MemoryMarshal.TryGetArray(input.First, out var segment))
+            if (input.IsSingleSegment)
            {
-                return segment;
+                return input.First;
            }

            // Should be rare
-            var array = input.ToArray();
-            return new ArraySegment<byte>(array);
+            return input.ToArray();
        }

        static bool TryReadBodyLength(ref ReadOnlySequence<byte> input, out int headerLength, out int bodyLength)
-        {
-            var valueSequence = input.Slice(0, Math.Min(5, input.Length));
-            if (valueSequence.IsSingleSegment)
-            {
-                var valueSpan =
-#if NET5_0_OR_GREATER
-                    valueSequence.FirstSpan;
-#else
-                    valueSequence.First.Span;
-#endif
-                return TryReadBodyLength(valueSpan, out headerLength, out bodyLength);
-            }
-            else
-            {
-                Span<byte> valueSpan = stackalloc byte[8];
-                valueSequence.CopyTo(valueSpan);
-                valueSpan = valueSpan.Slice(0, (int)valueSequence.Length);
-                return TryReadBodyLength(valueSpan, out headerLength, out bodyLength);
-            }
-        }
-
-        static bool TryReadBodyLength(ReadOnlySpan<byte> span, out int headerLength, out int bodyLength)
        {
            // Alorithm taken from https://docs.oasis-open.org/mqtt/mqtt/v3.1.1/errata01/os/mqtt-v3.1.1-errata01-os-complete.html.
            var multiplier = 1;
@@ -106,35 +81,33 @@ namespace MQTTnet.AspNetCore
            var index = 1;
            headerLength = 0;
            bodyLength = 0;
+            
+            var temp = input.Slice(0, Math.Min(5, input.Length)).GetMemory().Span;

            do
            {
-                if (index == span.Length)
+                if (index == temp.Length)
                {
                    return false;
                }

-                encodedByte = span[index];
+                encodedByte = temp[index];
                index++;

                value += (byte)(encodedByte & 127) * multiplier;
                if (multiplier > 128 * 128 * 128)
                {
-                    ThrowProtocolViolationException(span, index);
+                    throw new MqttProtocolViolationException($"Remaining length is invalid (Data={string.Join(",", temp.Slice(1, index).ToArray())}).");
                }

                multiplier *= 128;
            } while ((encodedByte & 128) != 0);

+            input = input.Slice(index);
+
            headerLength = index;
            bodyLength = value;
            return true;
        }
-
-
-        static void ThrowProtocolViolationException(ReadOnlySpan<byte> valueSpan, int index)
-        {
-            throw new MqttProtocolViolationException($"Remaining length is invalid (Data={string.Join(",", valueSpan.Slice(1, index).ToArray())}).");
-        }
    }
 }
@@ -1,66 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using BenchmarkDotNet.Attributes;
-using BenchmarkDotNet.Jobs;
-using MQTTnet.Internal;
-
-namespace MQTTnet.Benchmarks
-{
-    [SimpleJob(RuntimeMoniker.Net60)]
-    [MemoryDiagnoser]
-    public class AsyncLockBenchmark : BaseBenchmark
-    {
-        [Benchmark]
-        public async Task Synchronize_100_Tasks()
-        {
-            const int tasksCount = 100;
-
-            var tasks = new Task[tasksCount];
-            var asyncLock = new AsyncLock();
-            var globalI = 0;
-
-            for (var i = 0; i < tasksCount; i++)
-            {
-                tasks[i] = Task.Run(
-                    async () =>
-                    {
-                        using (await asyncLock.EnterAsync().ConfigureAwait(false))
-                        {
-                            var localI = globalI;
-                            await Task.Delay(5).ConfigureAwait(false); // Increase the chance for wrong data.
-                            localI++;
-                            globalI = localI;
-                        }
-                    });
-            }
-
-            await Task.WhenAll(tasks).ConfigureAwait(false);
-
-            if (globalI != tasksCount)
-            {
-                throw new Exception($"Code is broken ({globalI})!");
-            }
-        }
-        
-        [Benchmark]
-        public async Task Wait_100_000_Times()
-        {
-            var asyncLock = new AsyncLock();
-
-            using (var cancellationToken = new CancellationTokenSource())
-            {
-                for (var i = 0; i < 100000; i++)
-                {
-                    using (await asyncLock.EnterAsync(cancellationToken.Token).ConfigureAwait(false))
-                    {
-                    }
-                }
-            }
-        }
-    }
-}
@@ -1,7 +1,3 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
 namespace MQTTnet.Benchmarks
 {
    public abstract class BaseBenchmark
@@ -2,25 +2,54 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

+using BenchmarkDotNet.Attributes;
+using MQTTnet.Adapter;
+using MQTTnet.Internal;
+using MQTTnet.Packets;
 using System;
 using System.IO;
 using System.Threading;
-using BenchmarkDotNet.Attributes;
-using MQTTnet.Adapter;
 using MQTTnet.Diagnostics;
 using MQTTnet.Formatter;
-using MQTTnet.Packets;
 using MQTTnet.Tests.Mockups;

 namespace MQTTnet.Benchmarks
 {
    [MemoryDiagnoser]
-    public sealed class ChannelAdapterBenchmark : BaseBenchmark
+    public sealed class ChannelAdapterBenchmark
    {
        MqttChannelAdapter _channelAdapter;
        int _iterations;
-        MqttPublishPacket _packet;
        MemoryStream _stream;
+        MqttPublishPacket _packet;
+
+        [GlobalSetup]
+        public void Setup()
+        {
+            _packet = new MqttPublishPacket
+            {
+                Topic = "A"
+            };
+
+            var serializer = new MqttPacketFormatterAdapter(MqttProtocolVersion.V311, new MqttBufferWriter(4096, 65535));
+            
+            var serializedPacket = Join(serializer.Encode(_packet).Join());
+
+            _iterations = 10000;
+
+            _stream = new MemoryStream(_iterations * serializedPacket.Length);
+
+            for (var i = 0; i < _iterations; i++)
+            {
+                _stream.Write(serializedPacket, 0, serializedPacket.Length);
+            }
+
+            _stream.Position = 0;
+
+            var channel = new MemoryMqttChannel(_stream);
+            
+            _channelAdapter = new MqttChannelAdapter(channel, serializer, null, new MqttNetEventLogger());
+        }

        [Benchmark]
        public void Receive_10000_Messages()
@@ -48,34 +77,6 @@ namespace MQTTnet.Benchmarks
            _stream.Position = 0;
        }

-        [GlobalSetup]
-        public void Setup()
-        {
-            _packet = new MqttPublishPacket
-            {
-                Topic = "A"
-            };
-
-            var serializer = new MqttPacketFormatterAdapter(MqttProtocolVersion.V311, new MqttBufferWriter(4096, 65535));
-
-            var serializedPacket = Join(serializer.Encode(_packet).Join());
-
-            _iterations = 10000;
-
-            _stream = new MemoryStream(_iterations * serializedPacket.Length);
-
-            for (var i = 0; i < _iterations; i++)
-            {
-                _stream.Write(serializedPacket, 0, serializedPacket.Length);
-            }
-
-            _stream.Position = 0;
-
-            var channel = new MemoryMqttChannel(_stream);
-
-            _channelAdapter = new MqttChannelAdapter(channel, serializer, null, new MqttNetEventLogger());
-        }
-
        static byte[] Join(params ArraySegment<byte>[] chunks)
        {
            var buffer = new MemoryStream();
@@ -87,4 +88,4 @@ namespace MQTTnet.Benchmarks
            return buffer.ToArray();
        }
    }
-}
+}
@@ -0,0 +1,22 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using BenchmarkDotNet.Jobs;
+using BenchmarkDotNet.Validators;
+
+namespace MQTTnet.Benchmarks.Configurations
+{
+    /// <summary>
+    /// this options may be used to run benchmarks in debugmode and attach a performance profiler
+    /// https://benchmarkdotnet.org/Configs/Configs.htm
+    /// </summary>
+    public class AllowNonOptimized : BaseConfig
+    {
+        public AllowNonOptimized()
+        {
+            AddValidator(JitOptimizationsValidator.DontFailOnError); // ALLOW NON-OPTIMIZED DLLS
+            AddJob(Job.InProcess);
+        }
+    }
+}
@@ -0,0 +1,19 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using BenchmarkDotNet.Configs;
+using System.Linq;
+
+namespace MQTTnet.Benchmarks.Configurations
+{
+    public class BaseConfig : ManualConfig
+    {
+        public BaseConfig()
+        {
+            AddLogger(DefaultConfig.Instance.GetLoggers().ToArray()); // manual config has no loggers by default
+            AddExporter(DefaultConfig.Instance.GetExporters().ToArray()); // manual config has no exporters by default
+            AddColumnProvider(DefaultConfig.Instance.GetColumnProviders().ToArray()); // manual config has no columns by default
+        }
+    }
+}
@@ -0,0 +1,19 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using BenchmarkDotNet.Environments;
+using BenchmarkDotNet.Jobs;
+using BenchmarkDotNet.Toolchains.CsProj;
+
+namespace MQTTnet.Benchmarks.Configurations
+{
+    public class RuntimeCompareConfig : BaseConfig
+    {
+        public RuntimeCompareConfig()
+        {
+            AddJob(Job.Default.WithRuntime(ClrRuntime.Net48));
+            AddJob(Job.Default.WithRuntime(CoreRuntime.Core50).WithToolchain(CsProjCoreToolchain.NetCoreApp50));
+        }
+    }
+}
@@ -11,7 +11,7 @@ namespace MQTTnet.Benchmarks
    [SimpleJob(RuntimeMoniker.Net60)]
    [RPlotExporter]
    [MemoryDiagnoser]
-    public class LoggerBenchmark : BaseBenchmark
+    public class LoggerBenchmark
    {
        MqttNetNullLogger _nullLogger;
        MqttNetSourceLogger _sourceNullLogger;
@@ -1,23 +1,25 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

    <PropertyGroup>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
        <OutputType>Exe</OutputType>
        <DebugType>Full</DebugType>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
        <LangVersion>7.2</LangVersion>
        <IsPackable>false</IsPackable>
        <EnableNETAnalyzers>false</EnableNETAnalyzers>
        <EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
        <DisableImplicitAspNetCoreAnalyzers>true</DisableImplicitAspNetCoreAnalyzers>
-        <NoWarn>1591;NETSDK1138</NoWarn>
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="BenchmarkDotNet" Version="0.13.2" />
+        <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
        <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
    </ItemGroup>
-    
+
+    <ItemGroup Condition="'$(TargetFramework)' != 'net5.0'">
+        <PackageReference Include="System.IO.Pipelines" Version="4.7.2" />
+    </ItemGroup>
+
    <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
        <PackageReference Include="System.IO.Pipelines" Version="5.0.0" />
    </ItemGroup>
@@ -26,12 +28,11 @@
        <PackageReference Include="System.IO.Pipelines" Version="5.0.0" />
    </ItemGroup>

-    <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
-        <PackageReference Include="System.IO.Pipelines" Version="7.0.0" />
-    </ItemGroup>
-
    <ItemGroup>
        <ProjectReference Include="..\..\Source\MQTTnet.AspnetCore\MQTTnet.AspNetCore.csproj" />
+
+        <PackageReference Include="Microsoft.CodeAnalysis.Compilers" Version="4.0.1" />
+        <PackageReference Include="Microsoft.Net.Compilers" Version="4.0.1" />
        <ProjectReference Include="..\MQTTnet.Tests\MQTTnet.Tests.csproj" />
    </ItemGroup>

@@ -1,40 +0,0 @@
-using BenchmarkDotNet.Attributes;
-using BenchmarkDotNet.Jobs;
-using System;
-
-
-namespace MQTTnet.Benchmarks
-{
-    [SimpleJob(RuntimeMoniker.Net60)]
-    [RPlotExporter, RankColumn]
-    [MemoryDiagnoser]
-    public class MemoryCopyBenchmark
-    {
-        const int max_length = 1024 * 8;
-        private byte[] source;
-        private byte[] target;
-
-        [Params(64 - 1, 128 - 1, 256 - 1, 512 - 1, 1024 - 1, 2048 - 1, 5096 - 1)]
-        public int Length { get; set; }
-
-        [GlobalSetup]
-        public void Setup()
-        {
-            source = new byte[max_length];
-            target = new byte[max_length];
-        }
-
-        [Benchmark(Baseline = true)]
-        public void Array_Copy()
-        {
-            Array.Copy(source, 0, target, 0, Length);
-        }
-
-        [Benchmark]
-        public void Memory_Copy()
-        {
-            MQTTnet.Internal.MqttMemoryHelper.Copy(source, 0, target, 0, Length);
-        }
-
-    }
-}
@@ -1,8 +1,5 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
 using BenchmarkDotNet.Attributes;
+using BenchmarkDotNet.Jobs;
 using MQTTnet.Client;
 using MQTTnet.Server;
 using System;
@@ -11,10 +8,14 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;

+
 namespace MQTTnet.Benchmarks
 {
+    /// <summary>
+    /// Create a number of topics, publish, subscribe, and wait for response
+    /// </summary>
    [MemoryDiagnoser]
-    public class MessageDeliveryBenchmark : BaseBenchmark
+    public class MessageDeliveryBenchmark
    {
        List<MqttApplicationMessage> _topicPublishMessages;

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

@@ -12,7 +9,7 @@ namespace MQTTnet.Benchmarks
 {
    [SimpleJob(RuntimeMoniker.Net60)]
    [MemoryDiagnoser]
-    public class MqttPacketReaderWriterBenchmark : BaseBenchmark
+    public class MqttPacketReaderWriterBenchmark
    {
        readonly byte[] _demoPayload = new byte[1024];
        
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using System;
 using BenchmarkDotNet.Attributes;
 using MQTTnet.Channel;
 using MQTTnet.Implementations;
@@ -17,7 +16,7 @@ namespace MQTTnet.Benchmarks
 {
    [SimpleJob(RuntimeMoniker.Net60)]
    [MemoryDiagnoser]
-    public class MqttTcpChannelBenchmark : BaseBenchmark
+    public sealed class MqttTcpChannelBenchmark
    {
        MqttServer _mqttServer;
        IMqttChannel _serverChannel;
@@ -71,8 +70,8 @@ namespace MQTTnet.Benchmarks

            while (read < expected)
            {
-                var readResult = await _clientChannel.ReadAsync(new byte[size], 0, size, CancellationToken.None).ConfigureAwait(false);
-                read += readResult;
+                var readresult = await _clientChannel.ReadAsync(new byte[size], 0, size, CancellationToken.None).ConfigureAwait(false);
+                read += readresult;
            }
        }

@@ -80,11 +79,9 @@ namespace MQTTnet.Benchmarks
        {
            await Task.Yield();

-            var buffer = new ArraySegment<byte>(new byte[size]);
-            
            for (var i = 0; i < iterations; i++)
            {
-                await _serverChannel.WriteAsync(buffer, true, CancellationToken.None).ConfigureAwait(false);
+                await _serverChannel.WriteAsync(new byte[size], 0, size, CancellationToken.None).ConfigureAwait(false);
            }
        }
    }
@@ -3,140 +3,81 @@
 // See the LICENSE file in the project root for more information.

 using System;
-using System.Collections.Generic;
-using System.Linq;
-using BenchmarkDotNet.Loggers;
 using BenchmarkDotNet.Running;
+using MQTTnet.Benchmarks.Configurations;
 using MQTTnet.Diagnostics;

 namespace MQTTnet.Benchmarks
 {
    public static class Program
    {
-        static int _selectedBenchmarkIndex;
-        static List<Type> _benchmarks;
-
-        public static void Main(string[] arguments)
+        public static void Main(string[] args)
        {
-            _benchmarks = CollectBenchmarks();
-            HandleArguments(arguments);
+            Console.WriteLine($"MQTTnet - Benchmarks ({TargetFrameworkProvider.TargetFramework})");
+            Console.WriteLine("--------------------------------------------------------");
+            Console.WriteLine("1 = MessageProcessingBenchmark");
+            Console.WriteLine("2 = SerializerBenchmark");
+            Console.WriteLine("3 = LoggerBenchmark");
+            Console.WriteLine("4 = TopicFilterComparerBenchmark");
+            Console.WriteLine("5 = ChannelAdapterBenchmark");
+            Console.WriteLine("6 = MqttTcpChannelBenchmark");
+            Console.WriteLine("7 = TcpPipesBenchmark");
+            Console.WriteLine("8 = MessageProcessingMqttConnectionContextBenchmark");
+            Console.WriteLine("9 = ServerProcessingBenchmark");
+            Console.WriteLine("a = MqttPacketReaderWriterBenchmark");
+            Console.WriteLine("b = RoundtripBenchmark");
+            Console.WriteLine("c = SubscribeBenchmark");
+            Console.WriteLine("d = UnsubscribeBenchmark");
+            Console.WriteLine("e = MessageDeliveryBenchmark");

-            while (true)
+            var pressedKey = Console.ReadKey(true);
+            switch (pressedKey.KeyChar)
            {
-                RenderMenu();
-
-                var key = Console.ReadKey(true);
-
-                if (key.Key == ConsoleKey.DownArrow)
-                {
-                    _selectedBenchmarkIndex++;
-                    if (_selectedBenchmarkIndex > _benchmarks.Count - 1)
-                    {
-                        _selectedBenchmarkIndex = 0;
-                    }
-                }
-                else if (key.Key == ConsoleKey.UpArrow)
-                {
-                    _selectedBenchmarkIndex--;
-                    if (_selectedBenchmarkIndex < 0)
-                    {
-                        _selectedBenchmarkIndex = _benchmarks.Count - 1;
-                    }
-                }
-                else if (key.Key == ConsoleKey.Escape)
-                {
-                    Environment.Exit(0);
-                }
-                else if (key.Key == ConsoleKey.Enter)
-                {
+                case '1':
+                    BenchmarkRunner.Run<MessageProcessingBenchmark>();
+                    break;
+                case '2':
+                    BenchmarkRunner.Run<SerializerBenchmark>();
+                    break;
+                case '3':
+                    BenchmarkRunner.Run<LoggerBenchmark>();
+                    break;
+                case '4':
+                    BenchmarkRunner.Run<TopicFilterComparerBenchmark>();
+                    break;
+                case '5':
+                    BenchmarkRunner.Run<ChannelAdapterBenchmark>();
+                    break;
+                case '6':
+                    BenchmarkRunner.Run<MqttTcpChannelBenchmark>();
+                    break;
+                case '7':
+                    BenchmarkRunner.Run<TcpPipesBenchmark>();
+                    break;
+                case '8':
+                    BenchmarkRunner.Run<MessageProcessingMqttConnectionContextBenchmark>(new RuntimeCompareConfig());
+                    break;
+                case '9':
+                    BenchmarkRunner.Run<ServerProcessingBenchmark>();
+                    break;
+                case 'a':
+                    BenchmarkRunner.Run(typeof(MqttPacketReaderWriterBenchmark));
+                    break;
+                case 'b':
+                    BenchmarkRunner.Run<RoundtripProcessingBenchmark>();
+                    break;
+                case 'c':
+                    BenchmarkRunner.Run<SubscribeBenchmark>();
+                    break;
+                case 'd':
+                    BenchmarkRunner.Run<UnsubscribeBenchmark>();
+                    break;
+                case 'e':
+                    BenchmarkRunner.Run<MessageDeliveryBenchmark>();
                    break;
-                }
            }

-            BenchmarkRunner.Run(_benchmarks[_selectedBenchmarkIndex]);
-
-            Console.ForegroundColor = ConsoleColor.Yellow;
-            Console.WriteLine("Press any key to exit");
            Console.ReadLine();
        }
-
-        static List<Type> CollectBenchmarks()
-        {
-            var benchmarks = new List<Type>();
-
-            var types = typeof(Program).Assembly.GetExportedTypes();
-            foreach (var type in types)
-            {
-                if (typeof(BaseBenchmark).IsAssignableFrom(type))
-                {
-                    if (type != typeof(BaseBenchmark))
-                    {
-                        benchmarks.Add(type);        
-                    }
-                }
-            }
-
-            return benchmarks.OrderBy(b => b.Name).ToList();
-        }
-
-        static void HandleArguments(string[] arguments)
-        {
-            if (arguments.Length == 0)
-            {
-                return;
-            }
-
-            // Allow for preselection to avoid developer frustration.
-            
-            if (int.TryParse(arguments[0], out var benchmarkIndex))
-            {
-                _selectedBenchmarkIndex = benchmarkIndex;
-                return;
-            }
-
-            _selectedBenchmarkIndex = _benchmarks.FindIndex(b => b.Name.Equals(arguments[0]));
-
-            if (_selectedBenchmarkIndex < 0)
-            {
-                _selectedBenchmarkIndex = 0;
-            }
-
-            if (_selectedBenchmarkIndex > _benchmarks.Count - 1)
-            {
-                _selectedBenchmarkIndex = _benchmarks.Count - 1;
-            }
-        }
-
-        static void RenderMenu()
-        {
-            Console.Clear();
-
-            Console.WriteLine($"MQTTnet - Benchmarks ({TargetFrameworkProvider.TargetFramework})");
-            Console.WriteLine("-----------------------------------------------");
-            Console.ForegroundColor = ConsoleColor.Yellow;
-            Console.WriteLine("Press arrow keys for benchmark selection");
-            Console.WriteLine("Press Enter for benchmark execution");
-            Console.WriteLine("Press Esc for exit");
-            Console.ForegroundColor = ConsoleColor.White;
-            Console.WriteLine();
-
-            for (var index = 0; index < _benchmarks.Count; index++)
-            {
-                var benchmark = _benchmarks[index];
-
-                if (_selectedBenchmarkIndex == index)
-                {
-                    Console.Write("-> ");
-                }
-                else
-                {
-                    Console.Write("   ");
-                }
-
-                Console.WriteLine(benchmark.Name);
-            }
-
-            Console.WriteLine();
-        }
    }
-}
+}
@@ -1,240 +0,0 @@
-using BenchmarkDotNet.Attributes;
-using BenchmarkDotNet.Jobs;
-using MQTTnet.Adapter;
-using MQTTnet.AspNetCore;
-using MQTTnet.Exceptions;
-using MQTTnet.Formatter;
-using MQTTnet.Packets;
-using System;
-using System.Buffers;
-using System.IO;
-using System.IO.Pipelines;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace MQTTnet.Benchmarks
-{
-    [SimpleJob(RuntimeMoniker.Net60)]
-    [RPlotExporter, RankColumn]
-    [MemoryDiagnoser]
-    public class ReaderExtensionsBenchmark
-    {
-        MqttPacketFormatterAdapter mqttPacketFormatter;
-        MemoryStream stream;
-
-        [GlobalSetup]
-        public void GlobalSetup()
-        {
-            mqttPacketFormatter = new MqttPacketFormatterAdapter(MqttProtocolVersion.V311, new MqttBufferWriter(4096, 65535));
-            var mqttMessage = new MqttApplicationMessageBuilder()
-            .WithTopic("topic")
-            .WithPayload(new byte[10 * 1024])
-            .Build();
-
-            var packet = MqttPacketFactories.Publish.Create(mqttMessage);
-
-            var buffer = mqttPacketFormatter.Encode(packet);
-            stream = new MemoryStream();
-            stream.Write(buffer.Packet);
-            stream.Write(buffer.Payload);
-            mqttPacketFormatter.Cleanup();
-        }
-
-        [Benchmark(Baseline = true)]
-        public async Task Before()
-        {
-            stream.Position = 0;
-            var input = PipeReader.Create(stream);
-
-            while (true)
-            {
-                ReadResult readResult;
-                var readTask = input.ReadAsync();
-                if (readTask.IsCompleted)
-                {
-                    readResult = readTask.Result;
-                }
-                else
-                {
-                    readResult = await readTask.ConfigureAwait(false);
-                }
-
-                var buffer = readResult.Buffer;
-
-                var consumed = buffer.Start;
-                var observed = buffer.Start;
-
-                try
-                {
-                    if (!buffer.IsEmpty)
-                    {
-                        if (ReaderExtensions_Before.TryDecode(mqttPacketFormatter, buffer, out var packet, out consumed, out observed, out var received))
-                        {
-                            break;
-                        }
-                    }
-                    else if (readResult.IsCompleted)
-                    {
-                        throw new MqttCommunicationException("Connection Aborted");
-                    }
-                }
-                finally
-                {
-                    // The buffer was sliced up to where it was consumed, so we can just advance to the start.
-                    // We mark examined as buffer.End so that if we didn't receive a full frame, we'll wait for more data
-                    // before yielding the read again.
-                    input.AdvanceTo(consumed, observed);
-                }
-            }
-        }
-
-        [Benchmark]
-        public async Task After()
-        {
-            stream.Position = 0;
-            var input = PipeReader.Create(stream);
-
-            while (true)
-            {
-                ReadResult readResult;
-                var readTask = input.ReadAsync();
-                if (readTask.IsCompleted)
-                {
-                    readResult = readTask.Result;
-                }
-                else
-                {
-                    readResult = await readTask.ConfigureAwait(false);
-                }
-
-                var buffer = readResult.Buffer;
-
-                var consumed = buffer.Start;
-                var observed = buffer.Start;
-
-                try
-                {
-                    if (!buffer.IsEmpty)
-                    {
-                        if (ReaderExtensions.TryDecode(mqttPacketFormatter, buffer, out var packet, out consumed, out observed, out var received))
-                        {
-                            break;
-                        }
-                    }
-                    else if (readResult.IsCompleted)
-                    {
-                        throw new MqttCommunicationException("Connection Aborted");
-                    }
-                }
-                finally
-                {
-                    // The buffer was sliced up to where it was consumed, so we can just advance to the start.
-                    // We mark examined as buffer.End so that if we didn't receive a full frame, we'll wait for more data
-                    // before yielding the read again.
-                    input.AdvanceTo(consumed, observed);
-                }
-            }
-        }
-
-        public static class ReaderExtensions_Before
-        {
-            public static bool TryDecode(MqttPacketFormatterAdapter formatter,
-                in ReadOnlySequence<byte> input,
-                out MqttPacket packet,
-                out SequencePosition consumed,
-                out SequencePosition observed,
-                out int bytesRead)
-            {
-                if (formatter == null) throw new ArgumentNullException(nameof(formatter));
-
-                packet = null;
-                consumed = input.Start;
-                observed = input.End;
-                bytesRead = 0;
-                var copy = input;
-
-                if (copy.Length < 2)
-                {
-                    return false;
-                }
-
-                var fixedHeader = copy.First.Span[0];
-                if (!TryReadBodyLength(ref copy, out int headerLength, out var bodyLength))
-                {
-                    return false;
-                }
-
-                if (copy.Length < bodyLength)
-                {
-                    return false;
-                }
-
-                var bodySlice = copy.Slice(0, bodyLength);
-                var buffer = GetMemory(bodySlice).ToArray();
-
-                var receivedMqttPacket = new ReceivedMqttPacket(fixedHeader, new ArraySegment<byte>(buffer, 0, buffer.Length), buffer.Length + 2);
-
-                if (formatter.ProtocolVersion == MqttProtocolVersion.Unknown)
-                {
-                    formatter.DetectProtocolVersion(receivedMqttPacket);
-                }
-
-                packet = formatter.Decode(receivedMqttPacket);
-                consumed = bodySlice.End;
-                observed = bodySlice.End;
-                bytesRead = headerLength + bodyLength;
-                return true;
-            }
-
-            static ReadOnlyMemory<byte> GetMemory(in ReadOnlySequence<byte> input)
-            {
-                if (input.IsSingleSegment)
-                {
-                    return input.First;
-                }
-
-                // Should be rare
-                return input.ToArray();
-            }
-
-            static bool TryReadBodyLength(ref ReadOnlySequence<byte> input, out int headerLength, out int bodyLength)
-            {
-                // Alorithm taken from https://docs.oasis-open.org/mqtt/mqtt/v3.1.1/errata01/os/mqtt-v3.1.1-errata01-os-complete.html.
-                var multiplier = 1;
-                var value = 0;
-                byte encodedByte;
-                var index = 1;
-                headerLength = 0;
-                bodyLength = 0;
-
-                var temp = GetMemory(input.Slice(0, Math.Min(5, input.Length))).Span;
-
-                do
-                {
-                    if (index == temp.Length)
-                    {
-                        return false;
-                    }
-
-                    encodedByte = temp[index];
-                    index++;
-
-                    value += (byte)(encodedByte & 127) * multiplier;
-                    if (multiplier > 128 * 128 * 128)
-                    {
-                        throw new MqttProtocolViolationException($"Remaining length is invalid (Data={string.Join(",", temp.Slice(1, index).ToArray())}).");
-                    }
-
-                    multiplier *= 128;
-                } while ((encodedByte & 128) != 0);
-
-                input = input.Slice(index);
-
-                headerLength = index;
-                bodyLength = value;
-                return true;
-            }
-        }
-
-    }
-}
@@ -8,7 +8,7 @@ namespace MQTTnet.Benchmarks
    [SimpleJob(RuntimeMoniker.Net60)]
    [RPlotExporter, RankColumn]
    [MemoryDiagnoser]
-    public class RoundtripProcessingBenchmark : BaseBenchmark
+    public class RoundtripProcessingBenchmark
    {
        [GlobalSetup]
        public void GlobalSetup()
@@ -1,68 +0,0 @@
-using BenchmarkDotNet.Attributes;
-using BenchmarkDotNet.Jobs;
-using MQTTnet.Formatter;
-using System;
-using System.IO;
-using System.IO.Pipelines;
-using System.Threading.Tasks;
-
-namespace MQTTnet.Benchmarks
-{
-    [SimpleJob(RuntimeMoniker.Net60)]
-    [RPlotExporter, RankColumn]
-    [MemoryDiagnoser]
-    public class SendPacketAsyncBenchmark : BaseBenchmark
-    {
-        MemoryStream stream;
-        MqttPacketBuffer buffer;
-
-        [GlobalSetup]
-        public void GlobalSetup()
-        {
-            stream = new MemoryStream(1024);
-            var packet = new ArraySegment<byte>(new byte[10]);
-            buffer = new MqttPacketBuffer(packet);
-        }
-
-        [Benchmark(Baseline = true)]
-        public async ValueTask Before()
-        {
-            stream.Position = 0;
-            var output = PipeWriter.Create(stream);
-
-            WritePacketBuffer(output, buffer);
-            await output.FlushAsync();
-        }
-
-        [Benchmark]
-        public async ValueTask After()
-        {
-            stream.Position = 0;
-            var output = PipeWriter.Create(stream);
-
-            if (buffer.Payload.Count == 0)
-            {
-                await output.WriteAsync(buffer.Packet).ConfigureAwait(false);
-            }
-            else
-            {
-                WritePacketBuffer(output, buffer);
-                await output.FlushAsync().ConfigureAwait(false);
-            }
-        }
-
-
-        static void WritePacketBuffer(PipeWriter output, MqttPacketBuffer buffer)
-        {
-            // copy MqttPacketBuffer's Packet and Payload to the same buffer block of PipeWriter
-            // MqttPacket will be transmitted within the bounds of a WebSocket frame after PipeWriter.FlushAsync
-
-            var span = output.GetSpan(buffer.Length);
-
-            buffer.Packet.AsSpan().CopyTo(span);
-            buffer.Payload.AsSpan().CopyTo(span.Slice(buffer.Packet.Count));
-
-            output.Advance(buffer.Length);
-        }
-    }
-}
@@ -104,7 +104,7 @@ namespace MQTTnet.Benchmarks
                return Task.FromResult(count);
            }

-            public Task WriteAsync(ArraySegment<byte> buffer, bool isEndOfPacket, CancellationToken cancellationToken)
+            public Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
            {
                throw new NotSupportedException();
            }
@@ -1,7 +1,3 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Jobs;
 using MQTTnet.Tests.Mockups;
@@ -12,7 +8,7 @@ namespace MQTTnet.Benchmarks
    [SimpleJob(RuntimeMoniker.Net60)]
    [RPlotExporter, RankColumn]
    [MemoryDiagnoser]
-    public class ServerProcessingBenchmark : BaseBenchmark
+    public class ServerProcessingBenchmark
    {
        [GlobalSetup]
        public void GlobalSetup()
@@ -1,7 +1,3 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Jobs;
 using MQTTnet.Client;
@@ -12,7 +8,7 @@ using System.Linq;
 namespace MQTTnet.Benchmarks
 {
    [MemoryDiagnoser]
-    public class SubscribeBenchmark : BaseBenchmark
+    public class SubscribeBenchmark
    {
        MqttServer _mqttServer;
        IMqttClient _mqttClient;
@@ -15,7 +15,7 @@ namespace MQTTnet.Benchmarks
 {
    [SimpleJob(RuntimeMoniker.Net60)]
    [MemoryDiagnoser]
-    public class TcpPipesBenchmark : BaseBenchmark
+    public class TcpPipesBenchmark
    {
        IDuplexPipe _client;
        IDuplexPipe _server;
@@ -11,7 +11,7 @@ namespace MQTTnet.Benchmarks
    [SimpleJob(RuntimeMoniker.Net60)]
    [RPlotExporter]
    [MemoryDiagnoser]
-    public class TopicFilterComparerBenchmark : BaseBenchmark
+    public class TopicFilterComparerBenchmark
    {
        static readonly char[] TopicLevelSeparator = { '/' };

@@ -1,30 +1,31 @@
 using System;
 using System.Collections.Generic;
+using System.Text;

 namespace MQTTnet.Benchmarks
 {
    public class TopicGenerator
    {
        public static void Generate(
-            int numPublishers,
-            int numTopicsPerPublisher,
-            out Dictionary<string, List<string>> topicsByPublisher,
-            out Dictionary<string, List<string>> singleWildcardTopicsByPublisher,
-            out Dictionary<string, List<string>> multiWildcardTopicsByPublisher)
+           int numPublishers, int numTopicsPerPublisher,
+           out Dictionary<string, List<string>> topicsByPublisher,
+           out Dictionary<string, List<string>> singleWildcardTopicsByPublisher,
+           out Dictionary<string, List<string>> multiWildcardTopicsByPublisher
+           )
        {
            topicsByPublisher = new Dictionary<string, List<string>>();
            singleWildcardTopicsByPublisher = new Dictionary<string, List<string>>();
            multiWildcardTopicsByPublisher = new Dictionary<string, List<string>>();

            // Find some reasonable distribution across three topic levels
-            var topicsPerLevel = (int)Math.Pow(numTopicsPerPublisher, 1.0 / 3.0);
+            var topicsPerLevel = (int)Math.Pow(numTopicsPerPublisher, (1.0 / 3.0));
            if (topicsPerLevel <= 0)
            {
                topicsPerLevel = 1;
            }

-            var numLevel1Topics = topicsPerLevel;
-            var numLevel2Topics = topicsPerLevel;
+            int numLevel1Topics = topicsPerLevel;
+            int numLevel2Topics = topicsPerLevel;

            var maxNumLevel3Topics = 1 + (int)((double)numTopicsPerPublisher / numLevel1Topics / numLevel2Topics);
            if (maxNumLevel3Topics <= 0)
@@ -34,7 +35,7 @@ namespace MQTTnet.Benchmarks

            for (var p = 0; p < numPublishers; ++p)
            {
-                var publisherTopicCount = 0;
+                int publisherTopicCount = 0;
                var publisherName = "pub" + p;
                for (var l1 = 0; l1 < numLevel1Topics; ++l1)
                {
@@ -43,22 +44,19 @@ namespace MQTTnet.Benchmarks
                        for (var l3 = 0; l3 < maxNumLevel3Topics; ++l3)
                        {
                            if (publisherTopicCount >= numTopicsPerPublisher)
-                            {
                                break;
-                            }

-                            var topic = $"{publisherName}/building{l1 + 1}/level{l2 + 1}/sensor{l3 + 1}";
+                            var topic = string.Format("{0}/building{1}/level{2}/sensor{3}", publisherName, l1 + 1, l2 + 1, l3 + 1);
                            AddPublisherTopic(publisherName, topic, topicsByPublisher);

                            if (l2 == 0)
                            {
-                                var singleWildcardTopic = $"{publisherName}/building{l1 + 1}/+/sensor{l3 + 1}";
+                                var singleWildcardTopic = string.Format("{0}/building{1}/+/sensor{2}", publisherName, l1 + 1, l3 + 1);
                                AddPublisherTopic(publisherName, singleWildcardTopic, singleWildcardTopicsByPublisher);
                            }
-
-                            if (l1 == 0 && l3 == 0)
+                            if ((l1 == 0) && (l3 == 0))
                            {
-                                var multiWildcardTopic = $"{publisherName}/+/level{l2 + 1}/+";
+                                var multiWildcardTopic = string.Format("{0}/+/level{1}/+", publisherName, l2 + 1);
                                AddPublisherTopic(publisherName, multiWildcardTopic, multiWildcardTopicsByPublisher);
                            }

@@ -77,8 +75,7 @@ namespace MQTTnet.Benchmarks
                topicList = new List<string>();
                topicsByPublisher.Add(publisherName, topicList);
            }
-
            topicList.Add(topic);
        }
    }
-}
+}
@@ -1,7 +1,3 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
 using BenchmarkDotNet.Attributes;
 using MQTTnet.Client;
 using MQTTnet.Server;
@@ -11,7 +7,7 @@ using System.Linq;
 namespace MQTTnet.Benchmarks
 {
    [MemoryDiagnoser]
-    public class UnsubscribeBenchmark : BaseBenchmark 
+    public class UnsubscribeBenchmark
    {
        MqttServer _mqttServer;
        IMqttClient _mqttClient;
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="BenchmarkDotNet" version="0.10.14" targetFramework="net462" />
+  <package id="BenchmarkDotNet.Core" version="0.10.14" targetFramework="net462" />
+  <package id="BenchmarkDotNet.Toolchains.Roslyn" version="0.10.14" targetFramework="net462" />
+  <package id="Microsoft.CodeAnalysis.Analyzers" version="1.1.0" targetFramework="net462" />
+  <package id="Microsoft.CodeAnalysis.Common" version="2.6.1" targetFramework="net462" />
+  <package id="Microsoft.CodeAnalysis.CSharp" version="2.6.1" targetFramework="net462" />
+  <package id="Microsoft.DotNet.InternalAbstractions" version="1.0.0" targetFramework="net462" />
+  <package id="Microsoft.DotNet.PlatformAbstractions" version="1.1.1" targetFramework="net462" />
+  <package id="Microsoft.Win32.Registry" version="4.3.0" targetFramework="net462" />
+  <package id="System.AppContext" version="4.3.0" targetFramework="net462" />
+  <package id="System.Collections" version="4.3.0" targetFramework="net462" />
+  <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net462" />
+  <package id="System.Collections.Immutable" version="1.3.1" targetFramework="net462" />
+  <package id="System.Console" version="4.3.0" targetFramework="net462" />
+  <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net462" />
+  <package id="System.Diagnostics.FileVersionInfo" version="4.3.0" targetFramework="net462" />
+  <package id="System.Diagnostics.StackTrace" version="4.3.0" targetFramework="net462" />
+  <package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net462" />
+  <package id="System.Dynamic.Runtime" version="4.3.0" targetFramework="net462" />
+  <package id="System.Globalization" version="4.3.0" targetFramework="net462" />
+  <package id="System.IO.Compression" version="4.3.0" targetFramework="net462" />
+  <package id="System.IO.FileSystem" version="4.3.0" targetFramework="net462" />
+  <package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net462" />
+  <package id="System.Linq" version="4.3.0" targetFramework="net462" />
+  <package id="System.Linq.Expressions" version="4.3.0" targetFramework="net462" />
+  <package id="System.Reflection" version="4.3.0" targetFramework="net462" />
+  <package id="System.Reflection.Metadata" version="1.4.2" targetFramework="net462" />
+  <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net462" />
+  <package id="System.Runtime" version="4.3.0" targetFramework="net462" />
+  <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net462" />
+  <package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net462" />
+  <package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net462" />
+  <package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net462" />
+  <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net462" />
+  <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net462" />
+  <package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net462" />
+  <package id="System.Text.Encoding" version="4.3.0" targetFramework="net462" />
+  <package id="System.Text.Encoding.CodePages" version="4.3.0" targetFramework="net462" />
+  <package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net462" />
+  <package id="System.Threading" version="4.3.0" targetFramework="net462" />
+  <package id="System.Threading.Tasks" version="4.3.0" targetFramework="net462" />
+  <package id="System.Threading.Tasks.Extensions" version="4.3.0" targetFramework="net462" />
+  <package id="System.Threading.Tasks.Parallel" version="4.3.0" targetFramework="net462" />
+  <package id="System.Threading.Thread" version="4.3.0" targetFramework="net462" />
+  <package id="System.ValueTuple" version="4.3.0" targetFramework="net462" />
+  <package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net462" />
+  <package id="System.Xml.XDocument" version="4.3.0" targetFramework="net462" />
+  <package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="net462" />
+  <package id="System.Xml.XmlSerializer" version="4.3.0" targetFramework="net462" />
+  <package id="System.Xml.XPath" version="4.3.0" targetFramework="net462" />
+  <package id="System.Xml.XPath.XDocument" version="4.3.0" targetFramework="net462" />
+</packages>
@@ -15,12 +15,10 @@ namespace MQTTnet.Extensions.ManagedClient
        }

        public ManagedMqttApplicationMessage ApplicationMessage { get; }
-
+        
        /// <summary>
-        ///     Gets or sets the exception which was thrown while sending the message.
+        /// Then this is _null_ the message was processed successfully without any error.
        /// </summary>
        public Exception Exception { get; }
-
-        public bool HasFailed => Exception != null;
    }
-}
+}
@@ -6,13 +6,13 @@ using System;

 namespace MQTTnet.Extensions.ManagedClient
 {
-    public sealed class ApplicationMessageDroppedEventArgs : EventArgs
+    public sealed class ApplicationMessageSkippedEventArgs : EventArgs
    {
-        public ApplicationMessageDroppedEventArgs(ManagedMqttApplicationMessage applicationMessage)
+        public ApplicationMessageSkippedEventArgs(ManagedMqttApplicationMessage applicationMessage)
        {
            ApplicationMessage = applicationMessage ?? throw new ArgumentNullException(nameof(applicationMessage));
        }

        public ManagedMqttApplicationMessage ApplicationMessage { get; }
    }
-}
+}
@@ -1,7 +1,3 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
 using System;
 using MQTTnet.Client;

@@ -16,7 +12,7 @@ namespace MQTTnet.Extensions.ManagedClient
        }

        /// <summary>
-        ///     This is null when the server was not reachable and thus no MQTT response was transmitted.
+        /// This is null when the connection was failing and the server was not reachable.
        /// </summary>
        public MqttClientConnectResult ConnectResult { get; }

@@ -1,56 +1,52 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
 using System;
+using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using MQTTnet.Client;
+using MQTTnet.Packets;

 namespace MQTTnet.Extensions.ManagedClient
 {
    public interface IManagedMqttClient : IDisposable
    {
-        event Func<ApplicationMessageDroppedEventArgs, Task> ApplicationMessageDroppedAsync;
-
-        event Func<EventArgs, Task> ApplicationMessageEnqueueingAsync;
-
        event Func<ApplicationMessageProcessedEventArgs, Task> ApplicationMessageProcessedAsync;
-
+        
        event Func<MqttApplicationMessageReceivedEventArgs, Task> ApplicationMessageReceivedAsync;
-
+        
+        event Func<ApplicationMessageSkippedEventArgs, Task> ApplicationMessageSkippedAsync;
+        
        event Func<MqttClientConnectedEventArgs, Task> ConnectedAsync;
-
+        
        event Func<ConnectingFailedEventArgs, Task> ConnectingFailedAsync;
-
+        
+        event Func<EventArgs, Task> ConnectionStateChangedAsync;
+        
        event Func<MqttClientDisconnectedEventArgs, Task> DisconnectedAsync;
-
-        event Func<SubscribeProcessedEventArgs, Task> SubscribeProcessedAsync;
-
-        event Func<UnsubscribeProcessedEventArgs, Task> UnsubscribeProcessedAsync;
-
-        int EnqueuedApplicationMessagesCount { get; }
-
+        
+        event Func<ManagedProcessFailedEventArgs, Task> SynchronizingSubscriptionsFailedAsync;
+        
        IMqttClient InternalClient { get; }
-
+        
        bool IsConnected { get; }
-
+        
        bool IsStarted { get; }
-
+        
        ManagedMqttClientOptions Options { get; }
-
+        
+        int PendingApplicationMessagesCount { get; }
+        
        Task EnqueueAsync(MqttApplicationMessage applicationMessage);
-
+        
        Task EnqueueAsync(ManagedMqttApplicationMessage applicationMessage);
-
+        
        Task PingAsync(CancellationToken cancellationToken = default);
-
+        
        Task StartAsync(ManagedMqttClientOptions options);
-
-        Task StopAsync(MqttClientDisconnectOptions options, CancellationToken cancellationToken);
-
-        Task SubscribeAsync(MqttClientSubscribeOptions options);
-
-        Task UnsubscribeAsync(MqttClientUnsubscribeOptions options);
+        
+        Task StopAsync();
+        
+        Task SubscribeAsync(ICollection<MqttTopicFilter> topicFilters);
+        
+        Task UnsubscribeAsync(ICollection<string> topics);
    }
 }
@@ -1,11 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">

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

    <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
@@ -1,4 +0,0 @@
-<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:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=new/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=new_005Cevents/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=new_005Coptions/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
@@ -6,16 +6,10 @@ using System;

 namespace MQTTnet.Extensions.ManagedClient
 {
-    public sealed class ManagedMqttApplicationMessage
+    public class ManagedMqttApplicationMessage
    {
-        public ManagedMqttApplicationMessage(string id, MqttApplicationMessage applicationMessage)
-        {
-            Id = id ?? throw new ArgumentNullException(nameof(id));
-            ApplicationMessage = applicationMessage ?? throw new ArgumentNullException(nameof(applicationMessage));
-        }
-        
-        public string Id { get; }
+        public Guid Id { get; set; } = Guid.NewGuid();

-        public MqttApplicationMessage ApplicationMessage { get; }
+        public MqttApplicationMessage ApplicationMessage { get; set; }
    }
 }
@@ -6,19 +6,15 @@ using System;

 namespace MQTTnet.Extensions.ManagedClient
 {
-    public sealed class ManagedMqttApplicationMessageBuilder
+    public class ManagedMqttApplicationMessageBuilder
    {
-        MqttApplicationMessage _applicationMessage;
-        string _id = Guid.NewGuid().ToString();
+        private Guid _id = Guid.NewGuid();
+        private MqttApplicationMessage _applicationMessage;

-        public ManagedMqttApplicationMessage Build()
+        public ManagedMqttApplicationMessageBuilder WithId(Guid id)
        {
-            if (_applicationMessage == null)
-            {
-                throw new InvalidOperationException("The ApplicationMessage cannot be null.");
-            }
-
-            return new ManagedMqttApplicationMessage(_id, _applicationMessage);
+            _id = id;
+            return this;
        }

        public ManagedMqttApplicationMessageBuilder WithApplicationMessage(MqttApplicationMessage applicationMessage)
@@ -29,10 +25,7 @@ namespace MQTTnet.Extensions.ManagedClient

        public ManagedMqttApplicationMessageBuilder WithApplicationMessage(Action<MqttApplicationMessageBuilder> builder)
        {
-            if (builder == null)
-            {
-                throw new ArgumentNullException(nameof(builder));
-            }
+            if (builder == null) throw new ArgumentNullException(nameof(builder));

            var internalBuilder = new MqttApplicationMessageBuilder();
            builder(internalBuilder);
@@ -41,16 +34,18 @@ namespace MQTTnet.Extensions.ManagedClient
            return this;
        }

-        public ManagedMqttApplicationMessageBuilder WithId(Guid id)
+        public ManagedMqttApplicationMessage Build()
        {
-            _id = id.ToString();
-            return this;
-        }
+            if (_applicationMessage == null)
+            {
+                throw new InvalidOperationException("The ApplicationMessage cannot be null.");
+            }

-        public ManagedMqttApplicationMessageBuilder WithId(string id)
-        {
-            _id = id ?? throw new ArgumentNullException(nameof(id));
-            return this;
+            return new ManagedMqttApplicationMessage
+            {
+                Id = _id,
+                ApplicationMessage = _applicationMessage
+            };
        }
    }
-}
+}
@@ -17,10 +17,10 @@ using MQTTnet.Server;

 namespace MQTTnet.Extensions.ManagedClient
 {
-    public sealed class ManagedMqttClient : Disposable
+    public sealed class ManagedMqttClient : Disposable, IManagedMqttClient
    {
        readonly AsyncEvent<ApplicationMessageProcessedEventArgs> _applicationMessageProcessedEvent = new AsyncEvent<ApplicationMessageProcessedEventArgs>();
-        readonly AsyncEvent<ApplicationMessageDroppedEventArgs> _applicationMessageSkippedEvent = new AsyncEvent<ApplicationMessageDroppedEventArgs>();
+        readonly AsyncEvent<ApplicationMessageSkippedEventArgs> _applicationMessageSkippedEvent = new AsyncEvent<ApplicationMessageSkippedEventArgs>();
        readonly AsyncEvent<ConnectingFailedEventArgs> _connectingFailedEvent = new AsyncEvent<ConnectingFailedEventArgs>();
        readonly AsyncEvent<EventArgs> _connectionStateChangedEvent = new AsyncEvent<EventArgs>();
        readonly AsyncEvent<ManagedProcessFailedEventArgs> _synchronizingSubscriptionsFailedEvent = new AsyncEvent<ManagedProcessFailedEventArgs>();
@@ -62,7 +62,6 @@ namespace MQTTnet.Extensions.ManagedClient
        CancellationTokenSource _publishingCancellationToken;

        ManagedMqttClientStorageManager _storageManager;
-        bool _isCleanDisconnect;

        public ManagedMqttClient(IMqttClient mqttClient, IMqttNetLogger logger)
        {
@@ -76,7 +75,7 @@ namespace MQTTnet.Extensions.ManagedClient
            _logger = logger.WithSource(nameof(ManagedMqttClient));
        }

-        public event Func<ApplicationMessageDroppedEventArgs, Task> ApplicationMessageSkippedAsync
+        public event Func<ApplicationMessageSkippedEventArgs, Task> ApplicationMessageSkippedAsync
        {
            add => _applicationMessageSkippedEvent.AddHandler(value);
            remove => _applicationMessageSkippedEvent.RemoveHandler(value);
@@ -118,18 +117,12 @@ namespace MQTTnet.Extensions.ManagedClient
            remove => InternalClient.DisconnectedAsync -= value;
        }

-        public event Func<SubscribeProcessedEventArgs, Task> SubscribeProcessedAsync;
-        
-        public event Func<UnsubscribeProcessedEventArgs, Task> UnsubscribeProcessedAsync;
-
-        public event Func<ManagedProcessFailedEventArgs, Task> SubscribedAsync
+        public event Func<ManagedProcessFailedEventArgs, Task> SynchronizingSubscriptionsFailedAsync
        {
            add => _synchronizingSubscriptionsFailedEvent.AddHandler(value);
            remove => _synchronizingSubscriptionsFailedEvent.RemoveHandler(value);
        }

-        public event Func<EventArgs, Task> ApplicationMessageEnqueued;
-
        public IMqttClient InternalClient { get; }

        public bool IsConnected => InternalClient.IsConnected;
@@ -167,21 +160,21 @@ namespace MQTTnet.Extensions.ManagedClient
                throw new InvalidOperationException("call StartAsync before publishing messages");
            }

-            MqttTopicValidator.ThrowIfInvalid(applicationMessage.ApplicationMessage);
+            MqttTopicValidator.ThrowIfInvalid(applicationMessage.ApplicationMessage.Topic);

            ManagedMqttApplicationMessage removedMessage = null;
-            ApplicationMessageDroppedEventArgs applicationMessageDroppedEventArgs = null;
+            ApplicationMessageSkippedEventArgs applicationMessageSkippedEventArgs = null;

            try
            {
-                using (await _messageQueueLock.EnterAsync().ConfigureAwait(false))
+                using (await _messageQueueLock.WaitAsync(CancellationToken.None).ConfigureAwait(false))
                {
                    if (_messageQueue.Count >= Options.MaxPendingMessages)
                    {
                        if (Options.PendingMessagesOverflowStrategy == MqttPendingMessagesOverflowStrategy.DropNewMessage)
                        {
                            _logger.Verbose("Skipping publish of new application message because internal queue is full.");
-                            applicationMessageDroppedEventArgs = new ApplicationMessageDroppedEventArgs(applicationMessage);
+                            applicationMessageSkippedEventArgs = new ApplicationMessageSkippedEventArgs(applicationMessage);
                            return;
                        }

@@ -189,7 +182,7 @@ namespace MQTTnet.Extensions.ManagedClient
                        {
                            removedMessage = _messageQueue.RemoveFirst();
                            _logger.Verbose("Removed oldest application message from internal queue because it is full.");
-                            applicationMessageDroppedEventArgs = new ApplicationMessageDroppedEventArgs(removedMessage);
+                            applicationMessageSkippedEventArgs = new ApplicationMessageSkippedEventArgs(removedMessage);
                        }
                    }

@@ -208,9 +201,9 @@ namespace MQTTnet.Extensions.ManagedClient
            }
            finally
            {
-                if (applicationMessageDroppedEventArgs != null && _applicationMessageSkippedEvent.HasHandlers)
+                if (applicationMessageSkippedEventArgs != null && _applicationMessageSkippedEvent.HasHandlers)
                {
-                    await _applicationMessageSkippedEvent.InvokeAsync(applicationMessageDroppedEventArgs).ConfigureAwait(false);
+                    await _applicationMessageSkippedEvent.InvokeAsync(applicationMessageSkippedEventArgs).ConfigureAwait(false);
                }
            }
        }
@@ -262,12 +255,10 @@ namespace MQTTnet.Extensions.ManagedClient
            _logger.Info("Started");
        }

-        public async Task StopAsync(bool cleanDisconnect = true)
+        public async Task StopAsync()
        {
            ThrowIfDisposed();

-            _isCleanDisconnect = cleanDisconnect;
-            
            StopPublishing();
            StopMaintainingConnection();

@@ -305,7 +296,7 @@ namespace MQTTnet.Extensions.ManagedClient

            _subscriptionsQueuedSignal.Release();

-            return CompletedTask.Instance;
+            return Task.FromResult(0);
        }

        public Task UnsubscribeAsync(ICollection<string> topics)
@@ -328,7 +319,7 @@ namespace MQTTnet.Extensions.ManagedClient

            _subscriptionsQueuedSignal.Release();

-            return CompletedTask.Instance;
+            return Task.FromResult(0);
        }

        protected override void Dispose(bool disposing)
@@ -391,12 +382,9 @@ namespace MQTTnet.Extensions.ManagedClient
                {
                    try
                    {
-                        if (_isCleanDisconnect)
+                        using (var disconnectTimeout = new CancellationTokenSource(Options.ClientOptions.Timeout))
                        {
-                            using (var disconnectTimeout = new CancellationTokenSource(Options.ClientOptions.Timeout))
-                            {
-                                await InternalClient.DisconnectAsync(new MqttClientDisconnectOptions(), disconnectTimeout.Token).ConfigureAwait(false);
-                            }
+                            await InternalClient.DisconnectAsync(new MqttClientDisconnectOptions(), disconnectTimeout.Token).ConfigureAwait(false);
                        }
                    }
                    catch (OperationCanceledException)
@@ -705,7 +693,7 @@ namespace MQTTnet.Extensions.ManagedClient
            {
                await InternalClient.PublishAsync(message.ApplicationMessage).ConfigureAwait(false);

-                using (await _messageQueueLock.EnterAsync().ConfigureAwait(false)) //lock to avoid conflict with this.PublishAsync
+                using (await _messageQueueLock.WaitAsync(CancellationToken.None).ConfigureAwait(false)) //lock to avoid conflict with this.PublishAsync
                {
                    // While publishing this message, this.PublishAsync could have booted this
                    // message off the queue to make room for another (when using a cap
@@ -736,7 +724,7 @@ namespace MQTTnet.Extensions.ManagedClient
                    //contradict the expected behavior of QoS 1 and 2, that's also true
                    //for the usage of a message queue cap, so it's still consistent
                    //with prior behavior in that way.
-                    using (await _messageQueueLock.EnterAsync().ConfigureAwait(false)) //lock to avoid conflict with this.PublishAsync
+                    using (await _messageQueueLock.WaitAsync(CancellationToken.None).ConfigureAwait(false)) //lock to avoid conflict with this.PublishAsync
                    {
                        _messageQueue.RemoveFirst(i => i.Id.Equals(message.Id));

@@ -3,9 +3,8 @@
 // See the LICENSE file in the project root for more information.

 using System;
-using System.Threading;
+using System.Collections.Generic;
 using System.Threading.Tasks;
-using MQTTnet.Client;
 using MQTTnet.Packets;
 using MQTTnet.Protocol;

@@ -39,35 +38,6 @@ namespace MQTTnet.Extensions.ManagedClient
            return managedMqttClient.EnqueueAsync(applicationMessage);
        }

-        public static Task StopAsync(this IManagedMqttClient managedMqttClient, bool isClean = true, CancellationToken cancellationToken = default)
-        {
-            if (managedMqttClient == null)
-            {
-                throw new ArgumentNullException(nameof(managedMqttClient));
-            }
-
-            return managedMqttClient.StopAsync(new MqttClientDisconnectOptions
-            {
-                IsClean = isClean
-            }, cancellationToken);
-        }
-        
-        public static Task SubscribeAsync(this IManagedMqttClient managedMqttClient, MqttTopicFilter topicFilter)
-        {
-            if (managedMqttClient == null)
-            {
-                throw new ArgumentNullException(nameof(managedMqttClient));
-            }
-
-            if (topicFilter == null)
-            {
-                throw new ArgumentNullException(nameof(topicFilter));
-            }
-
-            var subscribeOptions = new MqttClientSubscribeOptionsBuilder().WithTopicFilter(topicFilter).Build();
-            return managedMqttClient.SubscribeAsync(subscribeOptions);
-        }
-
        public static Task SubscribeAsync(
            this IManagedMqttClient managedMqttClient,
            string topic,
@@ -83,8 +53,11 @@ namespace MQTTnet.Extensions.ManagedClient
                throw new ArgumentNullException(nameof(topic));
            }

-            var subscribeOptions = new MqttClientSubscribeOptionsBuilder().WithTopicFilter(topic, qualityOfServiceLevel).Build();
-            return managedMqttClient.SubscribeAsync(subscribeOptions);
+            return managedMqttClient.SubscribeAsync(
+                new List<MqttTopicFilter>
+                {
+                    new MqttTopicFilterBuilder().WithTopic(topic).WithQualityOfServiceLevel(qualityOfServiceLevel).Build()
+                });
        }

        public static Task UnsubscribeAsync(this IManagedMqttClient managedMqttClient, string topic)
@@ -99,8 +72,7 @@ namespace MQTTnet.Extensions.ManagedClient
                throw new ArgumentNullException(nameof(topic));
            }

-            var unsubscribeOptions = new MqttClientUnsubscribeOptionsBuilder().WithTopicFilter(topic).Build();
-            return managedMqttClient.UnsubscribeAsync(unsubscribeOptions);
+            return managedMqttClient.UnsubscribeAsync(new List<string> { topic });
        }
    }
 }
@@ -10,15 +10,6 @@ namespace MQTTnet.Extensions.ManagedClient
 {
    public sealed class ManagedMqttClientOptions
    {
-        public ManagedMqttClientOptions()
-        {
-        }
-
-        public ManagedMqttClientOptions(MqttClientOptions clientOptions)
-        {
-            ClientOptions = clientOptions;
-        }
-        
        public MqttClientOptions ClientOptions { get; set; }

        public TimeSpan AutoReconnectDelay { get; set; } = TimeSpan.FromSeconds(5);
@@ -8,7 +8,7 @@ using MQTTnet.Server;

 namespace MQTTnet.Extensions.ManagedClient
 {
-    public sealed class ManagedMqttClientOptionsBuilder
+    public class ManagedMqttClientOptionsBuilder
    {
        readonly ManagedMqttClientOptions _options = new ManagedMqttClientOptions();
        MqttClientOptionsBuilder _clientOptionsBuilder;
@@ -34,7 +34,7 @@ namespace MQTTnet.Extensions.ManagedClient
        {
            if (applicationMessage == null) throw new ArgumentNullException(nameof(applicationMessage));

-            using (await _messagesLock.EnterAsync().ConfigureAwait(false))
+            using (await _messagesLock.WaitAsync(CancellationToken.None).ConfigureAwait(false))
            {
                _messages.Add(applicationMessage);
                await SaveAsync().ConfigureAwait(false);
@@ -45,7 +45,7 @@ namespace MQTTnet.Extensions.ManagedClient
        {
            if (applicationMessage == null) throw new ArgumentNullException(nameof(applicationMessage));

-            using (await _messagesLock.EnterAsync().ConfigureAwait(false))
+            using (await _messagesLock.WaitAsync(CancellationToken.None).ConfigureAwait(false))
            {
                var index = _messages.IndexOf(applicationMessage);
                if (index == -1)
@@ -10,54 +10,24 @@ namespace MQTTnet.Extensions.ManagedClient
 {
    public static class MqttFactoryExtensions
    {
-        public static IManagedMqttClient CreateManagedMqttClient(this MqttFactory factory, IMqttClient mqttClient, IMqttNetLogger logger)
-        {
-            if (factory == null)
-            {
-                throw new ArgumentNullException(nameof(factory));
-            }
-
-            if (mqttClient == null)
-            {
-                return new NewManagedMqttClient(factory.CreateMqttClient(), logger);
-            }
-
-            return new NewManagedMqttClient(mqttClient, logger);
-        }
-
        public static IManagedMqttClient CreateManagedMqttClient(this MqttFactory factory, IMqttClient mqttClient = null)
        {
-            if (factory == null)
-            {
-                throw new ArgumentNullException(nameof(factory));
-            }
+            if (factory == null) throw new ArgumentNullException(nameof(factory));

            if (mqttClient == null)
            {
-                return new NewManagedMqttClient(factory.CreateMqttClient(), factory.DefaultLogger);
+                return new ManagedMqttClient(factory.CreateMqttClient(), factory.DefaultLogger);    
            }
-
-            return new NewManagedMqttClient(mqttClient, factory.DefaultLogger);
+            
+            return new ManagedMqttClient(mqttClient, factory.DefaultLogger);
        }
-
+        
        public static IManagedMqttClient CreateManagedMqttClient(this MqttFactory factory, IMqttNetLogger logger)
        {
-            if (factory == null)
-            {
-                throw new ArgumentNullException(nameof(factory));
-            }
+            if (factory == null) throw new ArgumentNullException(nameof(factory));
+            if (logger == null) throw new ArgumentNullException(nameof(logger));

-            if (logger == null)
-            {
-                throw new ArgumentNullException(nameof(logger));
-            }
-
-            return new NewManagedMqttClient(factory.CreateMqttClient(logger), logger);
-        }
-
-        public static ManagedMqttClientOptionsBuilder CreateManagedMqttClientOptionsBuilder(this MqttFactory factory)
-        {
-            return new ManagedMqttClientOptionsBuilder();
+            return new ManagedMqttClient(factory.CreateMqttClient(logger), logger);
        }
    }
 }
@@ -1,95 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using MQTTnet.Client;
-using MQTTnet.Diagnostics;
-using MQTTnet.Internal;
-
-namespace MQTTnet.Extensions.ManagedClient
-{
-    public sealed class ApplicationMessagesManager
-    {
-        readonly MqttNetSourceLogger _logger;
-
-        readonly Queue<ManagedMqttApplicationMessage> _messageQueue = new Queue<ManagedMqttApplicationMessage>();
-        readonly IMqttClient _mqttClient;
-
-        public ApplicationMessagesManager(IMqttClient mqttClient, IMqttNetLogger logger)
-        {
-            _mqttClient = mqttClient ?? throw new ArgumentNullException(nameof(mqttClient));
-
-            if (logger == null)
-            {
-                throw new ArgumentNullException(nameof(logger));
-            }
-
-            _logger = logger.WithSource<ApplicationMessagesManager>();
-        }
-
-        public AsyncEvent<ApplicationMessageDroppedEventArgs> ApplicationMessageDroppedEvent { get; } = new AsyncEvent<ApplicationMessageDroppedEventArgs>();
-
-        public AsyncEvent<ApplicationMessageEnqueueingEventArgs> ApplicationMessageEnqueueingEvent { get; } = new AsyncEvent<ApplicationMessageEnqueueingEventArgs>();
-
-        public int EnqueuedApplicationMessagesCount
-        {
-            get
-            {
-                lock (_messageQueue)
-                {
-                    return _messageQueue.Count;
-                }
-            }
-        }
-
-        public void Dequeue()
-        {
-            lock (_messageQueue)
-            {
-                _messageQueue.Dequeue();
-            }
-        }
-
-        public async Task Enqueue(ManagedMqttApplicationMessage applicationMessage)
-        {
-            if (applicationMessage == null)
-            {
-                throw new ArgumentNullException(nameof(applicationMessage));
-            }
-
-            // Fire the event first so that the handler can make sure that this message is 
-            // properly backed up in a suitable storage.
-            if (ApplicationMessageEnqueueingEvent.HasHandlers)
-            {
-                var eventArgs = new ApplicationMessageEnqueueingEventArgs(applicationMessage, 0);
-                await ApplicationMessageEnqueueingEvent.InvokeAsync(eventArgs).ConfigureAwait(false);
-            }
-
-            lock (_messageQueue)
-            {
-                
-                // TODO: Drop if too much!
-                
-                _messageQueue.Enqueue(applicationMessage);
-            }
-        }
-
-        public bool TryPeek(out ManagedMqttApplicationMessage applicationMessage)
-        {
-            lock (_messageQueue)
-            {
-                if (_messageQueue.Count == 0)
-                {
-                    applicationMessage = null;
-                    return false;
-                }
-
-                applicationMessage = _messageQueue.Peek();
-                return true;
-            }
-        }
-    }
-}
@@ -1,21 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-
-namespace MQTTnet.Extensions.ManagedClient
-{
-    public sealed class ApplicationMessageEnqueueingEventArgs : EventArgs
-    {
-        public ApplicationMessageEnqueueingEventArgs(ManagedMqttApplicationMessage applicationMessage, ushort packetIdentifier)
-        {
-            ApplicationMessage = applicationMessage ?? throw new ArgumentNullException(nameof(applicationMessage));
-            PacketIdentifier = packetIdentifier;
-        }
-
-        public ManagedMqttApplicationMessage ApplicationMessage { get; }
-
-        public ushort PacketIdentifier { get; }
-    }
-}
@@ -1,27 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using MQTTnet.Client;
-using MQTTnet.Packets;
-
-namespace MQTTnet.Extensions.ManagedClient
-{
-    public sealed class SubscribeProcessedEventArgs : EventArgs
-    {
-        public SubscribeProcessedEventArgs(MqttClientSubscribeOptions options, MqttClientSubscribeResultCode result, IReadOnlyCollection<MqttUserProperty> userProperties)
-        {
-            Options = options ?? throw new ArgumentNullException(nameof(options));
-            Result = result;
-            UserProperties = userProperties;
-        }
-
-        public MqttClientSubscribeOptions Options { get; }
-
-        public MqttClientSubscribeResultCode Result { get; }
-
-        public IReadOnlyCollection<MqttUserProperty> UserProperties { get; }
-    }
-}
@@ -1,27 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using MQTTnet.Client;
-using MQTTnet.Packets;
-
-namespace MQTTnet.Extensions.ManagedClient
-{
-    public sealed class UnsubscribeProcessedEventArgs : EventArgs
-    {
-        public UnsubscribeProcessedEventArgs(MqttClientUnsubscribeOptions options, MqttClientUnsubscribeResultCode result, IReadOnlyCollection<MqttUserProperty> userProperties)
-        {
-            Options = options ?? throw new ArgumentNullException(nameof(options));
-            Result = result;
-            UserProperties = userProperties;
-        }
-
-        public MqttClientUnsubscribeOptions Options { get; }
-
-        public MqttClientUnsubscribeResultCode Result { get; }
-
-        public IReadOnlyCollection<MqttUserProperty> UserProperties { get; }
-    }
-}
@@ -1,15 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace MQTTnet.Extensions.ManagedClient
-{
-    public enum MaintainConnectionResult
-    {
-        NoChange,
-
-        ConnectedEstablished,
-
-        NotConnected
-    }
-}
@@ -1,35 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Linq;
-using MQTTnet.Client;
-
-namespace MQTTnet.Extensions.ManagedClient
-{
-    public sealed class ManagedMqttSubscription
-    {
-        public ManagedMqttSubscription(MqttClientSubscribeOptions subscribeOptions)
-        {
-            SubscribeOptions = subscribeOptions ?? throw new ArgumentNullException(nameof(subscribeOptions));
-
-            Topic = subscribeOptions.TopicFilters.First().Topic;
-        }
-
-        public bool IsObsolete => UnsubscribeOptions != null;
-
-        public bool IsPending { get; set; } = true;
-
-        public MqttClientSubscribeOptions SubscribeOptions { get; }
-
-        public string Topic { get; }
-
-        public MqttClientUnsubscribeOptions UnsubscribeOptions { get; private set; }
-
-        public void MarkAsUnsubscribed(MqttClientUnsubscribeOptions options)
-        {
-            UnsubscribeOptions = options ?? throw new ArgumentNullException(nameof(options));
-        }
-    }
-}
@@ -1,155 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using MQTTnet.Client;
-using MQTTnet.Diagnostics;
-using MQTTnet.Internal;
-using MQTTnet.Protocol;
-
-namespace MQTTnet.Extensions.ManagedClient
-{
-    public sealed class ManagedMqttSubscriptionsManager
-    {
-        readonly MqttNetSourceLogger _logger;
-        readonly IMqttClient _mqttClient;
-        
-        // Do not use a dictionary in order to preserve subscription ordering (retained messages).
-        readonly List<ManagedMqttSubscription> _subscriptions = new List<ManagedMqttSubscription>();
-
-        public ManagedMqttSubscriptionsManager(IMqttClient mqttClient, IMqttNetLogger logger)
-        {
-            _mqttClient = mqttClient ?? throw new ArgumentNullException(nameof(mqttClient));
-
-            if (logger == null)
-            {
-                throw new ArgumentNullException(nameof(logger));
-            }
-
-            _logger = logger.WithSource<ManagedMqttSubscriptionsManager>();
-        }
-
-        public AsyncEvent<SubscribeProcessedEventArgs> SubscribeProcessedEvent { get; } = new AsyncEvent<SubscribeProcessedEventArgs>();
-
-        public AsyncEvent<UnsubscribeProcessedEventArgs> UnsubscribeProcessedEvent { get; } = new AsyncEvent<UnsubscribeProcessedEventArgs>();
-
-        public void ResubscribeAll()
-        {
-            lock (_subscriptions)
-            {
-                foreach (var subscription in _subscriptions)
-                {
-                    subscription.IsPending = true;
-                }
-            }
-        }
-
-        public void Subscribe(MqttClientSubscribeOptions options)
-        {
-            if (options == null)
-            {
-                throw new ArgumentNullException(nameof(options));
-            }
-
-            if (options.TopicFilters.Count > 1)
-            {
-                throw new NotSupportedException("The managed client only supports subscribing to one topic at the same time.");
-            }
-
-            var topic = options.TopicFilters.First().Topic;
-            
-            lock (_subscriptions)
-            {
-                MqttTopicValidator.ThrowIfInvalidSubscribe(topic);
-
-                _subscriptions.RemoveAll(s => s.Topic.Equals(topic));
-                _subscriptions.Add(new ManagedMqttSubscription(options));
-            }
-        }
-
-        public async Task Synchronize(CancellationToken cancellationToken)
-        {
-            // TODO: Remember real changes.
-
-            List<ManagedMqttSubscription> pendingSubscriptions;
-            List<ManagedMqttSubscription> obsoleteSubscriptions;
-            lock (_subscriptions)
-            {
-                pendingSubscriptions = _subscriptions.Where(s => s.IsPending).ToList();
-                obsoleteSubscriptions = _subscriptions.Where(s => s.IsObsolete).ToList();
-            }
-
-            if (pendingSubscriptions.Count == 0 && obsoleteSubscriptions.Count == 0)
-            {
-                _logger.Verbose("No subscriptions to synchronize");
-                return;
-            }
-
-            foreach (var subscription in pendingSubscriptions)
-            {
-                var subscribeResult = await _mqttClient.SubscribeAsync(subscription.SubscribeOptions, cancellationToken).ConfigureAwait(false);
-                subscription.IsPending = false;
-                await FireSubscribeProcessedEvent(subscription, subscribeResult).ConfigureAwait(false);
-            }
-
-            foreach (var subscription in obsoleteSubscriptions)
-            {
-                var unsubscribeResult = await _mqttClient.UnsubscribeAsync(subscription.UnsubscribeOptions, cancellationToken).ConfigureAwait(false);
-                lock (_subscriptions)
-                {
-                    _subscriptions.Remove(subscription);
-                }
-
-                await FireUnsubscribeProcessedEvent(subscription, unsubscribeResult).ConfigureAwait(false);
-            }
-        }
-
-        public void Unsubscribe(MqttClientUnsubscribeOptions options)
-        {
-            if (options == null)
-            {
-                throw new ArgumentNullException(nameof(options));
-            }
-
-            lock (_subscriptions)
-            {
-                var topic = options.TopicFilters.First();
-                var existingSubscription = _subscriptions.FirstOrDefault(s => s.Topic.Equals(topic));
-
-                if (existingSubscription != null)
-                {
-                    existingSubscription.MarkAsUnsubscribed(options);
-                }
-            }
-        }
-
-        async Task FireSubscribeProcessedEvent(ManagedMqttSubscription subscription, MqttClientSubscribeResult subscribeResult)
-        {
-            _logger.Info("Subscribed topic '{0}'.", subscription.Topic);
-
-            if (SubscribeProcessedEvent.HasHandlers)
-            {
-                var resultCode = subscribeResult?.Items.First().ResultCode ?? MqttClientSubscribeResultCode.UnspecifiedError;
-                var eventArgs = new SubscribeProcessedEventArgs(subscription.SubscribeOptions, resultCode, subscribeResult?.UserProperties);
-                await SubscribeProcessedEvent.InvokeAsync(eventArgs).ConfigureAwait(false);
-            }
-        }
-
-        async Task FireUnsubscribeProcessedEvent(ManagedMqttSubscription subscription, MqttClientUnsubscribeResult unsubscribeResult)
-        {
-            _logger.Info("Unsubscribed topic '{0}'.", subscription.Topic);
-
-            if (UnsubscribeProcessedEvent.HasHandlers)
-            {
-                var resultCode = unsubscribeResult?.Items.First().ResultCode ?? MqttClientUnsubscribeResultCode.UnspecifiedError;
-                var eventArgs = new UnsubscribeProcessedEventArgs(subscription.UnsubscribeOptions, resultCode, unsubscribeResult?.UserProperties);
-                await UnsubscribeProcessedEvent.InvokeAsync(eventArgs).ConfigureAwait(false);
-            }
-        }
-    }
-}
@@ -1,103 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using MQTTnet.Client;
-using MQTTnet.Diagnostics;
-using MQTTnet.Internal;
-
-namespace MQTTnet.Extensions.ManagedClient
-{
-    public sealed class MqttConnectionManager
-    {
-        readonly MqttNetSourceLogger _logger;
-        readonly IMqttClient _mqttClient;
-
-        bool _wasConnected;
-
-        public MqttConnectionManager(IMqttClient mqttClient, IMqttNetLogger logger)
-        {
-            _mqttClient = mqttClient ?? throw new ArgumentNullException(nameof(mqttClient));
-
-            if (logger == null)
-            {
-                throw new ArgumentNullException(nameof(logger));
-            }
-
-            _logger = logger.WithSource<MqttConnectionManager>();
-
-            _mqttClient.DisconnectedAsync += OnClientDisconnected;
-        }
-
-        public AsyncEvent<MqttClientConnectedEventArgs> ConnectedEvent { get; } = new AsyncEvent<MqttClientConnectedEventArgs>();
-
-        public AsyncEvent<ConnectingFailedEventArgs> ConnectingFailedEvent { get; } = new AsyncEvent<ConnectingFailedEventArgs>();
-
-        public AsyncEvent<MqttClientDisconnectedEventArgs> DisconnectedEvent { get; } = new AsyncEvent<MqttClientDisconnectedEventArgs>();
-
-        public async Task<MaintainConnectionResult> MaintainConnection(ManagedMqttClientOptions options, CancellationToken cancellationToken)
-        {
-            cancellationToken.ThrowIfCancellationRequested();
-            
-            if (_wasConnected)
-            {
-                try
-                {
-                    // The only valid way for testing the connection is to send a PING. So we start with this
-                    // in order to check if reconnecting etc. is require or not.
-                    await _mqttClient.PingAsync(cancellationToken).ConfigureAwait(false);
-
-                    // The client is properly connection. No further action required.
-                    return MaintainConnectionResult.NoChange;
-                }
-                catch (Exception exception)
-                {
-                    _logger.Error(exception, "Error while checking connection.");
-                }
-            }
-
-            MqttClientConnectResult connectResult = null;
-            try
-            {
-                // The PING was not successful so that there is no working connection. So we connect.
-                connectResult = await _mqttClient.ConnectAsync(options.ClientOptions, cancellationToken).ConfigureAwait(false);
-
-                _wasConnected = true;
-                _logger.Info("Connected.");
-
-                if (ConnectedEvent.HasHandlers)
-                {
-                    var eventArgs = new MqttClientConnectedEventArgs(connectResult);
-                    await ConnectedEvent.TryInvokeAsync(eventArgs, _logger).ConfigureAwait(false);
-                }
-
-                return MaintainConnectionResult.ConnectedEstablished;
-            }
-            catch (Exception exception)
-            {
-                if (!(exception is OperationCanceledException))
-                {
-                    _logger.Error(exception, "Error while connecting.");
-                }
-
-                if (ConnectingFailedEvent.HasHandlers)
-                {
-                    var eventArgs = new ConnectingFailedEventArgs(connectResult, exception);
-                    await ConnectingFailedEvent.InvokeAsync(eventArgs).ConfigureAwait(false);
-                }
-            }
-
-            _wasConnected = false;
-            return MaintainConnectionResult.NotConnected;
-        }
-
-        Task OnClientDisconnected(MqttClientDisconnectedEventArgs arg)
-        {
-            _wasConnected = false;
-            return DisconnectedEvent?.InvokeAsync(arg);
-        }
-    }
-}
@@ -1,309 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using MQTTnet.Client;
-using MQTTnet.Diagnostics;
-using MQTTnet.Internal;
-
-namespace MQTTnet.Extensions.ManagedClient
-{
-    public sealed class NewManagedMqttClient : Disposable, IManagedMqttClient
-    {
-        readonly AsyncEvent<ApplicationMessageProcessedEventArgs> _applicationMessageProcessedEvent = new AsyncEvent<ApplicationMessageProcessedEventArgs>();
-        readonly ApplicationMessagesManager _applicationMessagesManager;
-        readonly MqttConnectionManager _connectionManager;
-        readonly AsyncEvent<EventArgs> _isConnectedChangedEvent = new AsyncEvent<EventArgs>();
-        readonly MqttNetSourceLogger _logger;
-        readonly ManagedMqttSubscriptionsManager _subscriptionsManager;
-
-        readonly ManualResetEventSlim _workSignal = new ManualResetEventSlim();
-
-        CancellationTokenSource _workerCancellationToken;
-        Task _workerTask;
-
-        public NewManagedMqttClient(IMqttClient mqttClient, IMqttNetLogger logger)
-        {
-            InternalClient = mqttClient ?? throw new ArgumentNullException(nameof(mqttClient));
-
-            if (logger == null)
-            {
-                throw new ArgumentNullException(nameof(logger));
-            }
-
-            InternalClient.DisconnectedAsync += OnInternalClientDisconnected;
-
-            _logger = logger.WithSource(nameof(NewManagedMqttClient));
-
-            _connectionManager = new MqttConnectionManager(mqttClient, logger);
-            _subscriptionsManager = new ManagedMqttSubscriptionsManager(mqttClient, logger);
-            _applicationMessagesManager = new ApplicationMessagesManager(mqttClient, logger);
-
-            // TODO: Start timer for periodical connection checking.
-        }
-
-        public event Func<EventArgs, Task> ApplicationMessageEnqueueingAsync
-        {
-            add => _applicationMessagesManager.ApplicationMessageEnqueueingEvent.AddHandler(value);
-            remove => _applicationMessagesManager.ApplicationMessageEnqueueingEvent.RemoveHandler(value);
-        }
-
-        public event Func<ApplicationMessageProcessedEventArgs, Task> ApplicationMessageProcessedAsync
-        {
-            add => _applicationMessageProcessedEvent.AddHandler(value);
-            remove => _applicationMessageProcessedEvent.RemoveHandler(value);
-        }
-
-        public event Func<MqttApplicationMessageReceivedEventArgs, Task> ApplicationMessageReceivedAsync
-        {
-            add => InternalClient.ApplicationMessageReceivedAsync += value;
-            remove => InternalClient.ApplicationMessageReceivedAsync += value;
-        }
-
-        public event Func<ApplicationMessageDroppedEventArgs, Task> ApplicationMessageDroppedAsync
-        {
-            add => _applicationMessagesManager.ApplicationMessageDroppedEvent.AddHandler(value);
-            remove => _applicationMessagesManager.ApplicationMessageDroppedEvent.RemoveHandler(value);
-        }
-
-        public event Func<MqttClientConnectedEventArgs, Task> ConnectedAsync
-        {
-            add => _connectionManager.ConnectedEvent.AddHandler(value);
-            remove => _connectionManager.ConnectedEvent.RemoveHandler(value);
-        }
-
-        public event Func<ConnectingFailedEventArgs, Task> ConnectingFailedAsync
-        {
-            add => _connectionManager.ConnectingFailedEvent.AddHandler(value);
-            remove => _connectionManager.ConnectingFailedEvent.RemoveHandler(value);
-        }
-
-        public event Func<MqttClientDisconnectedEventArgs, Task> DisconnectedAsync
-        {
-            add => _connectionManager.DisconnectedEvent.AddHandler(value);
-            remove => _connectionManager.DisconnectedEvent.RemoveHandler(value);
-        }
-
-        public event Func<SubscribeProcessedEventArgs, Task> SubscribeProcessedAsync
-        {
-            add => _subscriptionsManager.SubscribeProcessedEvent.AddHandler(value);
-            remove => _subscriptionsManager.SubscribeProcessedEvent.RemoveHandler(value);
-        }
-
-        public event Func<UnsubscribeProcessedEventArgs, Task> UnsubscribeProcessedAsync
-        {
-            add => _subscriptionsManager.UnsubscribeProcessedEvent.AddHandler(value);
-            remove => _subscriptionsManager.UnsubscribeProcessedEvent.RemoveHandler(value);
-        }
-
-        public IMqttClient InternalClient { get; }
-
-        public bool IsConnected { get; private set; }
-
-        public bool IsStarted { get; private set; }
-
-        public ManagedMqttClientOptions Options { get; private set; }
-
-        public int EnqueuedApplicationMessagesCount => _applicationMessagesManager.EnqueuedApplicationMessagesCount;
-
-        public Task EnqueueAsync(MqttApplicationMessage applicationMessage)
-        {
-            return EnqueueAsync(new ManagedMqttApplicationMessage(Guid.NewGuid().ToString(), applicationMessage));
-        }
-
-        public async Task EnqueueAsync(ManagedMqttApplicationMessage applicationMessage)
-        {
-            if (applicationMessage == null)
-            {
-                throw new ArgumentNullException(nameof(applicationMessage));
-            }
-
-            await _applicationMessagesManager.Enqueue(applicationMessage).ConfigureAwait(false);
-            _workSignal.Set();
-        }
-
-        public Task PingAsync(CancellationToken cancellationToken = default)
-        {
-            return InternalClient.PingAsync(cancellationToken);
-        }
-
-        public Task StartAsync(ManagedMqttClientOptions options)
-        {
-            Options = options ?? throw new ArgumentNullException(nameof(options));
-
-            _workerCancellationToken = new CancellationTokenSource();
-
-            _workerTask = Task.Factory.StartNew(
-                () => WorkerLoop(_workerCancellationToken.Token),
-                _workerCancellationToken.Token,
-                TaskCreationOptions.PreferFairness,
-                TaskScheduler.Default);
-
-            _workSignal.Set();
-
-            return CompletedTask.Instance;
-        }
-
-        public async Task StopAsync(MqttClientDisconnectOptions options, CancellationToken cancellationToken = default)
-        {
-            if (options == null)
-            {
-                throw new ArgumentNullException(nameof(options));
-            }
-
-            // TODO: Send proper Disconnect signal.
-
-            try
-            {
-                await InternalClient.DisconnectAsync(options, cancellationToken).ConfigureAwait(false);
-            }
-            catch (Exception exception)
-            {
-                _logger.Error(exception, "Error while disconnecting.");
-            }
-
-            _workerCancellationToken?.Cancel(false);
-            _workerCancellationToken?.Dispose();
-
-            _workerCancellationToken = null;
-
-            if (_workerTask != null)
-            {
-            }
-        }
-
-        public Task SubscribeAsync(MqttClientSubscribeOptions options)
-        {
-            ThrowIfDisposed();
-
-            _subscriptionsManager.Subscribe(options);
-            _workSignal.Set();
-
-            return CompletedTask.Instance;
-        }
-
-        public Task UnsubscribeAsync(MqttClientUnsubscribeOptions options)
-        {
-            ThrowIfDisposed();
-
-            _subscriptionsManager.Unsubscribe(options);
-            _workSignal.Set();
-
-            return CompletedTask.Instance;
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-
-            if (disposing)
-            {
-            }
-        }
-
-        Task OnInternalClientDisconnected(MqttClientDisconnectedEventArgs eventArgs)
-        {
-            _workSignal.Set();
-            return CompletedTask.Instance;
-        }
-
-        async Task UpdateConnectionStatus(MaintainConnectionResult maintainConnectionResult)
-        {
-            var isConnected = maintainConnectionResult != MaintainConnectionResult.NotConnected;
-
-            if (IsConnected.Equals(isConnected))
-            {
-                return;
-            }
-
-            IsConnected = isConnected;
-
-            if (_isConnectedChangedEvent.HasHandlers)
-            {
-                await _isConnectedChangedEvent.InvokeAsync(EventArgs.Empty).ConfigureAwait(false);
-            }
-        }
-
-        async Task WorkerLoop(CancellationToken cancellationToken)
-        {
-            try
-            {
-                IsStarted = true;
-
-                while (!cancellationToken.IsCancellationRequested)
-                {
-                    _workSignal.Wait(cancellationToken);
-                    _workSignal.Reset();
-
-                    var maintainConnectionResult = await _connectionManager.MaintainConnection(Options, cancellationToken).ConfigureAwait(false);
-                    await UpdateConnectionStatus(maintainConnectionResult).ConfigureAwait(false);
-
-                    if (maintainConnectionResult == MaintainConnectionResult.ConnectedEstablished && Options.ClientOptions.CleanSession)
-                    {
-                        // Since the session is clean the server will now know any subscription so that
-                        // we have to subscribe to all of them again.
-                        _subscriptionsManager.ResubscribeAll();
-                    }
-
-                    if (IsConnected)
-                    {
-                        await _subscriptionsManager.Synchronize(cancellationToken).ConfigureAwait(false);
-                    }
-
-                    if (IsConnected)
-                    {
-                        // TODO: Move into pending messages manager + locking.
-                        while (_applicationMessagesManager.TryPeek(out var nextPendingMessage))
-                        {
-                            Exception processingException = null;
-                            try
-                            {
-                                _logger.Verbose("Publishing managed application message {0}.", nextPendingMessage.Id);
-
-                                await InternalClient.PublishAsync(nextPendingMessage.ApplicationMessage, cancellationToken).ConfigureAwait(false);
-
-                                // The message was delivered successfully. So we can get rid of it.
-                                _applicationMessagesManager.Dequeue();
-                            }
-                            catch (Exception exception)
-                            {
-                                processingException = exception;
-                            }
-                            finally
-                            {
-                                if (_applicationMessageProcessedEvent.HasHandlers)
-                                {
-                                    var eventArgs = new ApplicationMessageProcessedEventArgs(nextPendingMessage, processingException);
-                                    await _applicationMessageProcessedEvent.InvokeAsync(eventArgs).ConfigureAwait(false);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            catch (OperationCanceledException)
-            {
-            }
-#if !NETSTANDARD1_3
-            catch (ThreadAbortException)
-            {
-            }
-#endif
-            catch (Exception exception)
-            {
-                _logger.Error(exception, "Error while maintaining connection.");
-            }
-            finally
-            {
-                IsStarted = false;
-
-                await UpdateConnectionStatus(MaintainConnectionResult.NotConnected).ConfigureAwait(false);
-            }
-
-            // TODO: Disconnected!
-        }
-    }
-}
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

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

    <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
@@ -11,12 +11,10 @@ namespace MQTTnet.Extensions.Rpc
    {
        public static IMqttRpcClient CreateMqttRpcClient(this MqttFactory factory, IMqttClient mqttClient)
        {
-            return factory.CreateMqttRpcClient(
-                mqttClient,
-                new MqttRpcClientOptions
-                {
-                    TopicGenerationStrategy = new DefaultMqttRpcClientTopicGenerationStrategy()
-                });
+            return factory.CreateMqttRpcClient(mqttClient, new MqttRpcClientOptions
+            {
+                TopicGenerationStrategy = new DefaultMqttRpcClientTopicGenerationStrategy()
+            });
        }

        public static IMqttRpcClient CreateMqttRpcClient(this MqttFactory _, IMqttClient mqttClient, MqttRpcClientOptions rpcClientOptions)
@@ -2,25 +2,23 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

+using MQTTnet.Client;
+using MQTTnet.Exceptions;
+using MQTTnet.Protocol;
 using System;
 using System.Collections.Concurrent;
 using System.Threading;
 using System.Threading.Tasks;
-using MQTTnet.Client;
-using MQTTnet.Exceptions;
-using MQTTnet.Formatter;
-using MQTTnet.Internal;
-using MQTTnet.Protocol;
+using MQTTnet.Implementations;

 namespace MQTTnet.Extensions.Rpc
 {
    public sealed class MqttRpcClient : IMqttRpcClient
    {
+        readonly ConcurrentDictionary<string, TaskCompletionSource<byte[]>> _waitingCalls = new ConcurrentDictionary<string, TaskCompletionSource<byte[]>>();
        readonly IMqttClient _mqttClient;
        readonly MqttRpcClientOptions _options;
-
-        readonly ConcurrentDictionary<string, AsyncTaskCompletionSource<byte[]>> _waitingCalls = new ConcurrentDictionary<string, AsyncTaskCompletionSource<byte[]>>();
-
+        
        public MqttRpcClient(IMqttClient mqttClient, MqttRpcClientOptions options)
        {
            _mqttClient = mqttClient ?? throw new ArgumentNullException(nameof(mqttClient));
@@ -29,18 +27,6 @@ namespace MQTTnet.Extensions.Rpc
            _mqttClient.ApplicationMessageReceivedAsync += HandleApplicationMessageReceivedAsync;
        }

-        public void Dispose()
-        {
-            _mqttClient.ApplicationMessageReceivedAsync -= HandleApplicationMessageReceivedAsync;
-
-            foreach (var tcs in _waitingCalls)
-            {
-                tcs.Value.TrySetCanceled();
-            }
-
-            _waitingCalls.Clear();
-        }
-
        public async Task<byte[]> ExecuteAsync(TimeSpan timeout, string methodName, byte[] payload, MqttQualityOfServiceLevel qualityOfServiceLevel)
        {
            using (var timeoutToken = new CancellationTokenSource(timeout))
@@ -63,13 +49,15 @@ namespace MQTTnet.Extensions.Rpc

        public async Task<byte[]> ExecuteAsync(string methodName, byte[] payload, MqttQualityOfServiceLevel qualityOfServiceLevel, CancellationToken cancellationToken = default)
        {
-            if (methodName == null)
+            if (methodName == null) throw new ArgumentNullException(nameof(methodName));
+            
+            var topicNames = _options.TopicGenerationStrategy.CreateRpcTopics(new TopicGenerationContext
            {
-                throw new ArgumentNullException(nameof(methodName));
-            }
-
-            var context = new TopicGenerationContext(_mqttClient, _options, methodName, qualityOfServiceLevel);
-            var topicNames = _options.TopicGenerationStrategy.CreateRpcTopics(context);
+                MethodName = methodName,
+                QualityOfServiceLevel = qualityOfServiceLevel,
+                MqttClient = _mqttClient,
+                Options = _options
+            });

            var requestTopic = topicNames.RequestTopic;
            var responseTopic = topicNames.ResponseTopic;
@@ -84,34 +72,34 @@ namespace MQTTnet.Extensions.Rpc
                throw new MqttProtocolViolationException("RPC response topic is empty.");
            }

-            var requestMessageBuilder = new MqttApplicationMessageBuilder().WithTopic(requestTopic).WithPayload(payload).WithQualityOfServiceLevel(qualityOfServiceLevel);
-
-            if (_mqttClient.Options.ProtocolVersion == MqttProtocolVersion.V500)
-            {
-                requestMessageBuilder.WithResponseTopic(responseTopic);
-            }
-
-            var requestMessage = requestMessageBuilder.Build();
+            var requestMessage = new MqttApplicationMessageBuilder()
+                .WithTopic(requestTopic)
+                .WithPayload(payload)
+                .WithQualityOfServiceLevel(qualityOfServiceLevel)
+                .WithResponseTopic(responseTopic)
+                .Build();

            try
            {
-                var awaitable = new AsyncTaskCompletionSource<byte[]>();
+#if NET452
+                var awaitable = new TaskCompletionSource<byte[]>();
+#else
+                var awaitable = new TaskCompletionSource<byte[]>(TaskCreationOptions.RunContinuationsAsynchronously);
+#endif

                if (!_waitingCalls.TryAdd(responseTopic, awaitable))
                {
                    throw new InvalidOperationException();
                }

-                var subscribeOptions = new MqttClientSubscribeOptionsBuilder().WithTopicFilter(responseTopic, qualityOfServiceLevel).Build();
+                var subscribeOptions = new MqttClientSubscribeOptionsBuilder()
+                    .WithTopicFilter(responseTopic, qualityOfServiceLevel)
+                    .Build();

                await _mqttClient.SubscribeAsync(subscribeOptions, cancellationToken).ConfigureAwait(false);
                await _mqttClient.PublishAsync(requestMessage, cancellationToken).ConfigureAwait(false);

-                using (cancellationToken.Register(
-                           () =>
-                           {
-                               awaitable.TrySetCanceled();
-                           }))
+                using (cancellationToken.Register(() => { awaitable.TrySetCanceled(); }))
                {
                    return await awaitable.Task.ConfigureAwait(false);
                }
@@ -119,8 +107,8 @@ namespace MQTTnet.Extensions.Rpc
            finally
            {
                _waitingCalls.TryRemove(responseTopic, out _);
-
-                await _mqttClient.UnsubscribeAsync(responseTopic, CancellationToken.None).ConfigureAwait(false);
+                
+                await _mqttClient.UnsubscribeAsync(responseTopic).ConfigureAwait(false);
            }
        }

@@ -128,15 +116,31 @@ namespace MQTTnet.Extensions.Rpc
        {
            if (!_waitingCalls.TryRemove(eventArgs.ApplicationMessage.Topic, out var awaitable))
            {
-                return CompletedTask.Instance;
+                return PlatformAbstractionLayer.CompletedTask;
            }

+#if NET452
+            Task.Run(() => awaitable.TrySetResult(eventArgs.ApplicationMessage.Payload));
+#else
            awaitable.TrySetResult(eventArgs.ApplicationMessage.Payload);
+#endif

            // Set this message to handled to that other code can avoid execution etc.
            eventArgs.IsHandled = true;

-            return CompletedTask.Instance;
+            return PlatformAbstractionLayer.CompletedTask;
+        }
+
+        public void Dispose()
+        {
+            _mqttClient.ApplicationMessageReceivedAsync -= HandleApplicationMessageReceivedAsync;
+
+            foreach (var tcs in _waitingCalls)
+            {
+                tcs.Value.TrySetCanceled();
+            }
+
+            _waitingCalls.Clear();
        }
    }
 }
@@ -10,6 +10,13 @@ namespace MQTTnet.Extensions.Rpc
    {
        IMqttRpcClientTopicGenerationStrategy _topicGenerationStrategy = new DefaultMqttRpcClientTopicGenerationStrategy();

+        public MqttRpcClientOptionsBuilder WithTopicGenerationStrategy(IMqttRpcClientTopicGenerationStrategy value)
+        {
+            _topicGenerationStrategy = value ?? throw new ArgumentNullException(nameof(value));
+
+            return this;
+        }
+
        public MqttRpcClientOptions Build()
        {
            return new MqttRpcClientOptions
@@ -17,12 +24,5 @@ namespace MQTTnet.Extensions.Rpc
                TopicGenerationStrategy = _topicGenerationStrategy
            };
        }
-
-        public MqttRpcClientOptionsBuilder WithTopicGenerationStrategy(IMqttRpcClientTopicGenerationStrategy value)
-        {
-            _topicGenerationStrategy = value ?? throw new ArgumentNullException(nameof(value));
-
-            return this;
-        }
    }
-}
+}
@@ -10,11 +10,6 @@ namespace MQTTnet.Extensions.Rpc
    {
        public MqttRpcTopicPair CreateRpcTopics(TopicGenerationContext context)
        {
-            if (context == null)
-            {
-                throw new ArgumentNullException(nameof(context));
-            }
-
            if (context.MethodName.Contains("/") || context.MethodName.Contains("+") || context.MethodName.Contains("#"))
            {
                throw new ArgumentException("The method name cannot contain /, + or #.");
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using System;
 using MQTTnet.Client;
 using MQTTnet.Protocol;

@@ -10,29 +9,20 @@ namespace MQTTnet.Extensions.Rpc
 {
    public sealed class TopicGenerationContext
    {
-        public TopicGenerationContext(IMqttClient mqttClient, MqttRpcClientOptions options, string methodName, MqttQualityOfServiceLevel qualityOfServiceLevel)
-        {
-            MethodName = methodName ?? throw new ArgumentNullException(nameof(methodName));
-            QualityOfServiceLevel = qualityOfServiceLevel;
-            MqttClient = mqttClient ?? throw new ArgumentNullException(nameof(mqttClient));
-            Options = options ?? throw new ArgumentNullException(nameof(options));
-        }
-
-        public string MethodName { get; }
-
-        public IMqttClient MqttClient { get; }
-
-        public MqttRpcClientOptions Options { get; }
+        public string MethodName { get; set; }

        /// <summary>
-        ///     Gets or sets the quality of service level.
-        ///     The Quality of Service (QoS) level is an agreement between the sender of a message and the receiver of a message
-        ///     that defines the guarantee of delivery for a specific message.
-        ///     There are 3 QoS levels in MQTT:
-        ///     - At most once  (0): Message gets delivered no time, once or multiple times.
-        ///     - At least once (1): Message gets delivered at least once (one time or more often).
-        ///     - Exactly once  (2): Message gets delivered exactly once (It's ensured that the message only comes once).
+        /// Gets or sets the quality of service level.
+        /// The Quality of Service (QoS) level is an agreement between the sender of a message and the receiver of a message that defines the guarantee of delivery for a specific message.
+        /// There are 3 QoS levels in MQTT:
+        /// - At most once  (0): Message gets delivered no time, once or multiple times.
+        /// - At least once (1): Message gets delivered at least once (one time or more often).
+        /// - Exactly once  (2): Message gets delivered exactly once (It's ensured that the message only comes once).
        /// </summary>
-        public MqttQualityOfServiceLevel QualityOfServiceLevel { get; }
+        public MqttQualityOfServiceLevel QualityOfServiceLevel { get; set; }
+
+        public IMqttClient MqttClient { get; set; }
+
+        public MqttRpcClientOptions Options { get; set; }
    }
-}
+}
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

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

    <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
@@ -10,12 +10,9 @@ namespace MQTTnet.Extensions.WebSocket4Net
    {
        public static MqttFactory UseWebSocket4Net(this MqttFactory mqttFactory)
        {
-            if (mqttFactory == null)
-            {
-                throw new ArgumentNullException(nameof(mqttFactory));
-            }
+            if (mqttFactory == null) throw new ArgumentNullException(nameof(mqttFactory));

            return mqttFactory.UseClientAdapterFactory(new WebSocket4NetMqttClientAdapterFactory());
        }
    }
-}
+}
@@ -5,7 +5,6 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Net;
 using System.Security.Authentication;
@@ -15,17 +14,16 @@ using System.Threading.Tasks;
 using MQTTnet.Channel;
 using MQTTnet.Client;
 using MQTTnet.Exceptions;
-using MQTTnet.Internal;
 using SuperSocket.ClientEngine;
 using WebSocket4Net;
-using DataReceivedEventArgs = WebSocket4Net.DataReceivedEventArgs;

 namespace MQTTnet.Extensions.WebSocket4Net
 {
    public sealed class WebSocket4NetMqttChannel : IMqttChannel
    {
-        readonly MqttClientOptions _clientOptions;
        readonly BlockingCollection<byte> _receiveBuffer = new BlockingCollection<byte>();
+
+        readonly MqttClientOptions _clientOptions;
        readonly MqttClientWebSocketOptions _webSocketOptions;

        WebSocket _webSocket;
@@ -36,13 +34,13 @@ namespace MQTTnet.Extensions.WebSocket4Net
            _webSocketOptions = webSocketOptions ?? throw new ArgumentNullException(nameof(webSocketOptions));
        }

-        public X509Certificate2 ClientCertificate { get; }
-
        public string Endpoint => _webSocketOptions.Uri;

        public bool IsSecureConnection { get; private set; }

-        public Task ConnectAsync(CancellationToken cancellationToken)
+        public X509Certificate2 ClientCertificate { get; }
+
+        public async Task ConnectAsync(CancellationToken cancellationToken)
        {
            var uri = _webSocketOptions.Uri;
            if (!uri.StartsWith("ws://", StringComparison.OrdinalIgnoreCase) && !uri.StartsWith("wss://", StringComparison.OrdinalIgnoreCase))
@@ -56,13 +54,11 @@ namespace MQTTnet.Extensions.WebSocket4Net
                    uri = "wss://" + uri;
                }
            }
-            
-            IsSecureConnection = uri.StartsWith("wss://", StringComparison.OrdinalIgnoreCase);

-#if NET48 || NETCOREAPP3_0_OR_GREATER
-            var sslProtocols = _webSocketOptions.TlsOptions?.SslProtocol ?? SslProtocols.Tls12 | SslProtocols.Tls13;
+#if NET48 || NETCOREAPP3_1 || NET5 || NET6
+            var sslProtocols = _webSocketOptions?.TlsOptions?.SslProtocol ?? SslProtocols.Tls12 | SslProtocols.Tls13;
 #else
-            var sslProtocols = _webSocketOptions.TlsOptions?.SslProtocol ?? SslProtocols.Tls12 | (SslProtocols)0x00003000 /*Tls13*/;
+            var sslProtocols = _webSocketOptions?.TlsOptions?.SslProtocol ?? SslProtocols.Tls12 | (SslProtocols)0x00003000 /*Tls13*/;
 #endif

            var subProtocol = _webSocketOptions.SubProtocols.FirstOrDefault() ?? string.Empty;
@@ -93,7 +89,7 @@ namespace MQTTnet.Extensions.WebSocket4Net
            var receiveBufferSize = 0;

            var certificates = new X509CertificateCollection();
-            if (_webSocketOptions.TlsOptions?.Certificates != null)
+            if (_webSocketOptions?.TlsOptions?.Certificates != null)
            {
                foreach (var certificate in _webSocketOptions.TlsOptions.Certificates)
                {
@@ -110,13 +106,15 @@ namespace MQTTnet.Extensions.WebSocket4Net
                NoDelay = true,
                Security =
                {
-                    AllowUnstrustedCertificate = _webSocketOptions.TlsOptions?.AllowUntrustedCertificates == true,
-                    AllowCertificateChainErrors = _webSocketOptions.TlsOptions?.IgnoreCertificateChainErrors == true,
+                    AllowUnstrustedCertificate = _webSocketOptions?.TlsOptions?.AllowUntrustedCertificates == true,
+                    AllowCertificateChainErrors = _webSocketOptions?.TlsOptions?.IgnoreCertificateChainErrors == true,
                    Certificates = certificates
                }
            };

-            return ConnectInternalAsync(cancellationToken);
+            await ConnectInternalAsync(cancellationToken).ConfigureAwait(false);
+            
+            IsSecureConnection = uri.StartsWith("wss://", StringComparison.OrdinalIgnoreCase);
        }

        public Task DisconnectAsync(CancellationToken cancellationToken)
@@ -125,21 +123,8 @@ namespace MQTTnet.Extensions.WebSocket4Net
            {
                _webSocket.Close();
            }
-
-            return CompletedTask.Instance;
-        }
-
-        public void Dispose()
-        {
-            if (_webSocket == null)
-            {
-                return;
-            }
-
-            _webSocket.DataReceived -= OnDataReceived;
-            _webSocket.Error -= OnError;
-            _webSocket.Dispose();
-            _webSocket = null;
+            
+            return Task.FromResult(0);
        }

        public Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
@@ -169,10 +154,36 @@ namespace MQTTnet.Extensions.WebSocket4Net
            return Task.FromResult(readBytes);
        }

-        public Task WriteAsync(ArraySegment<byte> buffer, bool isEndOfPacket, CancellationToken cancellationToken)
+        public Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
        {
-            _webSocket.Send(buffer.Array, buffer.Offset, buffer.Count);
-            return CompletedTask.Instance;
+            _webSocket.Send(buffer, offset, count);
+            return Task.FromResult(0);
+        }
+
+        public void Dispose()
+        {
+            if (_webSocket == null)
+            {
+                return;
+            }
+
+            _webSocket.DataReceived -= OnDataReceived;
+            _webSocket.Error -= OnError;
+            _webSocket.Dispose();
+            _webSocket = null;
+        }
+
+        static void OnError(object sender, ErrorEventArgs e)
+        {
+            System.Diagnostics.Debug.Write(e.Exception.ToString());
+        }
+
+        void OnDataReceived(object sender, DataReceivedEventArgs e)
+        {
+            foreach (var @byte in e.Data)
+            {
+                _receiveBuffer.Add(@byte);
+            }
        }

        async Task ConnectInternalAsync(CancellationToken cancellationToken)
@@ -180,50 +191,44 @@ namespace MQTTnet.Extensions.WebSocket4Net
            _webSocket.Error += OnError;
            _webSocket.DataReceived += OnDataReceived;

-            var promise = new AsyncTaskCompletionSource<bool>();
+            var taskCompletionSource = new TaskCompletionSource<Exception>();

            void ErrorHandler(object sender, ErrorEventArgs e)
            {
-                promise.TrySetException(e.Exception);
+                taskCompletionSource.TrySetResult(e.Exception);
            }

-            void OpenedHandler(object sender, EventArgs e)
+            void SuccessHandler(object sender, EventArgs e)
            {
-                promise.TrySetResult(true);
-            }
-
-            void ClosedHandler(object sender, EventArgs e)
-            {
-                promise.TrySetException(new MqttCommunicationException("Connection closed."));
+                taskCompletionSource.TrySetResult(null);
            }

            try
            {
-                _webSocket.Opened += OpenedHandler;
-                _webSocket.Closed += ClosedHandler;
+                _webSocket.Opened += SuccessHandler;
                _webSocket.Error += ErrorHandler;

-                using (var timeout = new CancellationTokenSource(_clientOptions.Timeout))
-                using (var linkedCts = CancellationTokenSource.CreateLinkedTokenSource(timeout.Token, cancellationToken))
+#pragma warning disable AsyncFixer02 // Long-running or blocking operations inside an async method
+                _webSocket.Open();
+#pragma warning restore AsyncFixer02 // Long-running or blocking operations inside an async method
+
+                using (var timeoutCts = new CancellationTokenSource(_clientOptions.Timeout))
+                using (var linkedCts = CancellationTokenSource.CreateLinkedTokenSource(timeoutCts.Token, cancellationToken))
                {
-                    using (linkedCts.Token.Register(() => promise.TrySetCanceled()))
+                    using (linkedCts.Token.Register(() => taskCompletionSource.TrySetCanceled()))
                    {
                        try
                        {
-                            // OpenAsync does basically the same but without support for a cancellation token.
-                            // So we do it on our own!
-                            _webSocket.Open();
-
-                            await promise.Task.ConfigureAwait(false);
+                            await taskCompletionSource.Task.ConfigureAwait(false);
                        }
                        catch (Exception exception)
                        {
-                            var timeoutReached = timeout.IsCancellationRequested && !cancellationToken.IsCancellationRequested;
+                            var timeoutReached = timeoutCts.IsCancellationRequested && !cancellationToken.IsCancellationRequested;
                            if (timeoutReached)
                            {
                                throw new MqttCommunicationTimedOutException(exception);
                            }
-
+                            
                            if (exception is AuthenticationException authenticationException)
                            {
                                throw new MqttCommunicationException(authenticationException.InnerException);
@@ -245,23 +250,9 @@ namespace MQTTnet.Extensions.WebSocket4Net
            }
            finally
            {
-                _webSocket.Opened -= OpenedHandler;
-                _webSocket.Closed -= ClosedHandler;
+                _webSocket.Opened -= SuccessHandler;
                _webSocket.Error -= ErrorHandler;
            }
        }
-
-        void OnDataReceived(object sender, DataReceivedEventArgs e)
-        {
-            foreach (var @byte in e.Data)
-            {
-                _receiveBuffer.Add(@byte);
-            }
-        }
-
-        static void OnError(object sender, ErrorEventArgs e)
-        {
-            Debug.Write(e.Exception.ToString());
-        }
    }
-}
+}
@@ -2,12 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using System;
 using MQTTnet.Adapter;
-using MQTTnet.Client;
-using MQTTnet.Diagnostics;
 using MQTTnet.Formatter;
 using MQTTnet.Implementations;
+using System;
+using MQTTnet.Client;
+using MQTTnet.Diagnostics;

 namespace MQTTnet.Extensions.WebSocket4Net
 {
@@ -15,10 +15,7 @@ namespace MQTTnet.Extensions.WebSocket4Net
    {
        public IMqttChannelAdapter CreateClientAdapter(MqttClientOptions options, MqttPacketInspector packetInspector, IMqttNetLogger logger)
        {
-            if (options == null)
-            {
-                throw new ArgumentNullException(nameof(options));
-            }
+            if (options == null) throw new ArgumentNullException(nameof(options));

            switch (options.ChannelOptions)
            {
@@ -26,7 +23,7 @@ namespace MQTTnet.Extensions.WebSocket4Net
                {
                    return new MqttChannelAdapter(
                        new MqttTcpChannel(options),
-                        new MqttPacketFormatterAdapter(options.ProtocolVersion, new MqttBufferWriter(options.WriterBufferSize, options.WriterBufferSizeMax)),
+                        new MqttPacketFormatterAdapter(options.ProtocolVersion, new MqttBufferWriter(4096, 65535)),
                        packetInspector,
                        logger);
                }
@@ -35,16 +32,16 @@ namespace MQTTnet.Extensions.WebSocket4Net
                {
                    return new MqttChannelAdapter(
                        new WebSocket4NetMqttChannel(options, webSocketOptions),
-                        new MqttPacketFormatterAdapter(options.ProtocolVersion, new MqttBufferWriter(options.WriterBufferSize, options.WriterBufferSizeMax)),
+                        new MqttPacketFormatterAdapter(options.ProtocolVersion, new MqttBufferWriter(4068, 65535)), 
                        packetInspector,
                        logger);
                }

                default:
-                {
-                    throw new NotSupportedException();
-                }
+                    {
+                        throw new NotSupportedException();
+                    }
            }
        }
    }
-}
+}
@@ -1,28 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Threading;
-using System.Threading.Tasks;
-using MQTTnet.Internal;
-
-namespace MQTTnet.TestApp
-{
-    public sealed class AsyncLockTest
-    {
-        public async Task Run()
-        {
-            var asyncLock = new AsyncLock();
-
-            using (var cancellationToken = new CancellationTokenSource())
-            {
-                for (var i = 0; i < 100000; i++)
-                {
-                    using (await asyncLock.EnterAsync(cancellationToken.Token).ConfigureAwait(false))
-                    {
-                    }
-                } 
-            }
-        }
-    }
-}
@@ -7,7 +7,7 @@ using System;
 using System.Text;
 using System.Threading.Tasks;
 using MQTTnet.Diagnostics;
-using MQTTnet.Internal;
+using MQTTnet.Implementations;
 using MQTTnet.Protocol;

 namespace MQTTnet.TestApp
@@ -40,7 +40,7 @@ namespace MQTTnet.TestApp
                    Console.WriteLine($"+ Retain = {e.ApplicationMessage.Retain}");
                    Console.WriteLine();
                    
-                    return CompletedTask.Instance;
+                    return PlatformAbstractionLayer.CompletedTask;
                };

                client.ConnectedAsync += async e =>
@@ -1,19 +1,20 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

    <PropertyGroup>
        <OutputType>Exe</OutputType>
        <DebugType>Full</DebugType>
-        <TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
        <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net452;net461</TargetFrameworks>
        <IsPackable>false</IsPackable>
        <EnableNETAnalyzers>false</EnableNETAnalyzers>
        <EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
        <DisableImplicitAspNetCoreAnalyzers>true</DisableImplicitAspNetCoreAnalyzers>
-        <NoWarn>1591;NETSDK1138</NoWarn>
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+        <PackageReference Include="Microsoft.CodeAnalysis.Compilers" Version="4.0.1" />
+        <PackageReference Include="Microsoft.Net.Compilers" Version="4.0.1" />
    </ItemGroup>

    <ItemGroup>
@@ -9,7 +9,7 @@ using Newtonsoft.Json;
 using System.Collections.Generic;
 using MQTTnet.Client;
 using MQTTnet.Extensions.ManagedClient;
-using MQTTnet.Internal;
+using MQTTnet.Implementations;
 using MQTTnet.Protocol;

 namespace MQTTnet.TestApp
@@ -42,7 +42,7 @@ namespace MQTTnet.TestApp
                managedClient.ApplicationMessageReceivedAsync += e =>
                {
                    Console.WriteLine(">> RECEIVED: " + e.ApplicationMessage.Topic);
-                    return CompletedTask.Instance;
+                    return PlatformAbstractionLayer.CompletedTask;
                };

                await managedClient.StartAsync(options);
@@ -85,7 +85,7 @@ namespace MQTTnet.TestApp
            public Task SaveQueuedMessagesAsync(IList<ManagedMqttApplicationMessage> messages)
            {
                File.WriteAllText(Filename, JsonConvert.SerializeObject(messages));
-                return CompletedTask.Instance;
+                return Task.FromResult(0);
            }

            public Task<IList<ManagedMqttApplicationMessage>> LoadQueuedMessagesAsync()
@@ -5,7 +5,6 @@ using System;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Linq;
-using MQTTnet.Internal;

 namespace MQTTnet.TestApp
 {
@@ -125,7 +124,7 @@ namespace MQTTnet.TestApp
            {
                _cancellationTokenSource.Cancel();
            }
-            return CompletedTask.Instance;
+            return Implementations.PlatformAbstractionLayer.CompletedTask;
        }

        public async Task Cleanup()
@@ -28,7 +28,6 @@ namespace MQTTnet.TestApp
            Console.WriteLine("c = Start QoS 0 benchmark");
            Console.WriteLine("d = Start server with logging");
            Console.WriteLine("e = Start Message Throughput Test");
-            Console.WriteLine("f = Start AsyncLock Test");

            var pressedKey = Console.ReadKey(true);
            if (pressedKey.KeyChar == '1')
@@ -89,10 +88,6 @@ namespace MQTTnet.TestApp
            {
                Task.Run(new MessageThroughputTest().Run);
            }
-            else if (pressedKey.KeyChar == 'f')
-            {
-                Task.Run(new AsyncLockTest().Run);
-            }

            Thread.Sleep(Timeout.Infinite);
        }
@@ -2,14 +2,13 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

+using MQTTnet.Client;
 using System;
 using System.Security.Authentication;
 using System.Threading;
 using System.Threading.Tasks;
-using MQTTnet.Client;
-using MQTTnet.Extensions.WebSocket4Net;
 using MQTTnet.Formatter;
-using MQTTnet.Internal;
+using MQTTnet.Implementations;
 using MQTTnet.Protocol;

 namespace MQTTnet.TestApp
@@ -18,6 +17,10 @@ namespace MQTTnet.TestApp
    {
        public static async Task RunAsync()
        {
+            // MqttNetConsoleLogger.ForwardToConsole();
+
+            // For most of these connections to work, set output target to Net5.0.            
+
 #if NET5_0_OR_GREATER
            // TLS13 is only available in Net5.0
            var unsafeTls13 = new MqttClientOptionsBuilderTlsParameters
@@ -28,6 +31,7 @@ namespace MQTTnet.TestApp
                CertificateValidationHandler = w => true
            };
 #endif
+
            // Also defining TLS12 for servers that don't seem no to support TLS13.
            var unsafeTls12 = new MqttClientOptionsBuilderTlsParameters
            {
@@ -38,37 +42,33 @@ namespace MQTTnet.TestApp
            };

            // mqtt.eclipseprojects.io
-            await ExecuteTestAsync(
-                "mqtt.eclipseprojects.io TCP",
-                new MqttClientOptionsBuilder().WithTcpServer("mqtt.eclipseprojects.io", 1883).WithProtocolVersion(MqttProtocolVersion.V311).Build());
+            await ExecuteTestAsync("mqtt.eclipseprojects.io TCP",
+                    new MqttClientOptionsBuilder().WithTcpServer("mqtt.eclipseprojects.io", 1883)
+                        .WithProtocolVersion(MqttProtocolVersion.V311).Build());

-            await ExecuteTestAsync(
-                "mqtt.eclipseprojects.io WS",
-                new MqttClientOptionsBuilder().WithWebSocketServer("mqtt.eclipseprojects.io:80/mqtt").WithProtocolVersion(MqttProtocolVersion.V311).Build());
+            await ExecuteTestAsync("mqtt.eclipseprojects.io WS",
+                new MqttClientOptionsBuilder().WithWebSocketServer("mqtt.eclipseprojects.io:80/mqtt")
+                    .WithProtocolVersion(MqttProtocolVersion.V311).Build());

 #if NET5_0_OR_GREATER
            await ExecuteTestAsync("mqtt.eclipseprojects.io WS TLS13",
                new MqttClientOptionsBuilder().WithWebSocketServer("mqtt.eclipseprojects.io:443/mqtt")
                    .WithProtocolVersion(MqttProtocolVersion.V311).WithTls(unsafeTls13).Build());
-            
-            await ExecuteTestAsync("mqtt.eclipseprojects.io WS TLS13 (WebSocket4Net)",
-                new MqttClientOptionsBuilder().WithWebSocketServer("mqtt.eclipseprojects.io:443/mqtt")
-                    .WithProtocolVersion(MqttProtocolVersion.V311).WithTls(unsafeTls13).Build(),
-                    true);
 #endif

            // test.mosquitto.org
-            await ExecuteTestAsync(
-                "test.mosquitto.org TCP",
-                new MqttClientOptionsBuilder().WithTcpServer("test.mosquitto.org", 1883).WithProtocolVersion(MqttProtocolVersion.V311).Build());
+            await ExecuteTestAsync("test.mosquitto.org TCP",
+                new MqttClientOptionsBuilder().WithTcpServer("test.mosquitto.org", 1883)
+                    .WithProtocolVersion(MqttProtocolVersion.V311).Build());

-            await ExecuteTestAsync(
-                "test.mosquitto.org TCP - Authenticated",
-                new MqttClientOptionsBuilder().WithTcpServer("test.mosquitto.org", 1884).WithCredentials("rw", "readwrite").WithProtocolVersion(MqttProtocolVersion.V311).Build());
+            await ExecuteTestAsync("test.mosquitto.org TCP - Authenticated",
+                new MqttClientOptionsBuilder().WithTcpServer("test.mosquitto.org", 1884)
+                    .WithCredentials("rw", "readwrite")
+                    .WithProtocolVersion(MqttProtocolVersion.V311).Build());

-            await ExecuteTestAsync(
-                "test.mosquitto.org TCP TLS12",
-                new MqttClientOptionsBuilder().WithTcpServer("test.mosquitto.org", 8883).WithProtocolVersion(MqttProtocolVersion.V311).WithTls(unsafeTls12).Build());
+            await ExecuteTestAsync("test.mosquitto.org TCP TLS12",
+                new MqttClientOptionsBuilder().WithTcpServer("test.mosquitto.org", 8883)
+                    .WithProtocolVersion(MqttProtocolVersion.V311).WithTls(unsafeTls12).Build());

 #if NET5_0_OR_GREATER
            await ExecuteTestAsync("test.mosquitto.org TCP TLS13",
@@ -76,40 +76,27 @@ namespace MQTTnet.TestApp
                    .WithProtocolVersion(MqttProtocolVersion.V311).WithTls(unsafeTls13).Build());
 #endif

-            await ExecuteTestAsync(
-                "test.mosquitto.org TCP TLS12 - Authenticated",
+            await ExecuteTestAsync("test.mosquitto.org TCP TLS12 - Authenticated",
                new MqttClientOptionsBuilder().WithTcpServer("test.mosquitto.org", 8885)
                    .WithCredentials("rw", "readwrite")
-                    .WithProtocolVersion(MqttProtocolVersion.V311)
-                    .WithTls(unsafeTls12)
-                    .Build());
+                    .WithProtocolVersion(MqttProtocolVersion.V311).WithTls(unsafeTls12).Build());

-            await ExecuteTestAsync(
-                "test.mosquitto.org WS",
-                new MqttClientOptionsBuilder().WithWebSocketServer("test.mosquitto.org:8080/mqtt").WithProtocolVersion(MqttProtocolVersion.V311).Build());
+            await ExecuteTestAsync("test.mosquitto.org WS",
+                new MqttClientOptionsBuilder().WithWebSocketServer("test.mosquitto.org:8080/mqtt")
+                    .WithProtocolVersion(MqttProtocolVersion.V311).Build());

-            await ExecuteTestAsync(
-                "test.mosquitto.org WS (WebSocket4Net)",
-                new MqttClientOptionsBuilder().WithWebSocketServer("test.mosquitto.org:8080/mqtt").WithProtocolVersion(MqttProtocolVersion.V311).Build(),
-                true);
-
-            await ExecuteTestAsync(
-                "test.mosquitto.org WS TLS12",
-                new MqttClientOptionsBuilder().WithWebSocketServer("test.mosquitto.org:8081/mqtt").WithProtocolVersion(MqttProtocolVersion.V311).WithTls(unsafeTls12).Build());
-
-            // await ExecuteTestAsync(
-            //     "test.mosquitto.org WS TLS12 (WebSocket4Net)",
-            //     new MqttClientOptionsBuilder().WithWebSocketServer("test.mosquitto.org:8081/mqtt").WithProtocolVersion(MqttProtocolVersion.V311).WithTls(unsafeTls12).Build(),
-            //     true);
+            await ExecuteTestAsync("test.mosquitto.org WS TLS12",
+                new MqttClientOptionsBuilder().WithWebSocketServer("test.mosquitto.org:8081/mqtt")
+                    .WithProtocolVersion(MqttProtocolVersion.V311).WithTls(unsafeTls12).Build());

            // broker.emqx.io
-            await ExecuteTestAsync(
-                "broker.emqx.io TCP",
-                new MqttClientOptionsBuilder().WithTcpServer("broker.emqx.io", 1883).WithProtocolVersion(MqttProtocolVersion.V311).Build());
+            await ExecuteTestAsync("broker.emqx.io TCP",
+                new MqttClientOptionsBuilder().WithTcpServer("broker.emqx.io", 1883)
+                     .WithProtocolVersion(MqttProtocolVersion.V311).Build());

-            await ExecuteTestAsync(
-                "broker.emqx.io TCP TLS12",
-                new MqttClientOptionsBuilder().WithTcpServer("broker.emqx.io", 8883).WithProtocolVersion(MqttProtocolVersion.V311).WithTls(unsafeTls12).Build());
+            await ExecuteTestAsync("broker.emqx.io TCP TLS12",
+                new MqttClientOptionsBuilder().WithTcpServer("broker.emqx.io", 8883)
+                    .WithProtocolVersion(MqttProtocolVersion.V311).WithTls(unsafeTls12).Build());

 #if NET5_0_OR_GREATER
            await ExecuteTestAsync("broker.emqx.io TCP TLS13",
@@ -117,37 +104,23 @@ namespace MQTTnet.TestApp
                    .WithProtocolVersion(MqttProtocolVersion.V311).WithTls(unsafeTls13).Build());
 #endif

-            await ExecuteTestAsync(
-                "broker.emqx.io WS",
-                new MqttClientOptionsBuilder().WithWebSocketServer("broker.emqx.io:8083/mqtt").WithProtocolVersion(MqttProtocolVersion.V311).Build());
+            await ExecuteTestAsync("broker.emqx.io WS",
+                new MqttClientOptionsBuilder().WithWebSocketServer("broker.emqx.io:8083/mqtt")
+                    .WithProtocolVersion(MqttProtocolVersion.V311).Build());

-            await ExecuteTestAsync(
-                "broker.emqx.io WS (WebSocket4Net)",
-                new MqttClientOptionsBuilder().WithWebSocketServer("broker.emqx.io:8084/mqtt").WithProtocolVersion(MqttProtocolVersion.V311).Build(),
-                true);
+            await ExecuteTestAsync("broker.emqx.io WS TLS12",
+                new MqttClientOptionsBuilder().WithWebSocketServer("broker.emqx.io:8084/mqtt")
+                    .WithProtocolVersion(MqttProtocolVersion.V311).WithTls(unsafeTls12).Build());

-            await ExecuteTestAsync(
-                "broker.emqx.io WS TLS12",
-                new MqttClientOptionsBuilder().WithWebSocketServer("broker.emqx.io:8084/mqtt").WithProtocolVersion(MqttProtocolVersion.V311).WithTls(unsafeTls12).Build());
-
-            await ExecuteTestAsync(
-                "broker.emqx.io WS TLS12 (WebSocket4Net)",
-                new MqttClientOptionsBuilder().WithWebSocketServer("broker.emqx.io:8084/mqtt").WithProtocolVersion(MqttProtocolVersion.V311).WithTls(unsafeTls12).Build(),
-                true);

            // broker.hivemq.com
-            await ExecuteTestAsync(
-                "broker.hivemq.com TCP",
-                new MqttClientOptionsBuilder().WithTcpServer("broker.hivemq.com", 1883).WithProtocolVersion(MqttProtocolVersion.V311).Build());
+            await ExecuteTestAsync("broker.hivemq.com TCP",
+                new MqttClientOptionsBuilder().WithTcpServer("broker.hivemq.com", 1883)
+                    .WithProtocolVersion(MqttProtocolVersion.V311).Build());

-            await ExecuteTestAsync(
-                "broker.hivemq.com WS",
-                new MqttClientOptionsBuilder().WithWebSocketServer("broker.hivemq.com:8000/mqtt").WithProtocolVersion(MqttProtocolVersion.V311).Build());
-
-            await ExecuteTestAsync(
-                "broker.hivemq.com WS (WebSocket4Net)",
-                new MqttClientOptionsBuilder().WithWebSocketServer("broker.hivemq.com:8000/mqtt").WithProtocolVersion(MqttProtocolVersion.V311).Build(),
-                true);
+            await ExecuteTestAsync("broker.hivemq.com WS",
+                new MqttClientOptionsBuilder().WithWebSocketServer("broker.hivemq.com:8000/mqtt")
+                    .WithProtocolVersion(MqttProtocolVersion.V311).Build());

            // mqtt.swifitch.cz: Does not seem to operate any more

@@ -157,43 +130,36 @@ namespace MQTTnet.TestApp
            Console.ReadLine();
        }

-        static async Task ExecuteTestAsync(string name, MqttClientOptions options, bool useWebSocket4Net = false)
+        static async Task ExecuteTestAsync(string name, MqttClientOptions options)
        {
            try
            {
                Write("Testing '" + name + "'... ", ConsoleColor.Gray);
-
                var factory = new MqttFactory();
-                if (useWebSocket4Net)
+                //factory.UseWebSocket4Net();
+                var client = factory.CreateMqttClient();
+                var topic = Guid.NewGuid().ToString();
+
+                MqttApplicationMessage receivedMessage = null;
+                client.ApplicationMessageReceivedAsync += e =>
                {
-                    factory.UseWebSocket4Net();
+                    receivedMessage = e.ApplicationMessage;
+                    return PlatformAbstractionLayer.CompletedTask;
+                };
+
+                await client.ConnectAsync(options);
+                await client.SubscribeAsync(topic, MqttQualityOfServiceLevel.AtLeastOnce);
+                await client.PublishStringAsync(topic, "Hello_World", MqttQualityOfServiceLevel.AtLeastOnce);
+
+                SpinWait.SpinUntil(() => receivedMessage != null, 5000);
+
+                if (receivedMessage?.Topic != topic || receivedMessage?.ConvertPayloadToString() != "Hello_World")
+                {
+                    throw new Exception("Message invalid.");
                }

-                using (var client = factory.CreateMqttClient())
-                {
-                    MqttApplicationMessage receivedMessage = null;
-                    client.ApplicationMessageReceivedAsync += e =>
-                    {
-                        receivedMessage = e.ApplicationMessage;
-                        return CompletedTask.Instance;
-                    };
-
-                    await client.ConnectAsync(options).ConfigureAwait(false);
-
-                    var topic = Guid.NewGuid().ToString();
-                    await client.SubscribeAsync(topic, MqttQualityOfServiceLevel.AtLeastOnce).ConfigureAwait(false);
-                    await client.PublishStringAsync(topic, "Hello_World", MqttQualityOfServiceLevel.AtLeastOnce).ConfigureAwait(false);
-
-                    SpinWait.SpinUntil(() => receivedMessage != null, 5000);
-
-                    if (receivedMessage?.Topic != topic || receivedMessage?.ConvertPayloadToString() != "Hello_World")
-                    {
-                        throw new Exception("Message invalid.");
-                    }
-
-                    await client.UnsubscribeAsync(topic).ConfigureAwait(false);
-                    await client.DisconnectAsync().ConfigureAwait(false);
-                }
+                await client.UnsubscribeAsync(topic);
+                await client.DisconnectAsync();

                Write("[OK]\n", ConsoleColor.Green);
            }
@@ -208,5 +174,6 @@ namespace MQTTnet.TestApp
            Console.ForegroundColor = color;
            Console.Write(message);
        }
+
    }
-}
+}
@@ -4,11 +4,13 @@

 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Text;
 using System.Threading.Tasks;
 using MQTTnet.Diagnostics;
-using MQTTnet.Internal;
+using MQTTnet.Extensions.ManagedClient;
+using MQTTnet.Implementations;
 using MQTTnet.Protocol;
 using MQTTnet.Server;
 using Newtonsoft.Json;
@@ -67,13 +69,13 @@ namespace MQTTnet.TestApp
                    }

                    File.WriteAllText(Filename, JsonConvert.SerializeObject(e.StoredRetainedMessages));
-                    return CompletedTask.Instance;
+                    return Task.FromResult(0);
                };
                
                mqttServer.RetainedMessagesClearedAsync += e =>
                {
                    File.Delete(Filename);
-                    return CompletedTask.Instance;
+                    return Task.FromResult(0);
                };
                
                mqttServer.LoadingRetainedMessageAsync += e =>
@@ -91,7 +93,7 @@ namespace MQTTnet.TestApp

                    e.LoadedRetainedMessages = retainedMessages;

-                    return CompletedTask.Instance;
+                    return Task.FromResult(0);
                };

                mqttServer.InterceptingPublishAsync += e =>
@@ -109,7 +111,7 @@ namespace MQTTnet.TestApp
                        e.CloseConnection = true;
                    }

-                    return CompletedTask.Instance;
+                    return PlatformAbstractionLayer.CompletedTask;
                };
                
                mqttServer.ValidatingConnectionAsync += e =>
@@ -122,7 +124,7 @@ namespace MQTTnet.TestApp
                        }
                    }

-                    return CompletedTask.Instance;
+                    return PlatformAbstractionLayer.CompletedTask;
                };

                mqttServer.InterceptingSubscriptionAsync += e =>
@@ -138,7 +140,7 @@ namespace MQTTnet.TestApp
                        e.CloseConnection = true;
                    }

-                    return CompletedTask.Instance;
+                    return PlatformAbstractionLayer.CompletedTask;
                };
                
                mqttServer.InterceptingPublishAsync += e =>
@@ -147,7 +149,7 @@ namespace MQTTnet.TestApp
                        $"'{e.ClientId}' reported '{e.ApplicationMessage.Topic}' > '{Encoding.UTF8.GetString(e.ApplicationMessage.Payload ?? new byte[0])}'",
                        ConsoleColor.Magenta);
                    
-                    return CompletedTask.Instance;
+                    return PlatformAbstractionLayer.CompletedTask;
                };

                //options.ApplicationMessageInterceptor = c =>
@@ -175,7 +177,7 @@ namespace MQTTnet.TestApp
                mqttServer.ClientConnectedAsync += e =>
                {
                    Console.Write("Client disconnected event fired.");
-                    return CompletedTask.Instance;
+                    return PlatformAbstractionLayer.CompletedTask;
                };

                await mqttServer.StartAsync();
@@ -14,7 +14,7 @@ using MQTTnet.LowLevelClient;
 using MQTTnet.Packets;
 using MQTTnet.Protocol;

-namespace MQTTnet.Tests.Clients.LowLevelMqttClient
+namespace MQTTnet.Tests.Client
 {
    [TestClass]
    public sealed class LowLevelMqttClient_Tests : BaseTestClass
@@ -64,7 +64,7 @@ namespace MQTTnet.Tests.Clients.LowLevelMqttClient

            await client.ConnectAsync(options, CancellationToken.None).ConfigureAwait(false);
        }
-
+        
        [TestMethod]
        [ExpectedException(typeof(MqttCommunicationException))]
        public async Task Connect_To_Wrong_Host()
@@ -80,8 +80,6 @@ namespace MQTTnet.Tests.Clients.LowLevelMqttClient
        {
            using (var testEnvironment = CreateTestEnvironment())
            {
-                testEnvironment.IgnoreServerLogErrors = true;
-
                testEnvironment.ServerPort = 8364;
                var server = await testEnvironment.StartServer();

@@ -118,8 +116,6 @@ namespace MQTTnet.Tests.Clients.LowLevelMqttClient
        {
            using (var testEnvironment = CreateTestEnvironment())
            {
-                testEnvironment.IgnoreServerLogErrors = true;
-
                var server = await testEnvironment.StartServer();

                using (var lowLevelClient = testEnvironment.CreateLowLevelClient())
@@ -127,7 +123,7 @@ namespace MQTTnet.Tests.Clients.LowLevelMqttClient
                    Assert.IsFalse(lowLevelClient.IsConnected);

                    var clientOptions = new MqttClientOptionsBuilder().WithTcpServer("127.0.0.1", testEnvironment.ServerPort).WithTimeout(TimeSpan.FromSeconds(1)).Build();
-
+                    
                    await lowLevelClient.ConnectAsync(clientOptions, CancellationToken.None);

                    Assert.IsTrue(lowLevelClient.IsConnected);
@@ -152,7 +148,7 @@ namespace MQTTnet.Tests.Clients.LowLevelMqttClient
                    catch
                    {
                    }
-
+           
                    Assert.IsFalse(lowLevelClient.IsConnected);
                }
            }
--- a/Show More
+++ b/Show More