From faea7b307d4634785e61c3447e786e92235cd9eb Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Mon, 4 Mar 2019 19:06:57 -0600 Subject: [PATCH 1/2] Update to coverlet 2.6.0 --- build/Dependencies.props | 2 +- test/Directory.Build.props | 1 + test/Directory.Build.targets | 14 -------------- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/build/Dependencies.props b/build/Dependencies.props index d2a48f6865..bce591d4ef 100644 --- a/build/Dependencies.props +++ b/build/Dependencies.props @@ -34,7 +34,7 @@ 1.0.0-beta-62824-02 1.1.1 - 2.5.1 + 2.6.0 4.0.9 diff --git a/test/Directory.Build.props b/test/Directory.Build.props index 8e63128b1a..0c7772ca61 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -35,6 +35,7 @@ true + true true opencover $(BaseOutputPath)$(PlatformConfig)\coverage\$(MSBuildProjectName).coverage diff --git a/test/Directory.Build.targets b/test/Directory.Build.targets index 552a873c5a..390295efa9 100644 --- a/test/Directory.Build.targets +++ b/test/Directory.Build.targets @@ -8,18 +8,4 @@ $(AllowedReferenceRelatedFileExtensions);.runtimeconfig.json;.runtimeconfig.dev.json;.deps.json - - - - <_CoverletOriginalTargetPath>$(TargetPath) - $([System.IO.Path]::GetDirectoryName($(TargetPath)))\NonExistent.dll - - - - - - $(_CoverletOriginalTargetPath) - - - \ No newline at end of file From 67524eaa4a0b3c4120bb17c5ec807638bfe88e0e Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Sun, 10 Mar 2019 10:54:39 -0500 Subject: [PATCH 2/2] Only include SourceLink source in coverage report --- build/Codecoverage.proj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/Codecoverage.proj b/build/Codecoverage.proj index e0b3355aa1..598b3fd393 100644 --- a/build/Codecoverage.proj +++ b/build/Codecoverage.proj @@ -17,8 +17,8 @@ <_BranchName Condition="'$(_BranchName)' == ''">$(BUILD_SOURCEBRANCHNAME) - - + + <_CodecovArgs Include="-f;$(BaseOutputPath)$(PlatformConfig)\coverage\Cobertura.xml" />