From a1307cd4e76a89598c53cb68309358a7012db553 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Fri, 9 Sep 2022 16:03:29 -0500
Subject: Move `Bundle/@CommandLineVariables` into Bal.wixext.

Implements 6858
---
 .../burn/TestData/VariableTests/BundleA/Bundle.wxs | 40 ++++++++++++++++++++++
 .../TestData/VariableTests/BundleA/BundleA.wixproj |  3 --
 2 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 src/test/burn/TestData/VariableTests/BundleA/Bundle.wxs

(limited to 'src/test/burn/TestData/VariableTests/BundleA')

diff --git a/src/test/burn/TestData/VariableTests/BundleA/Bundle.wxs b/src/test/burn/TestData/VariableTests/BundleA/Bundle.wxs
new file mode 100644
index 00000000..4a8cb43e
--- /dev/null
+++ b/src/test/burn/TestData/VariableTests/BundleA/Bundle.wxs
@@ -0,0 +1,40 @@
+<!-- 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" bal:CommandLineVariables="caseInsensitive">
+    <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/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
@@ -5,9 +5,6 @@
     <BA>hyperlinkLicense</BA>
     <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>
-- 
cgit v1.2.3-55-g6feb