[iOS][non-icu] HybridGlobalization implement calendar data

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

@@ -423,3 +423,34 @@ Below function are used from apple native functions:
 - [uppercaseStringWithLocale](https://developer.apple.com/documentation/foundation/nsstring/1413316-uppercasestringwithlocale?language=objc)
 - [lowercaseStringWithLocale](https://developer.apple.com/documentation/foundation/nsstring/1417298-lowercasestringwithlocale?language=objc)
 
+## Calandars
+
+Affected public APIs:
+- DateTimeFormatInfo.AbbreviatedDayNames
+- DateTimeFormatInfo.GetAbbreviatedDayName()
+- DateTimeFormatInfo.AbbreviatedMonthGenitiveNames
+- DateTimeFormatInfo.AbbreviatedMonthNames
+- DateTimeFormatInfo.GetAbbreviatedMonthName()
+- DateTimeFormatInfo.AMDesignator
+- DateTimeFormatInfo.CalendarWeekRule
+- DateTimeFormatInfo.DayNames
+- DateTimeFormatInfo.GetDayName()
+- DateTimeFormatInfo.GetEraName()
+- DateTimeFormatInfo.FirstDayOfWeek
+- DateTimeFormatInfo.FullDateTimePattern
+- DateTimeFormatInfo.LongDatePattern
+- DateTimeFormatInfo.LongTimePattern
+- DateTimeFormatInfo.MonthDayPattern
+- DateTimeFormatInfo.MonthGenitiveNames
+- DateTimeFormatInfo.MonthNames
+- DateTimeFormatInfo.GetMonthName()
+- DateTimeFormatInfo.NativeCalendarName
+- DateTimeFormatInfo.PMDesignator
+- DateTimeFormatInfo.ShortDatePattern
+- DateTimeFormatInfo.ShortestDayNames
+- DateTimeFormatInfo.GetShortestDayName()
+- DateTimeFormatInfo.ShortTimePattern
+- DateTimeFormatInfo.YearMonthPattern
+
+Apple Native API does not have an equivalent for abbreviated era name and will return empty string
+- DateTimeFormatInfo.GetAbbreviatedEraName()

src/libraries/Common/src/Interop/Interop.Calendar.iOS.cs

@@ -0,0 +1,15 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Globalization;
+using System.Runtime.InteropServices;
+
+internal static partial class Interop
+{
+    internal static partial class Globalization
+    {
+        [LibraryImport(Libraries.GlobalizationNative, EntryPoint = "GlobalizationNative_GetCalendarInfoNative", StringMarshalling = StringMarshalling.Utf8)]
+        internal static unsafe partial string GetCalendarInfoNative(string localeName, CalendarId calendarId, CalendarDataType calendarDataType);
+    }
+}

src/libraries/System.Globalization.Calendars/tests/Hybrid/System.Globalization.Calendars.IOS.Tests.csproj

@@ -0,0 +1,108 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>$(NetCoreAppCurrent)-ios;$(NetCoreAppCurrent)-tvos;$(NetCoreAppCurrent)-maccatalyst</TargetFrameworks>
+    <TestRuntime>true</TestRuntime>
+    <HybridGlobalization>true</HybridGlobalization>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\System\Globalization\CalendarTestBase.cs" />
+    <Compile Include="..\System\Globalization\ChineseLunisolarCalendarTests.cs" />
+    <Compile Include="..\System\Globalization\EastAsianLunisolarCalendarTestBase.cs" />
+    <Compile Include="..\System\Globalization\GregorianCalendarTests.cs" />
+    <Compile Include="..\System\Globalization\HebrewCalendarTests.cs" />
+    <Compile Include="..\System\Globalization\HijriCalendarTests.cs" />
+    <Compile Include="..\System\Globalization\JapaneseCalendarTests.cs" />
+    <Compile Include="..\System\Globalization\JapaneseLunisolarCalendarTests.cs" />
+    <Compile Include="..\System\Globalization\JulianCalendarTests.cs" />
+    <Compile Include="..\System\Globalization\KoreanCalendarTests.cs" />
+    <Compile Include="..\System\Globalization\KoreanLunisolarCalendarTests.cs" />
+    <Compile Include="..\System\Globalization\PersianCalendarTests.cs" />
+    <Compile Include="..\System\Globalization\TaiwanCalendarTests.cs" />
+    <Compile Include="..\System\Globalization\TaiwanLunisolarCalendarTests.cs" />
+    <Compile Include="..\System\Globalization\ThaiBuddhistCalendarTests.cs" />
+    <Compile Include="..\System\Globalization\UmAlQuraCalendarTests.cs" />
+    <Compile Include="..\GregorianCalendar\GregorianCalendarAddMonths.cs" />
+    <Compile Include="..\GregorianCalendar\GregorianCalendarAddYears.cs" />
+    <Compile Include="..\GregorianCalendar\GregorianCalendarGetDayOfMonth.cs" />
+    <Compile Include="..\GregorianCalendar\GregorianCalendarGetDayOfWeek.cs" />
+    <Compile Include="..\GregorianCalendar\GregorianCalendarGetDayOfYear.cs" />
+    <Compile Include="..\GregorianCalendar\GregorianCalendarGetDaysInMonth.cs" />
+    <Compile Include="..\GregorianCalendar\GregorianCalendarGetDaysInYear.cs" />
+    <Compile Include="..\GregorianCalendar\GregorianCalendarGetEra.cs" />
+    <Compile Include="..\GregorianCalendar\GregorianCalendarGetMonth.cs" />
+    <Compile Include="..\GregorianCalendar\GregorianCalendarGetLeapMonth.cs" />
+    <Compile Include="..\GregorianCalendar\GregorianCalendarGetMonthsInYear.cs" />
+    <Compile Include="..\GregorianCalendar\GregorianCalendarGetWeekOfYear.cs" />
+    <Compile Include="..\GregorianCalendar\GregorianCalendarGetYear.cs" />
+    <Compile Include="..\GregorianCalendar\GregorianCalendarIsLeapDay.cs" />
+    <Compile Include="..\GregorianCalendar\GregorianCalendarIsLeapMonth.cs" />
+    <Compile Include="..\GregorianCalendar\GregorianCalendarIsLeapYear.cs" />
+    <Compile Include="..\GregorianCalendar\GregorianCalendarTests.Utilities.cs" />
+    <Compile Include="..\GregorianCalendar\GregorianCalendarToDateTime.cs" />
+    <Compile Include="..\GregorianCalendar\GregorianCalendarToFourDigitYear.cs" />
+    <Compile Include="..\GregorianCalendar\GregorianCalendarTwoDigitYearMax.cs" />
+    <Compile Include="..\ISOWeek\ISOWeekTests.cs" />
+    <Compile Include="..\JapaneseCalendar\JapaneseCalendarAddMonths.cs" />
+    <Compile Include="..\JapaneseCalendar\JapaneseCalendarToFourDigitYear.cs" />
+    <Compile Include="..\JapaneseCalendar\JapaneseCalendarTwoDigitYearMax.cs" />
+    <Compile Include="..\KoreanCalendar\KoreanCalendarToDateTime.cs" />
+    <Compile Include="..\KoreanCalendar\KoreanCalendarAddMonths.cs" />
+    <Compile Include="..\KoreanCalendar\KoreanCalendarAddYears.cs" />
+    <Compile Include="..\KoreanCalendar\KoreanCalendarGetDayOfMonth.cs" />
+    <Compile Include="..\KoreanCalendar\KoreanCalendarGetDayOfWeek.cs" />
+    <Compile Include="..\KoreanCalendar\KoreanCalendarGetDayOfYear.cs" />
+    <Compile Include="..\KoreanCalendar\KoreanCalendarGetDaysInMonth.cs" />
+    <Compile Include="..\KoreanCalendar\KoreanCalendarGetDaysInYear.cs" />
+    <Compile Include="..\KoreanCalendar\KoreanCalendarGetEra.cs" />
+    <Compile Include="..\KoreanCalendar\KoreanCalendarGetMonth.cs" />
+    <Compile Include="..\KoreanCalendar\KoreanCalendarGetMonthsInYear.cs" />
+    <Compile Include="..\KoreanCalendar\KoreanCalendarGetWeekOfYear.cs" />
+    <Compile Include="..\KoreanCalendar\KoreanCalendarGetYear.cs" />
+    <Compile Include="..\KoreanCalendar\KoreanCalendarIsLeapDay.cs" />
+    <Compile Include="..\KoreanCalendar\KoreanCalendarIsLeapMonth.cs" />
+    <Compile Include="..\KoreanCalendar\KoreanCalendarIsLeapYear.cs" />
+    <Compile Include="..\KoreanCalendar\KoreanCalendarToFourDigitYear.cs" />
+    <Compile Include="..\KoreanCalendar\KoreanCalendarTwoDigitYearMax.cs" />
+    <Compile Include="..\Misc\MiscCalendars.cs" />
+    <Compile Include="..\Misc\Calendars.cs" />
+    <Compile Include="..\TaiwanCalendar\TaiwanCalendarUtilities.cs" />
+    <Compile Include="..\TaiwanCalendar\TaiwanCalendarAddMonths.cs" />
+    <Compile Include="..\TaiwanCalendar\TaiwanCalendarAddYears.cs" />
+    <Compile Include="..\TaiwanCalendar\TaiwanCalendarDaysAndMonths.cs" />
+    <Compile Include="..\TaiwanCalendar\TaiwanCalendarGetDayOfMonth.cs" />
+    <Compile Include="..\TaiwanCalendar\TaiwanCalendarGetDayOfWeek.cs" />
+    <Compile Include="..\TaiwanCalendar\TaiwanCalendarGetDayOfYear.cs" />
+    <Compile Include="..\TaiwanCalendar\TaiwanCalendarGetDaysInMonth.cs" />
+    <Compile Include="..\TaiwanCalendar\TaiwanCalendarGetDaysInYear.cs" />
+    <Compile Include="..\TaiwanCalendar\TaiwanCalendarGetEra.cs" />
+    <Compile Include="..\TaiwanCalendar\TaiwanCalendarGetMonth.cs" />
+    <Compile Include="..\TaiwanCalendar\TaiwanCalendarGetMonthsInYear.cs" />
+    <Compile Include="..\TaiwanCalendar\TaiwanCalendarGetWeekOfYear.cs" />
+    <Compile Include="..\TaiwanCalendar\TaiwanCalendarGetYear.cs" />
+    <Compile Include="..\TaiwanCalendar\TaiwanCalendarIsLeapDay.cs" />
+    <Compile Include="..\TaiwanCalendar\TaiwanCalendarIsLeapMonth.cs" />
+    <Compile Include="..\TaiwanCalendar\TaiWanCalendarIsLeapYear.cs" />
+    <Compile Include="..\TaiwanCalendar\TaiwanCalendarToDateTime.cs" />
+    <Compile Include="..\TaiwanCalendar\TaiwanCalendarToFourDigitYear.cs" />
+    <Compile Include="..\TaiwanCalendar\TaiwanCalendarTwoDigitYearMax.cs" />
+    <Compile Include="..\ThaiBuddhistCalendar\ThaiBuddhistCalendarAddMonths.cs" />
+    <Compile Include="..\ThaiBuddhistCalendar\ThaiBuddhistCalendarAddYears.cs" />
+    <Compile Include="..\ThaiBuddhistCalendar\ThaiBuddhistCalendarGetDayOfMonth.cs" />
+    <Compile Include="..\ThaiBuddhistCalendar\ThaiBuddhistCalendarGetDayOfWeek.cs" />
+    <Compile Include="..\ThaiBuddhistCalendar\ThaiBuddhistCalendarGetDayOfYear.cs" />
+    <Compile Include="..\ThaiBuddhistCalendar\ThaiBuddhistCalendarGetDaysInMonth.cs" />
+    <Compile Include="..\ThaiBuddhistCalendar\ThaiBuddhistCalendarGetDaysInYear.cs" />
+    <Compile Include="..\ThaiBuddhistCalendar\ThaiBuddhistCalendarGetEra.cs" />
+    <Compile Include="..\ThaiBuddhistCalendar\ThaiBuddhistCalendarGetMonth.cs" />
+    <Compile Include="..\ThaiBuddhistCalendar\ThaiBuddhistCalendarGetMonthsInYear.cs" />
+    <Compile Include="..\ThaiBuddhistCalendar\ThaiBuddhistCalendarGetWeekOfYear.cs" />
+    <Compile Include="..\ThaiBuddhistCalendar\ThaiBuddhistCalendarGetYear.cs" />
+    <Compile Include="..\ThaiBuddhistCalendar\ThaiBuddhistCalendarIsLeapDay.cs" />
+    <Compile Include="..\ThaiBuddhistCalendar\ThaiBuddhistCalendarIsLeapMonth.cs" />
+    <Compile Include="..\ThaiBuddhistCalendar\ThaiBuddhistCalendarIsLeapYear.cs" />
+    <Compile Include="..\ThaiBuddhistCalendar\ThaiBuddhistCalendarToDateTime.cs" />
+    <Compile Include="..\ThaiBuddhistCalendar\ThaiBuddhistCalendarToFourDigitYear.cs" />
+    <Compile Include="..\ThaiBuddhistCalendar\ThaiBuddhistCalendarTwoDigitYearMax.cs" />
+    <Compile Include="$(CommonTestPath)System\RandomDataGenerator.cs" />
+  </ItemGroup>
+</Project>

src/libraries/System.Globalization.Calendars/tests/System/Globalization/CalendarTestBase.cs

@@ -430,7 +430,7 @@ public void GetEra_Invalid_ThrowsArgumentOutOfRangeException()
             Assert.All(DateTime_TestData(calendar), dt =>
             {
                 // JapaneseCalendar throws on ICU, but not on NLS
-                if ((calendar is JapaneseCalendar && PlatformDetection.IsNlsGlobalization) || calendar is HebrewCalendar || calendar is TaiwanLunisolarCalendar || calendar is JapaneseLunisolarCalendar)
+                if ((calendar is JapaneseCalendar && (PlatformDetection.IsNlsGlobalization || PlatformDetection.IsHybridGlobalizationOnOSX)) || calendar is HebrewCalendar || calendar is TaiwanLunisolarCalendar || calendar is JapaneseLunisolarCalendar)
                 {
                     calendar.GetEra(dt);
                 }

src/libraries/System.Globalization/tests/Hybrid/System.Globalization.IOS.Tests.csproj

@@ -18,9 +18,39 @@
     <Compile Include="..\CompareInfo\CompareInfoTests.IsPrefix.cs" />
     <Compile Include="..\CompareInfo\CompareInfoTests.IsSuffix.cs" />
     <Compile Include="..\CompareInfo\CompareInfoTests.LastIndexOf.cs" />
+    <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoAbbreviatedDayNames.cs" />
+    <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoAbbreviatedMonthGenitiveNames.cs" />
+    <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoAbbreviatedMonthNames.cs" />
+    <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoAMDesignator.cs" />
+    <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoCalendar.cs" />
     <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoCalendarWeekRule.cs" />
+    <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoClone.cs" />
     <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoData.cs" />
+    <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoDayNames.cs" />
     <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoFirstDayOfWeek.cs" />
+    <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoFullDateTimePattern.cs" />
+    <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoGetAbbreviatedDayName.cs" />
+    <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoGetAbbreviatedMonthName.cs" />
+    <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoGetDayName.cs" />
+    <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoGetEraName.cs" />
+    <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoGetFormat.cs" />
+    <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoGetInstance.cs" />
+    <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoGetMonthName.cs" />
+    <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoLongDatePattern.cs" />
+    <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoLongTimePattern.cs" />
+    <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoMonthDayPattern.cs" />
+    <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoMonthGenitiveNames.cs" />
+    <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoMonthNames.cs" />
+    <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoPMDesignator.cs" />
+    <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoReadOnly.cs" />
+    <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoRFC1123Pattern.cs" />
+    <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoShortDatePattern.cs" />
+    <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoShortestDayNames.cs" />
+    <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoShortTimePattern.cs" />
+    <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoSortableDateTimePattern.cs" />
+    <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoTests.cs" />
+    <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoUniversalSortableDateTimePattern.cs" />
+    <Compile Include="..\DateTimeFormatInfo\DateTimeFormatInfoYearMonthPattern.cs" />
     <Compile Include="..\NumberFormatInfo\NumberFormatInfoCurrencySymbol.cs" />
     <Compile Include="..\NumberFormatInfo\NumberFormatInfoData.cs" />
     <Compile Include="..\NumberFormatInfo\NumberFormatInfoNaNSymbol.cs" />

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

@@ -319,6 +319,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\Calendar.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CalendarAlgorithmType.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CalendarData.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CalendarData.iOS.cs" Condition="'$(IsiOSLike)' == 'true'" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CalendarData.Icu.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CalendarData.Nls.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CalendarWeekRule.cs" />
@@ -1287,6 +1288,9 @@
     <Compile Include="$(CommonPath)Interop\Interop.Calendar.cs">
       <Link>Common\Interop\Interop.Calendar.cs</Link>
     </Compile>
+    <Compile Include="$(CommonPath)Interop\Interop.Calendar.iOS.cs" Condition="'$(IsiOSLike)' == 'true'">
+      <Link>Common\Interop\Interop.Calendar.iOS.cs</Link>
+    </Compile>
     <Compile Include="$(CommonPath)Interop\Interop.Casing.cs">
       <Link>Common\Interop\Interop.Casing.cs</Link>
     </Compile>

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

@@ -7,8 +7,16 @@ namespace System.Globalization
 {
     internal sealed partial class CalendarData
     {
-        private bool LoadCalendarDataFromSystemCore(string localeName, CalendarId calendarId) =>
-            IcuLoadCalendarDataFromSystem(localeName, calendarId);
+        private bool LoadCalendarDataFromSystemCore(string localeName, CalendarId calendarId)
+        {
+#if TARGET_MACCATALYST || TARGET_IOS || TARGET_TVOS
+            return GlobalizationMode.Hybrid ?
+                LoadCalendarDataFromNative(localeName, calendarId) :
+                IcuLoadCalendarDataFromSystem(localeName, calendarId);
+#else
+            return IcuLoadCalendarDataFromSystem(localeName, calendarId);
+#endif
+        }
 
 #pragma warning disable IDE0060
         internal static int GetCalendarsCore(string localeName, bool useUserOverride, CalendarId[] calendars) =>