aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core/Bind/TransferFilesCommand.cs
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2021-03-16 16:12:50 -0700
committerRob Mensching <rob@firegiant.com>2021-03-16 16:16:02 -0700
commitfb2e8cb8a28a2a1a84909a8793a57d0d575da610 (patch)
treeb16b703c6ec142413878ccfcbc8fada467d9fc47 /src/WixToolset.Core/Bind/TransferFilesCommand.cs
parentbf9daf7547175f7a17b949feaeaa9f3cac388073 (diff)
downloadwix-fb2e8cb8a28a2a1a84909a8793a57d0d575da610.tar.gz
wix-fb2e8cb8a28a2a1a84909a8793a57d0d575da610.tar.bz2
wix-fb2e8cb8a28a2a1a84909a8793a57d0d575da610.zip
Make ResetAcl opt-in instead of opt-out
Diffstat (limited to 'src/WixToolset.Core/Bind/TransferFilesCommand.cs')
-rw-r--r--src/WixToolset.Core/Bind/TransferFilesCommand.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/WixToolset.Core/Bind/TransferFilesCommand.cs b/src/WixToolset.Core/Bind/TransferFilesCommand.cs
index 51d5a744..b3b74fbc 100644
--- a/src/WixToolset.Core/Bind/TransferFilesCommand.cs
+++ b/src/WixToolset.Core/Bind/TransferFilesCommand.cs
@@ -13,12 +13,12 @@ namespace WixToolset.Core.Bind
13 13
14 internal class TransferFilesCommand 14 internal class TransferFilesCommand
15 { 15 {
16 public TransferFilesCommand(IMessaging messaging, IEnumerable<ILayoutExtension> extensions, IEnumerable<IFileTransfer> fileTransfers, bool suppressAclReset) 16 public TransferFilesCommand(IMessaging messaging, IEnumerable<ILayoutExtension> extensions, IEnumerable<IFileTransfer> fileTransfers, bool resetAcls)
17 { 17 {
18 this.Extensions = extensions; 18 this.Extensions = extensions;
19 this.Messaging = messaging; 19 this.Messaging = messaging;
20 this.FileTransfers = fileTransfers; 20 this.FileTransfers = fileTransfers;
21 this.SuppressAclReset = suppressAclReset; 21 this.ResetAcls = resetAcls;
22 } 22 }
23 23
24 private IMessaging Messaging { get; } 24 private IMessaging Messaging { get; }
@@ -27,7 +27,7 @@ namespace WixToolset.Core.Bind
27 27
28 private IEnumerable<IFileTransfer> FileTransfers { get; } 28 private IEnumerable<IFileTransfer> FileTransfers { get; }
29 29
30 private bool SuppressAclReset { get; } 30 private bool ResetAcls { get; }
31 31
32 public void Execute() 32 public void Execute()
33 { 33 {
@@ -152,9 +152,9 @@ namespace WixToolset.Core.Bind
152 } while (retry); 152 } while (retry);
153 } 153 }
154 154
155 // Finally, if there were any files remove the ACL that may have been added to 155 // Finally, if directed then reset remove ACLs that may may have been picked up
156 // during the file transfer process. 156 // during the file transfer process.
157 if (0 < destinationFiles.Count && !this.SuppressAclReset) 157 if (this.ResetAcls && 0 < destinationFiles.Count)
158 { 158 {
159 try 159 try
160 { 160 {