From 89b083980e43a3c62fa08418966bdb0ee958e0d9 Mon Sep 17 00:00:00 2001
From: skoshelev <sergey.k@nopcommerce.com>
Date: Mon, 22 Mar 2021 09:00:59 +0300
Subject: [PATCH] #5554 Fixed problem with a returned null value from async
 methods

---
 src/Libraries/Nop.Core/NopVersion.cs                            | 2 +-
 .../ShipStationComputationMethod.cs                             | 2 +-
 src/Plugins/Nop.Plugin.Shipping.ShipStation/plugin.json         | 2 +-
 src/Plugins/Nop.Plugin.Shipping.UPS/UPSComputationMethod.cs     | 2 +-
 src/Plugins/Nop.Plugin.Shipping.UPS/plugin.json                 | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Libraries/Nop.Core/NopVersion.cs b/src/Libraries/Nop.Core/NopVersion.cs
index 4cb7f253650..e62106b4d6f 100644
--- a/src/Libraries/Nop.Core/NopVersion.cs
+++ b/src/Libraries/Nop.Core/NopVersion.cs
@@ -13,7 +13,7 @@ public static class NopVersion
         /// <summary>
         /// Gets the minor store version
         /// </summary>
-        public const string MINOR_VERSION = "1";
+        public const string MINOR_VERSION = "2";
         
         /// <summary>
         /// Gets the full store version
diff --git a/src/Plugins/Nop.Plugin.Shipping.ShipStation/ShipStationComputationMethod.cs b/src/Plugins/Nop.Plugin.Shipping.ShipStation/ShipStationComputationMethod.cs
index 39737b1a91e..2cd3dbdc78c 100644
--- a/src/Plugins/Nop.Plugin.Shipping.ShipStation/ShipStationComputationMethod.cs
+++ b/src/Plugins/Nop.Plugin.Shipping.ShipStation/ShipStationComputationMethod.cs
@@ -108,7 +108,7 @@ public async Task<GetShippingOptionResponse> GetShippingOptionsAsync(GetShipping
             if (getShippingOptionRequest == null)
                 throw new ArgumentNullException(nameof(getShippingOptionRequest));
 
-            return null;
+            return Task.FromResult<decimal?>(null);
         }
 
         /// <summary>
diff --git a/src/Plugins/Nop.Plugin.Shipping.ShipStation/plugin.json b/src/Plugins/Nop.Plugin.Shipping.ShipStation/plugin.json
index c598495afd7..1459821052e 100644
--- a/src/Plugins/Nop.Plugin.Shipping.ShipStation/plugin.json
+++ b/src/Plugins/Nop.Plugin.Shipping.ShipStation/plugin.json
@@ -2,7 +2,7 @@
   "Group": "Shipping rate computation",
   "FriendlyName": "ShipStation",
   "SystemName": "Shipping.ShipStation",
-  "Version": "1.13",
+  "Version": "1.14",
   "SupportedVersions": [ "4.40" ],
   "Author": "nopCommerce team",
   "DisplayOrder": 1,
diff --git a/src/Plugins/Nop.Plugin.Shipping.UPS/UPSComputationMethod.cs b/src/Plugins/Nop.Plugin.Shipping.UPS/UPSComputationMethod.cs
index 5699e029f28..65cb2939c42 100644
--- a/src/Plugins/Nop.Plugin.Shipping.UPS/UPSComputationMethod.cs
+++ b/src/Plugins/Nop.Plugin.Shipping.UPS/UPSComputationMethod.cs
@@ -76,7 +76,7 @@ public async Task<GetShippingOptionResponse> GetShippingOptionsAsync(GetShipping
         /// </returns>
         public Task<decimal?> GetFixedRateAsync(GetShippingOptionRequest getShippingOptionRequest)
         {
-            return null;
+            return Task.FromResult<decimal?>(null);
         }
 
         /// <summary>
diff --git a/src/Plugins/Nop.Plugin.Shipping.UPS/plugin.json b/src/Plugins/Nop.Plugin.Shipping.UPS/plugin.json
index 831e7ac2b0d..31f4a00f543 100644
--- a/src/Plugins/Nop.Plugin.Shipping.UPS/plugin.json
+++ b/src/Plugins/Nop.Plugin.Shipping.UPS/plugin.json
@@ -2,7 +2,7 @@
   "Group": "Shipping rate computation",
   "FriendlyName": "UPS (United Parcel Service)",
   "SystemName": "Shipping.UPS",
-  "Version": "1.64",
+  "Version": "1.65",
   "SupportedVersions": [ "4.40" ],
   "Author": "nopCommerce team",
   "DisplayOrder": 1,