Skip to content

Commit dc25fd7

Browse files
committed
Addressed some comments.
1 parent 905330d commit dc25fd7

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ cl /nologo /nologo /c /Fo%objDir%\aspnetcorev2_outofprocess_arm64.obj empty.cpp
1313
cl /nologo /nologo /c /arm64EC /Fo%objDir%\aspnetcorev2_outofprocess_x64.obj empty.cpp
1414

1515
link /lib /nologo /machine:arm64 /def:aspnetcorev2_outofprocess_arm64.def /out:%objDir%\aspnetcorev2_outofprocess_arm64.lib
16-
link /lib /machine:x64 /def:aspnetcorev2_outofprocess_x64.def /out:%objDir%\aspnetcorev2_outofprocess_x64.lib
16+
link /lib /nologo /machine:x64 /def:aspnetcorev2_outofprocess_x64.def /out:%objDir%\aspnetcorev2_outofprocess_x64.lib
1717

1818
link /dll /nologo /noentry /machine:arm64x /defArm64Native:aspnetcorev2_outofprocess_arm64.def /def:aspnetcorev2_outofprocess_x64.def %objDir%\aspnetcorev2_outofprocess_arm64.obj %objDir%\aspnetcorev2_outofprocess_x64.obj /out:%binDir%\aspnetcorev2_outofprocess.dll %objDir%\aspnetcorev2_outofprocess_arm64.lib %objDir%\aspnetcorev2_outofprocess_x64.lib

src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.proj

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0" DefaultTargets="Build">
22
<PropertyGroup Label="Globals">
3-
<VCProjectVersion>17.0</VCProjectVersion>
4-
<RootNamespace>aspnetcorev2</RootNamespace>
5-
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
6-
<PlatformToolset>v143</PlatformToolset>
73
<CharacterSet>Unicode</CharacterSet>
84
<IsTestProject>false</IsTestProject>
95
</PropertyGroup>
6+
<Import Project="..\build\settings.props" />
107
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
118
<PropertyGroup>
129
<ObjDir>$(ArtifactsObjDir)\AspNetCoreModuleForwarders</ObjDir>

src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ HandlerResolver::LoadRequestHandlerAssembly(const IHttpApplication &pApplication
110110

111111
LOG_INFOF(L"Loading request handler: '%ls'", handlerDllPath.c_str());
112112

113-
hRequestHandlerDll = LoadLibraryEx(handlerDllPath.c_str(), 0, LOAD_LIBRARY_SEARCH_DEFAULT_DIRS | LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR);
113+
hRequestHandlerDll = LoadLibraryEx(handlerDllPath.c_str(), nullptr, LOAD_LIBRARY_SEARCH_DEFAULT_DIRS | LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR);
114114
RETURN_LAST_ERROR_IF_NULL(hRequestHandlerDll);
115115

116116
if (preventUnload)

0 commit comments

Comments
 (0)