You've already forked linux-packaging-mono
Imported Upstream version 5.12.0.220
Former-commit-id: c477e03582759447177c6d4bf412cd2355aad476
This commit is contained in:
parent
8bd104cef2
commit
8fc30896db
@ -116,12 +116,18 @@ namespace System.Diagnostics {
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
#if MONO
|
||||
internal static int ShowDefaultAssertDialog(String conditionString, String message, String stackTrace, String windowTitle) {
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
#else
|
||||
// Called when an assert happens.
|
||||
// windowTitle can be null.
|
||||
[System.Security.SecurityCritical] // auto-generated
|
||||
[ResourceExposure(ResourceScope.Process)]
|
||||
[MethodImplAttribute(MethodImplOptions.InternalCall)]
|
||||
internal extern static int ShowDefaultAssertDialog(String conditionString, String message, String stackTrace, String windowTitle);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
@ -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
|
||||
|
@ -652,6 +652,7 @@ namespace System {
|
||||
}
|
||||
}
|
||||
|
||||
#if !MONO
|
||||
#if !FEATURE_CORECLR
|
||||
internal class SizedReference : IDisposable
|
||||
{
|
||||
@ -751,4 +752,5 @@ namespace System {
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
@ -61,13 +61,18 @@ namespace System {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
#if MONO
|
||||
internal static String FormatSignature(byte [] signature) {
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
#else
|
||||
// Called to format signature
|
||||
[System.Security.SecurityCritical] // auto-generated
|
||||
[ResourceExposure(ResourceScope.None)]
|
||||
[MethodImplAttribute(MethodImplOptions.InternalCall)]
|
||||
internal static extern String FormatSignature(byte [] signature);
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
// Potentially called from the EE
|
||||
|
@ -145,6 +145,9 @@ namespace System.Runtime.ExceptionServices {
|
||||
// This method will restore the original stack trace and bucketing details before throwing
|
||||
// the exception so that it is easy, from debugging standpoint, to understand what really went wrong on
|
||||
// the original thread.
|
||||
#if MONO
|
||||
[System.Diagnostics.StackTraceHidden]
|
||||
#endif
|
||||
public void Throw()
|
||||
{
|
||||
// Restore the exception dispatch details before throwing the exception.
|
||||
@ -153,6 +156,7 @@ namespace System.Runtime.ExceptionServices {
|
||||
}
|
||||
|
||||
#if MONO
|
||||
[System.Diagnostics.StackTraceHidden]
|
||||
public static void Throw (Exception source) => Capture (source).Throw ();
|
||||
#endif
|
||||
}
|
||||
|
@ -1 +1 @@
|
||||
79e71f969cd9994599f828f5f837105f57781ca7
|
||||
4f1214b31d44b0d1eab716234b631e9ad233967c
|
@ -173,7 +173,11 @@ namespace System.Threading
|
||||
#if MONO
|
||||
protected static int WaitHelper(IntPtr[] waitHandles, bool waitAll, int millisecondsTimeout)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
unsafe {
|
||||
fixed (IntPtr * pWaitHandles = waitHandles) {
|
||||
return System.Threading.WaitHandle.Wait_internal (pWaitHandles, waitHandles.Length, waitAll, millisecondsTimeout);
|
||||
}
|
||||
}
|
||||
}
|
||||
#else
|
||||
[MethodImplAttribute(MethodImplOptions.InternalCall)]
|
||||
|
@ -675,7 +675,9 @@ namespace System.Threading
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#if MONO
|
||||
ThreadPool.NotifyWorkItemQueued();
|
||||
#endif
|
||||
EnsureThreadRequested();
|
||||
}
|
||||
|
||||
@ -1897,6 +1899,13 @@ namespace System.Threading
|
||||
[MethodImplAttribute(MethodImplOptions.InternalCall)]
|
||||
internal static extern void NotifyWorkItemProgressNative();
|
||||
|
||||
#if MONO
|
||||
[System.Security.SecurityCritical]
|
||||
[ResourceExposure(ResourceScope.None)]
|
||||
[MethodImplAttribute(MethodImplOptions.InternalCall)]
|
||||
internal static extern void NotifyWorkItemQueued();
|
||||
#endif
|
||||
|
||||
[System.Security.SecurityCritical] // auto-generated
|
||||
[ResourceExposure(ResourceScope.None)]
|
||||
[MethodImplAttribute(MethodImplOptions.InternalCall)]
|
||||
|
@ -52,6 +52,9 @@ namespace System {
|
||||
using System.Collections.Generic;
|
||||
|
||||
[Pure]
|
||||
#if MONO
|
||||
[System.Diagnostics.StackTraceHidden]
|
||||
#endif
|
||||
internal static partial class ThrowHelper {
|
||||
#if !MONO
|
||||
internal static void ThrowArgumentOutOfRangeException() {
|
||||
|
@ -412,10 +412,16 @@ namespace System {
|
||||
// "TimeSpan_LegacyFormatMode"=dword:00000001
|
||||
//
|
||||
#if !FEATURE_CORECLR
|
||||
#if MONO
|
||||
private static bool LegacyFormatMode() {
|
||||
return false;
|
||||
}
|
||||
#else
|
||||
[System.Security.SecurityCritical]
|
||||
[ResourceExposure(ResourceScope.None)]
|
||||
[MethodImplAttribute(MethodImplOptions.InternalCall)]
|
||||
private static extern bool LegacyFormatMode();
|
||||
#endif
|
||||
#endif // !FEATURE_CORECLR
|
||||
//
|
||||
// In Silverlight v4, specifying the APP_EARLIER_THAN_SL4.0 quirks mode allows applications to
|
||||
|
Reference in New Issue
Block a user