Create template for bundle.
Sean Hall committed
Jan 1, 2021 at 23:12 UTC
02d4ef4774fa43cc9524fac93c888981e5d47478
26 files changed
+101
-153
src/TestData/BasicFunctionalityTests/BundleA/BundleA.wixproj
+5
@@ -2,7 +2,12 @@
2
<Project Sdk="WixToolset.Sdk">
3
<PropertyGroup>
4
<OutputType>Bundle</OutputType>
5
+ <BA>hyperlinkLicense</BA>
6
+ <UpgradeCode>{8C7E2C47-1EE7-4BBE-99A2-EAB7F3693F48}</UpgradeCode>
7
</PropertyGroup>
8
+ <ItemGroup>
9
+ <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
10
+ </ItemGroup>
11
<ItemGroup>
12
<ProjectReference Include="..\PackageA\PackageA.wixproj" />
13
</ItemGroup>
src/TestData/BasicFunctionalityTests/BundleA/BundleA.wxi
deleted
-21
@@ -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>
src/TestData/BasicFunctionalityTests/BundleA/BundleA.wxs
-1
@@ -2,7 +2,6 @@
2
3
4
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5
- <?include BundleA.wxi ?>
5
<Fragment>
6
<PackageGroup Id="BundlePackages">
7
<MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" />
src/TestData/MsiTransactionTests/BundleAv1/BundleA.props
new
+15
@@ -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>
src/TestData/MsiTransactionTests/BundleAv1/BundleA.wxi
deleted
-21
@@ -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>
src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj
+1
-7
@@ -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. -->
2
<Project Sdk="WixToolset.Sdk">
3
- <PropertyGroup>
4
- <OutputType>Bundle</OutputType>
5
- <SuppressSpecificWarnings>1151</SuppressSpecificWarnings>
6
- </PropertyGroup>
3
+ <Import Project="BundleA.props" />
4
<ItemGroup>
5
<ProjectReference Include="..\PackageA\PackageA.wixproj" />
6
<ProjectReference Include="..\PackageBv1\PackageBv1.wixproj" />
7
<ProjectReference Include="..\PackageCv1\PackageCv1.wixproj" />
8
</ItemGroup>
12
- <ItemGroup>
13
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.77" />
14
- </ItemGroup>
9
</Project>
\ No newline at end of file
src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wxs
-1
@@ -2,7 +2,6 @@
2
3
4
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5
- <?include BundleA.wxi ?>
5
<Fragment>
6
<PackageGroup Id="BundlePackages">
7
<MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" />
src/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj
+1
-5
@@ -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. -->
2
<Project Sdk="WixToolset.Sdk">
3
+ <Import Project="..\BundleAv1\BundleA.props" />
4
<PropertyGroup>
4
- <OutputType>Bundle</OutputType>
5
- <SuppressSpecificWarnings>1151</SuppressSpecificWarnings>
5
<Version>2.0.0.0</Version>
6
</PropertyGroup>
7
<ItemGroup>
@@ -10,7 +9,4 @@
9
<ProjectReference Include="..\PackageCv2\PackageCv2.wixproj" />
10
<ProjectReference Include="..\PackageD\PackageD.wixproj" />
11
</ItemGroup>
13
- <ItemGroup>
14
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.77" />
15
- </ItemGroup>
12
</Project>
\ No newline at end of file
src/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wxs
-1
@@ -2,7 +2,6 @@
2
3
4
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5
- <?include ..\BundleAv1\BundleA.wxi ?>
5
<Fragment>
6
<PackageGroup Id="BundlePackages">
7
<MsiPackage Id="PackageD" SourceFile="$(var.PackageD.TargetPath)" />
src/TestData/MsiTransactionTests/BundleBv1/BundleB.props
new
+17
@@ -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>
src/TestData/MsiTransactionTests/BundleBv1/BundleB.wxi
deleted
-17
@@ -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>
src/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wixproj
+1
-8
@@ -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. -->
2
<Project Sdk="WixToolset.Sdk">
3
- <PropertyGroup>
4
- <OutputType>Bundle</OutputType>
5
- </PropertyGroup>
3
+ <Import Project="BundleB.props" />
4
<ItemGroup>
7
- <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
5
<ProjectReference Include="..\PackageBv1\PackageBv1.wixproj" />
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>
7
</Project>
\ No newline at end of file
src/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wxs
-2
@@ -2,10 +2,8 @@
2
3
4
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5
- <?include BundleB.wxi ?>
5
<Fragment>
6
<PackageGroup Id="BundlePackages">
8
- <PackageGroupRef Id="TestBA" />
7
<MsiPackage Id="PackageB" SourceFile="$(var.PackageBv1.TargetPath)" />
8
</PackageGroup>
9
</Fragment>
src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj
+2
-6
@@ -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. -->
2
<Project Sdk="WixToolset.Sdk">
3
+ <Import Project="..\BundleBv1\BundleB.props" />
4
<PropertyGroup>
4
- <OutputType>Bundle</OutputType>
5
<SuppressSpecificWarnings>1151</SuppressSpecificWarnings>
6
+ <BA>TestBAdnc</BA>
7
<Version>2.0.0.0</Version>
8
</PropertyGroup>
9
<ItemGroup>
9
- <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
10
<ProjectReference Include="..\PackageA\PackageA.wixproj" />
11
<ProjectReference Include="..\PackageBv2\PackageBv2.wixproj" />
12
<ProjectReference Include="..\PackageF\PackageF.wixproj" />
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>
14
</Project>
\ No newline at end of file
src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wxs
-2
@@ -2,10 +2,8 @@
2
3
4
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5
- <?include ..\BundleBv1\BundleB.wxi ?>
5
<Fragment>
6
<PackageGroup Id="BundlePackages">
8
- <PackageGroupRef Id="TestBAdnc" />
7
<MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" />
8
<RollbackBoundary Transaction="yes" />
9
<MsiPackage Id="PackageB" SourceFile="$(var.PackageBv2.TargetPath)" />
src/TestData/PrereqBaTests/BundleA/BundleA.wixproj
+5
@@ -2,7 +2,12 @@
2
<Project Sdk="WixToolset.Sdk">
3
<PropertyGroup>
4
<OutputType>Bundle</OutputType>
5
+ <BA>BrokenDnc</BA>
6
+ <UpgradeCode>{A4456636-916A-43A0-87BF-A897C2717A00}</UpgradeCode>
7
</PropertyGroup>
8
+ <ItemGroup>
9
+ <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
10
+ </ItemGroup>
11
<ItemGroup>
12
<BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net5.0-windows\win-x86" BindName="dnc5x86" />
13
</ItemGroup>
src/TestData/PrereqBaTests/BundleA/BundleA.wxi
deleted
-17
@@ -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>
src/TestData/PrereqBaTests/BundleA/BundleA.wxs
+3
-2
@@ -2,9 +2,8 @@
2
3
4
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
5
- <?include BundleA.wxi ?>
5
<Fragment>
7
- <BootstrapperApplication>
6
+ <BootstrapperApplication Id="BrokenDnc">
7
<Payload SourceFile="!(bindpath.dnc5x86)\TestBA.deps.json" />
8
<Payload SourceFile="!(bindpath.dnc5x86)\TestBA.dll" bal:BAFactoryAssembly="yes" />
9
<Payload Name="TestBA.runtimeconfig.json" SourceFile="bad.runtimeconfig.json" />
@@ -12,7 +11,9 @@
11
<Payload SourceFile="!(bindpath.dnc5x86)\WixToolset.Mba.Core.dll" />
12
<bal:WixDotNetCoreBootstrapperApplicationHost />
13
</BootstrapperApplication>
14
+ </Fragment>
15
16
+ <Fragment>
17
<PackageGroup Id="BundlePackages">
18
<MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" bal:PrereqPackage="yes" Permanent="yes" />
19
<MsiPackage Id="PackageF" SourceFile="$(var.PackageF.TargetPath)" />
src/TestData/PrereqBaTests/BundleB/BundleB.wixproj
+5
@@ -2,7 +2,12 @@
2
<Project Sdk="WixToolset.Sdk">
3
<PropertyGroup>
4
<OutputType>Bundle</OutputType>
5
+ <BA>BrokenMba</BA>
6
+ <UpgradeCode>{157A1FBA-3825-4AAA-B13D-F45435A79D64}</UpgradeCode>
7
</PropertyGroup>
8
+ <ItemGroup>
9
+ <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
10
+ </ItemGroup>
11
<ItemGroup>
12
<BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net35\win-x86" BindName="net2x86" />
13
</ItemGroup>
src/TestData/PrereqBaTests/BundleB/BundleB.wxi
deleted
-17
@@ -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>
src/TestData/PrereqBaTests/BundleB/BundleB.wxs
+3
-2
@@ -2,16 +2,17 @@
2
3
4
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
5
- <?include BundleB.wxi ?>
5
<Fragment>
7
- <BootstrapperApplication>
6
+ <BootstrapperApplication Id="BrokenMba">
7
<Payload Name="WixToolset.Mba.Host.config" SourceFile="bad.config" />
8
<Payload SourceFile="!(bindpath.net2x86)\TestBA.dll" />
9
<Payload SourceFile="!(bindpath.net2x86)\mbanative.dll" />
10
<Payload SourceFile="!(bindpath.net2x86)\WixToolset.Mba.Core.dll" />
11
<bal:WixManagedBootstrapperApplicationHost />
12
</BootstrapperApplication>
13
+ </Fragment>
14
15
+ <Fragment>
16
<PackageGroup Id="BundlePackages">
17
<MsiPackage Id="PackageB" SourceFile="$(var.PackageB.TargetPath)" bal:PrereqPackage="yes" Permanent="yes" />
18
<MsiPackage Id="PackageF" SourceFile="$(var.PackageF.TargetPath)" />
src/TestData/RollbackBoundaryTests/BundleA/BundleA.wixproj
+5
@@ -2,7 +2,12 @@
2
<Project Sdk="WixToolset.Sdk">
3
<PropertyGroup>
4
<OutputType>Bundle</OutputType>
5
+ <BA>hyperlinkLicense</BA>
6
+ <UpgradeCode>{E8426C86-D5E4-45FA-B09D-789DC7E5E00A}</UpgradeCode>
7
</PropertyGroup>
8
+ <ItemGroup>
9
+ <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
10
+ </ItemGroup>
11
<ItemGroup>
12
<ProjectReference Include="..\PackageA\PackageA.wixproj" />
13
<ProjectReference Include="..\PackageB\PackageB.wixproj" />
src/TestData/RollbackBoundaryTests/BundleA/BundleA.wxi
deleted
-21
@@ -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>
src/TestData/RollbackBoundaryTests/BundleA/BundleA.wxs
-1
@@ -2,7 +2,6 @@
2
3
4
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5
- <?include BundleA.wxi ?>
5
<Fragment>
6
<PackageGroup Id="BundlePackages">
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 -->
src/TestData/Templates/Bundle.wxs
new
+35
@@ -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>
src/Wix.Build.targets
+3
-1
@@ -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. -->
3
<Project>
4
<PropertyGroup>
5
+ <BundleName Condition=" '$(BundleName)' == '' ">$(MSBuildProjectName)</BundleName>
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>
9
<DefineConstants Condition=" '$(CabPrefix)' != '' ">CabPrefix=$(CabPrefix);$(DefineConstants)</DefineConstants>
10
<DefineConstants Condition=" '$(UpgradeCode)' != '' ">UpgradeCode=$(UpgradeCode);$(DefineConstants)</DefineConstants>
11
<DefineConstants Condition=" '$(Version)' != '' ">Version=$(Version);$(DefineConstants)</DefineConstants>