Create template for bundle.

6 files changed, 16 insertions, 38 deletions

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,8 +2,13 @@
 <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>
   <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,8 +2,13 @@
 <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>
   <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)" />