From: Sebastien Pouliot <sebastien@ximian.com>
Date: Fri, 18 Sep 2009 15:34:41 +0000 (-0000)
Subject: 2009-09-18  Sebastien Pouliot  <sebastien@ximian.com>
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=4d177fd9eb0b3831db86d97073ed8ff740f77208;p=mono.git

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 a6247c7e4e1..293d367a869 100644
--- 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 bbf3ef856ec..fccab496a96 100644
--- 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);