Merge branch 'upstream'
Former-commit-id: a831fab306fd071c710d72e82aa20b049be48703
This commit is contained in:
commit
04eafdf5b0
@ -1 +1 @@
|
||||
c1c4180bcf0d7dbd1d0c854948b7b57e88437d3e
|
||||
7b0af47166406354079db8b2928ad165a5967c95
|
@ -1 +1 @@
|
||||
875e956a9948f7a01d1d037a18e75e92d31b02ed
|
||||
0cbae372497b7af607d0bee6168c3a347db63458
|
1
external/bockbuild/packages/gtk-sharp.py
vendored
1
external/bockbuild/packages/gtk-sharp.py
vendored
@ -9,6 +9,5 @@ class GtkSharp212ReleasePackage (Package):
|
||||
'configure': './bootstrap-2.12 --prefix=%{package_prefix}',
|
||||
}
|
||||
)
|
||||
self.make = 'make CSC=mcs'
|
||||
|
||||
GtkSharp212ReleasePackage()
|
||||
|
@ -427,7 +427,7 @@ index bcbb173..4234bf1 100644
|
||||
|
||||
fontset = g_hash_table_lookup (ctfontmap->fontset_hash, &key);
|
||||
if (G_LIKELY (fontset))
|
||||
@@ -1450,6 +1430,53 @@ pango_core_text_font_map_init (PangoCoreTextFontMap *ctfontmap)
|
||||
@@ -1450,6 +1430,52 @@ pango_core_text_font_map_init (PangoCoreTextFontMap *ctfontmap)
|
||||
CFRelease (dict);
|
||||
}
|
||||
|
||||
@ -438,7 +438,6 @@ index bcbb173..4234bf1 100644
|
||||
+
|
||||
+ NSArray *fontfaces = [[NSFontManager sharedFontManager] availableMembersOfFontFamily: name];
|
||||
+ int num_faces = [fontfaces count];
|
||||
+ CFRelease (name);
|
||||
+
|
||||
+ for (int faceindex = 0; faceindex < num_faces; faceindex++)
|
||||
+ {
|
||||
|
@ -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.97";
|
||||
public const string MonoVersion = "6.6.0.99";
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
|
@ -1216,10 +1216,13 @@ namespace System
|
||||
return false;
|
||||
}
|
||||
|
||||
var isUtc = false;
|
||||
if (dateTime.Kind != DateTimeKind.Utc) {
|
||||
if (!TryAddTicks (date, -BaseUtcOffset.Ticks, out date, DateTimeKind.Utc))
|
||||
return false;
|
||||
}
|
||||
} else
|
||||
isUtc = true;
|
||||
|
||||
|
||||
AdjustmentRule current = GetApplicableRule (date);
|
||||
if (current != null) {
|
||||
@ -1231,7 +1234,7 @@ namespace System
|
||||
if (forOffset)
|
||||
isDst = true;
|
||||
offset = baseUtcOffset;
|
||||
if (date >= new DateTime (tStart.Ticks + current.DaylightDelta.Ticks, DateTimeKind.Utc))
|
||||
if (isUtc || (date >= new DateTime (tStart.Ticks + current.DaylightDelta.Ticks, DateTimeKind.Utc)))
|
||||
{
|
||||
offset += current.DaylightDelta;
|
||||
isDst = true;
|
||||
|
@ -54,8 +54,11 @@ namespace MonoTests.System
|
||||
return "New Zealand Standard Time";
|
||||
case "Europe/Athens":
|
||||
return "GTB Standard Time";
|
||||
case "Europe/Chisinau":
|
||||
return "E. Europe Standard Time";
|
||||
case "US/Eastern":
|
||||
return "Eastern Standard Time";
|
||||
case "America/Chicago":
|
||||
case "US/Central":
|
||||
return "Central Standard Time";
|
||||
case "US/Pacific":
|
||||
@ -64,18 +67,57 @@ namespace MonoTests.System
|
||||
case "Australia/Melbourne":
|
||||
return "AUS Eastern Standard Time";
|
||||
case "Europe/Brussels":
|
||||
case "Europe/Copenhagen":
|
||||
case "Europe/Paris":
|
||||
case "Europe/Madrid":
|
||||
return "Romance Standard Time";
|
||||
case "Africa/Kinshasa":
|
||||
return "W. Central Africa Standard Time";
|
||||
case "Europe/Rome":
|
||||
case "Europe/Vatican":
|
||||
case "Europe/Vienna":
|
||||
case "Europe/Berlin":
|
||||
case "Europe/Luxembourg":
|
||||
case "Europe/Malta":
|
||||
case "Europe/Monaco":
|
||||
case "Europe/Amsterdam":
|
||||
case "Europe/Oslo":
|
||||
case "Europe/San_Marino":
|
||||
return "W. Europe Standard Time";
|
||||
case "Canada/Eastern":
|
||||
return "Eastern Standard Time";
|
||||
case "Asia/Tehran":
|
||||
return "Iran Standard Time";
|
||||
case "Europe/Guernsey":
|
||||
case "Europe/Dublin":
|
||||
case "Europe/Isle_of_Man":
|
||||
case "Europe/Jersey":
|
||||
case "Europe/Lisbon":
|
||||
case "Europe/London":
|
||||
return "GMT Standard Time";
|
||||
case "America/Havana":
|
||||
return "Cuba Standard Time";
|
||||
case "America/Anchorage":
|
||||
return "Alaskan Standard Time";
|
||||
case "Atlantic/Azores":
|
||||
return "Azores Standard Time";
|
||||
case "Asia/Jerusalem":
|
||||
return "Israel Standard Time";
|
||||
case "Asia/Amman":
|
||||
return "Jordan Standard Time";
|
||||
case "Europe/Tirane":
|
||||
case "Europe/Warsaw":
|
||||
return "Central European Standard Time";
|
||||
case "Europe/Sofia":
|
||||
case "Europe/Tallinn":
|
||||
case "Europe/Riga":
|
||||
case "Europe/Vilnius":
|
||||
case "Europe/Kiev":
|
||||
return "FLE Standard Time";
|
||||
case "Europe/Prague":
|
||||
case "Europe/Budapest":
|
||||
case "Europe/Bratislava":
|
||||
return "Central Europe Standard Time";
|
||||
default:
|
||||
Assert.Fail ($"No mapping defined for zone id '{id}'");
|
||||
return null;
|
||||
@ -482,6 +524,218 @@ namespace MonoTests.System
|
||||
Assert.AreEqual (new TimeSpan (0, 0, 0), tzi.GetUtcOffset (date));
|
||||
#endif
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Bug_16395 ()
|
||||
{
|
||||
// Cuba, Havana (Cuba Standard Time): Jumps ahead at 12:00 AM on 3/8/2020 to 1:00 AM
|
||||
CheckJumpingIntoDST ("America/Havana",
|
||||
new DateTime (2020, 3, 8, 0, 0, 0), new DateTime (2020, 3, 8, 0, 30, 0), new DateTime (2020, 3, 8, 1, 0, 0),
|
||||
new TimeSpan (-5, 0, 0), new TimeSpan (-4, 0, 0));
|
||||
|
||||
// US, Kansas City, MO (US Central Time): Jumps ahead at 2:00 AM on 3/8/2020 to 3:00 AM
|
||||
CheckJumpingIntoDST ("America/Chicago",
|
||||
new DateTime (2020, 3, 8, 2, 0, 0), new DateTime (2020, 3, 8, 2, 30, 0), new DateTime (2020, 3, 8, 3, 0, 0),
|
||||
new TimeSpan (-6, 0, 0), new TimeSpan (-5, 0, 0));
|
||||
|
||||
// Anchorage, AK (Alaska Time): Jumps ahead at 2:00 AM on 3/8/2020 to 3:00 AM
|
||||
CheckJumpingIntoDST ("America/Anchorage",
|
||||
new DateTime (2020, 3, 8, 2, 0, 0), new DateTime (2020, 3, 8, 2, 30, 0), new DateTime (2020, 3, 8, 3, 0, 0),
|
||||
new TimeSpan (-9, 0, 0), new TimeSpan (-8, 0, 0));
|
||||
|
||||
// Azores ST (Ponta Delgada, Portugal): Jumps ahead at 12:00 AM on 3/29/2020 to 1:00 AM
|
||||
CheckJumpingIntoDST ("Atlantic/Azores",
|
||||
new DateTime (2020, 3, 29, 0, 0, 0), new DateTime (2020, 3, 29, 0, 30, 0), new DateTime (2020, 3, 29, 1, 0, 0),
|
||||
new TimeSpan (-1, 0, 0), new TimeSpan (0, 0, 0));
|
||||
|
||||
// Iran, Tehran (Iran ST): Jumps ahead at 12:00 AM on 3/21/2020 to 1:00 AM
|
||||
CheckJumpingIntoDST ("Asia/Tehran",
|
||||
new DateTime (2020, 3, 21, 0, 0, 0), new DateTime (2020, 3, 21, 0, 30, 0), new DateTime (2020, 3, 21, 1, 0, 0),
|
||||
new TimeSpan (3, 30, 0), new TimeSpan (4, 30, 0));
|
||||
|
||||
// Israel, Jerusalem (Israel ST): Jumps ahead at 2:00 AM on 3/27/2020 to 3:00 AM
|
||||
CheckJumpingIntoDST ("Asia/Jerusalem",
|
||||
new DateTime (2020, 3, 27, 2, 0, 0), new DateTime (2020, 3, 27, 2, 30, 0), new DateTime (2020, 3, 27, 3, 0, 0),
|
||||
new TimeSpan (2, 0, 0), new TimeSpan (3, 0, 0));
|
||||
|
||||
// Jordan, Amman (Eastern European ST): Jumps ahead at 12:00 AM on 3/27/2020 to 1:00 AM
|
||||
CheckJumpingIntoDST ("Asia/Amman",
|
||||
new DateTime (2020, 3, 27, 0, 0, 0), new DateTime (2020, 3, 27, 0, 30, 0), new DateTime (2020, 3, 27, 1, 0, 0),
|
||||
new TimeSpan (2, 0, 0), new TimeSpan (3, 0, 0));
|
||||
|
||||
// Albania, Tirana (Central European ST): Jumps ahead at 2:00 AM on 3/29/2020 to 3:00 AM
|
||||
CheckJumpingIntoDST ("Europe/Tirane",
|
||||
new DateTime (2020, 3, 29, 2, 0, 0), new DateTime (2020, 3, 29, 2, 30, 0), new DateTime (2020, 3, 29, 3, 0, 0),
|
||||
new TimeSpan (1, 0, 0), new TimeSpan (2, 0, 0));
|
||||
|
||||
// Austria, Vienna (Central European ST): Jumps ahead at 2:00 AM on 3/29/2020 to 3:00 AM
|
||||
CheckJumpingIntoDST ("Europe/Vienna",
|
||||
new DateTime (2020, 3, 29, 2, 0, 0), new DateTime (2020, 3, 29, 2, 30, 0), new DateTime (2020, 3, 29, 3, 0, 0),
|
||||
new TimeSpan (1, 0, 0), new TimeSpan (2, 0, 0));
|
||||
|
||||
// Belgium, Brussels (Central European ST): Jumps ahead at 2:00 AM on 3/29/2020 to 3:00 AM
|
||||
CheckJumpingIntoDST ("Europe/Brussels",
|
||||
new DateTime (2020, 3, 29, 2, 0, 0), new DateTime (2020, 3, 29, 2, 30, 0), new DateTime (2020, 3, 29, 3, 0, 0),
|
||||
new TimeSpan (1, 0, 0), new TimeSpan (2, 0, 0));
|
||||
|
||||
// Bulgaria, Sofia (Eastern European ST): Jumps ahead at 3:00 AM on 3/29/2020 to 4:00 AM
|
||||
CheckJumpingIntoDST ("Europe/Sofia",
|
||||
new DateTime (2020, 3, 29, 3, 0, 0), new DateTime (2020, 3, 29, 3, 30, 0), new DateTime (2020, 3, 29, 4, 0, 0),
|
||||
new TimeSpan (2, 0, 0), new TimeSpan (3, 0, 0));
|
||||
|
||||
// Czechia, Prague (Central European ST): Jumps ahead at 2:00 AM on 3/29/2020 to 3:00 AM
|
||||
CheckJumpingIntoDST ("Europe/Prague",
|
||||
new DateTime (2020, 3, 29, 2, 0, 0), new DateTime (2020, 3, 29, 2, 30, 0), new DateTime (2020, 3, 29, 3, 0, 0),
|
||||
new TimeSpan (1, 0, 0), new TimeSpan (2, 0, 0));
|
||||
|
||||
// Denmark, Copenhagen (Central European ST): Jumps ahead at 2:00 AM on 3/29/2020 to 3:00 AM
|
||||
CheckJumpingIntoDST ("Europe/Copenhagen",
|
||||
new DateTime (2020, 3, 29, 2, 0, 0), new DateTime (2020, 3, 29, 2, 30, 0), new DateTime (2020, 3, 29, 3, 0, 0),
|
||||
new TimeSpan (1, 0, 0), new TimeSpan (2, 0, 0));
|
||||
|
||||
// Estonia, Tallinn (Eastern European ST): Jumps ahead at 3:00 AM on 3/29/2020 to 4:00 AM
|
||||
CheckJumpingIntoDST ("Europe/Tallinn",
|
||||
new DateTime (2020, 3, 29, 3, 0, 0), new DateTime (2020, 3, 29, 3, 30, 0), new DateTime (2020, 3, 29, 4, 0, 0),
|
||||
new TimeSpan (2, 0, 0), new TimeSpan (3, 0, 0));
|
||||
|
||||
// France, Paris (Central European ST): Jumps ahead at 2:00 AM on 3/29/2020 to 3:00 AM
|
||||
CheckJumpingIntoDST ("Europe/Paris",
|
||||
new DateTime (2020, 3, 29, 2, 0, 0), new DateTime (2020, 3, 29, 2, 30, 0), new DateTime (2020, 3, 29, 3, 0, 0),
|
||||
new TimeSpan (1, 0, 0), new TimeSpan (2, 0, 0));
|
||||
|
||||
// Germany, Berlin (Central European ST): Jumps ahead at 2:00 AM on 3/29/2020 to 3:00 AM
|
||||
CheckJumpingIntoDST ("Europe/Berlin",
|
||||
new DateTime (2020, 3, 29, 2, 0, 0), new DateTime (2020, 3, 29, 2, 30, 0), new DateTime (2020, 3, 29, 3, 0, 0),
|
||||
new TimeSpan (1, 0, 0), new TimeSpan (2, 0, 0));
|
||||
|
||||
// Greece, Athens (Eastern European ST): Jumps ahead at 3:00 AM on 3/29/2020 to 4:00 AM
|
||||
CheckJumpingIntoDST ("Europe/Athens",
|
||||
new DateTime (2020, 3, 29, 3, 0, 0), new DateTime (2020, 3, 29, 3, 30, 0), new DateTime (2020, 3, 29, 4, 0, 0),
|
||||
new TimeSpan (2, 0, 0), new TimeSpan (3, 0, 0));
|
||||
|
||||
// Guernsey (UK) Jumps ahead at 1:00 AM on 3/29/2020 to 2:00 AM
|
||||
CheckJumpingIntoDST ("Europe/Guernsey",
|
||||
new DateTime (2020, 3, 29, 1, 0, 0), new DateTime (2020, 3, 29, 1, 30, 0), new DateTime (2020, 3, 29, 2, 0, 0),
|
||||
new TimeSpan (0, 0, 0), new TimeSpan (1, 0, 0));
|
||||
|
||||
// Holy See, Vatican City (Central European ST): Jumps ahead at 2:00 AM on 3/29/2020 to 3:00 AM
|
||||
CheckJumpingIntoDST ("Europe/Vatican",
|
||||
new DateTime (2020, 3, 29, 2, 0, 0), new DateTime (2020, 3, 29, 2, 30, 0), new DateTime (2020, 3, 29, 3, 0, 0),
|
||||
new TimeSpan (1, 0, 0), new TimeSpan (2, 0, 0));
|
||||
|
||||
// Hungary, Budapest (Central European ST): Jumps ahead at 2:00 AM on 3/29/2020 to 3:00 AM
|
||||
CheckJumpingIntoDST ("Europe/Budapest",
|
||||
new DateTime (2020, 3, 29, 2, 0, 0), new DateTime (2020, 3, 29, 2, 30, 0), new DateTime (2020, 3, 29, 3, 0, 0),
|
||||
new TimeSpan (1, 0, 0), new TimeSpan (2, 0, 0));
|
||||
|
||||
// // Ireland, Dublin (Greenwich Mean Time -> Irish Standard Time): Jumps ahead at 1:00 AM on 3/29/2020 to 2:00 AM
|
||||
// CheckJumpingIntoDST ("Europe/Dublin",
|
||||
// new DateTime (2020, 3, 29, 1, 0, 0), new DateTime (2020, 3, 29, 1, 30, 0), new DateTime (2020, 3, 29, 2, 0, 0),
|
||||
// new TimeSpan (0, 0, 0), new TimeSpan (1, 0, 0));
|
||||
|
||||
// UK, Douglas, Isle of Man (GMT+1:00): Jumps ahead at 1:00 AM on 3/29/2020 to 2:00 AM
|
||||
CheckJumpingIntoDST ("Europe/Isle_of_Man",
|
||||
new DateTime (2020, 3, 29, 1, 0, 0), new DateTime (2020, 3, 29, 1, 30, 0), new DateTime (2020, 3, 29, 2, 0, 0),
|
||||
new TimeSpan (0, 0, 0), new TimeSpan (1, 0, 0));
|
||||
|
||||
// Italy, Rome (Central European ST): Jumps ahead at 2:00 AM on 3/29/2020 to 3:00 AM
|
||||
CheckJumpingIntoDST ("Europe/Rome",
|
||||
new DateTime (2020, 3, 29, 2, 0, 0), new DateTime (2020, 3, 29, 2, 30, 0), new DateTime (2020, 3, 29, 3, 0, 0),
|
||||
new TimeSpan (1, 0, 0), new TimeSpan (2, 0, 0));
|
||||
|
||||
// Jersey (UK): Jumps ahead at 1:00 AM on 3/29/2020 to 2:00 AM
|
||||
CheckJumpingIntoDST ("Europe/Jersey",
|
||||
new DateTime (2020, 3, 29, 1, 0, 0), new DateTime (2020, 3, 29, 1, 30, 0), new DateTime (2020, 3, 29, 2, 0, 0),
|
||||
new TimeSpan (0, 0, 0), new TimeSpan (1, 0, 0));
|
||||
|
||||
// Latvia, Riga (Eastern European ST): Jumps ahead at 3:00 AM on 3/29/2020 to 4:00 AM
|
||||
CheckJumpingIntoDST ("Europe/Riga",
|
||||
new DateTime (2020, 3, 29, 3, 0, 0), new DateTime (2020, 3, 29, 3, 30, 0), new DateTime (2020, 3, 29, 4, 0, 0),
|
||||
new TimeSpan (2, 0, 0), new TimeSpan (3, 0, 0));
|
||||
|
||||
// Lithuania, Vilnius (Eastern European ST): Jumps ahead at 3:00 AM on 3/29/2020 to 4:00 AM
|
||||
CheckJumpingIntoDST ("Europe/Vilnius",
|
||||
new DateTime (2020, 3, 29, 3, 0, 0), new DateTime (2020, 3, 29, 3, 30, 0), new DateTime (2020, 3, 29, 4, 0, 0),
|
||||
new TimeSpan (2, 0, 0), new TimeSpan (3, 0, 0));
|
||||
|
||||
// Luxembourg, Luxembourg (Central European ST): Jumps ahead at 2:00 AM on 3/29/2020 to 3:00 AM
|
||||
CheckJumpingIntoDST ("Europe/Luxembourg",
|
||||
new DateTime (2020, 3, 29, 2, 0, 0), new DateTime (2020, 3, 29, 2, 30, 0), new DateTime (2020, 3, 29, 3, 0, 0),
|
||||
new TimeSpan (1, 0, 0), new TimeSpan (2, 0, 0));
|
||||
|
||||
// Malta, Valletta (Central European ST): Jumps ahead at 2:00 AM on 3/29/2020 to 3:00 AM
|
||||
CheckJumpingIntoDST ("Europe/Malta",
|
||||
new DateTime (2020, 3, 29, 2, 0, 0), new DateTime (2020, 3, 29, 2, 30, 0), new DateTime (2020, 3, 29, 3, 0, 0),
|
||||
new TimeSpan (1, 0, 0), new TimeSpan (2, 0, 0));
|
||||
|
||||
// Moldova, Chişinău (Eastern European ST): Jumps ahead at 2:00 AM on 3/29/2020 to 3:00 AM
|
||||
CheckJumpingIntoDST ("Europe/Chisinau",
|
||||
new DateTime (2020, 3, 29, 2, 0, 0), new DateTime (2020, 3, 29, 2, 30, 0), new DateTime (2020, 3, 29, 3, 0, 0),
|
||||
new TimeSpan (2, 0, 0), new TimeSpan (3, 0, 0));
|
||||
|
||||
// Monaco, Monaco (Central European ST): Jumps ahead at 2:00 AM on 3/29/2020 to 3:00 AM
|
||||
CheckJumpingIntoDST ("Europe/Monaco",
|
||||
new DateTime (2020, 3, 29, 2, 0, 0), new DateTime (2020, 3, 29, 2, 30, 0), new DateTime (2020, 3, 29, 3, 0, 0),
|
||||
new TimeSpan (1, 0, 0), new TimeSpan (2, 0, 0));
|
||||
|
||||
// Netherlands, Amsterdam (Central European ST): Jumps ahead at 2:00 AM on 3/29/2020 to 3:00 AM
|
||||
CheckJumpingIntoDST ("Europe/Amsterdam",
|
||||
new DateTime (2020, 3, 29, 2, 0, 0), new DateTime (2020, 3, 29, 2, 30, 0), new DateTime (2020, 3, 29, 3, 0, 0),
|
||||
new TimeSpan (1, 0, 0), new TimeSpan (2, 0, 0));
|
||||
|
||||
// Norway, Oslo (Central European ST): Jumps ahead at 2:00 AM on 3/29/2020 to 3:00 AM
|
||||
CheckJumpingIntoDST ("Europe/Oslo",
|
||||
new DateTime (2020, 3, 29, 2, 0, 0), new DateTime (2020, 3, 29, 2, 30, 0), new DateTime (2020, 3, 29, 3, 0, 0),
|
||||
new TimeSpan (1, 0, 0), new TimeSpan (2, 0, 0));
|
||||
|
||||
// Poland, Warsaw (Central European ST): Jumps ahead at 2:00 AM on 3/29/2020 to 3:00 AM
|
||||
CheckJumpingIntoDST ("Europe/Warsaw",
|
||||
new DateTime (2020, 3, 29, 2, 0, 0), new DateTime (2020, 3, 29, 2, 30, 0), new DateTime (2020, 3, 29, 3, 0, 0),
|
||||
new TimeSpan (1, 0, 0), new TimeSpan (2, 0, 0));
|
||||
|
||||
// Portugal, Lisbon (Western European ST): Jumps ahead at 1:00 AM on 3/29/2020 to 2:00 AM
|
||||
CheckJumpingIntoDST ("Europe/Lisbon",
|
||||
new DateTime (2020, 3, 29, 1, 0, 0), new DateTime (2020, 3, 29, 1, 30, 0), new DateTime (2020, 3, 29, 2, 0, 0),
|
||||
new TimeSpan (0, 0, 0), new TimeSpan (1, 0, 0));
|
||||
|
||||
// San Marino, San Marino (Central European ST): Jumps ahead at 2:00 AM on 3/29/2020 to 3:00 AM
|
||||
CheckJumpingIntoDST ("Europe/San_Marino",
|
||||
new DateTime (2020, 3, 29, 2, 0, 0), new DateTime (2020, 3, 29, 2, 30, 0), new DateTime (2020, 3, 29, 3, 0, 0),
|
||||
new TimeSpan (1, 0, 0), new TimeSpan (2, 0, 0));
|
||||
|
||||
// Slovakia, Bratislava (Central European ST): Jumps ahead at 2:00 AM on 3/29/2020 to 3:00 AM
|
||||
CheckJumpingIntoDST ("Europe/Bratislava",
|
||||
new DateTime (2020, 3, 29, 2, 0, 0), new DateTime (2020, 3, 29, 2, 30, 0), new DateTime (2020, 3, 29, 3, 0, 0),
|
||||
new TimeSpan (1, 0, 0), new TimeSpan (2, 0, 0));
|
||||
|
||||
// Spain, Madrid (Central European ST): Jumps ahead at 2:00 AM on 3/29/2020 to 3:00 AM
|
||||
CheckJumpingIntoDST ("Europe/Madrid",
|
||||
new DateTime (2020, 3, 29, 2, 0, 0), new DateTime (2020, 3, 29, 2, 30, 0), new DateTime (2020, 3, 29, 3, 0, 0),
|
||||
new TimeSpan (1, 0, 0), new TimeSpan (2, 0, 0));
|
||||
|
||||
// Ukraine, Kiev (Eastern European ST): Jumps ahead at 3:00 AM on 3/29/2020 to 4:00 AM
|
||||
CheckJumpingIntoDST ("Europe/Kiev",
|
||||
new DateTime (2020, 3, 29, 3, 0, 0), new DateTime (2020, 3, 29, 3, 30, 0), new DateTime (2020, 3, 29, 4, 0, 0),
|
||||
new TimeSpan (2, 0, 0), new TimeSpan (3, 0, 0));
|
||||
|
||||
// United Kingdom, London (British ST): Jumps ahead at 1:00 AM on 3/29/2020 to 2:00 AM
|
||||
CheckJumpingIntoDST ("Europe/London",
|
||||
new DateTime (2020, 3, 29, 1, 0, 0), new DateTime (2020, 3, 29, 1, 30, 0), new DateTime (2020, 3, 29, 2, 0, 0),
|
||||
new TimeSpan (0, 0, 0), new TimeSpan (1, 0, 0));
|
||||
}
|
||||
|
||||
void CheckJumpingIntoDST (string tzId, DateTime dstDeltaStart, DateTime inDstDelta, DateTime dstDeltaEnd, TimeSpan baseOffset, TimeSpan dstOffset)
|
||||
{
|
||||
var tzi = TimeZoneInfo.FindSystemTimeZoneById (MapTimeZoneId (tzId));
|
||||
Assert.IsFalse (tzi.IsDaylightSavingTime (dstDeltaStart), $"{tzId}: #1");
|
||||
Assert.AreEqual (baseOffset, tzi.GetUtcOffset (dstDeltaStart), $"{tzId}: #2");
|
||||
|
||||
Assert.IsFalse (tzi.IsDaylightSavingTime (inDstDelta), $"{tzId}: #3");
|
||||
Assert.AreEqual (baseOffset, tzi.GetUtcOffset (inDstDelta), $"{tzId}: #4");
|
||||
|
||||
Assert.IsTrue (tzi.IsDaylightSavingTime (dstDeltaEnd), $"{tzId}: #5");
|
||||
Assert.AreEqual (dstOffset, tzi.GetUtcOffset (dstDeltaEnd), $"{tzId}: #6");
|
||||
}
|
||||
}
|
||||
|
||||
[TestFixture]
|
||||
|
@ -1 +1 @@
|
||||
edc1389c07394c14b27e463871b22b1561937374
|
||||
110bd10827b6c5c1c0c3639f7642d1beea638b77
|
@ -1 +1 @@
|
||||
4ff2e299148bc180e72ad19f5adfddb59f8968ac
|
||||
5bc72b980e3461ec2ad7504d85dcc559b62dfdda
|
@ -1 +1 @@
|
||||
29a1fbbf19d42d96405d39a21f1513237b134c2f
|
||||
69bf31bb2dc5b9f3fb9f298cf7f6f7e2124dfd74
|
@ -1 +1 @@
|
||||
59d20293264f996016a6966494e42c88ded3d2f0
|
||||
efd5259d8efefb41ecdb2ff2b4dfc7b8e0cd252a
|
@ -1 +1 @@
|
||||
2407bcaadeea1315459f2dcc9f409c43878239e6
|
||||
e47863ea4f12cc73cb298198cdf5aa2f70f4d95c
|
@ -1 +1 @@
|
||||
02111185a37ca5018aba384763d2dae87428e1bc
|
||||
1d6a0e4a36b89cff13bd2c205f095ca7d5ff1dcc
|
@ -1 +1 @@
|
||||
7367be6e5163b9fc3bacb712cdc3874535ce373a
|
||||
cfec3ef01184edb4742249953cb14917be2b85a1
|
@ -1 +1 @@
|
||||
edc1389c07394c14b27e463871b22b1561937374
|
||||
110bd10827b6c5c1c0c3639f7642d1beea638b77
|
@ -1 +1 @@
|
||||
4ff2e299148bc180e72ad19f5adfddb59f8968ac
|
||||
5bc72b980e3461ec2ad7504d85dcc559b62dfdda
|
@ -1 +1 @@
|
||||
29a1fbbf19d42d96405d39a21f1513237b134c2f
|
||||
69bf31bb2dc5b9f3fb9f298cf7f6f7e2124dfd74
|
@ -1 +1 @@
|
||||
59d20293264f996016a6966494e42c88ded3d2f0
|
||||
efd5259d8efefb41ecdb2ff2b4dfc7b8e0cd252a
|
@ -1 +1 @@
|
||||
2407bcaadeea1315459f2dcc9f409c43878239e6
|
||||
e47863ea4f12cc73cb298198cdf5aa2f70f4d95c
|
@ -1 +1 @@
|
||||
02111185a37ca5018aba384763d2dae87428e1bc
|
||||
1d6a0e4a36b89cff13bd2c205f095ca7d5ff1dcc
|
@ -1 +1 @@
|
||||
fe56122f136d473f918fc364b67d415599c5ef19
|
||||
dea65471e5d0b03efbda9a345ea08d6f6601acb2
|
@ -1 +1 @@
|
||||
7367be6e5163b9fc3bacb712cdc3874535ce373a
|
||||
cfec3ef01184edb4742249953cb14917be2b85a1
|
@ -1 +1 @@
|
||||
edc1389c07394c14b27e463871b22b1561937374
|
||||
110bd10827b6c5c1c0c3639f7642d1beea638b77
|
@ -1 +1 @@
|
||||
4ff2e299148bc180e72ad19f5adfddb59f8968ac
|
||||
5bc72b980e3461ec2ad7504d85dcc559b62dfdda
|
@ -1 +1 @@
|
||||
29a1fbbf19d42d96405d39a21f1513237b134c2f
|
||||
69bf31bb2dc5b9f3fb9f298cf7f6f7e2124dfd74
|
@ -1 +1 @@
|
||||
59d20293264f996016a6966494e42c88ded3d2f0
|
||||
efd5259d8efefb41ecdb2ff2b4dfc7b8e0cd252a
|
@ -1 +1 @@
|
||||
2407bcaadeea1315459f2dcc9f409c43878239e6
|
||||
e47863ea4f12cc73cb298198cdf5aa2f70f4d95c
|
@ -1 +1 @@
|
||||
02111185a37ca5018aba384763d2dae87428e1bc
|
||||
1d6a0e4a36b89cff13bd2c205f095ca7d5ff1dcc
|
@ -1 +1 @@
|
||||
fe56122f136d473f918fc364b67d415599c5ef19
|
||||
dea65471e5d0b03efbda9a345ea08d6f6601acb2
|
@ -1 +1 @@
|
||||
7367be6e5163b9fc3bacb712cdc3874535ce373a
|
||||
cfec3ef01184edb4742249953cb14917be2b85a1
|
@ -1 +1 @@
|
||||
edc1389c07394c14b27e463871b22b1561937374
|
||||
110bd10827b6c5c1c0c3639f7642d1beea638b77
|
@ -1 +1 @@
|
||||
4ff2e299148bc180e72ad19f5adfddb59f8968ac
|
||||
5bc72b980e3461ec2ad7504d85dcc559b62dfdda
|
@ -1 +1 @@
|
||||
1dd0fe1ec96f67481278bd2e0eaa6afe2f20043e
|
||||
ec189eed4c94bf7019dc11edfe3808a4fa7e79e4
|
@ -1 +1 @@
|
||||
59d20293264f996016a6966494e42c88ded3d2f0
|
||||
efd5259d8efefb41ecdb2ff2b4dfc7b8e0cd252a
|
@ -1 +1 @@
|
||||
2407bcaadeea1315459f2dcc9f409c43878239e6
|
||||
e47863ea4f12cc73cb298198cdf5aa2f70f4d95c
|
@ -1 +1 @@
|
||||
02111185a37ca5018aba384763d2dae87428e1bc
|
||||
1d6a0e4a36b89cff13bd2c205f095ca7d5ff1dcc
|
@ -1 +1 @@
|
||||
fe56122f136d473f918fc364b67d415599c5ef19
|
||||
dea65471e5d0b03efbda9a345ea08d6f6601acb2
|
@ -1 +1 @@
|
||||
c1d6d365f014df7509c75839511a94e3f9ccfc70
|
||||
809c683af8af8b9a3584e196259fcee3eaeede98
|
@ -1 +1 @@
|
||||
#define FULL_VERSION "explicit/af008b2"
|
||||
#define FULL_VERSION "explicit/c99adb9"
|
||||
|
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
264bda96fa3234e217568c2650004f02a3997af7
|
||||
d42ba1bec1d8c811ce7daf126822bf801ba26ace
|
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
90c129805db0ea6c9038a6877c0641359066791c
|
||||
f744fd4737c003096656c35ac83ab537fe59adfb
|
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
eecd334f0adb90def5cec90b170d0d072264f202
|
||||
b9b79b2c4dff5c5c172bde43d1c787238344ef3d
|
@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: mono 6.6.0.97\n"
|
||||
"Project-Id-Version: mono 6.6.0.99\n"
|
||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||
"POT-Creation-Date: 2019-09-25 09:02+0000\n"
|
||||
"POT-Creation-Date: 2019-09-26 08:31+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
BIN
po/mcs/pt_BR.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
10bb4aecde65b8a57a9ec85da90df90c2e57c419
|
||||
90f72557a8d50013cf98a0c639201261b89c3732
|
Loading…
x
Reference in New Issue
Block a user