Allow customization of the .wixpdb output folder

Fixes 6857

18 files changed, 303 insertions, 37 deletions

diff --git a/src/api/wix/WixToolset.Extensibility/Data/TrackedFileType.cs b/src/api/wix/WixToolset.Extensibility/Data/TrackedFileType.cs
index 904a990f..40abd590 100644
--- a/src/api/wix/WixToolset.Extensibility/Data/TrackedFileType.cs
+++ b/src/api/wix/WixToolset.Extensibility/Data/TrackedFileType.cs
@@ -25,10 +25,22 @@ namespace WixToolset.Extensibility.Data
         Intermediate,
 
         /// <summary>
-        /// Output created by the build process itself (like a .msi, .cab or .wixpdb).
+        /// Output created by the build process itself (like a .cab).
         /// These files can be recreated in the final output location by building again.
         /// </summary>
-        BuiltOutput,
+        BuiltContentOutput,
+
+        /// <summary>
+        /// Target output created by the build process itself (like a .msi, .msm, .wixlib, .exe).
+        /// These files can be recreated in the final output location by building again.
+        /// </summary>
+        BuiltTargetOutput,
+
+        /// <summary>
+        /// Output pdb created by the build process itself (like a .wixpdb).
+        /// These files can be recreated in the final output location by building again.
+        /// </summary>
+        BuiltPdbOutput,
 
         /// <summary>
         /// Output copied by the build process (like external files in an .msi).
diff --git a/src/ext/Bal/bal.cmd b/src/ext/Bal/bal.cmd
index 060f8ee0..8d573941 100644
--- a/src/ext/Bal/bal.cmd
+++ b/src/ext/Bal/bal.cmd
@@ -18,7 +18,7 @@ msbuild -p:Configuration=%_C%;Platform=x86 test\examples\TestEngine\Example.Test
 msbuild -p:Configuration=%_C%;Platform=x64 test\examples\TestEngine\Example.TestEngine.vcxproj || exit /b
 msbuild -p:Configuration=%_C%;Platform=ARM64 test\examples\TestEngine\Example.TestEngine.vcxproj || exit /b
 
-msbuild -p:Configuration=%_C% || exit /b
+msbuild -p:Configuration=%_C% -bl:%_L%\bal_build.binlog || exit /b
 
 dotnet test test\WixToolsetTest.Dnc.HostGenerator -c %_C% --nologo --no-build -l "trx;LogFileName=%_L%\TestResults\WixToolsetTest.Dnc.HostGenerator.trx" || exit /b
 
diff --git a/src/wix/WixToolset.BuildTasks/ReadTracking.cs b/src/wix/WixToolset.BuildTasks/ReadTracking.cs
index 1ce039f6..f92baaf1 100644
--- a/src/wix/WixToolset.BuildTasks/ReadTracking.cs
+++ b/src/wix/WixToolset.BuildTasks/ReadTracking.cs
@@ -29,12 +29,30 @@ namespace WixToolset.BuildTasks
         public ITaskItem[] All { get; private set; }
 
         /// <summary>
-        /// The tracked built outputs.
+        /// The union of tracked built outputs.
         /// </summary>
         [Output]
         public ITaskItem[] BuiltOutputs { get; private set; }
 
         /// <summary>
+        /// The tracked content built outputs.
+        /// </summary>
+        [Output]
+        public ITaskItem[] BuiltContentOutputs { get; private set; }
+
+        /// <summary>
+        /// The tracked target built outputs.
+        /// </summary>
+        [Output]
+        public ITaskItem[] BuiltTargetOutputs { get; private set; }
+
+        /// <summary>
+        /// The tracked pdb built outputs.
+        /// </summary>
+        [Output]
+        public ITaskItem[] BuiltPdbOutputs { get; private set; }
+
+        /// <summary>
         /// The tracked copied outputs.
         /// </summary>
         [Output]
@@ -47,7 +65,7 @@ namespace WixToolset.BuildTasks
         public ITaskItem[] Inputs { get; private set; }
 
         /// <summary>
-        /// All tracked outputs.
+        /// The union of all tracked outputs.
         /// </summary>
         [Output]
         public ITaskItem[] Outputs { get; private set; }
@@ -81,10 +99,14 @@ namespace WixToolset.BuildTasks
             }
 
             this.All = all.ToArray();
-            this.BuiltOutputs = all.Where(t => FilterByTrackedType(t, "BuiltOutput")).ToArray();
+            this.BuiltContentOutputs = all.Where(t => FilterByTrackedType(t, "BuiltContentOutput")).ToArray();
+            this.BuiltTargetOutputs = all.Where(t => FilterByTrackedType(t, "BuiltTargetOutput")).ToArray();
+            this.BuiltPdbOutputs = all.Where(t => FilterByTrackedType(t, "BuiltPdbOutput")).ToArray();
             this.CopiedOutputs = all.Where(t => FilterByTrackedType(t, "CopiedOutput")).ToArray();
             this.Inputs = all.Where(t => FilterByTrackedType(t, "Input")).ToArray();
-            this.Outputs = all.Where(t => FilterByTrackedType(t, "BuiltOutput") || FilterByTrackedType(t, "CopiedOutput")).ToArray();
+
+            this.BuiltOutputs = this.BuiltContentOutputs.Concat(this.BuiltTargetOutputs).Concat(this.BuiltPdbOutputs).ToArray();
+            this.Outputs = this.BuiltOutputs.Concat(this.CopiedOutputs).ToArray();
 
             return true;
         }
diff --git a/src/wix/WixToolset.Core.Burn/Bind/BindBundleCommand.cs b/src/wix/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
index 75a080a8..cd0590d0 100644
--- a/src/wix/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
+++ b/src/wix/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
@@ -505,7 +505,7 @@ namespace WixToolset.Core.Burn
                 command.Execute();
 
                 fileTransfers.Add(command.Transfer);
-                trackedFiles.Add(this.BackendHelper.TrackFile(this.OutputPath, TrackedFileType.BuiltOutput));
+                trackedFiles.Add(this.BackendHelper.TrackFile(this.OutputPath, TrackedFileType.BuiltTargetOutput));
             }
 
 #if TODO // does this need to come back, or do they only need to be in TrackedFiles?
@@ -577,7 +577,7 @@ namespace WixToolset.Core.Burn
             }
             else
             {
-                var trackPdb = this.BackendHelper.TrackFile(this.OutputPdbPath, TrackedFileType.BuiltOutput);
+                var trackPdb = this.BackendHelper.TrackFile(this.OutputPdbPath, TrackedFileType.BuiltPdbOutput);
                 trackedFiles.Add(trackPdb);
 
                 wixout = WixOutput.Create(trackPdb.Path);
diff --git a/src/wix/WixToolset.Core.Burn/Bundles/CreateNonUXContainers.cs b/src/wix/WixToolset.Core.Burn/Bundles/CreateNonUXContainers.cs
index e606fe59..2df07dd6 100644
--- a/src/wix/WixToolset.Core.Burn/Bundles/CreateNonUXContainers.cs
+++ b/src/wix/WixToolset.Core.Burn/Bundles/CreateNonUXContainers.cs
@@ -108,7 +108,7 @@ namespace WixToolset.Core.Burn.Bundles
                         var transfer = this.BackendHelper.CreateFileTransfer(container.WorkingPath, outputPath, true, container.SourceLineNumbers);
                         fileTransfers.Add(transfer);
 
-                        trackedFiles.Add(this.BackendHelper.TrackFile(outputPath, TrackedFileType.BuiltOutput, container.SourceLineNumbers));
+                        trackedFiles.Add(this.BackendHelper.TrackFile(outputPath, TrackedFileType.BuiltContentOutput, container.SourceLineNumbers));
                     }
                     else // update the attached container index.
                     {
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
index ef8dec38..b849aea5 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
@@ -471,7 +471,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             {
                 this.Messaging.Write(VerboseMessages.GeneratingDatabase());
 
-                var trackMsi = this.WindowsInstallerBackendHelper.TrackFile(this.OutputPath, TrackedFileType.BuiltOutput);
+                var trackMsi = this.WindowsInstallerBackendHelper.TrackFile(this.OutputPath, TrackedFileType.BuiltTargetOutput);
                 trackedFiles.Add(trackMsi);
 
                 var command = new GenerateDatabaseCommand(this.Messaging, this.WindowsInstallerBackendHelper, this.FileSystemManager, data, trackMsi.Path, tableDefinitions, this.IntermediateFolder, keepAddedColumns: false, this.SuppressAddingValidationRows, useSubdirectory: false);
@@ -601,7 +601,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             }
             else
             {
-                var trackPdb = this.WindowsInstallerBackendHelper.TrackFile(this.OutputPdbPath, TrackedFileType.BuiltOutput);
+                var trackPdb = this.WindowsInstallerBackendHelper.TrackFile(this.OutputPdbPath, TrackedFileType.BuiltPdbOutput);
                 trackedFiles.Add(trackPdb);
 
                 wixout = WixOutput.Create(trackPdb.Path);
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs
index 31198837..6ed107d5 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs
@@ -206,7 +206,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             }
             else
             {
-                var trackDestination = this.BackendHelper.TrackFile(Path.Combine(cabinetDir, mediaSymbol.Cabinet), TrackedFileType.BuiltOutput, mediaSymbol.SourceLineNumbers);
+                var trackDestination = this.BackendHelper.TrackFile(Path.Combine(cabinetDir, mediaSymbol.Cabinet), TrackedFileType.BuiltContentOutput, mediaSymbol.SourceLineNumbers);
                 this.trackedFiles.Add(trackDestination);
 
                 var transfer = this.BackendHelper.CreateFileTransfer(resolvedCabinet.Path, trackDestination.Path, resolvedCabinet.BuildOption == CabinetBuildOption.BuildAndMove, mediaSymbol.SourceLineNumbers);
@@ -314,7 +314,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                     var trackSource = this.BackendHelper.TrackFile(spannedCabinetSourcePath, TrackedFileType.Intermediate, transfer.SourceLineNumbers);
                     this.trackedFiles.Add(trackSource);
 
-                    var trackTarget = this.BackendHelper.TrackFile(spannedCabinetTargetPath, TrackedFileType.BuiltOutput, transfer.SourceLineNumbers);
+                    var trackTarget = this.BackendHelper.TrackFile(spannedCabinetTargetPath, TrackedFileType.BuiltContentOutput, transfer.SourceLineNumbers);
                     this.trackedFiles.Add(trackTarget);
 
                     var newTransfer = this.BackendHelper.CreateFileTransfer(trackSource.Path, trackTarget.Path, transfer.Move, transfer.SourceLineNumbers);
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs
index 6662f8f7..26b69afb 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs
@@ -112,12 +112,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                             var transfer = this.BackendHelper.CreateFileTransfer(facade.SourcePath, fileLayoutPath, false, facade.SourceLineNumber);
                             fileTransfers.Add(transfer);
 
-                            // Track the location where the cabinet will be placed. If the transfer is
-                            // redundant then then the file should not be cleaned. This is important
-                            // because if the source and destination of the transfer is the same, we
-                            // don't want to clean the file because we'd be deleting the original
-                            // (and that would be bad).
-                            var tracked = this.BackendHelper.TrackFile(transfer.Destination, TrackedFileType.BuiltOutput, facade.SourceLineNumber);
+                            var tracked = this.BackendHelper.TrackFile(transfer.Destination, TrackedFileType.CopiedOutput, facade.SourceLineNumber);
+
                             tracked.Clean = !transfer.Redundant;
 
                             trackedFiles.Add(tracked);
diff --git a/src/wix/WixToolset.Core/ExtensibilityServices/TrackedFile.cs b/src/wix/WixToolset.Core/ExtensibilityServices/TrackedFile.cs
index 570fb029..c9966bce 100644
--- a/src/wix/WixToolset.Core/ExtensibilityServices/TrackedFile.cs
+++ b/src/wix/WixToolset.Core/ExtensibilityServices/TrackedFile.cs
@@ -12,7 +12,7 @@ namespace WixToolset.Core.ExtensibilityServices
             this.Path = path;
             this.Type = type;
             this.SourceLineNumbers = sourceLineNumbers;
-            this.Clean = (type == TrackedFileType.Intermediate || type == TrackedFileType.BuiltOutput || type == TrackedFileType.CopiedOutput);
+            this.Clean = (type == TrackedFileType.Intermediate || type == TrackedFileType.BuiltContentOutput || type == TrackedFileType.BuiltTargetOutput || type == TrackedFileType.BuiltPdbOutput || type == TrackedFileType.CopiedOutput);
         }
 
         public bool Clean { get; set; }
diff --git a/src/wix/WixToolset.Sdk/tools/wix.targets b/src/wix/WixToolset.Sdk/tools/wix.targets
index 521b2d17..ccc7eab9 100644
--- a/src/wix/WixToolset.Sdk/tools/wix.targets
+++ b/src/wix/WixToolset.Sdk/tools/wix.targets
@@ -71,7 +71,8 @@
     <!-- Default OutputType to a known WiX Toolset type.  -->
     <OutputType Condition=" '$(OutputType)' == '' ">Package</OutputType>
 
-    <WixPdbType Condition=" '$(WixPdbType)' == '' ">full</WixPdbType>
+    <DebugType Condition=" '$(SuppressPdbOutput)' == 'true' ">none</DebugType>
+    <DebugType Condition=" '$(DebugType)' == '' ">full</DebugType>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -114,6 +115,13 @@
   </PropertyGroup>
 
   <PropertyGroup>
+    <!--
+    Only Package, Module and Bundle output types create .wixpdbs, so reset the flag indicating symbols will be produced outside of those output types.
+    -->
+    <_DebugSymbolsProduced Condition=" '$(OutputType)' != 'Package' and '$(OutputType)' != 'Module' and '$(OutputType)' != 'Bundle' ">false</_DebugSymbolsProduced>
+  </PropertyGroup>
+
+  <PropertyGroup>
     <!-- Default pdb output path to the intermediate output directory -->
     <PdbOutputDir Condition=" '$(PdbOutputDir)'=='' ">$(TargetDir)</PdbOutputDir>
     <TargetPdbDir Condition=" '$(PdbOutputDir)'!='' ">$([MSBuild]::NormalizeDirectory($(MSBuildProjectDirectory), $(PdbOutputDir)))</TargetPdbDir>
@@ -625,7 +633,7 @@
         OutputFile="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetFileName)"
         OutputType="$(OutputType)"
         PdbFile="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetPdbFileName)"
-        PdbType="$(WixPdbType)"
+        PdbType="$(DebugType)"
 
         AdditionalOptions="$(CompilerAdditionalOptions) $(LinkerAdditionalOptions)"
         DefineConstants="$(DefineConstants);$(SolutionDefineConstants);$(ProjectDefineConstants);$(ProjectReferenceDefineConstants)"
@@ -887,7 +895,7 @@
 
     <!-- Include build output pdb(s).  Different than predefined itemgroup since AssignTargetPaths target may change -->
     <ItemGroup>
-      <DebugSymbolsProjectOutputGroupOutput Include="$(TargetPdbPath)" Condition=" '$(SuppressPdbOutput)' != 'true' "/>
+      <DebugSymbolsProjectOutputGroupOutput Include="$(TargetPdbPath)" Condition=" '$(DebugType)' != 'none' "/>
     </ItemGroup>
   </Target>
 
@@ -922,13 +930,18 @@
       <FullIntermediateOutputPath>$([MSBuild]::NormalizeDirectory($(IntermediateOutputPath)))</FullIntermediateOutputPath>
     </PropertyGroup>
 
-    <!-- Copy the bound output files. -->
+    <!-- Add the target output to the list to be copied. -->
+    <ItemGroup>
+      <_FullPathToCopy Include="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetFileName)" />
+    </ItemGroup>
+
+    <!-- Add the bound content output files to the list to be copied. -->
     <ReadTracking File="$(IntermediateOutputPath)$(BindTrackingFilePrefix)%(CultureGroup.Identity)$(BindTrackingFileExtension)">
-      <Output TaskParameter="Outputs" ItemName="_FullPathToCopy" />
+      <Output TaskParameter="BuiltContentOutputs" ItemName="_FullPathToCopy" />
+      <Output TaskParameter="CopiedOutputs" ItemName="_FullPathToCopy" />
     </ReadTracking>
 
     <ItemGroup>
-      <_FullPathToCopy Include="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetFileName)" Condition=" '@(_FullPathToCopy)'=='' " />
       <_RelativePath Include="$([MSBuild]::MakeRelative($(FullIntermediateOutputPath), %(_FullPathToCopy.FullPath)))" />
     </ItemGroup>
 
@@ -950,10 +963,10 @@
 
     <Message Importance="High" Text="$(MSBuildProjectName) -&gt; $(TargetPath)" Condition="'$(CopyBuildOutputToOutputDirectory)' == 'true' and '$(SkipCopyBuildProduct)'!='true'" />
 
-    <!-- Copy the debug information file (.pdb), if any
+    <!-- Copy the debug information file (.wixpdb), if any -->
     <Copy
-        SourceFiles="@(_DebugSymbolsIntermediatePath)"
-        DestinationFiles="@(_DebugSymbolsOutputPath)"
+        SourceFiles="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetPdbFileName)"
+        DestinationFiles="$(TargetPdbDir)%(CultureGroup.OutputFolder)$(TargetPdbFileName)"
         SkipUnchangedFiles="$(SkipCopyUnchangedFiles)"
         OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)"
         Retries="$(CopyRetryCount)"
@@ -964,7 +977,6 @@
       <Output TaskParameter="DestinationFiles" ItemName="FileWrites"/>
 
     </Copy>
-    -->
   </Target>
 
   <Import Project="$(WixSigningTargetsPath)"  />
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs
index 8b65e4aa..a5232f83 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs
@@ -497,11 +497,13 @@ namespace WixToolsetTest.CoreIntegration
                 Assert.True(File.Exists(exePath));
                 Assert.True(File.Exists(Path.Combine(Path.GetDirectoryName(exePath), "test.txt")));
 
-                var trackedLines = File.ReadAllLines(trackingFile).Select(s => s.Replace(baseFolder, null, StringComparison.OrdinalIgnoreCase).Replace(folder, null, StringComparison.OrdinalIgnoreCase)).ToArray();
+                var trackedLines = File.ReadAllLines(trackingFile).Select(s => s.Replace(baseFolder, null, StringComparison.OrdinalIgnoreCase).Replace(folder, null, StringComparison.OrdinalIgnoreCase))
+                    .OrderBy(s => s)
+                    .ToArray();
                 WixAssert.CompareLineByLine(new[]
                 {
-                    "BuiltOutput\tbin\\test.exe",
-                    "BuiltOutput\tbin\\test.wixpdb",
+                    "BuiltPdbOutput\tbin\\test.wixpdb",
+                    "BuiltTargetOutput\tbin\\test.exe",
                     "CopiedOutput\tbin\\test.txt",
                     "Input\tSimpleBundle\\data\\fakeba.dll",
                     "Input\tSimpleBundle\\data\\MsiPackage\\test.txt"
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/SigningFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/SigningFixture.cs
index 8fe73e5d..02fbfc30 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/SigningFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/SigningFixture.cs
@@ -148,7 +148,7 @@ namespace WixToolsetTest.CoreIntegration
                 result.AssertSuccess();
 
                 result = WixRunner.Execute(new[]
-{
+                {
                     "burn",
                     "detach",
                     exePath,
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)]
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/Wixlib/PackageIncludesWixlib/Package.wxs b/src/wix/test/WixToolsetTest.Sdk/TestData/Wixlib/PackageIncludesWixlib/Package.wxs
new file mode 100644
index 00000000..fe8298bd
--- /dev/null
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/Wixlib/PackageIncludesWixlib/Package.wxs
@@ -0,0 +1,9 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="yes" InstallerVersion="200">
+    <MediaTemplate />
+
+    <Feature Id="ProductFeature" Title="ATitle">
+      <ComponentGroupRef Id="ProductComponents" />
+    </Feature>
+  </Package>
+</Wix>
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/Wixlib/PackageIncludesWixlib/PackageIncludesWixlib.wixproj b/src/wix/test/WixToolsetTest.Sdk/TestData/Wixlib/PackageIncludesWixlib/PackageIncludesWixlib.wixproj
new file mode 100644
index 00000000..6ada19b8
--- /dev/null
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/Wixlib/PackageIncludesWixlib/PackageIncludesWixlib.wixproj
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(WixMSBuildProps)" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <ProjectGuid>{B00939D5-7952-4ADF-BEB1-507D227B2FE2}</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>
+    <ProjectReference Include="..\SimpleWixlib\SimpleWixlib.wixproj">
+      <Name>SimpleWixlib</Name>
+      <Project>{9F84998B-7F45-4CB3-8795-915801DBBB74}</Project>
+    </ProjectReference>
+  </ItemGroup>
+
+  <Import Project="$(WixTargetsPath)" />
+</Project>
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/Wixlib/SimpleWixlib/Library.wxs b/src/wix/test/WixToolsetTest.Sdk/TestData/Wixlib/SimpleWixlib/Library.wxs
new file mode 100644
index 00000000..8ffb3e8a
--- /dev/null
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/Wixlib/SimpleWixlib/Library.wxs
@@ -0,0 +1,15 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Fragment>
+      <StandardDirectory Id="ProgramFilesFolder">
+          <Directory Id="WixLibFolder" />
+      </StandardDirectory>
+  </Fragment>
+
+  <Fragment>
+    <ComponentGroup Id="ProductComponents" Directory="WixLibFolder">
+       <Component Id="TextFile" Guid="2D93B748-4926-4185-BC84-9F1D6883AF20">
+         <File Source="Library.txt" />
+       </Component>
+    </ComponentGroup>
+  </Fragment>
+</Wix>
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/Wixlib/SimpleWixlib/SimpleWixlib.wixproj b/src/wix/test/WixToolsetTest.Sdk/TestData/Wixlib/SimpleWixlib/SimpleWixlib.wixproj
new file mode 100644
index 00000000..7c83a339
--- /dev/null
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/Wixlib/SimpleWixlib/SimpleWixlib.wixproj
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(WixMSBuildProps)" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <OutputType>Library</OutputType>
+    <BindFiles>true</BindFiles>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <ProjectGuid>{9F84998B-7F45-4CB3-8795-915801DBBB74}</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="Library.wxs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <BindInputPaths Include="data" />
+  </ItemGroup>
+
+  <Import Project="$(WixTargetsPath)" />
+</Project>
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/Wixlib/SimpleWixlib/data/Library.txt b/src/wix/test/WixToolsetTest.Sdk/TestData/Wixlib/SimpleWixlib/data/Library.txt
new file mode 100644
index 00000000..19a811ae
--- /dev/null
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/Wixlib/SimpleWixlib/data/Library.txt
@@ -0,0 +1 @@
+This is Library.txt.