diff options
| author | AlexGhiondea <AlexGhiondea@users.noreply.github.com> | 2016-05-17 13:45:59 -0700 |
|---|---|---|
| committer | AlexGhiondea <AlexGhiondea@users.noreply.github.com> | 2016-05-17 13:45:59 -0700 |
| commit | 41a4ad5054cf877db6aa331855b43ad8678a93ad (patch) | |
| tree | dc6df3c0a4eb30fea53c0cba8b99fc45b413efe5 /src/debug | |
| parent | 80f3d4f3a73abff6c90b331bc7b3eb97d365cf2c (diff) | |
| parent | 54d45a3f4ed052ddc23d367e2cd46a7c7eb831ea (diff) | |
| download | coreclr-41a4ad5054cf877db6aa331855b43ad8678a93ad.tar.gz coreclr-41a4ad5054cf877db6aa331855b43ad8678a93ad.tar.bz2 coreclr-41a4ad5054cf877db6aa331855b43ad8678a93ad.zip | |
Merge pull request #4874 from gkhanna79/SPC_S1
Add support for System.Private.CoreLib to be core library
Diffstat (limited to 'src/debug')
| -rw-r--r-- | src/debug/daccess/nidump.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/debug/daccess/nidump.cpp b/src/debug/daccess/nidump.cpp index a3a454384c..e293e081ba 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), |