Skip to content

[iOS] HybridGlobalization Implement missing cases for GlobalizationNative_GetLocaleInfoString#89296

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
mkhamoyan merged 17 commits into from
Aug 1, 2023
Merged

[iOS] HybridGlobalization Implement missing cases for GlobalizationNative_GetLocaleInfoString #89296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
5ac9461
Cahnges to return missing locale properties
mkhamoyan Jul 20, 2023
548e34a
Refactor functions
mkhamoyan Jul 21, 2023
a8976cc
Order test files and add EnglishName tests
mkhamoyan Jul 21, 2023
e6a49f1
Merge branch 'main' into hybrid_locale_properties
mkhamoyan Jul 24, 2023
f17d8c0
update order of LocaleStringData cases
mkhamoyan Jul 24, 2023
f032d86
clean up the code
mkhamoyan Jul 24, 2023
d800ae6
add whitespace
mkhamoyan Jul 25, 2023
8c53bf5
use strncasecmp and minor refactorings
mkhamoyan Jul 25, 2023
f6d9afa
Remove static tables and call icu function
mkhamoyan Jul 26, 2023
4268488
Merge branch 'main' into hybrid_locale_properties
mkhamoyan Jul 27, 2023
8209fa6
Merge branch 'main' into hybrid_locale_properties
mkhamoyan Jul 28, 2023
4cf91d2
Merge branch 'main' into hybrid_locale_properties
mkhamoyan Jul 28, 2023
5afb93a
not run on OSX platform
mkhamoyan Jul 28, 2023
98c2944
Rename OSX files to iOS
mkhamoyan Jul 28, 2023
1234322
update entrypoints
mkhamoyan Jul 28, 2023
a1eadfa
Merge branch 'main' into hybrid_locale_properties
mkhamoyan Jul 31, 2023
6aaa76e
inlcude icu lib files for nativeaot tests
mkhamoyan Jul 31, 2023
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
0 .../Common/src/Interop/Interop.Casing.OSX.cs → .../Common/src/Interop/Interop.Casing.iOS.cs
View file
Open in desktop
File renamed without changes.
0 ...mmon/src/Interop/Interop.Collation.OSX.cs → ...mmon/src/Interop/Interop.Collation.iOS.cs
View file
Open in desktop
File renamed without changes.
0 .../Common/src/Interop/Interop.Locale.OSX.cs → .../Common/src/Interop/Interop.Locale.iOS.cs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/libraries/System.Globalization/tests/CultureInfo/CultureInfoEnglishName.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ public static IEnumerable<object[]> EnglishName_TestData()
{
yield return new object[] { CultureInfo.CurrentCulture.Name, CultureInfo.CurrentCulture.EnglishName };

if (SupportFullGlobalizationData)
if (SupportFullGlobalizationData || PlatformDetection.IsHybridGlobalizationOnOSX)
{
yield return new object[] { "en-US", "English (United States)" };
yield return new object[] { "fr-FR", "French (France)" };
Expand Down
3 changes: 2 additions & 1 deletion src/libraries/System.Globalization/tests/CultureInfo/CultureInfoNativeName.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,11 @@ public static IEnumerable<object[]> NativeName_TestData()
yield return new object[] { CultureInfo.CurrentCulture.Name, CultureInfo.CurrentCulture.NativeName };

// Android has its own ICU, which doesn't 100% map to UsingLimitedCultures
if (PlatformDetection.IsNotUsingLimitedCultures || PlatformDetection.IsAndroid)
if (PlatformDetection.IsNotUsingLimitedCultures || PlatformDetection.IsAndroid || PlatformDetection.IsHybridGlobalizationOnOSX)
{
yield return new object[] { "en-US", "English (United States)" };
yield return new object[] { "en-CA", "English (Canada)" };
yield return new object[] { "en-GB", "English (United Kingdom)" };
}
else
{
Expand Down
31 changes: 31 additions & 0 deletions src/libraries/System.Globalization/tests/CultureInfo/CultureInfoThreeLetterISOInfo.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using Xunit;
using System.Collections.Generic;

namespace System.Globalization.Tests
{
public class CultureInfoThreeLetterISOInfo
{
public static IEnumerable<object[]> RegionInfo_TestData()
{
yield return new object[] { 0x409, 244, "en-US", "USA", "eng" };
yield return new object[] { 0x411, 122, "ja-JP", "JPN", "jpn" };
yield return new object[] { 0x804, 45, "zh-CN", "CHN", "zho" };
yield return new object[] { 0x401, 205, "ar-SA", "SAU", "ara" };
yield return new object[] { 0x412, 134, "ko-KR", "KOR", "kor" };
yield return new object[] { 0x40d, 117, "he-IL", "ISR", "heb" };
}

[Theory]
[MemberData(nameof(RegionInfo_TestData))]
public void MiscTest(int lcid, int geoId, string name, string threeLetterISORegionName, string threeLetterISOLanguageName)
{
RegionInfo ri = new RegionInfo(lcid); // create it with lcid
Assert.Equal(geoId, ri.GeoId);
Assert.Equal(threeLetterISORegionName, ri.ThreeLetterISORegionName);
Assert.Equal(threeLetterISOLanguageName, new CultureInfo(name).ThreeLetterISOLanguageName);
}
}
}
48 changes: 0 additions & 48 deletions src/libraries/System.Globalization/tests/Hybrid/HybridMode.cs
View file
Open in desktop

This file was deleted.

47 changes: 26 additions & 21 deletions src/libraries/System.Globalization/tests/Hybrid/System.Globalization.IOS.Tests.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,39 +5,44 @@
<HybridGlobalization>true</HybridGlobalization>
</PropertyGroup>
<ItemGroup>
<Compile Include="HybridMode.cs" />
<Compile Include="..\CultureInfo\CultureInfoEnglishName.cs" />
<Compile Include="..\CultureInfo\CultureInfoNumberFormat.cs" />
<Compile Include="..\CultureInfo\CultureInfoNames.cs" />
<Compile Include="..\CultureInfo\CultureInfoNativeName.cs" />
<Compile Include="..\CultureInfo\CultureInfoParent.cs" />
<Compile Include="..\CultureInfo\CultureInfoThreeLetterISOInfo.cs" />
<Compile Include="..\CultureInfo\CultureInfoTwoLetterISOLanguageName.cs" />
<Compile Include="..\CompareInfo\CompareInfoTestsBase.cs" />
<Compile Include="..\CompareInfo\CompareInfoTests.Compare.cs" />
<Compile Include="..\CompareInfo\CompareInfoTests.IndexOf.cs" />
<Compile Include="..\CompareInfo\CompareInfoTests.IsPrefix.cs" />
<Compile Include="..\CompareInfo\CompareInfoTests.IsSuffix.cs" />
<Compile Include="..\CompareInfo\CompareInfoTests.LastIndexOf.cs" />
<Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoCalendarWeekRule.cs" />
<Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoData.cs" />
<Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoFirstDayOfWeek.cs" />
<Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoCalendarWeekRule.cs" />
<Compile Include="..\NumberFormatInfo\NumberFormatInfoValidateParseStyle.cs" />
<Compile Include="..\NumberFormatInfo\NumberFormatInfoData.cs" />
<Compile Include="..\NumberFormatInfo\NumberFormatInfoCurrencySymbol.cs" />
<Compile Include="..\NumberFormatInfo\NumberFormatInfoData.cs" />
<Compile Include="..\NumberFormatInfo\NumberFormatInfoNaNSymbol.cs" />
<Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentGroupSeparator.cs" />
<Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentDecimalSeparator.cs" />
<Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentDecimalDigits.cs" />
<Compile Include="..\NumberFormatInfo\NumberFormatInfoPerMilleSymbol.cs" />
<Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentSymbol.cs" />
<Compile Include="..\NumberFormatInfo\NumberFormatInfoPositiveSign.cs" />
<Compile Include="..\NumberFormatInfo\NumberFormatInfoPositiveInfinitySymbol.cs" />
<Compile Include="..\NumberFormatInfo\NumberFormatInfoNegativeSign.cs" />
<Compile Include="..\NumberFormatInfo\NumberFormatInfoNegativeInfinitySymbol.cs" />
<Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberGroupSeparator.cs" />
<Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberDecimalSeparator.cs" />
<Compile Include="..\NumberFormatInfo\NumberFormatInfoNegativeSign.cs" />
<Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberDecimalDigits.cs" />
<Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberDecimalSeparator.cs" />
<Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberGroupSeparator.cs" />
<Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberGroupSizes.cs" />
<Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberNegativePattern.cs" />
<Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentNegativePattern.cs" />
<Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentDecimalDigits.cs" />
<Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentDecimalSeparator.cs" />
<Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentGroupSeparator.cs" />
<Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentGroupSizes.cs" />
<Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentNegativePattern.cs" />
<Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentPositivePattern.cs" />
<Compile Include="..\CompareInfo\CompareInfoTestsBase.cs" />
<Compile Include="..\CompareInfo\CompareInfoTests.Compare.cs" />
<Compile Include="..\CompareInfo\CompareInfoTests.IndexOf.cs" />
<Compile Include="..\CompareInfo\CompareInfoTests.LastIndexOf.cs" />
<Compile Include="..\CompareInfo\CompareInfoTests.IsPrefix.cs" />
<Compile Include="..\CompareInfo\CompareInfoTests.IsSuffix.cs" />
<Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentSymbol.cs" />
<Compile Include="..\NumberFormatInfo\NumberFormatInfoPerMilleSymbol.cs" />
<Compile Include="..\NumberFormatInfo\NumberFormatInfoPositiveInfinitySymbol.cs" />
<Compile Include="..\NumberFormatInfo\NumberFormatInfoPositiveSign.cs" />
<Compile Include="..\NumberFormatInfo\NumberFormatInfoTests.cs" />
<Compile Include="..\NumberFormatInfo\NumberFormatInfoValidateParseStyle.cs" />
<Compile Include="..\System\Globalization\TextInfoTests.cs" />
</ItemGroup>
</Project>
18 changes: 9 additions & 9 deletions src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -332,11 +332,11 @@
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.Nls.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.Utf8.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.WebAssembly.cs" Condition="'$(TargetsBrowser)' == 'true'" />
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.OSX.cs" Condition="'$(IsOSXLike)' == 'true'" />
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.iOS.cs" Condition="'$(IsiOSLike)' == 'true'" />
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareOptions.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.Icu.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.OSX.cs" Condition="'$(IsOSXLike)' == 'true'" />
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.iOS.cs" Condition="'$(IsiOSLike)' == 'true'" />
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.Nls.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureInfo.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureNotFoundException.cs" />
Expand DownExpand Up@@ -391,7 +391,7 @@
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.Icu.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.Nls.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.OSX.cs" Condition="'$(IsOSXLike)' == 'true'" />
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.iOS.cs" Condition="'$(IsiOSLike)' == 'true'" />
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.WebAssembly.cs" Condition="'$(TargetsBrowser)' == 'true'" />
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\ThaiBuddhistCalendar.cs" />
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TimeSpanFormat.cs" />
Expand DownExpand Up@@ -1290,14 +1290,14 @@
<Compile Include="$(CommonPath)Interop\Interop.Casing.cs">
<Link>Common\Interop\Interop.Casing.cs</Link>
</Compile>
<Compile Include="$(CommonPath)Interop\Interop.Casing.OSX.cs" Condition="'$(IsOSXLike)' == 'true'">
<Link>Common\Interop\Interop.Casing.OSX.cs</Link>
<Compile Include="$(CommonPath)Interop\Interop.Casing.iOS.cs" Condition="'$(IsiOSLike)' == 'true'">
<Link>Common\Interop\Interop.Casing.iOS.cs</Link>
</Compile>
<Compile Include="$(CommonPath)Interop\Interop.Collation.cs">
<Link>Common\Interop\Interop.Collation.cs</Link>
</Compile>
<Compile Include="$(CommonPath)Interop\Interop.Collation.OSX.cs" Condition="'$(IsOSXLike)' == 'true'">
<Link>Common\Interop\Interop.Collation.OSX.cs</Link>
<Compile Include="$(CommonPath)Interop\Interop.Collation.iOS.cs" Condition="'$(IsiOSLike)' == 'true'">
<Link>Common\Interop\Interop.Collation.iOS.cs</Link>
</Compile>
<Compile Include="$(CommonPath)Interop\Interop.ICU.cs">
<Link>Common\Interop\Interop.ICU.cs</Link>
Expand All@@ -1311,8 +1311,8 @@
<Compile Include="$(CommonPath)Interop\Interop.Locale.cs">
<Link>Common\Interop\Interop.Locale.cs</Link>
</Compile>
<Compile Include="$(CommonPath)Interop\Interop.Locale.OSX.cs" Condition="'$(IsOSXLike)' == 'true'">
<Link>Common\Interop\Interop.Locale.OSX.cs</Link>
<Compile Include="$(CommonPath)Interop\Interop.Locale.iOS.cs" Condition="'$(IsiOSLike)' == 'true'">
<Link>Common\Interop\Interop.Locale.iOS.cs</Link>
</Compile>
<Compile Include="$(CommonPath)Interop\Interop.Normalization.cs">
<Link>Common\Interop\Interop.Normalization.cs</Link>
Expand Down
20 changes: 10 additions & 10 deletions src/libraries/System.Private.CoreLib/src/System/Globalization/CompareInfo.Icu.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ private void IcuInitSortHandle(string interopCultureName)
_isAsciiEqualityOrdinal = GetIsAsciiEqualityOrdinal(interopCultureName);
if (!GlobalizationMode.Invariant)
{
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS || TARGET_BROWSER
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS || TARGET_BROWSER
if (GlobalizationMode.Hybrid)
return;
#endif
Expand DownExpand Up@@ -84,7 +84,7 @@ private unsafe int IcuIndexOfCore(ReadOnlySpan<char> source, ReadOnlySpan<char>
fixed (char* pSource = &MemoryMarshal.GetReference(source))
fixed (char* pTarget = &MemoryMarshal.GetReference(target))
{
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
if (GlobalizationMode.Hybrid)
return IndexOfCoreNative(pTarget, target.Length, pSource, source.Length, options, fromBeginning, matchLengthPtr);
#endif
Expand DownExpand Up@@ -203,7 +203,7 @@ private unsafe int IndexOfOrdinalIgnoreCaseHelper(ReadOnlySpan<char> source, Rea
throw new Exception((string)ex_result);
return result;
}
#elif TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#elif TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
if (GlobalizationMode.Hybrid)
return IndexOfCoreNative(b, target.Length, a, source.Length, options, fromBeginning, matchLengthPtr);
#endif
Expand DownExpand Up@@ -305,7 +305,7 @@ private unsafe int IndexOfOrdinalHelper(ReadOnlySpan<char> source, ReadOnlySpan<
throw new Exception((string)ex_result);
return result;
}
#elif TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#elif TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
if (GlobalizationMode.Hybrid)
return IndexOfCoreNative(b, target.Length, a, source.Length, options, fromBeginning, matchLengthPtr);
#endif
Expand DownExpand Up@@ -337,7 +337,7 @@ private unsafe bool IcuStartsWith(ReadOnlySpan<char> source, ReadOnlySpan<char>
fixed (char* pSource = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
fixed (char* pPrefix = &MemoryMarshal.GetReference(prefix))
{
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
if (GlobalizationMode.Hybrid)
return NativeStartsWith(pPrefix, prefix.Length, pSource, source.Length, options);
#endif
Expand DownExpand Up@@ -420,7 +420,7 @@ private unsafe bool StartsWithOrdinalIgnoreCaseHelper(ReadOnlySpan<char> source,
return true;

InteropCall:
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
if (GlobalizationMode.Hybrid)
return NativeStartsWith(bp, prefix.Length, ap, source.Length, options);
#endif
Expand DownExpand Up@@ -492,7 +492,7 @@ private unsafe bool StartsWithOrdinalHelper(ReadOnlySpan<char> source, ReadOnlyS
return true;

InteropCall:
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
if (GlobalizationMode.Hybrid)
return NativeStartsWith(bp, prefix.Length, ap, source.Length, options);
#endif
Expand DownExpand Up@@ -521,7 +521,7 @@ private unsafe bool IcuEndsWith(ReadOnlySpan<char> source, ReadOnlySpan<char> su
fixed (char* pSource = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
fixed (char* pSuffix = &MemoryMarshal.GetReference(suffix))
{
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
if (GlobalizationMode.Hybrid)
return NativeEndsWith(pSuffix, suffix.Length, pSource, source.Length, options);
#endif
Expand DownExpand Up@@ -605,7 +605,7 @@ private unsafe bool EndsWithOrdinalIgnoreCaseHelper(ReadOnlySpan<char> source, R
return true;

InteropCall:
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
if (GlobalizationMode.Hybrid)
return NativeEndsWith(bp, suffix.Length, ap, source.Length, options);
#endif
Expand DownExpand Up@@ -677,7 +677,7 @@ private unsafe bool EndsWithOrdinalHelper(ReadOnlySpan<char> source, ReadOnlySpa
return true;

InteropCall:
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
if (GlobalizationMode.Hybrid)
return NativeEndsWith(bp, suffix.Length, ap, source.Length, options);
#endif
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
[iOS] HybridGlobalization Implement missing cases for GlobalizationNative_GetLocaleInfoString by mkhamoyan · Pull Request #89296 · dotnet/runtime · GitHub
Skip to content
[iOS] HybridGlobalization Implement missing cases for GlobalizationNative_GetLocaleInfoString#89296

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

mkhamoyan
merged 17 commits into

from

Aug 1, 2023
 Merged


[iOS] HybridGlobalization Implement missing cases for GlobalizationNative_GetLocaleInfoString
#89296
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


17 commits


Select commit
Hold shift + click to select a range
5ac9461

Cahnges to return missing locale properties


mkhamoyan Jul 20, 2023
548e34a

Refactor functions


mkhamoyan Jul 21, 2023
a8976cc

Order test files and add EnglishName tests


mkhamoyan Jul 21, 2023
e6a49f1

Merge branch 'main' into hybrid_locale_properties


mkhamoyan Jul 24, 2023
f17d8c0

update order of LocaleStringData cases


mkhamoyan Jul 24, 2023
f032d86

clean up the code


mkhamoyan Jul 24, 2023
d800ae6

add whitespace


mkhamoyan Jul 25, 2023
8c53bf5

use strncasecmp and minor refactorings


mkhamoyan Jul 25, 2023
f6d9afa

Remove static tables and call icu function


mkhamoyan Jul 26, 2023
4268488

Merge branch 'main' into hybrid_locale_properties


mkhamoyan Jul 27, 2023
8209fa6

Merge branch 'main' into hybrid_locale_properties


mkhamoyan Jul 28, 2023
4cf91d2

Merge branch 'main' into hybrid_locale_properties


mkhamoyan Jul 28, 2023
5afb93a

not run on OSX platform


mkhamoyan Jul 28, 2023
98c2944

Rename OSX files to iOS


mkhamoyan Jul 28, 2023
1234322

update entrypoints


mkhamoyan Jul 28, 2023
a1eadfa

Merge branch 'main' into hybrid_locale_properties


mkhamoyan Jul 31, 2023
6aaa76e

inlcude icu lib files for nativeaot tests


mkhamoyan Jul 31, 2023

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


0
.../Common/src/Interop/Interop.Casing.OSX.cs → .../Common/src/Interop/Interop.Casing.iOS.cs

View file


Open in desktop


File renamed without changes.


0
...mmon/src/Interop/Interop.Collation.OSX.cs → ...mmon/src/Interop/Interop.Collation.iOS.cs

View file


Open in desktop


File renamed without changes.


0
.../Common/src/Interop/Interop.Locale.OSX.cs → .../Common/src/Interop/Interop.Locale.iOS.cs

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
src/libraries/System.Globalization/tests/CultureInfo/CultureInfoEnglishName.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ public static IEnumerable<object[]> EnglishName_TestData()
 {
 yield return new object[] { CultureInfo.CurrentCulture.Name, CultureInfo.CurrentCulture.EnglishName };

 if (SupportFullGlobalizationData)
 if (SupportFullGlobalizationData || PlatformDetection.IsHybridGlobalizationOnOSX)
 {
 yield return new object[] { "en-US", "English (United States)" };
 yield return new object[] { "fr-FR", "French (France)" };
Expand Down

3 changes: 2 additions & 1 deletion
src/libraries/System.Globalization/tests/CultureInfo/CultureInfoNativeName.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,11 @@ public static IEnumerable<object[]> NativeName_TestData()
 yield return new object[] { CultureInfo.CurrentCulture.Name, CultureInfo.CurrentCulture.NativeName };

 // Android has its own ICU, which doesn't 100% map to UsingLimitedCultures
 if (PlatformDetection.IsNotUsingLimitedCultures || PlatformDetection.IsAndroid)
 if (PlatformDetection.IsNotUsingLimitedCultures || PlatformDetection.IsAndroid || PlatformDetection.IsHybridGlobalizationOnOSX)
 {
 yield return new object[] { "en-US", "English (United States)" };
 yield return new object[] { "en-CA", "English (Canada)" };
 yield return new object[] { "en-GB", "English (United Kingdom)" };
 }
 else
 {
Expand Down

31 changes: 31 additions & 0 deletions
src/libraries/System.Globalization/tests/CultureInfo/CultureInfoThreeLetterISOInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using Xunit;
using System.Collections.Generic;

namespace System.Globalization.Tests
{
 public class CultureInfoThreeLetterISOInfo
 {
 public static IEnumerable<object[]> RegionInfo_TestData()
 {
 yield return new object[] { 0x409, 244, "en-US", "USA", "eng" };
 yield return new object[] { 0x411, 122, "ja-JP", "JPN", "jpn" };
 yield return new object[] { 0x804, 45, "zh-CN", "CHN", "zho" };
 yield return new object[] { 0x401, 205, "ar-SA", "SAU", "ara" };
 yield return new object[] { 0x412, 134, "ko-KR", "KOR", "kor" };
 yield return new object[] { 0x40d, 117, "he-IL", "ISR", "heb" };
 }

 [Theory]
 [MemberData(nameof(RegionInfo_TestData))]
 public void MiscTest(int lcid, int geoId, string name, string threeLetterISORegionName, string threeLetterISOLanguageName)
 {
 RegionInfo ri = new RegionInfo(lcid); // create it with lcid
 Assert.Equal(geoId, ri.GeoId);
 Assert.Equal(threeLetterISORegionName, ri.ThreeLetterISORegionName);
 Assert.Equal(threeLetterISOLanguageName, new CultureInfo(name).ThreeLetterISOLanguageName);
 }
 }
}

48 changes: 0 additions & 48 deletions
src/libraries/System.Globalization/tests/Hybrid/HybridMode.cs

View file


Open in desktop


This file was deleted.


47 changes: 26 additions & 21 deletions
src/libraries/System.Globalization/tests/Hybrid/System.Globalization.IOS.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,39 +5,44 @@
 <HybridGlobalization>true</HybridGlobalization>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="HybridMode.cs" />
 <Compile Include="..\CultureInfo\CultureInfoEnglishName.cs" />
 <Compile Include="..\CultureInfo\CultureInfoNumberFormat.cs" />
 <Compile Include="..\CultureInfo\CultureInfoNames.cs" />
 <Compile Include="..\CultureInfo\CultureInfoNativeName.cs" />
 <Compile Include="..\CultureInfo\CultureInfoParent.cs" />
 <Compile Include="..\CultureInfo\CultureInfoThreeLetterISOInfo.cs" />
 <Compile Include="..\CultureInfo\CultureInfoTwoLetterISOLanguageName.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTestsBase.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.Compare.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.IndexOf.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.IsPrefix.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.IsSuffix.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.LastIndexOf.cs" />
 <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoCalendarWeekRule.cs" />
 <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoData.cs" />
 <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoFirstDayOfWeek.cs" />
 <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoCalendarWeekRule.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoValidateParseStyle.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoData.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoCurrencySymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoData.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNaNSymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentGroupSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentDecimalSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentDecimalDigits.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPerMilleSymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentSymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPositiveSign.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPositiveInfinitySymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNegativeSign.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNegativeInfinitySymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberGroupSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberDecimalSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNegativeSign.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberDecimalDigits.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberDecimalSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberGroupSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberGroupSizes.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberNegativePattern.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentNegativePattern.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentDecimalDigits.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentDecimalSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentGroupSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentGroupSizes.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentNegativePattern.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentPositivePattern.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTestsBase.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.Compare.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.IndexOf.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.LastIndexOf.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.IsPrefix.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.IsSuffix.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentSymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPerMilleSymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPositiveInfinitySymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPositiveSign.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoTests.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoValidateParseStyle.cs" />
 <Compile Include="..\System\Globalization\TextInfoTests.cs" />
 </ItemGroup>
</Project>

18 changes: 9 additions & 9 deletions
src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -332,11 +332,11 @@
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.Nls.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.Utf8.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.WebAssembly.cs" Condition="'$(TargetsBrowser)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.OSX.cs" Condition="'$(IsOSXLike)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.iOS.cs" Condition="'$(IsiOSLike)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareOptions.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.Icu.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.OSX.cs" Condition="'$(IsOSXLike)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.iOS.cs" Condition="'$(IsiOSLike)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.Nls.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureInfo.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureNotFoundException.cs" />
Expand DownExpand Up@@ -391,7 +391,7 @@
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.Icu.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.Nls.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.OSX.cs" Condition="'$(IsOSXLike)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.iOS.cs" Condition="'$(IsiOSLike)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.WebAssembly.cs" Condition="'$(TargetsBrowser)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\ThaiBuddhistCalendar.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TimeSpanFormat.cs" />
Expand DownExpand Up@@ -1290,14 +1290,14 @@
 <Compile Include="$(CommonPath)Interop\Interop.Casing.cs">
 <Link>Common\Interop\Interop.Casing.cs</Link>
 </Compile>
 <Compile Include="$(CommonPath)Interop\Interop.Casing.OSX.cs" Condition="'$(IsOSXLike)' == 'true'">
 <Link>Common\Interop\Interop.Casing.OSX.cs</Link>
 <Compile Include="$(CommonPath)Interop\Interop.Casing.iOS.cs" Condition="'$(IsiOSLike)' == 'true'">
 <Link>Common\Interop\Interop.Casing.iOS.cs</Link>
 </Compile>
 <Compile Include="$(CommonPath)Interop\Interop.Collation.cs">
 <Link>Common\Interop\Interop.Collation.cs</Link>
 </Compile>
 <Compile Include="$(CommonPath)Interop\Interop.Collation.OSX.cs" Condition="'$(IsOSXLike)' == 'true'">
 <Link>Common\Interop\Interop.Collation.OSX.cs</Link>
 <Compile Include="$(CommonPath)Interop\Interop.Collation.iOS.cs" Condition="'$(IsiOSLike)' == 'true'">
 <Link>Common\Interop\Interop.Collation.iOS.cs</Link>
 </Compile>
 <Compile Include="$(CommonPath)Interop\Interop.ICU.cs">
 <Link>Common\Interop\Interop.ICU.cs</Link>
Expand All@@ -1311,8 +1311,8 @@
 <Compile Include="$(CommonPath)Interop\Interop.Locale.cs">
 <Link>Common\Interop\Interop.Locale.cs</Link>
 </Compile>
 <Compile Include="$(CommonPath)Interop\Interop.Locale.OSX.cs" Condition="'$(IsOSXLike)' == 'true'">
 <Link>Common\Interop\Interop.Locale.OSX.cs</Link>
 <Compile Include="$(CommonPath)Interop\Interop.Locale.iOS.cs" Condition="'$(IsiOSLike)' == 'true'">
 <Link>Common\Interop\Interop.Locale.iOS.cs</Link>
 </Compile>
 <Compile Include="$(CommonPath)Interop\Interop.Normalization.cs">
 <Link>Common\Interop\Interop.Normalization.cs</Link>
Expand Down

20 changes: 10 additions & 10 deletions
src/libraries/System.Private.CoreLib/src/System/Globalization/CompareInfo.Icu.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ private void IcuInitSortHandle(string interopCultureName)
 _isAsciiEqualityOrdinal = GetIsAsciiEqualityOrdinal(interopCultureName);
 if (!GlobalizationMode.Invariant)
 {
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS || TARGET_BROWSER
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS || TARGET_BROWSER
 if (GlobalizationMode.Hybrid)
 return;
#endif
Expand DownExpand Up@@ -84,7 +84,7 @@ private unsafe int IcuIndexOfCore(ReadOnlySpan<char> source, ReadOnlySpan<char>
 fixed (char* pSource = &MemoryMarshal.GetReference(source))
 fixed (char* pTarget = &MemoryMarshal.GetReference(target))
 {
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return IndexOfCoreNative(pTarget, target.Length, pSource, source.Length, options, fromBeginning, matchLengthPtr);
#endif
Expand DownExpand Up@@ -203,7 +203,7 @@ private unsafe int IndexOfOrdinalIgnoreCaseHelper(ReadOnlySpan<char> source, Rea
 throw new Exception((string)ex_result);
 return result;
 }
#elif TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#elif TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return IndexOfCoreNative(b, target.Length, a, source.Length, options, fromBeginning, matchLengthPtr);
#endif
Expand DownExpand Up@@ -305,7 +305,7 @@ private unsafe int IndexOfOrdinalHelper(ReadOnlySpan<char> source, ReadOnlySpan<
 throw new Exception((string)ex_result);
 return result;
 }
#elif TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#elif TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return IndexOfCoreNative(b, target.Length, a, source.Length, options, fromBeginning, matchLengthPtr);
#endif
Expand DownExpand Up@@ -337,7 +337,7 @@ private unsafe bool IcuStartsWith(ReadOnlySpan<char> source, ReadOnlySpan<char>
 fixed (char* pSource = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* pPrefix = &MemoryMarshal.GetReference(prefix))
 {
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return NativeStartsWith(pPrefix, prefix.Length, pSource, source.Length, options);
#endif
Expand DownExpand Up@@ -420,7 +420,7 @@ private unsafe bool StartsWithOrdinalIgnoreCaseHelper(ReadOnlySpan<char> source,
 return true;

 InteropCall:
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return NativeStartsWith(bp, prefix.Length, ap, source.Length, options);
#endif
Expand DownExpand Up@@ -492,7 +492,7 @@ private unsafe bool StartsWithOrdinalHelper(ReadOnlySpan<char> source, ReadOnlyS
 return true;

 InteropCall:
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return NativeStartsWith(bp, prefix.Length, ap, source.Length, options);
#endif
Expand DownExpand Up@@ -521,7 +521,7 @@ private unsafe bool IcuEndsWith(ReadOnlySpan<char> source, ReadOnlySpan<char> su
 fixed (char* pSource = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* pSuffix = &MemoryMarshal.GetReference(suffix))
 {
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return NativeEndsWith(pSuffix, suffix.Length, pSource, source.Length, options);
#endif
Expand DownExpand Up@@ -605,7 +605,7 @@ private unsafe bool EndsWithOrdinalIgnoreCaseHelper(ReadOnlySpan<char> source, R
 return true;

 InteropCall:
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return NativeEndsWith(bp, suffix.Length, ap, source.Length, options);
#endif
Expand DownExpand Up@@ -677,7 +677,7 @@ private unsafe bool EndsWithOrdinalHelper(ReadOnlySpan<char> source, ReadOnlySpa
 return true;

 InteropCall:
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return NativeEndsWith(bp, suffix.Length, ap, source.Length, options);
#endif
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[iOS] HybridGlobalization Implement missing cases for GlobalizationNative_GetLocaleInfoString by mkhamoyan · Pull Request #89296 · dotnet/runtime · GitHub
Skip to content
[iOS] HybridGlobalization Implement missing cases for GlobalizationNative_GetLocaleInfoString#89296

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

mkhamoyan
merged 17 commits into

from

Aug 1, 2023
 Merged


[iOS] HybridGlobalization Implement missing cases for GlobalizationNative_GetLocaleInfoString
#89296
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


17 commits


Select commit
Hold shift + click to select a range
5ac9461

Cahnges to return missing locale properties


mkhamoyan Jul 20, 2023
548e34a

Refactor functions


mkhamoyan Jul 21, 2023
a8976cc

Order test files and add EnglishName tests


mkhamoyan Jul 21, 2023
e6a49f1

Merge branch 'main' into hybrid_locale_properties


mkhamoyan Jul 24, 2023
f17d8c0

update order of LocaleStringData cases


mkhamoyan Jul 24, 2023
f032d86

clean up the code


mkhamoyan Jul 24, 2023
d800ae6

add whitespace


mkhamoyan Jul 25, 2023
8c53bf5

use strncasecmp and minor refactorings


mkhamoyan Jul 25, 2023
f6d9afa

Remove static tables and call icu function


mkhamoyan Jul 26, 2023
4268488

Merge branch 'main' into hybrid_locale_properties


mkhamoyan Jul 27, 2023
8209fa6

Merge branch 'main' into hybrid_locale_properties


mkhamoyan Jul 28, 2023
4cf91d2

Merge branch 'main' into hybrid_locale_properties


mkhamoyan Jul 28, 2023
5afb93a

not run on OSX platform


mkhamoyan Jul 28, 2023
98c2944

Rename OSX files to iOS


mkhamoyan Jul 28, 2023
1234322

update entrypoints


mkhamoyan Jul 28, 2023
a1eadfa

Merge branch 'main' into hybrid_locale_properties


mkhamoyan Jul 31, 2023
6aaa76e

inlcude icu lib files for nativeaot tests


mkhamoyan Jul 31, 2023

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


0
.../Common/src/Interop/Interop.Casing.OSX.cs → .../Common/src/Interop/Interop.Casing.iOS.cs

View file


Open in desktop


File renamed without changes.


0
...mmon/src/Interop/Interop.Collation.OSX.cs → ...mmon/src/Interop/Interop.Collation.iOS.cs

View file


Open in desktop


File renamed without changes.


0
.../Common/src/Interop/Interop.Locale.OSX.cs → .../Common/src/Interop/Interop.Locale.iOS.cs

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
src/libraries/System.Globalization/tests/CultureInfo/CultureInfoEnglishName.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ public static IEnumerable<object[]> EnglishName_TestData()
 {
 yield return new object[] { CultureInfo.CurrentCulture.Name, CultureInfo.CurrentCulture.EnglishName };

 if (SupportFullGlobalizationData)
 if (SupportFullGlobalizationData || PlatformDetection.IsHybridGlobalizationOnOSX)
 {
 yield return new object[] { "en-US", "English (United States)" };
 yield return new object[] { "fr-FR", "French (France)" };
Expand Down

3 changes: 2 additions & 1 deletion
src/libraries/System.Globalization/tests/CultureInfo/CultureInfoNativeName.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,11 @@ public static IEnumerable<object[]> NativeName_TestData()
 yield return new object[] { CultureInfo.CurrentCulture.Name, CultureInfo.CurrentCulture.NativeName };

 // Android has its own ICU, which doesn't 100% map to UsingLimitedCultures
 if (PlatformDetection.IsNotUsingLimitedCultures || PlatformDetection.IsAndroid)
 if (PlatformDetection.IsNotUsingLimitedCultures || PlatformDetection.IsAndroid || PlatformDetection.IsHybridGlobalizationOnOSX)
 {
 yield return new object[] { "en-US", "English (United States)" };
 yield return new object[] { "en-CA", "English (Canada)" };
 yield return new object[] { "en-GB", "English (United Kingdom)" };
 }
 else
 {
Expand Down

31 changes: 31 additions & 0 deletions
src/libraries/System.Globalization/tests/CultureInfo/CultureInfoThreeLetterISOInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using Xunit;
using System.Collections.Generic;

namespace System.Globalization.Tests
{
 public class CultureInfoThreeLetterISOInfo
 {
 public static IEnumerable<object[]> RegionInfo_TestData()
 {
 yield return new object[] { 0x409, 244, "en-US", "USA", "eng" };
 yield return new object[] { 0x411, 122, "ja-JP", "JPN", "jpn" };
 yield return new object[] { 0x804, 45, "zh-CN", "CHN", "zho" };
 yield return new object[] { 0x401, 205, "ar-SA", "SAU", "ara" };
 yield return new object[] { 0x412, 134, "ko-KR", "KOR", "kor" };
 yield return new object[] { 0x40d, 117, "he-IL", "ISR", "heb" };
 }

 [Theory]
 [MemberData(nameof(RegionInfo_TestData))]
 public void MiscTest(int lcid, int geoId, string name, string threeLetterISORegionName, string threeLetterISOLanguageName)
 {
 RegionInfo ri = new RegionInfo(lcid); // create it with lcid
 Assert.Equal(geoId, ri.GeoId);
 Assert.Equal(threeLetterISORegionName, ri.ThreeLetterISORegionName);
 Assert.Equal(threeLetterISOLanguageName, new CultureInfo(name).ThreeLetterISOLanguageName);
 }
 }
}

48 changes: 0 additions & 48 deletions
src/libraries/System.Globalization/tests/Hybrid/HybridMode.cs

View file


Open in desktop


This file was deleted.


47 changes: 26 additions & 21 deletions
src/libraries/System.Globalization/tests/Hybrid/System.Globalization.IOS.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,39 +5,44 @@
 <HybridGlobalization>true</HybridGlobalization>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="HybridMode.cs" />
 <Compile Include="..\CultureInfo\CultureInfoEnglishName.cs" />
 <Compile Include="..\CultureInfo\CultureInfoNumberFormat.cs" />
 <Compile Include="..\CultureInfo\CultureInfoNames.cs" />
 <Compile Include="..\CultureInfo\CultureInfoNativeName.cs" />
 <Compile Include="..\CultureInfo\CultureInfoParent.cs" />
 <Compile Include="..\CultureInfo\CultureInfoThreeLetterISOInfo.cs" />
 <Compile Include="..\CultureInfo\CultureInfoTwoLetterISOLanguageName.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTestsBase.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.Compare.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.IndexOf.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.IsPrefix.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.IsSuffix.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.LastIndexOf.cs" />
 <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoCalendarWeekRule.cs" />
 <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoData.cs" />
 <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoFirstDayOfWeek.cs" />
 <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoCalendarWeekRule.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoValidateParseStyle.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoData.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoCurrencySymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoData.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNaNSymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentGroupSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentDecimalSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentDecimalDigits.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPerMilleSymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentSymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPositiveSign.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPositiveInfinitySymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNegativeSign.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNegativeInfinitySymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberGroupSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberDecimalSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNegativeSign.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberDecimalDigits.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberDecimalSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberGroupSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberGroupSizes.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberNegativePattern.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentNegativePattern.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentDecimalDigits.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentDecimalSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentGroupSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentGroupSizes.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentNegativePattern.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentPositivePattern.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTestsBase.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.Compare.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.IndexOf.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.LastIndexOf.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.IsPrefix.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.IsSuffix.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentSymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPerMilleSymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPositiveInfinitySymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPositiveSign.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoTests.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoValidateParseStyle.cs" />
 <Compile Include="..\System\Globalization\TextInfoTests.cs" />
 </ItemGroup>
</Project>

18 changes: 9 additions & 9 deletions
src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -332,11 +332,11 @@
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.Nls.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.Utf8.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.WebAssembly.cs" Condition="'$(TargetsBrowser)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.OSX.cs" Condition="'$(IsOSXLike)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.iOS.cs" Condition="'$(IsiOSLike)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareOptions.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.Icu.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.OSX.cs" Condition="'$(IsOSXLike)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.iOS.cs" Condition="'$(IsiOSLike)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.Nls.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureInfo.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureNotFoundException.cs" />
Expand DownExpand Up@@ -391,7 +391,7 @@
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.Icu.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.Nls.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.OSX.cs" Condition="'$(IsOSXLike)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.iOS.cs" Condition="'$(IsiOSLike)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.WebAssembly.cs" Condition="'$(TargetsBrowser)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\ThaiBuddhistCalendar.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TimeSpanFormat.cs" />
Expand DownExpand Up@@ -1290,14 +1290,14 @@
 <Compile Include="$(CommonPath)Interop\Interop.Casing.cs">
 <Link>Common\Interop\Interop.Casing.cs</Link>
 </Compile>
 <Compile Include="$(CommonPath)Interop\Interop.Casing.OSX.cs" Condition="'$(IsOSXLike)' == 'true'">
 <Link>Common\Interop\Interop.Casing.OSX.cs</Link>
 <Compile Include="$(CommonPath)Interop\Interop.Casing.iOS.cs" Condition="'$(IsiOSLike)' == 'true'">
 <Link>Common\Interop\Interop.Casing.iOS.cs</Link>
 </Compile>
 <Compile Include="$(CommonPath)Interop\Interop.Collation.cs">
 <Link>Common\Interop\Interop.Collation.cs</Link>
 </Compile>
 <Compile Include="$(CommonPath)Interop\Interop.Collation.OSX.cs" Condition="'$(IsOSXLike)' == 'true'">
 <Link>Common\Interop\Interop.Collation.OSX.cs</Link>
 <Compile Include="$(CommonPath)Interop\Interop.Collation.iOS.cs" Condition="'$(IsiOSLike)' == 'true'">
 <Link>Common\Interop\Interop.Collation.iOS.cs</Link>
 </Compile>
 <Compile Include="$(CommonPath)Interop\Interop.ICU.cs">
 <Link>Common\Interop\Interop.ICU.cs</Link>
Expand All@@ -1311,8 +1311,8 @@
 <Compile Include="$(CommonPath)Interop\Interop.Locale.cs">
 <Link>Common\Interop\Interop.Locale.cs</Link>
 </Compile>
 <Compile Include="$(CommonPath)Interop\Interop.Locale.OSX.cs" Condition="'$(IsOSXLike)' == 'true'">
 <Link>Common\Interop\Interop.Locale.OSX.cs</Link>
 <Compile Include="$(CommonPath)Interop\Interop.Locale.iOS.cs" Condition="'$(IsiOSLike)' == 'true'">
 <Link>Common\Interop\Interop.Locale.iOS.cs</Link>
 </Compile>
 <Compile Include="$(CommonPath)Interop\Interop.Normalization.cs">
 <Link>Common\Interop\Interop.Normalization.cs</Link>
Expand Down

20 changes: 10 additions & 10 deletions
src/libraries/System.Private.CoreLib/src/System/Globalization/CompareInfo.Icu.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ private void IcuInitSortHandle(string interopCultureName)
 _isAsciiEqualityOrdinal = GetIsAsciiEqualityOrdinal(interopCultureName);
 if (!GlobalizationMode.Invariant)
 {
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS || TARGET_BROWSER
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS || TARGET_BROWSER
 if (GlobalizationMode.Hybrid)
 return;
#endif
Expand DownExpand Up@@ -84,7 +84,7 @@ private unsafe int IcuIndexOfCore(ReadOnlySpan<char> source, ReadOnlySpan<char>
 fixed (char* pSource = &MemoryMarshal.GetReference(source))
 fixed (char* pTarget = &MemoryMarshal.GetReference(target))
 {
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return IndexOfCoreNative(pTarget, target.Length, pSource, source.Length, options, fromBeginning, matchLengthPtr);
#endif
Expand DownExpand Up@@ -203,7 +203,7 @@ private unsafe int IndexOfOrdinalIgnoreCaseHelper(ReadOnlySpan<char> source, Rea
 throw new Exception((string)ex_result);
 return result;
 }
#elif TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#elif TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return IndexOfCoreNative(b, target.Length, a, source.Length, options, fromBeginning, matchLengthPtr);
#endif
Expand DownExpand Up@@ -305,7 +305,7 @@ private unsafe int IndexOfOrdinalHelper(ReadOnlySpan<char> source, ReadOnlySpan<
 throw new Exception((string)ex_result);
 return result;
 }
#elif TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#elif TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return IndexOfCoreNative(b, target.Length, a, source.Length, options, fromBeginning, matchLengthPtr);
#endif
Expand DownExpand Up@@ -337,7 +337,7 @@ private unsafe bool IcuStartsWith(ReadOnlySpan<char> source, ReadOnlySpan<char>
 fixed (char* pSource = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* pPrefix = &MemoryMarshal.GetReference(prefix))
 {
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return NativeStartsWith(pPrefix, prefix.Length, pSource, source.Length, options);
#endif
Expand DownExpand Up@@ -420,7 +420,7 @@ private unsafe bool StartsWithOrdinalIgnoreCaseHelper(ReadOnlySpan<char> source,
 return true;

 InteropCall:
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return NativeStartsWith(bp, prefix.Length, ap, source.Length, options);
#endif
Expand DownExpand Up@@ -492,7 +492,7 @@ private unsafe bool StartsWithOrdinalHelper(ReadOnlySpan<char> source, ReadOnlyS
 return true;

 InteropCall:
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return NativeStartsWith(bp, prefix.Length, ap, source.Length, options);
#endif
Expand DownExpand Up@@ -521,7 +521,7 @@ private unsafe bool IcuEndsWith(ReadOnlySpan<char> source, ReadOnlySpan<char> su
 fixed (char* pSource = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* pSuffix = &MemoryMarshal.GetReference(suffix))
 {
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return NativeEndsWith(pSuffix, suffix.Length, pSource, source.Length, options);
#endif
Expand DownExpand Up@@ -605,7 +605,7 @@ private unsafe bool EndsWithOrdinalIgnoreCaseHelper(ReadOnlySpan<char> source, R
 return true;

 InteropCall:
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return NativeEndsWith(bp, suffix.Length, ap, source.Length, options);
#endif
Expand DownExpand Up@@ -677,7 +677,7 @@ private unsafe bool EndsWithOrdinalHelper(ReadOnlySpan<char> source, ReadOnlySpa
 return true;

 InteropCall:
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return NativeEndsWith(bp, suffix.Length, ap, source.Length, options);
#endif
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[iOS] HybridGlobalization Implement missing cases for GlobalizationNative_GetLocaleInfoString by mkhamoyan · Pull Request #89296 · dotnet/runtime · GitHub
Skip to content
[iOS] HybridGlobalization Implement missing cases for GlobalizationNative_GetLocaleInfoString#89296

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

mkhamoyan
merged 17 commits into

from

Aug 1, 2023
 Merged


[iOS] HybridGlobalization Implement missing cases for GlobalizationNative_GetLocaleInfoString
#89296
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


17 commits


Select commit
Hold shift + click to select a range
5ac9461

Cahnges to return missing locale properties


mkhamoyan Jul 20, 2023
548e34a

Refactor functions


mkhamoyan Jul 21, 2023
a8976cc

Order test files and add EnglishName tests


mkhamoyan Jul 21, 2023
e6a49f1

Merge branch 'main' into hybrid_locale_properties


mkhamoyan Jul 24, 2023
f17d8c0

update order of LocaleStringData cases


mkhamoyan Jul 24, 2023
f032d86

clean up the code


mkhamoyan Jul 24, 2023
d800ae6

add whitespace


mkhamoyan Jul 25, 2023
8c53bf5

use strncasecmp and minor refactorings


mkhamoyan Jul 25, 2023
f6d9afa

Remove static tables and call icu function


mkhamoyan Jul 26, 2023
4268488

Merge branch 'main' into hybrid_locale_properties


mkhamoyan Jul 27, 2023
8209fa6

Merge branch 'main' into hybrid_locale_properties


mkhamoyan Jul 28, 2023
4cf91d2

Merge branch 'main' into hybrid_locale_properties


mkhamoyan Jul 28, 2023
5afb93a

not run on OSX platform


mkhamoyan Jul 28, 2023
98c2944

Rename OSX files to iOS


mkhamoyan Jul 28, 2023
1234322

update entrypoints


mkhamoyan Jul 28, 2023
a1eadfa

Merge branch 'main' into hybrid_locale_properties


mkhamoyan Jul 31, 2023
6aaa76e

inlcude icu lib files for nativeaot tests


mkhamoyan Jul 31, 2023

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


0
.../Common/src/Interop/Interop.Casing.OSX.cs → .../Common/src/Interop/Interop.Casing.iOS.cs

View file


Open in desktop


File renamed without changes.


0
...mmon/src/Interop/Interop.Collation.OSX.cs → ...mmon/src/Interop/Interop.Collation.iOS.cs

View file


Open in desktop


File renamed without changes.


0
.../Common/src/Interop/Interop.Locale.OSX.cs → .../Common/src/Interop/Interop.Locale.iOS.cs

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
src/libraries/System.Globalization/tests/CultureInfo/CultureInfoEnglishName.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ public static IEnumerable<object[]> EnglishName_TestData()
 {
 yield return new object[] { CultureInfo.CurrentCulture.Name, CultureInfo.CurrentCulture.EnglishName };

 if (SupportFullGlobalizationData)
 if (SupportFullGlobalizationData || PlatformDetection.IsHybridGlobalizationOnOSX)
 {
 yield return new object[] { "en-US", "English (United States)" };
 yield return new object[] { "fr-FR", "French (France)" };
Expand Down

3 changes: 2 additions & 1 deletion
src/libraries/System.Globalization/tests/CultureInfo/CultureInfoNativeName.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,11 @@ public static IEnumerable<object[]> NativeName_TestData()
 yield return new object[] { CultureInfo.CurrentCulture.Name, CultureInfo.CurrentCulture.NativeName };

 // Android has its own ICU, which doesn't 100% map to UsingLimitedCultures
 if (PlatformDetection.IsNotUsingLimitedCultures || PlatformDetection.IsAndroid)
 if (PlatformDetection.IsNotUsingLimitedCultures || PlatformDetection.IsAndroid || PlatformDetection.IsHybridGlobalizationOnOSX)
 {
 yield return new object[] { "en-US", "English (United States)" };
 yield return new object[] { "en-CA", "English (Canada)" };
 yield return new object[] { "en-GB", "English (United Kingdom)" };
 }
 else
 {
Expand Down

31 changes: 31 additions & 0 deletions
src/libraries/System.Globalization/tests/CultureInfo/CultureInfoThreeLetterISOInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using Xunit;
using System.Collections.Generic;

namespace System.Globalization.Tests
{
 public class CultureInfoThreeLetterISOInfo
 {
 public static IEnumerable<object[]> RegionInfo_TestData()
 {
 yield return new object[] { 0x409, 244, "en-US", "USA", "eng" };
 yield return new object[] { 0x411, 122, "ja-JP", "JPN", "jpn" };
 yield return new object[] { 0x804, 45, "zh-CN", "CHN", "zho" };
 yield return new object[] { 0x401, 205, "ar-SA", "SAU", "ara" };
 yield return new object[] { 0x412, 134, "ko-KR", "KOR", "kor" };
 yield return new object[] { 0x40d, 117, "he-IL", "ISR", "heb" };
 }

 [Theory]
 [MemberData(nameof(RegionInfo_TestData))]
 public void MiscTest(int lcid, int geoId, string name, string threeLetterISORegionName, string threeLetterISOLanguageName)
 {
 RegionInfo ri = new RegionInfo(lcid); // create it with lcid
 Assert.Equal(geoId, ri.GeoId);
 Assert.Equal(threeLetterISORegionName, ri.ThreeLetterISORegionName);
 Assert.Equal(threeLetterISOLanguageName, new CultureInfo(name).ThreeLetterISOLanguageName);
 }
 }
}

48 changes: 0 additions & 48 deletions
src/libraries/System.Globalization/tests/Hybrid/HybridMode.cs

View file


Open in desktop


This file was deleted.


47 changes: 26 additions & 21 deletions
src/libraries/System.Globalization/tests/Hybrid/System.Globalization.IOS.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,39 +5,44 @@
 <HybridGlobalization>true</HybridGlobalization>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="HybridMode.cs" />
 <Compile Include="..\CultureInfo\CultureInfoEnglishName.cs" />
 <Compile Include="..\CultureInfo\CultureInfoNumberFormat.cs" />
 <Compile Include="..\CultureInfo\CultureInfoNames.cs" />
 <Compile Include="..\CultureInfo\CultureInfoNativeName.cs" />
 <Compile Include="..\CultureInfo\CultureInfoParent.cs" />
 <Compile Include="..\CultureInfo\CultureInfoThreeLetterISOInfo.cs" />
 <Compile Include="..\CultureInfo\CultureInfoTwoLetterISOLanguageName.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTestsBase.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.Compare.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.IndexOf.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.IsPrefix.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.IsSuffix.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.LastIndexOf.cs" />
 <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoCalendarWeekRule.cs" />
 <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoData.cs" />
 <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoFirstDayOfWeek.cs" />
 <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoCalendarWeekRule.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoValidateParseStyle.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoData.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoCurrencySymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoData.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNaNSymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentGroupSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentDecimalSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentDecimalDigits.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPerMilleSymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentSymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPositiveSign.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPositiveInfinitySymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNegativeSign.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNegativeInfinitySymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberGroupSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberDecimalSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNegativeSign.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberDecimalDigits.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberDecimalSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberGroupSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberGroupSizes.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberNegativePattern.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentNegativePattern.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentDecimalDigits.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentDecimalSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentGroupSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentGroupSizes.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentNegativePattern.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentPositivePattern.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTestsBase.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.Compare.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.IndexOf.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.LastIndexOf.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.IsPrefix.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.IsSuffix.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentSymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPerMilleSymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPositiveInfinitySymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPositiveSign.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoTests.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoValidateParseStyle.cs" />
 <Compile Include="..\System\Globalization\TextInfoTests.cs" />
 </ItemGroup>
</Project>

18 changes: 9 additions & 9 deletions
src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -332,11 +332,11 @@
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.Nls.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.Utf8.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.WebAssembly.cs" Condition="'$(TargetsBrowser)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.OSX.cs" Condition="'$(IsOSXLike)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.iOS.cs" Condition="'$(IsiOSLike)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareOptions.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.Icu.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.OSX.cs" Condition="'$(IsOSXLike)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.iOS.cs" Condition="'$(IsiOSLike)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.Nls.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureInfo.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureNotFoundException.cs" />
Expand DownExpand Up@@ -391,7 +391,7 @@
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.Icu.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.Nls.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.OSX.cs" Condition="'$(IsOSXLike)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.iOS.cs" Condition="'$(IsiOSLike)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.WebAssembly.cs" Condition="'$(TargetsBrowser)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\ThaiBuddhistCalendar.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TimeSpanFormat.cs" />
Expand DownExpand Up@@ -1290,14 +1290,14 @@
 <Compile Include="$(CommonPath)Interop\Interop.Casing.cs">
 <Link>Common\Interop\Interop.Casing.cs</Link>
 </Compile>
 <Compile Include="$(CommonPath)Interop\Interop.Casing.OSX.cs" Condition="'$(IsOSXLike)' == 'true'">
 <Link>Common\Interop\Interop.Casing.OSX.cs</Link>
 <Compile Include="$(CommonPath)Interop\Interop.Casing.iOS.cs" Condition="'$(IsiOSLike)' == 'true'">
 <Link>Common\Interop\Interop.Casing.iOS.cs</Link>
 </Compile>
 <Compile Include="$(CommonPath)Interop\Interop.Collation.cs">
 <Link>Common\Interop\Interop.Collation.cs</Link>
 </Compile>
 <Compile Include="$(CommonPath)Interop\Interop.Collation.OSX.cs" Condition="'$(IsOSXLike)' == 'true'">
 <Link>Common\Interop\Interop.Collation.OSX.cs</Link>
 <Compile Include="$(CommonPath)Interop\Interop.Collation.iOS.cs" Condition="'$(IsiOSLike)' == 'true'">
 <Link>Common\Interop\Interop.Collation.iOS.cs</Link>
 </Compile>
 <Compile Include="$(CommonPath)Interop\Interop.ICU.cs">
 <Link>Common\Interop\Interop.ICU.cs</Link>
Expand All@@ -1311,8 +1311,8 @@
 <Compile Include="$(CommonPath)Interop\Interop.Locale.cs">
 <Link>Common\Interop\Interop.Locale.cs</Link>
 </Compile>
 <Compile Include="$(CommonPath)Interop\Interop.Locale.OSX.cs" Condition="'$(IsOSXLike)' == 'true'">
 <Link>Common\Interop\Interop.Locale.OSX.cs</Link>
 <Compile Include="$(CommonPath)Interop\Interop.Locale.iOS.cs" Condition="'$(IsiOSLike)' == 'true'">
 <Link>Common\Interop\Interop.Locale.iOS.cs</Link>
 </Compile>
 <Compile Include="$(CommonPath)Interop\Interop.Normalization.cs">
 <Link>Common\Interop\Interop.Normalization.cs</Link>
Expand Down

20 changes: 10 additions & 10 deletions
src/libraries/System.Private.CoreLib/src/System/Globalization/CompareInfo.Icu.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ private void IcuInitSortHandle(string interopCultureName)
 _isAsciiEqualityOrdinal = GetIsAsciiEqualityOrdinal(interopCultureName);
 if (!GlobalizationMode.Invariant)
 {
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS || TARGET_BROWSER
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS || TARGET_BROWSER
 if (GlobalizationMode.Hybrid)
 return;
#endif
Expand DownExpand Up@@ -84,7 +84,7 @@ private unsafe int IcuIndexOfCore(ReadOnlySpan<char> source, ReadOnlySpan<char>
 fixed (char* pSource = &MemoryMarshal.GetReference(source))
 fixed (char* pTarget = &MemoryMarshal.GetReference(target))
 {
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return IndexOfCoreNative(pTarget, target.Length, pSource, source.Length, options, fromBeginning, matchLengthPtr);
#endif
Expand DownExpand Up@@ -203,7 +203,7 @@ private unsafe int IndexOfOrdinalIgnoreCaseHelper(ReadOnlySpan<char> source, Rea
 throw new Exception((string)ex_result);
 return result;
 }
#elif TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#elif TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return IndexOfCoreNative(b, target.Length, a, source.Length, options, fromBeginning, matchLengthPtr);
#endif
Expand DownExpand Up@@ -305,7 +305,7 @@ private unsafe int IndexOfOrdinalHelper(ReadOnlySpan<char> source, ReadOnlySpan<
 throw new Exception((string)ex_result);
 return result;
 }
#elif TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#elif TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return IndexOfCoreNative(b, target.Length, a, source.Length, options, fromBeginning, matchLengthPtr);
#endif
Expand DownExpand Up@@ -337,7 +337,7 @@ private unsafe bool IcuStartsWith(ReadOnlySpan<char> source, ReadOnlySpan<char>
 fixed (char* pSource = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* pPrefix = &MemoryMarshal.GetReference(prefix))
 {
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return NativeStartsWith(pPrefix, prefix.Length, pSource, source.Length, options);
#endif
Expand DownExpand Up@@ -420,7 +420,7 @@ private unsafe bool StartsWithOrdinalIgnoreCaseHelper(ReadOnlySpan<char> source,
 return true;

 InteropCall:
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return NativeStartsWith(bp, prefix.Length, ap, source.Length, options);
#endif
Expand DownExpand Up@@ -492,7 +492,7 @@ private unsafe bool StartsWithOrdinalHelper(ReadOnlySpan<char> source, ReadOnlyS
 return true;

 InteropCall:
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return NativeStartsWith(bp, prefix.Length, ap, source.Length, options);
#endif
Expand DownExpand Up@@ -521,7 +521,7 @@ private unsafe bool IcuEndsWith(ReadOnlySpan<char> source, ReadOnlySpan<char> su
 fixed (char* pSource = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* pSuffix = &MemoryMarshal.GetReference(suffix))
 {
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return NativeEndsWith(pSuffix, suffix.Length, pSource, source.Length, options);
#endif
Expand DownExpand Up@@ -605,7 +605,7 @@ private unsafe bool EndsWithOrdinalIgnoreCaseHelper(ReadOnlySpan<char> source, R
 return true;

 InteropCall:
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return NativeEndsWith(bp, suffix.Length, ap, source.Length, options);
#endif
Expand DownExpand Up@@ -677,7 +677,7 @@ private unsafe bool EndsWithOrdinalHelper(ReadOnlySpan<char> source, ReadOnlySpa
 return true;

 InteropCall:
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return NativeEndsWith(bp, suffix.Length, ap, source.Length, options);
#endif
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
[iOS] HybridGlobalization Implement missing cases for GlobalizationNative_GetLocaleInfoString by mkhamoyan · Pull Request #89296 · dotnet/runtime · GitHub
Skip to content
[iOS] HybridGlobalization Implement missing cases for GlobalizationNative_GetLocaleInfoString#89296

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

mkhamoyan
merged 17 commits into

from

Aug 1, 2023
 Merged


[iOS] HybridGlobalization Implement missing cases for GlobalizationNative_GetLocaleInfoString
#89296
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


17 commits


Select commit
Hold shift + click to select a range
5ac9461

Cahnges to return missing locale properties


mkhamoyan Jul 20, 2023
548e34a

Refactor functions


mkhamoyan Jul 21, 2023
a8976cc

Order test files and add EnglishName tests


mkhamoyan Jul 21, 2023
e6a49f1

Merge branch 'main' into hybrid_locale_properties


mkhamoyan Jul 24, 2023
f17d8c0

update order of LocaleStringData cases


mkhamoyan Jul 24, 2023
f032d86

clean up the code


mkhamoyan Jul 24, 2023
d800ae6

add whitespace


mkhamoyan Jul 25, 2023
8c53bf5

use strncasecmp and minor refactorings


mkhamoyan Jul 25, 2023
f6d9afa

Remove static tables and call icu function


mkhamoyan Jul 26, 2023
4268488

Merge branch 'main' into hybrid_locale_properties


mkhamoyan Jul 27, 2023
8209fa6

Merge branch 'main' into hybrid_locale_properties


mkhamoyan Jul 28, 2023
4cf91d2

Merge branch 'main' into hybrid_locale_properties


mkhamoyan Jul 28, 2023
5afb93a

not run on OSX platform


mkhamoyan Jul 28, 2023
98c2944

Rename OSX files to iOS


mkhamoyan Jul 28, 2023
1234322

update entrypoints


mkhamoyan Jul 28, 2023
a1eadfa

Merge branch 'main' into hybrid_locale_properties


mkhamoyan Jul 31, 2023
6aaa76e

inlcude icu lib files for nativeaot tests


mkhamoyan Jul 31, 2023

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


0
.../Common/src/Interop/Interop.Casing.OSX.cs → .../Common/src/Interop/Interop.Casing.iOS.cs

View file


Open in desktop


File renamed without changes.


0
...mmon/src/Interop/Interop.Collation.OSX.cs → ...mmon/src/Interop/Interop.Collation.iOS.cs

View file


Open in desktop


File renamed without changes.


0
.../Common/src/Interop/Interop.Locale.OSX.cs → .../Common/src/Interop/Interop.Locale.iOS.cs

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
src/libraries/System.Globalization/tests/CultureInfo/CultureInfoEnglishName.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ public static IEnumerable<object[]> EnglishName_TestData()
 {
 yield return new object[] { CultureInfo.CurrentCulture.Name, CultureInfo.CurrentCulture.EnglishName };

 if (SupportFullGlobalizationData)
 if (SupportFullGlobalizationData || PlatformDetection.IsHybridGlobalizationOnOSX)
 {
 yield return new object[] { "en-US", "English (United States)" };
 yield return new object[] { "fr-FR", "French (France)" };
Expand Down

3 changes: 2 additions & 1 deletion
src/libraries/System.Globalization/tests/CultureInfo/CultureInfoNativeName.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,11 @@ public static IEnumerable<object[]> NativeName_TestData()
 yield return new object[] { CultureInfo.CurrentCulture.Name, CultureInfo.CurrentCulture.NativeName };

 // Android has its own ICU, which doesn't 100% map to UsingLimitedCultures
 if (PlatformDetection.IsNotUsingLimitedCultures || PlatformDetection.IsAndroid)
 if (PlatformDetection.IsNotUsingLimitedCultures || PlatformDetection.IsAndroid || PlatformDetection.IsHybridGlobalizationOnOSX)
 {
 yield return new object[] { "en-US", "English (United States)" };
 yield return new object[] { "en-CA", "English (Canada)" };
 yield return new object[] { "en-GB", "English (United Kingdom)" };
 }
 else
 {
Expand Down

31 changes: 31 additions & 0 deletions
src/libraries/System.Globalization/tests/CultureInfo/CultureInfoThreeLetterISOInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using Xunit;
using System.Collections.Generic;

namespace System.Globalization.Tests
{
 public class CultureInfoThreeLetterISOInfo
 {
 public static IEnumerable<object[]> RegionInfo_TestData()
 {
 yield return new object[] { 0x409, 244, "en-US", "USA", "eng" };
 yield return new object[] { 0x411, 122, "ja-JP", "JPN", "jpn" };
 yield return new object[] { 0x804, 45, "zh-CN", "CHN", "zho" };
 yield return new object[] { 0x401, 205, "ar-SA", "SAU", "ara" };
 yield return new object[] { 0x412, 134, "ko-KR", "KOR", "kor" };
 yield return new object[] { 0x40d, 117, "he-IL", "ISR", "heb" };
 }

 [Theory]
 [MemberData(nameof(RegionInfo_TestData))]
 public void MiscTest(int lcid, int geoId, string name, string threeLetterISORegionName, string threeLetterISOLanguageName)
 {
 RegionInfo ri = new RegionInfo(lcid); // create it with lcid
 Assert.Equal(geoId, ri.GeoId);
 Assert.Equal(threeLetterISORegionName, ri.ThreeLetterISORegionName);
 Assert.Equal(threeLetterISOLanguageName, new CultureInfo(name).ThreeLetterISOLanguageName);
 }
 }
}

48 changes: 0 additions & 48 deletions
src/libraries/System.Globalization/tests/Hybrid/HybridMode.cs

View file


Open in desktop


This file was deleted.


47 changes: 26 additions & 21 deletions
src/libraries/System.Globalization/tests/Hybrid/System.Globalization.IOS.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,39 +5,44 @@
 <HybridGlobalization>true</HybridGlobalization>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="HybridMode.cs" />
 <Compile Include="..\CultureInfo\CultureInfoEnglishName.cs" />
 <Compile Include="..\CultureInfo\CultureInfoNumberFormat.cs" />
 <Compile Include="..\CultureInfo\CultureInfoNames.cs" />
 <Compile Include="..\CultureInfo\CultureInfoNativeName.cs" />
 <Compile Include="..\CultureInfo\CultureInfoParent.cs" />
 <Compile Include="..\CultureInfo\CultureInfoThreeLetterISOInfo.cs" />
 <Compile Include="..\CultureInfo\CultureInfoTwoLetterISOLanguageName.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTestsBase.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.Compare.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.IndexOf.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.IsPrefix.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.IsSuffix.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.LastIndexOf.cs" />
 <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoCalendarWeekRule.cs" />
 <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoData.cs" />
 <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoFirstDayOfWeek.cs" />
 <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoCalendarWeekRule.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoValidateParseStyle.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoData.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoCurrencySymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoData.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNaNSymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentGroupSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentDecimalSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentDecimalDigits.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPerMilleSymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentSymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPositiveSign.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPositiveInfinitySymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNegativeSign.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNegativeInfinitySymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberGroupSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberDecimalSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNegativeSign.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberDecimalDigits.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberDecimalSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberGroupSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberGroupSizes.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberNegativePattern.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentNegativePattern.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentDecimalDigits.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentDecimalSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentGroupSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentGroupSizes.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentNegativePattern.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentPositivePattern.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTestsBase.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.Compare.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.IndexOf.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.LastIndexOf.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.IsPrefix.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.IsSuffix.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentSymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPerMilleSymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPositiveInfinitySymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPositiveSign.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoTests.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoValidateParseStyle.cs" />
 <Compile Include="..\System\Globalization\TextInfoTests.cs" />
 </ItemGroup>
</Project>

18 changes: 9 additions & 9 deletions
src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -332,11 +332,11 @@
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.Nls.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.Utf8.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.WebAssembly.cs" Condition="'$(TargetsBrowser)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.OSX.cs" Condition="'$(IsOSXLike)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.iOS.cs" Condition="'$(IsiOSLike)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareOptions.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.Icu.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.OSX.cs" Condition="'$(IsOSXLike)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.iOS.cs" Condition="'$(IsiOSLike)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.Nls.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureInfo.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureNotFoundException.cs" />
Expand DownExpand Up@@ -391,7 +391,7 @@
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.Icu.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.Nls.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.OSX.cs" Condition="'$(IsOSXLike)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.iOS.cs" Condition="'$(IsiOSLike)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.WebAssembly.cs" Condition="'$(TargetsBrowser)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\ThaiBuddhistCalendar.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TimeSpanFormat.cs" />
Expand DownExpand Up@@ -1290,14 +1290,14 @@
 <Compile Include="$(CommonPath)Interop\Interop.Casing.cs">
 <Link>Common\Interop\Interop.Casing.cs</Link>
 </Compile>
 <Compile Include="$(CommonPath)Interop\Interop.Casing.OSX.cs" Condition="'$(IsOSXLike)' == 'true'">
 <Link>Common\Interop\Interop.Casing.OSX.cs</Link>
 <Compile Include="$(CommonPath)Interop\Interop.Casing.iOS.cs" Condition="'$(IsiOSLike)' == 'true'">
 <Link>Common\Interop\Interop.Casing.iOS.cs</Link>
 </Compile>
 <Compile Include="$(CommonPath)Interop\Interop.Collation.cs">
 <Link>Common\Interop\Interop.Collation.cs</Link>
 </Compile>
 <Compile Include="$(CommonPath)Interop\Interop.Collation.OSX.cs" Condition="'$(IsOSXLike)' == 'true'">
 <Link>Common\Interop\Interop.Collation.OSX.cs</Link>
 <Compile Include="$(CommonPath)Interop\Interop.Collation.iOS.cs" Condition="'$(IsiOSLike)' == 'true'">
 <Link>Common\Interop\Interop.Collation.iOS.cs</Link>
 </Compile>
 <Compile Include="$(CommonPath)Interop\Interop.ICU.cs">
 <Link>Common\Interop\Interop.ICU.cs</Link>
Expand All@@ -1311,8 +1311,8 @@
 <Compile Include="$(CommonPath)Interop\Interop.Locale.cs">
 <Link>Common\Interop\Interop.Locale.cs</Link>
 </Compile>
 <Compile Include="$(CommonPath)Interop\Interop.Locale.OSX.cs" Condition="'$(IsOSXLike)' == 'true'">
 <Link>Common\Interop\Interop.Locale.OSX.cs</Link>
 <Compile Include="$(CommonPath)Interop\Interop.Locale.iOS.cs" Condition="'$(IsiOSLike)' == 'true'">
 <Link>Common\Interop\Interop.Locale.iOS.cs</Link>
 </Compile>
 <Compile Include="$(CommonPath)Interop\Interop.Normalization.cs">
 <Link>Common\Interop\Interop.Normalization.cs</Link>
Expand Down

20 changes: 10 additions & 10 deletions
src/libraries/System.Private.CoreLib/src/System/Globalization/CompareInfo.Icu.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ private void IcuInitSortHandle(string interopCultureName)
 _isAsciiEqualityOrdinal = GetIsAsciiEqualityOrdinal(interopCultureName);
 if (!GlobalizationMode.Invariant)
 {
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS || TARGET_BROWSER
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS || TARGET_BROWSER
 if (GlobalizationMode.Hybrid)
 return;
#endif
Expand DownExpand Up@@ -84,7 +84,7 @@ private unsafe int IcuIndexOfCore(ReadOnlySpan<char> source, ReadOnlySpan<char>
 fixed (char* pSource = &MemoryMarshal.GetReference(source))
 fixed (char* pTarget = &MemoryMarshal.GetReference(target))
 {
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return IndexOfCoreNative(pTarget, target.Length, pSource, source.Length, options, fromBeginning, matchLengthPtr);
#endif
Expand DownExpand Up@@ -203,7 +203,7 @@ private unsafe int IndexOfOrdinalIgnoreCaseHelper(ReadOnlySpan<char> source, Rea
 throw new Exception((string)ex_result);
 return result;
 }
#elif TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#elif TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return IndexOfCoreNative(b, target.Length, a, source.Length, options, fromBeginning, matchLengthPtr);
#endif
Expand DownExpand Up@@ -305,7 +305,7 @@ private unsafe int IndexOfOrdinalHelper(ReadOnlySpan<char> source, ReadOnlySpan<
 throw new Exception((string)ex_result);
 return result;
 }
#elif TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#elif TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return IndexOfCoreNative(b, target.Length, a, source.Length, options, fromBeginning, matchLengthPtr);
#endif
Expand DownExpand Up@@ -337,7 +337,7 @@ private unsafe bool IcuStartsWith(ReadOnlySpan<char> source, ReadOnlySpan<char>
 fixed (char* pSource = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* pPrefix = &MemoryMarshal.GetReference(prefix))
 {
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return NativeStartsWith(pPrefix, prefix.Length, pSource, source.Length, options);
#endif
Expand DownExpand Up@@ -420,7 +420,7 @@ private unsafe bool StartsWithOrdinalIgnoreCaseHelper(ReadOnlySpan<char> source,
 return true;

 InteropCall:
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return NativeStartsWith(bp, prefix.Length, ap, source.Length, options);
#endif
Expand DownExpand Up@@ -492,7 +492,7 @@ private unsafe bool StartsWithOrdinalHelper(ReadOnlySpan<char> source, ReadOnlyS
 return true;

 InteropCall:
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return NativeStartsWith(bp, prefix.Length, ap, source.Length, options);
#endif
Expand DownExpand Up@@ -521,7 +521,7 @@ private unsafe bool IcuEndsWith(ReadOnlySpan<char> source, ReadOnlySpan<char> su
 fixed (char* pSource = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* pSuffix = &MemoryMarshal.GetReference(suffix))
 {
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return NativeEndsWith(pSuffix, suffix.Length, pSource, source.Length, options);
#endif
Expand DownExpand Up@@ -605,7 +605,7 @@ private unsafe bool EndsWithOrdinalIgnoreCaseHelper(ReadOnlySpan<char> source, R
 return true;

 InteropCall:
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return NativeEndsWith(bp, suffix.Length, ap, source.Length, options);
#endif
Expand DownExpand Up@@ -677,7 +677,7 @@ private unsafe bool EndsWithOrdinalHelper(ReadOnlySpan<char> source, ReadOnlySpa
 return true;

 InteropCall:
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return NativeEndsWith(bp, suffix.Length, ap, source.Length, options);
#endif
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[iOS] HybridGlobalization Implement missing cases for GlobalizationNative_GetLocaleInfoString by mkhamoyan · Pull Request #89296 · dotnet/runtime · GitHub
Skip to content
[iOS] HybridGlobalization Implement missing cases for GlobalizationNative_GetLocaleInfoString#89296

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

mkhamoyan
merged 17 commits into

from

Aug 1, 2023
 Merged


[iOS] HybridGlobalization Implement missing cases for GlobalizationNative_GetLocaleInfoString
#89296
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


17 commits


Select commit
Hold shift + click to select a range
5ac9461

Cahnges to return missing locale properties


mkhamoyan Jul 20, 2023
548e34a

Refactor functions


mkhamoyan Jul 21, 2023
a8976cc

Order test files and add EnglishName tests


mkhamoyan Jul 21, 2023
e6a49f1

Merge branch 'main' into hybrid_locale_properties


mkhamoyan Jul 24, 2023
f17d8c0

update order of LocaleStringData cases


mkhamoyan Jul 24, 2023
f032d86

clean up the code


mkhamoyan Jul 24, 2023
d800ae6

add whitespace


mkhamoyan Jul 25, 2023
8c53bf5

use strncasecmp and minor refactorings


mkhamoyan Jul 25, 2023
f6d9afa

Remove static tables and call icu function


mkhamoyan Jul 26, 2023
4268488

Merge branch 'main' into hybrid_locale_properties


mkhamoyan Jul 27, 2023
8209fa6

Merge branch 'main' into hybrid_locale_properties


mkhamoyan Jul 28, 2023
4cf91d2

Merge branch 'main' into hybrid_locale_properties


mkhamoyan Jul 28, 2023
5afb93a

not run on OSX platform


mkhamoyan Jul 28, 2023
98c2944

Rename OSX files to iOS


mkhamoyan Jul 28, 2023
1234322

update entrypoints


mkhamoyan Jul 28, 2023
a1eadfa

Merge branch 'main' into hybrid_locale_properties


mkhamoyan Jul 31, 2023
6aaa76e

inlcude icu lib files for nativeaot tests


mkhamoyan Jul 31, 2023

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


0
.../Common/src/Interop/Interop.Casing.OSX.cs → .../Common/src/Interop/Interop.Casing.iOS.cs

View file


Open in desktop


File renamed without changes.


0
...mmon/src/Interop/Interop.Collation.OSX.cs → ...mmon/src/Interop/Interop.Collation.iOS.cs

View file


Open in desktop


File renamed without changes.


0
.../Common/src/Interop/Interop.Locale.OSX.cs → .../Common/src/Interop/Interop.Locale.iOS.cs

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
src/libraries/System.Globalization/tests/CultureInfo/CultureInfoEnglishName.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ public static IEnumerable<object[]> EnglishName_TestData()
 {
 yield return new object[] { CultureInfo.CurrentCulture.Name, CultureInfo.CurrentCulture.EnglishName };

 if (SupportFullGlobalizationData)
 if (SupportFullGlobalizationData || PlatformDetection.IsHybridGlobalizationOnOSX)
 {
 yield return new object[] { "en-US", "English (United States)" };
 yield return new object[] { "fr-FR", "French (France)" };
Expand Down

3 changes: 2 additions & 1 deletion
src/libraries/System.Globalization/tests/CultureInfo/CultureInfoNativeName.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,11 @@ public static IEnumerable<object[]> NativeName_TestData()
 yield return new object[] { CultureInfo.CurrentCulture.Name, CultureInfo.CurrentCulture.NativeName };

 // Android has its own ICU, which doesn't 100% map to UsingLimitedCultures
 if (PlatformDetection.IsNotUsingLimitedCultures || PlatformDetection.IsAndroid)
 if (PlatformDetection.IsNotUsingLimitedCultures || PlatformDetection.IsAndroid || PlatformDetection.IsHybridGlobalizationOnOSX)
 {
 yield return new object[] { "en-US", "English (United States)" };
 yield return new object[] { "en-CA", "English (Canada)" };
 yield return new object[] { "en-GB", "English (United Kingdom)" };
 }
 else
 {
Expand Down

31 changes: 31 additions & 0 deletions
src/libraries/System.Globalization/tests/CultureInfo/CultureInfoThreeLetterISOInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using Xunit;
using System.Collections.Generic;

namespace System.Globalization.Tests
{
 public class CultureInfoThreeLetterISOInfo
 {
 public static IEnumerable<object[]> RegionInfo_TestData()
 {
 yield return new object[] { 0x409, 244, "en-US", "USA", "eng" };
 yield return new object[] { 0x411, 122, "ja-JP", "JPN", "jpn" };
 yield return new object[] { 0x804, 45, "zh-CN", "CHN", "zho" };
 yield return new object[] { 0x401, 205, "ar-SA", "SAU", "ara" };
 yield return new object[] { 0x412, 134, "ko-KR", "KOR", "kor" };
 yield return new object[] { 0x40d, 117, "he-IL", "ISR", "heb" };
 }

 [Theory]
 [MemberData(nameof(RegionInfo_TestData))]
 public void MiscTest(int lcid, int geoId, string name, string threeLetterISORegionName, string threeLetterISOLanguageName)
 {
 RegionInfo ri = new RegionInfo(lcid); // create it with lcid
 Assert.Equal(geoId, ri.GeoId);
 Assert.Equal(threeLetterISORegionName, ri.ThreeLetterISORegionName);
 Assert.Equal(threeLetterISOLanguageName, new CultureInfo(name).ThreeLetterISOLanguageName);
 }
 }
}

48 changes: 0 additions & 48 deletions
src/libraries/System.Globalization/tests/Hybrid/HybridMode.cs

View file


Open in desktop


This file was deleted.


47 changes: 26 additions & 21 deletions
src/libraries/System.Globalization/tests/Hybrid/System.Globalization.IOS.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,39 +5,44 @@
 <HybridGlobalization>true</HybridGlobalization>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="HybridMode.cs" />
 <Compile Include="..\CultureInfo\CultureInfoEnglishName.cs" />
 <Compile Include="..\CultureInfo\CultureInfoNumberFormat.cs" />
 <Compile Include="..\CultureInfo\CultureInfoNames.cs" />
 <Compile Include="..\CultureInfo\CultureInfoNativeName.cs" />
 <Compile Include="..\CultureInfo\CultureInfoParent.cs" />
 <Compile Include="..\CultureInfo\CultureInfoThreeLetterISOInfo.cs" />
 <Compile Include="..\CultureInfo\CultureInfoTwoLetterISOLanguageName.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTestsBase.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.Compare.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.IndexOf.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.IsPrefix.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.IsSuffix.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.LastIndexOf.cs" />
 <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoCalendarWeekRule.cs" />
 <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoData.cs" />
 <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoFirstDayOfWeek.cs" />
 <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoCalendarWeekRule.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoValidateParseStyle.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoData.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoCurrencySymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoData.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNaNSymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentGroupSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentDecimalSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentDecimalDigits.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPerMilleSymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentSymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPositiveSign.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPositiveInfinitySymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNegativeSign.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNegativeInfinitySymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberGroupSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberDecimalSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNegativeSign.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberDecimalDigits.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberDecimalSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberGroupSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberGroupSizes.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberNegativePattern.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentNegativePattern.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentDecimalDigits.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentDecimalSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentGroupSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentGroupSizes.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentNegativePattern.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentPositivePattern.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTestsBase.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.Compare.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.IndexOf.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.LastIndexOf.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.IsPrefix.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.IsSuffix.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentSymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPerMilleSymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPositiveInfinitySymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPositiveSign.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoTests.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoValidateParseStyle.cs" />
 <Compile Include="..\System\Globalization\TextInfoTests.cs" />
 </ItemGroup>
</Project>

18 changes: 9 additions & 9 deletions
src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -332,11 +332,11 @@
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.Nls.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.Utf8.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.WebAssembly.cs" Condition="'$(TargetsBrowser)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.OSX.cs" Condition="'$(IsOSXLike)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.iOS.cs" Condition="'$(IsiOSLike)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareOptions.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.Icu.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.OSX.cs" Condition="'$(IsOSXLike)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.iOS.cs" Condition="'$(IsiOSLike)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.Nls.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureInfo.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureNotFoundException.cs" />
Expand DownExpand Up@@ -391,7 +391,7 @@
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.Icu.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.Nls.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.OSX.cs" Condition="'$(IsOSXLike)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.iOS.cs" Condition="'$(IsiOSLike)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.WebAssembly.cs" Condition="'$(TargetsBrowser)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\ThaiBuddhistCalendar.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TimeSpanFormat.cs" />
Expand DownExpand Up@@ -1290,14 +1290,14 @@
 <Compile Include="$(CommonPath)Interop\Interop.Casing.cs">
 <Link>Common\Interop\Interop.Casing.cs</Link>
 </Compile>
 <Compile Include="$(CommonPath)Interop\Interop.Casing.OSX.cs" Condition="'$(IsOSXLike)' == 'true'">
 <Link>Common\Interop\Interop.Casing.OSX.cs</Link>
 <Compile Include="$(CommonPath)Interop\Interop.Casing.iOS.cs" Condition="'$(IsiOSLike)' == 'true'">
 <Link>Common\Interop\Interop.Casing.iOS.cs</Link>
 </Compile>
 <Compile Include="$(CommonPath)Interop\Interop.Collation.cs">
 <Link>Common\Interop\Interop.Collation.cs</Link>
 </Compile>
 <Compile Include="$(CommonPath)Interop\Interop.Collation.OSX.cs" Condition="'$(IsOSXLike)' == 'true'">
 <Link>Common\Interop\Interop.Collation.OSX.cs</Link>
 <Compile Include="$(CommonPath)Interop\Interop.Collation.iOS.cs" Condition="'$(IsiOSLike)' == 'true'">
 <Link>Common\Interop\Interop.Collation.iOS.cs</Link>
 </Compile>
 <Compile Include="$(CommonPath)Interop\Interop.ICU.cs">
 <Link>Common\Interop\Interop.ICU.cs</Link>
Expand All@@ -1311,8 +1311,8 @@
 <Compile Include="$(CommonPath)Interop\Interop.Locale.cs">
 <Link>Common\Interop\Interop.Locale.cs</Link>
 </Compile>
 <Compile Include="$(CommonPath)Interop\Interop.Locale.OSX.cs" Condition="'$(IsOSXLike)' == 'true'">
 <Link>Common\Interop\Interop.Locale.OSX.cs</Link>
 <Compile Include="$(CommonPath)Interop\Interop.Locale.iOS.cs" Condition="'$(IsiOSLike)' == 'true'">
 <Link>Common\Interop\Interop.Locale.iOS.cs</Link>
 </Compile>
 <Compile Include="$(CommonPath)Interop\Interop.Normalization.cs">
 <Link>Common\Interop\Interop.Normalization.cs</Link>
Expand Down

20 changes: 10 additions & 10 deletions
src/libraries/System.Private.CoreLib/src/System/Globalization/CompareInfo.Icu.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ private void IcuInitSortHandle(string interopCultureName)
 _isAsciiEqualityOrdinal = GetIsAsciiEqualityOrdinal(interopCultureName);
 if (!GlobalizationMode.Invariant)
 {
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS || TARGET_BROWSER
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS || TARGET_BROWSER
 if (GlobalizationMode.Hybrid)
 return;
#endif
Expand DownExpand Up@@ -84,7 +84,7 @@ private unsafe int IcuIndexOfCore(ReadOnlySpan<char> source, ReadOnlySpan<char>
 fixed (char* pSource = &MemoryMarshal.GetReference(source))
 fixed (char* pTarget = &MemoryMarshal.GetReference(target))
 {
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return IndexOfCoreNative(pTarget, target.Length, pSource, source.Length, options, fromBeginning, matchLengthPtr);
#endif
Expand DownExpand Up@@ -203,7 +203,7 @@ private unsafe int IndexOfOrdinalIgnoreCaseHelper(ReadOnlySpan<char> source, Rea
 throw new Exception((string)ex_result);
 return result;
 }
#elif TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#elif TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return IndexOfCoreNative(b, target.Length, a, source.Length, options, fromBeginning, matchLengthPtr);
#endif
Expand DownExpand Up@@ -305,7 +305,7 @@ private unsafe int IndexOfOrdinalHelper(ReadOnlySpan<char> source, ReadOnlySpan<
 throw new Exception((string)ex_result);
 return result;
 }
#elif TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#elif TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return IndexOfCoreNative(b, target.Length, a, source.Length, options, fromBeginning, matchLengthPtr);
#endif
Expand DownExpand Up@@ -337,7 +337,7 @@ private unsafe bool IcuStartsWith(ReadOnlySpan<char> source, ReadOnlySpan<char>
 fixed (char* pSource = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* pPrefix = &MemoryMarshal.GetReference(prefix))
 {
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return NativeStartsWith(pPrefix, prefix.Length, pSource, source.Length, options);
#endif
Expand DownExpand Up@@ -420,7 +420,7 @@ private unsafe bool StartsWithOrdinalIgnoreCaseHelper(ReadOnlySpan<char> source,
 return true;

 InteropCall:
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return NativeStartsWith(bp, prefix.Length, ap, source.Length, options);
#endif
Expand DownExpand Up@@ -492,7 +492,7 @@ private unsafe bool StartsWithOrdinalHelper(ReadOnlySpan<char> source, ReadOnlyS
 return true;

 InteropCall:
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return NativeStartsWith(bp, prefix.Length, ap, source.Length, options);
#endif
Expand DownExpand Up@@ -521,7 +521,7 @@ private unsafe bool IcuEndsWith(ReadOnlySpan<char> source, ReadOnlySpan<char> su
 fixed (char* pSource = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* pSuffix = &MemoryMarshal.GetReference(suffix))
 {
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return NativeEndsWith(pSuffix, suffix.Length, pSource, source.Length, options);
#endif
Expand DownExpand Up@@ -605,7 +605,7 @@ private unsafe bool EndsWithOrdinalIgnoreCaseHelper(ReadOnlySpan<char> source, R
 return true;

 InteropCall:
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return NativeEndsWith(bp, suffix.Length, ap, source.Length, options);
#endif
Expand DownExpand Up@@ -677,7 +677,7 @@ private unsafe bool EndsWithOrdinalHelper(ReadOnlySpan<char> source, ReadOnlySpa
 return true;

 InteropCall:
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return NativeEndsWith(bp, suffix.Length, ap, source.Length, options);
#endif
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[iOS] HybridGlobalization Implement missing cases for GlobalizationNative_GetLocaleInfoString by mkhamoyan · Pull Request #89296 · dotnet/runtime · GitHub
Skip to content
[iOS] HybridGlobalization Implement missing cases for GlobalizationNative_GetLocaleInfoString#89296

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

mkhamoyan
merged 17 commits into

from

Aug 1, 2023
 Merged


[iOS] HybridGlobalization Implement missing cases for GlobalizationNative_GetLocaleInfoString
#89296
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


17 commits


Select commit
Hold shift + click to select a range
5ac9461

Cahnges to return missing locale properties


mkhamoyan Jul 20, 2023
548e34a

Refactor functions


mkhamoyan Jul 21, 2023
a8976cc

Order test files and add EnglishName tests


mkhamoyan Jul 21, 2023
e6a49f1

Merge branch 'main' into hybrid_locale_properties


mkhamoyan Jul 24, 2023
f17d8c0

update order of LocaleStringData cases


mkhamoyan Jul 24, 2023
f032d86

clean up the code


mkhamoyan Jul 24, 2023
d800ae6

add whitespace


mkhamoyan Jul 25, 2023
8c53bf5

use strncasecmp and minor refactorings


mkhamoyan Jul 25, 2023
f6d9afa

Remove static tables and call icu function


mkhamoyan Jul 26, 2023
4268488

Merge branch 'main' into hybrid_locale_properties


mkhamoyan Jul 27, 2023
8209fa6

Merge branch 'main' into hybrid_locale_properties


mkhamoyan Jul 28, 2023
4cf91d2

Merge branch 'main' into hybrid_locale_properties


mkhamoyan Jul 28, 2023
5afb93a

not run on OSX platform


mkhamoyan Jul 28, 2023
98c2944

Rename OSX files to iOS


mkhamoyan Jul 28, 2023
1234322

update entrypoints


mkhamoyan Jul 28, 2023
a1eadfa

Merge branch 'main' into hybrid_locale_properties


mkhamoyan Jul 31, 2023
6aaa76e

inlcude icu lib files for nativeaot tests


mkhamoyan Jul 31, 2023

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


0
.../Common/src/Interop/Interop.Casing.OSX.cs → .../Common/src/Interop/Interop.Casing.iOS.cs

View file


Open in desktop


File renamed without changes.


0
...mmon/src/Interop/Interop.Collation.OSX.cs → ...mmon/src/Interop/Interop.Collation.iOS.cs

View file


Open in desktop


File renamed without changes.


0
.../Common/src/Interop/Interop.Locale.OSX.cs → .../Common/src/Interop/Interop.Locale.iOS.cs

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
src/libraries/System.Globalization/tests/CultureInfo/CultureInfoEnglishName.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ public static IEnumerable<object[]> EnglishName_TestData()
 {
 yield return new object[] { CultureInfo.CurrentCulture.Name, CultureInfo.CurrentCulture.EnglishName };

 if (SupportFullGlobalizationData)
 if (SupportFullGlobalizationData || PlatformDetection.IsHybridGlobalizationOnOSX)
 {
 yield return new object[] { "en-US", "English (United States)" };
 yield return new object[] { "fr-FR", "French (France)" };
Expand Down

3 changes: 2 additions & 1 deletion
src/libraries/System.Globalization/tests/CultureInfo/CultureInfoNativeName.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,11 @@ public static IEnumerable<object[]> NativeName_TestData()
 yield return new object[] { CultureInfo.CurrentCulture.Name, CultureInfo.CurrentCulture.NativeName };

 // Android has its own ICU, which doesn't 100% map to UsingLimitedCultures
 if (PlatformDetection.IsNotUsingLimitedCultures || PlatformDetection.IsAndroid)
 if (PlatformDetection.IsNotUsingLimitedCultures || PlatformDetection.IsAndroid || PlatformDetection.IsHybridGlobalizationOnOSX)
 {
 yield return new object[] { "en-US", "English (United States)" };
 yield return new object[] { "en-CA", "English (Canada)" };
 yield return new object[] { "en-GB", "English (United Kingdom)" };
 }
 else
 {
Expand Down

31 changes: 31 additions & 0 deletions
src/libraries/System.Globalization/tests/CultureInfo/CultureInfoThreeLetterISOInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using Xunit;
using System.Collections.Generic;

namespace System.Globalization.Tests
{
 public class CultureInfoThreeLetterISOInfo
 {
 public static IEnumerable<object[]> RegionInfo_TestData()
 {
 yield return new object[] { 0x409, 244, "en-US", "USA", "eng" };
 yield return new object[] { 0x411, 122, "ja-JP", "JPN", "jpn" };
 yield return new object[] { 0x804, 45, "zh-CN", "CHN", "zho" };
 yield return new object[] { 0x401, 205, "ar-SA", "SAU", "ara" };
 yield return new object[] { 0x412, 134, "ko-KR", "KOR", "kor" };
 yield return new object[] { 0x40d, 117, "he-IL", "ISR", "heb" };
 }

 [Theory]
 [MemberData(nameof(RegionInfo_TestData))]
 public void MiscTest(int lcid, int geoId, string name, string threeLetterISORegionName, string threeLetterISOLanguageName)
 {
 RegionInfo ri = new RegionInfo(lcid); // create it with lcid
 Assert.Equal(geoId, ri.GeoId);
 Assert.Equal(threeLetterISORegionName, ri.ThreeLetterISORegionName);
 Assert.Equal(threeLetterISOLanguageName, new CultureInfo(name).ThreeLetterISOLanguageName);
 }
 }
}

48 changes: 0 additions & 48 deletions
src/libraries/System.Globalization/tests/Hybrid/HybridMode.cs

View file


Open in desktop


This file was deleted.


47 changes: 26 additions & 21 deletions
src/libraries/System.Globalization/tests/Hybrid/System.Globalization.IOS.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,39 +5,44 @@
 <HybridGlobalization>true</HybridGlobalization>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="HybridMode.cs" />
 <Compile Include="..\CultureInfo\CultureInfoEnglishName.cs" />
 <Compile Include="..\CultureInfo\CultureInfoNumberFormat.cs" />
 <Compile Include="..\CultureInfo\CultureInfoNames.cs" />
 <Compile Include="..\CultureInfo\CultureInfoNativeName.cs" />
 <Compile Include="..\CultureInfo\CultureInfoParent.cs" />
 <Compile Include="..\CultureInfo\CultureInfoThreeLetterISOInfo.cs" />
 <Compile Include="..\CultureInfo\CultureInfoTwoLetterISOLanguageName.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTestsBase.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.Compare.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.IndexOf.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.IsPrefix.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.IsSuffix.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.LastIndexOf.cs" />
 <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoCalendarWeekRule.cs" />
 <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoData.cs" />
 <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoFirstDayOfWeek.cs" />
 <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoCalendarWeekRule.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoValidateParseStyle.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoData.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoCurrencySymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoData.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNaNSymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentGroupSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentDecimalSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentDecimalDigits.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPerMilleSymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentSymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPositiveSign.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPositiveInfinitySymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNegativeSign.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNegativeInfinitySymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberGroupSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberDecimalSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNegativeSign.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberDecimalDigits.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberDecimalSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberGroupSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberGroupSizes.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberNegativePattern.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentNegativePattern.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentDecimalDigits.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentDecimalSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentGroupSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentGroupSizes.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentNegativePattern.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentPositivePattern.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTestsBase.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.Compare.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.IndexOf.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.LastIndexOf.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.IsPrefix.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.IsSuffix.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentSymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPerMilleSymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPositiveInfinitySymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPositiveSign.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoTests.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoValidateParseStyle.cs" />
 <Compile Include="..\System\Globalization\TextInfoTests.cs" />
 </ItemGroup>
</Project>

18 changes: 9 additions & 9 deletions
src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -332,11 +332,11 @@
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.Nls.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.Utf8.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.WebAssembly.cs" Condition="'$(TargetsBrowser)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.OSX.cs" Condition="'$(IsOSXLike)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.iOS.cs" Condition="'$(IsiOSLike)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareOptions.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.Icu.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.OSX.cs" Condition="'$(IsOSXLike)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.iOS.cs" Condition="'$(IsiOSLike)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.Nls.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureInfo.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureNotFoundException.cs" />
Expand DownExpand Up@@ -391,7 +391,7 @@
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.Icu.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.Nls.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.OSX.cs" Condition="'$(IsOSXLike)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.iOS.cs" Condition="'$(IsiOSLike)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.WebAssembly.cs" Condition="'$(TargetsBrowser)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\ThaiBuddhistCalendar.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TimeSpanFormat.cs" />
Expand DownExpand Up@@ -1290,14 +1290,14 @@
 <Compile Include="$(CommonPath)Interop\Interop.Casing.cs">
 <Link>Common\Interop\Interop.Casing.cs</Link>
 </Compile>
 <Compile Include="$(CommonPath)Interop\Interop.Casing.OSX.cs" Condition="'$(IsOSXLike)' == 'true'">
 <Link>Common\Interop\Interop.Casing.OSX.cs</Link>
 <Compile Include="$(CommonPath)Interop\Interop.Casing.iOS.cs" Condition="'$(IsiOSLike)' == 'true'">
 <Link>Common\Interop\Interop.Casing.iOS.cs</Link>
 </Compile>
 <Compile Include="$(CommonPath)Interop\Interop.Collation.cs">
 <Link>Common\Interop\Interop.Collation.cs</Link>
 </Compile>
 <Compile Include="$(CommonPath)Interop\Interop.Collation.OSX.cs" Condition="'$(IsOSXLike)' == 'true'">
 <Link>Common\Interop\Interop.Collation.OSX.cs</Link>
 <Compile Include="$(CommonPath)Interop\Interop.Collation.iOS.cs" Condition="'$(IsiOSLike)' == 'true'">
 <Link>Common\Interop\Interop.Collation.iOS.cs</Link>
 </Compile>
 <Compile Include="$(CommonPath)Interop\Interop.ICU.cs">
 <Link>Common\Interop\Interop.ICU.cs</Link>
Expand All@@ -1311,8 +1311,8 @@
 <Compile Include="$(CommonPath)Interop\Interop.Locale.cs">
 <Link>Common\Interop\Interop.Locale.cs</Link>
 </Compile>
 <Compile Include="$(CommonPath)Interop\Interop.Locale.OSX.cs" Condition="'$(IsOSXLike)' == 'true'">
 <Link>Common\Interop\Interop.Locale.OSX.cs</Link>
 <Compile Include="$(CommonPath)Interop\Interop.Locale.iOS.cs" Condition="'$(IsiOSLike)' == 'true'">
 <Link>Common\Interop\Interop.Locale.iOS.cs</Link>
 </Compile>
 <Compile Include="$(CommonPath)Interop\Interop.Normalization.cs">
 <Link>Common\Interop\Interop.Normalization.cs</Link>
Expand Down

20 changes: 10 additions & 10 deletions
src/libraries/System.Private.CoreLib/src/System/Globalization/CompareInfo.Icu.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ private void IcuInitSortHandle(string interopCultureName)
 _isAsciiEqualityOrdinal = GetIsAsciiEqualityOrdinal(interopCultureName);
 if (!GlobalizationMode.Invariant)
 {
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS || TARGET_BROWSER
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS || TARGET_BROWSER
 if (GlobalizationMode.Hybrid)
 return;
#endif
Expand DownExpand Up@@ -84,7 +84,7 @@ private unsafe int IcuIndexOfCore(ReadOnlySpan<char> source, ReadOnlySpan<char>
 fixed (char* pSource = &MemoryMarshal.GetReference(source))
 fixed (char* pTarget = &MemoryMarshal.GetReference(target))
 {
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return IndexOfCoreNative(pTarget, target.Length, pSource, source.Length, options, fromBeginning, matchLengthPtr);
#endif
Expand DownExpand Up@@ -203,7 +203,7 @@ private unsafe int IndexOfOrdinalIgnoreCaseHelper(ReadOnlySpan<char> source, Rea
 throw new Exception((string)ex_result);
 return result;
 }
#elif TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#elif TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return IndexOfCoreNative(b, target.Length, a, source.Length, options, fromBeginning, matchLengthPtr);
#endif
Expand DownExpand Up@@ -305,7 +305,7 @@ private unsafe int IndexOfOrdinalHelper(ReadOnlySpan<char> source, ReadOnlySpan<
 throw new Exception((string)ex_result);
 return result;
 }
#elif TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#elif TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return IndexOfCoreNative(b, target.Length, a, source.Length, options, fromBeginning, matchLengthPtr);
#endif
Expand DownExpand Up@@ -337,7 +337,7 @@ private unsafe bool IcuStartsWith(ReadOnlySpan<char> source, ReadOnlySpan<char>
 fixed (char* pSource = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* pPrefix = &MemoryMarshal.GetReference(prefix))
 {
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return NativeStartsWith(pPrefix, prefix.Length, pSource, source.Length, options);
#endif
Expand DownExpand Up@@ -420,7 +420,7 @@ private unsafe bool StartsWithOrdinalIgnoreCaseHelper(ReadOnlySpan<char> source,
 return true;

 InteropCall:
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return NativeStartsWith(bp, prefix.Length, ap, source.Length, options);
#endif
Expand DownExpand Up@@ -492,7 +492,7 @@ private unsafe bool StartsWithOrdinalHelper(ReadOnlySpan<char> source, ReadOnlyS
 return true;

 InteropCall:
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return NativeStartsWith(bp, prefix.Length, ap, source.Length, options);
#endif
Expand DownExpand Up@@ -521,7 +521,7 @@ private unsafe bool IcuEndsWith(ReadOnlySpan<char> source, ReadOnlySpan<char> su
 fixed (char* pSource = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* pSuffix = &MemoryMarshal.GetReference(suffix))
 {
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return NativeEndsWith(pSuffix, suffix.Length, pSource, source.Length, options);
#endif
Expand DownExpand Up@@ -605,7 +605,7 @@ private unsafe bool EndsWithOrdinalIgnoreCaseHelper(ReadOnlySpan<char> source, R
 return true;

 InteropCall:
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return NativeEndsWith(bp, suffix.Length, ap, source.Length, options);
#endif
Expand DownExpand Up@@ -677,7 +677,7 @@ private unsafe bool EndsWithOrdinalHelper(ReadOnlySpan<char> source, ReadOnlySpa
 return true;

 InteropCall:
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return NativeEndsWith(bp, suffix.Length, ap, source.Length, options);
#endif
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
[iOS] HybridGlobalization Implement missing cases for GlobalizationNative_GetLocaleInfoString by mkhamoyan · Pull Request #89296 · dotnet/runtime · GitHub
Skip to content
[iOS] HybridGlobalization Implement missing cases for GlobalizationNative_GetLocaleInfoString#89296

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

mkhamoyan
merged 17 commits into

from

Aug 1, 2023
 Merged


[iOS] HybridGlobalization Implement missing cases for GlobalizationNative_GetLocaleInfoString
#89296
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


17 commits


Select commit
Hold shift + click to select a range
5ac9461

Cahnges to return missing locale properties


mkhamoyan Jul 20, 2023
548e34a

Refactor functions


mkhamoyan Jul 21, 2023
a8976cc

Order test files and add EnglishName tests


mkhamoyan Jul 21, 2023
e6a49f1

Merge branch 'main' into hybrid_locale_properties


mkhamoyan Jul 24, 2023
f17d8c0

update order of LocaleStringData cases


mkhamoyan Jul 24, 2023
f032d86

clean up the code


mkhamoyan Jul 24, 2023
d800ae6

add whitespace


mkhamoyan Jul 25, 2023
8c53bf5

use strncasecmp and minor refactorings


mkhamoyan Jul 25, 2023
f6d9afa

Remove static tables and call icu function


mkhamoyan Jul 26, 2023
4268488

Merge branch 'main' into hybrid_locale_properties


mkhamoyan Jul 27, 2023
8209fa6

Merge branch 'main' into hybrid_locale_properties


mkhamoyan Jul 28, 2023
4cf91d2

Merge branch 'main' into hybrid_locale_properties


mkhamoyan Jul 28, 2023
5afb93a

not run on OSX platform


mkhamoyan Jul 28, 2023
98c2944

Rename OSX files to iOS


mkhamoyan Jul 28, 2023
1234322

update entrypoints


mkhamoyan Jul 28, 2023
a1eadfa

Merge branch 'main' into hybrid_locale_properties


mkhamoyan Jul 31, 2023
6aaa76e

inlcude icu lib files for nativeaot tests


mkhamoyan Jul 31, 2023

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


0
.../Common/src/Interop/Interop.Casing.OSX.cs → .../Common/src/Interop/Interop.Casing.iOS.cs

View file


Open in desktop


File renamed without changes.


0
...mmon/src/Interop/Interop.Collation.OSX.cs → ...mmon/src/Interop/Interop.Collation.iOS.cs

View file


Open in desktop


File renamed without changes.


0
.../Common/src/Interop/Interop.Locale.OSX.cs → .../Common/src/Interop/Interop.Locale.iOS.cs

View file


Open in desktop


File renamed without changes.


2 changes: 1 addition & 1 deletion
src/libraries/System.Globalization/tests/CultureInfo/CultureInfoEnglishName.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ public static IEnumerable<object[]> EnglishName_TestData()
 {
 yield return new object[] { CultureInfo.CurrentCulture.Name, CultureInfo.CurrentCulture.EnglishName };

 if (SupportFullGlobalizationData)
 if (SupportFullGlobalizationData || PlatformDetection.IsHybridGlobalizationOnOSX)
 {
 yield return new object[] { "en-US", "English (United States)" };
 yield return new object[] { "fr-FR", "French (France)" };
Expand Down

3 changes: 2 additions & 1 deletion
src/libraries/System.Globalization/tests/CultureInfo/CultureInfoNativeName.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,10 +13,11 @@ public static IEnumerable<object[]> NativeName_TestData()
 yield return new object[] { CultureInfo.CurrentCulture.Name, CultureInfo.CurrentCulture.NativeName };

 // Android has its own ICU, which doesn't 100% map to UsingLimitedCultures
 if (PlatformDetection.IsNotUsingLimitedCultures || PlatformDetection.IsAndroid)
 if (PlatformDetection.IsNotUsingLimitedCultures || PlatformDetection.IsAndroid || PlatformDetection.IsHybridGlobalizationOnOSX)
 {
 yield return new object[] { "en-US", "English (United States)" };
 yield return new object[] { "en-CA", "English (Canada)" };
 yield return new object[] { "en-GB", "English (United Kingdom)" };
 }
 else
 {
Expand Down

31 changes: 31 additions & 0 deletions
src/libraries/System.Globalization/tests/CultureInfo/CultureInfoThreeLetterISOInfo.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using Xunit;
using System.Collections.Generic;

namespace System.Globalization.Tests
{
 public class CultureInfoThreeLetterISOInfo
 {
 public static IEnumerable<object[]> RegionInfo_TestData()
 {
 yield return new object[] { 0x409, 244, "en-US", "USA", "eng" };
 yield return new object[] { 0x411, 122, "ja-JP", "JPN", "jpn" };
 yield return new object[] { 0x804, 45, "zh-CN", "CHN", "zho" };
 yield return new object[] { 0x401, 205, "ar-SA", "SAU", "ara" };
 yield return new object[] { 0x412, 134, "ko-KR", "KOR", "kor" };
 yield return new object[] { 0x40d, 117, "he-IL", "ISR", "heb" };
 }

 [Theory]
 [MemberData(nameof(RegionInfo_TestData))]
 public void MiscTest(int lcid, int geoId, string name, string threeLetterISORegionName, string threeLetterISOLanguageName)
 {
 RegionInfo ri = new RegionInfo(lcid); // create it with lcid
 Assert.Equal(geoId, ri.GeoId);
 Assert.Equal(threeLetterISORegionName, ri.ThreeLetterISORegionName);
 Assert.Equal(threeLetterISOLanguageName, new CultureInfo(name).ThreeLetterISOLanguageName);
 }
 }
}

48 changes: 0 additions & 48 deletions
src/libraries/System.Globalization/tests/Hybrid/HybridMode.cs

View file


Open in desktop


This file was deleted.


47 changes: 26 additions & 21 deletions
src/libraries/System.Globalization/tests/Hybrid/System.Globalization.IOS.Tests.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,39 +5,44 @@
 <HybridGlobalization>true</HybridGlobalization>
 </PropertyGroup>
 <ItemGroup>
 <Compile Include="HybridMode.cs" />
 <Compile Include="..\CultureInfo\CultureInfoEnglishName.cs" />
 <Compile Include="..\CultureInfo\CultureInfoNumberFormat.cs" />
 <Compile Include="..\CultureInfo\CultureInfoNames.cs" />
 <Compile Include="..\CultureInfo\CultureInfoNativeName.cs" />
 <Compile Include="..\CultureInfo\CultureInfoParent.cs" />
 <Compile Include="..\CultureInfo\CultureInfoThreeLetterISOInfo.cs" />
 <Compile Include="..\CultureInfo\CultureInfoTwoLetterISOLanguageName.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTestsBase.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.Compare.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.IndexOf.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.IsPrefix.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.IsSuffix.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.LastIndexOf.cs" />
 <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoCalendarWeekRule.cs" />
 <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoData.cs" />
 <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoFirstDayOfWeek.cs" />
 <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoCalendarWeekRule.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoValidateParseStyle.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoData.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoCurrencySymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoData.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNaNSymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentGroupSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentDecimalSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentDecimalDigits.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPerMilleSymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentSymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPositiveSign.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPositiveInfinitySymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNegativeSign.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNegativeInfinitySymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberGroupSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberDecimalSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNegativeSign.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberDecimalDigits.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberDecimalSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberGroupSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberGroupSizes.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoNumberNegativePattern.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentNegativePattern.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentDecimalDigits.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentDecimalSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentGroupSeparator.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentGroupSizes.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentNegativePattern.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentPositivePattern.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTestsBase.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.Compare.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.IndexOf.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.LastIndexOf.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.IsPrefix.cs" />
 <Compile Include="..\CompareInfo\CompareInfoTests.IsSuffix.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPercentSymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPerMilleSymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPositiveInfinitySymbol.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoPositiveSign.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoTests.cs" />
 <Compile Include="..\NumberFormatInfo\NumberFormatInfoValidateParseStyle.cs" />
 <Compile Include="..\System\Globalization\TextInfoTests.cs" />
 </ItemGroup>
</Project>

18 changes: 9 additions & 9 deletions
src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -332,11 +332,11 @@
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.Nls.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.Utf8.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.WebAssembly.cs" Condition="'$(TargetsBrowser)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.OSX.cs" Condition="'$(IsOSXLike)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.iOS.cs" Condition="'$(IsiOSLike)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareOptions.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.Icu.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.OSX.cs" Condition="'$(IsOSXLike)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.iOS.cs" Condition="'$(IsiOSLike)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.Nls.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureInfo.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureNotFoundException.cs" />
Expand DownExpand Up@@ -391,7 +391,7 @@
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.Icu.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.Nls.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.OSX.cs" Condition="'$(IsOSXLike)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.iOS.cs" Condition="'$(IsiOSLike)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TextInfo.WebAssembly.cs" Condition="'$(TargetsBrowser)' == 'true'" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\ThaiBuddhistCalendar.cs" />
 <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TimeSpanFormat.cs" />
Expand DownExpand Up@@ -1290,14 +1290,14 @@
 <Compile Include="$(CommonPath)Interop\Interop.Casing.cs">
 <Link>Common\Interop\Interop.Casing.cs</Link>
 </Compile>
 <Compile Include="$(CommonPath)Interop\Interop.Casing.OSX.cs" Condition="'$(IsOSXLike)' == 'true'">
 <Link>Common\Interop\Interop.Casing.OSX.cs</Link>
 <Compile Include="$(CommonPath)Interop\Interop.Casing.iOS.cs" Condition="'$(IsiOSLike)' == 'true'">
 <Link>Common\Interop\Interop.Casing.iOS.cs</Link>
 </Compile>
 <Compile Include="$(CommonPath)Interop\Interop.Collation.cs">
 <Link>Common\Interop\Interop.Collation.cs</Link>
 </Compile>
 <Compile Include="$(CommonPath)Interop\Interop.Collation.OSX.cs" Condition="'$(IsOSXLike)' == 'true'">
 <Link>Common\Interop\Interop.Collation.OSX.cs</Link>
 <Compile Include="$(CommonPath)Interop\Interop.Collation.iOS.cs" Condition="'$(IsiOSLike)' == 'true'">
 <Link>Common\Interop\Interop.Collation.iOS.cs</Link>
 </Compile>
 <Compile Include="$(CommonPath)Interop\Interop.ICU.cs">
 <Link>Common\Interop\Interop.ICU.cs</Link>
Expand All@@ -1311,8 +1311,8 @@
 <Compile Include="$(CommonPath)Interop\Interop.Locale.cs">
 <Link>Common\Interop\Interop.Locale.cs</Link>
 </Compile>
 <Compile Include="$(CommonPath)Interop\Interop.Locale.OSX.cs" Condition="'$(IsOSXLike)' == 'true'">
 <Link>Common\Interop\Interop.Locale.OSX.cs</Link>
 <Compile Include="$(CommonPath)Interop\Interop.Locale.iOS.cs" Condition="'$(IsiOSLike)' == 'true'">
 <Link>Common\Interop\Interop.Locale.iOS.cs</Link>
 </Compile>
 <Compile Include="$(CommonPath)Interop\Interop.Normalization.cs">
 <Link>Common\Interop\Interop.Normalization.cs</Link>
Expand Down

20 changes: 10 additions & 10 deletions
src/libraries/System.Private.CoreLib/src/System/Globalization/CompareInfo.Icu.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ private void IcuInitSortHandle(string interopCultureName)
 _isAsciiEqualityOrdinal = GetIsAsciiEqualityOrdinal(interopCultureName);
 if (!GlobalizationMode.Invariant)
 {
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS || TARGET_BROWSER
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS || TARGET_BROWSER
 if (GlobalizationMode.Hybrid)
 return;
#endif
Expand DownExpand Up@@ -84,7 +84,7 @@ private unsafe int IcuIndexOfCore(ReadOnlySpan<char> source, ReadOnlySpan<char>
 fixed (char* pSource = &MemoryMarshal.GetReference(source))
 fixed (char* pTarget = &MemoryMarshal.GetReference(target))
 {
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return IndexOfCoreNative(pTarget, target.Length, pSource, source.Length, options, fromBeginning, matchLengthPtr);
#endif
Expand DownExpand Up@@ -203,7 +203,7 @@ private unsafe int IndexOfOrdinalIgnoreCaseHelper(ReadOnlySpan<char> source, Rea
 throw new Exception((string)ex_result);
 return result;
 }
#elif TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#elif TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return IndexOfCoreNative(b, target.Length, a, source.Length, options, fromBeginning, matchLengthPtr);
#endif
Expand DownExpand Up@@ -305,7 +305,7 @@ private unsafe int IndexOfOrdinalHelper(ReadOnlySpan<char> source, ReadOnlySpan<
 throw new Exception((string)ex_result);
 return result;
 }
#elif TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#elif TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return IndexOfCoreNative(b, target.Length, a, source.Length, options, fromBeginning, matchLengthPtr);
#endif
Expand DownExpand Up@@ -337,7 +337,7 @@ private unsafe bool IcuStartsWith(ReadOnlySpan<char> source, ReadOnlySpan<char>
 fixed (char* pSource = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* pPrefix = &MemoryMarshal.GetReference(prefix))
 {
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return NativeStartsWith(pPrefix, prefix.Length, pSource, source.Length, options);
#endif
Expand DownExpand Up@@ -420,7 +420,7 @@ private unsafe bool StartsWithOrdinalIgnoreCaseHelper(ReadOnlySpan<char> source,
 return true;

 InteropCall:
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return NativeStartsWith(bp, prefix.Length, ap, source.Length, options);
#endif
Expand DownExpand Up@@ -492,7 +492,7 @@ private unsafe bool StartsWithOrdinalHelper(ReadOnlySpan<char> source, ReadOnlyS
 return true;

 InteropCall:
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return NativeStartsWith(bp, prefix.Length, ap, source.Length, options);
#endif
Expand DownExpand Up@@ -521,7 +521,7 @@ private unsafe bool IcuEndsWith(ReadOnlySpan<char> source, ReadOnlySpan<char> su
 fixed (char* pSource = &MemoryMarshal.GetReference(source)) // could be null (or otherwise unable to be dereferenced)
 fixed (char* pSuffix = &MemoryMarshal.GetReference(suffix))
 {
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return NativeEndsWith(pSuffix, suffix.Length, pSource, source.Length, options);
#endif
Expand DownExpand Up@@ -605,7 +605,7 @@ private unsafe bool EndsWithOrdinalIgnoreCaseHelper(ReadOnlySpan<char> source, R
 return true;

 InteropCall:
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return NativeEndsWith(bp, suffix.Length, ap, source.Length, options);
#endif
Expand DownExpand Up@@ -677,7 +677,7 @@ private unsafe bool EndsWithOrdinalHelper(ReadOnlySpan<char> source, ReadOnlySpa
 return true;

 InteropCall:
#if TARGET_OSX || TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
 if (GlobalizationMode.Hybrid)
 return NativeEndsWith(bp, suffix.Length, ap, source.Length, options);
#endif
Expand Down
Loading