Start using readonly memory

Remove unused usings (#2217 )
Update samples (#2216 )
2026-10-19 19:13:11 +08:00 · 2025-10-22 11:35:56 +02:00 · 2025-10-21 13:10:09 +02:00 · 2025-10-21 12:33:20 +02:00 · 2025-10-20 14:33:50 +02:00 · 2025-10-20 13:32:31 +02:00
402 changed files with 22101 additions and 23444 deletions
@@ -3,7 +3,7 @@ name: CI
 on: [push, pull_request]

 env:
-  VERSION: "5.0.0.${{github.run_number}}"
+  VERSION: "5.1.0.${{github.run_number}}"
  PACKAGE_SUFFIX: ""

 jobs:
@@ -21,8 +21,15 @@ jobs:
      - name: Checkout code
        uses: actions/checkout@v4

+      - name: Load strong name certificate
+        run: |
+          echo "$SNC_BASE64" | base64 --decode > "${{ github.workspace }}/certificate.snk"
+        shell: bash
+        env:
+          SNC_BASE64: ${{ secrets.SNC_BASE64 }}
+
      - name: Build package
-        run: dotnet build MQTTnet.sln --configuration Release /p:FileVersion=${{ env.VERSION }} /p:AssemblyVersion=${{ env.VERSION }} /p:PackageVersion=${{ env.VERSION }}${{ env.PACKAGE_SUFFIX }}
+        run: dotnet build MQTTnet.sln --configuration Release /p:FileVersion=${{ env.VERSION }} /p:AssemblyVersion=${{ env.VERSION }} /p:PackageVersion=${{ env.VERSION }}${{ env.PACKAGE_SUFFIX }} /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=${{ github.workspace }}/certificate.snk

      - name: Upload nuget packages
        uses: actions/upload-artifact@v4
@@ -46,7 +53,7 @@ jobs:
        uses: actions/checkout@v4

      - name: Execute tests
-        run: dotnet test --framework net8.0 Source/MQTTnet.Tests/MQTTnet.Tests.csproj
+        run: dotnet test --framework net8.0 --configuration Release Source/MQTTnet.Tests/MQTTnet.Tests.csproj

  sign:
    needs: build
@@ -0,0 +1,58 @@
+<Project>
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <Product>MQTTnet</Product>
+        <Authors>The contributors of MQTTnet</Authors>
+        <Company>The contributors of MQTTnet</Company>
+        <Copyright>Copyright (c) .NET Foundation and Contributors</Copyright>
+
+        <DelaySign>false</DelaySign>
+        <SignAssembly>false</SignAssembly>
+        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+        <EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
+        <ImplicitUsings>enable</ImplicitUsings>
+
+        <NeutralLanguage>en-US</NeutralLanguage>
+        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+        <NoWarn>1591;NETSDK1138;NU1803;NU1901;NU1902</NoWarn>
+
+        <NuGetAuditMode>all</NuGetAuditMode>
+        <NuGetAudit>true</NuGetAudit>
+        <NuGetAuditLevel>low</NuGetAuditLevel>
+
+        <EnableNETAnalyzers>true</EnableNETAnalyzers>
+        <AnalysisLevel>latest</AnalysisLevel>
+        <AnalysisMode>recommended</AnalysisMode>
+        <AnalysisModeStyle>default</AnalysisModeStyle>
+
+        <TestingPlatformShowTestsFailure>true</TestingPlatformShowTestsFailure>
+        <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
+        <EnableMSTestRunner>true</EnableMSTestRunner>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
+        <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(GeneratePackageOnBuild)'=='true'">
+        <PackageLicenseFile>LICENSE</PackageLicenseFile>
+        <PackageIcon>nuget.png</PackageIcon>
+        <PackageProjectUrl>https://github.com/dotnet/MQTTnet</PackageProjectUrl>
+        <RepositoryUrl>https://github.com/dotnet/MQTTnet.git</RepositoryUrl>
+        <RepositoryType>git</RepositoryType>
+        <IncludeSymbols>true</IncludeSymbols>
+        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+        <PublishRepositoryUrl>true</PublishRepositoryUrl>
+        <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    </PropertyGroup>
+
+    <ItemGroup Condition="'$(GeneratePackageOnBuild)'=='true'">
+        <None Include="README.md" Pack="true" PackagePath="" Condition="Exists('README.md')" />
+        <None Include="..\..\Images\nuget.png" Pack="true" PackagePath="" />
+        <None Include="..\..\LICENSE" Pack="true" PackagePath="" />
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(IncludeSymbols)'=='true'">
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
+    </ItemGroup>
+</Project>
@@ -7,11 +7,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet", "Source\MQTTnet\M
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B3F60ECB-45BA-4C66-8903-8BB89CA67998}"
 	ProjectSection(SolutionItems) = preProject
+		.github\workflows\ci.yml = .github\workflows\ci.yml
 		CODE-OF-CONDUCT.md = CODE-OF-CONDUCT.md
+		Directory.Build.props = Directory.Build.props
 		LICENSE = LICENSE
 		README.md = README.md
 		Source\ReleaseNotes.md = Source\ReleaseNotes.md
-		.github\workflows\ci.yml = .github\workflows\ci.yml
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet.AspNetCore", "Source\MQTTnet.AspnetCore\MQTTnet.AspNetCore.csproj", "{F10C4060-F7EE-4A83-919F-FF723E72F94A}"
@@ -85,6 +86,4 @@ Global
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {07536672-5CBC-4BE3-ACE0-708A431A7894}
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-	EndGlobalSection
 EndGlobal
@@ -1,4 +1,8 @@
 <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/CodeInspection/Highlighting/InspectionSeverities/=ConvertIfStatementToSwitchStatement/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InconsistentNaming/@EntryIndexedValue">SUGGESTION</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UncatchableException/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UnthrowableException/@EntryIndexedValue">DO_NOT_SHOW</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>
@@ -3,9 +3,9 @@
 <br/>
 </p>

-[![NuGet Badge](https://buildstats.info/nuget/MQTTnet)](https://www.nuget.org/packages/MQTTnet)
+[![NuGet Badge](https://img.shields.io/nuget/dt/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)
-[![MyGet](https://img.shields.io/myget/mqttnet/v/mqttnet?color=orange&label=MyGet-Preview)](https://www.myget.org/feed/mqttnet/package/nuget/MQTTnet)
+[![MyGet](https://img.shields.io/myget/mqttnet/v/mqttnet?color=orange&label=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)
 [![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](https://raw.githubusercontent.com/dotnet/MQTTnet/master/LICENSE)
@@ -413,7 +413,7 @@ m/XriWr/Cq4h/JfB7NTsezVslgkBaoU=
            if (e.ClientWasConnected)
            {
                // Use the current options as the new options.
-                await mqttClient.ConnectAsync(mqttClient.Options);
+                await mqttClient.ConnectAsync(mqttClientOptions);
            }
        };

@@ -490,7 +490,7 @@ m/XriWr/Cq4h/JfB7NTsezVslgkBaoU=
        }
    }

-    class SampleClientKerberosAuthenticationHandler : IMqttEnhancedAuthenticationHandler
+    sealed class SampleClientKerberosAuthenticationHandler : IMqttEnhancedAuthenticationHandler
    {
        public async Task HandleEnhancedAuthenticationAsync(MqttEnhancedAuthenticationEventArgs eventArgs)
        {
@@ -23,8 +23,7 @@ public static class Client_Publish_Samples

        var mqttFactory = new MqttClientFactory();

-        using (var mqttClient = mqttFactory.CreateMqttClient())
-        {
+        using var mqttClient = mqttFactory.CreateMqttClient();
        var mqttClientOptions = new MqttClientOptionsBuilder()
            .WithTcpServer("broker.hivemq.com")
            .Build();
@@ -42,7 +41,6 @@ public static class Client_Publish_Samples

        Console.WriteLine("MQTT application message is published.");
    }
-    }

    public static async Task Publish_Multiple_Application_Messages()
    {
@@ -54,8 +52,7 @@ public static class Client_Publish_Samples

        var mqttFactory = new MqttClientFactory();

-        using (var mqttClient = mqttFactory.CreateMqttClient())
-        {
+        using var mqttClient = mqttFactory.CreateMqttClient();
        var mqttClientOptions = new MqttClientOptionsBuilder()
            .WithTcpServer("broker.hivemq.com")
            .Build();
@@ -87,5 +84,4 @@ public static class Client_Publish_Samples

        Console.WriteLine("MQTT application message is published.");
    }
-    }
 }
@@ -7,7 +7,6 @@
 // ReSharper disable InconsistentNaming
 // ReSharper disable UnusedMember.Local

-using MQTTnet.Extensions.TopicTemplate;
 using MQTTnet.Packets;
 using MQTTnet.Protocol;
 using MQTTnet.Samples.Helpers;
@@ -16,8 +15,6 @@ namespace MQTTnet.Samples.Client;

 public static class Client_Subscribe_Samples
 {
-    static readonly MqttTopicTemplate sampleTemplate = new("mqttnet/samples/topic/{id}");
-
    public static async Task Handle_Received_Application_Message()
    {
        /*
@@ -26,8 +23,7 @@ public static class Client_Subscribe_Samples

        var mqttFactory = new MqttClientFactory();

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

        // Setup message handling before connecting so that queued messages
@@ -43,7 +39,7 @@ public static class Client_Subscribe_Samples

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

-            var mqttSubscribeOptions = mqttFactory.CreateSubscribeOptionsBuilder().WithTopicTemplate(sampleTemplate.WithParameter("id", "2")).Build();
+        var mqttSubscribeOptions = mqttFactory.CreateSubscribeOptionsBuilder().WithTopicFilter("mqttnet/samples/topic/2").Build();

        await mqttClient.SubscribeAsync(mqttSubscribeOptions, CancellationToken.None);

@@ -52,18 +48,16 @@ public static class Client_Subscribe_Samples
        Console.WriteLine("Press enter to exit.");
        Console.ReadLine();
    }
-    }

    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!
+         * This sample subscribes to a topic and sends a detailed response to the client. This requires at least QoS level 1 to work!
         */

        var mqttFactory = new MqttClientFactory();

-        using (var mqttClient = mqttFactory.CreateMqttClient())
-        {
+        using var mqttClient = mqttFactory.CreateMqttClient();
        mqttClient.ApplicationMessageReceivedAsync += delegate(MqttApplicationMessageReceivedEventArgs args)
        {
            // Do some work with the message...
@@ -83,7 +77,7 @@ public static class Client_Subscribe_Samples

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

-            var mqttSubscribeOptions = mqttFactory.CreateSubscribeOptionsBuilder().WithTopicTemplate(sampleTemplate.WithParameter("id", "1")).Build();
+        var mqttSubscribeOptions = mqttFactory.CreateSubscribeOptionsBuilder().WithTopicFilter("topic/test").Build();

        var response = await mqttClient.SubscribeAsync(mqttSubscribeOptions, CancellationToken.None);

@@ -92,7 +86,6 @@ public static class Client_Subscribe_Samples
        // The response contains additional data sent by the server after subscribing.
        response.DumpToConsole();
    }
-    }

    public static async Task Subscribe_Multiple_Topics()
    {
@@ -102,8 +95,7 @@ public static class Client_Subscribe_Samples

        var mqttFactory = new MqttClientFactory();

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

        await mqttClient.ConnectAsync(mqttClientOptions, CancellationToken.None);
@@ -111,9 +103,10 @@ public static class Client_Subscribe_Samples
        // 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()
-                .WithTopicTemplate(sampleTemplate.WithParameter("id", "1"))
-                .WithTopicTemplate(sampleTemplate.WithParameter("id", "2"), noLocal: true)
-                .WithTopicTemplate(sampleTemplate.WithParameter("id", "3"), retainHandling: MqttRetainHandling.SendAtSubscribe)
+            .WithTopicFilter(t => t.WithTopic("topic/1").WithAtLeastOnceQoS())
+            .WithTopicFilter(t => t.WithTopic("topic/2").WithAtMostOnceQoS())
+            .WithTopicFilter(t => t.WithTopic("topic/3").WithNoLocal())
+            .WithTopicFilter(t => t.WithRetainHandling(MqttRetainHandling.SendAtSubscribe))
            .Build();

        var response = await mqttClient.SubscribeAsync(mqttSubscribeOptions, CancellationToken.None);
@@ -123,7 +116,6 @@ public static class Client_Subscribe_Samples
        // The response contains additional data sent by the server after subscribing.
        response.DumpToConsole();
    }
-    }

    public static async Task Subscribe_Topic()
    {
@@ -133,13 +125,14 @@ public static class Client_Subscribe_Samples

        var mqttFactory = new MqttClientFactory();

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

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

-            var mqttSubscribeOptions = mqttFactory.CreateSubscribeOptionsBuilder().WithTopicTemplate(sampleTemplate.WithParameter("id", "1")).Build();
+        var topicFilter = mqttFactory.CreateTopicFilterBuilder().WithTopic("mqttnet/samples/topic/2").WithAtLeastOnceQoS();
+
+        var mqttSubscribeOptions = mqttFactory.CreateSubscribeOptionsBuilder().WithTopicFilter(topicFilter).Build();

        var response = await mqttClient.SubscribeAsync(mqttSubscribeOptions, CancellationToken.None);

@@ -148,9 +141,8 @@ public static class Client_Subscribe_Samples
        // The response contains additional data sent by the server after subscribing.
        response.DumpToConsole();
    }
-    }

-    static void ConcurrentProcessingDisableAutoAcknowledge(CancellationToken shutdownToken, IMqttClient mqttClient)
+    static void ConcurrentProcessingDisableAutoAcknowledge(IMqttClient mqttClient, CancellationToken shutdownToken)
    {
        /*
         * This sample shows how to achieve concurrent processing and not have message AutoAcknowledged
@@ -178,7 +170,7 @@ public static class Client_Subscribe_Samples
        };
    }

-    static void ConcurrentProcessingWithLimit(CancellationToken shutdownToken, IMqttClient mqttClient)
+    static void ConcurrentProcessingWithLimit(IMqttClient mqttClient, CancellationToken shutdownToken)
    {
        /*
         * This sample shows how to achieve concurrent processing, with:
@@ -0,0 +1,75 @@
+// 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.Extensions.TopicTemplate;
+using MQTTnet.Protocol;
+using MQTTnet.Samples.Helpers;
+
+// ReSharper disable UnusedType.Global
+// ReSharper disable UnusedMember.Global
+// ReSharper disable InconsistentNaming
+// ReSharper disable UnusedMember.Local
+
+namespace MQTTnet.Samples.Client;
+
+public static class Client_Subscribe_TopicTemplate_Samples
+{
+    static readonly MqttTopicTemplate SampleTemplate = new("mqttnet/samples/topic/{id}");
+
+    public static async Task Subscribe_Multiple_Topics_With_Template()
+    {
+        /*
+         * This sample subscribes to several topics in a single request.
+         *
+         * This sample requires the nuget 'MQTTnet.Extensions.TopicTemplate'.
+         */
+
+        var mqttFactory = new MqttClientFactory();
+
+        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()
+            .WithTopicTemplate(SampleTemplate.WithParameter("id", "1"))
+            .WithTopicTemplate(SampleTemplate.WithParameter("id", "2"), noLocal: true)
+            .WithTopicTemplate(SampleTemplate.WithParameter("id", "3"), retainHandling: 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_With_Template()
+    {
+        /*
+         * This sample subscribes to a topic.
+         *
+         * This sample requires the nuget 'MQTTnet.Extensions.TopicTemplate'.
+         */
+
+        var mqttFactory = new MqttClientFactory();
+
+        using var mqttClient = mqttFactory.CreateMqttClient();
+        var mqttClientOptions = new MqttClientOptionsBuilder().WithTcpServer("broker.hivemq.com").Build();
+
+        await mqttClient.ConnectAsync(mqttClientOptions, CancellationToken.None);
+
+        var mqttSubscribeOptions = mqttFactory.CreateSubscribeOptionsBuilder().WithTopicTemplate(SampleTemplate.WithParameter("id", "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();
+    }
+}
@@ -6,6 +6,7 @@
 // ReSharper disable UnusedMember.Global
 // ReSharper disable InconsistentNaming

+using System.Globalization;
 using System.Text;
 using MQTTnet.Diagnostics.Logger;

@@ -26,8 +27,7 @@ public static class Logger_Samples
            .WithTcpServer("broker.hivemq.com")
            .Build();

-        using (var mqttClient = mqttFactory.CreateMqttClient())
-        {
+        using var mqttClient = mqttFactory.CreateMqttClient();
        await mqttClient.ConnectAsync(mqttClientOptions, CancellationToken.None);

        Console.WriteLine("MQTT client is connected.");
@@ -37,7 +37,6 @@ public static class Logger_Samples

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

    public static async Task Use_Event_Logger()
    {
@@ -50,10 +49,10 @@ public static class Logger_Samples
        // The logger ID is optional but can be set do distinguish different logger instances.
        var mqttEventLogger = new MqttNetEventLogger("MyCustomLogger");

-        mqttEventLogger.LogMessagePublished += (sender, args) =>
+        mqttEventLogger.LogMessagePublished += (_, args) =>
        {
            var output = new StringBuilder();
-            output.AppendLine($">> [{args.LogMessage.Timestamp:O}] [{args.LogMessage.ThreadId}] [{args.LogMessage.Source}] [{args.LogMessage.Level}]: {args.LogMessage.Message}");
+            output.AppendLine(CultureInfo.InvariantCulture, $">> [{args.LogMessage.Timestamp:O}] [{args.LogMessage.ThreadId}] [{args.LogMessage.Source}] [{args.LogMessage.Level}]: {args.LogMessage.Message}");
            if (args.LogMessage.Exception != null)
            {
                output.AppendLine(args.LogMessage.Exception.ToString());
@@ -68,8 +67,7 @@ public static class Logger_Samples
            .WithTcpServer("broker.hivemq.com")
            .Build();

-        using (var mqttClient = mqttFactory.CreateMqttClient())
-        {
+        using var mqttClient = mqttFactory.CreateMqttClient();
        await mqttClient.ConnectAsync(mqttClientOptions, CancellationToken.None);

        Console.WriteLine("MQTT client is connected.");
@@ -79,7 +77,6 @@ public static class Logger_Samples

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

    sealed class MyLogger : IMqttNetLogger
    {
@@ -20,8 +20,7 @@ public static class PackageInspection_Samples

        var mqttFactory = new MqttClientFactory();

-        using (var mqttClient = mqttFactory.CreateMqttClient())
-        {
+        using var mqttClient = mqttFactory.CreateMqttClient();
        var mqttClientOptions = mqttFactory.CreateClientOptionsBuilder()
            .WithTcpServer("broker.hivemq.com")
            .Build();
@@ -37,7 +36,6 @@ public static class PackageInspection_Samples

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

    static Task OnInspectPacket(InspectMqttPacketEventArgs eventArgs)
    {
@@ -8,15 +8,17 @@ namespace MQTTnet.Samples.Helpers;

 internal static class ObjectExtensions
 {
+    static readonly JsonSerializerOptions SerializerOptions = new()
+    {
+        WriteIndented = true
+    };
+
    public static TObject DumpToConsole<TObject>(this TObject @object)
    {
        var output = "NULL";
        if (@object != null)
        {
-            output = JsonSerializer.Serialize(@object, new JsonSerializerOptions
-            {
-                WriteIndented = true
-            });
+            output = JsonSerializer.Serialize(@object, SerializerOptions);
        }

        Console.WriteLine($"[{@object?.GetType().Name}]:\r\n{output}");
@@ -2,19 +2,10 @@

    <PropertyGroup>
        <OutputType>Exe</OutputType>
-        <TargetFramework>net8.0</TargetFramework>
        <ImplicitUsings>enable</ImplicitUsings>
        <Nullable>enable</Nullable>
        <IsPackable>false</IsPackable>
-        <DisableImplicitAspNetCoreAnalyzers>true</DisableImplicitAspNetCoreAnalyzers>
-        <EnableNETAnalyzers>false</EnableNETAnalyzers>
-        <EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
-        <NoWarn>1591;NETSDK1138;NU1803;NU1901;NU1902</NoWarn>
-        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <NuGetAuditMode>all</NuGetAuditMode>
-        <NuGetAudit>true</NuGetAudit>
-        <NuGetAuditLevel>low</NuGetAuditLevel>
-        <AnalysisLevel>latest-Recommended</AnalysisLevel>
+        <NoWarn>$(NoWarn);CA1707</NoWarn>
    </PropertyGroup>

    <ItemGroup>
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

+using System.Globalization;
 using System.Reflection;

 Console.BackgroundColor = ConsoleColor.White;
@@ -28,7 +29,7 @@ Console.Write("Please choose sample class (press Enter to continue): ");
 Console.ResetColor();

 var input = Console.ReadLine();
-var selectedIndex = int.Parse(input ?? "0");
+var selectedIndex = int.Parse(input ?? "0", CultureInfo.InvariantCulture);
 var selectedSampleClass = sampleClasses[selectedIndex];
 var sampleMethods = selectedSampleClass.GetMethods(BindingFlags.Static | BindingFlags.Public).OrderBy(m => m.Name).ToList();

@@ -45,7 +46,7 @@ Console.Write("Please choose sample (press Enter to continue): ");
 Console.ResetColor();

 input = Console.ReadLine();
-selectedIndex = int.Parse(input ?? "0");
+selectedIndex = int.Parse(input ?? "0", CultureInfo.InvariantCulture);
 var selectedSampleMethod = sampleMethods[selectedIndex];

 Console.WriteLine();
@@ -26,8 +26,7 @@ public static class RpcClient_Samples
        // The RPC client is an addon for the existing client. So we need a regular client
        // which is wrapped later.

-        using (var mqttClient = mqttFactory.CreateMqttClient())
-        {
+        using var mqttClient = mqttFactory.CreateMqttClient();
        var mqttClientOptions = new MqttClientOptionsBuilder()
            .WithTcpServer("broker.hivemq.com")
            .Build();
@@ -43,7 +42,6 @@ public static class RpcClient_Samples

        Console.WriteLine("The RPC call was successful.");
    }
-    }

    /*
     * The device must respond to the request using the correct topic. The following C code shows how a
@@ -8,6 +8,7 @@
 // ReSharper disable EmptyConstructor
 // ReSharper disable MemberCanBeMadeStatic.Local

+using System.Diagnostics.CodeAnalysis;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
@@ -52,14 +53,14 @@ public static class Server_ASP_NET_Samples
            // Inject other services via constructor.
        }

-        public Task OnClientConnected(ClientConnectedEventArgs eventArgs)
+        public static Task OnClientConnected(ClientConnectedEventArgs eventArgs)
        {
            Console.WriteLine($"Client '{eventArgs.ClientId}' connected.");
            return Task.CompletedTask;
        }


-        public Task ValidateConnection(ValidatingConnectionEventArgs eventArgs)
+        public static Task ValidateConnection(ValidatingConnectionEventArgs eventArgs)
        {
            Console.WriteLine($"Client '{eventArgs.ClientId}' wants to connect. Accepting!");
            return Task.CompletedTask;
@@ -68,6 +69,7 @@ public static class Server_ASP_NET_Samples

    sealed class Startup
    {
+        [SuppressMessage("Performance", "CA1822:Mark members as static")]
        public void Configure(IApplicationBuilder app, IWebHostEnvironment environment, MqttController mqttController)
        {
            app.UseRouting();
@@ -88,11 +90,12 @@ public static class Server_ASP_NET_Samples
                     * Attach event handlers etc. if required.
                     */

-                    server.ValidatingConnectionAsync += mqttController.ValidateConnection;
-                    server.ClientConnectedAsync += mqttController.OnClientConnected;
+                    server.ValidatingConnectionAsync += MqttController.ValidateConnection;
+                    server.ClientConnectedAsync += MqttController.OnClientConnected;
                });
        }

+        [SuppressMessage("Performance", "CA1822:Mark members as static")]
        public void ConfigureServices(IServiceCollection services)
        {
            services.AddHostedMqttServer(
@@ -25,8 +25,7 @@ public static class Server_Diagnostics_Samples
        var mqttServerFactory = new MqttServerFactory();
        var mqttServerOptions = new MqttServerOptionsBuilder().WithDefaultEndpoint().Build();

-        using (var mqttServer = mqttServerFactory.CreateMqttServer(mqttServerOptions))
-        {
+        using var mqttServer = mqttServerFactory.CreateMqttServer(mqttServerOptions);
        // Attach the event handler.
        mqttServer.ClientAcknowledgedPublishPacketAsync += e =>
        {
@@ -37,7 +36,7 @@ public static class Server_Diagnostics_Samples
            Console.WriteLine($"QoS 1 reason code: {qos1AcknowledgePacket?.ReasonCode}");

            var qos2AcknowledgePacket = e.AcknowledgePacket as MqttPubCompPacket;
-                Console.WriteLine($"QoS 2 reason code: {qos1AcknowledgePacket?.ReasonCode}");
+            Console.WriteLine($"QoS 2 reason code: {qos2AcknowledgePacket?.ReasonCode}");
            return CompletedTask.Instance;
        };

@@ -48,5 +47,4 @@ public static class Server_Diagnostics_Samples

        await mqttServer.StopAsync();
    }
-    }
 }
@@ -9,6 +9,7 @@
 // ReSharper disable MemberCanBeMadeStatic.Local

 using MQTTnet.Internal;
+using MQTTnet.Protocol;
 using MQTTnet.Server;

 namespace MQTTnet.Samples.Server;
@@ -25,8 +26,7 @@ public static class Server_Intercepting_Samples
        var mqttServerFactory = new MqttServerFactory();
        var mqttServerOptions = new MqttServerOptionsBuilder().WithDefaultEndpoint().Build();

-        using (var mqttServer = mqttServerFactory.CreateMqttServer(mqttServerOptions))
-        {
+        using var mqttServer = mqttServerFactory.CreateMqttServer(mqttServerOptions);
        mqttServer.InterceptingPublishAsync += args =>
        {
            // Here we only change the topic of the received application message.
@@ -43,5 +43,32 @@ public static class Server_Intercepting_Samples
        Console.ReadLine();
        await mqttServer.StopAsync();
    }
+
+    public static async Task Intercept_Subscription()
+    {
+        /*
+         * This sample starts a simple MQTT server which does not allow to subscribe to '#'
+         * Start the server and try to subscribe to '#' with a client of choice.
+         */
+
+        var mqttServerFactory = new MqttServerFactory();
+        var mqttServerOptions = new MqttServerOptionsBuilder().WithDefaultEndpoint().Build();
+
+        using var mqttServer = mqttServerFactory.CreateMqttServer(mqttServerOptions);
+        mqttServer.InterceptingSubscriptionAsync += args =>
+        {
+            if (args.TopicFilter.Topic.Equals("#", StringComparison.Ordinal))
+            {
+                args.Response.ReasonCode = MqttSubscribeReasonCode.NotAuthorized;
+            }
+
+            return CompletedTask.Instance;
+        };
+
+        await mqttServer.StartAsync();
+
+        Console.WriteLine("Press Enter to exit.");
+        Console.ReadLine();
+        await mqttServer.StopAsync();
    }
 }
@@ -29,8 +29,7 @@ public static class Server_Retained_Messages_Samples
        // Due to security reasons the "default" endpoint (which is unencrypted) is not enabled by default!
        var mqttServerOptions = mqttServerFactory.CreateServerOptionsBuilder().WithDefaultEndpoint().Build();

-        using (var server = mqttServerFactory.CreateMqttServer(mqttServerOptions))
-        {
+        using var server = mqttServerFactory.CreateMqttServer(mqttServerOptions);
        // Make sure that the server will load the retained messages.
        server.LoadingRetainedMessageAsync += async eventArgs =>
        {
@@ -87,7 +86,6 @@ public static class Server_Retained_Messages_Samples
        Console.WriteLine("Press Enter to exit.");
        Console.ReadLine();
    }
-    }

    sealed class MqttRetainedMessageModel
    {
@@ -6,6 +6,7 @@
 // ReSharper disable UnusedMember.Global
 // ReSharper disable InconsistentNaming

+using System.Globalization;
 using MQTTnet.Diagnostics.Logger;
 using MQTTnet.Protocol;
 using MQTTnet.Server;
@@ -22,8 +23,7 @@ public static class Server_Simple_Samples
         * See _Run_Minimal_Server_ for more information.
         */

-        using (var mqttServer = await StartMqttServer())
-        {
+        using var mqttServer = await StartMqttServer();
        // Let the client connect.
        await Task.Delay(TimeSpan.FromSeconds(5));

@@ -34,7 +34,6 @@ public static class Server_Simple_Samples
            await affectedClient.DisconnectAsync();
        }
    }
-    }

    public static async Task Publish_Message_From_Broker()
    {
@@ -44,8 +43,7 @@ public static class Server_Simple_Samples
         * See _Run_Minimal_Server_ for more information.
         */

-        using (var mqttServer = await StartMqttServer())
-        {
+        using var mqttServer = await StartMqttServer();
        // Create a new message using the builder as usual.
        var message = new MqttApplicationMessageBuilder().WithTopic("HelloWorld").WithPayload("Test").Build();

@@ -56,7 +54,6 @@ public static class Server_Simple_Samples
                SenderClientId = "SenderClientId"
            });
    }
-    }

    public static async Task Run_Minimal_Server()
    {
@@ -77,8 +74,7 @@ public static class Server_Simple_Samples
        //     .WithDefaultEndpointPort(1234)
        //     .Build();

-        using (var mqttServer = mqttServerFactory.CreateMqttServer(mqttServerOptions))
-        {
+        using var mqttServer = mqttServerFactory.CreateMqttServer(mqttServerOptions);
        await mqttServer.StartAsync();

        Console.WriteLine("Press Enter to exit.");
@@ -87,7 +83,6 @@ public static class Server_Simple_Samples
        // Stop and dispose the MQTT server if it is no longer needed!
        await mqttServer.StopAsync();
    }
-    }

    public static async Task Run_Server_With_Logging()
    {
@@ -103,8 +98,7 @@ public static class Server_Simple_Samples

        var mqttServerOptions = new MqttServerOptionsBuilder().WithDefaultEndpoint().Build();

-        using (var mqttServer = mqttServerFactory.CreateMqttServer(mqttServerOptions))
-        {
+        using var mqttServer = mqttServerFactory.CreateMqttServer(mqttServerOptions);
        await mqttServer.StartAsync();

        Console.WriteLine("Press Enter to exit.");
@@ -113,7 +107,6 @@ public static class Server_Simple_Samples
        // Stop and dispose the MQTT server if it is no longer needed!
        await mqttServer.StopAsync();
    }
-    }

    public static async Task Validating_Connections()
    {
@@ -127,8 +120,7 @@ public static class Server_Simple_Samples

        var mqttServerOptions = new MqttServerOptionsBuilder().WithDefaultEndpoint().Build();

-        using (var mqttServer = mqttServerFactory.CreateMqttServer(mqttServerOptions))
-        {
+        using var mqttServer = mqttServerFactory.CreateMqttServer(mqttServerOptions);
        // Setup connection validation before starting the server so that there is
        // no change to connect without valid credentials.
        mqttServer.ValidatingConnectionAsync += e =>
@@ -158,7 +150,6 @@ public static class Server_Simple_Samples

        await mqttServer.StopAsync();
    }
-    }

    static async Task<MqttServer> StartMqttServer()
    {
@@ -171,7 +162,7 @@ public static class Server_Simple_Samples
        return server;
    }

-    class ConsoleLogger : IMqttNetLogger
+    sealed class ConsoleLogger : IMqttNetLogger
    {
        readonly object _consoleSyncRoot = new();

@@ -201,7 +192,7 @@ public static class Server_Simple_Samples

            if (parameters?.Length > 0)
            {
-                message = string.Format(message, parameters);
+                message = string.Format(CultureInfo.InvariantCulture, message, parameters);
            }

            lock (_consoleSyncRoot)
@@ -31,8 +31,7 @@ public static class Server_TLS_Samples

        var mqttServerOptions = new MqttServerOptionsBuilder().WithEncryptionCertificate(certificate).WithEncryptedEndpoint().Build();

-        using (var mqttServer = mqttServerFactory.CreateMqttServer(mqttServerOptions))
-        {
+        using var mqttServer = mqttServerFactory.CreateMqttServer(mqttServerOptions);
        await mqttServer.StartAsync();

        Console.WriteLine("Press Enter to exit.");
@@ -41,7 +40,6 @@ public static class Server_TLS_Samples
        // Stop and dispose the MQTT server if it is no longer needed!
        await mqttServer.StopAsync();
    }
-    }

    static X509Certificate2 CreateSelfSignedCertificate(string oid)
    {
@@ -50,8 +48,7 @@ public static class Server_TLS_Samples
        sanBuilder.AddIpAddress(IPAddress.IPv6Loopback);
        sanBuilder.AddDnsName("localhost");

-        using (var rsa = RSA.Create())
-        {
+        using var rsa = RSA.Create();
        var certRequest = new CertificateRequest("CN=localhost", rsa, HashAlgorithmName.SHA512, RSASignaturePadding.Pkcs1);

        certRequest.CertificateExtensions.Add(
@@ -61,8 +58,7 @@ public static class Server_TLS_Samples

        certRequest.CertificateExtensions.Add(sanBuilder.Build());

-            using (var certificate = certRequest.CreateSelfSigned(DateTimeOffset.Now.AddMinutes(-10), DateTimeOffset.Now.AddMinutes(10)))
-            {
+        using var certificate = certRequest.CreateSelfSigned(DateTimeOffset.Now.AddMinutes(-10), DateTimeOffset.Now.AddMinutes(10));
        var pfxCertificate = new X509Certificate2(
            certificate.Export(X509ContentType.Pfx),
            (string)null!,
@@ -70,6 +66,4 @@ public static class Server_TLS_Samples

        return pfxCertificate;
    }
-        }
-    }
 }
@@ -1,19 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
        <Nullable>enable</Nullable>
        <ImplicitUsings>enable</ImplicitUsings>
        <IsPackable>false</IsPackable>
-        <DisableImplicitAspNetCoreAnalyzers>true</DisableImplicitAspNetCoreAnalyzers>
-        <EnableNETAnalyzers>false</EnableNETAnalyzers>
-        <EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
-        <NoWarn>1591;NETSDK1138;NU1803;NU1901;NU1902</NoWarn>
-        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <NuGetAuditMode>all</NuGetAuditMode>
-        <NuGetAudit>true</NuGetAudit>
-        <NuGetAuditLevel>low</NuGetAuditLevel>
-        <AnalysisLevel>latest-Recommended</AnalysisLevel>
+        <NoWarn>$(NoWarn);CA1707</NoWarn>
    </PropertyGroup>

    <ItemGroup>
@@ -4,11 +4,11 @@

 using Microsoft.AspNetCore.Mvc.RazorPages;

-namespace MQTTnet.AspTestApp.Pages
+namespace MQTTnet.AspTestApp.Pages;
+
+public partial class IndexModel : PageModel
 {
-    public class IndexModel : PageModel
-    {
-        private readonly ILogger<IndexModel> _logger;
+    readonly ILogger<IndexModel> _logger;

    public IndexModel(ILogger<IndexModel> logger)
    {
@@ -17,7 +17,9 @@ namespace MQTTnet.AspTestApp.Pages

    public void OnGet()
    {
+        LogOnGet();
+    }

-        }
-    }
+    [LoggerMessage(Level = LogLevel.Information, Message = "OnGet")]
+    private partial void LogOnGet();
 }
@@ -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 Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using MQTTnet.Server;
@@ -33,10 +32,8 @@ public static class ApplicationBuilderExtensions
                }

                var adapter = app.ApplicationServices.GetRequiredService<MqttWebSocketServerAdapter>();
-                using (var webSocket = await context.WebSockets.AcceptWebSocketAsync(subProtocol).ConfigureAwait(false))
-                {
+                using var webSocket = await context.WebSockets.AcceptWebSocketAsync(subProtocol).ConfigureAwait(false);
                await adapter.RunWebSocketConnectionAsync(webSocket, context);
-                }
            });

        return app;
@@ -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.Server;

 namespace MQTTnet.AspNetCore;
@@ -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 System.Runtime.InteropServices;

 namespace MQTTnet.AspNetCore;
@@ -4,13 +4,12 @@

 using Microsoft.AspNetCore.Connections;

-namespace MQTTnet.AspNetCore
+namespace MQTTnet.AspNetCore;
+
+public static class ConnectionBuilderExtensions
 {
-    public static class ConnectionBuilderExtensions
-    {
    public static IConnectionBuilder UseMqtt(this IConnectionBuilder builder)
    {
        return builder.UseConnectionHandler<MqttConnectionHandler>();
    }
-    }
 }
@@ -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 System;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Routing;

-namespace MQTTnet.AspNetCore
+namespace MQTTnet.AspNetCore;
+
+public static class EndpointRouterExtensions
 {
-    public static class EndpointRouterExtensions
-    {
    public static void MapMqtt(this IEndpointRouteBuilder endpoints, string pattern)
    {
        ArgumentNullException.ThrowIfNull(endpoints);
@@ -19,6 +18,4 @@ namespace MQTTnet.AspNetCore
            options.WebSockets.SubProtocolSelector = MqttSubProtocolSelector.SelectSubProtocol;
        });
    }
-    }
 }
-
@@ -1,60 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">

    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
        <AssemblyName>MQTTnet.AspNetCore</AssemblyName>
        <RootNamespace>MQTTnet.AspNetCore</RootNamespace>
-        <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-        <Company>The contributors of MQTTnet</Company>
-        <Product>MQTTnet</Product>
+        <IsAotCompatible>true</IsAotCompatible>
+
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
        <Description>MQTTnet is a high performance .NET library for MQTT based communication. It provides a MQTT client and a MQTT server (broker) and supports v3.1.0, v3.1.1 and v5.0.0 of the MQTT protocol.</Description>
-        <Authors>The contributors of MQTTnet</Authors>
        <PackageId>MQTTnet.AspNetCore</PackageId>
-        <SignAssembly>false</SignAssembly>
-        <DelaySign>false</DelaySign>
-        <PublishRepositoryUrl>true</PublishRepositoryUrl>
-        <IncludeSymbols>true</IncludeSymbols>
-        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-        <Copyright>Copyright (c) .NET Foundation and Contributors</Copyright>
-        <PackageProjectUrl>https://github.com/dotnet/MQTTnet</PackageProjectUrl>
-        <RepositoryUrl>https://github.com/dotnet/MQTTnet.git</RepositoryUrl>
-        <RepositoryType>git</RepositoryType>
        <PackageTags>MQTT Message Queue Telemetry Transport MQTTClient MQTTServer Server MQTTBroker Broker NETStandard IoT InternetOfThings Messaging Hardware Arduino Sensor Actuator M2M ESP Smart Home Cities Automation Xamarin Blazor</PackageTags>
-        <NeutralLanguage>en-US</NeutralLanguage>
-        <EnableNETAnalyzers>false</EnableNETAnalyzers>
-        <EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
-        <PackageIcon>nuget.png</PackageIcon>
-        <EmbedUntrackedSources>true</EmbedUntrackedSources>
-        <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-        <PackageLicenseExpression>MIT</PackageLicenseExpression>
        <PackageReleaseNotes>For release notes please go to MQTTnet release notes (https://www.nuget.org/packages/MQTTnet/).</PackageReleaseNotes>
-        <DisableImplicitAspNetCoreAnalyzers>true</DisableImplicitAspNetCoreAnalyzers>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+
        <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <NoWarn>1591;NETSDK1138;NU1803;NU1901;NU1902</NoWarn>
-        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <NuGetAuditMode>all</NuGetAuditMode>
-        <NuGetAudit>true</NuGetAudit>
-        <NuGetAuditLevel>low</NuGetAuditLevel>
-        <NuGetAuditLevel>low</NuGetAuditLevel>
-        <AnalysisLevel>latest-Recommended</AnalysisLevel>
    </PropertyGroup>

    <ItemGroup>
-        <None Include="..\..\Images\nuget.png">
-            <Pack>True</Pack>
-            <PackagePath>\</PackagePath>
-        </None>
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
        <FrameworkReference Include="Microsoft.AspNetCore.App"/>
    </ItemGroup>

-    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release'">
-    </PropertyGroup>
-
    <ItemGroup>
        <ProjectReference Include="..\MQTTnet.Server\MQTTnet.Server.csproj"/>
        <ProjectReference Include="..\MQTTnet\MQTTnet.csproj"/>
@@ -2,18 +2,17 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using System;
 using MQTTnet.Adapter;
 using MQTTnet.Diagnostics.Logger;
 using MQTTnet.Formatter;

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

        switch (options.ChannelOptions)
        {
@@ -30,5 +29,4 @@ namespace MQTTnet.AspNetCore
            }
        }
    }
-    }
 }
@@ -2,13 +2,10 @@
 // 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 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;
@@ -61,27 +58,6 @@ public sealed class MqttConnectionContext : IMqttChannelAdapter
        }
    }

-    public EndPoint RemoteEndPoint
-    {
-        get
-        {
-            // mqtt over tcp
-            if (_connection.RemoteEndPoint != null)
-            {
-                return _connection.RemoteEndPoint;
-            }
-
-            // mqtt over websocket
-            var httpFeature = _connection.Features.Get<IHttpConnectionFeature>();
-            if (httpFeature?.RemoteIpAddress != null)
-            {
-                return new IPEndPoint(httpFeature.RemoteIpAddress, httpFeature.RemotePort);
-            }
-
-            return null;
-        }
-    }
-
    public bool IsSecureConnection
    {
        get
@@ -104,8 +80,50 @@ public sealed class MqttConnectionContext : IMqttChannelAdapter
        }
    }

+    public EndPoint LocalEndPoint
+    {
+        get
+        {
+            // mqtt over tcp
+            if (_connection.LocalEndPoint != null)
+            {
+                return _connection.LocalEndPoint;
+            }
+
+            // mqtt over websocket
+            var httpFeature = _connection.Features.Get<IHttpConnectionFeature>();
+            if (httpFeature?.LocalIpAddress != null)
+            {
+                return new IPEndPoint(httpFeature.LocalIpAddress, httpFeature.LocalPort);
+            }
+
+            return null;
+        }
+    }
+
    public MqttPacketFormatterAdapter PacketFormatterAdapter { get; }

+    public EndPoint RemoteEndPoint
+    {
+        get
+        {
+            // mqtt over tcp
+            if (_connection.RemoteEndPoint != null)
+            {
+                return _connection.RemoteEndPoint;
+            }
+
+            // mqtt over websocket
+            var httpFeature = _connection.Features.Get<IHttpConnectionFeature>();
+            if (httpFeature?.RemoteIpAddress != null)
+            {
+                return new IPEndPoint(httpFeature.RemoteIpAddress, httpFeature.RemotePort);
+            }
+
+            return null;
+        }
+    }
+
    public async Task ConnectAsync(CancellationToken cancellationToken)
    {
        if (_connection is SocketConnection tcp && !tcp.IsConnected)
@@ -232,8 +250,8 @@ public sealed class MqttConnectionContext : IMqttChannelAdapter
        var span = output.GetSpan(buffer.Length);

        buffer.Packet.AsSpan().CopyTo(span);
-        int offset = buffer.Packet.Count;
-        buffer.Payload.CopyTo(destination: span.Slice(offset));
+        var offset = buffer.Packet.Count;
+        buffer.Payload.CopyTo(span.Slice(offset));
        output.Advance(buffer.Length);
    }
 }
@@ -2,8 +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 System.Threading.Tasks;
 using Microsoft.AspNetCore.Connections;
 using Microsoft.AspNetCore.Connections.Features;
 using MQTTnet.Adapter;
@@ -33,15 +31,13 @@ public sealed class MqttConnectionHandler : ConnectionHandler, IMqttServerAdapte
        }

        var formatter = new MqttPacketFormatterAdapter(new MqttBufferWriter(_serverOptions.WriterBufferSize, _serverOptions.WriterBufferSizeMax));
-        using (var adapter = new MqttConnectionContext(formatter, connection))
-        {
+        using var adapter = new MqttConnectionContext(formatter, connection);
        var clientHandler = ClientHandler;
        if (clientHandler != null)
        {
            await clientHandler(adapter).ConfigureAwait(false);
        }
    }
-    }

    public Task StartAsync(MqttServerOptions options, IMqttNetLogger logger)
    {
@@ -2,10 +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 System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.Extensions.Hosting;
 using MQTTnet.Diagnostics.Logger;
 using MQTTnet.Server;
@@ -2,9 +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 System.Collections.Generic;
-using System.Linq;
 using Microsoft.AspNetCore.Http;

 namespace MQTTnet.AspNetCore;
@@ -29,6 +26,6 @@ public static class MqttSubProtocolSelector
        ArgumentNullException.ThrowIfNull(requestedSubProtocolValues);

        // Order the protocols to also match "mqtt", "mqttv-3.1", "mqttv-3.11" etc.
-        return requestedSubProtocolValues.OrderByDescending(p => p.Length).FirstOrDefault(p => p.ToLower().StartsWith("mqtt"));
+        return requestedSubProtocolValues.OrderByDescending(p => p.Length).FirstOrDefault(p => p.ToLowerInvariant().StartsWith("mqtt", StringComparison.InvariantCulture));
    }
 }
@@ -2,10 +2,8 @@
 // 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.Net.WebSockets;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using MQTTnet.Adapter;
 using MQTTnet.Diagnostics.Logger;
@@ -43,12 +41,10 @@ public sealed class MqttWebSocketServerAdapter : IMqttServerAdapter
                var formatter = new MqttPacketFormatterAdapter(new MqttBufferWriter(4096, 65535));
                var channel = new MqttWebSocketChannel(webSocket, remoteEndPoint, isSecureConnection, clientCertificate);

-                using (var channelAdapter = new MqttChannelAdapter(channel, formatter, _logger))
-                {
+                using var channelAdapter = new MqttChannelAdapter(channel, formatter, _logger);
                await clientHandler(channelAdapter).ConfigureAwait(false);
            }
        }
-        }
        finally
        {
            clientCertificate?.Dispose();
@@ -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 System.Buffers;
 using System.Runtime.InteropServices;
 using MQTTnet.Adapter;
@@ -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 Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Hosting;
@@ -2,44 +2,35 @@
 // 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.Diagnostics;
 using System.IO.Pipelines;
 using System.Net.Sockets;
 using System.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;

 namespace MQTTnet.AspNetCore;

-public class SocketAwaitable : ICriticalNotifyCompletion
+public class SocketAwaitable(PipeScheduler ioScheduler) : ICriticalNotifyCompletion
 {
-    static readonly Action _callbackCompleted = () =>
+    static readonly Action CallbackCompleted = () =>
    {
    };

-    readonly PipeScheduler _ioScheduler;
    int _bytesTransferred;

    Action _callback;
    SocketError _error;

-    public SocketAwaitable(PipeScheduler ioScheduler)
-    {
-        _ioScheduler = ioScheduler;
-    }
-
-    public bool IsCompleted => ReferenceEquals(_callback, _callbackCompleted);
+    public bool IsCompleted => ReferenceEquals(_callback, CallbackCompleted);

    public void Complete(int bytesTransferred, SocketError socketError)
    {
        _error = socketError;
        _bytesTransferred = bytesTransferred;
-        var continuation = Interlocked.Exchange(ref _callback, _callbackCompleted);
+        var continuation = Interlocked.Exchange(ref _callback, CallbackCompleted);

        if (continuation != null)
        {
-            _ioScheduler.Schedule(state => ((Action)state)(), continuation);
+            ioScheduler.Schedule(state => ((Action)state)(), continuation);
        }
    }

@@ -50,7 +41,7 @@ public class SocketAwaitable : ICriticalNotifyCompletion

    public int GetResult()
    {
-        Debug.Assert(ReferenceEquals(_callback, _callbackCompleted));
+        Debug.Assert(ReferenceEquals(_callback, CallbackCompleted));

        _callback = null;

@@ -64,7 +55,7 @@ public class SocketAwaitable : ICriticalNotifyCompletion

    public void OnCompleted(Action continuation)
    {
-        if (ReferenceEquals(_callback, _callbackCompleted) || ReferenceEquals(Interlocked.CompareExchange(ref _callback, continuation, null), _callbackCompleted))
+        if (ReferenceEquals(_callback, CallbackCompleted) || ReferenceEquals(Interlocked.CompareExchange(ref _callback, continuation, null), CallbackCompleted))
        {
            Task.Run(continuation);
        }
@@ -2,13 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using System;
-using System.Collections.Generic;
-using System.IO;
 using System.IO.Pipelines;
 using System.Net;
 using System.Net.Sockets;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Connections;
 using Microsoft.AspNetCore.Http.Features;
 using MQTTnet.Exceptions;
@@ -18,11 +14,11 @@ namespace MQTTnet.AspNetCore;
 public sealed class SocketConnection : ConnectionContext
 {
    readonly EndPoint _endPoint;
+
    volatile bool _aborted;
    IDuplexPipe _application;
    SocketReceiver _receiver;
    SocketSender _sender;
-
    Socket _socket;

    public SocketConnection(EndPoint endPoint)
@@ -40,10 +36,13 @@ public sealed class SocketConnection : ConnectionContext
    }

    public override string ConnectionId { get; set; }
+
    public override IFeatureCollection Features { get; }

    public bool IsConnected { get; private set; }
+
    public override IDictionary<object, object> Items { get; set; }
+
    public override IDuplexPipe Transport { get; set; }

    public override ValueTask DisposeAsync()
@@ -78,7 +77,7 @@ public sealed class SocketConnection : ConnectionContext
        IsConnected = true;
    }

-    Exception ConnectionAborted()
+    static MqttCommunicationException ConnectionAborted()
    {
        return new MqttCommunicationException("Connection Aborted");
    }
@@ -95,8 +94,7 @@ public sealed class SocketConnection : ConnectionContext
        {
            error = new MqttCommunicationException(ex);
        }
-        catch (SocketException ex) when (ex.SocketErrorCode == SocketError.OperationAborted || ex.SocketErrorCode == SocketError.ConnectionAborted ||
-                                         ex.SocketErrorCode == SocketError.Interrupted || ex.SocketErrorCode == SocketError.InvalidArgument)
+        catch (SocketException ex) when (ex.SocketErrorCode is SocketError.OperationAborted or SocketError.ConnectionAborted or SocketError.Interrupted or SocketError.InvalidArgument)
        {
            if (!_aborted)
            {
@@ -123,10 +121,10 @@ public sealed class SocketConnection : ConnectionContext
        {
            if (_aborted)
            {
-                error = error ?? ConnectionAborted();
+                error ??= ConnectionAborted();
            }

-            _application.Output.Complete(error);
+            await _application.Output.CompleteAsync(error);
        }
    }

@@ -216,12 +214,16 @@ public sealed class SocketConnection : ConnectionContext

            var flushTask = _application.Output.FlushAsync();

+            FlushResult result;
            if (!flushTask.IsCompleted)
            {
-                await flushTask;
+                result = await flushTask;
+            }
+            else
+            {
+                result = flushTask.GetAwaiter().GetResult();
            }

-            var result = flushTask.GetAwaiter().GetResult();
            if (result.IsCompleted)
            {
                // Pipe consumer is shut down, do we stop writing
@@ -2,13 +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 System.IO.Pipelines;
 using System.Net.Sockets;

 namespace MQTTnet.AspNetCore;

-public sealed class SocketReceiver
+public sealed class SocketReceiver : IDisposable
 {
    readonly SocketAwaitable _awaitable;
    readonly SocketAsyncEventArgs _eventArgs = new();
@@ -33,4 +32,9 @@ public sealed class SocketReceiver

        return _awaitable;
    }
+
+    public void Dispose()
+    {
+        _eventArgs.Dispose();
+    }
 }
@@ -2,9 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using System;
 using System.Buffers;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO.Pipelines;
 using System.Net.Sockets;
@@ -12,7 +10,7 @@ using System.Runtime.InteropServices;

 namespace MQTTnet.AspNetCore;

-public sealed class SocketSender
+public sealed class SocketSender : IDisposable
 {
    readonly SocketAwaitable _awaitable;
    readonly SocketAsyncEventArgs _eventArgs = new();
@@ -28,6 +26,11 @@ public sealed class SocketSender
        _eventArgs.Completed += (_, e) => ((SocketAwaitable)e.UserToken).Complete(e.BytesTransferred, e.SocketError);
    }

+    public void Dispose()
+    {
+        _eventArgs.Dispose();
+    }
+
    public SocketAwaitable SendAsync(in ReadOnlySequence<byte> buffers)
    {
        if (buffers.IsSingleSegment)
@@ -0,0 +1 @@
+[assembly: DoNotParallelize]
@@ -2,19 +2,16 @@
 // 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
+namespace MQTTnet.Benchmarks;
+
+[SimpleJob(RuntimeMoniker.Net60)]
+[MemoryDiagnoser]
+public class AsyncLockBenchmark : BaseBenchmark
 {
-    [SimpleJob(RuntimeMoniker.Net60)]
-    [MemoryDiagnoser]
-    public class AsyncLockBenchmark : BaseBenchmark
-    {
    [Benchmark]
    public async Task Synchronize_100_Tasks()
    {
@@ -43,7 +40,7 @@ namespace MQTTnet.Benchmarks

        if (globalI != tasksCount)
        {
-                throw new Exception($"Code is broken ({globalI})!");
+            throw new InvalidOperationException($"Code is broken ({globalI})!");
        }
    }

@@ -52,8 +49,7 @@ namespace MQTTnet.Benchmarks
    {
        var asyncLock = new AsyncLock();

-            using (var cancellationToken = new CancellationTokenSource())
-            {
+        using var cancellationToken = new CancellationTokenSource();
        for (var i = 0; i < 100000; i++)
        {
            using (await asyncLock.EnterAsync(cancellationToken.Token).ConfigureAwait(false))
@@ -61,6 +57,4 @@ namespace MQTTnet.Benchmarks
            }
        }
    }
-        }
-    }
 }
@@ -2,9 +2,8 @@
 // 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
+namespace MQTTnet.Benchmarks;
+
+public abstract class BaseBenchmark
 {
-    public abstract class BaseBenchmark
-    {
-    }
 }
@@ -2,9 +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 System.IO;
-using System.Threading;
 using BenchmarkDotNet.Attributes;
 using MQTTnet.Adapter;
 using MQTTnet.Diagnostics.Logger;
@@ -12,11 +9,11 @@ using MQTTnet.Formatter;
 using MQTTnet.Packets;
 using MQTTnet.Tests.Mockups;

-namespace MQTTnet.Benchmarks
+namespace MQTTnet.Benchmarks;
+
+[MemoryDiagnoser]
+public sealed class ChannelAdapterBenchmark : BaseBenchmark, IDisposable
 {
-    [MemoryDiagnoser]
-    public sealed class ChannelAdapterBenchmark : BaseBenchmark
-    {
    MqttChannelAdapter _channelAdapter;
    int _iterations;
    MqttPublishPacket _packet;
@@ -86,5 +83,10 @@ namespace MQTTnet.Benchmarks

        return buffer.ToArray();
    }
+
+    public void Dispose()
+    {
+        _channelAdapter?.Dispose();
+        _stream?.Dispose();
    }
 }
@@ -2,17 +2,18 @@
 // 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.Diagnostics;
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Jobs;
 using MQTTnet.Diagnostics.Logger;

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

@@ -42,7 +43,7 @@ namespace MQTTnet.Benchmarks
    {
        if (_useHandler)
        {
-                eventArgs.LogMessage.ToString();
+            Debug.WriteLine(eventArgs.LogMessage.ToString());
        }
    }

@@ -87,5 +88,4 @@ namespace MQTTnet.Benchmarks
            _sourceNullLogger.Verbose("test log message {0}", "parameter");
        }
    }
-    }
 }
@@ -1,24 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">

    <PropertyGroup>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
        <OutputType>Exe</OutputType>
        <DebugType>Full</DebugType>
-        <TargetFramework>net8.0</TargetFramework>
        <IsPackable>false</IsPackable>
-        <EnableNETAnalyzers>false</EnableNETAnalyzers>
-        <EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
-        <DisableImplicitAspNetCoreAnalyzers>true</DisableImplicitAspNetCoreAnalyzers>
-        <NoWarn>1591;NETSDK1138;NU1803;NU1901;NU1902;CS8892</NoWarn>
+        <NoWarn>$(NoWarn);CS8892;CA1707;CA1051;CA1822</NoWarn>
        <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-        <NuGetAuditMode>all</NuGetAuditMode>
-        <NuGetAudit>true</NuGetAudit>
-        <NuGetAuditLevel>low</NuGetAuditLevel>
-        <AnalysisLevel>latest-Recommended</AnalysisLevel>
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
+        <PackageReference Include="BenchmarkDotNet" Version="0.15.4" />
    </ItemGroup>

    <ItemGroup>
@@ -1,18 +1,18 @@
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Jobs;
-using System;


-namespace MQTTnet.Benchmarks
+namespace MQTTnet.Benchmarks;
+
+[SimpleJob(RuntimeMoniker.Net60)]
+[RPlotExporter, RankColumn]
+[MemoryDiagnoser]
+public class MemoryCopyBenchmark
 {
-    [SimpleJob(RuntimeMoniker.Net60)]
-    [RPlotExporter, RankColumn]
-    [MemoryDiagnoser]
-    public class MemoryCopyBenchmark
-    {
-        const int max_length = 1024 * 8;
-        private byte[] source;
-        private byte[] target;
+    const int MaxLength = 1024 * 8;
+
+    byte[] _source;
+    byte[] _target;

    [Params(64 - 1, 128 - 1, 256 - 1, 512 - 1, 1024 - 1, 2048 - 1, 5096 - 1)]
    public int Length { get; set; }
@@ -20,21 +20,20 @@ namespace MQTTnet.Benchmarks
    [GlobalSetup]
    public void Setup()
    {
-            source = new byte[max_length];
-            target = new byte[max_length];
+        _source = new byte[MaxLength];
+        _target = new byte[MaxLength];
    }

    [Benchmark(Baseline = true)]
    public void Array_Copy()
    {
-            Array.Copy(source, 0, target, 0, Length);
+        Array.Copy(_source, 0, _target, 0, Length);
    }

    [Benchmark]
    public void Memory_Copy()
    {
-            MQTTnet.Internal.MqttMemoryHelper.Copy(source, 0, target, 0, Length);
+        Internal.MqttMemoryHelper.Copy(_source, 0, _target, 0, Length);
    }

-    }
 }
@@ -2,11 +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 System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
 using MQTTnet.Packets;
 using MQTTnet.Server;
@@ -14,7 +9,7 @@ using MQTTnet.Server;
 namespace MQTTnet.Benchmarks;

 [MemoryDiagnoser]
-public class MessageDeliveryBenchmark : BaseBenchmark
+public sealed class MessageDeliveryBenchmark : BaseBenchmark, IDisposable
 {
    List<string> _allSubscribedTopics; // Keep track of the subset of topics that are subscribed
    CancellationTokenSource _cancellationTokenSource;
@@ -23,22 +18,19 @@ public class MessageDeliveryBenchmark : BaseBenchmark
    int _messagesExpectedCount;
    int _messagesReceivedCount;
    Dictionary<string, IMqttClient> _mqttPublisherClientsByPublisherName;
-
    MqttServer _mqttServer;
    List<IMqttClient> _mqttSubscriberClients;
+
+    [Params(1000, 10000)] public int _numPublishers;
+
+    [Params(5, 10, 20, 50)] public int _numSubscribedTopicsPerSubscriber;
+
+    [Params(10)] public int _numSubscribers;
+
+    [Params(1, 5)] public int _numTopicsPerPublisher;
    Dictionary<string, string> _publisherByTopic;
-    List<MqttApplicationMessage> _topicPublishMessages;
-
    Dictionary<string, List<string>> _topicsByPublisher;

-    [Params(1000, 10000)] public int NumPublishers;
-
-    [Params(5, 10, 20, 50)] public int NumSubscribedTopicsPerSubscriber;
-
-    [Params(10)] public int NumSubscribers;
-
-    [Params(1, 5)] public int NumTopicsPerPublisher;
-
    [GlobalCleanup]
    public void Cleanup()
    {
@@ -64,14 +56,11 @@ public class MessageDeliveryBenchmark : BaseBenchmark
        _mqttServer = null;
    }

-    /// <summary>
-    ///     Publish messages and wait for messages sent to subscribers
-    /// </summary>
    [Benchmark]
    public void DeliverMessages()
    {
        // There should be one message received per publish for each subscribed topic
-        _messagesExpectedCount = NumSubscribedTopicsPerSubscriber * NumSubscribers;
+        _messagesExpectedCount = _numSubscribedTopicsPerSubscriber * _numSubscribers;

        // Loop for a while and exchange messages

@@ -82,8 +71,6 @@ public class MessageDeliveryBenchmark : BaseBenchmark
        // same payload for all messages
        var payload = new byte[] { 1, 2, 3, 4 };

-        var tasks = new List<Task>();
-
        // publish a message for each subscribed topic
        foreach (var topic in _allSubscribedTopics)
        {
@@ -101,35 +88,29 @@ public class MessageDeliveryBenchmark : BaseBenchmark
        }
        catch
        {
+            // Ignore all errors.
        }

        _cancellationTokenSource.Dispose();

        if (_messagesReceivedCount < _messagesExpectedCount)
        {
-            throw new Exception(string.Format("Messages Received Count mismatch, expected {0}, received {1}", _messagesExpectedCount, _messagesReceivedCount));
+            throw new InvalidOperationException($"Messages Received Count mismatch, expected {_messagesExpectedCount}, received {_messagesReceivedCount}");
        }
    }

+    public void Dispose()
+    {
+        _cancellationTokenSource?.Dispose();
+        _mqttServer?.Dispose();
+    }

    [GlobalSetup]
    public void Setup()
    {
        _lockMsgCount = new object();

-        Dictionary<string, List<string>> singleWildcardTopicsByPublisher;
-        Dictionary<string, List<string>> multiWildcardTopicsByPublisher;
-
-        TopicGenerator.Generate(NumPublishers, NumTopicsPerPublisher, out _topicsByPublisher, out singleWildcardTopicsByPublisher, out multiWildcardTopicsByPublisher);
-
-        var topics = _topicsByPublisher.First().Value;
-        _topicPublishMessages = new List<MqttApplicationMessage>();
-        // Prepare messages, same for each publisher
-        foreach (var topic in topics)
-        {
-            var message = new MqttApplicationMessageBuilder().WithTopic(topic).WithPayload(new byte[] { 1, 2, 3, 4, 5, 6, 7, 8 }).Build();
-            _topicPublishMessages.Add(message);
-        }
+        TopicGenerator.Generate(_numPublishers, _numTopicsPerPublisher, out _topicsByPublisher, out _, out _);

        // Create server
        var serverFactory = new MqttServerFactory();
@@ -139,7 +120,7 @@ public class MessageDeliveryBenchmark : BaseBenchmark
        _mqttServer.StartAsync().GetAwaiter().GetResult();

        // Create publisher clients
-        _mqttPublisherClientsByPublisherName = new Dictionary<string, IMqttClient>();
+        _mqttPublisherClientsByPublisherName = [];
        foreach (var pt in _topicsByPublisher)
        {
            var publisherName = pt.Key;
@@ -151,13 +132,13 @@ public class MessageDeliveryBenchmark : BaseBenchmark

        // Create subscriber clients
        _mqttSubscriberClients = new List<IMqttClient>();
-        for (var i = 0; i < NumSubscribers; i++)
+        for (var i = 0; i < _numSubscribers; i++)
        {
            var mqttSubscriberClient = clientFactory.CreateMqttClient();
            _mqttSubscriberClients.Add(mqttSubscriberClient);

            var subscriberOptions = new MqttClientOptionsBuilder().WithTcpServer("localhost").WithClientId("subscriber" + i).Build();
-            mqttSubscriberClient.ApplicationMessageReceivedAsync += r =>
+            mqttSubscriberClient.ApplicationMessageReceivedAsync += _ =>
            {
                // count messages and signal cancellation when expected message count is reached
                lock (_lockMsgCount)
@@ -171,12 +152,13 @@ public class MessageDeliveryBenchmark : BaseBenchmark

                return Task.CompletedTask;
            };
+
            mqttSubscriberClient.ConnectAsync(subscriberOptions).GetAwaiter().GetResult();
        }


        var allTopics = new List<string>();
-        _publisherByTopic = new Dictionary<string, string>();
+        _publisherByTopic = [];
        foreach (var t in _topicsByPublisher)
        {
            foreach (var topic in t.Value)
@@ -189,21 +171,18 @@ public class MessageDeliveryBenchmark : BaseBenchmark
        // Subscribe to NumSubscribedTopics topics spread across all topics
        _allSubscribedTopics = new List<string>();

-        var totalNumTopics = NumPublishers * NumTopicsPerPublisher;
-        var topicIndexStep = totalNumTopics / (NumSubscribedTopicsPerSubscriber * NumSubscribers);
-        if (topicIndexStep * NumSubscribedTopicsPerSubscriber * NumSubscribers != totalNumTopics)
+        var totalNumTopics = _numPublishers * _numTopicsPerPublisher;
+        var topicIndexStep = totalNumTopics / (_numSubscribedTopicsPerSubscriber * _numSubscribers);
+        if (topicIndexStep * _numSubscribedTopicsPerSubscriber * _numSubscribers != totalNumTopics)
        {
-            throw new Exception(
-                string.Format(
-                    "The total number of topics must be divisible by the number of subscribed topics across all subscribers. Total number of topics: {0}, topic step: {1}",
-                    totalNumTopics,
-                    topicIndexStep));
+            throw new InvalidOperationException(
+                $"The total number of topics must be divisible by the number of subscribed topics across all subscribers. Total number of topics: {totalNumTopics}, topic step: {topicIndexStep}");
        }

        var topicIndex = 0;
        foreach (var mqttSubscriber in _mqttSubscriberClients)
        {
-            for (var i = 0; i < NumSubscribedTopicsPerSubscriber; ++i, topicIndex += topicIndexStep)
+            for (var i = 0; i < _numSubscribedTopicsPerSubscriber; ++i, topicIndex += topicIndexStep)
            {
                var topic = allTopics[topicIndex];
                _allSubscribedTopics.Add(topic);
@@ -9,12 +9,12 @@ using Microsoft.AspNetCore.Hosting;
 using MQTTnet.AspNetCore;
 using MQTTnet.Diagnostics.Logger;

-namespace MQTTnet.Benchmarks
+namespace MQTTnet.Benchmarks;
+
+[SimpleJob(RuntimeMoniker.Net60)]
+[MemoryDiagnoser]
+public class MessageProcessingMqttConnectionContextBenchmark : BaseBenchmark
 {
-    [SimpleJob(RuntimeMoniker.Net60)]
-    [MemoryDiagnoser]
-    public class MessageProcessingMqttConnectionContextBenchmark : BaseBenchmark
-    {
    IWebHost _host;
    IMqttClient _mqttClient;
    MqttApplicationMessage _message;
@@ -30,7 +30,7 @@ namespace MQTTnet.Benchmarks
                    .AddMqttConnectionHandler();
            })
            .Configure(app => {
-                       app.UseMqttServer(s => {
+                app.UseMqttServer(_ => {

                });
            })
@@ -69,5 +69,4 @@ namespace MQTTnet.Benchmarks
            _mqttClient.PublishAsync(_message).GetAwaiter().GetResult();
        }
    }
-    }
 }
@@ -2,18 +2,17 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using System;
 using System.Text;
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Jobs;
 using MQTTnet.Formatter;

-namespace MQTTnet.Benchmarks
+namespace MQTTnet.Benchmarks;
+
+[SimpleJob(RuntimeMoniker.Net60)]
+[MemoryDiagnoser]
+public class MqttBufferReaderBenchmark
 {
-    [SimpleJob(RuntimeMoniker.Net60)]
-    [MemoryDiagnoser]
-    public class MqttBufferReaderBenchmark
-    {
    byte[] _buffer;
    int _bufferLength;

@@ -39,5 +38,4 @@ namespace MQTTnet.Benchmarks
    {
        Encoding.UTF8.GetString(_buffer, 0, _bufferLength);
    }
-    }
 }
@@ -2,18 +2,17 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using System;
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Jobs;
 using MQTTnet.Formatter;
 using MQTTnet.Tests.Mockups;

-namespace MQTTnet.Benchmarks
+namespace MQTTnet.Benchmarks;
+
+[SimpleJob(RuntimeMoniker.Net60)]
+[MemoryDiagnoser]
+public class MqttPacketReaderWriterBenchmark : BaseBenchmark
 {
-    [SimpleJob(RuntimeMoniker.Net60)]
-    [MemoryDiagnoser]
-    public class MqttPacketReaderWriterBenchmark : BaseBenchmark
-    {
    readonly byte[] _demoPayload = new byte[1024];

    byte[] _readPayload;
@@ -92,5 +91,4 @@ namespace MQTTnet.Benchmarks
            writer.Reset(0);
        }
    }
-    }
 }
@@ -2,11 +2,8 @@
 // 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 System.Reflection;
-using System.Threading;
-using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Jobs;
 using MQTTnet.Channel;
@@ -19,9 +16,9 @@ namespace MQTTnet.Benchmarks;

 [SimpleJob(RuntimeMoniker.Net60)]
 [MemoryDiagnoser]
-public class MqttTcpChannelBenchmark : BaseBenchmark
+public sealed class MqttTcpChannelBenchmark : BaseBenchmark, IDisposable
 {
-    IMqttChannel _clientChannel;
+    MqttTcpChannel _clientChannel;
    MqttServer _mqttServer;
    IMqttChannel _serverChannel;

@@ -85,4 +82,11 @@ public class MqttTcpChannelBenchmark : BaseBenchmark
            await _serverChannel.WriteAsync(buffer, true, CancellationToken.None).ConfigureAwait(false);
        }
    }
+
+    public void Dispose()
+    {
+        _clientChannel?.Dispose();
+        _mqttServer?.Dispose();
+        _serverChannel?.Dispose();
+    }
 }
@@ -2,17 +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 System.Collections.Generic;
-using System.Linq;
-using BenchmarkDotNet.Loggers;
 using BenchmarkDotNet.Running;
-using MQTTnet.Diagnostics;

-namespace MQTTnet.Benchmarks
+namespace MQTTnet.Benchmarks;
+
+public static class Program
 {
-    public static class Program
-    {
    static int _selectedBenchmarkIndex;
    static List<Type> _benchmarks;

@@ -94,7 +89,7 @@ namespace MQTTnet.Benchmarks
            return;
        }

-            _selectedBenchmarkIndex = _benchmarks.FindIndex(b => b.Name.Equals(arguments[0]));
+        _selectedBenchmarkIndex = _benchmarks.FindIndex(b => b.Name.Equals(arguments[0], StringComparison.Ordinal));

        if (_selectedBenchmarkIndex < 0)
        {
@@ -138,5 +133,4 @@ namespace MQTTnet.Benchmarks

        Console.WriteLine();
    }
-    }
 }
@@ -1,31 +1,25 @@
 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
+namespace MQTTnet.Benchmarks;
+
+[SimpleJob(RuntimeMoniker.Net60)]
+[RPlotExporter, RankColumn]
+[MemoryDiagnoser]
+public sealed class ReaderExtensionsBenchmark : IDisposable, IAsyncDisposable
 {
-    [SimpleJob(RuntimeMoniker.Net60)]
-    [RPlotExporter, RankColumn]
-    [MemoryDiagnoser]
-    public class ReaderExtensionsBenchmark
-    {
-        MqttPacketFormatterAdapter mqttPacketFormatter;
-        MemoryStream stream;
+    MqttPacketFormatterAdapter _mqttPacketFormatter;
+    MemoryStream _stream;

    [GlobalSetup]
    public void GlobalSetup()
    {
-            mqttPacketFormatter = new MqttPacketFormatterAdapter(MqttProtocolVersion.V311, new MqttBufferWriter(4096, 65535));
+        _mqttPacketFormatter = new MqttPacketFormatterAdapter(MqttProtocolVersion.V311, new MqttBufferWriter(4096, 65535));
        var mqttMessage = new MqttApplicationMessageBuilder()
            .WithTopic("topic")
            .WithPayload(new byte[10 * 1024])
@@ -33,66 +27,18 @@ namespace MQTTnet.Benchmarks

        var packet = MqttPublishPacketFactory.Create(mqttMessage);

-            var buffer = mqttPacketFormatter.Encode(packet);
-            stream = new MemoryStream();
-            stream.Write(buffer.Packet);
-            stream.Write(buffer.Payload.ToArray());
-            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);
-                }
-            }
+        var buffer = _mqttPacketFormatter.Encode(packet);
+        _stream = new MemoryStream();
+        _stream.Write(buffer.Packet);
+        _stream.Write(buffer.Payload.ToArray());
+        _mqttPacketFormatter.Cleanup();
    }

    [Benchmark]
    public async Task After()
    {
-            stream.Position = 0;
-            var input = PipeReader.Create(stream);
+        _stream.Position = 0;
+        var input = PipeReader.Create(_stream);

        while (true)
        {
@@ -116,7 +62,7 @@ namespace MQTTnet.Benchmarks
            {
                if (!buffer.IsEmpty)
                {
-                        if (ReaderExtensions.TryDecode(mqttPacketFormatter, buffer, out var packet, out consumed, out observed, out var received))
+                    if (_mqttPacketFormatter.TryDecode(buffer, out _, out consumed, out observed, out _))
                    {
                        break;
                    }
@@ -136,105 +82,16 @@ namespace MQTTnet.Benchmarks
        }
    }

-        public static class ReaderExtensions_Before
+    public void Dispose()
    {
-            public static bool TryDecode(MqttPacketFormatterAdapter formatter,
-                in ReadOnlySequence<byte> input,
-                out MqttPacket packet,
-                out SequencePosition consumed,
-                out SequencePosition observed,
-                out int bytesRead)
-            {
-                ArgumentNullException.ThrowIfNull(formatter);
-
-                packet = null;
-                consumed = input.Start;
-                observed = input.End;
-                bytesRead = 0;
-                var copy = input;
-
-                if (copy.Length < 2)
-                {
-                    return false;
+        _stream?.Dispose();
    }

-                var fixedHeader = copy.First.Span[0];
-                if (!TryReadBodyLength(ref copy, out int headerLength, out var bodyLength))
+    public async ValueTask DisposeAsync()
    {
-                    return false;
-                }
-
-                if (copy.Length < bodyLength)
+        if (_stream != null)
        {
-                    return false;
+            await _stream.DisposeAsync();
        }
-
-                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;
-            }
-        }
-
    }
 }
@@ -1,15 +1,14 @@
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Jobs;
 using MQTTnet.Tests.Mockups;
-using MQTTnet.Tests.Server;

-namespace MQTTnet.Benchmarks
+namespace MQTTnet.Benchmarks;
+
+[SimpleJob(RuntimeMoniker.Net60)]
+[RPlotExporter, RankColumn]
+[MemoryDiagnoser]
+public class RoundtripProcessingBenchmark : BaseBenchmark
 {
-    [SimpleJob(RuntimeMoniker.Net60)]
-    [RPlotExporter, RankColumn]
-    [MemoryDiagnoser]
-    public class RoundtripProcessingBenchmark : BaseBenchmark
-    {
    [GlobalSetup]
    public void GlobalSetup()
    {
@@ -24,7 +23,6 @@ namespace MQTTnet.Benchmarks
    [Benchmark]
    public void Handle_100_000_Messages_In_Receiving_Client()
    {
-            new Load_Tests().Handle_100_000_Messages_In_Receiving_Client().GetAwaiter().GetResult();
-        }
+        //new Load_Tests().Handle_100_000_Messages_In_Receiving_Client().GetAwaiter().GetResult();
    }
 }
@@ -1,57 +1,67 @@
+using System.Buffers;
+using System.IO.Pipelines;
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Jobs;
 using MQTTnet.Formatter;
-using System;
-using System.Buffers;
-using System.IO;
-using System.IO.Pipelines;
-using System.Threading.Tasks;

-namespace MQTTnet.Benchmarks
+namespace MQTTnet.Benchmarks;
+
+[SimpleJob(RuntimeMoniker.Net60)]
+[RPlotExporter]
+[RankColumn]
+[MemoryDiagnoser]
+public sealed class SendPacketAsyncBenchmark : BaseBenchmark, IDisposable, IAsyncDisposable
 {
-    [SimpleJob(RuntimeMoniker.Net60)]
-    [RPlotExporter, RankColumn]
-    [MemoryDiagnoser]
-    public class SendPacketAsyncBenchmark : BaseBenchmark
-    {
-        MemoryStream stream;
-        MqttPacketBuffer buffer;
+    MqttPacketBuffer _buffer;
+    MemoryStream _stream;

-        [GlobalSetup]
-        public void GlobalSetup()
+    [Benchmark]
+    public async ValueTask After()
    {
-            stream = new MemoryStream(1024);
-            var packet = new ArraySegment<byte>(new byte[10]);
-            buffer = new MqttPacketBuffer(packet);
+        _stream.Position = 0;
+        var output = PipeWriter.Create(_stream);
+
+        if (_buffer.Payload.Length == 0)
+        {
+            await output.WriteAsync(_buffer.Packet).ConfigureAwait(false);
+        }
+        else
+        {
+            WritePacketBuffer(output, _buffer);
+            await output.FlushAsync().ConfigureAwait(false);
+        }
    }

    [Benchmark(Baseline = true)]
    public async ValueTask Before()
    {
-            stream.Position = 0;
-            var output = PipeWriter.Create(stream);
+        _stream.Position = 0;
+        var output = PipeWriter.Create(_stream);

-            WritePacketBuffer(output, buffer);
+        WritePacketBuffer(output, _buffer);
        await output.FlushAsync();
    }

-        [Benchmark]
-        public async ValueTask After()
+    public void Dispose()
    {
-            stream.Position = 0;
-            var output = PipeWriter.Create(stream);
-
-            if (buffer.Payload.Length == 0)
-            {
-                await output.WriteAsync(buffer.Packet).ConfigureAwait(false);
+        _stream?.Dispose();
    }
-            else
+
+    public async ValueTask DisposeAsync()
    {
-                WritePacketBuffer(output, buffer);
-                await output.FlushAsync().ConfigureAwait(false);
+        if (_stream != null)
+        {
+            await _stream.DisposeAsync();
        }
    }

+    [GlobalSetup]
+    public void GlobalSetup()
+    {
+        _stream = new MemoryStream(1024);
+        var packet = new ArraySegment<byte>(new byte[10]);
+        _buffer = new MqttPacketBuffer(packet);
+    }

    static void WritePacketBuffer(PipeWriter output, MqttPacketBuffer buffer)
    {
@@ -61,9 +71,8 @@ namespace MQTTnet.Benchmarks
        var span = output.GetSpan(buffer.Length);

        buffer.Packet.AsSpan().CopyTo(span);
-            buffer.Payload.CopyTo(span.Slice(buffer.Packet.Count));
+        buffer.Payload.CopyTo(span[buffer.Packet.Count..]);

        output.Advance(buffer.Length);
    }
-    }
 }
@@ -4,10 +4,7 @@

 using BenchmarkDotNet.Attributes;
 using MQTTnet.Packets;
-using System;
 using System.Security.Cryptography.X509Certificates;
-using System.Threading;
-using System.Threading.Tasks;
 using MQTTnet.Adapter;
 using MQTTnet.Channel;
 using MQTTnet.Formatter;
@@ -17,16 +14,16 @@ using MQTTnet.Diagnostics.Logger;
 using System.Buffers;
 using System.Net;

-namespace MQTTnet.Benchmarks
+namespace MQTTnet.Benchmarks;
+
+[SimpleJob(RuntimeMoniker.Net60)]
+[RPlotExporter]
+[MemoryDiagnoser]
+public class SerializerBenchmark : BaseBenchmark
 {
-    [SimpleJob(RuntimeMoniker.Net60)]
-    [RPlotExporter]
-    [MemoryDiagnoser]
-    public class SerializerBenchmark : BaseBenchmark
-    {
    MqttPacket _packet;
    ArraySegment<byte> _serializedPacket;
-        IMqttPacketFormatter _serializer;
+    MqttV3PacketFormatter _serializer;
    MqttBufferWriter _bufferWriter;

    [GlobalSetup]
@@ -43,7 +40,7 @@ namespace MQTTnet.Benchmarks
    }

    [Benchmark]
-        public void Serialize_10000_Messages()
+    public void Serialize10000Messages()
    {
        for (var i = 0; i < 10000; i++)
        {
@@ -53,7 +50,7 @@ namespace MQTTnet.Benchmarks
    }

    [Benchmark]
-        public void Deserialize_10000_Messages()
+    public void Deserialize10000Messages()
    {
        var channel = new BenchmarkMqttChannel(_serializedPacket);
        var reader = new MqttChannelAdapter(channel, new MqttPacketFormatterAdapter(new MqttBufferWriter(4096, 65535)), new MqttNetEventLogger());
@@ -62,11 +59,11 @@ namespace MQTTnet.Benchmarks
        {
            channel.Reset();

-                var header = reader.ReceivePacketAsync(CancellationToken.None).GetAwaiter().GetResult();
+            reader.ReceivePacketAsync(CancellationToken.None).GetAwaiter().GetResult();
        }
    }

-        class BenchmarkMqttChannel : IMqttChannel
+    sealed class BenchmarkMqttChannel : IMqttChannel
    {
        readonly ArraySegment<byte> _buffer;
        int _position;
@@ -79,9 +76,11 @@ namespace MQTTnet.Benchmarks

        public EndPoint RemoteEndPoint { get; set; }

-            public bool IsSecureConnection { get; } = false;
+        public EndPoint LocalEndPoint { get; set; }

-            public X509Certificate2 ClientCertificate { get; }
+        public bool IsSecureConnection { get; }
+
+        public X509Certificate2 ClientCertificate { get; set; }

        public void Reset()
        {
@@ -100,7 +99,7 @@ namespace MQTTnet.Benchmarks

        public Task<int> ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
        {
-                Array.Copy(_buffer.Array, _position, buffer, offset, count);
+            Array.Copy(_buffer!.Array!, _position, buffer, offset, count);
            _position += count;

            return Task.FromResult(count);
@@ -115,5 +114,4 @@ namespace MQTTnet.Benchmarks
        {
        }
    }
-    }
 }
@@ -5,15 +5,14 @@
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Jobs;
 using MQTTnet.Tests.Mockups;
-using MQTTnet.Tests.Server;

-namespace MQTTnet.Benchmarks
+namespace MQTTnet.Benchmarks;
+
+[SimpleJob(RuntimeMoniker.Net60)]
+[RPlotExporter, RankColumn]
+[MemoryDiagnoser]
+public class ServerProcessingBenchmark : BaseBenchmark
 {
-    [SimpleJob(RuntimeMoniker.Net60)]
-    [RPlotExporter, RankColumn]
-    [MemoryDiagnoser]
-    public class ServerProcessingBenchmark : BaseBenchmark
-    {
    [GlobalSetup]
    public void GlobalSetup()
    {
@@ -28,13 +27,12 @@ namespace MQTTnet.Benchmarks
    [Benchmark]
    public void Handle_100_000_Messages_In_Server_MqttClient()
    {
-            new Load_Tests().Handle_100_000_Messages_In_Server().GetAwaiter().GetResult();
+        //new Load_Tests().Handle_100_000_Messages_In_Server().GetAwaiter().GetResult();
    }

-        //[Benchmark]
+    [Benchmark]
    public void Handle_100_000_Messages_In_Server_LowLevelMqttClient()
    {
-            new Load_Tests().Handle_100_000_Messages_In_Low_Level_Client().GetAwaiter().GetResult();
-        }
+        //new Load_Tests().Handle_100_000_Messages_In_Low_Level_Client().GetAwaiter().GetResult();
    }
 }
@@ -2,8 +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.Collections.Generic;
-using System.Linq;
 using BenchmarkDotNet.Attributes;
 using MQTTnet.Server;

@@ -30,7 +28,7 @@ public class SubscribeBenchmark : BaseBenchmark
    [GlobalSetup]
    public void Setup()
    {
-        TopicGenerator.Generate(NumPublishers, NumTopicsPerPublisher, out var topicsByPublisher, out var singleWildcardTopicsByPublisher, out var multiWildcardTopicsByPublisher);
+        TopicGenerator.Generate(NumPublishers, NumTopicsPerPublisher, out var topicsByPublisher, out _, out _);
        _topics = topicsByPublisher.Values.First();

        var serverOptions = new MqttServerOptionsBuilder().WithDefaultEndpoint().Build();
@@ -5,18 +5,16 @@
 using System.IO.Pipelines;
 using System.Net;
 using System.Net.Sockets;
-using System.Threading;
-using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Jobs;
 using MQTTnet.AspNetCore;

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

@@ -76,5 +74,4 @@ namespace MQTTnet.Benchmarks
            await output.WriteAsync(new byte[size], CancellationToken.None).ConfigureAwait(false);
        }
    }
-    }
 }
@@ -2,19 +2,16 @@
 // 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;

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

+[SimpleJob(RuntimeMoniker.Net60)]
+[RPlotExporter]
+[MemoryDiagnoser]
+public class TopicFilterComparerBenchmark : BaseBenchmark
+{
    readonly string _longTopic =
        "AAAAAAAAAAAAAssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssshhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkAAAAAAAAAAAAAAABBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC";

@@ -33,238 +30,4 @@ namespace MQTTnet.Benchmarks
            MqttTopicFilterComparer.Compare(_longTopic, _longTopic);
        }
    }
-
-        [Benchmark]
-        public void MqttTopicFilterComparer_10000_LoopMethod_Without_Pointer()
-        {
-            for (var i = 0; i < 100000; i++)
-            {
-                MqttTopicFilterComparerWithoutPointer.Compare("sport/tennis/player1", "sport/#");
-                MqttTopicFilterComparerWithoutPointer.Compare("sport/tennis/player1/ranking", "sport/#/ranking");
-                MqttTopicFilterComparerWithoutPointer.Compare("sport/tennis/player1/score/wimbledon", "sport/+/player1/#");
-                MqttTopicFilterComparerWithoutPointer.Compare("sport/tennis/player1", "sport/tennis/+");
-                MqttTopicFilterComparerWithoutPointer.Compare("/finance", "+/+");
-                MqttTopicFilterComparerWithoutPointer.Compare("/finance", "/+");
-                MqttTopicFilterComparerWithoutPointer.Compare("/finance", "+");
-                MqttTopicFilterComparerWithoutPointer.Compare(_longTopic, _longTopic);
-            }
-        }
-
-        [Benchmark]
-        public void MqttTopicFilterComparer_10000_StringSplitMethod()
-        {
-            for (var i = 0; i < 100000; i++)
-            {
-                LegacyMethodByStringSplit("sport/tennis/player1", "sport/#");
-                LegacyMethodByStringSplit("sport/tennis/player1/ranking", "sport/#/ranking");
-                LegacyMethodByStringSplit("sport/tennis/player1/score/wimbledon", "sport/+/player1/#");
-                LegacyMethodByStringSplit("sport/tennis/player1", "sport/tennis/+");
-                LegacyMethodByStringSplit("/finance", "+/+");
-                LegacyMethodByStringSplit("/finance", "/+");
-                LegacyMethodByStringSplit("/finance", "+");
-                MqttTopicFilterComparer.Compare(_longTopic, _longTopic);
-            }
-        }
-
-        [GlobalSetup]
-        public void Setup()
-        {
-        }
-
-        static bool LegacyMethodByStringSplit(string topic, string filter)
-        {
-            ArgumentNullException.ThrowIfNull(topic);
-            ArgumentNullException.ThrowIfNull(filter);
-
-            if (string.Equals(topic, filter, StringComparison.Ordinal))
-            {
-                return true;
-            }
-
-            var fragmentsTopic = topic.Split(TopicLevelSeparator, StringSplitOptions.None);
-            var fragmentsFilter = filter.Split(TopicLevelSeparator, StringSplitOptions.None);
-
-            // # > In either case it MUST be the last character specified in the Topic Filter [MQTT-4.7.1-2].
-            for (var i = 0; i < fragmentsFilter.Length; i++)
-            {
-                if (fragmentsFilter[i] == "+")
-                {
-                    continue;
-                }
-
-                if (fragmentsFilter[i] == "#")
-                {
-                    return true;
-                }
-
-                if (i >= fragmentsTopic.Length)
-                {
-                    return false;
-                }
-
-                if (!string.Equals(fragmentsFilter[i], fragmentsTopic[i], StringComparison.Ordinal))
-                {
-                    return false;
-                }
-            }
-
-            return fragmentsTopic.Length == fragmentsFilter.Length;
-        }
-
-        public static class MqttTopicFilterComparerWithoutPointer
-        {
-            public const char LevelSeparator = '/';
-            public const char MultiLevelWildcard = '#';
-            public const char SingleLevelWildcard = '+';
-            public const char ReservedTopicPrefix = '$';
-
-            public static MqttTopicFilterCompareResult Compare(string topic, string filter)
-            {
-                if (string.IsNullOrEmpty(topic))
-                {
-                    return MqttTopicFilterCompareResult.TopicInvalid;
-                }
-
-                if (string.IsNullOrEmpty(filter))
-                {
-                    return MqttTopicFilterCompareResult.FilterInvalid;
-                }
-
-                var filterOffset = 0;
-                var filterLength = filter.Length;
-
-                var topicOffset = 0;
-                var topicLength = topic.Length;
-
-                var topicPointer = topic;
-                var filterPointer = filter;
-
-                var isMultiLevelFilter = filterPointer[filterLength - 1] == MultiLevelWildcard;
-                var isReservedTopic = topicPointer[0] == ReservedTopicPrefix;
-
-                if (isReservedTopic && filterLength == 1 && isMultiLevelFilter)
-                {
-                    // It is not allowed to receive i.e. '$foo/bar' with filter '#'.
-                    return MqttTopicFilterCompareResult.NoMatch;
-                }
-
-                if (isReservedTopic && filterPointer[0] == SingleLevelWildcard)
-                {
-                    // It is not allowed to receive i.e. '$SYS/monitor/Clients' with filter '+/monitor/Clients'.
-                    return MqttTopicFilterCompareResult.NoMatch;
-                }
-
-                if (filterLength == 1 && isMultiLevelFilter)
-                {
-                    // Filter '#' matches basically everything.
-                    return MqttTopicFilterCompareResult.IsMatch;
-                }
-
-                // Go through the filter char by char.
-                while (filterOffset < filterLength && topicOffset < topicLength)
-                {
-                    // Check if the current char is a multi level wildcard. The char is only allowed
-                    // at the very las position.
-                    if (filterPointer[filterOffset] == MultiLevelWildcard && filterOffset != filterLength - 1)
-                    {
-                        return MqttTopicFilterCompareResult.FilterInvalid;
-                    }
-
-                    if (filterPointer[filterOffset] == topicPointer[topicOffset])
-                    {
-                        if (topicOffset == topicLength - 1)
-                        {
-                            // Check for e.g. "foo" matching "foo/#"
-                            if (filterOffset == filterLength - 3 && filterPointer[filterOffset + 1] == LevelSeparator && isMultiLevelFilter)
-                            {
-                                return MqttTopicFilterCompareResult.IsMatch;
-                            }
-
-                            // Check for e.g. "foo/" matching "foo/#"
-                            if (filterOffset == filterLength - 2 && filterPointer[filterOffset] == LevelSeparator && isMultiLevelFilter)
-                            {
-                                return MqttTopicFilterCompareResult.IsMatch;
-                            }
-                        }
-
-                        filterOffset++;
-                        topicOffset++;
-
-                        // Check if the end was reached and i.e. "foo/bar" matches "foo/bar"
-                        if (filterOffset == filterLength && topicOffset == topicLength)
-                        {
-                            return MqttTopicFilterCompareResult.IsMatch;
-                        }
-
-                        var endOfTopic = topicOffset == topicLength;
-
-                        if (endOfTopic && filterOffset == filterLength - 1 && filterPointer[filterOffset] == SingleLevelWildcard)
-                        {
-                            if (filterOffset > 0 && filterPointer[filterOffset - 1] != LevelSeparator)
-                            {
-                                return MqttTopicFilterCompareResult.FilterInvalid;
-                            }
-
-                            return MqttTopicFilterCompareResult.IsMatch;
-                        }
-                    }
-                    else
-                    {
-                        if (filterPointer[filterOffset] == SingleLevelWildcard)
-                        {
-                            // Check for invalid "+foo" or "a/+foo" subscription
-                            if (filterOffset > 0 && filterPointer[filterOffset - 1] != LevelSeparator)
-                            {
-                                return MqttTopicFilterCompareResult.FilterInvalid;
-                            }
-
-                            // Check for bad "foo+" or "foo+/a" subscription
-                            if (filterOffset < filterLength - 1 && filterPointer[filterOffset + 1] != LevelSeparator)
-                            {
-                                return MqttTopicFilterCompareResult.FilterInvalid;
-                            }
-
-                            filterOffset++;
-                            while (topicOffset < topicLength && topicPointer[topicOffset] != LevelSeparator)
-                            {
-                                topicOffset++;
-                            }
-
-                            if (topicOffset == topicLength && filterOffset == filterLength)
-                            {
-                                return MqttTopicFilterCompareResult.IsMatch;
-                            }
-                        }
-                        else if (filterPointer[filterOffset] == MultiLevelWildcard)
-                        {
-                            if (filterOffset > 0 && filterPointer[filterOffset - 1] != LevelSeparator)
-                            {
-                                return MqttTopicFilterCompareResult.FilterInvalid;
-                            }
-
-                            if (filterOffset + 1 != filterLength)
-                            {
-                                return MqttTopicFilterCompareResult.FilterInvalid;
-                            }
-
-                            return MqttTopicFilterCompareResult.IsMatch;
-                        }
-                        else
-                        {
-                            // Check for e.g. "foo/bar" matching "foo/+/#".
-                            if (filterOffset > 0 && filterOffset + 2 == filterLength && topicOffset == topicLength && filterPointer[filterOffset - 1] == SingleLevelWildcard &&
-                                filterPointer[filterOffset] == LevelSeparator && isMultiLevelFilter)
-                            {
-                                return MqttTopicFilterCompareResult.IsMatch;
-                            }
-
-                            return MqttTopicFilterCompareResult.NoMatch;
-                        }
-                    }
-                }
-
-                return MqttTopicFilterCompareResult.NoMatch;
-            }
-        }
-    }
 }
@@ -1,10 +1,7 @@
-using System;
-using System.Collections.Generic;
+namespace MQTTnet.Benchmarks;

-namespace MQTTnet.Benchmarks
+public class TopicGenerator
 {
-    public class TopicGenerator
-    {
    public static void Generate(
        int numPublishers,
        int numTopicsPerPublisher,
@@ -80,5 +77,4 @@ namespace MQTTnet.Benchmarks

        topicList.Add(topic);
    }
-    }
 }
@@ -2,8 +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.Collections.Generic;
-using System.Linq;
 using BenchmarkDotNet.Attributes;
 using MQTTnet.Server;

@@ -14,15 +12,15 @@ public class UnsubscribeBenchmark : BaseBenchmark
 {
    const int NumPublishers = 1;
    const int NumTopicsPerPublisher = 10000;
+
    IMqttClient _mqttClient;
    MqttServer _mqttServer;
-
    List<string> _topics;

    [GlobalSetup]
    public void Setup()
    {
-        TopicGenerator.Generate(NumPublishers, NumTopicsPerPublisher, out var topicsByPublisher, out var singleWildcardTopicsByPublisher, out var multiWildcardTopicsByPublisher);
+        TopicGenerator.Generate(NumPublishers, NumTopicsPerPublisher, out var topicsByPublisher, out _, out _);
        _topics = topicsByPublisher.Values.First();

        var serverOptions = new MqttServerOptionsBuilder().WithDefaultEndpoint().Build();
@@ -2,17 +2,15 @@
 // 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.Rpc;

-namespace MQTTnet.Extensions.Rpc
+public sealed class DefaultMqttRpcClientTopicGenerationStrategy : IMqttRpcClientTopicGenerationStrategy
 {
-    public sealed class DefaultMqttRpcClientTopicGenerationStrategy : IMqttRpcClientTopicGenerationStrategy
-    {
    public MqttRpcTopicPair CreateRpcTopics(TopicGenerationContext context)
    {
        ArgumentNullException.ThrowIfNull(context);

-            if (context.MethodName.Contains("/") || context.MethodName.Contains("+") || context.MethodName.Contains("#"))
+        if (context.MethodName.Contains('/') || context.MethodName.Contains('+') || context.MethodName.Contains('#'))
        {
            throw new ArgumentException("The method name cannot contain /, + or #.");
        }
@@ -26,5 +24,4 @@ namespace MQTTnet.Extensions.Rpc
            ResponseTopic = responseTopic
        };
    }
-    }
 }
@@ -2,18 +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 System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
 using MQTTnet.Protocol;

-namespace MQTTnet.Extensions.Rpc
+namespace MQTTnet.Extensions.Rpc;
+
+public interface IMqttRpcClient : IDisposable
 {
-    public interface IMqttRpcClient : IDisposable
-    {
    Task<byte[]> ExecuteAsync(TimeSpan timeout, string methodName, byte[] payload, MqttQualityOfServiceLevel qualityOfServiceLevel, IDictionary<string,object> parameters = null);

    Task<byte[]> ExecuteAsync(string methodName, byte[] payload, MqttQualityOfServiceLevel qualityOfServiceLevel, IDictionary<string, object> parameters = null, CancellationToken cancellationToken = default);
-    }
 }
@@ -2,10 +2,9 @@
 // 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.Rpc
+namespace MQTTnet.Extensions.Rpc;
+
+public interface IMqttRpcClientTopicGenerationStrategy
 {
-    public interface IMqttRpcClientTopicGenerationStrategy
-    {
    MqttRpcTopicPair CreateRpcTopics(TopicGenerationContext context);
-    }
 }
@@ -1,54 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">

    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
        <AssemblyName>MQTTnet.Extensions.Rpc</AssemblyName>
        <RootNamespace>MQTTnet.Extensions.Rpc</RootNamespace>
+        <IsAotCompatible>true</IsAotCompatible>
+
        <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-        <Company>The contributors of MQTTnet</Company>
-        <Product>MQTTnet</Product>
        <Description>This is an extension library which allows executing synchronous device calls including a response using MQTTnet.</Description>
-        <Authors>The contributors of MQTTnet</Authors>
        <PackageId>MQTTnet.Extensions.Rpc</PackageId>
-        <SignAssembly>false</SignAssembly>
-        <DelaySign>false</DelaySign>
-        <PublishRepositoryUrl>true</PublishRepositoryUrl>
-        <IncludeSymbols>true</IncludeSymbols>
-        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-        <Copyright>Copyright (c) .NET Foundation and Contributors</Copyright>
-        <PackageProjectUrl>https://github.com/dotnet/MQTTnet</PackageProjectUrl>
-        <RepositoryUrl>https://github.com/dotnet/MQTTnet.git</RepositoryUrl>
-        <RepositoryType>git</RepositoryType>
        <PackageTags>MQTT Message Queue Telemetry Transport MQTTClient MQTTServer Server MQTTBroker Broker NETStandard IoT InternetOfThings Messaging Hardware Arduino Sensor Actuator M2M ESP Smart Home Cities Automation Xamarin Blazor</PackageTags>
-        <NeutralLanguage>en-US</NeutralLanguage>
-        <EnableNETAnalyzers>false</EnableNETAnalyzers>
-        <EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
-        <PackageIcon>nuget.png</PackageIcon>
        <EmbedUntrackedSources>true</EmbedUntrackedSources>
-        <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-        <PackageLicenseExpression>MIT</PackageLicenseExpression>
        <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;NU1803;NU1901;NU1902</NoWarn>
-        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <NuGetAuditMode>all</NuGetAuditMode>
-        <NuGetAudit>true</NuGetAudit>
-        <NuGetAuditLevel>low</NuGetAuditLevel>
-        <AnalysisLevel>latest-Recommended</AnalysisLevel>
    </PropertyGroup>

-    <ItemGroup>
-        <None Include="..\..\Images\nuget.png">
-            <Pack>True</Pack>
-            <PackagePath>\</PackagePath>
-        </None>
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
-    </ItemGroup>
-
    <ItemGroup>
        <ProjectReference Include="..\MQTTnet\MQTTnet.csproj"/>
    </ItemGroup>
@@ -2,12 +2,10 @@
 // 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.Rpc;

-namespace MQTTnet.Extensions.Rpc
+public static class MqttFactoryExtensions
 {
-    public static class MqttFactoryExtensions
-    {
    public static IMqttRpcClient CreateMqttRpcClient(this MqttClientFactory clientFactory, IMqttClient mqttClient)
    {
        return clientFactory.CreateMqttRpcClient(
@@ -25,5 +23,4 @@ namespace MQTTnet.Extensions.Rpc

        return new MqttRpcClient(mqttClient, rpcClientOptions);
    }
-    }
 }
@@ -2,22 +2,17 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using System;
 using System.Buffers;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using MQTTnet.Exceptions;
 using MQTTnet.Formatter;
 using MQTTnet.Internal;
 using MQTTnet.Protocol;

-namespace MQTTnet.Extensions.Rpc
+namespace MQTTnet.Extensions.Rpc;
+
+public sealed class MqttRpcClient : IMqttRpcClient
 {
-    public sealed class MqttRpcClient : IMqttRpcClient
-    {
    readonly IMqttClient _mqttClient;
    readonly MqttRpcClientOptions _options;

@@ -45,8 +40,7 @@ namespace MQTTnet.Extensions.Rpc

    public async Task<byte[]> ExecuteAsync(TimeSpan timeout, string methodName, byte[] payload, MqttQualityOfServiceLevel qualityOfServiceLevel, IDictionary<string, object> parameters = null)
    {
-            using (var timeoutToken = new CancellationTokenSource(timeout))
-            {
+        using var timeoutToken = new CancellationTokenSource(timeout);
        try
        {
            return await ExecuteAsync(methodName, payload, qualityOfServiceLevel, parameters, timeoutToken.Token).ConfigureAwait(false);
@@ -61,7 +55,6 @@ namespace MQTTnet.Extensions.Rpc
            throw;
        }
    }
-        }

    public async Task<byte[]> ExecuteAsync(string methodName, byte[] payload, MqttQualityOfServiceLevel qualityOfServiceLevel, IDictionary<string, object> parameters = null, CancellationToken cancellationToken = default)
    {
@@ -137,5 +130,4 @@ namespace MQTTnet.Extensions.Rpc

        return CompletedTask.Instance;
    }
-    }
 }
@@ -2,23 +2,19 @@
 // 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.Text;
-using System.Threading.Tasks;
 using MQTTnet.Protocol;

-namespace MQTTnet.Extensions.Rpc
+namespace MQTTnet.Extensions.Rpc;
+
+public static class MqttRpcClientExtensions
 {
-    public static class MqttRpcClientExtensions
-    {
    public static Task<byte[]> ExecuteAsync(this IMqttRpcClient client, TimeSpan timeout, string methodName, string payload, MqttQualityOfServiceLevel qualityOfServiceLevel, IDictionary<string,object> parameters = null)
    {
-            if (client == null) throw new ArgumentNullException(nameof(client));
+        ArgumentNullException.ThrowIfNull(client);

        var buffer = Encoding.UTF8.GetBytes(payload ?? string.Empty);

        return client.ExecuteAsync(timeout, methodName, buffer, qualityOfServiceLevel, parameters);
    }
-    }
 }
@@ -2,10 +2,9 @@
 // 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.Rpc
+namespace MQTTnet.Extensions.Rpc;
+
+public sealed class MqttRpcClientOptions
 {
-    public sealed class MqttRpcClientOptions
-    {
    public IMqttRpcClientTopicGenerationStrategy TopicGenerationStrategy { get; set; } = new DefaultMqttRpcClientTopicGenerationStrategy();
-    }
 }
@@ -2,12 +2,10 @@
 // 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.Rpc;

-namespace MQTTnet.Extensions.Rpc
+public sealed class MqttRpcClientOptionsBuilder
 {
-    public sealed class MqttRpcClientOptionsBuilder
-    {
    IMqttRpcClientTopicGenerationStrategy _topicGenerationStrategy = new DefaultMqttRpcClientTopicGenerationStrategy();

    public MqttRpcClientOptions Build()
@@ -24,5 +22,4 @@ namespace MQTTnet.Extensions.Rpc

        return this;
    }
-    }
 }
@@ -2,12 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-namespace MQTTnet.Extensions.Rpc
+namespace MQTTnet.Extensions.Rpc;
+
+public sealed class MqttRpcTopicPair
 {
-    public sealed class MqttRpcTopicPair
-    {
    public string RequestTopic { get; set; }

    public string ResponseTopic { get; set; }
-    }
 }
@@ -2,14 +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 System.Collections.Generic;
 using MQTTnet.Protocol;

-namespace MQTTnet.Extensions.Rpc
+namespace MQTTnet.Extensions.Rpc;
+
+public sealed class TopicGenerationContext
 {
-    public sealed class TopicGenerationContext
-    {
    public TopicGenerationContext(IMqttClient mqttClient, MqttRpcClientOptions options, string methodName,
        IDictionary<string, object> parameters, MqttQualityOfServiceLevel qualityOfServiceLevel)
    {
@@ -38,5 +36,4 @@ namespace MQTTnet.Extensions.Rpc
    ///     - Exactly once  (2): Message gets delivered exactly once (It's ensured that the message only comes once).
    /// </summary>
    public MqttQualityOfServiceLevel QualityOfServiceLevel { get; }
-    }
 }
@@ -1,53 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk">

    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
        <AssemblyName>MQTTnet.Extensions.TopicTemplate</AssemblyName>
        <RootNamespace>MQTTnet.Extensions.TopicTemplate</RootNamespace>
+        <IsAotCompatible>true</IsAotCompatible>
+
        <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-        <Company>The contributors of MQTTnet</Company>
-        <Product>MQTTnet</Product>
        <Description>
           Provides mqtt topic templating logic to support dispatch,
           routing and similar functionality based on the well known moustache syntax (AsyncAPI compatible).
        </Description>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
-        <Authors>The contributors of MQTTnet</Authors>
        <PackageId>MQTTnet.Extensions.TopicTemplate</PackageId>
-        <SignAssembly>false</SignAssembly>
-        <DelaySign>false</DelaySign>
-        <PublishRepositoryUrl>true</PublishRepositoryUrl>
-        <IncludeSymbols>true</IncludeSymbols>
-        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-        <Copyright>Copyright (c) .NET Foundation and Contributors</Copyright>
-        <PackageProjectUrl>https://github.com/dotnet/MQTTnet</PackageProjectUrl>
-        <RepositoryUrl>https://github.com/dotnet/MQTTnet.git</RepositoryUrl>
-        <RepositoryType>git</RepositoryType>
        <PackageTags>MQTT Message Queue Telemetry MQTTClient Messaging Routing AsyncAPI Template</PackageTags>
-        <NeutralLanguage>en-US</NeutralLanguage>
-        <PackageIcon>nuget.png</PackageIcon>
-        <EmbedUntrackedSources>true</EmbedUntrackedSources>
-        <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-        <PackageLicenseExpression>MIT</PackageLicenseExpression>
        <PackageReleaseNotes>For release notes please go to MQTTnet release notes (https://www.nuget.org/packages/MQTTnet/).</PackageReleaseNotes>
        <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <NoWarn>1591;NETSDK1138</NoWarn>
+
    </PropertyGroup>

    <ItemGroup>
-        <None Include="README.md">
-            <Pack>True</Pack>
-            <PackagePath>\</PackagePath>
-        </None>
-        <None Include="..\..\Images\nuget.png">
-            <Pack>True</Pack>
-            <PackagePath>\</PackagePath>
-        </None>
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-        <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+        <PackageReference Include="System.ValueTuple" Version="4.6.1" />
    </ItemGroup>

    <ItemGroup>
@@ -2,11 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.

-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text.RegularExpressions;
-using System.Threading;
 using MQTTnet.Protocol;

 namespace MQTTnet.Extensions.TopicTemplate;
@@ -84,13 +80,13 @@ public sealed class MqttTopicTemplate : IEquatable<MqttTopicTemplate>
        {
            var filter = TopicFilter;
            // append slash if neccessary
-            if (filter.Length > 0 && !filter.EndsWith(MqttTopicFilterComparer.LevelSeparator.ToString()) && !filter.EndsWith(MqttTopicFilterComparer.MultiLevelWildcard.ToString()))
+            if (filter.Length > 0 && !filter.EndsWith(MqttTopicFilterComparer.LevelSeparator) && !filter.EndsWith(MqttTopicFilterComparer.MultiLevelWildcard))
            {
                filter += MqttTopicFilterComparer.LevelSeparator;
            }

            // append hash if neccessary
-            if (!filter.EndsWith(MqttTopicFilterComparer.MultiLevelWildcard.ToString()))
+            if (!filter.EndsWith(MqttTopicFilterComparer.MultiLevelWildcard))
            {
                filter += MqttTopicFilterComparer.MultiLevelWildcard;
            }
@@ -161,12 +157,12 @@ public sealed class MqttTopicTemplate : IEquatable<MqttTopicTemplate>
            return new MqttTopicTemplate(MqttTopicFilterComparer.MultiLevelWildcard.ToString());
        }

-        if (root.Contains(MqttTopicFilterComparer.LevelSeparator) && !root.EndsWith(MqttTopicFilterComparer.LevelSeparator.ToString()) && !root.EndsWith("}"))
+        if (root.Contains(MqttTopicFilterComparer.LevelSeparator) && !root.EndsWith(MqttTopicFilterComparer.LevelSeparator.ToString(), StringComparison.InvariantCulture) && !root.EndsWith('}'))
        {
            root = root.Substring(0, root.LastIndexOf(MqttTopicFilterComparer.LevelSeparator) + 1);
        }

-        if (root.EndsWith(MqttTopicFilterComparer.LevelSeparator.ToString()))
+        if (root.EndsWith(MqttTopicFilterComparer.LevelSeparator.ToString(), StringComparison.InvariantCulture))
        {
            root += MqttTopicFilterComparer.SingleLevelWildcard;
        }
@@ -230,7 +226,7 @@ public sealed class MqttTopicTemplate : IEquatable<MqttTopicTemplate>
            throw new ArgumentException("the topic has to match this template", nameof(topic));
        }

-        return parseParameterValuesInternal(topic);
+        return ParseParameterValuesInternal(topic);
    }

    /// <summary>
@@ -330,7 +326,7 @@ public sealed class MqttTopicTemplate : IEquatable<MqttTopicTemplate>
        return parameters.Aggregate(this, (t, p) => t.TrySetParameter(p.parameter, p.value));
    }

-    IEnumerable<(string parameter, int index, string value)> parseParameterValuesInternal(string topic)
+    IEnumerable<(string parameter, int index, string value)> ParseParameterValuesInternal(string topic)
    {
        // because we have a match, we know the segment array is at least the template's length
        var segments = topic.Split(MqttTopicFilterComparer.LevelSeparator);
@@ -2,8 +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 System.Linq;
 using MQTTnet.Packets;
 using MQTTnet.Protocol;

@@ -5,10 +5,10 @@
 using MQTTnet.Packets;
 using MQTTnet.Protocol;

-namespace MQTTnet.Server
+namespace MQTTnet.Server;
+
+public sealed class MqttServerClientDisconnectOptions
 {
-    public sealed class MqttServerClientDisconnectOptions
-    {
    public MqttDisconnectReasonCode ReasonCode { get; set; } = MqttDisconnectReasonCode.NormalDisconnection;

    /// <summary>
@@ -28,5 +28,4 @@ namespace MQTTnet.Server
    ///     <remarks>MQTT 5.0.0+ feature.</remarks>
    /// </summary>
    public List<MqttUserProperty> UserProperties { get; set; }
-    }
 }
@@ -5,10 +5,10 @@
 using MQTTnet.Packets;
 using MQTTnet.Protocol;

-namespace MQTTnet.Server
+namespace MQTTnet.Server;
+
+public sealed class MqttServerClientDisconnectOptionsBuilder
 {
-    public sealed class MqttServerClientDisconnectOptionsBuilder
-    {
    readonly MqttServerClientDisconnectOptions _options = new MqttServerClientDisconnectOptions();

    public MqttServerClientDisconnectOptions Build()
@@ -50,5 +50,4 @@ namespace MQTTnet.Server
        _options.UserProperties.Add(new MqttUserProperty(name, value));
        return this;
    }
-    }
 }
@@ -53,10 +53,7 @@ public sealed class ExchangeEnhancedAuthenticationOptionsFactory

    public ExchangeEnhancedAuthenticationOptionsFactory WithUserProperty(string name, string value)
    {
-        if (name == null)
-        {
-            throw new ArgumentNullException(nameof(name));
-        }
+        ArgumentNullException.ThrowIfNull(name);

        if (_options.UserProperties == null)
        {
@@ -2,12 +2,10 @@
 // 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.Server;

-namespace MQTTnet.Server
+public sealed class ApplicationMessageEnqueuedEventArgs : EventArgs
 {
-    public sealed class ApplicationMessageEnqueuedEventArgs : EventArgs
-    {
    public ApplicationMessageEnqueuedEventArgs(string senderClientId, string receiverClientId, MqttApplicationMessage applicationMessage, bool isDropped)
    {
        SenderClientId = senderClientId ?? throw new ArgumentNullException( nameof(senderClientId));
@@ -23,5 +21,4 @@ namespace MQTTnet.Server
    public bool IsDropped { get; }

    public MqttApplicationMessage ApplicationMessage { get; }
-    }
 }
@@ -2,12 +2,10 @@
 // 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.Server;

-namespace MQTTnet.Server
+public sealed class ApplicationMessageNotConsumedEventArgs : EventArgs
 {
-    public sealed class ApplicationMessageNotConsumedEventArgs : EventArgs
-    {
    public ApplicationMessageNotConsumedEventArgs(MqttApplicationMessage applicationMessage, string senderId)
    {
        ApplicationMessage = applicationMessage ?? throw new ArgumentNullException(nameof(applicationMessage));
@@ -23,5 +21,4 @@ namespace MQTTnet.Server
    ///     Gets the ID of the client which has sent the affected application message.
    /// </summary>
    public string SenderId { get; }
-    }
 }
@@ -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 System;
 using System.Collections;
 using MQTTnet.Packets;

-namespace MQTTnet.Server
+namespace MQTTnet.Server;
+
+public sealed class ClientAcknowledgedPublishPacketEventArgs : EventArgs
 {
-    public sealed class ClientAcknowledgedPublishPacketEventArgs : EventArgs
-    {
    public ClientAcknowledgedPublishPacketEventArgs(string clientId, string userName, IDictionary sessionItems, MqttPublishPacket publishPacket, MqttPacketWithIdentifier acknowledgePacket)
    {
        ClientId = clientId ?? throw new ArgumentNullException(nameof(clientId));
@@ -48,5 +47,4 @@ namespace MQTTnet.Server
    ///     Gets the session items which contain custom user data per session.
    /// </summary>
    public IDictionary SessionItems { get; }
-    }
 }
@@ -2,18 +2,16 @@
 // 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;
-using System.Collections.Generic;
 using System.Net;
 using System.Text;
 using MQTTnet.Formatter;
 using MQTTnet.Packets;

-namespace MQTTnet.Server
+namespace MQTTnet.Server;
+
+public sealed class ClientConnectedEventArgs : EventArgs
 {
-    public sealed class ClientConnectedEventArgs : EventArgs
-    {
    readonly MqttConnectPacket _connectPacket;

    public ClientConnectedEventArgs(MqttConnectPacket connectPacket, MqttProtocolVersion protocolVersion, EndPoint remoteEndPoint, IDictionary sessionItems)
@@ -67,5 +65,4 @@ namespace MQTTnet.Server
    ///     <remarks>MQTT 5.0.0+ feature.</remarks>
    /// </summary>
    public List<MqttUserProperty> UserProperties => _connectPacket?.UserProperties;
-    }
 }
@@ -2,18 +2,16 @@
 // 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;
-using System.Collections.Generic;
 using System.Net;
 using System.Text;
 using MQTTnet.Packets;
 using MQTTnet.Protocol;

-namespace MQTTnet.Server
+namespace MQTTnet.Server;
+
+public sealed class ClientDisconnectedEventArgs : EventArgs
 {
-    public sealed class ClientDisconnectedEventArgs : EventArgs
-    {
    readonly MqttConnectPacket _connectPacket;
    readonly MqttDisconnectPacket _disconnectPacket;

@@ -88,5 +86,4 @@ namespace MQTTnet.Server
    ///     <remarks>MQTT 5.0.0+ feature.</remarks>
    /// </summary>
    public List<MqttUserProperty> UserProperties => _disconnectPacket?.UserProperties;
-    }
 }
@@ -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 System;
 using System.Collections;
 using MQTTnet.Packets;

-namespace MQTTnet.Server
+namespace MQTTnet.Server;
+
+public sealed class ClientSubscribedTopicEventArgs : EventArgs
 {
-    public sealed class ClientSubscribedTopicEventArgs : EventArgs
-    {
    public ClientSubscribedTopicEventArgs(string clientId, string userName, MqttTopicFilter topicFilter, IDictionary sessionItems)
    {
        ClientId = clientId ?? throw new ArgumentNullException(nameof(clientId));
@@ -39,5 +38,4 @@ namespace MQTTnet.Server
    ///     The topic filter can contain topics and wildcards.
    /// </summary>
    public MqttTopicFilter TopicFilter { get; }
-    }
 }
@@ -2,13 +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 System.Collections;

-namespace MQTTnet.Server
+namespace MQTTnet.Server;
+
+public sealed class ClientUnsubscribedTopicEventArgs : EventArgs
 {
-    public sealed class ClientUnsubscribedTopicEventArgs : EventArgs
-    {
    public ClientUnsubscribedTopicEventArgs(string clientId, string userName, string topicFilter, IDictionary sessionItems)
    {
        ClientId = clientId ?? throw new ArgumentNullException(nameof(clientId));
@@ -38,5 +37,4 @@ namespace MQTTnet.Server
    ///     The topic filter can contain topics and wildcards.
    /// </summary>
    public string TopicFilter { get; }
-    }
 }
@@ -2,12 +2,10 @@
 // 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.Server;

-namespace MQTTnet.Server
+public sealed class InterceptingClientApplicationMessageEnqueueEventArgs : EventArgs
 {
-    public sealed class InterceptingClientApplicationMessageEnqueueEventArgs : EventArgs
-    {
    public InterceptingClientApplicationMessageEnqueueEventArgs(string senderClientId, string receiverClientId, MqttApplicationMessage applicationMessage)
    {
        SenderClientId = senderClientId ?? throw new ArgumentNullException(nameof(senderClientId));
@@ -31,5 +29,4 @@ namespace MQTTnet.Server
    public string ReceiverClientId { get; }

    public string SenderClientId { get; }
-    }
 }
@@ -2,17 +2,15 @@
 // 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;
 using System.Net;
-using System.Threading;
 using MQTTnet.Packets;

-namespace MQTTnet.Server
+namespace MQTTnet.Server;
+
+public sealed class InterceptingPacketEventArgs : EventArgs
 {
-    public sealed class InterceptingPacketEventArgs : EventArgs
-    {
-        public InterceptingPacketEventArgs(CancellationToken cancellationToken, string clientId, string userName, EndPoint remoteEndPoint, MqttPacket packet, IDictionary sessionItems)
+    public InterceptingPacketEventArgs(string clientId, string userName, EndPoint remoteEndPoint, MqttPacket packet, IDictionary sessionItems, CancellationToken cancellationToken)
    {
        CancellationToken = cancellationToken;
        ClientId = clientId ?? throw new ArgumentNullException(nameof(clientId));
@@ -60,5 +58,4 @@ namespace MQTTnet.Server
    ///     Gets or sets a key/value collection that can be used to share data within the scope of this session.
    /// </summary>
    public IDictionary SessionItems { get; }
-    }
 }
@@ -2,15 +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 System;
 using System.Collections;
-using System.Threading;

-namespace MQTTnet.Server
+namespace MQTTnet.Server;
+
+public sealed class InterceptingPublishEventArgs : EventArgs
 {
-    public sealed class InterceptingPublishEventArgs : EventArgs
-    {
-        public InterceptingPublishEventArgs(MqttApplicationMessage applicationMessage, CancellationToken cancellationToken, string clientId, string userName, IDictionary sessionItems)
+    public InterceptingPublishEventArgs(MqttApplicationMessage applicationMessage, string clientId, string userName, IDictionary sessionItems, CancellationToken cancellationToken)
    {
        ApplicationMessage = applicationMessage ?? throw new ArgumentNullException(nameof(applicationMessage));
        CancellationToken = cancellationToken;
@@ -32,11 +30,6 @@ namespace MQTTnet.Server
    /// </summary>
    public string ClientId { get; }

-        /// <summary>
-        /// Gets the user name of the client.
-        /// </summary>
-        public string UserName { get; }
-
    public bool CloseConnection { get; set; }

    /// <summary>
@@ -47,11 +40,15 @@ namespace MQTTnet.Server
    /// <summary>
    ///     Gets the response which will be sent to the client via the PUBACK etc. packets.
    /// </summary>
-        public PublishResponse Response { get; } = new PublishResponse();
+    public PublishResponse Response { get; } = new();

    /// <summary>
    ///     Gets or sets a key/value collection that can be used to share data within the scope of this session.
    /// </summary>
    public IDictionary SessionItems { get; }
-    }
+
+    /// <summary>
+    ///     Gets the user name of the client.
+    /// </summary>
+    public string UserName { get; }
 }
@@ -2,23 +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.Collections;
-using System.Collections.Generic;
-using System.Threading;
 using MQTTnet.Packets;

-namespace MQTTnet.Server
+namespace MQTTnet.Server;
+
+public sealed class InterceptingSubscriptionEventArgs : EventArgs
 {
-    public sealed class InterceptingSubscriptionEventArgs : EventArgs
-    {
    public InterceptingSubscriptionEventArgs(
-            CancellationToken cancellationToken,
        string clientId,
        string userName,
        MqttSessionStatus session,
        MqttTopicFilter topicFilter,
-            List<MqttUserProperty> userProperties)
+        List<MqttUserProperty> userProperties,
+        CancellationToken cancellationToken)
    {
        CancellationToken = cancellationToken;
        ClientId = clientId;
@@ -39,11 +36,6 @@ namespace MQTTnet.Server
    /// </summary>
    public string ClientId { get; }

-        /// <summary>
-        /// Gets the user name of the client.
-        /// </summary>
-        public string UserName { get; }
-
    /// <summary>
    ///     Gets or sets whether the broker should close the client connection.
    /// </summary>
@@ -64,7 +56,7 @@ namespace MQTTnet.Server
    /// <summary>
    ///     Gets the response which will be sent to the client via the SUBACK packet.
    /// </summary>
-        public SubscribeResponse Response { get; } = new SubscribeResponse();
+    public SubscribeResponse Response { get; } = new();

    /// <summary>
    ///     Gets the current client session.
@@ -82,10 +74,14 @@ namespace MQTTnet.Server
    /// </summary>
    public MqttTopicFilter TopicFilter { get; set; }

+    /// <summary>
+    ///     Gets the user name of the client.
+    /// </summary>
+    public string UserName { get; }
+
    /// <summary>
    ///     Gets or sets the user properties.
    ///     <remarks>MQTT 5.0.0+ feature.</remarks>
    /// </summary>
    public List<MqttUserProperty> UserProperties { get; set; }
-    }
 }
@@ -2,17 +2,14 @@
 // 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;
-using System.Collections.Generic;
-using System.Threading;
 using MQTTnet.Packets;

-namespace MQTTnet.Server
+namespace MQTTnet.Server;
+
+public sealed class InterceptingUnsubscriptionEventArgs : EventArgs
 {
-    public sealed class InterceptingUnsubscriptionEventArgs : EventArgs
-    {
-        public InterceptingUnsubscriptionEventArgs(CancellationToken cancellationToken, string clientId, string userName, IDictionary sessionItems, string topic, List<MqttUserProperty> userProperties)
+    public InterceptingUnsubscriptionEventArgs(string clientId, string userName, IDictionary sessionItems, string topic, List<MqttUserProperty> userProperties, CancellationToken cancellationToken)
    {
        CancellationToken = cancellationToken;
        ClientId = clientId;
@@ -74,5 +71,4 @@ namespace MQTTnet.Server
    ///     <remarks>MQTT 5.0.0+ feature.</remarks>
    /// </summary>
    public List<MqttUserProperty> UserProperties { get; set; }
-    }
 }
@@ -2,13 +2,9 @@
 // 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;
+namespace MQTTnet.Server;

-namespace MQTTnet.Server
+public sealed class LoadingRetainedMessagesEventArgs : EventArgs
 {
-    public sealed class LoadingRetainedMessagesEventArgs : EventArgs
-    {
    public List<MqttApplicationMessage> LoadedRetainedMessages { get; set; } = new List<MqttApplicationMessage>();
-    }
 }
@@ -2,15 +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 System;
-using System.Collections.Generic;
 using MQTTnet.Packets;
 using MQTTnet.Server.Internal;

-namespace MQTTnet.Server
+namespace MQTTnet.Server;
+
+public sealed class PreparingSessionEventArgs : EventArgs
 {
-    public sealed class PreparingSessionEventArgs : EventArgs
-    {
    public string Id { get; set; }

    // TODO: Allow adding of packets to the queue etc.
@@ -47,5 +45,4 @@ namespace MQTTnet.Server
    // </summary>
    // TODO: Use single properties. No entire will message.
    //MqttApplicationMessage WillMessage { get; set; }
-    }
 }
@@ -2,13 +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.Packets;

-namespace MQTTnet.Server
+namespace MQTTnet.Server;
+
+public sealed class QueueMessageOverwrittenEventArgs : EventArgs
 {
-    public sealed class QueueMessageOverwrittenEventArgs : EventArgs
-    {
    public QueueMessageOverwrittenEventArgs(string receiverClientId, MqttPacket packet)
    {
        ReceiverClientId = receiverClientId ?? throw new ArgumentNullException(nameof(receiverClientId));
@@ -18,5 +17,4 @@ namespace MQTTnet.Server
    public MqttPacket Packet { get; }

    public string ReceiverClientId { get; }
-    }
 }
@@ -2,13 +2,10 @@
 // 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;
+namespace MQTTnet.Server;

-namespace MQTTnet.Server
+public sealed class RetainedMessageChangedEventArgs : EventArgs
 {
-    public sealed class RetainedMessageChangedEventArgs : EventArgs
-    {
    public RetainedMessageChangedEventArgs(string clientId, MqttApplicationMessage changedRetainedMessage, List<MqttApplicationMessage> storedRetainedMessages)
    {
        ClientId = clientId ?? throw new ArgumentNullException(nameof(clientId));
@@ -21,5 +18,4 @@ namespace MQTTnet.Server
    public string ClientId { get; }

    public List<MqttApplicationMessage> StoredRetainedMessages { get; }
-    }
 }
@@ -2,13 +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 System.Collections;

-namespace MQTTnet.Server
+namespace MQTTnet.Server;
+
+public sealed class SessionDeletedEventArgs : EventArgs
 {
-    public sealed class SessionDeletedEventArgs : EventArgs
-    {
    public SessionDeletedEventArgs(string id, string userName, IDictionary sessionItems)
    {
        Id = id ?? throw new ArgumentNullException(nameof(id));
@@ -30,5 +29,4 @@ namespace MQTTnet.Server
    ///     Gets or sets a key/value collection that can be used to share data within the scope of this session.
    /// </summary>
    public IDictionary SessionItems { get; }
-    }
 }
@@ -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.
+
+namespace MQTTnet.Server.Exceptions;
+
+public class MqttPendingMessagesOverflowException : Exception
+{
+    public MqttPendingMessagesOverflowException(string sessionId, MqttPendingMessagesOverflowStrategy overflowStrategy) : base(
+        $"Send buffer max pending messages overflow occurred for session '{sessionId}'. Strategy: {overflowStrategy}.")
+    {
+        SessionId = sessionId;
+        OverflowStrategy = overflowStrategy;
+    }
+
+    public MqttPendingMessagesOverflowStrategy OverflowStrategy { get; }
+
+    public string SessionId { get; }
+}
@@ -8,10 +8,10 @@ using MQTTnet.Adapter;
 using MQTTnet.Diagnostics.Logger;
 using MQTTnet.Internal;

-namespace MQTTnet.Server.Internal.Adapter
+namespace MQTTnet.Server.Internal.Adapter;
+
+public sealed class MqttTcpServerAdapter : IMqttServerAdapter
 {
-    public sealed class MqttTcpServerAdapter : IMqttServerAdapter
-    {
    readonly List<MqttTcpServerListener> _listeners = new List<MqttTcpServerListener>();

    CancellationTokenSource _cancellationTokenSource;
@@ -121,5 +121,4 @@ namespace MQTTnet.Server.Internal.Adapter
            }
        }
    }
-    }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
christian	b477ddbe60	Start using readonly memory	2025-10-22 11:35:56 +02:00
Christian	d74d83453f	Remove unused usings (#2217 )	2025-10-21 13:10:09 +02:00
Christian	99e70fdbbb	Update samples (#2216 ) Separate the topic template samples from the other samples	2025-10-21 12:33:20 +02:00
Christian	535a4e010c	Add validations of variable byte integers (#2214 ) * Add validations and add docs * Update release notes * Fix build	2025-10-20 14:33:50 +02:00
老九andchristian	37c1eecce5	Add Directory.Build.props. (#2120 ) * Add Directory.Build.props. * Adjust Analysis related properties and add conditional enablement for ContinuousIntegrationBuild. * Adopt new changes in master --------- Co-authored-by: christian <6939810+chkr1011@users.noreply.github.com>	2025-10-20 13:32:31 +02:00
Christian	e791d9aba4	Expose local endpoint in channel adapter (#2213 ) * Expose local endpoint * Update release notes	2025-10-19 23:06:36 +02:00
Christian	5ebc5fcb7e	Call enqueue interceptor for retained messages (fix) (#2212 ) * Call the event handler also for retained messages * Update release notes * Add Unit Test	2025-10-19 21:21:47 +02:00
Christian	51979fa5a4	Call enqueue interceptor for retained messages (#2211 ) * Call the event handler also for retained messages * Update release notes	2025-10-19 19:14:33 +02:00
Christian	7ac7f256ef	Update nugets (#2210 ) * Upate nugets, fix breaking changes * Fix CI build	2025-10-17 21:29:46 +02:00
JensNordenbro Jens Nordenbro christian	e7ccd897b0	Use License file from code repo (#2197 ) * Use License file from code repo * Configure all relevant projects * Update release notes * Restore release notes --------- Co-authored-by: Jens Nordenbro <jens.nordenbro@beijerelectronics.com> Co-authored-by: christian <6939810+chkr1011@users.noreply.github.com>	2025-10-17 19:28:45 +02:00
Christian	d5d72ac37d	Enable support for AOT compilation (#2209 ) * Update project files * Update release notes	2025-10-17 19:06:28 +02:00
Christian	a5ef10fddb	Restore strong name (#2208 ) * Restore strong name certificate * Migrate strong name certificate loading to linux. * Fix wrong path * Restore version, update release notes	2025-10-17 19:05:20 +02:00
zhaowgitandChristian	c97bd82334	Issues #2091 Improve the performance of RetainedMessages without subs… (#2093 ) * Issues #2091 Improve the performance of RetainedMessages without subscribing to RetainedMessageChangedEvent. * Fix build errors * Update release notes --------- Co-authored-by: Christian <6939810+chkr1011@users.noreply.github.com>	2025-10-17 19:04:11 +02:00
christian	75ebf116cf	Merge remote-tracking branch 'origin/master'	2025-09-14 10:47:46 +02:00
christian	2f7f55e3f5	Update version	2025-09-14 10:47:32 +02:00
Christian	e43e7f8e36	Use latest language features (#2176 ) * Make use of language features line AsyncDispose, init etc. * Fix build errors * Improve Unit Tests * Improve Unit Tests * Improve Unit Tests * Update samples * Remove obsolete benchmarks * Code cleanup * Improve unit tests * Improve Unit Tests * Fix Unit Tests * Improve Unit Tests * Improve Unit Tests * Restore unit tests * Exclude load tests from unit tests	2025-08-30 10:52:59 +02:00
timyhac	247988e633	Remove "MQTTv5 only" in documentation comments for `MqttClientConnectResult.IsSessionPresent` and `MqttClientConnectResult.ResultCode` (#2166 ) * Remove "MQTTv5" from documentation comments for `IsSessionPresent` As far as I can tell, this is available for MQTT v3.1.1 References: * [OASIS Standard](https://docs.oasis-open.org/mqtt/mqtt/v3.1.1/os/mqtt-v3.1.1-os.html#_Toc398718035) * [MQTTnet source code](https://github.com/dotnet/MQTTnet/blob/93a9d8d1dbe8dde2b7d79a37c873fae13b4f4797/Source/MQTTnet/Connecting/MqttClientConnectResultFactory.cs#L75) * Remove "MQTTv5 only" for `ResultCode`	2025-03-29 19:11:53 +01:00
Youssef Victor	93a9d8d1db	Move to MTP (#2163 )	2025-03-02 11:59:33 +01:00
Christian	24c418cf43	Update README.md	2025-01-07 18:57:58 +01:00
Lucas Tandchristian	948c7c2b69	Corrected Cancellation Source for KeepAlive Messages (#2129 ) * Corrected Cancellation Source for KeepAlive Messages * Use half of the keep alive value for the ping timeout * Update release notes * Update ReleaseNotes.md * Update ReleaseNotes.md * Update ReleaseNotes.md --------- Co-authored-by: christian <6939810+chkr1011@users.noreply.github.com>	2025-01-02 12:17:05 +01:00
christian	1cdc343e6d	Update release notes	2025-01-02 12:11:57 +01:00
Anton Smolkov Anton Smolkov christian	27771f0146	Improve session message injection (#2117 ) * Improve session message injection methods * Add more tests for session injection * Change return type from MqttPublishPacket to MqttPacketWithIdentifier * Use dedicated type for MattApplicationMessage injection result * Code review minor fixes * Apply project code style * Update release notes --------- Co-authored-by: Anton Smolkov <anton.smolkov@idp.zyfra.com> Co-authored-by: christian <6939810+chkr1011@users.noreply.github.com>	2025-01-02 11:51:46 +01:00
christian	e7de2b913a	Increase version	2025-01-02 11:34:14 +01:00
christian	3dd3279656	Fix missing release notes in nuget package	2025-01-02 11:34:08 +01:00
christian	c5934bf18b	Reset release notes	2025-01-02 11:22:19 +01:00