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

@@ -577,11 +577,7 @@ TextWriter sw = Console.Out;
Uri merged = new Uri (absolute, "?moon");
Assert.AreEqual ("?moon", merged.Query, "merged.Query");
#if NET_4_0
Assert.AreEqual ("http://host/dir/subdir/weird;name?moon", merged.ToString (), "merged.ToString");
#else
Assert.AreEqual ("http://host/dir/subdir/?moon", merged.ToString (), "merged.ToString");
#endif
}
[Test]