Switch to MTP for coverage

2025-12-16 16:23:31 +00:00 · 2025-11-19 09:45:19 -05:00
parent 76b463cc99
commit c004529c47
25 changed files with 91 additions and 170 deletions
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -84,7 +84,7 @@
        "BenchmarkDotNet",
        "BitPay.Light",
        "Braintree",
-        "coverlet.collector",
+        "Microsoft.Testing.Extensions.CodeCoverage",
        "CsvHelper",
        "Kralizek.AutoFixture.Extensions.MockHttp",
        "Microsoft.AspNetCore.Mvc.Testing",
--- a/.github/workflows/test-database.yml
+++ b/.github/workflows/test-database.yml
@@ -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 "test-results.trx"
        shell: pwsh

      - name: Print MySQL Logs
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -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 "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 "test-results.trx"

      - name: Report test results
        uses: dorny/test-reporter@890a17cecf52a379fc869ab770a71657660be727 # v2.1.0
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -20,6 +20,10 @@
    <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>
@@ -28,8 +32,6 @@

    <XUnitRunnerVisualStudioVersion>3.1.4</XUnitRunnerVisualStudioVersion>

-    <CoverletCollectorVersion>6.0.0</CoverletCollectorVersion>
-
    <NSubstituteVersion>5.1.0</NSubstituteVersion>

    <AutoFixtureXUnit3Version>4.19.0</AutoFixtureXUnit3Version>
--- a/bitwarden_license/test/Commercial.Core.Test/Commercial.Core.Test.csproj
+++ b/bitwarden_license/test/Commercial.Core.Test/Commercial.Core.Test.csproj
@@ -6,10 +6,6 @@

  <ItemGroup>
    <PackageReference Include="xunit.v3" Version="$(XUnitv3Version)" />
-    <PackageReference Include="coverlet.collector" Version="$(CoverletCollectorVersion)">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
  </ItemGroup>

  <ItemGroup>
--- a/bitwarden_license/test/SSO.Test/SSO.Test.csproj
+++ b/bitwarden_license/test/SSO.Test/SSO.Test.csproj
@@ -11,10 +11,6 @@

    <ItemGroup>
      <PackageReference Include="xunit.v3" Version="$(XUnitv3Version)" />
-      <PackageReference Include="coverlet.collector" Version="$(CoverletCollectorVersion)">
-        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        <PrivateAssets>all</PrivateAssets>
-      </PackageReference>
      <PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" />
    </ItemGroup>

--- a/bitwarden_license/test/Scim.IntegrationTest/Scim.IntegrationTest.csproj
+++ b/bitwarden_license/test/Scim.IntegrationTest/Scim.IntegrationTest.csproj
@@ -5,10 +5,6 @@
  </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="NSubstitute" Version="$(NSubstituteVersion)" />
    <PackageReference Include="xunit.v3" Version="$(XUnitv3Version)" />
--- a/bitwarden_license/test/Scim.Test/Scim.Test.csproj
+++ b/bitwarden_license/test/Scim.Test/Scim.Test.csproj
@@ -6,10 +6,6 @@

  <ItemGroup>
    <PackageReference Include="xunit.v3" Version="$(XUnitv3Version)" />
-    <PackageReference Include="coverlet.collector" Version="$(CoverletCollectorVersion)">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
    <PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" />
  </ItemGroup>

--- a/test/Admin.Test/Admin.Test.csproj
+++ b/test/Admin.Test/Admin.Test.csproj
@@ -4,10 +4,6 @@
    <RootNamespace>Admin.Test</RootNamespace>
  </PropertyGroup>
  <ItemGroup>
-    <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>
--- a/test/Api.IntegrationTest/Api.IntegrationTest.csproj
+++ b/test/Api.IntegrationTest/Api.IntegrationTest.csproj
@@ -5,10 +5,6 @@

  <ItemGroup>
    <PackageReference Include="xunit.v3" Version="$(XUnitv3Version)" />
-    <PackageReference Include="coverlet.collector" Version="$(CoverletCollectorVersion)">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
  </ItemGroup>

  <ItemGroup>
--- a/test/Api.Test/Api.Test.csproj
+++ b/test/Api.Test/Api.Test.csproj
@@ -5,10 +5,6 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="$(CoverletCollectorVersion)">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
    <PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" />
    <PackageReference Include="xunit.v3" Version="$(XUnitv3Version)" />
    <PackageReference Include="AutoFixture.Xunit3" Version="$(AutoFixtureXUnit3Version)" />
--- a/test/Billing.Test/Billing.Test.csproj
+++ b/test/Billing.Test/Billing.Test.csproj
@@ -7,10 +7,6 @@
  <ItemGroup>
    <PackageReference Include="RichardSzalay.MockHttp" Version="7.0.0" />
    <PackageReference Include="xunit.v3" Version="$(XUnitv3Version)" />
-    <PackageReference Include="coverlet.collector" Version="$(CoverletCollectorVersion)">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
    <PackageReference Include="AutoFixture.Xunit3" Version="$(AutoFixtureXUnit3Version)" />
    <PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" />
  </ItemGroup>
--- a/test/Core.IntegrationTest/Core.IntegrationTest.csproj
+++ b/test/Core.IntegrationTest/Core.IntegrationTest.csproj
@@ -10,7 +10,6 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="6.0.4" />
    <PackageReference Include="MartinCostello.Logging.XUnit.v3" Version="0.6.0" />
    <PackageReference Include="Rnwood.SmtpServer" Version="3.1.0-ci0868" />
    <PackageReference Include="xunit.v3" Version="$(XUnitv3Version)" />
--- a/test/Core.Test/Core.Test.csproj
+++ b/test/Core.Test/Core.Test.csproj
@@ -4,10 +4,6 @@
    <RootNamespace>Bit.Core.Test</RootNamespace>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="$(CoverletCollectorVersion)">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
    <PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" />
    <PackageReference Include="xunit.v3" Version="$(XUnitv3Version)" />
    <PackageReference Include="AutoFixture.Xunit3" Version="$(AutoFixtureXUnit3Version)" />
--- a/test/Events.IntegrationTest/Events.IntegrationTest.csproj
+++ b/test/Events.IntegrationTest/Events.IntegrationTest.csproj
@@ -9,10 +9,6 @@

  <ItemGroup>
    <PackageReference Include="xunit.v3" Version="$(XUnitv3Version)" />
-    <PackageReference Include="coverlet.collector" Version="$(CoverletCollectorVersion)">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
  </ItemGroup>

  <ItemGroup>
--- a/test/Events.Test/Events.Test.csproj
+++ b/test/Events.Test/Events.Test.csproj
@@ -4,10 +4,6 @@
    <RootNamespace>Events.Test</RootNamespace>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="$(CoverletCollectorVersion)">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
    <PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" />
    <PackageReference Include="xunit.v3" Version="$(XUnitv3Version)" />
  </ItemGroup>
--- a/test/EventsProcessor.Test/EventsProcessor.Test.csproj
+++ b/test/EventsProcessor.Test/EventsProcessor.Test.csproj
@@ -4,10 +4,6 @@
    <RootNamespace>EventsProcessor.Test</RootNamespace>
  </PropertyGroup>
  <ItemGroup>
-    <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>
--- a/test/Icons.Test/Icons.Test.csproj
+++ b/test/Icons.Test/Icons.Test.csproj
@@ -5,10 +5,6 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="$(CoverletCollectorVersion)">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
    <PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" />
    <PackageReference Include="xunit.v3" Version="$(XUnitv3Version)" />
  </ItemGroup>
--- a/test/Identity.IntegrationTest/Identity.IntegrationTest.csproj
+++ b/test/Identity.IntegrationTest/Identity.IntegrationTest.csproj
@@ -6,10 +6,6 @@

  <PropertyGroup Condition=" '$(RunConfiguration)' == 'Identity.IntegrationTest' " />
  <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="NSubstitute" Version="$(NSubstituteVersion)" />
    <PackageReference Include="xunit.v3" Version="$(XUnitv3Version)" />
--- a/test/Identity.Test/Identity.Test.csproj
+++ b/test/Identity.Test/Identity.Test.csproj
@@ -5,10 +5,6 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="$(CoverletCollectorVersion)">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
    <PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" />
    <PackageReference Include="xunit.v3" Version="$(XUnitv3Version)" />
    <PackageReference Include="AutoFixture.Xunit3" Version="$(AutoFixtureXUnit3Version)" />
--- a/test/Infrastructure.Dapper.Test/Infrastructure.Dapper.Test.csproj
+++ b/test/Infrastructure.Dapper.Test/Infrastructure.Dapper.Test.csproj
@@ -9,10 +9,6 @@

  <ItemGroup>
    <PackageReference Include="xunit.v3" Version="$(XUnitv3Version)" />
-    <PackageReference Include="coverlet.collector" Version="6.0.4">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
  </ItemGroup>

  <ItemGroup>
--- a/test/Infrastructure.EFIntegration.Test/Infrastructure.EFIntegration.Test.csproj
+++ b/test/Infrastructure.EFIntegration.Test/Infrastructure.EFIntegration.Test.csproj
@@ -3,10 +3,6 @@
    <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="NSubstitute" Version="$(NSubstituteVersion)" />
    <PackageReference Include="xunit.v3" Version="$(XUnitv3Version)" />
    <PackageReference Include="AutoFixture.Xunit3" Version="$(AutoFixtureXUnit3Version)" />
--- a/test/Infrastructure.IntegrationTest/Infrastructure.IntegrationTest.csproj
+++ b/test/Infrastructure.IntegrationTest/Infrastructure.IntegrationTest.csproj
@@ -12,10 +12,6 @@
    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
    <PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" Version="8.10.0" />
    <PackageReference Include="xunit.v3" Version="3.0.1" />
-    <PackageReference Include="coverlet.collector" Version="$(CoverletCollectorVersion)">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
  </ItemGroup>

  <ItemGroup>
--- a/test/Notifications.Test/Notifications.Test.csproj
+++ b/test/Notifications.Test/Notifications.Test.csproj
@@ -4,10 +4,6 @@
    <RootNamespace>Notifications.Test</RootNamespace>
  </PropertyGroup>
  <ItemGroup>
-    <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>
--- a/test/SharedWeb.Test/SharedWeb.Test.csproj
+++ b/test/SharedWeb.Test/SharedWeb.Test.csproj
@@ -4,10 +4,6 @@
    <RootNamespace>SharedWeb.Test</RootNamespace>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="$(CoverletCollectorVersion)">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
    <PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" />
    <PackageReference Include="xunit.v3" Version="$(XUnitv3Version)" />
  </ItemGroup>