From dc9f4c329e6f55ce7595970463e0caf148096f4b Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Thu, 21 Dec 2017 13:42:52 -0800 Subject: Support wixout and extract Resolve and Layout from Binder --- src/WixToolset.Core/Bind/TransferFilesCommand.cs | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'src/WixToolset.Core/Bind/TransferFilesCommand.cs') diff --git a/src/WixToolset.Core/Bind/TransferFilesCommand.cs b/src/WixToolset.Core/Bind/TransferFilesCommand.cs index 68d8b129..d4e143c3 100644 --- a/src/WixToolset.Core/Bind/TransferFilesCommand.cs +++ b/src/WixToolset.Core/Bind/TransferFilesCommand.cs @@ -13,15 +13,15 @@ namespace WixToolset.Core.Bind internal class TransferFilesCommand { - public TransferFilesCommand(IMessaging messaging, IEnumerable bindPaths, IEnumerable extensions, IEnumerable fileTransfers, bool suppressAclReset) + public TransferFilesCommand(IMessaging messaging, IEnumerable extensions, IEnumerable fileTransfers, bool suppressAclReset) { - this.FileResolver = new FileResolver(bindPaths, extensions); + this.FileSystem = new FileSystem(extensions); this.Messaging = messaging; this.FileTransfers = fileTransfers; this.SuppressAclReset = suppressAclReset; } - private FileResolver FileResolver { get; } + private FileSystem FileSystem { get; } private IMessaging Messaging { get; } @@ -35,10 +35,8 @@ namespace WixToolset.Core.Bind foreach (var fileTransfer in this.FileTransfers) { - string fileSource = this.FileResolver.ResolveFile(fileTransfer.Source, fileTransfer.Type, fileTransfer.SourceLineNumbers, BindStage.Normal); - // If the source and destination are identical, then there's nothing to do here - if (0 == String.Compare(fileSource, fileTransfer.Destination, StringComparison.OrdinalIgnoreCase)) + if (0 == String.Compare(fileTransfer.Source, fileTransfer.Destination, StringComparison.OrdinalIgnoreCase)) { fileTransfer.Redundant = true; continue; @@ -51,13 +49,13 @@ namespace WixToolset.Core.Bind { if (fileTransfer.Move) { - this.Messaging.Write(VerboseMessages.MoveFile(fileSource, fileTransfer.Destination)); - this.TransferFile(true, fileSource, fileTransfer.Destination); + this.Messaging.Write(VerboseMessages.MoveFile(fileTransfer.Source, fileTransfer.Destination)); + this.TransferFile(true, fileTransfer.Source, fileTransfer.Destination); } else { - this.Messaging.Write(VerboseMessages.CopyFile(fileSource, fileTransfer.Destination)); - this.TransferFile(false, fileSource, fileTransfer.Destination); + this.Messaging.Write(VerboseMessages.CopyFile(fileTransfer.Source, fileTransfer.Destination)); + this.TransferFile(false, fileTransfer.Source, fileTransfer.Destination); } retry = false; @@ -183,11 +181,11 @@ namespace WixToolset.Core.Bind if (move) { - complete = this.FileResolver.MoveFile(source, destination, true); + complete = this.FileSystem.MoveFile(source, destination, true); } else { - complete = this.FileResolver.CopyFile(source, destination, true); + complete = this.FileSystem.CopyFile(source, destination, true); } if (!complete) -- cgit v1.2.3-55-g6feb