mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.12.0.220

Browse Source 
Former-commit-id: c477e03582759447177c6d4bf412cd2355aad476
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-04-24 09:31:23 +00:00
parent 8bd104cef2
commit 8fc30896db
1200 changed files with 29534 additions and 26161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mcs/class/referencesource/mscorlib/system/exception.cs
View File

@ -281,13 +281,12 @@ namespace System {
get { return _innerException; }
}
#if !MONO
[System.Security.SecurityCritical] // auto-generated
[ResourceExposure(ResourceScope.None)]
[MethodImplAttribute(MethodImplOptions.InternalCall)]
static extern private IRuntimeMethodInfo GetMethodFromStackTrace(Object stackTrace);
#if !MONO
[System.Security.SecuritySafeCritical] // auto-generated
private MethodBase GetExceptionMethodFromStackTrace()
{
@ -1036,11 +1035,16 @@ namespace System {
}
}
#if MONO
private static bool nIsTransient(int hr) {
throw new NotImplementedException ();
}
#else
[System.Security.SecurityCritical] // auto-generated
[ResourceExposure(ResourceScope.None)]
[MethodImplAttribute(MethodImplOptions.InternalCall)]
private extern static bool nIsTransient(int hr);
#endif
// This piece of infrastructure exists to help avoid deadlocks
// between parts of mscorlib that might throw an exception while
@ -1065,11 +1069,11 @@ namespace System {
#if MONO
switch (kind) {
case ExceptionMessageKind.ThreadAbort:
return "";
return "Thread was being aborted.";
case ExceptionMessageKind.ThreadInterrupted:
return "";
return "Thread was interrupted from a waiting state.";
case ExceptionMessageKind.OutOfMemory:
return "Out of memory";
return "Insufficient memory to continue the execution of the program.";
}
return "";
#else