Author: gonzalo
Date: 2005-04-25 20:05:03 -0400 (Mon, 25 Apr 2005)
New Revision: 43567
Modified:
trunk/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs
trunk/mcs/class/System.Web/System.Web.Compilation/ChangeLog
trunk/mcs/class/System.Web/System.Web.Configuration/ChangeLog
trunk/mcs/class/System.Web/System.Web.Configuration/CompilerCollection.cs
Log:
2005-04-25 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
* System.Web.Configuration/CompilerCollection.cs: added CompareLanguages
method.
* System.Web.Compilation/AspGenerator.cs: when checking languages, try
to match other aliases too (ie, 'cs' == 'c#').
Modified: trunk/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs
2005-04-25 22:37:58 UTC (rev 43566)
+++ trunk/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs
2005-04-26 00:05:03 UTC (rev 43567)
@@ -33,6 +33,7 @@
using System.IO;
using System.Text;
using System.Web.Caching;
+using System.Web.Configuration;
using System.Web.UI;
using System.Web.UI.HtmlControls;
using System.Web.Util;
@@ -624,7 +625,11 @@
if (lang == null || lang == "")
return;
- if (String.Compare (lang, tparser.Language, true) != 0)
{
+ if (String.Compare (lang, tparser.Language, true) == 0)
+ return;
+
+ CompilationConfiguration cfg =
CompilationConfiguration.GetInstance (HttpContext.Current);
+ if (!cfg.Compilers.CompareLanguages (tparser.Language,
lang)) {
throw new ParseException (Location,
String.Format ("Trying to mix
language '{0}' and '{1}'.",
tparser.Language, lang));
Modified: trunk/mcs/class/System.Web/System.Web.Compilation/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Compilation/ChangeLog 2005-04-25
22:37:58 UTC (rev 43566)
+++ trunk/mcs/class/System.Web/System.Web.Compilation/ChangeLog 2005-04-26
00:05:03 UTC (rev 43567)
@@ -1,3 +1,8 @@
+2005-04-25 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
+
+ * AspGenerator.cs: when checking languages, try to match other aliases
+ too (ie, 'cs' == 'c#').
+
2005-04-22 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
* BaseCompiler.cs: check that DynamicBase directory exists before
Modified: trunk/mcs/class/System.Web/System.Web.Configuration/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Configuration/ChangeLog
2005-04-25 22:37:58 UTC (rev 43566)
+++ trunk/mcs/class/System.Web/System.Web.Configuration/ChangeLog
2005-04-26 00:05:03 UTC (rev 43567)
@@ -1,3 +1,7 @@
+2005-04-25 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
+
+ * CompilerCollection.cs: added CompareLanguages method.
+
2005-04-22 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
* CompilationConfigurationHandler.cs: ensure TempDirectory is not empty
Modified:
trunk/mcs/class/System.Web/System.Web.Configuration/CompilerCollection.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Configuration/CompilerCollection.cs
2005-04-25 22:37:58 UTC (rev 43566)
+++ trunk/mcs/class/System.Web/System.Web.Configuration/CompilerCollection.cs
2005-04-26 00:05:03 UTC (rev 43567)
@@ -63,6 +63,11 @@
}
}
}
+
+ public bool CompareLanguages (string lang1, string lang2)
+ {
+ return (this [lang1] == this [lang2]);
+ }
}
#if false
public sealed class CompilerCollection : ConfigurationElementCollection
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
