2009-09-18 Sebastien Pouliot <sebastien@ximian.com>

	* RemotingServices.cs: Avoid depending on COM stuff for NET_2_1

svn path=/trunk/mcs/; revision=142192

diff --git a/mcs/class/corlib/System.Runtime.Remoting/ChangeLog b/mcs/class/corlib/System.Runtime.Remoting/ChangeLog
index a6247c7e4e1acf1ebce78fdd90e03233a5a0b28e..293d367a8697b6021eb82bea77fca433832b5fe5 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting/ChangeLog
+++ b/mcs/class/corlib/System.Runtime.Remoting/ChangeLog
@@ -1,3 +1,7 @@
+2009-09-18  Sebastien Pouliot  <sebastien@ximian.com>
+
+       * RemotingServices.cs: Avoid depending on COM stuff for NET_2_1
+
 2009-07-11  Robert Jordan  <robertj@gmx.net>
 
        * RemotingServices.cs: Track ComInteropProxy's changes.

diff --git a/mcs/class/corlib/System.Runtime.Remoting/RemotingServices.cs b/mcs/class/corlib/System.Runtime.Remoting/RemotingServices.cs
index bbf3ef856ecc1bd11285c0ff3a4d1c472f5b8ad5..fccab496a960d7844efeea49673094cc31646666 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting/RemotingServices.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting/RemotingServices.cs
@@ -578,13 +578,13 @@ namespace System.Runtime.Remoting
                        RemotingProxy proxy = new RemotingProxy (type, ChannelServices.CrossContextUrl, activationAttributes);
                        return proxy.GetTransparentProxy();
                }
-
+#if !NET_2_1
                internal static object CreateClientProxyForComInterop (Type type)
                {
                        Mono.Interop.ComInteropProxy proxy = Mono.Interop.ComInteropProxy.CreateProxy (type);
                        return proxy.GetTransparentProxy ();
                }
-       
+#endif
                internal static Identity GetIdentityForUri (string uri)
                {
                        string normUri = GetNormalizedUri (uri);