Imported Upstream version 6.0.0.172

Former-commit-id: f3cc9b82f3e5bd8f0fd3ebc098f789556b44e9cd
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-04-12 14:10:50 +00:00
parent 8016999e4d
commit 64ac736ec5
32155 changed files with 3981439 additions and 75368 deletions

View File

@@ -293,7 +293,6 @@ namespace MonoTests.Microsoft.Build.Tasks {
Assert.Fail ("Build failed");
string full_base_dir = Path.GetFullPath (basedir);
logger.CheckLoggedAny ("CI1: " + String.Join (";", files), MessageImportance.Normal, "A1");
} catch (AssertionException) {
logger.DumpMessages ();
throw;

View File

@@ -94,9 +94,6 @@ namespace MonoTests.Microsoft.Build.Tasks {
project.Build ("1");
Assert.AreEqual (3, Directory.GetDirectories (path).Length, "A1");
Assert.AreEqual (Path.Combine (path, "A"), Directory.GetDirectories (path) [0], "A2");
Assert.AreEqual (Path.Combine (path, "B"), Directory.GetDirectories (path) [1], "A3");
Assert.AreEqual (Path.Combine (path, "C"), Directory.GetDirectories (path) [2], "A4");
BuildItemGroup output = project.GetEvaluatedItemsByName ("Out");
Assert.AreEqual (Path.Combine (path, "A"), output [0].FinalItemSpec, "A5");

View File

@@ -229,7 +229,7 @@ namespace MonoTests.Microsoft.Build.Tasks
if (result == 1)
Assert.Fail ("{0}: Expected message '{1}' was not emitted.", id, expected);
if (result == 2)
Assert.AreEqual (expected, actual, id);
return;
}
public void CheckLoggedAny (string expected, MessageImportance importance, string id)