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

Imported Upstream version 6.4.0.137

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
mcs/class/corlib/System.Runtime.Remoting/Identity.cs
View File

@ -157,7 +157,7 @@ namespace System.Runtime.Remoting
public MarshalByRefObject ClientProxy
{
get { return (MarshalByRefObject) _proxyReference.Target; }
get { return (MarshalByRefObject) _proxyReference?.Target; }
set { _proxyReference = new WeakReference (value); }
}

13
mcs/class/corlib/System.Runtime.Remoting/RemotingConfiguration.cs
View File

@ -53,7 +53,7 @@ namespace System.Runtime.Remoting
static string processGuid = null;
static bool defaultConfigRead = false;
static bool defaultDelayedConfigRead = false;
static string _errorMode;
static CustomErrorsModes _errorMode = CustomErrorsModes.RemoteOnly;
static Hashtable wellKnownClientEntries = new Hashtable();
static Hashtable activatedClientEntries = new Hashtable();
@ -81,11 +81,10 @@ namespace System.Runtime.Remoting
set { applicationName = value; }
}
[MonoTODO]
public static CustomErrorsModes CustomErrorsMode
{
get { throw new NotImplementedException (); }
set { throw new NotImplementedException (); }
get { return _errorMode; }
set { _errorMode = value; }
}
public static string ProcessId
@ -387,8 +386,8 @@ namespace System.Runtime.Remoting
public static bool CustomErrorsEnabled (bool isLocalRequest)
{
if (_errorMode == "off") return false;
if (_errorMode == "on") return true;
if (_errorMode == CustomErrorsModes.Off) return false;
if (_errorMode == CustomErrorsModes.On) return true;
return !isLocalRequest;
}
@ -403,7 +402,7 @@ namespace System.Runtime.Remoting
if (m != "on" && m != "off" && m != "remoteonly")
throw new RemotingException ("Invalid custom error mode: " + mode);
_errorMode = m;
_errorMode = (CustomErrorsModes) Enum.Parse(typeof(CustomErrorsModes), m, true);
}
}

2
mcs/class/corlib/System.Runtime.Remoting/RemotingServices.cs
View File

@ -100,7 +100,7 @@ namespace System.Runtime.Remoting
[MethodImplAttribute(MethodImplOptions.InternalCall)]
internal extern static MethodBase GetVirtualMethod (Type type, MethodBase method);
#if DISABLE_REMOTING
#if !FEATURE_REMOTING
public static bool IsTransparentProxy (object proxy)
{
throw new NotSupportedException ();