From 8210f415fe705947643a917d3d8a2c0d68e2d15c Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Mon, 12 Jan 2026 09:58:31 +0800
Subject: [PATCH] Enhance TimeZoneHelper with offset and validation

https://abp.io/support/questions/10295/TimeZoneHelperGetTimezones-throws-TimeZoneNotFoundException-on-Linux
---
 Directory.Packages.props                      |  2 +-
 .../Volo/Abp/Timing/TimeZoneHelper.cs         | 29 +++++++++++++-
 .../Volo/Abp/Timing/TimeZoneHelper_Tests.cs   | 39 +++++++++++++++++++
 3 files changed, 68 insertions(+), 2 deletions(-)
 create mode 100644 framework/test/Volo.Abp.Timing.Tests/Volo/Abp/Timing/TimeZoneHelper_Tests.cs

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 453ddc618f..de499d0b7b 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -181,7 +181,7 @@
     <PackageVersion Include="System.Text.Json" Version="10.0.0" />
     <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.6.3" />
     <PackageVersion Include="TencentCloudSDK.Sms" Version="3.0.1273" />
-    <PackageVersion Include="TimeZoneConverter" Version="7.0.0" />
+    <PackageVersion Include="TimeZoneConverter" Version="7.2.0" />
     <PackageVersion Include="Unidecode.NET" Version="2.1.0" />
     <PackageVersion Include="xunit" Version="2.9.3" />
     <PackageVersion Include="xunit.extensibility.execution" Version="2.9.3" />
diff --git a/framework/src/Volo.Abp.Timing/Volo/Abp/Timing/TimeZoneHelper.cs b/framework/src/Volo.Abp.Timing/Volo/Abp/Timing/TimeZoneHelper.cs
index 6101585878..f4a44db29e 100644
--- a/framework/src/Volo.Abp.Timing/Volo/Abp/Timing/TimeZoneHelper.cs
+++ b/framework/src/Volo.Abp.Timing/Volo/Abp/Timing/TimeZoneHelper.cs
@@ -7,14 +7,41 @@ namespace Volo.Abp.Timing;
 
 public static class TimeZoneHelper
 {
+    /// <summary>
+    /// Returns timezone list ordered by display name, enriched with UTC offset, filtering out invalid ids.
+    /// </summary>
     public static List<NameValue> GetTimezones(List<NameValue> timezones)
     {
         return timezones
             .OrderBy(x => x.Name)
-            .Select(x => new NameValue( $"{x.Name} ({GetTimezoneOffset(TZConvert.GetTimeZoneInfo(x.Name))})", x.Name))
+            .Select(TryCreateNameValueWithOffset)
+            .Where(x => x != null)
+            .Select(x => x!)
             .ToList();
     }
 
+    /// <summary>
+    /// Builds a <see cref="NameValue"/> that includes the UTC offset in the name; returns null if the id is not found.
+    /// </summary>
+    public static NameValue? TryCreateNameValueWithOffset(NameValue timeZone)
+    {
+        try
+        {
+            var timeZoneInfo = TZConvert.GetTimeZoneInfo(timeZone.Name);
+            var name = $"{timeZone.Name} ({GetTimezoneOffset(timeZoneInfo)})";
+            return new NameValue(name, timeZoneInfo.StandardName);
+        }
+        catch (TimeZoneNotFoundException)
+        {
+            // ignore
+        }
+
+        return null;
+    }
+
+    /// <summary>
+    /// Formats the base UTC offset as "+hh:mm" or "-hh:mm" for display purposes.
+    /// </summary>
     public static string GetTimezoneOffset(TimeZoneInfo timeZoneInfo)
     {
         if (timeZoneInfo.BaseUtcOffset < TimeSpan.Zero)
diff --git a/framework/test/Volo.Abp.Timing.Tests/Volo/Abp/Timing/TimeZoneHelper_Tests.cs b/framework/test/Volo.Abp.Timing.Tests/Volo/Abp/Timing/TimeZoneHelper_Tests.cs
new file mode 100644
index 0000000000..ced819f1ba
--- /dev/null
+++ b/framework/test/Volo.Abp.Timing.Tests/Volo/Abp/Timing/TimeZoneHelper_Tests.cs
@@ -0,0 +1,39 @@
+using System.Collections.Generic;
+using Shouldly;
+using TimeZoneConverter;
+using Volo.Abp.Testing;
+using Xunit;
+
+namespace Volo.Abp.Timing;
+
+public class TimeZoneHelper_Tests : AbpIntegratedTest<AbpTimingTestModule>
+{
+    [Fact]
+    public void GetTimezones_Test()
+    {
+        var validTimeZoneId = "UTC";
+        var invalidTimeZoneId = "Invalid/Zone";
+
+        var timezones = new List<NameValue>
+        {
+            new(invalidTimeZoneId, invalidTimeZoneId),
+            new(validTimeZoneId, validTimeZoneId)
+        };
+
+        var result = TimeZoneHelper.GetTimezones(timezones);
+
+        result.Count.ShouldBe(1);
+
+        var expectedTimeZoneInfo = TZConvert.GetTimeZoneInfo(validTimeZoneId);
+        var expectedName = $"{validTimeZoneId} ({TimeZoneHelper.GetTimezoneOffset(expectedTimeZoneInfo)})";
+
+        result[0].Name.ShouldBe(expectedName);
+        result[0].Value.ShouldBe(expectedTimeZoneInfo.StandardName);
+    }
+
+    [Fact]
+    public void TryCreateNameValueWithOffset_Should_Return_Null_For_Invalid_Timezone()
+    {
+        TimeZoneHelper.TryCreateNameValueWithOffset(new NameValue("Invalid/Zone", "Invalid/Zone")).ShouldBeNull();
+    }
+}