From 4edc784e8b96a0332be9818e0cbad0f1098f2d85 Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Thu, 17 Oct 2019 09:04:47 +0000 Subject: [PATCH] Imported Upstream version 6.6.0.129 Former-commit-id: 5252f8cfe37b84003acc4bfe0fa11691f0daf9fd --- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- external/bockbuild/packages/gtk+.py | 4 +- .../patches/gtk/gtkviewport-autoscroll.patch | 109 ++++++++++++++++++ mcs/build/common/Consts.cs | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- mono/mini/version.h | 2 +- mono/unit-tests/Makefile.in | 4 +- msvc/Makefile.in | 2 +- po/mcs/de.gmo | Bin 5406 -> 5406 bytes po/mcs/de.po.REMOVED.git-id | 2 +- po/mcs/es.gmo | Bin 16329 -> 16329 bytes po/mcs/es.po.REMOVED.git-id | 2 +- po/mcs/ja.gmo | Bin 20863 -> 20863 bytes po/mcs/ja.po.REMOVED.git-id | 2 +- po/mcs/mcs.pot | 4 +- po/mcs/pt_BR.gmo | Bin 72806 -> 72806 bytes po/mcs/pt_BR.po.REMOVED.git-id | 2 +- 48 files changed, 156 insertions(+), 45 deletions(-) create mode 100644 external/bockbuild/packages/patches/gtk/gtkviewport-autoscroll.patch diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 70d2a5b74b..a0554be6f2 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -e99de790e27e54ae0cbce0db611ab735386b06d2 \ No newline at end of file +5ff3337832dd9373631c72289f1972a02ecaffe9 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index 2b719497f5..872c2cd206 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -2126007ad631362e44600237a94b76bc10cb7be7 \ No newline at end of file +e745c73cd7c45328cc765d02bab525b7edb8d184 \ No newline at end of file diff --git a/external/bockbuild/packages/gtk+.py b/external/bockbuild/packages/gtk+.py index 291e027534..ff42b5f4c7 100644 --- a/external/bockbuild/packages/gtk+.py +++ b/external/bockbuild/packages/gtk+.py @@ -224,7 +224,9 @@ class GtkPackage (GitHubPackage): # https://devdiv.visualstudio.com/DevDiv/_workitems/edit/821841 'patches/gtk/nsview-embedding-skip-hidden-subviews.patch', - 'patches/gtk/0001-gtk-combo-box-native-menu-hook.patch' + 'patches/gtk/0001-gtk-combo-box-native-menu-hook.patch', + + 'patches/gtk/gtkviewport-autoscroll.patch' ]) def prep(self): diff --git a/external/bockbuild/packages/patches/gtk/gtkviewport-autoscroll.patch b/external/bockbuild/packages/patches/gtk/gtkviewport-autoscroll.patch new file mode 100644 index 0000000000..799e66c147 --- /dev/null +++ b/external/bockbuild/packages/patches/gtk/gtkviewport-autoscroll.patch @@ -0,0 +1,109 @@ +diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c +index e564b9af5..24dd9f099 100644 +--- a/gtk/gtkviewport.c ++++ b/gtk/gtkviewport.c +@@ -26,6 +26,7 @@ + + #include "config.h" + #include "gtkviewport.h" ++#include "gtkwindow.h" + #include "gtkintl.h" + #include "gtkmarshalers.h" + #include "gtkprivate.h" +@@ -87,6 +88,8 @@ static void gtk_viewport_adjustment_value_changed (GtkAdjustment *adjustment, + gpointer data); + static void gtk_viewport_style_set (GtkWidget *widget, + GtkStyle *previous_style); ++static void gtk_viewport_set_focus_child (GtkContainer *container, ++ GtkWidget *child); + + G_DEFINE_TYPE (GtkViewport, gtk_viewport, GTK_TYPE_BIN) + +@@ -114,8 +117,9 @@ gtk_viewport_class_init (GtkViewportClass *class) + widget_class->size_request = gtk_viewport_size_request; + widget_class->size_allocate = gtk_viewport_size_allocate; + widget_class->style_set = gtk_viewport_style_set; +- ++ + container_class->add = gtk_viewport_add; ++ container_class->set_focus_child = gtk_viewport_set_focus_child; + + class->set_scroll_adjustments = gtk_viewport_set_scroll_adjustments; + +@@ -758,6 +762,76 @@ gtk_viewport_add (GtkContainer *container, + GTK_CONTAINER_CLASS (gtk_viewport_parent_class)->add (container, child); + } + ++static gboolean ++set_focus_child_cb (gpointer data) ++{ ++ GtkWidget *widget; ++ GtkViewport *viewport; ++ GtkWidget *toplevel; ++ GtkWidget *focus; ++ GtkAdjustment *adj; ++ int x, y; ++ GtkAllocation widget_alloc; ++ GtkAllocation focus_alloc; ++ gdouble value; ++ ++ widget = (GtkWidget *)data; ++ g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); ++ ++ toplevel = gtk_widget_get_toplevel (widget); ++ g_return_val_if_fail (GTK_IS_WIDGET (toplevel), FALSE); ++ ++ focus = gtk_window_get_focus (GTK_WINDOW (toplevel)); ++ if (focus == NULL) ++ return FALSE; ++ ++ viewport = GTK_VIEWPORT (widget); ++ ++ gtk_widget_get_allocation (focus, &focus_alloc); ++ gtk_widget_get_allocation (widget, &widget_alloc); ++ gtk_widget_translate_coordinates (focus, widget, 0, 0, &x, &y); ++ ++ /* Do we need to move vertically? */ ++ if (y + focus_alloc.height >= widget_alloc.height) ++ { ++ adj = gtk_viewport_get_vadjustment (viewport); ++ value = gtk_adjustment_get_value (adj) + (y + focus_alloc.height - widget_alloc.height); ++ gtk_adjustment_set_value (adj, value); ++ } ++ else if (y <= widget_alloc.y) ++ { ++ adj = gtk_viewport_get_vadjustment (viewport); ++ value = gtk_adjustment_get_value (adj) - (widget_alloc.y - y); ++ gtk_adjustment_set_value (adj, value); ++ } ++ ++ /* Do we need to move horizontally? */ ++ if (x + focus_alloc.width >= widget_alloc.width) ++ { ++ adj = gtk_viewport_get_hadjustment (viewport); ++ value = gtk_adjustment_get_value (adj) + (x + focus_alloc.width - widget_alloc.width); ++ gtk_adjustment_set_value (adj, value); ++ } ++ else if (x <= widget_alloc.x) ++ { ++ adj = gtk_viewport_get_hadjustment (viewport); ++ value = gtk_adjustment_get_value (adj) - (widget_alloc.x - x); ++ gtk_adjustment_set_value (adj, value); ++ } ++ ++ return FALSE; ++} ++ ++static void ++gtk_viewport_set_focus_child (GtkContainer *container, ++ GtkWidget *child) ++{ ++ if (child == NULL) ++ return; ++ ++ g_idle_add (set_focus_child_cb, container); ++} ++ + static void + gtk_viewport_size_request (GtkWidget *widget, + GtkRequisition *requisition) diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 1f1565df4b..d4e1bc2a3e 100644 --- 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.128"; + public const string MonoVersion = "6.6.0.129"; public const string MonoCompany = "Mono development team"; public const string MonoProduct = "Mono Common Language Infrastructure"; public const string MonoCopyright = "(c) Various Mono authors"; diff --git 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 index 77686ba2b7..a0658e3e4b 100644 --- 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 @@ -89e45ec332a791625f1f00a79c83866a1f50581f \ No newline at end of file +300722a98a05bc31dfb3f3fc97aaa86152d6626e \ No newline at end of file diff --git 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 index 143a1f90ba..948d9b8825 100644 --- 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 @@ -f3666c75cf299935ce7d98afad77e3fd806a5947 \ No newline at end of file +6ab34de67290bcc7a0088ecd8c8317e457e9bb61 \ No newline at end of file diff --git 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 index 45759bc4cf..b6cabfb362 100644 --- 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 @@ -6afe3d0aaf1b20c05b5970c395988505e6d81484 \ No newline at end of file +0fb6236afda1dcfd99e4adca17530b21360700af \ No newline at end of file diff --git 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 index da35835a44..b1517ed1ea 100644 --- 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 @@ -79c868774947b3efa0ece81712bb568df8b4927c \ No newline at end of file +a1eaa2f68f534f2c4b2ee4b1f772f15b1b67bdcc \ No newline at end of file diff --git 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 index b3409e1834..c92c0cd7df 100644 --- 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 @@ -74f03df4b3bc6d6f248f883fc145547b03970ad9 \ No newline at end of file +32f2b24aaa0b03c517b78e71da24e365056ee71f \ No newline at end of file diff --git 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 index cfd3b59fc6..2d23c03e6a 100644 --- 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 @@ -bf559e19a4204224fdaa8166a68a938e4e567afb \ No newline at end of file +2c1857d6aec99e5872da9a31885a3e7ff8d06ced \ No newline at end of file diff --git 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 index 67da849280..67da47ccf0 100644 --- 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 @@ -0a008b2c7a75809e566ef96fa411184427d72072 \ No newline at end of file +e024162eae00395b415cd344e804a4ac0a841e3a \ No newline at end of file diff --git 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 index 77686ba2b7..a0658e3e4b 100644 --- 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 @@ -89e45ec332a791625f1f00a79c83866a1f50581f \ No newline at end of file +300722a98a05bc31dfb3f3fc97aaa86152d6626e \ No newline at end of file diff --git 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 index 143a1f90ba..948d9b8825 100644 --- 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 @@ -f3666c75cf299935ce7d98afad77e3fd806a5947 \ No newline at end of file +6ab34de67290bcc7a0088ecd8c8317e457e9bb61 \ No newline at end of file diff --git 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 index 45759bc4cf..b6cabfb362 100644 --- 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 @@ -6afe3d0aaf1b20c05b5970c395988505e6d81484 \ No newline at end of file +0fb6236afda1dcfd99e4adca17530b21360700af \ No newline at end of file diff --git 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 index da35835a44..b1517ed1ea 100644 --- 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 @@ -79c868774947b3efa0ece81712bb568df8b4927c \ No newline at end of file +a1eaa2f68f534f2c4b2ee4b1f772f15b1b67bdcc \ No newline at end of file diff --git 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 index b3409e1834..c92c0cd7df 100644 --- 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 @@ -74f03df4b3bc6d6f248f883fc145547b03970ad9 \ No newline at end of file +32f2b24aaa0b03c517b78e71da24e365056ee71f \ No newline at end of file diff --git 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 index cfd3b59fc6..2d23c03e6a 100644 --- 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 @@ -bf559e19a4204224fdaa8166a68a938e4e567afb \ No newline at end of file +2c1857d6aec99e5872da9a31885a3e7ff8d06ced \ No newline at end of file diff --git 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 index 31b833f2c4..d6baaf7bee 100644 --- 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 @@ -9003fa9a075495eb5b115a722c5d7a46b2d5c5a0 \ No newline at end of file +70caf6f317b845757690c33fa4621758452fd86b \ No newline at end of file diff --git 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 index 67da849280..67da47ccf0 100644 --- 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 @@ -0a008b2c7a75809e566ef96fa411184427d72072 \ No newline at end of file +e024162eae00395b415cd344e804a4ac0a841e3a \ No newline at end of file diff --git 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 index 77686ba2b7..a0658e3e4b 100644 --- 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 @@ -89e45ec332a791625f1f00a79c83866a1f50581f \ No newline at end of file +300722a98a05bc31dfb3f3fc97aaa86152d6626e \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Configuration.dll.REMOVED.git-id index 143a1f90ba..948d9b8825 100644 --- a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -f3666c75cf299935ce7d98afad77e3fd806a5947 \ No newline at end of file +6ab34de67290bcc7a0088ecd8c8317e457e9bb61 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Core.dll.REMOVED.git-id index 45759bc4cf..b6cabfb362 100644 --- a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -6afe3d0aaf1b20c05b5970c395988505e6d81484 \ No newline at end of file +0fb6236afda1dcfd99e4adca17530b21360700af \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.IO.Compression.dll.REMOVED.git-id index da35835a44..b1517ed1ea 100644 --- a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -79c868774947b3efa0ece81712bb568df8b4927c \ No newline at end of file +a1eaa2f68f534f2c4b2ee4b1f772f15b1b67bdcc \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Numerics.dll.REMOVED.git-id index b3409e1834..c92c0cd7df 100644 --- a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -74f03df4b3bc6d6f248f883fc145547b03970ad9 \ No newline at end of file +32f2b24aaa0b03c517b78e71da24e365056ee71f \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Xml.dll.REMOVED.git-id index cfd3b59fc6..2d23c03e6a 100644 --- a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -bf559e19a4204224fdaa8166a68a938e4e567afb \ No newline at end of file +2c1857d6aec99e5872da9a31885a3e7ff8d06ced \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mcs.exe.REMOVED.git-id index 31b833f2c4..d6baaf7bee 100644 --- a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -9003fa9a075495eb5b115a722c5d7a46b2d5c5a0 \ No newline at end of file +70caf6f317b845757690c33fa4621758452fd86b \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mscorlib.dll.REMOVED.git-id index 67da849280..67da47ccf0 100644 --- a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -0a008b2c7a75809e566ef96fa411184427d72072 \ No newline at end of file +e024162eae00395b415cd344e804a4ac0a841e3a \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Mono.Security.dll.REMOVED.git-id index 77686ba2b7..a0658e3e4b 100644 --- a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -89e45ec332a791625f1f00a79c83866a1f50581f \ No newline at end of file +300722a98a05bc31dfb3f3fc97aaa86152d6626e \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Configuration.dll.REMOVED.git-id index 143a1f90ba..948d9b8825 100644 --- a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -f3666c75cf299935ce7d98afad77e3fd806a5947 \ No newline at end of file +6ab34de67290bcc7a0088ecd8c8317e457e9bb61 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Core.dll.REMOVED.git-id index ead80cd224..605b27d064 100644 --- a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -4e8b22d47d41d3c26b20e098509be714c9b8f20c \ No newline at end of file +a6e3dd850207b906f007f26645603201afe2cfc8 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.IO.Compression.dll.REMOVED.git-id index da35835a44..b1517ed1ea 100644 --- a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -79c868774947b3efa0ece81712bb568df8b4927c \ No newline at end of file +a1eaa2f68f534f2c4b2ee4b1f772f15b1b67bdcc \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Numerics.dll.REMOVED.git-id index b3409e1834..c92c0cd7df 100644 --- a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -74f03df4b3bc6d6f248f883fc145547b03970ad9 \ No newline at end of file +32f2b24aaa0b03c517b78e71da24e365056ee71f \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Xml.dll.REMOVED.git-id index cfd3b59fc6..2d23c03e6a 100644 --- a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -bf559e19a4204224fdaa8166a68a938e4e567afb \ No newline at end of file +2c1857d6aec99e5872da9a31885a3e7ff8d06ced \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mcs.exe.REMOVED.git-id index 31b833f2c4..d6baaf7bee 100644 --- a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -9003fa9a075495eb5b115a722c5d7a46b2d5c5a0 \ No newline at end of file +70caf6f317b845757690c33fa4621758452fd86b \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mscorlib.dll.REMOVED.git-id index 49427e49c0..0a37b56cca 100644 --- a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -3b91c985795095a06678d9c9ad21b8afb0cdc4a2 \ No newline at end of file +f4f22c4d91fac636ef3fc03f2dd022850d2000fa \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index d0e9244451..dca6ec4675 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/b601371" +#define FULL_VERSION "explicit/3eb5f34" diff --git a/mono/unit-tests/Makefile.in b/mono/unit-tests/Makefile.in index eed954ce12..7b45dbc879 100644 --- a/mono/unit-tests/Makefile.in +++ b/mono/unit-tests/Makefile.in @@ -1496,10 +1496,10 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@CROSS_COMPILE_TRUE@clean-local: -@HOST_WIN32_TRUE@clean-local: @CROSS_COMPILE_TRUE@test-local: @HOST_WIN32_TRUE@test-local: +@CROSS_COMPILE_TRUE@clean-local: +@HOST_WIN32_TRUE@clean-local: clean: clean-am clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \ diff --git a/msvc/Makefile.in b/msvc/Makefile.in index a35c268f47..23ce0a9ad5 100644 --- a/msvc/Makefile.in +++ b/msvc/Makefile.in @@ -525,8 +525,8 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@ENABLE_MSVC_FALSE@install-exec-local: @ENABLE_MSVC_FALSE@clean-local: +@ENABLE_MSVC_FALSE@install-exec-local: clean: clean-am clean-am: clean-generic clean-libtool clean-local mostlyclean-am diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index 8fed843836749bd7d739358628f6dbd36805749a..3b314720a91df138aaacac9479bd8655b8d876cb 100644 GIT binary patch delta 20 bcmbQIHBW29Q!aLM1p^B!W24P)xQw^}N~#8W delta 20 bcmbQIHBW29Q!aKh1p^B!BeTtKxQw^}O0Ncd diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index 27869d8815..e3767cc266 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -5ee064b61c174eddde00c8f73aebe35143aeba22 \ No newline at end of file +cd2ee4f457d612eef9e14287cac43ba7089669f2 \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index 2fbdcd1dc446623b42f45e64833c97239a2fb977..4f6840a63e14b7ab3db4e5ff1ab9431844cbb444 100644 GIT binary patch delta 20 bcmX?Ef3kjqo+7)sf`NsVvC(Ez#VK+CQOX9e delta 20 bcmX?Ef3kjqo+7)Mf`NsVk=bTb#VK+CQO^dl diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index c869cf77ef..aa7cd099c5 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -40d70447f011cb4cfb0e1748763c48ca4d568f46 \ No newline at end of file +4d3a86a1e872b378c8910c237e0dd4a3c37bfb25 \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index 002a2bee2c621801402cdc2f8ab4eeff2841c480..433899fcf36a39004ec0fdb4db1d2f865f3da574 100644 GIT binary patch delta 22 dcmeyri1Gg-#tj_m?B)sv7FNbaoB7oXv;bio2MhoJ delta 22 dcmeyri1Gg-#tj_m>}CoE7FI@PoB7oXv;bit2Mz!L diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index 2d29e2c0f3..08779ed97c 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -681908bd2a42f011b44bf15e296812501ea5179f \ No newline at end of file +edda0118e4f4d795d59607753344f59a48c2f708 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index 9252cf8482..d00825f38b 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mono 6.6.0.128\n" +"Project-Id-Version: mono 6.6.0.129\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2019-10-16 08:26+0000\n" +"POT-Creation-Date: 2019-10-17 08:32+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo index 19e096c26ad7a5c4866a6ba67a4992711dd127b8..5ffc1c571bd4fbfbf9a288ff1c4bf6cb992e9a19 100644 GIT binary patch delta 22 ecmaF1gXP%{mJM-J+07LUEUb);Hm6QyYzF{t69|F; delta 22 ecmaF1gXP%{mJM-J+07ITEUb*oHm6QyYzF{t7zl&_ diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index 512d451a3d..1a4865fccb 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -7bd7d5c9851f157ffcf3dcf765e9755fe52f8575 \ No newline at end of file +07afc155f6e9ad9a685a188a70238ca92c219768 \ No newline at end of file