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/corlib/System.Runtime.Remoting.Activation/ActivationServices.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting.Activation/ActivationServices.cs
@@ -213,7 +213,7 @@ namespace System.Runtime.Remoting.Activation

 			if (type.IsContextful)
 				return RemotingServices.CreateClientProxyForContextBound (type, null);
-#if !NET_2_1
+#if !MOBILE
 			if (type.IsCOMObject) {
 				return RemotingServices.CreateClientProxyForComInterop (type);
 			}