Move to a single tracking file for all bind inputs and outputs

A single tracking file can be enhanced more easily than continuing
to introduce specialized tracking files. In this case, we now
include output files that are copied and can differentiate them from
the built output files.

14 files changed, 185 insertions, 206 deletions

diff --git a/src/api/wix/WixToolset.Extensibility/Data/ILayoutContext.cs b/src/api/wix/WixToolset.Extensibility/Data/ILayoutContext.cs
index b11b4d13..981ed38e 100644
--- a/src/api/wix/WixToolset.Extensibility/Data/ILayoutContext.cs
+++ b/src/api/wix/WixToolset.Extensibility/Data/ILayoutContext.cs
@@ -32,24 +32,14 @@ namespace WixToolset.Extensibility.Data
         IReadOnlyCollection<IFileTransfer> FileTransfers { get; set; }
 
         /// <summary>
-        /// File to capture list of content files.
-        /// </summary>
-        string ContentsFile { get; set; }
-
-        /// <summary>
-        /// File to capture list of output files.
-        /// </summary>
-        string OutputsFile { get; set; }
-
-        /// <summary>
         /// Intermediate folder.
         /// </summary>
         string IntermediateFolder { get; set; }
 
         /// <summary>
-        /// List of built output files.
+        /// File to capture list of content, built output and copied output files.
         /// </summary>
-        string BuiltOutputsFile { get; set; }
+        string TrackingFile { get; set; }
 
         /// <summary>
         /// Reset ACLs on file transfers.
diff --git a/src/api/wix/WixToolset.Extensibility/Data/TrackedFileType.cs b/src/api/wix/WixToolset.Extensibility/Data/TrackedFileType.cs
index e7f53842..904a990f 100644
--- a/src/api/wix/WixToolset.Extensibility/Data/TrackedFileType.cs
+++ b/src/api/wix/WixToolset.Extensibility/Data/TrackedFileType.cs
@@ -25,9 +25,15 @@ namespace WixToolset.Extensibility.Data
         Intermediate,
 
         /// <summary>
-        /// Final output (like a .msi, .cab or .wixpdb).
-        /// These are the whole point of the build process.
+        /// Output created by the build process itself (like a .msi, .cab or .wixpdb).
+        /// These files can be recreated in the final output location by building again.
         /// </summary>
-        Final,
+        BuiltOutput,
+
+        /// <summary>
+        /// Output copied by the build process (like external files in an .msi).
+        /// These files are not created by the build process but are copied to the final output location.
+        /// </summary>
+        CopiedOutput,
     }
 }
diff --git a/src/wix/WixToolset.BuildTasks/ReadTracking.cs b/src/wix/WixToolset.BuildTasks/ReadTracking.cs
new file mode 100644
index 00000000..1ce039f6
--- /dev/null
+++ b/src/wix/WixToolset.BuildTasks/ReadTracking.cs
@@ -0,0 +1,97 @@
+// 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 WixToolset.BuildTasks
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using Microsoft.Build.Framework;
+    using Microsoft.Build.Utilities;
+
+    /// <summary>
+    /// Read the contents of the tracking file produced by the build command.
+    /// </summary>
+    public class ReadTracking : Task
+    {
+        private const string TrackedTypeMetadataName = "TrackedType";
+        private static readonly char[] TrackedLineTypePathSeparator = new[] { '\t' };
+
+        /// <summary>
+        /// The path to the tracking file.
+        /// </summary>
+        [Required]
+        public ITaskItem File { get; set; }
+
+        /// <summary>
+        /// All tracked files.
+        /// </summary>
+        [Output]
+        public ITaskItem[] All { get; private set; }
+
+        /// <summary>
+        /// The tracked built outputs.
+        /// </summary>
+        [Output]
+        public ITaskItem[] BuiltOutputs { get; private set; }
+
+        /// <summary>
+        /// The tracked copied outputs.
+        /// </summary>
+        [Output]
+        public ITaskItem[] CopiedOutputs { get; private set; }
+
+        /// <summary>
+        /// The tracked inputs.
+        /// </summary>
+        [Output]
+        public ITaskItem[] Inputs { get; private set; }
+
+        /// <summary>
+        /// All tracked outputs.
+        /// </summary>
+        [Output]
+        public ITaskItem[] Outputs { get; private set; }
+
+        /// <summary>
+        /// Gets a complete list of external cabs referenced by the given installer database file.
+        /// </summary>
+        /// <returns>True upon completion of the task execution.</returns>
+        public override bool Execute()
+        {
+            var all = new List<ITaskItem>();
+            var path = this.File.ItemSpec;
+
+            if (System.IO.File.Exists(path))
+            {
+                var lines = System.IO.File.ReadAllLines(path);
+
+                foreach (var line in lines)
+                {
+                    var split = line.Split(TrackedLineTypePathSeparator, 2, StringSplitOptions.RemoveEmptyEntries);
+
+                    if (split.Length == 2)
+                    {
+                        all.Add(new TaskItem(split[1], new Dictionary<string, string>() { [TrackedTypeMetadataName] = split[0] }));
+                    }
+                    else
+                    {
+                        this.Log.LogError($"Failed to parse tracked line: {line}");
+                    }
+                }
+            }
+
+            this.All = all.ToArray();
+            this.BuiltOutputs = all.Where(t => FilterByTrackedType(t, "BuiltOutput")).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();
+
+            return true;
+        }
+
+        private static bool FilterByTrackedType(ITaskItem item, string type)
+        {
+            return item.GetMetadata(TrackedTypeMetadataName).Equals(type, StringComparison.OrdinalIgnoreCase);
+        }
+    }
+}
diff --git a/src/wix/WixToolset.BuildTasks/WixBuild.cs b/src/wix/WixToolset.BuildTasks/WixBuild.cs
index dbff7e81..3d4617f6 100644
--- a/src/wix/WixToolset.BuildTasks/WixBuild.cs
+++ b/src/wix/WixToolset.BuildTasks/WixBuild.cs
@@ -52,11 +52,7 @@ namespace WixToolset.BuildTasks
 
         public bool BindFiles { get; set; }
 
-        public ITaskItem BindContentsFile { get; set; }
-
-        public ITaskItem BindOutputsFile { get; set; }
-
-        public ITaskItem BindBuiltOutputsFile { get; set; }
+        public ITaskItem BindTrackingFile { get; set; }
 
         public string CabinetCachePath { get; set; }
 
@@ -96,9 +92,7 @@ namespace WixToolset.BuildTasks
             commandLineBuilder.AppendSwitchIfNotNull("-usf ", this.UnreferencedSymbolsFile);
             commandLineBuilder.AppendSwitchIfNotNull("-cc ", this.CabinetCachePath);
             commandLineBuilder.AppendSwitchIfNotNull("-intermediatefolder ", this.IntermediateDirectory);
-            commandLineBuilder.AppendSwitchIfNotNull("-contentsfile ", this.BindContentsFile);
-            commandLineBuilder.AppendSwitchIfNotNull("-outputsfile ", this.BindOutputsFile);
-            commandLineBuilder.AppendSwitchIfNotNull("-builtoutputsfile ", this.BindBuiltOutputsFile);
+            commandLineBuilder.AppendSwitchIfNotNull("-trackingfile ", this.BindTrackingFile);
             commandLineBuilder.AppendSwitchIfNotNull("-defaultcompressionlevel ", this.DefaultCompressionLevel);
 
             base.BuildCommandLine(commandLineBuilder);
diff --git a/src/wix/WixToolset.Core.Burn/Bind/BindBundleCommand.cs b/src/wix/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
index cd00232a..7b74ce5e 100644
--- a/src/wix/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
+++ b/src/wix/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
@@ -483,7 +483,7 @@ namespace WixToolset.Core.Burn
                 command.Execute();
 
                 fileTransfers.Add(command.Transfer);
-                trackedFiles.Add(this.BackendHelper.TrackFile(this.OutputPath, TrackedFileType.Final));
+                trackedFiles.Add(this.BackendHelper.TrackFile(this.OutputPath, TrackedFileType.BuiltOutput));
             }
 
 #if TODO // does this need to come back, or do they only need to be in TrackedFiles?
@@ -504,7 +504,7 @@ namespace WixToolset.Core.Burn
             }
             else
             {
-                var trackPdb = this.BackendHelper.TrackFile(this.OutputPdbPath, TrackedFileType.Final);
+                var trackPdb = this.BackendHelper.TrackFile(this.OutputPdbPath, TrackedFileType.BuiltOutput);
                 trackedFiles.Add(trackPdb);
 
                 wixout = WixOutput.Create(trackPdb.Path);
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
index 9f36cd78..f2a8b9c6 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
@@ -478,7 +478,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             {
                 this.Messaging.Write(VerboseMessages.GeneratingDatabase());
 
-                var trackMsi = this.WindowsInstallerBackendHelper.TrackFile(this.OutputPath, TrackedFileType.Final);
+                var trackMsi = this.WindowsInstallerBackendHelper.TrackFile(this.OutputPath, TrackedFileType.BuiltOutput);
                 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);
@@ -595,7 +595,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             }
             else
             {
-                var trackPdb = this.WindowsInstallerBackendHelper.TrackFile(this.OutputPdbPath, TrackedFileType.Final);
+                var trackPdb = this.WindowsInstallerBackendHelper.TrackFile(this.OutputPdbPath, TrackedFileType.BuiltOutput);
                 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 83a4949e..4ac248cd 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs
@@ -225,7 +225,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             }
             else
             {
-                var trackDestination = this.BackendHelper.TrackFile(Path.Combine(cabinetDir, mediaSymbol.Cabinet), TrackedFileType.Final, mediaSymbol.SourceLineNumbers);
+                var trackDestination = this.BackendHelper.TrackFile(Path.Combine(cabinetDir, mediaSymbol.Cabinet), TrackedFileType.BuiltOutput, mediaSymbol.SourceLineNumbers);
                 this.trackedFiles.Add(trackDestination);
 
                 var transfer = this.BackendHelper.CreateFileTransfer(resolvedCabinet.Path, trackDestination.Path, resolvedCabinet.BuildOption == CabinetBuildOption.BuildAndMove, mediaSymbol.SourceLineNumbers);
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs
index 039ba495..9aad3537 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs
@@ -109,7 +109,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                             // 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.Final, facade.SourceLineNumber);
+                            var tracked = this.BackendHelper.TrackFile(transfer.Destination, TrackedFileType.BuiltOutput, facade.SourceLineNumber);
                             tracked.Clean = !transfer.Redundant;
 
                             trackedFiles.Add(tracked);
diff --git a/src/wix/WixToolset.Core/CommandLine/BuildCommand.cs b/src/wix/WixToolset.Core/CommandLine/BuildCommand.cs
index 5f618b81..47b7afa8 100644
--- a/src/wix/WixToolset.Core/CommandLine/BuildCommand.cs
+++ b/src/wix/WixToolset.Core/CommandLine/BuildCommand.cs
@@ -52,11 +52,7 @@ namespace WixToolset.Core.CommandLine
 
         private CompressionLevel? DefaultCompressionLevel { get; set; }
 
-        private string ContentsFile { get; set; }
-
-        private string OutputsFile { get; set; }
-
-        private string BuiltOutputsFile { get; set; }
+        private string TrackingFile { get; set; }
 
         public Task<int> ExecuteAsync(CancellationToken cancellationToken)
         {
@@ -78,11 +74,7 @@ namespace WixToolset.Core.CommandLine
 
             this.Platform = this.commandLine.Platform;
 
-            this.ContentsFile = this.commandLine.ContentsFile;
-
-            this.OutputsFile = this.commandLine.OutputsFile;
-
-            this.BuiltOutputsFile = this.commandLine.BuiltOutputsFile;
+            this.TrackingFile = this.commandLine.TrackingFile;
 
             this.DefaultCompressionLevel = this.commandLine.DefaultCompressionLevel;
 
@@ -371,9 +363,7 @@ namespace WixToolset.Core.CommandLine
                     context.TrackedFiles = bindResult.TrackedFiles;
                     context.FileTransfers = bindResult.FileTransfers;
                     context.IntermediateFolder = intermediateFolder;
-                    context.ContentsFile = this.ContentsFile;
-                    context.OutputsFile = this.OutputsFile;
-                    context.BuiltOutputsFile = this.BuiltOutputsFile;
+                    context.TrackingFile = this.TrackingFile;
                     context.ResetAcls = this.commandLine.ResetAcls;
                     context.CancellationToken = cancellationToken;
 
@@ -537,11 +527,7 @@ namespace WixToolset.Core.CommandLine
 
             public CompressionLevel? DefaultCompressionLevel { get; private set; }
 
-            public string ContentsFile { get; private set; }
-
-            public string OutputsFile { get; private set; }
-
-            public string BuiltOutputsFile { get; private set; }
+            public string TrackingFile { get; private set; }
 
             public List<string> Ices { get; } = new List<string>();
 
@@ -610,16 +596,8 @@ namespace WixToolset.Core.CommandLine
                             parser.GetNextArgumentOrError(arg, this.Cultures);
                             return true;
 
-                        case "contentsfile":
-                            this.ContentsFile = parser.GetNextArgumentAsFilePathOrError(arg);
-                            return true;
-
-                        case "outputsfile":
-                            this.OutputsFile = parser.GetNextArgumentAsFilePathOrError(arg);
-                            return true;
-
-                        case "builtoutputsfile":
-                            this.BuiltOutputsFile = parser.GetNextArgumentAsFilePathOrError(arg);
+                        case "trackingfile":
+                            this.TrackingFile = parser.GetNextArgumentAsFilePathOrError(arg);
                             return true;
 
                         case "d":
diff --git a/src/wix/WixToolset.Core/ExtensibilityServices/TrackedFile.cs b/src/wix/WixToolset.Core/ExtensibilityServices/TrackedFile.cs
index 028cddbf..570fb029 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.Final);
+            this.Clean = (type == TrackedFileType.Intermediate || type == TrackedFileType.BuiltOutput || type == TrackedFileType.CopiedOutput);
         }
 
         public bool Clean { get; set; }
diff --git a/src/wix/WixToolset.Core/LayoutContext.cs b/src/wix/WixToolset.Core/LayoutContext.cs
index 4b8c7b99..3def3006 100644
--- a/src/wix/WixToolset.Core/LayoutContext.cs
+++ b/src/wix/WixToolset.Core/LayoutContext.cs
@@ -27,11 +27,7 @@ namespace WixToolset.Core
 
         public string IntermediateFolder { get; set; }
 
-        public string ContentsFile { get; set; }
-
-        public string OutputsFile { get; set; }
-
-        public string BuiltOutputsFile { get; set; }
+        public string TrackingFile { get; set; }
 
         public bool ResetAcls { get; set; }
 
diff --git a/src/wix/WixToolset.Core/LayoutCreator.cs b/src/wix/WixToolset.Core/LayoutCreator.cs
index 0c5aaf63..7a143680 100644
--- a/src/wix/WixToolset.Core/LayoutCreator.cs
+++ b/src/wix/WixToolset.Core/LayoutCreator.cs
@@ -16,6 +16,8 @@ namespace WixToolset.Core
     /// </summary>
     internal class LayoutCreator : ILayoutCreator
     {
+        private const string TrackedLineTypePathSeparator = "\t";
+
         internal LayoutCreator(IServiceProvider serviceProvider)
         {
             this.Messaging = serviceProvider.GetService<IMessaging>();
@@ -51,22 +53,9 @@ namespace WixToolset.Core
             }
             finally
             {
-                if (context.TrackedFiles != null)
+                if (context.TrackedFiles != null && !String.IsNullOrEmpty(context.TrackingFile))
                 {
-                    if (!String.IsNullOrEmpty(context.ContentsFile))
-                    {
-                        this.CreateContentsFile(context.ContentsFile, context.TrackedFiles);
-                    }
-
-                    if (!String.IsNullOrEmpty(context.OutputsFile))
-                    {
-                        this.CreateOutputsFile(context.OutputsFile, context.TrackedFiles);
-                    }
-
-                    if (!String.IsNullOrEmpty(context.BuiltOutputsFile))
-                    {
-                        this.CreateBuiltOutputsFile(context.BuiltOutputsFile, context.TrackedFiles);
-                    }
+                    this.CreateTrackingFile(context.TrackingFile, context.TrackedFiles);
                 }
             }
 
@@ -78,72 +67,15 @@ namespace WixToolset.Core
         }
 
         /// <summary>
-        /// Writes the paths to the content files to a text file.
-        /// </summary>
-        /// <param name="path">Path to write file.</param>
-        /// <param name="trackedFiles">Collection of paths to content files that will be written to file.</param>
-        private void CreateContentsFile(string path, IEnumerable<ITrackedFile> trackedFiles)
-        {
-            var uniqueInputFilePaths = new SortedSet<string>(trackedFiles.Where(t => t.Type == TrackedFileType.Input).Select(t => t.Path), StringComparer.OrdinalIgnoreCase);
-
-            if (!uniqueInputFilePaths.Any())
-            {
-                return;
-            }
-
-            var directory = Path.GetDirectoryName(path);
-            Directory.CreateDirectory(directory);
-
-            using (var contents = new StreamWriter(path, false))
-            {
-                foreach (var inputPath in uniqueInputFilePaths)
-                {
-                    contents.WriteLine(inputPath);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Writes the paths to the output files to a text file.
-        /// </summary>
-        /// <param name="path">Path to write file.</param>
-        /// <param name="trackedFiles">Collection of files that were transferred to the output directory.</param>
-        private void CreateOutputsFile(string path, IEnumerable<ITrackedFile> trackedFiles)
-        {
-            var uniqueOutputPaths = new SortedSet<string>(trackedFiles.Where(t => t.Clean).Select(t => t.Path), StringComparer.OrdinalIgnoreCase);
-
-            if (!uniqueOutputPaths.Any())
-            {
-                return;
-            }
-
-            var directory = Path.GetDirectoryName(path);
-            Directory.CreateDirectory(directory);
-
-            using (var outputs = new StreamWriter(path, false))
-            {
-                //// Don't list files where the source is the same as the destination since
-                //// that might be the only place the file exists. The outputs file is often
-                //// used to delete stuff and losing the original source would be bad.
-                //var uniqueOutputPaths = new SortedSet<string>(fileTransfers.Where(ft => !ft.Redundant).Select(ft => ft.Destination), StringComparer.OrdinalIgnoreCase);
-
-                foreach (var outputPath in uniqueOutputPaths)
-                {
-                    outputs.WriteLine(outputPath);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Writes the paths to the built output files to a text file.
+        /// Writes the paths of the track files to a text file.
         /// </summary>
         /// <param name="path">Path to write file.</param>
-        /// <param name="trackedFiles">Collection of files that were transferred to the output directory.</param>
-        private void CreateBuiltOutputsFile(string path, IEnumerable<ITrackedFile> trackedFiles)
+        /// <param name="trackedFiles">Collection of files that were tracked.</param>
+        private void CreateTrackingFile(string path, IEnumerable<ITrackedFile> trackedFiles)
         {
-            var uniqueBuiltPaths = new SortedSet<string>(trackedFiles.Where(t => t.Type == TrackedFileType.Final).Select(t => t.Path), StringComparer.OrdinalIgnoreCase);
+            var uniqueTrackingLines = new SortedSet<string>(trackedFiles.Where(t => t.Type != TrackedFileType.Temporary).Select(TrackedFileLine), StringComparer.OrdinalIgnoreCase);
 
-            if (!uniqueBuiltPaths.Any())
+            if (!uniqueTrackingLines.Any())
             {
                 return;
             }
@@ -151,11 +83,11 @@ namespace WixToolset.Core
             var directory = Path.GetDirectoryName(path);
             Directory.CreateDirectory(directory);
 
-            using (var outputs = new StreamWriter(path, false))
+            using (var stream = new StreamWriter(path, false))
             {
-                foreach (var builtPath in uniqueBuiltPaths)
+                foreach (var trackingLine in uniqueTrackingLines)
                 {
-                    outputs.WriteLine(builtPath);
+                    stream.WriteLine(trackingLine);
                 }
             }
         }
@@ -219,5 +151,10 @@ namespace WixToolset.Core
                 }
             }
         }
+
+        private static string TrackedFileLine(ITrackedFile trackedFile)
+        {
+            return trackedFile.Type + TrackedLineTypePathSeparator + trackedFile.Path;
+        }
     }
 }
diff --git a/src/wix/WixToolset.Sdk/tools/wix.targets b/src/wix/WixToolset.Sdk/tools/wix.targets
index 7497a9f8..0029e217 100644
--- a/src/wix/WixToolset.Sdk/tools/wix.targets
+++ b/src/wix/WixToolset.Sdk/tools/wix.targets
@@ -112,18 +112,20 @@
   <PropertyGroup>
     <!-- Default pdb output path to the intermediate output directory -->
     <PdbOutputDir Condition=" '$(PdbOutputDir)'=='' ">$(TargetDir)</PdbOutputDir>
-    <PdbOutputDir Condition=" !HasTrailingSlash('$(PdbOutputDir)') ">$(PdbOutputDir)\</PdbOutputDir>
-
-    <!-- Example, C:\MyProjects\MyProject\bin\debug\ -->
-    <TargetPdbDir Condition=" '$(PdbOutputDir)'!='' ">$([System.IO.Path]::GetFullPath(`$([System.IO.Path]::Combine(`$(MSBuildProjectDirectory)`, `$(PdbOutputDir)`))`))</TargetPdbDir>
-
-    <!-- Example, MySetup.wixpdb" -->
+    <TargetPdbDir Condition=" '$(PdbOutputDir)'!='' ">$([MSBuild]::NormalizeDirectory($(MSBuildProjectDirectory), $(PdbOutputDir)))</TargetPdbDir>
     <TargetPdbFileName Condition=" '$(TargetPdbFileName)' == '' ">$(TargetName).wixpdb</TargetPdbFileName>
-
-    <!-- Example, C:\MyProjects\MyProject\bin\debug\MyPackage.wixpdb -->
     <TargetPdbPath Condition=" '$(TargetPdbPath)' == '' ">$(TargetPdbDir)$(TargetPdbFileName)</TargetPdbPath>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <WixExtDir Condition=" '$(WixExtDir)' == ''">$(WixBinDir)</WixExtDir>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <BindTrackingFilePrefix Condition=" '$(BindTrackingFilePrefix)' == '' ">$(MSBuildProjectFile).BindTracking</BindTrackingFilePrefix>
+    <BindTrackingFileExtension Condition=" '$(BindTrackingFileExtension)' == '' ">.txt</BindTrackingFileExtension>
+  </PropertyGroup>
+
   <!--
   ***********************************************************************************************
   ***********************************************************************************************
@@ -154,24 +156,14 @@
   <UsingTask TaskName="WixAssignCulture" Condition=" '$(WixTasksPath64)' != '' " AssemblyFile="$(WixTasksPath)" Architecture="x86" />
   <UsingTask TaskName="WixAssignCulture" Condition=" '$(WixTasksPath64)' != '' " AssemblyFile="$(WixTasksPath64)" Architecture="x64" />
 
+  <UsingTask TaskName="ReadTracking" Condition=" '$(WixTasksPath64)' == '' " AssemblyFile="$(WixTasksPath)" />
+  <UsingTask TaskName="ReadTracking" Condition=" '$(WixTasksPath64)' != '' " AssemblyFile="$(WixTasksPath)" Architecture="x86" />
+  <UsingTask TaskName="ReadTracking" Condition=" '$(WixTasksPath64)' != '' " AssemblyFile="$(WixTasksPath64)" Architecture="x64" />
+
   <UsingTask TaskName="ResolveWixReferences" Condition=" '$(WixTasksPath64)' == '' " AssemblyFile="$(WixTasksPath)" />
   <UsingTask TaskName="ResolveWixReferences" Condition=" '$(WixTasksPath64)' != '' " AssemblyFile="$(WixTasksPath)" Architecture="x86" />
   <UsingTask TaskName="ResolveWixReferences" Condition=" '$(WixTasksPath64)' != '' " AssemblyFile="$(WixTasksPath64)" Architecture="x64" />
 
-  <PropertyGroup>
-    <BindContentsFile Condition=" '$(BindContentsFile)' == '' ">$(MSBuildProjectFile).BindContentsFileList.txt</BindContentsFile>
-    <BindOutputsFile Condition=" '$(BindOutputsFile)' == '' ">$(MSBuildProjectFile).BindOutputsFileList.txt</BindOutputsFile>
-    <BindBuiltOutputsFile Condition=" '$(BindBuiltOutputsFile)' == '' ">$(MSBuildProjectFile).BindBuiltOutputsFileList.txt</BindBuiltOutputsFile>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <CabinetCachePath Condition=" '$(CabinetCachePath)'=='' and '$(ReuseCabinetCache)'=='true' ">$(IntermediateOutputPath)cabcache\</CabinetCachePath>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <WixExtDir Condition=" '$(WixExtDir)' == ''">$(WixBinDir)</WixExtDir>
-  </PropertyGroup>
-
   <!--
   ***********************************************************************************************
   ***********************************************************************************************
@@ -552,6 +544,9 @@
     <PropertyGroup>
       <TargetPath>@(_CulturedTargetPath)</TargetPath>
       <TargetPdbPath>@(_CulturedTargetPdbPath)</TargetPdbPath>
+
+      <!-- Update bind tracking filename prefix so cultures appended to the filename will be separated by a "-" -->
+      <BindTrackingFilePrefix>$(BindTrackingFilePrefix)-</BindTrackingFilePrefix>
     </PropertyGroup>
   </Target>
 
@@ -615,18 +610,17 @@
       Inputs="@(Compile);
       @(Content);
       @(_WixLocalizationFile);
-      @(WixObject);
       @(_WixReferencedProjectOutputs);
       @(_ResolvedWixLibraryPaths);
       @(_ResolvedWixExtensionPaths);
       @(_BindInputs)"
-      Outputs="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(BindBuiltOutputsFile);@(_BindBuiltOutputs)"
+      Outputs="$(IntermediateOutputPath)$(BindTrackingFilePrefix)%(CultureGroup.Identity)$(BindTrackingFileExtension);@(_BindBuiltOutputs)"
       DependsOnTargets="$(CoreCompileDependsOn)" 
       Condition=" '@(Compile)' != '' ">
 
     <PropertyGroup>
-      <OutputFile>$([System.IO.Path]::GetFullPath($(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetFileName)))</OutputFile>
-      <PdbOutputFile>$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetPdbFileName)</PdbOutputFile>
+      <CabinetCachePath Condition=" '$(CabinetCachePath)'=='' and '$(ReuseCabinetCache)'=='true' ">$(IntermediateOutputPath)cabcache\</CabinetCachePath>
+      <_WixBuildCabinetCachePath Condition=" '$(CabinetCachePath)'!='' ">$([MSBuild]::NormalizeDirectory($(CabinetCachePath), %(CultureGroup.OutputFolder)))</_WixBuildCabinetCachePath>
     </PropertyGroup>
 
     <WixBuild
@@ -641,9 +635,9 @@
 
         IntermediateDirectory="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)"
 
-        OutputFile="$(OutputFile)"
+        OutputFile="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetFileName)"
         OutputType="$(OutputType)"
-        PdbFile="$(PdbOutputFile)"
+        PdbFile="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetPdbFileName)"
         PdbType="$(WixPdbType)"
 
         AdditionalOptions="$(CompilerAdditionalOptions) $(LinkerAdditionalOptions)"
@@ -659,11 +653,9 @@
 
         BindInputPaths="@(LinkerBindInputPaths)"
         BindFiles="$(LinkerBindFiles)"
-        BindContentsFile="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(BindContentsFile)"
-        BindOutputsFile="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(BindOutputsFile)"
-        BindBuiltOutputsFile="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(BindBuiltOutputsFile)"
+        BindTrackingFile="$(IntermediateOutputPath)$(BindTrackingFilePrefix)%(CultureGroup.Identity)$(BindTrackingFileExtension)"
 
-        CabinetCachePath="$(CabinetCachePath)"
+        CabinetCachePath="$(_WixBuildCabinetCachePath)"
         CabinetCreationThreadCount="$(CabinetCreationThreadCount)"
         DefaultCompressionLevel="$(DefaultCompressionLevel)"
 
@@ -754,16 +746,10 @@
   <Target
     Name="ReadPreviousBindInputsAndBuiltOutputs">
 
-    <ReadLinesFromFile File="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(BindContentsFile)">
-      <Output TaskParameter="Lines" ItemName="_BindInputs" />
-    </ReadLinesFromFile>
-
-    <ReadLinesFromFile File="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(BindBuiltOutputsFile)">
-      <Output TaskParameter="Lines" ItemName="_BindBuiltOutputs" />
-    </ReadLinesFromFile>
-
-    <Message Importance="low" Text="Previous bind inputs: @(_BindInputs)" />
-    <Message Importance="low" Text="Previous bind outputs: @(_BindBuiltOutputs)" />
+    <ReadTracking File="$(IntermediateOutputPath)$(BindTrackingFilePrefix)%(CultureGroup.Identity)$(BindTrackingFileExtension)">
+      <Output TaskParameter="Inputs" ItemName="_BindInputs" />
+      <Output TaskParameter="BuiltOutputs" ItemName="_BindBuiltOutputs" />
+    </ReadTracking>
   </Target>
 
   <!--
@@ -789,17 +775,13 @@
       Name="UpdateFileWritesWithBindInformation"
       AfterTargets="CoreCompile">
 
-    <ReadLinesFromFile File="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(BindOutputsFile)">
-      <Output TaskParameter="Lines" ItemName="FileWrites"/>
-    </ReadLinesFromFile>
+    <ReadTracking File="$(IntermediateOutputPath)$(BindTrackingFilePrefix)%(CultureGroup.Identity)$(BindTrackingFileExtension)">
+      <Output TaskParameter="Outputs" ItemName="FileWrites" />
+    </ReadTracking>
 
     <ItemGroup>
-      <FileWrites Include="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(BindContentsFile)" Condition=" Exists('$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(BindContentsFile)') " />
-      <FileWrites Include="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(BindOutputsFile)" Condition=" Exists('$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(BindOutputsFile)') " />
-      <FileWrites Include="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(BindBuiltOutputsFile)" Condition=" Exists('$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(BindBuiltOutputsFile)') " />
+      <FileWrites Include="$(IntermediateOutputPath)$(BindTrackingFilePrefix)%(CultureGroup.Identity)$(BindTrackingFileExtension)" Condition=" Exists('$(IntermediateOutputPath)$(BindTrackingFilePrefix)%(CultureGroup.Identity)$(BindTrackingFileExtension)') " />
     </ItemGroup>
-
-    <Message Importance="low" Text="Build files after link: @(FileWrites)" />
   </Target>
 
   <!--
@@ -862,10 +844,10 @@
 
     <!-- Don't add BuiltProjectOutputGroupKeyOutput - to avoid duplicates, we only want to get the updated list of TargetPaths from the TargetPath property below -->
 
-    <!-- Try to read the outputs from the bind outputs text file since that's the output list straight from compiler. -->
-    <ReadLinesFromFile File="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(BindBuiltOutputsFile)">
-      <Output TaskParameter="Lines" ItemName="_BuiltProjectOutputGroupOutputIntermediate"/>
-    </ReadLinesFromFile>
+    <!-- Try to read the outputs from the bind tracking text file since that's the output list straight from compiler. -->
+    <ReadTracking File="$(IntermediateOutputPath)$(BindTrackingFilePrefix)%(CultureGroup.Identity)$(BindTrackingFileExtension)">
+      <Output TaskParameter="Outputs" ItemName="_BuiltProjectOutputGroupOutputIntermediate" />
+    </ReadTracking>
 
     <!-- If we didn't get anything from the bind outputs text file, default to the target path. -->
     <ItemGroup Condition=" '@(_BuiltProjectOutputGroupOutputIntermediate)'=='' ">
@@ -930,17 +912,17 @@
     <PropertyGroup>
       <CopyBuildOutputToOutputDirectory Condition="'$(CopyBuildOutputToOutputDirectory)'==''">true</CopyBuildOutputToOutputDirectory>
       <CopyOutputSymbolsToOutputDirectory Condition="'$(CopyOutputSymbolsToOutputDirectory)'==''">true</CopyOutputSymbolsToOutputDirectory>
-      <FullIntermediateOutputPath>$([System.IO.Path]::GetFullPath($(IntermediateOutputPath)))</FullIntermediateOutputPath>
+      <FullIntermediateOutputPath>$([MSBuild]::NormalizeDirectory($(IntermediateOutputPath)))</FullIntermediateOutputPath>
     </PropertyGroup>
 
-    <!-- Copy the bound files. -->
-    <ReadLinesFromFile File="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(BindBuiltOutputsFile)">
-      <Output TaskParameter="Lines" ItemName="_FullPathToCopy"/>
-    </ReadLinesFromFile>
+    <!-- Copy the bound output files. -->
+    <ReadTracking File="$(IntermediateOutputPath)$(BindTrackingFilePrefix)%(CultureGroup.Identity)$(BindTrackingFileExtension)">
+      <Output TaskParameter="Outputs" ItemName="_FullPathToCopy" />
+    </ReadTracking>
 
     <ItemGroup>
-      <_FullPathToCopy Include="$(OutputFile)" Condition=" '@(_FullPathToCopy)'=='' " />
-      <_RelativePath Include="$([MSBuild]::MakeRelative($(FullIntermediateOutputPath), %(_FullPathToCopy.Identity)))" />
+      <_FullPathToCopy Include="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetFileName)" Condition=" '@(_FullPathToCopy)'=='' " />
+      <_RelativePath Include="$([MSBuild]::MakeRelative($(FullIntermediateOutputPath), %(_FullPathToCopy.FullPath)))" />
     </ItemGroup>
 
     <Copy
diff --git a/src/wix/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj b/src/wix/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj
index 8f40efee..6111a184 100644
--- a/src/wix/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj
+++ b/src/wix/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj
@@ -19,8 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <!-- <PackageReference Include="WixBuildTools.TestSupport" /> -->
-    <ProjectReference Include="..\..\..\internal\WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj" />
+    <PackageReference Include="WixBuildTools.TestSupport" /> 
   </ItemGroup>
 
   <ItemGroup>