Merge branch 'upstream'

Former-commit-id: bd65754dda063a155a53ba94928bd82a368bf8d7
2018-02-19 19:28:10 +00:00 · 2018-02-19 19:28:10 +00:00 · 571b267d80
commit 571b267d80
parent 5d174b420f dfe346d80a
35 changed files with 32 additions and 32 deletions
--- a/configure.REMOVED.git-id
+++ b/configure.REMOVED.git-id
@ -1 +1 @@
-a5369f5f09670efe25898d47fbac22036bb252ea
+21aa3c78c535a77efc5486d2beee95df662db20d
--- a/configure.ac.REMOVED.git-id
+++ b/configure.ac.REMOVED.git-id
@ -1 +1 @@
-c55cb6decfc6e9fe67278e2f584be6549cdcc373
+a7e7548d78cf0e90a5385b2b99ede5398e7558b7
--- a/mcs/Makefile
+++ b/mcs/Makefile
@ -47,7 +47,7 @@ all-profiles $(STD_TARGETS:=-profiles): %-profiles: profiles-do--%
 	@:

 profiles-do--%:
-	$(MAKE) $(PROFILES:%=profile-do--%--$*)
+	$(if $(PROFILES),$(MAKE) $(PROFILES:%=profile-do--%--$*))

 # The % below looks like profile-name--target-name
 profile-do--%:
--- 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.10.0.125";
+	public const string MonoVersion = "5.10.0.129";
 	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/1051000002/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051000002/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-c9fdb4babc518a11ad6c0d93028b088b817cf83d
+b510e8bff1113be7a9a1d62060a5efcdb7bdcc12
--- a/mcs/class/lib/monolite-darwin/1051000002/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051000002/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-ec17194b631ee15781082a8b9868e049381698a0
+bcce3c2ded0ad00bb49a3469f38302367003ade6
--- a/mcs/class/lib/monolite-darwin/1051000002/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051000002/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-77d766ad011f247086635e3685bdd2a58395cbb0
+84849ae2d0369cd97bf2cd870cf694cc97fde651
--- a/mcs/class/lib/monolite-darwin/1051000002/System.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051000002/System.Security.dll.REMOVED.git-id
@ -1 +1 @@
-2bd0f554f512f004ed57c34e9f4e4256af35cafd
+2b7060d86b43aafbf55b39fb1f170906ccd47e86
--- a/mcs/class/lib/monolite-darwin/1051000002/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051000002/System.Xml.dll.REMOVED.git-id
@ -1 +1 @@
-35d5aaa31beb70a7a0170479b2f307fd0edcbd8d
+c60c1a782d836c859abeb9503f345353c8ec1997
--- a/mcs/class/lib/monolite-darwin/1051000002/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051000002/mcs.exe.REMOVED.git-id
@ -1 +1 @@
-39f1d2bfef60a3c69441454c437b0cd95a518fac
+ba2a1d3760b8dd2d67125c6027177bacf92f73ff
--- a/mcs/class/lib/monolite-darwin/1051000002/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051000002/mscorlib.dll.REMOVED.git-id
@ -1 +1 @@
-b6b8b2aed36d96a0e533a62ce3e342daf8b68500
+ad3cffdf7ffb10dbdd82ec7b7ffc84a1d3a61480
--- a/mcs/class/lib/monolite-linux/1051000002/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051000002/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-c9fdb4babc518a11ad6c0d93028b088b817cf83d
+b510e8bff1113be7a9a1d62060a5efcdb7bdcc12
--- a/mcs/class/lib/monolite-linux/1051000002/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051000002/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-ec17194b631ee15781082a8b9868e049381698a0
+bcce3c2ded0ad00bb49a3469f38302367003ade6
--- a/mcs/class/lib/monolite-linux/1051000002/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051000002/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-77d766ad011f247086635e3685bdd2a58395cbb0
+84849ae2d0369cd97bf2cd870cf694cc97fde651
--- a/mcs/class/lib/monolite-linux/1051000002/System.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051000002/System.Security.dll.REMOVED.git-id
@ -1 +1 @@
-2bd0f554f512f004ed57c34e9f4e4256af35cafd
+2b7060d86b43aafbf55b39fb1f170906ccd47e86
--- a/mcs/class/lib/monolite-linux/1051000002/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051000002/System.Xml.dll.REMOVED.git-id
@ -1 +1 @@
-35d5aaa31beb70a7a0170479b2f307fd0edcbd8d
+c60c1a782d836c859abeb9503f345353c8ec1997
--- a/mcs/class/lib/monolite-linux/1051000002/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051000002/mcs.exe.REMOVED.git-id
@ -1 +1 @@
-39f1d2bfef60a3c69441454c437b0cd95a518fac
+ba2a1d3760b8dd2d67125c6027177bacf92f73ff
--- a/mcs/class/lib/monolite-linux/1051000002/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051000002/mscorlib.dll.REMOVED.git-id
@ -1 +1 @@
-b6b8b2aed36d96a0e533a62ce3e342daf8b68500
+ad3cffdf7ffb10dbdd82ec7b7ffc84a1d3a61480
--- a/mcs/class/lib/monolite-win32/1051000002/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051000002/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-c9fdb4babc518a11ad6c0d93028b088b817cf83d
+b510e8bff1113be7a9a1d62060a5efcdb7bdcc12
--- a/mcs/class/lib/monolite-win32/1051000002/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051000002/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-ec17194b631ee15781082a8b9868e049381698a0
+bcce3c2ded0ad00bb49a3469f38302367003ade6
--- a/mcs/class/lib/monolite-win32/1051000002/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051000002/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-77d766ad011f247086635e3685bdd2a58395cbb0
+84849ae2d0369cd97bf2cd870cf694cc97fde651
--- a/mcs/class/lib/monolite-win32/1051000002/System.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051000002/System.Security.dll.REMOVED.git-id
@ -1 +1 @@
-2bd0f554f512f004ed57c34e9f4e4256af35cafd
+2b7060d86b43aafbf55b39fb1f170906ccd47e86
--- a/mcs/class/lib/monolite-win32/1051000002/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051000002/System.Xml.dll.REMOVED.git-id
@ -1 +1 @@
-35d5aaa31beb70a7a0170479b2f307fd0edcbd8d
+c60c1a782d836c859abeb9503f345353c8ec1997
--- a/mcs/class/lib/monolite-win32/1051000002/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051000002/mcs.exe.REMOVED.git-id
@ -1 +1 @@
-39f1d2bfef60a3c69441454c437b0cd95a518fac
+ba2a1d3760b8dd2d67125c6027177bacf92f73ff
--- a/mcs/class/lib/monolite-win32/1051000002/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051000002/mscorlib.dll.REMOVED.git-id
@ -1 +1 @@
-b6b8b2aed36d96a0e533a62ce3e342daf8b68500
+ad3cffdf7ffb10dbdd82ec7b7ffc84a1d3a61480
--- a/mono/mini/version.h
+++ b/mono/mini/version.h
@ -1 +1 @@
-#define FULL_VERSION "explicit/c67ec40"
+#define FULL_VERSION "explicit/177997b"
--- 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 @@
-5c9988df374daf08c58f88d8f7c2d45aa77bd940
+ed4688778a6df6c2d3d96079e1b9205b1592f8f9
--- 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 @@
-0e4cdd9021bd0fa959e62869965714fe157689a0
+89e7d6618b23c23978990c607190330791eb47eb
--- 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 @@
-1e4960a35be2691e40c3d7208e79c6b2170efa55
+d0b3ad9bcaff032dd3f277ca570a8418b25b1df2
--- a/po/mcs/mcs.pot
+++ b/po/mcs/mcs.pot
@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: mono 5.10.0.125\n"
+"Project-Id-Version: mono 5.10.0.129\n"
 "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
-"POT-Creation-Date: 2018-02-17 19:29+0000\n"
+"POT-Creation-Date: 2018-02-19 18:52+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 @@
-2b44b3e8e649e2dfc8dd12c3fd78561b3a0d65f0
+c84d08da2af74fc873c2a68a30ca6eda9311e385