Skip to content

Fix DateTime.Parse with AssumeUniversal style option #111729

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
tarekgh merged 2 commits into from
Jan 23, 2025
Merged

Fix DateTime.Parse with AssumeUniversal style option #111729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4686da6
Fix DateTime.Parse with AssumeUniversal style option
tarekgh Jan 23, 2025
2a3b6a6
Apply suggestions from code review
tarekgh Jan 23, 2025
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
17 changes: 4 additions & 13 deletions src/libraries/System.Private.CoreLib/src/System/Globalization/DateTimeParse.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3792,22 +3792,13 @@ private static bool CheckNewValue(scoped ref int currentValue, int newValue, cha

private static DateTime GetDateTimeNow(scoped ref DateTimeResult result, scoped ref DateTimeStyles styles)
{
if ((result.flags & ParseFlags.CaptureOffset) != 0)
if ((result.flags & (ParseFlags.CaptureOffset | ParseFlags.TimeZoneUsed)) == (ParseFlags.CaptureOffset | ParseFlags.TimeZoneUsed))
{
if ((result.flags & ParseFlags.TimeZoneUsed) != 0)
{
// use the supplied offset to calculate 'Now'
return new DateTime(DateTime.UtcNow.Ticks + result.timeZoneOffset.Ticks, DateTimeKind.Unspecified);
}
else if ((styles & DateTimeStyles.AssumeUniversal) != 0)
{
// assume the offset is Utc
return DateTime.UtcNow;
}
// use the supplied offset to calculate 'Now'
return new DateTime(DateTime.UtcNow.Ticks + result.timeZoneOffset.Ticks, DateTimeKind.Unspecified);
}

// assume the offset is Local
return DateTime.Now;
return (styles & DateTimeStyles.AssumeUniversal) != 0 ? DateTime.UtcNow : DateTime.Now;
}

private static bool CheckDefaultDateTime(scoped ref DateTimeResult result, scoped ref Calendar cal, DateTimeStyles styles)
Expand Down
11 changes: 11 additions & 0 deletions src/libraries/System.Runtime/tests/System.Runtime.Tests/System/DateTimeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2687,6 +2687,17 @@ public void TestRoundTrippingDateTimeAndFileTime()
Assert.Equal(now, roundTrippedDateTime);
}

[Fact]
public void TestParseTimeOnlyStringWithAssumeUtcOption()
{
DateTime utcNow1 = DateTime.UtcNow;
DateTime dt = DateTime.Parse("13:30", null, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal);
DateTime utcNow2 = DateTime.UtcNow;

// Ensure the parsed date part is in UTC.
Assert.InRange(dt.Date, utcNow1.Date, utcNow2.Date);
}

[Fact]
[PlatformSpecific(TestPlatforms.Windows)]
public void TestTimeSynchronizationWithTheSystem()
Expand Down