From 02d4ef4774fa43cc9524fac93c888981e5d47478 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Fri, 1 Jan 2021 23:12:28 -0600
Subject: Create template for bundle.

---
 .../BundleA/BundleA.wixproj                        |  5 ++++
 .../BasicFunctionalityTests/BundleA/BundleA.wxi    | 21 -------------
 .../BasicFunctionalityTests/BundleA/BundleA.wxs    |  1 -
 .../MsiTransactionTests/BundleAv1/BundleA.props    | 15 ++++++++++
 .../MsiTransactionTests/BundleAv1/BundleA.wxi      | 21 -------------
 .../BundleAv1/BundleAv1.wixproj                    |  8 +----
 .../MsiTransactionTests/BundleAv1/BundleAv1.wxs    |  1 -
 .../BundleAv2/BundleAv2.wixproj                    |  6 +---
 .../MsiTransactionTests/BundleAv2/BundleAv2.wxs    |  1 -
 .../MsiTransactionTests/BundleBv1/BundleB.props    | 17 +++++++++++
 .../MsiTransactionTests/BundleBv1/BundleB.wxi      | 17 -----------
 .../BundleBv1/BundleBv1.wixproj                    |  9 +-----
 .../MsiTransactionTests/BundleBv1/BundleBv1.wxs    |  2 --
 .../BundleBv2/BundleBv2.wixproj                    |  8 ++---
 .../MsiTransactionTests/BundleBv2/BundleBv2.wxs    |  2 --
 src/TestData/PrereqBaTests/BundleA/BundleA.wixproj |  5 ++++
 src/TestData/PrereqBaTests/BundleA/BundleA.wxi     | 17 -----------
 src/TestData/PrereqBaTests/BundleA/BundleA.wxs     |  5 ++--
 src/TestData/PrereqBaTests/BundleB/BundleB.wixproj |  5 ++++
 src/TestData/PrereqBaTests/BundleB/BundleB.wxi     | 17 -----------
 src/TestData/PrereqBaTests/BundleB/BundleB.wxs     |  5 ++--
 .../RollbackBoundaryTests/BundleA/BundleA.wixproj  |  5 ++++
 .../RollbackBoundaryTests/BundleA/BundleA.wxi      | 21 -------------
 .../RollbackBoundaryTests/BundleA/BundleA.wxs      |  1 -
 src/TestData/Templates/Bundle.wxs                  | 35 ++++++++++++++++++++++
 src/Wix.Build.targets                              |  4 ++-
 26 files changed, 101 insertions(+), 153 deletions(-)
 delete mode 100644 src/TestData/BasicFunctionalityTests/BundleA/BundleA.wxi
 create mode 100644 src/TestData/MsiTransactionTests/BundleAv1/BundleA.props
 delete mode 100644 src/TestData/MsiTransactionTests/BundleAv1/BundleA.wxi
 create mode 100644 src/TestData/MsiTransactionTests/BundleBv1/BundleB.props
 delete mode 100644 src/TestData/MsiTransactionTests/BundleBv1/BundleB.wxi
 delete mode 100644 src/TestData/PrereqBaTests/BundleA/BundleA.wxi
 delete mode 100644 src/TestData/PrereqBaTests/BundleB/BundleB.wxi
 delete mode 100644 src/TestData/RollbackBoundaryTests/BundleA/BundleA.wxi
 create mode 100644 src/TestData/Templates/Bundle.wxs

diff --git a/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wixproj b/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wixproj
index 45127b23..3eac53a1 100644
--- a/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wixproj
+++ b/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wixproj
@@ -2,7 +2,12 @@
 <Project Sdk="WixToolset.Sdk">
   <PropertyGroup>
     <OutputType>Bundle</OutputType>
+    <BA>hyperlinkLicense</BA>
+    <UpgradeCode>{8C7E2C47-1EE7-4BBE-99A2-EAB7F3693F48}</UpgradeCode>
   </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PackageA\PackageA.wixproj" />
   </ItemGroup>
diff --git a/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wxi b/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wxi
deleted file mode 100644
index 0bad694e..00000000
--- a/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wxi
+++ /dev/null
@@ -1,21 +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?>
-
-<Include xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
-  <Bundle Name="~$(var.TestGroupName) - Bundle A" Version="$(var.Version)" UpgradeCode="{8C7E2C47-1EE7-4BBE-99A2-EAB7F3693F48}" Compressed="yes">
-    <Log Prefix="~$(var.TestGroupName)_BundleA" />
-
-    <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
-
-    <BootstrapperApplication>
-        <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" />
-    </BootstrapperApplication>
-
-    <Chain>
-      <PackageGroupRef Id="BundlePackages" />
-    </Chain>
-  </Bundle>
-</Include>
diff --git a/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wxs b/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wxs
index 0506f05a..bd164a29 100644
--- a/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wxs
+++ b/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wxs
@@ -2,7 +2,6 @@
 
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <?include BundleA.wxi ?>
   <Fragment>
     <PackageGroup Id="BundlePackages">
       <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" />
diff --git a/src/TestData/MsiTransactionTests/BundleAv1/BundleA.props b/src/TestData/MsiTransactionTests/BundleAv1/BundleA.props
new file mode 100644
index 00000000..ba3eb3e5
--- /dev/null
+++ b/src/TestData/MsiTransactionTests/BundleAv1/BundleA.props
@@ -0,0 +1,15 @@
+<!-- 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. -->
+<Project>
+  <PropertyGroup>
+    <OutputType>Bundle</OutputType>
+    <SuppressSpecificWarnings>1151</SuppressSpecificWarnings>
+    <BA>hyperlinkLicense</BA>
+    <UpgradeCode>{90ED10D5-B187-4470-B498-05D80DAB729A}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.77" />
+  </ItemGroup>
+</Project>
diff --git a/src/TestData/MsiTransactionTests/BundleAv1/BundleA.wxi b/src/TestData/MsiTransactionTests/BundleAv1/BundleA.wxi
deleted file mode 100644
index ef01c2e9..00000000
--- a/src/TestData/MsiTransactionTests/BundleAv1/BundleA.wxi
+++ /dev/null
@@ -1,21 +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?>
-
-<Include xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
-  <Bundle Name="~$(var.TestGroupName) - Bundle A" Version="$(var.Version)" UpgradeCode="{90ED10D5-B187-4470-B498-05D80DAB729A}" Compressed="yes">
-    <Log Prefix="~$(var.TestGroupName)_BundleA" />
-
-    <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
-
-    <BootstrapperApplication>
-        <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" Theme="hyperlinkLicense" />
-    </BootstrapperApplication>
-
-    <Chain>
-      <PackageGroupRef Id="BundlePackages" />
-    </Chain>
-  </Bundle>
-</Include>
diff --git a/src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj b/src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj
index 4e92a102..607c4ce6 100644
--- a/src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj
+++ b/src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj
@@ -1,15 +1,9 @@
 <!-- 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. -->
 <Project Sdk="WixToolset.Sdk">
-  <PropertyGroup>
-    <OutputType>Bundle</OutputType>
-    <SuppressSpecificWarnings>1151</SuppressSpecificWarnings>
-  </PropertyGroup>
+  <Import Project="BundleA.props" />
   <ItemGroup>
     <ProjectReference Include="..\PackageA\PackageA.wixproj" />
     <ProjectReference Include="..\PackageBv1\PackageBv1.wixproj" />
     <ProjectReference Include="..\PackageCv1\PackageCv1.wixproj" />
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.77" />
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wxs b/src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wxs
index f8355aa6..544fe6a6 100644
--- a/src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wxs
+++ b/src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wxs
@@ -2,7 +2,6 @@
 
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <?include BundleA.wxi ?>
   <Fragment>
     <PackageGroup Id="BundlePackages">
       <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" />
diff --git a/src/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj b/src/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj
index 7d1a42c5..9600f6ba 100644
--- a/src/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj
+++ b/src/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj
@@ -1,8 +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. -->
 <Project Sdk="WixToolset.Sdk">
+  <Import Project="..\BundleAv1\BundleA.props" />
   <PropertyGroup>
-    <OutputType>Bundle</OutputType>
-    <SuppressSpecificWarnings>1151</SuppressSpecificWarnings>
     <Version>2.0.0.0</Version>
   </PropertyGroup>
   <ItemGroup>
@@ -10,7 +9,4 @@
     <ProjectReference Include="..\PackageCv2\PackageCv2.wixproj" />
     <ProjectReference Include="..\PackageD\PackageD.wixproj" />
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.77" />
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wxs b/src/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wxs
index 11360c22..8623537b 100644
--- a/src/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wxs
+++ b/src/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wxs
@@ -2,7 +2,6 @@
 
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <?include ..\BundleAv1\BundleA.wxi ?>
   <Fragment>
     <PackageGroup Id="BundlePackages">
       <MsiPackage Id="PackageD" SourceFile="$(var.PackageD.TargetPath)" />
diff --git a/src/TestData/MsiTransactionTests/BundleBv1/BundleB.props b/src/TestData/MsiTransactionTests/BundleBv1/BundleB.props
new file mode 100644
index 00000000..23bd0ad3
--- /dev/null
+++ b/src/TestData/MsiTransactionTests/BundleBv1/BundleB.props
@@ -0,0 +1,17 @@
+<!-- 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. -->
+<Project>
+  <PropertyGroup>
+    <OutputType>Bundle</OutputType>
+    <UpgradeCode>{552FD011-4DD6-42B2-A4C6-AD1417C829B2}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.77" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.56" />
+  </ItemGroup>
+</Project>
diff --git a/src/TestData/MsiTransactionTests/BundleBv1/BundleB.wxi b/src/TestData/MsiTransactionTests/BundleBv1/BundleB.wxi
deleted file mode 100644
index 943b8b48..00000000
--- a/src/TestData/MsiTransactionTests/BundleBv1/BundleB.wxi
+++ /dev/null
@@ -1,17 +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?>
-
-<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Bundle Name="~$(var.TestGroupName) - Bundle B" Version="$(var.Version)" UpgradeCode="{552FD011-4DD6-42B2-A4C6-AD1417C829B2}" Compressed="yes">
-    <Log Prefix="~$(var.TestGroupName)_BundleB" />
-
-    <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
-
-    <Chain>
-      <PackageGroupRef Id="BundlePackages" />
-    </Chain>
-  </Bundle>
-</Include>
diff --git a/src/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wixproj b/src/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wixproj
index 3cf361d2..508e25ee 100644
--- a/src/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wixproj
+++ b/src/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wixproj
@@ -1,14 +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. -->
 <Project Sdk="WixToolset.Sdk">
-  <PropertyGroup>
-    <OutputType>Bundle</OutputType>
-  </PropertyGroup>
+  <Import Project="BundleB.props" />
   <ItemGroup>
-    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
     <ProjectReference Include="..\PackageBv1\PackageBv1.wixproj" />
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.77" />
-    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.56" />
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wxs b/src/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wxs
index 1a24f53e..00d927ec 100644
--- a/src/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wxs
+++ b/src/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wxs
@@ -2,10 +2,8 @@
 
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <?include BundleB.wxi ?>
   <Fragment>
     <PackageGroup Id="BundlePackages">
-      <PackageGroupRef Id="TestBA" />
       <MsiPackage Id="PackageB" SourceFile="$(var.PackageBv1.TargetPath)" />
     </PackageGroup>
   </Fragment>
diff --git a/src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj b/src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj
index 7162dea2..b84052d5 100644
--- a/src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj
+++ b/src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj
@@ -1,18 +1,14 @@
 <!-- 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. -->
 <Project Sdk="WixToolset.Sdk">
+  <Import Project="..\BundleBv1\BundleB.props" />
   <PropertyGroup>
-    <OutputType>Bundle</OutputType>
     <SuppressSpecificWarnings>1151</SuppressSpecificWarnings>
+    <BA>TestBAdnc</BA>
     <Version>2.0.0.0</Version>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
     <ProjectReference Include="..\PackageA\PackageA.wixproj" />
     <ProjectReference Include="..\PackageBv2\PackageBv2.wixproj" />
     <ProjectReference Include="..\PackageF\PackageF.wixproj" />
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.77" />
-    <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.56" />
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wxs b/src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wxs
index 33665860..d1861e75 100644
--- a/src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wxs
+++ b/src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wxs
@@ -2,10 +2,8 @@
 
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <?include ..\BundleBv1\BundleB.wxi ?>
   <Fragment>
     <PackageGroup Id="BundlePackages">
-      <PackageGroupRef Id="TestBAdnc" />
       <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" />
       <RollbackBoundary Transaction="yes" />
       <MsiPackage Id="PackageB" SourceFile="$(var.PackageBv2.TargetPath)" />
diff --git a/src/TestData/PrereqBaTests/BundleA/BundleA.wixproj b/src/TestData/PrereqBaTests/BundleA/BundleA.wixproj
index 56f4b11e..b608bb8c 100644
--- a/src/TestData/PrereqBaTests/BundleA/BundleA.wixproj
+++ b/src/TestData/PrereqBaTests/BundleA/BundleA.wixproj
@@ -2,7 +2,12 @@
 <Project Sdk="WixToolset.Sdk">
   <PropertyGroup>
     <OutputType>Bundle</OutputType>
+    <BA>BrokenDnc</BA>
+    <UpgradeCode>{A4456636-916A-43A0-87BF-A897C2717A00}</UpgradeCode>
   </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+  </ItemGroup>
   <ItemGroup>
     <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net5.0-windows\win-x86" BindName="dnc5x86" />
   </ItemGroup>
diff --git a/src/TestData/PrereqBaTests/BundleA/BundleA.wxi b/src/TestData/PrereqBaTests/BundleA/BundleA.wxi
deleted file mode 100644
index 23623ffb..00000000
--- a/src/TestData/PrereqBaTests/BundleA/BundleA.wxi
+++ /dev/null
@@ -1,17 +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?>
-
-<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Bundle Name="~$(var.TestGroupName) - Bundle A" Version="$(var.Version)" UpgradeCode="{A4456636-916A-43A0-87BF-A897C2717A00}" Compressed="yes">
-    <Log Prefix="~$(var.TestGroupName)_BundleA" />
-
-    <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
-
-    <Chain>
-      <PackageGroupRef Id="BundlePackages" />
-    </Chain>
-  </Bundle>
-</Include>
diff --git a/src/TestData/PrereqBaTests/BundleA/BundleA.wxs b/src/TestData/PrereqBaTests/BundleA/BundleA.wxs
index 53139834..0c9e8d21 100644
--- a/src/TestData/PrereqBaTests/BundleA/BundleA.wxs
+++ b/src/TestData/PrereqBaTests/BundleA/BundleA.wxs
@@ -2,9 +2,8 @@
 
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
-  <?include BundleA.wxi ?>
   <Fragment>
-    <BootstrapperApplication>
+    <BootstrapperApplication Id="BrokenDnc">
       <Payload SourceFile="!(bindpath.dnc5x86)\TestBA.deps.json" />
       <Payload SourceFile="!(bindpath.dnc5x86)\TestBA.dll" bal:BAFactoryAssembly="yes" />
       <Payload Name="TestBA.runtimeconfig.json" SourceFile="bad.runtimeconfig.json" />
@@ -12,7 +11,9 @@
       <Payload SourceFile="!(bindpath.dnc5x86)\WixToolset.Mba.Core.dll" />
       <bal:WixDotNetCoreBootstrapperApplicationHost />
     </BootstrapperApplication>
+  </Fragment>
 
+  <Fragment>
     <PackageGroup Id="BundlePackages">
       <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" bal:PrereqPackage="yes" Permanent="yes" />
       <MsiPackage Id="PackageF" SourceFile="$(var.PackageF.TargetPath)" />
diff --git a/src/TestData/PrereqBaTests/BundleB/BundleB.wixproj b/src/TestData/PrereqBaTests/BundleB/BundleB.wixproj
index 420c2a0c..bad720f9 100644
--- a/src/TestData/PrereqBaTests/BundleB/BundleB.wixproj
+++ b/src/TestData/PrereqBaTests/BundleB/BundleB.wixproj
@@ -2,7 +2,12 @@
 <Project Sdk="WixToolset.Sdk">
   <PropertyGroup>
     <OutputType>Bundle</OutputType>
+    <BA>BrokenMba</BA>
+    <UpgradeCode>{157A1FBA-3825-4AAA-B13D-F45435A79D64}</UpgradeCode>
   </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+  </ItemGroup>
   <ItemGroup>
     <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net35\win-x86" BindName="net2x86" />
   </ItemGroup>
diff --git a/src/TestData/PrereqBaTests/BundleB/BundleB.wxi b/src/TestData/PrereqBaTests/BundleB/BundleB.wxi
deleted file mode 100644
index 6bfeb213..00000000
--- a/src/TestData/PrereqBaTests/BundleB/BundleB.wxi
+++ /dev/null
@@ -1,17 +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?>
-
-<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Bundle Name="~$(var.TestGroupName) - Bundle B" Version="$(var.Version)" UpgradeCode="{157A1FBA-3825-4AAA-B13D-F45435A79D64}" Compressed="yes">
-    <Log Prefix="~$(var.TestGroupName)_BundleB" />
-
-    <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
-
-    <Chain>
-      <PackageGroupRef Id="BundlePackages" />
-    </Chain>
-  </Bundle>
-</Include>
diff --git a/src/TestData/PrereqBaTests/BundleB/BundleB.wxs b/src/TestData/PrereqBaTests/BundleB/BundleB.wxs
index 57d8a552..603c3aee 100644
--- a/src/TestData/PrereqBaTests/BundleB/BundleB.wxs
+++ b/src/TestData/PrereqBaTests/BundleB/BundleB.wxs
@@ -2,16 +2,17 @@
 
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
-  <?include BundleB.wxi ?>
   <Fragment>
-    <BootstrapperApplication>
+    <BootstrapperApplication Id="BrokenMba">
       <Payload Name="WixToolset.Mba.Host.config" SourceFile="bad.config" />
       <Payload SourceFile="!(bindpath.net2x86)\TestBA.dll" />
       <Payload SourceFile="!(bindpath.net2x86)\mbanative.dll" />
       <Payload SourceFile="!(bindpath.net2x86)\WixToolset.Mba.Core.dll" />
       <bal:WixManagedBootstrapperApplicationHost />
     </BootstrapperApplication>
+  </Fragment>
 
+  <Fragment>
     <PackageGroup Id="BundlePackages">
       <MsiPackage Id="PackageB" SourceFile="$(var.PackageB.TargetPath)" bal:PrereqPackage="yes" Permanent="yes" />
       <MsiPackage Id="PackageF" SourceFile="$(var.PackageF.TargetPath)" />
diff --git a/src/TestData/RollbackBoundaryTests/BundleA/BundleA.wixproj b/src/TestData/RollbackBoundaryTests/BundleA/BundleA.wixproj
index 96f7aa31..43a844ad 100644
--- a/src/TestData/RollbackBoundaryTests/BundleA/BundleA.wixproj
+++ b/src/TestData/RollbackBoundaryTests/BundleA/BundleA.wixproj
@@ -2,7 +2,12 @@
 <Project Sdk="WixToolset.Sdk">
   <PropertyGroup>
     <OutputType>Bundle</OutputType>
+    <BA>hyperlinkLicense</BA>
+    <UpgradeCode>{E8426C86-D5E4-45FA-B09D-789DC7E5E00A}</UpgradeCode>
   </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PackageA\PackageA.wixproj" />
     <ProjectReference Include="..\PackageB\PackageB.wixproj" />
diff --git a/src/TestData/RollbackBoundaryTests/BundleA/BundleA.wxi b/src/TestData/RollbackBoundaryTests/BundleA/BundleA.wxi
deleted file mode 100644
index 145073b5..00000000
--- a/src/TestData/RollbackBoundaryTests/BundleA/BundleA.wxi
+++ /dev/null
@@ -1,21 +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?>
-
-<Include xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
-  <Bundle Name="~$(var.TestGroupName) - Bundle A" Version="$(var.Version)" UpgradeCode="{E8426C86-D5E4-45FA-B09D-789DC7E5E00A}" Compressed="yes">
-    <Log Prefix="~$(var.TestGroupName)_BundleA" />
-
-    <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
-
-    <BootstrapperApplication>
-        <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" />
-    </BootstrapperApplication>
-
-    <Chain>
-      <PackageGroupRef Id="BundlePackages" />
-    </Chain>
-  </Bundle>
-</Include>
diff --git a/src/TestData/RollbackBoundaryTests/BundleA/BundleA.wxs b/src/TestData/RollbackBoundaryTests/BundleA/BundleA.wxs
index 251b1863..795dc13a 100644
--- a/src/TestData/RollbackBoundaryTests/BundleA/BundleA.wxs
+++ b/src/TestData/RollbackBoundaryTests/BundleA/BundleA.wxs
@@ -2,7 +2,6 @@
 
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <?include BundleA.wxi ?>
   <Fragment>
     <PackageGroup Id="BundlePackages">
       <MsiPackage Id="PackageC" SourceFile="$(var.PackageC.TargetPath)" Permanent="yes" /> <!-- TODO: this is a workaround for inability to specify RollbackBoundary as first package, remove when this is fixed -->
diff --git a/src/TestData/Templates/Bundle.wxs b/src/TestData/Templates/Bundle.wxs
new file mode 100644
index 00000000..6042a616
--- /dev/null
+++ b/src/TestData/Templates/Bundle.wxs
@@ -0,0 +1,35 @@
+<!-- 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">
+  <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
+    <Log Prefix="~$(var.TestGroupName)_$(var.BundleName)" />
+
+    <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
+
+    <?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/Wix.Build.targets b/src/Wix.Build.targets
index 6a35b172..e6018b67 100644
--- a/src/Wix.Build.targets
+++ b/src/Wix.Build.targets
@@ -2,8 +2,10 @@
 <!-- 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. -->
 <Project>
   <PropertyGroup>
+    <BundleName Condition=" '$(BundleName)' == '' ">$(MSBuildProjectName)</BundleName>
     <PackageName Condition=" '$(PackageName)' == '' ">$(MSBuildProjectName)</PackageName>
-    <DefineConstants>TestGroupName=$(TestGroupName);PackageName=$(PackageName);$(DefineConstants)</DefineConstants>
+    <DefineConstants>TestGroupName=$(TestGroupName);PackageName=$(PackageName);BundleName=$(BundleName);$(DefineConstants)</DefineConstants>
+    <DefineConstants Condition=" '$(BA)' != '' ">BA=$(BA);$(DefineConstants)</DefineConstants>
     <DefineConstants Condition=" '$(CabPrefix)' != '' ">CabPrefix=$(CabPrefix);$(DefineConstants)</DefineConstants>
     <DefineConstants Condition=" '$(UpgradeCode)' != '' ">UpgradeCode=$(UpgradeCode);$(DefineConstants)</DefineConstants>
     <DefineConstants Condition=" '$(Version)' != '' ">Version=$(Version);$(DefineConstants)</DefineConstants>
-- 
cgit v1.2.3-55-g6feb