Switch to coverlet

Switch to coverlet for code coverage from OpenCover.

Author: martincostello

build/common.props

@@ -11,4 +11,12 @@
     <DebugType>portable</DebugType>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <CollectCoverage>true</CollectCoverage>
+    <CoverletOutput>$(OutputPath)/</CoverletOutput>
+    <CoverletOutputFormat>cobertura,json</CoverletOutputFormat>
+    <Exclude>[Mvc.Client*]*,[xunit.*]*</Exclude>
+    <ExcludeByAttribute>System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute</ExcludeByAttribute>
+  </PropertyGroup>
+
 </Project>

build/dependencies.props

@@ -2,21 +2,21 @@
 
   <PropertyGroup Label="Package Versions">
     <AspNetCoreVersion>3.0.0-preview6.19307.2</AspNetCoreVersion>
+    <CoverletVersion>2.6.2</CoverletVersion>
     <DotNetTestSdkVersion>16.2.0-preview-20190606-02</DotNetTestSdkVersion>
     <GoogleProviderVersion>3.0.0-preview6.19307.2</GoogleProviderVersion>
     <JetBrainsVersion>2019.1.1</JetBrainsVersion>
     <JustEatHttpClientInterceptionVersion>2.0.1</JustEatHttpClientInterceptionVersion>
     <MartinCostelloLoggingXUnitVersion>0.1.0</MartinCostelloLoggingXUnitVersion>
     <MicrosoftSourceLinkGitHubVersion>1.0.0-beta2-19270-01</MicrosoftSourceLinkGitHubVersion>
-    <OpenCoverVersion>4.7.922</OpenCoverVersion>
     <ReportGeneratorVersion>4.1.10</ReportGeneratorVersion>
     <ShouldlyVersion>3.0.2</ShouldlyVersion>
     <TwitterProviderVersion>3.0.0-preview6.19307.2</TwitterProviderVersion>
     <XunitVersion>2.4.1</XunitVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="OpenCover" Version="$(OpenCoverVersion)" PrivateAssets="All" />
+    <PackageReference Include="coverlet.msbuild" Version="$(CoverletVersion)" PrivateAssets="All" />
     <PackageReference Include="ReportGenerator" Version="$(ReportGeneratorVersion)" PrivateAssets="All" />
   </ItemGroup>
 

run.ps1

@@ -110,42 +110,17 @@ function DotNetTest {
         $propsFile = Join-Path $solutionPath "build"
         $propsFile = Join-Path $propsFile "dependencies.props"
 
-        $openCoverVersion = (Select-Xml -Path $propsFile -XPath "//OpenCoverVersion").Node.'#text'
-        $openCoverPath = Join-Path $nugetPath "OpenCover\$openCoverVersion\tools\OpenCover.Console.exe"
-
         $reportGeneratorVersion = (Select-Xml -Path $propsFile -XPath "//ReportGeneratorVersion").Node.'#text'
         $reportGeneratorPath = Join-Path $nugetPath "ReportGenerator\$reportGeneratorVersion\tools\netcoreapp2.0\ReportGenerator.dll"
 
-        $coverageOutput = Join-Path $OutputPath "code-coverage.xml"
+        $coverageOutput = Join-Path $OutputPath "coverage.cobertura.xml"
         $reportOutput = Join-Path $OutputPath "coverage"
 
         if ($null -ne $env:TF_BUILD) {
-            & $openCoverPath `
-                `"-target:$dotnetPath`" `
-                `"-targetargs:test $Project --output $OutputPath --logger trx`" `
-                -output:$coverageOutput `
-                `"-excludebyattribute:System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage*`" `
-                -hideskipped:All `
-                -mergebyhash `
-                -mergeoutput `
-                -oldstyle `
-                -register:user `
-                -skipautoprops `
-                `"-filter:+[AspNet.Security.OAuth.*]* -[AspNet.Security.OAuth.Providers.Tests]*`"
+            & $dotnetPath test $Project --output $OutputPath --logger trx
         }
         else {
-            & $openCoverPath `
-                `"-target:$dotnetPath`" `
-                `"-targetargs:test $Project --output $OutputPath`" `
-                -output:$coverageOutput `
-                `"-excludebyattribute:System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage*`" `
-                -hideskipped:All `
-                -mergebyhash `
-                -mergeoutput `
-                -oldstyle `
-                -register:user `
-                -skipautoprops `
-                `"-filter:+[AspNet.Security.OAuth.*]* -[AspNet.Security.OAuth.Providers.Tests]*`"
+            & $dotnetPath test $Project --output $OutputPath
         }
 
         $dotNetTestExitCode = $LASTEXITCODE
@@ -154,7 +129,7 @@ function DotNetTest {
             $reportGeneratorPath `
             `"-reports:$coverageOutput`" `
             `"-targetdir:$reportOutput`" `
-            -reporttypes:HTML`;Cobertura `
+            -reporttypes:HTML `
             -verbosity:Warning
     }