Imported Upstream version 4.8.0.309

Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions

View File

@ -28,15 +28,9 @@ namespace MonoTests.System.Resources
[TestFixtureSetUp]
public void FixtureSetUp ()
{
char ds = Path.DirectorySeparatorChar;
if (ds == '/') {
string base_path = Path.Combine (Directory.GetCurrentDirectory (), Path.Combine ("Test", "resources"));
m_ResourceFile = Path.Combine (base_path, "MyResources.resources");
m_BadResourceFile = Path.Combine (base_path, "Empty.resources");
} else {
m_ResourceFile = Path.Combine ("Test", Path.Combine ("resources", "MyResources.resources"));
m_BadResourceFile = "resources" + ds + "Empty.resources";
}
string base_path = Path.Combine (Directory.GetCurrentDirectory (), Path.Combine ("Test", "resources"));
m_ResourceFile = Path.Combine (base_path, "MyResources.resources");
m_BadResourceFile = Path.Combine (base_path, "Empty.resources");
}
[SetUp]