From 3fe7ff41cabab366e7918ba7ee8f2127eb24eaff Mon Sep 17 00:00:00 2001 From: "Peiyao Zhao (from Dev Box)" Date: Tue, 18 Feb 2025 15:45:01 +0800 Subject: [PATCH] auto upgrade to wix4 --- .../PowerToysSetupVNext/AdvancedPaste.wxs | 10 +- installer/PowerToysSetupVNext/Awake.wxs | 10 +- .../PowerToysSetupVNext/BaseApplications.wxs | 4 +- installer/PowerToysSetupVNext/ColorPicker.wxs | 10 +- installer/PowerToysSetupVNext/Core.wxs | 89 +-- .../CustomDialogs/PTInstallDirDlg.wxs | 7 +- .../CustomDialogs/PTLicenseDlg.wxs | 11 +- .../CustomDialogs/WixUI_PTInstallDir.wxs | 47 +- .../EnvironmentVariables.wxs | 10 +- .../FileExplorerPreview.wxs | 14 +- .../PowerToysSetupVNext/FileLocksmith.wxs | 16 +- installer/PowerToysSetupVNext/Hosts.wxs | 10 +- .../PowerToysSetupVNext/ImageResizer.wxs | 82 +-- .../PowerToysSetupVNext/KeyboardManager.wxs | 44 +- installer/PowerToysSetupVNext/MonacoSRC.wxs | 653 +++++++++--------- .../MouseWithoutBorders.wxs | 7 +- installer/PowerToysSetupVNext/NewPlus.wxs | 34 +- installer/PowerToysSetupVNext/Peek.wxs | 10 +- installer/PowerToysSetupVNext/PowerRename.wxs | 16 +- installer/PowerToysSetupVNext/PowerToys.wxs | 82 +-- .../PowerToysBootstrapperVNext.wixproj | 54 +- .../PowerToysInstallerVNext.wixproj | 102 +-- installer/PowerToysSetupVNext/Product.wxs | 374 +++------- .../PowerToysSetupVNext/RegistryPreview.wxs | 10 +- installer/PowerToysSetupVNext/Resources.wxs | 280 +++----- installer/PowerToysSetupVNext/Run.wxs | 92 ++- installer/PowerToysSetupVNext/Settings.wxs | 28 +- .../PowerToysSetupVNext/ShortcutGuide.wxs | 12 +- installer/PowerToysSetupVNext/Tools.wxs | 18 +- installer/PowerToysSetupVNext/WinAppSDK.wxs | 29 +- .../WinUI3Applications.wxs | 4 +- installer/PowerToysSetupVNext/Workspaces.wxs | 12 +- installer/PowerToysSetupVNext/packages.config | 3 - 33 files changed, 809 insertions(+), 1375 deletions(-) delete mode 100644 installer/PowerToysSetupVNext/packages.config diff --git a/installer/PowerToysSetupVNext/AdvancedPaste.wxs b/installer/PowerToysSetupVNext/AdvancedPaste.wxs index a865ddbf6c..69c740fd8e 100644 --- a/installer/PowerToysSetupVNext/AdvancedPaste.wxs +++ b/installer/PowerToysSetupVNext/AdvancedPaste.wxs @@ -1,6 +1,4 @@ - - + @@ -17,11 +15,11 @@ - + - + - + diff --git a/installer/PowerToysSetupVNext/Awake.wxs b/installer/PowerToysSetupVNext/Awake.wxs index a8f5536ff4..f66d306fab 100644 --- a/installer/PowerToysSetupVNext/Awake.wxs +++ b/installer/PowerToysSetupVNext/Awake.wxs @@ -1,6 +1,4 @@ - - + @@ -20,11 +18,11 @@ - + - + - + diff --git a/installer/PowerToysSetupVNext/BaseApplications.wxs b/installer/PowerToysSetupVNext/BaseApplications.wxs index 134a3ee89a..8b3fd56798 100644 --- a/installer/PowerToysSetupVNext/BaseApplications.wxs +++ b/installer/PowerToysSetupVNext/BaseApplications.wxs @@ -1,6 +1,4 @@ - - + diff --git a/installer/PowerToysSetupVNext/ColorPicker.wxs b/installer/PowerToysSetupVNext/ColorPicker.wxs index 0c744a7b26..26be8b8790 100644 --- a/installer/PowerToysSetupVNext/ColorPicker.wxs +++ b/installer/PowerToysSetupVNext/ColorPicker.wxs @@ -1,6 +1,4 @@ - - + @@ -19,11 +17,11 @@ - + - + - + diff --git a/installer/PowerToysSetupVNext/Core.wxs b/installer/PowerToysSetupVNext/Core.wxs index eb39fdc9db..eb3cbe8d36 100644 --- a/installer/PowerToysSetupVNext/Core.wxs +++ b/installer/PowerToysSetupVNext/Core.wxs @@ -1,29 +1,27 @@ - - + - + - - + + - + - - + + @@ -32,24 +30,24 @@ - + - + - + - + - + - + @@ -59,12 +57,12 @@ - + - + @@ -73,60 +71,43 @@ - + - - - + + + - + - + - - - INSTALLDESKTOPSHORTCUT + + + - - + + - + - + - + - - - - - + + + + + - + diff --git a/installer/PowerToysSetupVNext/CustomDialogs/PTInstallDirDlg.wxs b/installer/PowerToysSetupVNext/CustomDialogs/PTInstallDirDlg.wxs index d5697ec631..0f1af3a9e4 100644 --- a/installer/PowerToysSetupVNext/CustomDialogs/PTInstallDirDlg.wxs +++ b/installer/PowerToysSetupVNext/CustomDialogs/PTInstallDirDlg.wxs @@ -1,15 +1,14 @@ - - + - + - 1 + diff --git a/installer/PowerToysSetupVNext/CustomDialogs/PTLicenseDlg.wxs b/installer/PowerToysSetupVNext/CustomDialogs/PTLicenseDlg.wxs index ee7b752591..969de90bf7 100644 --- a/installer/PowerToysSetupVNext/CustomDialogs/PTLicenseDlg.wxs +++ b/installer/PowerToysSetupVNext/CustomDialogs/PTLicenseDlg.wxs @@ -1,8 +1,7 @@ - - + - + @@ -11,14 +10,14 @@ - 1 + - !(wix.WixUICostingPopupOptOut) OR CostingComplete = 1 + - 1 + diff --git a/installer/PowerToysSetupVNext/CustomDialogs/WixUI_PTInstallDir.wxs b/installer/PowerToysSetupVNext/CustomDialogs/WixUI_PTInstallDir.wxs index a06d1ed278..d7666077c0 100644 --- a/installer/PowerToysSetupVNext/CustomDialogs/WixUI_PTInstallDir.wxs +++ b/installer/PowerToysSetupVNext/CustomDialogs/WixUI_PTInstallDir.wxs @@ -1,5 +1,4 @@ - - + @@ -23,7 +22,7 @@ Patch dialog sequence: --> - + @@ -44,33 +43,33 @@ Patch dialog sequence: - 1 - "1"]]> + + - 1 + - NOT Installed - Installed AND PATCH + + - 1 - 1 + + - 1 - 1 - NOT WIXUI_DONTVALIDATEPATH - "1"]]> - WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1" - 1 - 1 - NOT Installed - Installed AND NOT PATCH - Installed AND PATCH + + + + + + + + + + - 1 + - 1 - 1 - 1 + + + diff --git a/installer/PowerToysSetupVNext/EnvironmentVariables.wxs b/installer/PowerToysSetupVNext/EnvironmentVariables.wxs index 44567055af..9ec8778cda 100644 --- a/installer/PowerToysSetupVNext/EnvironmentVariables.wxs +++ b/installer/PowerToysSetupVNext/EnvironmentVariables.wxs @@ -1,6 +1,4 @@ - - + @@ -17,11 +15,11 @@ - + - + - + diff --git a/installer/PowerToysSetupVNext/FileExplorerPreview.wxs b/installer/PowerToysSetupVNext/FileExplorerPreview.wxs index 0a92d94c3e..b4369c3576 100644 --- a/installer/PowerToysSetupVNext/FileExplorerPreview.wxs +++ b/installer/PowerToysSetupVNext/FileExplorerPreview.wxs @@ -1,6 +1,4 @@ - - + @@ -28,13 +26,13 @@ - + - + - - - + + + diff --git a/installer/PowerToysSetupVNext/FileLocksmith.wxs b/installer/PowerToysSetupVNext/FileLocksmith.wxs index 085e60eaa7..14136be3a2 100644 --- a/installer/PowerToysSetupVNext/FileLocksmith.wxs +++ b/installer/PowerToysSetupVNext/FileLocksmith.wxs @@ -1,6 +1,4 @@ - - + @@ -15,7 +13,7 @@ - + @@ -23,20 +21,20 @@ - + - + - + - + - + diff --git a/installer/PowerToysSetupVNext/Hosts.wxs b/installer/PowerToysSetupVNext/Hosts.wxs index cb86aa8e11..9aa61f9260 100644 --- a/installer/PowerToysSetupVNext/Hosts.wxs +++ b/installer/PowerToysSetupVNext/Hosts.wxs @@ -1,6 +1,4 @@ - - + @@ -17,11 +15,11 @@ - + - + - + diff --git a/installer/PowerToysSetupVNext/ImageResizer.wxs b/installer/PowerToysSetupVNext/ImageResizer.wxs index 9f4602939a..3c2dbb63e3 100644 --- a/installer/PowerToysSetupVNext/ImageResizer.wxs +++ b/installer/PowerToysSetupVNext/ImageResizer.wxs @@ -1,6 +1,4 @@ - - + @@ -16,79 +14,37 @@ - + - + - - - - - - - - - - - - - + + + + + + + + + + + + + - + - + - + diff --git a/installer/PowerToysSetupVNext/KeyboardManager.wxs b/installer/PowerToysSetupVNext/KeyboardManager.wxs index dc216ccde3..9aa9fc9472 100644 --- a/installer/PowerToysSetupVNext/KeyboardManager.wxs +++ b/installer/PowerToysSetupVNext/KeyboardManager.wxs @@ -1,6 +1,4 @@ - - + @@ -12,42 +10,42 @@ - + - + - - - - - - + + + + + + - - - - - + + + + + - + - + - + - + - + - - + + diff --git a/installer/PowerToysSetupVNext/MonacoSRC.wxs b/installer/PowerToysSetupVNext/MonacoSRC.wxs index 379776d194..efa0ae97bc 100644 --- a/installer/PowerToysSetupVNext/MonacoSRC.wxs +++ b/installer/PowerToysSetupVNext/MonacoSRC.wxs @@ -1,5 +1,4 @@ - - + @@ -10,785 +9,785 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/installer/PowerToysSetupVNext/MouseWithoutBorders.wxs b/installer/PowerToysSetupVNext/MouseWithoutBorders.wxs index 8a5efa1f8d..9a0453f296 100644 --- a/installer/PowerToysSetupVNext/MouseWithoutBorders.wxs +++ b/installer/PowerToysSetupVNext/MouseWithoutBorders.wxs @@ -1,7 +1,4 @@ - - + @@ -9,7 +6,7 @@ - + diff --git a/installer/PowerToysSetupVNext/NewPlus.wxs b/installer/PowerToysSetupVNext/NewPlus.wxs index 4dd1c67701..7e70c54ea0 100644 --- a/installer/PowerToysSetupVNext/NewPlus.wxs +++ b/installer/PowerToysSetupVNext/NewPlus.wxs @@ -1,6 +1,4 @@ - - + @@ -20,7 +18,7 @@ - + @@ -28,17 +26,17 @@ - + - + - + - + @@ -48,22 +46,22 @@ - + - + - + - + - + @@ -71,13 +69,13 @@ - + - + - - - + + + diff --git a/installer/PowerToysSetupVNext/Peek.wxs b/installer/PowerToysSetupVNext/Peek.wxs index f87794e945..9b37c2e162 100644 --- a/installer/PowerToysSetupVNext/Peek.wxs +++ b/installer/PowerToysSetupVNext/Peek.wxs @@ -1,6 +1,4 @@ - - + @@ -17,11 +15,11 @@ - + - + - + diff --git a/installer/PowerToysSetupVNext/PowerRename.wxs b/installer/PowerToysSetupVNext/PowerRename.wxs index 1e722d9334..5b0ca63d3d 100644 --- a/installer/PowerToysSetupVNext/PowerRename.wxs +++ b/installer/PowerToysSetupVNext/PowerRename.wxs @@ -1,6 +1,4 @@ - - + @@ -15,7 +13,7 @@ - + @@ -23,21 +21,21 @@ - + - + - + - + - + diff --git a/installer/PowerToysSetupVNext/PowerToys.wxs b/installer/PowerToysSetupVNext/PowerToys.wxs index 2e50d278fb..6a6e37b51f 100644 --- a/installer/PowerToysSetupVNext/PowerToys.wxs +++ b/installer/PowerToysSetupVNext/PowerToys.wxs @@ -1,90 +1,54 @@ - + - - - + - - - - + + + + - + - + - - + + - - - - + + + + - MinimumVersion >= DetectedPowerToysVersion - TargetPowerToysVersion >= DetectedPowerToysUserVersion OR WixBundleInstalled + + - MinimumVersion >= DetectedPowerToysUserVersion - TargetPowerToysVersion >= DetectedPowerToysVersion OR WixBundleInstalled + + - + - DetectedWindowsBuildNumber >= 19041 OR WixBundleInstalled + - + - + - + diff --git a/installer/PowerToysSetupVNext/PowerToysBootstrapperVNext.wixproj b/installer/PowerToysSetupVNext/PowerToysBootstrapperVNext.wixproj index f5ee3564c1..28ba799a32 100644 --- a/installer/PowerToysSetupVNext/PowerToysBootstrapperVNext.wixproj +++ b/installer/PowerToysSetupVNext/PowerToysBootstrapperVNext.wixproj @@ -1,15 +1,12 @@ - - + + + false + - Version=$(Version) PowerToysVNextBootstrapper - {da4e9744-80be-424c-b0f5-afd8757db575} $(DefineConstants);PerUser=true @@ -21,8 +18,6 @@ Release x64 arm64 - 3.10 - 2.0 PowerToysSetup-$(Version)-$(Platform) Bundle True @@ -31,52 +26,19 @@ $(Platform)\$(Configuration)\MachineSetup $(Platform)\$(Configuration)\UserSetup obj\$(Platform)\$(Configuration)\ - - - $(WixExtDir)\WixUtilExtension.dll - WixUtilExtension - - - $(WixExtDir)\WixUIExtension.dll - WixUIExtension - - - $(WixExtDir)\WixNetFxExtension.dll - WixNetFxExtension - - - $(WixExtDir)\WixBalExtension.dll - WixBalExtension - + + + + - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - diff --git a/installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj b/installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj index e2c66c0f28..4ab9e94229 100644 --- a/installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj +++ b/installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj @@ -1,5 +1,8 @@ - - + + + + false + @@ -8,13 +11,6 @@ The build pipeline builds the Settings and Launcher projects for Publication using a specific profile. If you're doing local installer builds, this will simulate the build pipeline doing that for you. --> - IF NOT DEFINED IsPipeline ( -call "$([MSBuild]::GetVsInstallRoot())\Common7\Tools\VsDevCmd.bat" -arch=amd64 -host_arch=amd64 -winsdk=10.0.19041.0 -vcvars_ver=$(VCToolsVersion) -SET PTRoot=$(SolutionDir)\.. -call "..\..\..\publish.cmd" x64 -) -call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateMonacoWxs.ps1 -monacoWxsFile "$(MSBuildThisFileDirectory)\MonacoSRC.wxs" - Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\ARM64\$(Configuration)\Assets\Monaco\monacoSRC @@ -28,33 +24,6 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil Always - - call move /Y ..\..\..\AdvancedPaste.wxs.bk ..\..\..\AdvancedPaste.wxs - call move /Y ..\..\..\Awake.wxs.bk ..\..\..\Awake.wxs - call move /Y ..\..\..\BaseApplications.wxs.bk ..\..\..\BaseApplications.wxs - call move /Y ..\..\..\ColorPicker.wxs.bk ..\..\..\ColorPicker.wxs - call move /Y ..\..\..\Core.wxs.bk ..\..\..\Core.wxs - call move /Y ..\..\..\EnvironmentVariables.wxs.bk ..\..\..\EnvironmentVariables.wxs - call move /Y ..\..\..\FileExplorerPreview.wxs.bk ..\..\..\FileExplorerPreview.wxs - call move /Y ..\..\..\FileLocksmith.wxs.bk ..\..\..\FileLocksmith.wxs - call move /Y ..\..\..\Hosts.wxs.bk ..\..\..\Hosts.wxs - call move /Y ..\..\..\ImageResizer.wxs.bk ..\..\..\ImageResizer.wxs - call move /Y ..\..\..\KeyboardManager.wxs.bk ..\..\..\KeyboardManager.wxs - call move /Y ..\..\..\MouseWithoutBorders.wxs.bk ..\..\..\MouseWithoutBorders.wxs - call move /Y ..\..\..\NewPlus.wxs.bk ..\..\..\NewPlus.wxs - call move /Y ..\..\..\Peek.wxs.bk ..\..\..\Peek.wxs - call move /Y ..\..\..\PowerRename.wxs.bk ..\..\..\PowerRename.wxs - call move /Y ..\..\..\Product.wxs.bk ..\..\..\Product.wxs - call move /Y ..\..\..\RegistryPreview.wxs.bk ..\..\..\RegistryPreview.wxs - call move /Y ..\..\..\Resources.wxs.bk ..\..\..\Resources.wxs - call move /Y ..\..\..\Run.wxs.bk ..\..\..\Run.wxs - call move /Y ..\..\..\Settings.wxs.bk ..\..\..\Settings.wxs - call move /Y ..\..\..\ShortcutGuide.wxs.bk ..\..\..\ShortcutGuide.wxs - call move /Y ..\..\..\Tools.wxs.bk ..\..\..\Tools.wxs - call move /Y ..\..\..\WinAppSDK.wxs.bk ..\..\..\WinAppSDK.wxs - call move /Y ..\..\..\WinUI3Applications.wxs.bk ..\..\..\WinUI3Applications.wxs - call move /Y ..\..\..\Workspaces.wxs.bk ..\..\..\Workspaces.wxs - $(DefineConstants);PerUser=true @@ -67,15 +36,9 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil Release $(Platform) - 3.10 - {b6e94700-df38-41f6-a3fd-18b69674ab1e} - 2.0 PowerToysSetup-$(Version)-$(Platform) PowerToysUserSetup-$(Version)-$(Platform) - Package True - - ICE91 @@ -125,22 +88,11 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil - - $(WixExtDir)\WixFirewallExtension.dll - WixFirewallExtension - - - $(WixExtDir)\WixUtilExtension.dll - WixUtilExtension - - - $(WixExtDir)\WixUIExtension.dll - WixUIExtension - - - $(WixExtDir)\WixNetFxExtension.dll - WixNetFxExtension - + + + + + @@ -155,30 +107,6 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil INSTALLFOLDER - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - @@ -186,4 +114,14 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil + + + + + + + + + + \ No newline at end of file diff --git a/installer/PowerToysSetupVNext/Product.wxs b/installer/PowerToysSetupVNext/Product.wxs index 33dc8d0e55..ebe0016f7e 100644 --- a/installer/PowerToysSetupVNext/Product.wxs +++ b/installer/PowerToysSetupVNext/Product.wxs @@ -1,6 +1,4 @@ - - + @@ -18,23 +16,15 @@ - https://robmensching.com/blog/posts/2003/10/4/windows-installer-components-introduction/ --> - + - + - + @@ -43,16 +33,13 @@ - - = 19041)]]> - + - + - + @@ -86,50 +73,33 @@ - - 1 - 1 + + + - NOT Installed - 1 - NOT Installed - NOT Installed - Installed AND _REMOVE_ALL="Yes" - Installed AND _REMOVE_ALL="Yes" - Installed AND NOT (_REMOVE_ALL="Yes") - Installed AND NOT (_REMOVE_ALL="Yes") + + + + + + + + - + - - - + - - ""]]> - - - DEFAULTBOOTSTRAPPERINSTALLFOLDER OR PREVIOUSINSTALLFOLDER = ""]]> - + + @@ -144,12 +114,8 @@ - - NOT Installed - - - NOT Installed - + + @@ -157,288 +123,110 @@ NOT Installed --> - + - - NOT Installed - - - Installed and (NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL") - - - Installed AND (REMOVE="ALL") - - - Installed AND (REMOVE="ALL") - - - Installed AND (NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL") - - - Installed AND (NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL") - - - WIX_UPGRADE_DETECTED - - - Installed AND (NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL") - + + + + + + + + - - Installed AND (REMOVE="ALL") - + - NOT Installed + - NOT Installed + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -446,7 +234,6 @@ - @@ -459,13 +246,12 @@ - + - - - - - - + + + + + diff --git a/installer/PowerToysSetupVNext/RegistryPreview.wxs b/installer/PowerToysSetupVNext/RegistryPreview.wxs index f7bd3948d4..f54a328881 100644 --- a/installer/PowerToysSetupVNext/RegistryPreview.wxs +++ b/installer/PowerToysSetupVNext/RegistryPreview.wxs @@ -1,6 +1,4 @@ - - + @@ -18,11 +16,11 @@ - + - + - + diff --git a/installer/PowerToysSetupVNext/Resources.wxs b/installer/PowerToysSetupVNext/Resources.wxs index 0f4e10f4a6..8fa13cf89d 100644 --- a/installer/PowerToysSetupVNext/Resources.wxs +++ b/installer/PowerToysSetupVNext/Resources.wxs @@ -1,6 +1,4 @@ - - + @@ -161,300 +159,202 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -464,9 +364,9 @@ - + - + @@ -523,27 +423,27 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/installer/PowerToysSetupVNext/Run.wxs b/installer/PowerToysSetupVNext/Run.wxs index 94a589585f..22dee71eeb 100644 --- a/installer/PowerToysSetupVNext/Run.wxs +++ b/installer/PowerToysSetupVNext/Run.wxs @@ -1,6 +1,4 @@ - - + @@ -396,52 +394,52 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/installer/PowerToysSetupVNext/Settings.wxs b/installer/PowerToysSetupVNext/Settings.wxs index 07a2b056dc..d32ff1f691 100644 --- a/installer/PowerToysSetupVNext/Settings.wxs +++ b/installer/PowerToysSetupVNext/Settings.wxs @@ -1,6 +1,4 @@ - - + @@ -19,9 +17,9 @@ - + - + @@ -48,9 +46,9 @@ - + - + @@ -63,17 +61,17 @@ - + - + - - - - - + + + + + - + diff --git a/installer/PowerToysSetupVNext/ShortcutGuide.wxs b/installer/PowerToysSetupVNext/ShortcutGuide.wxs index 729a805861..9d0dca30c3 100644 --- a/installer/PowerToysSetupVNext/ShortcutGuide.wxs +++ b/installer/PowerToysSetupVNext/ShortcutGuide.wxs @@ -1,6 +1,4 @@ - - + @@ -18,12 +16,12 @@ - - + + - + - + diff --git a/installer/PowerToysSetupVNext/Tools.wxs b/installer/PowerToysSetupVNext/Tools.wxs index 24c3fc2007..9e43e90916 100644 --- a/installer/PowerToysSetupVNext/Tools.wxs +++ b/installer/PowerToysSetupVNext/Tools.wxs @@ -1,31 +1,29 @@ - - + - + - + - + - + - + - + - + diff --git a/installer/PowerToysSetupVNext/WinAppSDK.wxs b/installer/PowerToysSetupVNext/WinAppSDK.wxs index 631fb033ef..00b8395735 100644 --- a/installer/PowerToysSetupVNext/WinAppSDK.wxs +++ b/installer/PowerToysSetupVNext/WinAppSDK.wxs @@ -1,6 +1,4 @@ - - + @@ -9,15 +7,15 @@ - + - + - + - + @@ -319,12 +317,9 @@ - + - + @@ -332,9 +327,9 @@ - + - + @@ -452,11 +447,11 @@ - + - - + + diff --git a/installer/PowerToysSetupVNext/WinUI3Applications.wxs b/installer/PowerToysSetupVNext/WinUI3Applications.wxs index 742f3dcf80..8d3a0404a4 100644 --- a/installer/PowerToysSetupVNext/WinUI3Applications.wxs +++ b/installer/PowerToysSetupVNext/WinUI3Applications.wxs @@ -1,6 +1,4 @@ - - + diff --git a/installer/PowerToysSetupVNext/Workspaces.wxs b/installer/PowerToysSetupVNext/Workspaces.wxs index 4237aab945..de29e8f90a 100644 --- a/installer/PowerToysSetupVNext/Workspaces.wxs +++ b/installer/PowerToysSetupVNext/Workspaces.wxs @@ -1,6 +1,4 @@ - - + @@ -18,12 +16,12 @@ - - + + - + - + diff --git a/installer/PowerToysSetupVNext/packages.config b/installer/PowerToysSetupVNext/packages.config deleted file mode 100644 index 569e1bea86..0000000000 --- a/installer/PowerToysSetupVNext/packages.config +++ /dev/null @@ -1,3 +0,0 @@ - - -