Create template for bundle.

4 files changed, 18 insertions, 27 deletions

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>