Merge branch 'upstream'

Former-commit-id: 1f61bb69bff25a28e26016b9864e3211c48870fd
2019-04-07 08:27:36 +00:00 · 2019-04-07 08:27:36 +00:00 · 9c74842b7b
commit 9c74842b7b
parent 33cbceb032 5c452d1cda
48 changed files with 40 additions and 42 deletions
--- a/configure.REMOVED.git-id
+++ b/configure.REMOVED.git-id
@ -1 +1 @@
-0a03c7f32bc7b65313fc17968337ec1275503bfd
+f9c9b3a412fac3a2eade8c2a784e6d1463a6184c
--- a/configure.ac.REMOVED.git-id
+++ b/configure.ac.REMOVED.git-id
@ -1 +1 @@
-b0ebf6705b6f8103de8063eb5c429b681ee4c050
+f18cc25ac85a689f076e76f6a848acb21601d93f
--- 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.20.1.12";
+	public const string MonoVersion = "5.20.1.15";
 	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-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-3711e39b6d13c94f3b9cc285b2d3c0e2bd37ff1e
+256432bee74f3671b895c68c9a554a9c7c645758
--- a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-650c50111fe3755feef49c2ec78c2e74447e2ff3
+c6b1e10a49b6606b92e962cbead17c1135c5f3e5
--- a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id
@ -1 +1 @@
-c067c825b0f2163660b695da9f588058056717f2
+441a722c2664495a368e1a1b3799c07f877269d6
--- a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.IO.Compression.dll
+++ b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.IO.Compression.dll
--- a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-70b00f1b73773eb56d9001c8d753e2eb49556f75
+56b3f562a378b405606e687414433dba8797f9eb
--- a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Xml.dll.REMOVED.git-id
@ -1 +1 @@
-4b461f4ce5df86d225abb084e56e6321b4a342d3
+94dd95147356498efe30226a29c5f11eb52f1475
--- a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mcs.exe.REMOVED.git-id
@ -1 +1 @@
-e8bb0f5d8e23280b2b9fc9151d4e0cc991d9e986
+b6ece8972f41516569335fb1a3b169814883fdb8
--- a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mscorlib.dll.REMOVED.git-id
@ -1 +1 @@
-27235349020b8dabfd41b50228d83ca35ad2f23b
+aabe25ec6f948269abffa827a524ce4957fc8982
--- a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-3711e39b6d13c94f3b9cc285b2d3c0e2bd37ff1e
+256432bee74f3671b895c68c9a554a9c7c645758
--- a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-650c50111fe3755feef49c2ec78c2e74447e2ff3
+c6b1e10a49b6606b92e962cbead17c1135c5f3e5
--- a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id
@ -1 +1 @@
-c067c825b0f2163660b695da9f588058056717f2
+441a722c2664495a368e1a1b3799c07f877269d6
--- a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.IO.Compression.dll
+++ b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.IO.Compression.dll
--- a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-70b00f1b73773eb56d9001c8d753e2eb49556f75
+56b3f562a378b405606e687414433dba8797f9eb
--- a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Xml.dll.REMOVED.git-id
@ -1 +1 @@
-4b461f4ce5df86d225abb084e56e6321b4a342d3
+94dd95147356498efe30226a29c5f11eb52f1475
--- a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mcs.exe.REMOVED.git-id
@ -1 +1 @@
-e8bb0f5d8e23280b2b9fc9151d4e0cc991d9e986
+b6ece8972f41516569335fb1a3b169814883fdb8
--- a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mscorlib.dll.REMOVED.git-id
@ -1 +1 @@
-27235349020b8dabfd41b50228d83ca35ad2f23b
+aabe25ec6f948269abffa827a524ce4957fc8982
--- a/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-3711e39b6d13c94f3b9cc285b2d3c0e2bd37ff1e
+256432bee74f3671b895c68c9a554a9c7c645758
--- a/Show More
+++ b/Show More