From 28ebbb9f08d53e0da96be6cdfbdf64a9c8a66556 Mon Sep 17 00:00:00 2001
From: Paulo Janotti <pauloja@microsoft.com>
Date: Fri, 22 Jun 2018 09:27:52 -0700
Subject: [PATCH 1/3] Initial change for adding coverage runtime folder

---
 .../PackageFiles/CodeCoverage.targets         | 37 ++++++++++++++++++-
 .../xunit.console.netcore.runtimeconfig.json  |  8 ++++
 .../PackageFiles/tests.targets                | 13 ++++++-
 3 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 src/Microsoft.DotNet.Build.Tasks/PackageFiles/coverage/xunit.console.netcore.runtimeconfig.json

diff --git a/src/Microsoft.DotNet.Build.Tasks/PackageFiles/CodeCoverage.targets b/src/Microsoft.DotNet.Build.Tasks/PackageFiles/CodeCoverage.targets
index 1ad9d08e01..32779b6f86 100644
--- a/src/Microsoft.DotNet.Build.Tasks/PackageFiles/CodeCoverage.targets
+++ b/src/Microsoft.DotNet.Build.Tasks/PackageFiles/CodeCoverage.targets
@@ -17,6 +17,7 @@
     <CoverageReportDir Condition="'$(CoverageReportDir)' == ''">$(TestWorkingDir)coverage\</CoverageReportDir>
 
     <RestoreIlPdbsWithHardlinks Condition="'$(RestoreIlPdbsWithHardlinks)' == ''">true</RestoreIlPdbsWithHardlinks>
+    <UseCoverageDedicatedRuntime Condition="'$(UseCoverageDedicatedRuntime)' == ''">true</UseCoverageDedicatedRuntime>
 
     <!-- This targets file has two modes one for individual projects and one for all -->
     <GenerateCodeCoverageReportForAll Condition="'$(GenerateCodeCoverageReportForAll)'==''">false</GenerateCodeCoverageReportForAll>
@@ -53,7 +54,9 @@
   </Target>
 
   <!-- Workaround OpenCover symbol matching behavior by moving pdb files for coverage runs -->
-  <Target Name="ReplaceIlPdbsOnTestHost"  BeforeTargets="GenerateTestExecutionScripts" Condition="'$(CodeCoverageEnabled)'=='true'">
+  <Target Name="ReplaceIlPdbsOnTestHost"
+    BeforeTargets="GenerateTestExecutionScripts"
+    Condition="'$(CodeCoverageEnabled)'=='true' and '$(UseCoverageDedicatedRuntime)'!='true'">
     <Message Importance="high" Text="Replacing IL pdbs with respective pdbs for crossgen images (workaround OpenCover issue)." />
     <ItemGroup>
       <SelectedNiPdbFiles Include="@(_CodeCoverageAssemblies -> '$(NETCoreAppTestSharedFrameworkPath)ni/%(Identity).ni.pdb')"
@@ -131,6 +134,38 @@
   </Target>
   <!-- *********************************************************************************************** -->
 
+  <Target Name="CreateCoverageDedicatedRuntime"
+    BeforeTargets="GenerateTestExecutionScripts"
+    DependsOnTargets="GenerateWindowsPdbsForAssemblyBeingTested"
+    Condition="'$(CodeCoverageEnabled)'=='true' and '$(UseCoverageDedicatedRuntime)'=='true'">
+    <PropertyGroup>
+      <CoverageDedicatedRuntimeDir>$(TestHostRootPath)shared/Microsoft.NETCore.App/10.10.10</CoverageDedicatedRuntimeDir>
+    </PropertyGroup>
+    <ItemGroup>
+      <RuntimeFiles Include="$(NETCoreAppTestSharedFrameworkPath)/*.*" />
+      <RuntimeFiles Include="$(NETCoreAppTestSharedFrameworkPath)il/*.*" />
+      <RuntimeFilesAmd64 Include="$(NETCoreAppTestSharedFrameworkPath)amd64/*.*" />
+      <RuntimeFilesx86 Include="$(NETCoreAppTestSharedFrameworkPath)x86/*.*" />
+      <RuntimeWindowsPdbs Include="$(NETCoreAppTestSharedFrameworkPath)WindowsPDB/*.*" />
+    </ItemGroup>
+    <Copy SourceFiles="@(RuntimeFiles)"
+          DestinationFolder="$(CoverageDedicatedRuntimeDir)"
+          SkipUnchangedFiles="true"
+          UseHardlinksIfPossible="false" />
+    <Copy SourceFiles="@(RuntimeFilesAmd64)"
+          DestinationFolder="$(CoverageDedicatedRuntimeDir)/amd64/"
+          SkipUnchangedFiles="true"
+          UseHardlinksIfPossible="false" />
+    <Copy SourceFiles="@(RuntimeFilesx86)"
+          DestinationFolder="$(CoverageDedicatedRuntimeDir)/x86/"
+          SkipUnchangedFiles="true"
+          UseHardlinksIfPossible="false" />
+    <Copy SourceFiles="@(RuntimeWindowsPdbs)"
+          DestinationFolder="$(CoverageDedicatedRuntimeDir)/WindowsPDB/"
+          SkipUnchangedFiles="true"
+          UseHardlinksIfPossible="false" />
+  </Target>
+
   <!-- xUnit command line with coverage enabled -->
   <PropertyGroup Condition="'$(CoverageEnabledForProject)'=='true'">
     <CoverageHost>$(PackagesDir)OpenCover\$(OpenCoverVersion)\tools\OpenCover.Console.exe</CoverageHost>
diff --git a/src/Microsoft.DotNet.Build.Tasks/PackageFiles/coverage/xunit.console.netcore.runtimeconfig.json b/src/Microsoft.DotNet.Build.Tasks/PackageFiles/coverage/xunit.console.netcore.runtimeconfig.json
new file mode 100644
index 0000000000..2f2aa2dab5
--- /dev/null
+++ b/src/Microsoft.DotNet.Build.Tasks/PackageFiles/coverage/xunit.console.netcore.runtimeconfig.json
@@ -0,0 +1,8 @@
+{
+	"runtimeOptions": {
+		"framework": {
+			"name": "Microsoft.NETCore.App",
+			"version": "10.10.10"
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Build.Tasks/PackageFiles/tests.targets b/src/Microsoft.DotNet.Build.Tasks/PackageFiles/tests.targets
index a86d2c28bf..c2c5a5a329 100644
--- a/src/Microsoft.DotNet.Build.Tasks/PackageFiles/tests.targets
+++ b/src/Microsoft.DotNet.Build.Tasks/PackageFiles/tests.targets
@@ -35,7 +35,6 @@
   </ItemGroup>
 
   <PropertyGroup Condition="'$(BuildingNETFxVertical)' != 'true'">
-    <XunitRuntimeConfig>$(ToolsDir)\xunit.console.netcore.runtimeconfig.json</XunitRuntimeConfig>
     <TestRuntimeEnvVar Condition="'$(RunningOnUnix)'!='true'">%RUNTIME_PATH%\</TestRuntimeEnvVar>
     <TestRuntimeEnvVar Condition="'$(RunningOnUnix)'=='true'">$RUNTIME_PATH/</TestRuntimeEnvVar>
     <TestHostExecutablePath Condition="'$(RunningOnUnix)'!='true' AND '$(TestHostExecutablePath)' == '' AND '$(BuildingUAPAOTVertical)' != 'true'">$(TestRuntimeEnvVar)dotnet.exe</TestHostExecutablePath>
@@ -96,6 +95,18 @@
 
   <!-- The Code Coverage targets will override TestHost and TestCommandLine if coverage is enabled -->
   <Import Project="$(MSBuildThisFileDirectory)CodeCoverage.targets" />
+  <Choose>
+    <When Condition="'$(CodeCoverageEnabled)'=='true' and '$(UseCoverageDedicatedRuntime)'=='true'">
+      <PropertyGroup>
+        <XunitRuntimeConfig>$(ToolsDir)coverage/xunit.console.netcore.runtimeconfig.json</XunitRuntimeConfig>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <XunitRuntimeConfig>$(ToolsDir)xunit.console.netcore.runtimeconfig.json</XunitRuntimeConfig>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
 
   <!-- In VS (2015 Preview or later currently required): Debug to run unit tests on CoreCLR. -->
   <PropertyGroup Condition="'$(IsTestProject)'=='true'">

From 03164309c9f9bee4a79133e5f445529b65371ce6 Mon Sep 17 00:00:00 2001
From: Paulo Janotti <pauloja@microsoft.com>
Date: Fri, 22 Jun 2018 10:04:02 -0700
Subject: [PATCH 2/3] Remove IL pdb copying

---
 .../PackageFiles/CodeCoverage.targets         | 50 -------------------
 1 file changed, 50 deletions(-)

diff --git a/src/Microsoft.DotNet.Build.Tasks/PackageFiles/CodeCoverage.targets b/src/Microsoft.DotNet.Build.Tasks/PackageFiles/CodeCoverage.targets
index 32779b6f86..6be842f825 100644
--- a/src/Microsoft.DotNet.Build.Tasks/PackageFiles/CodeCoverage.targets
+++ b/src/Microsoft.DotNet.Build.Tasks/PackageFiles/CodeCoverage.targets
@@ -16,7 +16,6 @@
     <CodeCoverageEnabled Condition="'$(SkipTests)' != 'true' and '$(RunningOnUnix)' != 'true' and '$(Coverage)' == 'true' and '$(Performance)' != 'true'">true</CodeCoverageEnabled>
     <CoverageReportDir Condition="'$(CoverageReportDir)' == ''">$(TestWorkingDir)coverage\</CoverageReportDir>
 
-    <RestoreIlPdbsWithHardlinks Condition="'$(RestoreIlPdbsWithHardlinks)' == ''">true</RestoreIlPdbsWithHardlinks>
     <UseCoverageDedicatedRuntime Condition="'$(UseCoverageDedicatedRuntime)' == ''">true</UseCoverageDedicatedRuntime>
 
     <!-- This targets file has two modes one for individual projects and one for all -->
@@ -53,48 +52,6 @@
     </PropertyGroup>
   </Target>
 
-  <!-- Workaround OpenCover symbol matching behavior by moving pdb files for coverage runs -->
-  <Target Name="ReplaceIlPdbsOnTestHost"
-    BeforeTargets="GenerateTestExecutionScripts"
-    Condition="'$(CodeCoverageEnabled)'=='true' and '$(UseCoverageDedicatedRuntime)'!='true'">
-    <Message Importance="high" Text="Replacing IL pdbs with respective pdbs for crossgen images (workaround OpenCover issue)." />
-    <ItemGroup>
-      <SelectedNiPdbFiles Include="@(_CodeCoverageAssemblies -> '$(NETCoreAppTestSharedFrameworkPath)ni/%(Identity).ni.pdb')"
-        Condition="Exists('$(NETCoreAppTestSharedFrameworkPath)/il/%(Identity).pdb') AND Exists('$(NETCoreAppTestSharedFrameworkPath)/ni/%(Identity).ni.pdb')" >
-          <IlPdbPath>$(NETCoreAppTestSharedFrameworkPath)%(Identity).pdb</IlPdbPath>
-      </SelectedNiPdbFiles>
-    </ItemGroup>
-
-    <!-- Delete the files under the test host to break any existing hardlinks -->
-    <Delete Files="@(SelectedNiPdbFiles -> '%(IlPdbPath)')" />
-
-    <!-- Put renamed pdbs in place -->
-    <Copy SourceFiles="@(SelectedNiPdbFiles)" 
-      DestinationFiles="%(SelectedNiPdbFiles.IlPdbPath)"
-      SkipUnchangedFiles="true" />
-  </Target>
-
-  <!-- General task to restore pdbs that may have been replaced for OpenCover workaround -->
-  <Target Name="RestoreIlPdbs">
-    <ItemGroup>
-       <!-- Assume that all ni pdbs were replaced (ensures full restore) -->
-      <PdbsToRestore Include="$(NETCoreAppTestSharedFrameworkPath)il/*.pdb" />
-    </ItemGroup>
-
-    <Copy SourceFiles="@(PdbsToRestore)" 
-      DestinationFolder="$(NETCoreAppTestSharedFrameworkPath)"
-      SkipUnchangedFiles="true"
-      UseHardlinksIfPossible="$(RestoreIlPdbsWithHardlinks)" />
-  </Target>
-
-  <!-- Il pdbs may need to be restored due to previous coverage runs that replaced them with IL versions -->
-  <Target Name="RestoreIlPdbsForTestRun"
-    BeforeTargets="GenerateTestExecutionScripts"
-    DependsOnTargets="RestoreIlPdbs"
-    Condition="'$(CodeCoverageEnabled)' != 'true' AND '$(SkipTests)' != 'true' AND '$(RunningOnUnix)' != 'true'">
-    <Message Importance="normal" Text="Restoring IL pdbs that were potentially replaced with respective crossgen pdbs." />
-  </Target>
-
   <!-- *********************************************************************************************** -->
   <!-- As of 10/2017 OpenCover does not support portable PDBs, but we want the builds to generate
        portable PDBs.  Thus we generate windows PDBs from portable PDBs here.   Can be removed
@@ -247,11 +204,4 @@
                            OutputReport="$(CoverageReportDir)\VisitedMethodsReport.xml"/>
   </Target>
 
-  <!-- Restore IL pdbs to testhost -->
-  <Target Name="RestoreIlPdbsToTestHostAfterCoverageReports"
-    AfterTargets="GenerateIndividualCoverageReport;GenerateFullCoverageReport"
-    DependsOnTargets="RestoreIlPdbs">
-    <Message Importance="normal" Text="Restoring IL pdbs that were potentially replaced with respective crossgen pdbs." />
-  </Target>
-
 </Project>

From d2106c5649fafe9f3865ea8c5280f64b7110d522 Mon Sep 17 00:00:00 2001
From: Paulo Janotti <pauloja@microsoft.com>
Date: Thu, 28 Jun 2018 13:55:45 -0700
Subject: [PATCH 3/3] PR feedback + no hardlink for dedicated runtime

---
 .../PackageFiles/CodeCoverage.targets         | 78 ++++++++++---------
 .../PackageFiles/tests.targets                | 16 +++-
 2 files changed, 56 insertions(+), 38 deletions(-)

diff --git a/src/Microsoft.DotNet.Build.Tasks/PackageFiles/CodeCoverage.targets b/src/Microsoft.DotNet.Build.Tasks/PackageFiles/CodeCoverage.targets
index 6be842f825..0dbc35e62f 100644
--- a/src/Microsoft.DotNet.Build.Tasks/PackageFiles/CodeCoverage.targets
+++ b/src/Microsoft.DotNet.Build.Tasks/PackageFiles/CodeCoverage.targets
@@ -17,7 +17,8 @@
     <CoverageReportDir Condition="'$(CoverageReportDir)' == ''">$(TestWorkingDir)coverage\</CoverageReportDir>
 
     <UseCoverageDedicatedRuntime Condition="'$(UseCoverageDedicatedRuntime)' == ''">true</UseCoverageDedicatedRuntime>
-
+    <CoverageDedicatedRuntimeDir>$(TestHostRootPath)shared/Microsoft.NETCore.App/10.10.10</CoverageDedicatedRuntimeDir>
+  
     <!-- This targets file has two modes one for individual projects and one for all -->
     <GenerateCodeCoverageReportForAll Condition="'$(GenerateCodeCoverageReportForAll)'==''">false</GenerateCodeCoverageReportForAll>
     <CoverageEnabledForProject Condition="'$(GenerateCodeCoverageReportForAll)'=='true'">false</CoverageEnabledForProject>
@@ -52,11 +53,50 @@
     </PropertyGroup>
   </Target>
 
+  <Target Name="CreateCoverageDedicatedRuntime"
+    BeforeTargets="GenerateTestExecutionScripts"
+    Condition="'$(CodeCoverageEnabled)'=='true' and '$(UseCoverageDedicatedRuntime)'=='true'">
+    <PropertyGroup>
+    </PropertyGroup>
+    <ItemGroup>
+      <_RuntimeFiles Include="$(NETCoreAppTestSharedFrameworkPath)/*.*" />
+      <RuntimeFiles Include="%(_RuntimeFiles.Identity)" Condition="!Exists('$(NETCoreAppTestSharedFrameworkPath)il/%(Filename)%(Extension)')" />
+      <RuntimeFiles Include="$(NETCoreAppTestSharedFrameworkPath)il/*.*" />
+      <RuntimeFilesAmd64 Include="$(NETCoreAppTestSharedFrameworkPath)amd64/*.*" />
+      <RuntimeFilesx86 Include="$(NETCoreAppTestSharedFrameworkPath)x86/*.*" />
+    </ItemGroup>
+    <Copy SourceFiles="@(RuntimeFiles)"
+          DestinationFolder="$(CoverageDedicatedRuntimeDir)"
+          SkipUnchangedFiles="true"
+          UseHardlinksIfPossible="false" />
+    <Copy SourceFiles="@(RuntimeFilesAmd64)"
+          DestinationFolder="$(CoverageDedicatedRuntimeDir)/amd64/"
+          SkipUnchangedFiles="true"
+          UseHardlinksIfPossible="false" />
+    <Copy SourceFiles="@(RuntimeFilesx86)"
+          DestinationFolder="$(CoverageDedicatedRuntimeDir)/x86/"
+          SkipUnchangedFiles="true"
+          UseHardlinksIfPossible="false" />
+  </Target>
+
   <!-- *********************************************************************************************** -->
   <!-- As of 10/2017 OpenCover does not support portable PDBs, but we want the builds to generate
        portable PDBs.  Thus we generate windows PDBs from portable PDBs here.   Can be removed
        when OpenCover directly supports Portable PDBs (probably by early 2018) -->
 
+  <Choose>
+    <When Condition="'$(UseCoverageDedicatedRuntime)'=='true'">
+      <PropertyGroup>
+        <CoverageRuntimeDir>$(CoverageDedicatedRuntimeDir)</CoverageRuntimeDir>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <CoverageRuntimeDir>$(NETCoreAppTestSharedFrameworkPath)</CoverageRuntimeDir>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+
   <Target Name="GenerateWindowsPdbsForAssemblyBeingTested" 
     BeforeTargets="GenerateTestExecutionScripts"
     Condition="'$(CodeCoverageEnabled)' == 'true' and '$(TargetOS)'=='Windows_NT'">
@@ -64,7 +104,7 @@
     <!-- We look for the DLL being tested for coverage and its PDB create a WindowsPDB\*.pdb which has
          the windows PDB.  -->
     <ItemGroup>
-      <CandidateAssemblies Include="@(_CodeCoverageAssemblies -> '$(NETCoreAppTestSharedFrameworkPath)%(Identity)')" />
+      <CandidateAssemblies Include="@(_CodeCoverageAssemblies -> '$(CoverageRuntimeDir)/%(Identity)')" />
 
       <ExistingPortableDllsToConvert
         Include="@(CandidateAssemblies -> '%(Identity).dll' )"
@@ -87,42 +127,10 @@
          it does unblock things and this is all intended to be temporary until OpenCover supports 
          portable PDBs directly  -->
     <Message Importance="high" Text="Replacing Portable PDB with Windows Pdb in place!" />
-    <Copy SourceFiles="%(ExistingPortableDllsToConvert.TargetPath)" DestinationFolder="$(NETCoreAppTestSharedFrameworkPath)" Condition="Exists('%(ExistingPortableDllsToConvert.TargetPath)')"/>
+    <Copy SourceFiles="%(ExistingPortableDllsToConvert.TargetPath)" DestinationFolder="$(CoverageRuntimeDir)" Condition="Exists('%(ExistingPortableDllsToConvert.TargetPath)')"/>
   </Target>
   <!-- *********************************************************************************************** -->
 
-  <Target Name="CreateCoverageDedicatedRuntime"
-    BeforeTargets="GenerateTestExecutionScripts"
-    DependsOnTargets="GenerateWindowsPdbsForAssemblyBeingTested"
-    Condition="'$(CodeCoverageEnabled)'=='true' and '$(UseCoverageDedicatedRuntime)'=='true'">
-    <PropertyGroup>
-      <CoverageDedicatedRuntimeDir>$(TestHostRootPath)shared/Microsoft.NETCore.App/10.10.10</CoverageDedicatedRuntimeDir>
-    </PropertyGroup>
-    <ItemGroup>
-      <RuntimeFiles Include="$(NETCoreAppTestSharedFrameworkPath)/*.*" />
-      <RuntimeFiles Include="$(NETCoreAppTestSharedFrameworkPath)il/*.*" />
-      <RuntimeFilesAmd64 Include="$(NETCoreAppTestSharedFrameworkPath)amd64/*.*" />
-      <RuntimeFilesx86 Include="$(NETCoreAppTestSharedFrameworkPath)x86/*.*" />
-      <RuntimeWindowsPdbs Include="$(NETCoreAppTestSharedFrameworkPath)WindowsPDB/*.*" />
-    </ItemGroup>
-    <Copy SourceFiles="@(RuntimeFiles)"
-          DestinationFolder="$(CoverageDedicatedRuntimeDir)"
-          SkipUnchangedFiles="true"
-          UseHardlinksIfPossible="false" />
-    <Copy SourceFiles="@(RuntimeFilesAmd64)"
-          DestinationFolder="$(CoverageDedicatedRuntimeDir)/amd64/"
-          SkipUnchangedFiles="true"
-          UseHardlinksIfPossible="false" />
-    <Copy SourceFiles="@(RuntimeFilesx86)"
-          DestinationFolder="$(CoverageDedicatedRuntimeDir)/x86/"
-          SkipUnchangedFiles="true"
-          UseHardlinksIfPossible="false" />
-    <Copy SourceFiles="@(RuntimeWindowsPdbs)"
-          DestinationFolder="$(CoverageDedicatedRuntimeDir)/WindowsPDB/"
-          SkipUnchangedFiles="true"
-          UseHardlinksIfPossible="false" />
-  </Target>
-
   <!-- xUnit command line with coverage enabled -->
   <PropertyGroup Condition="'$(CoverageEnabledForProject)'=='true'">
     <CoverageHost>$(PackagesDir)OpenCover\$(OpenCoverVersion)\tools\OpenCover.Console.exe</CoverageHost>
diff --git a/src/Microsoft.DotNet.Build.Tasks/PackageFiles/tests.targets b/src/Microsoft.DotNet.Build.Tasks/PackageFiles/tests.targets
index c2c5a5a329..11004f3647 100644
--- a/src/Microsoft.DotNet.Build.Tasks/PackageFiles/tests.targets
+++ b/src/Microsoft.DotNet.Build.Tasks/PackageFiles/tests.targets
@@ -41,6 +41,7 @@
     <TestHostExecutablePath Condition="'$(RunningOnUnix)'=='true' AND '$(TestHostExecutablePath)' == '' AND '$(BuildingUAPAOTVertical)' != 'true'">$(TestRuntimeEnvVar)dotnet</TestHostExecutablePath>
 
     <XunitExecutable Condition="'$(XunitExecutable)' == ''">xunit.console.netcore.exe</XunitExecutable>
+    <XunitRuntimeConfigFile>xunit.console.netcore.runtimeconfig.json</XunitRuntimeConfigFile>
 
     <DebugEngines>{2E36F1D4-B23C-435D-AB41-18E608940038}</DebugEngines>
   </PropertyGroup>
@@ -98,12 +99,14 @@
   <Choose>
     <When Condition="'$(CodeCoverageEnabled)'=='true' and '$(UseCoverageDedicatedRuntime)'=='true'">
       <PropertyGroup>
-        <XunitRuntimeConfig>$(ToolsDir)coverage/xunit.console.netcore.runtimeconfig.json</XunitRuntimeConfig>
+        <XunitRuntimeConfig>$(ToolsDir)coverage/$(XunitRuntimeConfigFile)</XunitRuntimeConfig>
+        <UsingCoverageDedicatedRuntime>true</UsingCoverageDedicatedRuntime>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
-        <XunitRuntimeConfig>$(ToolsDir)xunit.console.netcore.runtimeconfig.json</XunitRuntimeConfig>
+        <XunitRuntimeConfig>$(ToolsDir)$(XunitRuntimeConfigFile)</XunitRuntimeConfig>
+        <UsingCoverageDedicatedRuntime>false</UsingCoverageDedicatedRuntime>
       </PropertyGroup>
     </Otherwise>
   </Choose>
@@ -125,7 +128,14 @@
       <RunTestsForProjectInputs Include="@(AllItemsFullPathWithTargetPath)" />
     </ItemGroup>
     <ItemGroup Condition="'$(BuildingNETFxVertical)' != 'true'">
-      <SupplementalTestData Condition="'$(SkipXunitRuntimeConfigCopying)' != 'true'" Include="$(XunitRuntimeConfig)" />
+      <!-- SupplementalTestData has its own properties to control hard links, however, with the coverage dedicated runtime that will override the original -->
+      <Delete Condition="'@(UsingCoverageDedicatedRuntime)' == 'true' and Exists('$(TestPath)$(XunitRuntimeConfigFile)')"
+              Files="'$(TestPath)$(XunitRuntimeConfigFile)'" />
+      <Copy Condition="'@(UsingCoverageDedicatedRuntime)' == 'true'"
+            SourceFiles="$(XunitRuntimeConfig)"
+            DestinationFolder="$(TestPath)"
+            UseHardLinksIfPossible="false" />
+      <SupplementalTestData Condition="'$(SkipXunitRuntimeConfigCopying)' != 'true' and '@(UsingCoverageDedicatedRuntime)' != 'true'" Include="$(XunitRuntimeConfig)" />
       <SupplementalTestData Include="$(RuntimePath)xunit.console.netcore.exe" />
     </ItemGroup>
     <ItemGroup Condition="'$(BuildingNETFxVertical)' == 'true'">