2009-01-07 Astushi Enomoto <[email protected]>

	* net_2_1_raw_System.ServiceModel.dll.sources : add OperationContext
	  and OperationContextScope to 2.1 build.

	* OperationContext.cs : changes to include this in net_2_1_raw.


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

mcs/class/System.ServiceModel/ChangeLog

@@ -1,3 +1,8 @@
+2009-01-07  Astushi Enomoto  <[email protected]>
+
+	* net_2_1_raw_System.ServiceModel.dll.sources : add OperationContext
+	  and OperationContextScope to 2.1 build.
+
 2008-09-12  Astushi Enomoto  <[email protected]>
             Jb Evain  <[email protected]>
 

mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog

@@ -1,3 +1,7 @@
+2009-01-07  Atsushi Enomoto  <[email protected]>
+
+	* OperationContext.cs : changes to include this in net_2_1_raw.
+
 2008-05-28  Noam Lampert <[email protected]>
 	* ServiceHost.cs: Allow services to implement more than one contract.
 

mcs/class/System.ServiceModel/System.ServiceModel/OperationContext.cs

@@ -46,7 +46,9 @@ namespace System.ServiceModel
 			set { Thread.SetData (Thread.GetNamedDataSlot (operation_context_name), value); }
 		}
 
+#if !NET_2_1
 		EndpointDispatcher dispatcher;
+#endif
 		IContextChannel channel;
 		RequestContext request_ctx;
 		ExtensionCollection<OperationContext> extensions;
@@ -67,11 +69,6 @@ namespace System.ServiceModel
 			get { return channel; }
 		}
 
-		public EndpointDispatcher EndpointDispatcher {
-			get { return dispatcher; }
-			set { dispatcher = value; }
-		}
-
 		public IExtensionCollection<OperationContext> Extensions {
 			get {
 				if (extensions == null)
@@ -80,6 +77,12 @@ namespace System.ServiceModel
 			}
 		}
 
+
+#if !NET_2_1
+		public EndpointDispatcher EndpointDispatcher {
+			get { return dispatcher; }
+			set { dispatcher = value; }
+		}
 		public bool HasSupportingTokens {
 			get { return SupportingTokens != null ? SupportingTokens.Count > 0 : false; }
 		}
@@ -87,6 +90,7 @@ namespace System.ServiceModel
 		public ServiceHostBase Host {
 			get { return dispatcher != null ? dispatcher.ChannelDispatcher.Host : null; }
 		}
+#endif
 
 		public MessageHeaders IncomingMessageHeaders {
 			get { return request_ctx != null ? request_ctx.RequestMessage.Headers : null; }
@@ -136,15 +140,16 @@ namespace System.ServiceModel
 			set { request_ctx = value; }
 		}
 
-		public ServiceSecurityContext ServiceSecurityContext {
-			get { return IncomingMessageProperties != null ? IncomingMessageProperties.Security.ServiceSecurityContext : null; }
-		}
-
 		[MonoTODO]
 		public string SessionId {
 			get { throw new NotImplementedException (); }
 		}
 
+#if !NET_2_1
+		public ServiceSecurityContext ServiceSecurityContext {
+			get { return IncomingMessageProperties != null ? IncomingMessageProperties.Security.ServiceSecurityContext : null; }
+		}
+
 		public ICollection<SupportingTokenSpecification> SupportingTokens {
 			get { return IncomingMessageProperties != null ? IncomingMessageProperties.Security.IncomingSupportingTokens : null; }
 		}
@@ -168,6 +173,7 @@ namespace System.ServiceModel
 		{
 			throw new NotImplementedException ();
 		}
+#endif
 
 		internal Message IncomingMessage {
 			get {

mcs/class/System.ServiceModel/net_2_1_raw_System.ServiceModel.dll.sources

@@ -188,6 +188,8 @@ System.ServiceModel/MessageHeaderException.cs
 System.ServiceModel/MessageHeader_1.cs
 System.ServiceModel/MessageParameterAttribute.cs
 System.ServiceModel/MessagePropertyAttribute.cs
+System.ServiceModel/OperationContext.cs
+System.ServiceModel/OperationContextScope.cs
 System.ServiceModel/OperationContractAttribute.cs
 System.ServiceModel/ProtocolException.cs
 System.ServiceModel/QuotaExceededException.cs