Author: mhabersack
Date: 2007-01-17 16:24:52 -0500 (Wed, 17 Jan 2007)
New Revision: 71229
Modified:
trunk/mcs/class/System.Web/System.Web.Compilation/AppCodeCompiler.cs
trunk/mcs/class/System.Web/System.Web.Compilation/AppResourcesCompiler.cs
trunk/mcs/class/System.Web/System.Web.Compilation/CachingCompiler.cs
trunk/mcs/class/System.Web/System.Web.Compilation/ChangeLog
Log:
Compilation fixes
Modified: trunk/mcs/class/System.Web/System.Web.Compilation/AppCodeCompiler.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Compilation/AppCodeCompiler.cs
2007-01-17 21:23:58 UTC (rev 71228)
+++ trunk/mcs/class/System.Web/System.Web.Compilation/AppCodeCompiler.cs
2007-01-17 21:24:52 UTC (rev 71229)
@@ -212,6 +212,8 @@
AppDomain.CurrentDomain.SetupInformation.DynamicBase,
name, "dll", OnCreateTemporaryAssemblyFile);
parameters.OutputAssembly = outputAssemblyName;
+ foreach (Assembly a in BuildManager.TopLevelAssemblies)
+ parameters.ReferencedAssemblies.Add
(a.Location);
CompilerResults results = abuilder.BuildAssembly
(parameters);
if (results.Errors.Count == 0) {
BuildManager.CodeAssemblies.Add
(results.PathToAssembly);
Modified:
trunk/mcs/class/System.Web/System.Web.Compilation/AppResourcesCompiler.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Compilation/AppResourcesCompiler.cs
2007-01-17 21:23:58 UTC (rev 71228)
+++ trunk/mcs/class/System.Web/System.Web.Compilation/AppResourcesCompiler.cs
2007-01-17 21:24:52 UTC (rev 71229)
@@ -548,13 +548,13 @@
throw new HttpException ("Failed to compile
resource file", ex);
} finally {
if (reader != null)
- reader.Dispose ();
+ reader.Close ();
else if (source != null)
- source.Dispose ();
+ source.Close ();
if (writer != null)
- writer.Dispose ();
+ writer.Close ();
else if (destination != null)
- destination.Dispose ();
+ destination.Close ();
}
return resource;
Modified: trunk/mcs/class/System.Web/System.Web.Compilation/CachingCompiler.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Compilation/CachingCompiler.cs
2007-01-17 21:23:58 UTC (rev 71228)
+++ trunk/mcs/class/System.Web/System.Web.Compilation/CachingCompiler.cs
2007-01-17 21:24:52 UTC (rev 71229)
@@ -91,6 +91,9 @@
return results;
ICodeCompiler comp = compiler.Compiler;
+#if NET_2_0
+ GetExtraAssemblies
(compiler.CompilerParameters);
+#endif
results = comp.CompileAssemblyFromDom
(compiler.CompilerParameters, compiler.Unit);
string [] deps = (string [])
compiler.Parser.Dependencies.ToArray (typeof (string));
cache.InsertPrivate (key, results, new
CacheDependency (deps));
@@ -246,6 +249,12 @@
if (o is string)
options.ReferencedAssemblies.Add ((string) o);
}
+
+ list = BuildManager.TopLevelAssemblies;
+ if (list != null && list.Count > 0) {
+ foreach (Assembly a in list)
+ options.ReferencedAssemblies.Add
(a.Location);
+ }
}
#endif
Modified: trunk/mcs/class/System.Web/System.Web.Compilation/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.Compilation/ChangeLog 2007-01-17
21:23:58 UTC (rev 71228)
+++ trunk/mcs/class/System.Web/System.Web.Compilation/ChangeLog 2007-01-17
21:24:52 UTC (rev 71229)
@@ -1,5 +1,13 @@
2007-01-17 Marek Habersack <[EMAIL PROTECTED]>
+ * AppCodeCompiler.cs: Reference toplevel assemblies (at this stage
+ App_GlobalResources) when compiling App_Code sources.
+
+ * CachingCompiler.cs: Reference toplevel assemblies when compiling
+ e.g. Global.asax
+
+ * AppResourcesCompiler.cs: Close the streams properly.
+
* AspGenerator.cs: Don't ignore thead/tbody anymore.
2007-01-15 Marek Habersack <[EMAIL PROTECTED]>
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
