diff options
Diffstat (limited to 'src/test/burn/TestData')
-rw-r--r-- | src/test/burn/TestData/VariableTests/BundleA/Bundle.wxs (renamed from src/test/burn/TestData/VariableTests/BundleB/Bundle.wxs) | 2 | ||||
-rw-r--r-- | src/test/burn/TestData/VariableTests/BundleA/BundleA.wixproj | 3 | ||||
-rw-r--r-- | src/test/burn/TestData/VariableTests/BundleB/BundleB.wixproj | 3 | ||||
-rw-r--r-- | src/test/burn/TestData/VariableTests/BundleB/BundleB.wxs | 1 | ||||
-rw-r--r-- | src/test/burn/TestData/WixStdBaTests/BundleA/Bundle.wxs | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/src/test/burn/TestData/VariableTests/BundleB/Bundle.wxs b/src/test/burn/TestData/VariableTests/BundleA/Bundle.wxs index fb293d9b..4a8cb43e 100644 --- a/src/test/burn/TestData/VariableTests/BundleB/Bundle.wxs +++ b/src/test/burn/TestData/VariableTests/BundleA/Bundle.wxs | |||
@@ -6,7 +6,7 @@ | |||
6 | 6 | ||
7 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> | 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 --> | 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"> | 9 | <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" bal:CommandLineVariables="caseInsensitive"> |
10 | <Log Prefix="~$(var.TestGroupName)_$(var.BundleName)" /> | 10 | <Log Prefix="~$(var.TestGroupName)_$(var.BundleName)" /> |
11 | 11 | ||
12 | <Variable Name="TestGroupName" Value="$(var.TestGroupName)" /> | 12 | <Variable Name="TestGroupName" Value="$(var.TestGroupName)" /> |
diff --git a/src/test/burn/TestData/VariableTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/VariableTests/BundleA/BundleA.wixproj index 91049cee..b318e40a 100644 --- a/src/test/burn/TestData/VariableTests/BundleA/BundleA.wixproj +++ b/src/test/burn/TestData/VariableTests/BundleA/BundleA.wixproj | |||
@@ -6,9 +6,6 @@ | |||
6 | <UpgradeCode>{DDB62589-C5AD-4E92-A697-EAD7D7C37C8D}</UpgradeCode> | 6 | <UpgradeCode>{DDB62589-C5AD-4E92-A697-EAD7D7C37C8D}</UpgradeCode> |
7 | </PropertyGroup> | 7 | </PropertyGroup> |
8 | <ItemGroup> | 8 | <ItemGroup> |
9 | <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" /> | ||
10 | </ItemGroup> | ||
11 | <ItemGroup> | ||
12 | <ProjectReference Include="..\PackageA\PackageA.wixproj" /> | 9 | <ProjectReference Include="..\PackageA\PackageA.wixproj" /> |
13 | </ItemGroup> | 10 | </ItemGroup> |
14 | <ItemGroup> | 11 | <ItemGroup> |
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> |
diff --git a/src/test/burn/TestData/WixStdBaTests/BundleA/Bundle.wxs b/src/test/burn/TestData/WixStdBaTests/BundleA/Bundle.wxs index e4c10d5a..99320b35 100644 --- a/src/test/burn/TestData/WixStdBaTests/BundleA/Bundle.wxs +++ b/src/test/burn/TestData/WixStdBaTests/BundleA/Bundle.wxs | |||
@@ -1,7 +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 | 2 | ||
3 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> | 3 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> |
4 | <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" CommandLineVariables="caseSensitive"> | 4 | <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" bal:CommandLineVariables="caseSensitive"> |
5 | <Log Prefix="~$(var.TestGroupName)_$(var.BundleName)" /> | 5 | <Log Prefix="~$(var.TestGroupName)_$(var.BundleName)" /> |
6 | 6 | ||
7 | <Variable Name="TestGroupName" Value="$(var.TestGroupName)" /> | 7 | <Variable Name="TestGroupName" Value="$(var.TestGroupName)" /> |