From 56ca521396cdf47b5611f6e3a6264be9a8d20282 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Mon, 27 Jun 2022 11:30:28 -0500
Subject: Add IsWixTestSupportProject property to prevent test project
 detection.

---
 src/Directory.Build.targets                                      | 9 +++++++++
 .../WixBuildTools.TestSupport.Native.vcxproj                     | 2 +-
 .../WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj   | 1 +
 src/test/burn/WixTestTools/WixTestTools.csproj                   | 1 +
 .../WixToolset.Core.TestPackage.csproj                           | 1 +
 5 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index 1170fc62..efad8cd5 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -9,6 +9,15 @@
     <SigningConfiguration>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), signing.json))\signing.json</SigningConfiguration>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(IsWixTestSupportProject)'=='true' ">
+    <IsTestProject>false</IsTestProject>
+    <IsWixTestProject>true</IsWixTestProject>
+  </PropertyGroup>
+
+  <ItemGroup Condition=" '$(IsWixTestSupportProject)'=='true' ">
+    <ProjectCapability Remove="TestContainer" />
+  </ItemGroup>
+
   <Target Name="__FixupGitBaseVersion" BeforeTargets="_GitPopulateVersionInfo">
     <PropertyGroup>
       <GitBaseVersion>$(GitBaseVersion.Replace('{apiversion}', '$(ApiVersion)'))</GitBaseVersion>
diff --git a/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj b/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj
index 0eae7750..47d79745 100644
--- a/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj
+++ b/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj
@@ -33,7 +33,7 @@
     <CLRSupport>true</CLRSupport>
     <Description>WixBuildTools C++/CLI Test Support</Description>
     <SignOutput>false</SignOutput>
-    <IsWixTestProject>true</IsWixTestProject>
+    <IsWixTestSupportProject>true</IsWixTestSupportProject>
   </PropertyGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
diff --git a/src/internal/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj b/src/internal/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj
index 8a5237d1..4e1c3c26 100644
--- a/src/internal/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj
+++ b/src/internal/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj
@@ -11,6 +11,7 @@
     <CreateDocumentationFile>true</CreateDocumentationFile>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <SignOutput>false</SignOutput>
+    <IsWixTestSupportProject>true</IsWixTestSupportProject>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/test/burn/WixTestTools/WixTestTools.csproj b/src/test/burn/WixTestTools/WixTestTools.csproj
index 49e14f25..535e6f44 100644
--- a/src/test/burn/WixTestTools/WixTestTools.csproj
+++ b/src/test/burn/WixTestTools/WixTestTools.csproj
@@ -5,6 +5,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <PlatformTarget>x64</PlatformTarget>
+    <IsWixTestSupportProject>true</IsWixTestSupportProject>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/wix/WixToolset.Core.TestPackage/WixToolset.Core.TestPackage.csproj b/src/wix/WixToolset.Core.TestPackage/WixToolset.Core.TestPackage.csproj
index 0c78cc32..3a028ec1 100644
--- a/src/wix/WixToolset.Core.TestPackage/WixToolset.Core.TestPackage.csproj
+++ b/src/wix/WixToolset.Core.TestPackage/WixToolset.Core.TestPackage.csproj
@@ -10,6 +10,7 @@
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <CreateDocumentationFile>true</CreateDocumentationFile>
     <SignOutput>false</SignOutput>
+    <IsWixTestSupportProject>true</IsWixTestSupportProject>
   </PropertyGroup>
 
   <ItemGroup>
-- 
cgit v1.2.3-55-g6feb