Imported Upstream version 6.4.0.137

Former-commit-id: 943baa9f16a098c33e129777827f3a9d20da00d6

mcs/class/corlib/Test/Mono/MonoNativePlatformType.cs

@@ -36,6 +36,8 @@ namespace Mono
 		MONO_NATIVE_PLATFORM_TYPE_IOS		= 2,
 		MONO_NATIVE_PLATFORM_TYPE_LINUX		= 3,
 		MONO_NATIVE_PLATFORM_TYPE_AIX		= 4,
+		MONO_NATIVE_PLATFORM_TYPE_ANDROID	= 5,
+		MONO_NATIVE_PLATFORM_TYPE_FREEBSD	= 6,
 
 		MONO_NATIVE_PLATFORM_TYPE_IPHONE	= 0x100,
 		MONO_NATIVE_PLATFORM_TYPE_TV		= 0x200,

mcs/class/corlib/Test/System.Collections.ObjectModel/CollectionTest.cs

@@ -60,7 +60,6 @@ namespace MonoTests.System.Collections.ObjectModel
 			object cLock = ((ICollection) c).SyncRoot;
 
 			Assert.IsNotNull (cLock);
-			Assert.IsTrue (cLock.GetType ().Equals (typeof (object)));
 		}
 
 		[Test]

mcs/class/corlib/Test/System.Collections/CaseInsensitiveComparerTest.cs

@@ -33,6 +33,7 @@ namespace MonoTests.System.Collections {
 		}
 
 		[Test]
+		[Category ("ManagedCollator")]
 		public void TestCompare_Culture ()
 		{
 			CultureInfo originalCulture = Thread.CurrentThread.CurrentCulture;

mcs/class/corlib/Test/System.Collections/CaseInsensitiveHashCodeProviderTest.cs

@@ -80,6 +80,7 @@ namespace MonoTests.System.Collections
 		}
 
 		[Test]
+		[Category ("ManagedCollator")]
 		public void HashCode ()
 		{
 			CaseInsensitiveHashCodeProvider cih = new CaseInsensitiveHashCodeProvider ();

mcs/class/corlib/Test/System.Collections/ComparerTest.cs

@@ -51,6 +51,7 @@ namespace MonoTests.System.Collections {
 		}
 
 		[Test]
+		[Category ("ManagedCollator")]
 		public void Invariant ()
 		{
 			Comparer c = Comparer.DefaultInvariant;
@@ -71,6 +72,7 @@ namespace MonoTests.System.Collections {
 		}
 
 		[Test]
+		[Category ("ManagedCollator")]
 		public void Constructor ()
 		{
 			Comparer c = new Comparer (CultureInfo.InvariantCulture);

mcs/class/corlib/Test/System.Collections/HashtableTest.cs

@@ -532,6 +532,7 @@ public class HashtableTest {
 	}
 	
 	[Test]
+	[Category ("Remoting")]
 	public void TestSerialization2 () {
 		// Test from bug #70570
 		MemoryStream stream = new MemoryStream();
@@ -723,7 +724,8 @@ public class HashtableTest {
 	///  Test hashtable with CaseInsensitiveHashCodeProvider
 	///  and CaseInsensitive comparer.
 	/// </summary>
-        [Test]        
+	[Test]
+	[Category ("ManagedCollator")]
 	public void TestCaseInsensitive ()
 	{
 		// Not very meaningfull test, just to make

mcs/class/corlib/Test/System.Globalization/CalendarTest.cs

@@ -123,6 +123,7 @@ sealed class Date {
 } // class Date
 
 [TestFixture]
+[Category ("Calendars")]
 public class CalendarTest {
 	private Calendar[] acal;
 	private GregorianCalendar gcal;
@@ -427,7 +428,7 @@ public class CalendarTest {
 			new Date(28,10,2038,1),
 			new Date(13,10,1460,1),
 			new Date(12,2,5799,1),
-			new Date(10,11,50,4),
+			new Date(10,11,20,5),
 			new Date(10,11,127,1),
 			new Date(10,11,4371,1),
 			new Date(10,11,2581,1));
@@ -435,7 +436,7 @@ public class CalendarTest {
 			new Date(5,7,2094,1),
 			new Date(6,3,1518,1),
 			new Date(5,11,5854,1),
-			new Date(18,7,106,4),
+			new Date(18,7,76,5),
 			new Date(18,7,183,1),
 			new Date(18,7,4427,1),
 			new Date(18,7,2637,1));
@@ -494,7 +495,7 @@ public class CalendarTest {
 		foreach (Calendar cal in acal) {
 			int check = 1;
 			if (cal is JapaneseCalendar)
-				check = 4;
+				check = 5;
 			Assert.AreEqual(check, cal.Eras.Length,
 						 String.Format("D01 {0}.Eras.Length", cal));
 			cal.Eras[0] = 29;
@@ -506,11 +507,12 @@ public class CalendarTest {
 	public void TestErasProperty2() {
 		Assert.AreEqual(1, clcal.Eras.Length, "cn");
 		Assert.AreEqual(1, tlcal.Eras.Length, "tw");
-		Assert.AreEqual(2, jlcal.Eras.Length, "jp");
+		Assert.AreEqual(3, jlcal.Eras.Length, "jp");
 		Assert.AreEqual(1, klcal.Eras.Length, "kr");
 
-		Assert.AreEqual(4, jlcal.Eras [0], "jp.1");
-		Assert.AreEqual(3, jlcal.Eras [1], "jp.2");
+		Assert.AreEqual(5, jlcal.Eras [0], "jp.1");
+		Assert.AreEqual(4, jlcal.Eras [1], "jp.2");
+		Assert.AreEqual(3, jlcal.Eras [2], "jp.3");
 	}
 
 	[Test]

mcs/class/corlib/Test/System.Globalization/CompareInfoTest.cs

@@ -15,6 +15,7 @@ namespace MonoTests.System.Globalization
 {
 
 [TestFixture]
+[Category ("ManagedCollator")]
 public class CompareInfoTest
 {
 	static bool doTest = Environment.GetEnvironmentVariable ("MONO_DISABLE_MANAGED_COLLATION") != "yes";

mcs/class/corlib/Test/System.Globalization/DateTimeFormatInfoTest.cs

@@ -92,6 +92,7 @@ namespace MonoTests.System.Globalization
 		}
 
 		[Test]
+		[Category ("Calendars")]
 		public void TestSpecificCultureFormats_es_ES ()
 		{
 			CultureInfo ci = new CultureInfo ("es-ES");
@@ -119,6 +120,7 @@ namespace MonoTests.System.Globalization
 		}
 
 		[Test]
+		[Category ("Calendars")]
 		public void MonthGenitiveNames ()
 		{
 			var dfi = new CultureInfo ("cs-CZ").DateTimeFormat;
@@ -127,6 +129,7 @@ namespace MonoTests.System.Globalization
 		}
 
 		[Test]
+		[Category ("Calendars")]
 		public void QuoteInValue ()
 		{
 			var culture = new CultureInfo("mt-MT");
@@ -144,6 +147,7 @@ namespace MonoTests.System.Globalization
 		}
 
 		[Test]
+		[Category ("Calendars")]
 		public void TestFirstYearOfJapaneseEra ()
 		{
 			DateTimeFormatInfo jpnFormat = new CultureInfo ("ja-JP").DateTimeFormat;

mcs/class/corlib/Test/System.Globalization/EastAsianLunisolarCalendarTest.cs

@@ -37,6 +37,7 @@ using System.IO;
 namespace MonoTests.System.Globalization
 {
 	[TestFixture]
+	[Category ("Calendars")]
 	public class EastAsianLunisolarCalendarTest
 	{
 		static ChineseLunisolarCalendar cn = new ChineseLunisolarCalendar ();
@@ -48,30 +49,30 @@ namespace MonoTests.System.Globalization
 		public void ToDateTime ()
 		{
 			Assert.AreEqual (new DateTime (2000, 2, 5), cn.ToDateTime (2000, 1, 1, 0, 0, 0, 0), "cn1");
-			Assert.AreEqual (new DateTime (2000, 2, 5), jp.ToDateTime (12, 1, 1, 0, 0, 0, 0), "jp1"); // since 1988 (current epoch)
+			Assert.AreEqual (new DateTime (2000, 2, 5), jp.ToDateTime (12, 1, 1, 0, 0, 0, 0, 4), "jp1"); // since 1988 (current epoch)
 			Assert.AreEqual (new DateTime (2000, 2, 5), tw.ToDateTime (89, 1, 1, 0, 0, 0, 0), "tw1"); // since 1912 (current epoch)
 			Assert.AreEqual (new DateTime (2000, 2, 5), kr.ToDateTime (2000, 1, 1, 0, 0, 0, 0), "kr1");
 
 			Assert.AreEqual (new DateTime (2001, 1, 24), cn.ToDateTime (2001, 1, 1, 0, 0, 0, 0), "cn2");
-			Assert.AreEqual (new DateTime (2001, 1, 24), jp.ToDateTime (13, 1, 1, 0, 0, 0, 0), "jp2");
+			Assert.AreEqual (new DateTime (2001, 1, 24), jp.ToDateTime (13, 1, 1, 0, 0, 0, 0, 4), "jp2");
 			Assert.AreEqual (new DateTime (2001, 1, 24), tw.ToDateTime (90, 1, 1, 0, 0, 0, 0), "tw2");
 			Assert.AreEqual (new DateTime (2001, 1, 24), kr.ToDateTime (2001, 1, 1, 0, 0, 0, 0), "kr2");
 
 			Assert.AreEqual (new DateTime (2002, 2, 12), cn.ToDateTime (2002, 1, 1, 0, 0, 0, 0), "cn3");
-			Assert.AreEqual (new DateTime (2002, 2, 12), jp.ToDateTime (14, 1, 1, 0, 0, 0, 0), "jp3");
+			Assert.AreEqual (new DateTime (2002, 2, 12), jp.ToDateTime (14, 1, 1, 0, 0, 0, 0, 4), "jp3");
 			Assert.AreEqual (new DateTime (2002, 2, 12), tw.ToDateTime (91, 1, 1, 0, 0, 0, 0), "tw3");
 			Assert.AreEqual (new DateTime (2002, 2, 12), kr.ToDateTime (2002, 1, 1, 0, 0, 0, 0), "kr3");
 
 			// actually it is 5th month which is leap, but that
 			// does not afffect on resulting DateTime
 			Assert.AreEqual (new DateTime (2001, 5, 23), cn.ToDateTime (2001, 5, 1, 0, 0, 0, 0), "cn4");
-			Assert.AreEqual (new DateTime (2001, 5, 23), jp.ToDateTime (13, 5, 1, 0, 0, 0, 0), "jp4");
+			Assert.AreEqual (new DateTime (2001, 5, 23), jp.ToDateTime (13, 5, 1, 0, 0, 0, 0, 4), "jp4");
 			Assert.AreEqual (new DateTime (2001, 5, 23), tw.ToDateTime (90, 5, 1, 0, 0, 0, 0), "tw4");
 			Assert.AreEqual (new DateTime (2001, 5, 23), kr.ToDateTime (2001, 5, 1, 0, 0, 0, 0), "kr4");
 
 			// here the leap month works.
 			Assert.AreEqual (new DateTime (2002, 2, 11), cn.ToDateTime (2001, 13, 30, 0, 0, 0, 0), "cn5");
-			Assert.AreEqual (new DateTime (2002, 2, 11), jp.ToDateTime (13, 13, 30, 0, 0, 0, 0), "jp5");
+			Assert.AreEqual (new DateTime (2002, 2, 11), jp.ToDateTime (13, 13, 30, 0, 0, 0, 0, 4), "jp5");
 			Assert.AreEqual (new DateTime (2002, 2, 11), tw.ToDateTime (90, 13, 30, 0, 0, 0, 0), "tw5");
 			Assert.AreEqual (new DateTime (2002, 2, 11), kr.ToDateTime (2001, 13, 30, 0, 0, 0, 0), "kr5");
 
@@ -114,7 +115,7 @@ namespace MonoTests.System.Globalization
 			for (int i = 0; i < 60; i++)
 				Assert.AreEqual (leapYears [i % 19], cn.IsLeapYear (2000 + i), "cn" + i);
 			for (int i = 0; i < 48; i++) // only 1-to-61 are allowed
-				Assert.AreEqual (leapYears [i % 19], jp.IsLeapYear (12 + i), "jp" + i);
+				Assert.AreEqual (leapYears [i % 19], jp.IsLeapYear (12 + i, 4), "jp" + i);
 			for (int i = 0; i < 50; i++)
 				Assert.AreEqual (leapYears [i % 19], tw.IsLeapYear (89 + i), "tw" + i);
 			for (int i = 0; i < 50; i++)
@@ -177,7 +178,7 @@ namespace MonoTests.System.Globalization
 			d [29] = 6;
 			for (int y = 12; y < 32; y++)
 				for (int m = 1; m <= 12; m++)
-					Assert.AreEqual (d.ContainsKey (y) && d [y] == m, jp.IsLeapMonth (y, m), "jp" + y + "/" + m);
+					Assert.AreEqual (d.ContainsKey (y) && d [y] == m, jp.IsLeapMonth (y, m, 4), "jp" + y + "/" + m);
 
 			d = new Dictionary<int,int> ();
 			d [2001] = 5;

mcs/class/corlib/Test/System.Globalization/IdnMappingTest.cs

@@ -95,7 +95,7 @@ namespace MonoTests.System.Globalization
 		public void GetAscii ()
 		{
 			IdnMapping m = new IdnMapping ();
-			GetAscii (m, "www.mono-project.com", "www.mono-project.com", 1);
+			GetAscii (m, "www.example.com", "www.example.com", 1);
 			GetAscii (m, "a\uFF61b", "a.b", 2);
 
 			// umm... does it reject anything larger than U+FFFF ??
@@ -168,7 +168,7 @@ namespace MonoTests.System.Globalization
 		public void GetUnicode ()
 		{
 			IdnMapping m = new IdnMapping ();
-			GetAscii (m, "www.mono-project.com", "www.mono-project.com", 1);
+			GetAscii (m, "www.example.com", "www.example.com", 1);
 			GetAscii (m, "a\uFF61b", "a.b", 2);
 
 			// umm... does it reject anything larger than U+FFFF ??

mcs/class/corlib/Test/System.IO.IsolatedStorage/IsolatedStorageFileTest.cs

@@ -994,6 +994,7 @@ namespace MonoTests.System.IO.IsolatedStorageTest {
 		}
 
 		[Test]
+		[Category("AndroidSdksNotWorking")]
 		public void MoveFile ()
 		{
 			IsolatedStorageFile isf = IsolatedStorageFile.GetUserStoreForAssembly ();

mcs/class/corlib/Test/System.IO/DirectoryTest.cs

@@ -1723,13 +1723,14 @@ public class DirectoryTest
 		Directory.SetCurrentDirectory (" ");
 	}
 
-	[Test] // https://github.com/mono/mono/issues/13030
-	public void GetLogicalDrivesNotEmpty ()
-	{
-		CollectionAssert.IsNotEmpty (Directory.GetLogicalDrives ());
-	}
+	[Test] // https://github.com/mono/mono/issues/13030
+	public void GetLogicalDrivesNotEmpty ()
+	{
+		CollectionAssert.IsNotEmpty (Directory.GetLogicalDrives ());
+	}
 
 	[Test]
+	[Category("AndroidSdksNotWorking")]
 	public void GetNoFiles () // Bug 58875. This throwed an exception on windows.
 	{
 		DirectoryInfo dir = new DirectoryInfo (".");

mcs/class/corlib/Test/System.IO/DriveInfoTest.cs

@@ -30,6 +30,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
+using System.Runtime.InteropServices;
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Formatters.Binary;
 
@@ -43,7 +44,7 @@ namespace MonoTests.System.IO
 		[Test]
 		public void Constructor ()
 		{
-			if (Environment.OSVersion.Platform != PlatformID.Win32NT)
+			if (!RuntimeInformation.IsOSPlatform (OSPlatform.Windows))
 				Assert.Ignore ("The Jenkins builders don't have '/' mounted, just testing Windows for now.");
 
 			var drive = new DriveInfo ("C:\\");
@@ -54,7 +55,22 @@ namespace MonoTests.System.IO
 		[Test]
 		public void ConstructorThrowsOnNonExistingDrive ()
 		{
-			Assert.Throws<ArgumentException> (() => new DriveInfo ("/monodriveinfotest"));
+			Assert.Throws<ArgumentException> (() => new DriveInfo ("monodriveinfotest"));
+		}
+
+		[Test]
+		[Category ("NotWasm")] // it doesn't know about 'memfs' drive format
+		public void ConstructorGetsValidDriveFromNonDriveString ()
+		{
+			if (!RuntimeInformation.IsOSPlatform (OSPlatform.Windows) && !RuntimeInformation.IsOSPlatform (OSPlatform.OSX))
+				Assert.Ignore ("Some Linux-hosted CI builders don't have '/' mounted, just testing Windows and MacOS for now.");
+			
+			var tempPath = Path.GetTempPath ();
+			var drive = new DriveInfo (tempPath);
+			ValidateDriveInfo (drive);
+
+			drive = new DriveInfo (tempPath.ToUpper());
+			ValidateDriveInfo (drive);
 		}
 
 		[Test]

mcs/class/corlib/Test/System.IO/FileInfoTest.cs

@@ -622,6 +622,7 @@ namespace MonoTests.System.IO
 		}
 		
 		[Test]
+		[Category("AndroidSdksNotWorking")]
 		public void MoveTo ()
 		{
 			string path1 = TempFolder + DSC + "FIT.MoveTo.Source.Test";
@@ -651,6 +652,7 @@ namespace MonoTests.System.IO
 		}
 
 		[Test] //Covers #18361
+		[Category("AndroidSdksNotWorking")]
 		public void MoveTo_SameName ()
 		{
 			string name = "FIT.MoveTo.SameName.Test";
@@ -880,6 +882,7 @@ namespace MonoTests.System.IO
 		}
 
 		[Test] //Covers #38796
+		[Category("AndroidSdksNotWorking")]
 		public void ToStringAfterMoveTo ()
 		{
 			string name1 = "FIT.ToStringAfterMoveTo.Test";

mcs/class/corlib/Test/System.IO/FileTest.cs

@@ -913,6 +913,7 @@ namespace MonoTests.System.IO
 		}
 
 		[Test]
+		[Category("AndroidSdksNotWorking")]
 		public void Move ()
 		{
 			string bar = tmpFolder + Path.DirectorySeparatorChar + "bar";
@@ -923,7 +924,7 @@ namespace MonoTests.System.IO
 			}
 			
 			Assert.IsTrue (File.Exists (bar), "#1");
-			Assert.DoesNotThrow (() => File.Move (bar, baz), "#5");
+			File.Move (bar, baz);
 			Assert.IsFalse (File.Exists (bar), "#2");
 			Assert.IsTrue (File.Exists (baz), "#3");
 
@@ -939,7 +940,7 @@ namespace MonoTests.System.IO
 			Directory.CreateDirectory (dir);
 			Directory.CreateDirectory (dir2);
 			File.Create (dir_foo).Close ();
-			Assert.DoesNotThrow (() => File.Move (dir_foo, dir2_foo), "#6");
+			File.Move (dir_foo, dir2_foo);
 			Assert.IsTrue (File.Exists (dir2_foo), "#4");
 			
 			Directory.Delete (dir, true);
@@ -2507,6 +2508,7 @@ namespace MonoTests.System.IO
 
 		[Test]
 		[Category("NotWasm")]
+		[Category("AndroidSdksNotWorking")]
 		public void ReplaceTest ()
 		{
 			string tmp = Path.Combine (tmpFolder, "ReplaceTest");

mcs/class/corlib/Test/System.Reflection.Emit/AssemblyBuilderTest.cs

@@ -99,12 +99,14 @@ public class AssemblyBuilderTest
 		return mb;
 	}
 
+#if !DISABLE_SECURITY
 	[Test]
 	[Category ("MobileNotWorking")]
 	public void DefaultCtor ()
 	{
 		Assert.IsNotNull (ab.Evidence, "#1");
 	}
+#endif
 
 	[Test]
 	[Category ("NotWorking")]
@@ -1789,8 +1791,7 @@ public class AssemblyBuilderTest
 
 			// load assembly in separate domain, so we can clean-up after the 
 			// test
-			newDomain = AppDomain.CreateDomain ("test2", currentDomain.Evidence,
-				currentDomain.SetupInformation);
+			newDomain = AppDomain.CreateDomain ("test2", null, currentDomain.SetupInformation);
 
 			Helper helper = new Helper (Path.Combine (tempDir, assemblyName.Name + ".dll"),
 				fullName);
@@ -1906,6 +1907,17 @@ public class AssemblyBuilderTest
 			});
 	}
 
+	[Test]
+	public void GetReflectionOnly ()
+	{
+		// Regression test for 13028.
+		// Asserts ReflectionOnly is actually implemented.
+		AssemblyBuilder ab1 = genAssembly ();
+		AssemblyBuilder ab2 = genAssembly (AssemblyBuilderAccess.ReflectionOnly);
+		Assert.IsFalse (ab1.ReflectionOnly, "#1");
+		Assert.IsTrue (ab2.ReflectionOnly, "#2");
+	}
+
 
 }
 }

mcs/class/corlib/Test/System.Reflection/AssemblyTest.cs

@@ -527,8 +527,7 @@ namespace MonoTests.System.Reflection
 			AssemblyBuilder ab = AppDomain.CurrentDomain
 				.DefineDynamicAssembly (assemblyName,
 				AssemblyBuilderAccess.Save,
-				TempFolder,
-				AppDomain.CurrentDomain.Evidence);
+				TempFolder);
 			ab.Save (Path.GetFileName (assemblyFileName));
 
 			using (FileStream fs = File.OpenRead (assemblyFileName)) {
@@ -623,8 +622,7 @@ namespace MonoTests.System.Reflection
 			AssemblyBuilder ab = AppDomain.CurrentDomain
 				.DefineDynamicAssembly (assemblyName,
 				AssemblyBuilderAccess.Save,
-				Path.GetDirectoryName (assemblyFileName),
-				AppDomain.CurrentDomain.Evidence);
+				Path.GetDirectoryName (assemblyFileName));
 			ab.Save (Path.GetFileName (assemblyFileName));
 
 			using (FileStream fs = File.OpenRead (assemblyFileName)) {
@@ -664,8 +662,7 @@ namespace MonoTests.System.Reflection
 			AssemblyBuilder ab = AppDomain.CurrentDomain
 				.DefineDynamicAssembly (assemblyName,
 				AssemblyBuilderAccess.Save,
-				TempFolder,
-				AppDomain.CurrentDomain.Evidence);
+				TempFolder);
 			ab.AddResourceFile ("read", "readme.txt");
 			ab.Save (Path.GetFileName (assemblyFileNameA));
 
@@ -930,8 +927,7 @@ namespace MonoTests.System.Reflection
 			setup.ApplicationBase = baseDirectory;
 			setup.ApplicationName = "testdomain";
 
-			AppDomain ad = AppDomain.CreateDomain ("testdomain", 
-				AppDomain.CurrentDomain.Evidence, setup);
+			AppDomain ad = AppDomain.CreateDomain ("testdomain", null, setup);
 
 			if (assemblyResolver) {
 				Assembly ea = Assembly.GetExecutingAssembly ();
@@ -1025,8 +1021,7 @@ namespace MonoTests.System.Reflection
 				AssemblyBuilder ab = AppDomain.CurrentDomain
 					.DefineDynamicAssembly (assemblyName,
 					AssemblyBuilderAccess.Save,
-					Path.GetDirectoryName (assemblyFileName),
-					AppDomain.CurrentDomain.Evidence);
+					Path.GetDirectoryName (assemblyFileName));
 				ab.Save (Path.GetFileName (assemblyFileName));
 
 				Assembly assembly;
@@ -1040,7 +1035,7 @@ namespace MonoTests.System.Reflection
 
 				Assert.AreEqual (string.Empty, assembly.Location, "#1");
 
-				assembly = Assembly.LoadFrom (assemblyFileName, AppDomain.CurrentDomain.Evidence);
+				assembly = Assembly.LoadFrom (assemblyFileName);
 				Assert.IsFalse (assembly.Location == string.Empty, "#2");
 				Assert.AreEqual (Path.GetFileName (assemblyFileName), Path.GetFileName(assembly.Location), "#3");
 				// note: we cannot check if directory names match, as MS.NET seems to 
@@ -1050,7 +1045,7 @@ namespace MonoTests.System.Reflection
 
 			public void bug78465 (string assemblyFileName)
 			{
-				Assembly assembly = Assembly.LoadFrom (assemblyFileName, AppDomain.CurrentDomain.Evidence);
+				Assembly assembly = Assembly.LoadFrom (assemblyFileName);
 				Assert.IsFalse (assembly.Location == string.Empty, "#2");
 				Assert.AreEqual (Path.GetFileName (assemblyFileName), Path.GetFileName (assembly.Location), "#3");
 				// note: we cannot check if directory names match, as MS.NET seems to 
@@ -1066,12 +1061,11 @@ namespace MonoTests.System.Reflection
 				AssemblyBuilder ab = AppDomain.CurrentDomain
 					.DefineDynamicAssembly (assemblyName,
 					AssemblyBuilderAccess.Save,
-					Path.GetDirectoryName (assemblyFileName),
-					AppDomain.CurrentDomain.Evidence);
+					Path.GetDirectoryName (assemblyFileName));
 				ab.AddResourceFile ("read", "readme.txt");
 				ab.Save (Path.GetFileName (assemblyFileName));
 
-				Assembly assembly = Assembly.LoadFrom (assemblyFileName, AppDomain.CurrentDomain.Evidence);
+				Assembly assembly = Assembly.LoadFrom (assemblyFileName);
 				Assert.IsTrue (assembly.Location != string.Empty, "#B1");
 				string[] resNames = assembly.GetManifestResourceNames ();
 				Assert.IsNotNull (resNames, "#B2");

mcs/class/corlib/Test/System.Reflection/FieldInfoTest.cs

@@ -1371,7 +1371,9 @@ namespace MonoTests.System.Reflection
 			Assert.AreEqual ("B", fields.str);
 		}
 
+#if !DISABLE_REMOTING
 		[Test]
+		[Category ("Remoting")]
 		public void GetValueContextBoundObject ()
 		{
 			var instance = new CBOTest ();
@@ -1394,6 +1396,7 @@ namespace MonoTests.System.Reflection
 		}
 
 		[Test]
+		[Category ("Remoting")]
 		public void SetValueContextBoundObject ()
 		{
 			var instance = new CBOTest ();
@@ -1419,6 +1422,7 @@ namespace MonoTests.System.Reflection
 			Assert.AreEqual (s2, "This is a string", "s2");
 
 		}
+#endif
 
 		class CBOTest : ContextBoundObject {
 			public double d1 = 14.0;

mcs/class/corlib/Test/System.Resources/ResourceManagerTest.cs

@@ -791,6 +791,7 @@ namespace MonoTests.System.Resources
 		}
 
 		[Test]
+		[Category ("Globalization")]
 		[Category ("StackWalks")]
 		[Category ("NotWasm")]
 		public void TestSatellites ()