[corlib] Disable more remoting code for mobile

diff --git a/external/referencesource b/external/referencesource
index f43e7328de0744ccc77251aebdde9e214c258255..357bc3c958168c7335171a6b2c971149348fdc42 160000 (submodule)
--- a/external/referencesource
+++ b/external/referencesource
@@ -1 +1 @@
-Subproject commit f43e7328de0744ccc77251aebdde9e214c258255
+Subproject commit 357bc3c958168c7335171a6b2c971149348fdc42

diff --git a/mcs/class/corlib/System.Runtime.Remoting.Channels/CrossAppDomainChannel.cs b/mcs/class/corlib/System.Runtime.Remoting.Channels/CrossAppDomainChannel.cs
index 9fc2f723a1fb5fb930cd8321dfe1b07636893d1d..938805aa3a3a085184ad7c06bd07d86a17ae4c37 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting.Channels/CrossAppDomainChannel.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting.Channels/CrossAppDomainChannel.cs
@@ -290,6 +290,7 @@ namespace System.Runtime.Remoting.Channels
        {
                internal static IMessage DeserializeMessage(MemoryStream mem, IMethodCallMessage msg)
                {
+#if FEATURE_REMOTING
                        BinaryFormatter serializer = new BinaryFormatter();                
 
                        serializer.SurrogateSelector = null;
@@ -299,6 +300,9 @@ namespace System.Runtime.Remoting.Channels
                                return (IMessage) serializer.Deserialize(mem, null);
                        else
                                return (IMessage) serializer.DeserializeMethodResponse(mem, null, msg);
+#else
+                       throw new NotSupportedException ();
+#endif
                }
                
                internal static MemoryStream SerializeMessage(IMessage msg)

diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodCall.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodCall.cs
index 56cd3cb76c6aeb2713e410630423e3e773e71b12..1fbf7fd6c20cc2a313c2953c4b7b3f02647b78e1 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodCall.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodCall.cs
@@ -118,7 +118,7 @@ namespace System.Runtime.Remoting.Messaging {
                        Init();
                        ResolveMethod();
                }
-
+#if FEATURE_REMOTING
         internal MethodCall (Object handlerObject, BinaryMethodCallMessage smuggledMsg)
         {
             if (handlerObject != null)
@@ -152,7 +152,7 @@ namespace System.Runtime.Remoting.Messaging {
             if (smuggledMsg.HasProperties)
                 smuggledMsg.PopulateMessageProperties(Properties);
         }
-
+#endif
                internal MethodCall ()
                {
                }

diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodResponse.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodResponse.cs
index 36d644cdf519d2d9bcd8e84c8f0b989a64ff19ff..a99c0245217a8e52aa1db38210b42d6e0842ebd3 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodResponse.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodResponse.cs
@@ -125,7 +125,7 @@ namespace System.Runtime.Remoting.Messaging {
                        if (retmsg.PropertiesCount > 0)
                                CADMessageBase.UnmarshalProperties (Properties, retmsg.PropertiesCount, args);
                }
-
+#if FEATURE_REMOTING
         internal MethodResponse(IMethodCallMessage msg,
                                 Object handlerObject,
                                 BinaryMethodReturnMessage smuggledMrm)
@@ -155,7 +155,7 @@ namespace System.Runtime.Remoting.Messaging {
             if (smuggledMrm.HasProperties)
                 smuggledMrm.PopulateMessageProperties(Properties);
         }
-
+#endif
                internal MethodResponse (SerializationInfo info, StreamingContext context) 
                {
                        foreach (SerializationEntry entry in info)