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/System.Configuration/Test/Util/TestUtil.cs
+++ b/mcs/class/System.Configuration/Test/Util/TestUtil.cs
@ -85,13 +85,9 @@ namespace MonoTests.System.Configuration.Util {

 		public static string ThisConfigFileName {
 			get {
-#if TARGET_JVM
-				return "System.Configuration.Test20.jar.config";
-#else
 				var asm = Assembly.GetCallingAssembly ();
 				var exe = Path.GetFileName (asm.Location);
 				return exe + ".config";
-#endif
 			}
 		}
 	}