msi: fixup WiX4 migration

Fixed a few nodemsi WiX warnings and added NuGet.Config file.
nodejs · Mar 2, 2023 · e3abcc7 · e3abcc7
1 parent ad698b1
commit e3abcc7
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 15 deletions.
diff --git 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
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+  </packageSources>
+</configuration>
diff --git a/tools/msvs/msi/nodemsi/product.wxs b/tools/msvs/msi/nodemsi/product.wxs
@@ -123,14 +123,14 @@
       </Feature>
     </Feature>
 
-      <StandardDirectory Id="ProgramMenuFolder">
-        <Directory Id="ApplicationProgramsFolder" Name="Node.js"/>
-      </StandardDirectory>
+    <StandardDirectory Id="ProgramMenuFolder">
+      <Directory Id="ApplicationProgramsFolder" Name="Node.js"/>
+    </StandardDirectory>
 
-      <Directory Id="$(var.ProgramFilesFolderId)">
-        <Directory Id="INSTALLDIR" Name="nodejs">
-        </Directory>
+    <StandardDirectory Id="$(var.ProgramFilesFolderId)">
+      <Directory Id="INSTALLDIR" Name="nodejs">
       </Directory>
+    </StandardDirectory>
 
     <DirectoryRef Id="INSTALLDIR">
       <Component Id="NodeExecutable">
@@ -241,17 +241,17 @@
           </Component>
         </Directory>
       </Directory>
+    </DirectoryRef>
 
-      <Directory Id="AppDataFolder">
-        <Directory Id="AppDataDir" Name="npm">
-          <Component Id="AppData" Guid="D3B35D0E-D0F9-4D11-A773-D4608E90E1D1">
-            <CreateFolder />
-            <RemoveFolder Id="AppDataDir" On="uninstall" />
-            <RegistryValue Root="HKCU" Key="$(var.RegistryKeyPath)\Components" Type="string" Value="" />
-          </Component>
-        </Directory>
+    <StandardDirectory Id="AppDataFolder">
+      <Directory Id="AppDataDir" Name="npm">
+        <Component Id="AppData" Guid="D3B35D0E-D0F9-4D11-A773-D4608E90E1D1">
+          <CreateFolder />
+          <RemoveFolder Id="AppDataDir" On="uninstall" />
+          <RegistryValue Root="HKCU" Key="$(var.RegistryKeyPath)\Components" Type="string" Value="" />
+        </Component>
       </Directory>
-    </DirectoryRef>
+    </StandardDirectory>
 
     <DirectoryRef Id="ApplicationProgramsFolder">
       <Component Id="DocumentationShortcuts">