From fb2e8cb8a28a2a1a84909a8793a57d0d575da610 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Tue, 16 Mar 2021 16:12:50 -0700
Subject: Make ResetAcl opt-in instead of opt-out

---
 src/WixToolset.Core/CommandLine/BuildCommand.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/WixToolset.Core/CommandLine')

diff --git a/src/WixToolset.Core/CommandLine/BuildCommand.cs b/src/WixToolset.Core/CommandLine/BuildCommand.cs
index eda93f31..9efef830 100644
--- a/src/WixToolset.Core/CommandLine/BuildCommand.cs
+++ b/src/WixToolset.Core/CommandLine/BuildCommand.cs
@@ -372,7 +372,7 @@ namespace WixToolset.Core.CommandLine
                     context.ContentsFile = this.ContentsFile;
                     context.OutputsFile = this.OutputsFile;
                     context.BuiltOutputsFile = this.BuiltOutputsFile;
-                    context.SuppressAclReset = false; // TODO: correctly set SuppressAclReset
+                    context.ResetAcls = this.commandLine.ResetAcls;
                     context.CancellationToken = cancellationToken;
 
                     var layout = this.ServiceProvider.GetService<ILayoutCreator>();
@@ -547,6 +547,8 @@ namespace WixToolset.Core.CommandLine
 
             public bool SuppressValidation { get; set; }
 
+            public bool ResetAcls { get; set; }
+
             public CommandLine(IServiceProvider serviceProvider, IMessaging messaging)
             {
                 this.ServiceProvider = serviceProvider;
@@ -702,6 +704,10 @@ namespace WixToolset.Core.CommandLine
                         case "sval":
                             this.SuppressValidation = true;
                             return true;
+
+                        case "resetacls":
+                            this.ResetAcls = true;
+                            return true;
                     }
 
                     if (parameter.StartsWith("sw"))
-- 
cgit v1.2.3-55-g6feb