6 files changed, 13 insertions, 8 deletions

diff --git a/src/test/burn/TestData/VariableTests/BundleB/Bundle.wxs b/src/test/burn/TestData/VariableTests/BundleA/Bundle.wxs
index fb293d9b..4a8cb43e 100644
--- a/src/test/burn/TestData/VariableTests/BundleB/Bundle.wxs
+++ b/src/test/burn/TestData/VariableTests/BundleA/Bundle.wxs
@@ -6,7 +6,7 @@
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
   <!-- CommandLineVariables should be the only thing different from the template -->
-  <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" CommandLineVariables="caseSensitive">
+  <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" bal:CommandLineVariables="caseInsensitive">
     <Log Prefix="~$(var.TestGroupName)_$(var.BundleName)" />
 
     <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
diff --git a/src/test/burn/TestData/VariableTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/VariableTests/BundleA/BundleA.wixproj
index 91049cee..b318e40a 100644
--- a/src/test/burn/TestData/VariableTests/BundleA/BundleA.wixproj
+++ b/src/test/burn/TestData/VariableTests/BundleA/BundleA.wixproj
@@ -6,9 +6,6 @@
     <UpgradeCode>{DDB62589-C5AD-4E92-A697-EAD7D7C37C8D}</UpgradeCode>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
-  </ItemGroup>
-  <ItemGroup>
     <ProjectReference Include="..\PackageA\PackageA.wixproj" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/test/burn/TestData/VariableTests/BundleB/BundleB.wixproj b/src/test/burn/TestData/VariableTests/BundleB/BundleB.wixproj
index fa11100b..866891a5 100644
--- a/src/test/burn/TestData/VariableTests/BundleB/BundleB.wixproj
+++ b/src/test/burn/TestData/VariableTests/BundleB/BundleB.wixproj
@@ -6,6 +6,9 @@
     <UpgradeCode>{B735B6D2-9D4D-4E98-B464-946F7F62AFC8}</UpgradeCode>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+  </ItemGroup>
+  <ItemGroup>
     <ProjectReference Include="..\PackageA\PackageA.wixproj" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/test/burn/TestData/VariableTests/BundleB/BundleB.wxs b/src/test/burn/TestData/VariableTests/BundleB/BundleB.wxs
index f243c97d..4ab7e46f 100644
--- a/src/test/burn/TestData/VariableTests/BundleB/BundleB.wxs
+++ b/src/test/burn/TestData/VariableTests/BundleB/BundleB.wxs
@@ -13,5 +13,6 @@
 
     <Variable Name="INSTALLLOCATION" bal:Overridable="yes" />
     <Variable Name="LICENSEKEY" Hidden="yes" bal:Overridable="yes" />
+    <Variable Name="licensekey" Hidden="no" bal:Overridable="yes" />
   </Fragment>
 </Wix>
diff --git a/src/test/burn/TestData/WixStdBaTests/BundleA/Bundle.wxs b/src/test/burn/TestData/WixStdBaTests/BundleA/Bundle.wxs
index e4c10d5a..99320b35 100644
--- a/src/test/burn/TestData/WixStdBaTests/BundleA/Bundle.wxs
+++ b/src/test/burn/TestData/WixStdBaTests/BundleA/Bundle.wxs
@@ -1,7 +1,7 @@
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
-  <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" CommandLineVariables="caseSensitive">
+  <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" bal:CommandLineVariables="caseSensitive">
     <Log Prefix="~$(var.TestGroupName)_$(var.BundleName)" />
 
     <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/VariableTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/VariableTests.cs
index 16a5d648..e7b1362f 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/VariableTests.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/VariableTests.cs
@@ -22,12 +22,14 @@ namespace WixToolsetTest.BurnE2E
 
             packageA.VerifyInstalled(false);
 
-            var logFilePath = bundleA.Install(0, "INSTALLLOCATION=nothingtoseehere", "licensekey=supersecretkey");
+            var logFilePath = bundleA.Install(0, "InstallLocation=nothingtoseehere", "licensekey=supersecretkey");
             bundleA.VerifyRegisteredAndInPackageCache();
 
             packageA.VerifyInstalled(true);
 
-            Assert.True(LogVerifier.MessageInLogFile(logFilePath, "INSTALLLOCATION=nothingtoseehere LICENSEKEY=*****"));
+            // Burn logging its command line.
+            Assert.True(LogVerifier.MessageInLogFile(logFilePath, "InstallLocation=nothingtoseehere licensekey=*****"));
+            // Burn logging the MSI install command line.
             Assert.True(LogVerifier.MessageInLogFile(logFilePath, "INSTALLLOCATION=\"nothingtoseehere\" LICENSEKEY=\"*****\""));
             Assert.False(LogVerifier.MessageInLogFile(logFilePath, "supersecretkey"));
         }
@@ -45,7 +47,9 @@ namespace WixToolsetTest.BurnE2E
 
             packageA.VerifyInstalled(true);
 
-            Assert.True(LogVerifier.MessageInLogFile(logFilePath, "InstallLocation=nothingtoseehere licensekey=supersecretkey"));
+            // Burn logging its command line.
+            Assert.True(LogVerifier.MessageInLogFile(logFilePath, "InstallLocation=nothingtoseehere licensekey=*****"));
+            // Burn logging the MSI install command line.
             Assert.True(LogVerifier.MessageInLogFile(logFilePath, "INSTALLLOCATION=\"\" LICENSEKEY=\"*****\""));
         }
     }