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 -
 .../MsiTransactionTests/BundleAv2/BundleAv2.wixproj |  6 +-----
 .../MsiTransactionTests/BundleAv2/BundleAv2.wxs     |  1 -
 .../MsiTransactionTests/BundleBv1/BundleB.props     | 17 +++++++++++++++++
 .../MsiTransactionTests/BundleBv1/BundleB.wxi       | 17 -----------------
 .../MsiTransactionTests/BundleBv1/BundleBv1.wixproj |  9 +--------
 .../MsiTransactionTests/BundleBv1/BundleBv1.wxs     |  2 --
 .../MsiTransactionTests/BundleBv2/BundleBv2.wixproj |  8 ++------
 .../MsiTransactionTests/BundleBv2/BundleBv2.wxs     |  2 --
 12 files changed, 37 insertions(+), 70 deletions(-)
 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

(limited to 'src/TestData/MsiTransactionTests')

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