Imported Upstream version 4.8.0.309

Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions

View File

@@ -273,7 +273,7 @@ namespace System
#endif
private AdjustmentRule [] adjustmentRules;
#if !NET_2_1 || MOBILE_STATIC
#if !MOBILE || MOBILE_STATIC
/// <summary>
/// Determine whether windows of not (taken Stephane Delcroix's code)
/// </summary>
@@ -538,7 +538,7 @@ namespace System
//FIXME: this method should check for cached values in systemTimeZones
if (id == null)
throw new ArgumentNullException ("id");
#if !NET_2_1
#if !MOBILE
if (TimeZoneKey != null)
{
if (id == "Coordinated Universal Time")
@@ -568,7 +568,7 @@ namespace System
}
#endif
#if !NET_2_1
#if !MOBILE
private static TimeZoneInfo FromRegistryKey (string id, RegistryKey key)
{
byte [] reg_tzi = (byte []) key.GetValue ("TZI");
@@ -919,7 +919,7 @@ namespace System
public bool IsDaylightSavingTime (DateTimeOffset dateTimeOffset)
{
throw new NotImplementedException ();
return IsDaylightSavingTime (dateTimeOffset.DateTime);
}
internal DaylightTime GetDaylightChanges (int year)