diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2009-08-06 07:06:03 +0400 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2009-08-06 07:06:03 +0400 |
| commit | 9bacb28423a04c570f6ea22e6884d5ef76820445 (patch) | |
| tree | c74fdcc9d3e2eb17af7541f04148d3231b415697 /data | |
| parent | 8cfc7de84375f385b2129d6828426a777e2f8419 (diff) | |
2009-08-06 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=139460
Diffstat (limited to 'data')
| -rw-r--r-- | data/net_4_0/ChangeLog | 5 | ||||
| -rw-r--r-- | data/net_4_0/machine.config | 16 | ||||
| -rw-r--r-- | data/net_4_0/web.config | 4 |
3 files changed, 25 insertions, 0 deletions
diff --git a/data/net_4_0/ChangeLog b/data/net_4_0/ChangeLog index 46a923b7af2..0f076a9a3e7 100644 --- a/data/net_4_0/ChangeLog +++ b/data/net_4_0/ChangeLog @@ -1,3 +1,8 @@ +2009-08-06 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-07-24 Jb Evain <jbevain@novell.com> * Initial import of the net_4_0 specific files. diff --git a/data/net_4_0/machine.config b/data/net_4_0/machine.config index 96b9168e29d..5e229b5aafc 100644 --- a/data/net_4_0/machine.config +++ b/data/net_4_0/machine.config @@ -253,6 +253,22 @@ </providers> </profile> </system.web> + + + <system.serviceModel> + <extensions> + <behaviorExtensions> + <add name="enableWebScript" type="System.ServiceModel.Configuration.WebScriptEnablingElement, System.ServiceModel.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/> + <add name="webHttp" type="System.ServiceModel.Configuration.WebHttpElement, System.ServiceModel.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/> + </behaviorExtensions> + <bindingElementExtensions> + <add name="webMessageEncoding" type="System.ServiceModel.Configuration.WebMessageEncodingElement, System.ServiceModel.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/> + </bindingElementExtensions> + <bindingExtensions> + <add name="webHttpBinding" type="System.ServiceModel.Configuration.WebHttpBindingCollectionElement, System.ServiceModel.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/> + </bindingExtensions> + </extensions> + </system.serviceModel> </configuration> diff --git a/data/net_4_0/web.config b/data/net_4_0/web.config index b94651457d0..abbaad7d1db 100644 --- a/data/net_4_0/web.config +++ b/data/net_4_0/web.config @@ -95,6 +95,10 @@ <add assembly="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <add assembly="System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <add assembly="System.Web.Services, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> + <add assembly="System.Runtime.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"/> + <add assembly="System.IdentityModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"/> + <add assembly="System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/> + <add assembly="System.ServiceModel.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/> <add assembly="System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <add assembly="*" /> <!-- Add assemblies in bin directory --> </assemblies> |