Merge branch 'upstream'

Former-commit-id: ee1e5df905fb0c0c12e7bd283b1228a4b90e9afd
2018-07-07 08:19:03 +00:00 · 2018-07-07 08:19:03 +00:00 · 16d242e37e
commit 16d242e37e
parent 03ea632860 daad72dd6c
35 changed files with 32 additions and 32 deletions
--- a/configure.REMOVED.git-id
+++ b/configure.REMOVED.git-id
@ -1 +1 @@
-3d370aee6ff558d1db9495739a11b0fbdd5c3be3
+1e624517af5aa30d9f08a31e93952c6cc7d05e71
--- a/configure.ac.REMOVED.git-id
+++ b/configure.ac.REMOVED.git-id
@ -1 +1 @@
-590adfbc18ed4d0b5d5b6433347692980d68352f
+a4fab3b83d5be7e652caafe0ad4fa8668232589e
--- 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.158";
+	public const string MonoVersion = "5.14.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/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 @@
-78920717669553c991639cd8ca1188215eaa85af
+7454f7428038f6de48a4869fd278dfd58a8342ce
--- 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 @@
-66936f786b470766acbfa39582d2a6c9ce011046
+ab10848b8c4e3d694b888acb62c744cabf0f285d
--- 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 @@
-66f20a4c99d0395431836ac79442c69b728ace7a
+4f0f62e311024baa3bc2388a83501b6f392ddf6c
--- 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 @@
-0d28f3fa635006a8aebd64886b9980cd2b077077
+631e265fd726ff841664c40a413758635aadcbfd
--- 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 @@
-722e1a947458dbff3be028eccb95a69433773c95
+1bdb76589f97d7d777641c1e64838a4920549735
--- 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 @@
-04915ee16c1fcbc265345e14dee015a5e9a0c74b
+f4cdc9369621a069697d551b13bbc799cc630134
--- 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 @@
-12d08661907184a324a81714dfdc065d412b7229
+a12673fc16bfe855792b1023c49eb00b256e1660
--- 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 @@
-78920717669553c991639cd8ca1188215eaa85af
+7454f7428038f6de48a4869fd278dfd58a8342ce
--- 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 @@
-66936f786b470766acbfa39582d2a6c9ce011046
+ab10848b8c4e3d694b888acb62c744cabf0f285d
--- 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 @@
-66f20a4c99d0395431836ac79442c69b728ace7a
+4f0f62e311024baa3bc2388a83501b6f392ddf6c
--- 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 @@
-0d28f3fa635006a8aebd64886b9980cd2b077077
+631e265fd726ff841664c40a413758635aadcbfd
--- 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 @@
-722e1a947458dbff3be028eccb95a69433773c95
+1bdb76589f97d7d777641c1e64838a4920549735
--- 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 @@
-04915ee16c1fcbc265345e14dee015a5e9a0c74b
+f4cdc9369621a069697d551b13bbc799cc630134
--- 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 @@
-12d08661907184a324a81714dfdc065d412b7229
+a12673fc16bfe855792b1023c49eb00b256e1660
--- 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 @@
-78920717669553c991639cd8ca1188215eaa85af
+7454f7428038f6de48a4869fd278dfd58a8342ce
--- 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 @@
-66936f786b470766acbfa39582d2a6c9ce011046
+ab10848b8c4e3d694b888acb62c744cabf0f285d
--- 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 @@
-66f20a4c99d0395431836ac79442c69b728ace7a
+4f0f62e311024baa3bc2388a83501b6f392ddf6c
--- 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 @@
-0d28f3fa635006a8aebd64886b9980cd2b077077
+631e265fd726ff841664c40a413758635aadcbfd
--- 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 @@
-722e1a947458dbff3be028eccb95a69433773c95
+1bdb76589f97d7d777641c1e64838a4920549735
--- 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 @@
-04915ee16c1fcbc265345e14dee015a5e9a0c74b
+f4cdc9369621a069697d551b13bbc799cc630134
--- 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 @@
-12d08661907184a324a81714dfdc065d412b7229
+a12673fc16bfe855792b1023c49eb00b256e1660
--- a/mono/metadata/w32file-unix.c.REMOVED.git-id
+++ b/mono/metadata/w32file-unix.c.REMOVED.git-id
@ -1 +1 @@
-d20571cbe9063f14ee5081788efab0cfbaea42d9
+4097474d367e9e0ece9bcb0d65d1abdb1c7ca30a
--- a/mono/mini/version.h
+++ b/mono/mini/version.h
@ -1 +1 @@
-#define FULL_VERSION "explicit/9d69811"
+#define FULL_VERSION "explicit/5f411d9"
--- 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 @@
-7f8365e160a5c74d1cc4a1ffa68898551e97252d
+77813640c92ac3d266ed6fbf0a842fba43d159f8
--- 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 @@
-718067532e460df5be35d6a06fa995b515339b8e
+78c6c3603f13928f154209819807e66a6438233c
--- 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 @@
-e77b3bf043812da9a06cc98e0c11b8328c9412c1
+eff736ac110190ea41debee4a30dfc7074aab5b1
--- a/po/mcs/mcs.pot
+++ b/po/mcs/mcs.pot
@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: mono 5.14.0.158\n"
+"Project-Id-Version: mono 5.14.0.160\n"
 "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
-"POT-Creation-Date: 2018-07-03 08:04+0000\n"
+"POT-Creation-Date: 2018-07-07 08:00+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 @@
-6c495385233f7d6f0970c7d5839043f50e701270
+030666c10348cd9a2eade9e3722695fbb9744033