From 53f3643577267ca40945d7affb1667376ef27333 Mon Sep 17 00:00:00 2001
From: Youssef Victor <youssefvictor00@gmail.com>
Date: Fri, 10 Apr 2026 12:29:30 +0200
Subject: [PATCH 1/2] Add xunit.runner.visualstudio when using xunit.v3+VSTest

---
 src/Microsoft.DotNet.Arcade.Sdk/tools/XUnitV3/XUnitV3.targets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/XUnitV3/XUnitV3.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/XUnitV3/XUnitV3.targets
index 9fc8dc9e7a4..38b6ecc9954 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/XUnitV3/XUnitV3.targets
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/XUnitV3/XUnitV3.targets
@@ -21,6 +21,10 @@
     <PackageReference Include="Microsoft.Testing.Platform" Version="$(MicrosoftTestingPlatformVersion)" IsImplicitlyDefined="true" PrivateAssets="all" Publish="true" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(UseMicrosoftTestingPlatformRunner)' != 'true'">
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(MicrosoftTestingPlatformVersion)" IsImplicitlyDefined="true" PrivateAssets="all" Publish="true" />
+  </ItemGroup>
+
   <PropertyGroup>
     <XUnitDesktopSettingsFile Condition="'$(XUnitDesktopSettingsFile)' == ''">$(MSBuildThisFileDirectory)xunit.runner.json</XUnitDesktopSettingsFile>
     <XUnitCoreSettingsFile Condition="'$(XUnitCoreSettingsFile)' == ''">$(MSBuildThisFileDirectory)xunit.runner.json</XUnitCoreSettingsFile>

From c1cffc13a787fc8a7fc1b1f9d0a5d528db7ea7dd Mon Sep 17 00:00:00 2001
From: Youssef Victor <youssefvictor00@gmail.com>
Date: Fri, 10 Apr 2026 12:35:27 +0200
Subject: [PATCH 2/2] Update XUnitV3.targets

---
 src/Microsoft.DotNet.Arcade.Sdk/tools/XUnitV3/XUnitV3.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/XUnitV3/XUnitV3.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/XUnitV3/XUnitV3.targets
index 38b6ecc9954..f39adb984b1 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/XUnitV3/XUnitV3.targets
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/XUnitV3/XUnitV3.targets
@@ -21,7 +21,7 @@
     <PackageReference Include="Microsoft.Testing.Platform" Version="$(MicrosoftTestingPlatformVersion)" IsImplicitlyDefined="true" PrivateAssets="all" Publish="true" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(UseMicrosoftTestingPlatformRunner)' != 'true'">
+  <ItemGroup Condition="'$(UseMicrosoftTestingPlatformRunner)' != 'true' OR '$(UseVSTestRunner)' == 'true'">
     <PackageReference Include="xunit.runner.visualstudio" Version="$(MicrosoftTestingPlatformVersion)" IsImplicitlyDefined="true" PrivateAssets="all" Publish="true" />
   </ItemGroup>