Skip to content

Commit 88a7df7

Browse files
StefanStojanovicaduh95
authored andcommitted
msi: fix WiX warnings
Refs: nodejs/build#4130 PR-URL: #60251 Fixes: nodejs/build#4130 Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>
1 parent abdeb18 commit 88a7df7

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

tools/msvs/msi/nodemsi/nodemsi.wixproj

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff 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" />
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">x64</Platform>
@@ -39,22 +39,26 @@
3939
</Compile>
4040
</ItemGroup>
4141
<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" />
4545
</ItemGroup>
4646
<ItemGroup>
4747
<ProjectReference Include="../custom_actions/custom_actions.vcxproj" />
4848
</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" />
5050
<Target Name="BeforeBuild">
5151
<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">
5252
</HeatDirectory>
5353
<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">
5454
</HeatDirectory>
5555
</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>
6064
</Project>

0 commit comments

Comments
 (0)