Просмотр исходного кода

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


svn path=/trunk/mcs/; revision=76375
Marek Habersack 18 лет назад
Родитель
Сommit
dcbab13899

+ 1 - 1
mcs/class/System.Web/System.Web.Compilation/AppCodeCompiler.cs

@@ -220,7 +220,7 @@ namespace System.Web.Compilation
 			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);

+ 2 - 2
mcs/class/System.Web/System.Web.Compilation/AppResourcesCompiler.cs

@@ -140,7 +140,7 @@ namespace System.Web.Compilation
 			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 @@ namespace System.Web.Compilation
 			CompilerResults results = abuilder.BuildAssembly (cp);
 			Assembly ret = null;
 			
-			if (results.Errors.Count == 0) {
+			if (results.NativeCompilerReturnValue == 0) {
 				ret = results.CompiledAssembly;
 				AddAssemblyToCache (virtualPath, ret);
 			} else {

+ 1 - 1
mcs/class/System.Web/System.Web.Compilation/AssemblyBuilder.cs

@@ -229,7 +229,7 @@ namespace System.Web.Compilation {
 			
 			results = provider.CompileAssemblyFromFile (options, files.ToArray ());			
 
-			if (results.NativeCompilerReturnValue != 0 || results.Errors.Count > 0) {
+			if (results.NativeCompilerReturnValue != 0) {
 				string fileText = null;
 				try {
 					using (StreamReader sr = File.OpenText (results.Errors [0].FileName)) {

+ 7 - 0
mcs/class/System.Web/System.Web.Compilation/ChangeLog

@@ -1,5 +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
+	
 	* AspComponentFoundry.cs: formatting changes.
 	AssemblyFoundry looks for the specified namespace+type in the
 	top-level assemblies if necessary.