From 54d45a3f4ed052ddc23d367e2cd46a7c7eb831ea Mon Sep 17 00:00:00 2001 From: Gaurav Khanna Date: Mon, 9 May 2016 15:57:44 -0700 Subject: Initial change to support System.Private.CoreLib.dll as Core Library. --- src/debug/daccess/nidump.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/debug') diff --git a/src/debug/daccess/nidump.cpp b/src/debug/daccess/nidump.cpp index 29c326debe..e6cfd128db 100644 --- a/src/debug/daccess/nidump.cpp +++ b/src/debug/daccess/nidump.cpp @@ -1179,8 +1179,9 @@ NativeImageDumper::DumpNativeImage() break; } } + //If we're actually dumping mscorlib, remap the mscorlib dependency to our own native image. - if( mscorlib == NULL || !wcscmp(m_name, W("mscorlib")) ) + if( (mscorlib == NULL) || !wcscmp(m_name, CoreLibName_W)) { mscorlib = GetDependency(0); mscorlib->fIsMscorlib = TRUE; @@ -2445,7 +2446,7 @@ mdAssemblyRef NativeImageDumper::MapAssemblyRefToManifest(mdAssemblyRef token, I ret = currentRef; break; } - else if (wcscmp(szAssemblyName, W("mscorlib")) == 0) + else if (wcscmp(szAssemblyName, CoreLibName_W) == 0) { // Mscorlib is special - version number and public key token are ignored. ret = currentRef; @@ -2658,7 +2659,7 @@ NativeImageDumper::Dependency *NativeImageDumper::OpenDependency(int index) Dependency& dependency = m_dependencies[index]; AppendTokenName(entry->dwAssemblyRef, buf, m_manifestImport, true); bool isHardBound = !!(entry->signNativeImage != INVALID_NGEN_SIGNATURE); - SString mscorlibStr(SString::Literal, W("mscorlib")); + SString mscorlibStr(SString::Literal, CoreLibName_W); bool isMscorlib = (0 == buf.Compare( mscorlibStr )); dependency.fIsHardbound = isHardBound; wcscpy_s(dependency.name, _countof(dependency.name), -- cgit v1.2.3