From b501216e0ba573a810391ec35a38ebdf46094c8c Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Wed, 20 Mar 2019 08:22:07 +0000 Subject: [PATCH] Imported Upstream version 5.20.1.3 Former-commit-id: c0dbb88f7549c374316c95af3cf6b4a8c7d66bfe --- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- external/bockbuild/packages/gtk+.py | 18 +++++++---- ...move-event-when-popup-window-appears.patch | 13 ++++++++ ...sview-embedding-skip-hidden-subviews.patch | 26 +++++++++++++++ mcs/build/common/Consts.cs | 2 +- .../HttpRequestChannel.cs | 30 +++++++++++++++--- .../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 | Bin 99328 -> 99328 bytes .../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 | Bin 99328 -> 99328 bytes .../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 | Bin 99328 -> 99328 bytes .../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 | Bin 99328 -> 99328 bytes .../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/utils/mono-state.c | 15 +++++---- 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 +- 50 files changed, 121 insertions(+), 57 deletions(-) create mode 100644 external/bockbuild/packages/patches/gtk/0077-fix-nsview-embedding-mouse-move-event-when-popup-window-appears.patch create mode 100644 external/bockbuild/packages/patches/gtk/nsview-embedding-skip-hidden-subviews.patch diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index f412f2172b..0a281f2011 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -17ee62937b460cba39bf26a858c29c2c54457ab7 \ No newline at end of file +94bc7d21560c6d7059519c3cb59ddff9d187b0c8 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index ecd4c3f761..2397e27c61 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -cad070b951efa98a606ab02c265f6d0b8a77b64f \ No newline at end of file +c110d06a95e16d5496281e8499d680b7692c0840 \ No newline at end of file diff --git a/external/bockbuild/packages/gtk+.py b/external/bockbuild/packages/gtk+.py index 6b584d8332..56e283651e 100644 --- a/external/bockbuild/packages/gtk+.py +++ b/external/bockbuild/packages/gtk+.py @@ -212,14 +212,18 @@ class GtkPackage (GitHubPackage): #'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', + # https://devdiv.visualstudio.com/DevDiv/_workitems/edit/569768 + 'patches/gtk/gtk-imquartz-commit-on-focus-out.patch', - # https://devdiv.visualstudio.com/DevDiv/_workitems/edit/737323 - 'patches/gtk/gtk-nsview-subview-focus-fixes.patch', - 'patches/gtk/gtk-nsview-focus-tabbing.patch', - 'patches/gtk/popup-combo-box-with-arrows.patch', - 'patches/gtk/0001-prevent-gdk-quartz-window-delegate-replacement.patch' + # https://devdiv.visualstudio.com/DevDiv/_workitems/edit/737323 + 'patches/gtk/gtk-nsview-subview-focus-fixes.patch', + 'patches/gtk/gtk-nsview-focus-tabbing.patch', + 'patches/gtk/popup-combo-box-with-arrows.patch', + 'patches/gtk/0001-prevent-gdk-quartz-window-delegate-replacement.patch', + 'patches/gtk/0077-fix-nsview-embedding-mouse-move-event-when-popup-window-appears.patch', + + # https://devdiv.visualstudio.com/DevDiv/_workitems/edit/821841 + 'patches/gtk/nsview-embedding-skip-hidden-subviews.patch', ]) def prep(self): diff --git a/external/bockbuild/packages/patches/gtk/0077-fix-nsview-embedding-mouse-move-event-when-popup-window-appears.patch b/external/bockbuild/packages/patches/gtk/0077-fix-nsview-embedding-mouse-move-event-when-popup-window-appears.patch new file mode 100644 index 0000000000..9ebe750327 --- /dev/null +++ b/external/bockbuild/packages/patches/gtk/0077-fix-nsview-embedding-mouse-move-event-when-popup-window-appears.patch @@ -0,0 +1,13 @@ +diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c +index 195899b13..3eecdde42 100644 +--- a/gdk/quartz/gdkevents-quartz.c ++++ b/gdk/quartz/gdkevents-quartz.c +@@ -932,7 +932,7 @@ find_window_for_ns_event (NSEvent *nsevent, + toplevel_private = (GdkWindowObject *)toplevel; + toplevel_impl = (GdkWindowImplQuartz *)toplevel_private->impl; + +- subview = find_nsview_at_pos (toplevel_impl, *x, *y); ++ subview = find_nsview_at_pos (toplevel_impl, x_tmp, y_tmp); + if (subview != NULL && ![subview isKindOfClass:[GdkQuartzView class]]) { + g_signal_emit_by_name (toplevel, "native-child-event", + subview, nsevent); diff --git a/external/bockbuild/packages/patches/gtk/nsview-embedding-skip-hidden-subviews.patch b/external/bockbuild/packages/patches/gtk/nsview-embedding-skip-hidden-subviews.patch new file mode 100644 index 0000000000..3ed3b8ea1c --- /dev/null +++ b/external/bockbuild/packages/patches/gtk/nsview-embedding-skip-hidden-subviews.patch @@ -0,0 +1,26 @@ +From cb62d4a99f228f51ee420f289f741dbb4ecea57b Mon Sep 17 00:00:00 2001 +From: Vsevolod Kukol +Date: Mon, 18 Mar 2019 16:15:54 +0100 +Subject: [PATCH] Skip hidden subviews when searching for a child event target + +--- + gdk/quartz/gdkevents-quartz.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c +index b5016e1de9..8101e366c8 100644 +--- a/gdk/quartz/gdkevents-quartz.c ++++ b/gdk/quartz/gdkevents-quartz.c +@@ -724,7 +724,8 @@ find_nsview_at_pos (GdkWindowImplQuartz *impl, gint x, gint y) + if (sv == impl->layer_view) + continue; + +- if (r.origin.x <= x && r.origin.x + r.size.width >= x && ++ if (![sv isHidden] && ++ r.origin.x <= x && r.origin.x + r.size.width >= x && + r.origin.y <= y && r.origin.y + r.size.height >= y) + { + NSView* child = find_nsview_at_pos (impl, x - r.origin.x, y - r.origin.y); +-- +2.17.1 (Apple Git-112) + diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index e779763867..2181cd2948 100644 --- 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.20.1.0"; + public const string MonoVersion = "5.20.1.3"; 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/System.ServiceModel/System.ServiceModel.Channels/HttpRequestChannel.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/HttpRequestChannel.cs index 4e4d73f9fb..c5a96fe331 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/HttpRequestChannel.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/HttpRequestChannel.cs @@ -41,7 +41,8 @@ namespace System.ServiceModel.Channels { HttpChannelFactory source; - List web_requests = new List (); + object locker = new object(); + List web_requests = new List (); //synced by locker // Constructor @@ -86,7 +87,12 @@ namespace System.ServiceModel.Channels } var web_request = (HttpWebRequest) HttpWebRequest.Create (destination); - web_requests.Add (web_request); + + lock (locker) + { + web_requests.Add (web_request); + } + result.WebRequest = web_request; web_request.Method = "POST"; web_request.ContentType = Encoder.ContentType; @@ -350,9 +356,20 @@ namespace System.ServiceModel.Channels protected override void OnAbort () { - foreach (var web_request in web_requests.ToArray ()) + WebRequest[] current_web_requests; + + lock (locker) + { + current_web_requests = web_requests.ToArray(); + } + + foreach (var web_request in current_web_requests) web_request.Abort (); - web_requests.Clear (); + + lock(locker) + { + web_requests.Clear (); + } } // Close @@ -497,7 +514,10 @@ namespace System.ServiceModel.Channels void Cleanup () { - owner.web_requests.Remove (WebRequest); + lock (owner.locker) + { + owner.web_requests.Remove (WebRequest); + } } } } diff --git a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id index d5e7d0ce7e..c19fd1ef83 100644 --- a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -df5a5fc92d7905ebf7afbf917ca6f1122e507f60 \ No newline at end of file +ae45d263adda87b3d33397c470a2fd1f4755187d \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id index 9c7dc95fc7..0fb8708829 100644 --- a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -0687a5d2f6021f1362f95c4a9c49b42ff6f4a9c6 \ No newline at end of file +60a6339b6c14d7868129f347b15f3dd086ae01b5 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id index 3d3a8f9995..1183983b39 100644 --- a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -e722d044d5e351ccfde65c270f8bcf11cb8dd1b1 \ No newline at end of file +369ff3864f283c17c1c752eb0f0da156ad05617f \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.IO.Compression.dll b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.IO.Compression.dll index e6b1c7f97548259da685ebfd95d943e53a6ddb05..9db0d4e45c6723a2f6e85198274ea5f41ad35d37 100644 GIT binary patch delta 58 zcmV-A0LA}+hz5X&29SsZ%{>%{fsD0`0W=H{Q(D9lcBeK{!O3lD4Q!krKPf*_@Q)x6lj$W(ET= Q04kTDeE}-BV-o?LaP-0$g#Z8m diff --git a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Numerics.dll.REMOVED.git-id index 02384fc453..7dd72b75ea 100644 --- a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -63967ebdb25eb87385c0ddd1bb0e7d613e667454 \ No newline at end of file +180c38a8bdc36a60626e44ed7920cc1e0e25d9c9 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Xml.dll.REMOVED.git-id index 814b55e689..db831c8f12 100644 --- a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -38c6703f1e110a77aec611606f421524a10aaea0 \ No newline at end of file +ad1a8440cd8a7b65154e2143b28502f22ceedf59 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mcs.exe.REMOVED.git-id index 67adafebd3..36b079c80b 100644 --- a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -6e424b13b6a523109871a5892de9c92309e8a794 \ No newline at end of file +c3a7f19271ebc7b4a9bc655e58c899da6d3b3669 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mscorlib.dll.REMOVED.git-id index 825f74ebb1..b953e9c1fb 100644 --- a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -b732d0e8f434ee2be69e269693879a25d0ea8869 \ No newline at end of file +dc42b64cdc4b9ae2ca91d631e08778f7e9eb6a8d \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id index d5e7d0ce7e..c19fd1ef83 100644 --- a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -df5a5fc92d7905ebf7afbf917ca6f1122e507f60 \ No newline at end of file +ae45d263adda87b3d33397c470a2fd1f4755187d \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id index 9c7dc95fc7..0fb8708829 100644 --- a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -0687a5d2f6021f1362f95c4a9c49b42ff6f4a9c6 \ No newline at end of file +60a6339b6c14d7868129f347b15f3dd086ae01b5 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id index 3d3a8f9995..1183983b39 100644 --- a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -e722d044d5e351ccfde65c270f8bcf11cb8dd1b1 \ No newline at end of file +369ff3864f283c17c1c752eb0f0da156ad05617f \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.IO.Compression.dll b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.IO.Compression.dll index e6b1c7f97548259da685ebfd95d943e53a6ddb05..9db0d4e45c6723a2f6e85198274ea5f41ad35d37 100644 GIT binary patch delta 58 zcmV-A0LA}+hz5X&29SsZ%{>%{fsD0`0W=H{Q(D9lcBeK{!O3lD4Q!krKPf*_@Q)x6lj$W(ET= Q04kTDeE}-BV-o?LaP-0$g#Z8m diff --git a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Numerics.dll.REMOVED.git-id index 02384fc453..7dd72b75ea 100644 --- a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -63967ebdb25eb87385c0ddd1bb0e7d613e667454 \ No newline at end of file +180c38a8bdc36a60626e44ed7920cc1e0e25d9c9 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Xml.dll.REMOVED.git-id index 814b55e689..db831c8f12 100644 --- a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -38c6703f1e110a77aec611606f421524a10aaea0 \ No newline at end of file +ad1a8440cd8a7b65154e2143b28502f22ceedf59 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mcs.exe.REMOVED.git-id index 67adafebd3..36b079c80b 100644 --- a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -6e424b13b6a523109871a5892de9c92309e8a794 \ No newline at end of file +c3a7f19271ebc7b4a9bc655e58c899da6d3b3669 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mscorlib.dll.REMOVED.git-id index 825f74ebb1..b953e9c1fb 100644 --- a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -b732d0e8f434ee2be69e269693879a25d0ea8869 \ No newline at end of file +dc42b64cdc4b9ae2ca91d631e08778f7e9eb6a8d \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id index d5e7d0ce7e..c19fd1ef83 100644 --- a/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -df5a5fc92d7905ebf7afbf917ca6f1122e507f60 \ No newline at end of file +ae45d263adda87b3d33397c470a2fd1f4755187d \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id index 9c7dc95fc7..0fb8708829 100644 --- a/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -0687a5d2f6021f1362f95c4a9c49b42ff6f4a9c6 \ No newline at end of file +60a6339b6c14d7868129f347b15f3dd086ae01b5 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id index 3d3a8f9995..1183983b39 100644 --- a/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -e722d044d5e351ccfde65c270f8bcf11cb8dd1b1 \ No newline at end of file +369ff3864f283c17c1c752eb0f0da156ad05617f \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.IO.Compression.dll b/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.IO.Compression.dll index e6b1c7f97548259da685ebfd95d943e53a6ddb05..9db0d4e45c6723a2f6e85198274ea5f41ad35d37 100644 GIT binary patch delta 58 zcmV-A0LA}+hz5X&29SsZ%{>%{fsD0`0W=H{Q(D9lcBeK{!O3lD4Q!krKPf*_@Q)x6lj$W(ET= Q04kTDeE}-BV-o?LaP-0$g#Z8m diff --git a/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Numerics.dll.REMOVED.git-id index 02384fc453..7dd72b75ea 100644 --- a/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -63967ebdb25eb87385c0ddd1bb0e7d613e667454 \ No newline at end of file +180c38a8bdc36a60626e44ed7920cc1e0e25d9c9 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Xml.dll.REMOVED.git-id index 814b55e689..db831c8f12 100644 --- a/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -38c6703f1e110a77aec611606f421524a10aaea0 \ No newline at end of file +ad1a8440cd8a7b65154e2143b28502f22ceedf59 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mcs.exe.REMOVED.git-id index 67adafebd3..36b079c80b 100644 --- a/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -6e424b13b6a523109871a5892de9c92309e8a794 \ No newline at end of file +c3a7f19271ebc7b4a9bc655e58c899da6d3b3669 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mscorlib.dll.REMOVED.git-id index 825f74ebb1..b953e9c1fb 100644 --- a/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -b732d0e8f434ee2be69e269693879a25d0ea8869 \ No newline at end of file +dc42b64cdc4b9ae2ca91d631e08778f7e9eb6a8d \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id index d5e7d0ce7e..c19fd1ef83 100644 --- a/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -df5a5fc92d7905ebf7afbf917ca6f1122e507f60 \ No newline at end of file +ae45d263adda87b3d33397c470a2fd1f4755187d \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id index 9c7dc95fc7..0fb8708829 100644 --- a/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -0687a5d2f6021f1362f95c4a9c49b42ff6f4a9c6 \ No newline at end of file +60a6339b6c14d7868129f347b15f3dd086ae01b5 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id index 3d3a8f9995..1183983b39 100644 --- a/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -e722d044d5e351ccfde65c270f8bcf11cb8dd1b1 \ No newline at end of file +369ff3864f283c17c1c752eb0f0da156ad05617f \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.IO.Compression.dll b/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.IO.Compression.dll index e6b1c7f97548259da685ebfd95d943e53a6ddb05..9db0d4e45c6723a2f6e85198274ea5f41ad35d37 100644 GIT binary patch delta 58 zcmV-A0LA}+hz5X&29SsZ%{>%{fsD0`0W=H{Q(D9lcBeK{!O3lD4Q!krKPf*_@Q)x6lj$W(ET= Q04kTDeE}-BV-o?LaP-0$g#Z8m diff --git a/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Numerics.dll.REMOVED.git-id index 02384fc453..7dd72b75ea 100644 --- a/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -63967ebdb25eb87385c0ddd1bb0e7d613e667454 \ No newline at end of file +180c38a8bdc36a60626e44ed7920cc1e0e25d9c9 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Xml.dll.REMOVED.git-id index 814b55e689..db831c8f12 100644 --- a/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -38c6703f1e110a77aec611606f421524a10aaea0 \ No newline at end of file +ad1a8440cd8a7b65154e2143b28502f22ceedf59 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mcs.exe.REMOVED.git-id index 67adafebd3..36b079c80b 100644 --- a/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -6e424b13b6a523109871a5892de9c92309e8a794 \ No newline at end of file +c3a7f19271ebc7b4a9bc655e58c899da6d3b3669 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mscorlib.dll.REMOVED.git-id index 825f74ebb1..b953e9c1fb 100644 --- a/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -b732d0e8f434ee2be69e269693879a25d0ea8869 \ No newline at end of file +dc42b64cdc4b9ae2ca91d631e08778f7e9eb6a8d \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index 9ff58d9bf7..f2feb68000 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/9326f9f" +#define FULL_VERSION "explicit/24a71af" diff --git a/mono/utils/mono-state.c b/mono/utils/mono-state.c index c582cac4b9..214471358c 100644 --- a/mono/utils/mono-state.c +++ b/mono/utils/mono-state.c @@ -259,15 +259,16 @@ mono_state_alloc_mem (MonoStateMem *mem, long tag, size_t size) mem->size = size; mem->handle = g_open (name, O_RDWR | O_CREAT | O_EXCL, S_IWUSR | S_IRUSR | S_IRGRP | S_IROTH); - if (mem->handle < 1) - return FALSE; + if (mem->handle < 1) { + mem->mem = (gpointer *) mmap (0, mem->size, PROT_READ | PROT_WRITE, MAP_ANONYMOUS, -1, 0); + } else { + lseek (mem->handle, mem->size, SEEK_SET); + g_write (mem->handle, "", 1); - lseek (mem->handle, mem->size, SEEK_SET); - g_write (mem->handle, "", 1); - - mem->mem = (gpointer *) mmap (0, mem->size, PROT_READ | PROT_WRITE, MAP_SHARED, mem->handle, 0); + mem->mem = (gpointer *) mmap (0, mem->size, PROT_READ | PROT_WRITE, MAP_SHARED, mem->handle, 0); + } if (mem->mem == GINT_TO_POINTER (-1)) - g_assert_not_reached (); + return FALSE; return TRUE; } diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index 90a8871a4dd540a6c337cc12dea0ed7964eecc61..8bcf063ce850aa8cef797f331461b378b80a0731 100644 GIT binary patch delta 21 ccmbQIHBW296D|%T0|f&MD+9C5Z@7%O08khPrT_o{ delta 21 ccmbQIHBW296D|%zQw0MHD+yDRo delta 21 ccmX?Ef3kjqt|Et_se*xpm673QQ^hHA09UsL-2eap diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index f843a1cbb5..312fa1e434 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -36adcd8756216119ad1102196639e8707bddffe6 \ No newline at end of file +b9218732f47d65ea6a82493c31b2e9db32c8387c \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index 31ce10c9ae5d034f13d5b1175877a3c3dff430f1..d43237356a11b3d8793aaf314ee0268c523d2621 100644 GIT binary patch delta 23 ecmeyri1Gg-#trQ197YBT1{PKZW}Erd3$y@deg`-J delta 23 ecmeyri1Gg-#trQ19EPR}1{PLEhMW1-3$y@dod-Dp diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index 8ef21ef3e9..d7a7cce18a 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -9aab281d16df6070c2836f59154be69f17537797 \ No newline at end of file +4483803a4242e351def00eb4cf9b3d2380476747 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index 1b63e8899c..6bf1a94a04 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mono 5.20.1.0\n" +"Project-Id-Version: mono 5.20.1.3\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2019-03-15 08:21+0000\n" +"POT-Creation-Date: 2019-03-20 08:06+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 cb1bc3c1d876f5ea78d4e149534af43e315222ce..3f3d65ed7236b782a8ad7055b5053fe1d8d96f0e 100644 GIT binary patch delta 23 fcmaF1gXP%{mJP8}IgAVx3@oe+%r>V^Wo!okbvX#G delta 23 fcmaF1gXP%{mJP8}ISfq|3@ogS3^%7vWo!okbyx_m diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index 44ed9b9308..a5a5ac3653 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -ae6b4ec08961f8c1ae98eacfe0deb1ba7fdf881c \ No newline at end of file +e348ee33ac9fdedb5ba4e5905bdde1d6814ecc3e \ No newline at end of file