From cc2beb39d74379c86119cd9ea029f8aa17b31f72 Mon Sep 17 00:00:00 2001
From: Matt Kotsenas <matt.kotsenas@gmail.com>
Date: Tue, 11 Jun 2024 09:08:14 -0700
Subject: [PATCH] Switch to using a before and after target

---
 build/targets/tests/Tests.targets | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/build/targets/tests/Tests.targets b/build/targets/tests/Tests.targets
index 5abe6870..49bc6c6e 100644
--- a/build/targets/tests/Tests.targets
+++ b/build/targets/tests/Tests.targets
@@ -3,14 +3,28 @@
     <!-- Enable test logging to TRX files and place them in the artifacts directory -->
     <VSTestLogger>trx%3bLogFileName=$(MSBuildProjectName).trx</VSTestLogger>
     <VSTestResultsDirectory Condition="'$(VSTestResultsDirectory)' == ''">$(ArtifactsTestResultsPath)/$(TargetFramework)</VSTestResultsDirectory>
-    <_TestCodeCoverageMergedReport>$(ArtifactsTestResultsPath)/report.cobertura.xml</_TestCodeCoverageMergedReport>
+
+    <_TestCoverageGlob>$(ArtifactsTestResultsPath)/**/*.cobertura.xml</_TestCoverageGlob>
+    <_TestCoverageReportDirectory>$(ArtifactsTestResultsPath)/coverage</_TestCoverageReportDirectory>
   </PropertyGroup>
 
-  <Target Name="GenerageCodeCoverageReport" AfterTargets="Test;VSTest" Condition=" '$(IsTestProject)' == 'true' ">
+  <Target Name="CleanCoverageReport" BeforeTargets="Test;VSTest" Condition=" '$(IsTestProject)' == 'true' ">
+    <!-- Prevent this previous runs' coverage files from being merged into this report run. -->
+    <RemoveDir Directories="$(_TestCoverageReportDirectory)" />
+
+    <ItemGroup>
+      <_CoverageFiles Include="$(_TestCoverageGlob)" />
+    </ItemGroup>
+    <Delete Files="@(_CoverageFiles)" />
+    <ItemGroup>
+      <_CoverageFiles Remove="@(_CoverageFiles)" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="GenerateCoverageReport" AfterTargets="Test;VSTest" Condition=" '$(IsTestProject)' == 'true' ">
     <ItemGroup>
-      <_CoverageFiles Include="$(ArtifactsTestResultsPath)/**/*.cobertura.xml" />
+      <_CoverageFiles Include="$(_TestCoverageGlob)" />
     </ItemGroup>
-    <ReportGenerator ProjectDirectory="$(MSBuildProjectDirectory)" ReportFiles="@(_CoverageFiles)" TargetDirectory="$(ArtifactsTestResultsPath)/coverage" ReportTypes="MarkdownSummaryGithub;Cobertura;HtmlInline" />
-    <Delete Files="@(_CoverageFiles)" /><!-- Prevent this run's coverage files from being merged into the next run. -->
+    <ReportGenerator ProjectDirectory="$(MSBuildProjectDirectory)" ReportFiles="@(_CoverageFiles)" TargetDirectory="$(_TestCoverageReportDirectory)" ReportTypes="MarkdownSummaryGithub;Cobertura;HtmlInline" />
   </Target>
 </Project>