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>

Directory.Build.props

@@ -1,9 +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>
 
-  <PropertyGroup>
+        <DelaySign>false</DelaySign>
-    <TestingPlatformShowTestsFailure>true</TestingPlatformShowTestsFailure>
+        <SignAssembly>false</SignAssembly>
-    <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
+        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <EnableMSTestRunner>true</EnableMSTestRunner>
+        <EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
-  </PropertyGroup>
+        <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>

MQTTnet.sln

@@ -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

Samples/Client/Client_Connection_Samples.cs

@@ -490,7 +490,7 @@ m/XriWr/Cq4h/JfB7NTsezVslgkBaoU=
         }
     }
 
-    class SampleClientKerberosAuthenticationHandler : IMqttEnhancedAuthenticationHandler
+    sealed class SampleClientKerberosAuthenticationHandler : IMqttEnhancedAuthenticationHandler
     {
         public async Task HandleEnhancedAuthenticationAsync(MqttEnhancedAuthenticationEventArgs eventArgs)
         {

Samples/Client/Client_Subscribe_Samples.cs

@@ -142,7 +142,7 @@ public static class Client_Subscribe_Samples
         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
@@ -170,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:

Samples/Diagnostics/Logger_Samples.cs

@@ -6,6 +6,7 @@
 // ReSharper disable UnusedMember.Global
 // ReSharper disable InconsistentNaming
 
+using System.Globalization;
 using System.Text;
 using MQTTnet.Diagnostics.Logger;
 
@@ -51,7 +52,7 @@ public static class Logger_Samples
         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());

Samples/Helpers/ObjectExtensions.cs

@@ -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
+            output = JsonSerializer.Serialize(@object, SerializerOptions);
-            {
-                WriteIndented = true
-            });
         }
 
         Console.WriteLine($"[{@object?.GetType().Name}]:\r\n{output}");

Samples/MQTTnet.Samples.csproj

@@ -2,19 +2,10 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <IsPackable>false</IsPackable>
-        <DisableImplicitAspNetCoreAnalyzers>true</DisableImplicitAspNetCoreAnalyzers>
+        <NoWarn>$(NoWarn);CA1707</NoWarn>
-        <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>
     </PropertyGroup>
 
     <ItemGroup>

Samples/Program.cs

@@ -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();

Samples/Server/Server_ASP_NET_Samples.cs

@@ -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.ValidatingConnectionAsync += MqttController.ValidateConnection;
-                    server.ClientConnectedAsync += mqttController.OnClientConnected;
+                    server.ClientConnectedAsync += MqttController.OnClientConnected;
                 });
         }
 
+        [SuppressMessage("Performance", "CA1822:Mark members as static")]
         public void ConfigureServices(IServiceCollection services)
         {
             services.AddHostedMqttServer(

Samples/Server/Server_Simple_Samples.cs

@@ -6,6 +6,7 @@
 // ReSharper disable UnusedMember.Global
 // ReSharper disable InconsistentNaming
 
+using System.Globalization;
 using MQTTnet.Diagnostics.Logger;
 using MQTTnet.Protocol;
 using MQTTnet.Server;
@@ -161,7 +162,7 @@ public static class Server_Simple_Samples
         return server;
     }
 
-    class ConsoleLogger : IMqttNetLogger
+    sealed class ConsoleLogger : IMqttNetLogger
     {
         readonly object _consoleSyncRoot = new();
 
@@ -191,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)

Source/MQTTnet.AspTestApp/MQTTnet.AspTestApp.csproj

@@ -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>
+        <NoWarn>$(NoWarn);CA1707</NoWarn>
-        <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>
     </PropertyGroup>
 
     <ItemGroup>

Source/MQTTnet.AspTestApp/Pages/Index.cshtml.cs

@@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
 
 namespace MQTTnet.AspTestApp.Pages;
 
-public class IndexModel : PageModel
+public partial class IndexModel : PageModel
 {
     readonly ILogger<IndexModel> _logger;
 
@@ -17,6 +17,9 @@ public class IndexModel : PageModel
 
     public void OnGet()
     {
-        _logger.LogDebug("OnGet");
+        LogOnGet();
     }
+
+    [LoggerMessage(Level = LogLevel.Information, Message = "OnGet")]
+    private partial void LogOnGet();
 }

Source/MQTTnet.AspnetCore/MQTTnet.AspNetCore.csproj

@@ -1,59 +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>
-        <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>
-        <PackageLicenseFile>LICENSE</PackageLicenseFile>
-        <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>
         <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>
+        <PackageId>MQTTnet.AspNetCore</PackageId>
+        <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>
+        <PackageReleaseNotes>For release notes please go to MQTTnet release notes (https://www.nuget.org/packages/MQTTnet/).</PackageReleaseNotes>
+
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
     </PropertyGroup>
 
     <ItemGroup>
-        <None Include="..\..\Images\nuget.png" Pack="true" PackagePath="" />
-        <None Include="..\..\LICENSE" Pack="true" PackagePath="" />
-    </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"/>

Source/MQTTnet.AspnetCore/MqttClientConnectionContextFactory.cs

@@ -13,7 +13,7 @@ public sealed class MqttClientConnectionContextFactory : IMqttClientAdapterFacto
 {
     public IMqttChannelAdapter CreateClientAdapter(MqttClientOptions options, MqttPacketInspector packetInspector, IMqttNetLogger logger)
     {
-        if (options == null) throw new ArgumentNullException(nameof(options));
+        ArgumentNullException.ThrowIfNull(options);
 
         switch (options.ChannelOptions)
         {

Source/MQTTnet.AspnetCore/MqttSubProtocolSelector.cs

@@ -29,6 +29,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));
     }
 }

Source/MQTTnet.AspnetCore/SocketConnection.cs

@@ -81,7 +81,7 @@ public sealed class SocketConnection : ConnectionContext
         IsConnected = true;
     }
 
-    static Exception ConnectionAborted()
+    static MqttCommunicationException ConnectionAborted()
     {
         return new MqttCommunicationException("Connection Aborted");
     }
@@ -218,12 +218,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

Source/MQTTnet.AspnetCore/SocketReceiver.cs

@@ -8,7 +8,7 @@ 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 +33,9 @@ public sealed class SocketReceiver
 
         return _awaitable;
     }
+
+    public void Dispose()
+    {
+        _eventArgs.Dispose();
+    }
 }

Source/MQTTnet.AspnetCore/SocketSender.cs

@@ -12,7 +12,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 +28,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)

Source/MQTTnet.Benchmarks/AsyncLockBenchmark.cs

@@ -43,7 +43,7 @@ public class AsyncLockBenchmark : BaseBenchmark
 
         if (globalI != tasksCount)
         {
-            throw new Exception($"Code is broken ({globalI})!");
+            throw new InvalidOperationException($"Code is broken ({globalI})!");
         }
     }
 

Source/MQTTnet.Benchmarks/ChannelAdapterBenchmark.cs

@@ -15,7 +15,7 @@ using MQTTnet.Tests.Mockups;
 namespace MQTTnet.Benchmarks;
 
 [MemoryDiagnoser]
-public sealed class ChannelAdapterBenchmark : BaseBenchmark
+public sealed class ChannelAdapterBenchmark : BaseBenchmark, IDisposable
 {
     MqttChannelAdapter _channelAdapter;
     int _iterations;
@@ -86,4 +86,10 @@ public sealed class ChannelAdapterBenchmark : BaseBenchmark
 
         return buffer.ToArray();
     }
+
+    public void Dispose()
+    {
+        _channelAdapter?.Dispose();
+        _stream?.Dispose();
+    }
 }

Source/MQTTnet.Benchmarks/MQTTnet.Benchmarks.csproj

@@ -1,20 +1,11 @@
 <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>
+        <NoWarn>$(NoWarn);CS8892;CA1707;CA1051;CA1822</NoWarn>
-        <EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
-        <DisableImplicitAspNetCoreAnalyzers>true</DisableImplicitAspNetCoreAnalyzers>
-        <NoWarn>1591;NETSDK1138;NU1803;NU1901;NU1902;CS8892</NoWarn>
         <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-        <NuGetAuditMode>all</NuGetAuditMode>
-        <NuGetAudit>true</NuGetAudit>
-        <NuGetAuditLevel>low</NuGetAuditLevel>
-        <AnalysisLevel>latest-Recommended</AnalysisLevel>
     </PropertyGroup>
 
     <ItemGroup>

Source/MQTTnet.Benchmarks/MessageDeliveryBenchmark.cs

@@ -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 BenchmarkDotNet.Attributes;
 using MQTTnet.Packets;
 using MQTTnet.Server;
@@ -13,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;
@@ -99,10 +95,16 @@ public class MessageDeliveryBenchmark : BaseBenchmark
 
         if (_messagesReceivedCount < _messagesExpectedCount)
         {
-            throw new Exception($"Messages Received Count mismatch, expected {_messagesExpectedCount}, received {_messagesReceivedCount}");
+            throw new InvalidOperationException($"Messages Received Count mismatch, expected {_messagesExpectedCount}, received {_messagesReceivedCount}");
         }
     }
 
+    public void Dispose()
+    {
+        _cancellationTokenSource?.Dispose();
+        _mqttServer?.Dispose();
+    }
+
     [GlobalSetup]
     public void Setup()
     {
@@ -173,7 +175,7 @@ public class MessageDeliveryBenchmark : BaseBenchmark
         var topicIndexStep = totalNumTopics / (_numSubscribedTopicsPerSubscriber * _numSubscribers);
         if (topicIndexStep * _numSubscribedTopicsPerSubscriber * _numSubscribers != totalNumTopics)
         {
-            throw new Exception(
+            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}");
         }
 

Source/MQTTnet.Benchmarks/MqttTcpChannelBenchmark.cs

@@ -4,8 +4,6 @@
 
 using System.Buffers;
 using System.Reflection;
-using System.Threading;
-using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Jobs;
 using MQTTnet.Channel;
@@ -18,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;
 
@@ -84,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();
+    }
 }

Source/MQTTnet.Benchmarks/Program.cs

@@ -92,7 +92,7 @@ public static class Program
             return;
         }
 
-        _selectedBenchmarkIndex = _benchmarks.FindIndex(b => b.Name.Equals(arguments[0]));
+        _selectedBenchmarkIndex = _benchmarks.FindIndex(b => b.Name.Equals(arguments[0], StringComparison.Ordinal));
 
         if (_selectedBenchmarkIndex < 0)
         {

Source/MQTTnet.Benchmarks/ReaderExtensionsBenchmark.cs

@@ -13,7 +13,7 @@ namespace MQTTnet.Benchmarks;
 [SimpleJob(RuntimeMoniker.Net60)]
 [RPlotExporter, RankColumn]
 [MemoryDiagnoser]
-public class ReaderExtensionsBenchmark
+public sealed class ReaderExtensionsBenchmark : IDisposable, IAsyncDisposable
 {
     MqttPacketFormatterAdapter _mqttPacketFormatter;
     MemoryStream _stream;
@@ -83,4 +83,17 @@ public class ReaderExtensionsBenchmark
             }
         }
     }
+
+    public void Dispose()
+    {
+        _stream?.Dispose();
+    }
+
+    public async ValueTask DisposeAsync()
+    {
+        if (_stream != null)
+        {
+            await _stream.DisposeAsync();
+        }
+    }
 }

Source/MQTTnet.Benchmarks/SendPacketAsyncBenchmark.cs

@@ -1,39 +1,19 @@
+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;
 
 [SimpleJob(RuntimeMoniker.Net60)]
-[RPlotExporter, RankColumn]
+[RPlotExporter]
+[RankColumn]
 [MemoryDiagnoser]
-public class SendPacketAsyncBenchmark : BaseBenchmark
+public sealed class SendPacketAsyncBenchmark : BaseBenchmark, IDisposable, IAsyncDisposable
 {
-    MemoryStream _stream;
     MqttPacketBuffer _buffer;
-
+    MemoryStream _stream;
-    [GlobalSetup]
-    public void GlobalSetup()
-    {
-        _stream = new MemoryStream(1024);
-        var packet = new ArraySegment<byte>(new byte[10]);
-        _buffer = new MqttPacketBuffer(packet);
-    }
-
-    [Benchmark(Baseline = true)]
-    public async ValueTask Before()
-    {
-        _stream.Position = 0;
-        var output = PipeWriter.Create(_stream);
-
-        WritePacketBuffer(output, _buffer);
-        await output.FlushAsync();
-    }
 
     [Benchmark]
     public async ValueTask After()
@@ -52,6 +32,37 @@ public class SendPacketAsyncBenchmark : BaseBenchmark
         }
     }
 
+    [Benchmark(Baseline = true)]
+    public async ValueTask Before()
+    {
+        _stream.Position = 0;
+        var output = PipeWriter.Create(_stream);
+
+        WritePacketBuffer(output, _buffer);
+        await output.FlushAsync();
+    }
+
+    public void Dispose()
+    {
+        _stream?.Dispose();
+    }
+
+    public async ValueTask DisposeAsync()
+    {
+        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)
     {
         // copy MqttPacketBuffer's Packet and Payload to the same buffer block of PipeWriter

Source/MQTTnet.Benchmarks/SerializerBenchmark.cs

@@ -26,7 +26,7 @@ public class SerializerBenchmark : BaseBenchmark
 {
     MqttPacket _packet;
     ArraySegment<byte> _serializedPacket;
-    IMqttPacketFormatter _serializer;
+    MqttV3PacketFormatter _serializer;
     MqttBufferWriter _bufferWriter;
 
     [GlobalSetup]
@@ -43,7 +43,7 @@ public class SerializerBenchmark : BaseBenchmark
     }
 
     [Benchmark]
-    public void Serialize_10000_Messages()
+    public void Serialize10000Messages()
     {
         for (var i = 0; i < 10000; i++)
         {
@@ -53,7 +53,7 @@ public class SerializerBenchmark : BaseBenchmark
     }
 
     [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());
@@ -66,7 +66,7 @@ public class SerializerBenchmark : BaseBenchmark
         }
     }
 
-    class BenchmarkMqttChannel : IMqttChannel
+    sealed class BenchmarkMqttChannel : IMqttChannel
     {
         readonly ArraySegment<byte> _buffer;
         int _position;
@@ -81,7 +81,7 @@ public class SerializerBenchmark : BaseBenchmark
 
         public EndPoint LocalEndPoint { get; set; }
 
-        public bool IsSecureConnection { get; } = false;
+        public bool IsSecureConnection { get; }
 
         public X509Certificate2 ClientCertificate { get; set; }
 

Source/MQTTnet.Extensions.Rpc/DefaultMqttRpcClientTopicGenerationStrategy.cs

@@ -12,7 +12,7 @@ public sealed class DefaultMqttRpcClientTopicGenerationStrategy : IMqttRpcClient
     {
         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 #.");
         }

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

@@ -1,53 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
         <AssemblyName>MQTTnet.Extensions.Rpc</AssemblyName>
         <RootNamespace>MQTTnet.Extensions.Rpc</RootNamespace>
-        <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-        <Company>The contributors of MQTTnet</Company>
-        <Product>MQTTnet</Product>
-        <Description>This is an extension library which allows executing synchronous device calls including a response using MQTTnet.</Description>
-        <Authors>The contributors of MQTTnet</Authors>
-        <PackageId>MQTTnet.Extensions.Rpc</PackageId>
-        <SignAssembly>false</SignAssembly>
-        <DelaySign>false</DelaySign>
-        <PublishRepositoryUrl>true</PublishRepositoryUrl>
-        <IncludeSymbols>true</IncludeSymbols>
-        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-        <Copyright>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>
-        <PackageLicenseFile>LICENSE</PackageLicenseFile>
-        <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>
         <IsAotCompatible>true</IsAotCompatible>
+
+        <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+        <Description>This is an extension library which allows executing synchronous device calls including a response using MQTTnet.</Description>
+        <PackageId>MQTTnet.Extensions.Rpc</PackageId>
+        <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>
+        <EmbedUntrackedSources>true</EmbedUntrackedSources>
+        <PackageReleaseNotes>For release notes please go to MQTTnet release notes (https://www.nuget.org/packages/MQTTnet/).</PackageReleaseNotes>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
     </PropertyGroup>
 
-    <ItemGroup>
-        <None Include="..\..\Images\nuget.png" Pack="true" PackagePath="" />
-        <None Include="..\..\LICENSE" Pack="true" PackagePath="" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
-    </ItemGroup>
-
     <ItemGroup>
         <ProjectReference Include="..\MQTTnet\MQTTnet.csproj"/>
     </ItemGroup>

Source/MQTTnet.Extensions.Rpc/MqttRpcClientExtensions.cs

@@ -14,7 +14,7 @@ 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);
 

Source/MQTTnet.Extensions.TopicTemplate/MQTTnet.Extensions.TopicTemplate.csproj

@@ -1,54 +1,24 @@
 <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>
-        <PackageLicenseFile>LICENSE</PackageLicenseFile>
         <PackageReleaseNotes>For release notes please go to MQTTnet release notes (https://www.nuget.org/packages/MQTTnet/).</PackageReleaseNotes>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <NoWarn>1591;NETSDK1138</NoWarn>
+
-        <IsAotCompatible>true</IsAotCompatible>
     </PropertyGroup>
 
     <ItemGroup>
-        <None Include="README.md">
-            <Pack>True</Pack>
-            <PackagePath>\</PackagePath>
-        </None>
-    </ItemGroup>
-
-    <ItemGroup>
-        <None Include="..\..\Images\nuget.png" Pack="true" PackagePath="" />
-        <None Include="..\..\LICENSE" Pack="true" PackagePath="" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
         <PackageReference Include="System.ValueTuple" Version="4.6.1" />
     </ItemGroup>
 

Source/MQTTnet.Extensions.TopicTemplate/MqttTopicTemplate.cs

@@ -84,13 +84,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 +161,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;
         }

Source/MQTTnet.Server/EnhancedAuthentication/ExchangeEnhancedAuthenticationOptionsFactory.cs

@@ -53,10 +53,7 @@ public sealed class ExchangeEnhancedAuthenticationOptionsFactory
 
     public ExchangeEnhancedAuthenticationOptionsFactory WithUserProperty(string name, string value)
     {
-        if (name == null)
+        ArgumentNullException.ThrowIfNull(name);
-        {
-            throw new ArgumentNullException(nameof(name));
-        }
 
         if (_options.UserProperties == null)
         {

Source/MQTTnet.Server/Events/InterceptingPacketEventArgs.cs

@@ -10,7 +10,7 @@ namespace MQTTnet.Server;
 
 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));

Source/MQTTnet.Server/Events/InterceptingPublishEventArgs.cs

@@ -8,7 +8,7 @@ namespace MQTTnet.Server;
 
 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;
@@ -30,11 +30,6 @@ public sealed class InterceptingPublishEventArgs : EventArgs
     /// </summary>
     public string ClientId { get; }
 
-    /// <summary>
-    /// Gets the user name of the client.
-    /// </summary>
-    public string UserName { get; }
-
     public bool CloseConnection { get; set; }
 
     /// <summary>
@@ -45,10 +40,15 @@ public sealed class InterceptingPublishEventArgs : EventArgs
     /// <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; }
 }

Source/MQTTnet.Server/Events/InterceptingSubscriptionEventArgs.cs

@@ -10,12 +10,12 @@ namespace MQTTnet.Server;
 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;
@@ -36,11 +36,6 @@ public sealed class InterceptingSubscriptionEventArgs : EventArgs
     /// </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>
@@ -61,7 +56,7 @@ public sealed class InterceptingSubscriptionEventArgs : EventArgs
     /// <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.
@@ -79,6 +74,11 @@ public sealed class InterceptingSubscriptionEventArgs : EventArgs
     /// </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>

Source/MQTTnet.Server/Events/InterceptingUnsubscriptionEventArgs.cs

@@ -9,7 +9,7 @@ namespace MQTTnet.Server;
 
 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;

Source/MQTTnet.Server/Internal/MqttClientSessionsManager.cs

@@ -131,7 +131,7 @@ public sealed class MqttClientSessionsManager : ISubscriptionChangedNotification
         // Allow the user to intercept application message...
         if (_eventContainer.InterceptingPublishEvent.HasHandlers)
         {
-            var interceptingPublishEventArgs = new InterceptingPublishEventArgs(applicationMessage, cancellationToken, senderId, senderUserName, senderSessionItems);
+            var interceptingPublishEventArgs = new InterceptingPublishEventArgs(applicationMessage, senderId, senderUserName, senderSessionItems, cancellationToken);
             if (string.IsNullOrEmpty(interceptingPublishEventArgs.ApplicationMessage.Topic))
             {
                 // This can happen if a topic alias us used but the topic is
@@ -437,7 +437,7 @@ public sealed class MqttClientSessionsManager : ISubscriptionChangedNotification
         }
     }
 
-    public void OnSubscriptionsAdded(MqttSession clientSession, List<string> topics)
+    public void OnSubscriptionsAdded(MqttSession clientSession, List<string> subscriptionsTopics)
     {
         _sessionsManagementLock.EnterWriteLock();
         try
@@ -448,7 +448,7 @@ public sealed class MqttClientSessionsManager : ISubscriptionChangedNotification
                 _subscriberSessions.Add(clientSession);
             }
 
-            foreach (var topic in topics)
+            foreach (var topic in subscriptionsTopics)
             {
                 clientSession.AddSubscribedTopic(topic);
             }

Source/MQTTnet.Server/Internal/MqttClientSubscriptionsManager.cs

@@ -81,7 +81,7 @@ public sealed class MqttClientSubscriptionsManager : IDisposable
             return CheckSubscriptionsResult.NotSubscribed;
         }
 
-        var senderIsReceiver = string.Equals(senderId, _session.Id);
+        var senderIsReceiver = string.Equals(senderId, _session.Id, StringComparison.Ordinal);
         var maxQoSLevel = -1; // Not subscribed.
 
         HashSet<uint> subscriptionIdentifiers = null;
@@ -460,7 +460,7 @@ public sealed class MqttClientSubscriptionsManager : IDisposable
         List<MqttUserProperty> userProperties,
         CancellationToken cancellationToken)
     {
-        var eventArgs = new InterceptingSubscriptionEventArgs(cancellationToken, _session.Id, _session.UserName, new MqttSessionStatus(_session), topicFilter, userProperties);
+        var eventArgs = new InterceptingSubscriptionEventArgs(_session.Id, _session.UserName, new MqttSessionStatus(_session), topicFilter, userProperties, cancellationToken);
 
         if (topicFilter.QualityOfServiceLevel == MqttQualityOfServiceLevel.AtMostOnce)
         {
@@ -475,7 +475,7 @@ public sealed class MqttClientSubscriptionsManager : IDisposable
             eventArgs.Response.ReasonCode = MqttSubscribeReasonCode.GrantedQoS2;
         }
 
-        if (topicFilter.Topic.StartsWith("$share/"))
+        if (topicFilter.Topic.StartsWith("$share/", StringComparison.InvariantCulture))
         {
             eventArgs.Response.ReasonCode = MqttSubscribeReasonCode.SharedSubscriptionsNotSupported;
         }
@@ -493,7 +493,7 @@ public sealed class MqttClientSubscriptionsManager : IDisposable
         List<MqttUserProperty> userProperties,
         CancellationToken cancellationToken)
     {
-        var clientUnsubscribingTopicEventArgs = new InterceptingUnsubscriptionEventArgs(cancellationToken, _session.Id, _session.UserName, _session.Items, topicFilter, userProperties)
+        var clientUnsubscribingTopicEventArgs = new InterceptingUnsubscriptionEventArgs(_session.Id, _session.UserName, _session.Items, topicFilter, userProperties, cancellationToken)
         {
             Response =
             {

Source/MQTTnet.Server/Internal/MqttConnectedClient.cs

@@ -156,7 +156,7 @@ public sealed class MqttConnectedClient : IDisposable
                 // TODO: Maybe adding a configuration option is requested in the future.
                 if (disconnectOptions != null)
                 {
-                    if (disconnectOptions.ReasonCode != MqttDisconnectReasonCode.NormalDisconnection || disconnectOptions.UserProperties?.Any() == true ||
+                    if (disconnectOptions.ReasonCode != MqttDisconnectReasonCode.NormalDisconnection || disconnectOptions.UserProperties?.Count > 0 ||
                         !string.IsNullOrEmpty(disconnectOptions.ReasonString) || !string.IsNullOrEmpty(disconnectOptions.ServerReference))
                     {
                         // It is very important to send the DISCONNECT packet here BEFORE cancelling the
@@ -349,7 +349,7 @@ public sealed class MqttConnectedClient : IDisposable
             return packet;
         }
 
-        var interceptingPacketEventArgs = new InterceptingPacketEventArgs(cancellationToken, Id, UserName, RemoteEndPoint, packet, Session.Items);
+        var interceptingPacketEventArgs = new InterceptingPacketEventArgs(Id, UserName, RemoteEndPoint, packet, Session.Items, cancellationToken);
         await _eventContainer.InterceptingOutboundPacketEvent.InvokeAsync(interceptingPacketEventArgs).ConfigureAwait(false);
 
         if (!interceptingPacketEventArgs.ProcessPacket || packet == null)
@@ -395,7 +395,7 @@ public sealed class MqttConnectedClient : IDisposable
 
                 if (_eventContainer.InterceptingInboundPacketEvent.HasHandlers)
                 {
-                    var interceptingPacketEventArgs = new InterceptingPacketEventArgs(cancellationToken, Id, UserName, RemoteEndPoint, currentPacket, Session.Items);
+                    var interceptingPacketEventArgs = new InterceptingPacketEventArgs(Id, UserName, RemoteEndPoint, currentPacket, Session.Items, cancellationToken);
                     await _eventContainer.InterceptingInboundPacketEvent.InvokeAsync(interceptingPacketEventArgs).ConfigureAwait(false);
                     currentPacket = interceptingPacketEventArgs.Packet;
                     processPacket = interceptingPacketEventArgs.ProcessPacket;

Source/MQTTnet.Server/Internal/MqttRetainedMessagesManager.cs

@@ -7,13 +7,12 @@ using MQTTnet.Internal;
 
 namespace MQTTnet.Server.Internal;
 
-public sealed class MqttRetainedMessagesManager
+public sealed class MqttRetainedMessagesManager : IDisposable
 {
-    readonly Dictionary<string, MqttApplicationMessage> _messages = new(4096);
-    readonly AsyncLock _storageAccessLock = new();
-
     readonly MqttServerEventContainer _eventContainer;
     readonly MqttNetSourceLogger _logger;
+    readonly Dictionary<string, MqttApplicationMessage> _messages = new(4096);
+    readonly AsyncLock _storageAccessLock = new();
 
     public MqttRetainedMessagesManager(MqttServerEventContainer eventContainer, IMqttNetLogger logger)
     {
@@ -24,6 +23,46 @@ public sealed class MqttRetainedMessagesManager
         _logger = logger.WithSource(nameof(MqttRetainedMessagesManager));
     }
 
+    public async Task ClearMessages()
+    {
+        lock (_messages)
+        {
+            _messages.Clear();
+        }
+
+        using (await _storageAccessLock.EnterAsync().ConfigureAwait(false))
+        {
+            await _eventContainer.RetainedMessagesClearedEvent.InvokeAsync(EventArgs.Empty).ConfigureAwait(false);
+        }
+    }
+
+    public void Dispose()
+    {
+        _storageAccessLock.Dispose();
+    }
+
+    public Task<MqttApplicationMessage> GetMessage(string topic)
+    {
+        lock (_messages)
+        {
+            if (_messages.TryGetValue(topic, out var message))
+            {
+                return Task.FromResult(message);
+            }
+        }
+
+        return Task.FromResult<MqttApplicationMessage>(null);
+    }
+
+    public Task<IList<MqttApplicationMessage>> GetMessages()
+    {
+        lock (_messages)
+        {
+            var result = new List<MqttApplicationMessage>(_messages.Values);
+            return Task.FromResult((IList<MqttApplicationMessage>)result);
+        }
+    }
+
     public async Task Start()
     {
         try
@@ -79,8 +118,7 @@ public sealed class MqttRetainedMessagesManager
                     }
                     else
                     {
-                        if (existingMessage.QualityOfServiceLevel != applicationMessage.QualityOfServiceLevel ||
+                        if (existingMessage.QualityOfServiceLevel != applicationMessage.QualityOfServiceLevel || !MqttMemoryHelper.SequenceEqual(existingMessage.Payload, payload))
-                            !MqttMemoryHelper.SequenceEqual(existingMessage.Payload, payload))
                         {
                             _messages[applicationMessage.Topic] = applicationMessage;
                             saveIsRequired = true;
@@ -113,39 +151,4 @@ public sealed class MqttRetainedMessagesManager
             _logger.Error(exception, "Unhandled exception while handling retained messages.");
         }
     }
-
-    public Task<IList<MqttApplicationMessage>> GetMessages()
-    {
-        lock (_messages)
-        {
-            var result = new List<MqttApplicationMessage>(_messages.Values);
-            return Task.FromResult((IList<MqttApplicationMessage>)result);
-        }
-    }
-
-    public Task<MqttApplicationMessage> GetMessage(string topic)
-    {
-        lock (_messages)
-        {
-            if (_messages.TryGetValue(topic, out var message))
-            {
-                return Task.FromResult(message);
-            }
-        }
-
-        return Task.FromResult<MqttApplicationMessage>(null);
-    }
-
-    public async Task ClearMessages()
-    {
-        lock (_messages)
-        {
-            _messages.Clear();
-        }
-
-        using (await _storageAccessLock.EnterAsync().ConfigureAwait(false))
-        {
-            await _eventContainer.RetainedMessagesClearedEvent.InvokeAsync(EventArgs.Empty).ConfigureAwait(false);
-        }
-    }
 }

Source/MQTTnet.Server/MQTTnet.Server.csproj

@@ -1,56 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
         <AssemblyName>MQTTnet.Server</AssemblyName>
         <RootNamespace>MQTTnet.Server</RootNamespace>
+        <IsAotCompatible>true</IsAotCompatible>
+
         <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-        <Company>The contributors of MQTTnet</Company>
-        <Product>MQTTnet</Product>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <Description>This is the server implementation of MQTTnet.</Description>
-        <Authors>The contributors of MQTTnet</Authors>
         <PackageId>MQTTnet.Server</PackageId>
-        <DelaySign>false</DelaySign>
-        <SignAssembly>false</SignAssembly>
-        <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>
-        <PackageLicenseFile>LICENSE</PackageLicenseFile>
-        <DisableImplicitAspNetCoreAnalyzers>true</DisableImplicitAspNetCoreAnalyzers>
-        <NoWarn>1591;NETSDK1138;NU1803;NU1901;NU1902</NoWarn>
-        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <NuGetAuditMode>all</NuGetAuditMode>
-        <NuGetAudit>true</NuGetAudit>
-        <NuGetAuditLevel>low</NuGetAuditLevel>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>disable</Nullable>
-        <AnalysisLevel>latest-Recommended</AnalysisLevel>
-        <IsAotCompatible>true</IsAotCompatible>
     </PropertyGroup>
 
     <ItemGroup>
         <ProjectReference Include="..\MQTTnet\MQTTnet.csproj"/>
     </ItemGroup>
 
-    <ItemGroup>
-        <None Include="..\..\Images\nuget.png" Pack="true" PackagePath="" />
-        <None Include="..\..\LICENSE" Pack="true" PackagePath="" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
-    </ItemGroup>
-
 </Project>

Source/MQTTnet.Server/MqttServerFactory.cs

@@ -2,12 +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.Diagnostics.CodeAnalysis;
 using MQTTnet.Diagnostics.Logger;
 using MQTTnet.Server.EnhancedAuthentication;
 using MQTTnet.Server.Internal.Adapter;
 
 namespace MQTTnet.Server;
 
+[SuppressMessage("Performance", "CA1822:Mark members as static")]
 public sealed class MqttServerFactory
 {
     public MqttServerFactory() : this(new MqttNetNullLogger())

Source/MQTTnet.TestApp/AsyncLockTest.cs

@@ -11,7 +11,7 @@ namespace MQTTnet.TestApp;
 
 public sealed class AsyncLockTest
 {
-    public async Task Run()
+    public static async Task Run()
     {
         try
         {

Source/MQTTnet.TestApp/MQTTnet.TestApp.csproj

@@ -3,17 +3,7 @@
     <PropertyGroup>
         <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</NoWarn>
-        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <NuGetAuditMode>all</NuGetAuditMode>
-        <NuGetAudit>true</NuGetAudit>
-        <NuGetAuditLevel>low</NuGetAuditLevel>
-        <AnalysisLevel>latest-Recommended</AnalysisLevel>
     </PropertyGroup>
 
     <ItemGroup>

Source/MQTTnet.TestApp/MessageThroughputTest.cs

@@ -14,7 +14,7 @@ namespace MQTTnet.TestApp;
 /// the number of messages per second that can be exchanged between publishers and subscriber.
 /// Measurements are performed for subscriptions containing no wildcard, a single wildcard or multiple wildcards.
 /// </summary>
-public class MessageThroughputTest
+public sealed class MessageThroughputTest : IDisposable
 {
     // Change these constants to suit
     const int NumPublishers = 5000;
@@ -55,9 +55,9 @@ public class MessageThroughputTest
 
             await Setup();
 
-            await Subscribe_to_No_Wildcard_Topics();
+            await SubscribeToNoWildcardTopics();
-            await Subscribe_to_Single_Wildcard_Topics();
+            await SubscribeToSingleWildcardTopics();
-            await Subscribe_to_Multi_Wildcard_Topics();
+            await SubscribeToMultiWildcardTopics();
 
             Console.WriteLine();
             Console.WriteLine("End message throughput test");
@@ -74,7 +74,7 @@ public class MessageThroughputTest
 
     public async Task Setup()
     {
-        new TopicGenerator().Generate(NumPublishers, NumTopicsPerPublisher, out _topicsByPublisher, out _singleWildcardTopicsByPublisher, out _multiWildcardTopicsByPublisher);
+        TopicGenerator.Generate(NumPublishers, NumTopicsPerPublisher, out _topicsByPublisher, out _singleWildcardTopicsByPublisher, out _multiWildcardTopicsByPublisher);
 
         var serverOptions = new MqttServerOptionsBuilder().WithDefaultEndpoint().Build();
         var mqttClientFactory = new MqttClientFactory();
@@ -152,7 +152,7 @@ public class MessageThroughputTest
     /// <summary>
     /// Measure no-wildcard topic subscription message exchange performance
     /// </summary>
-    public Task Subscribe_to_No_Wildcard_Topics()
+    public Task SubscribeToNoWildcardTopics()
     {
         return ProcessMessages(_topicsByPublisher, "no wildcards");
     }
@@ -160,7 +160,7 @@ public class MessageThroughputTest
     /// <summary>
     /// Measure single-wildcard topic subscription message exchange performance
     /// </summary>
-    public Task Subscribe_to_Single_Wildcard_Topics()
+    public Task SubscribeToSingleWildcardTopics()
     {
         return ProcessMessages(_singleWildcardTopicsByPublisher, "single wildcard");
     }
@@ -168,7 +168,7 @@ public class MessageThroughputTest
     /// <summary>
     /// Measure multi-wildcard topic subscription message exchange performance
     /// </summary>
-    public Task Subscribe_to_Multi_Wildcard_Topics()
+    public Task SubscribeToMultiWildcardTopics()
     {
         return ProcessMessages(_multiWildcardTopicsByPublisher, "multi wildcard");
     }
@@ -342,4 +342,8 @@ public class MessageThroughputTest
         Console.ResetColor();
     }
 
+    public void Dispose()
+    {
+        _cancellationTokenSource.Dispose();
+    }
 }

Source/MQTTnet.TestApp/MqttNetConsoleLogger.cs

@@ -34,7 +34,9 @@ public static class MqttNetConsoleLogger
     static void PrintToConsole(object sender, MqttNetLogMessagePublishedEventArgs e)
     {
         var output = new StringBuilder();
+#pragma warning disable CA1305
         output.AppendLine($">> [{e.LogMessage.Timestamp:O}] [{e.LogMessage.ThreadId}] [{e.LogMessage.Source}] [{e.LogMessage.Level}]: {e.LogMessage.Message}");
+#pragma warning restore CA1305
         if (e.LogMessage.Exception != null)
         {
             output.AppendLine(e.LogMessage.Exception.ToString());

Source/MQTTnet.TestApp/PerformanceTest.cs

@@ -204,7 +204,7 @@ public static class PerformanceTest
         };
     }
 
-    static Task PublishSingleMessage(IMqttClient client, MqttApplicationMessage applicationMessage, ref int count)
+    static Task<MqttClientPublishResult> PublishSingleMessage(IMqttClient client, MqttApplicationMessage applicationMessage, ref int count)
     {
         Interlocked.Increment(ref count);
         return Task.Run(() => client.PublishAsync(applicationMessage));

Source/MQTTnet.TestApp/Program.cs

@@ -85,7 +85,7 @@ public static class Program
         }
         else if (pressedKey.KeyChar == 'f')
         {
-            Task.Run(new AsyncLockTest().Run);
+            Task.Run(AsyncLockTest.Run);
         }
 
         Thread.Sleep(Timeout.Infinite);

Source/MQTTnet.TestApp/PublicBrokerTest.cs

@@ -157,7 +157,7 @@ public static class PublicBrokerTest
 
                 if (receivedMessage?.Topic != topic || receivedMessage?.ConvertPayloadToString() != "Hello_World")
                 {
-                    throw new Exception("Message invalid.");
+                    throw new InvalidOperationException("Message invalid.");
                 }
 
                 await client.UnsubscribeAsync(topic).ConfigureAwait(false);

Source/MQTTnet.TestApp/ServerTest.cs

@@ -129,12 +129,12 @@ public static class ServerTest
 
             mqttServer.InterceptingSubscriptionAsync += e =>
             {
-                if (e.TopicFilter.Topic.StartsWith("admin/foo/bar") && e.ClientId != "theAdmin")
+                if (e.TopicFilter.Topic.StartsWith("admin/foo/bar", StringComparison.InvariantCulture) && e.ClientId != "theAdmin")
                 {
                     e.Response.ReasonCode = MqttSubscribeReasonCode.ImplementationSpecificError;
                 }
 
-                if (e.TopicFilter.Topic.StartsWith("the/secret/stuff") && e.ClientId != "Imperator")
+                if (e.TopicFilter.Topic.StartsWith("the/secret/stuff", StringComparison.InvariantCulture) && e.ClientId != "Imperator")
                 {
                     e.Response.ReasonCode = MqttSubscribeReasonCode.ImplementationSpecificError;
                     e.CloseConnection = true;

Source/MQTTnet.TestApp/TopicGenerator.cs

@@ -6,7 +6,7 @@ namespace MQTTnet.TestApp;
 
 public class TopicGenerator
 {
-    public void Generate(
+    public static void Generate(
         int numPublishers, int numTopicsPerPublisher,
         out Dictionary<string, List<string>> topicsByPublisher,
         out Dictionary<string, List<string>> singleWildcardTopicsByPublisher,
@@ -84,14 +84,14 @@ public class TopicGenerator
         }
     }
 
-    void AddPublisherTopic(string publisherName, string topic, Dictionary<string, List<string>> topicsByPublisher)
+    static void AddPublisherTopic(string publisherName, string topic, Dictionary<string, List<string>> topicsByPublisher)
     {
-        List<string> topicList;
+        if (!topicsByPublisher.TryGetValue(publisherName, out var topicList))
-        if (!topicsByPublisher.TryGetValue(publisherName, out topicList))
         {
             topicList = new List<string>();
             topicsByPublisher.Add(publisherName, topicList);
         }
+
         topicList.Add(topic);
     }
 }

Source/MQTTnet.Tests/ASP/MqttConnectionContextTest.cs

@@ -119,9 +119,11 @@ public class MqttConnectionContextTest
         await Assert.ThrowsExactlyAsync<MqttCommunicationException>(() => ctx.ReceivePacketAsync(CancellationToken.None)).ConfigureAwait(false);
     }
 
-    class Startup
+    sealed class Startup
     {
+#pragma warning disable CA1822
         public void Configure(IApplicationBuilder app)
+#pragma warning restore CA1822
         {
         }
     }

Source/MQTTnet.Tests/BaseTestClass.cs

@@ -20,12 +20,12 @@ public abstract class BaseTestClass
         return new TestEnvironment(TestContext, protocolVersion, trackUnobservedTaskException);
     }
 
-    protected Task LongTestDelay()
+    public static Task LongTestDelay()
     {
         return Task.Delay(TimeSpan.FromSeconds(1));
     }
 
-    protected Task MediumTestDelay()
+    public static Task MediumTestDelay()
     {
         return Task.Delay(TimeSpan.FromSeconds(0.5));
     }

Source/MQTTnet.Tests/Clients/LowLevelMqttClient/LowLevelMqttClient_Tests.cs

@@ -188,7 +188,7 @@ public sealed class LowLevelMqttClient_Tests : BaseTestClass
         return await client.ReceiveAsync(CancellationToken.None) as MqttConnAckPacket;
     }
 
-    async Task<MqttSubAckPacket> Subscribe(ILowLevelMqttClient client, string topic)
+    static async Task<MqttSubAckPacket> Subscribe(ILowLevelMqttClient client, string topic)
     {
         await client.SendAsync(
                 new MqttSubscribePacket

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

@@ -73,7 +73,7 @@ public sealed class MqttClient_Connection_Tests : BaseTestClass
         catch (Exception exception)
         {
             Assert.IsNotNull(exception);
-            Assert.IsInstanceOfType(exception, typeof(MqttCommunicationException));
+            Assert.IsInstanceOfType<MqttCommunicationException>(exception);
         }
 
         await LongTestDelay(); // disconnected handler is called async
@@ -161,7 +161,7 @@ public sealed class MqttClient_Connection_Tests : BaseTestClass
         Assert.AreEqual("test_value", eventArgs.UserProperties[0].Value);
     }
 
-    class TestClientKerberosAuthenticationHandler : IMqttEnhancedAuthenticationHandler
+    sealed class TestClientKerberosAuthenticationHandler : IMqttEnhancedAuthenticationHandler
     {
         public async Task HandleEnhancedAuthenticationAsync(MqttEnhancedAuthenticationEventArgs eventArgs)
         {

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

@@ -6,6 +6,7 @@ using System;
 using System.Buffers;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Globalization;
 using System.Linq;
 using System.Net.Sockets;
 using System.Text;
@@ -122,8 +123,8 @@ public sealed class MqttClient_Tests : BaseTestClass
         await Task.Delay(500);
 
         Assert.IsNotNull(ex);
-        Assert.IsInstanceOfType(ex, typeof(MqttCommunicationException));
+        Assert.IsInstanceOfType<MqttCommunicationException>(ex);
-        Assert.IsInstanceOfType(ex.InnerException, typeof(SocketException));
+        Assert.IsInstanceOfType<SocketException>(ex.InnerException);
     }
 
     [TestMethod]
@@ -245,8 +246,8 @@ public sealed class MqttClient_Tests : BaseTestClass
         catch (Exception exception)
         {
             Assert.IsNotNull(exception);
-            Assert.IsInstanceOfType(exception, typeof(MqttCommunicationException));
+            Assert.IsInstanceOfType<MqttCommunicationException>(exception);
-            Assert.IsInstanceOfType(exception.InnerException, typeof(SocketException));
+            Assert.IsInstanceOfType<SocketException>(exception.InnerException);
         }
     }
 
@@ -355,7 +356,7 @@ public sealed class MqttClient_Tests : BaseTestClass
 
         async Task Handler1(MqttApplicationMessageReceivedEventArgs eventArgs)
         {
-            var value = int.Parse(eventArgs.ApplicationMessage.ConvertPayloadToString());
+            var value = int.Parse(eventArgs.ApplicationMessage.ConvertPayloadToString(), CultureInfo.InvariantCulture);
             await Task.Delay(value);
 
             lock (receivedValues)
@@ -369,7 +370,7 @@ public sealed class MqttClient_Tests : BaseTestClass
         var client2 = await testEnvironment.ConnectClient();
         for (var i = MessagesCount; i > 0; i--)
         {
-            await client2.PublishStringAsync("x", i.ToString());
+            await client2.PublishStringAsync("x", i.ToString(CultureInfo.InvariantCulture));
         }
 
         await Task.Delay(5000);
@@ -401,7 +402,7 @@ public sealed class MqttClient_Tests : BaseTestClass
         var client2 = await testEnvironment.ConnectClient();
         for (var i = MessagesCount; i > 0; i--)
         {
-            await client2.PublishStringAsync("x", i.ToString(), MqttQualityOfServiceLevel.ExactlyOnce);
+            await client2.PublishStringAsync("x", i.ToString(CultureInfo.InvariantCulture), MqttQualityOfServiceLevel.ExactlyOnce);
         }
 
         await Task.Delay(5000);
@@ -415,7 +416,7 @@ public sealed class MqttClient_Tests : BaseTestClass
 
         Task Handler1(MqttApplicationMessageReceivedEventArgs eventArgs)
         {
-            var value = int.Parse(eventArgs.ApplicationMessage.ConvertPayloadToString());
+            var value = int.Parse(eventArgs.ApplicationMessage.ConvertPayloadToString(), CultureInfo.InvariantCulture);
             eventArgs.AutoAcknowledge = false;
             Task.Delay(value).ContinueWith(_ => eventArgs.AcknowledgeAsync(CancellationToken.None));
 

Source/MQTTnet.Tests/Extensions/Rpc_Tests.cs

@@ -220,7 +220,7 @@ public sealed class Rpc_Tests : BaseTestClass
         Assert.AreEqual("pong", Encoding.UTF8.GetString(response));
     }
 
-    class TestTopicStrategy : IMqttRpcClientTopicGenerationStrategy
+    sealed class TestTopicStrategy : IMqttRpcClientTopicGenerationStrategy
     {
         public MqttRpcTopicPair CreateRpcTopics(TopicGenerationContext context)
         {
@@ -232,7 +232,7 @@ public sealed class Rpc_Tests : BaseTestClass
         }
     }
 
-    class TestParametersTopicGenerationStrategy : IMqttRpcClientTopicGenerationStrategy
+    sealed class TestParametersTopicGenerationStrategy : IMqttRpcClientTopicGenerationStrategy
     {
         internal const string ExpectedParamName = "test_param_name";
 

Source/MQTTnet.Tests/Formatter/MqttBufferReader_Tests.cs

@@ -287,7 +287,7 @@ public sealed class MqttBufferReader_Tests
 
 
     // Helper class to build up a reference to elements of various types in a buffer
-    class ElementReference
+    sealed class ElementReference
     {
         public enum BufferElementType
         {

Source/MQTTnet.Tests/Formatter/MqttPacketSerialization_V3_Binary_Tests.cs

@@ -551,7 +551,7 @@ public sealed class MqttPacketSerialization_V3_Binary_Tests
     }
 
 
-    void DeserializeAndCompare(MqttPacket packet, string expectedBase64Value, MqttProtocolVersion protocolVersion = MqttProtocolVersion.V311)
+    static void DeserializeAndCompare(MqttPacket packet, string expectedBase64Value, MqttProtocolVersion protocolVersion = MqttProtocolVersion.V311)
     {
         var writer = WriterFactory();
 

Source/MQTTnet.Tests/Internal/MqttPacketBus_Tests.cs

@@ -35,15 +35,15 @@ public sealed class MqttPacketBus_Tests
 
         Assert.AreEqual(9, bus.TotalItemsCount);
 
-        Assert.IsInstanceOfType(bus.DequeueItemAsync(CancellationToken.None).Result.Packet, typeof(MqttPublishPacket));
+        Assert.IsInstanceOfType<MqttPublishPacket>(bus.DequeueItemAsync(CancellationToken.None).Result.Packet);
-        Assert.IsInstanceOfType(bus.DequeueItemAsync(CancellationToken.None).Result.Packet, typeof(MqttSubAckPacket));
+        Assert.IsInstanceOfType<MqttSubAckPacket>(bus.DequeueItemAsync(CancellationToken.None).Result.Packet);
-        Assert.IsInstanceOfType(bus.DequeueItemAsync(CancellationToken.None).Result.Packet, typeof(MqttPingRespPacket));
+        Assert.IsInstanceOfType<MqttPingRespPacket>(bus.DequeueItemAsync(CancellationToken.None).Result.Packet);
-        Assert.IsInstanceOfType(bus.DequeueItemAsync(CancellationToken.None).Result.Packet, typeof(MqttPublishPacket));
+        Assert.IsInstanceOfType<MqttPublishPacket>(bus.DequeueItemAsync(CancellationToken.None).Result.Packet);
-        Assert.IsInstanceOfType(bus.DequeueItemAsync(CancellationToken.None).Result.Packet, typeof(MqttSubAckPacket));
+        Assert.IsInstanceOfType<MqttSubAckPacket>(bus.DequeueItemAsync(CancellationToken.None).Result.Packet);
-        Assert.IsInstanceOfType(bus.DequeueItemAsync(CancellationToken.None).Result.Packet, typeof(MqttPingRespPacket));
+        Assert.IsInstanceOfType<MqttPingRespPacket>(bus.DequeueItemAsync(CancellationToken.None).Result.Packet);
-        Assert.IsInstanceOfType(bus.DequeueItemAsync(CancellationToken.None).Result.Packet, typeof(MqttPublishPacket));
+        Assert.IsInstanceOfType<MqttPublishPacket>(bus.DequeueItemAsync(CancellationToken.None).Result.Packet);
-        Assert.IsInstanceOfType(bus.DequeueItemAsync(CancellationToken.None).Result.Packet, typeof(MqttSubAckPacket));
+        Assert.IsInstanceOfType<MqttSubAckPacket>(bus.DequeueItemAsync(CancellationToken.None).Result.Packet);
-        Assert.IsInstanceOfType(bus.DequeueItemAsync(CancellationToken.None).Result.Packet, typeof(MqttPingRespPacket));
+        Assert.IsInstanceOfType<MqttPingRespPacket>(bus.DequeueItemAsync(CancellationToken.None).Result.Packet);
 
         Assert.AreEqual(0, bus.TotalItemsCount);
     }

Source/MQTTnet.Tests/MQTTnet.Tests.csproj

@@ -3,19 +3,10 @@
     <PropertyGroup>
 
         <OutputType>Exe</OutputType>
-        <TargetFramework>net8.0</TargetFramework>
         <IsPackable>false</IsPackable>
-        <EnableNETAnalyzers>false</EnableNETAnalyzers>
-        <EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
-        <DisableImplicitAspNetCoreAnalyzers>true</DisableImplicitAspNetCoreAnalyzers>
-        <NoWarn>1591;NETSDK1138;NU1803;NU1901;NU1902</NoWarn>
-        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <NuGetAuditMode>all</NuGetAuditMode>
-        <NuGetAudit>true</NuGetAudit>
-        <NuGetAuditLevel>low</NuGetAuditLevel>
-        <AnalysisLevel>latest-Recommended</AnalysisLevel>
         <LangVersion>default</LangVersion>
         <Nullable>disable</Nullable>
+        <NoWarn>$(NoWarn);CA1707</NoWarn>
     </PropertyGroup>
 
     <ItemGroup>
@@ -23,7 +14,6 @@
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
         <PackageReference Include="MSTest" Version="4.0.1" />
 
-
         <FrameworkReference Include="Microsoft.AspNetCore.App" />
     </ItemGroup>
 

Source/MQTTnet.Tests/Mockups/MemoryMqttChannel.cs

@@ -31,7 +31,7 @@ public sealed class MemoryMqttChannel : IMqttChannel
 
     public EndPoint LocalEndPoint { get; set; }
 
-    public bool IsSecureConnection { get; } = false;
+    public bool IsSecureConnection { get; }
 
     public X509Certificate2 ClientCertificate { get; set; }
 
@@ -60,5 +60,6 @@ public sealed class MemoryMqttChannel : IMqttChannel
 
     public void Dispose()
     {
+        _stream.Dispose();
     }
 }

Source/MQTTnet.Tests/Mockups/TestEnvironment.cs

@@ -5,7 +5,6 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -182,7 +181,9 @@ public sealed class TestEnvironment : IDisposable
         return new MqttRpcClient(await ConnectClient(), options);
     }
 
+#pragma warning disable CA1822
     public TestApplicationMessageReceivedHandler CreateApplicationMessageHandler(IMqttClient mqttClient)
+#pragma warning restore CA1822
     {
         return new TestApplicationMessageReceivedHandler(mqttClient);
     }
@@ -199,7 +200,7 @@ public sealed class TestEnvironment : IDisposable
             {
                 var clientOptions = e.ClientOptions;
                 var existingClientId = clientOptions.ClientId;
-                if (existingClientId != null && !existingClientId.StartsWith(TestContext.TestName))
+                if (existingClientId != null && !existingClientId.StartsWith(TestContext.TestName, StringComparison.InvariantCulture))
                 {
                     clientOptions.ClientId = TestContext.TestName + "_" + existingClientId;
                 }
@@ -257,7 +258,7 @@ public sealed class TestEnvironment : IDisposable
             if (TestContext != null)
             {
                 // Null is used when the client id is assigned from the server!
-                if (!string.IsNullOrEmpty(e.ClientId) && !e.ClientId.StartsWith(TestContext.TestName))
+                if (!string.IsNullOrEmpty(e.ClientId) && !e.ClientId.StartsWith(TestContext.TestName, StringComparison.InvariantCulture))
                 {
                     TrackException(new InvalidOperationException($"Invalid client ID used ({e.ClientId}). It must start with UnitTest name."));
                     e.ReasonCode = MqttConnectReasonCode.ClientIdentifierNotValid;
@@ -326,10 +327,10 @@ public sealed class TestEnvironment : IDisposable
             GC.WaitForFullGCComplete();
             GC.WaitForPendingFinalizers();
 
-            if (_exceptions.Any())
+            if (_exceptions.Count > 0)
             {
                 // ReSharper disable once ThrowExceptionInUnexpectedLocation
-                throw new Exception($"{_exceptions.Count} exceptions tracked.\r\n" + string.Join(Environment.NewLine, _exceptions));
+                throw new InvalidOperationException($"{_exceptions.Count} exceptions tracked.\r\n" + string.Join(Environment.NewLine, _exceptions));
             }
         }
         finally
@@ -387,7 +388,7 @@ public sealed class TestEnvironment : IDisposable
                 {
                     var message = $"Server had {_serverErrors.Count} errors (${string.Join(Environment.NewLine, _serverErrors)}).";
                     Console.WriteLine(message);
-                    throw new Exception(message);
+                    throw new InvalidOperationException(message);
                 }
             }
         }
@@ -400,7 +401,7 @@ public sealed class TestEnvironment : IDisposable
                 {
                     var message = $"Client(s) had {_clientErrors.Count} errors (${string.Join(Environment.NewLine, _clientErrors)})";
                     Console.WriteLine(message);
-                    throw new Exception(message);
+                    throw new InvalidOperationException(message);
                 }
             }
         }

Source/MQTTnet.Tests/Mockups/TestLogger.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Globalization;
 using MQTTnet.Diagnostics.Logger;
 
 namespace MQTTnet.Tests.Mockups;
@@ -13,12 +14,12 @@ public sealed class TestLogger : IMqttNetLogger
 
     public bool IsEnabled { get; } = true;
 
-    public void Publish(MqttNetLogLevel logLevel, string source, string message, object[] parameters, Exception exception)
+    public void Publish(MqttNetLogLevel level, string source, string message, object[] parameters, Exception exception)
     {
         LogMessagePublished?.Invoke(this, new MqttNetLogMessagePublishedEventArgs(new MqttNetLogMessage
         {
-            Level = logLevel,
+            Level = level,
-            Message = string.Format(message, parameters),
+            Message = string.Format(CultureInfo.InvariantCulture, message, parameters),
             Exception = exception
         }));
     }

Source/MQTTnet.Tests/MqttTcpChannel_Tests.cs

@@ -71,7 +71,7 @@ public class MqttTcpChannel_Tests
             }
             catch (Exception exception)
             {
-                Assert.IsInstanceOfType(exception, typeof(SocketException));
+                Assert.IsInstanceOfType<SocketException>(exception);
                 Assert.AreEqual(SocketError.OperationAborted, ((SocketException)exception).SocketErrorCode);
             }
         }

Source/MQTTnet.Tests/RoundtripTime_Tests.cs

@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Globalization;
 using System.Threading.Tasks;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using MQTTnet.Internal;
@@ -45,7 +46,7 @@ public class RoundtripTime_Tests
         for (var i = 0; i < 100; i++)
         {
             response = new TaskCompletionSource<string>();
-            await senderClient.PublishStringAsync("test", DateTime.UtcNow.Ticks.ToString());
+            await senderClient.PublishStringAsync("test", DateTime.UtcNow.Ticks.ToString(CultureInfo.InvariantCulture));
             if (!response.Task.Wait(TimeSpan.FromSeconds(5)))
             {
                 throw new TimeoutException();

Source/MQTTnet.Tests/Server/General.cs

@@ -350,7 +350,7 @@ public class General_Tests : BaseTestClass
         var isIntercepted = false;
         c2.ApplicationMessageReceivedAsync += e =>
         {
-            isIntercepted = string.Compare("extended", Encoding.UTF8.GetString(e.ApplicationMessage.Payload), StringComparison.Ordinal) == 0;
+            isIntercepted = string.Equals("extended", Encoding.UTF8.GetString(e.ApplicationMessage.Payload), StringComparison.Ordinal);
             return CompletedTask.Instance;
         };
 

Source/MQTTnet.Tests/Server/HotSwapCerts_Tests.cs

@@ -295,10 +295,10 @@ public sealed class HotSwapCerts_Tests
         }
     }
 
-    class HotSwappableClientCertProvider : IMqttClientCertificatesProvider, IDisposable
+    sealed class HotSwappableClientCertProvider : IMqttClientCertificatesProvider, IDisposable
     {
         X509Certificate2Collection _certificates;
-        ConcurrentBag<X509Certificate2> _serverCerts = new ConcurrentBag<X509Certificate2>();
+        ConcurrentBag<X509Certificate2> _serverCerts = new();
 
         public HotSwappableClientCertProvider()
         {

Source/MQTTnet.Tests/Server/MqttSubscriptionsManager_Tests.cs

@@ -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;
 using System.Collections.Concurrent;
 using System.Threading;
 using System.Threading.Tasks;
@@ -16,10 +17,15 @@ namespace MQTTnet.Tests.Server;
 
 // ReSharper disable InconsistentNaming
 [TestClass]
-public sealed class MqttSubscriptionsManager_Tests : BaseTestClass
+public sealed class MqttSubscriptionsManager_Tests : BaseTestClass, IDisposable
 {
     MqttClientSubscriptionsManager _subscriptionsManager;
 
+    public void Dispose()
+    {
+        _subscriptionsManager?.Dispose();
+    }
+
     [TestMethod]
     public async Task MqttSubscriptionsManager_SubscribeAndUnsubscribeSingle()
     {
@@ -46,7 +52,7 @@ public sealed class MqttSubscriptionsManager_Tests : BaseTestClass
         {
             TopicFilters =
             [
-                new() { Topic = "A/B/C", QualityOfServiceLevel = MqttQualityOfServiceLevel.AtMostOnce }
+                new MqttTopicFilter { Topic = "A/B/C", QualityOfServiceLevel = MqttQualityOfServiceLevel.AtMostOnce }
             ]
         };
 
@@ -178,6 +184,48 @@ public sealed class MqttSubscriptionsManager_Tests : BaseTestClass
         CheckIsNotSubscribed("house/2/room/bed");
     }
 
+    [TestInitialize]
+    public void TestInitialize()
+    {
+        var logger = new TestLogger();
+        var options = new MqttServerOptions();
+        var retainedMessagesManager = new MqttRetainedMessagesManager(new MqttServerEventContainer(), logger);
+        var eventContainer = new MqttServerEventContainer();
+        var clientSessionManager = new MqttClientSessionsManager(options, retainedMessagesManager, eventContainer, logger);
+
+        var session = new MqttSession(
+            new MqttConnectPacket
+            {
+                ClientId = ""
+            },
+            new ConcurrentDictionary<object, object>(),
+            options,
+            eventContainer,
+            retainedMessagesManager,
+            clientSessionManager);
+
+        _subscriptionsManager = new MqttClientSubscriptionsManager(session, new MqttServerEventContainer(), retainedMessagesManager, clientSessionManager);
+    }
+
+    void CheckIsNotSubscribed(string topic)
+    {
+        var result = CheckSubscriptions(topic, MqttQualityOfServiceLevel.AtMostOnce, "");
+        Assert.IsFalse(result.IsSubscribed);
+    }
+
+    void CheckIsSubscribed(string topic)
+    {
+        var result = CheckSubscriptions(topic, MqttQualityOfServiceLevel.AtMostOnce, "");
+        Assert.IsTrue(result.IsSubscribed);
+        Assert.AreEqual(MqttQualityOfServiceLevel.AtMostOnce, result.QualityOfServiceLevel);
+    }
+
+    CheckSubscriptionsResult CheckSubscriptions(string topic, MqttQualityOfServiceLevel applicationMessageQoSLevel, string senderClientId)
+    {
+        MqttTopicHash.Calculate(topic, out var topicHash, out _, out _);
+        return _subscriptionsManager.CheckSubscriptions(topic, topicHash, applicationMessageQoSLevel, senderClientId);
+    }
+
     async Task SubscribeToTopic(string topic)
     {
         var sp = new MqttSubscribePacket
@@ -190,40 +238,4 @@ public sealed class MqttSubscriptionsManager_Tests : BaseTestClass
 
         await _subscriptionsManager.Subscribe(sp, CancellationToken.None);
     }
-
-    void CheckIsSubscribed(string topic)
-    {
-        var result = CheckSubscriptions(topic, MqttQualityOfServiceLevel.AtMostOnce, "");
-        Assert.IsTrue(result.IsSubscribed);
-        Assert.AreEqual(MqttQualityOfServiceLevel.AtMostOnce, result.QualityOfServiceLevel);
-    }
-
-    void CheckIsNotSubscribed(string topic)
-    {
-        var result = CheckSubscriptions(topic, MqttQualityOfServiceLevel.AtMostOnce, "");
-        Assert.IsFalse(result.IsSubscribed);
-    }
-
-    [TestInitialize]
-    public void TestInitialize()
-    {
-        var logger = new TestLogger();
-        var options = new MqttServerOptions();
-        var retainedMessagesManager = new MqttRetainedMessagesManager(new MqttServerEventContainer(), logger);
-        var eventContainer = new MqttServerEventContainer();
-        var clientSessionManager = new MqttClientSessionsManager(options, retainedMessagesManager, eventContainer, logger);
-
-        var session = new MqttSession(new MqttConnectPacket
-        {
-            ClientId = ""
-        }, new ConcurrentDictionary<object, object>(), options, eventContainer, retainedMessagesManager, clientSessionManager);
-
-        _subscriptionsManager = new MqttClientSubscriptionsManager(session, new MqttServerEventContainer(), retainedMessagesManager, clientSessionManager);
-    }
-
-    CheckSubscriptionsResult CheckSubscriptions(string topic, MqttQualityOfServiceLevel applicationMessageQoSLevel, string senderClientId)
-    {
-        MqttTopicHash.Calculate(topic, out var topicHash, out _, out _);
-        return _subscriptionsManager.CheckSubscriptions(topic, topicHash, applicationMessageQoSLevel, senderClientId);
-    }
 }

Source/MQTTnet.Tests/Server/Retained_Messages_Tests.cs

@@ -24,7 +24,7 @@ public class Retained_Messages_Tests : BaseTestClass
         var c1 = await testEnvironment.ConnectClient();
 
         await c1.PublishAsync(new MqttApplicationMessageBuilder().WithTopic("retained").WithPayload(new byte[3]).WithRetainFlag().Build());
-        await c1.PublishAsync(new MqttApplicationMessageBuilder().WithTopic("retained").WithPayload(new byte[0]).WithRetainFlag().Build());
+        await c1.PublishAsync(new MqttApplicationMessageBuilder().WithTopic("retained").WithPayload([]).WithRetainFlag().Build());
 
         await c1.DisconnectAsync();
 

Source/MQTTnet.Tests/Server/Security_Tests.cs

@@ -144,7 +144,7 @@ public class Security_Tests : BaseTestClass
         var clientOptions = new MqttClientOptionsBuilder().WithTcpServer("127.0.0.1", testEnvironment.ServerPort).WithCredentials(username, password).Build();
 
         var ex = await Assert.ThrowsExactlyAsync<MqttConnectingFailedException>(async () => await client.ConnectAsync(clientOptions));
-        Assert.IsInstanceOfType(ex.InnerException, typeof(MqttProtocolViolationException));
+        Assert.IsInstanceOfType<MqttProtocolViolationException>(ex.InnerException);
         Assert.AreEqual("Error while authenticating. If the User Name Flag is set to 0, the Password Flag MUST be set to 0 [MQTT-3.1.2-22].", ex.Message, false);
     }
 

Source/MQTTnet.Tests/Server/Subscribe_Tests.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Globalization;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -222,7 +223,7 @@ public sealed class Subscribe_Tests : BaseTestClass
 
         for (var i = 0; i < 500; i++)
         {
-            var so = new MqttClientSubscribeOptionsBuilder().WithTopicFilter(i.ToString()).Build();
+            var so = new MqttClientSubscribeOptionsBuilder().WithTopicFilter(i.ToString(CultureInfo.InvariantCulture)).Build();
 
             await c1.SubscribeAsync(so);
 
@@ -234,7 +235,7 @@ public sealed class Subscribe_Tests : BaseTestClass
         var messageBuilder = new MqttApplicationMessageBuilder();
         for (var i = 0; i < 500; i++)
         {
-            messageBuilder.WithTopic(i.ToString());
+            messageBuilder.WithTopic(i.ToString(CultureInfo.InvariantCulture));
 
             await c2.PublishAsync(messageBuilder.Build());
 
@@ -264,7 +265,7 @@ public sealed class Subscribe_Tests : BaseTestClass
         var optionsBuilder = new MqttClientSubscribeOptionsBuilder();
         for (var i = 0; i < 500; i++)
         {
-            optionsBuilder.WithTopicFilter(i.ToString());
+            optionsBuilder.WithTopicFilter(i.ToString(CultureInfo.InvariantCulture));
         }
 
         await c1.SubscribeAsync(optionsBuilder.Build());
@@ -274,7 +275,7 @@ public sealed class Subscribe_Tests : BaseTestClass
         var messageBuilder = new MqttApplicationMessageBuilder();
         for (var i = 0; i < 500; i++)
         {
-            messageBuilder.WithTopic(i.ToString());
+            messageBuilder.WithTopic(i.ToString(CultureInfo.InvariantCulture));
 
             await c2.PublishAsync(messageBuilder.Build());
         }

Source/MQTTnet.Tests/Server/Subscription_TopicHash_Tests.cs

@@ -14,7 +14,7 @@ using MQTTnet.Tests.Mockups;
 namespace MQTTnet.Tests.Server;
 
 [TestClass]
-public sealed class SubscriptionTopicHashTests
+public sealed class SubscriptionTopicHashTests : IDisposable
 {
     MqttSession _clientSession;
 
@@ -84,6 +84,11 @@ public sealed class SubscriptionTopicHashTests
         CheckTopicHash("client1/+/level1/#", 0x65004A0000000000, 0xFF00FF0000000000);
     }
 
+    public void Dispose()
+    {
+        _clientSession?.Dispose();
+    }
+
     /// <summary>
     ///     Test long topic name with last level being #
     /// </summary>
@@ -414,7 +419,7 @@ public sealed class SubscriptionTopicHashTests
                 foreach (var t in topics)
                 {
                     // replace last letter with x
-                    topicsToFind.Add(t.Substring(0, t.Length - 1) + "x");
+                    topicsToFind.Add(string.Concat(t.AsSpan(0, t.Length - 1), "x"));
                 }
 
                 matchCount = CheckTopicSubscriptions(_clientSession, topicsToFind, "No Wildcard No Match (Replace X)");
@@ -468,7 +473,7 @@ public sealed class SubscriptionTopicHashTests
         Assert.AreEqual(0xff, hashMaskBytes[7], "mask 7 mismatch");
     }
 
-    void CheckTopicHash(string topic, ulong expectedHash, ulong expectedHashMask)
+    static void CheckTopicHash(string topic, ulong expectedHash, ulong expectedHashMask)
     {
         MqttTopicHash.Calculate(topic, out var topicHash, out var hashMask, out _);
 
@@ -481,7 +486,7 @@ public sealed class SubscriptionTopicHashTests
         Assert.AreEqual(expectedHashMask, hashMask, "Topic hash mask not as expected");
     }
 
-    int CheckTopicSubscriptions(MqttSession clientSession, List<string> topicsToFind, string subject)
+    static int CheckTopicSubscriptions(MqttSession clientSession, List<string> topicsToFind, string subject)
     {
         var matchCount = 0;
 
@@ -517,7 +522,7 @@ public sealed class SubscriptionTopicHashTests
         return matchCount;
     }
 
-    byte[] GetBytes(ulong value)
+    static byte[] GetBytes(ulong value)
     {
         var bytes = BitConverter.GetBytes(value);
         // Ensure that highest byte comes first for comparison left to right

Source/MQTTnet.Tests/Server/Topic_Alias_Tests.cs

@@ -71,6 +71,6 @@ public sealed class Topic_Alias_Tests : BaseTestClass
 
         Assert.HasCount(3, receivedTopics);
         CollectionAssert.AllItemsAreNotNull(receivedTopics);
-        Assert.IsTrue(receivedTopics.All(t => t.Equals("this_is_the_topic")));
+        Assert.IsTrue(receivedTopics.All(t => t.Equals("this_is_the_topic", System.StringComparison.Ordinal)));
     }
 }

Source/MQTTnet/MQTTnet.csproj

@@ -10,42 +10,15 @@
     </Target>
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
         <AssemblyName>MQTTnet</AssemblyName>
         <RootNamespace>MQTTnet</RootNamespace>
-        <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+        <IsAotCompatible>true</IsAotCompatible>
-        <Company>The contributors of MQTTnet</Company>
+
-        <Product>MQTTnet</Product>
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <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</PackageId>
-        <DelaySign>false</DelaySign>
-        <SignAssembly>false</SignAssembly>
-        <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>true</EnableNETAnalyzers>
-        <EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
-        <PackageIcon>nuget.png</PackageIcon>
-        <EmbedUntrackedSources>true</EmbedUntrackedSources>
-        <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-        <PackageLicenseFile>LICENSE</PackageLicenseFile>
-        <DisableImplicitAspNetCoreAnalyzers>true</DisableImplicitAspNetCoreAnalyzers>
-        <NoWarn>1591;NETSDK1138;NU1803;NU1901;NU1902</NoWarn>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <NuGetAuditMode>all</NuGetAuditMode>
-        <NuGetAudit>true</NuGetAudit>
-        <NuGetAuditLevel>low</NuGetAuditLevel>
-        <AnalysisLevel>latest-Recommended</AnalysisLevel>
-        <IsAotCompatible>true</IsAotCompatible>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(Configuration)'=='Debug'">
@@ -54,14 +27,4 @@
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     </PropertyGroup>
-
-    <ItemGroup>
-        <None Include="..\..\Images\nuget.png" Pack="true" PackagePath="" />
-        <None Include="..\..\LICENSE" Pack="true" PackagePath="" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
-    </ItemGroup>
-
 </Project>