Exclude detect-only Upgrades from default-feature.
Fixes https://github.com/wixtoolset/issues/issues/8125
Bob Arnson committed
Jun 29, 2024 at 22:04 UTC
701977a460da9a2f35f05c844eb9a5ba0dee8bed
3 files changed
+6
-10
src/wix/WixToolset.Core/Link/AddDefaultSymbolsCommand.cs
+1
-2
@@ -56,8 +56,7 @@ namespace WixToolset.Core.Link
56
// conjure a default major upgrade with the stdlib localization string for the
57
// downgrade error message.
58
var symbols = this.Sections.SelectMany(section => section.Symbols);
59
- var upgradeSymbols = symbols.OfType<UpgradeSymbol>();
60
- if (!upgradeSymbols.Any())
59
+ if (!symbols.OfType<UpgradeSymbol>().Any(us => !us.OnlyDetect))
60
{
61
var packageSymbol = this.Find.EntrySection.Symbols.OfType<WixPackageSymbol>().FirstOrDefault();
62
src/wix/test/WixToolsetTest.CoreIntegration/TestData/DefaultMajorUpgrade/DefaultMajorUpgrade.wxs
+4
-8
@@ -1,12 +1,8 @@
1
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2
<Package Name="MajorUpgradeDowngradeMessage" Language="1033" Version="2.0.0" Manufacturer="Example Corporation" UpgradeCode="7ab24276-c628-43db-9e65-a184d052909b" Scope="perMachine">
3
- <Feature Id="ProductFeature" Title="MsiPackageTitle">
4
- </Feature>
5
- </Package>
3
7
- <Fragment>
8
- <StandardDirectory Id="ProgramFiles6432Folder">
9
- <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
10
- </StandardDirectory>
11
- </Fragment>
4
+ <Property Id="PRODUCT">
5
+ <ProductSearch UpgradeCode="{46649344-6CDF-4531-B91C-DCC088CBF6D3}" Minimum="1.0" />
6
+ </Property>
7
+ </Package>
8
</Wix>
src/wix/test/WixToolsetTest.CoreIntegration/UpgradeFixture.cs
+1
@@ -68,6 +68,7 @@ namespace WixToolsetTest.CoreIntegration
68
WixAssert.CompareLineByLine(new[]
69
{
70
"LaunchCondition:NOT WIX_DOWNGRADE_DETECTED\tA newer version of [ProductName] is already installed.",
71
+ "Upgrade:{46649344-6CDF-4531-B91C-DCC088CBF6D3}\t1.0\t\t\t258\t\tPRODUCT",
72
"Upgrade:{7AB24276-C628-43DB-9E65-A184D052909B}\t\t2.0.0\t1033\t1\t\tWIX_UPGRADE_DETECTED",
73
"Upgrade:{7AB24276-C628-43DB-9E65-A184D052909B}\t2.0.0\t\t1033\t2\t\tWIX_DOWNGRADE_DETECTED",
74
}, results);