From 2accc355d9dadb2688cf226f8736232d583281aa Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Fri, 8 Jan 2021 15:33:32 -0800
Subject: Rename ExePackage/@XxxCommand attributes to @XxxArguments

Fixes wixtoolset/issues#6245
---
 src/WixToolset.Converters/WixConverter.cs | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

(limited to 'src/WixToolset.Converters')

diff --git a/src/WixToolset.Converters/WixConverter.cs b/src/WixToolset.Converters/WixConverter.cs
index d0c40050..a7f08b88 100644
--- a/src/WixToolset.Converters/WixConverter.cs
+++ b/src/WixToolset.Converters/WixConverter.cs
@@ -161,7 +161,7 @@ namespace WixToolset.Converters
                 { WixConverter.FirewallRemoteAddressElementName, this.ConvertFirewallRemoteAddressElement },
                 { WixConverter.EmbeddedChainerElementName, this.ConvertEmbeddedChainerElement },
                 { WixConverter.ErrorElementName, this.ConvertErrorElement },
-                { WixConverter.ExePackageElementName, this.ConvertSuppressSignatureValidation },
+                { WixConverter.ExePackageElementName, this.ConvertExePackageElement },
                 { WixConverter.ModuleElementName, this.ConvertModuleElement },
                 { WixConverter.MsiPackageElementName, this.ConvertWindowsInstallerPackageElement },
                 { WixConverter.MspPackageElementName, this.ConvertWindowsInstallerPackageElement },
@@ -843,6 +843,24 @@ namespace WixToolset.Converters
 
         private void ConvertErrorElement(XElement element) => this.ConvertInnerTextToAttribute(element, "Message");
 
+        private void ConvertExePackageElement(XElement element)
+        {
+            this.ConvertSuppressSignatureValidation(element);
+
+            foreach (var attributeName in new[] { "InstallCommand", "RepairCommand", "UninstallCommand" })
+            {
+                var newName = attributeName.Replace("Command", "Arguments");
+                var attribute = element.Attribute(attributeName);
+
+                if (attribute != null &&
+                    this.OnError(ConverterTestType.RenameExePackageCommandToArguments, element, "The {0} element {1} attribute has been renamed {2}.", element.Name.LocalName, attribute.Name.LocalName, newName))
+                {
+                    element.Add(new XAttribute(newName, attribute.Value));
+                    attribute.Remove();
+                }
+            }
+        }
+
         private void ConvertPermissionExElement(XElement element)
         {
             var xCondition = element.Element(ConditionElementName);
@@ -1691,6 +1709,11 @@ namespace WixToolset.Converters
             /// The custom elements for built-in BAs are now required.
             /// </summary>
             BalBootstrapperApplicationRefToElement,
+
+            /// <summary>
+            /// The ExePackage elements "XxxCommand" attributes have been renamed to "XxxArguments".
+            /// </summary>
+            RenameExePackageCommandToArguments,
         }
     }
 }
-- 
cgit v1.2.3-55-g6feb