aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2021-08-22 22:26:23 -0400
committerBob Arnson <bob@firegiant.com>2021-08-22 22:55:41 -0400
commit19c52f14644ac666c12f1a44bc2c0cce1586b8c5 (patch)
treebe6ef8e61e7fe6c37ae9e7bafd3f2fda64934883 /src/test
parentbb18c9c4f0e6da640775b85ebda68b31f2b391ed (diff)
downloadwix-19c52f14644ac666c12f1a44bc2c0cce1586b8c5.tar.gz
wix-19c52f14644ac666c12f1a44bc2c0cce1586b8c5.tar.bz2
wix-19c52f14644ac666c12f1a44bc2c0cce1586b8c5.zip
On SuppressDowngradeFailure, quit after detect.
Implements https://github.com/wixtoolset/issues/issues/6537.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/burn/TestData/WixStdBaTests/BundleA/Bundle.wxs17
-rw-r--r--src/test/burn/TestData/WixStdBaTests/BundleA/BundleA.wxs10
-rw-r--r--src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_v11.wixproj15
-rw-r--r--src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_v12.wixproj15
-rw-r--r--src/test/burn/TestData/WixStdBaTests/PackageA/PackageA.wixproj9
5 files changed, 66 insertions, 0 deletions
diff --git a/src/test/burn/TestData/WixStdBaTests/BundleA/Bundle.wxs b/src/test/burn/TestData/WixStdBaTests/BundleA/Bundle.wxs
new file mode 100644
index 00000000..dded1f40
--- /dev/null
+++ b/src/test/burn/TestData/WixStdBaTests/BundleA/Bundle.wxs
@@ -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
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">
5 <Log Prefix="~$(var.TestGroupName)_$(var.BundleName)" />
6
7 <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
8
9 <BootstrapperApplication>
10 <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" SuppressDowngradeFailure="yes" />
11 </BootstrapperApplication>
12
13 <Chain>
14 <PackageGroupRef Id="BundlePackages" />
15 </Chain>
16 </Bundle>
17</Wix>
diff --git a/src/test/burn/TestData/WixStdBaTests/BundleA/BundleA.wxs b/src/test/burn/TestData/WixStdBaTests/BundleA/BundleA.wxs
new file mode 100644
index 00000000..b3345b5d
--- /dev/null
+++ b/src/test/burn/TestData/WixStdBaTests/BundleA/BundleA.wxs
@@ -0,0 +1,10 @@
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<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
4 xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
5 <Fragment>
6 <PackageGroup Id="BundlePackages">
7 <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" />
8 </PackageGroup>
9 </Fragment>
10</Wix>
diff --git a/src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_v11.wixproj b/src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_v11.wixproj
new file mode 100644
index 00000000..5fa77495
--- /dev/null
+++ b/src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_v11.wixproj
@@ -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 Sdk="WixToolset.Sdk">
3 <PropertyGroup>
4 <OutputType>Bundle</OutputType>
5 <UpgradeCode>{7D977157-06C9-4176-A931-AC16E18AAB51}</UpgradeCode>
6 <DefineConstants>$(DefineConstants);Version=1.1</DefineConstants>
7 <OutputName>WixStdBaTest1_v11</OutputName>
8 </PropertyGroup>
9 <ItemGroup>
10 <ProjectReference Include="..\PackageA\PackageA.wixproj" />
11 </ItemGroup>
12 <ItemGroup>
13 <PackageReference Include="WixToolset.Bal.wixext" />
14 </ItemGroup>
15</Project> \ No newline at end of file
diff --git a/src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_v12.wixproj b/src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_v12.wixproj
new file mode 100644
index 00000000..5918df51
--- /dev/null
+++ b/src/test/burn/TestData/WixStdBaTests/BundleA/BundleA_v12.wixproj
@@ -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 Sdk="WixToolset.Sdk">
3 <PropertyGroup>
4 <OutputType>Bundle</OutputType>
5 <UpgradeCode>{7D977157-06C9-4176-A931-AC16E18AAB51}</UpgradeCode>
6 <DefineConstants>$(DefineConstants);Version=1.2</DefineConstants>
7 <OutputName>WixStdBaTest1_v12</OutputName>
8 </PropertyGroup>
9 <ItemGroup>
10 <ProjectReference Include="..\PackageA\PackageA.wixproj" />
11 </ItemGroup>
12 <ItemGroup>
13 <PackageReference Include="WixToolset.Bal.wixext" />
14 </ItemGroup>
15</Project> \ No newline at end of file
diff --git a/src/test/burn/TestData/WixStdBaTests/PackageA/PackageA.wixproj b/src/test/burn/TestData/WixStdBaTests/PackageA/PackageA.wixproj
new file mode 100644
index 00000000..a028c152
--- /dev/null
+++ b/src/test/burn/TestData/WixStdBaTests/PackageA/PackageA.wixproj
@@ -0,0 +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 <UpgradeCode>{78FBE6B9-7BA5-444B-A2B8-489820FA2C89}</UpgradeCode>
5 </PropertyGroup>
6 <ItemGroup>
7 <Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" />
8 </ItemGroup>
9</Project> \ No newline at end of file
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-22 15:46:04 +0000