Commit 063fbd8
msi: fix WiX warnings
Refs: nodejs/build#4130
PR-URL: #60251
Fixes: nodejs/build#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>1 parent 6e8b029 commit 063fbd8
1 file changed
Lines changed: 14 additions & 10 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,5 +1,5 @@ | |||
| 1 | - <Project Sdk="WixToolset.Sdk/4.0.0-rc.1"> | ||
| 2 | - <Import Project="Sdk.props" Sdk="WixToolset.Sdk" Version="4.0.0-rc.1" /> | ||
| 1 | + <Project> | ||
| 2 | + <Import Project="Sdk.props" Sdk="WixToolset.Sdk" Version="4.0.6" /> | ||
| 3 | 3 | <PropertyGroup> | |
| 4 | 4 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | |
| 5 | 5 | <Platform Condition=" '$(Platform)' == '' ">x64</Platform> | |
@@ -36,20 +36,24 @@ | |||
| 36 | 36 | </Compile> | |
| 37 | 37 | </ItemGroup> | |
| 38 | 38 | <ItemGroup> | |
| 39 | - <PackageReference Include="WixToolset.UI.wixext" Version="4.0.0-rc.1" /> | ||
| 40 | - <PackageReference Include="WixToolset.Util.wixext" Version="4.0.0-rc.1" /> | ||
| 41 | - <PackageReference Include="WixToolset.Heat" Version="4.0.0-rc.1" /> | ||
| 39 | + <PackageReference Include="WixToolset.UI.wixext" Version="4.0.6" /> | ||
| 40 | + <PackageReference Include="WixToolset.Util.wixext" Version="4.0.6" /> | ||
| 41 | + <PackageReference Include="WixToolset.Heat" Version="4.0.6" /> | ||
| 42 | 42 | </ItemGroup> | |
| 43 | 43 | <ItemGroup> | |
| 44 | 44 | <ProjectReference Include="../custom_actions/custom_actions.vcxproj" /> | |
| 45 | 45 | </ItemGroup> | |
| 46 | - <Import Project="Sdk.targets" Sdk="WixToolset.Sdk" Version="4.0.0-rc.1" /> | ||
| 46 | + <Import Project="Sdk.targets" Sdk="WixToolset.Sdk" Version="4.0.6" /> | ||
| 47 | 47 | <Target Name="BeforeBuild"> | |
| 48 | 48 | <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"> | |
| 49 | 49 | </HeatDirectory> | |
| 50 | 50 | </Target> | |
| 51 | - <PropertyGroup> | ||
| 52 | - <PostBuildEvent>move "$(TargetDir)en-us\$(TargetFileName)" "$(TargetPath)" | ||
| 53 | - move "$(TargetDir)en-us\$(TargetPdbFileName)" "$(TargetPdbPath)"</PostBuildEvent> | ||
| 54 | - </PropertyGroup> | ||
| 51 | + <Target Name="AfterBuild"> | ||
| 52 | + <Move SourceFiles="$(OutputPath)en-us\$(OutputName).msi" | ||
| 53 | + DestinationFiles="$(OutputPath)$(OutputName).msi" | ||
| 54 | + Condition="Exists('$(OutputPath)en-us\$(OutputName).msi')" /> | ||
| 55 | + <Move SourceFiles="$(OutputPath)en-us\$(OutputName).wixpdb" | ||
| 56 | + DestinationFiles="$(OutputPath)$(OutputName).wixpdb" | ||
| 57 | + Condition="Exists('$(OutputPath)en-us\$(OutputName).wixpdb')" /> | ||
| 58 | + </Target> | ||
| 55 | 59 | </Project> | |
0 commit comments