From: Gaurav Khanna <gkhanna@microsoft.com>
Date: Wed, 25 May 2016 22:42:20 +0000 (-0700)
Subject: WinMD Adapter should only lookup mscorlib in WinMD references
X-Git-Tag: accepted/tizen/base/20180629.140029~4529^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=57c5bd38021e154e0949c204b759208541d56f39;p=platform%2Fupstream%2Fcoreclr.git

WinMD Adapter should only lookup mscorlib in WinMD references
---

diff --git a/src/inc/utilcode.h b/src/inc/utilcode.h
index ebc0514..aa8cb015 100644
--- a/src/inc/utilcode.h
+++ b/src/inc/utilcode.h
@@ -62,6 +62,7 @@ const WCHAR kWatsonName2[] = W("drwtsn32");
 #define CoreLibNameLen 22
 #define CoreLibSatelliteName_A "System.Private.CoreLib.resources"
 #define CoreLibSatelliteNameLen 32
+#define LegacyCoreLibName_A "mscorlib"
 #else // !defined(FEATURE_CORECLR)
 #define CoreLibName_W W("mscorlib")
 #define CoreLibName_IL_W W("mscorlib.dll")
@@ -74,6 +75,7 @@ const WCHAR kWatsonName2[] = W("drwtsn32");
 #define CoreLibNameLen 8
 #define CoreLibSatelliteName_A "mscorlib.resources"
 #define CoreLibSatelliteNameLen 18
+#define LegacyCoreLibName_A "mscorlib"
 #endif // defined(FEATURE_CORECLR)
 
 class StringArrayList;
diff --git a/src/md/winmd/adapter.cpp b/src/md/winmd/adapter.cpp
index 146b04e..5b4d95c 100644
--- a/src/md/winmd/adapter.cpp
+++ b/src/md/winmd/adapter.cpp
@@ -157,7 +157,9 @@ HRESULT CheckIfWinMDAdapterNeeded(IMDCommon *pRawMDCommon)
         LPCSTR arefName;
         USHORT usMajorVersion;
         IfFailGo(pNewAdapter->m_pRawMetaModelCommonRO->CommonGetAssemblyRefProps(mdar, &usMajorVersion, NULL, NULL, NULL, NULL, NULL, NULL, &arefName, NULL, NULL, NULL));
-        if (0 == strcmp(arefName, CoreLibName_A))
+        
+        // We check for legacy Core library name since Windows.winmd references mscorlib and not System.Private.CoreLib
+        if (0 == strcmp(arefName, LegacyCoreLibName_A))
         {
             pNewAdapter->m_assemblyRefMscorlib = mdar;