diff --git a/ci-test.ps1 b/ci-test.ps1 index 35a9b4646..d0be1e1a8 100644 --- a/ci-test.ps1 +++ b/ci-test.ps1 @@ -17,7 +17,7 @@ if ($codecov -eq 'true') { # Allow toggling of profile to workaround any potential JIT errors caused by code injection. dotnet clean -c $codecovProfile - dotnet test -c $codecovProfile -f $targetFramework /p:codecov=true + dotnet test -collect:"XPlat Code Coverage" -settings .\tests\coverlet.runsettings -configuration $codecovProfile -framework $targetFramework } elseif ($platform -eq '-x86' -and $targetFramework -match $netFxRegex) { @@ -34,4 +34,4 @@ elseif ($platform -eq '-x86' -and $targetFramework -match $netFxRegex) { else { dotnet test --no-build -c Release -f $targetFramework -} \ No newline at end of file +} diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props index 64f79e324..07d333276 100644 --- a/tests/Directory.Build.props +++ b/tests/Directory.Build.props @@ -32,7 +32,6 @@ - diff --git a/tests/Directory.Build.targets b/tests/Directory.Build.targets index 137a7a030..bacaaa709 100644 --- a/tests/Directory.Build.targets +++ b/tests/Directory.Build.targets @@ -23,30 +23,14 @@ - - - - true - true - [SixLabors.*]* - lcov - - $(MSBuildThisFileDirectory)..\ - $(CoverletOutputPath)$(AssemblyName).$(TargetFramework).lcov - - - true - - - - + - + diff --git a/tests/coverlet.runsettings b/tests/coverlet.runsettings new file mode 100644 index 000000000..ee408a5f0 --- /dev/null +++ b/tests/coverlet.runsettings @@ -0,0 +1,14 @@ + + + + + + + lcov + [SixLabors.*]* + true + + + + +