Merge branch 'upstream'

Former-commit-id: 275c337c565cc638f617cf9cfb98c158a11180d4
2019-06-06 09:29:20 +00:00 · 2019-06-06 09:29:20 +00:00 · 1c22562c0a
commit 1c22562c0a
parent 9d203ae117 7de0679779
56 changed files with 61 additions and 46 deletions
--- a/configure.REMOVED.git-id
+++ b/configure.REMOVED.git-id
@ -1 +1 @@
-799bcbd4d60c3694db91755fa7c8c99bc65fb780
+e4dbd55a6935d98c1061117e8bc216643726030d
--- a/configure.ac.REMOVED.git-id
+++ b/configure.ac.REMOVED.git-id
@ -1 +1 @@
-df10188ed85b7c592c5676b2d81a3f1d8135dbd0
+662a404734cf8813c639a09f84523e7ab398aaf0
--- a/external/api-snapshot/profiles/monodroid/System.cs.REMOVED.git-id
+++ b/external/api-snapshot/profiles/monodroid/System.cs.REMOVED.git-id
@ -1 +1 @@
-d44dbe0810a188fc6ce61f9edc7458776a0504a0
+c876fc10c44dfbcd52c7bbff4f0aa7e6b9dd856d
--- a/external/api-snapshot/profiles/monotouch/System.cs.REMOVED.git-id
+++ b/external/api-snapshot/profiles/monotouch/System.cs.REMOVED.git-id
@ -1 +1 @@
-b9bc91cfb92aaab8d33ff1821d3d6972e6191a55
+471dc3bfaf12041985008efef21da18be5b4995c
--- a/external/api-snapshot/profiles/net_4_x/System.cs.REMOVED.git-id
+++ b/external/api-snapshot/profiles/net_4_x/System.cs.REMOVED.git-id
@ -1 +1 @@
-d26fb9d4290ecadae1dccea4fce05985005fd56f
+cae17c3c9a4c8c124b8fc63aabb49906a9bac010
--- a/external/corefx/src/System.ComponentModel.TypeConverter/src/System/ComponentModel/BaseNumberConverter.cs
+++ b/external/corefx/src/System.ComponentModel.TypeConverter/src/System/ComponentModel/BaseNumberConverter.cs
@ -12,6 +12,8 @@ namespace System.ComponentModel
    /// </summary>
    public abstract class BaseNumberConverter : TypeConverter
    {
+        internal BaseNumberConverter() { }
+
        /// <summary>
        /// Determines whether this editor will attempt to convert hex (0x or #) strings
        /// </summary>
--- a/mcs/build/common/Consts.cs
+++ b/mcs/build/common/Consts.cs
@ -41,7 +41,7 @@ static partial class Consts
 	// Use these assembly version constants to make code more maintainable.
 	//

-	public const string MonoVersion = "6.0.0.278";
+	public const string MonoVersion = "6.0.0.284";
 	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/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-fae8e88b78a85ab345a7e6910eecdb3d56a4729d
+0081ae35dbce9a10dcfd0a9a0a22e9690e19da56
--- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-ec251c8d881147eb53f4a7be43eb34d514ff5386
+1cbed502c7bc7f3ee585f5a992af3439588908ee
--- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id
@ -1 +1 @@
-7ef81088b15583acff58f8162c2cf3cba80018ab
+de4610d6ed476d486c45dcda2a88ff584d1ff1c3
--- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll
+++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll
--- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-4e951b67f5f1f1636e4a20d6b79c9a754fad456d
+489d7ee861c287503c007ef4054371bb2650a61f
--- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id
@ -1 +1 @@
-5e5858169817e28ccd47ab619433a4308f01be96
+0755b77099541d721dba6c265a09c09e9cc9d9be
--- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.dll.REMOVED.git-id
@ -1 +1 @@
-4de6210313c96a129141e34340b491792621e5f6
+ef2e4304281563bd8360933f8a58371f6e4dba90
--- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id
@ -1 +1 @@
-a13cb0413466e72b31800ea79f418a69be00210b
+8a04fc03dae997ce5a67c88ff36d45e62465988c
--- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id
@ -1 +1 @@
-e0ee85c32e73f249e8da0486bc5d2b47895e7292
+13da60b713ea88aa40dfb5cac5b123260ecbe2b1
--- a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-fae8e88b78a85ab345a7e6910eecdb3d56a4729d
+0081ae35dbce9a10dcfd0a9a0a22e9690e19da56
--- a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-ec251c8d881147eb53f4a7be43eb34d514ff5386
+1cbed502c7bc7f3ee585f5a992af3439588908ee
--- a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id
@ -1 +1 @@
-7ef81088b15583acff58f8162c2cf3cba80018ab
+de4610d6ed476d486c45dcda2a88ff584d1ff1c3
--- a/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll
+++ b/mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll
--- a/Show More
+++ b/Show More