From 91e5242e40d64a66054854b614322a10ce973dba Mon Sep 17 00:00:00 2001
From: Sam Harwell <Sam.Harwell@microsoft.com>
Date: Wed, 1 Feb 2023 13:16:06 -0600
Subject: [PATCH] Switch from coverlet.msbuild to coverlet.collector

---
 Directory.Build.targets      | 38 +-----------------------------------
 eng/CodeCoverage.proj        |  4 ++--
 eng/CodeCoverage.runsettings | 21 ++++++++++++++++++++
 eng/Testing.props            |  6 ++++++
 4 files changed, 30 insertions(+), 39 deletions(-)
 create mode 100644 eng/CodeCoverage.runsettings

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 0283343778..13ec6e5599 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(IsUnitTestProject)' == 'true'">
-    <PackageReference Include="coverlet.msbuild" Version="$(CoverletVersion)" PrivateAssets="all" />
+    <PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" GeneratePathProperty="true" PrivateAssets="all" />
   </ItemGroup>
 
   <PropertyGroup Condition="'$(IsTestProject)' == 'true' or '$(NonShipping)' == 'true' or '$(IsVsixProject)' == 'true'">
@@ -35,19 +35,7 @@
   <PropertyGroup Condition="'$(Coverage)' == 'true'">
     <!-- https://github.com/tonerdo/coverlet/issues/363 -->
     <DeterministicSourcePaths>false</DeterministicSourcePaths>
-
-    <!-- https://github.com/tonerdo/coverlet/issues/618 -->
-    <IncludeTestAssembly>true</IncludeTestAssembly>
-
-    <CollectCoverage>true</CollectCoverage>
-    <SingleHit>true</SingleHit>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <CoverletOutputFormat>opencover</CoverletOutputFormat>
-    <CoverletOutput>$(ArtifactsDir)coverage\$(MSBuildProjectName)_$(TargetFramework)_$(_TestArchitecture).coverage</CoverletOutput>
-    <Include></Include>
-    <Exclude></Exclude>
-    <ExcludeByAttribute>ExcludeFromCodeCoverage</ExcludeByAttribute>
-    <ExcludeByFile></ExcludeByFile>
   </PropertyGroup>
 
   <!-- Global Analyzer Config -->
@@ -59,28 +47,4 @@
     <!-- Include NonShipping.globalconfig for non-shipping projects -->
     <EditorConfigFiles Condition="'$(IsShipping)' != 'true'" Include="$(RepositoryEngineeringDir)globalconfigs\NonShipping.globalconfig" />
   </ItemGroup>
-
-  <Target Name="OuterInstrumentModulesNoBuild" BeforeTargets="RunTests" Condition="'$(IsUnitTestProject)' == 'true' AND '$(TargetFramework)' == ''">
-    <MSBuild
-      Projects="$(MSBuildProjectFullPath)"
-      Targets="InnerInstrumentModulesNoBuild"
-      Properties="TargetFramework=%(_TargetFramework.Identity)" />
-  </Target>
-
-  <Target Name="OuterGenerateCoverageResult" BeforeTargets="Test" Condition="'$(IsUnitTestProject)' == 'true' AND '$(TargetFramework)' == ''">
-    <MSBuild
-      Projects="$(MSBuildProjectFullPath)"
-      Targets="InnerGenerateCoverageResult"
-      Properties="TargetFramework=%(_TargetFramework.Identity)" />
-  </Target>
-
-  <Target Name="InnerInstrumentModulesNoBuild"
-          BeforeTargets="RunTests"
-          DependsOnTargets="InstrumentModules"
-          Condition="'$(IsUnitTestProject)' == 'true' AND '$(TargetFramework)' != '' AND '$(CollectCoverage)' == 'true'" />
-
-  <Target Name="InnerGenerateCoverageResult"
-          BeforeTargets="Test"
-          DependsOnTargets="GenerateCoverageResult"
-          Condition="'$(IsUnitTestProject)' == 'true' AND '$(TargetFramework)' != '' AND '$(CollectCoverage)' == 'true'" />
 </Project>
diff --git a/eng/CodeCoverage.proj b/eng/CodeCoverage.proj
index decb66174d..a927075d8f 100644
--- a/eng/CodeCoverage.proj
+++ b/eng/CodeCoverage.proj
@@ -20,8 +20,8 @@
       <_ReportGeneratorPath>$(PkgReportGenerator)\tools\net47\ReportGenerator.exe</_ReportGeneratorPath>
     </PropertyGroup>
 
-    <Message Importance="high" Text="&quot;$(_ReportGeneratorPath)&quot; -reports:$(ArtifactsDir)coverage\*.coverage -targetdir:$(ArtifactsDir)coverage -reporttypes:Cobertura" />
-    <Exec Command="&quot;$(_ReportGeneratorPath)&quot; -reports:$(ArtifactsDir)coverage\*.coverage -targetdir:$(ArtifactsDir)coverage -reporttypes:Cobertura" />
+    <Message Importance="high" Text="&quot;$(_ReportGeneratorPath)&quot; -reports:$(ArtifactsDir)TestResults\**\coverage.opencover.xml -targetdir:$(ArtifactsDir)coverage -reporttypes:Cobertura" />
+    <Exec Command="&quot;$(_ReportGeneratorPath)&quot; -reports:$(ArtifactsDir)TestResults\**\coverage.opencover.xml -targetdir:$(ArtifactsDir)coverage -reporttypes:Cobertura" />
 
     <ItemGroup>
       <_CodecovArgs Include="-f;$(ArtifactsDir)coverage\Cobertura.xml" />
diff --git a/eng/CodeCoverage.runsettings b/eng/CodeCoverage.runsettings
new file mode 100644
index 0000000000..7d7693e3d3
--- /dev/null
+++ b/eng/CodeCoverage.runsettings
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RunSettings>
+  <DataCollectionRunSettings>
+    <DataCollectors>
+      <DataCollector friendlyName="XPlat code coverage">
+        <Configuration>
+          <Format>opencover</Format>
+
+          <!-- https://github.com/tonerdo/coverlet/issues/618 -->
+          <IncludeTestAssembly>true</IncludeTestAssembly>
+
+          <SingleHit>true</SingleHit>
+          <Include></Include>
+          <Exclude></Exclude>
+          <ExcludeByAttribute>ExcludeFromCodeCoverage</ExcludeByAttribute>
+          <ExcludeByFile></ExcludeByFile>
+        </Configuration>
+      </DataCollector>
+    </DataCollectors>
+  </DataCollectionRunSettings>
+</RunSettings>
diff --git a/eng/Testing.props b/eng/Testing.props
index 94c1513636..3ec4874f5b 100644
--- a/eng/Testing.props
+++ b/eng/Testing.props
@@ -5,4 +5,10 @@
     <TestRunnerAdditionalArguments>$(TestRunnerAdditionalArguments) --blame-hang-timeout 10min</TestRunnerAdditionalArguments>
     <TestRunnerAdditionalArguments>$(TestRunnerAdditionalArguments) --blame-crash-dump-type full</TestRunnerAdditionalArguments>
   </PropertyGroup>
+
+  <PropertyGroup Condition="'$(IsTestProject)' == 'true' AND '$(Coverage)' == 'true'">
+    <TestRunnerAdditionalArguments>$(TestRunnerAdditionalArguments) --collect:"XPlat Code Coverage"</TestRunnerAdditionalArguments>
+    <TestRunnerAdditionalArguments>$(TestRunnerAdditionalArguments) --test-adapter-path "$(Pkgcoverlet_collector)/build/netstandard1.0"</TestRunnerAdditionalArguments>
+    <TestRunnerAdditionalArguments>$(TestRunnerAdditionalArguments) --settings "$(RepoRoot)/eng/CodeCoverage.runsettings"</TestRunnerAdditionalArguments>
+  </PropertyGroup>
 </Project>
\ No newline at end of file