mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'upstream'

Browse Source 
Former-commit-id: b7d1a69fe01c15f90edd42d910d58231f7324ef1
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2019-06-28 09:17:33 +00:00
commit fd5be6f0ce
47 changed files with 66 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.REMOVED.git-id
View File

@ -1 +1 @@
cd60dbc711b07a8165a9e2ceb4971485fc99e4b8
74b9f93bfedcdd2c965b8b0bf314618e8e19d771

2
configure.ac.REMOVED.git-id
View File

@ -1 +1 @@
578c66a0578032c9d0b9458acc537ffacd9ec25f
81afb4f21a9c222ab3e329deb7de7f25e370eca6

2
mcs/build/common/Consts.cs
View File

@ -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";

6
mcs/class/corlib/System/TimeZoneInfo.cs
View File

@ -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;
}
}

22
mcs/class/corlib/Test/System/TimeZoneInfoTest.cs
View File

@ -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
}
}

2
mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
e9cf176ddc549c8d78f2bd1fc467cb1775175fd2
436cd54aa59ef12d83c181f3d1b238e80ae1b43a

2
mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
deb6bb194ee0df2bbb410ceeeffbe909a6e0491c
2e2f5cc4ad8225d1d3874aadeb050777c745bb6f

2
mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id
View File

@ -1 +1 @@
09510fbcabe070401af8e00a2be12196fb3dc466
29329048737e825912df6bbaf196c9078526ba4a

BIN
mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll
View File

Binary file not shown.

2
mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
573517ad47d4e9316b036efe3929d1fb92f16c13
84b9ce2081b922fc053118de1fd3c5a4173bd210

2
mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
20948f52a7247a2c723a1a45d96365024c028f59
add2614210a79ad6cfd0a24b851e17ad1d32ab82

2
mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
e8f94dc5a3876f440bb7d73e25d45fd6ce7c3032
8aa76c71cef9546ca5eb93400f97c92b01ad945a

2
mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
883e2079791d7a692e256df74168b5bcd0f52dcf
7024287df064bbdb438f0b8020401924602f85ac

2
mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
e9cf176ddc549c8d78f2bd1fc467cb1775175fd2
436cd54aa59ef12d83c181f3d1b238e80ae1b43a

2
mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
deb6bb194ee0df2bbb410ceeeffbe909a6e0491c
2e2f5cc4ad8225d1d3874aadeb050777c745bb6f

2
mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id
View File

@ -1 +1 @@
09510fbcabe070401af8e00a2be12196fb3dc466
29329048737e825912df6bbaf196c9078526ba4a

BIN
mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll
View File

Binary file not shown.

2
mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
573517ad47d4e9316b036efe3929d1fb92f16c13
84b9ce2081b922fc053118de1fd3c5a4173bd210

2
mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
20948f52a7247a2c723a1a45d96365024c028f59
add2614210a79ad6cfd0a24b851e17ad1d32ab82

2
mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
e8f94dc5a3876f440bb7d73e25d45fd6ce7c3032
8aa76c71cef9546ca5eb93400f97c92b01ad945a

2
mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
883e2079791d7a692e256df74168b5bcd0f52dcf
7024287df064bbdb438f0b8020401924602f85ac

2
mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
e9cf176ddc549c8d78f2bd1fc467cb1775175fd2
436cd54aa59ef12d83c181f3d1b238e80ae1b43a

2
mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
deb6bb194ee0df2bbb410ceeeffbe909a6e0491c
2e2f5cc4ad8225d1d3874aadeb050777c745bb6f

2
mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id
View File

@ -1 +1 @@
09510fbcabe070401af8e00a2be12196fb3dc466
29329048737e825912df6bbaf196c9078526ba4a

BIN
mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll
View File

Binary file not shown.

2
mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
573517ad47d4e9316b036efe3929d1fb92f16c13
84b9ce2081b922fc053118de1fd3c5a4173bd210

2
mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
20948f52a7247a2c723a1a45d96365024c028f59
add2614210a79ad6cfd0a24b851e17ad1d32ab82

2
mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
e8f94dc5a3876f440bb7d73e25d45fd6ce7c3032
8aa76c71cef9546ca5eb93400f97c92b01ad945a

2
mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
883e2079791d7a692e256df74168b5bcd0f52dcf
7024287df064bbdb438f0b8020401924602f85ac

2
mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
e9cf176ddc549c8d78f2bd1fc467cb1775175fd2
436cd54aa59ef12d83c181f3d1b238e80ae1b43a

2
mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
deb6bb194ee0df2bbb410ceeeffbe909a6e0491c
2e2f5cc4ad8225d1d3874aadeb050777c745bb6f

2
mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id
View File

@ -1 +1 @@
bf65bcca67865d552fac4b702588684e7f29ea98
b368bb771d2c09cf5a249edd98bc950beb42d252

BIN
mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll
View File

Binary file not shown.

2
mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
573517ad47d4e9316b036efe3929d1fb92f16c13
84b9ce2081b922fc053118de1fd3c5a4173bd210

2
mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
20948f52a7247a2c723a1a45d96365024c028f59
add2614210a79ad6cfd0a24b851e17ad1d32ab82

2
mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
e8f94dc5a3876f440bb7d73e25d45fd6ce7c3032
8aa76c71cef9546ca5eb93400f97c92b01ad945a

2
mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
98ce5406f32e8b5ee884076fa13d647a5cef1d41
1e9ff20800b5bec5a8b08756ab3e4798ba3aee39

2
mono/mini/version.h
View File

@ -1 +1 @@
#define FULL_VERSION "explicit/346da98"
#define FULL_VERSION "explicit/e6f5369"

BIN
po/mcs/de.gmo
View File

Binary file not shown.

2
po/mcs/de.po.REMOVED.git-id
View File

@ -1 +1 @@
a89ec654fc134c9afb28590dd2c74092b64d1c32
b8883a770d220c61b699febccf2fb65196bc877b

BIN
po/mcs/es.gmo
View File

Binary file not shown.

2
po/mcs/es.po.REMOVED.git-id
View File

@ -1 +1 @@
a2efff70bccbcac2f08c1329e06a343eeb51e41d
92478994af1acbfb95fd4f7d240a34cab20c6234

BIN
po/mcs/ja.gmo
View File

Binary file not shown.

2
po/mcs/ja.po.REMOVED.git-id
View File

@ -1 +1 @@
e8528396c0d03ac590fd8c58de7ba9f55a6c0df0
f9bc7b782248bada9292d8f4f149b152231f10cb

4
po/mcs/mcs.pot
View File

@ -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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

BIN
po/mcs/pt_BR.gmo
View File

Binary file not shown.

2
po/mcs/pt_BR.po.REMOVED.git-id
View File

@ -1 +1 @@
45044618ef821ffb7acb405168ceeb499898e67a
dde47bb2dcf8b4c9aec32544c63e465595b44961