Merge branch 'upstream'

Former-commit-id: a8affe66e7c9b77985664e0369d0a6217c4c1415
2018-09-15 08:25:34 +00:00 · 2018-09-15 08:25:34 +00:00 · d4c91180ba
commit d4c91180ba
parent 14029bb337 0875d0d9cd
41 changed files with 58 additions and 33 deletions
--- a/configure.REMOVED.git-id
+++ b/configure.REMOVED.git-id
@ -1 +1 @@
-56db02bbf491350266e10038e449d70f6ca2664e
+a8a3dec4f955c24b4400ea1a0230a855d96b97cf
--- a/configure.ac.REMOVED.git-id
+++ b/configure.ac.REMOVED.git-id
@ -1 +1 @@
-dffd1b26770c0832033cde49a9f1264edea74a4c
+dae60eb72446d9ce5f213d3cb3678c206afba466
--- a/mcs/build/common/Consts.cs
+++ b/mcs/build/common/Consts.cs
@ -34,7 +34,7 @@ static class Consts
 	// Use these assembly version constants to make code more maintainable.
 	//

-	public const string MonoVersion = "5.16.0.158";
+	public const string MonoVersion = "5.16.0.160";
 	public const string MonoCompany = "Mono development team";
 	public const string MonoProduct = "Mono Common Language Infrastructure";
 	public const string MonoCopyright = "(c) Various Mono authors";
--- a/mcs/class/corlib/Test/System.Runtime.InteropServices/MarshalTest.cs
+++ b/mcs/class/corlib/Test/System.Runtime.InteropServices/MarshalTest.cs
@ -120,6 +120,13 @@ namespace MonoTests.System.Runtime.InteropServices
 			Assert.IsTrue (size == 4 || size == 8);
 		}

+		[Test]
+		public unsafe void Sizeof_Void ()
+		{
+			int size = Marshal.SizeOf (typeof (void));
+			Assert.AreEqual (1, size);
+		}
+
 		[Test]
 		public void PtrToStringWithNull ()
 		{
--- a/mcs/class/lib/monolite-darwin/1051600011/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051600011/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-32a78b8bf740eaf925f379aee7c693cca7082ac5
+9340050d3e1d0b1811befe3ea863039a29991c05
--- a/mcs/class/lib/monolite-darwin/1051600011/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051600011/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-d1bc65fc5344b987fd68388406f5b4a32ccd3fb5
+b5679a6f8a5199ca74d7143777f0742a5e0a00fd
--- a/mcs/class/lib/monolite-darwin/1051600011/System.IO.Compression.dll
+++ b/mcs/class/lib/monolite-darwin/1051600011/System.IO.Compression.dll
--- a/mcs/class/lib/monolite-darwin/1051600011/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051600011/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-eb38463d57461c0b111cfa78799af6fb6456d04d
+4131faad1c2afbbc0aab29999890df98c9a3b9bc
--- a/mcs/class/lib/monolite-darwin/1051600011/System.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051600011/System.Security.dll.REMOVED.git-id
@ -1 +1 @@
-ee743b423f2ebc67d6cb8585463a0d21ba2fb307
+c2cb4d0ef943e31143821b8ef5f784d0cfd595f4
--- a/mcs/class/lib/monolite-darwin/1051600011/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051600011/System.Xml.dll.REMOVED.git-id
@ -1 +1 @@
-df8144324bff2ac19edad7a05daf8f7781863db1
+7c241e20526e563aa837c5a6a5e06ff3d71ce0a8
--- a/mcs/class/lib/monolite-darwin/1051600011/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051600011/mcs.exe.REMOVED.git-id
@ -1 +1 @@
-0c9710b19bb8840b4239439e1cb3c5a8d3a29a01
+89ffdbff17871bc72d84d1750e31ab3f03dab725
--- a/mcs/class/lib/monolite-darwin/1051600011/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051600011/mscorlib.dll.REMOVED.git-id
@ -1 +1 @@
-db0fbbba7553aed4af6ea7e096d2f14b1786e2c0
+d8a0ffa13d365a4212d158f99ec3689f9d2d61e9
--- a/mcs/class/lib/monolite-linux/1051600011/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051600011/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-32a78b8bf740eaf925f379aee7c693cca7082ac5
+9340050d3e1d0b1811befe3ea863039a29991c05
--- a/mcs/class/lib/monolite-linux/1051600011/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051600011/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-d1bc65fc5344b987fd68388406f5b4a32ccd3fb5
+b5679a6f8a5199ca74d7143777f0742a5e0a00fd
--- a/mcs/class/lib/monolite-linux/1051600011/System.IO.Compression.dll
+++ b/mcs/class/lib/monolite-linux/1051600011/System.IO.Compression.dll
--- a/mcs/class/lib/monolite-linux/1051600011/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051600011/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-eb38463d57461c0b111cfa78799af6fb6456d04d
+4131faad1c2afbbc0aab29999890df98c9a3b9bc
--- a/mcs/class/lib/monolite-linux/1051600011/System.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051600011/System.Security.dll.REMOVED.git-id
@ -1 +1 @@
-ee743b423f2ebc67d6cb8585463a0d21ba2fb307
+c2cb4d0ef943e31143821b8ef5f784d0cfd595f4
--- a/mcs/class/lib/monolite-linux/1051600011/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051600011/System.Xml.dll.REMOVED.git-id
@ -1 +1 @@
-df8144324bff2ac19edad7a05daf8f7781863db1
+7c241e20526e563aa837c5a6a5e06ff3d71ce0a8
--- a/mcs/class/lib/monolite-linux/1051600011/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051600011/mcs.exe.REMOVED.git-id
@ -1 +1 @@
-0c9710b19bb8840b4239439e1cb3c5a8d3a29a01
+89ffdbff17871bc72d84d1750e31ab3f03dab725
--- a/mcs/class/lib/monolite-linux/1051600011/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051600011/mscorlib.dll.REMOVED.git-id
@ -1 +1 @@
-db0fbbba7553aed4af6ea7e096d2f14b1786e2c0
+d8a0ffa13d365a4212d158f99ec3689f9d2d61e9
--- a/Show More
+++ b/Show More