diff options
| author | Ankit Jain <radical@corewars.org> | 2009-09-29 18:47:09 +0400 |
|---|---|---|
| committer | Ankit Jain <radical@corewars.org> | 2009-09-29 18:47:09 +0400 |
| commit | d0dbad9ad72c37e8e0262435852206e3c58c501d (patch) | |
| tree | 05991e29cd6e79378bf14b3be2f89a2049446e88 /mcs/tools | |
| parent | 4f8c33af39910b92dfd7b3f4126062f03cf6c5a1 (diff) | |
Update xbuild and Microsoft.Build.* from trunk.
In tools/xbuild:
2009-09-29 Ankit Jain <jankit@novell.com>
* SolutionParser.cs (Insert): Show project name in case of a cyclic
dependency.
In class/Microsoft.Build.Tasks/Microsoft.Build.Tasks:
2009-09-29 Ankit Jain <jankit@novell.com>
* Exec.cs: Write the commands, which can be multiline,
to a temporary file, and execute that with "cmd.exe /c"
on windows and "sh" on non-windows.
(LogToolCommand): Override, and emit the commands instead
of the actual args passed to the shell.
In class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine:
2009-09-29 Ankit Jain <jankit@novell.com>
* ProjectTest.cs (TestPropertiesFromImportedProjects): New.
In class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine:
2009-09-29 Ankit Jain <jankit@novell.com>
* GroupingCollection.cs (Evaluate): Mark internal.
* Project.cs (AddImport): Only evaluate the properties,
till before the import.
2009-09-29 Ankit Jain <jankit@novell.com>
* Project.cs (DoLoad): Don't use XmlReader.Create, for loading
the project xml, as returned Xml*Reader normalizes the newlines.
Instead directly use the TextReader with XmlDocument.Load ().
In class/Microsoft.Build.Utilities/Microsoft.Build.Utilities:
2009-09-29 Ankit Jain <jankit@novell.com>
* ToolTask.cs (ExecuteTool): Use LogToolCommand, instead of
directly logging.
(LogToolCommand): Implement.
svn path=/branches/mono-2-6/mcs/; revision=142871
Diffstat (limited to 'mcs/tools')
| -rw-r--r-- | mcs/tools/xbuild/ChangeLog | 5 | ||||
| -rw-r--r-- | mcs/tools/xbuild/SolutionParser.cs | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/mcs/tools/xbuild/ChangeLog b/mcs/tools/xbuild/ChangeLog index a8ec63241d5..69b5b904cc1 100644 --- a/mcs/tools/xbuild/ChangeLog +++ b/mcs/tools/xbuild/ChangeLog @@ -1,3 +1,8 @@ +2009-09-29 Ankit Jain <jankit@novell.com> + + * SolutionParser.cs (Insert): Show project name in case of a cyclic + dependency. + 2009-09-27 Ankit Jain <jankit@novell.com> * SolutionParser.cs: Implement support for WebSite projects. These diff --git a/mcs/tools/xbuild/SolutionParser.cs b/mcs/tools/xbuild/SolutionParser.cs index 9a8d1110d57..eb62468c8b6 100644 --- a/mcs/tools/xbuild/SolutionParser.cs +++ b/mcs/tools/xbuild/SolutionParser.cs @@ -849,7 +849,9 @@ namespace Mono.XBuild.CommandLine { return levels [index]; if (triedToInsert[index]) - throw new InvalidOperationException ("Cyclic dependency found in the project dependency graph"); + throw new InvalidOperationException (String.Format ( + "Cyclic dependency involving project {0} found in the project dependency graph", + allItems [index].Name)); triedToInsert[index] = true; ProjectInfo insertItem = allItems[index]; |