move checks outside of CultureData.cs

Author: tqiu8

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

@@ -805,10 +805,13 @@ private static string NormalizeCultureName(string name, out bool isNeutralName)
 
             if (GlobalizationMode.PredefinedOnly)
             {
-                if (!Interop.Globalization.IsPredefinedLocale(cultureName))
+                if (GlobalizationMode.UseNls)
                 {
-                    throw new CultureNotFoundException(nameof(cultureName), SR.Format(SR.Argument_InvalidPredefinedCultureName, cultureName),
-                        message: "View https://docs.microsoft.com/en-us/aspnet/core/blazor/globalization-localization?view=aspnetcore-5.0#blazor-webassembly to load a new culture");
+                    NlsIsEnsurePredefinedLocaleName(cultureName);
+                }
+                else
+                {
+                    IcuIsEnsurePredefinedLocaleName(cultureName);
                 }
             }
 

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

@@ -11,7 +11,6 @@ internal static partial class GlobalizationMode
 
         internal static bool UseNls => false;
 
-        internal static bool PredefinedOnly { get; } = GetPredefinedOnly();
 
         private static bool GetGlobalizationInvariantMode()
         {

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

@@ -9,8 +9,6 @@ internal static partial class GlobalizationMode
         // So we need Invariant to be initialized first.
         internal static bool Invariant { get; } = GetInvariantSwitchValue();
 
-        internal static bool PredefinedOnly { get; } = GetPredefinedOnly();
-
         internal static bool UseNls { get; } = !Invariant &&
             (GetSwitchValue("System.Globalization.UseNls", "DOTNET_SYSTEM_GLOBALIZATION_USENLS") ||
                 !LoadIcu());

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

@@ -14,8 +14,7 @@ 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 GetPredefinedOnly() =>
-            GetSwitchValue("System.Globalization.PredefinedOnly", "DOTNET_SYSTEM_GLOBALIZATION_PREDEFINED_ONLY");
+        internal static bool PredefinedOnly { get; } = GetSwitchValue("System.Globalization.PredefinedOnly", "DOTNET_SYSTEM_GLOBALIZATION_PREDEFINED_ONLY");
 
         private static bool GetSwitchValue(string switchName, string envVariable)
         {