Merge branch 'upstream'

Former-commit-id: 0813e4a8d67262398fd875a443fd0cee5f891774
2019-10-10 09:42:21 +00:00
parent 94683c0919 999c53a9b4
commit 1c5fa28df2
48 changed files with 46 additions and 44 deletions
--- a/configure.REMOVED.git-id
+++ b/configure.REMOVED.git-id
@@ -1 +1 @@
-6de4503b94f36fed33829802cffecb205642c4e9
+6e3c4811ade49d003f84eede9b4c021e1b80b98b
--- a/configure.ac.REMOVED.git-id
+++ b/configure.ac.REMOVED.git-id
@@ -1 +1 @@
-e8ba4214c3d70b39574f56ed7bc05bbd3a2f60fe
+c50e2cfabcd9c9d6897460a876dd79552e2f3394
--- a/external/api-snapshot/profiles/monodroid/Facades/System.Drawing.Common.cs.REMOVED.git-id
+++ b/external/api-snapshot/profiles/monodroid/Facades/System.Drawing.Common.cs.REMOVED.git-id
@@ -1 +1 @@
-c5b17c0701c73a3aa6ad6b67d522f353b5a80198
+ac1d7574e725affd888e6127a8bf7347476782bd
--- a/external/api-snapshot/profiles/monotouch/Facades/System.Drawing.Common.cs.REMOVED.git-id
+++ b/external/api-snapshot/profiles/monotouch/Facades/System.Drawing.Common.cs.REMOVED.git-id
@@ -1 +1 @@
-9a166dff704fb6a448e3c3c8b5292d4d303760a9
+1bd9a88cfed80e89f6dacb2be88204ab058bb4df
--- a/external/corefx/src/System.Drawing.Primitives/src/System/Drawing/Color.cs
+++ b/external/corefx/src/System.Drawing.Primitives/src/System/Drawing/Color.cs
@@ -24,7 +24,9 @@ namespace System.Drawing
 #endif
 #if FEATURE_TYPECONVERTER
    [TypeConverter(typeof(ColorConverter))]
+#if !MOBILE && !XAMMAC_4_5
    [Editor ("System.Drawing.Design.ColorEditor, " + Consts.AssemblySystem_Drawing_Design, typeof (System.Drawing.Design.UITypeEditor))]
+#endif
 #endif
    public readonly struct Color : IEquatable<Color>
    {
--- 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.6.0.119";
+	public const string MonoVersion = "6.6.0.121";
 	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/657116DD-B24B-4615-8680-6C56BA42F86D/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/Mono.Security.dll.REMOVED.git-id
@@ -1 +1 @@
-9d2fcfd434931da585ab291c212346931c933bab
+03aa3be101b19caea4495f98a429c1b417d49e23
--- a/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.Configuration.dll.REMOVED.git-id
@@ -1 +1 @@
-2ad214814c764e19b6de05578d78a358b7e5f452
+0642431843fc8daeec9c6848fac04da3fb5a2ad5
--- a/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.Core.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.Core.dll.REMOVED.git-id
@@ -1 +1 @@
-1061ac1bfe2f04055851484a8679dfaef1c50ce7
+bb5ea6ff06acd1c513ca3251e12ce944e43414fa
--- a/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.IO.Compression.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.IO.Compression.dll.REMOVED.git-id
@@ -1 +1 @@
-3b10c0599ef98c23731a271f2f7cf6162a08fc9c
+ff78b30b11a77d7a1194a23c1a033d61622c932c
--- a/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.Numerics.dll.REMOVED.git-id
@@ -1 +1 @@
-3cdef0fa1aa7da9c30ec7a887fca6d089fe63d86
+5d9a0af640d7e4e68702e356ac1c5364f43804c0
--- a/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/System.Xml.dll.REMOVED.git-id
@@ -1 +1 @@
-b2549951de963b7c963e477773a8e1885b7070f4
+21d684ba7228f6dfd5a076b1113c3dfa72bde87a
--- a/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/657116DD-B24B-4615-8680-6C56BA42F86D/mscorlib.dll.REMOVED.git-id
@@ -1 +1 @@
-ab6814c55f18b84143613048031cfff7a2b62f50
+fe78243973f077054d92ebd4604dfe2e8a3da6a7
--- a/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/Mono.Security.dll.REMOVED.git-id
@@ -1 +1 @@
-9d2fcfd434931da585ab291c212346931c933bab
+03aa3be101b19caea4495f98a429c1b417d49e23
--- a/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.Configuration.dll.REMOVED.git-id
@@ -1 +1 @@
-2ad214814c764e19b6de05578d78a358b7e5f452
+0642431843fc8daeec9c6848fac04da3fb5a2ad5
--- a/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.Core.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.Core.dll.REMOVED.git-id
@@ -1 +1 @@
-1061ac1bfe2f04055851484a8679dfaef1c50ce7
+bb5ea6ff06acd1c513ca3251e12ce944e43414fa
--- a/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.IO.Compression.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.IO.Compression.dll.REMOVED.git-id
@@ -1 +1 @@
-3b10c0599ef98c23731a271f2f7cf6162a08fc9c
+ff78b30b11a77d7a1194a23c1a033d61622c932c
--- a/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.Numerics.dll.REMOVED.git-id
@@ -1 +1 @@
-3cdef0fa1aa7da9c30ec7a887fca6d089fe63d86
+5d9a0af640d7e4e68702e356ac1c5364f43804c0
--- a/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/System.Xml.dll.REMOVED.git-id
@@ -1 +1 @@
-b2549951de963b7c963e477773a8e1885b7070f4
+21d684ba7228f6dfd5a076b1113c3dfa72bde87a
--- a/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/657116DD-B24B-4615-8680-6C56BA42F86D/mcs.exe.REMOVED.git-id
@@ -1 +1 @@
-5cedd94f0adf25104832e7f09251b58dd765beed
+e16d6224dcb22afb80cc5b911adafded076efefa
--- a/Show More
+++ b/Show More