From 888875fabc0818633a3fc59fd5625e5ea7cab561 Mon Sep 17 00:00:00 2001
From: StefanStojanovic <stefan.stojanovic@janeasystems.com>
Date: Mon, 13 Oct 2025 15:00:05 +0200
Subject: [PATCH] msi: fix WiX warnings

Refs: https://github.com/nodejs/build/issues/4130
---
 tools/msvs/msi/nodemsi/nodemsi.wixproj | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/tools/msvs/msi/nodemsi/nodemsi.wixproj b/tools/msvs/msi/nodemsi/nodemsi.wixproj
index 0e220b9dd51739..4170e53cf738f5 100644
--- a/tools/msvs/msi/nodemsi/nodemsi.wixproj
+++ b/tools/msvs/msi/nodemsi/nodemsi.wixproj
@@ -1,5 +1,5 @@
-<Project Sdk="WixToolset.Sdk/4.0.0-rc.1">
-  <Import Project="Sdk.props" Sdk="WixToolset.Sdk" Version="4.0.0-rc.1" />
+<Project>
+  <Import Project="Sdk.props" Sdk="WixToolset.Sdk" Version="4.0.6" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
@@ -36,20 +36,24 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.UI.wixext" Version="4.0.0-rc.1" />
-    <PackageReference Include="WixToolset.Util.wixext" Version="4.0.0-rc.1" />
-    <PackageReference Include="WixToolset.Heat" Version="4.0.0-rc.1" />
+    <PackageReference Include="WixToolset.UI.wixext" Version="4.0.6" />
+    <PackageReference Include="WixToolset.Util.wixext" Version="4.0.6" />
+    <PackageReference Include="WixToolset.Heat" Version="4.0.6" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="../custom_actions/custom_actions.vcxproj" />
   </ItemGroup>
-  <Import Project="Sdk.targets" Sdk="WixToolset.Sdk" Version="4.0.0-rc.1" />
+  <Import Project="Sdk.targets" Sdk="WixToolset.Sdk" Version="4.0.6" />
   <Target Name="BeforeBuild">
     <HeatDirectory ToolPath="$(WixToolPath)" Directory="..\..\..\..\Release\node-v$(FullVersion)-win-$(Platform)\node_modules\npm" PreprocessorVariable="var.NpmSourceDir" DirectoryRefId="NodeModulesFolder" ComponentGroupName="NpmSourceFiles" GenerateGuidsNow="true" SuppressFragments="false" OutputFile="..\..\..\..\npm.wxs">
     </HeatDirectory>
   </Target>
-  <PropertyGroup>
-    <PostBuildEvent>move "$(TargetDir)en-us\$(TargetFileName)" "$(TargetPath)"
-    move "$(TargetDir)en-us\$(TargetPdbFileName)" "$(TargetPdbPath)"</PostBuildEvent>
-  </PropertyGroup>
+  <Target Name="AfterBuild">
+    <Move SourceFiles="$(OutputPath)en-us\$(OutputName).msi"
+          DestinationFiles="$(OutputPath)$(OutputName).msi"
+          Condition="Exists('$(OutputPath)en-us\$(OutputName).msi')" />
+    <Move SourceFiles="$(OutputPath)en-us\$(OutputName).wixpdb"
+          DestinationFiles="$(OutputPath)$(OutputName).wixpdb"
+          Condition="Exists('$(OutputPath)en-us\$(OutputName).wixpdb')" />
+  </Target>
 </Project>