Skip to content

[release/6.0] Fix calling NLS with Cultures has alternative sort names #62155

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
safern merged 4 commits into from
Dec 15, 2021
Merged

[release/6.0] Fix calling NLS with Cultures has alternative sort names #62155

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
64ad051
Fix calling NLS with Cultures has alternative sort names
tarekgh Nov 23, 2021
b6ef2c9
Exclude the test for the browser
tarekgh Nov 24, 2021
8fb965d
Update src/libraries/System.Private.CoreLib/src/System/Globalization/…
tarekgh Nov 29, 2021
9067331
Fix test typo
tarekgh Dec 1, 2021
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
Prev Previous commit
Next Next commit
Update src/libraries/System.Private.CoreLib/src/System/Globalization/… 
…CultureData.Nls.cs

Co-authored-by: Adeel Mujahid <[email protected]>
  • Loading branch information
@tarekgh @am11
tarekgh and am11 authored Nov 29, 2021
commit 8fb965d522f786ddb2319fe6c7c3a00585eb6c7b
2 changes: 1 addition & 1 deletion src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.Nls.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ private int NlsGetLocaleInfo(LocaleNumberData type)

// Ask OS for data, note that we presume it returns success, so we have to know that
// sWindowsName is valid before calling.
Debug.Assert(_sRealName != null, "[CultureData.DoGetLocaleInfoInt] Expected _sRealName to be populated by already");
Debug.Assert(_sRealName != null, "[CultureData.DoGetLocaleInfoInt] Expected _sRealName to be populated already");
return GetLocaleInfoExInt(_sRealName, lctype);
}

Expand Down