Update code coverage integration

Author: sharwell

build/Codecoverage.proj

@@ -6,29 +6,24 @@
   </PropertyGroup>
 
   <ItemGroup>
-      <PackageReference Include="Codecov" Version="$(CodecovVersion)" />
-      <PackageReference Include="ReportGenerator" Version="$(ReportGeneratorVersion)" />
+    <PackageReference Include="Codecov" Version="$(CodecovVersion)" GeneratePathProperty="true" />
+    <PackageReference Include="ReportGenerator" Version="$(ReportGeneratorVersion)" GeneratePathProperty="true" />
   </ItemGroup>
-  <Target Name="Codecov" DependsOnTargets="Restore">
+
+  <Target Name="Codecov">
     <PropertyGroup>
-      <_CodecovPath>$(RestorePackagesPath)codecov\$(CodecovVersion)\tools\Codecov.exe</_CodecovPath>
-      <_ReportGeneratorPath>$(RestorePackagesPath)reportgenerator\$(ReportGeneratorVersion)\tools\net47\ReportGenerator.exe</_ReportGeneratorPath>
-      <_BranchName Condition="'$(_BranchName)' == ''">$(SYSTEM_PULLREQUEST_SOURCEBRANCH)</_BranchName>
-      <_BranchName Condition="'$(_BranchName)' == ''">$(BUILD_SOURCEBRANCHNAME)</_BranchName>
+      <_CodecovPath>$(PkgCodecov)\tools\Codecov.exe</_CodecovPath>
+      <_ReportGeneratorPath>$(PkgReportGenerator)\tools\net47\ReportGenerator.exe</_ReportGeneratorPath>
     </PropertyGroup>
 
     <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" />
-      <_CodecovArgs Include="-r;$(BUILD_REPOSITORY_NAME)" Condition="'$(BUILD_REPOSITORY_NAME)' != ''" />
-      <_CodecovArgs Include="--pr;$(SYSTEM_PULLREQUEST_PULLREQUESTNUMBER)" Condition="'$(SYSTEM_PULLREQUEST_PULLREQUESTNUMBER)' != ''" />
-      <_CodecovArgs Include="-b;$(BUILD_BUILDNUMBER)" Condition="'$(BUILD_BUILDNUMBER)' != ''" />
-      <_CodecovArgs Include="--branch;$(_BranchName)" Condition="'$(_BranchName)' != ''" />
-      <_CodecovArgs Include="-c;$(BUILD_SOURCEVERSION)" Condition="'$(BUILD_SOURCEVERSION)' != ''" />
-      <_CodecovArgs Include="-n;$(BUILD_DEFINITIONNAME)" Condition="'$(BUILD_DEFINITIONNAME)' != ''" />
-      <_CodecovArgs Include="-t;$(CodeCovToken)" Condition="'$(CodeCovToken)' != ''" />
+
+      <!-- Report an error if the upload fails -->
+      <_CodecovArgs Include="--required" />
 
       <_CodecovFlags Include="$(Configuration)" Condition="'$(Configuration)' != ''" />
       <_CodecovProductionFlags Include="@(_CodecovFlags)" />

build/Dependencies.props

@@ -37,9 +37,9 @@
   <!-- Build/infrastructure Dependencies -->
   <PropertyGroup>
     <PublishSymbolsPackageVersion>1.0.0-beta-62824-02</PublishSymbolsPackageVersion>
-    <CodecovVersion>1.7.2</CodecovVersion>
-    <CoverletVersion>2.6.0</CoverletVersion>
-    <ReportGeneratorVersion>4.0.9</ReportGeneratorVersion>
+    <CodecovVersion>1.9.0</CodecovVersion>
+    <CoverletVersion>2.7.0</CoverletVersion>
+    <ReportGeneratorVersion>4.3.6</ReportGeneratorVersion>
     <MicrosoftDotNetApiCompatPackageVersion>1.0.0-beta.19225.5</MicrosoftDotNetApiCompatPackageVersion>
   </PropertyGroup>
 

build/ci/job-template.yml

@@ -66,7 +66,7 @@ jobs:
         displayName: Download Benchmark Data
       - script: ${{ parameters.buildScript }} -$(_configuration) -runtests -coverage=${{ parameters.codeCoverage }}
         displayName: Run Tests.
-    - script: $(Build.SourcesDirectory)/Tools/dotnetcli/dotnet msbuild build/Codecoverage.proj /p:CodeCovToken=$(CODECOV_TOKEN)
+    - script: $(Build.SourcesDirectory)/Tools/dotnetcli/dotnet msbuild -restore build/Codecoverage.proj
       displayName: Upload coverage to codecov.io
       condition: and(succeeded(), eq(${{ parameters.codeCoverage }}, True))
     - task: PublishTestResults@2

test/Directory.Build.props

@@ -34,6 +34,9 @@
   </ItemGroup>
 
   <PropertyGroup Condition="'$(Coverage)' == 'true'">
+      <!-- https://github.com/tonerdo/coverlet/issues/618 -->
+      <IncludeTestAssembly>true</IncludeTestAssembly>
+
       <CollectCoverage>true</CollectCoverage>
       <SingleHit>true</SingleHit>
       <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <!-- https://github.com/tonerdo/coverlet/issues/72 -->