Add OutputType of Exe when the user has requested EnableXunitRunner

xunit · Feb 26, 2024 · 80083a4 · 80083a4
1 parent 7c7d7ab
commit 80083a4
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 19 deletions.
diff --git a/src/xunit.runner.visualstudio/build/xunit.runner.visualstudio.desktop.props b/src/xunit.runner.visualstudio/build/xunit.runner.visualstudio.desktop.props
@@ -5,20 +5,19 @@
     <IsTestingPlatformApplication>$(EnableXunitRunner)</IsTestingPlatformApplication>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(EnableXunitRunner)' == 'true' ">
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+
   <ItemGroup>
-    <!--
-      !!! IMPORTANT !!!
-      DO NOT CHANGE THE GUID, IT'S A WELL KNOWN EXTENSION POINT AND THIS EXTENSION NEEDS TO BE REGISTERED AT THE END
-      WE HAVE CODE INSIDE THE TASK 'TestingPlatformEntryPoint' TO ENSURE THE ORDER OF THE REGISTRATION BASED ON THIS GUID
-    -->
-    <TestingPlatformBuilderHook Include="17E773D9-071C-4C66-97DD-57A450BDB027" Condition=" $(GenerateTestingPlatformEntryPoint) == 'true' " >
-      <DisplayName>xUnit</DisplayName>
+    <!-- This GUID comes from Microsoft.Testing.Platform, do not modify -->
+    <TestingPlatformBuilderHook Include="17E773D9-071C-4C66-97DD-57A450BDB027" Condition=" '$(GenerateTestingPlatformEntryPoint)' == 'true' " >
+      <DisplayName>xUnit.net</DisplayName>
       <TypeFullName>Xunit.Runner.VisualStudio.TestingPlatformBuilderHook</TypeFullName>
     </TestingPlatformBuilderHook>
-  </ItemGroup>  
-  
+  </ItemGroup>
+
   <ItemGroup>
-    <!-- Adapter dll is included in the .targets -->
     <None Include="$(MSBuildThisFileDirectory)xunit.abstractions.dll">
       <Link>xunit.abstractions.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

diff --git a/src/xunit.runner.visualstudio/build/xunit.runner.visualstudio.dotnetcore.props b/src/xunit.runner.visualstudio/build/xunit.runner.visualstudio.dotnetcore.props
@@ -5,20 +5,19 @@
     <IsTestingPlatformApplication>$(EnableXunitRunner)</IsTestingPlatformApplication>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(EnableXunitRunner)' == 'true' ">
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+
   <ItemGroup>
-    <!--
-      !!! IMPORTANT !!!
-      DO NOT CHANGE THE GUID, IT'S A WELL KNOWN EXTENSION POINT AND THIS EXTENSION NEEDS TO BE REGISTERED AT THE END
-      WE HAVE CODE INSIDE THE TASK 'TestingPlatformEntryPoint' TO ENSURE THE ORDER OF THE REGISTRATION BASED ON THIS GUID
-    -->
-    <TestingPlatformBuilderHook Include="17E773D9-071C-4C66-97DD-57A450BDB027" Condition=" $(GenerateTestingPlatformEntryPoint) == 'true' " >
-      <DisplayName>xUnit</DisplayName>
+    <!-- This GUID comes from Microsoft.Testing.Platform, do not modify -->
+    <TestingPlatformBuilderHook Include="17E773D9-071C-4C66-97DD-57A450BDB027" Condition=" '$(GenerateTestingPlatformEntryPoint)' == 'true' " >
+      <DisplayName>xUnit.net</DisplayName>
       <TypeFullName>Xunit.Runner.VisualStudio.TestingPlatformBuilderHook</TypeFullName>
     </TestingPlatformBuilderHook>
   </ItemGroup>
-  
+
   <ItemGroup>
-    <!-- Adapter dll is included in the .targets -->
     <None Include="$(MSBuildThisFileDirectory)xunit.runner.reporters.netcoreapp10.dll">
       <Link>xunit.runner.reporters.netcoreapp10.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>