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

diff --git a/data/net_2_0/ChangeLog b/data/net_2_0/ChangeLog
index 73f74e2d2ddff3064c7c0bc08eff658eb912d213..09f2a8259689851077b997088df268ed836055e1 100644 (file)
--- 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 bb47350be0af67b052e71f2fedbf448b46bffc9e..76ccdb489141fbb91d1cba931b2963d512ce5f24 100644 (file)
--- 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 49ca8df8f28cc6f624d17f62c539660b7715e515..e1428f8c39ba200383ec08d6f8817086011cb92e 100644 (file)
--- 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>