From e3abcc74007f4b1a5a555128b65120e58a78c5d3 Mon Sep 17 00:00:00 2001 From: StefanStojanovic Date: Thu, 2 Mar 2023 15:35:02 +0100 Subject: [PATCH] msi: fixup WiX4 migration Fixed a few nodemsi WiX warnings and added NuGet.Config file. --- BUILDING.md | 4 ++++ tools/msvs/msi/NuGet.Config | 6 ++++++ tools/msvs/msi/nodemsi/product.wxs | 30 +++++++++++++++--------------- 3 files changed, 25 insertions(+), 15 deletions(-) create mode 100644 tools/msvs/msi/NuGet.Config diff --git a/BUILDING.md b/BUILDING.md index 0aebcf9caf3751..82a01ac0aeeef1 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -584,6 +584,10 @@ to run it again before invoking `make -j4`. to `PATH`. A build with the `openssl-no-asm` option does not need this, nor does a build targeting ARM64 Windows. +Optional requirements to build the MSI installer package: + +* The .NET SDK component from [Visual Studio 2019](https://visualstudio.microsoft.com/vs/older-downloads/#visual-studio-2019-and-other-products) + Optional requirements for compiling for Windows 10 on ARM (ARM64): * Visual Studio 15.9.0 or newer diff --git a/tools/msvs/msi/NuGet.Config b/tools/msvs/msi/NuGet.Config new file mode 100644 index 00000000000000..19d85b78fdf998 --- /dev/null +++ b/tools/msvs/msi/NuGet.Config @@ -0,0 +1,6 @@ + + + + + + diff --git a/tools/msvs/msi/nodemsi/product.wxs b/tools/msvs/msi/nodemsi/product.wxs index b9ff500dcb5b00..de4a6a34cee118 100644 --- a/tools/msvs/msi/nodemsi/product.wxs +++ b/tools/msvs/msi/nodemsi/product.wxs @@ -123,14 +123,14 @@ - - - + + + - - - + + + @@ -241,17 +241,17 @@ + - - - - - - - - + + + + + + + - +