1 files changed, 112 insertions, 2 deletions

diff --git a/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs b/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
index 40ebad5b..bd6f70bc 100644
--- a/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
+++ b/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
@@ -273,7 +273,47 @@ namespace WixToolsetTest.Sdk
                 });
         }
 
-        private void AssertWixpdb(BuildSystem buildSystem, string wixpdbType, string[] expectedOutputFiles)
+        [Theory]
+        [InlineData(BuildSystem.DotNetCoreSdk)]
+        [InlineData(BuildSystem.MSBuild)]
+        [InlineData(BuildSystem.MSBuild64)]
+        public void CanBuildWithWixpdbToDifferentFolder(BuildSystem buildSystem)
+        {
+            var expectedOutputFiles = new[]
+            {
+                @"bin\x86\Release\en-US\cab1.cab",
+                @"bin\x86\Release\en-US\MsiPackage.msi",
+                @"pdb\en-US\MsiPackage.wixpdb",
+            };
+
+            var sourceFolder = TestData.Get(@"TestData", "SimpleMsiPackage", "MsiPackage");
+
+            using (var fs = new TestDataFolderFileSystem())
+            {
+                fs.Initialize(sourceFolder);
+                var baseFolder = fs.BaseFolder;
+                var binFolder = Path.Combine(baseFolder, @"bin\");
+                var pdbFolder = Path.Combine(baseFolder, @"pdb\");
+                var projectPath = Path.Combine(baseFolder, "MsiPackage.wixproj");
+
+                var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[]
+                {
+                    MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "WixMSBuildProps", MsbuildFixture.WixPropsPath),
+                    $"-p:PdbOutputDir={pdbFolder}",
+                    "-p:SuppressValidation=true"
+                });
+                result.AssertSuccess();
+
+                var paths = Directory.EnumerateFiles(binFolder, @"*.*", SearchOption.AllDirectories)
+                    .Concat(Directory.EnumerateFiles(pdbFolder, @"*.*", SearchOption.AllDirectories))
+                    .Select(s => s.Substring(baseFolder.Length + 1))
+                    .OrderBy(s => s)
+                    .ToArray();
+                WixAssert.CompareLineByLine(expectedOutputFiles, paths);
+            }
+        }
+
+        private void AssertWixpdb(BuildSystem buildSystem, string debugType, string[] expectedOutputFiles)
         {
             var sourceFolder = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage");
 
@@ -287,7 +327,7 @@ namespace WixToolsetTest.Sdk
                 var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[]
                 {
                     MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "WixMSBuildProps", MsbuildFixture.WixPropsPath),
-                    wixpdbType == null ? String.Empty : $"-p:WixPdbType={wixpdbType}",
+                    debugType == null ? String.Empty : $"-p:DebugType={debugType}",
                     "-p:SuppressValidation=true"
                 });
                 result.AssertSuccess();
@@ -425,6 +465,76 @@ namespace WixToolsetTest.Sdk
         }
 
         [Theory]
+        [InlineData(BuildSystem.DotNetCoreSdk, null)]
+        [InlineData(BuildSystem.DotNetCoreSdk, true)]
+        [InlineData(BuildSystem.MSBuild, null)]
+        [InlineData(BuildSystem.MSBuild, true)]
+        [InlineData(BuildSystem.MSBuild64, null)]
+        [InlineData(BuildSystem.MSBuild64, true)]
+        public void CanBuildSimpleWixlib(BuildSystem buildSystem, bool? outOfProc)
+        {
+            var sourceFolder = TestData.Get(@"TestData", "Wixlib", "SimpleWixlib");
+
+            using (var fs = new TestDataFolderFileSystem())
+            {
+                fs.Initialize(sourceFolder);
+                var baseFolder = fs.BaseFolder;
+                var binFolder = Path.Combine(baseFolder, @"bin\");
+                var projectPath = Path.Combine(baseFolder, "SimpleWixlib.wixproj");
+
+                var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[]
+                {
+                    MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "WixMSBuildProps", MsbuildFixture.WixPropsPath),
+                }, outOfProc: outOfProc);
+                result.AssertSuccess();
+
+                var wixBuildCommands = MsbuildUtilities.GetToolCommandLines(result, "wix", "build", buildSystem, outOfProc);
+                Assert.Single(wixBuildCommands);
+
+                var path = Directory.EnumerateFiles(binFolder, @"*.*", SearchOption.AllDirectories)
+                    .Select(s => s.Substring(baseFolder.Length + 1))
+                    .Single();
+                WixAssert.StringEqual(@"bin\x86\Release\SimpleWixlib.wixlib", path);
+            }
+        }
+
+        [Theory]
+        [InlineData(BuildSystem.DotNetCoreSdk, null)]
+        [InlineData(BuildSystem.DotNetCoreSdk, true)]
+        [InlineData(BuildSystem.MSBuild, null)]
+        [InlineData(BuildSystem.MSBuild, true)]
+        [InlineData(BuildSystem.MSBuild64, null)]
+        [InlineData(BuildSystem.MSBuild64, true)]
+        public void CanBuildPackageIncludingSimpleWixlib(BuildSystem buildSystem, bool? outOfProc)
+        {
+            var sourceFolder = TestData.Get(@"TestData", "Wixlib");
+
+            using (var fs = new TestDataFolderFileSystem())
+            {
+                fs.Initialize(sourceFolder);
+                var baseFolder = fs.BaseFolder;
+                var binFolder = Path.Combine(baseFolder, "PackageIncludesWixlib", @"bin\");
+                var projectPath = Path.Combine(baseFolder, "PackageIncludesWixlib", "PackageIncludesWixlib.wixproj");
+
+                var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[]
+                {
+                    MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "WixMSBuildProps", MsbuildFixture.WixPropsPath),
+                }, outOfProc: outOfProc);
+                result.AssertSuccess();
+
+                var paths = Directory.EnumerateFiles(binFolder, @"*.*", SearchOption.AllDirectories)
+                    .Select(s => s.Substring(baseFolder.Length + 1))
+                    .ToArray();
+                WixAssert.CompareLineByLine(new[]
+                {
+                    @"PackageIncludesWixlib\bin\x86\Release\cab1.cab",
+                    @"PackageIncludesWixlib\bin\x86\Release\PackageIncludesWixlib.msi",
+                    @"PackageIncludesWixlib\bin\x86\Release\PackageIncludesWixlib.wixpdb",
+                }, paths);
+            }
+        }
+
+        [Theory]
         [InlineData(BuildSystem.DotNetCoreSdk)]
         [InlineData(BuildSystem.MSBuild)]
         [InlineData(BuildSystem.MSBuild64)]