aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core/LayoutCreator.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/LayoutCreator.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/LayoutCreator.cs')
-rw-r--r--src/WixToolset.Core/LayoutCreator.cs6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/WixToolset.Core/LayoutCreator.cs b/src/WixToolset.Core/LayoutCreator.cs
index b31c4e16..0c5aaf63 100644
--- a/src/WixToolset.Core/LayoutCreator.cs
+++ b/src/WixToolset.Core/LayoutCreator.cs
@@ -18,13 +18,9 @@ namespace WixToolset.Core
18 { 18 {
19 internal LayoutCreator(IServiceProvider serviceProvider) 19 internal LayoutCreator(IServiceProvider serviceProvider)
20 { 20 {
21 this.ServiceProvider = serviceProvider;
22
23 this.Messaging = serviceProvider.GetService<IMessaging>(); 21 this.Messaging = serviceProvider.GetService<IMessaging>();
24 } 22 }
25 23
26 private IServiceProvider ServiceProvider { get; }
27
28 private IMessaging Messaging { get; } 24 private IMessaging Messaging { get; }
29 25
30 public void Layout(ILayoutContext context) 26 public void Layout(ILayoutContext context)
@@ -44,7 +40,7 @@ namespace WixToolset.Core
44 { 40 {
45 this.Messaging.Write(VerboseMessages.LayingOutMedia()); 41 this.Messaging.Write(VerboseMessages.LayingOutMedia());
46 42
47 var command = new TransferFilesCommand(this.Messaging, context.Extensions, context.FileTransfers, context.SuppressAclReset); 43 var command = new TransferFilesCommand(this.Messaging, context.Extensions, context.FileTransfers, context.ResetAcls);
48 command.Execute(); 44 command.Execute();
49 } 45 }
50 46