Commit 88a7df7
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 abdeb18 commit 88a7df7
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> | |
@@ -39,22 +39,26 @@ | |||
| 39 | 39 | </Compile> | |
| 40 | 40 | </ItemGroup> | |
| 41 | 41 | <ItemGroup> | |
| 42 | - <PackageReference Include="WixToolset.UI.wixext" Version="4.0.0-rc.1" /> | ||
| 43 | - <PackageReference Include="WixToolset.Util.wixext" Version="4.0.0-rc.1" /> | ||
| 44 | - <PackageReference Include="WixToolset.Heat" Version="4.0.0-rc.1" /> | ||
| 42 | + <PackageReference Include="WixToolset.UI.wixext" Version="4.0.6" /> | ||
| 43 | + <PackageReference Include="WixToolset.Util.wixext" Version="4.0.6" /> | ||
| 44 | + <PackageReference Include="WixToolset.Heat" Version="4.0.6" /> | ||
| 45 | 45 | </ItemGroup> | |
| 46 | 46 | <ItemGroup> | |
| 47 | 47 | <ProjectReference Include="../custom_actions/custom_actions.vcxproj" /> | |
| 48 | 48 | </ItemGroup> | |
| 49 | - <Import Project="Sdk.targets" Sdk="WixToolset.Sdk" Version="4.0.0-rc.1" /> | ||
| 49 | + <Import Project="Sdk.targets" Sdk="WixToolset.Sdk" Version="4.0.6" /> | ||
| 50 | 50 | <Target Name="BeforeBuild"> | |
| 51 | 51 | <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"> | |
| 52 | 52 | </HeatDirectory> | |
| 53 | 53 | <HeatDirectory ToolPath="$(WixToolPath)" Directory="..\..\..\..\Release\node-v$(FullVersion)-win-$(Platform)\node_modules\corepack" PreprocessorVariable="var.CorepackSourceDir" DirectoryRefId="NodeModulesFolder" ComponentGroupName="CorepackSourceFiles" GenerateGuidsNow="true" SuppressFragments="false" OutputFile="..\..\..\..\corepack.wxs"> | |
| 54 | 54 | </HeatDirectory> | |
| 55 | 55 | </Target> | |
| 56 | - <PropertyGroup> | ||
| 57 | - <PostBuildEvent>move "$(TargetDir)en-us\$(TargetFileName)" "$(TargetPath)" | ||
| 58 | - move "$(TargetDir)en-us\$(TargetPdbFileName)" "$(TargetPdbPath)"</PostBuildEvent> | ||
| 59 | - </PropertyGroup> | ||
| 56 | + <Target Name="AfterBuild"> | ||
| 57 | + <Move SourceFiles="$(OutputPath)en-us\$(OutputName).msi" | ||
| 58 | + DestinationFiles="$(OutputPath)$(OutputName).msi" | ||
| 59 | + Condition="Exists('$(OutputPath)en-us\$(OutputName).msi')" /> | ||
| 60 | + <Move SourceFiles="$(OutputPath)en-us\$(OutputName).wixpdb" | ||
| 61 | + DestinationFiles="$(OutputPath)$(OutputName).wixpdb" | ||
| 62 | + Condition="Exists('$(OutputPath)en-us\$(OutputName).wixpdb')" /> | ||
| 63 | + </Target> | ||
| 60 | 64 | </Project> | |
0 commit comments