Imported Upstream version 6.4.0.137

Former-commit-id: 943baa9f16a098c33e129777827f3a9d20da00d6
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-07-26 19:53:28 +00:00
parent e9207cf623
commit ef583813eb
2712 changed files with 74169 additions and 40587 deletions

View File

@@ -31,7 +31,7 @@
//
using System.Runtime.CompilerServices;
#if !DISABLE_REMOTING
#if FEATURE_REMOTING
using System.Runtime.Remoting.Contexts;
#endif
using System.Runtime.ConstrainedExecution;
@@ -77,14 +77,14 @@ namespace System.Threading
throw new SynchronizationLockException ("Object is not synchronized");
try {
#if !DISABLE_REMOTING
#if FEATURE_REMOTING
if (exitContext)
SynchronizationAttribute.ExitContext ();
#endif
return Monitor_wait (obj, millisecondsTimeout);
} finally {
#if !DISABLE_REMOTING
#if FEATURE_REMOTING
if (exitContext)
SynchronizationAttribute.EnterContext ();
#endif
@@ -116,5 +116,9 @@ namespace System.Threading
{
return Monitor_test_owner (obj);
}
#if NETCORE
public static long LockContentionCount => throw new PlatformNotSupportedException ();
#endif
}
}