Imported Upstream version 4.8.0.309

Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions
--- a/mcs/class/referencesource/mscorlib/system/contextboundobject.cs
+++ b/mcs/class/referencesource/mscorlib/system/contextboundobject.cs
@@ -20,7 +20,7 @@ namespace System {
    using System.Security.Permissions;
    [Serializable]
    [System.Runtime.InteropServices.ComVisible(true)]
-#if FEATURE_REMOTING
+#if FEATURE_REMOTING || MONO
    public abstract class ContextBoundObject : MarshalByRefObject {
 #else // FEATURE_REMOTING
    public abstract class ContextBoundObject {