Author: gonzalo
Date: 2005-03-16 19:31:49 -0500 (Wed, 16 Mar 2005)
New Revision: 41924
Modified:
trunk/mcs/class/System.Web/System.Web.Configuration/ChangeLog
trunk/mcs/class/System.Web/System.Web.Configuration/CompilationConfiguration.cs
trunk/mcs/class/System.Web/System.Web.Configuration/CompilationConfigurationHandler.cs
trunk/mcs/class/System.Web/System.Web.Configuration/CompilationSection.cs
trunk/mcs/class/System.Web/System.Web.Configuration/Compiler.cs
trunk/mcs/class/System.Web/System.Web.Configuration/CompilerCollection.cs
Log:
2005-03-16 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
* CompilerCollection.cs:
* CompilationConfigurationHandler.cs:
* Compiler.cs:
* CompilationSection.cs:
* CompilationConfiguration.cs: reverted last patch and/or disable code
until the whole config system is migrated to 2.0. Fixes bug #73736.
Modified: trunk/mcs/class/System.Web/System.Web.Configuration/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Configuration/ChangeLog
2005-03-16 23:26:20 UTC (rev 41923)
+++ trunk/mcs/class/System.Web/System.Web.Configuration/ChangeLog
2005-03-17 00:31:49 UTC (rev 41924)
@@ -1,3 +1,12 @@
+2005-03-16 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
+
+ * CompilerCollection.cs:
+ * CompilationConfigurationHandler.cs:
+ * Compiler.cs:
+ * CompilationSection.cs:
+ * CompilationConfiguration.cs: reverted last patch and/or disable code
+ until the whole config system is migrated to 2.0. Fixes bug #73736.
+
2005-03-14 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
* CodeSubDirectoriesCollection.cs:
Modified:
trunk/mcs/class/System.Web/System.Web.Configuration/CompilationConfiguration.cs
===================================================================
---
trunk/mcs/class/System.Web/System.Web.Configuration/CompilationConfiguration.cs
2005-03-16 23:26:20 UTC (rev 41923)
+++
trunk/mcs/class/System.Web/System.Web.Configuration/CompilationConfiguration.cs
2005-03-17 00:31:49 UTC (rev 41924)
@@ -129,11 +129,7 @@
num_recompiles_before_app_restart =
parent.num_recompiles_before_app_restart;
strict = parent.strict;
temp_directory = parent.temp_directory;
-#if !NET_2_0
compilers = new CompilerCollection (parent.compilers);
-#else
- compilers = new CompilerCollection ();
-#endif
ArrayList p = parent.assemblies;
assembliesInBin = parent.assembliesInBin;
ICollection coll = (p == null) ? (ICollection) new
object [0] : p;
Modified:
trunk/mcs/class/System.Web/System.Web.Configuration/CompilationConfigurationHandler.cs
===================================================================
---
trunk/mcs/class/System.Web/System.Web.Configuration/CompilationConfigurationHandler.cs
2005-03-16 23:26:20 UTC (rev 41923)
+++
trunk/mcs/class/System.Web/System.Web.Configuration/CompilationConfigurationHandler.cs
2005-03-17 00:31:49 UTC (rev 41924)
@@ -27,7 +27,6 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-
using System;
using System.Collections;
using System.Configuration;
@@ -92,14 +91,11 @@
ThrowException ("Unexpected element",
child);
Compiler compiler = new Compiler ();
-#if !NET_2_0
-// Removing this for 2.0 is a hack until the whole config. system is migrated
to 2.0
compiler.Language = AttValue ("language",
child);
compiler.Extension = AttValue ("extension",
child);
compiler.Type = AttValue ("type", child);
compiler.CompilerOptions = AttValue
("compilerOptions", child, true, true);
compiler.WarningLevel = AttUIntValue
("warningLevel", child, 0);
-#endif
config.Compilers [compiler.Language] = compiler;
}
}
Modified:
trunk/mcs/class/System.Web/System.Web.Configuration/CompilationSection.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Configuration/CompilationSection.cs
2005-03-16 23:26:20 UTC (rev 41923)
+++ trunk/mcs/class/System.Web/System.Web.Configuration/CompilationSection.cs
2005-03-17 00:31:49 UTC (rev 41924)
@@ -75,8 +75,8 @@
props.Add (batchTimeout);
codeSubDirectories = new ConfigurationProperty
("codeSubDirectories", typeof (CodeSubDirectoriesCollection), 0);
props.Add (codeSubDirectories);
- compilers = new ConfigurationProperty ("compilers",
typeof (CompilerCollection), 0);
- props.Add (compilers);
+ //compilers = new ConfigurationProperty ("compilers",
typeof (CompilerCollection), 0);
+ //props.Add (compilers);
debug = new ConfigurationProperty ("debug", boolType,
false, boolTypeConv, null, 0);
props.Add (debug);
defaultLanguage = new ConfigurationProperty
("defaultLanguage", strType, "c#", strTypeConv, null, 0);
@@ -125,9 +125,11 @@
get { return (CodeSubDirectoriesCollection) this
[codeSubDirectories]; }
}
+ /*
public CompilerCollection Compilers {
get { return (CompilerCollection) this [compilers]; }
}
+ */
public bool Debug {
get { return (bool) this [debug]; }
Modified: trunk/mcs/class/System.Web/System.Web.Configuration/Compiler.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Configuration/Compiler.cs
2005-03-16 23:26:20 UTC (rev 41923)
+++ trunk/mcs/class/System.Web/System.Web.Configuration/Compiler.cs
2005-03-17 00:31:49 UTC (rev 41924)
@@ -34,7 +34,6 @@
namespace System.Web.Configuration
{
-#if !NET_2_0
class Compiler
{
public string Language;
@@ -53,7 +52,7 @@
"CompilerOptions: " + CompilerOptions + "\n";
}
}
-#else // NET_2_0
+#if false
public sealed class Compiler : ConfigurationElement
{
static ConfigurationPropertyCollection props;
Modified:
trunk/mcs/class/System.Web/System.Web.Configuration/CompilerCollection.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Configuration/CompilerCollection.cs
2005-03-16 23:26:20 UTC (rev 41923)
+++ trunk/mcs/class/System.Web/System.Web.Configuration/CompilerCollection.cs
2005-03-17 00:31:49 UTC (rev 41924)
@@ -34,7 +34,6 @@
namespace System.Web.Configuration
{
-#if !NET_2_0
sealed class CompilerCollection
{
Hashtable compilers;
@@ -65,7 +64,7 @@
}
}
}
-#else // NET_2_0
+#if false
public sealed class CompilerCollection : ConfigurationElementCollection
{
static ConfigurationPropertyCollection props;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
