Skip to content

Commit 722e19b

Browse files
ilonatommyilonatommy
authored
[browser][non-icu] HybridGlobalization not supported on WASI (#84629)
* Remove WASI targets from HybridGlobalization. * Update docs. * Run tests only on browser. * Do not add these files for WASI. * Tests run only on browser. * Missing removal.
1 parent f4701e2 commit 722e19b

File tree

10 files changed

+38
-38
lines changed

10 files changed

+38
-38
lines changed

‎docs/design/features/hybrid-globalization.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Hybrid mode does not use ICU data for some functions connected with globalizatio
88

99
### WASM
1010

11-
For WebAssembly, both on Browser and WASI, we are using Web API instead of some ICU data.
11+
For WebAssembly in Browser we are using Web API instead of some ICU data.
1212

1313
**Case change**
1414

‎src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ public static string GetDistroVersionString()
355355
public static Version ICUVersion => m_icuVersion.Value;
356356

357357
public static bool IsInvariantGlobalization => m_isInvariant.Value;
358-
public static bool IsHybridGlobalizationOnWasm => m_isHybrid.Value && (IsBrowser || IsWasi);
358+
public static bool IsHybridGlobalizationOnBrowser => m_isHybrid.Value && IsBrowser;
359359
public static bool IsNotInvariantGlobalization => !IsInvariantGlobalization;
360360
public static bool IsIcuGlobalization => ICUVersion > new Version(0, 0, 0, 0);
361361
public static bool IsNlsGlobalization => IsNotInvariantGlobalization && !IsIcuGlobalization;

‎src/libraries/System.Globalization/tests/CompareInfo/CompareInfoTests.Compare.cs‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ public class CompareInfoCompareTests
1515
private static CompareInfo s_turkishCompare = new CultureInfo("tr-TR").CompareInfo;
1616
private static CompareInfo s_japaneseCompare = new CultureInfo("ja-JP").CompareInfo;
1717
private static CompareOptions supportedIgnoreNonSpaceOption =
18-
PlatformDetection.IsHybridGlobalizationOnWasm ?
18+
PlatformDetection.IsHybridGlobalizationOnBrowser ?
1919
CompareOptions.IgnoreNonSpace | CompareOptions.IgnoreKanaType :
2020
CompareOptions.IgnoreNonSpace;
2121

2222
private static CompareOptions supportedIgnoreCaseIgnoreNonSpaceOptions =
23-
PlatformDetection.IsHybridGlobalizationOnWasm ?
23+
PlatformDetection.IsHybridGlobalizationOnBrowser ?
2424
CompareOptions.IgnoreCase | CompareOptions.IgnoreNonSpace | CompareOptions.IgnoreKanaType :
2525
CompareOptions.IgnoreCase | CompareOptions.IgnoreNonSpace;
2626

@@ -38,9 +38,9 @@ public class CompareInfoCompareTests
3838
public static IEnumerable<object[]> Compare_Kana_TestData()
3939
{
4040
// HybridGlobalization does not support IgnoreWidth
41-
if (!PlatformDetection.IsHybridGlobalizationOnWasm)
41+
if (!PlatformDetection.IsHybridGlobalizationOnBrowser)
4242
{
43-
CompareOptions ignoreKanaIgnoreWidthIgnoreCase = CompareOptions.IgnoreKanaType | CompareOptions.IgnoreWidth | CompareOptions.IgnoreCase;
43+
CompareOptions ignoreKanaIgnoreWidthIgnoreCase = CompareOptions.IgnoreKanaType | CompareOptions.IgnoreWidth | CompareOptions.IgnoreCase;
4444
yield return new object[] { s_invariantCompare, "\u3070\u3073\u3076\u3079\u307C", "\u30D0\u30D3\u3076\u30D9\uFF8E\uFF9E", ignoreKanaIgnoreWidthIgnoreCase, 0 };
4545
yield return new object[] { s_invariantCompare, "\u30D0\u30D3\u3076\u30D9\uFF8E\uFF9E", "\u3070\u3073\uFF8C\uFF9E\uFF8D\uFF9E\u307C", ignoreKanaIgnoreWidthIgnoreCase, 0 };
4646
yield return new object[] { s_invariantCompare, "\u3060", "\uFF80\uFF9E", ignoreKanaIgnoreWidthIgnoreCase, 0 };
@@ -65,11 +65,11 @@ public static IEnumerable<object[]> Compare_Kana_TestData()
6565

6666
public static IEnumerable<object[]> Compare_TestData()
6767
{
68-
// PlatformDetection.IsHybridGlobalizationOnWasm does not support IgnoreWidth
69-
CompareOptions ignoredOptions = PlatformDetection.IsHybridGlobalizationOnWasm ?
68+
// PlatformDetection.IsHybridGlobalizationOnBrowser does not support IgnoreWidth
69+
CompareOptions ignoredOptions = PlatformDetection.IsHybridGlobalizationOnBrowser ?
7070
CompareOptions.IgnoreKanaType | CompareOptions.IgnoreCase :
7171
CompareOptions.IgnoreKanaType | CompareOptions.IgnoreWidth | CompareOptions.IgnoreCase;
72-
72+
7373
yield return new object[] { s_invariantCompare, "\u3042", "\u30A2", ignoredOptions, 0 };
7474
yield return new object[] { s_invariantCompare, "\u3042", "\uFF71", ignoredOptions, 0 };
7575

@@ -84,9 +84,9 @@ public static IEnumerable<object[]> Compare_TestData()
8484
yield return new object[] { s_invariantCompare, "ABCDE", "\uFF21\uFF22\uFF23D\uFF25", ignoredOptions, 0 }; // as above
8585
yield return new object[] { s_invariantCompare, "ABCDE", "a\uFF22\uFF23D\uFF25", ignoredOptions, 0 }; // as above
8686
yield return new object[] { s_invariantCompare, "ABCDE", "\uFF41\uFF42\uFF23D\uFF25", ignoredOptions, 0 }; // as above
87-
87+
8888
yield return new object[] { s_invariantCompare, "\u6FA4", "\u6CA2", ignoredOptions, 1 };
89-
89+
9090
yield return new object[] { s_invariantCompare, "\u3070\u3073\u3076\u3079\u307C", "\u30D0\u30D3\u30D6\u30D9\u30DC", ignoredOptions, 0 };
9191
yield return new object[] { s_invariantCompare, "\u3070\u3073\u3076\u3079\u307C", "\u30D0\u30D3\u3076\u30D9\u30DC", ignoredOptions, 0 };
9292
yield return new object[] { s_invariantCompare, "\u3070\u3073\uFF8C\uFF9E\uFF8D\uFF9E\u307C", "\uFF8E\uFF9E", ignoredOptions, -1 };
@@ -97,7 +97,7 @@ public static IEnumerable<object[]> Compare_TestData()
9797
yield return new object[] { s_invariantCompare, "\u3070\u30DC\uFF8C\uFF9E\uFF8D\uFF9E\u307C", "\u3070\uFF8E\uFF9E\u30D6", ignoredOptions, 1 }; // known exception for hg: should be -1
9898
yield return new object[] { s_invariantCompare, "\u3070\u30DC\uFF8C\uFF9E\uFF8D\uFF9E\u307C\u3079\u307C", "\u3079\uFF8E\uFF9E", ignoredOptions, -1 };
9999
yield return new object[] { s_invariantCompare, "\u3070\uFF8C\uFF9E\uFF8D\uFF9E\u307C", "\u30D6", ignoredOptions, -1 };
100-
100+
101101
yield return new object[] { s_invariantCompare, "ABDDE", "D", ignoredOptions, -1 };
102102
yield return new object[] { s_invariantCompare, "ABCDE", "\uFF43D", ignoredOptions, -1 };
103103
yield return new object[] { s_invariantCompare, "ABCDE", "c", ignoredOptions, -1 };
@@ -118,7 +118,7 @@ public static IEnumerable<object[]> Compare_TestData()
118118
yield return new object[] { s_invariantCompare, "10", "1\uFF10", ignoredOptions, 0 }; // as above
119119
yield return new object[] { s_invariantCompare, "9999\uFF1910", "1\uFF10", ignoredOptions, 1 };
120120
yield return new object[] { s_invariantCompare, "9999\uFF191010", "1\uFF10", ignoredOptions, 1 };
121-
121+
122122
yield return new object[] { s_invariantCompare, "'\u3000'", "' '", ignoredOptions, 0 };
123123
yield return new object[] { s_invariantCompare, "\uFF1B", ";", ignoredOptions, 0 }; // known exception for hg: should be 1
124124
yield return new object[] { s_invariantCompare, "\uFF08", "(", ignoredOptions, 0 }; // known exception for hg: should be 1
@@ -243,20 +243,20 @@ public static IEnumerable<object[]> Compare_TestData()
243243
yield return new object[] { s_invariantCompare, "foobar", "FooB\u00C0R", supportedIgnoreNonSpaceOption, -1 };
244244

245245
yield return new object[] { s_invariantCompare, "\uFF9E", "\u3099", supportedIgnoreNonSpaceOption, 0 };
246-
yield return new object[] { s_invariantCompare, "\uFF9E", "\u3099", CompareOptions.IgnoreCase, PlatformDetection.IsHybridGlobalizationOnWasm ? 1 : 0 };
246+
yield return new object[] { s_invariantCompare, "\uFF9E", "\u3099", CompareOptions.IgnoreCase, PlatformDetection.IsHybridGlobalizationOnBrowser ? 1 : 0 };
247247
yield return new object[] { s_invariantCompare, "\u20A9", "\uFFE6", CompareOptions.IgnoreCase, -1 };
248248
yield return new object[] { s_invariantCompare, "\u20A9", "\uFFE6", CompareOptions.None, -1 };
249249
yield return new object[] { s_invariantCompare, "\u0021", "\uFF01", CompareOptions.IgnoreSymbols, 0 };
250250
// some symbols e.g. currencies are not ignored correctly in HybridGlobalization
251-
if (!PlatformDetection.IsHybridGlobalizationOnWasm)
251+
if (!PlatformDetection.IsHybridGlobalizationOnBrowser)
252252
{
253253
yield return new object[] { s_invariantCompare, "\u00A2", "\uFFE0", CompareOptions.IgnoreSymbols, 0 };
254254
yield return new object[] { s_invariantCompare, "$", "&", CompareOptions.IgnoreSymbols, 0 };
255255
}
256256
yield return new object[] { s_invariantCompare, "\uFF65", "\u30FB", CompareOptions.IgnoreSymbols, 0 };
257257
yield return new object[] { s_invariantCompare, "\u0021", "\uFF01", CompareOptions.None, -1 };
258258

259-
if (!PlatformDetection.IsHybridGlobalizationOnWasm)
259+
if (!PlatformDetection.IsHybridGlobalizationOnBrowser)
260260
{
261261
yield return new object[] { s_invariantCompare, "\u20A9", "\uFFE6", CompareOptions.IgnoreWidth, 0 };
262262
yield return new object[] { s_invariantCompare, "\u0021", "\uFF01", CompareOptions.IgnoreWidth, 0 };
@@ -265,13 +265,13 @@ public static IEnumerable<object[]> Compare_TestData()
265265

266266
yield return new object[] { s_invariantCompare, "\uFF66", "\u30F2", CompareOptions.IgnoreSymbols, s_expectedHalfToFullFormsComparison };
267267
yield return new object[] { s_invariantCompare, "\uFF66", "\u30F2", CompareOptions.IgnoreCase, s_expectedHalfToFullFormsComparison };
268-
// in HybridGlobalization on WASM IgnoreNonSpace is not supported and comparison of katakana/hiragana equivalents with supportedIgnoreNonSpaceOption gives 0
269-
if (!PlatformDetection.IsHybridGlobalizationOnWasm)
268+
// in HybridGlobalization on Browser IgnoreNonSpace is not supported and comparison of katakana/hiragana equivalents with supportedIgnoreNonSpaceOption gives 0
269+
if (!PlatformDetection.IsHybridGlobalizationOnBrowser)
270270
yield return new object[] { s_invariantCompare, "\uFF66", "\u30F2", CompareOptions.IgnoreNonSpace, s_expectedHalfToFullFormsComparison };
271271
yield return new object[] { s_invariantCompare, "\uFF66", "\u30F2", CompareOptions.None, s_expectedHalfToFullFormsComparison };
272272

273-
// in HybridGlobalization on WASM IgnoreKanaType is supported only for "ja"
274-
var kanaComparison = PlatformDetection.IsHybridGlobalizationOnWasm ? s_japaneseCompare : s_invariantCompare;
273+
// in HybridGlobalization on Browser IgnoreKanaType is supported only for "ja"
274+
var kanaComparison = PlatformDetection.IsHybridGlobalizationOnBrowser ? s_japaneseCompare : s_invariantCompare;
275275
yield return new object[] { kanaComparison, "\u3060", "\u30C0", CompareOptions.IgnoreKanaType, 0 };
276276
yield return new object[] { kanaComparison, "c", "C", CompareOptions.IgnoreKanaType, -1 };
277277
yield return new object[] { s_invariantCompare, "\u3060", "\u30C0", CompareOptions.IgnoreCase, s_expectedHiraganaToKatakanaCompare };
@@ -296,7 +296,7 @@ public static IEnumerable<object[]> Compare_TestData()
296296
// Misc differences between platforms
297297
bool useNls = PlatformDetection.IsNlsGlobalization;
298298

299-
var supportedCmpOptions = PlatformDetection.IsHybridGlobalizationOnWasm ?
299+
var supportedCmpOptions = PlatformDetection.IsHybridGlobalizationOnBrowser ?
300300
CompareOptions.IgnoreKanaType | CompareOptions.IgnoreCase :
301301
CompareOptions.IgnoreKanaType | CompareOptions.IgnoreWidth | CompareOptions.IgnoreCase;
302302

@@ -538,15 +538,15 @@ public void TestIgnoreKanaAndWidthCases()
538538

539539
// Edge case of the Ignore Width.
540540
Assert.False(string.Compare("\u3162\u3163", "\uFFDB\uFFDC", CultureInfo.InvariantCulture, CompareOptions.None) == 0, $"Expect '0x3162 0x3163' != '0xFFDB 0xFFDC'");
541-
if (!PlatformDetection.IsHybridGlobalizationOnWasm)
541+
if (!PlatformDetection.IsHybridGlobalizationOnBrowser)
542542
Assert.True(string.Compare("\u3162\u3163", "\uFFDB\uFFDC", CultureInfo.InvariantCulture, CompareOptions.IgnoreWidth) == 0, "Expect '0x3162 0x3163' == '0xFFDB 0xFFDC'");
543543

544544
const char hiraganaStart = '\u3041';
545545
const char hiraganaEnd = '\u3096';
546546
const int hiraganaToKatakanaOffset = 0x30a1 - 0x3041;
547547

548-
// in HybridGlobalization on WASM IgnoreKanaType is supported only for "ja-JP"
549-
CultureInfo ignoreKanaTypeTestedCulture = PlatformDetection.IsHybridGlobalizationOnWasm ? new CultureInfo("ja-JP") : CultureInfo.InvariantCulture;
548+
// in HybridGlobalization on Browser IgnoreKanaType is supported only for "ja-JP"
549+
CultureInfo ignoreKanaTypeTestedCulture = PlatformDetection.IsHybridGlobalizationOnBrowser ? new CultureInfo("ja-JP") : CultureInfo.InvariantCulture;
550550

551551
for (Char hiraganaChar = hiraganaStart; hiraganaChar <= hiraganaEnd; hiraganaChar++)
552552
{
@@ -559,7 +559,7 @@ public void TestIgnoreKanaAndWidthCases()
559559

560560
public static IEnumerable<object[]> Compare_HiraganaAndKatakana_TestData()
561561
{
562-
CompareOptions[] optionsPositive = PlatformDetection.IsHybridGlobalizationOnWasm ?
562+
CompareOptions[] optionsPositive = PlatformDetection.IsHybridGlobalizationOnBrowser ?
563563
new[] {
564564
CompareOptions.None,
565565
CompareOptions.IgnoreCase,
@@ -594,7 +594,7 @@ public static IEnumerable<object[]> Compare_HiraganaAndKatakana_TestData()
594594
CompareOptions.IgnoreKanaType | CompareOptions.IgnoreWidth | CompareOptions.IgnoreNonSpace,
595595
CompareOptions.IgnoreKanaType | CompareOptions.IgnoreWidth | CompareOptions.IgnoreCase | CompareOptions.IgnoreNonSpace,
596596
};
597-
CompareOptions[] optionsNegative = PlatformDetection.IsHybridGlobalizationOnWasm ?
597+
CompareOptions[] optionsNegative = PlatformDetection.IsHybridGlobalizationOnBrowser ?
598598
new[] {
599599
CompareOptions.IgnoreNonSpace,
600600
CompareOptions.IgnoreNonSpace | CompareOptions.IgnoreCase,

‎src/libraries/System.Globalization/tests/Hybrid/Hybrid.WASM.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>$(NetCoreAppCurrent)-browser;$(NetCoreAppCurrent)-wasi</TargetFrameworks>
3+
<TargetFramework>$(NetCoreAppCurrent)-browser</TargetFramework>
44
<TestRuntime>true</TestRuntime>
55
<HybridGlobalization>true</HybridGlobalization>
66
</PropertyGroup>

‎src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@
341341
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.Icu.cs" />
342342
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.Invariant.cs" />
343343
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.Nls.cs" />
344-
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.WebAssembly.cs" Condition="'$(TargetsWasi)' == 'true' or '$(TargetsBrowser)' == 'true'"/>
344+
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.WebAssembly.cs" Condition="'$(TargetsBrowser)' == 'true'"/>
345345
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareOptions.cs" />
346346
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.cs" />
347347
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.Icu.cs" />
@@ -399,7 +399,7 @@
399399
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.cs" />
400400
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.Icu.cs" />
401401
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.Nls.cs" />
402-
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.WebAssembly.cs" Condition="'$(TargetsWasi)' == 'true' or '$(TargetsBrowser)' == 'true'" />
402+
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.WebAssembly.cs" Condition="'$(TargetsBrowser)' == 'true'" />
403403
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\ThaiBuddhistCalendar.cs" />
404404
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TimeSpanFormat.cs" />
405405
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TimeSpanParse.cs" />
@@ -1260,10 +1260,10 @@
12601260
<Compile Include="$(MSBuildThisFileDirectory)System\WeakReference.cs" />
12611261
<Compile Include="$(MSBuildThisFileDirectory)System\WeakReference.T.cs" />
12621262
<Compile Include="$(MSBuildThisFileDirectory)System\ComAwareWeakReference.cs" />
1263-
<Compile Include="$(CommonPath)Interop\Browser\Interop.CompareInfo.cs" Condition="'$(TargetsWasi)' == 'true' or '$(TargetsBrowser)' == 'true'">
1263+
<Compile Include="$(CommonPath)Interop\Browser\Interop.CompareInfo.cs" Condition="'$(TargetsBrowser)' == 'true'">
12641264
<Link>Common\Interop\Interop.CompareInfo.cs</Link>
12651265
</Compile>
1266-
<Compile Include="$(CommonPath)Interop\Browser\Interop.TextInfo.cs" Condition="'$(TargetsWasi)' == 'true' or '$(TargetsBrowser)' == 'true'">
1266+
<Compile Include="$(CommonPath)Interop\Browser\Interop.TextInfo.cs" Condition="'$(TargetsBrowser)' == 'true'">
12671267
<Link>Common\Interop\Interop.TextInfo.cs</Link>
12681268
</Compile>
12691269
<Compile Include="$(CommonPath)Interop\Interop.Calendar.cs">
@@ -2610,4 +2610,4 @@
26102610
<Compile Include="$(MSBuildThisFileDirectory)System\Numerics\IUnaryPlusOperators.cs" />
26112611
<Compile Include="$(MSBuildThisFileDirectory)System\Numerics\IUnsignedNumber.cs" />
26122612
</ItemGroup>
2613-
</Project>
2613+
</Project>

‎src/libraries/System.Private.CoreLib/src/System/Globalization/CompareInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ private static void ThrowCompareOptionsCheckFailed(CompareOptions options)
487487
private unsafe int CompareStringCore(ReadOnlySpan<char> string1, ReadOnlySpan<char> string2, CompareOptions options) =>
488488
GlobalizationMode.UseNls ?
489489
NlsCompareString(string1, string2, options) :
490-
#if TARGET_BROWSER || TARGET_WASI
490+
#if TARGET_BROWSER
491491
GlobalizationMode.Hybrid ?
492492
JsCompareString(string1, string2, options) :
493493
#endif

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ internal static partial class GlobalizationMode
1313
private static partial class Settings
1414
{
1515
internal static bool Invariant { get; } = AppContextConfigHelper.GetBooleanConfig("System.Globalization.Invariant", "DOTNET_SYSTEM_GLOBALIZATION_INVARIANT");
16-
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS || TARGET_BROWSER || TARGET_WASI
16+
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS || TARGET_BROWSER
1717
internal static bool Hybrid { get; } = AppContextConfigHelper.GetBooleanConfig("System.Globalization.Hybrid", "DOTNET_SYSTEM_GLOBALIZATION_HYBRID");
1818
#endif
1919
internal static bool PredefinedCulturesOnly { get; } = AppContextConfigHelper.GetBooleanConfig("System.Globalization.PredefinedCulturesOnly", "DOTNET_SYSTEM_GLOBALIZATION_PREDEFINED_CULTURES_ONLY", GlobalizationMode.Invariant);
@@ -23,7 +23,7 @@ private static partial class Settings
2323
// This allows for the whole Settings nested class to be trimmed when Invariant=true, and allows for the Settings
2424
// static cctor (on Unix) to be preserved when Invariant=false.
2525
internal static bool Invariant => Settings.Invariant;
26-
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS || TARGET_BROWSER || TARGET_WASI
26+
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS || TARGET_BROWSER
2727
internal static bool Hybrid => Settings.Hybrid;
2828
#endif
2929
internal static bool PredefinedCulturesOnly => Settings.PredefinedCulturesOnly;

‎src/libraries/System.Private.CoreLib/src/System/Globalization/TextInfo.Icu.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ private static bool NeedsTurkishCasing(string localeName)
1919
internal unsafe void IcuChangeCase(char* src, int srcLen, char* dstBuffer, int dstBufferCapacity, bool bToUpper)
2020
{
2121
Debug.Assert(!GlobalizationMode.Invariant);
22-
#if TARGET_BROWSER || TARGET_WASI
22+
#if TARGET_BROWSER
2323
Debug.Assert(!GlobalizationMode.Hybrid);
2424
#endif
2525
Debug.Assert(!GlobalizationMode.UseNls);

‎src/libraries/System.Private.CoreLib/src/System/Globalization/TextInfo.Nls.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public partial class TextInfo
1010
private unsafe void NlsChangeCase(char* pSource, int pSourceLen, char* pResult, int pResultLen, bool toUpper)
1111
{
1212
Debug.Assert(!GlobalizationMode.Invariant);
13-
#if TARGET_BROWSER || TARGET_WASI
13+
#if TARGET_BROWSER
1414
Debug.Assert(!GlobalizationMode.Hybrid);
1515
#endif
1616
Debug.Assert(GlobalizationMode.UseNls);

0 commit comments

Comments
 (0)