Merge branch 'upstream'

Former-commit-id: 7590da2de02c7053a4b09b2d7618bf7c40af9c7c
2018-05-06 09:12:46 +00:00 · 2018-05-06 09:12:46 +00:00 · 31e8697aad
commit 31e8697aad
parent d337f4fe32 748f626b5b
36 changed files with 122 additions and 124 deletions
--- a/configure.REMOVED.git-id
+++ b/configure.REMOVED.git-id
@ -1 +1 @@
-9d8d6096190e935bc448abb0cf6978fdfa093034
+ad7d1d91672a0b9215f46658798bdfc7e4e04967
--- a/configure.ac.REMOVED.git-id
+++ b/configure.ac.REMOVED.git-id
@ -1 +1 @@
-4cc988b98de7505f71a9191ce5c7146802163cbe
+2f7b9acac0e462cd69b7ef1379edbb13fbe42d68
--- 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.12.0.227";
+	public const string MonoVersion = "5.12.0.233";
 	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/lib/monolite-darwin/1051200002/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051200002/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-35d7fc897d1f06594a9b4fcae63b02277d2d4c9c
+fd873542cd2e942ab09c172260885710d4e05cec
--- a/mcs/class/lib/monolite-darwin/1051200002/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051200002/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-abd593f6d8cfe063f7015675df9502ce32be91b2
+1b590155b5041797ac3895307be45ed6fdd60f91
--- a/mcs/class/lib/monolite-darwin/1051200002/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051200002/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-37a32c8b51742b4521fe4523bf298b7403d3921c
+b48a20fb5406ae62a5fa8c0b9c7f606264842e09
--- a/mcs/class/lib/monolite-darwin/1051200002/System.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051200002/System.Security.dll.REMOVED.git-id
@ -1 +1 @@
-831fd5ec9dbf5349138f39f972064741d4c371a1
+c4a16379b1ef87f7336a4c65f64075e2e88beda6
--- a/mcs/class/lib/monolite-darwin/1051200002/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051200002/System.Xml.dll.REMOVED.git-id
@ -1 +1 @@
-ba025b1cbe8df6d9cfe3343cd46d9eb3db982015
+4a920472399dcb68f3ca9b9deb382e88e161b746
--- a/mcs/class/lib/monolite-darwin/1051200002/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051200002/mcs.exe.REMOVED.git-id
@ -1 +1 @@
-791174d8ad4a4092ab97c51f785d7a1c0ba7b759
+ed9d1258cd1fbbf35f6eeb80df08643f2942711e
--- a/mcs/class/lib/monolite-darwin/1051200002/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051200002/mscorlib.dll.REMOVED.git-id
@ -1 +1 @@
-40daeb79fbc5bbf7c6e4dfa4f89fe6dd435af8fb
+c5ea573ad188e8d26791c5cf210e4670dbca5e35
--- a/mcs/class/lib/monolite-linux/1051200002/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051200002/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-35d7fc897d1f06594a9b4fcae63b02277d2d4c9c
+fd873542cd2e942ab09c172260885710d4e05cec
--- a/mcs/class/lib/monolite-linux/1051200002/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051200002/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-abd593f6d8cfe063f7015675df9502ce32be91b2
+1b590155b5041797ac3895307be45ed6fdd60f91
--- a/mcs/class/lib/monolite-linux/1051200002/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051200002/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-37a32c8b51742b4521fe4523bf298b7403d3921c
+b48a20fb5406ae62a5fa8c0b9c7f606264842e09
--- a/mcs/class/lib/monolite-linux/1051200002/System.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051200002/System.Security.dll.REMOVED.git-id
@ -1 +1 @@
-831fd5ec9dbf5349138f39f972064741d4c371a1
+c4a16379b1ef87f7336a4c65f64075e2e88beda6
--- a/mcs/class/lib/monolite-linux/1051200002/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051200002/System.Xml.dll.REMOVED.git-id
@ -1 +1 @@
-ba025b1cbe8df6d9cfe3343cd46d9eb3db982015
+4a920472399dcb68f3ca9b9deb382e88e161b746
--- a/mcs/class/lib/monolite-linux/1051200002/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051200002/mcs.exe.REMOVED.git-id
@ -1 +1 @@
-791174d8ad4a4092ab97c51f785d7a1c0ba7b759
+ed9d1258cd1fbbf35f6eeb80df08643f2942711e
--- a/mcs/class/lib/monolite-linux/1051200002/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051200002/mscorlib.dll.REMOVED.git-id
@ -1 +1 @@
-40daeb79fbc5bbf7c6e4dfa4f89fe6dd435af8fb
+c5ea573ad188e8d26791c5cf210e4670dbca5e35
--- a/mcs/class/lib/monolite-win32/1051200002/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051200002/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-35d7fc897d1f06594a9b4fcae63b02277d2d4c9c
+fd873542cd2e942ab09c172260885710d4e05cec
--- a/mcs/class/lib/monolite-win32/1051200002/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051200002/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-abd593f6d8cfe063f7015675df9502ce32be91b2
+1b590155b5041797ac3895307be45ed6fdd60f91
--- a/mcs/class/lib/monolite-win32/1051200002/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051200002/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-37a32c8b51742b4521fe4523bf298b7403d3921c
+b48a20fb5406ae62a5fa8c0b9c7f606264842e09
--- a/Show More
+++ b/Show More