From 2b06b55574eedc5d11f6052837c7a80f5d0a122a Mon Sep 17 00:00:00 2001
From: Eric StJohn <ericstj@microsoft.com>
Date: Wed, 10 Jan 2024 15:02:05 -0800
Subject: [PATCH 1/4] Don't copy runner to test output during regular builds

The test runner is not required for local test execution, but is needed
for helix (today).  In the future we should try to change helix to not
expect the runner in the output directory, but instead as a correlation
payload.
---
 eng/testing/xunit/xunit.console.targets | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/eng/testing/xunit/xunit.console.targets b/eng/testing/xunit/xunit.console.targets
index 175d149c96a914..fea89a806a0407 100644
--- a/eng/testing/xunit/xunit.console.targets
+++ b/eng/testing/xunit/xunit.console.targets
@@ -68,8 +68,8 @@
 
   <!-- ResolveAssemblyReferences is the target that populates ReferenceCopyLocalPaths which is what is copied to output directory. -->
   <Target Name="CopyRunnerToOutputDirectory" BeforeTargets="ResolveAssemblyReferences" Condition="'$(TargetsMobile)' != 'true' or '$(BundleXunitRunner)' == 'true'">
-    <ItemGroup>
-      <!-- Copy test runner to output directory -->
+    <ItemGroup Condition="'$(ArchiveTests)' == 'true'">
+      <!-- When ArchiveTests is set, copy xunit.runner.console to output directory -->
       <None Include="$([System.IO.Path]::GetDirectoryName('$(XunitConsole472Path)'))\*"
             Exclude="$([System.IO.Path]::GetDirectoryName('$(XunitConsole472Path)'))\xunit.console.*exe.config;
                      $([System.IO.Path]::GetDirectoryName('$(XunitConsole472Path)'))\xunit.console.x86.exe;
@@ -87,11 +87,9 @@
     </ItemGroup>
 
     <!-- Workaround for https://github.com/xunit/xunit/issues/1651 -->
-    <ItemGroup Condition="'$(ArchiveTests)' != 'true'">
-      <None Remove="$(Pkgxunit_runner_visualstudio)\build\net452\xunit.runner.utility.net452.dll" />
-      <None Remove="$(Pkgxunit_runner_visualstudio)\build\net452\xunit.runner.reporters.net452.dll" />
-      <None Remove="$(Pkgxunit_runner_visualstudio)\build\netcoreapp2.1\xunit.runner.utility.netcoreapp10.dll" />
-      <None Remove="$(Pkgxunit_runner_visualstudio)\build\netcoreapp2.1\xunit.runner.reporters.netcoreapp10.dll" />
+    <ItemGroup>
+      <None Remove="$(Pkgxunit_runner_visualstudio)\build\net462\xunit.abstractions.dll" />
+      <None Remove="$(Pkgxunit_runner_visualstudio)\build\net6.0\xunit.abstractions.dll" />
     </ItemGroup>
   </Target>
 </Project>

From dceca2318bc9cb0c87dcd9590337502c26d2d0fc Mon Sep 17 00:00:00 2001
From: Eric StJohn <ericstj@microsoft.com>
Date: Thu, 18 Jan 2024 13:56:17 -0800
Subject: [PATCH 2/4] Refine xunit 1651 workaround until we can pick up the fix

---
 eng/testing/xunit/xunit.console.targets | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/eng/testing/xunit/xunit.console.targets b/eng/testing/xunit/xunit.console.targets
index fea89a806a0407..e080202d55dd73 100644
--- a/eng/testing/xunit/xunit.console.targets
+++ b/eng/testing/xunit/xunit.console.targets
@@ -87,9 +87,12 @@
     </ItemGroup>
 
     <!-- Workaround for https://github.com/xunit/xunit/issues/1651 -->
-    <ItemGroup>
-      <None Remove="$(Pkgxunit_runner_visualstudio)\build\net462\xunit.abstractions.dll" />
-      <None Remove="$(Pkgxunit_runner_visualstudio)\build\net6.0\xunit.abstractions.dll" />
+    <ItemGroup Condition="'$(Pkgxunit_runner_visualstudio)' != '' AND '$(TargetFrameworkIdentifier)' == '.NETFramework'">
+      <!-- Remove `xunit.abstractions.dll` that was added to @(None) by xunit.runner.visualstudio -->
+      <_xunitAbstractionsRemove Include="@(None->WithMetadataValue('Filename', 'xunit.abstractions'))" />
+      <None Remove="@(_xunitAbstractionsRemove)" />
     </ItemGroup>
+    <Error Condition="'$(Pkgxunit_runner_visualstudio)' != '' AND '$(TargetFrameworkIdentifier)' == '.NETFramework' AND '@(_xunitAbstractionsRemove)' == ''"
+           Text="Remove workaround above and GeneratePathProperty from the xunit.runner.visualstudio PackageReference as they are no longer needed"/>
   </Target>
 </Project>

From a32b085cff251458bb0df1e7e2d9b0947249f4dd Mon Sep 17 00:00:00 2001
From: Eric StJohn <ericstj@microsoft.com>
Date: Thu, 18 Jan 2024 14:45:54 -0800
Subject: [PATCH 3/4] Update eng/testing/xunit/xunit.console.targets
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com>
---
 eng/testing/xunit/xunit.console.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/testing/xunit/xunit.console.targets b/eng/testing/xunit/xunit.console.targets
index e080202d55dd73..1c00757402fa36 100644
--- a/eng/testing/xunit/xunit.console.targets
+++ b/eng/testing/xunit/xunit.console.targets
@@ -93,6 +93,6 @@
       <None Remove="@(_xunitAbstractionsRemove)" />
     </ItemGroup>
     <Error Condition="'$(Pkgxunit_runner_visualstudio)' != '' AND '$(TargetFrameworkIdentifier)' == '.NETFramework' AND '@(_xunitAbstractionsRemove)' == ''"
-           Text="Remove workaround above and GeneratePathProperty from the xunit.runner.visualstudio PackageReference as they are no longer needed"/>
+           Text="Remove workaround above and GeneratePathProperty from the xunit.runner.visualstudio PackageReference as they are no longer needed." />
   </Target>
 </Project>

From 119339153c3f699d469743b0f4f5aa3612b68ce9 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 22 Jan 2024 20:59:16 +0100
Subject: [PATCH 4/4] Update xunit.console.targets

---
 eng/testing/xunit/xunit.console.targets | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/eng/testing/xunit/xunit.console.targets b/eng/testing/xunit/xunit.console.targets
index 1c00757402fa36..f7bdcc2940ec02 100644
--- a/eng/testing/xunit/xunit.console.targets
+++ b/eng/testing/xunit/xunit.console.targets
@@ -85,14 +85,5 @@
             CopyToOutputDirectory="PreserveNewest"
             Visible="false" />
     </ItemGroup>
-
-    <!-- Workaround for https://github.com/xunit/xunit/issues/1651 -->
-    <ItemGroup Condition="'$(Pkgxunit_runner_visualstudio)' != '' AND '$(TargetFrameworkIdentifier)' == '.NETFramework'">
-      <!-- Remove `xunit.abstractions.dll` that was added to @(None) by xunit.runner.visualstudio -->
-      <_xunitAbstractionsRemove Include="@(None->WithMetadataValue('Filename', 'xunit.abstractions'))" />
-      <None Remove="@(_xunitAbstractionsRemove)" />
-    </ItemGroup>
-    <Error Condition="'$(Pkgxunit_runner_visualstudio)' != '' AND '$(TargetFrameworkIdentifier)' == '.NETFramework' AND '@(_xunitAbstractionsRemove)' == ''"
-           Text="Remove workaround above and GeneratePathProperty from the xunit.runner.visualstudio PackageReference as they are no longer needed." />
   </Target>
 </Project>