From ae4c3947277a5c05368276c31bc2cd562d7580bb Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Mon, 3 Mar 2025 22:19:36 -0500
Subject: Only referenced components get default feature.

Fixes https://github.com/wixtoolset/issues/issues/8882
Fixes https://github.com/wixtoolset/issues/issues/8939
---
 src/setup/ThmViewerPackage/ThmViewerPackage.wxs | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

(limited to 'src/setup')

diff --git a/src/setup/ThmViewerPackage/ThmViewerPackage.wxs b/src/setup/ThmViewerPackage/ThmViewerPackage.wxs
index df398d0f..66bbe766 100644
--- a/src/setup/ThmViewerPackage/ThmViewerPackage.wxs
+++ b/src/setup/ThmViewerPackage/ThmViewerPackage.wxs
@@ -1,23 +1,13 @@
 <!-- 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. -->
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Package Id="WixToolset.ThemeViewer.Package" Name="WiX Toolset Theme Viewer" Manufacturer="WiX Toolset" Language="1033" Version="!(bind.fileVersion.ThmViewerFile)">
-    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
-
-    <Feature Id="Main">
-      <ComponentGroupRef Id="Components" />
-    </Feature>
+    <Component>
+      <File Id="ThmViewerFile" Source="thmviewer.exe" />
+      <Shortcut Name="!(bind.property.ProductName)" Directory="ShortcutFolder" Advertise="yes" />
+      <RemoveFolder Directory="ShortcutFolder" On="uninstall" />
+    </Component>
   </Package>
 
-  <Fragment>
-    <ComponentGroup Id="Components" Directory="INSTALLFOLDER" Subdirectory="bin">
-      <Component>
-        <File Id="ThmViewerFile" Source="thmviewer.exe" />
-        <Shortcut Name="!(bind.property.ProductName)" Directory="ShortcutFolder" Advertise="yes" />
-        <RemoveFolder Directory="ShortcutFolder" On="uninstall" />
-      </Component>
-    </ComponentGroup>
-  </Fragment>
-
   <Fragment>
     <StandardDirectory Id="ProgramFilesFolder">
       <Directory Id="INSTALLFOLDER" Name="WiX Toolset v$(SetupMajorMinorVersion)" />
-- 
cgit v1.2.3-55-g6feb