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

@ -42,7 +42,7 @@ namespace System
public abstract class MarshalByRefObject
{
[NonSerialized]
#if DISABLE_REMOTING
#if !FEATURE_REMOTING
private object _identity; //Keep layout equal to avoid runtime issues
#else
private ServerIdentity _identity; // Holds marshalling iformation of the object
@ -52,7 +52,7 @@ namespace System
{
}
#if DISABLE_REMOTING
#if !FEATURE_REMOTING
internal ServerIdentity ObjectIdentity {
get { throw new NotSupportedException (); }
set { throw new NotSupportedException (); }
@ -84,7 +84,7 @@ namespace System
[SecurityPermission (SecurityAction.LinkDemand, Infrastructure = true)]
public virtual ObjRef CreateObjRef (Type requestedType)
{
#if DISABLE_REMOTING
#if !FEATURE_REMOTING
throw new NotSupportedException ();
#else
// This method can only be called when this object has been marshalled
@ -99,7 +99,7 @@ namespace System
[SecurityPermission (SecurityAction.LinkDemand, Infrastructure = true)]
public object GetLifetimeService ()
{
#if DISABLE_REMOTING
#if !FEATURE_REMOTING
throw new NotSupportedException ();
#else
if (_identity == null)
@ -111,7 +111,7 @@ namespace System
[SecurityPermission (SecurityAction.LinkDemand, Infrastructure = true)]
public virtual object InitializeLifetimeService ()
{
#if DISABLE_REMOTING
#if !FEATURE_REMOTING
throw new NotSupportedException ();
#else
if (_identity != null && _identity.Lease != null)
@ -123,7 +123,7 @@ namespace System
protected MarshalByRefObject MemberwiseClone (bool cloneIdentity)
{
#if DISABLE_REMOTING
#if !FEATURE_REMOTING
throw new NotSupportedException ();
#else
MarshalByRefObject mbr = (MarshalByRefObject) MemberwiseClone ();