From 603febd2edb1efb44759d750829c9d5e46b97ebe Mon Sep 17 00:00:00 2001
From: "Peiyao Zhao (from Dev Box)" <peiyaozhao@microsoft.com>
Date: Tue, 15 Apr 2025 12:33:45 +0800
Subject: [PATCH] update

---
 Directory.Packages.props                           | 14 ++++++--------
 installer/PowerToysSetupVNext/Common.wxi           |  2 +-
 installer/PowerToysSetupVNext/Core.wxs             |  2 +-
 .../PowerToysInstallerVNext.wixproj                |  3 ---
 installer/PowerToysSetupVNext/Product.wxs          |  2 +-
 5 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 0c4838afe2..fcba240c34 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -98,18 +98,16 @@
     <PackageVersion Include="WinUIEx" Version="2.2.0" />
     <PackageVersion Include="WPF-UI" Version="3.0.5" />
     <PackageVersion Include="WyHash" Version="1.0.5" />
+    <PackageVersion Include="WixToolset.Heat" Version="5.0.2" />
+    <PackageVersion Include="WixToolset.Firewall.wixext" Version="5.0.2" />
+    <PackageVersion Include="WixToolset.Util.wixext" Version="5.0.2" />
+    <PackageVersion Include="WixToolset.UI.wixext" Version="5.0.2" />
+    <PackageVersion Include="WixToolset.NetFx.wixext" Version="5.0.2" />
+    <PackageVersion Include="WixToolset.Bal.wixext" Version="5.0.2" />
   </ItemGroup>
   <ItemGroup Condition="'$(IsExperimentationLive)'!=''">
     <!-- Additional dependencies used by experimentation -->
     <PackageVersion Include="Microsoft.VariantAssignment.Client" Version="2.4.17140001" />
     <PackageVersion Include="Microsoft.VariantAssignment.Contract" Version="3.0.16990001" />
   </ItemGroup>
-  <ItemGroup>
-     <PackageVersion Include="WixToolset.Heat" Version="5.0.2" />
-     <PackageVersion Include="WixToolset.Firewall.wixext" Version="5.0.2" />
-     <PackageVersion Include="WixToolset.Util.wixext" Version="5.0.2" />
-     <PackageVersion Include="WixToolset.UI.wixext" Version="5.0.2" />
-     <PackageVersion Include="WixToolset.NetFx.wixext" Version="5.0.2" />
-     <PackageVersion Include="WixToolset.Bal.wixext" Version="5.0.2" />
-   </ItemGroup>
 </Project>
diff --git a/installer/PowerToysSetupVNext/Common.wxi b/installer/PowerToysSetupVNext/Common.wxi
index 56f4c1ed21..4f6f8b235a 100644
--- a/installer/PowerToysSetupVNext/Common.wxi
+++ b/installer/PowerToysSetupVNext/Common.wxi
@@ -47,7 +47,7 @@
         <?define PerMachineYesNo="yes"?>
         <?define MSIPath="MachineSetup"?>
         <?define MSIName="PowerToysSetupVNext-$(var.Version)-$(var.PowerToysPlatform).msi"?>
-        <?define DefaultInstallDir="ProgramFiles64Folder" ?>
+        <?define DefaultInstallDir="CustomProgramFiles64Folder" ?>
         <?define RegistryScope="HKLM" ?>
         <?define InstallScope="perMachine" ?>
         <?define InstallPrivileges="elevated" ?>
diff --git a/installer/PowerToysSetupVNext/Core.wxs b/installer/PowerToysSetupVNext/Core.wxs
index eb3cbe8d36..d3f992d82e 100644
--- a/installer/PowerToysSetupVNext/Core.wxs
+++ b/installer/PowerToysSetupVNext/Core.wxs
@@ -18,7 +18,7 @@
         </RegistryKey>
       </Component>
       <Component Id="powertoys_exe" Guid="30261594-41A6-4509-AD09-FBC4E692F441" Bitness="always64">
-        <File Id="PowerToys.exe" Checksum="yes" />
+        <File Id="PowerToys.exe" Name="PowerToys.exe" Checksum="yes" />
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys">
           <RegistryValue Type="string" Name="URL Protocol" Value="" KeyPath="yes" />
           <RegistryValue Type="string" Value="URL:PowerToys custom internal URI protocol" />
diff --git a/installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj b/installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj
index 3e5c5ec90f..67f3a42956 100644
--- a/installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj
+++ b/installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj
@@ -173,9 +173,6 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
       <ErrorText>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}.</ErrorText>
     </PropertyGroup>
   </Target>
-  <Target Name="BeforeBuild">
-    <HarvestDirectory Directory="..\..\src\Monaco\monacoSRC" PreprocessorVariable="var.MonacoSRCHarvestPath" OutputFile="MonacoSRC.wxs" ComponentGroupName="MonacoSRCHeatGenerated" DirectoryRefId="MonacoPreviewHandlerMonacoSRCFolder" AutogenerateGuids="false" GenerateGuidsNow="true" SuppressFragments="false" SuppressRegistry="false" SuppressRootDirectory="true" />
-  </Target>
   <!-- Prevents NU1503 -->
   <Target Name="_IsProjectRestoreSupported" Returns="@(_ValidProjectsForRestore)">
     <ItemGroup>
diff --git a/installer/PowerToysSetupVNext/Product.wxs b/installer/PowerToysSetupVNext/Product.wxs
index 2b82bc0e03..970063124d 100644
--- a/installer/PowerToysSetupVNext/Product.wxs
+++ b/installer/PowerToysSetupVNext/Product.wxs
@@ -116,7 +116,7 @@
       <Custom Action="SetUnApplyModulesRegistryChangeSetsParam" Before="UnApplyModulesRegistryChangeSets" />
       <Custom Action="CheckGPO" After="InstallInitialize" Condition="NOT Installed" />
       <Custom Action="ApplyModulesRegistryChangeSets" After="InstallFiles" Condition="NOT Installed" />
-      <Custom Action="WixCloseApplications_x64" Before="RemoveFiles" />
+      <Custom Action="override Wix4CloseApplications_$(sys.BUILDARCHSHORT)" Before="RemoveFiles" />
       <Custom Action="RemovePowerToysSchTasks" After="RemoveFiles" />
       <!-- TODO: Use to activate embedded MSIX -->
       <!--<Custom Action="InstallEmbeddedMSIXTask" After="InstallFinalize">