Imported Upstream version 5.12.0.220

Former-commit-id: c477e03582759447177c6d4bf412cd2355aad476

mcs/class/corlib/Test/System/ConvertTest.cs.REMOVED.git-id

@@ -1 +1 @@
-8f9fe1c0099abe4f3aa9b529c6cba003b529b9e6
+7dddddb510af5037a9ba9a26f203104dae03ef87

mcs/class/corlib/Test/System/DecimalTest-Microsoft.cs

@@ -708,7 +708,7 @@ namespace MonoTests.System
 		}
 		
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void TestToSingle()
 		{
 		    // Single Decimal.ToSingle(Decimal)
@@ -726,7 +726,7 @@ namespace MonoTests.System
 		}
 		
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void TestToDouble()
 		{
 		    Double d = Decimal.ToDouble(new Decimal(0, 0, 1, false, 0));

mcs/class/corlib/Test/System/DecimalTest.cs

@@ -507,7 +507,7 @@ namespace MonoTests.System
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void TestConstructSingle ()
 		{
 			Decimal d;
@@ -630,7 +630,7 @@ namespace MonoTests.System
 
 		[Test]
 		[SetCulture("en-US")]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void TestConstructDouble ()
 		{
 			Decimal d;
@@ -729,7 +729,7 @@ namespace MonoTests.System
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void TestConstructDoubleRound ()
 		{
 			decimal d;
@@ -982,7 +982,7 @@ namespace MonoTests.System
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void ToInt32 ()
 		{
 			Decimal d = 254.9m;
@@ -1045,7 +1045,7 @@ namespace MonoTests.System
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void ToSingle ()
 		{
 			Decimal d = 254.9m;
@@ -1059,7 +1059,7 @@ namespace MonoTests.System
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void ToDouble ()
 		{
 			Decimal d = 254.9m;

mcs/class/corlib/Test/System/DelegateTest.cs

@@ -851,7 +851,7 @@ namespace MonoTests.System
 		delegate object Boxer ();
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void BoxingCovariance ()
 		{
 			var boxer = (Boxer) Delegate.CreateDelegate (
@@ -913,7 +913,7 @@ namespace MonoTests.System
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void NullFirstArgumentOnStaticMethod ()
 		{
 			CallTarget call = (CallTarget) Delegate.CreateDelegate (
@@ -927,7 +927,7 @@ namespace MonoTests.System
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 #if MONOTOUCH || FULL_AOT_RUNTIME
 		[Category ("NotWorking")] // #10539
 #endif
@@ -1027,7 +1027,7 @@ namespace MonoTests.System
 #if MONOTOUCH || FULL_AOT_RUNTIME
 		[Category ("NotWorking")] // #10539
 #endif
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void ClosedOverNullReferenceStaticMethod ()
 		{
 			var del = (Func<long?,long?>) Delegate.CreateDelegate (
@@ -1105,7 +1105,7 @@ namespace MonoTests.System
 		event Action bar_handler;
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		[ExpectedException (typeof (ArgumentException))] // #635349, #605936
 		public void NewDelegateClosedOverNullReferenceInstanceMethod ()
 		{
@@ -1149,7 +1149,7 @@ namespace MonoTests.System
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void DynamicInvokeOpenInstanceDelegate ()
 		{
 			var d1 = Delegate.CreateDelegate (typeof (Func<DelegateTest, int>), typeof(DelegateTest).GetMethod ("DynamicInvokeOpenInstanceDelegate_CB"));
@@ -1287,7 +1287,7 @@ namespace MonoTests.System
 		}
 #if !MONOTOUCH && !FULL_AOT_RUNTIME
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void CreateDelegateWithLdFtnAndAbstractMethod ()
 		{
 			AssemblyName assemblyName = new AssemblyName ();
@@ -1395,6 +1395,23 @@ namespace MonoTests.System
 			Assert.IsTrue (d (0, 0));
 		}
 
+		[Test]
+		public void EnumBaseTypeConversion2 () {
+			Func<Enum22, int> dm = EnumArg;
+			var d = (Func<int, int>)Delegate.CreateDelegate (typeof (Func<int, int>), dm.Method);
+			Assert.AreEqual (1, d (1));
+		}
+
+		public enum Enum22 {
+			none,
+			one,
+			two
+		}
+
+		public static int EnumArg (Enum22 e) {
+			return (int)e;
+		}
+
 #if !MONOTOUCH && !FULL_AOT_RUNTIME
 		public static void DynInvokeWithClosedFirstArg (object a, object b)
 		{

mcs/class/corlib/Test/System/ExceptionTest.cs

@@ -262,7 +262,7 @@ namespace MonoTests.System
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void GetObjectData ()
 		{
 			string msg = "MESSAGE";
@@ -380,7 +380,7 @@ namespace MonoTests.System
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void Source ()
 		{
 			Exception ex1 = new Exception ("MSG");

mcs/class/corlib/Test/System/GCTest.cs

@@ -56,7 +56,7 @@ namespace MonoTests.System {
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void ReRegisterForFinalizeTest ()
 		{
 			var thread =  new Thread (Run_ReRegisterForFinalizeTest);

mcs/class/corlib/Test/System/LazyTest.cs

@@ -111,6 +111,7 @@ namespace MonoTests.System
 		static int counter;
 
 		[Test]
+		[Category ("MultiThreaded")]
 		public void EnsureSingleThreadSafeExecution ()
 		{
 			counter = 42;
@@ -279,6 +280,7 @@ namespace MonoTests.System
 		}
 
 		[Test]
+		[Category ("MultiThreaded")]
 		public void ConcurrentInitialization ()
 		{
 			var init = new AutoResetEvent (false);

mcs/class/corlib/Test/System/NumberFormatterTest.cs.REMOVED.git-id

@@ -1 +1 @@
-c0dce0e1d544ea41ff8c13a3deea467234334447
+be7c06e492f19830004719e43e6448e4ebe66d81

mcs/class/corlib/Test/System/TimeZoneInfoTest.cs

@@ -124,8 +124,8 @@ namespace MonoTests.System
 				} catch (DllNotFoundException e) {
 					return;
 				}
-#if !MONOTOUCH && !XAMMAC && !XAMMAC_4_5
-				// this assumption is incorrect for iOS, tvO, watchOS and OSX
+#if !MONOTOUCH && !XAMMAC
+				// this assumption is incorrect for the TimeZoneInfo.MonoTouch.cs implementation (iOS, tvOS, watchOS and XamMac Modern)
 				Assert.IsTrue (TimeZoneInfo.Local.Id != "Local", "Local timezone id should not be \"Local\"");
 #endif
 			}

mcs/class/corlib/Test/System/TimeZoneTest.cs

@@ -317,7 +317,7 @@ public class TimeZoneTest {
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void GetUtcOffsetAtDSTBoundary ()
 		{
 			/*

mcs/class/corlib/Test/System/TypedReferenceCas.cs

@@ -51,7 +51,7 @@ namespace MonoCasTests.System {
 		// when reflection is used (i.e. it gets testable).
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		[ReflectionPermission (SecurityAction.Deny, MemberAccess = true)]
 		[ExpectedException (typeof (SecurityException))]
 		public void MakeTypedReference ()

mcs/class/corlib/Test/System/TypedReferenceTest.cs

@@ -59,7 +59,7 @@ namespace MonoTests.System
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void MakeTypedReference ()
 		{
 			var o = new CClass () { a = new AStruct () { b = "5" }};

mcs/class/corlib/Test/System/ValueTypeTest.cs

@@ -52,7 +52,7 @@ namespace MonoTests.System
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void TestEquals_Nullable ()
 		{
 			NullableStruct f1 = new NullableStruct { f = 5 };