mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2024-11-24 04:12:32 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

adjust for modules (#5284)

Browse Source 
Co-authored-by: Clint Rutkas <crutkas@microsoft.com>
This commit is contained in:
Clint Rutkas 2020-07-28 19:26:18 -07:00 committed by GitHub
parent 8fb446ad47
commit 1fc3cfee68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
installer/PowerToysSetup/Product.wxs
View File

@ -288,7 +288,9 @@
<Directory Id="SettingsV2ViewsInstallFolder" Name="Views"/> <Directory Id="SettingsV2ViewsInstallFolder" Name="Views"/>
<Directory Id="SettingsV2StylesInstallFolder" Name="Styles"/> <Directory Id="SettingsV2StylesInstallFolder" Name="Styles"/>
<Directory Id="SettingsV2PropertiesInstallFolder" Name="Properties"/> <Directory Id="SettingsV2PropertiesInstallFolder" Name="Properties"/>
<Directory Id="SettingsV2AssetsInstallFolder" Name="Assets"/> <Directory Id="SettingsV2AssetsInstallFolder" Name="Assets">
<Directory Id="SettingsV2AssetsModulesInstallFolder" Name="Modules" />
</Directory>
<Directory Id="SettingsV2ControlsInstallFolder" Name="Controls"/> <Directory Id="SettingsV2ControlsInstallFolder" Name="Controls"/>
<Directory Id="SettingsV2XamlInstallFolder" Name="Microsoft.UI.Xaml"> <Directory Id="SettingsV2XamlInstallFolder" Name="Microsoft.UI.Xaml">
<Directory Id="SettingsV2XamlAssetsInstallFolder" Name="Assets" /> <Directory Id="SettingsV2XamlAssetsInstallFolder" Name="Assets" />
@ -689,9 +691,6 @@
<?foreach File in Logo.scale-200.png;SplashScreen.png;StoreLogo.scale-100.png?> <?foreach File in Logo.scale-200.png;SplashScreen.png;StoreLogo.scale-100.png?>
<File Source="$(var.BinX64Dir)SettingsUIRunner\Assets\$(var.File)" /> <File Source="$(var.BinX64Dir)SettingsUIRunner\Assets\$(var.File)" />
<?endforeach?> <?endforeach?>
<?foreach File in ColorPicker.png;FancyZones.png;ImageResizer.png;KBM.png;PowerLauncher.png;PowerPreview.png;PowerRename.png;PT.png;ShortcutGuide.png?>
<File Source="$(var.BinX64Dir)SettingsUIRunner\Assets\Modules\$(var.File)" />
<?endforeach?>
<File Id="SettingsV2_StoreLogo" Source="$(var.BinX64Dir)SettingsUIRunner\Assets\StoreLogo.png" /> <File Id="SettingsV2_StoreLogo" Source="$(var.BinX64Dir)SettingsUIRunner\Assets\StoreLogo.png" />
<File Id="Square150x150Logo" Source="$(var.BinX64Dir)SettingsUIRunner\Assets\Square150x150Logo.scale-200.png" /> <File Id="Square150x150Logo" Source="$(var.BinX64Dir)SettingsUIRunner\Assets\Square150x150Logo.scale-200.png" />
<File Id="Square44x44Logo_targetsize_24_altform_unplated" Source="$(var.BinX64Dir)SettingsUIRunner\Assets\Square44x44Logo.targetsize-24_altform-unplated.png" /> <File Id="Square44x44Logo_targetsize_24_altform_unplated" Source="$(var.BinX64Dir)SettingsUIRunner\Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
@ -699,6 +698,13 @@
<File Id="Square44x44Logo" Source="$(var.BinX64Dir)SettingsUIRunner\Assets\Square44x44Logo.scale-200.png" /> <File Id="Square44x44Logo" Source="$(var.BinX64Dir)SettingsUIRunner\Assets\Square44x44Logo.scale-200.png" />
</Component> </Component>
</DirectoryRef> </DirectoryRef>
<DirectoryRef Id="SettingsV2AssetsModulesInstallFolder" FileSource="$(var.BinX64Dir)SettingsUIRunner\Assets\Modules">
<Component Id="SettingsV2AssetsModules" Guid="A0B961A9-77D0-4223-88A9-E3B41BD9C329" Win64="yes">
<?foreach File in ColorPicker.png;FancyZones.png;ImageResizer.png;KBM.png;PowerLauncher.png;PowerPreview.png;PowerRename.png;PT.png;ShortcutGuide.png?>
<File Source="$(var.BinX64Dir)SettingsUIRunner\Assets\Modules\$(var.File)" />
<?endforeach?>
</Component>
</DirectoryRef>
<DirectoryRef Id="SettingsV2ControlsInstallFolder" FileSource="$(var.BinX64Dir)SettingsUIRunner\Controls"> <DirectoryRef Id="SettingsV2ControlsInstallFolder" FileSource="$(var.BinX64Dir)SettingsUIRunner\Controls">
<Component Id="SettingsV2Controls" Guid="05C55C88-B59A-4450-A07C-EB7626E0781A" Win64="yes"> <Component Id="SettingsV2Controls" Guid="05C55C88-B59A-4450-A07C-EB7626E0781A" Win64="yes">
<?foreach File in HotkeySettingsControl.xbf?> <?foreach File in HotkeySettingsControl.xbf?>
@ -793,6 +799,7 @@
<ComponentRef Id="Module_ColorPicker_Resources"/> <ComponentRef Id="Module_ColorPicker_Resources"/>
<ComponentRef Id="SettingsV2" /> <ComponentRef Id="SettingsV2" />
<ComponentRef Id="SettingsV2Assets" /> <ComponentRef Id="SettingsV2Assets" />
<ComponentRef Id="SettingsV2AssetsModules" />
<ComponentRef Id="SettingsV2Controls" /> <ComponentRef Id="SettingsV2Controls" />
<ComponentRef Id="SettingsV2Properties" /> <ComponentRef Id="SettingsV2Properties" />
<ComponentRef Id="SettingsV2Styles" /> <ComponentRef Id="SettingsV2Styles" />