From 20f012511e74867111d41c36bdfc6b4eb0f0123b Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 13 Jun 2024 11:55:22 +0000
Subject: [PATCH] Fix templates VMR build

The PackageReference to xunit caused the project
to have IsTestProject=true set which then caused
the project to get filtered out in source-build
and VMR builds.

Instead of referencing the meta xunit package,
just reference the extensibility.execution pkg
that provides the necessary API.
---
 .gitignore                                                     | 3 ++-
 Directory.Packages.props                                       | 2 +-
 .../Microsoft.TemplateEngine.TestHelper.csproj                 | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4c12bd0b08c..d7488adadf1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,8 +22,9 @@ bld/
 [Bb]in/
 [Oo]bj/
 dev/
+*.binlog
 
-# Visual Studio 2015 cache/options directory
+# Visual Studio cache/options directory
 .vs/
 # Visual Studio launch settings
 **/launchSettings.json
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 08177e3353e..e5466be8be8 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -39,7 +39,7 @@
     <PackageVersion Include="Verify.XUnit" Version="25.0.2" />
     <PackageVersion Include="xunit.abstractions" Version="2.0.3" />
     <!-- Xunit version is managed by Arcade. -->
-    <PackageVersion Include="xunit" Version="$(XUnitVersion)" />
+    <PackageVersion Include="xunit.extensibility.execution" Version="$(XUnitVersion)" />
   </ItemGroup>
 
   <!-- DotNetBuild overrides -->
diff --git a/test/Microsoft.TemplateEngine.TestHelper/Microsoft.TemplateEngine.TestHelper.csproj b/test/Microsoft.TemplateEngine.TestHelper/Microsoft.TemplateEngine.TestHelper.csproj
index 5a8a952e044..075ab499a5f 100644
--- a/test/Microsoft.TemplateEngine.TestHelper/Microsoft.TemplateEngine.TestHelper.csproj
+++ b/test/Microsoft.TemplateEngine.TestHelper/Microsoft.TemplateEngine.TestHelper.csproj
@@ -1,5 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <!-- Don't set IsTestUtilityProject=true because this project is referenced by tools and would otherwise be filtered out. -->
   <PropertyGroup>
     <TargetFrameworks>$(NetCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
     <IsPackable>true</IsPackable>
@@ -16,7 +17,7 @@
 
   <ItemGroup>
     <PackageReference Include="NuGet.Protocol" />
-    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.extensibility.execution" />
     <PackageReference Include="xunit.abstractions" />
     <PackageReference Include="Microsoft.Extensions.Logging" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" />