[browser][non-icu] HybridGlobalization calendar data

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

@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Globalization;
+using System.Runtime.CompilerServices;
+
+internal static partial class Interop
+{
+    internal static unsafe partial class JsGlobalization
+    {
+        [MethodImplAttribute(MethodImplOptions.InternalCall)]
+        internal static extern unsafe int GetCalendarInfo(in string culture, CalendarId calendarId, char* buffer, int bufferLength, out int exceptionalResult, out object result);
+    }
+}

src/libraries/Common/src/Interop/Browser/Interop.Locale.cs

@@ -0,0 +1,17 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Runtime.CompilerServices;
+
+internal static partial class Interop
+{
+    internal static unsafe partial class JsGlobalization
+    {
+        [MethodImplAttribute(MethodImplOptions.InternalCall)]
+        internal static extern unsafe int GetCultureInfo(in string culture, char* buffer, int bufferLength, out int exceptionalResult, out object result);
+        [MethodImplAttribute(MethodImplOptions.InternalCall)]
+        internal static extern unsafe int GetFirstDayOfWeek(in string culture, out int exceptionalResult, out object result);
+        [MethodImplAttribute(MethodImplOptions.InternalCall)]
+        internal static extern unsafe int GetFirstWeekOfYear(in string culture, out int exceptionalResult, out object result);
+    }
+}

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

@@ -364,7 +364,8 @@ public static string GetDistroVersionString()
         public static bool IsHybridGlobalizationOnOSX => m_isHybrid.Value && (IsOSX || IsMacCatalyst || IsiOS || IstvOS);
         public static bool IsNotHybridGlobalizationOnBrowser => !IsHybridGlobalizationOnBrowser;
         public static bool IsNotInvariantGlobalization => !IsInvariantGlobalization;
-        public static bool IsIcuGlobalization => ICUVersion > new Version(0, 0, 0, 0);
+        public static bool IsIcuGlobalization => ICUVersion > new Version(0, 0, 0, 0);        
+        public static bool IsIcuGlobalizationAndNotHybridOnBrowser => IsIcuGlobalization && IsNotHybridGlobalizationOnBrowser;
         public static bool IsNlsGlobalization => IsNotInvariantGlobalization && !IsIcuGlobalization;
 
         public static bool IsSubstAvailable

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

@@ -0,0 +1,109 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>$(NetCoreAppCurrent)-browser</TargetFrameworks>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <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

@@ -423,14 +423,17 @@ public void TwoDigitYearMax_Invalid_ThrowsArgumentOutOfRangeException()
             Assert.Throws<ArgumentOutOfRangeException>(() => calendar.TwoDigitYearMax = max + 1);
         }
 
-        [Fact]
+        [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotHybridGlobalizationOnBrowser))]
         public void GetEra_Invalid_ThrowsArgumentOutOfRangeException()
         {
             Calendar calendar = Calendar;
             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)
+                // JapaneseCalendar throws on ICU, but not on NLS or in HybridGlobalization on Browser
+                if ((calendar is JapaneseCalendar && (PlatformDetection.IsNlsGlobalization || PlatformDetection.IsHybridGlobalizationOnBrowser)) ||
+                    calendar is HebrewCalendar ||
+                    calendar is TaiwanLunisolarCalendar ||
+                    calendar is JapaneseLunisolarCalendar)
                 {
                     calendar.GetEra(dt);
                 }

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

@@ -442,7 +442,7 @@ public void TestCreationWithTemporaryLCID(int lcid)
         [InlineData("de-DE-u-co-phonebk-t-xx", "de-DE-t-xx", "de-DE-t-xx_phoneboo")]
         [InlineData("de-DE-u-co-phonebk-t-xx-u-yy", "de-DE-t-xx-u-yy", "de-DE-t-xx-u-yy_phoneboo")]
         [InlineData("de-DE", "de-DE", "de-DE")]
-        [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsIcuGlobalization))]
+        [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsIcuGlobalizationAndNotHybridOnBrowser))]
         public void TestCreationWithMangledSortName(string cultureName, string expectedCultureName, string expectedSortName)
         {
             CultureInfo ci = CultureInfo.GetCultureInfo(cultureName);
@@ -457,7 +457,7 @@ public void TestCreationWithMangledSortName(string cultureName, string expectedC
         [InlineData("qps-plocm", "qps-PLOCM")] // ICU normalize this name to "qps--plocm" which we normalize it back to "qps-plocm"
         [InlineData("zh_CN", "zh_cn")]
         [InlineData("km_KH", "km_kh")]
-        [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsIcuGlobalization), nameof(PlatformDetection.IsNotWindowsServerCore))]
+        [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsIcuGlobalizationAndNotHybridOnBrowser), nameof(PlatformDetection.IsNotWindowsServerCore))]
         public void TestCreationWithICUNormalizedNames(string cultureName, string expectedCultureName)
         {
             CultureInfo ci = CultureInfo.GetCultureInfo(cultureName);