Add support for dotnet 10 (#2229)

chkr1011 · web-flow · commit 1a3e97afec65 · 2025-12-07T16:24:34.000+01:00
* Add dotnet10 as target framework and fix breaking changes

* Fix tests

* Fix tests for CI

* Fix typo
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,6 +17,7 @@ jobs:
         with:
           dotnet-version: |
             8.0.x
+            10.0.x
 
       - name: Checkout code
         uses: actions/checkout@v4
@@ -48,12 +49,13 @@ jobs:
         with:
           dotnet-version: |
             8.0.x
+            10.0.x
 
       - name: Checkout code
         uses: actions/checkout@v4
 
       - name: Execute tests
-        run: dotnet test --framework net8.0 --configuration Release Source/MQTTnet.Tests/MQTTnet.Tests.csproj
+        run: dotnet test --framework net10.0 --configuration Release Source/MQTTnet.Tests/MQTTnet.Tests.csproj
 
   sign:
     needs: build
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
         <Product>MQTTnet</Product>
         <Authors>The contributors of MQTTnet</Authors>
         <Company>The contributors of MQTTnet</Company>
@@ -11,6 +11,7 @@
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
         <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>disable</Nullable>
 
         <NeutralLanguage>en-US</NeutralLanguage>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -24,10 +25,6 @@
         <AnalysisLevel>latest</AnalysisLevel>
         <AnalysisMode>recommended</AnalysisMode>
         <AnalysisModeStyle>default</AnalysisModeStyle>
-
-        <TestingPlatformShowTestsFailure>true</TestingPlatformShowTestsFailure>
-        <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
-        <EnableMSTestRunner>true</EnableMSTestRunner>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
diff --git a/Samples/Server/Server_TLS_Samples.cs b/Samples/Server/Server_TLS_Samples.cs
@@ -59,10 +59,12 @@ static X509Certificate2 CreateSelfSignedCertificate(string oid)
         certRequest.CertificateExtensions.Add(sanBuilder.Build());
 
         using var certificate = certRequest.CreateSelfSigned(DateTimeOffset.Now.AddMinutes(-10), DateTimeOffset.Now.AddMinutes(10));
+#pragma warning disable SYSLIB0057
         var pfxCertificate = new X509Certificate2(
             certificate.Export(X509ContentType.Pfx),
             (string)null!,
             X509KeyStorageFlags.MachineKeySet | X509KeyStorageFlags.Exportable);
+#pragma warning restore SYSLIB0057
 
         return pfxCertificate;
     }
diff --git a/Source/MQTTnet.Server/Internal/Adapter/MqttTcpServerListener.cs b/Source/MQTTnet.Server/Internal/Adapter/MqttTcpServerListener.cs
@@ -202,9 +202,14 @@ await sslStream.AuthenticateAsServerAsync(
 
                 clientCertificate = sslStream.RemoteCertificate as X509Certificate2;
 
+                // TODO: Check why this export is needed. Is there something else in the RemoteCertificate as a X509Certificate2???
                 if (clientCertificate == null && sslStream.RemoteCertificate != null)
                 {
+                    #if NET10_0_OR_GREATER
+                    clientCertificate = X509CertificateLoader.LoadCertificate(sslStream.RemoteCertificate.Export(X509ContentType.Cert));
+                    #else
                     clientCertificate = new X509Certificate2(sslStream.RemoteCertificate.Export(X509ContentType.Cert));
+                    #endif
                 }
             }
 
diff --git a/Source/MQTTnet.TestApp/MQTTnet.TestApp.csproj b/Source/MQTTnet.TestApp/MQTTnet.TestApp.csproj
@@ -2,7 +2,6 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <DebugType>Full</DebugType>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
diff --git a/Source/MQTTnet.Tests/MQTTnet.Tests.csproj b/Source/MQTTnet.Tests/MQTTnet.Tests.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-
         <OutputType>Exe</OutputType>
         <IsPackable>false</IsPackable>
         <LangVersion>default</LangVersion>
diff --git a/Source/MQTTnet.Tests/Server/HotSwapCerts_Tests.cs b/Source/MQTTnet.Tests/Server/HotSwapCerts_Tests.cs
@@ -122,10 +122,12 @@ static X509Certificate2 CreateSelfSignedCertificate(string oid)
         certRequest.CertificateExtensions.Add(sanBuilder.Build());
 
         using var certificate = certRequest.CreateSelfSigned(DateTimeOffset.Now.AddMinutes(-10), DateTimeOffset.Now.AddMinutes(10));
+#pragma warning disable SYSLIB0057
         var pfxCertificate = new X509Certificate2(
             certificate.Export(X509ContentType.Pfx),
             (string)null,
             X509KeyStorageFlags.MachineKeySet | X509KeyStorageFlags.Exportable);
+#pragma warning restore SYSLIB0057
 
         return pfxCertificate;
     }
diff --git a/Source/MQTTnet.Tests/Server/Load_Tests.cs b/Source/MQTTnet.Tests/Server/Load_Tests.cs
@@ -1,5 +1,6 @@
 #if DEBUG
 
+using System.Globalization;
 using MQTTnet.Internal;
 using MQTTnet.Packets;
 using MQTTnet.Protocol;
@@ -52,7 +53,7 @@ await client.SendAsync(
 
                         for (var j = 0; j < 1000; j++)
                         {
-                            publishPacket.Topic = j.ToString();
+                            publishPacket.Topic = j.ToString(CultureInfo.InvariantCulture);
 
                             await client.SendAsync(publishPacket, CancellationToken.None);
                         }
@@ -139,7 +140,7 @@ public async Task Handle_100_000_Messages_In_Server()
 
                     for (var j = 0; j < 1000; j++)
                     {
-                        var message = applicationMessageBuilder.WithTopic(j.ToString()).Build();
+                        var message = applicationMessageBuilder.WithTopic(j.ToString(CultureInfo.InvariantCulture)).Build();
 
                         await client.PublishAsync(message);
                     }
diff --git a/Source/MQTTnet.Tests/Server/Subscription_TopicHash_Tests.cs b/Source/MQTTnet.Tests/Server/Subscription_TopicHash_Tests.cs
@@ -520,10 +520,11 @@ static int CheckTopicSubscriptions(MqttSession clientSession, List<string> topic
     static byte[] GetBytes(ulong value)
     {
         var bytes = BitConverter.GetBytes(value);
+
         // Ensure that highest byte comes first for comparison left to right
         if (BitConverter.IsLittleEndian)
         {
-            return bytes.Reverse().ToArray();
+            bytes = bytes.AsEnumerable().Reverse().ToArray();
         }
 
         return bytes;
diff --git a/Source/MQTTnet.Tests/Server/Tls_Tests.cs b/Source/MQTTnet.Tests/Server/Tls_Tests.cs
@@ -31,10 +31,12 @@ static X509Certificate2 CreateCertificate(string oid)
         certRequest.CertificateExtensions.Add(sanBuilder.Build());
 
         using var certificate = certRequest.CreateSelfSigned(DateTimeOffset.Now.AddMinutes(-10), DateTimeOffset.Now.AddMinutes(10));
+#pragma warning disable SYSLIB0057
         var pfxCertificate = new X509Certificate2(
             certificate.Export(X509ContentType.Pfx),
             (string)null,
             X509KeyStorageFlags.MachineKeySet | X509KeyStorageFlags.Exportable);
+#pragma warning restore SYSLIB0057
 
         return pfxCertificate;
     }
diff --git a/Source/MQTTnet/Certificates/BlobCertificateProvider.cs b/Source/MQTTnet/Certificates/BlobCertificateProvider.cs
@@ -14,12 +14,25 @@ public class BlobCertificateProvider(byte[] blob) : ICertificateProvider
 
     public X509Certificate2 GetCertificate()
     {
+        #if NET10_0_OR_GREATER
+
+        if (string.IsNullOrEmpty(Password))
+        {
+            return X509CertificateLoader.LoadCertificate(Blob);
+        }
+
+        return X509CertificateLoader.LoadPkcs12(Blob, Password);
+
+        #else
+
         if (string.IsNullOrEmpty(Password))
         {
             // Use a different overload when no password is specified. Otherwise, the constructor will fail.
             return new X509Certificate2(Blob);
         }
 
         return new X509Certificate2(Blob, Password);
+
+        #endif
     }
 }
diff --git a/Source/ReleaseNotes.md b/Source/ReleaseNotes.md
@@ -7,3 +7,4 @@
 * Marked all projects as AOT compatible
 * Restored the strong name of the nugets
 * Embedded license file in all nugets (#2197, thanks to @JensNordenbro)
+* Added support for dotnet10

Original file line number	Diff line number	Diff line change
`@@ -202,9 +202,14 @@ await sslStream.AuthenticateAsServerAsync(`
`202`	`202`
`203`	`203`	`clientCertificate = sslStream.RemoteCertificate as X509Certificate2;`
`204`	`204`
	`205`	`+ // TODO: Check why this export is needed. Is there something else in the RemoteCertificate as a X509Certificate2???`
`205`	`206`	`if (clientCertificate == null && sslStream.RemoteCertificate != null)`
`206`	`207`	`{`
	`208`	`+ #if NET10_0_OR_GREATER`
	`209`	`+ clientCertificate = X509CertificateLoader.LoadCertificate(sslStream.RemoteCertificate.Export(X509ContentType.Cert));`
	`210`	`+ #else`
`207`	`211`	`clientCertificate = new X509Certificate2(sslStream.RemoteCertificate.Export(X509ContentType.Cert));`
	`212`	`+ #endif`
`208`	`213`	`}`
`209`	`214`	`}`
`210`	`215`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`#if DEBUG`
`2`	`2`
	`3`	`+using System.Globalization;`
`3`	`4`	`using MQTTnet.Internal;`
`4`	`5`	`using MQTTnet.Packets;`
`5`	`6`	`using MQTTnet.Protocol;`
`@@ -52,7 +53,7 @@ await client.SendAsync(`
`52`	`53`
`53`	`54`	`for (var j = 0; j < 1000; j++)`
`54`	`55`	`{`
`55`		`- publishPacket.Topic = j.ToString();`
	`56`	`+ publishPacket.Topic = j.ToString(CultureInfo.InvariantCulture);`
`56`	`57`
`57`	`58`	`await client.SendAsync(publishPacket, CancellationToken.None);`
`58`	`59`	`}`
`@@ -139,7 +140,7 @@ public async Task Handle_100_000_Messages_In_Server()`
`139`	`140`
`140`	`141`	`for (var j = 0; j < 1000; j++)`
`141`	`142`	`{`
`142`		`- var message = applicationMessageBuilder.WithTopic(j.ToString()).Build();`
	`143`	`+ var message = applicationMessageBuilder.WithTopic(j.ToString(CultureInfo.InvariantCulture)).Build();`
`143`	`144`
`144`	`145`	`await client.PublishAsync(message);`
`145`	`146`	`}`
Original file line number	Diff line number	Diff line change
`@@ -520,10 +520,11 @@ static int CheckTopicSubscriptions(MqttSession clientSession, List<string> topic`
`520`	`520`	`static byte[] GetBytes(ulong value)`
`521`	`521`	`{`
`522`	`522`	`var bytes = BitConverter.GetBytes(value);`
	`523`	`+`
`523`	`524`	`// Ensure that highest byte comes first for comparison left to right`
`524`	`525`	`if (BitConverter.IsLittleEndian)`
`525`	`526`	`{`
`526`		`- return bytes.Reverse().ToArray();`
	`527`	`+ bytes = bytes.AsEnumerable().Reverse().ToArray();`
`527`	`528`	`}`
`528`	`529`
`529`	`530`	`return bytes;`