Simplify CalDateTime AsSystemLocal and AsUtc by using AsDateTimeOffset

Author: axunonb

Ical.Net/DataTypes/CalDateTime.cs

@@ -303,52 +303,12 @@ public override int GetHashCode()
         /// If the DateTimeKind is Unspecified, it's assumed that the underlying
         /// Value already represents the system's datetime.
         /// </summary>
-        public DateTime AsSystemLocal
-        {
-            get
-            {
-                if (Value.Kind == DateTimeKind.Unspecified)
-                {
-                    return HasTime
-                        ? Value
-                        : Value.Date;
-                }
-
-                return HasTime
-                    ? Value.ToLocalTime()
-                    : Value.ToLocalTime().Date;
-            }
-        }
+        public DateTime AsSystemLocal => AsDateTimeOffset.LocalDateTime;
 
         /// <summary>
         /// Returns a representation of the <see cref="DateTime"/> in UTC.
         /// </summary>
-        public DateTime AsUtc
-        {
-            get
-            {
-                // In order of weighting:
-                //  1) Specified TzId
-                //  2) Value having a DateTimeKind.Utc
-                //  3) Use the OS's time zone
-                DateTime asUtc;
-
-                if (!string.IsNullOrWhiteSpace(TzId))
-                {
-                    var asLocal = DateUtil.ToZonedDateTimeLeniently(Value, TzId);
-                    return asLocal.ToDateTimeUtc();
-                }
-
-                if (IsUtc || Value.Kind == DateTimeKind.Utc)
-                {
-                    asUtc = DateTime.SpecifyKind(Value, DateTimeKind.Utc);
-                    return asUtc;
-                }
-
-                asUtc = DateTime.SpecifyKind(Value, DateTimeKind.Local).ToUniversalTime();
-                return asUtc;
-            }
-        }
+        public DateTime AsUtc => AsDateTimeOffset.UtcDateTime;
 
         /// <summary>
         /// Gets the underlying <see cref="DateOnlyValue"/> of <see cref="Value"/>.
@@ -533,7 +493,7 @@ public IDateTime ToTimeZone(string? tzId)
         /// </summary>
         public DateTimeOffset AsDateTimeOffset =>
             string.IsNullOrWhiteSpace(TzId)
-                ? new DateTimeOffset(AsSystemLocal)
+                ? new DateTimeOffset(Value)
                 : DateUtil.ToZonedDateTimeLeniently(Value, TzId).ToDateTimeOffset();
 
         /// <inheritdoc cref="DateTime.Add"/>

Ical.Net/Evaluation/RecurrencePatternEvaluator.cs

@@ -472,7 +472,7 @@ private List<DateTime> GetYearDayVariants(List<DateTime> dates, RecurrencePatter
                     }
                 }
 
-                if (keepDate)
+                if (!keepDate)
                 {
                     dates.RemoveAt(i);
                 }