Skip to content

Commit 17cdadc

Browse files
msi: fixup WiX4 migration
Fixed a few nodemsi WiX warnings and added NuGet.Config file.
1 parent dd7a84f commit 17cdadc

File tree

2 files changed

+21
-15
lines changed

2 files changed

+21
-15
lines changed

tools/msvs/msi/NuGet.Config

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<packageSources>
4+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
5+
</packageSources>
6+
</configuration>

tools/msvs/msi/nodemsi/product.wxs

+15-15
Original file line numberDiff line numberDiff line change
@@ -123,14 +123,14 @@
123123
</Feature>
124124
</Feature>
125125

126-
<StandardDirectory Id="ProgramMenuFolder">
127-
<Directory Id="ApplicationProgramsFolder" Name="Node.js"/>
128-
</StandardDirectory>
126+
<StandardDirectory Id="ProgramMenuFolder">
127+
<Directory Id="ApplicationProgramsFolder" Name="Node.js"/>
128+
</StandardDirectory>
129129

130-
<Directory Id="$(var.ProgramFilesFolderId)">
131-
<Directory Id="INSTALLDIR" Name="nodejs">
132-
</Directory>
130+
<StandardDirectory Id="$(var.ProgramFilesFolderId)">
131+
<Directory Id="INSTALLDIR" Name="nodejs">
133132
</Directory>
133+
</StandardDirectory>
134134

135135
<DirectoryRef Id="INSTALLDIR">
136136
<Component Id="NodeExecutable">
@@ -241,17 +241,17 @@
241241
</Component>
242242
</Directory>
243243
</Directory>
244+
</DirectoryRef>
244245

245-
<Directory Id="AppDataFolder">
246-
<Directory Id="AppDataDir" Name="npm">
247-
<Component Id="AppData" Guid="D3B35D0E-D0F9-4D11-A773-D4608E90E1D1">
248-
<CreateFolder />
249-
<RemoveFolder Id="AppDataDir" On="uninstall" />
250-
<RegistryValue Root="HKCU" Key="$(var.RegistryKeyPath)\Components" Type="string" Value="" />
251-
</Component>
252-
</Directory>
246+
<StandardDirectory Id="AppDataFolder">
247+
<Directory Id="AppDataDir" Name="npm">
248+
<Component Id="AppData" Guid="D3B35D0E-D0F9-4D11-A773-D4608E90E1D1">
249+
<CreateFolder />
250+
<RemoveFolder Id="AppDataDir" On="uninstall" />
251+
<RegistryValue Root="HKCU" Key="$(var.RegistryKeyPath)\Components" Type="string" Value="" />
252+
</Component>
253253
</Directory>
254-
</DirectoryRef>
254+
</StandardDirectory>
255255

256256
<DirectoryRef Id="ApplicationProgramsFolder">
257257
<Component Id="DocumentationShortcuts">

0 commit comments

Comments
 (0)