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.

---
 .../MsiTransactionTests/BundleAv1/BundleA.props     | 15 +++++++++++++++
 .../MsiTransactionTests/BundleAv1/BundleA.wxi       | 21 ---------------------
 .../MsiTransactionTests/BundleAv1/BundleAv1.wixproj |  8 +-------
 .../MsiTransactionTests/BundleAv1/BundleAv1.wxs     |  1 -
 4 files changed, 16 insertions(+), 29 deletions(-)
 create mode 100644 src/TestData/MsiTransactionTests/BundleAv1/BundleA.props
 delete mode 100644 src/TestData/MsiTransactionTests/BundleAv1/BundleA.wxi

(limited to 'src/TestData/MsiTransactionTests/BundleAv1')

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)" />
-- 
cgit v1.2.3-55-g6feb