New test.

[mono.git] / mcs / class / System.Web / System.Web.UI / TemplateParser.cs

diff --git a/mcs/class/System.Web/System.Web.UI/TemplateParser.cs b/mcs/class/System.Web/System.Web.UI/TemplateParser.cs
index 71fb1085ef7edc54b6ace11edf29c9d2e6aeecb7..c99f839de2d80da3c50737dec3fedb6b0495f3d7 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/TemplateParser.cs
+++ b/mcs/class/System.Web/System.Web.UI/TemplateParser.cs
@@ -74,7 +74,6 @@ namespace System.Web.UI {
                Assembly srcAssembly;
                int appAssemblyIndex = -1;
 
-               [MonoTODO ("deal with AddAssembliesInBin in the 2.0 case")]
                internal TemplateParser ()
                {
                        imports = new ArrayList ();
@@ -93,9 +92,20 @@ namespace System.Web.UI {
                        imports.Add ("System.Web.UI.HtmlControls");
 
                        assemblies = new ArrayList ();
-#if CONFIGURATION_2_0
-                       foreach (AssemblyInfo info in CompilationConfig.Assemblies)
-                               AddAssemblyByName (info.Assembly);
+#if NET_2_0
+                       bool addAssembliesInBin = false;
+                       foreach (AssemblyInfo info in CompilationConfig.Assemblies) {
+                               if (info.Assembly == "*")
+                                       addAssembliesInBin = true;
+                               else
+                                       AddAssemblyByName (info.Assembly);
+                       }
+                       if (addAssembliesInBin)
+                               AddAssembliesInBin ();
+
+                       foreach (NamespaceInfo info in PagesConfig.Namespaces) {
+                               imports.Add (info.Namespace);
+                       }
 #else
                        foreach (string a in CompilationConfig.Assemblies)
                                AddAssemblyByName (a);
@@ -384,6 +394,22 @@ namespace System.Web.UI {
                        }
                }
 
+               internal virtual Assembly AddAssemblyByFileName (string filename)
+               {
+                       Assembly assembly = null;
+                       Exception error = null;
+
+                       try {
+                               assembly = Assembly.LoadFrom (filename);
+                       } catch (Exception e) { error = e; }
+
+                       if (assembly == null)
+                               ThrowParseException ("Assembly " + filename + " not found", error);
+
+                       AddAssembly (assembly, true);
+                       return assembly;
+               }
+
                internal virtual Assembly AddAssemblyByName (string name)
                {
                        if (anames == null)
@@ -410,7 +436,7 @@ namespace System.Web.UI {
                                        assembly = Assembly.LoadWithPartialName (name);
                                } catch (Exception e) { error = e; }
                        }
-
+                       
                        if (assembly == null)
                                ThrowParseException ("Assembly " + name + " not found", error);
 
@@ -461,7 +487,7 @@ namespace System.Web.UI {
 
                                // Add the code file as an option to the
                                // compiler. This lets both files be compiled at once.
-                               compilerOptions += " " + realPath;
+                               compilerOptions += " \"" + realPath + "\"";
                        } else if (inherits != null) {
                                // We just set the inherits directly because this is a
                                // Single-Page model.
@@ -684,7 +710,7 @@ namespace System.Web.UI {
                        get { return oc_param; }
                }
 
-#if CONFIGURATION_2_0
+#if NET_2_0
                internal PagesSection PagesConfig {
                        get {
                                return WebConfigurationManager.GetSection ("system.web/pages") as PagesSection;