2009-05-20 Jonathan Chambers <joncham@gmail.com>

        * SolutionParser.cs (ParseSolution): Ignore vcproj projects in solutions
        and issue warning.

svn path=/trunk/mcs/; revision=134468

diff --git a/mcs/tools/xbuild/ChangeLog b/mcs/tools/xbuild/ChangeLog
index f8b167f1efc5b1895286f5482ff80d6df19d0b6a..ab7ce2004a9993fcd05d276f3792ef2de84cfa38 100644 (file)
--- a/mcs/tools/xbuild/ChangeLog
+++ b/mcs/tools/xbuild/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-20  Jonathan Chambers  <joncham@gmail.com>
+
+       * SolutionParser.cs (ParseSolution): Ignore vcproj projects in solutions 
+       and issue warning. 
+
 2009-04-27  Ankit Jain  <jankit@novell.com>
 
        * xbuild/Microsoft.VisualBasic.targets: Update to use

diff --git a/mcs/tools/xbuild/SolutionParser.cs b/mcs/tools/xbuild/SolutionParser.cs
index 3a10101a98eed179af2d951f8b2142171b446a68..c15eec9aa31e075d8b416e26abd9ec1101618c75 100644 (file)
--- a/mcs/tools/xbuild/SolutionParser.cs
+++ b/mcs/tools/xbuild/SolutionParser.cs
@@ -85,6 +85,7 @@ namespace Mono.XBuild.CommandLine {
                static Regex projectConfigurationBuildRegex = new Regex ("\\s*(" + guidExpression + ")\\.(.*?)\\|(.*?)\\.Build\\.0 = (.*?)\\|(.+)");
 
                static string solutionFolderGuid = "{2150E333-8FDC-42A3-9474-1A3956D46DE8}";
+               static string vcprojGuid = "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}";
 
                public void ParseSolution (string file, Project p)
                {
@@ -107,6 +108,13 @@ namespace Mono.XBuild.CommandLine {
                                        m = m.NextMatch ();
                                        continue;
                                }
+                               if (String.Compare (m.Groups [1].Value, vcprojGuid,
+                                               StringComparison.InvariantCultureIgnoreCase) == 0) {
+                                       // Ignore vcproj 
+                                       ErrorUtilities.ReportWarning (0, string.Format("Ignoring vcproj '{0}'.", projectInfo.Name));
+                                       m = m.NextMatch ();
+                                       continue;
+                               }
 
                                projectInfos.Add (new Guid (m.Groups[4].Value), projectInfo);