Properly (?) fix TimeZoneInfo.cs build.
authorMark Probst <mark.probst@gmail.com>
Sun, 9 Dec 2012 14:00:06 +0000 (15:00 +0100)
committerMark Probst <mark.probst@gmail.com>
Sun, 9 Dec 2012 14:00:06 +0000 (15:00 +0100)
I'm just taking a wild guess that this is the proper fix.  Please review.

mcs/class/System.Core/System/TimeZoneInfo.cs

index 67f0ec50f83777c0ba978c93d2b0e4cc6f4752b9..0701b7743933b32a439532f5a1cd3be41699ea87 100644 (file)
@@ -248,14 +248,11 @@ namespace System
 
                public static DateTimeOffset ConvertTime(DateTimeOffset dateTimeOffset, TimeZoneInfo destinationTimeZone) 
                {
-#if BOOTSTRAP_BASIC
-                       throw new NotImplementedException ();
-#else
                        if (destinationTimeZone == null) 
                                throw new ArgumentNullException("destinationTimeZone");
                
                        var utcDateTime = dateTimeOffset.UtcDateTime;
-                       AdjustmentRule rule = GetApplicableRule (utcDateTime);
+                       AdjustmentRule rule = destinationTimeZone.GetApplicableRule (utcDateTime);
                
                        if (rule != null && destinationTimeZone.IsDaylightSavingTime(utcDateTime)) {
                                var offset = destinationTimeZone.BaseUtcOffset + rule.DaylightDelta;
@@ -264,7 +261,6 @@ namespace System
                        else {
                                return new DateTimeOffset(DateTime.SpecifyKind(utcDateTime, DateTimeKind.Unspecified) + destinationTimeZone.BaseUtcOffset, destinationTimeZone.BaseUtcOffset);
                        }
-#endif
                }
 
                public static DateTime ConvertTimeBySystemTimeZoneId (DateTime dateTime, string destinationTimeZoneId)