diff options
| author | Gaurav Khanna <gkhanna@microsoft.com> | 2016-05-09 15:57:44 -0700 |
|---|---|---|
| committer | Gaurav Khanna <gkhanna@microsoft.com> | 2016-05-16 22:22:04 -0700 |
| commit | 54d45a3f4ed052ddc23d367e2cd46a7c7eb831ea (patch) | |
| tree | 91c8341a128fe879be2ea5f809ae8356a0d13d7b /src/binder | |
| parent | 8da89acc3a4f5a57a7346d627ddab32e86b442f4 (diff) | |
| download | coreclr-54d45a3f4ed052ddc23d367e2cd46a7c7eb831ea.tar.gz coreclr-54d45a3f4ed052ddc23d367e2cd46a7c7eb831ea.tar.bz2 coreclr-54d45a3f4ed052ddc23d367e2cd46a7c7eb831ea.zip | |
Initial change to support System.Private.CoreLib.dll as Core Library.
Diffstat (limited to 'src/binder')
| -rw-r--r-- | src/binder/assemblybinder.cpp | 26 | ||||
| -rw-r--r-- | src/binder/variables.cpp | 3 |
2 files changed, 15 insertions, 14 deletions
diff --git a/src/binder/assemblybinder.cpp b/src/binder/assemblybinder.cpp index 70f698f10f..517eac99d6 100644 --- a/src/binder/assemblybinder.cpp +++ b/src/binder/assemblybinder.cpp @@ -675,30 +675,30 @@ namespace BINDER_SPACE _ASSERTE(ppSystemAssembly != NULL); - StackSString sMscorlibDir(systemDirectory); + StackSString sCoreLibDir(systemDirectory); ReleaseHolder<Assembly> pSystemAssembly; - if(!sMscorlibDir.EndsWith(DIRECTORY_SEPARATOR_CHAR_W)) + if(!sCoreLibDir.EndsWith(DIRECTORY_SEPARATOR_CHAR_W)) { - sMscorlibDir.Append(DIRECTORY_SEPARATOR_CHAR_W); + sCoreLibDir.Append(DIRECTORY_SEPARATOR_CHAR_W); } - StackSString sMscorlib; + StackSString sCoreLib; - // At run-time, mscorlib.ni.dll is typically always available, and - // mscorlib.dll is typically not. So check for the NI first. - sMscorlib = sMscorlibDir; - sMscorlib.Append(W("mscorlib.ni.dll")); - if (!fBindToNativeImage || FAILED(AssemblyBinder::GetAssembly(sMscorlib, + // At run-time, System.Private.CoreLib.ni.dll is typically always available, and + // System.Private.CoreLib.dll is typically not. So check for the NI first. + sCoreLib = sCoreLibDir; + sCoreLib.Append(CoreLibName_NI_W); + if (!fBindToNativeImage || FAILED(AssemblyBinder::GetAssembly(sCoreLib, FALSE /* fInspectionOnly */, TRUE /* fIsInGAC */, TRUE /* fExplicitBindToNativeImage */, &pSystemAssembly))) { - // If mscorlib.ni.dll is unavailable, look for mscorlib.dll instead - sMscorlib = sMscorlibDir; - sMscorlib.Append(W("mscorlib.dll")); - IF_FAIL_GO(AssemblyBinder::GetAssembly(sMscorlib, + // If System.Private.CoreLib.ni.dll is unavailable, look for System.Private.CoreLib.dll instead + sCoreLib = sCoreLibDir; + sCoreLib.Append(CoreLibName_IL_W); + IF_FAIL_GO(AssemblyBinder::GetAssembly(sCoreLib, FALSE /* fInspectionOnly */, TRUE /* fIsInGAC */, FALSE /* fExplicitBindToNativeImage */, diff --git a/src/binder/variables.cpp b/src/binder/variables.cpp index 5d31d85a55..615b358deb 100644 --- a/src/binder/variables.cpp +++ b/src/binder/variables.cpp @@ -83,7 +83,8 @@ namespace BINDER_SPACE architectureARM.SetLiteral(W("ARM")); architectureARM64.SetLiteral(W("ARM64")); cultureNeutral.SetLiteral(W("neutral")); - mscorlib.SetLiteral(W("mscorlib")); + mscorlib.SetLiteral(CoreLibName_W); + emptyString.Clear(); #ifdef FEATURE_VERSIONING_LOG |