Trying code cov report merging for multiple target frameworks

You-World · Nov 7, 2020 · 086a064 · 086a064
1 parent 00857d7
commit 086a064
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -3,4 +3,8 @@
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
+
+  <PropertyGroup Condition="'$(CollectCoverage)' == 'true'">
+    <MergeWith>$(CoverletOutput)/coverage.$(TargetFramework).json</MergeWith>
+  </PropertyGroup>
 </Project>
diff --git a/build.ps1 b/build.ps1
@@ -65,7 +65,7 @@ try {
         # Generate Coverage Report
         Write-Message "Generating Codecov Report"
         Invoke-WebRequest -Uri 'https://codecov.io/bash' -OutFile codecov.sh
-        & bash codecov.sh -f "coverage.info"
+        & bash codecov.sh -f "coverage.*.json"
     }
 
     # Finished

diff --git a/build/Autofac.Build.psm1 b/build/Autofac.Build.psm1
@@ -184,8 +184,7 @@ function Invoke-Test {
                 --configuration Release `
                 --logger:trx `
                 /p:CollectCoverage=true `
-                /p:CoverletOutput="..\..\" `
-                /p:MergeWith="..\..\coverage.json" `
+                /p:CoverletOutput='../../' `
                 /p:CoverletOutputFormat="json%2clcov" `
                 /p:ExcludeByAttribute=CompilerGeneratedAttribute `
                 /p:ExcludeByAttribute=GeneratedCodeAttribute