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

Implements 6858

1 files changed, 35 insertions, 5 deletions

diff --git a/src/ext/Bal/wixext/BalBurnBackendExtension.cs b/src/ext/Bal/wixext/BalBurnBackendExtension.cs
index 6f615796..a27ff739 100644
--- a/src/ext/Bal/wixext/BalBurnBackendExtension.cs
+++ b/src/ext/Bal/wixext/BalBurnBackendExtension.cs
@@ -24,6 +24,7 @@ namespace WixToolset.Bal
             BalSymbolDefinitions.WixBalPackageInfo,
             BalSymbolDefinitions.WixDncOptions,
             BalSymbolDefinitions.WixMbaPrereqInformation,
+            BalSymbolDefinitions.WixStdbaCommandLine,
             BalSymbolDefinitions.WixStdbaOptions,
             BalSymbolDefinitions.WixStdbaOverridableVariable,
             BalSymbolDefinitions.WixMbaPrereqOptions,
@@ -61,6 +62,30 @@ namespace WixToolset.Bal
 
                 return true;
             }
+            else if (symbol is WixStdbaCommandLineSymbol stdbaCommandLineSymbol)
+            {
+                var sb = new StringBuilder();
+                using (var writer = XmlWriter.Create(sb))
+                {
+                    writer.WriteStartElement(symbol.Definition.Name, BurnConstants.BootstrapperApplicationDataNamespace);
+
+                    switch (stdbaCommandLineSymbol.VariableType)
+                    {
+                        case WixStdbaCommandLineVariableType.CaseInsensitive:
+                            writer.WriteAttributeString("VariableType", "caseInsensitive");
+                            break;
+                        default:
+                            writer.WriteAttributeString("VariableType", "caseSensitive");
+                            break;
+                    }
+
+                    writer.WriteEndElement();
+                }
+
+                this.BackendHelper.AddBootstrapperApplicationData(sb.ToString());
+
+                return true;
+            }
             else
             {
                 return base.TryProcessSymbol(section, symbol);
@@ -418,19 +443,24 @@ namespace WixToolset.Bal
 
         private void VerifyOverridableVariables(IntermediateSection section)
         {
-            var bundleSymbol = section.Symbols.OfType<WixBundleSymbol>().Single();
-            if (bundleSymbol.CommandLineVariables != WixBundleCommandLineVariables.UpperCase)
+            var commandLineSymbol = section.Symbols.OfType<WixStdbaCommandLineSymbol>().SingleOrDefault();
+            if (commandLineSymbol?.VariableType != WixStdbaCommandLineVariableType.CaseInsensitive)
             {
                 return;
             }
 
             var overridableVariableSymbols = section.Symbols.OfType<WixStdbaOverridableVariableSymbol>().ToList();
+            var overridableVariables = new Dictionary<string, WixStdbaOverridableVariableSymbol>(StringComparer.InvariantCultureIgnoreCase);
             foreach (var overridableVariableSymbol in overridableVariableSymbols)
             {
-                var upperName = overridableVariableSymbol.Name.ToUpperInvariant();
-                if (upperName != overridableVariableSymbol.Name)
+                if (!overridableVariables.TryGetValue(overridableVariableSymbol.Name, out var collisionVariableSymbol))
+                {
+                    overridableVariables.Add(overridableVariableSymbol.Name, overridableVariableSymbol);
+                }
+                else
                 {
-                    this.Messaging.Write(BalErrors.NonUpperCaseOverridableVariable(overridableVariableSymbol.SourceLineNumbers, overridableVariableSymbol.Name, upperName));
+                    this.Messaging.Write(BalErrors.OverridableVariableCollision(overridableVariableSymbol.SourceLineNumbers, overridableVariableSymbol.Name, collisionVariableSymbol.Name));
+                    this.Messaging.Write(BalErrors.OverridableVariableCollision2(collisionVariableSymbol.SourceLineNumbers));
                 }
             }
         }