From 7a86b33a38f29b315e8f08759eba42e8fe296fd7 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Sat, 3 Sep 2022 10:44:33 -0700
Subject: Centralize test project configuration with IsWixTestProject

---
 src/Directory.Build.targets                                 |  1 -
 src/Directory.csproj.targets                                | 13 ++++++++++++-
 src/Directory.vcxproj.targets                               |  2 +-
 .../WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj  |  8 --------
 .../wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj |  9 +--------
 .../Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj   |  9 +--------
 .../WixToolsetTest.Dnc.HostGenerator.csproj                 |  6 +-----
 .../WixToolsetTest.ManagedHost.csproj                       |  9 +--------
 .../FullFramework2MBA/Example.FullFramework2MBA.csproj      |  5 -----
 .../WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj    |  9 +--------
 .../WixToolsetTest.Dependency.csproj                        | 10 +---------
 .../WixToolsetTest.DifxApp/WixToolsetTest.DifxApp.csproj    |  9 +--------
 .../WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj    |  9 +--------
 .../WixToolsetTest.Firewall/WixToolsetTest.Firewall.csproj  |  9 +--------
 .../test/WixToolsetTest.Http/WixToolsetTest.Http.csproj     |  9 +--------
 .../Iis/test/WixToolsetTest.Iis/WixToolsetTest.Iis.csproj   |  9 +--------
 .../test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj     |  9 +--------
 .../test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj   | 10 +---------
 .../WixToolsetTest.Powershell.csproj                        |  9 +--------
 .../Sql/test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj   |  9 +--------
 src/ext/UI/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj  |  9 +--------
 .../test/WixToolsetTest.Util/WixToolsetTest.Util.csproj     |  9 +--------
 .../WixToolsetTest.VisualStudio.csproj                      |  9 +--------
 src/internal/SetBuildNumber/Directory.Packages.props.pp     |  2 +-
 .../WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj    |  7 +------
 .../msi/WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj  |  7 +------
 src/test/wix/WixE2E/WixE2E.csproj                           | 10 +---------
 .../test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj     | 10 +---------
 .../WixToolsetTest.HeatTasks.csproj                         | 10 +---------
 .../WixToolsetTest.BuildTasks.csproj                        | 10 +---------
 .../WixToolsetTest.Converters.Symbolizer.csproj             |  9 +--------
 .../WixToolsetTest.Converters.csproj                        |  9 +--------
 .../WixToolsetTest.Core.Burn.csproj                         | 10 +---------
 .../WixToolsetTest.Core.Native.csproj                       |  9 +--------
 src/wix/test/WixToolsetTest.Core/WixToolsetTest.Core.csproj | 10 +---------
 .../WixToolsetTest.CoreIntegration.csproj                   | 10 +---------
 src/wix/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj   | 10 +---------
 37 files changed, 45 insertions(+), 268 deletions(-)

diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index efad8cd5..5a8ef429 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -11,7 +11,6 @@
 
   <PropertyGroup Condition=" '$(IsWixTestSupportProject)'=='true' ">
     <IsTestProject>false</IsTestProject>
-    <IsWixTestProject>true</IsWixTestProject>
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(IsWixTestSupportProject)'=='true' ">
diff --git a/src/Directory.csproj.targets b/src/Directory.csproj.targets
index b131565c..4ec71cf1 100644
--- a/src/Directory.csproj.targets
+++ b/src/Directory.csproj.targets
@@ -12,7 +12,18 @@
 
   <Target Name="__SetAssemblyInfoFromGit" DependsOnTargets="__SetPropertiesFromGit" BeforeTargets="GetAssemblyVersion" />
 
-  <ItemGroup>
+  <PropertyGroup Condition=" '$(IsWixTestProject)'=='true' ">
+    <IsPackable>false</IsPackable>
+    <SignOutput>false</SignOutput>
+  </PropertyGroup>
+
+  <ItemGroup Condition=" '$(IsWixTestProject)'=='true' ">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(IsWixTestProject)'!='true' ">
     <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
     <PackageReference Include="GitInfo" PrivateAssets="All" />
   </ItemGroup>
diff --git a/src/Directory.vcxproj.targets b/src/Directory.vcxproj.targets
index 041db031..97f65b4c 100644
--- a/src/Directory.vcxproj.targets
+++ b/src/Directory.vcxproj.targets
@@ -50,7 +50,7 @@
   </PropertyGroup>
 
   <Target Name="PublicizeNativePdb"
-          Condition=" '@(Link)' != '' and '$(IsWixTestProject)' != 'true' and '$(IsWixSampleProject)' != 'true' ">
+          Condition=" '@(Link)' != '' and '$(IsWixTestSupportProject)' != 'true' and '$(IsWixTestProject)' != 'true' and '$(IsWixSampleProject)' != 'true' ">
     <Copy SourceFiles="%(Link.ProgramDatabaseFile)" DestinationFolder="$(PdbsFolder)$(PlatformFolder)" />
   </Target>
 </Project>
diff --git a/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj b/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
index a6899d1e..02cd24b1 100644
--- a/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
+++ b/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
@@ -4,9 +4,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <IsPackable>false</IsPackable>
     <RuntimeIdentifier>win-x86</RuntimeIdentifier>
-    <SignOutput>false</SignOutput>
     <RollForward>Major</RollForward>
     <IsWixTestProject>true</IsWixTestProject>
   </PropertyGroup>
@@ -18,10 +16,4 @@
   <ItemGroup>
     <PackageReference Include="WixBuildTools.TestSupport" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
-  </ItemGroup>
 </Project>
diff --git a/src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj b/src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj
index 4400d799..18054f67 100644
--- a/src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj
+++ b/src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj
@@ -4,8 +4,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <IsPackable>false</IsPackable>
-    <SignOutput>false</SignOutput>
+    <IsWixTestProject>true</IsWixTestProject>
   </PropertyGroup>
 
   <ItemGroup>
@@ -15,10 +14,4 @@
   <ItemGroup>
     <PackageReference Include="WixBuildTools.TestSupport" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
-  </ItemGroup>
 </Project>
diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj b/src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj
index a59a4707..65ac84dc 100644
--- a/src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj
+++ b/src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj
@@ -4,8 +4,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <IsPackable>false</IsPackable>
-    <SignOutput>false</SignOutput>
+    <IsWixTestProject>true</IsWixTestProject>
   </PropertyGroup>
 
   <ItemGroup>
@@ -23,10 +22,4 @@
   <ItemGroup>
     <PackageReference Include="WixToolset.Core.TestPackage" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
-  </ItemGroup>
 </Project>
diff --git a/src/ext/Bal/test/WixToolsetTest.Dnc.HostGenerator/WixToolsetTest.Dnc.HostGenerator.csproj b/src/ext/Bal/test/WixToolsetTest.Dnc.HostGenerator/WixToolsetTest.Dnc.HostGenerator.csproj
index 0c2b33fd..3da896a9 100644
--- a/src/ext/Bal/test/WixToolsetTest.Dnc.HostGenerator/WixToolsetTest.Dnc.HostGenerator.csproj
+++ b/src/ext/Bal/test/WixToolsetTest.Dnc.HostGenerator/WixToolsetTest.Dnc.HostGenerator.csproj
@@ -4,8 +4,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <IsPackable>false</IsPackable>
-    <SignOutput>false</SignOutput>
+    <IsWixTestProject>true</IsWixTestProject>
   </PropertyGroup>
 
   <ItemGroup>
@@ -20,8 +19,5 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
   </ItemGroup>
 </Project>
diff --git a/src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj b/src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj
index a55beac7..bcadc112 100644
--- a/src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj
+++ b/src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj
@@ -4,8 +4,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <IsPackable>false</IsPackable>
-    <SignOutput>false</SignOutput>
+    <IsWixTestProject>true</IsWixTestProject>
   </PropertyGroup>
 
   <ItemGroup>
@@ -15,10 +14,4 @@
   <ItemGroup>
     <PackageReference Include="WixToolset.Core.TestPackage" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
-  </ItemGroup>
 </Project>
diff --git a/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj b/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj
index e396e41f..2076f0b4 100644
--- a/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj
+++ b/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj
@@ -17,9 +17,4 @@
   <ItemGroup>
     <PackageReference Include="WixToolset.Mba.Core" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
-    <PackageReference Include="GitInfo" PrivateAssets="All" />
-  </ItemGroup>
 </Project>
diff --git a/src/ext/ComPlus/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj b/src/ext/ComPlus/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj
index b440f273..d423ffeb 100644
--- a/src/ext/ComPlus/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj
+++ b/src/ext/ComPlus/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj
@@ -4,8 +4,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <IsPackable>false</IsPackable>
-    <SignOutput>false</SignOutput>
+    <IsWixTestProject>true</IsWixTestProject>
   </PropertyGroup>
 
   <ItemGroup>
@@ -19,10 +18,4 @@
   <ItemGroup>
     <PackageReference Include="WixToolset.Core.TestPackage" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
-  </ItemGroup>
 </Project>
diff --git a/src/ext/Dependency/test/WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj b/src/ext/Dependency/test/WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj
index f1067f3f..101eee58 100644
--- a/src/ext/Dependency/test/WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj
+++ b/src/ext/Dependency/test/WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj
@@ -4,9 +4,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <DebugType>embedded</DebugType>
-    <IsPackable>false</IsPackable>
-    <SignOutput>false</SignOutput>
+    <IsWixTestProject>true</IsWixTestProject>
   </PropertyGroup>
 
   <ItemGroup>
@@ -20,10 +18,4 @@
   <ItemGroup>
     <PackageReference Include="WixToolset.Core.TestPackage" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
-  </ItemGroup>
 </Project>
diff --git a/src/ext/DifxApp/test/WixToolsetTest.DifxApp/WixToolsetTest.DifxApp.csproj b/src/ext/DifxApp/test/WixToolsetTest.DifxApp/WixToolsetTest.DifxApp.csproj
index 28496a2e..bc348261 100644
--- a/src/ext/DifxApp/test/WixToolsetTest.DifxApp/WixToolsetTest.DifxApp.csproj
+++ b/src/ext/DifxApp/test/WixToolsetTest.DifxApp/WixToolsetTest.DifxApp.csproj
@@ -4,8 +4,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <IsPackable>false</IsPackable>
-    <SignOutput>false</SignOutput>
+    <IsWixTestProject>true</IsWixTestProject>
   </PropertyGroup>
 
   <ItemGroup>
@@ -22,10 +21,4 @@
   <ItemGroup>
     <PackageReference Include="WixToolset.Core.TestPackage" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
-  </ItemGroup>
 </Project>
diff --git a/src/ext/DirectX/test/WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj b/src/ext/DirectX/test/WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj
index f0eab3bd..d524cb7d 100644
--- a/src/ext/DirectX/test/WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj
+++ b/src/ext/DirectX/test/WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj
@@ -4,8 +4,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <IsPackable>false</IsPackable>
-    <SignOutput>false</SignOutput>
+    <IsWixTestProject>true</IsWixTestProject>
   </PropertyGroup>
 
   <ItemGroup>
@@ -22,10 +21,4 @@
   <ItemGroup>
     <PackageReference Include="WixToolset.Core.TestPackage" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
-  </ItemGroup>
 </Project>
diff --git a/src/ext/Firewall/test/WixToolsetTest.Firewall/WixToolsetTest.Firewall.csproj b/src/ext/Firewall/test/WixToolsetTest.Firewall/WixToolsetTest.Firewall.csproj
index 684fa4a5..be8e7f2a 100644
--- a/src/ext/Firewall/test/WixToolsetTest.Firewall/WixToolsetTest.Firewall.csproj
+++ b/src/ext/Firewall/test/WixToolsetTest.Firewall/WixToolsetTest.Firewall.csproj
@@ -4,8 +4,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <IsPackable>false</IsPackable>
-    <SignOutput>false</SignOutput>
+    <IsWixTestProject>true</IsWixTestProject>
   </PropertyGroup>
 
   <ItemGroup>
@@ -19,10 +18,4 @@
   <ItemGroup>
     <PackageReference Include="WixToolset.Core.TestPackage" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
-  </ItemGroup>
 </Project>
diff --git a/src/ext/Http/test/WixToolsetTest.Http/WixToolsetTest.Http.csproj b/src/ext/Http/test/WixToolsetTest.Http/WixToolsetTest.Http.csproj
index 052b96b4..62c477ed 100644
--- a/src/ext/Http/test/WixToolsetTest.Http/WixToolsetTest.Http.csproj
+++ b/src/ext/Http/test/WixToolsetTest.Http/WixToolsetTest.Http.csproj
@@ -4,8 +4,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <IsPackable>false</IsPackable>
-    <SignOutput>false</SignOutput>
+    <IsWixTestProject>true</IsWixTestProject>
   </PropertyGroup>
 
   <ItemGroup>
@@ -19,10 +18,4 @@
   <ItemGroup>
     <PackageReference Include="WixToolset.Core.TestPackage" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
-  </ItemGroup>
 </Project>
diff --git a/src/ext/Iis/test/WixToolsetTest.Iis/WixToolsetTest.Iis.csproj b/src/ext/Iis/test/WixToolsetTest.Iis/WixToolsetTest.Iis.csproj
index 07d1a9ba..3f59e352 100644
--- a/src/ext/Iis/test/WixToolsetTest.Iis/WixToolsetTest.Iis.csproj
+++ b/src/ext/Iis/test/WixToolsetTest.Iis/WixToolsetTest.Iis.csproj
@@ -4,8 +4,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <IsPackable>false</IsPackable>
-    <SignOutput>false</SignOutput>
+    <IsWixTestProject>true</IsWixTestProject>
   </PropertyGroup>
 
   <ItemGroup>
@@ -22,10 +21,4 @@
   <ItemGroup>
     <PackageReference Include="WixToolset.Core.TestPackage" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
-  </ItemGroup>
 </Project>
diff --git a/src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj b/src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj
index 9b3d00ca..5acf0cf7 100644
--- a/src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj
+++ b/src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj
@@ -4,8 +4,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <IsPackable>false</IsPackable>
-    <SignOutput>false</SignOutput>
+    <IsWixTestProject>true</IsWixTestProject>
   </PropertyGroup>
 
   <ItemGroup>
@@ -22,10 +21,4 @@
   <ItemGroup>
     <PackageReference Include="WixToolset.Core.TestPackage" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
-  </ItemGroup>
 </Project>
diff --git a/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj b/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
index 24f807eb..71cf532f 100644
--- a/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
+++ b/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
@@ -4,9 +4,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <DebugType>embedded</DebugType>
-    <IsPackable>false</IsPackable>
-    <SignOutput>false</SignOutput>
+    <IsWixTestProject>true</IsWixTestProject>
   </PropertyGroup>
 
   <ItemGroup>
@@ -22,12 +20,6 @@
     <PackageReference Include="WixToolset.Core.TestPackage" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
-  </ItemGroup>
-
   <Target Name="CopyExtensions" AfterTargets="Build">
     <Copy DestinationFolder="$(OutputPath)" SourceFiles="@(WixExtension)" />
   </Target>
diff --git a/src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj b/src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj
index bd834200..595629ed 100644
--- a/src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj
+++ b/src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj
@@ -4,8 +4,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <IsPackable>false</IsPackable>
-    <SignOutput>false</SignOutput>
+    <IsWixTestProject>true</IsWixTestProject>
   </PropertyGroup>
 
   <ItemGroup>
@@ -19,10 +18,4 @@
   <ItemGroup>
     <PackageReference Include="WixToolset.Core.TestPackage" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
-  </ItemGroup>
 </Project>
diff --git a/src/ext/Sql/test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj b/src/ext/Sql/test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj
index df560060..39949409 100644
--- a/src/ext/Sql/test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj
+++ b/src/ext/Sql/test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj
@@ -4,8 +4,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <IsPackable>false</IsPackable>
-    <SignOutput>false</SignOutput>
+    <IsWixTestProject>true</IsWixTestProject>
   </PropertyGroup>
 
   <ItemGroup>
@@ -19,10 +18,4 @@
   <ItemGroup>
     <PackageReference Include="WixToolset.Core.TestPackage" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
-  </ItemGroup>
 </Project>
diff --git a/src/ext/UI/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj b/src/ext/UI/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj
index 211c02a6..5f2da23f 100644
--- a/src/ext/UI/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj
+++ b/src/ext/UI/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj
@@ -4,8 +4,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <IsPackable>false</IsPackable>
-    <SignOutput>false</SignOutput>
+    <IsWixTestProject>true</IsWixTestProject>
   </PropertyGroup>
 
   <ItemGroup>
@@ -19,10 +18,4 @@
   <ItemGroup>
     <PackageReference Include="WixToolset.Core.TestPackage" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
-  </ItemGroup>
 </Project>
diff --git a/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj b/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj
index fdb21557..e607f9cf 100644
--- a/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj
+++ b/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj
@@ -4,8 +4,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <IsPackable>false</IsPackable>
-    <SignOutput>false</SignOutput>
+    <IsWixTestProject>true</IsWixTestProject>
   </PropertyGroup>
 
   <ItemGroup>
@@ -19,10 +18,4 @@
   <ItemGroup>
     <PackageReference Include="WixToolset.Core.TestPackage" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
-  </ItemGroup>
 </Project>
diff --git a/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj b/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj
index f480d365..d39e1528 100644
--- a/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj
+++ b/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj
@@ -4,8 +4,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <IsPackable>false</IsPackable>
-    <SignOutput>false</SignOutput>
+    <IsWixTestProject>true</IsWixTestProject>
   </PropertyGroup>
 
   <ItemGroup>
@@ -19,10 +18,4 @@
   <ItemGroup>
     <PackageReference Include="WixToolset.Core.TestPackage" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
-  </ItemGroup>
 </Project>
diff --git a/src/internal/SetBuildNumber/Directory.Packages.props.pp b/src/internal/SetBuildNumber/Directory.Packages.props.pp
index 6fc9594c..f77fcffa 100644
--- a/src/internal/SetBuildNumber/Directory.Packages.props.pp
+++ b/src/internal/SetBuildNumber/Directory.Packages.props.pp
@@ -73,7 +73,7 @@
 
   <ItemGroup>
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
-    <PackageVersion Include="GitInfo" Version="2.1.2" />
+    <PackageVersion Include="GitInfo" Version="2.2.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj b/src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj
index 88b8dcb0..1bedb34b 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj
+++ b/src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj
@@ -6,6 +6,7 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <PlatformTarget>x64</PlatformTarget>
     <RollForward>Major</RollForward>
+    <IsWixTestProject>true</IsWixTestProject>
   </PropertyGroup>
 
   <ItemGroup>
@@ -24,10 +25,4 @@
     <PackageReference Include="WixToolset.Data" />
     <PackageReference Include="WixToolset.Mba.Core" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
-  </ItemGroup>
 </Project>
diff --git a/src/test/msi/WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj b/src/test/msi/WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj
index ccf98042..348d97ad 100644
--- a/src/test/msi/WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj
+++ b/src/test/msi/WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj
@@ -6,6 +6,7 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <PlatformTarget>x64</PlatformTarget>
     <RollForward>Major</RollForward>
+    <IsWixTestProject>true</IsWixTestProject>
   </PropertyGroup>
 
   <ItemGroup>
@@ -22,10 +23,4 @@
     <PackageReference Include="WixBuildTools.TestSupport" />
     <PackageReference Include="WixToolset.Data" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
-  </ItemGroup>
 </Project>
diff --git a/src/test/wix/WixE2E/WixE2E.csproj b/src/test/wix/WixE2E/WixE2E.csproj
index 031979b6..d85cc152 100644
--- a/src/test/wix/WixE2E/WixE2E.csproj
+++ b/src/test/wix/WixE2E/WixE2E.csproj
@@ -4,9 +4,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
-    <IsPackable>false</IsPackable>
-    <DebugType>embedded</DebugType>
-    <SignOutput>false</SignOutput>
+    <IsWixTestProject>true</IsWixTestProject>
   </PropertyGroup>
 
   <ItemGroup>
@@ -16,10 +14,4 @@
   <ItemGroup>
      <PackageReference Include="WixBuildTools.TestSupport" /> 
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="all" />
-  </ItemGroup>
 </Project>
diff --git a/src/tools/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj b/src/tools/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj
index c887297b..cb4deae1 100644
--- a/src/tools/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj
+++ b/src/tools/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj
@@ -4,10 +4,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
-    <IsPackable>false</IsPackable>
-    <DebugType>embedded</DebugType>
     <DefaultItemExcludes>TestData\**;$(DefaultItemExcludes)</DefaultItemExcludes>
-    <SignOutput>false</SignOutput>
+    <IsWixTestProject>true</IsWixTestProject>
   </PropertyGroup>
 
   <ItemGroup>
@@ -21,10 +19,4 @@
   <ItemGroup>
     <PackageReference Include="WixToolset.Core.TestPackage" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
-  </ItemGroup>
 </Project>
diff --git a/src/tools/test/WixToolsetTest.HeatTasks/WixToolsetTest.HeatTasks.csproj b/src/tools/test/WixToolsetTest.HeatTasks/WixToolsetTest.HeatTasks.csproj
index c0c7c903..03b7cb88 100644
--- a/src/tools/test/WixToolsetTest.HeatTasks/WixToolsetTest.HeatTasks.csproj
+++ b/src/tools/test/WixToolsetTest.HeatTasks/WixToolsetTest.HeatTasks.csproj
@@ -4,10 +4,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
-    <IsPackable>false</IsPackable>
-    <DebugType>embedded</DebugType>
     <DefaultItemExcludes>TestData\**;$(DefaultItemExcludes)</DefaultItemExcludes>
-    <SignOutput>false</SignOutput>
+    <IsWixTestProject>true</IsWixTestProject>
   </PropertyGroup>
 
   <ItemGroup>
@@ -19,10 +17,4 @@
     <PackageReference Include="WixBuildTools.TestSupport" /> 
     <PackageReference Include="WixToolset.Core.TestPackage" /> 
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
-  </ItemGroup>
 </Project>
diff --git a/src/wix/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj b/src/wix/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
index fe8a78e9..f8bb4438 100644
--- a/src/wix/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
+++ b/src/wix/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
@@ -4,11 +4,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
-    <IsPackable>false</IsPackable>
-    <DebugType>embedded</DebugType>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-    <SignOutput>false</SignOutput>
     <RequiresNativeWixAssets>true</RequiresNativeWixAssets>
+    <IsWixTestProject>true</IsWixTestProject>
   </PropertyGroup>
 
   <ItemGroup>
@@ -27,10 +25,4 @@
     <PackageReference Include="Microsoft.Build.Tasks.Core" />
     <PackageReference Include="WixBuildTools.TestSupport" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
-  </ItemGroup>
 </Project>
diff --git a/src/wix/test/WixToolsetTest.Converters.Symbolizer/WixToolsetTest.Converters.Symbolizer.csproj b/src/wix/test/WixToolsetTest.Converters.Symbolizer/WixToolsetTest.Converters.Symbolizer.csproj
index 8be39179..5e246624 100644
--- a/src/wix/test/WixToolsetTest.Converters.Symbolizer/WixToolsetTest.Converters.Symbolizer.csproj
+++ b/src/wix/test/WixToolsetTest.Converters.Symbolizer/WixToolsetTest.Converters.Symbolizer.csproj
@@ -4,8 +4,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
-    <IsPackable>false</IsPackable>
-    <SignOutput>false</SignOutput>
+    <IsWixTestProject>true</IsWixTestProject>
   </PropertyGroup>
 
   <ItemGroup>
@@ -24,10 +23,4 @@
   <ItemGroup>
     <Reference Include="wix" HintPath="..\..\deps\wix.dll" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
-  </ItemGroup>
 </Project>
diff --git a/src/wix/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj b/src/wix/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj
index 2d7da5ad..cf374060 100644
--- a/src/wix/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj
+++ b/src/wix/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj
@@ -4,8 +4,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <IsPackable>false</IsPackable>
-    <SignOutput>false</SignOutput>
+    <IsWixTestProject>true</IsWixTestProject>
   </PropertyGroup>
 
   <ItemGroup>
@@ -26,10 +25,4 @@
   <ItemGroup>
     <PackageReference Include="WixBuildTools.TestSupport" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
-  </ItemGroup>
 </Project>
diff --git a/src/wix/test/WixToolsetTest.Core.Burn/WixToolsetTest.Core.Burn.csproj b/src/wix/test/WixToolsetTest.Core.Burn/WixToolsetTest.Core.Burn.csproj
index fd1e9ccb..36dfa4b3 100644
--- a/src/wix/test/WixToolsetTest.Core.Burn/WixToolsetTest.Core.Burn.csproj
+++ b/src/wix/test/WixToolsetTest.Core.Burn/WixToolsetTest.Core.Burn.csproj
@@ -4,9 +4,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <IsPackable>false</IsPackable>
-    <DebugType>embedded</DebugType>
-    <SignOutput>false</SignOutput>
+    <IsWixTestProject>true</IsWixTestProject>
   </PropertyGroup>
 
   <ItemGroup>
@@ -16,10 +14,4 @@
   <ItemGroup>
     <PackageReference Include="WixBuildTools.TestSupport" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
-  </ItemGroup>
 </Project>
diff --git a/src/wix/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj b/src/wix/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj
index e3ad52df..f702efe1 100644
--- a/src/wix/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj
+++ b/src/wix/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj
@@ -4,10 +4,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <IsPackable>false</IsPackable>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-    <SignOutput>false</SignOutput>
     <RequiresNativeWixAssets>true</RequiresNativeWixAssets>
+    <IsWixTestProject>true</IsWixTestProject>
   </PropertyGroup>
 
   <ItemGroup>
@@ -21,10 +20,4 @@
   <ItemGroup>
     <PackageReference Include="WixBuildTools.TestSupport" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
-  </ItemGroup>
 </Project>
diff --git a/src/wix/test/WixToolsetTest.Core/WixToolsetTest.Core.csproj b/src/wix/test/WixToolsetTest.Core/WixToolsetTest.Core.csproj
index 3b0259cb..65af0da5 100644
--- a/src/wix/test/WixToolsetTest.Core/WixToolsetTest.Core.csproj
+++ b/src/wix/test/WixToolsetTest.Core/WixToolsetTest.Core.csproj
@@ -4,9 +4,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <IsPackable>false</IsPackable>
-    <DebugType>embedded</DebugType>
-    <SignOutput>false</SignOutput>
+    <IsWixTestProject>true</IsWixTestProject>
   </PropertyGroup>
 
   <ItemGroup>
@@ -16,10 +14,4 @@
   <ItemGroup>
     <PackageReference Include="WixBuildTools.TestSupport" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
-  </ItemGroup>
 </Project>
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj b/src/wix/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
index 996858d1..16e6f73a 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj
@@ -4,10 +4,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <IsPackable>false</IsPackable>
-    <DebugType>embedded</DebugType>
-    <SignOutput>false</SignOutput>
     <RequiresNativeWixAssets>true</RequiresNativeWixAssets>
+    <IsWixTestProject>true</IsWixTestProject>
   </PropertyGroup>
 
   <ItemGroup>
@@ -25,10 +23,4 @@
   <ItemGroup>
      <PackageReference Include="WixBuildTools.TestSupport" /> 
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
-  </ItemGroup>
 </Project>
diff --git a/src/wix/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj b/src/wix/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj
index 5a6f6ad1..3ec0eeaf 100644
--- a/src/wix/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj
+++ b/src/wix/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj
@@ -4,11 +4,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
-    <IsPackable>false</IsPackable>
-    <DebugType>embedded</DebugType>
     <DefaultItemExcludes>TestData\**;$(DefaultItemExcludes)</DefaultItemExcludes>
-    <SignOutput>false</SignOutput>
     <RequiresNativeWixAssets>true</RequiresNativeWixAssets>
+    <IsWixTestProject>true</IsWixTestProject>
   </PropertyGroup>
 
   <ItemGroup>
@@ -22,10 +20,4 @@
   <ItemGroup>
     <PackageReference Include="WixBuildTools.TestSupport" /> 
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit" />
-    <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
-  </ItemGroup>
 </Project>
-- 
cgit v1.2.3-55-g6feb