Merge branch 'upstream'

Former-commit-id: b771b96c62fe0050d95d64c48bb085e35e11be25
2019-10-24 09:29:10 +00:00 · 2019-10-24 09:29:10 +00:00 · 5fe8dbdf05
commit 5fe8dbdf05
parent c6674ff5f8 85bcceff8c
49 changed files with 57 additions and 48 deletions
--- a/configure.REMOVED.git-id
+++ b/configure.REMOVED.git-id
@ -1 +1 @@
-3f0d7de26eb06e696651f0eb54e2feb5e8da4294
+3ba21059031b27874a35373e00bdcd91bd47de13
--- a/configure.ac.REMOVED.git-id
+++ b/configure.ac.REMOVED.git-id
@ -1 +1 @@
-891b77322f23307c9bf054b7c13d05d760b9f650
+e18300135ca50e7668c69f3ed3cd61dd3558d856
--- a/external/bockbuild/packages/gtk-sharp.py
+++ b/external/bockbuild/packages/gtk-sharp.py
@ -4,7 +4,7 @@ class GtkSharp212ReleasePackage (Package):
        Package.__init__(self, 'gtk-sharp',
                         sources=['git://github.com/mono/gtk-sharp.git'],
                         git_branch='gtk-sharp-2-12-branch',
-                         revision='6a98cdb3414a760d44eee5bd4b17224a6762d7ad',
+                         revision='dedce8ddbe37ae467f18ff785255e04fd9ccd782',
                         override_properties={
                             'configure': './bootstrap-2.12 --prefix=%{package_prefix}',
                         }
--- 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.133";
+	public const string MonoVersion = "6.6.0.140";
 	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/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 @@
-7c0fc742e67ebd432c14b6b616747368cbc5080a
+454ae59b63749df1c592dc2130fa7213b2ef0e9c
--- 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 @@
-4aa0eea6dca3dbd14a424eb9a5fe3fc4b76cbd3f
+a5c6aed95ba8bc49e3c1b969120cb70f6718271d
--- 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 @@
-0b9f8d1e37f9c05962c7898562f1f574dfabb0dc
+912f8605f6a11f646d7e49ab09f34a1701fd9a3d
--- 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 @@
-29cb409d7fba33bd16be5379f326276c7f810d0f
+358ce5082e789676e06fdf6e7a1279f4186d31a7
--- 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 @@
-19412dd30bb7279a59d82b7da07ccbe8307a1a3b
+40787214b81a44904dfc445b7ad3740600a06e89
--- 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 @@
-386226aa05d1283286ef664640d8cd9695907824
+24a1d0f66f4ff5e1eab59634988bbf3cf879f335
--- 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 @@
-83ac4ed1a4cb6da6e6796ecb5e8f44cef1be242c
+8b6dc65e0cbc140249fa33142feac2235b0940ed
--- 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 @@
-7c0fc742e67ebd432c14b6b616747368cbc5080a
+454ae59b63749df1c592dc2130fa7213b2ef0e9c
--- 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 @@
-4aa0eea6dca3dbd14a424eb9a5fe3fc4b76cbd3f
+a5c6aed95ba8bc49e3c1b969120cb70f6718271d
--- 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 @@
-0b9f8d1e37f9c05962c7898562f1f574dfabb0dc
+912f8605f6a11f646d7e49ab09f34a1701fd9a3d
--- 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 @@
-29cb409d7fba33bd16be5379f326276c7f810d0f
+358ce5082e789676e06fdf6e7a1279f4186d31a7
--- 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 @@
-19412dd30bb7279a59d82b7da07ccbe8307a1a3b
+40787214b81a44904dfc445b7ad3740600a06e89
--- 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 @@
-386226aa05d1283286ef664640d8cd9695907824
+24a1d0f66f4ff5e1eab59634988bbf3cf879f335
--- 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 @@
-eabf1317215f7103b2ee8a2347ba0fa285af848a
+ac98f66f66258581ca21c1de9aa4f3802362d63b
--- 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 @@
-83ac4ed1a4cb6da6e6796ecb5e8f44cef1be242c
+8b6dc65e0cbc140249fa33142feac2235b0940ed
--- a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-7c0fc742e67ebd432c14b6b616747368cbc5080a
+454ae59b63749df1c592dc2130fa7213b2ef0e9c
--- a/Show More
+++ b/Show More