diff --git a/Common.Server.Test/Common.Server.Test.csproj b/Common.Server.Test/Common.Server.Test.csproj index 8097ffc..96807f3 100644 --- a/Common.Server.Test/Common.Server.Test.csproj +++ b/Common.Server.Test/Common.Server.Test.csproj @@ -15,9 +15,9 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - - runtime; build; native; contentfiles; analyzers; buildtransitive + all + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Common.Shared.Test/Common.Shared.Test.csproj b/Common.Shared.Test/Common.Shared.Test.csproj index 70cbfaf..8faf4db 100644 --- a/Common.Shared.Test/Common.Shared.Test.csproj +++ b/Common.Shared.Test/Common.Shared.Test.csproj @@ -15,9 +15,9 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - - runtime; build; native; contentfiles; analyzers; buildtransitive + all + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/bin/pre b/bin/pre index 90526f5..da60bfb 100644 --- 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 \ No newline at end of file