Skip to content

Commit

Permalink
[release/8.0-staging] [main] Fixed DateTimeOffset.Now calls on Androi…
Browse files Browse the repository at this point in the history
…d with specific conditions (#94718)

Fixed issue when DateTimeOffset.Now throws exception on Android with Arabic language & western hemisphere timezone

Backport of #94710

Co-authored-by: Taras Shevchuk <taras.v.shevchuk@gmail.com>
  • Loading branch information
github-actions[bot] and Saratsin committed Nov 15, 2023
1 parent 5acd05e commit 467099f
Showing 1 changed file with 2 additions and 1 deletion.
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

0 comments on commit 467099f

Please sign in to comment.