Imported Upstream version 5.4.0.167

Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa

mcs/class/Mono.Posix/Test/Mono.Unix.Native/RealTimeSignumTests.cs

@@ -23,21 +23,25 @@ namespace MonoTests.Mono.Unix.Native {
 	public class RealTimeSignumTest 
 	{
 		[Test]
-		[ExpectedException (typeof (ArgumentOutOfRangeException))]
 		public void TestRealTimeOutOfRange ()
 		{
 			if (!TestHelper.CanUseRealTimeSignals ())
 				return;
-			RealTimeSignum rts = new RealTimeSignum (int.MaxValue);
+
+			Assert.Throws<ArgumentOutOfRangeException> (() => {
+				RealTimeSignum rts = new RealTimeSignum (int.MaxValue);
+			});
 		}
 
 		[Test]
-		[ExpectedException (typeof (ArgumentOutOfRangeException))]
 		public void TestRealTimeSignumNegativeOffset ()
 		{
 			if (!TestHelper.CanUseRealTimeSignals ())
 				return;
-			RealTimeSignum rts1 = new RealTimeSignum (-1);
+
+			Assert.Throws<ArgumentOutOfRangeException> (() => {
+				RealTimeSignum rts1 = new RealTimeSignum (-1);
+			});
 		}
 
 		[Test]

mcs/class/Mono.Posix/Test/Mono.Unix.Native/StdlibTest.cs

@@ -56,7 +56,7 @@ namespace MonoTests.Mono.Unix.Native {
 			Assert.IsFalse (NativeConvert.ToSignum (st.signalReceived) == Signum.SIGURG,
 					"#IH: Signal Handler invoked when it should have been removed!");
 		}
-
+#if !NETCOREAPP2_0
 		[Test]
 		// MSVCRT.DLL doesn't export snprintf(3).
 		[Category ("NotDotNet")]
@@ -92,6 +92,7 @@ namespace MonoTests.Mono.Unix.Native {
 			Assert.AreEqual (s.ToString(), expected,
 					"#SNPF: printf of many builtin types failed");
 		}
+#endif
 	}
 }
 

mcs/class/Mono.Posix/Test/Mono.Unix/UnixSignalTest.cs

@@ -136,14 +136,16 @@ namespace MonoTests.Mono.Unix {
 		}
 
 		[Test]
-		[ExpectedException]
 		[Category ("NotOnMac")]
 		public void TestSignumPropertyThrows ()
 		{
 			if (!TestHelper.CanUseRealTimeSignals ())
 				return;
-			UnixSignal signal1 = new UnixSignal (new RealTimeSignum (0));
-			Signum s = signal1.Signum;
+
+			Assert.Throws<InvalidOperationException> (() => {
+				UnixSignal signal1 = new UnixSignal (new RealTimeSignum (0));
+				Signum s = signal1.Signum;
+			});
 		}
 
 		[Test]
@@ -158,14 +160,16 @@ namespace MonoTests.Mono.Unix {
 		}
 	
 		[Test]
-		[ExpectedException]
 		[Category ("NotOnMac")]
 		public void TestRealTimePropertyThrows ()
 		{
 			if (!TestHelper.CanUseRealTimeSignals ())
-				return;
-			UnixSignal signal1 = new UnixSignal (Signum.SIGSEGV);
-			RealTimeSignum s = signal1.RealTimeSignum;
+					return;
+
+			Assert.Throws<InvalidOperationException> (() => {
+				UnixSignal signal1 = new UnixSignal (Signum.SIGSEGV);
+				RealTimeSignum s = signal1.RealTimeSignum;
+			});
 		}
 
 		[Test]