Import latest fixes from main branch

dotnet · Jul 31, 2024 · 65fea6b · 65fea6b
1 parent 7c3b605
commit 65fea6b
Show file tree

Hide file tree

Showing 8 changed files with 519 additions and 551 deletions.
diff --git a/Samples/Client/Client_Subscribe_Samples.cs b/Samples/Client/Client_Subscribe_Samples.cs
@@ -17,8 +17,8 @@ namespace MQTTnet.Samples.Client;
 
 public static class Client_Subscribe_Samples
 {
-    static MqttTopicTemplate sampleTemplate = new MqttTopicTemplate("mqttnet/samples/topic/{id}");
-    
+    static readonly MqttTopicTemplate sampleTemplate = new("mqttnet/samples/topic/{id}");
+
     public static async Task Handle_Received_Application_Message()
     {
         /*
@@ -44,9 +44,7 @@ public static async Task Handle_Received_Application_Message()
 
             await mqttClient.ConnectAsync(mqttClientOptions, CancellationToken.None);
 
-            var mqttSubscribeOptions = mqttFactory.CreateSubscribeOptionsBuilder()
-                .WithTopicTemplate(sampleTemplate.WithParameter("id", "2"))
-                .Build();
+            var mqttSubscribeOptions = mqttFactory.CreateSubscribeOptionsBuilder().WithTopicTemplate(sampleTemplate.WithParameter("id", "2")).Build();
 
             await mqttClient.SubscribeAsync(mqttSubscribeOptions, CancellationToken.None);
 
@@ -86,10 +84,7 @@ public static async Task Send_Responses()
 
             await mqttClient.ConnectAsync(mqttClientOptions, CancellationToken.None);
 
-            var mqttSubscribeOptions = mqttFactory.CreateSubscribeOptionsBuilder()
-                .WithTopicTemplate(
-                    sampleTemplate.WithParameter("id", "1"))
-                .Build();
+            var mqttSubscribeOptions = mqttFactory.CreateSubscribeOptionsBuilder().WithTopicTemplate(sampleTemplate.WithParameter("id", "1")).Build();
 
             var response = await mqttClient.SubscribeAsync(mqttSubscribeOptions, CancellationToken.None);
 
@@ -117,12 +112,9 @@ public static async Task Subscribe_Multiple_Topics()
             // Create the subscribe options including several topics with different options.
             // It is also possible to all of these topics using a dedicated call of _SubscribeAsync_ per topic.
             var mqttSubscribeOptions = mqttFactory.CreateSubscribeOptionsBuilder()
-                .WithTopicTemplate(
-                    sampleTemplate.WithParameter("id", "1"))
-                .WithTopicTemplate(
-                    sampleTemplate.WithParameter("id", "2"), noLocal: true)
-                .WithTopicTemplate(
-                    sampleTemplate.WithParameter("id", "3"), retainHandling: MqttRetainHandling.SendAtSubscribe)
+                .WithTopicTemplate(sampleTemplate.WithParameter("id", "1"))
+                .WithTopicTemplate(sampleTemplate.WithParameter("id", "2"), noLocal: true)
+                .WithTopicTemplate(sampleTemplate.WithParameter("id", "3"), retainHandling: MqttRetainHandling.SendAtSubscribe)
                 .Build();
 
             var response = await mqttClient.SubscribeAsync(mqttSubscribeOptions, CancellationToken.None);
@@ -148,9 +140,7 @@ public static async Task Subscribe_Topic()
 
             await mqttClient.ConnectAsync(mqttClientOptions, CancellationToken.None);
 
-            var mqttSubscribeOptions = mqttFactory.CreateSubscribeOptionsBuilder()
-                .WithTopicTemplate(sampleTemplate.WithParameter("id", "1"))
-                .Build();
+            var mqttSubscribeOptions = mqttFactory.CreateSubscribeOptionsBuilder().WithTopicTemplate(sampleTemplate.WithParameter("id", "1")).Build();
 
             var response = await mqttClient.SubscribeAsync(mqttSubscribeOptions, CancellationToken.None);
 

diff --git a/Samples/MQTTnet.Samples.csproj b/Samples/MQTTnet.Samples.csproj
@@ -20,6 +20,7 @@
 
         <ProjectReference Include="..\Source\MQTTnet.AspnetCore\MQTTnet.AspNetCore.csproj"/>
         <ProjectReference Include="..\Source\MQTTnet.Extensions.Rpc\MQTTnet.Extensions.Rpc.csproj"/>
+        <ProjectReference Include="..\Source\MQTTnet.Extensions.TopicTemplate\MQTTnet.Extensions.TopicTemplate.csproj" />
         <ProjectReference Include="..\Source\MQTTnet.Server\MQTTnet.Server.csproj"/>
         <ProjectReference Include="..\Source\MQTTnet\MQTTnet.csproj"/>
     </ItemGroup>

diff --git a/Source/MQTTnet.AspnetCore/MqttHostedServer.cs b/Source/MQTTnet.AspnetCore/MqttHostedServer.cs
@@ -7,60 +7,42 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Hosting;
-using MQTTnet.Adapter;
-using MQTTnet.Diagnostics;
+using MQTTnet.Diagnostics.Logger;
 using MQTTnet.Server;
 
-namespace MQTTnet.AspNetCore
+namespace MQTTnet.AspNetCore;
+
+public sealed class MqttHostedServer : MqttServer, IHostedService
 {
-    public sealed class MqttHostedServer : MqttServer, IHostedService
-    {
-        readonly MqttFactory _mqttFactory;
-#if NETCOREAPP3_1_OR_GREATER
-        readonly IHostApplicationLifetime _hostApplicationLifetime;
-        public MqttHostedServer(IHostApplicationLifetime hostApplicationLifetime, MqttFactory mqttFactory,
-            MqttServerOptions options, IEnumerable<IMqttServerAdapter> adapters, IMqttNetLogger logger) : base(
-            options,
-            adapters,
-            logger)
-        {
-            _mqttFactory = mqttFactory ?? throw new ArgumentNullException(nameof(mqttFactory));
-            _hostApplicationLifetime = hostApplicationLifetime;
-        }
-#else
-        public MqttHostedServer(MqttFactory mqttFactory,
-            MqttServerOptions options, IEnumerable<IMqttServerAdapter> adapters, IMqttNetLogger logger) : base(
-            options,
-            adapters,
-            logger)
-        {
-            _mqttFactory = mqttFactory ?? throw new ArgumentNullException(nameof(mqttFactory));
-        }
-#endif
+    readonly IHostApplicationLifetime _hostApplicationLifetime;
+    readonly MqttServerFactory _mqttFactory;
 
+    public MqttHostedServer(
+        IHostApplicationLifetime hostApplicationLifetime,
+        MqttServerFactory mqttFactory,
+        MqttServerOptions options,
+        IEnumerable<IMqttServerAdapter> adapters,
+        IMqttNetLogger logger) : base(options, adapters, logger)
+    {
+        _mqttFactory = mqttFactory ?? throw new ArgumentNullException(nameof(mqttFactory));
+        _hostApplicationLifetime = hostApplicationLifetime;
+    }
 
-        public async Task StartAsync(CancellationToken cancellationToken)
-        {
-            // The yield makes sure that the hosted service is considered up and running.
-            await Task.Yield();
-#if NETCOREAPP3_1_OR_GREATER
-            _hostApplicationLifetime.ApplicationStarted.Register(OnStarted);
-#else
-            _ = StartAsync();
-#endif
+    public async Task StartAsync(CancellationToken cancellationToken)
+    {
+        // The yield makes sure that the hosted service is considered up and running.
+        await Task.Yield();
 
-        }
+        _hostApplicationLifetime.ApplicationStarted.Register(OnStarted);
+    }
 
-        public Task StopAsync(CancellationToken cancellationToken)
-        {
-            return StopAsync(_mqttFactory.CreateMqttServerStopOptionsBuilder().Build());
-        }
+    public Task StopAsync(CancellationToken cancellationToken)
+    {
+        return StopAsync(_mqttFactory.CreateMqttServerStopOptionsBuilder().Build());
+    }
 
-#if NETCOREAPP3_1_OR_GREATER
-        private void OnStarted()
-        {
-            _ = StartAsync();
-        }
-#endif
+    void OnStarted()
+    {
+        _ = StartAsync();
     }
 }
diff --git a/Source/MQTTnet.Extensions.TopicTemplate/MQTTnet.Extensions.TopicTemplate.csproj b/Source/MQTTnet.Extensions.TopicTemplate/MQTTnet.Extensions.TopicTemplate.csproj
@@ -1,10 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
-        <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net452;net461;net48</TargetFrameworks>
-        <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' AND '$(MSBuildRuntimeType)' != 'Core' ">$(TargetFrameworks);uap10.0</TargetFrameworks>
-
+        <TargetFrameworks>net8.0</TargetFrameworks>
         <AssemblyName>MQTTnet.Extensions.TopicTemplate</AssemblyName>
         <RootNamespace>MQTTnet.Extensions.TopicTemplate</RootNamespace>
         <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
@@ -60,7 +57,7 @@
             <PackagePath>\</PackagePath>
         </None>
     </ItemGroup>
-    
+
     <ItemGroup>
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
         <PackageReference Include="System.ValueTuple" Version="4.5.0" />