[MSI] Do not use advertised icon (#10246)
This commit is contained in:
parent
1d2aeaf147
commit
81c19b4749
|
@ -287,8 +287,10 @@
|
||||||
</Directory>
|
</Directory>
|
||||||
</Directory>
|
</Directory>
|
||||||
</Directory>
|
</Directory>
|
||||||
<Directory Id="ProgramMenuFolder"/>
|
<Directory Id="ProgramMenuFolder">
|
||||||
<Directory Id="DesktopFolder" Name="Desktop"/>
|
<Directory Id="ApplicationProgramsFolder" Name="PowerToys (Preview)"/>
|
||||||
|
</Directory>
|
||||||
|
<Directory Id="DesktopFolder" Name="Desktop" />
|
||||||
</Directory>
|
</Directory>
|
||||||
</Fragment>
|
</Fragment>
|
||||||
|
|
||||||
|
@ -302,20 +304,7 @@
|
||||||
</RegistryKey>
|
</RegistryKey>
|
||||||
</Component>
|
</Component>
|
||||||
<Component Id="powertoys_exe" Guid="A2C66D91-3485-4D00-B04D-91844E6B345B" Win64="yes">
|
<Component Id="powertoys_exe" Guid="A2C66D91-3485-4D00-B04D-91844E6B345B" Win64="yes">
|
||||||
<File Id="PowerToys.exe" KeyPath="yes" Checksum="yes">
|
<File Id="PowerToys.exe" KeyPath="yes" Checksum="yes" />
|
||||||
<Shortcut Id="ApplicationStartMenuShortcut"
|
|
||||||
Name="PowerToys (Preview)"
|
|
||||||
Description="PowerToys - Windows system utilities to maximize productivity"
|
|
||||||
Directory="ProgramMenuFolder"
|
|
||||||
Icon="powertoys.exe"
|
|
||||||
IconIndex="0"
|
|
||||||
Advertise="yes">
|
|
||||||
<ShortcutProperty Key="System.AppUserModel.ID" Value="Microsoft.PowerToysWin32"/>
|
|
||||||
<!-- ToastActivatorCLSID is used only by toast background activation, which currently isn't used, but causes MSI warning 1946 to display for a small share of users -->
|
|
||||||
<!-- <ShortcutProperty Key="System.AppUserModel.ToastActivatorCLSID" Value="{DD5CACDA-7C2E-4997-A62A-04A597B58F76}"/> -->
|
|
||||||
</Shortcut>
|
|
||||||
</File>
|
|
||||||
|
|
||||||
<RegistryKey Root="HKCR" Key="powertoys">
|
<RegistryKey Root="HKCR" Key="powertoys">
|
||||||
<RegistryValue Type="string" Name="URL Protocol" Value=""/>
|
<RegistryValue Type="string" Name="URL Protocol" Value=""/>
|
||||||
<RegistryValue Type="string" Value="URL:PowerToys custom internal URI protocol"/>
|
<RegistryValue Type="string" Value="URL:PowerToys custom internal URI protocol"/>
|
||||||
|
@ -326,11 +315,7 @@
|
||||||
<RegistryValue Type="string" Value=""[INSTALLFOLDER]PowerToys.exe" "%1"" />
|
<RegistryValue Type="string" Value=""[INSTALLFOLDER]PowerToys.exe" "%1"" />
|
||||||
</RegistryKey>
|
</RegistryKey>
|
||||||
</RegistryKey>
|
</RegistryKey>
|
||||||
|
|
||||||
|
|
||||||
</Component>
|
</Component>
|
||||||
|
|
||||||
|
|
||||||
<Component Id="settings_exe" Guid="A5A461A9-7097-4CBA-9D39-3DBBB6B7B80C" Win64="yes">
|
<Component Id="settings_exe" Guid="A5A461A9-7097-4CBA-9D39-3DBBB6B7B80C" Win64="yes">
|
||||||
<File Id="PowerToysSettings.exe" KeyPath="yes" Checksum="yes" />
|
<File Id="PowerToysSettings.exe" KeyPath="yes" Checksum="yes" />
|
||||||
</Component>
|
</Component>
|
||||||
|
@ -356,6 +341,24 @@
|
||||||
<?endforeach?>
|
<?endforeach?>
|
||||||
</Component>
|
</Component>
|
||||||
</DirectoryRef>
|
</DirectoryRef>
|
||||||
|
|
||||||
|
<DirectoryRef Id="ApplicationProgramsFolder">
|
||||||
|
<Component Id="PowerToysStartMenuShortcut" Guid="336AB4F9-078C-4DCA-B69F-3808A9FFD758">
|
||||||
|
<Shortcut Id="ApplicationStartMenuShortcut"
|
||||||
|
Name="PowerToys (Preview)"
|
||||||
|
Description="PowerToys - Windows system utilities to maximize productivity"
|
||||||
|
Icon="powertoys.exe"
|
||||||
|
IconIndex="0"
|
||||||
|
Target="[!PowerToys.exe]"
|
||||||
|
WorkingDirectory="INSTALLFOLDER">
|
||||||
|
<ShortcutProperty Key="System.AppUserModel.ID" Value="Microsoft.PowerToysWin32"/>
|
||||||
|
</Shortcut>
|
||||||
|
<RemoveFolder Id="CleanUpStartMenuShortCut" Directory="ApplicationProgramsFolder" On="uninstall"/>
|
||||||
|
<!-- ApplicationStartMenuShortcut is implicitly installed in HKCU, so WIX won't allow changing this reg value to HKLM. -->
|
||||||
|
<RegistryValue Root="HKCU" Key="Software\Microsoft\PowerToys" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
|
||||||
|
</Component>
|
||||||
|
</DirectoryRef>
|
||||||
|
|
||||||
<DirectoryRef Id="SvgsInstallFolder" FileSource="$(var.BinX64Dir)svgs\">
|
<DirectoryRef Id="SvgsInstallFolder" FileSource="$(var.BinX64Dir)svgs\">
|
||||||
<Component Id="PowerToysSvgs" Guid="7C4D4EED-9338-423D-992C-DCE02F3E2D35" Win64="yes">
|
<Component Id="PowerToysSvgs" Guid="7C4D4EED-9338-423D-992C-DCE02F3E2D35" Win64="yes">
|
||||||
<File Source="$(var.BinX64Dir)svgs\0.svg" />
|
<File Source="$(var.BinX64Dir)svgs\0.svg" />
|
||||||
|
@ -757,6 +760,7 @@
|
||||||
<DirectoryRef Id="DesktopFolder">
|
<DirectoryRef Id="DesktopFolder">
|
||||||
<Component Id="DesktopShortcut" Guid="87321F2B-CC48-4326-881E-9C62CC260DC8">
|
<Component Id="DesktopShortcut" Guid="87321F2B-CC48-4326-881E-9C62CC260DC8">
|
||||||
<Condition>INSTALLDESKTOPSHORTCUT</Condition>
|
<Condition>INSTALLDESKTOPSHORTCUT</Condition>
|
||||||
|
<!-- DesktopShortcutId is implicitly installed in HKCU, so WIX won't allow changing this reg value to HKLM. -->
|
||||||
<RegistryValue Root="HKCU"
|
<RegistryValue Root="HKCU"
|
||||||
Key="Software\[Manufacturer]\[ProductName]"
|
Key="Software\[Manufacturer]\[ProductName]"
|
||||||
Name="desktopshorcutinstalled"
|
Name="desktopshorcutinstalled"
|
||||||
|
@ -777,6 +781,7 @@
|
||||||
<Fragment>
|
<Fragment>
|
||||||
<ComponentGroup Id="CoreComponents" Directory="INSTALLFOLDER">
|
<ComponentGroup Id="CoreComponents" Directory="INSTALLFOLDER">
|
||||||
<ComponentRef Id="powertoys_exe" />
|
<ComponentRef Id="powertoys_exe" />
|
||||||
|
<ComponentRef Id="PowerToysStartMenuShortcut"/>
|
||||||
<ComponentRef Id="BackgroundActivator_dll" />
|
<ComponentRef Id="BackgroundActivator_dll" />
|
||||||
<ComponentRef Id="action_runner_exe" />
|
<ComponentRef Id="action_runner_exe" />
|
||||||
<ComponentRef Id="powertoys_toast_clsid" />
|
<ComponentRef Id="powertoys_toast_clsid" />
|
||||||
|
@ -921,7 +926,7 @@
|
||||||
<Component Id="launcherInstallComponent" Directory="LauncherInstallFolder" Guid="5E688DB4-C522-4268-BA54-ED1CDFFE9DB6">
|
<Component Id="launcherInstallComponent" Directory="LauncherInstallFolder" Guid="5E688DB4-C522-4268-BA54-ED1CDFFE9DB6">
|
||||||
|
|
||||||
<!-- Toast Notification AUMID -->
|
<!-- Toast Notification AUMID -->
|
||||||
<RegistryKey Root="HKCU" Key="SOFTWARE\Classes\AppUserModelId\PowerToysRun">
|
<RegistryKey Root="HKLM" Key="SOFTWARE\Classes\AppUserModelId\PowerToysRun">
|
||||||
<RegistryValue Type="string" Name="DisplayName" Value="PowerToys Run" />
|
<RegistryValue Type="string" Name="DisplayName" Value="PowerToys Run" />
|
||||||
<RegistryValue Type="string" Name="IconUri" Value="[LauncherImagesFolder]RunAsset.ico" />
|
<RegistryValue Type="string" Name="IconUri" Value="[LauncherImagesFolder]RunAsset.ico" />
|
||||||
</RegistryKey>
|
</RegistryKey>
|
||||||
|
|
Loading…
Reference in a new issue