Skip to content

[release/8.0-staging] [main] Fixed DateTimeOffset.Now calls on Android with specific conditions #94718

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
steveisok merged 2 commits into from
Nov 15, 2023
Merged

[release/8.0-staging] [main] Fixed DateTimeOffset.Now calls on Android with specific conditions #94718

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61c650d
Fixed DateTimeOffset.Now calls on Android with specific conditions
Saratsin Nov 14, 2023
16e1754
Fixed usings order
Saratsin Nov 14, 2023
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
3 changes: 2 additions & 1 deletion src/libraries/System.Private.CoreLib/src/System/DateTimeOffset.Android.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System.Globalization;
using System.Threading;

namespace System
Expand Down Expand Up @@ -60,7 +61,7 @@ public static DateTimeOffset Now
}

// Fast path obtained offset incorporated into ToLocalTime(DateTime.UtcNow, true) logic
int localDateTimeOffsetSeconds = Convert.ToInt32(localDateTimeOffset);
int localDateTimeOffsetSeconds = Convert.ToInt32(localDateTimeOffset, CultureInfo.InvariantCulture);
TimeSpan offset = TimeSpan.FromSeconds(localDateTimeOffsetSeconds);
long localTicks = utcDateTime.Ticks + offset.Ticks;
if (localTicks < DateTime.MinTicks || localTicks > DateTime.MaxTicks)
Expand Down