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/data
diff options
context:
space:
mode:
authorAtsushi Eno <atsushieno@gmail.com>2009-08-05 11:22:42 +0400
committerAtsushi Eno <atsushieno@gmail.com>2009-08-05 11:22:42 +0400
commitb77ea43126b7a83984ccd2e9c8582a2430a2dcf7 (patch)
treeafff36563cebc42fd3e55719db3e02fa088c9b75 /data
parent6311f336e0a81aa973b3a6c8418d60eb8503e66a (diff)
2009-08-05 Atsushi Enomoto <atsushi@ximian.com>
* web.config: add WCF assemblies as references at compilation. * machine.config: add some missing WCF sections (new in 3.5). svn path=/trunk/mono/; revision=139392
Diffstat (limited to 'data')
-rw-r--r--data/net_2_0/ChangeLog5
-rw-r--r--data/net_2_0/machine.config15
-rw-r--r--data/net_2_0/web.config4
3 files changed, 24 insertions, 0 deletions
diff --git a/data/net_2_0/ChangeLog b/data/net_2_0/ChangeLog
index 73f74e2d2dd..09f2a825968 100644
--- a/data/net_2_0/ChangeLog
+++ b/data/net_2_0/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-05 Atsushi Enomoto <atsushi@ximian.com>
+
+ * web.config: add WCF assemblies as references at compilation.
+ * machine.config: add some missing WCF sections (new in 3.5).
+
2009-05-28 Atsushi Enomoto <atsushi@ximian.com>
* machine.config: fix WCF diagnostics section name.
diff --git a/data/net_2_0/machine.config b/data/net_2_0/machine.config
index bb47350be0a..76ccdb48914 100644
--- a/data/net_2_0/machine.config
+++ b/data/net_2_0/machine.config
@@ -253,6 +253,21 @@
</providers>
</profile>
</system.web>
+
+ <system.serviceModel>
+ <extensions>
+ <behaviorExtensions>
+ <add name="enableWebScript" type="System.ServiceModel.Configuration.WebScriptEnablingElement, System.ServiceModel.Web, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
+ <add name="webHttp" type="System.ServiceModel.Configuration.WebHttpElement, System.ServiceModel.Web, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
+ </behaviorExtensions>
+ <bindingElementExtensions>
+ <add name="webMessageEncoding" type="System.ServiceModel.Configuration.WebMessageEncodingElement, System.ServiceModel.Web, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
+ </bindingElementExtensions>
+ <bindingExtensions>
+ <add name="webHttpBinding" type="System.ServiceModel.Configuration.WebHttpBindingCollectionElement, System.ServiceModel.Web, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
+ </bindingExtensions>
+ </extensions>
+ </system.serviceModel>
</configuration>
diff --git a/data/net_2_0/web.config b/data/net_2_0/web.config
index 49ca8df8f28..e1428f8c39b 100644
--- a/data/net_2_0/web.config
+++ b/data/net_2_0/web.config
@@ -95,6 +95,10 @@
<add assembly="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add assembly="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add assembly="System.Web.Services, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <add assembly="System.Runtime.Serialization, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"/>
+ <add assembly="System.IdentityModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"/>
+ <add assembly="System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
+ <add assembly="System.ServiceModel.Web, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add assembly="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add assembly="*" /> <!-- Add assemblies in bin directory -->
</assemblies>