From fb9e14a6204bfd19eb5ef83a6f249178a81399f8 Mon Sep 17 00:00:00 2001
From: maliming <6908465+maliming@users.noreply.github.com>
Date: Fri, 10 Jul 2020 10:58:04 +0800
Subject: [PATCH 1/3] Update TZConvertTimezoneProvider.cs

---
 .../Volo/Abp/Timing/TZConvertTimezoneProvider.cs                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/src/Volo.Abp.Timing/Volo/Abp/Timing/TZConvertTimezoneProvider.cs b/framework/src/Volo.Abp.Timing/Volo/Abp/Timing/TZConvertTimezoneProvider.cs
index 551b26e488..9713ea0f5c 100644
--- a/framework/src/Volo.Abp.Timing/Volo/Abp/Timing/TZConvertTimezoneProvider.cs
+++ b/framework/src/Volo.Abp.Timing/Volo/Abp/Timing/TZConvertTimezoneProvider.cs
@@ -10,7 +10,7 @@ namespace Volo.Abp.Timing
     {
         public virtual List<NameValue> GetWindowsTimezones()
         {
-            return TZConvert.KnownIanaTimeZoneNames.OrderBy(x => x).Select(x => new NameValue(x, x)).ToList();
+            return TZConvert.KnownWindowsTimeZoneIds.OrderBy(x => x).Select(x => new NameValue(x, x)).ToList();
         }
 
         public virtual List<NameValue> GetIanaTimezones()

From 6717b3861a3561a016eeefffdc7b85e533e0259c Mon Sep 17 00:00:00 2001
From: maliming <6908465+maliming@users.noreply.github.com>
Date: Fri, 10 Jul 2020 11:09:26 +0800
Subject: [PATCH 2/3] Update abp.js

---
 npm/packs/core/src/abp.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/npm/packs/core/src/abp.js b/npm/packs/core/src/abp.js
index 41837d2368..f8cdf1ea2c 100644
--- a/npm/packs/core/src/abp.js
+++ b/npm/packs/core/src/abp.js
@@ -717,7 +717,7 @@ var abp = abp || {};
     };
 
     var toUtc = function (date) {
-        Date.UTC(
+        return Date.UTC(
             date.getUTCFullYear(),
             date.getUTCMonth(),
             date.getUTCDate(),

From 85f382da195c0bfe4bc53b9c7c57d83d4647bde6 Mon Sep 17 00:00:00 2001
From: maliming <6908465+maliming@users.noreply.github.com>
Date: Fri, 10 Jul 2020 13:08:14 +0800
Subject: [PATCH 3/3] fix toLocal function problem.

---
 npm/packs/core/src/abp.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/npm/packs/core/src/abp.js b/npm/packs/core/src/abp.js
index f8cdf1ea2c..20bd92147a 100644
--- a/npm/packs/core/src/abp.js
+++ b/npm/packs/core/src/abp.js
@@ -706,13 +706,13 @@ var abp = abp || {};
 
     var toLocal = function (date) {
         return new Date(
-            date.getUTCFullYear(),
-            date.getUTCMonth(),
-            date.getUTCDate(),
-            date.getUTCHours(),
-            date.getUTCMinutes(),
-            date.getUTCSeconds(),
-            date.getUTCMilliseconds()
+            date.getFullYear(),
+            date.getMonth(),
+            date.getDate(),
+            date.getHours(),
+            date.getMinutes(),
+            date.getSeconds(),
+            date.getMilliseconds()
         );
     };