Skip to content

msi: fix WiX warnings #60251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −10
Open

msi: fix WiX warnings #60251

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions tools/msvs/msi/nodemsi/nodemsi.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project Sdk="WixToolset.Sdk/4.0.0-rc.1">
<Import Project="Sdk.props" Sdk="WixToolset.Sdk" Version="4.0.0-rc.1" />
<Project>
<Import Project="Sdk.props" Sdk="WixToolset.Sdk" Version="4.0.6" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x64</Platform>
Expand Down Expand Up @@ -36,20 +36,24 @@
</Compile>
</ItemGroup>
<ItemGroup>
<PackageReference Include="WixToolset.UI.wixext" Version="4.0.0-rc.1" />
<PackageReference Include="WixToolset.Util.wixext" Version="4.0.0-rc.1" />
<PackageReference Include="WixToolset.Heat" Version="4.0.0-rc.1" />
<PackageReference Include="WixToolset.UI.wixext" Version="4.0.6" />
<PackageReference Include="WixToolset.Util.wixext" Version="4.0.6" />
<PackageReference Include="WixToolset.Heat" Version="4.0.6" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="../custom_actions/custom_actions.vcxproj" />
</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">
<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>
</Target>
<PropertyGroup>
<PostBuildEvent>move "$(TargetDir)en-us\$(TargetFileName)" "$(TargetPath)"
move "$(TargetDir)en-us\$(TargetPdbFileName)" "$(TargetPdbPath)"</PostBuildEvent>
</PropertyGroup>
<Target Name="AfterBuild">
<Move SourceFiles="$(OutputPath)en-us\$(OutputName).msi"
DestinationFiles="$(OutputPath)$(OutputName).msi"
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>
Loading