ical-org#197 Fixed comparison bug for Until; also removed a conversio…

…n step since it is now an IDateTime/CalDateTime.
ColinNg · Jan 30, 2017 · 44753ff · 44753ff
1 parent 800594d
commit 44753ff
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/v3/ical.NET/Evaluation/RecurrencePatternEvaluator.cs b/v3/ical.NET/Evaluation/RecurrencePatternEvaluator.cs
@@ -302,7 +302,7 @@ private HashSet<DateTime> GetDates(IDateTime seed, DateTime periodStart, DateTim
                         else if (pattern.Until.Value == DateTime.MinValue || candidate <= pattern.Until.Value)
                         {
                             var utcCandidate = DateUtil.FromTimeZoneToTimeZone(candidate, DateUtil.GetZone(seed.TzId), DateTimeZone.Utc).ToDateTimeUtc();
-                            if (!dates.Contains(candidate) && (pattern.Until == DateTime.MinValue || utcCandidate <= pattern.Until))
+                            if (!dates.Contains(candidate) && (pattern.Until.Value == DateTime.MinValue || utcCandidate <= pattern.Until.AsUtc))
                             {
                                 dates.Add(candidate);
                             }

diff --git a/v3/ical.NET/Utility/DateUtil.cs b/v3/ical.NET/Utility/DateUtil.cs
@@ -64,8 +64,7 @@ public static IDateTime MatchTimeZone(IDateTime dt1, IDateTime dt2)
                 // The first date/time is in UTC time, convert!
                 return new CalDateTime(copy.AsUtc);
             }
-            // The first date/time is in local time, convert!
-            return new CalDateTime(copy.AsSystemLocal);
+            return copy;
         }
 
         public static DateTime AddWeeks(DateTime dt, int interval, DayOfWeek firstDayOfWeek)