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

@ -14,7 +14,7 @@ namespace MonoTests.System.Runtime.Serialization.Formatters.Binary
// path, it would be interesting also to test a
// custom formatter, like the XML-RPC.net one!)
[TestFixture]
public class BinarySerializationOverVersions {
public class BinarySerializationOverVersionsTest {
[Test]
public void TestDroppedField () //eliminate CountryCode
@ -122,11 +122,6 @@ namespace MonoTests.System.Runtime.Serialization.Formatters.Binary
AppDomain.Unload (ad);
}
static void Main () {
throw new Exception ();
}
private static string Find (string assemblyVersion)
{
string initDir = Path.GetDirectoryName (Assembly.GetExecutingAssembly ().Location);
@ -135,7 +130,7 @@ namespace MonoTests.System.Runtime.Serialization.Formatters.Binary
private static string Find (string assemblyVersion, string path)
{
return Path.Combine (Path.Combine (path, assemblyVersion), AssemblyName);
return Path.Combine (Path.Combine (path, "vts", assemblyVersion), AssemblyName);
}
}
}