Merge branch 'upstream'

Former-commit-id: 4fae2d180b070fc27c31064898e2ecf42850c66b
2018-07-11 08:25:49 +00:00 · 2018-07-11 08:25:49 +00:00 · eea32b5901
commit eea32b5901
parent 8c4f2846b1 2327b74189
35 changed files with 32 additions and 32 deletions
--- a/configure.REMOVED.git-id
+++ b/configure.REMOVED.git-id
@ -1 +1 @@
-1e624517af5aa30d9f08a31e93952c6cc7d05e71
+2ae51be67dfd26706cd8b2b93168380a99bd5cdf
--- a/configure.ac.REMOVED.git-id
+++ b/configure.ac.REMOVED.git-id
@ -1 +1 @@
-a4fab3b83d5be7e652caafe0ad4fa8668232589e
+8e769346903571d38503dce24b6c002872414936
--- 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.14.0.160";
+	public const string MonoVersion = "5.14.0.161";
 	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/1051400003/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400003/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-7454f7428038f6de48a4869fd278dfd58a8342ce
+5ae20c4b3bc1c6520f9c8bb4cbec691610ff8126
--- a/mcs/class/lib/monolite-darwin/1051400003/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400003/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-ab10848b8c4e3d694b888acb62c744cabf0f285d
+e5735477a0db8d9fbee553dc64d7ec8b87844b46
--- a/mcs/class/lib/monolite-darwin/1051400003/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400003/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-4f0f62e311024baa3bc2388a83501b6f392ddf6c
+b354dd7e1c8b5df0209aeb650b1f4d79d2c21867
--- a/mcs/class/lib/monolite-darwin/1051400003/System.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400003/System.Security.dll.REMOVED.git-id
@ -1 +1 @@
-631e265fd726ff841664c40a413758635aadcbfd
+778740ef22ffdc4c99567b7ca2f3f6d9f39626ab
--- a/mcs/class/lib/monolite-darwin/1051400003/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400003/System.Xml.dll.REMOVED.git-id
@ -1 +1 @@
-1bdb76589f97d7d777641c1e64838a4920549735
+2fff4a0e726d1199e054e0497dd4ce6dbfbe1bbf
--- a/mcs/class/lib/monolite-darwin/1051400003/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400003/mcs.exe.REMOVED.git-id
@ -1 +1 @@
-f4cdc9369621a069697d551b13bbc799cc630134
+95be6ac3ed6a51045eb79e03ddbab4691eb7ddd0
--- a/mcs/class/lib/monolite-darwin/1051400003/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400003/mscorlib.dll.REMOVED.git-id
@ -1 +1 @@
-a12673fc16bfe855792b1023c49eb00b256e1660
+b040c9ec355e921b8c99d7f6718d55e9c0fde492
--- a/mcs/class/lib/monolite-linux/1051400003/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400003/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-7454f7428038f6de48a4869fd278dfd58a8342ce
+5ae20c4b3bc1c6520f9c8bb4cbec691610ff8126
--- a/mcs/class/lib/monolite-linux/1051400003/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400003/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-ab10848b8c4e3d694b888acb62c744cabf0f285d
+e5735477a0db8d9fbee553dc64d7ec8b87844b46
--- a/mcs/class/lib/monolite-linux/1051400003/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400003/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-4f0f62e311024baa3bc2388a83501b6f392ddf6c
+b354dd7e1c8b5df0209aeb650b1f4d79d2c21867
--- a/mcs/class/lib/monolite-linux/1051400003/System.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400003/System.Security.dll.REMOVED.git-id
@ -1 +1 @@
-631e265fd726ff841664c40a413758635aadcbfd
+778740ef22ffdc4c99567b7ca2f3f6d9f39626ab
--- a/mcs/class/lib/monolite-linux/1051400003/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400003/System.Xml.dll.REMOVED.git-id
@ -1 +1 @@
-1bdb76589f97d7d777641c1e64838a4920549735
+2fff4a0e726d1199e054e0497dd4ce6dbfbe1bbf
--- a/mcs/class/lib/monolite-linux/1051400003/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400003/mcs.exe.REMOVED.git-id
@ -1 +1 @@
-f4cdc9369621a069697d551b13bbc799cc630134
+95be6ac3ed6a51045eb79e03ddbab4691eb7ddd0
--- a/mcs/class/lib/monolite-linux/1051400003/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400003/mscorlib.dll.REMOVED.git-id
@ -1 +1 @@
-a12673fc16bfe855792b1023c49eb00b256e1660
+b040c9ec355e921b8c99d7f6718d55e9c0fde492
--- a/mcs/class/lib/monolite-win32/1051400003/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051400003/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-7454f7428038f6de48a4869fd278dfd58a8342ce
+5ae20c4b3bc1c6520f9c8bb4cbec691610ff8126
--- a/mcs/class/lib/monolite-win32/1051400003/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051400003/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-ab10848b8c4e3d694b888acb62c744cabf0f285d
+e5735477a0db8d9fbee553dc64d7ec8b87844b46
--- a/mcs/class/lib/monolite-win32/1051400003/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051400003/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-4f0f62e311024baa3bc2388a83501b6f392ddf6c
+b354dd7e1c8b5df0209aeb650b1f4d79d2c21867
--- a/mcs/class/lib/monolite-win32/1051400003/System.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051400003/System.Security.dll.REMOVED.git-id
@ -1 +1 @@
-631e265fd726ff841664c40a413758635aadcbfd
+778740ef22ffdc4c99567b7ca2f3f6d9f39626ab
--- a/mcs/class/lib/monolite-win32/1051400003/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051400003/System.Xml.dll.REMOVED.git-id
@ -1 +1 @@
-1bdb76589f97d7d777641c1e64838a4920549735
+2fff4a0e726d1199e054e0497dd4ce6dbfbe1bbf
--- a/mcs/class/lib/monolite-win32/1051400003/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051400003/mcs.exe.REMOVED.git-id
@ -1 +1 @@
-f4cdc9369621a069697d551b13bbc799cc630134
+95be6ac3ed6a51045eb79e03ddbab4691eb7ddd0
--- a/mcs/class/lib/monolite-win32/1051400003/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051400003/mscorlib.dll.REMOVED.git-id
@ -1 +1 @@
-a12673fc16bfe855792b1023c49eb00b256e1660
+b040c9ec355e921b8c99d7f6718d55e9c0fde492
--- a/mono/mini/mini-llvm.c.REMOVED.git-id
+++ b/mono/mini/mini-llvm.c.REMOVED.git-id
@ -1 +1 @@
-e6b7b70a3ecfdc193c1fee5bb30558e4224252c8
+841f3ad75a99ecca5086f601e60040b78a0d4f83
--- a/mono/mini/version.h
+++ b/mono/mini/version.h
@ -1 +1 @@
-#define FULL_VERSION "explicit/5f411d9"
+#define FULL_VERSION "explicit/c95a4a2"
--- a/po/mcs/de.gmo
+++ b/po/mcs/de.gmo
--- a/po/mcs/de.po.REMOVED.git-id
+++ b/po/mcs/de.po.REMOVED.git-id
@ -1 +1 @@
-77813640c92ac3d266ed6fbf0a842fba43d159f8
+d22edf8857aba2988896214509b9be75eb460335
--- a/po/mcs/es.gmo
+++ b/po/mcs/es.gmo
--- a/po/mcs/es.po.REMOVED.git-id
+++ b/po/mcs/es.po.REMOVED.git-id
@ -1 +1 @@
-78c6c3603f13928f154209819807e66a6438233c
+ff7bc7f32c3668716a372d936c65b1701fdff2d0
--- a/po/mcs/ja.gmo
+++ b/po/mcs/ja.gmo
--- a/po/mcs/ja.po.REMOVED.git-id
+++ b/po/mcs/ja.po.REMOVED.git-id
@ -1 +1 @@
-eff736ac110190ea41debee4a30dfc7074aab5b1
+82bad1b3e20b79c903cbc79540acd24d12ab4ec1
--- a/po/mcs/mcs.pot
+++ b/po/mcs/mcs.pot
@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: mono 5.14.0.160\n"
+"Project-Id-Version: mono 5.14.0.161\n"
 "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
-"POT-Creation-Date: 2018-07-07 08:00+0000\n"
+"POT-Creation-Date: 2018-07-11 08:01+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
--- a/po/mcs/pt_BR.gmo
+++ b/po/mcs/pt_BR.gmo
--- a/po/mcs/pt_BR.po.REMOVED.git-id
+++ b/po/mcs/pt_BR.po.REMOVED.git-id
@ -1 +1 @@
-030666c10348cd9a2eade9e3722695fbb9744033
+de027912abbe869757a5e84166ef89b36e134835