From a005b0d8df08d73dbf224c4ddf6f6a729eed02e5 Mon Sep 17 00:00:00 2001 From: Marek Safar Date: Wed, 8 Apr 2015 15:00:38 +0200 Subject: [PATCH] Mono friendly FileLoadException --- .../mscorlib/system/io/fileloadexception.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mcs/class/referencesource/mscorlib/system/io/fileloadexception.cs b/mcs/class/referencesource/mscorlib/system/io/fileloadexception.cs index 632742dd89d..2a7b803bed7 100644 --- a/mcs/class/referencesource/mscorlib/system/io/fileloadexception.cs +++ b/mcs/class/referencesource/mscorlib/system/io/fileloadexception.cs @@ -185,6 +185,9 @@ namespace System.IO { internal static String FormatFileLoadExceptionMessage(String fileName, int hResult) { +#if MONO + return string.Format (CultureInfo.InvariantCulture, "Could not load file or assembly '{0}' or one of its dependencies", fileName); +#else string format = null; GetFileLoadExceptionMessage(hResult, JitHelpers.GetStringHandleOnStack(ref format)); @@ -192,8 +195,9 @@ namespace System.IO { GetMessageForHR(hResult, JitHelpers.GetStringHandleOnStack(ref message)); return String.Format(CultureInfo.CurrentCulture, format, fileName, message); +#endif } - +#if !MONO [System.Security.SecurityCritical] // auto-generated [ResourceExposure(ResourceScope.None)] [DllImport(JitHelpers.QCall, CharSet = CharSet.Unicode)] @@ -205,5 +209,6 @@ namespace System.IO { [DllImport(JitHelpers.QCall, CharSet = CharSet.Unicode)] [SuppressUnmanagedCodeSecurity] private static extern void GetMessageForHR(int hresult, StringHandleOnStack retString); +#endif } } -- 2.25.1