try msbuild

0xor1 · Dec 5, 2023 · e7b8290 · e7b8290
1 parent 9490e7d
commit e7b8290
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/Common.Server.Test/Common.Server.Test.csproj b/Common.Server.Test/Common.Server.Test.csproj
@@ -15,9 +15,9 @@
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="coverlet.collector" Version="6.0.0">
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        <PackageReference Include="coverlet.msbuild" Version="6.0.0">
             <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="CSharpier.MsBuild" Version="0.26.2">
             <PrivateAssets>all</PrivateAssets>

diff --git a/Common.Shared.Test/Common.Shared.Test.csproj b/Common.Shared.Test/Common.Shared.Test.csproj
@@ -15,9 +15,9 @@
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="coverlet.collector" Version="6.0.0">
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        <PackageReference Include="coverlet.msbuild" Version="6.0.0">
             <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="CSharpier.MsBuild" Version="0.26.2">
             <PrivateAssets>all</PrivateAssets>

diff --git a/bin/pre b/bin/pre
@@ -13,16 +13,16 @@ docker-compose -f docker/docker-compose.yml up -d
 ./bin/wait-for-it -t 60 127.0.0.1:3306 -- echo "mariadb ready"
 
 dotnet build
-dotnet test --collect:"XPlat Code Coverage"
+dotnet test -p:CollectCoverage="true" -p:CoverletOutputFormat="lcov" -p:Exclude="[*]System.Text.RegularExpressions.Generated.*"
 
 if [ "$1" == "gh-actions" ]; then 
   curl -L https://coveralls.io/coveralls-linux.tar.gz | tar -xz
-  ./coveralls report */TestResults/*/coverage.cobertura.xml
+  ./coveralls report */coverage.info
 else
   dotnet tool install -g dotnet-reportgenerator-globaltool
   rm -r test_coverage
-  reportgenerator -reports:"*\TestResults\*\coverage.cobertura.xml " -classfilters:"-System.Text.RegularExpressions.Generated" -targetdir:"test_coverage" -reporttypes:Html
-  rm -r */TestResults
+  reportgenerator -reports:"*\coverage.info" -targetdir:"test_coverage" -reporttypes:Html
+  rm */coverage.info
 fi
 
 docker-compose -f docker/docker-compose.yml stop