bitwarden · justindbaur · Nov 18, 2025 · Nov 19, 2025 · Nov 19, 2025 · Nov 19, 2025
diff --git a/.github/renovate.json5 b/.github/renovate.json5
@@ -80,11 +80,11 @@
     {
       matchPackageNames: [
         "AutoFixture.AutoNSubstitute",
-        "AutoFixture.Xunit2",
+        "AutoFixture.Xunit3",
         "BenchmarkDotNet",
         "BitPay.Light",
         "Braintree",
-        "coverlet.collector",
+        "Microsoft.Testing.Extensions.CodeCoverage",
         "CsvHelper",
         "Kralizek.AutoFixture.Extensions.MockHttp",
         "Microsoft.AspNetCore.Mvc.Testing",
@@ -98,8 +98,7 @@
         "Stripe.net",
         "Swashbuckle.AspNetCore",
         "Swashbuckle.AspNetCore.SwaggerGen",
-        "xunit",
-        "xunit.runner.visualstudio",
+        "xunit.v3",
       ],
       description: "Billing owned dependencies",
       commitMessagePrefix: "[deps] Billing:",

@@ -136,7 +136,7 @@ jobs:
           # Bitwarden Lite MariaDB
           BW_TEST_DATABASES__4__TYPE: "MySql"
           BW_TEST_DATABASES__4__CONNECTIONSTRING: "server=localhost;port=4306;uid=root;pwd=mariadb-password;database=vault_dev;Allow User Variables=true"
-        run: dotnet test --logger "trx;LogFileName=infrastructure-test-results.trx" /p:CoverletOutputFormatter="cobertura" --collect:"XPlat Code Coverage"
+        run: dotnet test -- --coverage --coverage-output-format cobertura --coverage-output "coverage.cobertura.xml" --report-xunit-trx --report-xunit-trx-filename "infrastructure-test-results.trx"
         shell: pwsh
 
       - name: Print MySQL Logs
@@ -240,17 +240,17 @@ jobs:
              echo "  - SQL project files: src/Sql/"
              echo "  - Download 'report.xml' artifact for full details"
              echo ""
-             
+
              # Show actual SQL differences - exclude database setup commands
              if [ -s "diff.sql" ]; then
                echo "Key SQL differences:"
                # Show meaningful schema differences, filtering out database setup noise
                grep -E "^(CREATE|DROP|ALTER)" diff.sql | grep -v "ALTER DATABASE" | grep -v "DatabaseName" | head -5
                echo ""
              fi
-             
+
              echo "Common causes: naming differences (underscores, case), missing objects, or definition mismatches"
-             
+
              exit 1
            else
              echo "SUCCESS: Database validation passed"

@@ -53,10 +53,10 @@ jobs:
         run: dotnet sln bitwarden-server.sln remove src/Sql/Sql.sqlproj
 
       - name: Test OSS solution
-        run: dotnet test ./test --configuration Debug --logger "trx;LogFileName=oss-test-results.trx" /p:CoverletOutputFormatter="cobertura" --collect:"XPlat Code Coverage"
+        run: dotnet test ./test --configuration Debug -- --coverage --coverage-output-format cobertura --coverage-output "coverage.cobertura.xml" --report-xunit-trx --report-xunit-trx-filename "oss-test-results.trx"
 
       - name: Test Bitwarden solution
-        run: dotnet test ./bitwarden_license/test --configuration Debug --logger "trx;LogFileName=bw-test-results.trx" /p:CoverletOutputFormatter="cobertura" --collect:"XPlat Code Coverage"
+        run: dotnet test ./bitwarden_license/test --configuration Debug -- --coverage --coverage-output-format cobertura --coverage-output "coverage.cobertura.xml" --report-xunit-trx --report-xunit-trx-filename "bw-test-results.trx"
 
       - name: Report test results
         uses: dorny/test-reporter@890a17cecf52a379fc869ab770a71657660be727 # v2.1.0

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -11,23 +11,31 @@
     <Nullable Condition="'$(Nullable)' == '' and '$(IsTestProject)' == 'true'">annotations</Nullable>
     <Nullable Condition="'$(Nullable)' == '' and '$(IsTestProject)' != 'true'">enable</Nullable>
     <TreatWarningsAsErrors Condition="'$(TreatWarningsAsErrors)' == ''">true</TreatWarningsAsErrors>
+    <WarningsNotAsErrors>$(WarningsNotAsErrors);xUnit1051</WarningsNotAsErrors>
   </PropertyGroup>
 
-
+  <PropertyGroup Condition="'$(IsTestProject)' == 'true'">
+    <OutputType>Exe</OutputType>
+    <UseMicrosoftTestingPlatformRunner>true</UseMicrosoftTestingPlatformRunner>
+    <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(IsTestProject)' == 'true'">
+    <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.0.4" />
+  </ItemGroup>
+
   <PropertyGroup>
-    
+
     <MicrosoftNetTestSdkVersion>17.8.0</MicrosoftNetTestSdkVersion>
-
-    <XUnitVersion>2.6.6</XUnitVersion>
-
-    <XUnitRunnerVisualStudioVersion>2.5.6</XUnitRunnerVisualStudioVersion>
-
-    <CoverletCollectorVersion>6.0.0</CoverletCollectorVersion>
-
+
+    <XUnitv3Version>3.0.1</XUnitv3Version>
+
+    <XUnitRunnerVisualStudioVersion>3.1.4</XUnitRunnerVisualStudioVersion>
+
     <NSubstituteVersion>5.1.0</NSubstituteVersion>
-    
-    <AutoFixtureXUnit2Version>4.18.1</AutoFixtureXUnit2Version>
-    
+
+    <AutoFixtureXUnit3Version>4.19.0</AutoFixtureXUnit3Version>
+
     <AutoFixtureAutoNSubstituteVersion>4.18.1</AutoFixtureAutoNSubstituteVersion>
   </PropertyGroup>
-</Project>
+</Project>
@@ -1,6 +1,6 @@
 using System.Reflection;
 using AutoFixture;
-using AutoFixture.Xunit2;
+using AutoFixture.Xunit3;
 using Bit.Core.AdminConsole.Enums.Provider;
 
 namespace Bit.Commercial.Core.Test.AdminConsole.AutoFixture;

diff --git a/bitwarden_license/test/Commercial.Core.Test/Commercial.Core.Test.csproj b/bitwarden_license/test/Commercial.Core.Test/Commercial.Core.Test.csproj
@@ -5,16 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNetTestSdkVersion)" />
-    <PackageReference Include="xunit" Version="$(XUnitVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitRunnerVisualStudioVersion)">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="$(CoverletCollectorVersion)">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
+    <PackageReference Include="xunit.v3" Version="$(XUnitv3Version)" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...tsManager/Queries/AccessPolicies/ProjectServiceAccountsAccessPoliciesUpdatesQueryTests.cs b/...tsManager/Queries/AccessPolicies/ProjectServiceAccountsAccessPoliciesUpdatesQueryTests.cs
@@ -75,11 +75,11 @@ public async Task GetAsync_CurrentAccessPolicies_ReturnsChanges(
 
         Assert.Equal(data.ProjectId, result.ProjectId);
         Assert.Equal(data.OrganizationId, result.OrganizationId);
-        Assert.Single(result.ServiceAccountAccessPolicyUpdates.Where(x =>
-            x.Operation == AccessPolicyOperation.Delete && x.AccessPolicy == currentPolicyToDelete));
-        Assert.Single(result.ServiceAccountAccessPolicyUpdates.Where(x =>
+        Assert.Single(result.ServiceAccountAccessPolicyUpdates, x =>
+            x.Operation == AccessPolicyOperation.Delete && x.AccessPolicy == currentPolicyToDelete);
+        Assert.Single(result.ServiceAccountAccessPolicyUpdates, x =>
             x.Operation == AccessPolicyOperation.Update &&
-            x.AccessPolicy.GrantedProjectId == updatePolicy.GrantedProjectId));
+            x.AccessPolicy.GrantedProjectId == updatePolicy.GrantedProjectId);
         Assert.Equal(result.ServiceAccountAccessPolicyUpdates.Count() - 2,
             result.ServiceAccountAccessPolicyUpdates.Count(x => x.Operation == AccessPolicyOperation.Create));
     }

diff --git a/....Core.Test/SecretsManager/Queries/AccessPolicies/SecretAccessPoliciesUpdatesQueryTests.cs b/....Core.Test/SecretsManager/Queries/AccessPolicies/SecretAccessPoliciesUpdatesQueryTests.cs
@@ -88,27 +88,27 @@ public async Task GetAsync_CurrentAccessPolicies_ReturnsChanges(
         Assert.Equal(data.SecretId, result.SecretId);
         Assert.Equal(data.OrganizationId, result.OrganizationId);
 
-        Assert.Single(result.UserAccessPolicyUpdates.Where(x =>
-            x.Operation == AccessPolicyOperation.Delete && x.AccessPolicy == userPolicyChanges.Delete));
-        Assert.Single(result.UserAccessPolicyUpdates.Where(x =>
+        Assert.Single(result.UserAccessPolicyUpdates, x =>
+            x.Operation == AccessPolicyOperation.Delete && x.AccessPolicy == userPolicyChanges.Delete);
+        Assert.Single(result.UserAccessPolicyUpdates, x =>
             x.Operation == AccessPolicyOperation.Update &&
-            x.AccessPolicy.OrganizationUserId == userPolicyChanges.Update.OrganizationUserId));
+            x.AccessPolicy.OrganizationUserId == userPolicyChanges.Update.OrganizationUserId);
         Assert.Equal(result.UserAccessPolicyUpdates.Count() - 2,
             result.UserAccessPolicyUpdates.Count(x => x.Operation == AccessPolicyOperation.Create));
 
-        Assert.Single(result.GroupAccessPolicyUpdates.Where(x =>
-            x.Operation == AccessPolicyOperation.Delete && x.AccessPolicy == groupPolicyChanges.Delete));
-        Assert.Single(result.GroupAccessPolicyUpdates.Where(x =>
+        Assert.Single(result.GroupAccessPolicyUpdates, x =>
+            x.Operation == AccessPolicyOperation.Delete && x.AccessPolicy == groupPolicyChanges.Delete);
+        Assert.Single(result.GroupAccessPolicyUpdates, x =>
             x.Operation == AccessPolicyOperation.Update &&
-            x.AccessPolicy.GroupId == groupPolicyChanges.Update.GroupId));
+            x.AccessPolicy.GroupId == groupPolicyChanges.Update.GroupId);
         Assert.Equal(result.GroupAccessPolicyUpdates.Count() - 2,
             result.GroupAccessPolicyUpdates.Count(x => x.Operation == AccessPolicyOperation.Create));
 
-        Assert.Single(result.ServiceAccountAccessPolicyUpdates.Where(x =>
-            x.Operation == AccessPolicyOperation.Delete && x.AccessPolicy == serviceAccountPolicyChanges.Delete));
-        Assert.Single(result.ServiceAccountAccessPolicyUpdates.Where(x =>
+        Assert.Single(result.ServiceAccountAccessPolicyUpdates, x =>
+            x.Operation == AccessPolicyOperation.Delete && x.AccessPolicy == serviceAccountPolicyChanges.Delete);
+        Assert.Single(result.ServiceAccountAccessPolicyUpdates, x =>
             x.Operation == AccessPolicyOperation.Update &&
-            x.AccessPolicy.ServiceAccountId == serviceAccountPolicyChanges.Update.ServiceAccountId));
+            x.AccessPolicy.ServiceAccountId == serviceAccountPolicyChanges.Update.ServiceAccountId);
         Assert.Equal(result.ServiceAccountAccessPolicyUpdates.Count() - 2,
             result.ServiceAccountAccessPolicyUpdates.Count(x => x.Operation == AccessPolicyOperation.Create));
     }

diff --git a/...est/SecretsManager/Queries/AccessPolicies/ServiceAccountGrantedPolicyUpdatesQueryTests.cs b/...est/SecretsManager/Queries/AccessPolicies/ServiceAccountGrantedPolicyUpdatesQueryTests.cs
@@ -75,11 +75,11 @@ public async Task GetAsync_CurrentGrantedPolicies_ReturnsChanges(
 
         Assert.Equal(data.ServiceAccountId, result.ServiceAccountId);
         Assert.Equal(data.OrganizationId, result.OrganizationId);
-        Assert.Single(result.ProjectGrantedPolicyUpdates.Where(x =>
-            x.Operation == AccessPolicyOperation.Delete && x.AccessPolicy == currentPolicyToDelete));
-        Assert.Single(result.ProjectGrantedPolicyUpdates.Where(x =>
+        Assert.Single(result.ProjectGrantedPolicyUpdates, x =>
+            x.Operation == AccessPolicyOperation.Delete && x.AccessPolicy == currentPolicyToDelete);
+        Assert.Single(result.ProjectGrantedPolicyUpdates, x =>
             x.Operation == AccessPolicyOperation.Update &&
-            x.AccessPolicy.GrantedProjectId == updatePolicy.GrantedProjectId));
+            x.AccessPolicy.GrantedProjectId == updatePolicy.GrantedProjectId);
         Assert.Equal(result.ProjectGrantedPolicyUpdates.Count() - 2,
             result.ProjectGrantedPolicyUpdates.Count(x => x.Operation == AccessPolicyOperation.Create));
     }

diff --git a/bitwarden_license/test/SSO.Test/Controllers/AccountControllerTest.cs b/bitwarden_license/test/SSO.Test/Controllers/AccountControllerTest.cs
@@ -23,7 +23,6 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
 using NSubstitute;
-using Xunit.Abstractions;
 using AuthenticationOptions = Duende.IdentityServer.Configuration.AuthenticationOptions;
 
 namespace Bit.SSO.Test.Controllers;

diff --git a/bitwarden_license/test/SSO.Test/SSO.Test.csproj b/bitwarden_license/test/SSO.Test/SSO.Test.csproj
@@ -10,16 +10,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNetTestSdkVersion)" />
-      <PackageReference Include="xunit" Version="$(XUnitVersion)" />
-      <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitRunnerVisualStudioVersion)">
-        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        <PrivateAssets>all</PrivateAssets>
-      </PackageReference>
-      <PackageReference Include="coverlet.collector" Version="$(CoverletCollectorVersion)">
-        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        <PrivateAssets>all</PrivateAssets>
-      </PackageReference>
+      <PackageReference Include="xunit.v3" Version="$(XUnitv3Version)" />
       <PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" />
     </ItemGroup>
 

diff --git a/bitwarden_license/test/Scim.IntegrationTest/Controllers/v2/GroupsControllerPatchTests.cs b/bitwarden_license/test/Scim.IntegrationTest/Controllers/v2/GroupsControllerPatchTests.cs
@@ -16,15 +16,15 @@ public GroupsControllerPatchTests(ScimApplicationFactory factory)
         _factory = factory;
     }
 
-    public Task InitializeAsync()
+    public ValueTask InitializeAsync()
     {
         var databaseContext = _factory.GetDatabaseContext();
         _factory.ReinitializeDbForTests(databaseContext);
 
-        return Task.CompletedTask;
+        return ValueTask.CompletedTask;
     }
 
-    Task IAsyncLifetime.DisposeAsync() => Task.CompletedTask;
+    ValueTask IAsyncDisposable.DisposeAsync() => ValueTask.CompletedTask;
 
     [Fact]
     public async Task Patch_ReplaceDisplayName_Success()

diff --git a/bitwarden_license/test/Scim.IntegrationTest/Controllers/v2/GroupsControllerTests.cs b/bitwarden_license/test/Scim.IntegrationTest/Controllers/v2/GroupsControllerTests.cs
@@ -16,14 +16,14 @@ public GroupsControllerTests(ScimApplicationFactory factory)
         _factory = factory;
     }
 
-    public Task InitializeAsync()
+    public ValueTask InitializeAsync()
     {
         var databaseContext = _factory.GetDatabaseContext();
         _factory.ReinitializeDbForTests(databaseContext);
-        return Task.CompletedTask;
+        return ValueTask.CompletedTask;
     }
 
-    Task IAsyncLifetime.DisposeAsync() => Task.CompletedTask;
+    ValueTask IAsyncDisposable.DisposeAsync() => ValueTask.CompletedTask;
 
     [Fact]
     public async Task Get_Success()

diff --git a/bitwarden_license/test/Scim.IntegrationTest/Controllers/v2/UsersControllerTests.cs b/bitwarden_license/test/Scim.IntegrationTest/Controllers/v2/UsersControllerTests.cs
@@ -22,14 +22,14 @@ public UsersControllerTests(ScimApplicationFactory factory)
         _factory = factory;
     }
 
-    public Task InitializeAsync()
+    public ValueTask InitializeAsync()
     {
         var databaseContext = _factory.GetDatabaseContext();
         _factory.ReinitializeDbForTests(databaseContext);
-        return Task.CompletedTask;
+        return ValueTask.CompletedTask;
     }
 
-    Task IAsyncLifetime.DisposeAsync() => Task.CompletedTask;
+    ValueTask IAsyncDisposable.DisposeAsync() => ValueTask.CompletedTask;
 
     [Fact]
     public async Task Get_Success()

diff --git a/bitwarden_license/test/Scim.IntegrationTest/Scim.IntegrationTest.csproj b/bitwarden_license/test/Scim.IntegrationTest/Scim.IntegrationTest.csproj
@@ -1,35 +1,26 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="$(CoverletCollectorVersion)">
-      <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.NET.Test.Sdk" Version="$(MicrosoftNetTestSdkVersion)" />
-    <PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" />
-    <PackageReference Include="xunit" Version="$(XUnitVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitRunnerVisualStudioVersion)">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="AutoFixture.Xunit2" Version="$(AutoFixtureXUnit2Version)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Scim\Scim.csproj" />
-    <ProjectReference Include="..\..\..\test\Common\Common.csproj" />
-    <ProjectReference Include="..\..\..\test\IntegrationTestCommon\IntegrationTestCommon.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Update="Properties\launchSettings.json">
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <CopyToPublishDirectory>Never</CopyToPublishDirectory>
-    </Content>
-  </ItemGroup>
-</Project>
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.10" />
+    <PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" />
+    <PackageReference Include="xunit.v3" Version="$(XUnitv3Version)" />
+    <PackageReference Include="AutoFixture.Xunit3" Version="$(AutoFixtureXUnit3Version)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Scim\Scim.csproj" />
+    <ProjectReference Include="..\..\..\test\Common\Common.csproj" />
+    <ProjectReference Include="..\..\..\test\IntegrationTestCommon\IntegrationTestCommon.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Update="Properties\launchSettings.json">
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToPublishDirectory>Never</CopyToPublishDirectory>
+    </Content>
+  </ItemGroup>
+</Project>
diff --git a/bitwarden_license/test/Scim.Test/Scim.Test.csproj b/bitwarden_license/test/Scim.Test/Scim.Test.csproj
@@ -1,25 +1,16 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNetTestSdkVersion)" />
-    <PackageReference Include="xunit" Version="$(XUnitVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitRunnerVisualStudioVersion)">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="$(CoverletCollectorVersion)">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Scim\Scim.csproj" />
-    <ProjectReference Include="..\..\..\test\Common\Common.csproj" />
-  </ItemGroup>
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="xunit.v3" Version="$(XUnitv3Version)" />
+    <PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Scim\Scim.csproj" />
+    <ProjectReference Include="..\..\..\test\Common\Common.csproj" />
+  </ItemGroup>
+</Project>