Skip to content

Allow restricting cultures creation with any arbitrary names in Globalization Invariant Mode #54247

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 15 commits into from
Jul 1, 2021
Merged

Allow restricting cultures creation with any arbitrary names in Globalization Invariant Mode #54247

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ec6c0d3
Allow restricting cultures creation with any arbitrary names in Globa…
tarekgh Jun 15, 2021
20760d0
Address the feedback
tarekgh Jun 16, 2021
50e2c06
Add more Invariant test
tarekgh Jun 16, 2021
b56aa67
Fix test failing on Linux
tarekgh Jun 17, 2021
21dfbba
Implement throw by default on culture creation with Invariant Mode
tarekgh Jun 24, 2021
db6510b
Resolve Merge Conflicts
tarekgh Jun 24, 2021
5c095c1
Some code formatting fix
tarekgh Jun 24, 2021
1fdba59
Fix Invariant Test to Work with WASM environment
tarekgh Jun 25, 2021
57d66c0
More feedback addressing
tarekgh Jun 25, 2021
0d9ccc3
Feedback
tarekgh Jun 28, 2021
c89f557
Test fix
tarekgh Jun 28, 2021
7aabf49
Update the trimming test
tarekgh Jun 29, 2021
c66b3f1
add entry to feature-switches doc
tarekgh Jun 29, 2021
a74646e
Update docs/workflow/trimming/feature-switches.md
tarekgh Jun 29, 2021
8c503e1
Fix the browser AOT tests
tarekgh Jul 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
More feedback addressing
  • Loading branch information
@tarekgh
tarekgh committed Jun 30, 2021
commit 57d66c08def760c9996ac3358ac68968911d0b29
8 changes: 1 addition & 7 deletions src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,15 +669,9 @@ private static CultureData CreateCultureWithInvariantData()
return CultureData.Invariant;
}

if (GlobalizationMode.Invariant && GlobalizationMode.PredefinedCulturesOnly)
{
return null;
}

if (GlobalizationMode.PredefinedCulturesOnly)
{
Debug.Assert(!GlobalizationMode.Invariant);
if (GlobalizationMode.UseNls ? !NlsIsEnsurePredefinedLocaleName(cultureName): !IcuIsEnsurePredefinedLocaleName(cultureName))
if (GlobalizationMode.Invariant || (GlobalizationMode.UseNls ? !NlsIsEnsurePredefinedLocaleName(cultureName): !IcuIsEnsurePredefinedLocaleName(cultureName)))
return null;
}

Expand Down
10 changes: 6 additions & 4 deletions src/libraries/System.Private.CoreLib/src/System/Globalization/CultureInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,8 @@ private static CultureInfo InitializeUserDefaultUICulture()
return s_userDefaultUICulture!;
}

private static string GetCultureNotSupportedExceptionMessage() => GlobalizationMode.Invariant ? SR.Argument_CultureNotSupportedInInvariantMode : SR.Argument_CultureNotSupported;

public CultureInfo(string name) : this(name, true)
{
}
Expand All @@ -174,7 +176,7 @@ public CultureInfo(string name, bool useUserOverride)

if (cultureData == null)
{
throw new CultureNotFoundException(nameof(name), name, GlobalizationMode.Invariant ? SR.Argument_CultureNotSupportedInInvariantMode : SR.Argument_CultureNotSupported);
throw new CultureNotFoundException(nameof(name), name, GetCultureNotSupportedExceptionMessage());
}

_cultureData = cultureData;
Expand Down Expand Up @@ -249,7 +251,7 @@ internal CultureInfo(string cultureName, string textAndCompareCultureName)
}

CultureData? cultureData = CultureData.GetCultureData(cultureName, false) ??
throw new CultureNotFoundException(nameof(cultureName), cultureName, GlobalizationMode.Invariant ? SR.Argument_CultureNotSupportedInInvariantMode : SR.Argument_CultureNotSupported);
throw new CultureNotFoundException(nameof(cultureName), cultureName, GetCultureNotSupportedExceptionMessage());

_cultureData = cultureData;

Expand Down Expand Up @@ -1060,7 +1062,7 @@ public static CultureInfo GetCultureInfo(int culture)
}
catch (ArgumentException)
{
throw new CultureNotFoundException(nameof(culture), culture, GlobalizationMode.Invariant ? SR.Argument_CultureNotSupportedInInvariantMode : SR.Argument_CultureNotSupported);
throw new CultureNotFoundException(nameof(culture), culture, GetCultureNotSupportedExceptionMessage());
}

lock (lcidTable)
Expand Down Expand Up @@ -1096,7 +1098,7 @@ public static CultureInfo GetCultureInfo(string name)
}

result = CreateCultureInfoNoThrow(name, useUserOverride: false) ??
throw new CultureNotFoundException(nameof(name), name, GlobalizationMode.Invariant ? SR.Argument_CultureNotSupportedInInvariantMode : SR.Argument_CultureNotSupported);
throw new CultureNotFoundException(nameof(name), name, GetCultureNotSupportedExceptionMessage());
result._isReadOnly = true;

// Remember our name as constructed. Do NOT use alternate sort name versions because
Expand Down