Skip to content
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

[iOS][non-icu] HybridGlobalization implement timezoneinfo functions #91458

Merged
merged 15 commits into from
Sep 7, 2023
Merged

[iOS][non-icu] HybridGlobalization implement timezoneinfo functions #91458

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
7aa7289
Initial changed for timezone hybrid mode
mkhamoyan Aug 31, 2023
cfd0f5b
Refactoring
mkhamoyan Sep 1, 2023
3678a48
Fix test failure on ios
mkhamoyan Sep 1, 2023
8cf5609
Fix wasm build failure
mkhamoyan Sep 1, 2023
b44508f
Fix wasm build
mkhamoyan Sep 1, 2023
21acbca
Fix wasm build
mkhamoyan Sep 1, 2023
4947b49
Minor fix
mkhamoyan Sep 1, 2023
32e90d8
Remove logging
mkhamoyan Sep 1, 2023
88088d8
Fix failure on maccatalyst
mkhamoyan Sep 5, 2023
f187abb
Merge branch 'main' into hybrid_timezone_changes
mkhamoyan Sep 5, 2023
a886791
Changed displayName for hybrid mode
mkhamoyan Sep 5, 2023
8d91430
Remove logs
mkhamoyan Sep 5, 2023
4d9b1f6
Changes requested by review
mkhamoyan Sep 6, 2023
a64ee2b
Fix build failure
mkhamoyan Sep 6, 2023
c589bbe
Add checks and remove not needed code
mkhamoyan Sep 6, 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
Prev Previous commit
Next Next commit
Fix build failure
  • Loading branch information
@mkhamoyan
mkhamoyan committed Sep 6, 2023
commit a64ee2b509f02a8d59b234759580a5ed6c0cede2
2 changes: 1 addition & 1 deletion src/libraries/System.Private.CoreLib/src/System/TimeZoneInfo.FullGlobalizationData.Unix.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public sealed partial class TimeZoneInfo
{
private const string InvariantUtcStandardDisplayName = "Coordinated Universal Time";
private const string FallbackCultureName = "en-US";
#if !TARGET_MACCATALYST && TARGET_IOS && TARGET_TVOS
#if !TARGET_MACCATALYST && !TARGET_IOS && !TARGET_TVOS
private const string GmtId = "GMT";

// Some time zones may give better display names using their location names rather than their generic name.
Expand Down