From f737def5f578ac1d22e65b4cb39f3bc7aca43166 Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Wed, 6 Feb 2019 08:26:08 +0000 Subject: [PATCH] Imported Upstream version 5.20.0.185 Former-commit-id: fcd643a64a9c5470917dbbb1be4ba228e5c14650 --- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- .../monodroid/mscorlib.cs.REMOVED.git-id | 2 +- .../monotouch/mscorlib.cs.REMOVED.git-id | 2 +- .../net_4_x/mscorlib.cs.REMOVED.git-id | 2 +- mcs/build/common/Consts.cs | 2 +- .../CancellationTokenSourceTest.cs | 29 ++++++++++++++++++ .../corlib/corlib.dll.sources.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 +- .../System.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 +- .../System.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 +- .../System.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 +- .../System.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../system/threading/executioncontext.cs | 4 +++ mono/mini/version.h | 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 +- 55 files changed, 79 insertions(+), 46 deletions(-) diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index aba0909e16..c148de80e0 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -b796426724e7961d0e254ca3f7d9ac4049499d5d \ No newline at end of file +dedcdea54ed22b2f5d3bb7e1de37b77702527d1a \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index a598811a35..39eb7a42c4 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -edc8bec4f4b607c3a97b3df060a00581a5ec2e30 \ No newline at end of file +aef91595c533d430081888c8af71445b4fc3f164 \ No newline at end of file diff --git a/external/api-snapshot/profiles/monodroid/mscorlib.cs.REMOVED.git-id b/external/api-snapshot/profiles/monodroid/mscorlib.cs.REMOVED.git-id index 5500937f8a..a87d933a6f 100644 --- a/external/api-snapshot/profiles/monodroid/mscorlib.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/monodroid/mscorlib.cs.REMOVED.git-id @@ -1 +1 @@ -5720eb204ffdc35ca77f9c0f4c69efa1779a6fe7 \ No newline at end of file +a2da0f3967d88642e55a982da38b2df455a79b70 \ No newline at end of file diff --git a/external/api-snapshot/profiles/monotouch/mscorlib.cs.REMOVED.git-id b/external/api-snapshot/profiles/monotouch/mscorlib.cs.REMOVED.git-id index 53a5cfdd1d..c3207c569d 100644 --- a/external/api-snapshot/profiles/monotouch/mscorlib.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/monotouch/mscorlib.cs.REMOVED.git-id @@ -1 +1 @@ -3bfb5c5d5207383227a9277b36b995ff585297ba \ No newline at end of file +34ad6abcc4b7e3861a2242154197ae0f8dd7b2cc \ No newline at end of file diff --git a/external/api-snapshot/profiles/net_4_x/mscorlib.cs.REMOVED.git-id b/external/api-snapshot/profiles/net_4_x/mscorlib.cs.REMOVED.git-id index 0fad55ac87..db0a1770c5 100644 --- a/external/api-snapshot/profiles/net_4_x/mscorlib.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/net_4_x/mscorlib.cs.REMOVED.git-id @@ -1 +1 @@ -ed19cc64be777080a3bba2cb682288cc5b3e9d20 \ No newline at end of file +9f78547be1fb0d89abe4b6081fd5e151a17e94c8 \ No newline at end of file diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index c98aa9deaf..f8fd6f0915 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.0.184"; + public const string MonoVersion = "5.20.0.185"; 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/corlib/Test/System.Threading/CancellationTokenSourceTest.cs b/mcs/class/corlib/Test/System.Threading/CancellationTokenSourceTest.cs index 59d9b8cbba..19daae965d 100644 --- a/mcs/class/corlib/Test/System.Threading/CancellationTokenSourceTest.cs +++ b/mcs/class/corlib/Test/System.Threading/CancellationTokenSourceTest.cs @@ -491,6 +491,35 @@ namespace MonoTests.System.Threading c1.Dispose (); } } + + [Test] // https://github.com/mono/mono/issues/12421 + public void EnsurePostIsNotCalled () + { + SynchronizationContext mainContext = SynchronizationContext.Current; + var asc = new AssertSyncContext (); + SynchronizationContext.SetSynchronizationContext (asc); + var ct = new CancellationTokenSource (); + var tcs = new TaskCompletionSource (); + ct.Token.Register (() => tcs.TrySetCanceled ()); + + bool taskIsCancelled = false; + Action awaitAction = async () => { + try { await tcs.Task; } + catch (OperationCanceledException) { + taskIsCancelled = true; + } + }; + awaitAction (); + ct.Cancel (); // should not trigger SynchronizationContext.Post + Assert.IsTrue (taskIsCancelled); + SynchronizationContext.SetSynchronizationContext (mainContext); + } + + class AssertSyncContext : SynchronizationContext + { + public override void Post (SendOrPostCallback d, object state) => + throw new InvalidOperationException ("SynchronizationContext.Post was not expected."); + } } } diff --git a/mcs/class/corlib/corlib.dll.sources.REMOVED.git-id b/mcs/class/corlib/corlib.dll.sources.REMOVED.git-id index be0c1dd604..8374b896dd 100644 --- a/mcs/class/corlib/corlib.dll.sources.REMOVED.git-id +++ b/mcs/class/corlib/corlib.dll.sources.REMOVED.git-id @@ -1 +1 @@ -434209ab0071fbc27efd9219f99f4dd3f9f3c5a5 \ No newline at end of file +ac73c8792dbdb43746aeeab1d2fc010ecce1f93e \ No newline at end of file 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 0e9c6c6c78..96d78272e3 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 @@ -865e5662e29da2a52bb18b2500ddc7bd5f45d50f \ No newline at end of file +d83abc65e85980dfa39ccd8b45dd4523d2330d92 \ 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 450d34efa4..0df2ee9753 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 @@ -6a865dece6532c6139ed10e8bfc0b21b1525bed6 \ No newline at end of file +e419c4c654ebfad7e118b5b0a5036e6c85d3117c \ 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 e2344667e4..0d891b111d 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 @@ -5a096ae0d88faf3f76e9e3a8950467a4a409c735 \ No newline at end of file +02b5acbd3ff197caf5a6c6eb99377e21adea61c4 \ 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 914916af60183632f26ab0e382eef83e800a06de..1983bbea7b233206ccb43cf29f2ac3a34541cf47 100644 GIT binary patch delta 58 zcmV-A0LA}+hz5X&29SsZfHSt`fsD0`0W=H{j)n3uz)E64s!>g`x{dr;x6lj$Y6b%} Q04kTDeE}-BXA=RLaLf)D9RL6T delta 58 zcmV-A0LA}+hz5X&29SsZZ?=H*fsD0`0W=H{dUq2rZg`x{dr;x6lj$Y6b%} Q04kTDeE}-BXA=RLaLf)D9RL6T delta 58 zcmV-A0LA}+hz5X&29SsZZ?=H*fsD0`0W=H{dUq2rZg`x{dr;x6lj$Y6b%} Q04kTDeE}-BXA=RLaLf)D9RL6T delta 58 zcmV-A0LA}+hz5X&29SsZZ?=H*fsD0`0W=H{dUq2rZg`x{dr;x6lj$Y6b%} Q04kTDeE}-BXA=RLaLf)D9RL6T delta 58 zcmV-A0LA}+hz5X&29SsZZ?=H*fsD0`0W=H{dUq2rZ1p^B!1GCL}CoE7FGrpoB7oXv;bir2Mz!L delta 22 dcmeyri1Gg-#tj_m?4}9^7FGskoB7oXv;biT2MYiI diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index 41daa5d825..f292c4e0bd 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -1a839ae8748554cfcf5a519f6320d7653a58090f \ No newline at end of file +9b592f749549bd4add5e7c677d81321420b876b8 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index 6492a6daea..94489dc1e5 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mono 5.20.0.184\n" +"Project-Id-Version: mono 5.20.0.185\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2019-02-05 08:06+0000\n" +"POT-Creation-Date: 2019-02-06 08:08+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 6a79b5db713d62c6f755598adc330c9ab6d50031..dab7ecd052204353c3d2775de6973a4f0f166227 100644 GIT binary patch delta 22 ecmaF1gXP%{mJM-J+07ITEUXMHHm6QyYzF{t76^m@ delta 22 ecmaF1gXP%{mJM-J*-aG;EUXO7Hm6QyYzF{s{s@5p diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index 7403cef713..2c40021414 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -90f41adbbe070f8d07c56c8d970c6b775694b150 \ No newline at end of file +a1d2c54e4a8e85d9240137a157e4a703a24431db \ No newline at end of file