1 files changed, 21 insertions, 0 deletions

diff --git a/src/ext/Bal/wixext/BalBurnBackendExtension.cs b/src/ext/Bal/wixext/BalBurnBackendExtension.cs
index c6a1e0c1..854b8b35 100644
--- a/src/ext/Bal/wixext/BalBurnBackendExtension.cs
+++ b/src/ext/Bal/wixext/BalBurnBackendExtension.cs
@@ -31,6 +31,8 @@ namespace WixToolset.Bal
         {
             base.SymbolsFinalized(section);
 
+            this.VerifyOverridableVariables(section);
+
             var baSymbol = section.Symbols.OfType<WixBootstrapperApplicationDllSymbol>().SingleOrDefault();
             var baId = baSymbol?.Id?.Id;
             if (null == baId)
@@ -118,6 +120,25 @@ namespace WixToolset.Bal
             }
         }
 
+        private void VerifyOverridableVariables(IntermediateSection section)
+        {
+            var bundleSymbol = section.Symbols.OfType<WixBundleSymbol>().Single();
+            if (bundleSymbol.CommandLineVariables != WixBundleCommandLineVariables.UpperCase)
+            {
+                return;
+            }
+
+            var overridableVariableSymbols = section.Symbols.OfType<WixStdbaOverridableVariableSymbol>().ToList();
+            foreach (var overridableVariableSymbol in overridableVariableSymbols)
+            {
+                var upperName = overridableVariableSymbol.Name.ToUpperInvariant();
+                if (upperName != overridableVariableSymbol.Name)
+                {
+                    this.Messaging.Write(BalErrors.NonUpperCaseOverridableVariable(overridableVariableSymbol.SourceLineNumbers, overridableVariableSymbol.Name, upperName));
+                }
+            }
+        }
+
         private void VerifyPrereqPackages(IntermediateSection section, bool isDNC)
         {
             var prereqInfoSymbols = section.Symbols.OfType<WixMbaPrereqInformationSymbol>().ToList();