[PM-38502] .NET 10 upgrade (#274)

mzieniukbw · web-flow · commit 46c1a3c89c34 · 2026-06-11T13:42:49.000+02:00
* .NET 10 upgrade

* migrated deprecated X509Certificate2
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
 
     <Version>2025.11.0</Version>
   </PropertyGroup>
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.100",
+    "version": "10.0.100",
     "rollForward": "latestFeature"
   }
 }
diff --git a/src/KeyConnector/Dockerfile b/src/KeyConnector/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/aspnet:8.0-noble
+FROM mcr.microsoft.com/dotnet/aspnet:10.0-noble
 
 LABEL com.bitwarden.product="bitwarden"
 
diff --git a/src/KeyConnector/KeyConnector.csproj b/src/KeyConnector/KeyConnector.csproj
@@ -15,21 +15,21 @@
     <PackageReference Include="Azure.Storage.Blobs" Version="[12.19.1]"/>
     <PackageReference Include="Google.Cloud.Kms.V1" Version="[3.7.0]"/>
     <PackageReference Include="JsonFlatFileDataStore" Version="[2.4.2]"/>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="[8.0.27]"/>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="[8.0.11]">
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="[10.0.8]"/>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="[8.0.27]">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[8.0.11]"/>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="[8.0.2]"/>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="[8.0.2]"/>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[8.0.27]"/>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="[8.0.27]"/>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="[8.0.27]"/>
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="[8.0.11]"/>
     <PackageReference Include="Pkcs11Interop" Version="[5.1.2]"/>
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="[8.0.1]"/>
-    <PackageReference Include="Serilog.AspNetCore" Version="[8.0.1]"/>
-    <PackageReference Include="Serilog.Settings.Configuration" Version="[8.0.0]"/>
-    <PackageReference Include="Serilog.Sinks.Console" Version="[5.0.1]"/>
-    <PackageReference Include="Serilog.Sinks.File" Version="[5.0.0]"/>
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="[8.0.3]"/>
+    <PackageReference Include="Serilog.AspNetCore" Version="[10.0.0]"/>
+    <PackageReference Include="Serilog.Settings.Configuration" Version="[10.0.0]"/>
+    <PackageReference Include="Serilog.Sinks.Console" Version="[6.1.1]"/>
+    <PackageReference Include="Serilog.Sinks.File" Version="[7.0.0]"/>
     <PackageReference Include="VaultSharp" Version="[1.7.0]"/>
   </ItemGroup>
 
diff --git a/src/KeyConnector/Services/CertificateProviders/AzureKeyVaultCertificateProviderService.cs b/src/KeyConnector/Services/CertificateProviders/AzureKeyVaultCertificateProviderService.cs
@@ -39,7 +39,7 @@ public async Task<X509Certificate2> GetCertificateAsync()
                     StringComparison.InvariantCultureIgnoreCase))
                 {
                     var pfxBytes = Convert.FromBase64String(secret.Value);
-                    return new X509Certificate2(pfxBytes);
+                    return X509CertificateLoader.LoadPkcs12(pfxBytes, null);
                 }
             }
             return null;
diff --git a/src/KeyConnector/Services/CertificateProviders/AzureStorageCertificateProviderService.cs b/src/KeyConnector/Services/CertificateProviders/AzureStorageCertificateProviderService.cs
@@ -29,7 +29,7 @@ public async Task<X509Certificate2> GetCertificateAsync()
             {
                 using var stream = new MemoryStream();
                 await blobClient.DownloadToAsync(stream, CancellationToken.None);
-                return new X509Certificate2(stream.ToArray(), _settings.Certificate.AzureStorageFilePassword);
+                return X509CertificateLoader.LoadPkcs12(stream.ToArray(), _settings.Certificate.AzureStorageFilePassword);
             }
             return null;
         }
diff --git a/src/KeyConnector/Services/CertificateProviders/FilesystemCertificateProviderService.cs b/src/KeyConnector/Services/CertificateProviders/FilesystemCertificateProviderService.cs
@@ -14,7 +14,7 @@ public FilesystemCertificateProviderService(KeyConnectorSettings settings)
 
         public Task<X509Certificate2> GetCertificateAsync()
         {
-            var cert = new X509Certificate2(_settings.Certificate.FilesystemPath,
+            var cert = X509CertificateLoader.LoadPkcs12FromFile(_settings.Certificate.FilesystemPath,
                 _settings.Certificate.FilesystemPassword);
             return Task.FromResult(cert);
         }
diff --git a/src/KeyConnector/Services/CertificateProviders/HashicorpVaultCertificateProviderService.cs b/src/KeyConnector/Services/CertificateProviders/HashicorpVaultCertificateProviderService.cs
@@ -36,7 +36,7 @@ public async Task<X509Certificate2> GetCertificateAsync()
             if (secret?.Data?.Data?.ContainsKey(_settings.Certificate.VaultSecretDataKey) ?? false)
             {
                 var certData = secret.Data.Data[_settings.Certificate.VaultSecretDataKey] as string;
-                return new X509Certificate2(Convert.FromBase64String(certData),
+                return X509CertificateLoader.LoadPkcs12(Convert.FromBase64String(certData),
                     _settings.Certificate.VaultSecretFilePassword);
             }
             else
diff --git a/test/KeyConnector.Tests/KeyConnector.Tests.csproj b/test/KeyConnector.Tests/KeyConnector.Tests.csproj
@@ -13,8 +13,8 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="[18.6.0]" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="[8.0.27]" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="[8.0.0]" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="[10.0.8]" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="[10.0.8]" />
     <PackageReference Include="NSubstitute" Version="[5.3.0]" />
     <PackageReference Include="Testcontainers.MariaDb" Version="[4.12.0]" />
     <PackageReference Include="Testcontainers.MsSql" Version="[4.12.0]" />
diff --git a/test/KeyConnector.Tests/Services/CertificateProviders/StoreCertificateProviderServiceTests.cs b/test/KeyConnector.Tests/Services/CertificateProviders/StoreCertificateProviderServiceTests.cs
@@ -16,7 +16,7 @@ public class StoreCertificateProviderServiceTests
     [Fact]
     public async Task GetCertificateAsync_ReturnsCertificate_WhenThumbprintExists()
     {
-        var cert = new X509Certificate2(TestCertificateData.PfxBytes, TestCertificateData.Password);
+        var cert = X509CertificateLoader.LoadPkcs12(TestCertificateData.PfxBytes, TestCertificateData.Password);
         var collection = new X509Certificate2Collection(cert);
         _storeFactory.FindByThumbprint(cert.Thumbprint).Returns(collection);
         var sut = new StoreCertificateProviderService(

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "8.0.100",`
	`3`	`+ "version": "10.0.100",`
`4`	`4`	`"rollForward": "latestFeature"`
`5`	`5`	`}`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM mcr.microsoft.com/dotnet/aspnet:8.0-noble`
	`1`	`+FROM mcr.microsoft.com/dotnet/aspnet:10.0-noble`
`2`	`2`
`3`	`3`	`LABEL com.bitwarden.product="bitwarden"`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public async Task<X509Certificate2> GetCertificateAsync()`
`39`	`39`	`StringComparison.InvariantCultureIgnoreCase))`
`40`	`40`	`{`
`41`	`41`	`var pfxBytes = Convert.FromBase64String(secret.Value);`
`42`		`- return new X509Certificate2(pfxBytes);`
	`42`	`+ return X509CertificateLoader.LoadPkcs12(pfxBytes, null);`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public async Task<X509Certificate2> GetCertificateAsync()`
`29`	`29`	`{`
`30`	`30`	`using var stream = new MemoryStream();`
`31`	`31`	`await blobClient.DownloadToAsync(stream, CancellationToken.None);`
`32`		`- return new X509Certificate2(stream.ToArray(), _settings.Certificate.AzureStorageFilePassword);`
	`32`	`+ return X509CertificateLoader.LoadPkcs12(stream.ToArray(), _settings.Certificate.AzureStorageFilePassword);`
`33`	`33`	`}`
`34`	`34`	`return null;`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public FilesystemCertificateProviderService(KeyConnectorSettings settings)`
`14`	`14`
`15`	`15`	`public Task<X509Certificate2> GetCertificateAsync()`
`16`	`16`	`{`
`17`		`- var cert = new X509Certificate2(_settings.Certificate.FilesystemPath,`
	`17`	`+ var cert = X509CertificateLoader.LoadPkcs12FromFile(_settings.Certificate.FilesystemPath,`
`18`	`18`	`_settings.Certificate.FilesystemPassword);`
`19`	`19`	`return Task.FromResult(cert);`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public async Task<X509Certificate2> GetCertificateAsync()`
`36`	`36`	`if (secret?.Data?.Data?.ContainsKey(_settings.Certificate.VaultSecretDataKey) ?? false)`
`37`	`37`	`{`
`38`	`38`	`var certData = secret.Data.Data[_settings.Certificate.VaultSecretDataKey] as string;`
`39`		`- return new X509Certificate2(Convert.FromBase64String(certData),`
	`39`	`+ return X509CertificateLoader.LoadPkcs12(Convert.FromBase64String(certData),`
`40`	`40`	`_settings.Certificate.VaultSecretFilePassword);`
`41`	`41`	`}`
`42`	`42`	`else`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public class StoreCertificateProviderServiceTests`
`16`	`16`	`[Fact]`
`17`	`17`	`public async Task GetCertificateAsync_ReturnsCertificate_WhenThumbprintExists()`
`18`	`18`	`{`
`19`		`- var cert = new X509Certificate2(TestCertificateData.PfxBytes, TestCertificateData.Password);`
	`19`	`+ var cert = X509CertificateLoader.LoadPkcs12(TestCertificateData.PfxBytes, TestCertificateData.Password);`
`20`	`20`	`var collection = new X509Certificate2Collection(cert);`
`21`	`21`	`_storeFactory.FindByThumbprint(cert.Thumbprint).Returns(collection);`
`22`	`22`	`var sut = new StoreCertificateProviderService(`