We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent ef62e5a commit c03e79bCopy full SHA for c03e79b
.gitignore
@@ -65,12 +65,12 @@ _UpgradeReport_Files/
65
/tools/msvs/genfiles/
66
/npm.wxs
67
/corepack.wxs
68
-/tools/msvs/msi/Release/
69
-/tools/msvs/msi/obj/
70
-/tools/msvs/msi/x64/
+/tools/msvs/msi/**/Release/
+/tools/msvs/msi/**/obj/
+/tools/msvs/msi/**/x64/
71
# Exclude MSVS files used for .msi file generation
72
-!tools/msvs/msi/custom_actions.vcxproj
73
-!tools/msvs/msi/nodemsi.sln
+!tools/msvs/msi/**/custom_actions.vcxproj
+!tools/msvs/msi/**/nodemsi.sln
74
75
# === Rules for GYP artifacts ===
76
*-nodegyp*
BUILDING.md
@@ -586,10 +586,7 @@ to run it again before invoking `make -j4`.
586
587
Optional requirements to build the MSI installer package:
588
589
-* The [WiX Toolset v3.11](https://wixtoolset.org/releases/) and the
590
- [Wix Toolset Visual Studio 2019 Extension](https://marketplace.visualstudio.com/items?itemName=WixToolset.WixToolsetVisualStudio2019Extension)
591
-* The [WiX Toolset v3.14](https://wixtoolset.org/releases/) if
592
- building for Windows 10 on ARM (ARM64)
+* The .NET SDK component from [Visual Studio 2019](https://visualstudio.microsoft.com/vs/older-downloads/#visual-studio-2019-and-other-products)
593
594
Optional requiremen 8000 ts for compiling for Windows 10 on ARM (ARM64):
595
tools/msvs/msi/NuGet.Config
@@ -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/custom_actions.cc …svs/msi/custom_actions/custom_actions.cctools/msvs/msi/custom_actions.cc renamed to tools/msvs/msi/custom_actions/custom_actions.cc
@@ -77,27 +77,6 @@ extern "C" UINT WINAPI SetInstallScope(MSIHANDLE hInstall) {
77
return WcaFinalize(ERROR_SUCCESS);
78
}
79
80
-
81
-extern "C" UINT WINAPI BroadcastEnvironmentUpdate(MSIHANDLE hInstall) {
82
- HRESULT hr = S_OK;
83
- UINT er = ERROR_SUCCESS;
84
85
- hr = WcaInitialize(hInstall, "BroadcastEnvironmentUpdate");
86
- ExitOnFailure(hr, "Failed to initialize");
87
88
- SendMessageTimeoutW(HWND_BROADCAST,
89
- WM_SETTINGCHANGE,
90
- 0,
91
- (LPARAM) L"Environment",
92
- SMTO_ABORTIFHUNG,
93
- 5000,
94
- NULL);
95
96
-LExit:
97
- er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
98
- return WcaFinalize(er);
99
-}
100
101
#define AUTHENTICATED_USERS_SID L"S-1-5-11"
102
103
extern "C" UINT WINAPI GetLocalizedUserNames(MSIHANDLE hInstall) {
tools/msvs/msi/custom_actions.def …vs/msi/custom_actions/custom_actions.deftools/msvs/msi/custom_actions.def renamed to tools/msvs/msi/custom_actions/custom_actions.def
@@ -2,5 +2,4 @@ LIBRARY "custom_actions"
EXPORTS
SetInstallScope
-BroadcastEnvironmentUpdate
GetLocalizedUserNames
tools/msvs/msi/custom_actions.vcxproj …si/custom_actions/custom_actions.vcxprojtools/msvs/msi/custom_actions.vcxproj renamed to tools/msvs/msi/custom_actions/custom_actions.vcxproj
@@ -112,7 +112,7 @@
112
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
113
<ClCompile>
114
<Optimization>Disabled</Optimization>
115
- <AdditionalIncludeDirectories>$(WixSdkDir)\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(PkgWixToolset_WcaUtil)\build\native\include;$(PkgWixToolset_DUtil)\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
116
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
117
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
118
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -122,7 +122,7 @@
122
</ClCompile>
123
<Link>
124
<AdditionalDependencies>msi.lib;dutil.lib;wcautil.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
125
- <AdditionalLibraryDirectories>$(WixSdkDir)\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(PkgWixToolset_WcaUtil)\build\native\v14\x86;$(PkgWixToolset_DUtil)\build\native\v14\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
126
<ModuleDefinitionFile>custom_actions.def</ModuleDefinitionFile>
127
<GenerateDebugInformation>true</GenerateDebugInformation>
128
<SubSystem>Windows</SubSystem>
@@ -131,7 +131,7 @@
131
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
132
133
134
135
136
137
@@ -141,7 +141,7 @@
141
142
143
144
- <AdditionalLibraryDirectories>$(WixSdkDir)\lib\ARM64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(PkgWixToolset_WcaUtil)\build\native\v14\ARM64;$(PkgWixToolset_DUtil)\build\native\v14\ARM64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
145
146
147
@@ -150,7 +150,7 @@
150
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
151
152
153
154
155
156
@@ -160,7 +160,7 @@
160
161
162
163
- <AdditionalLibraryDirectories>$(WixSdkDir)\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(PkgWixToolset_WcaUtil)\build\native\v14\x64;$(PkgWixToolset_DUtil)\build\native\v14\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
164
165
166
@@ -170,7 +170,7 @@
170
171
<Optimization>MaxSpeed</Optimization>
172
<IntrinsicFunctions>true</IntrinsicFunctions>
173
174
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
175
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
176
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -184,7 +184,7 @@
184
185
186
187
188
189
190
@@ -196,7 +196,7 @@
196
197
198
199
200
201
202
@@ -210,7 +210,7 @@
210
211
212
213
214
215
216
@@ -222,7 +222,7 @@
222
223
224
225
226
227
228
@@ -236,7 +236,7 @@
236
237
238
239
240
241
242
@@ -254,4 +254,12 @@
254
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
255
<ImportGroup Label="ExtensionTargets">
256
</ImportGroup>
257
+ <ItemGroup>
258
+ <PackageReference Include="WixToolset.WcaUtil" Version="4.0.0-rc.1" GeneratePathProperty="true" />
259
+ <PackageReference Include="WixToolset.DUtil" Version="4.0.0-rc.1" GeneratePathProperty="true" />
260
+ </ItemGroup>
261
+ <PropertyGroup>
262
+ <_NuGetTargetFallbackMoniker>$(_NuGetTargetFallbackMoniker);native,Version=v0.0</_NuGetTargetFallbackMoniker>
263
+ <RuntimeIdentifiers>$(RuntimeIdentifiers);win-arm64</RuntimeIdentifiers>
264
+ </PropertyGroup>
265
</Project>
tools/msvs/msi/i18n/en-us.wxl
tools/msvs/msi/nodemsi.sln
@@ -1,9 +1,13 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "nodemsi", "nodemsi.wixproj", "{1D808FF0-B5A9-4BE9-859D-B334B6F48BE2}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.33027.164
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{B7DD6F7E-DEF8-4E67-B5B7-07EF123DB6F0}") = "nodemsi", "nodemsi\nodemsi.wixproj", "{1D808FF0-B5A9-4BE9-859D-B334B6F48BE2}"
+ ProjectSection(ProjectDependencies) = postProject
7
+ {B70585F8-DAB7-40FA-9904-13CF53A73A06} = {B70585F8-DAB7-40FA-9904-13CF53A73A06}
8
+ EndProjectSection
9
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "custom_actions", "custom_actions.vcxproj", "{B70585F8-DAB7-40FA-9904-13CF53A73A06}"
10
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "custom_actions", "custom_actions\custom_actions.vcxproj", "{B70585F8-DAB7-40FA-9904-13CF53A73A06}"
11
12
Global
13
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -43,4 +47,7 @@ Global
43
47
GlobalSection(SolutionProperties) = preSolution
44
48
HideSolutionNode = FALSE
45
49
EndGlobalSection
50
+ GlobalSection(ExtensibilityGlobals) = postSolution
51
+ SolutionGuid = {FB650322-7A09-471D-A635-F2DBDCEECDB8}
52
+ EndGlobalSection
46
53
EndGlobal