diff options
| author | Bob Arnson <bob@firegiant.com> | 2025-03-03 22:19:36 -0500 |
|---|---|---|
| committer | Bob Arnson <github@bobs.org> | 2025-03-03 23:06:48 -0500 |
| commit | ae4c3947277a5c05368276c31bc2cd562d7580bb (patch) | |
| tree | 0e26edad956f07cf702d46030a3dec3022ba0748 /src/setup | |
| parent | 29f885377442fa93f574f2b4430cb621c1ad809e (diff) | |
| download | wix-6.0.0-rc.2.tar.gz wix-6.0.0-rc.2.tar.bz2 wix-6.0.0-rc.2.zip | |
Only referenced components get default feature.v6.0.0-rc.2
Fixes https://github.com/wixtoolset/issues/issues/8882
Fixes https://github.com/wixtoolset/issues/issues/8939
Diffstat (limited to '')
| -rw-r--r-- | src/setup/ThmViewerPackage/ThmViewerPackage.wxs | 20 |
1 files changed, 5 insertions, 15 deletions
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,24 +1,14 @@ | |||
| 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 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
| 3 | <Package Id="WixToolset.ThemeViewer.Package" Name="WiX Toolset Theme Viewer" Manufacturer="WiX Toolset" Language="1033" Version="!(bind.fileVersion.ThmViewerFile)"> | 3 | <Package Id="WixToolset.ThemeViewer.Package" Name="WiX Toolset Theme Viewer" Manufacturer="WiX Toolset" Language="1033" Version="!(bind.fileVersion.ThmViewerFile)"> |
| 4 | <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> | 4 | <Component> |
| 5 | 5 | <File Id="ThmViewerFile" Source="thmviewer.exe" /> | |
| 6 | <Feature Id="Main"> | 6 | <Shortcut Name="!(bind.property.ProductName)" Directory="ShortcutFolder" Advertise="yes" /> |
| 7 | <ComponentGroupRef Id="Components" /> | 7 | <RemoveFolder Directory="ShortcutFolder" On="uninstall" /> |
| 8 | </Feature> | 8 | </Component> |
| 9 | </Package> | 9 | </Package> |
| 10 | 10 | ||
| 11 | <Fragment> | 11 | <Fragment> |
| 12 | <ComponentGroup Id="Components" Directory="INSTALLFOLDER" Subdirectory="bin"> | ||
| 13 | <Component> | ||
| 14 | <File Id="ThmViewerFile" Source="thmviewer.exe" /> | ||
| 15 | <Shortcut Name="!(bind.property.ProductName)" Directory="ShortcutFolder" Advertise="yes" /> | ||
| 16 | <RemoveFolder Directory="ShortcutFolder" On="uninstall" /> | ||
| 17 | </Component> | ||
| 18 | </ComponentGroup> | ||
| 19 | </Fragment> | ||
| 20 | |||
| 21 | <Fragment> | ||
| 22 | <StandardDirectory Id="ProgramFilesFolder"> | 12 | <StandardDirectory Id="ProgramFilesFolder"> |
| 23 | <Directory Id="INSTALLFOLDER" Name="WiX Toolset v$(SetupMajorMinorVersion)" /> | 13 | <Directory Id="INSTALLFOLDER" Name="WiX Toolset v$(SetupMajorMinorVersion)" /> |
| 24 | </StandardDirectory> | 14 | </StandardDirectory> |