diff --git a/src/coreclr/inc/CrstTypes.def b/src/coreclr/inc/CrstTypes.def index dbf3363a07cfa..185a590d938e5 100644 --- a/src/coreclr/inc/CrstTypes.def +++ b/src/coreclr/inc/CrstTypes.def @@ -86,7 +86,7 @@ Crst ArgBasedStubCache End Crst AssemblyLoader - AcquiredBefore DeadlockDetection UniqueStack + AcquiredBefore DeadlockDetection UniqueStack DebuggerMutex End Crst AvailableClass diff --git a/src/coreclr/inc/crsttypes.h b/src/coreclr/inc/crsttypes.h index 071d767f9ec7d..a1bab2ecb906c 100644 --- a/src/coreclr/inc/crsttypes.h +++ b/src/coreclr/inc/crsttypes.h @@ -149,7 +149,7 @@ int g_rgCrstLevelMap[] = 14, // CrstAppDomainHandleTable 0, // CrstArgBasedStubCache 0, // CrstAssemblyList - 7, // CrstAssemblyLoader + 12, // CrstAssemblyLoader 3, // CrstAvailableClass 4, // CrstAvailableParamTypes 7, // CrstBaseDomain diff --git a/src/coreclr/vm/nativeimage.cpp b/src/coreclr/vm/nativeimage.cpp index 0255a29085002..9067273ed2ec2 100644 --- a/src/coreclr/vm/nativeimage.cpp +++ b/src/coreclr/vm/nativeimage.cpp @@ -286,7 +286,7 @@ void NativeImage::CheckAssemblyMvid(Assembly *assembly) const SString message; message.Printf(W("MVID mismatch between loaded assembly '%s' (MVID = %s) and an assembly with the same simple name embedded in the native image '%s' (MVID = %s)"), - assembly->GetSimpleName(), + SString(SString::Utf8, assembly->GetSimpleName()).GetUnicode(), assemblyMvidText, SString(SString::Utf8, GetFileName()).GetUnicode(), componentMvidText);