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

Implements 6858

3 files changed, 4 insertions, 40 deletions

diff --git a/src/test/burn/TestData/VariableTests/BundleB/Bundle.wxs b/src/test/burn/TestData/VariableTests/BundleB/Bundle.wxs
deleted file mode 100644
index fb293d9b..00000000
--- a/src/test/burn/TestData/VariableTests/BundleB/Bundle.wxs
+++ /dev/null
@@ -1,40 +0,0 @@
-<!-- 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. -->
-
-<?ifndef Version?>
-<?define Version = 1.0.0.0?>
-<?endif?>
-
-<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">
-    <Log Prefix="~$(var.TestGroupName)_$(var.BundleName)" />
-
-    <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
-
-    <?ifdef SoftwareTag?>
-    <SoftwareTag Regid="regid.1995-08.com.example" InstallPath="[CommonAppDataFolder]regid.1995-08.com.example" />
-    <?endif?>
-
-    <?ifndef BA?>
-      <!-- pulled in through the PackageGroupRef below -->
-    <?elseif $(var.BA) = "TestBAdnc"?>
-      <!-- pulled in through the PackageGroupRef below -->
-    <?elseif $(var.BA) = "hyperlinkLicense"?>
-      <BootstrapperApplication>
-        <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" />
-      </BootstrapperApplication>
-    <?else?>
-      <BootstrapperApplicationRef Id="$(var.BA)" />
-    <?endif?>
-
-    <Chain>
-      <?ifndef BA?>
-        <PackageGroupRef Id="TestBA" />
-      <?elseif $(var.BA) = "TestBAdnc"?>
-        <PackageGroupRef Id="TestBAdnc" />
-      <?endif?>
-
-      <PackageGroupRef Id="BundlePackages" />
-    </Chain>
-  </Bundle>
-</Wix>
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>