From 701977a460da9a2f35f05c844eb9a5ba0dee8bed Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Sat, 29 Jun 2024 22:04:35 -0400
Subject: Exclude detect-only Upgrades from default-feature.

Fixes https://github.com/wixtoolset/issues/issues/8125
---
 src/wix/WixToolset.Core/Link/AddDefaultSymbolsCommand.cs     |  3 +--
 .../TestData/DefaultMajorUpgrade/DefaultMajorUpgrade.wxs     | 12 ++++--------
 .../test/WixToolsetTest.CoreIntegration/UpgradeFixture.cs    |  1 +
 3 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/wix/WixToolset.Core/Link/AddDefaultSymbolsCommand.cs b/src/wix/WixToolset.Core/Link/AddDefaultSymbolsCommand.cs
index 3d5280a2..b433b039 100644
--- a/src/wix/WixToolset.Core/Link/AddDefaultSymbolsCommand.cs
+++ b/src/wix/WixToolset.Core/Link/AddDefaultSymbolsCommand.cs
@@ -56,8 +56,7 @@ namespace WixToolset.Core.Link
             // conjure a default major upgrade with the stdlib localization string for the
             // downgrade error message.
             var symbols = this.Sections.SelectMany(section => section.Symbols);
-            var upgradeSymbols = symbols.OfType<UpgradeSymbol>();
-            if (!upgradeSymbols.Any())
+            if (!symbols.OfType<UpgradeSymbol>().Any(us => !us.OnlyDetect))
             {
                 var packageSymbol = this.Find.EntrySection.Symbols.OfType<WixPackageSymbol>().FirstOrDefault();
 
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/DefaultMajorUpgrade/DefaultMajorUpgrade.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/DefaultMajorUpgrade/DefaultMajorUpgrade.wxs
index ce9fd96f..95ebcd94 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/DefaultMajorUpgrade/DefaultMajorUpgrade.wxs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/DefaultMajorUpgrade/DefaultMajorUpgrade.wxs
@@ -1,12 +1,8 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <Package Name="MajorUpgradeDowngradeMessage" Language="1033" Version="2.0.0" Manufacturer="Example Corporation" UpgradeCode="7ab24276-c628-43db-9e65-a184d052909b" Scope="perMachine">
-        <Feature Id="ProductFeature" Title="MsiPackageTitle">
-        </Feature>
-    </Package>
 
-    <Fragment>
-        <StandardDirectory Id="ProgramFiles6432Folder">
-            <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
-        </StandardDirectory>
-    </Fragment>
+        <Property Id="PRODUCT">
+            <ProductSearch UpgradeCode="{46649344-6CDF-4531-B91C-DCC088CBF6D3}" Minimum="1.0" />
+        </Property>
+    </Package>
 </Wix>
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/UpgradeFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/UpgradeFixture.cs
index 2d2c0703..49c83c07 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/UpgradeFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/UpgradeFixture.cs
@@ -68,6 +68,7 @@ namespace WixToolsetTest.CoreIntegration
             WixAssert.CompareLineByLine(new[]
             {
                 "LaunchCondition:NOT WIX_DOWNGRADE_DETECTED\tA newer version of [ProductName] is already installed.",
+                "Upgrade:{46649344-6CDF-4531-B91C-DCC088CBF6D3}\t1.0\t\t\t258\t\tPRODUCT",
                 "Upgrade:{7AB24276-C628-43DB-9E65-A184D052909B}\t\t2.0.0\t1033\t1\t\tWIX_UPGRADE_DETECTED",
                 "Upgrade:{7AB24276-C628-43DB-9E65-A184D052909B}\t2.0.0\t\t1033\t2\t\tWIX_DOWNGRADE_DETECTED",
             }, results);
-- 
cgit v1.2.3-55-g6feb