Skip to content

Reduce use of EvaluationPeriod #946

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
maknapp wants to merge 22 commits into
base: version/6.0
Choose a base branch
from
Open

Reduce use of EvaluationPeriod #946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
45d78b8
Remove invalid CalDateTime constructor
maknapp Mar 17, 2026
1ea7c06
Unambiguous CalDateTime DateTime constructors
maknapp Mar 18, 2026
9718a64
Simplify occurrence end time calculation
maknapp Mar 19, 2026
347bf29
Remove CalDateTime.ToTimeZone
maknapp Mar 19, 2026
cb0b370
Formatting
maknapp Mar 19, 2026
bb91f79
Replace CalDateTime.Value with ToDateTime method
maknapp Mar 20, 2026
d05e510
Replace CalDateTime.AsUtc with ToDateTimeUtc method
maknapp Mar 20, 2026
f391f59
Add and update CalDateTime comments
maknapp Mar 21, 2026
52f2c13
Add kind to CalDateTime.ToDateTime
maknapp Mar 21, 2026
b796d6c
Fix CalDateTime serializer doc
maknapp Apr 2, 2026
a06f643
Remove nosonar
maknapp Apr 2, 2026
5d266c9
Change some NodaTime constructors to static
maknapp Apr 2, 2026
dc44591
Remove Instant from CalDateTime
maknapp Apr 3, 2026
607a959
Remove extra CalDateTime.ToZoneDateTime
maknapp Apr 3, 2026
723c54e
Change to CalDateTime.FromDateTime
maknapp Apr 19, 2026
3ddabbb
Get date only once for CalDateTime.Today
maknapp Apr 19, 2026
2f020ed
Clarify CalDateTime converting
maknapp Apr 19, 2026
613d567
Add CalDateTime tests
maknapp Apr 19, 2026
a5fa499
CalDateTime case insensitve hash code
maknapp Apr 19, 2026
ccac7da
Remove CalDateTime hour minute second
maknapp Apr 26, 2026
12d8e1e
Evaluate occurrences as ZonedDateTime
maknapp May 3, 2026
76ca967
Skip empty recurrence tasks
maknapp May 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 3 additions & 13 deletions Ical.Net.Benchmarks/CalDateTimePerfTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//
//
// Copyright ical.net project maintainers and contributors.
// Licensed under the MIT license.
//
Expand All @@ -12,23 +12,13 @@ namespace Ical.Net.Benchmarks;
public class CalDateTimePerfTests
{
private const string _aTzid = "Australia/Sydney";
private const string _bTzid = "America/New_York";

[Benchmark]
public CalDateTime EmptyTzid() => CalDateTime.Now;

[Benchmark]
public CalDateTime SpecifiedTzid() => new CalDateTime(DateTime.Now, _aTzid);

[Benchmark]
public CalDateTime UtcDateTime() => new CalDateTime(DateTime.UtcNow);

[Benchmark]
public CalDateTime EmptyTzidToTzid() => EmptyTzid().ToTimeZone(_bTzid);

[Benchmark]
public CalDateTime SpecifiedTzidToDifferentTzid() => SpecifiedTzid().ToTimeZone(_bTzid);
public CalDateTime SpecifiedTzid() => CalDateTime.FromDateTime(DateTime.Now, _aTzid);

[Benchmark]
public CalDateTime UtcToDifferentTzid() => UtcDateTime().ToTimeZone(_bTzid);
public CalDateTime UtcDateTime() => CalDateTime.FromDateTime(DateTime.UtcNow);
}
32 changes: 16 additions & 16 deletions Ical.Net.Benchmarks/OccurencePerfTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//
//
// Copyright ical.net project maintainers and contributors.
// Licensed under the MIT license.
//
Expand Down Expand Up @@ -40,13 +40,13 @@ public void GetOccurrences()
public void MultipleEventsWithUntilOccurrencesSearchingByWholeCalendar()
{
var searchStart = _calendarFourEvents.Events.First().DtStart!
.ToZonedDateTime(tz)
.ToZonedOrDefault(tz)
.LocalDateTime
.PlusYears(-1)
.InZoneLeniently(tz);

var searchEnd = _calendarFourEvents.Events.Last().DtStart!
.ToZonedDateTime(tz)
.ToZonedOrDefault(tz)
.LocalDateTime
.PlusYears(1)
.InZoneLeniently(tz)
Expand All @@ -59,13 +59,13 @@ public void MultipleEventsWithUntilOccurrencesSearchingByWholeCalendar()
public void MultipleEventsWithUntilOccurrences()
{
var searchStart = _calendarFourEvents.Events.First().DtStart!
.ToZonedDateTime(tz)
.ToZonedOrDefault(tz)
.LocalDateTime
.PlusYears(-1)
.InZoneLeniently(tz);

var searchEnd = _calendarFourEvents.Events.Last().DtStart!
.ToZonedDateTime(tz)
.ToZonedOrDefault(tz)
.LocalDateTime
.PlusYears(1)
.InZoneLeniently(tz)
Expand All @@ -80,13 +80,13 @@ public void MultipleEventsWithUntilOccurrences()
public void MultipleEventsWithUntilOccurrencesEventsAsParallel()
{
var searchStart = _calendarFourEvents.Events.First().DtStart!
.ToZonedDateTime(tz)
.ToZonedOrDefault(tz)
.LocalDateTime
.PlusYears(-1)
.InZoneLeniently(tz);

var searchEnd = _calendarFourEvents.Events.Last().DtStart!
.ToZonedDateTime(tz)
.ToZonedOrDefault(tz)
.LocalDateTime
.PlusYears(1)
.PlusDays(10)
Expand Down Expand Up @@ -178,7 +178,7 @@ private static Calendar GetFourCalendarEventsWithUntilRule()
End = new(startTime.PlusMinutes(10), tzid),
RecurrenceRule = new(FrequencyType.Daily, 1)
{
Until = new(startTime.PlusDays(10).InUtc().ToInstant()),
Until = CalDateTime.FromZonedDateTime(startTime.PlusDays(10).InUtc()),
},
};
startTime = startTime.PlusDays(1);
Expand All @@ -195,13 +195,13 @@ public void MultipleEventsWithCountOccurrencesSearchingByWholeCalendar()
{
var calendar = GetFourCalendarEventsWithCountRule();
var searchStart = _calendarFourEvents.Events.First().DtStart!
.ToZonedDateTime(tz)
.ToZonedOrDefault(tz)
.LocalDateTime
.PlusYears(-1)
.InZoneLeniently(tz);

var searchEnd = _calendarFourEvents.Events.Last().DtStart!
.ToZonedDateTime(tz)
.ToZonedOrDefault(tz)
.LocalDateTime
.PlusYears(1)
.InZoneLeniently(tz)
Expand All @@ -215,13 +215,13 @@ public void MultipleEventsWithCountOccurrences()
{
var calendar = GetFourCalendarEventsWithCountRule();
var searchStart = _calendarFourEvents.Events.First().DtStart!
.ToZonedDateTime(tz)
.ToZonedOrDefault(tz)
.LocalDateTime
.PlusYears(-1)
.InZoneLeniently(tz);

var searchEnd = _calendarFourEvents.Events.Last().DtStart!
.ToZonedDateTime(tz)
.ToZonedOrDefault(tz)
.LocalDateTime
.PlusYears(1)
.InZoneLeniently(tz)
Expand All @@ -237,13 +237,13 @@ public void MultipleEventsWithCountOccurrencesEventsAsParallel()
{
var calendar = GetFourCalendarEventsWithCountRule();
var searchStart = _calendarFourEvents.Events.First().DtStart!
.ToZonedDateTime(tz)
.ToZonedOrDefault(tz)
.LocalDateTime
.PlusYears(-1)
.InZoneLeniently(tz);

var searchEnd = _calendarFourEvents.Events.Last().DtStart!
.ToZonedDateTime(tz)
.ToZonedOrDefault(tz)
.LocalDateTime
.PlusYears(1)
.PlusDays(10)
Expand All @@ -270,8 +270,8 @@ private static Calendar GetFourCalendarEventsWithCountRule()
{
var e = new CalendarEvent
{
Start = new CalDateTime(startTime.AddMinutes(5), tzid),
End = new CalDateTime(startTime.AddMinutes(10), tzid),
Start = CalDateTime.FromDateTime(startTime.AddMinutes(5), tzid),
End = CalDateTime.FromDateTime(startTime.AddMinutes(10), tzid),
RecurrenceRule = new(FrequencyType.Daily, 1)
{
Count = 100,
Expand Down
6 changes: 3 additions & 3 deletions Ical.Net.Benchmarks/SerializationPerfTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//
//
// Copyright ical.net project maintainers and contributors.
// Licensed under the MIT license.
//
Expand Down Expand Up @@ -80,8 +80,8 @@ private static Calendar CreateSimpleCalendar()
var simpleCalendar = new Calendar();
var calendarEvent = new CalendarEvent
{
Start = new CalDateTime(DateTime.Now, timeZoneId),
End = new CalDateTime(DateTime.Now + TimeSpan.FromHours(1), timeZoneId),
Start = CalDateTime.FromDateTime(DateTime.Now, timeZoneId),
End = CalDateTime.FromDateTime(DateTime.Now + TimeSpan.FromHours(1), timeZoneId),
RecurrenceRule = new(FrequencyType.Daily, 1)
{
Count = 100,
Expand Down
Loading
Loading