Skip to content
Closed
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,14 @@ private static Dictionary<string, TimeZoneInfo> PopulateAllSystemTimeZones(Cache

foreach (string timeZoneId in GetTimeZoneIds())
{
// Skip UTC aliases to avoid duplicate display names in the list.
// UTC is already added to the dictionary at the start, and aliases like
// UCT, Etc/UTC, Zulu, etc. have the same display name as UTC.
if (IsUtcAlias(timeZoneId))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IsUtcAlias can also be simplified:

private static bool IsUtcAlias(string id) => id[0] switch
{
    'e' or 'E' => string.Equals(id, "Etc/UTC", StringComparison.OrdinalIgnoreCase) ||
                  string.Equals(id, "Etc/UCT", StringComparison.OrdinalIgnoreCase) ||
                  string.Equals(id, "Etc/Universal", StringComparison.OrdinalIgnoreCase) ||
                  string.Equals(id, "Etc/Zulu", StringComparison.OrdinalIgnoreCase),
    'u' or 'U' => string.Equals(id, "UCT", StringComparison.OrdinalIgnoreCase) ||
                  string.Equals(id, "UTC", StringComparison.OrdinalIgnoreCase) ||
                  string.Equals(id, "Universal", StringComparison.OrdinalIgnoreCase),
    'z' or 'Z' => string.Equals(id, "Zulu", StringComparison.OrdinalIgnoreCase),
    _ => false
};

{
continue;
}

if (TryGetTimeZone(timeZoneId, false, out TimeZoneInfo? timeZone, out _, cachedData, alwaysFallbackToLocalMachine: true) == TimeZoneInfoResult.Success &&
timeZone is not null)
{
Expand Down