Move most tests into the new WixToolsetTest.MSBuild project.

This project relies on all of the projects being published in order to properly test wix.targets.

34 files changed, 75 insertions, 51 deletions

diff --git a/src/ThmViewerPackage/ThmViewerPackage.wixproj b/src/ThmViewerPackage/ThmViewerPackage.wixproj
index 07014065..212d1bae 100644
--- a/src/ThmViewerPackage/ThmViewerPackage.wixproj
+++ b/src/ThmViewerPackage/ThmViewerPackage.wixproj
@@ -6,7 +6,6 @@
     <ProjectGuid>59c4b122-5167-445b-8fc4-09dcd4eced89</ProjectGuid>
     <OutputName>thmviewer</OutputName>
     <OutputType>Package</OutputType>
-    <WixBinDir>$(OutputPath)\net461\win-x86\</WixBinDir>
   </PropertyGroup>
 
   <ItemGroup>
@@ -24,7 +23,7 @@
     </ProjectReference>
   </ItemGroup>
 
-  <Import Project="..\WixToolset.MSBuild\wix.targets" />
+  <Import Project="$(OutputPath)\publish\WixToolset.MSBuild\tools\wix.targets" />
 
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
diff --git a/src/WixToolset.MSBuild/WixToolset.MSBuild.csproj b/src/WixToolset.MSBuild/WixToolset.MSBuild.csproj
index 5a9633ae..2d5ea01b 100644
--- a/src/WixToolset.MSBuild/WixToolset.MSBuild.csproj
+++ b/src/WixToolset.MSBuild/WixToolset.MSBuild.csproj
@@ -12,6 +12,13 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Content Include="tools\wix.ca.targets" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="tools\wix.harvest.targets" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="tools\wix.signing.targets" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="tools\wix.targets" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+
+  <ItemGroup>
     <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
   </ItemGroup>
 
diff --git a/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec b/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec
index 6171a911..ff0d74ee 100644
--- a/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec
+++ b/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec
@@ -12,11 +12,6 @@
 
   <files>
     <file src="$projectFolder$$id$.props" target="build" />
-    <file src="$projectFolder$wix.ca.targets" target="tools" />
-    <file src="$projectFolder$wix.harvest.targets" target="tools" />
-    <file src="$projectFolder$wix.signing.targets" target="tools" />
-    <file src="$projectFolder$wix.targets" target="tools" />
-    <file src="net461\**\*" target="tools\net461" />
-    <file src="netcoreapp2.1\**\*" target="tools\netcoreapp2.1" />
+    <file src="tools\**\*" target="tools" />
   </files>
 </package>
diff --git a/src/WixToolset.MSBuild/wix.ca.targets b/src/WixToolset.MSBuild/tools/wix.ca.targets
index 4578c2d8..4578c2d8 100644
--- a/src/WixToolset.MSBuild/wix.ca.targets
+++ b/src/WixToolset.MSBuild/tools/wix.ca.targets
diff --git a/src/WixToolset.MSBuild/wix.harvest.targets b/src/WixToolset.MSBuild/tools/wix.harvest.targets
index e4d866ea..e4d866ea 100644
--- a/src/WixToolset.MSBuild/wix.harvest.targets
+++ b/src/WixToolset.MSBuild/tools/wix.harvest.targets
diff --git a/src/WixToolset.MSBuild/wix.signing.targets b/src/WixToolset.MSBuild/tools/wix.signing.targets
index 7c25175f..7c25175f 100644
--- a/src/WixToolset.MSBuild/wix.signing.targets
+++ b/src/WixToolset.MSBuild/tools/wix.signing.targets
diff --git a/src/WixToolset.MSBuild/wix.targets b/src/WixToolset.MSBuild/tools/wix.targets
index b35d18c7..b35d18c7 100644
--- a/src/WixToolset.MSBuild/wix.targets
+++ b/src/WixToolset.MSBuild/tools/wix.targets
diff --git a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj b/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
index 9fb2bc82..22d421de 100644
--- a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
+++ b/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
@@ -10,31 +10,16 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Include="TestData\HeatFilePackage\HeatFilePackage.wixproj" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="TestData\HeatFilePackage\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="TestData\HeatFileMultpleFilesSameFileName\HeatFileMultpleFilesSameFileName.wixproj" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="TestData\HeatFileMultpleFilesSameFileName\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="TestData\HeatFileMultpleFilesSameFileName\MyProgram.txt" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="TestData\HeatFileMultpleFilesSameFileName\MyProgram.json" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="TestData\MultiCulturalMsiPackage\MsiPackage\MsiPackage.wixproj" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="TestData\MultiCulturalMsiPackage\MsiPackage\Package.de-de.wxl" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="TestData\MultiCulturalMsiPackage\MsiPackage\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="TestData\MultiCulturalMsiPackage\MsiPackage\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="TestData\MultiCulturalMsiPackage\MsiPackage\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="TestData\MultiCulturalMsiPackage\MsiPackage\data\test.txt" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="TestData\SimpleMsiPackage\MsiPackage\MsiPackage.wixproj" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="TestData\SimpleMsiPackage\MsiPackage\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="TestData\SimpleMsiPackage\MsiPackage\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="TestData\SimpleMsiPackage\MsiPackage\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="TestData\SimpleMsiPackage\MsiPackage\data\test.txt" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="TestData\SimpleMsiPackage\SimpleBundle\Bundle.wxs" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="TestData\SimpleMsiPackage\SimpleBundle\SimpleBundle.wixproj" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="..\WixToolsetTest.MSBuild\TestData\SimpleMsiPackage\MsiPackage\Package.en-us.wxl" Link="TestData\SimpleMsiPackage\MsiPackage\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="..\WixToolsetTest.MSBuild\TestData\SimpleMsiPackage\MsiPackage\Package.wxs" Link="TestData\SimpleMsiPackage\MsiPackage\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="..\WixToolsetTest.MSBuild\TestData\SimpleMsiPackage\MsiPackage\PackageComponents.wxs" Link="TestData\SimpleMsiPackage\MsiPackage\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="..\WixToolsetTest.MSBuild\TestData\SimpleMsiPackage\MsiPackage\data\test.txt" Link="TestData\SimpleMsiPackage\MsiPackage\data\test.txt" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="..\..\WixToolset.MSBuild\wix.harvest.targets" Link="wix.harvest.targets" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="..\..\WixToolset.MSBuild\wix.signing.targets" Link="wix.signing.targets" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="..\..\WixToolset.MSBuild\wix.targets" Link="wix.targets" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="..\..\WixToolset.MSBuild\tools\wix.harvest.targets" Link="wix.harvest.targets" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="..\..\WixToolset.MSBuild\tools\wix.signing.targets" Link="wix.signing.targets" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="..\..\WixToolset.MSBuild\tools\wix.targets" Link="wix.targets" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs b/src/test/WixToolsetTest.MSBuild/MsbuildFixture.cs
index 0768f863..85f111a9 100644
--- a/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs
+++ b/src/test/WixToolsetTest.MSBuild/MsbuildFixture.cs
@@ -1,18 +1,16 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolsetTest.BuildTasks
+namespace WixToolsetTest.MSBuild
 {
     using System;
     using System.IO;
     using System.Linq;
     using WixBuildTools.TestSupport;
-    using WixToolset.BuildTasks;
     using Xunit;
 
     public class MsbuildFixture
     {
-        private static readonly string WixBinPath = Path.GetDirectoryName(new Uri(typeof(WixBuild).Assembly.CodeBase).AbsolutePath) + "\\";
-        private static readonly string WixTargetsPath = Path.Combine(WixBinPath, "wix.targets");
+        private static readonly string WixTargetsPath = Path.Combine(new Uri(typeof(MsbuildFixture).Assembly.CodeBase).AbsolutePath, "..", "..", "publish", "WixToolset.MSBuild", "tools", "wix.targets");
 
         [Fact]
         public void CanBuildSimpleBundle()
@@ -28,7 +26,6 @@ namespace WixToolsetTest.BuildTasks
                 var result = MsbuildRunner.Execute(projectPath, new[]
                 {
                     $"-p:WixTargetsPath={WixTargetsPath}",
-                    $"-p:WixBinDir={WixBinPath}",
                     $"-p:IntermediateOutputPath={intermediateFolder}",
                     $"-p:OutputPath={binFolder}"
                 });
@@ -66,7 +63,6 @@ namespace WixToolsetTest.BuildTasks
                 var result = MsbuildRunner.Execute(projectPath, new[]
                 {
                     $"-p:WixTargetsPath={WixTargetsPath}",
-                    $"-p:WixBinDir={WixBinPath}",
                     $"-p:IntermediateOutputPath={intermediateFolder}",
                     $"-p:OutputPath={binFolder}"
                 });
@@ -129,7 +125,6 @@ namespace WixToolsetTest.BuildTasks
                 {
                     wixpdbType == null ? String.Empty : $"-p:WixPdbType={wixpdbType}",
                     $"-p:WixTargetsPath={WixTargetsPath}",
-                    $"-p:WixBinDir={WixBinPath}",
                     $"-p:IntermediateOutputPath={intermediateFolder}",
                     $"-p:OutputPath={binFolder}",
                 });
@@ -157,7 +152,6 @@ namespace WixToolsetTest.BuildTasks
                 var result = MsbuildRunner.Execute(projectPath, new[]
                 {
                     $"-p:WixTargetsPath={WixTargetsPath}",
-                    $"-p:WixBinDir={WixBinPath}",
                     $"-p:IntermediateOutputPath={intermediateFolder}",
                     $"-p:OutputPath={binFolder}",
                     $"-p:InstallerPlatform=x64",
@@ -183,7 +177,6 @@ namespace WixToolsetTest.BuildTasks
                 var result = MsbuildRunner.Execute(projectPath, new[]
                 {
                     $"-p:WixTargetsPath={WixTargetsPath}",
-                    $"-p:WixBinDir={WixBinPath}",
                     $"-p:IntermediateOutputPath={intermediateFolder}",
                     $"-p:OutputPath={binFolder}",
                     "-p:SuppressIces=\"ICE45;ICE46\""
@@ -206,7 +199,6 @@ namespace WixToolsetTest.BuildTasks
                 var result = MsbuildRunner.Execute(projectPath, new[]
                 {
                     $"-p:WixTargetsPath={WixTargetsPath}",
-                    $"-p:WixBinDir={WixBinPath}",
                     $"-p:IntermediateOutputPath={intermediateFolder}",
                     $"-p:OutputPath={binFolder}",
                     "-p:SuppressSpecificWarnings=\"1118;1102\""
@@ -232,7 +224,6 @@ namespace WixToolsetTest.BuildTasks
                 var result = MsbuildRunner.Execute(projectPath, new[]
                 {
                     $"-p:WixTargetsPath={WixTargetsPath}",
-                    $"-p:WixBinDir={WixBinPath}",
                     $"-p:IntermediateOutputPath={intermediateFolder}",
                     $"-p:OutputPath={binFolder}",
                     "-p:OutputType=IntermediatePostLink"
@@ -261,7 +252,6 @@ namespace WixToolsetTest.BuildTasks
                 var result = MsbuildRunner.Execute(projectPath, new[]
                 {
                     $"-p:WixTargetsPath={WixTargetsPath}",
-                    $"-p:WixBinDir={WixBinPath}",
                     $"-p:IntermediateOutputPath={intermediateFolder}",
                     $"-p:OutputPath={binFolder}",
                     "-v:diag"
@@ -280,7 +270,6 @@ namespace WixToolsetTest.BuildTasks
                 result = MsbuildRunner.Execute(projectPath, new[]
                 {
                     $"-p:WixTargetsPath={WixTargetsPath}",
-                    $"-p:WixBinDir={WixBinPath}",
                     $"-p:IntermediateOutputPath={intermediateFolder}",
                     $"-p:OutputPath={binFolder}",
                     "-t:Clean",
diff --git a/src/test/WixToolsetTest.BuildTasks/MsbuildHeatFixture.cs b/src/test/WixToolsetTest.MSBuild/MsbuildHeatFixture.cs
index 95805658..fa8acb81 100644
--- a/src/test/WixToolsetTest.BuildTasks/MsbuildHeatFixture.cs
+++ b/src/test/WixToolsetTest.MSBuild/MsbuildHeatFixture.cs
@@ -1,12 +1,11 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolsetTest.BuildTasks
+namespace WixToolsetTest.MSBuild
 {
     using System;
     using System.IO;
     using System.Linq;
     using WixBuildTools.TestSupport;
-    using WixToolset.BuildTasks;
     using WixToolset.Core.TestPackage;
     using WixToolset.Data;
     using WixToolset.Data.Tuples;
@@ -14,8 +13,7 @@ namespace WixToolsetTest.BuildTasks
 
     public class MsbuildHeatFixture
     {
-        private static readonly string WixBinPath = Path.GetDirectoryName(new Uri(typeof(WixBuild).Assembly.CodeBase).AbsolutePath) + "\\";
-        private static readonly string WixTargetsPath = Path.Combine(WixBinPath, "wix.targets");
+        private static readonly string WixTargetsPath = Path.Combine(new Uri(typeof(MsbuildHeatFixture).Assembly.CodeBase).AbsolutePath, "..", "..", "publish", "WixToolset.MSBuild", "tools", "wix.targets");
 
         [Fact]
         public void CanBuildHeatFilePackage()
@@ -31,7 +29,6 @@ namespace WixToolsetTest.BuildTasks
                 var result = MsbuildRunner.Execute(projectPath, new[]
                 {
                     $"-p:WixTargetsPath={WixTargetsPath}",
-                    $"-p:WixBinDir={WixBinPath}",
                     $"-p:IntermediateOutputPath={intermediateFolder}",
                     $"-p:OutputPath={binFolder}"
                 });
@@ -77,7 +74,7 @@ namespace WixToolsetTest.BuildTasks
         [Fact]
         public void CanBuildHeatFileWithMultipleFilesPackage()
         {
-            var projectPath = TestData.Get(@"TestData\HeatFileMultpleFilesSameFileName\HeatFileMultpleFilesSameFileName.wixproj");
+            var projectPath = TestData.Get(@"TestData\HeatFileMultipleFilesSameFileName\HeatFileMultipleFilesSameFileName.wixproj");
 
             using (var fs = new DisposableFileSystem())
             {
@@ -88,7 +85,6 @@ namespace WixToolsetTest.BuildTasks
                 var result = MsbuildRunner.Execute(projectPath, new[]
                 {
                     $"-p:WixTargetsPath={WixTargetsPath}",
-                    $"-p:WixBinDir={WixBinPath}",
                     $"-p:IntermediateOutputPath={intermediateFolder}",
                     $"-p:OutputPath={binFolder}"
                 });
@@ -140,7 +136,7 @@ namespace WixToolsetTest.BuildTasks
                     "</Fragment>" +
                     "</Wix>", testXml);
 
-                var pdbPath = Path.Combine(binFolder, "HeatFileMultpleFilesSameFileName.wixpdb");
+                var pdbPath = Path.Combine(binFolder, "HeatFileMultipleFilesSameFileName.wixpdb");
                 Assert.True(File.Exists(pdbPath));
 
                 var intermediate = Intermediate.Load(pdbPath);
diff --git a/src/test/WixToolsetTest.MSBuild/README.md b/src/test/WixToolsetTest.MSBuild/README.md
new file mode 100644
index 00000000..7faf34b9
--- /dev/null
+++ b/src/test/WixToolsetTest.MSBuild/README.md
@@ -0,0 +1,5 @@
+In order to properly test wix.targets,
+all of the supported architectures for WixToolset.BuildTasks need to be available in the layout used in the Nuget package.
+Making this happen on every build for the solution takes too long,
+so this project relies on manually running appveyor.cmd to publish everything before the tests can be run.
+appveyor.cmd needs to be ran again every time changes are made in other projects, including the targets themselves.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/HeatFileMultpleFilesSameFileName/HeatFileMultpleFilesSameFileName.wixproj b/src/test/WixToolsetTest.MSBuild/TestData/HeatFileMultipleFilesSameFileName/HeatFileMultipleFilesSameFileName.wixproj
index 860fc2dd..860fc2dd 100644
--- a/src/test/WixToolsetTest.BuildTasks/TestData/HeatFileMultpleFilesSameFileName/HeatFileMultpleFilesSameFileName.wixproj
+++ b/src/test/WixToolsetTest.MSBuild/TestData/HeatFileMultipleFilesSameFileName/HeatFileMultipleFilesSameFileName.wixproj
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/HeatFileMultpleFilesSameFileName/MyProgram.json b/src/test/WixToolsetTest.MSBuild/TestData/HeatFileMultipleFilesSameFileName/MyProgram.json
index 5f282702..5f282702 100644
--- a/src/test/WixToolsetTest.BuildTasks/TestData/HeatFileMultpleFilesSameFileName/MyProgram.json
+++ b/src/test/WixToolsetTest.MSBuild/TestData/HeatFileMultipleFilesSameFileName/MyProgram.json
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/HeatFileMultpleFilesSameFileName/MyProgram.txt b/src/test/WixToolsetTest.MSBuild/TestData/HeatFileMultipleFilesSameFileName/MyProgram.txt
index 5f282702..5f282702 100644
--- a/src/test/WixToolsetTest.BuildTasks/TestData/HeatFileMultpleFilesSameFileName/MyProgram.txt
+++ b/src/test/WixToolsetTest.MSBuild/TestData/HeatFileMultipleFilesSameFileName/MyProgram.txt
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/HeatFileMultpleFilesSameFileName/Package.wxs b/src/test/WixToolsetTest.MSBuild/TestData/HeatFileMultipleFilesSameFileName/Package.wxs
index 884da274..884da274 100644
--- a/src/test/WixToolsetTest.BuildTasks/TestData/HeatFileMultpleFilesSameFileName/Package.wxs
+++ b/src/test/WixToolsetTest.MSBuild/TestData/HeatFileMultipleFilesSameFileName/Package.wxs
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/HeatFilePackage/HeatFilePackage.wixproj b/src/test/WixToolsetTest.MSBuild/TestData/HeatFilePackage/HeatFilePackage.wixproj
index 87f4388a..87f4388a 100644
--- a/src/test/WixToolsetTest.BuildTasks/TestData/HeatFilePackage/HeatFilePackage.wixproj
+++ b/src/test/WixToolsetTest.MSBuild/TestData/HeatFilePackage/HeatFilePackage.wixproj
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/HeatFilePackage/Package.wxs b/src/test/WixToolsetTest.MSBuild/TestData/HeatFilePackage/Package.wxs
index e509c464..e509c464 100644
--- a/src/test/WixToolsetTest.BuildTasks/TestData/HeatFilePackage/Package.wxs
+++ b/src/test/WixToolsetTest.MSBuild/TestData/HeatFilePackage/Package.wxs
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/MsiPackage.wixproj b/src/test/WixToolsetTest.MSBuild/TestData/MultiCulturalMsiPackage/MsiPackage/MsiPackage.wixproj
index e04ea43d..e04ea43d 100644
--- a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/MsiPackage.wixproj
+++ b/src/test/WixToolsetTest.MSBuild/TestData/MultiCulturalMsiPackage/MsiPackage/MsiPackage.wixproj
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/Package.de-de.wxl b/src/test/WixToolsetTest.MSBuild/TestData/MultiCulturalMsiPackage/MsiPackage/Package.de-de.wxl
index 23493ace..23493ace 100644
--- a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/Package.de-de.wxl
+++ b/src/test/WixToolsetTest.MSBuild/TestData/MultiCulturalMsiPackage/MsiPackage/Package.de-de.wxl
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/Package.en-us.wxl b/src/test/WixToolsetTest.MSBuild/TestData/MultiCulturalMsiPackage/MsiPackage/Package.en-us.wxl
index 38c12ac1..38c12ac1 100644
--- a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/Package.en-us.wxl
+++ b/src/test/WixToolsetTest.MSBuild/TestData/MultiCulturalMsiPackage/MsiPackage/Package.en-us.wxl
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/Package.wxs b/src/test/WixToolsetTest.MSBuild/TestData/MultiCulturalMsiPackage/MsiPackage/Package.wxs
index d5a5a40d..d5a5a40d 100644
--- a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/Package.wxs
+++ b/src/test/WixToolsetTest.MSBuild/TestData/MultiCulturalMsiPackage/MsiPackage/Package.wxs
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/PackageComponents.wxs b/src/test/WixToolsetTest.MSBuild/TestData/MultiCulturalMsiPackage/MsiPackage/PackageComponents.wxs
index e26c4509..e26c4509 100644
--- a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/PackageComponents.wxs
+++ b/src/test/WixToolsetTest.MSBuild/TestData/MultiCulturalMsiPackage/MsiPackage/PackageComponents.wxs
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/data/test.txt b/src/test/WixToolsetTest.MSBuild/TestData/MultiCulturalMsiPackage/MsiPackage/data/test.txt
index cd0db0e1..cd0db0e1 100644
--- a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/data/test.txt
+++ b/src/test/WixToolsetTest.MSBuild/TestData/MultiCulturalMsiPackage/MsiPackage/data/test.txt
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MultiCulturalMsiPackage.sln b/src/test/WixToolsetTest.MSBuild/TestData/MultiCulturalMsiPackage/MultiCulturalMsiPackage.sln
index 2c88704e..2c88704e 100644
--- a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MultiCulturalMsiPackage.sln
+++ b/src/test/WixToolsetTest.MSBuild/TestData/MultiCulturalMsiPackage/MultiCulturalMsiPackage.sln
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj b/src/test/WixToolsetTest.MSBuild/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj
index d5cac8d8..d5cac8d8 100644
--- a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj
+++ b/src/test/WixToolsetTest.MSBuild/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/Package.en-us.wxl b/src/test/WixToolsetTest.MSBuild/TestData/SimpleMsiPackage/MsiPackage/Package.en-us.wxl
index 38c12ac1..38c12ac1 100644
--- a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/Package.en-us.wxl
+++ b/src/test/WixToolsetTest.MSBuild/TestData/SimpleMsiPackage/MsiPackage/Package.en-us.wxl
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/Package.wxs b/src/test/WixToolsetTest.MSBuild/TestData/SimpleMsiPackage/MsiPackage/Package.wxs
index f7998fff..f7998fff 100644
--- a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/Package.wxs
+++ b/src/test/WixToolsetTest.MSBuild/TestData/SimpleMsiPackage/MsiPackage/Package.wxs
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/PackageComponents.wxs b/src/test/WixToolsetTest.MSBuild/TestData/SimpleMsiPackage/MsiPackage/PackageComponents.wxs
index ddb95faf..ddb95faf 100644
--- a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/PackageComponents.wxs
+++ b/src/test/WixToolsetTest.MSBuild/TestData/SimpleMsiPackage/MsiPackage/PackageComponents.wxs
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/data/test.txt b/src/test/WixToolsetTest.MSBuild/TestData/SimpleMsiPackage/MsiPackage/data/test.txt
index cd0db0e1..cd0db0e1 100644
--- a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/data/test.txt
+++ b/src/test/WixToolsetTest.MSBuild/TestData/SimpleMsiPackage/MsiPackage/data/test.txt
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/SimpleBundle/Bundle.wxs b/src/test/WixToolsetTest.MSBuild/TestData/SimpleMsiPackage/SimpleBundle/Bundle.wxs
index 6cd04712..6cd04712 100644
--- a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/SimpleBundle/Bundle.wxs
+++ b/src/test/WixToolsetTest.MSBuild/TestData/SimpleMsiPackage/SimpleBundle/Bundle.wxs
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/SimpleBundle/SimpleBundle.wixproj b/src/test/WixToolsetTest.MSBuild/TestData/SimpleMsiPackage/SimpleBundle/SimpleBundle.wixproj
index 4c837936..4c837936 100644
--- a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/SimpleBundle/SimpleBundle.wixproj
+++ b/src/test/WixToolsetTest.MSBuild/TestData/SimpleMsiPackage/SimpleBundle/SimpleBundle.wixproj
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/SimpleMsiPackage.sln b/src/test/WixToolsetTest.MSBuild/TestData/SimpleMsiPackage/SimpleMsiPackage.sln
index dd21489d..dd21489d 100644
--- a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/SimpleMsiPackage.sln
+++ b/src/test/WixToolsetTest.MSBuild/TestData/SimpleMsiPackage/SimpleMsiPackage.sln
diff --git a/src/test/WixToolsetTest.MSBuild/WixToolsetTest.MSBuild.csproj b/src/test/WixToolsetTest.MSBuild/WixToolsetTest.MSBuild.csproj
new file mode 100644
index 00000000..bb109557
--- /dev/null
+++ b/src/test/WixToolsetTest.MSBuild/WixToolsetTest.MSBuild.csproj
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net461</TargetFramework>
+    <IsPackable>false</IsPackable>
+    <DebugType>embedded</DebugType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Content Include="TestData\HeatFilePackage\HeatFilePackage.wixproj" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\HeatFilePackage\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\HeatFileMultipleFilesSameFileName\HeatFileMultipleFilesSameFileName.wixproj" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\HeatFileMultipleFilesSameFileName\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\HeatFileMultipleFilesSameFileName\MyProgram.txt" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\HeatFileMultipleFilesSameFileName\MyProgram.json" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\MultiCulturalMsiPackage\MsiPackage\MsiPackage.wixproj" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\MultiCulturalMsiPackage\MsiPackage\Package.de-de.wxl" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\MultiCulturalMsiPackage\MsiPackage\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\MultiCulturalMsiPackage\MsiPackage\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\MultiCulturalMsiPackage\MsiPackage\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\MultiCulturalMsiPackage\MsiPackage\data\test.txt" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\SimpleMsiPackage\MsiPackage\MsiPackage.wixproj" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\SimpleMsiPackage\MsiPackage\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\SimpleMsiPackage\MsiPackage\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\SimpleMsiPackage\MsiPackage\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\SimpleMsiPackage\MsiPackage\data\test.txt" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\SimpleMsiPackage\SimpleBundle\Bundle.wxs" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\SimpleMsiPackage\SimpleBundle\SimpleBundle.wixproj" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" />
+    <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" />
+  </ItemGroup>
+</Project>
diff --git a/src/test/WixToolsetTest.MSBuild/WixToolsetTest.MSBuild.v3.ncrunchproject b/src/test/WixToolsetTest.MSBuild/WixToolsetTest.MSBuild.v3.ncrunchproject
new file mode 100644
index 00000000..cf22dfa9
--- /dev/null
+++ b/src/test/WixToolsetTest.MSBuild/WixToolsetTest.MSBuild.v3.ncrunchproject
@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <HiddenComponentWarnings />
+  </Settings>
+</ProjectConfiguration>
\ No newline at end of file