Skip to content

fix: respect DateTimeKind in ToDateTimeOffset #335

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
evanofficial wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: respect DateTimeKind in ToDateTimeOffset #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions src/Extensions/DateTimeExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,18 @@ namespace WinUI.TableView.Extensions;
internal static class DateTimeExtensions
{
/// <summary>
/// Converts a DateTime to a DateTimeOffset using the local time zone.
/// Converts a DateTime to a DateTimeOffset, respecting the DateTime's Kind.
/// Uses UTC offset for UTC DateTimes and local offset otherwise.
/// </summary>
/// <param name="dateTime">The DateTime to convert.</param>
/// <returns>A DateTimeOffset representing the same point in time as the DateTime.</returns>
public static DateTimeOffset ToDateTimeOffset(this DateTime dateTime)
{
return new DateTimeOffset(dateTime, TimeZoneInfo.Local.GetUtcOffset(dateTime));
var offset = dateTime.Kind == DateTimeKind.Utc
? TimeSpan.Zero
: TimeZoneInfo.Local.GetUtcOffset(dateTime);

return new DateTimeOffset(dateTime, offset);
}

/// <summary>
Expand Down
9 changes: 9 additions & 0 deletions tests/DateTimeExtensionsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,15 @@ public void ToDateTimeOffset_FromDateTime_UsesLocalOffset()
Assert.AreEqual(expected, dto);
}

[TestMethod]
public void ToDateTimeOffset_FromUtcDateTime_UsesZeroOffset()
{
var dt = new DateTime(2024, 1, 2, 3, 4, 5, DateTimeKind.Utc);
var dto = dt.ToDateTimeOffset();
var expected = new DateTimeOffset(dt, TimeSpan.Zero);
Assert.AreEqual(expected, dto);
}

[TestMethod]
public void ToDateTimeOffset_FromTimeSpan_UsesTodayDate()
{
Expand Down