Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 063fbd8

Browse filesBrowse files
StefanStojanovicaduh95
authored andcommitted
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
Copy full SHA for 063fbd8

File tree

Expand file treeCollapse file tree

1 file changed

+14
-10
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

1 file changed

+14
-10
lines changed
Open diff view settings
Collapse file

‎tools/msvs/msi/nodemsi/nodemsi.wixproj‎

Copy file name to clipboardExpand all lines: tools/msvs/msi/nodemsi/nodemsi.wixproj
+14-10Lines 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>
@@ -36,20 +36,24 @@
3636
</Compile>
3737
</ItemGroup>
3838
<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" />
4242
</ItemGroup>
4343
<ItemGroup>
4444
<ProjectReference Include="../custom_actions/custom_actions.vcxproj" />
4545
</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" />
4747
<Target Name="BeforeBuild">
4848
<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">
4949
</HeatDirectory>
5050
</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>
5559
</Project>

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.