From 770285204d89dbaf9bda94bdc782dba6538df7ab Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Sat, 10 Apr 2010 00:03:33 +0000 Subject: [PATCH] * ConsoleLogger.cs (EventsToString): If the target being executed is from an imported file, then show that. svn path=/trunk/mcs/; revision=155183 --- .../Microsoft.Build.BuildEngine/ChangeLog | 5 +++++ .../Microsoft.Build.BuildEngine/ConsoleLogger.cs | 11 ++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog index e103ef57009..d18d5cf3bc0 100644 --- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog +++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog @@ -1,5 +1,10 @@ 2010-04-10 Ankit Jain + * ConsoleLogger.cs (EventsToString): If the target being executed is + from an imported file, then show that. + +2010-04-10 Ankit Jain + * Project.cs: Add property MSBuildExtensionsPath32, used by silverlight projects. diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConsoleLogger.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConsoleLogger.cs index 49f3c2a1ed0..02d0179fb3f 100644 --- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConsoleLogger.cs +++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConsoleLogger.cs @@ -439,6 +439,7 @@ namespace Microsoft.Build.BuildEngine { { StringBuilder sb = new StringBuilder (); + string last_imported_target_file = String.Empty; for (int i = 0; i < events.Count; i ++) { BuildStatusEventArgs args = events [i]; ProjectStartedEventArgs pargs = args as ProjectStartedEventArgs; @@ -447,12 +448,20 @@ namespace Microsoft.Build.BuildEngine { String.IsNullOrEmpty (pargs.TargetNames) ? "default targets" : pargs.TargetNames); + last_imported_target_file = String.Empty; continue; } TargetStartedEventArgs targs = args as TargetStartedEventArgs; - if (targs != null) + if (targs != null) { + if (targs.TargetFile != targs.ProjectFile && targs.TargetFile != last_imported_target_file) + // target from an imported file, + // and it hasn't been mentioned as yet + sb.AppendFormat ("{0} ", targs.TargetFile); + + last_imported_target_file = targs.TargetFile; sb.AppendFormat ("({0} target) ->\n", targs.TargetName); + } } return sb.ToString (); -- 2.11.4.GIT