* data/net_1_1/machine.config: Ignore system.windows.forms section.

* data/net_2_0/machine.config: Define system.windows.forms section.

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

diff --git a/ChangeLog b/ChangeLog
index 5092d0d926795fe65f2f1b870b4a3643c495c0db..6b4633ec0cf9bb92603caab269eccc7b4197d50a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-02  Gert Driesen  <drieseng@users.sourceforge.net>
+
+       * data/net_1_1/machine.config: Ignore system.windows.forms section.
+       * data/net_2_0/machine.config: Define system.windows.forms section.
+
 2008-06-30  Alp Toker  <alp@nuanti.com>
 
        * configure.in:

diff --git a/data/net_1_1/machine.config b/data/net_1_1/machine.config
index f93d88252743ab7c2a74891ceb46c9926e228eb3..30aa212056778764ab8926cd62e06dcf92f61167 100644 (file)
--- a/data/net_1_1/machine.config
+++ b/data/net_1_1/machine.config
@@ -6,6 +6,7 @@
                <section name="appSettings" type="System.Configuration.NameValueFileSectionHandler, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
                <section name="system.diagnostics" type="System.Diagnostics.DiagnosticsConfigurationHandler, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
                <section name="system.runtime.remoting" type="System.Configuration.IgnoreSectionHandler, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowLocation="false"/>
+               <section name="system.windows.forms" type="System.Configuration.IgnoreSectionHandler, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
                <sectionGroup name="system.web">
                        <section name="httpHandlers"
                                 type="System.Web.Configuration.HttpHandlersSectionHandler, System.Web, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

diff --git a/data/net_2_0/machine.config b/data/net_2_0/machine.config
index 8b95025a5cfc79182cd5fbf8d5ebaeea7c815ed3..7a8078380921ebb0139c44e779994f6e5aa618b3 100644 (file)
--- a/data/net_2_0/machine.config
+++ b/data/net_2_0/machine.config
@@ -15,6 +15,7 @@
                <section name="system.data" type="System.Data.Common.DbProviderFactoriesConfigurationHandler, System.Data, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
                <section name="system.diagnostics" type="System.Diagnostics.DiagnosticsConfigurationHandler, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
                <section name="system.runtime.remoting" type="System.Configuration.IgnoreSection, System.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowLocation="false"/>
+               <section name="system.windows.forms" type="System.Windows.Forms.WindowsFormsSection, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
                <section name="windows" type="System.Configuration.IgnoreSection, System.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowLocation="false" />
                <section name="strongNames" type="System.Configuration.IgnoreSection, System.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowLocation="false"/>
                <sectionGroup name="system.web" type="System.Web.Configuration.SystemWebSectionGroup, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">