Imported Upstream version 5.0.0.42

Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b

mcs/class/Microsoft.Build/Makefile

@@ -10,9 +10,10 @@ LIBRARY = Microsoft.Build.dll
 LIB_REFS = $(PARENT_PROFILE)System $(PARENT_PROFILE)System.Core $(PARENT_PROFILE)System.Xml Microsoft.Build.Engine Microsoft.Build.Framework
 LIB_MCS_FLAGS = \
 	/d:MICROSOFT_BUILD_DLL
-	
+
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
 TEST_LIB_REFS = $(XBUILD_UTILITIES)
+TEST_NUNITLITE_APP_CONFIG_RUNTIME=Test/test-config-file-$(PROFILE)
 
 EXTRA_DISTFILES = \
 	Microsoft.Build.Internal/ExpressionParser.jay	\

mcs/class/Microsoft.Build/Microsoft.Build.Internal/BuildNodeManager.cs

@@ -80,6 +80,9 @@ namespace Microsoft.Build.Internal
 					if (!queued_builds.TryDequeue (out build))
 						continue;
 					StartOneBuild (build);
+				} catch (ThreadAbortException) {
+					// do nothing
+					break;
 				} catch (Exception ex) {
 					// FIXME: I guess INodeLogger should be used instead.
 					Console.Error.WriteLine ("Uncaught build node exception occured");

mcs/class/Microsoft.Build/Microsoft.Build_test.dll.sources

@@ -1,3 +1,4 @@
+../../test-helpers/NunitHelpers.cs
 FunctionalTest.cs
 Microsoft.Build.Construction/ProjectItemElementTest.cs
 Microsoft.Build.Construction/ProjectRootElementTest.cs

mcs/class/Microsoft.Build/Test/Microsoft.Build.Evaluation/ProjectItemTest.cs

@@ -90,7 +90,7 @@ namespace MonoTests.Microsoft.Build.Evaluation
 		{
 			string project_xml = @"<Project xmlns='http://schemas.microsoft.com/developer/msbuild/2003'>
   <ItemGroup>
-    <Foo Include='Test/ProjectItemTestTemporary/parent/dir*/a*.cs;Test/ProjectItemTestTemporary/x.cs' />
+    <Foo Include='" + "Test/ProjectItemTestTemporary/parent/dir*/a*.cs;Test/ProjectItemTestTemporary/x.cs".Replace ('/', Path.DirectorySeparatorChar) + @"' />
   </ItemGroup>
 </Project>";
 			try {
@@ -106,7 +106,7 @@ namespace MonoTests.Microsoft.Build.Evaluation
 		{
 			string project_xml = @"<Project xmlns='http://schemas.microsoft.com/developer/msbuild/2003'>
   <ItemGroup>
-    <Foo Include='Test/ProjectItemTestTemporary/parent/**/a*.cs;Test/ProjectItemTestTemporary/x.cs' />
+    <Foo Include='" + "Test/ProjectItemTestTemporary/parent/**/a*.cs;Test/ProjectItemTestTemporary/x.cs".Replace ('/', Path.DirectorySeparatorChar) + @"' />
   </ItemGroup>
 </Project>";
 			try {
@@ -127,23 +127,23 @@ namespace MonoTests.Microsoft.Build.Evaluation
 			// sort is needed because they are only sorted by ItemType.
 			var items = proj.Items.OrderBy (p => p.EvaluatedInclude).ToArray ();
 			Assert.AreEqual (5, items.Length, "#1");
-			Assert.AreEqual (string.Format ("Test/ProjectItemTestTemporary/parent/dir1{0}a.cs", Path.DirectorySeparatorChar), items [0].EvaluatedInclude, "#2");
+			Assert.AreEqual ("Test/ProjectItemTestTemporary/parent/dir1/a.cs", items [0].EvaluatedInclude.Replace (Path.DirectorySeparatorChar, '/'), "#2");
 			Assert.AreEqual ("a", items [0].GetMetadataValue ("Filename"), "#3");
 			if (hasRecursiveDir)
 				Assert.AreEqual ("dir1" + sep, items [0].GetMetadataValue ("RecursiveDir"), "#3.2");
-			Assert.AreEqual (string.Format ("Test/ProjectItemTestTemporary/parent/dir1{0}a1.cs", Path.DirectorySeparatorChar), items [1].EvaluatedInclude, "#4");
+			Assert.AreEqual ("Test/ProjectItemTestTemporary/parent/dir1/a1.cs", items [1].EvaluatedInclude.Replace (Path.DirectorySeparatorChar, '/'), "#4");
 			Assert.AreEqual ("a1", items [1].GetMetadataValue ("Filename"), "#5");
 			if (hasRecursiveDir)
 				Assert.AreEqual ("dir1" + sep, items [1].GetMetadataValue ("RecursiveDir"), "#5.2");
-			Assert.AreEqual (string.Format ("Test/ProjectItemTestTemporary/parent/dir2{0}a.cs", Path.DirectorySeparatorChar), items [2].EvaluatedInclude, "#6");
+			Assert.AreEqual ("Test/ProjectItemTestTemporary/parent/dir2/a.cs", items [2].EvaluatedInclude.Replace (Path.DirectorySeparatorChar, '/'), "#6");
 			Assert.AreEqual ("a", items [2].GetMetadataValue ("Filename"), "#7");
 			if (hasRecursiveDir)
 				Assert.AreEqual ("dir2" + sep, items [2].GetMetadataValue ("RecursiveDir"), "#7.2");
-			Assert.AreEqual (string.Format ("Test/ProjectItemTestTemporary/parent/dir2{0}a2.cs", Path.DirectorySeparatorChar), items [3].EvaluatedInclude, "#8");
+			Assert.AreEqual ("Test/ProjectItemTestTemporary/parent/dir2/a2.cs", items [3].EvaluatedInclude.Replace (Path.DirectorySeparatorChar, '/'), "#8");
 			Assert.AreEqual ("a2", items [3].GetMetadataValue ("Filename"), "#9");
 			if (hasRecursiveDir)
 				Assert.AreEqual ("dir2" + sep, items [3].GetMetadataValue ("RecursiveDir"), "#9.2");
-			Assert.AreEqual ("Test/ProjectItemTestTemporary/x.cs", items [4].EvaluatedInclude, "#10");
+			Assert.AreEqual ("Test/ProjectItemTestTemporary/x.cs", items [4].EvaluatedInclude.Replace (Path.DirectorySeparatorChar, '/'), "#10");
 			for (int i = 0; i < items.Length; i++)
 				Assert.AreEqual (xitem, items [i].Xml, "#11:" + i);
 		}
@@ -184,10 +184,7 @@ namespace MonoTests.Microsoft.Build.Evaluation
 		[Test]
 		public void ExpandPropertyThenTrim ()
 		{
-			string test = @"A
-B
-C
-    ";
+			string test = "A\nB\nC\n    ";
 			string project_xml = string.Format (@"<Project xmlns='http://schemas.microsoft.com/developer/msbuild/2003'>
   <PropertyGroup>
     <Test>{0}</Test>

mcs/class/Microsoft.Build/Test/Microsoft.Build.Execution/BuildSubmissionTest.cs

@@ -108,7 +108,8 @@ namespace MonoTests.Microsoft.Build.Execution
 			Assert.IsTrue (sub.BuildResult.OverallResult == BuildResultCode.Success, "#1");
 			DateTime endBuildDone = DateTime.Now;
 			Assert.IsTrue (endBuildDone - beforeExec >= TimeSpan.FromSeconds (1), "#2");
-			Assert.IsTrue (endBuildDone > waitDone, "#3");
+			Assert.IsTrue (waitDone >= beforeExec, "#3");
+			Assert.IsTrue (endBuildDone >= waitDone, "#4");
 		}
 		
 		[Test]