From 30ae9123c8a5e1d2125955bb63944d2c9899905d Mon Sep 17 00:00:00 2001
From: Aaron Powell <me@aaron-powell.com>
Date: Fri, 27 Sep 2024 00:48:21 +0000
Subject: [PATCH] Fixes to how the conditional tests work

---
 Directory.Build.targets                                |  7 +++++++
 Directory.Packages.props                               |  3 ++-
 .../Aspire.CommunityToolkit.Testing.csproj             | 10 ++++++++++
 .../XUnit/ConditionalFactAttribute.cs                  |  2 +-
 .../XUnit/ConditionalTheoryAttribute.cs                |  2 +-
 5 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 Directory.Build.targets

diff --git a/Directory.Build.targets b/Directory.Build.targets
new file mode 100644
index 00000000..96ce250d
--- /dev/null
+++ b/Directory.Build.targets
@@ -0,0 +1,7 @@
+<Project>
+  <Target Name="_SetVSTestLogger" BeforeTargets="VSTest" Condition=" '$(TrxLogFileNameSuffix)' != '' ">
+  <PropertyGroup>
+    <VSTestLogger>trx%3BLogFileName=$(AssemblyName)-$(TargetFramework).trx</VSTestLogger>
+  </PropertyGroup>
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 4b09baf6..2ec36416 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -26,8 +26,9 @@
     <PackageVersion Include="FluentAssertions" Version="6.12.0" />
     <PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.4.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageVersion Include="xunit" Version="2.9.0" />
+    <PackageVersion Include="xunit" Version="2.9.1" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
+    <PackageVersion Include="xunit.extensibility.execution" Version="2.9.1" />
     <!-- External packages -->
     <PackageVersion Include="OllamaSharp" Version="3.0.7" />
   </ItemGroup>
diff --git a/tests/Aspire.CommunityToolkit.Testing/Aspire.CommunityToolkit.Testing.csproj b/tests/Aspire.CommunityToolkit.Testing/Aspire.CommunityToolkit.Testing.csproj
index fa71b7ae..fe37e302 100644
--- a/tests/Aspire.CommunityToolkit.Testing/Aspire.CommunityToolkit.Testing.csproj
+++ b/tests/Aspire.CommunityToolkit.Testing/Aspire.CommunityToolkit.Testing.csproj
@@ -6,4 +6,14 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <!--
+      This intentionally does not reference 'xunit', 'xunit.core', or any runner packages.
+      XUnit recommends only using xunit.extensibility.*, xunit.assert, and xunit.abstractions for packages which "extend" xunit.
+      This allows consumers to decide which type of xunit runner they want to use to run these tests,
+      and avoids problems with `dotnet pack`.
+      See https://xunit.github.io/docs/nuget-packages and the special note in https://xunit.github.io/releases/2.3.
+    -->
+    <PackageReference Include="xunit.extensibility.execution" />
+  </ItemGroup>
 </Project>
diff --git a/tests/Aspire.CommunityToolkit.Testing/XUnit/ConditionalFactAttribute.cs b/tests/Aspire.CommunityToolkit.Testing/XUnit/ConditionalFactAttribute.cs
index 92077e27..4b5edce3 100644
--- a/tests/Aspire.CommunityToolkit.Testing/XUnit/ConditionalFactAttribute.cs
+++ b/tests/Aspire.CommunityToolkit.Testing/XUnit/ConditionalFactAttribute.cs
@@ -10,7 +10,7 @@
 namespace Microsoft.TestUtilities;
 
 [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
-[XunitTestCaseDiscoverer("Microsoft.TestUtilities." + nameof(ConditionalFactDiscoverer), "Microsoft.TestUtilities")]
+[XunitTestCaseDiscoverer("Microsoft.TestUtilities." + nameof(ConditionalFactDiscoverer), "Aspire.CommunityToolkit.Testing")]
 public class ConditionalFactAttribute : FactAttribute
 {
 }
diff --git a/tests/Aspire.CommunityToolkit.Testing/XUnit/ConditionalTheoryAttribute.cs b/tests/Aspire.CommunityToolkit.Testing/XUnit/ConditionalTheoryAttribute.cs
index d5f23068..95401a92 100644
--- a/tests/Aspire.CommunityToolkit.Testing/XUnit/ConditionalTheoryAttribute.cs
+++ b/tests/Aspire.CommunityToolkit.Testing/XUnit/ConditionalTheoryAttribute.cs
@@ -10,7 +10,7 @@
 namespace Microsoft.TestUtilities;
 
 [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
-[XunitTestCaseDiscoverer("Microsoft.TestUtilities." + nameof(ConditionalTheoryDiscoverer), "Microsoft.TestUtilities")]
+[XunitTestCaseDiscoverer("Microsoft.TestUtilities." + nameof(ConditionalTheoryDiscoverer), "Aspire.CommunityToolkit.Testing")]
 public class ConditionalTheoryAttribute : TheoryAttribute
 {
 }