From 53f83c9f56f372f4e801227fc5d60f0f4b8d1c8b Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Thu, 31 May 2012 14:03:04 -0400 Subject: [PATCH] Fixed regressions in Microsoft.Build.BuildEngine --- .../Microsoft.Build.BuildEngine/Project.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs index 04a5034a6b9..12500aa05f9 100644 --- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs +++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs @@ -1145,7 +1145,7 @@ namespace Microsoft.Build.BuildEngine { "the first import of this file will be used, ignoring others.", import.EvaluatedProjectPath, existingImport.ContainedInProjectFileName); - return false; + return true; } if (String.Compare (fullFileName, import.EvaluatedProjectPath) == 0) { @@ -1153,10 +1153,11 @@ namespace Microsoft.Build.BuildEngine { "The main project file was imported here, which creates a circular " + "reference. Ignoring this import."); - return false; + return true; } - if (!import.CheckEvaluatedProjectPathExists ()) + if (project_load_settings != ProjectLoadSettings.IgnoreMissingImports && + !import.CheckEvaluatedProjectPathExists ()) return false; Imports.Add (import); -- 2.25.1