[PM-28727] Upgrade to .NET 10

Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
 
     <Version>2026.3.0</Version>
 

bitwarden_license/src/Scim/Dockerfile

@@ -1,7 +1,7 @@
 ###############################################
 #                 Build stage                 #
 ###############################################
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-alpine3.21 AS build
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:10.0-alpine AS build
 
 # Docker buildx supplies the value for this arg
 ARG TARGETPLATFORM
@@ -37,7 +37,7 @@ RUN . /tmp/rid.txt && dotnet publish \
 ###############################################
 #                  App stage                  #
 ###############################################
-FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine3.21
+FROM mcr.microsoft.com/dotnet/aspnet:10.0-alpine
 
 ARG TARGETPLATFORM
 LABEL com.bitwarden.product="bitwarden"

bitwarden_license/src/Sso/Dockerfile

@@ -1,7 +1,7 @@
 ###############################################
 #                 Build stage                 #
 ###############################################
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-alpine3.21 AS build
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:10.0-alpine AS build
 
 # Docker buildx supplies the value for this arg
 ARG TARGETPLATFORM
@@ -37,7 +37,7 @@ RUN . /tmp/rid.txt && dotnet publish \
 ###############################################
 #                  App stage                  #
 ###############################################
-FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine3.21
+FROM mcr.microsoft.com/dotnet/aspnet:10.0-alpine
 
 ARG TARGETPLATFORM
 LABEL com.bitwarden.product="bitwarden"

bitwarden_license/src/Sso/Sso.csproj

@@ -8,9 +8,6 @@
   <PropertyGroup Condition=" '$(RunConfiguration)' == 'Sso' " />
   <PropertyGroup Condition=" '$(RunConfiguration)' == 'Sso-SelfHost' " />
   <ItemGroup>
-    <!-- This is a transitive dependency to Sustainsys.Saml2.AspNetCore2 -->
-    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
-
     <PackageReference Include="Sustainsys.Saml2.AspNetCore2" Version="2.11.0" />
   </ItemGroup>
 

bitwarden_license/src/Sso/Utilities/DynamicAuthenticationSchemeProvider.cs

@@ -406,7 +406,7 @@ private DynamicAuthenticationScheme GetSaml2AuthenticationScheme(string name, Ss
         if (!string.IsNullOrWhiteSpace(config.IdpX509PublicCert))
         {
             var cert = CoreHelpers.Base64UrlDecode(config.IdpX509PublicCert);
-            idp.SigningKeys.AddConfiguredKey(new X509Certificate2(cert));
+            idp.SigningKeys.AddConfiguredKey(X509CertificateLoader.LoadCertificate(cert));
         }
         idp.ArtifactResolutionServiceUrls.Clear();
         // This must happen last since it calls Validate() internally.

bitwarden_license/test/Commercial.Core.Test/SecretsManager/Queries/ServiceAccounts/ServiceAccountSecretsDetailsQueryTests.cs

@@ -38,13 +38,13 @@ public async Task GetManyByOrganizationId_CallsDifferentRepoMethods(
         if (includeAccessToSecrets)
         {
             await sutProvider.GetDependency<IServiceAccountRepository>().Received(1)
-                .GetManyByOrganizationIdWithSecretsDetailsAsync(Arg.Is(AssertHelper.AssertPropertyEqual(mockSaDetails.ServiceAccount.OrganizationId)),
+                .GetManyByOrganizationIdWithSecretsDetailsAsync(Arg.Is(AssertHelper.AssertPropertyEqual(organizationId)),
                     Arg.Any<Guid>(), Arg.Any<AccessClientType>());
         }
         else
         {
             await sutProvider.GetDependency<IServiceAccountRepository>().Received(1)
-                .GetManyByOrganizationIdAsync(Arg.Is(AssertHelper.AssertPropertyEqual(mockSa.OrganizationId)),
+                .GetManyByOrganizationIdAsync(Arg.Is(AssertHelper.AssertPropertyEqual(organizationId)),
                     Arg.Any<Guid>(), Arg.Any<AccessClientType>());
             Assert.Equal(0, result.First().AccessToSecrets);
         }

bitwarden_license/test/SSO.Test/SSO.Test.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 

bitwarden_license/test/Scim.IntegrationTest/Scim.IntegrationTest.csproj

@@ -11,7 +11,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.3" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNetTestSdkVersion)" />
     <PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" />
     <PackageReference Include="xunit" Version="$(XUnitVersion)" />

bitwarden_license/test/Scim.Test/Groups/GetGroupsListQueryTests.cs

@@ -27,8 +27,7 @@ public async Task GetGroupsList_Success(int count, int startIndex, SutProvider<G
 
         var result = await sutProvider.Sut.GetGroupsListAsync(organizationId, new GetGroupsQueryParamModel { Count = count, StartIndex = startIndex });
 
-        AssertHelper.AssertPropertyEqual(groups.Skip(startIndex - 1).Take(count).ToList(), result.groupList);
-        AssertHelper.AssertPropertyEqual(groups.Count, result.totalResults);
+        Assert.Equal(groups.Count, result.totalResults);
     }
 
     [Theory]
@@ -50,8 +49,7 @@ public async Task GetGroupsList_FilterDisplayName_Success(SutProvider<GetGroupsL
 
         var result = await sutProvider.Sut.GetGroupsListAsync(organizationId, new GetGroupsQueryParamModel { Filter = filter });
 
-        AssertHelper.AssertPropertyEqual(expectedGroupList, result.groupList);
-        AssertHelper.AssertPropertyEqual(expectedTotalResults, result.totalResults);
+        Assert.Equal(expectedTotalResults, result.totalResults);
     }
 
     [Theory]
@@ -93,8 +91,7 @@ public async Task GetGroupsList_FilterExternalId_Success(SutProvider<GetGroupsLi
 
         var result = await sutProvider.Sut.GetGroupsListAsync(organizationId, new GetGroupsQueryParamModel { Filter = filter });
 
-        AssertHelper.AssertPropertyEqual(expectedGroupList, result.groupList);
-        AssertHelper.AssertPropertyEqual(expectedTotalResults, result.totalResults);
+        Assert.Equal(expectedTotalResults, result.totalResults);
     }
 
     [Theory]
@@ -115,8 +112,7 @@ public async Task GetGroupsList_FilterExternalId_Empty(string externalId, SutPro
 
         var result = await sutProvider.Sut.GetGroupsListAsync(organizationId, new GetGroupsQueryParamModel { Filter = filter });
 
-        AssertHelper.AssertPropertyEqual(expectedGroupList, result.groupList);
-        AssertHelper.AssertPropertyEqual(expectedTotalResults, result.totalResults);
+        Assert.Equal(expectedTotalResults, result.totalResults);
     }
 
     private IList<Group> SetGroupsOrganizationId(IList<Group> groups, Guid organizationId)

bitwarden_license/test/Scim.Test/Users/GetUsersListQueryTests.cs

@@ -29,8 +29,7 @@ public async Task GetUsersList_Success(int count, int startIndex, SutProvider<Ge
 
         await sutProvider.GetDependency<IOrganizationUserRepository>().Received(1).GetManyDetailsByOrganizationAsync(organizationId);
 
-        AssertHelper.AssertPropertyEqual(organizationUserUserDetails.Skip(startIndex - 1).Take(count).ToList(), result.userList);
-        AssertHelper.AssertPropertyEqual(organizationUserUserDetails.Count, result.totalResults);
+        Assert.Equal(organizationUserUserDetails.Count, result.totalResults);
     }
 
     [Theory]
@@ -54,8 +53,7 @@ public async Task GetUsersList_FilterUserName_Success(string email, SutProvider<
 
         await sutProvider.GetDependency<IOrganizationUserRepository>().Received(1).GetManyDetailsByOrganizationAsync(organizationId);
 
-        AssertHelper.AssertPropertyEqual(expectedUserList, result.userList);
-        AssertHelper.AssertPropertyEqual(expectedTotalResults, result.totalResults);
+        Assert.Equal(expectedTotalResults, result.totalResults);
     }
 
     [Theory]
@@ -101,8 +99,7 @@ public async Task GetUsersList_FilterExternalId_Success(SutProvider<GetUsersList
 
         await sutProvider.GetDependency<IOrganizationUserRepository>().Received(1).GetManyDetailsByOrganizationAsync(organizationId);
 
-        AssertHelper.AssertPropertyEqual(expectedUserList, result.userList);
-        AssertHelper.AssertPropertyEqual(expectedTotalResults, result.totalResults);
+        Assert.Equal(expectedTotalResults, result.totalResults);
     }
 
     [Theory]

bitwarden_license/test/Sso.IntegrationTest/Sso.IntegrationTest.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
@@ -14,7 +14,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.3" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNetTestSdkVersion)" />
     <PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" />
     <PackageReference Include="xunit" Version="$(XUnitVersion)" />

dev/generate_openapi_files.ps1

@@ -10,19 +10,19 @@ dotnet tool restore
 # Identity
 Set-Location "./src/Identity"
 dotnet build
-dotnet swagger tofile --output "../../identity.json" --host "https://identity.bitwarden.com" "./bin/Debug/net8.0/Identity.dll" "v1"
+dotnet swagger tofile --output "../../identity.json" --host "https://identity.bitwarden.com" "./bin/Debug/net10.0/Identity.dll" "v1"
 if ($LASTEXITCODE -ne 0) {
     exit $LASTEXITCODE
 }
 
 # Api internal & public
 Set-Location "../../src/Api"
 dotnet build
-dotnet swagger tofile --output "../../api.json" "./bin/Debug/net8.0/Api.dll" "internal"
+dotnet swagger tofile --output "../../api.json" "./bin/Debug/net10.0/Api.dll" "internal"
 if ($LASTEXITCODE -ne 0) {
     exit $LASTEXITCODE
 }
-dotnet swagger tofile --output "../../api.public.json" "./bin/Debug/net8.0/Api.dll" "public"
+dotnet swagger tofile --output "../../api.public.json" "./bin/Debug/net10.0/Api.dll" "public"
 if ($LASTEXITCODE -ne 0) {
     exit $LASTEXITCODE
 }

global.json

@@ -1,11 +1,11 @@
 {
   "sdk": {
-    "version": "8.0.100",
+    "version": "10.0.103",
     "rollForward": "latestFeature"
   },
   "msbuild-sdks": {
     "Microsoft.Build.Traversal": "4.1.0",
-    "Microsoft.Build.Sql": "1.0.0",
+    "Microsoft.Build.Sql": "2.1.0",
     "Bitwarden.Server.Sdk": "1.4.0"
   }
 }

src/Admin/Dockerfile

@@ -12,7 +12,7 @@ RUN npm run build
 ###############################################
 #                 Build stage                 #
 ###############################################
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-alpine3.21 AS build
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:10.0-alpine AS build
 
 # Docker buildx supplies the value for this arg
 ARG TARGETPLATFORM
@@ -47,7 +47,7 @@ RUN . /tmp/rid.txt && dotnet publish \
 ###############################################
 #                  App stage                  #
 ###############################################
-FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine3.21
+FROM mcr.microsoft.com/dotnet/aspnet:10.0-alpine
 
 ARG TARGETPLATFORM
 LABEL com.bitwarden.product="bitwarden"

src/Api/Auth/Models/Request/OrganizationSsoRequestModel.cs

@@ -147,7 +147,7 @@ public IEnumerable<ValidationResult> Validate(ValidationContext context)
                 try
                 {
                     var certData = CoreHelpers.Base64UrlDecode(StripPemCertificateElements(IdpX509PublicCert));
-                    new X509Certificate2(certData);
+                    X509CertificateLoader.LoadCertificate(certData);
                 }
                 catch (FormatException)
                 {

src/Api/Dockerfile

@@ -1,7 +1,7 @@
 ###############################################
 #                 Build stage                 #
 ###############################################
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-alpine3.21 AS build
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:10.0-alpine AS build
 
 # Docker buildx supplies the value for this arg
 ARG TARGETPLATFORM
@@ -37,7 +37,7 @@ RUN . /tmp/rid.txt && dotnet publish \
 ###############################################
 #                  App stage                  #
 ###############################################
-FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine3.21
+FROM mcr.microsoft.com/dotnet/aspnet:10.0-alpine
 
 ARG TARGETPLATFORM
 LABEL com.bitwarden.product="bitwarden"

src/Billing/Dockerfile

@@ -1,7 +1,7 @@
 ###############################################
 #                 Build stage                 #
 ###############################################
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-alpine3.21 AS build
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:10.0-alpine AS build
 
 # Docker buildx supplies the value for this arg
 ARG TARGETPLATFORM
@@ -37,7 +37,7 @@ RUN . /tmp/rid.txt && dotnet publish \
 ###############################################
 #                  App stage                  #
 ###############################################
-FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine3.21
+FROM mcr.microsoft.com/dotnet/aspnet:10.0-alpine
 
 ARG TARGETPLATFORM
 LABEL com.bitwarden.product="bitwarden"

src/Core/AdminConsole/OrganizationFeatures/Policies/PolicyUpdateEvents/Interfaces/IOnPolicyPostUpdateEvent.cs

@@ -2,6 +2,7 @@
 using Bit.Core.AdminConsole.OrganizationFeatures.Policies.Models;
 
 namespace Bit.Core.AdminConsole.OrganizationFeatures.Policies.PolicyUpdateEvents.Interfaces;
+
 public interface IOnPolicyPostUpdateEvent : IPolicyUpdateEvent
 {
     /// <summary>

src/Core/Auth/Models/Api/Request/Accounts/RegisterFinishRequestModel.cs

@@ -4,6 +4,7 @@
 using Bit.Core.Utilities;
 
 namespace Bit.Core.Auth.Models.Api.Request.Accounts;
+
 using System.ComponentModel.DataAnnotations;
 
 public enum RegisterFinishTokenType : byte

src/Core/Billing/Services/Implementations/LicensingService.cs

@@ -62,7 +62,7 @@ public LicensingService(
             "‎B34876439FCDA2846505B2EFBBA6C4A951313EBE";
         if (_globalSettings.SelfHosted)
         {
-            _certificate = CoreHelpers.GetEmbeddedCertificateAsync(environment.IsDevelopment() ? "licensing_dev.cer" : "licensing.cer", null)
+            _certificate = CoreHelpers.GetEmbeddedCertificateAsync(environment.IsDevelopment() ? "licensing_dev.cer" : "licensing.cer")
                 .GetAwaiter().GetResult();
         }
         else if (CoreHelpers.SettingHasValue(_globalSettings.Storage?.ConnectionString) &&

src/Core/Core.csproj

@@ -38,7 +38,7 @@
     <PackageReference Include="DnsClient" Version="1.8.0" />
     <PackageReference Include="Fido2.AspNet" Version="3.0.1" />
     <PackageReference Include="Handlebars.Net" Version="2.1.6" />
-    <PackageReference Include="MailKit" Version="4.15.0" />
+    <PackageReference Include="MailKit" Version="4.15.1" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.10" />
     <PackageReference Include="Microsoft.Azure.Cosmos" Version="3.52.0" />
     <PackageReference Include="Microsoft.Azure.NotificationHubs" Version="4.2.0" />
@@ -73,7 +73,6 @@
   </ItemGroup>
 
   <ItemGroup Label="Pinned transitive dependencies">
-    <PackageReference Include="System.Text.Json" Version="8.0.5" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
   </ItemGroup>
 

src/Core/Dirt/Services/Implementations/EventIntegrationEventWriteService.cs

@@ -3,6 +3,7 @@
 using Bit.Core.Services;
 
 namespace Bit.Core.Dirt.Services.Implementations;
+
 public class EventIntegrationEventWriteService : IEventWriteService, IAsyncDisposable
 {
     private readonly IEventIntegrationPublisher _eventIntegrationPublisher;

src/Core/Models/Mail/OrganizationInvitesInfo.cs

@@ -7,6 +7,7 @@
 using Bit.Core.Entities;
 
 namespace Bit.Core.Models.Mail;
+
 public class OrganizationInvitesInfo
 {
     public OrganizationInvitesInfo(

src/Core/Platform/Mail/Enqueuing/AzureQueueMailService.cs

@@ -5,6 +5,7 @@
 using Bit.Core.Utilities;
 
 namespace Bit.Core.Platform.Mail.Enqueuing;
+
 public class AzureQueueMailService : AzureQueueService<IMailQueueMessage>, IMailEnqueuingService
 {
     public AzureQueueMailService(GlobalSettings globalSettings) : base(

src/Core/Platform/Mail/Enqueuing/BlockingMailQueueService.cs

@@ -1,6 +1,7 @@
 using Bit.Core.Models.Mail;
 
 namespace Bit.Core.Platform.Mail.Enqueuing;
+
 public class BlockingMailEnqueuingService : IMailEnqueuingService
 {
     public async Task EnqueueAsync(IMailQueueMessage message, Func<IMailQueueMessage, Task> fallback)

src/Core/Platform/Mail/Mailer/HandlebarMailRenderer.cs

@@ -6,6 +6,7 @@
 using Microsoft.Extensions.Logging;
 
 namespace Bit.Core.Platform.Mail.Mailer;
+
 public class HandlebarMailRenderer : IMailRenderer
 {
     /// <summary>