diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj index bfae51ff3fa7..f51cf66196e7 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj @@ -81,4 +81,8 @@ '$(PackageIconFullPath)' ^ '$(PackageLicenseExpression)' " /> + + + + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs index 471f789666d1..71c0448ea178 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs @@ -144,6 +144,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -216,64 +284,26 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + - + + + + @@ -297,7 +327,11 @@ AspNetCoreModuleV2 + AspNetCoreModuleV2Dll + + AspNetCoreModuleV2Dll.forwarder + @@ -309,6 +343,7 @@ + WWW Server @@ -319,6 +354,7 @@ AspNetCoreModuleV2 + + + 17.0 + aspnetcorev2 + 10.0 + v143 + Unicode + false + + + + $(ArtifactsObjDir)\AspNetCoreModuleForwarders + $(ArtifactsBinDir)\AspNetCoreModuleForwarders + + + + "$(VSInstallDir)Common7\Tools\VsDevCmd" + + + + + + + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/empty.cpp b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/empty.cpp new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp index fcd4205138c9..f47398a50c91 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/HandlerResolver.cpp @@ -110,7 +110,7 @@ HandlerResolver::LoadRequestHandlerAssembly(const IHttpApplication &pApplication LOG_INFOF(L"Loading request handler: '%ls'", handlerDllPath.c_str()); - hRequestHandlerDll = LoadLibrary(handlerDllPath.c_str()); + hRequestHandlerDll = LoadLibraryEx(handlerDllPath.c_str(), 0, LOAD_LIBRARY_SEARCH_DEFAULT_DIRS | LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR); RETURN_LAST_ERROR_IF_NULL(hRequestHandlerDll); if (preventUnload)