Merge branch 'upstream'

Former-commit-id: b32e22bc795304a1c6024ead6351d15c3454040b
2018-05-01 09:01:46 +00:00 · 2018-05-01 09:01:46 +00:00 · 1deaa54289
commit 1deaa54289
parent 8ad2f7d2ba ef0a925d56
34 changed files with 31 additions and 31 deletions
--- a/configure.REMOVED.git-id
+++ b/configure.REMOVED.git-id
@ -1 +1 @@
-18fbfd8270e70f42071ea2077a1d057e42223842
+9d0402a0c2fe979d4e702b268744d37db843781e
--- a/configure.ac.REMOVED.git-id
+++ b/configure.ac.REMOVED.git-id
@ -1 +1 @@
-d5bcc43ef87c733105d69a5bcde120c81608f89f
+cf3824e9a0803082e5db3a285035e8616189c9e3
--- 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.223";
+	public const string MonoVersion = "5.12.0.226";
 	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 @@
-27fd453a8a108d8d59359580a637bd58c05565e9
+9fa02907cfd12940c44a953f44d58fe406c77b66
--- 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 @@
-2ef294e45a4cf7f14ae9063fa2ba18d20196dd5e
+411d7ede74801935e212622c9ee548565bebf07a
--- 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 @@
-80e0eec30e4bf790b0b02079dd2ad3124400ab89
+9792ed9067cdc1f1343d3bdb21f0a0f61acedea3
--- 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 @@
-95e13d525c52bcd65bd86f6c66f306e4bfff7285
+3311e093bdcb62f86176c9052abaa139880abb65
--- 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 @@
-d8e876168b44d4dc88a526a69165ef7e3b519740
+176c78644d86c3885ecd46f4845f45fa94d65f0d
--- 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 @@
-45c7d8d59688f506db9d16ea9a1b854604d1ed6c
+d15403c754fe33ce695009ce9b8b9dd09c59e914
--- 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 @@
-f93e3dea1100aa00ec51aa2eb95a392c9be120e3
+ffc5177c642141f0de5a33e0328e35b98ca71766
--- 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 @@
-27fd453a8a108d8d59359580a637bd58c05565e9
+9fa02907cfd12940c44a953f44d58fe406c77b66
--- 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 @@
-2ef294e45a4cf7f14ae9063fa2ba18d20196dd5e
+411d7ede74801935e212622c9ee548565bebf07a
--- 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 @@
-80e0eec30e4bf790b0b02079dd2ad3124400ab89
+9792ed9067cdc1f1343d3bdb21f0a0f61acedea3
--- 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 @@
-95e13d525c52bcd65bd86f6c66f306e4bfff7285
+3311e093bdcb62f86176c9052abaa139880abb65
--- 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 @@
-d8e876168b44d4dc88a526a69165ef7e3b519740
+176c78644d86c3885ecd46f4845f45fa94d65f0d
--- 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 @@
-45c7d8d59688f506db9d16ea9a1b854604d1ed6c
+d15403c754fe33ce695009ce9b8b9dd09c59e914
--- 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 @@
-f93e3dea1100aa00ec51aa2eb95a392c9be120e3
+ffc5177c642141f0de5a33e0328e35b98ca71766
--- 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 @@
-27fd453a8a108d8d59359580a637bd58c05565e9
+9fa02907cfd12940c44a953f44d58fe406c77b66
--- 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 @@
-2ef294e45a4cf7f14ae9063fa2ba18d20196dd5e
+411d7ede74801935e212622c9ee548565bebf07a
--- 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 @@
-80e0eec30e4bf790b0b02079dd2ad3124400ab89
+9792ed9067cdc1f1343d3bdb21f0a0f61acedea3
--- a/Show More
+++ b/Show More