Merge branch 'upstream'

Former-commit-id: aed3267c266020b5d830a2c26c3fe010abcb9d77
2018-07-20 08:24:09 +00:00 · 2018-07-20 08:24:09 +00:00 · 7f7cbb1af3
commit 7f7cbb1af3
parent 6b92d635bb b0beda071a
36 changed files with 33 additions and 33 deletions
--- a/configure.REMOVED.git-id
+++ b/configure.REMOVED.git-id
@ -1 +1 @@
-44bb9ef8be292590b1345e1b063f35c47984beb6
+c90694a5a334d4af0381fcf93eea0b359d1708b9
--- a/configure.ac.REMOVED.git-id
+++ b/configure.ac.REMOVED.git-id
@ -1 +1 @@
-d7231c8451f4a944be911e452a7f91eb175aee32
+3998e85c1b62216ba2f5c64713f8b5127812e913
--- a/external/bockbuild/packages/gtk+.py
+++ b/external/bockbuild/packages/gtk+.py
@ -210,7 +210,7 @@ class GtkPackage (GitHubPackage):

                'patches/gtk/gtk-backing-scale-factor.patch',

-                'patches/gtk/gtk-fix-find_nsview_at_pos-recursive.patch',
+                #'patches/gtk/gtk-fix-find_nsview_at_pos-recursive.patch',

 		# https://devdiv.visualstudio.com/DevDiv/_workitems/edit/569768
 		'patches/gtk/gtk-imquartz-commit-on-focus-out.patch'
--- 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.14.0.169";
+	public const string MonoVersion = "5.14.0.171";
 	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-darwin/1051400005/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400005/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-2fcbe56723621a979e86eaa0ad5807441a761245
+f846c0f0518298f26ffb2399ace8dc6a37537574
--- a/mcs/class/lib/monolite-darwin/1051400005/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400005/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-dcdfdda502c4cdedc33c75b92b7af1bc11dca49c
+b05133cd7c331586deace52e4b262c1e752dfb4a
--- a/mcs/class/lib/monolite-darwin/1051400005/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400005/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-1ef91ffc452772177c253c998467896aa69100e2
+2529bc8fe0705d0d044ba2437eec769e69ae178c
--- a/mcs/class/lib/monolite-darwin/1051400005/System.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400005/System.Security.dll.REMOVED.git-id
@ -1 +1 @@
-ce795997d46c0de20180488048bcfc3e5a5065bf
+168ff73c8a6ffe34cfbdcd6e5c83002011a1547f
--- a/mcs/class/lib/monolite-darwin/1051400005/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400005/System.Xml.dll.REMOVED.git-id
@ -1 +1 @@
-590bbb19b4bc6a7f03707dc93734100396ed05fd
+4cd08e1ba992913daef88c9feb4740fca9ea0d31
--- a/mcs/class/lib/monolite-darwin/1051400005/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400005/mcs.exe.REMOVED.git-id
@ -1 +1 @@
-600664f240ac863b38f05a9ccb8b10179f411c21
+274992efdddda839b2e0febd321f6e199e24f9a5
--- a/mcs/class/lib/monolite-darwin/1051400005/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051400005/mscorlib.dll.REMOVED.git-id
@ -1 +1 @@
-8a8b05eb926d03af52574c5d37f0fbf203f76480
+b664ccab2a1503d8bdcdfbac55240b6b99085c84
--- a/mcs/class/lib/monolite-linux/1051400005/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400005/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-2fcbe56723621a979e86eaa0ad5807441a761245
+f846c0f0518298f26ffb2399ace8dc6a37537574
--- a/mcs/class/lib/monolite-linux/1051400005/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400005/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-dcdfdda502c4cdedc33c75b92b7af1bc11dca49c
+b05133cd7c331586deace52e4b262c1e752dfb4a
--- a/mcs/class/lib/monolite-linux/1051400005/System.Numerics.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400005/System.Numerics.dll.REMOVED.git-id
@ -1 +1 @@
-1ef91ffc452772177c253c998467896aa69100e2
+2529bc8fe0705d0d044ba2437eec769e69ae178c
--- a/mcs/class/lib/monolite-linux/1051400005/System.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400005/System.Security.dll.REMOVED.git-id
@ -1 +1 @@
-ce795997d46c0de20180488048bcfc3e5a5065bf
+168ff73c8a6ffe34cfbdcd6e5c83002011a1547f
--- a/mcs/class/lib/monolite-linux/1051400005/System.Xml.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400005/System.Xml.dll.REMOVED.git-id
@ -1 +1 @@
-590bbb19b4bc6a7f03707dc93734100396ed05fd
+4cd08e1ba992913daef88c9feb4740fca9ea0d31
--- a/mcs/class/lib/monolite-linux/1051400005/mcs.exe.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400005/mcs.exe.REMOVED.git-id
@ -1 +1 @@
-600664f240ac863b38f05a9ccb8b10179f411c21
+274992efdddda839b2e0febd321f6e199e24f9a5
--- a/mcs/class/lib/monolite-linux/1051400005/mscorlib.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051400005/mscorlib.dll.REMOVED.git-id
@ -1 +1 @@
-8a8b05eb926d03af52574c5d37f0fbf203f76480
+b664ccab2a1503d8bdcdfbac55240b6b99085c84
--- a/mcs/class/lib/monolite-win32/1051400005/Mono.Security.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051400005/Mono.Security.dll.REMOVED.git-id
@ -1 +1 @@
-2fcbe56723621a979e86eaa0ad5807441a761245
+f846c0f0518298f26ffb2399ace8dc6a37537574
--- a/mcs/class/lib/monolite-win32/1051400005/System.Configuration.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-win32/1051400005/System.Configuration.dll.REMOVED.git-id
@ -1 +1 @@
-dcdfdda502c4cdedc33c75b92b7af1bc11dca49c
+b05133cd7c331586deace52e4b262c1e752dfb4a
--- a/Show More
+++ b/Show More