From 9163dc941bdfda2fffc2fad9883accf6669101b7 Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Fri, 28 Jun 2019 08:52:31 +0000 Subject: [PATCH] Imported Upstream version 6.0.0.310 Former-commit-id: 4920e33be349109f038445814407a4de396c82a8 --- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- mcs/build/common/Consts.cs | 2 +- mcs/class/corlib/System/TimeZoneInfo.cs | 6 +++++ .../corlib/Test/System/TimeZoneInfoTest.cs | 22 ++++++++++++++++++ .../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 +- 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 +- 47 files changed, 66 insertions(+), 38 deletions(-) diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index c2846a4327..3d60c76a78 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -cd60dbc711b07a8165a9e2ceb4971485fc99e4b8 \ No newline at end of file +74b9f93bfedcdd2c965b8b0bf314618e8e19d771 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index 37ac38b66a..37d24cf76a 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -578c66a0578032c9d0b9458acc537ffacd9ec25f \ No newline at end of file +81afb4f21a9c222ab3e329deb7de7f25e370eca6 \ No newline at end of file diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 3c0eeeac3f..09f48c9755 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.0.0.309"; + public const string MonoVersion = "6.0.0.310"; 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/System/TimeZoneInfo.cs b/mcs/class/corlib/System/TimeZoneInfo.cs index 5f9cba0074..72ad64ad3f 100644 --- a/mcs/class/corlib/System/TimeZoneInfo.cs +++ b/mcs/class/corlib/System/TimeZoneInfo.cs @@ -1236,6 +1236,12 @@ namespace System isDst = true; } + if (date >= new DateTime (tEnd.Ticks - current.DaylightDelta.Ticks, DateTimeKind.Utc)) + { + offset = baseUtcOffset; + isDst = false; + } + return true; } } diff --git a/mcs/class/corlib/Test/System/TimeZoneInfoTest.cs b/mcs/class/corlib/Test/System/TimeZoneInfoTest.cs index 51159cc8f7..9f7340d3d1 100644 --- a/mcs/class/corlib/Test/System/TimeZoneInfoTest.cs +++ b/mcs/class/corlib/Test/System/TimeZoneInfoTest.cs @@ -72,6 +72,10 @@ namespace MonoTests.System return "W. Europe Standard Time"; case "Canada/Eastern": return "Eastern Standard Time"; + case "Asia/Tehran": + return "Iran Standard Time"; + case "Europe/Guernsey": + return "GMT Standard Time"; default: Assert.Fail ($"No mapping defined for zone id '{id}'"); return null; @@ -459,6 +463,24 @@ namespace MonoTests.System date = new DateTime (2019, 3, 10, 3, 0, 0); Assert.IsTrue (tzi.IsDaylightSavingTime (date)); Assert.AreEqual (new TimeSpan (-5, 0, 0), tzi.GetUtcOffset (date)); + +#if !WINAOT // https://github.com/mono/mono/issues/15439 + tzi = TimeZoneInfo.FindSystemTimeZoneById (MapTimeZoneId ("Europe/Vatican")); + date = new DateTime (2018, 10, 28, 2, 15, 0); + Assert.IsFalse (tzi.IsDaylightSavingTime (date)); + Assert.AreEqual (new TimeSpan (1, 0, 0), tzi.GetUtcOffset (date)); + + tzi = TimeZoneInfo.FindSystemTimeZoneById (MapTimeZoneId ("Asia/Tehran")); + date = new DateTime (2018, 9, 21, 23, 15, 0); + Assert.IsFalse (tzi.IsDaylightSavingTime (date)); + Assert.AreEqual (new TimeSpan (3, 30, 0), tzi.GetUtcOffset (date)); + + // for Greenwitch Mean Time (Guernsey) + tzi = TimeZoneInfo.FindSystemTimeZoneById (MapTimeZoneId ("Europe/Guernsey")); + date = new DateTime (2019, 10, 27, 1, 15, 0); + Assert.IsFalse (tzi.IsDaylightSavingTime (date)); + Assert.AreEqual (new TimeSpan (0, 0, 0), tzi.GetUtcOffset (date)); +#endif } } diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id index 3406561bb8..0eaaf80e32 100644 --- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -e9cf176ddc549c8d78f2bd1fc467cb1775175fd2 \ No newline at end of file +436cd54aa59ef12d83c181f3d1b238e80ae1b43a \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id index e2b164d8ab..6ff28b86be 100644 --- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -deb6bb194ee0df2bbb410ceeeffbe909a6e0491c \ No newline at end of file +2e2f5cc4ad8225d1d3874aadeb050777c745bb6f \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id index 9a7d9b9d4d..beb23b56bf 100644 --- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -09510fbcabe070401af8e00a2be12196fb3dc466 \ No newline at end of file +29329048737e825912df6bbaf196c9078526ba4a \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll index ff99781d1387786db7cb901ac4c0cba9f74e4a2e..9f85ee12586cfcbc1482946ec181974b4e2ad80d 100644 GIT binary patch delta 60 zcmV-C0K@-)hz5X&29SsZ1T8$QfsD0`0W1s=p_J7FLEPoB7oXv;biy2MquK delta 22 dcmeyri1Gg-#tj_m>_!R(7FGt9oB7oXv;biB2MYiI diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index 5827b04a90..9b2fdb6f49 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -e8528396c0d03ac590fd8c58de7ba9f55a6c0df0 \ No newline at end of file +f9bc7b782248bada9292d8f4f149b152231f10cb \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index 4ccd35ffdf..896e9b77d2 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mono 6.0.0.309\n" +"Project-Id-Version: mono 6.0.0.310\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2019-06-22 08:09+0000\n" +"POT-Creation-Date: 2019-06-28 08:14+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 2826a82a2b0d45e8faf1d23629d2275c1b5a7e6c..7434d2efc585da56ebd70fc22d9e323986ebc4d5 100644 GIT binary patch delta 22 ecmaF1gXP%{mJM-J*)0?dEUXMoHm6QyYzF{t9SDN} delta 22 ecmaF1gXP%{mJM-J*^LwoEUXMHH>XZzYzF{s>