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.

2 files changed, 11 insertions, 15 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,
     }
 }