Imported Upstream version 4.0.3.13

Former-commit-id: 4f1f69b42e04def9a697c2550b23b9cae645ef29
2015-07-20 03:39:00 -04:00
parent 4cee7df5e0
commit 2c051c3d51
138 changed files with 3829 additions and 206 deletions
--- a/mcs/class/System.ServiceModel/System.ServiceModel/OperationContext.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/OperationContext.cs
@@ -45,7 +45,7 @@ namespace System.ServiceModel
 		}

 		Message incoming_message;
-#if !NET_2_1
+#if !NET_2_1 && !XAMMAC_4_5
 		EndpointDispatcher dispatcher;
 #endif
 		IContextChannel channel;
@@ -83,7 +83,7 @@ namespace System.ServiceModel
 		}


-#if !NET_2_1
+#if !NET_2_1 && !XAMMAC_4_5
 		public EndpointDispatcher EndpointDispatcher {
 			get { return dispatcher; }
 			set { dispatcher = value; }