Update Dockerfiles to .NET 10

.github/workflows/build.yml

@@ -320,6 +320,10 @@ jobs:
 
       - name: Set up .NET
         uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
+        with:
+          dotnet-version: |
+            8.0.x
+            10.0.x
 
       - name: Log in to GHCR
         uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0

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"

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.5.1"
   }
 }

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/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/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>

src/Events/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/EventsProcessor/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/Icons/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
@@ -36,7 +36,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/Identity/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/Identity/IdentityServer/IUserDecryptionOptionsBuilder.cs

@@ -6,6 +6,7 @@
 using Bit.Core.Entities;
 
 namespace Bit.Identity.IdentityServer;
+
 public interface IUserDecryptionOptionsBuilder
 {
     IUserDecryptionOptionsBuilder ForUser(User user);

src/Identity/IdentityServer/StaticClients/SendClientBuilder.cs

@@ -5,6 +5,7 @@
 using Duende.IdentityServer.Models;
 
 namespace Bit.Identity.IdentityServer.StaticClients;
+
 public static class SendClientBuilder
 {
     public static Client Build(GlobalSettings globalSettings)

src/Infrastructure.EntityFramework/Converters/DataProtectionConverter.cs

@@ -6,6 +6,7 @@
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 namespace Bit.Infrastructure.EntityFramework.Converters;
+
 public class DataProtectionConverter : ValueConverter<string, string>
 {
     public DataProtectionConverter(IDataProtector dataProtector) :

src/Infrastructure.EntityFramework/Dirt/Models/OrganizationApplication.cs

@@ -5,6 +5,7 @@
 using Bit.Infrastructure.EntityFramework.AdminConsole.Models;
 
 namespace Bit.Infrastructure.EntityFramework.Dirt.Models;
+
 public class OrganizationApplication : Core.Dirt.Entities.OrganizationApplication
 {
     public virtual Organization Organization { get; set; }

src/Infrastructure.EntityFramework/Dirt/Models/OrganizationReport.cs

@@ -5,6 +5,7 @@
 using Bit.Infrastructure.EntityFramework.AdminConsole.Models;
 
 namespace Bit.Infrastructure.EntityFramework.Dirt.Models;
+
 public class OrganizationReport : Core.Dirt.Entities.OrganizationReport
 {
     public virtual Organization Organization { get; set; }

src/Notifications/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"

test/Core.Test/AdminConsole/OrganizationAuth/UpdateOrganizationAuthRequestCommandTests.cs

@@ -134,7 +134,7 @@ List<User> users
             organizationUsers[i].UserId = unprocessedAuthRequests[i].UserId;
 
             sutProvider.GetDependency<IUserRepository>().GetByIdAsync(Arg.Is(users[i].Id)).Returns(users[i]);
-        };
+        }
 
         sutProvider.GetDependency<IGlobalSettings>().PasswordlessAuth.AdminRequestExpiration.Returns(TimeSpan.FromDays(7));
 
@@ -205,7 +205,7 @@ User user
             update.Approved = false;
             unprocessedAuthRequest.Id = update.Id;
             unprocessedAuthRequests.Add(unprocessedAuthRequest);
-        };
+        }
 
         sutProvider.GetDependency<IGlobalSettings>().PasswordlessAuth.AdminRequestExpiration.Returns(TimeSpan.FromDays(7));
 

test/Core.Test/Auth/Models/Business/Tokenables/RegistrationEmailVerificationTokenableTests.cs

@@ -2,6 +2,7 @@
 using Bit.Core.Tokens;
 
 namespace Bit.Core.Test.Auth.Models.Business.Tokenables;
+
 using Bit.Core.Auth.Models.Business.Tokenables;
 using Xunit;
 

test/Core.Test/OrganizationFeatures/OrganizationSubscriptionUpdate/AddSecretsManagerSubscriptionCommandTests.cs

@@ -17,6 +17,7 @@
 using Xunit;
 
 namespace Bit.Core.Test.OrganizationFeatures.OrganizationSubscriptionUpdate;
+
 [SutProviderCustomize]
 public class AddSecretsManagerSubscriptionCommandTests
 {

util/Attachments/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"

util/MsSqlMigratorUtility/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
@@ -38,7 +38,7 @@ RUN . /tmp/rid.txt && dotnet publish \
 ###############################################
 #                  App stage                  #
 ###############################################
-FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine3.21 AS app
+FROM mcr.microsoft.com/dotnet/aspnet:10.0-alpine AS app
 
 ARG TARGETPLATFORM
 LABEL com.bitwarden.product="bitwarden"