diff options
Diffstat (limited to 'src/test/burn/TestData/VariableTests/BundleB')
3 files changed, 4 insertions, 40 deletions
diff --git a/src/test/burn/TestData/VariableTests/BundleB/Bundle.wxs b/src/test/burn/TestData/VariableTests/BundleB/Bundle.wxs deleted file mode 100644 index fb293d9b..00000000 --- a/src/test/burn/TestData/VariableTests/BundleB/Bundle.wxs +++ /dev/null | |||
@@ -1,40 +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 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> | ||
8 | <!-- CommandLineVariables should be the only thing different from the template --> | ||
9 | <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" CommandLineVariables="caseSensitive"> | ||
10 | <Log Prefix="~$(var.TestGroupName)_$(var.BundleName)" /> | ||
11 | |||
12 | <Variable Name="TestGroupName" Value="$(var.TestGroupName)" /> | ||
13 | |||
14 | <?ifdef SoftwareTag?> | ||
15 | <SoftwareTag Regid="regid.1995-08.com.example" InstallPath="[CommonAppDataFolder]regid.1995-08.com.example" /> | ||
16 | <?endif?> | ||
17 | |||
18 | <?ifndef BA?> | ||
19 | <!-- pulled in through the PackageGroupRef below --> | ||
20 | <?elseif $(var.BA) = "TestBAdnc"?> | ||
21 | <!-- pulled in through the PackageGroupRef below --> | ||
22 | <?elseif $(var.BA) = "hyperlinkLicense"?> | ||
23 | <BootstrapperApplication> | ||
24 | <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" /> | ||
25 | </BootstrapperApplication> | ||
26 | <?else?> | ||
27 | <BootstrapperApplicationRef Id="$(var.BA)" /> | ||
28 | <?endif?> | ||
29 | |||
30 | <Chain> | ||
31 | <?ifndef BA?> | ||
32 | <PackageGroupRef Id="TestBA" /> | ||
33 | <?elseif $(var.BA) = "TestBAdnc"?> | ||
34 | <PackageGroupRef Id="TestBAdnc" /> | ||
35 | <?endif?> | ||
36 | |||
37 | <PackageGroupRef Id="BundlePackages" /> | ||
38 | </Chain> | ||
39 | </Bundle> | ||
40 | </Wix> | ||
diff --git a/src/test/burn/TestData/VariableTests/BundleB/BundleB.wixproj b/src/test/burn/TestData/VariableTests/BundleB/BundleB.wixproj index fa11100b..866891a5 100644 --- a/src/test/burn/TestData/VariableTests/BundleB/BundleB.wixproj +++ b/src/test/burn/TestData/VariableTests/BundleB/BundleB.wixproj | |||
@@ -6,6 +6,9 @@ | |||
6 | <UpgradeCode>{B735B6D2-9D4D-4E98-B464-946F7F62AFC8}</UpgradeCode> | 6 | <UpgradeCode>{B735B6D2-9D4D-4E98-B464-946F7F62AFC8}</UpgradeCode> |
7 | </PropertyGroup> | 7 | </PropertyGroup> |
8 | <ItemGroup> | 8 | <ItemGroup> |
9 | <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" /> | ||
10 | </ItemGroup> | ||
11 | <ItemGroup> | ||
9 | <ProjectReference Include="..\PackageA\PackageA.wixproj" /> | 12 | <ProjectReference Include="..\PackageA\PackageA.wixproj" /> |
10 | </ItemGroup> | 13 | </ItemGroup> |
11 | <ItemGroup> | 14 | <ItemGroup> |
diff --git a/src/test/burn/TestData/VariableTests/BundleB/BundleB.wxs b/src/test/burn/TestData/VariableTests/BundleB/BundleB.wxs index f243c97d..4ab7e46f 100644 --- a/src/test/burn/TestData/VariableTests/BundleB/BundleB.wxs +++ b/src/test/burn/TestData/VariableTests/BundleB/BundleB.wxs | |||
@@ -13,5 +13,6 @@ | |||
13 | 13 | ||
14 | <Variable Name="INSTALLLOCATION" bal:Overridable="yes" /> | 14 | <Variable Name="INSTALLLOCATION" bal:Overridable="yes" /> |
15 | <Variable Name="LICENSEKEY" Hidden="yes" bal:Overridable="yes" /> | 15 | <Variable Name="LICENSEKEY" Hidden="yes" bal:Overridable="yes" /> |
16 | <Variable Name="licensekey" Hidden="no" bal:Overridable="yes" /> | ||
16 | </Fragment> | 17 | </Fragment> |
17 | </Wix> | 18 | </Wix> |