huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename reg keys from IIS ANCM V1 to V2 (#1017)

This commit is contained in:
Justin Kotalik 2018-07-10 10:32:01 -07:00 committed by GitHub
parent 86fed4de5f
commit 11b83dc2b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc
View File

@ -10,7 +10,7 @@
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#define FileDescription "IIS AspNetCore Module. Commit: " CommitHash #define FileDescription "IIS AspNetCore Module V2. Commit: " CommitHash
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //

4
src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp
View File

@ -11,7 +11,7 @@
#include "resources.h" #include "resources.h"
#include "exceptions.h" #include "exceptions.h"
DECLARE_DEBUG_PRINT_OBJECT("aspnetcore.dll"); DECLARE_DEBUG_PRINT_OBJECT("aspnetcorev2.dll");
HTTP_MODULE_ID g_pModuleId = NULL; HTTP_MODULE_ID g_pModuleId = NULL;
IHttpServer * g_pHttpServer = NULL; IHttpServer * g_pHttpServer = NULL;
@ -120,7 +120,7 @@ HRESULT
// check whether the feature is disabled due to security reason // check whether the feature is disabled due to security reason
if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, if (RegOpenKeyEx(HKEY_LOCAL_MACHINE,
L"SOFTWARE\\Microsoft\\IIS Extensions\\IIS AspNetCore Module\\Parameters", L"SOFTWARE\\Microsoft\\IIS Extensions\\IIS AspNetCore Module V2\\Parameters",
0, 0,
KEY_READ, KEY_READ,
&hKey) == NO_ERROR) &hKey) == NO_ERROR)

2
src/AspNetCoreModuleV2/CommonLib/debugutil.cpp
View File

@ -23,7 +23,7 @@ DebugInitialize()
HKEY hKey; HKEY hKey;
if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, if (RegOpenKeyEx(HKEY_LOCAL_MACHINE,
L"SOFTWARE\\Microsoft\\IIS Extensions\\IIS AspNetCore Module\\Parameters", L"SOFTWARE\\Microsoft\\IIS Extensions\\IIS AspNetCore Module V2\\Parameters",
0, 0,
KEY_READ, KEY_READ,
&hKey) == NO_ERROR) &hKey) == NO_ERROR)

2
src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx
View File

@ -54,7 +54,7 @@ InitializeGlobalConfiguration(
} }
if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, if (RegOpenKeyEx(HKEY_LOCAL_MACHINE,
L"SOFTWARE\\Microsoft\\IIS Extensions\\IIS AspNetCore Module\\Parameters", L"SOFTWARE\\Microsoft\\IIS Extensions\\IIS AspNetCore Module V2\\Parameters",
0, 0,
KEY_READ, KEY_READ,
&hKey) == NO_ERROR) &hKey) == NO_ERROR)

2
test/IISExpress.FunctionalTests/InProcess/LoggingTests.cs
View File

@ -82,7 +82,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
StopServer(); StopServer();
var logContents = File.ReadAllText(tempFile); var logContents = File.ReadAllText(tempFile);
Assert.Contains("[aspnetcore.dll]", logContents); Assert.Contains("[aspnetcorev2.dll]", logContents);
Assert.Contains("[aspnetcorev2_inprocess.dll]", logContents); Assert.Contains("[aspnetcorev2_inprocess.dll]", logContents);
} }
finally finally