Imported Upstream version 3.10.0

Former-commit-id: 172c8e3c300b39d5785c7a3e8dfb08ebdbc1a99b
2014-10-04 11:27:48 +01:00
parent fe777c5c82
commit 8b9b85e7f5
970 changed files with 20242 additions and 31308 deletions
--- a/mcs/class/corlib/Test/System/StringComparerTest.cs
+++ b/mcs/class/corlib/Test/System/StringComparerTest.cs
@ -43,17 +43,10 @@ namespace MonoTests.System
 	{
 		private CultureInfo old_culture;

-#if TARGET_JVM // BinaryFormatter is Java based under TARGET_JVM.
-		private BinaryFormatter CreateBinaryFormatter()
-		{
-			return (BinaryFormatter)vmw.@internal.remoting.BinaryFormatterUtils.CreateBinaryFormatter (false);
-		}
-#else
 		private BinaryFormatter CreateBinaryFormatter()
 		{
 			return new BinaryFormatter();
 		}
-#endif // TARGET_JVM

 		[SetUp]
 		public void SetUp ()