Skip to content

Fix DateTimeOffset Converter #2582 #3077

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

Merged
VladislavAntonyuk merged 4 commits into from
Feb 8, 2026
Merged

Fix DateTimeOffset Converter #2582 #3077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
053c784
Fix DateTimeOffset Converter #2582
VladislavAntonyuk Feb 8, 2026
a1056ec
Fix tests to be independant
VladislavAntonyuk Feb 8, 2026
308b74d
Merge branch 'main' into fix-2582
TheCodeTraveler Feb 8, 2026
63322ed
Merge branch 'main' into fix-2582
TheCodeTraveler Feb 8, 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
27 changes: 17 additions & 10 deletions src/CommunityToolkit.Maui.UnitTests/Converters/DateTimeOffsetConverterTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@ namespace CommunityToolkit.Maui.UnitTests.Converters;
public class DateTimeOffsetConverterTests : BaseConverterTest<DateTimeOffsetConverter>
{
static readonly DateTime testDateTimeNow = DateTime.Now;
static readonly DateTime testDateTimeLocal = new(2020, 08, 25, 13, 37, 00, DateTimeKind.Local);
static readonly DateTime testDateTimeUtc = new(2020, 08, 25, 13, 37, 00, DateTimeKind.Utc);
static readonly DateTime testDateTimeUnspecified = new(2020, 08, 25, 13, 37, 00);
static readonly DateTime testDateTimeLocal = new(2020, 08, 26, 13, 37, 00, DateTimeKind.Local);
static readonly DateTime testDateTimeUnspecified = new(2020, 08, 27, 13, 37, 00);

static readonly DateTimeOffset testDateTimeOffsetNow = new(testDateTimeNow);
static readonly DateTimeOffset testDateTimeOffsetLocal = new(2020, 08, 25, 13, 37, 00, DateTimeOffset.Now.Offset);
static readonly DateTimeOffset testDateTimeOffsetUtc = new(2020, 08, 25, 13, 37, 00, DateTimeOffset.UtcNow.Offset);
static readonly DateTimeOffset testDateTimeOffsetUtc = new(2020, 08, 25, 13, 37, 00, TimeZoneInfo.Utc.GetUtcOffset(testDateTimeUtc));
static readonly DateTimeOffset testDateTimeOffsetLocal = new(2020, 08, 26, 13, 37, 00, TimeZoneInfo.Local.GetUtcOffset(testDateTimeLocal));
static readonly DateTimeOffset testDateTimeOffsetUnspecified = new(2020, 08, 27, 13, 37, 00, TimeSpan.Zero);

public static TheoryData<DateTimeOffset, DateTime, CultureInfo?> Data { get; } = new()
{
Expand All @@ -33,7 +34,7 @@ public class DateTimeOffsetConverterTests : BaseConverterTest<DateTimeOffsetConv
testDateTimeOffsetUtc, testDateTimeUtc, null
},
{
testDateTimeOffsetUtc, testDateTimeUnspecified, null
testDateTimeOffsetUnspecified, testDateTimeUnspecified, null
},
{
testDateTimeOffsetNow, testDateTimeNow, CultureInfo.CurrentCulture
Expand All @@ -51,7 +52,7 @@ public class DateTimeOffsetConverterTests : BaseConverterTest<DateTimeOffsetConv
testDateTimeOffsetUtc, testDateTimeUtc, CultureInfo.CurrentCulture
},
{
testDateTimeOffsetUtc, testDateTimeUnspecified, CultureInfo.CurrentCulture
testDateTimeOffsetUnspecified, testDateTimeUnspecified, CultureInfo.CurrentCulture
},
};

Expand All @@ -73,7 +74,7 @@ public class DateTimeOffsetConverterTests : BaseConverterTest<DateTimeOffsetConv
testDateTimeUtc, testDateTimeOffsetUtc, null
},
{
testDateTimeUnspecified, testDateTimeOffsetUtc, null
testDateTimeUnspecified, testDateTimeOffsetUnspecified, null
},
{
testDateTimeNow, testDateTimeOffsetNow, CultureInfo.CurrentCulture
Expand All @@ -91,7 +92,13 @@ public class DateTimeOffsetConverterTests : BaseConverterTest<DateTimeOffsetConv
testDateTimeUtc, testDateTimeOffsetUtc, CultureInfo.CurrentCulture
},
{
testDateTimeUnspecified, testDateTimeOffsetUtc, CultureInfo.CurrentCulture
testDateTimeUnspecified, testDateTimeOffsetUnspecified, CultureInfo.CurrentCulture
},
{
new(2026, 03, 15, 13, 37, 00, DateTimeKind.Local), new(2026, 03, 15, 13, 37, 00, TimeZoneInfo.Local.GetUtcOffset(new(2026, 03, 15, 13, 37, 00))), CultureInfo.CurrentCulture
},
{
new(2026, 07, 15, 13, 37, 00, DateTimeKind.Local), new(2026, 07, 15, 13, 37, 00, TimeZoneInfo.Local.GetUtcOffset(new(2026, 07, 15, 13, 37, 00))), CultureInfo.CurrentCulture
},
};

Expand Down Expand Up @@ -158,12 +165,12 @@ class DateTimeOffsetComparer : IEqualityComparer<DateTimeOffset>
{
public bool Equals(DateTimeOffset x, DateTimeOffset y)
{
return x.Year == y.Year && x.Month == y.Month && x.Day == y.Day && x.Hour == y.Hour && x.Minute == y.Minute && x.Second == y.Second;
return x.Year == y.Year && x.Month == y.Month && x.Day == y.Day && x.Hour == y.Hour && x.Minute == y.Minute && x.Second == y.Second && x.Offset == y.Offset;
}

public int GetHashCode(DateTimeOffset obj)
{
return HashCode.Combine(obj.Year, obj.Month, obj.Day, obj.Hour, obj.Minute, obj.Second);
return HashCode.Combine(obj.Year, obj.Month, obj.Day, obj.Hour, obj.Minute, obj.Second, obj.Offset);
}
}
}
4 changes: 2 additions & 2 deletions src/CommunityToolkit.Maui/Converters/DateTimeOffsetConverter.shared.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ public override DateTimeOffset ConvertBackTo(DateTime value, CultureInfo? cultur
{
var offset = value.Kind switch
{
DateTimeKind.Local => DateTimeOffset.Now.Offset,
DateTimeKind.Utc => DateTimeOffset.UtcNow.Offset,
DateTimeKind.Local => TimeZoneInfo.Local.GetUtcOffset(value),
DateTimeKind.Utc => TimeZoneInfo.Utc.GetUtcOffset(value),
_ => TimeSpan.Zero,
};

Expand Down
Loading