[wasm] Throw exception if culture data does not exist in icu

src/libraries/Common/tests/Tests/System/StringTests.cs

@@ -2567,8 +2567,16 @@ public void Equals_Encyclopaedia_ReturnsExpected(StringComparison comparison, bo
  {
  string source = "encyclop\u00e6dia";
  string target = "encyclopaedia";
+ ThreadCultureChange culture;
+ if (PlatformDetection.IsBrowser)
+ {
+ culture = new ThreadCultureChange("pl-PL");
+ } else
+ {
+ culture = new ThreadCultureChange("se-SE");
+ }
 
- using (new ThreadCultureChange("se-SE"))
+ using (culture)
  {
  Assert.Equal(expected, string.Equals(source, target, comparison));
  Assert.Equal(expected, source.AsSpan().Equals(target.AsSpan(), comparison));

src/libraries/System.Globalization/tests/CultureInfo/CultureInfoAll.cs

@@ -7,6 +7,7 @@
 using System.Runtime.InteropServices;
 using Microsoft.DotNet.RemoteExecutor;
 using System.Text;
+using System.Diagnostics;
 using Xunit;
 
 namespace System.Globalization.Tests
@@ -809,5 +810,31 @@ public void CultureNotFoundExceptionTest()
  e = AssertExtensions.Throws<CultureNotFoundException>("culture", () => new CultureInfo(0x1000));
  Assert.Equal(0x1000, e.InvalidCultureId);
  }
+
+ [ConditionalTheory(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
+ [InlineData("1", "xx-XY")]
+ [InlineData("1", "zx-ZY")]
+ [InlineData("0", "xx-XY")]
+ [InlineData("0", "zx-ZY")]
+ public void PredefinedCulturesOnlyEnvVarTest(string predefinedCulturesOnlyEnvVar, string cultureName)
+ {
+ var psi = new ProcessStartInfo();
+ psi.Environment.Clear();
+
+ psi.Environment.Add("DOTNET_SYSTEM_GLOBALIZATION_PREDEFINED_CULTURES_ONLY", predefinedCulturesOnlyEnvVar);
+
+ RemoteExecutor.Invoke((culture, predefined) =>
+ {
+ if (predefined == "1")
+ {
+ AssertExtensions.Throws<CultureNotFoundException>(() => new CultureInfo(culture));
+ }
+ else
+ {
+ CultureInfo ci = new CultureInfo(culture);
+ Assert.Equal(culture, ci.Name);
+ }
+ }, cultureName, predefinedCulturesOnlyEnvVar, new RemoteInvokeOptions { StartInfo = psi }).Dispose();
+ }
  }
 }

src/libraries/System.Globalization/tests/CultureInfo/CultureInfoCurrentCulture.cs

@@ -16,17 +16,32 @@ public class CurrentCultureTests
  [Fact]
  public void CurrentCulture()
  {
- var newCulture = new CultureInfo(CultureInfo.CurrentCulture.Name.Equals("ja-JP", StringComparison.OrdinalIgnoreCase) ? "ar-SA" : "ja-JP");
- using (new ThreadCultureChange(newCulture))
+ CultureInfo newCulture;
+ try
  {
- Assert.Equal(CultureInfo.CurrentCulture, newCulture);
+ newCulture = new CultureInfo(CultureInfo.CurrentCulture.Name.Equals("ja-JP", StringComparison.OrdinalIgnoreCase) ? "ar-SA" : "ja-JP");
+ using (new ThreadCultureChange(newCulture))
+ {
+ Assert.Equal(CultureInfo.CurrentCulture, newCulture);
+ }
+ }
+ catch (CultureNotFoundException)
+ {
+ return;
  }
 
- newCulture = new CultureInfo("de-DE_phoneb");
- using (new ThreadCultureChange(newCulture))
+ try
+ {
+ newCulture = new CultureInfo("de-DE_phoneb");
+ using (new ThreadCultureChange(newCulture))
+ {
+ Assert.Equal(CultureInfo.CurrentCulture, newCulture);
+ Assert.Equal("de-DE_phoneb", newCulture.CompareInfo.Name);
+ }
+ }
+ catch (CultureNotFoundException)
  {
- Assert.Equal(CultureInfo.CurrentCulture, newCulture);
- Assert.Equal("de-DE_phoneb", newCulture.CompareInfo.Name);
+ return;
  }
  }
 
@@ -39,17 +54,32 @@ public void CurrentCulture_Set_Null_ThrowsArgumentNullException()
  [Fact]
  public void CurrentUICulture()
  {
- var newUICulture = new CultureInfo(CultureInfo.CurrentUICulture.Name.Equals("ja-JP", StringComparison.OrdinalIgnoreCase) ? "ar-SA" : "ja-JP");
- using (new ThreadCultureChange(null, newUICulture))
+ CultureInfo newUICulture;
+ try
  {
- Assert.Equal(CultureInfo.CurrentUICulture, newUICulture);
+ newUICulture = new CultureInfo(CultureInfo.CurrentUICulture.Name.Equals("ja-JP", StringComparison.OrdinalIgnoreCase) ? "ar-SA" : "ja-JP");
+ using (new ThreadCultureChange(null, newUICulture))
+ {
+ Assert.Equal(CultureInfo.CurrentUICulture, newUICulture);
+ }
+ }
+ catch (CultureNotFoundException)
+ {
+ return;
  }
 
- newUICulture = new CultureInfo("de-DE_phoneb");
- using (new ThreadCultureChange(null, newUICulture))
+ try
+ {
+ newUICulture = new CultureInfo("de-DE_phoneb");
+ using (new ThreadCultureChange(null, newUICulture))
+ {
+ Assert.Equal(CultureInfo.CurrentUICulture, newUICulture);
+ Assert.Equal("de-DE_phoneb", newUICulture.CompareInfo.Name);
+ }
+ }
+ catch (CultureNotFoundException)
  {
- Assert.Equal(CultureInfo.CurrentUICulture, newUICulture);
- Assert.Equal("de-DE_phoneb", newUICulture.CompareInfo.Name);
+ return;
  }
  }
 

src/libraries/System.Globalization/tests/System/Globalization/TextInfoTests.cs

@@ -307,7 +307,13 @@ private static void TestToLower(string name, string str, string expected)
  [MemberData(nameof(ToLower_TestData))]
  public void ToLower(string name, string str, string expected)
  {
- TestToLower(name, str, expected);
+ try{
+ TestToLower(name, str, expected);
+ }
+ catch (CultureNotFoundException)
+ {
+ return;
+ }
  }
 
  [Theory]
@@ -430,7 +436,14 @@ private static void TestToUpper(string name, string str, string expected)
  [MemberData(nameof(ToUpper_TestData))]
  public void ToUpper(string name, string str, string expected)
  {
- TestToUpper(name, str, expected);
+ try
+ {
+ TestToUpper(name, str, expected);
+ }
+ catch (CultureNotFoundException)
+ {
+ return;
+ }
  }
 
  [Theory]

src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.Icu.cs

@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
+using System.Runtime.CompilerServices;
 
 namespace System.Globalization
 {
@@ -63,11 +64,8 @@ private bool InitIcuCultureDataCore()
  {
  _iLanguage = CultureInfo.LOCALE_CUSTOM_UNSPECIFIED;
  }
-
  _bNeutral = TwoLetterISOCountryName.Length == 0;
-
  _sSpecificCulture = _bNeutral ? IcuLocaleData.GetSpecificCultureName(_sRealName) : _sRealName;
-
  // Remove the sort from sName unless custom culture
  if (index > 0 && !_bNeutral && !IsCustomCultureId(_iLanguage))
  {
@@ -110,7 +108,6 @@ private string IcuGetLocaleInfo(LocaleStringData type)
  {
  Debug.Assert(!GlobalizationMode.Invariant);
  Debug.Assert(!GlobalizationMode.UseNls);
-
  Debug.Assert(_sWindowsName != null, "[CultureData.IcuGetLocaleInfo] Expected _sWindowsName to be populated already");
  return IcuGetLocaleInfo(_sWindowsName, type);
  }
@@ -138,7 +135,6 @@ private unsafe string IcuGetLocaleInfo(string localeName, LocaleStringData type)
  Debug.Fail("[CultureData.IcuGetLocaleInfo(LocaleStringData)] Failed");
  return string.Empty;
  }
-
  return new string(buffer);
  }
 
@@ -226,6 +222,18 @@ private static string IcuGetLanguageDisplayName(string cultureName)
  return null;
  }
 
+ [MethodImpl(MethodImplOptions.AggressiveInlining)]
+ internal static void IcuIsEnsurePredefinedLocaleName(string name)
+ {
+ Debug.Assert(!GlobalizationMode.UseNls);
+
+ if (!Interop.Globalization.IsPredefinedLocale(name))
+ {
+ throw new CultureNotFoundException(nameof(name), SR.Format(SR.Argument_InvalidPredefinedCultureName, name),
+ message: "View https://docs.microsoft.com/en-us/aspnet/core/blazor/globalization-localization?view=aspnetcore-5.0#blazor-webassembly to load a new culture");
+ }
+ }
+
  private static string ConvertIcuTimeFormatString(ReadOnlySpan<char> icuFormatString)
  {
  Debug.Assert(icuFormatString.Length < ICU_ULOC_FULLNAME_CAPACITY);

src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.Nls.cs

@@ -5,6 +5,7 @@
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Text;
+using System.Runtime.CompilerServices;
 using Internal.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -85,6 +86,17 @@ private int[] NlsGetLocaleInfo(LocaleGroupingData type)
  return ConvertWin32GroupString(GetLocaleInfoFromLCType(_sWindowsName, (uint)type, _bUseOverrides));
  }
 
+ [MethodImpl(MethodImplOptions.AggressiveInlining)]
+ internal static void NlsIsEnsurePredefinedLocaleName(string name)
+ {
+ Debug.Assert(GlobalizationMode.UseNls);
+
+ if (CultureData.GetLocaleInfoExInt(name, Interop.Kernel32.LOCALE_ICONSTRUCTEDLOCALE) == 1)
+ {
+ throw new CultureNotFoundException(nameof(name), SR.Format(SR.Argument_InvalidPredefinedCultureName, name));
+ }
+ }
+
  private string? NlsGetTimeFormatString()
  {
  Debug.Assert(ShouldUseUserOverrideNlsData);

src/libraries/System.Private.CoreLib/src/System/Globalization/CultureData.cs

@@ -803,6 +803,18 @@ private static string NormalizeCultureName(string name, out bool isNeutralName)
  return CultureData.Invariant;
  }
 
+ if (GlobalizationMode.PredefinedCulturesOnly)
+ {
+ if (GlobalizationMode.UseNls)
+ {
+ NlsIsEnsurePredefinedLocaleName(cultureName);
+ }
+ else
+ {
+ IcuIsEnsurePredefinedLocaleName(cultureName);
+ }
+ }
+
  CultureData culture = new CultureData();
  culture._sRealName = cultureName;
  culture._bUseOverridesUserSetting = useUserOverride;

src/libraries/System.Private.CoreLib/src/System/Globalization/CultureInfo.Icu.cs

@@ -11,10 +11,7 @@ private static CultureInfo IcuGetPredefinedCultureInfo(string name)
  {
  Debug.Assert(!GlobalizationMode.UseNls);
 
- if (!Interop.Globalization.IsPredefinedLocale(name))
- {
- throw new CultureNotFoundException(nameof(name), SR.Format(SR.Argument_InvalidPredefinedCultureName, name));
- }
+ CultureData.IcuIsEnsurePredefinedLocaleName(name);
 
  return GetCultureInfo(name);
  }

src/libraries/System.Private.CoreLib/src/System/Globalization/CultureInfo.Nls.cs

@@ -11,10 +11,7 @@ private static CultureInfo NlsGetPredefinedCultureInfo(string name)
  {
  Debug.Assert(GlobalizationMode.UseNls);
 
- if (CultureData.GetLocaleInfoExInt(name, Interop.Kernel32.LOCALE_ICONSTRUCTEDLOCALE) == 1)
- {
- throw new CultureNotFoundException(nameof(name), SR.Format(SR.Argument_InvalidPredefinedCultureName, name));
- }
+ CultureData.NlsIsEnsurePredefinedLocaleName(name);
 
  return GetCultureInfo(name);
  }

src/libraries/System.Private.CoreLib/src/System/Globalization/GlobalizationMode.cs

@@ -14,6 +14,9 @@ private static bool GetInvariantSwitchValue() =>
  private static bool TryGetAppLocalIcuSwitchValue([NotNullWhen(true)] out string? value) =>
  TryGetStringValue("System.Globalization.AppLocalIcu", "DOTNET_SYSTEM_GLOBALIZATION_APPLOCALICU", out value);
 
+ internal static bool PredefinedCulturesOnly { get; } =
+ GetSwitchValue("System.Globalization.PredefinedCulturesOnly", "DOTNET_SYSTEM_GLOBALIZATION_PREDEFINED_CULTURES_ONLY");
+
  private static bool GetSwitchValue(string switchName, string envVariable)
  {
  if (!AppContext.TryGetSwitch(switchName, out bool ret))

src/libraries/System.Runtime/tests/System/DateTimeTests.cs

@@ -1551,7 +1551,15 @@ public static void TryParseExact_EmptyAMPMDesignator()
  [Fact]
  public static void ParseExact_EscapedSingleQuotes()
  {
- var formatInfo = DateTimeFormatInfo.GetInstance(new CultureInfo("mt-MT"));
+ DateTimeFormatInfo formatInfo;
+ if (PlatformDetection.IsBrowser)
+ {
+ formatInfo = DateTimeFormatInfo.GetInstance(new CultureInfo("id-ID"));
+ }
+ else
+ {
+ formatInfo = DateTimeFormatInfo.GetInstance(new CultureInfo("mt-MT"));
+ }
  const string format = @"dddd, d' ta\' 'MMMM yyyy";
 
  DateTime expected = new DateTime(1999, 2, 28, 17, 00, 01);
@@ -1735,8 +1743,16 @@ public static IEnumerable<object[]> Parse_ValidInput_Succeeds_MemberData()
  hebrewCulture.DateTimeFormat.Calendar = new HebrewCalendar();
  yield return new object[] { today.ToString(hebrewCulture), hebrewCulture, today };
 
- var mongolianCulture = new CultureInfo("mn-MN");
- yield return new object[] { today.ToString(mongolianCulture), mongolianCulture, today };
+ CultureInfo culture;
+ if (PlatformDetection.IsBrowser)
+ {
+ culture = new CultureInfo("pl-PL");
+ }
+ else
+ {
+ culture = new CultureInfo("mn-MN");
+ }
+ yield return new object[] { today.ToString(culture), culture, today };
  }
  }
 

src/mono/wasm/runtime/library_mono.js

@@ -1904,6 +1904,9 @@ var MonoSupportLib = {
 
  if (invariantMode)
  this.mono_wasm_setenv ("DOTNET_SYSTEM_GLOBALIZATION_INVARIANT", "1");
+
+ // Set globalization mode to PredefinedCulturesOnly
+ this.mono_wasm_setenv ("DOTNET_SYSTEM_GLOBALIZATION_PREDEFINED_CULTURES_ONLY", "1");
  },
 
  // Used by the debugger to enumerate loaded dlls and pdbs