Author: mhabersack
Date: 2007-04-30 03:50:20 -0400 (Mon, 30 Apr 2007)
New Revision: 76474
Modified:
branches/mono-1-2-4/mcs/class/System.Web/System.Web.Compilation/AppCodeCompiler.cs
branches/mono-1-2-4/mcs/class/System.Web/System.Web.Compilation/AppResourcesCompiler.cs
branches/mono-1-2-4/mcs/class/System.Web/System.Web.Compilation/ChangeLog
Log:
Backport of r76375
2007-04-27 Marek Habersack <[EMAIL PROTECTED]>
* AppCodeCompiler.cs: do not look at the number of errors, check
the compiler return code instead.
* AssemblyBuilder.cs: as above
* AppResourcesCompiler.cs: as above
Modified:
branches/mono-1-2-4/mcs/class/System.Web/System.Web.Compilation/AppCodeCompiler.cs
===================================================================
---
branches/mono-1-2-4/mcs/class/System.Web/System.Web.Compilation/AppCodeCompiler.cs
2007-04-30 07:45:53 UTC (rev 76473)
+++
branches/mono-1-2-4/mcs/class/System.Web/System.Web.Compilation/AppCodeCompiler.cs
2007-04-30 07:50:20 UTC (rev 76474)
@@ -220,7 +220,7 @@
foreach (Assembly a in BuildManager.TopLevelAssemblies)
parameters.ReferencedAssemblies.Add
(a.Location);
CompilerResults results = abuilder.BuildAssembly
(parameters);
- if (results.Errors.Count == 0) {
+ if (results.NativeCompilerReturnValue == 0) {
BuildManager.CodeAssemblies.Add
(results.CompiledAssembly);
BuildManager.TopLevelAssemblies.Add
(results.CompiledAssembly);
HttpRuntime.WritePreservationFile
(results.CompiledAssembly, name);
Modified:
branches/mono-1-2-4/mcs/class/System.Web/System.Web.Compilation/AppResourcesCompiler.cs
===================================================================
---
branches/mono-1-2-4/mcs/class/System.Web/System.Web.Compilation/AppResourcesCompiler.cs
2007-04-30 07:45:53 UTC (rev 76473)
+++
branches/mono-1-2-4/mcs/class/System.Web/System.Web.Compilation/AppResourcesCompiler.cs
2007-04-30 07:50:20 UTC (rev 76474)
@@ -140,7 +140,7 @@
CompilerResults results = abuilder.BuildAssembly (cp);
Assembly ret = null;
- if (results.Errors.Count == 0) {
+ if (results.NativeCompilerReturnValue == 0) {
ret = results.CompiledAssembly;
BuildManager.TopLevelAssemblies.Add (ret);
HttpContext.AppGlobalResourcesAssembly = ret;
@@ -203,7 +203,7 @@
CompilerResults results = abuilder.BuildAssembly (cp);
Assembly ret = null;
- if (results.Errors.Count == 0) {
+ if (results.NativeCompilerReturnValue == 0) {
ret = results.CompiledAssembly;
AddAssemblyToCache (virtualPath, ret);
} else {
Modified:
branches/mono-1-2-4/mcs/class/System.Web/System.Web.Compilation/ChangeLog
===================================================================
--- branches/mono-1-2-4/mcs/class/System.Web/System.Web.Compilation/ChangeLog
2007-04-30 07:45:53 UTC (rev 76473)
+++ branches/mono-1-2-4/mcs/class/System.Web/System.Web.Compilation/ChangeLog
2007-04-30 07:50:20 UTC (rev 76474)
@@ -1,3 +1,12 @@
+2007-04-27 Marek Habersack <[EMAIL PROTECTED]>
+
+ * AppCodeCompiler.cs: do not look at the number of errors, check
+ the compiler return code instead.
+
+ * AssemblyBuilder.cs: as above
+
+ * AppResourcesCompiler.cs: as above
+
2007-04-26 Marek Habersack <[EMAIL PROTECTED]>
* PageCompiler.cs: the Master property must be in the partial
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches