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 0d3fab96dd02b10b2891b9440acd5b5c54737bb6..c99f839de2d80da3c50737dec3fedb6b0495f3d7 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/TemplateParser.cs
+++ b/mcs/class/System.Web/System.Web.UI/TemplateParser.cs
@@ -102,6 +102,10 @@ namespace System.Web.UI {
                        }
                        if (addAssembliesInBin)
                                AddAssembliesInBin ();
+
+                       foreach (NamespaceInfo info in PagesConfig.Namespaces) {
+                               imports.Add (info.Namespace);
+                       }
 #else
                        foreach (string a in CompilationConfig.Assemblies)
                                AddAssemblyByName (a);
@@ -392,16 +396,18 @@ namespace System.Web.UI {
 
                internal virtual Assembly AddAssemblyByFileName (string filename)
                {
+                       Assembly assembly = null;
+                       Exception error = null;
+
                        try {
-                               Assembly assembly = Assembly.LoadFrom(filename);
-                               AddAssembly (assembly, true);
-                               return assembly;
-                       }
-                       catch (Exception e)
-                       {
-                               ThrowParseException ("Assembly file " + filename + " not found", e);
-                               return null; //never gets here, only to satisfy the compiler
-                       }
+                               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)
@@ -481,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.