Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/mcs/class
diff options
context:
space:
mode:
authorAtsushi Eno <atsushieno@gmail.com>2009-08-08 04:35:39 +0400
committerAtsushi Eno <atsushieno@gmail.com>2009-08-08 04:35:39 +0400
commit1ed5e1ad21879390f29b7a125d72b85ffc903e35 (patch)
tree664380c14123ad74c15502d699d85203dd451bf1 /mcs/class
parent8aba75ce1f0d5167892519f93ac6fb20477d101f (diff)
2009-08-07 Atsushi Enomoto <atsushi@ximian.com>
* ContractDescription.cs : wcf & 2.1 is specially annoying land :( svn path=/trunk/mcs/; revision=139597
Diffstat (limited to 'mcs/class')
-rw-r--r--mcs/class/System.ServiceModel/System.ServiceModel.Description/ChangeLog4
-rw-r--r--mcs/class/System.ServiceModel/System.ServiceModel.Description/ContractDescription.cs2
2 files changed, 6 insertions, 0 deletions
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Description/ChangeLog b/mcs/class/System.ServiceModel/System.ServiceModel.Description/ChangeLog
index 060787c16c4..b70143dfe71 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Description/ChangeLog
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Description/ChangeLog
@@ -1,5 +1,9 @@
2009-08-07 Atsushi Enomoto <atsushi@ximian.com>
+ * ContractDescription.cs : wcf & 2.1 is specially annoying land :(
+
+2009-08-07 Atsushi Enomoto <atsushi@ximian.com>
+
* ContractDescriptionGenerator.cs : add new contract getter to
create callback contract type (which does not demand
ServiceContractAttribute).
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Description/ContractDescription.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Description/ContractDescription.cs
index fe016da2135..3d5660dd33e 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Description/ContractDescription.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Description/ContractDescription.cs
@@ -153,8 +153,10 @@ namespace System.ServiceModel.Description
foreach (OperationDescription od in Operations) {
if (!proxy.Operations.Contains (od.Name))
PopulateClientOperation (proxy, od);
+#if !NET_2_1
foreach (IOperationBehavior ob in od.Behaviors)
ob.ApplyClientBehavior (od, proxy.Operations [od.Name]);
+#endif
}
return proxy;