From b79c873cb7fa8c1bf1b387129fd9e469dc0e43d2 Mon Sep 17 00:00:00 2001 From: Jonathan Chambers Date: Wed, 20 May 2009 17:05:59 +0000 Subject: [PATCH] 2009-05-20 Jonathan Chambers * SolutionParser.cs (ParseSolution): Ignore vcproj projects in solutions and issue warning. svn path=/trunk/mcs/; revision=134468 --- mcs/tools/xbuild/ChangeLog | 5 +++++ mcs/tools/xbuild/SolutionParser.cs | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/mcs/tools/xbuild/ChangeLog b/mcs/tools/xbuild/ChangeLog index f8b167f1efc..ab7ce2004a9 100644 --- a/mcs/tools/xbuild/ChangeLog +++ b/mcs/tools/xbuild/ChangeLog @@ -1,3 +1,8 @@ +2009-05-20 Jonathan Chambers + + * SolutionParser.cs (ParseSolution): Ignore vcproj projects in solutions + and issue warning. + 2009-04-27 Ankit Jain * xbuild/Microsoft.VisualBasic.targets: Update to use diff --git a/mcs/tools/xbuild/SolutionParser.cs b/mcs/tools/xbuild/SolutionParser.cs index 3a10101a98e..c15eec9aa31 100644 --- 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); -- 2.25.1