From 9e3d7c0c4c7000ef51c2959b4e04c2323d1dac31 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sun, 2 Jan 2022 13:13:10 -0800 Subject: 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. --- .../wix/WixToolset.Extensibility/Data/ILayoutContext.cs | 14 ++------------ .../wix/WixToolset.Extensibility/Data/TrackedFileType.cs | 12 +++++++++--- 2 files changed, 11 insertions(+), 15 deletions(-) (limited to 'src/api') 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 @@ -31,25 +31,15 @@ namespace WixToolset.Extensibility.Data /// IReadOnlyCollection FileTransfers { get; set; } - /// - /// File to capture list of content files. - /// - string ContentsFile { get; set; } - - /// - /// File to capture list of output files. - /// - string OutputsFile { get; set; } - /// /// Intermediate folder. /// string IntermediateFolder { get; set; } /// - /// List of built output files. + /// File to capture list of content, built output and copied output files. /// - string BuiltOutputsFile { get; set; } + string TrackingFile { get; set; } /// /// 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, /// - /// 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. /// - Final, + BuiltOutput, + + /// + /// 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. + /// + CopiedOutput, } } -- cgit v1.2.3-55-g6feb