Fixed regressions in Microsoft.Build.BuildEngine

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 04a5034a6b9d195d45073441ca8d6066effc0802..12500aa05f9a5fca677aa2c46f62fce147bba8b0 100644 (file)
--- 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);