2008-10-09 Marek Habersack <mhabersack@novell.com>

	* web.config: added the default monoSettings section which works around
	an incompatibility between mcs and csc, mentioned in bug #433806

	* machine.config: added definition of the monoSettings section to
	the system.web group

svn path=/trunk/mono/; revision=115338

diff --git a/data/net_2_0/ChangeLog b/data/net_2_0/ChangeLog
index ce7684071c75013ad25673117b5a43b8a89e4f1a..ed2648db823a4aace57e7e2cbaaa086bec61f588 100644 (file)
--- a/data/net_2_0/ChangeLog
+++ b/data/net_2_0/ChangeLog
@@ -1,3 +1,11 @@
+2008-10-09  Marek Habersack  <mhabersack@novell.com>
+
+       * web.config: added the default monoSettings section which works around
+       an incompatibility between mcs and csc, mentioned in bug #433806
+
+       * machine.config: added definition of the monoSettings section to 
+       the system.web group
+
 2008-10-06  Marek Habersack  <mhabersack@novell.com>
 
        * machine.config: added entries to ignore the mobileControls and

diff --git a/data/net_2_0/machine.config b/data/net_2_0/machine.config
index ce7d02dae2d55349fb42137e8a1bd4790042523a..7aa3504efdec57feca5ed547040c26426f444b81 100644 (file)
--- a/data/net_2_0/machine.config
+++ b/data/net_2_0/machine.config
@@ -60,6 +60,7 @@
                                <section name="outputCacheSettings" type="System.Web.Configuration.OutputCacheSettingsSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication"/>
                                <section name="sqlCacheDependency" type="System.Web.Configuration.OutputCacheSettingsSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication"/>
                        </sectionGroup>
+                       <section name="monoSettings" type="System.Web.Configuration.MonoSettingsSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
                </sectionGroup>
                <sectionGroup name="system.net" type="System.Net.Configuration.NetSectionGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
                        <section name="authenticationModules" type="System.Net.Configuration.AuthenticationModulesSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />

diff --git a/data/net_2_0/web.config b/data/net_2_0/web.config
index 3edb504d36699ea802d16dc3106e2eec6b4a9910..3a08938ecd4f469a9263d11dd896579de7f7f3cd 100644 (file)
--- a/data/net_2_0/web.config
+++ b/data/net_2_0/web.config
@@ -3,6 +3,13 @@
 <configuration>
 
        <system.web>
+               <monoSettings>
+                       <compilersCompatibility>
+                               <compiler language="c#;cs;csharp" extension=".cs" compilerOptions="/nowarn:0169"
+                                         type="Microsoft.CSharp.CSharpCodeProvider, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+                       </compilersCompatibility>
+               </monoSettings>
+               
                <authorization>
                        <allow users="*" />
                </authorization>