Merge branch 'upstream'

Former-commit-id: e6940cf42dd979c0535991a568ce28cd83ccf458

configure.REMOVED.git-id

@@ -1 +1 @@
-a7169155ba3d5d70f3acf700ca49e373a3f46cc5
+fcfe6854bcad7bda6aa023817c466b7967f49f33

configure.ac.REMOVED.git-id

@@ -1 +1 @@
-ca828b54dc1b6ad65538e1d9c6d055d550ebf7e7
+8a75e027837bdcf9841dd979a60ac5ec61c154b6

external/bdwgc/config.log

@@ -10,7 +10,7 @@ generated by GNU Autoconf 2.69.  Invocation command line was
 ## Platform. ##
 ## --------- ##
 
-hostname = az-ubuntu-general128ef0
+hostname = az-ubuntu-general509ff0
 uname -m = x86_64
 uname -r = 4.15.0-1067-azure
 uname -s = Linux
@@ -747,7 +747,7 @@ generated by GNU Autoconf 2.69.  Invocation command line was
   CONFIG_COMMANDS = 
   $ ./config.status 
 
-on az-ubuntu-general128ef0
+on az-ubuntu-general509ff0
 
 config.status:1238: creating Makefile
 config.status:1238: creating bdw-gc.pc

external/bdwgc/libtool.REMOVED.git-id

@@ -1 +1 @@
-aed3cecca35c13eaff55132c4827df92820f2b79
+bfb7f11b86db8779eb5d2349f8be15eecdc215a2

external/bockbuild/packages/gtk+.py

@@ -226,7 +226,11 @@ class GtkPackage (GitHubPackage):
                 'patches/gtk/nsview-embedding-skip-hidden-subviews.patch',
                 'patches/gtk/0001-gtk-combo-box-native-menu-hook.patch',
 
-                'patches/gtk/gtkviewport-autoscroll.patch'
+                'patches/gtk/gtkviewport-autoscroll.patch',
+
+                # https://devdiv.visualstudio.com/DevDiv/_workitems/edit/993471
+                'patches/gtk/gtk-pboard-types.patch',
+                'patches/gtk/define-NSPasteboardTypeURL.patch'
             ])
 
     def prep(self):

external/bockbuild/packages/patches/gtk/define-NSPasteboardTypeURL.patch

@@ -0,0 +1,15 @@
+diff --git a/gdk/quartz/gdkquartz.h b/gdk/quartz/gdkquartz.h
+index 558c53535e..6ee894533f 100644
+--- a/gdk/quartz/gdkquartz.h
++++ b/gdk/quartz/gdkquartz.h
+@@ -39,6 +39,10 @@ typedef unsigned int NSUInteger;
+ typedef float CGFloat;
+ #endif
+ 
++#ifndef NSPasteboardTypeURL
++#define NSPasteboardTypeURL NSURLPboardType
++#endif
++
+ typedef enum
+ {
+   GDK_OSX_UNSUPPORTED = 0,

external/bockbuild/packages/patches/gtk/gtk-pboard-types.patch

@@ -0,0 +1,93 @@
+diff --git a/gdk/quartz/gdkselection-quartz.c b/gdk/quartz/gdkselection-quartz.c
+index b3055324df..704c06e9bb 100644
+--- a/gdk/quartz/gdkselection-quartz.c
++++ b/gdk/quartz/gdkselection-quartz.c
+@@ -235,13 +235,13 @@ gdk_text_property_to_utf8_list_for_display (GdkDisplay    *display,
+ GdkAtom
+ gdk_quartz_pasteboard_type_to_atom_libgtk_only (NSString *type)
+ {
+-  if ([type isEqualToString:NSStringPboardType])
++  if ([type isEqualToString:NSPasteboardTypeString])
+     return gdk_atom_intern_static_string ("UTF8_STRING");
+-  else if ([type isEqualToString:NSTIFFPboardType])
++  else if ([type isEqualToString:NSPasteboardTypeTIFF])
+     return gdk_atom_intern_static_string ("image/tiff");
+-  else if ([type isEqualToString:NSColorPboardType])
++  else if ([type isEqualToString:NSPasteboardTypeColor])
+     return gdk_atom_intern_static_string ("application/x-color");
+-  else if ([type isEqualToString:NSURLPboardType])
++  else if ([type isEqualToString:NSPasteboardTypeURL])
+     return gdk_atom_intern_static_string ("text/uri-list");
+   else
+     return gdk_atom_intern ([type UTF8String], FALSE);
+@@ -251,13 +251,13 @@ NSString *
+ gdk_quartz_target_to_pasteboard_type_libgtk_only (const char *target)
+ {
+   if (strcmp (target, "UTF8_STRING") == 0)
+-    return NSStringPboardType;
++    return NSPasteboardTypeString;
+   else if (strcmp (target, "image/tiff") == 0)
+-    return NSTIFFPboardType;
++    return NSPasteboardTypeTIFF;
+   else if (strcmp (target, "application/x-color") == 0)
+-    return NSColorPboardType;
++    return NSPasteboardTypeColor;
+   else if (strcmp (target, "text/uri-list") == 0)
+-    return NSURLPboardType;
++    return NSPasteboardTypeURL;
+   else
+     return [NSString stringWithUTF8String:target];
+ }
+diff --git a/gtk/gtkquartz.c b/gtk/gtkquartz.c
+index d630abc040..9499cbb8cd 100644
+--- a/gtk/gtkquartz.c
++++ b/gtk/gtkquartz.c
+@@ -140,7 +140,7 @@ _gtk_quartz_get_selection_data_from_pasteboard (NSPasteboard *pasteboard,
+     selection_data->display = gdk_display_get_default ();
+   if (target == gdk_atom_intern_static_string ("UTF8_STRING"))
+     {
+-      NSString *s = [pasteboard stringForType:NSStringPboardType];
++      NSString *s = [pasteboard stringForType:NSPasteboardTypeString];
+ 
+       if (s)
+ 	{
+@@ -191,7 +191,7 @@ _gtk_quartz_get_selection_data_from_pasteboard (NSPasteboard *pasteboard,
+            gtk_selection_data_set_uris (selection_data, uris);
+            g_free (uris);
+          }
+-      else if ([[pasteboard types] containsObject:NSURLPboardType])
++      else if ([[pasteboard types] containsObject:NSPasteboardTypeURL])
+         {
+           gchar *uris[2];
+           NSURL *url = [NSURL URLFromPasteboard:pasteboard];
+@@ -212,7 +212,7 @@ _gtk_quartz_get_selection_data_from_pasteboard (NSPasteboard *pasteboard,
+       name = gdk_atom_name (target);
+ 
+       if (strcmp (name, "image/tiff") == 0)
+-	data = [pasteboard dataForType:NSTIFFPboardType];
++	data = [pasteboard dataForType:NSPasteboardTypeTIFF];
+       else
+ 	data = [pasteboard dataForType:[NSString stringWithUTF8String:name]];
+ 
+@@ -246,10 +246,10 @@ _gtk_quartz_set_selection_data_for_pasteboard (NSPasteboard     *pasteboard,
+ 
+   type = gdk_quartz_atom_to_pasteboard_type_libgtk_only (gtk_selection_data_get_target (selection_data));
+ 
+-  if ([type isEqualTo:NSStringPboardType]) 
++  if ([type isEqualTo:NSPasteboardTypeString])
+     [pasteboard setString:[NSString stringWithUTF8String:(const char *)data]
+                   forType:type];
+-  else if ([type isEqualTo:NSColorPboardType])
++  else if ([type isEqualTo:NSPasteboardTypeColor])
+     {
+       guint16 *color = (guint16 *)data;
+       float red, green, blue, alpha;
+@@ -263,7 +263,7 @@ _gtk_quartz_set_selection_data_for_pasteboard (NSPasteboard     *pasteboard,
+       nscolor = [NSColor colorWithDeviceRed:red green:green blue:blue alpha:alpha];
+       [nscolor writeToPasteboard:pasteboard];
+     }
+-  else if ([type isEqualTo:NSURLPboardType])
++  else if ([type isEqualTo:NSPasteboardTypeURL])
+     {
+       gchar **list = NULL;
+       int count;

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.10.0.69";
+	public const string MonoVersion = "6.10.0.70";
 	public const string MonoCompany = "Mono development team";
 	public const string MonoProduct = "Mono Common Language Infrastructure";
 	public const string MonoCopyright = "(c) Various Mono authors";

mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/Mono.Security.dll.REMOVED.git-id

@@ -1 +1 @@
-0960ba1991e1e48013dadde8ba11283dcaaf7430
+b0854085285a5c0dc4764acc4600bfee70da52cd

mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/System.Configuration.dll.REMOVED.git-id

@@ -1 +1 @@
-6594c328b3a7020addae6c0995808dccaf7b003a
+8f5f3d110767a7455545b2576aa98f7845d26355

mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/System.Core.dll.REMOVED.git-id

@@ -1 +1 @@
-3fd2c0c4862eb2d26424bff7994b7c9188c008e1
+f8ac41de377582aa29060c2e19bb3201bca681a2

mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/System.IO.Compression.dll.REMOVED.git-id

@@ -1 +1 @@
-2b00440618af669dd62abdf3c9731620525dcdd7
+e0563f1d1ed4b83bbd23834f68d36dcdb70192f5

mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/System.Numerics.dll.REMOVED.git-id

@@ -1 +1 @@
-4ed29af078e92cc111cf35263b200c164d4817db
+ca603944de23d00322c1932a9dcd813dd9f156fe

mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/System.Xml.dll.REMOVED.git-id

@@ -1 +1 @@
-435fdc35074f032c50ebd7d9dd34ab60ff627627
+1086daa1ef828cd7fe87986b6b9bc732234ff04f

mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/mcs.exe.REMOVED.git-id

@@ -1 +1 @@
-397383723ff06a023cf0aa60e59d678c56c5b08b
+432d54ca5a9455ab13e99ac806da1e146b9dc4be

mcs/class/lib/monolite-linux/97b07b51-46d8-4084-b48e-77aa5c192654/mscorlib.dll.REMOVED.git-id

@@ -1 +1 @@
-7b0e3428f751a81833f2f07ce81cc6363c44c73f
+f5c7d5f9408a3a9536e9ab7c65455cec503ce659

mcs/class/lib/monolite-macos/97b07b51-46d8-4084-b48e-77aa5c192654/Mono.Security.dll.REMOVED.git-id

@@ -1 +1 @@
-0960ba1991e1e48013dadde8ba11283dcaaf7430
+b0854085285a5c0dc4764acc4600bfee70da52cd

mcs/class/lib/monolite-macos/97b07b51-46d8-4084-b48e-77aa5c192654/System.Configuration.dll.REMOVED.git-id

@@ -1 +1 @@
-6594c328b3a7020addae6c0995808dccaf7b003a
+8f5f3d110767a7455545b2576aa98f7845d26355

mcs/class/lib/monolite-macos/97b07b51-46d8-4084-b48e-77aa5c192654/System.Core.dll.REMOVED.git-id

@@ -1 +1 @@
-3fd2c0c4862eb2d26424bff7994b7c9188c008e1
+f8ac41de377582aa29060c2e19bb3201bca681a2