Merge branch 'upstream'

Former-commit-id: c0c32def8dd876969f4b0cb8e5fdbf0f0c70c53a
2019-10-19 09:31:22 +00:00 · 2019-10-19 09:31:22 +00:00 · 611cc049d0
commit 611cc049d0
parent 8295f2d1c9 617cd4d095
52 changed files with 108 additions and 51 deletions
--- a/config.h.in
+++ b/config.h.in
@ -170,6 +170,9 @@
 /* Extension module enabled */
 #undef ENABLE_EXTENSION_MODULE

+/* ENABLE_GSS */
+#undef ENABLE_GSS
+
 /* Enable hybrid suspend for GC stop-the-world */
 #undef ENABLE_HYBRID_SUSPEND

--- a/configure.REMOVED.git-id
+++ b/configure.REMOVED.git-id
@ -1 +1 @@
-5ff3337832dd9373631c72289f1972a02ecaffe9
+e63a80ab818ef0a46037803afb710be6ba0005c0
--- a/configure.ac.REMOVED.git-id
+++ b/configure.ac.REMOVED.git-id
@ -1 +1 @@
-e745c73cd7c45328cc765d02bab525b7edb8d184
+df71134b4bd3e4aed9d647417aa3330c4e9b3b4e
--- 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.129";
+	public const string MonoVersion = "6.6.0.131";
 	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/build/profiles/net_4_x.make
+++ b/mcs/build/profiles/net_4_x.make
@ -25,3 +25,7 @@ ifdef PLATFORM_MACOS
 MONO_FEATURE_APPLETLS=1
 ENABLE_GSS=1
 endif
+
+ifeq ($(HOST_PLATFORM),linux)
+ENABLE_GSS=1
+endif
--- a/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-300722a98a05bc31dfb3f3fc97aaa86152d6626e
+2a60a99140fc86dce86c936b58167fe78901347a
--- a/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-6ab34de67290bcc7a0088ecd8c8317e457e9bb61
+dcd101068cd946291093bbd113d6e2d551d3cf42
--- a/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Core.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Core.dll.REMOVED.git-id
@ -1 +1 @@
-0fb6236afda1dcfd99e4adca17530b21360700af
+30fc7fab4ad97b7423a4b06e0081b2b217c19e3a
--- a/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.IO.Compression.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.IO.Compression.dll.REMOVED.git-id
@ -1 +1 @@
-a1eaa2f68f534f2c4b2ee4b1f772f15b1b67bdcc
+0b121317c7b73fcdf3e9a58f535d008d509fc37e
--- a/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-32f2b24aaa0b03c517b78e71da24e365056ee71f
+ca81833a60fdf5e715648892e5f9ffa1d211a34f
--- a/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Xml.dll.REMOVED.git-id
@ -1 +1 @@
-2c1857d6aec99e5872da9a31885a3e7ff8d06ced
+6680201b82f1dc7aa9b6ed727a066648c51d4632
--- a/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mscorlib.dll.REMOVED.git-id
@ -1 +1 @@
-e024162eae00395b415cd344e804a4ac0a841e3a
+09d15444bec87738849c3420744a59e20724a05f
--- a/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-300722a98a05bc31dfb3f3fc97aaa86152d6626e
+2a60a99140fc86dce86c936b58167fe78901347a
--- a/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-6ab34de67290bcc7a0088ecd8c8317e457e9bb61
+dcd101068cd946291093bbd113d6e2d551d3cf42
--- a/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Core.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Core.dll.REMOVED.git-id
@ -1 +1 @@
-0fb6236afda1dcfd99e4adca17530b21360700af
+30fc7fab4ad97b7423a4b06e0081b2b217c19e3a
--- a/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.IO.Compression.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.IO.Compression.dll.REMOVED.git-id
@ -1 +1 @@
-a1eaa2f68f534f2c4b2ee4b1f772f15b1b67bdcc
+0b121317c7b73fcdf3e9a58f535d008d509fc37e
--- a/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-32f2b24aaa0b03c517b78e71da24e365056ee71f
+ca81833a60fdf5e715648892e5f9ffa1d211a34f
--- a/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Xml.dll.REMOVED.git-id
@ -1 +1 @@
-2c1857d6aec99e5872da9a31885a3e7ff8d06ced
+6680201b82f1dc7aa9b6ed727a066648c51d4632
--- a/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mcs.exe.REMOVED.git-id
@ -1 +1 @@
-70caf6f317b845757690c33fa4621758452fd86b
+c644382c5fc1b4ef9c14b6f05e7119c1b9d4db31
--- a/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mscorlib.dll.REMOVED.git-id
@ -1 +1 @@
-e024162eae00395b415cd344e804a4ac0a841e3a
+09d15444bec87738849c3420744a59e20724a05f
--- a/Show More
+++ b/Show More