Move `Bundle/@CommandLineVariables` into Bal.wixext.

Implements 6858

3 files changed, 33 insertions, 26 deletions

diff --git a/src/api/burn/WixToolset.Mba.Core/IOverridableVariables.cs b/src/api/burn/WixToolset.Mba.Core/IOverridableVariables.cs
index 1ffe50e4..2b26d7b6 100644
--- a/src/api/burn/WixToolset.Mba.Core/IOverridableVariables.cs
+++ b/src/api/burn/WixToolset.Mba.Core/IOverridableVariables.cs
@@ -10,13 +10,13 @@ namespace WixToolset.Mba.Core
     public enum VariableCommandLineType
     {
         /// <summary>
-        /// Similar to Windows Installer, all variable names specified on the command line are automatically converted to upper case.
-        /// </summary>
-        UpperCase,
-        /// <summary>
         /// All variable names specified on the command line must match the case specified when building the bundle.
         /// </summary>
         CaseSensitive,
+        /// <summary>
+        /// Variable names specified on the command line do not have to match the case specified when building the bundle.
+        /// </summary>
+        CaseInsensitive,
     }
 
     /// <summary>
@@ -34,4 +34,4 @@ namespace WixToolset.Mba.Core
         /// </summary>
         IDictionary<string, IOverridableVariableInfo> Variables { get; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/api/burn/WixToolset.Mba.Core/MbaCommand.cs b/src/api/burn/WixToolset.Mba.Core/MbaCommand.cs
index 8917a334..bd93b7e7 100644
--- a/src/api/burn/WixToolset.Mba.Core/MbaCommand.cs
+++ b/src/api/burn/WixToolset.Mba.Core/MbaCommand.cs
@@ -2,6 +2,7 @@
 
 namespace WixToolset.Mba.Core
 {
+    using System;
     using System.Collections.Generic;
 
     /// <summary>
@@ -21,11 +22,11 @@ namespace WixToolset.Mba.Core
         {
             foreach (var kvp in this.Variables)
             {
-                var key = overridableVariables.CommandLineType == VariableCommandLineType.UpperCase ? kvp.Key.ToUpperInvariant() : kvp.Key;
+                var key = kvp.Key;
 
                 if (!overridableVariables.Variables.TryGetValue(key, out var overridableVariable))
                 {
-                    engine.Log(LogLevel.Error, string.Format("Ignoring attempt to set non-overridable variable: '{0}'.", key));
+                    engine.Log(LogLevel.Error, String.Format("Ignoring attempt to set non-overridable variable: '{0}'.", key));
                 }
                 else
                 {
diff --git a/src/api/burn/WixToolset.Mba.Core/OverridableVariables.cs b/src/api/burn/WixToolset.Mba.Core/OverridableVariables.cs
index 148acb34..121c6aee 100644
--- a/src/api/burn/WixToolset.Mba.Core/OverridableVariables.cs
+++ b/src/api/burn/WixToolset.Mba.Core/OverridableVariables.cs
@@ -29,37 +29,43 @@ namespace WixToolset.Mba.Core
         {
             XmlNamespaceManager namespaceManager = new XmlNamespaceManager(root.NameTable);
             namespaceManager.AddNamespace("p", BootstrapperApplicationData.XMLNamespace);
-            XPathNavigator commandLineNode = root.SelectSingleNode("/p:BootstrapperApplicationData/p:CommandLine", namespaceManager);
+            XPathNavigator commandLineNode = root.SelectSingleNode("/p:BootstrapperApplicationData/p:WixStdbaCommandLine", namespaceManager);
             XPathNodeIterator nodes = root.Select("/p:BootstrapperApplicationData/p:WixStdbaOverridableVariable", namespaceManager);
 
             var overridableVariables = new OverridableVariablesInfo();
+            IEqualityComparer<string> variableNameComparer;
 
             if (commandLineNode == null)
             {
-                throw new Exception("Failed to select command line information.");
-            }
-
-            string variablesValue = BootstrapperApplicationData.GetAttribute(commandLineNode, "Variables");
-
-            if (variablesValue == null)
-            {
-                throw new Exception("Failed to get command line variable type.");
-            }
-
-            if (variablesValue.Equals("upperCase", StringComparison.InvariantCulture))
-            {
-                overridableVariables.CommandLineType = VariableCommandLineType.UpperCase;
-            }
-            else if (variablesValue.Equals("caseSensitive", StringComparison.InvariantCulture))
-            {
                 overridableVariables.CommandLineType = VariableCommandLineType.CaseSensitive;
+                variableNameComparer = StringComparer.InvariantCulture;
             }
             else
             {
-                throw new Exception(string.Format("Unknown command line variable type: '{0}'", variablesValue));
+                string variablesValue = BootstrapperApplicationData.GetAttribute(commandLineNode, "Variables");
+
+                if (variablesValue == null)
+                {
+                    throw new Exception("Failed to get command line variable type.");
+                }
+
+                if (variablesValue.Equals("caseInsensitive", StringComparison.InvariantCulture))
+                {
+                    overridableVariables.CommandLineType = VariableCommandLineType.CaseInsensitive;
+                    variableNameComparer = StringComparer.InvariantCultureIgnoreCase;
+                }
+                else if (variablesValue.Equals("caseSensitive", StringComparison.InvariantCulture))
+                {
+                    overridableVariables.CommandLineType = VariableCommandLineType.CaseSensitive;
+                    variableNameComparer = StringComparer.InvariantCulture;
+                }
+                else
+                {
+                    throw new Exception(String.Format("Unknown command line variable type: '{0}'", variablesValue));
+                }
             }
 
-            overridableVariables.Variables = new Dictionary<string, IOverridableVariableInfo>();
+            overridableVariables.Variables = new Dictionary<string, IOverridableVariableInfo>(variableNameComparer);
 
             foreach (XPathNavigator node in nodes)
             {