Imported Upstream version 4.3.2.467

Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
This commit is contained in:
Xamarin Public Jenkins
2016-02-22 11:00:01 -05:00
parent f302175246
commit f3e3aab35a
4097 changed files with 122406 additions and 82300 deletions

View File

@ -201,9 +201,7 @@ namespace MonoTests.System.IO
expected = "one" + DSC + "two" + DSC;
Assert.AreEqual (expected, testPath, "Combine #07");
#if NET_4_0
Assert.AreEqual ("a", Path.Combine (new [] { "a", "" }), "Combine #08");
#endif
}
[Test]
@ -1242,7 +1240,6 @@ namespace MonoTests.System.IO
}
}
#if NET_4_0
string Concat (string sep, params string [] parms)
{
return String.Join (sep, parms);
@ -1382,7 +1379,6 @@ namespace MonoTests.System.IO
Assert.AreEqual ("", Path.Combine ("", "", "", "", ""), "#A4");
}
#endif
}
}