@joebigelow / wix / commits / 56ca5213

Add IsWixTestSupportProject property to prevent test project detection.

Sean Hall committed Jun 27, 2022 at 11:30 UTC 56ca521396cdf47b5611f6e3a6264be9a8d20282
5 files changed +13 -1
src/Directory.Build.targets
+9
@@ -9,6 +9,15 @@
9 <SigningConfiguration>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), signing.json))\signing.json</SigningConfiguration>
10 </PropertyGroup>
11
12 + <PropertyGroup Condition=" '$(IsWixTestSupportProject)'=='true' ">
13 + <IsTestProject>false</IsTestProject>
14 + <IsWixTestProject>true</IsWixTestProject>
15 + </PropertyGroup>
16 +
17 + <ItemGroup Condition=" '$(IsWixTestSupportProject)'=='true' ">
18 + <ProjectCapability Remove="TestContainer" />
19 + </ItemGroup>
20 +
21 <Target Name="__FixupGitBaseVersion" BeforeTargets="_GitPopulateVersionInfo">
22 <PropertyGroup>
23 <GitBaseVersion>$(GitBaseVersion.Replace('{apiversion}', '$(ApiVersion)'))</GitBaseVersion>
src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj
+1 -1
@@ -33,7 +33,7 @@
33 <CLRSupport>true</CLRSupport>
34 <Description>WixBuildTools C++/CLI Test Support</Description>
35 <SignOutput>false</SignOutput>
36 - <IsWixTestProject>true</IsWixTestProject>
36 + <IsWixTestSupportProject>true</IsWixTestSupportProject>
37 </PropertyGroup>
38
39 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
src/internal/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj
+1
@@ -11,6 +11,7 @@
11 <CreateDocumentationFile>true</CreateDocumentationFile>
12 <NoWarn>$(NoWarn);CS1591</NoWarn>
13 <SignOutput>false</SignOutput>
14 + <IsWixTestSupportProject>true</IsWixTestSupportProject>
15 </PropertyGroup>
16
17 <ItemGroup>
src/test/burn/WixTestTools/WixTestTools.csproj
+1
@@ -5,6 +5,7 @@
5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 <PlatformTarget>x64</PlatformTarget>
8 + <IsWixTestSupportProject>true</IsWixTestSupportProject>
9 </PropertyGroup>
10
11 <ItemGroup>
src/wix/WixToolset.Core.TestPackage/WixToolset.Core.TestPackage.csproj
+1
@@ -10,6 +10,7 @@
10 <PublishRepositoryUrl>true</PublishRepositoryUrl>
11 <CreateDocumentationFile>true</CreateDocumentationFile>
12 <SignOutput>false</SignOutput>
13 + <IsWixTestSupportProject>true</IsWixTestSupportProject>
14 </PropertyGroup>
15
16 <ItemGroup>