Author: msierad
Date: 2006-10-06 05:15:27 -0400 (Fri, 06 Oct 2006)
New Revision: 66336

Modified:
   trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog
   trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Copy.cs
   trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/MSBuild.cs
Log:
2006-10-06  Marek Sieradzki  <[EMAIL PROTECTED]>

        * MSBuild.cs: Added error logging.
        * Copy.cs: Fixed runtime cast exception.



Modified: trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog
===================================================================
--- trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog       
2006-10-06 09:13:14 UTC (rev 66335)
+++ trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ChangeLog       
2006-10-06 09:15:27 UTC (rev 66336)
@@ -1,3 +1,8 @@
+2006-10-06  Marek Sieradzki  <[EMAIL PROTECTED]>
+
+       * MSBuild.cs: Added error logging.
+       * Copy.cs: Fixed runtime cast exception.
+
 2006-09-30  Marek Sieradzki  <[EMAIL PROTECTED]>
 
        * ResolveAssemblyReference.cs: Added.

Modified: trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Copy.cs
===================================================================
--- trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Copy.cs 
2006-10-06 09:13:14 UTC (rev 66335)
+++ trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Copy.cs 
2006-10-06 09:15:27 UTC (rev 66336)
@@ -28,6 +28,7 @@
 #if NET_2_0
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using Microsoft.Build.Framework;
@@ -57,10 +58,8 @@
                                        throw new Exception ("You must specify 
only one attribute from DestinationFiles and DestinationFolder");
                                if (destinationFiles != null) {
                                        IEnumerator <ITaskItem> source, 
destination;
-                                       source = (IEnumerator <ITaskItem>) 
sourceFiles.GetEnumerator ();
-                                       destination = (IEnumerator <ITaskItem>) 
destinationFiles.GetEnumerator ();
-                                       source.Reset ();
-                                       destination.Reset ();
+                                       source = ((IEnumerable <ITaskItem>) 
sourceFiles).GetEnumerator ();
+                                       destination = ((IEnumerable 
<ITaskItem>) destinationFiles).GetEnumerator ();
                                        while (source.MoveNext ()) {
                                                destination.MoveNext ();
                                                ITaskItem sourceItem = 
source.Current;
@@ -89,7 +88,6 @@
                                        
                                        IEnumerator <ITaskItem> source;
                                        source = (IEnumerator <ITaskItem>) 
sourceFiles.GetEnumerator ();
-                                       source.Reset ();
                                        while (source.MoveNext ()) {
                                                ITaskItem sourceItem = 
source.Current;
                                                string sourceFile = 
sourceItem.GetMetadata ("FullPath");

Modified: trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/MSBuild.cs
===================================================================
--- trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/MSBuild.cs      
2006-10-06 09:13:14 UTC (rev 66335)
+++ trunk/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/MSBuild.cs      
2006-10-06 09:15:27 UTC (rev 66336)
@@ -51,13 +51,17 @@
                {
                        string filename;
                        bool result = true;
+                       stopOnFirstFailure = false;
                
                        foreach (ITaskItem project in projects) {
                                filename = project.GetMetadata ("FullPath");
                                
                                result = BuildEngine.BuildProjectFile 
(filename, targets, new Hashtable (), new Hashtable ());
-                               if (result == false)
-                                       break;
+                               if (result == false) {
+                                       Log.LogError ("Error while building 
{0}", filename);
+                                       if (stopOnFirstFailure)
+                                               break;
+                               }
                        }
                        return result;
                }

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to