2004-03-15 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* System.Web.Compilation/GlobalAsaxCompiler.cs: removed Imports and
	Assemblies properties.

	* System.Web.UI/TemplateParser.cs: don't add import statement or
	assemblies from global.asax to every file. Fixes bug #55496.

svn path=/trunk/mcs/; revision=24094

diff --git a/mcs/class/System.Web/System.Web.Compilation/ChangeLog b/mcs/class/System.Web/System.Web.Compilation/ChangeLog
index 8eca84562671832be3b715032b3ed38749b5e8e7..d872b22604731e78ce3de45fb65bdffa02553aff 100644 (file)
--- a/mcs/class/System.Web/System.Web.Compilation/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Compilation/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-15  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * GlobalAsaxCompiler.cs: removed Imports and Assemblies properties.
+
 2004-02-23  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * AspGenerator.cs: error out when <object> server tag is not closed.

diff --git a/mcs/class/System.Web/System.Web.Compilation/GlobalAsaxCompiler.cs b/mcs/class/System.Web/System.Web.Compilation/GlobalAsaxCompiler.cs
index 4f2b8039e82004ab7d898bb6ce070a71327680d1..ffadf83249e576908c586c38cd6d36089726a2c6 100644 (file)
--- a/mcs/class/System.Web/System.Web.Compilation/GlobalAsaxCompiler.cs
+++ b/mcs/class/System.Web/System.Web.Compilation/GlobalAsaxCompiler.cs
@@ -18,31 +18,19 @@ namespace System.Web.Compilation
                ApplicationFileParser parser;
                static ArrayList applicationObjectTags = new ArrayList (1);
                static ArrayList sessionObjectTags = new ArrayList (1);
-               static ArrayList imports;
-               static ArrayList assemblies;
 
                public GlobalAsaxCompiler (ApplicationFileParser parser)
                        : base (parser)
                {
                        applicationObjectTags.Clear ();
                        sessionObjectTags.Clear ();
-                       
-                       if (imports != null)
-                               imports.Clear ();
-
-                       if (assemblies != null)
-                               assemblies.Clear ();
-
                        this.parser = parser;
                }
 
                public static Type CompileApplicationType (ApplicationFileParser parser)
                {
                        AspGenerator generator = new AspGenerator (parser);
-                       Type type = generator.GetCompiledType ();
-                       imports = parser.Imports;
-                       assemblies = parser.Assemblies;
-                       return type;
+                       return generator.GetCompiledType ();
                }
 
                protected override void CreateMethods ()
@@ -90,14 +78,6 @@ namespace System.Web.Compilation
                internal static ArrayList SessionObjects {
                        get { return sessionObjectTags; }
                }
-
-               internal static ArrayList Assemblies {
-                       get { return assemblies; }
-               }
-
-               internal static ArrayList Imports {
-                       get { return imports; }
-               }
        }
 }
 

diff --git a/mcs/class/System.Web/System.Web.UI/ChangeLog b/mcs/class/System.Web/System.Web.UI/ChangeLog
index b9d0cadb332b707c12e69137534222588f3210fb..7f834cda45a8a4aecc0b120c5d27b411f89c6b26 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/ChangeLog
+++ b/mcs/class/System.Web/System.Web.UI/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-15  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * TemplateParser.cs: don't add import statement or assemblies from
+       global.asax to every file. Fixes bug #55496.
+
 2004-03-09  Juraj Skripsky <juraj@hotfeet.ch>
 
        * DataBinder.cs: allow unquoted string expressions (e.g. "[test]") and

diff --git a/mcs/class/System.Web/System.Web.UI/TemplateParser.cs b/mcs/class/System.Web/System.Web.UI/TemplateParser.cs
index e6596b7ab1be3af8600ed0e3be324c179ad17dfe..6cdeadba8ddb594955a61eb1b9b38fdfbca41b55 100755 (executable)
--- a/mcs/class/System.Web/System.Web.UI/TemplateParser.cs
+++ b/mcs/class/System.Web/System.Web.UI/TemplateParser.cs
@@ -67,21 +67,6 @@ namespace System.Web.UI
                                AddAssembliesInBin ();
 
                        language = CompilationConfig.DefaultLanguage;
-                       if (GlobalAsaxCompiler.Assemblies != null) {
-                               foreach (string assembly in GlobalAsaxCompiler.Assemblies) {
-                                       if (!assemblies.Contains (assembly)) {
-                                               AddAssemblyByName (assembly);
-                                       }
-                               }
-                       }
-
-                       if (GlobalAsaxCompiler.Imports != null) {
-                               foreach (string import in GlobalAsaxCompiler.Imports) {
-                                       if (!imports.Contains (import)) {
-                                               imports.Add (import);
-                                       }
-                               }
-                       }
                }
 
                internal void AddApplicationAssembly ()