aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2021-01-01 23:12:28 -0600
committerSean Hall <r.sean.hall@gmail.com>2021-01-03 16:20:19 -0600
commit02d4ef4774fa43cc9524fac93c888981e5d47478 (patch)
tree8ccfd50765ea96a3d323597124ccbb4684c94b85
parent47724ab546a84e77b4699bc28aa4e4ad7901253f (diff)
downloadwix-02d4ef4774fa43cc9524fac93c888981e5d47478.tar.gz
wix-02d4ef4774fa43cc9524fac93c888981e5d47478.tar.bz2
wix-02d4ef4774fa43cc9524fac93c888981e5d47478.zip
Create template for bundle.
Diffstat
-rw-r--r--src/TestData/BasicFunctionalityTests/BundleA/BundleA.wixproj5
-rw-r--r--src/TestData/BasicFunctionalityTests/BundleA/BundleA.wxi21
-rw-r--r--src/TestData/BasicFunctionalityTests/BundleA/BundleA.wxs1
-rw-r--r--src/TestData/MsiTransactionTests/BundleAv1/BundleA.props15
-rw-r--r--src/TestData/MsiTransactionTests/BundleAv1/BundleA.wxi21
-rw-r--r--src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj8
-rw-r--r--src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wxs1
-rw-r--r--src/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj6
-rw-r--r--src/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wxs1
-rw-r--r--src/TestData/MsiTransactionTests/BundleBv1/BundleB.props17
-rw-r--r--src/TestData/MsiTransactionTests/BundleBv1/BundleB.wxi17
-rw-r--r--src/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wixproj9
-rw-r--r--src/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wxs2
-rw-r--r--src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj8
-rw-r--r--src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wxs2
-rw-r--r--src/TestData/PrereqBaTests/BundleA/BundleA.wixproj5
-rw-r--r--src/TestData/PrereqBaTests/BundleA/BundleA.wxi17
-rw-r--r--src/TestData/PrereqBaTests/BundleA/BundleA.wxs5
-rw-r--r--src/TestData/PrereqBaTests/BundleB/BundleB.wixproj5
-rw-r--r--src/TestData/PrereqBaTests/BundleB/BundleB.wxi17
-rw-r--r--src/TestData/PrereqBaTests/BundleB/BundleB.wxs5
-rw-r--r--src/TestData/RollbackBoundaryTests/BundleA/BundleA.wixproj5
-rw-r--r--src/TestData/RollbackBoundaryTests/BundleA/BundleA.wxi21
-rw-r--r--src/TestData/RollbackBoundaryTests/BundleA/BundleA.wxs1
-rw-r--r--src/TestData/Templates/Bundle.wxs35
-rw-r--r--src/Wix.Build.targets4
26 files changed, 101 insertions, 153 deletions
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,8 +2,13 @@
2<Project Sdk="WixToolset.Sdk"> 2<Project Sdk="WixToolset.Sdk">
3 <PropertyGroup> 3 <PropertyGroup>
4 <OutputType>Bundle</OutputType> 4 <OutputType>Bundle</OutputType>
5 <BA>hyperlinkLicense</BA>
6 <UpgradeCode>{8C7E2C47-1EE7-4BBE-99A2-EAB7F3693F48}</UpgradeCode>
5 </PropertyGroup> 7 </PropertyGroup>
6 <ItemGroup> 8 <ItemGroup>
9 <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
10 </ItemGroup>
11 <ItemGroup>
7 <ProjectReference Include="..\PackageA\PackageA.wixproj" /> 12 <ProjectReference Include="..\PackageA\PackageA.wixproj" />
8 </ItemGroup> 13 </ItemGroup>
9 <ItemGroup> 14 <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 @@
1<!-- 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. -->
2
3<?ifndef Version?>
4<?define Version = 1.0.0.0?>
5<?endif?>
6
7<Include xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
8 <Bundle Name="~$(var.TestGroupName) - Bundle A" Version="$(var.Version)" UpgradeCode="{8C7E2C47-1EE7-4BBE-99A2-EAB7F3693F48}" Compressed="yes">
9 <Log Prefix="~$(var.TestGroupName)_BundleA" />
10
11 <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
12
13 <BootstrapperApplication>
14 <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" />
15 </BootstrapperApplication>
16
17 <Chain>
18 <PackageGroupRef Id="BundlePackages" />
19 </Chain>
20 </Bundle>
21</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 @@
2 2
3 3
4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 <?include BundleA.wxi ?>
6 <Fragment> 5 <Fragment>
7 <PackageGroup Id="BundlePackages"> 6 <PackageGroup Id="BundlePackages">
8 <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" /> 7 <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 @@
1<!-- 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. -->
2<Project>
3 <PropertyGroup>
4 <OutputType>Bundle</OutputType>
5 <SuppressSpecificWarnings>1151</SuppressSpecificWarnings>
6 <BA>hyperlinkLicense</BA>
7 <UpgradeCode>{90ED10D5-B187-4470-B498-05D80DAB729A}</UpgradeCode>
8 </PropertyGroup>
9 <ItemGroup>
10 <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
11 </ItemGroup>
12 <ItemGroup>
13 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.77" />
14 </ItemGroup>
15</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 @@
1<!-- 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. -->
2
3<?ifndef Version?>
4<?define Version = 1.0.0.0?>
5<?endif?>
6
7<Include xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
8 <Bundle Name="~$(var.TestGroupName) - Bundle A" Version="$(var.Version)" UpgradeCode="{90ED10D5-B187-4470-B498-05D80DAB729A}" Compressed="yes">
9 <Log Prefix="~$(var.TestGroupName)_BundleA" />
10
11 <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
12
13 <BootstrapperApplication>
14 <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" Theme="hyperlinkLicense" />
15 </BootstrapperApplication>
16
17 <Chain>
18 <PackageGroupRef Id="BundlePackages" />
19 </Chain>
20 </Bundle>
21</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 @@
1<!-- 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. --> 1<!-- 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. -->
2<Project Sdk="WixToolset.Sdk"> 2<Project Sdk="WixToolset.Sdk">
3 <PropertyGroup> 3 <Import Project="BundleA.props" />
4 <OutputType>Bundle</OutputType>
5 <SuppressSpecificWarnings>1151</SuppressSpecificWarnings>
6 </PropertyGroup>
7 <ItemGroup> 4 <ItemGroup>
8 <ProjectReference Include="..\PackageA\PackageA.wixproj" /> 5 <ProjectReference Include="..\PackageA\PackageA.wixproj" />
9 <ProjectReference Include="..\PackageBv1\PackageBv1.wixproj" /> 6 <ProjectReference Include="..\PackageBv1\PackageBv1.wixproj" />
10 <ProjectReference Include="..\PackageCv1\PackageCv1.wixproj" /> 7 <ProjectReference Include="..\PackageCv1\PackageCv1.wixproj" />
11 </ItemGroup> 8 </ItemGroup>
12 <ItemGroup>
13 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.77" />
14 </ItemGroup>
15</Project> \ No newline at end of file 9</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 @@
2 2
3 3
4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 <?include BundleA.wxi ?>
6 <Fragment> 5 <Fragment>
7 <PackageGroup Id="BundlePackages"> 6 <PackageGroup Id="BundlePackages">
8 <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" /> 7 <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 @@
1<!-- 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. --> 1<!-- 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. -->
2<Project Sdk="WixToolset.Sdk"> 2<Project Sdk="WixToolset.Sdk">
3 <Import Project="..\BundleAv1\BundleA.props" />
3 <PropertyGroup> 4 <PropertyGroup>
4 <OutputType>Bundle</OutputType>
5 <SuppressSpecificWarnings>1151</SuppressSpecificWarnings>
6 <Version>2.0.0.0</Version> 5 <Version>2.0.0.0</Version>
7 </PropertyGroup> 6 </PropertyGroup>
8 <ItemGroup> 7 <ItemGroup>
@@ -10,7 +9,4 @@
10 <ProjectReference Include="..\PackageCv2\PackageCv2.wixproj" /> 9 <ProjectReference Include="..\PackageCv2\PackageCv2.wixproj" />
11 <ProjectReference Include="..\PackageD\PackageD.wixproj" /> 10 <ProjectReference Include="..\PackageD\PackageD.wixproj" />
12 </ItemGroup> 11 </ItemGroup>
13 <ItemGroup>
14 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.77" />
15 </ItemGroup>
16</Project> \ No newline at end of file 12</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 @@
2 2
3 3
4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 <?include ..\BundleAv1\BundleA.wxi ?>
6 <Fragment> 5 <Fragment>
7 <PackageGroup Id="BundlePackages"> 6 <PackageGroup Id="BundlePackages">
8 <MsiPackage Id="PackageD" SourceFile="$(var.PackageD.TargetPath)" /> 7 <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 @@
1<!-- 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. -->
2<Project>
3 <PropertyGroup>
4 <OutputType>Bundle</OutputType>
5 <UpgradeCode>{552FD011-4DD6-42B2-A4C6-AD1417C829B2}</UpgradeCode>
6 </PropertyGroup>
7 <ItemGroup>
8 <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
9 </ItemGroup>
10 <ItemGroup>
11 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
12 </ItemGroup>
13 <ItemGroup>
14 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.77" />
15 <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.56" />
16 </ItemGroup>
17</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 @@
1<!-- 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. -->
2
3<?ifndef Version?>
4<?define Version = 1.0.0.0?>
5<?endif?>
6
7<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
8 <Bundle Name="~$(var.TestGroupName) - Bundle B" Version="$(var.Version)" UpgradeCode="{552FD011-4DD6-42B2-A4C6-AD1417C829B2}" Compressed="yes">
9 <Log Prefix="~$(var.TestGroupName)_BundleB" />
10
11 <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
12
13 <Chain>
14 <PackageGroupRef Id="BundlePackages" />
15 </Chain>
16 </Bundle>
17</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 @@
1<!-- 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. --> 1<!-- 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. -->
2<Project Sdk="WixToolset.Sdk"> 2<Project Sdk="WixToolset.Sdk">
3 <PropertyGroup> 3 <Import Project="BundleB.props" />
4 <OutputType>Bundle</OutputType>
5 </PropertyGroup>
6 <ItemGroup> 4 <ItemGroup>
7 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
8 <ProjectReference Include="..\PackageBv1\PackageBv1.wixproj" /> 5 <ProjectReference Include="..\PackageBv1\PackageBv1.wixproj" />
9 </ItemGroup> 6 </ItemGroup>
10 <ItemGroup>
11 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.77" />
12 <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.56" />
13 </ItemGroup>
14</Project> \ No newline at end of file 7</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 @@
2 2
3 3
4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 <?include BundleB.wxi ?>
6 <Fragment> 5 <Fragment>
7 <PackageGroup Id="BundlePackages"> 6 <PackageGroup Id="BundlePackages">
8 <PackageGroupRef Id="TestBA" />
9 <MsiPackage Id="PackageB" SourceFile="$(var.PackageBv1.TargetPath)" /> 7 <MsiPackage Id="PackageB" SourceFile="$(var.PackageBv1.TargetPath)" />
10 </PackageGroup> 8 </PackageGroup>
11 </Fragment> 9 </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 @@
1<!-- 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. --> 1<!-- 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. -->
2<Project Sdk="WixToolset.Sdk"> 2<Project Sdk="WixToolset.Sdk">
3 <Import Project="..\BundleBv1\BundleB.props" />
3 <PropertyGroup> 4 <PropertyGroup>
4 <OutputType>Bundle</OutputType>
5 <SuppressSpecificWarnings>1151</SuppressSpecificWarnings> 5 <SuppressSpecificWarnings>1151</SuppressSpecificWarnings>
6 <BA>TestBAdnc</BA>
6 <Version>2.0.0.0</Version> 7 <Version>2.0.0.0</Version>
7 </PropertyGroup> 8 </PropertyGroup>
8 <ItemGroup> 9 <ItemGroup>
9 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
10 <ProjectReference Include="..\PackageA\PackageA.wixproj" /> 10 <ProjectReference Include="..\PackageA\PackageA.wixproj" />
11 <ProjectReference Include="..\PackageBv2\PackageBv2.wixproj" /> 11 <ProjectReference Include="..\PackageBv2\PackageBv2.wixproj" />
12 <ProjectReference Include="..\PackageF\PackageF.wixproj" /> 12 <ProjectReference Include="..\PackageF\PackageF.wixproj" />
13 </ItemGroup> 13 </ItemGroup>
14 <ItemGroup>
15 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.77" />
16 <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.56" />
17 </ItemGroup>
18</Project> \ No newline at end of file 14</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 @@
2 2
3 3
4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 <?include ..\BundleBv1\BundleB.wxi ?>
6 <Fragment> 5 <Fragment>
7 <PackageGroup Id="BundlePackages"> 6 <PackageGroup Id="BundlePackages">
8 <PackageGroupRef Id="TestBAdnc" />
9 <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" /> 7 <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" />
10 <RollbackBoundary Transaction="yes" /> 8 <RollbackBoundary Transaction="yes" />
11 <MsiPackage Id="PackageB" SourceFile="$(var.PackageBv2.TargetPath)" /> 9 <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,8 +2,13 @@
2<Project Sdk="WixToolset.Sdk"> 2<Project Sdk="WixToolset.Sdk">
3 <PropertyGroup> 3 <PropertyGroup>
4 <OutputType>Bundle</OutputType> 4 <OutputType>Bundle</OutputType>
5 <BA>BrokenDnc</BA>
6 <UpgradeCode>{A4456636-916A-43A0-87BF-A897C2717A00}</UpgradeCode>
5 </PropertyGroup> 7 </PropertyGroup>
6 <ItemGroup> 8 <ItemGroup>
9 <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
10 </ItemGroup>
11 <ItemGroup>
7 <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net5.0-windows\win-x86" BindName="dnc5x86" /> 12 <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net5.0-windows\win-x86" BindName="dnc5x86" />
8 </ItemGroup> 13 </ItemGroup>
9 <ItemGroup> 14 <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 @@
1<!-- 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. -->
2
3<?ifndef Version?>
4<?define Version = 1.0.0.0?>
5<?endif?>
6
7<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
8 <Bundle Name="~$(var.TestGroupName) - Bundle A" Version="$(var.Version)" UpgradeCode="{A4456636-916A-43A0-87BF-A897C2717A00}" Compressed="yes">
9 <Log Prefix="~$(var.TestGroupName)_BundleA" />
10
11 <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
12
13 <Chain>
14 <PackageGroupRef Id="BundlePackages" />
15 </Chain>
16 </Bundle>
17</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 @@
2 2
3 3
4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
5 <?include BundleA.wxi ?>
6 <Fragment> 5 <Fragment>
7 <BootstrapperApplication> 6 <BootstrapperApplication Id="BrokenDnc">
8 <Payload SourceFile="!(bindpath.dnc5x86)\TestBA.deps.json" /> 7 <Payload SourceFile="!(bindpath.dnc5x86)\TestBA.deps.json" />
9 <Payload SourceFile="!(bindpath.dnc5x86)\TestBA.dll" bal:BAFactoryAssembly="yes" /> 8 <Payload SourceFile="!(bindpath.dnc5x86)\TestBA.dll" bal:BAFactoryAssembly="yes" />
10 <Payload Name="TestBA.runtimeconfig.json" SourceFile="bad.runtimeconfig.json" /> 9 <Payload Name="TestBA.runtimeconfig.json" SourceFile="bad.runtimeconfig.json" />
@@ -12,7 +11,9 @@
12 <Payload SourceFile="!(bindpath.dnc5x86)\WixToolset.Mba.Core.dll" /> 11 <Payload SourceFile="!(bindpath.dnc5x86)\WixToolset.Mba.Core.dll" />
13 <bal:WixDotNetCoreBootstrapperApplicationHost /> 12 <bal:WixDotNetCoreBootstrapperApplicationHost />
14 </BootstrapperApplication> 13 </BootstrapperApplication>
14 </Fragment>
15 15
16 <Fragment>
16 <PackageGroup Id="BundlePackages"> 17 <PackageGroup Id="BundlePackages">
17 <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" bal:PrereqPackage="yes" Permanent="yes" /> 18 <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" bal:PrereqPackage="yes" Permanent="yes" />
18 <MsiPackage Id="PackageF" SourceFile="$(var.PackageF.TargetPath)" /> 19 <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 @@
2<Project Sdk="WixToolset.Sdk"> 2<Project Sdk="WixToolset.Sdk">
3 <PropertyGroup> 3 <PropertyGroup>
4 <OutputType>Bundle</OutputType> 4 <OutputType>Bundle</OutputType>
5 <BA>BrokenMba</BA>
6 <UpgradeCode>{157A1FBA-3825-4AAA-B13D-F45435A79D64}</UpgradeCode>
5 </PropertyGroup> 7 </PropertyGroup>
6 <ItemGroup> 8 <ItemGroup>
9 <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
10 </ItemGroup>
11 <ItemGroup>
7 <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net35\win-x86" BindName="net2x86" /> 12 <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net35\win-x86" BindName="net2x86" />
8 </ItemGroup> 13 </ItemGroup>
9 <ItemGroup> 14 <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 @@
1<!-- 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. -->
2
3<?ifndef Version?>
4<?define Version = 1.0.0.0?>
5<?endif?>
6
7<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
8 <Bundle Name="~$(var.TestGroupName) - Bundle B" Version="$(var.Version)" UpgradeCode="{157A1FBA-3825-4AAA-B13D-F45435A79D64}" Compressed="yes">
9 <Log Prefix="~$(var.TestGroupName)_BundleB" />
10
11 <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
12
13 <Chain>
14 <PackageGroupRef Id="BundlePackages" />
15 </Chain>
16 </Bundle>
17</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 @@
2 2
3 3
4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
5 <?include BundleB.wxi ?>
6 <Fragment> 5 <Fragment>
7 <BootstrapperApplication> 6 <BootstrapperApplication Id="BrokenMba">
8 <Payload Name="WixToolset.Mba.Host.config" SourceFile="bad.config" /> 7 <Payload Name="WixToolset.Mba.Host.config" SourceFile="bad.config" />
9 <Payload SourceFile="!(bindpath.net2x86)\TestBA.dll" /> 8 <Payload SourceFile="!(bindpath.net2x86)\TestBA.dll" />
10 <Payload SourceFile="!(bindpath.net2x86)\mbanative.dll" /> 9 <Payload SourceFile="!(bindpath.net2x86)\mbanative.dll" />
11 <Payload SourceFile="!(bindpath.net2x86)\WixToolset.Mba.Core.dll" /> 10 <Payload SourceFile="!(bindpath.net2x86)\WixToolset.Mba.Core.dll" />
12 <bal:WixManagedBootstrapperApplicationHost /> 11 <bal:WixManagedBootstrapperApplicationHost />
13 </BootstrapperApplication> 12 </BootstrapperApplication>
13 </Fragment>
14 14
15 <Fragment>
15 <PackageGroup Id="BundlePackages"> 16 <PackageGroup Id="BundlePackages">
16 <MsiPackage Id="PackageB" SourceFile="$(var.PackageB.TargetPath)" bal:PrereqPackage="yes" Permanent="yes" /> 17 <MsiPackage Id="PackageB" SourceFile="$(var.PackageB.TargetPath)" bal:PrereqPackage="yes" Permanent="yes" />
17 <MsiPackage Id="PackageF" SourceFile="$(var.PackageF.TargetPath)" /> 18 <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,8 +2,13 @@
2<Project Sdk="WixToolset.Sdk"> 2<Project Sdk="WixToolset.Sdk">
3 <PropertyGroup> 3 <PropertyGroup>
4 <OutputType>Bundle</OutputType> 4 <OutputType>Bundle</OutputType>
5 <BA>hyperlinkLicense</BA>
6 <UpgradeCode>{E8426C86-D5E4-45FA-B09D-789DC7E5E00A}</UpgradeCode>
5 </PropertyGroup> 7 </PropertyGroup>
6 <ItemGroup> 8 <ItemGroup>
9 <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
10 </ItemGroup>
11 <ItemGroup>
7 <ProjectReference Include="..\PackageA\PackageA.wixproj" /> 12 <ProjectReference Include="..\PackageA\PackageA.wixproj" />
8 <ProjectReference Include="..\PackageB\PackageB.wixproj" /> 13 <ProjectReference Include="..\PackageB\PackageB.wixproj" />
9 <ProjectReference Include="..\PackageC\PackageC.wixproj" /> 14 <ProjectReference Include="..\PackageC\PackageC.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 @@
1<!-- 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. -->
2
3<?ifndef Version?>
4<?define Version = 1.0.0.0?>
5<?endif?>
6
7<Include xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
8 <Bundle Name="~$(var.TestGroupName) - Bundle A" Version="$(var.Version)" UpgradeCode="{E8426C86-D5E4-45FA-B09D-789DC7E5E00A}" Compressed="yes">
9 <Log Prefix="~$(var.TestGroupName)_BundleA" />
10
11 <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
12
13 <BootstrapperApplication>
14 <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" />
15 </BootstrapperApplication>
16
17 <Chain>
18 <PackageGroupRef Id="BundlePackages" />
19 </Chain>
20 </Bundle>
21</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 @@
2 2
3 3
4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 <?include BundleA.wxi ?>
6 <Fragment> 5 <Fragment>
7 <PackageGroup Id="BundlePackages"> 6 <PackageGroup Id="BundlePackages">
8 <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 --> 7 <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 @@
1<!-- 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. -->
2
3<?ifndef Version?>
4<?define Version = 1.0.0.0?>
5<?endif?>
6
7<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
8 <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
9 <Log Prefix="~$(var.TestGroupName)_$(var.BundleName)" />
10
11 <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
12
13 <?ifndef BA?>
14 <!-- pulled in through the PackageGroupRef below -->
15 <?elseif $(var.BA) = "TestBAdnc"?>
16 <!-- pulled in through the PackageGroupRef below -->
17 <?elseif $(var.BA) = "hyperlinkLicense"?>
18 <BootstrapperApplication>
19 <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" />
20 </BootstrapperApplication>
21 <?else?>
22 <BootstrapperApplicationRef Id="$(var.BA)" />
23 <?endif?>
24
25 <Chain>
26 <?ifndef BA?>
27 <PackageGroupRef Id="TestBA" />
28 <?elseif $(var.BA) = "TestBAdnc"?>
29 <PackageGroupRef Id="TestBAdnc" />
30 <?endif?>
31
32 <PackageGroupRef Id="BundlePackages" />
33 </Chain>
34 </Bundle>
35</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 @@
2<!-- 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. --> 2<!-- 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. -->
3<Project> 3<Project>
4 <PropertyGroup> 4 <PropertyGroup>
5 <BundleName Condition=" '$(BundleName)' == '' ">$(MSBuildProjectName)</BundleName>
5 <PackageName Condition=" '$(PackageName)' == '' ">$(MSBuildProjectName)</PackageName> 6 <PackageName Condition=" '$(PackageName)' == '' ">$(MSBuildProjectName)</PackageName>
6 <DefineConstants>TestGroupName=$(TestGroupName);PackageName=$(PackageName);$(DefineConstants)</DefineConstants> 7 <DefineConstants>TestGroupName=$(TestGroupName);PackageName=$(PackageName);BundleName=$(BundleName);$(DefineConstants)</DefineConstants>
8 <DefineConstants Condition=" '$(BA)' != '' ">BA=$(BA);$(DefineConstants)</DefineConstants>
7 <DefineConstants Condition=" '$(CabPrefix)' != '' ">CabPrefix=$(CabPrefix);$(DefineConstants)</DefineConstants> 9 <DefineConstants Condition=" '$(CabPrefix)' != '' ">CabPrefix=$(CabPrefix);$(DefineConstants)</DefineConstants>
8 <DefineConstants Condition=" '$(UpgradeCode)' != '' ">UpgradeCode=$(UpgradeCode);$(DefineConstants)</DefineConstants> 10 <DefineConstants Condition=" '$(UpgradeCode)' != '' ">UpgradeCode=$(UpgradeCode);$(DefineConstants)</DefineConstants>
9 <DefineConstants Condition=" '$(Version)' != '' ">Version=$(Version);$(DefineConstants)</DefineConstants> 11 <DefineConstants Condition=" '$(Version)' != '' ">Version=$(Version);$(DefineConstants)</DefineConstants>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-21 08:02:34 +0000