Update to coverlet 2.6.0 (#2843)

* Update to coverlet 2.6.0 * Only include SourceLink source in coverage report
dotnet · Mar 12, 2019 · 6e1291a · 6e1291a
1 parent 7f0c1ad
commit 6e1291a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 17 deletions.
diff --git a/build/Codecoverage.proj b/build/Codecoverage.proj
@@ -17,8 +17,8 @@
       <_BranchName Condition="'$(_BranchName)' == ''">$(BUILD_SOURCEBRANCHNAME)</_BranchName>
     </PropertyGroup>
 
-    <Message Importance="high" Text="&quot;$(_ReportGeneratorPath)&quot; -reports:$(BaseOutputPath)$(PlatformConfig)\coverage\*.coverage -targetdir:$(BaseOutputPath)$(PlatformConfig)\coverage -reporttypes:Cobertura" />
-    <Exec Command="&quot;$(_ReportGeneratorPath)&quot; -reports:$(BaseOutputPath)$(PlatformConfig)\coverage\*.coverage -targetdir:$(BaseOutputPath)$(PlatformConfig)\coverage -reporttypes:Cobertura" />
+    <Message Importance="high" Text="&quot;$(_ReportGeneratorPath)&quot; -reports:$(BaseOutputPath)$(PlatformConfig)\coverage\*.coverage -targetdir:$(BaseOutputPath)$(PlatformConfig)\coverage -filefilters:+https*;+*.fs -reporttypes:Cobertura" />
+    <Exec Command="&quot;$(_ReportGeneratorPath)&quot; -reports:$(BaseOutputPath)$(PlatformConfig)\coverage\*.coverage -targetdir:$(BaseOutputPath)$(PlatformConfig)\coverage -filefilters:+https*;+*.fs -reporttypes:Cobertura" />
 
     <ItemGroup>
       <_CodecovArgs Include="-f;$(BaseOutputPath)$(PlatformConfig)\coverage\Cobertura.xml" />

diff --git a/build/Dependencies.props b/build/Dependencies.props
@@ -34,7 +34,7 @@
   <PropertyGroup>
     <PublishSymbolsPackageVersion>1.0.0-beta-62824-02</PublishSymbolsPackageVersion>
     <CodecovVersion>1.1.1</CodecovVersion>
-    <CoverletVersion>2.5.1</CoverletVersion>
+    <CoverletVersion>2.6.0</CoverletVersion>
     <ReportGeneratorVersion>4.0.9</ReportGeneratorVersion>
   </PropertyGroup>
 

diff --git a/test/Directory.Build.props b/test/Directory.Build.props
@@ -35,6 +35,7 @@
 
   <PropertyGroup Condition="'$(Coverage)' == 'true'">
       <CollectCoverage>true</CollectCoverage>
+      <SingleHit>true</SingleHit>
       <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <!-- https://github.com/tonerdo/coverlet/issues/72 -->
       <CoverletOutputFormat>opencover</CoverletOutputFormat>
       <CoverletOutput>$(BaseOutputPath)$(PlatformConfig)\coverage\$(MSBuildProjectName).coverage</CoverletOutput>

diff --git a/test/Directory.Build.targets b/test/Directory.Build.targets
@@ -8,18 +8,4 @@
     <AllowedReferenceRelatedFileExtensions>$(AllowedReferenceRelatedFileExtensions);.runtimeconfig.json;.runtimeconfig.dev.json;.deps.json</AllowedReferenceRelatedFileExtensions>  
   </PropertyGroup>
 
-  <!-- Workaround for https://github.com/tonerdo/coverlet/pull/318 -->
-  <Target Name="UpdateTargetPathForCoverage" BeforeTargets="InstrumentModulesNoBuild;InstrumentModulesAfterBuild">
-    <PropertyGroup>
-      <_CoverletOriginalTargetPath>$(TargetPath)</_CoverletOriginalTargetPath>
-      <TargetPath>$([System.IO.Path]::GetDirectoryName($(TargetPath)))\NonExistent.dll</TargetPath>
-    </PropertyGroup>
-  </Target>
-
-  <Target Name="UpdateTargetPathAfterCoverage" AfterTargets="InstrumentModulesNoBuild;InstrumentModulesAfterBuild">
-    <PropertyGroup>
-      <TargetPath>$(_CoverletOriginalTargetPath)</TargetPath>
-    </PropertyGroup>
-  </Target>
-
 </Project>