Skip to content

Use invariant culture for CBOR #92539

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
stephentoub merged 2 commits into from
Sep 24, 2023
Merged

Use invariant culture for CBOR #92539

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
67c2d19
Use invariant culture for CBOR tests
filipnavara Sep 23, 2023
2c75b15
Update src/libraries/System.Formats.Cbor/src/System/Formats/Cbor/Read…
filipnavara Sep 23, 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
2 changes: 1 addition & 1 deletion src/libraries/System.Formats.Cbor/src/System/Formats/Cbor/Reader/CborReader.Tag.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public DateTimeOffset ReadDateTimeOffset()
string dateString = ReadTextString();

// TODO determine if conformance modes should allow inexact date sting parsing
if (!DateTimeOffset.TryParseExact(dateString, CborWriter.Rfc3339FormatString, null, DateTimeStyles.RoundtripKind, out DateTimeOffset result))
if (!DateTimeOffset.TryParseExact(dateString, CborWriter.Rfc3339FormatString, CultureInfo.InvariantCulture, DateTimeStyles.RoundtripKind, out DateTimeOffset result))
{
throw new CborContentException(SR.Cbor_Reader_InvalidDateTimeEncoding);
}
Expand Down
5 changes: 3 additions & 2 deletions src/libraries/System.Formats.Cbor/src/System/Formats/Cbor/Writer/CborWriter.Tag.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.

using System.Diagnostics;
using System.Globalization;
using System.Numerics;

namespace System.Formats.Cbor
Expand Down Expand Up @@ -42,8 +43,8 @@ public void WriteDateTimeOffset(DateTimeOffset value)
#else
value.Offset == TimeSpan.Zero ?
#endif // NET8_0_OR_GREATER
value.UtcDateTime.ToString(Rfc3339FormatString) : // prefer 'Z' over '+00:00'
value.ToString(Rfc3339FormatString);
value.UtcDateTime.ToString(Rfc3339FormatString, CultureInfo.InvariantCulture) : // prefer 'Z' over '+00:00'
value.ToString(Rfc3339FormatString, CultureInfo.InvariantCulture);

WriteTag(CborTag.DateTimeString);
WriteTextString(dateString);
Expand Down