From 64fe8bccc329ac5dc0d510bfbd73054d478ddc37 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Sat, 30 May 2020 18:55:10 +1000
Subject: 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.
---
 .../WixToolsetTest.BuildTasks/MsbuildFixture.cs    | 304 ---------------------
 .../MsbuildHeatFixture.cs                          | 155 -----------
 .../HeatFileMultpleFilesSameFileName.wixproj       |  61 -----
 .../MyProgram.json                                 |   1 -
 .../HeatFileMultpleFilesSameFileName/MyProgram.txt |   1 -
 .../HeatFileMultpleFilesSameFileName/Package.wxs   |  22 --
 .../HeatFilePackage/HeatFilePackage.wixproj        |  56 ----
 .../TestData/HeatFilePackage/Package.wxs           |  21 --
 .../MsiPackage/MsiPackage.wixproj                  |  57 ----
 .../MsiPackage/Package.de-de.wxl                   |  11 -
 .../MsiPackage/Package.en-us.wxl                   |  11 -
 .../MultiCulturalMsiPackage/MsiPackage/Package.wxs |  21 --
 .../MsiPackage/PackageComponents.wxs               |  10 -
 .../MsiPackage/data/test.txt                       |   1 -
 .../MultiCulturalMsiPackage.sln                    |  31 ---
 .../SimpleMsiPackage/MsiPackage/MsiPackage.wixproj |  49 ----
 .../SimpleMsiPackage/MsiPackage/Package.en-us.wxl  |  11 -
 .../SimpleMsiPackage/MsiPackage/Package.wxs        |  25 --
 .../MsiPackage/PackageComponents.wxs               |  10 -
 .../SimpleMsiPackage/MsiPackage/data/test.txt      |   1 -
 .../SimpleMsiPackage/SimpleBundle/Bundle.wxs       |  10 -
 .../SimpleBundle/SimpleBundle.wixproj              |  45 ---
 .../TestData/SimpleMsiPackage/SimpleMsiPackage.sln |  39 ---
 .../WixToolsetTest.BuildTasks.csproj               |  29 +-
 24 files changed, 7 insertions(+), 975 deletions(-)
 delete mode 100644 src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs
 delete mode 100644 src/test/WixToolsetTest.BuildTasks/MsbuildHeatFixture.cs
 delete mode 100644 src/test/WixToolsetTest.BuildTasks/TestData/HeatFileMultpleFilesSameFileName/HeatFileMultpleFilesSameFileName.wixproj
 delete mode 100644 src/test/WixToolsetTest.BuildTasks/TestData/HeatFileMultpleFilesSameFileName/MyProgram.json
 delete mode 100644 src/test/WixToolsetTest.BuildTasks/TestData/HeatFileMultpleFilesSameFileName/MyProgram.txt
 delete mode 100644 src/test/WixToolsetTest.BuildTasks/TestData/HeatFileMultpleFilesSameFileName/Package.wxs
 delete mode 100644 src/test/WixToolsetTest.BuildTasks/TestData/HeatFilePackage/HeatFilePackage.wixproj
 delete mode 100644 src/test/WixToolsetTest.BuildTasks/TestData/HeatFilePackage/Package.wxs
 delete mode 100644 src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/MsiPackage.wixproj
 delete mode 100644 src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/Package.de-de.wxl
 delete mode 100644 src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/Package.en-us.wxl
 delete mode 100644 src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/Package.wxs
 delete mode 100644 src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/PackageComponents.wxs
 delete mode 100644 src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/data/test.txt
 delete mode 100644 src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MultiCulturalMsiPackage.sln
 delete mode 100644 src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj
 delete mode 100644 src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/Package.en-us.wxl
 delete mode 100644 src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/Package.wxs
 delete mode 100644 src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/PackageComponents.wxs
 delete mode 100644 src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/data/test.txt
 delete mode 100644 src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/SimpleBundle/Bundle.wxs
 delete mode 100644 src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/SimpleBundle/SimpleBundle.wixproj
 delete mode 100644 src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/SimpleMsiPackage.sln

(limited to 'src/test/WixToolsetTest.BuildTasks')

diff --git a/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs b/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs
deleted file mode 100644
index 0768f863..00000000
--- a/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs
+++ /dev/null
@@ -1,304 +0,0 @@
-// 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
-{
-    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");
-
-        [Fact]
-        public void CanBuildSimpleBundle()
-        {
-            var projectPath = TestData.Get(@"TestData\SimpleMsiPackage\SimpleBundle\SimpleBundle.wixproj");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var binFolder = Path.Combine(baseFolder, @"bin\");
-                var intermediateFolder = Path.Combine(baseFolder, @"obj\");
-
-                var result = MsbuildRunner.Execute(projectPath, new[]
-                {
-                    $"-p:WixTargetsPath={WixTargetsPath}",
-                    $"-p:WixBinDir={WixBinPath}",
-                    $"-p:IntermediateOutputPath={intermediateFolder}",
-                    $"-p:OutputPath={binFolder}"
-                });
-                result.AssertSuccess();
-
-                var platformSwitches = result.Output.Where(line => line.TrimStart().StartsWith("wix.exe build -platform x86"));
-                Assert.Single(platformSwitches);
-
-                var warnings = result.Output.Where(line => line.Contains(": warning"));
-                Assert.Empty(warnings);
-
-                var paths = Directory.EnumerateFiles(binFolder, @"*.*", SearchOption.AllDirectories)
-                    .Select(s => s.Substring(baseFolder.Length + 1))
-                    .OrderBy(s => s)
-                    .ToArray();
-                Assert.Equal(new[]
-                {
-                    @"bin\SimpleBundle.exe",
-                    @"bin\SimpleBundle.wixpdb",
-                }, paths);
-            }
-        }
-
-        [Fact]
-        public void CanBuildSimpleMsiPackage()
-        {
-            var projectPath = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage\MsiPackage.wixproj");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var binFolder = Path.Combine(baseFolder, @"bin\");
-                var intermediateFolder = Path.Combine(baseFolder, @"obj\");
-
-                var result = MsbuildRunner.Execute(projectPath, new[]
-                {
-                    $"-p:WixTargetsPath={WixTargetsPath}",
-                    $"-p:WixBinDir={WixBinPath}",
-                    $"-p:IntermediateOutputPath={intermediateFolder}",
-                    $"-p:OutputPath={binFolder}"
-                });
-                result.AssertSuccess();
-
-                var platformSwitches = result.Output.Where(line => line.TrimStart().StartsWith("wix.exe build -platform x86"));
-                Assert.Single(platformSwitches);
-
-                var warnings = result.Output.Where(line => line.Contains(": warning"));
-                Assert.Equal(4, warnings.Count());
-
-                var paths = Directory.EnumerateFiles(binFolder, @"*.*", SearchOption.AllDirectories)
-                    .Select(s => s.Substring(baseFolder.Length + 1))
-                    .OrderBy(s => s)
-                    .ToArray();
-                Assert.Equal(new[]
-                {
-                    @"bin\en-US\cab1.cab",
-                    @"bin\en-US\MsiPackage.msi",
-                    @"bin\en-US\MsiPackage.wixpdb",
-                }, paths);
-            }
-        }
-
-        [Fact]
-        public void CanBuildWithDefaultAndExplicitlyFullWixpdbs()
-        {
-            var expectedOutputs = new[]
-                {
-                    @"bin\en-US\cab1.cab",
-                    @"bin\en-US\MsiPackage.msi",
-                    @"bin\en-US\MsiPackage.wixpdb",
-                };
-
-            this.AssertWixpdb(null, expectedOutputs);
-            this.AssertWixpdb("Full", expectedOutputs);
-        }
-
-        [Fact]
-        public void CanBuildWithNoWixpdb()
-        {
-            this.AssertWixpdb("NONE", new[]
-                {
-                    @"bin\en-US\cab1.cab",
-                    @"bin\en-US\MsiPackage.msi",
-                });
-        }
-
-        private void AssertWixpdb(string wixpdbType, string[] expectedOutputFiles)
-        {
-            var projectPath = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage\MsiPackage.wixproj");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var binFolder = Path.Combine(baseFolder, @"bin\");
-                var intermediateFolder = Path.Combine(baseFolder, @"obj\");
-
-                var result = MsbuildRunner.Execute(projectPath, new[]
-                {
-                    wixpdbType == null ? String.Empty : $"-p:WixPdbType={wixpdbType}",
-                    $"-p:WixTargetsPath={WixTargetsPath}",
-                    $"-p:WixBinDir={WixBinPath}",
-                    $"-p:IntermediateOutputPath={intermediateFolder}",
-                    $"-p:OutputPath={binFolder}",
-                });
-                result.AssertSuccess();
-
-                var paths = Directory.EnumerateFiles(binFolder, @"*.*", SearchOption.AllDirectories)
-                    .Select(s => s.Substring(baseFolder.Length + 1))
-                    .OrderBy(s => s)
-                    .ToArray();
-                Assert.Equal(expectedOutputFiles, paths);
-            }
-        }
-
-        [Fact]
-        public void CanBuild64BitMsiPackage()
-        {
-            var projectPath = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage\MsiPackage.wixproj");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var binFolder = Path.Combine(baseFolder, @"bin\");
-                var intermediateFolder = Path.Combine(baseFolder, @"obj\");
-
-                var result = MsbuildRunner.Execute(projectPath, new[]
-                {
-                    $"-p:WixTargetsPath={WixTargetsPath}",
-                    $"-p:WixBinDir={WixBinPath}",
-                    $"-p:IntermediateOutputPath={intermediateFolder}",
-                    $"-p:OutputPath={binFolder}",
-                    $"-p:InstallerPlatform=x64",
-                });
-                result.AssertSuccess();
-
-                var platformSwitches = result.Output.Where(line => line.TrimStart().StartsWith("wix.exe build -platform x64"));
-                Assert.Single(platformSwitches);
-            }
-        }
-
-        [Fact(Skip = "Currently fails")]
-        public void CanBuildSimpleMsiPackageWithIceSuppressions()
-        {
-            var projectPath = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage\MsiPackage.wixproj");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var binFolder = Path.Combine(baseFolder, @"bin\");
-                var intermediateFolder = Path.Combine(baseFolder, @"obj\");
-
-                var result = MsbuildRunner.Execute(projectPath, new[]
-                {
-                    $"-p:WixTargetsPath={WixTargetsPath}",
-                    $"-p:WixBinDir={WixBinPath}",
-                    $"-p:IntermediateOutputPath={intermediateFolder}",
-                    $"-p:OutputPath={binFolder}",
-                    "-p:SuppressIces=\"ICE45;ICE46\""
-                });
-                result.AssertSuccess();
-            }
-        }
-
-        [Fact]
-        public void CanBuildSimpleMsiPackageWithWarningSuppressions()
-        {
-            var projectPath = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage\MsiPackage.wixproj");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var binFolder = Path.Combine(baseFolder, @"bin\");
-                var intermediateFolder = Path.Combine(baseFolder, @"obj\");
-
-                var result = MsbuildRunner.Execute(projectPath, new[]
-                {
-                    $"-p:WixTargetsPath={WixTargetsPath}",
-                    $"-p:WixBinDir={WixBinPath}",
-                    $"-p:IntermediateOutputPath={intermediateFolder}",
-                    $"-p:OutputPath={binFolder}",
-                    "-p:SuppressSpecificWarnings=\"1118;1102\""
-                });
-                result.AssertSuccess();
-
-                var warnings = result.Output.Where(line => line.Contains(": warning"));
-                Assert.Empty(warnings);
-            }
-        }
-
-        [Fact]
-        public void CanBuildSimpleMsiPackageAsWixipl()
-        {
-            var projectPath = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage\MsiPackage.wixproj");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var binFolder = Path.Combine(baseFolder, @"bin\");
-                var intermediateFolder = Path.Combine(baseFolder, @"obj\");
-
-                var result = MsbuildRunner.Execute(projectPath, new[]
-                {
-                    $"-p:WixTargetsPath={WixTargetsPath}",
-                    $"-p:WixBinDir={WixBinPath}",
-                    $"-p:IntermediateOutputPath={intermediateFolder}",
-                    $"-p:OutputPath={binFolder}",
-                    "-p:OutputType=IntermediatePostLink"
-                });
-                result.AssertSuccess();
-
-                var path = Directory.EnumerateFiles(binFolder, @"*.*", SearchOption.AllDirectories)
-                    .Select(s => s.Substring(baseFolder.Length + 1))
-                    .Single();
-                Assert.Equal(@"bin\MsiPackage.wixipl", path);
-            }
-        }
-
-        [Fact]
-        public void CanBuildAndCleanSimpleMsiPackage()
-        {
-            var projectPath = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage\MsiPackage.wixproj");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var binFolder = Path.Combine(baseFolder, @"bin\");
-                var intermediateFolder = Path.Combine(baseFolder, @"obj\");
-
-                // Build
-                var result = MsbuildRunner.Execute(projectPath, new[]
-                {
-                    $"-p:WixTargetsPath={WixTargetsPath}",
-                    $"-p:WixBinDir={WixBinPath}",
-                    $"-p:IntermediateOutputPath={intermediateFolder}",
-                    $"-p:OutputPath={binFolder}",
-                    "-v:diag"
-                });
-                result.AssertSuccess();
-
-                var buildOutput = String.Join("\r\n", result.Output);
-
-                var createdPaths = Directory.EnumerateFiles(baseFolder, @"*.*", SearchOption.AllDirectories)
-                    .Select(s => s.Substring(baseFolder.Length + 1))
-                    .OrderBy(s => s)
-                    .ToArray();
-                Assert.NotEmpty(createdPaths);
-
-                // Clean
-                result = MsbuildRunner.Execute(projectPath, new[]
-                {
-                    $"-p:WixTargetsPath={WixTargetsPath}",
-                    $"-p:WixBinDir={WixBinPath}",
-                    $"-p:IntermediateOutputPath={intermediateFolder}",
-                    $"-p:OutputPath={binFolder}",
-                    "-t:Clean",
-                    "-v:diag"
-                });
-                result.AssertSuccess();
-
-                var cleanOutput = String.Join("\r\n", result.Output);
-
-                // Clean is only expected to delete the files listed in {Project}.FileListAbsolute.txt,
-                // so this is not quite right but close enough.
-                var remainingPaths = Directory.EnumerateFiles(baseFolder, @"*.*", SearchOption.AllDirectories)
-                    .Select(s => s.Substring(baseFolder.Length + 1))
-                    .Where(s => s != "obj\\MsiPackage.wixproj.FileListAbsolute.txt")
-                    .OrderBy(s => s)
-                    .ToArray();
-                Assert.Empty(remainingPaths);
-            }
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.BuildTasks/MsbuildHeatFixture.cs b/src/test/WixToolsetTest.BuildTasks/MsbuildHeatFixture.cs
deleted file mode 100644
index 95805658..00000000
--- a/src/test/WixToolsetTest.BuildTasks/MsbuildHeatFixture.cs
+++ /dev/null
@@ -1,155 +0,0 @@
-// 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
-{
-    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;
-    using Xunit;
-
-    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");
-
-        [Fact]
-        public void CanBuildHeatFilePackage()
-        {
-            var projectPath = TestData.Get(@"TestData\HeatFilePackage\HeatFilePackage.wixproj");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var binFolder = Path.Combine(baseFolder, @"bin\");
-                var intermediateFolder = Path.Combine(baseFolder, @"obj\");
-
-                var result = MsbuildRunner.Execute(projectPath, new[]
-                {
-                    $"-p:WixTargetsPath={WixTargetsPath}",
-                    $"-p:WixBinDir={WixBinPath}",
-                    $"-p:IntermediateOutputPath={intermediateFolder}",
-                    $"-p:OutputPath={binFolder}"
-                });
-                result.AssertSuccess();
-
-                var heatCommandLines = result.Output.Where(line => line.TrimStart().StartsWith("heat.exe file"));
-                Assert.Single(heatCommandLines);
-
-                var warnings = result.Output.Where(line => line.Contains(": warning"));
-                Assert.Empty(warnings);
-
-                var generatedFilePath = Path.Combine(intermediateFolder, @"_ProductComponents_INSTALLFOLDER_HeatFilePackage.wixproj_file.wxs");
-                Assert.True(File.Exists(generatedFilePath));
-
-                var generatedContents = File.ReadAllText(generatedFilePath);
-                var testXml = generatedContents.GetTestXml();
-                Assert.Equal(@"<Wix>" +
-                    "<Fragment>" +
-                    "<DirectoryRef Id='INSTALLFOLDER'>" +
-                    "<Component Id='HeatFilePackage.wixproj' Guid='*'>" +
-                    "<File Id='HeatFilePackage.wixproj' KeyPath='yes' Source='SourceDir\\HeatFilePackage.wixproj' />" +
-                    "</Component>" +
-                    "</DirectoryRef>" +
-                    "</Fragment>" +
-                    "<Fragment>" +
-                    "<ComponentGroup Id='ProductComponents'>" +
-                    "<ComponentRef Id='HeatFilePackage.wixproj' />" +
-                    "</ComponentGroup>" +
-                    "</Fragment>" +
-                    "</Wix>", testXml);
-
-                var pdbPath = Path.Combine(binFolder, "HeatFilePackage.wixpdb");
-                Assert.True(File.Exists(pdbPath));
-
-                var intermediate = Intermediate.Load(pdbPath);
-                var section = intermediate.Sections.Single();
-
-                var fileTuple = section.Tuples.OfType<FileTuple>().Single();
-                Assert.Equal(@"SourceDir\HeatFilePackage.wixproj", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path);
-            }
-        }
-
-        [Fact]
-        public void CanBuildHeatFileWithMultipleFilesPackage()
-        {
-            var projectPath = TestData.Get(@"TestData\HeatFileMultpleFilesSameFileName\HeatFileMultpleFilesSameFileName.wixproj");
-
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var binFolder = Path.Combine(baseFolder, @"bin\");
-                var intermediateFolder = Path.Combine(baseFolder, @"obj\");
-
-                var result = MsbuildRunner.Execute(projectPath, new[]
-                {
-                    $"-p:WixTargetsPath={WixTargetsPath}",
-                    $"-p:WixBinDir={WixBinPath}",
-                    $"-p:IntermediateOutputPath={intermediateFolder}",
-                    $"-p:OutputPath={binFolder}"
-                });
-                result.AssertSuccess();
-
-                var heatCommandLines = result.Output.Where(line => line.TrimStart().StartsWith("heat.exe file"));
-                Assert.Equal(2, heatCommandLines.Count());
-
-                var warnings = result.Output.Where(line => line.Contains(": warning"));
-                Assert.Empty(warnings);
-
-                var generatedFilePath = Path.Combine(intermediateFolder, @"_TxtProductComponents_INSTALLFOLDER_MyProgram.txt_file.wxs");
-                Assert.True(File.Exists(generatedFilePath));
-
-                var generatedContents = File.ReadAllText(generatedFilePath);
-                var testXml = generatedContents.GetTestXml();
-                Assert.Equal("<Wix>" +
-                    "<Fragment>" +
-                    "<DirectoryRef Id='INSTALLFOLDER'>" +
-                    "<Component Id='MyProgram.txt' Guid='*'>" +
-                    @"<File Id='MyProgram.txt' KeyPath='yes' Source='SourceDir\MyProgram.txt' />" +
-                    "</Component>" +
-                    "</DirectoryRef>" +
-                    "</Fragment>" +
-                    "<Fragment>" +
-                    "<ComponentGroup Id='TxtProductComponents'>" +
-                    "<ComponentRef Id='MyProgram.txt' />" +
-                    "</ComponentGroup>" +
-                    "</Fragment>" +
-                    "</Wix>", testXml);
-
-                generatedFilePath = Path.Combine(intermediateFolder, @"_JsonProductComponents_INSTALLFOLDER_MyProgram.json_file.wxs");
-                Assert.True(File.Exists(generatedFilePath));
-
-                generatedContents = File.ReadAllText(generatedFilePath);
-                testXml = generatedContents.GetTestXml();
-                Assert.Equal("<Wix>" +
-                    "<Fragment>" +
-                    "<DirectoryRef Id='INSTALLFOLDER'>" +
-                    "<Component Id='MyProgram.json' Guid='*'>" +
-                    @"<File Id='MyProgram.json' KeyPath='yes' Source='SourceDir\MyProgram.json' />" +
-                    "</Component>" +
-                    "</DirectoryRef>" +
-                    "</Fragment>" +
-                    "<Fragment>" +
-                    "<ComponentGroup Id='JsonProductComponents'>" +
-                    "<ComponentRef Id='MyProgram.json' />" +
-                    "</ComponentGroup>" +
-                    "</Fragment>" +
-                    "</Wix>", testXml);
-
-                var pdbPath = Path.Combine(binFolder, "HeatFileMultpleFilesSameFileName.wixpdb");
-                Assert.True(File.Exists(pdbPath));
-
-                var intermediate = Intermediate.Load(pdbPath);
-                var section = intermediate.Sections.Single();
-
-                var fileTuples = section.Tuples.OfType<FileTuple>().ToArray();
-                Assert.Equal(@"SourceDir\MyProgram.txt", fileTuples[0][FileTupleFields.Source].PreviousValue.AsPath().Path);
-                Assert.Equal(@"SourceDir\MyProgram.json", fileTuples[1][FileTupleFields.Source].PreviousValue.AsPath().Path);
-            }
-        }
-    }
-}
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/HeatFileMultpleFilesSameFileName/HeatFileMultpleFilesSameFileName.wixproj b/src/test/WixToolsetTest.BuildTasks/TestData/HeatFileMultpleFilesSameFileName/HeatFileMultpleFilesSameFileName.wixproj
deleted file mode 100644
index 860fc2dd..00000000
--- a/src/test/WixToolsetTest.BuildTasks/TestData/HeatFileMultpleFilesSameFileName/HeatFileMultpleFilesSameFileName.wixproj
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <ProjectGuid>7fb77005-c6e0-454f-8c2d-0a4a79c918ba</ProjectGuid>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <DefineConstants>Debug</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <DefineConstants>Debug</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="Package.wxs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <BindInputPaths Include="." />
-  </ItemGroup>
-  
-  <PropertyGroup>
-    <HarvestFileSuppressUniqueIds>true</HarvestFileSuppressUniqueIds>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <HarvestFile Include="MyProgram.txt">
-      <ComponentGroupName>TxtProductComponents</ComponentGroupName>
-      <DirectoryRefId>INSTALLFOLDER</DirectoryRefId>
-      <SuppressRootDirectory>true</SuppressRootDirectory>
-    </HarvestFile>
-    <HarvestFile Include="MyProgram.json">
-      <ComponentGroupName>JsonProductComponents</ComponentGroupName>
-      <DirectoryRefId>INSTALLFOLDER</DirectoryRefId>
-      <SuppressRootDirectory>true</SuppressRootDirectory>
-    </HarvestFile>
-  </ItemGroup>
-
-  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
-  <Import Project="$(MSBuildExtensionsPath32)\WixToolset\v4.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\WixToolset\v4.x\wix.targets') " />
-  <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
-    <Error Text="WiX Toolset build tools (v4.0 or later) must be installed to build this project. To download the WiX Toolset, go to http://wixtoolset.org/releases/." />
-  </Target>
-</Project>
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/HeatFileMultpleFilesSameFileName/MyProgram.json b/src/test/WixToolsetTest.BuildTasks/TestData/HeatFileMultpleFilesSameFileName/MyProgram.json
deleted file mode 100644
index 5f282702..00000000
--- a/src/test/WixToolsetTest.BuildTasks/TestData/HeatFileMultpleFilesSameFileName/MyProgram.json
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/HeatFileMultpleFilesSameFileName/MyProgram.txt b/src/test/WixToolsetTest.BuildTasks/TestData/HeatFileMultpleFilesSameFileName/MyProgram.txt
deleted file mode 100644
index 5f282702..00000000
--- a/src/test/WixToolsetTest.BuildTasks/TestData/HeatFileMultpleFilesSameFileName/MyProgram.txt
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/HeatFileMultpleFilesSameFileName/Package.wxs b/src/test/WixToolsetTest.BuildTasks/TestData/HeatFileMultpleFilesSameFileName/Package.wxs
deleted file mode 100644
index 884da274..00000000
--- a/src/test/WixToolsetTest.BuildTasks/TestData/HeatFileMultpleFilesSameFileName/Package.wxs
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Product Id="*" Name="HeatFilePackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
-    <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
-
-    <MediaTemplate />
-
-    <Feature Id="ProductFeature" Title="HeatFileFeature">
-        <ComponentGroupRef Id="TxtProductComponents" />
-        <ComponentGroupRef Id="JsonProductComponents" />
-    </Feature>
-  </Product>
-
-  <Fragment>
-    <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="ProgramFilesFolder">
-        <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-      </Directory>
-    </Directory>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/HeatFilePackage/HeatFilePackage.wixproj b/src/test/WixToolsetTest.BuildTasks/TestData/HeatFilePackage/HeatFilePackage.wixproj
deleted file mode 100644
index 87f4388a..00000000
--- a/src/test/WixToolsetTest.BuildTasks/TestData/HeatFilePackage/HeatFilePackage.wixproj
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <ProjectGuid>7fb77005-c6e0-454f-8c2d-0a4a79c918ba</ProjectGuid>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <DefineConstants>Debug</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <DefineConstants>Debug</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="Package.wxs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <BindInputPaths Include="." />
-  </ItemGroup>
-  
-  <PropertyGroup>
-    <HarvestFileSuppressUniqueIds>true</HarvestFileSuppressUniqueIds>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <HarvestFile Include="HeatFilePackage.wixproj">
-      <ComponentGroupName>ProductComponents</ComponentGroupName>
-      <DirectoryRefId>INSTALLFOLDER</DirectoryRefId>
-      <SuppressRootDirectory>true</SuppressRootDirectory>
-    </HarvestFile>
-  </ItemGroup>
-
-  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
-  <Import Project="$(MSBuildExtensionsPath32)\WixToolset\v4.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\WixToolset\v4.x\wix.targets') " />
-  <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
-    <Error Text="WiX Toolset build tools (v4.0 or later) must be installed to build this project. To download the WiX Toolset, go to http://wixtoolset.org/releases/." />
-  </Target>
-</Project>
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/HeatFilePackage/Package.wxs b/src/test/WixToolsetTest.BuildTasks/TestData/HeatFilePackage/Package.wxs
deleted file mode 100644
index e509c464..00000000
--- a/src/test/WixToolsetTest.BuildTasks/TestData/HeatFilePackage/Package.wxs
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Product Id="*" Name="HeatFilePackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
-    <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
-
-    <MediaTemplate />
-
-    <Feature Id="ProductFeature" Title="HeatFileFeature">
-      <ComponentGroupRef Id="ProductComponents" />
-    </Feature>
-  </Product>
-
-  <Fragment>
-    <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="ProgramFilesFolder">
-        <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-      </Directory>
-    </Directory>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/MsiPackage.wixproj b/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/MsiPackage.wixproj
deleted file mode 100644
index e04ea43d..00000000
--- a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/MsiPackage.wixproj
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>0.9</ProductVersion>
-    <ProjectGuid>7fb77005-c6e0-454f-8c2d-0a4a79c918ba</ProjectGuid>
-    <OutputName>MsiPackage</OutputName>
-    <OutputType>Package</OutputType>
-    <Name>MsiPackage</Name>
-    <RootNamespace>MsiPackage</RootNamespace>
-    <Cultures>en-US,en;de-DE</Cultures>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <WixTargetsPath>..\..\..\..\..\..\build\Release\publish\net461\wix.targets</WixTargetsPath>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <DefineConstants>Debug</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <DefineConstants>Debug</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="Package.wxs" />
-    <Compile Include="PackageComponents.wxs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="Package.en-us.wxl" />
-    <EmbeddedResource Include="Package.de-de.wxl" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <BindInputPaths Include="data" />
-  </ItemGroup>
-
-  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets') " />
-  <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
-    <Error Text="WiX Toolset build tools (v3.11 or later) must be installed to build this project. To download the WiX Toolset, go to http://wixtoolset.org/releases/." />
-  </Target>
-</Project>
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/Package.de-de.wxl b/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/Package.de-de.wxl
deleted file mode 100644
index 23493ace..00000000
--- a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/Package.de-de.wxl
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-This file contains the declaration of all the localizable strings.
--->
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="de-DE">
-
-  <String Id="DowngradeError">German DowngradeError</String>
-  <String Id="FeatureTitle">German FeatureTitle</String>
-
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/Package.en-us.wxl b/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/Package.en-us.wxl
deleted file mode 100644
index 38c12ac1..00000000
--- a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/Package.en-us.wxl
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-This file contains the declaration of all the localizable strings.
--->
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
-
-  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
-  <String Id="FeatureTitle">MsiPackage</String>
-
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/Package.wxs b/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/Package.wxs
deleted file mode 100644
index d5a5a40d..00000000
--- a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/Package.wxs
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
-    <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
-
-    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-    <MediaTemplate />
-
-    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
-      <ComponentGroupRef Id="ProductComponents" />
-    </Feature>
-  </Product>
-
-  <Fragment>
-    <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="ProgramFilesFolder">
-        <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-      </Directory>
-    </Directory>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/PackageComponents.wxs b/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/PackageComponents.wxs
deleted file mode 100644
index e26c4509..00000000
--- a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/PackageComponents.wxs
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Fragment>
-    <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-       <Component>
-         <File Source="test.txt" />
-       </Component>
-    </ComponentGroup>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/data/test.txt b/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/data/test.txt
deleted file mode 100644
index cd0db0e1..00000000
--- a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MsiPackage/data/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is test.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MultiCulturalMsiPackage.sln b/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MultiCulturalMsiPackage.sln
deleted file mode 100644
index 2c88704e..00000000
--- a/src/test/WixToolsetTest.BuildTasks/TestData/MultiCulturalMsiPackage/MultiCulturalMsiPackage.sln
+++ /dev/null
@@ -1,31 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26730.8
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "MsiPackage", "MsiPackage\MsiPackage.wixproj", "{7FB77005-C6E0-454F-8C2D-0A4A79C918BA}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Debug|x64.ActiveCfg = Debug|x64
-		{7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Debug|x64.Build.0 = Debug|x64
-		{7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Debug|x86.ActiveCfg = Debug|x86
-		{7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Debug|x86.Build.0 = Debug|x86
-		{7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Release|x64.ActiveCfg = Release|x64
-		{7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Release|x64.Build.0 = Release|x64
-		{7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Release|x86.ActiveCfg = Release|x86
-		{7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Release|x86.Build.0 = Release|x86
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {585B0599-4EB5-4AB6-BC66-819CC78B63D5}
-	EndGlobalSection
-EndGlobal
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj b/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj
deleted file mode 100644
index d5cac8d8..00000000
--- a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <ProjectGuid>7fb77005-c6e0-454f-8c2d-0a4a79c918ba</ProjectGuid>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <DefineConstants>Debug</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <DefineConstants>Debug</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="Package.wxs" />
-    <Compile Include="PackageComponents.wxs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="Package.en-us.wxl" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <BindInputPaths Include="data" />
-  </ItemGroup>
-
-  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
-  <Import Project="$(MSBuildExtensionsPath32)\WixToolset\v4.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\WixToolset\v4.x\wix.targets') " />
-  <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
-    <Error Text="WiX Toolset build tools (v4.0 or later) must be installed to build this project. To download the WiX Toolset, go to http://wixtoolset.org/releases/." />
-  </Target>
-</Project>
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/Package.en-us.wxl b/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/Package.en-us.wxl
deleted file mode 100644
index 38c12ac1..00000000
--- a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/Package.en-us.wxl
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-This file contains the declaration of all the localizable strings.
--->
-<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
-
-  <String Id="DowngradeError">A newer version of [ProductName] is already installed.</String>
-  <String Id="FeatureTitle">MsiPackage</String>
-
-</WixLocalization>
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/Package.wxs b/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/Package.wxs
deleted file mode 100644
index f7998fff..00000000
--- a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/Package.wxs
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<?define Variable = "Value" ?>
-<?define Variable = "DifferentValue" ?>
-
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Product Id="*" Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
-    <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
-
-    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-    <MediaTemplate />
-
-    <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
-      <ComponentGroupRef Id="ProductComponents" />
-    </Feature>
-  </Product>
-
-  <Fragment>
-    <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="ProgramFilesFolder">
-        <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-      </Directory>
-    </Directory>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/PackageComponents.wxs b/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/PackageComponents.wxs
deleted file mode 100644
index ddb95faf..00000000
--- a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/PackageComponents.wxs
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Fragment>
-    <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-       <Component>
-         <File Source="test.txt" DefaultLanguage="1033" />
-       </Component>
-    </ComponentGroup>
-  </Fragment>
-</Wix>
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/data/test.txt b/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/data/test.txt
deleted file mode 100644
index cd0db0e1..00000000
--- a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/MsiPackage/data/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is test.txt.
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/SimpleBundle/Bundle.wxs b/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/SimpleBundle/Bundle.wxs
deleted file mode 100644
index 6cd04712..00000000
--- a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/SimpleBundle/Bundle.wxs
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <Bundle Name="SimpleBundle" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="6670d5c9-bbec-4828-ab60-4a1c0ffeb97d">
-        <BootstrapperApplication SourceFile="test.txt" />
-
-        <Chain>
-            <ExePackage SourceFile="test.txt" /> 
-        </Chain>
-    </Bundle>
-</Wix>
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/SimpleBundle/SimpleBundle.wixproj b/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/SimpleBundle/SimpleBundle.wixproj
deleted file mode 100644
index 4c837936..00000000
--- a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/SimpleBundle/SimpleBundle.wixproj
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <ProjectGuid>6670d5c9-bbec-4828-ab60-4a1c0ffeb97d</ProjectGuid>
-    <OutputType>Bundle</OutputType>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <DefineConstants>Debug</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <DefineConstants>Debug</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="Bundle.wxs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <BindInputPaths Include="..\MsiPackage\data" />
-  </ItemGroup>
-
-  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
-  <Import Project="$(MSBuildExtensionsPath32)\WixToolset\v4.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\WixToolset\v4.x\wix.targets') " />
-  <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
-    <Error Text="WiX Toolset build tools (v4.0 or later) must be installed to build this project. To download the WiX Toolset, go to http://wixtoolset.org/releases/." />
-  </Target>
-</Project>
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/SimpleMsiPackage.sln b/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/SimpleMsiPackage.sln
deleted file mode 100644
index dd21489d..00000000
--- a/src/test/WixToolsetTest.BuildTasks/TestData/SimpleMsiPackage/SimpleMsiPackage.sln
+++ /dev/null
@@ -1,39 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30011.22
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "MsiPackage", "MsiPackage\MsiPackage.wixproj", "{7FB77005-C6E0-454F-8C2D-0A4A79C918BA}"
-EndProject
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SimpleBundle", "SimpleBundle\SimpleBundle.wixproj", "{6670D5C9-BBEC-4828-AB60-4A1C0FFEB97D}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Debug|x64.ActiveCfg = Debug|x64
-		{7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Debug|x64.Build.0 = Debug|x64
-		{7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Debug|x86.ActiveCfg = Debug|x86
-		{7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Debug|x86.Build.0 = Debug|x86
-		{7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Release|x64.ActiveCfg = Release|x64
-		{7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Release|x64.Build.0 = Release|x64
-		{7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Release|x86.ActiveCfg = Release|x86
-		{7FB77005-C6E0-454F-8C2D-0A4A79C918BA}.Release|x86.Build.0 = Release|x86
-		{6670D5C9-BBEC-4828-AB60-4A1C0FFEB97D}.Debug|x64.ActiveCfg = Debug|x86
-		{6670D5C9-BBEC-4828-AB60-4A1C0FFEB97D}.Debug|x86.ActiveCfg = Debug|x86
-		{6670D5C9-BBEC-4828-AB60-4A1C0FFEB97D}.Debug|x86.Build.0 = Debug|x86
-		{6670D5C9-BBEC-4828-AB60-4A1C0FFEB97D}.Release|x64.ActiveCfg = Release|x86
-		{6670D5C9-BBEC-4828-AB60-4A1C0FFEB97D}.Release|x86.ActiveCfg = Release|x86
-		{6670D5C9-BBEC-4828-AB60-4A1C0FFEB97D}.Release|x86.Build.0 = Release|x86
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {585B0599-4EB5-4AB6-BC66-819CC78B63D5}
-	EndGlobalSection
-EndGlobal
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>
-- 
cgit v1.2.3-55-g6feb