OSSForks/node
1
0
Fork 0
mirror of https://github.com/zebrajr/node.git synced 2026-01-15 12:15:26 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

msi: fix WiX warnings

Browse Source 
Refs: https://github.com/nodejs/build/issues/4130
PR-URL: https://github.com/nodejs/node/pull/60251
Fixes: https://github.com/nodejs/build/issues/4130
Reviewed-By: Richard Lau <richard.lau@ibm.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
This commit is contained in:
Stefan Stojanovic
2025-10-22 08:38:18 +02:00
committed by GitHub
parent a5f3cd8cb5
commit fe02cab92c
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tools/msvs/msi/nodemsi/nodemsi.wixproj
View File

@@ -1,5 +1,5 @@
<Project Sdk="WixToolset.Sdk/4.0.0-rc.1"> <Project>
<Import Project="Sdk.props" Sdk="WixToolset.Sdk" Version="4.0.0-rc.1" /> <Import Project="Sdk.props" Sdk="WixToolset.Sdk" Version="4.0.6" />
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x64</Platform> <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
@@ -36,20 +36,24 @@
</Compile> </Compile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="WixToolset.UI.wixext" Version="4.0.0-rc.1" /> <PackageReference Include="WixToolset.UI.wixext" Version="4.0.6" />
<PackageReference Include="WixToolset.Util.wixext" Version="4.0.0-rc.1" /> <PackageReference Include="WixToolset.Util.wixext" Version="4.0.6" />
<PackageReference Include="WixToolset.Heat" Version="4.0.0-rc.1" /> <PackageReference Include="WixToolset.Heat" Version="4.0.6" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="../custom_actions/custom_actions.vcxproj" /> <ProjectReference Include="../custom_actions/custom_actions.vcxproj" />
</ItemGroup> </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"> <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 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> </HeatDirectory>
</Target> </Target>
<PropertyGroup> <Target Name="AfterBuild">
<PostBuildEvent>move "$(TargetDir)en-us\$(TargetFileName)" "$(TargetPath)" <Move SourceFiles="$(OutputPath)en-us\$(OutputName).msi"
move "$(TargetDir)en-us\$(TargetPdbFileName)" "$(TargetPdbPath)"</PostBuildEvent> DestinationFiles="$(OutputPath)$(OutputName).msi"
</PropertyGroup> 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> </Project>