2009-12-01 Atsushi Enomoto <[email protected]>

	* ClientCredentials.cs : more SL3 changes.

	* ClientBase.cs, ChannelFactory_1.cs, ChannelFactory.cs :
	  more SL3 changes.


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

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

@@ -1,3 +1,7 @@
+2009-12-01  Atsushi Enomoto  <[email protected]>
+
+	* ClientCredentials.cs : more SL3 changes.
+
 2009-11-25  Atsushi Enomoto  <[email protected]>
 
 	* ClientCredentials.cs : it is part of SL3 API, so adjusted for it.

mcs/class/System.ServiceModel/System.ServiceModel.Description/ClientCredentials.cs

@@ -40,7 +40,9 @@ using System.ServiceModel.Security.Tokens;
 namespace System.ServiceModel.Description
 {
 	public class ClientCredentials
-#if !NET_2_1
+#if NET_2_1
+		: IEndpointBehavior
+#else
 		: SecurityCredentialsManager, IEndpointBehavior
 #endif
 	{

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

@@ -1,3 +1,8 @@
+2009-12-01  Atsushi Enomoto  <[email protected]>
+
+	* ClientBase.cs, ChannelFactory_1.cs, ChannelFactory.cs :
+	  more SL3 changes.
+
 2009-12-01  Atsushi Enomoto  <[email protected]>
 
 	* SilverlightClientConfigLoader.cs : do not enter infinite loop at

mcs/class/System.ServiceModel/System.ServiceModel/ChannelFactory.cs

@@ -67,11 +67,9 @@ namespace System.ServiceModel
 			get { return service_endpoint; }
 		}
 
-#if !NET_2_1
 		public ClientCredentials Credentials {
 			get { return Endpoint.Behaviors.Find<ClientCredentials> (); }
 		}
-#endif
 
 		protected internal override TimeSpan DefaultCloseTimeout {
 			get { return Endpoint.Binding.CloseTimeout; }

mcs/class/System.ServiceModel/System.ServiceModel/ChannelFactory_1.cs

@@ -154,9 +154,7 @@ namespace System.ServiceModel
 		{
 			ContractDescription cd = ContractDescription.GetContract (typeof (TChannel));
 			ServiceEndpoint ep = new ServiceEndpoint (cd);
-#if !NET_2_1
 			ep.Behaviors.Add (new ClientCredentials ());
-#endif
 			return ep;
 		}
 	}

mcs/class/System.ServiceModel/System.ServiceModel/ClientBase.cs

@@ -173,11 +173,9 @@ namespace System.ServiceModel
 			}
 		}
 
-#if !NET_2_1
 		public ClientCredentials ClientCredentials {
 			get { return ChannelFactory.Credentials; }
 		}
-#endif
 
 		public ServiceEndpoint Endpoint {
 			get { return factory.Endpoint; }