Imported Upstream version 4.2.0.179

Former-commit-id: 0a113cb3a6feb7873f632839b1307cc6033cd595
2015-08-26 07:17:56 -04:00
parent 183bba2c9a
commit 6992685b86
7507 changed files with 90259 additions and 657307 deletions
--- a/external/referencesource/mscorlib/system/runtime/remoting/callcontext.cs
+++ b/external/referencesource/mscorlib/system/runtime/remoting/callcontext.cs
@@ -36,6 +36,13 @@ namespace System.Runtime.Remoting.Messaging{
        {
        }

+#if MONO
+        internal static object SetCurrentCallContext (LogicalCallContext ctx)
+        {
+            return null;
+        }
+#endif
+
        // Sets the given logical call context object on the thread.
        // Returns the previous one.
        internal static LogicalCallContext SetLogicalCallContext(