diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LoginCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LoginCommand.cs
index 223b354c6a..12810aebb9 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LoginCommand.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LoginCommand.cs
@@ -81,22 +81,18 @@ namespace Volo.Abp.Cli.Commands
 
             using (var client = new CliHttpClient())
             {
-                var response = await client.GetHttpResponseMessageWithRetryAsync(
-                    url,
-                    CancellationTokenProvider.Token,
-                    Logger);
-
-                if (!response.IsSuccessStatusCode)
+                using (var response = await client.GetHttpResponseMessageWithRetryAsync(url, CancellationTokenProvider.Token, Logger))
                 {
-                    throw new Exception($"ERROR: Remote server returns '{response.StatusCode}'");
-                }
+                    if (!response.IsSuccessStatusCode)
+                    {
+                        throw new Exception($"ERROR: Remote server returns '{response.StatusCode}'");
+                    }
 
-                await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(response);
+                    await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(response);
 
-                var responseContent = await response.Content.ReadAsStringAsync();
-                var result = JsonSerializer.Deserialize<bool>(responseContent);
-
-                return result;
+                    var responseContent = await response.Content.ReadAsStringAsync();
+                    return JsonSerializer.Deserialize<bool>(responseContent);
+                }
             }
         }
 
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Http/CliHttpClient.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Http/CliHttpClient.cs
index 3712d0be13..d853067abf 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Http/CliHttpClient.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Http/CliHttpClient.cs
@@ -67,10 +67,7 @@ namespace Volo.Abp.Cli.Http
                 };
             }
 
-            if (!cancellationToken.HasValue)
-            {
-                cancellationToken = CancellationToken.None;
-            }
+            cancellationToken ??= CancellationToken.None;
 
             return await HttpPolicyExtensions
                 .HandleTransientHttpError()
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Licensing/AbpIoApiKeyService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Licensing/AbpIoApiKeyService.cs
index 33a2e10fdf..2aeb8ed90a 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Licensing/AbpIoApiKeyService.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Licensing/AbpIoApiKeyService.cs
@@ -59,22 +59,18 @@ namespace Volo.Abp.Cli.Licensing
 
             using (var client = new CliHttpClient())
             {
-                var response = await client.GetHttpResponseMessageWithRetryAsync(
-                    url: url,
-                    cancellationToken: CancellationTokenProvider.Token,
-                    logger: _logger);
-
-                if (!response.IsSuccessStatusCode)
+                using (var response = await client.GetHttpResponseMessageWithRetryAsync(url, CancellationTokenProvider.Token, _logger))
                 {
-                    throw new Exception($"ERROR: Remote server returns '{response.StatusCode}'");
-                }
+                    if (!response.IsSuccessStatusCode)
+                    {
+                        throw new Exception($"ERROR: Remote server returns '{response.StatusCode}'");
+                    }
 
-                await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(response);
+                    await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(response);
 
-                var responseContent = await response.Content.ReadAsStringAsync();
-                var apiKeyResult = JsonSerializer.Deserialize<DeveloperApiKeyResult>(responseContent);
-
-                return apiKeyResult;
+                    var responseContent = await response.Content.ReadAsStringAsync();
+                    return JsonSerializer.Deserialize<DeveloperApiKeyResult>(responseContent);
+                }
             }
         }
     }
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/NuGetService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/NuGetService.cs
index 1ecfc9e34d..45ed071416 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/NuGetService.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/NuGet/NuGetService.cs
@@ -65,47 +65,48 @@ namespace Volo.Abp.Cli.NuGet
 
             using (var client = new CliHttpClient(setBearerToken: false))
             {
-                var responseMessage = await client.GetHttpResponseMessageWithRetryAsync(
+                using (var responseMessage = await client.GetHttpResponseMessageWithRetryAsync(
                     url,
                     cancellationToken: CancellationTokenProvider.Token,
                     logger: Logger
-                );
-
-                await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(responseMessage);
-
-                var responseContent = await responseMessage.Content.ReadAsStringAsync();
-
-                List<SemanticVersion> versions;
-
-                if (!includeNightly && !includeReleaseCandidates)
-                {
-                    versions = JsonSerializer
-                    .Deserialize<NuGetVersionResultDto>(responseContent)
-                    .Versions
-                    .Select(SemanticVersion.Parse)
-                    .OrderByDescending(v=> v, new VersionComparer()).ToList();
-
-                    versions = versions.Where(x => !x.IsPrerelease).ToList();
-                }
-                else if (!includeNightly && includeReleaseCandidates)
+                ))
                 {
-                    versions = JsonSerializer
-                        .Deserialize<NuGetVersionResultDto>(responseContent)
-                        .Versions
-                        .Where(v=> !v.Contains("-preview"))
-                        .Select(SemanticVersion.Parse)
-                        .OrderByDescending(v=> v, new VersionComparer()).ToList();
+                    await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(responseMessage);
+
+                    var responseContent = await responseMessage.Content.ReadAsStringAsync();
+
+                    List<SemanticVersion> versions;
+
+                    if (!includeNightly && !includeReleaseCandidates)
+                    {
+                        versions = JsonSerializer
+                            .Deserialize<NuGetVersionResultDto>(responseContent)
+                            .Versions
+                            .Select(SemanticVersion.Parse)
+                            .OrderByDescending(v => v, new VersionComparer()).ToList();
+
+                        versions = versions.Where(x => !x.IsPrerelease).ToList();
+                    }
+                    else if (!includeNightly && includeReleaseCandidates)
+                    {
+                        versions = JsonSerializer
+                            .Deserialize<NuGetVersionResultDto>(responseContent)
+                            .Versions
+                            .Where(v => !v.Contains("-preview"))
+                            .Select(SemanticVersion.Parse)
+                            .OrderByDescending(v => v, new VersionComparer()).ToList();
+                    }
+                    else
+                    {
+                        versions = JsonSerializer
+                            .Deserialize<NuGetVersionResultDto>(responseContent)
+                            .Versions
+                            .Select(SemanticVersion.Parse)
+                            .OrderByDescending(v => v, new VersionComparer()).ToList();
+                    }
+
+                    return versions.Any() ? versions.Max() : null;
                 }
-                else
-                {
-                    versions = JsonSerializer
-                        .Deserialize<NuGetVersionResultDto>(responseContent)
-                        .Versions
-                        .Select(SemanticVersion.Parse)
-                        .OrderByDescending(v=> v, new VersionComparer()).ToList();
-                }
-
-                return versions.Any() ? versions.Max() : null;
             }
         }
 
@@ -122,30 +123,26 @@ namespace Volo.Abp.Cli.NuGet
         private async Task<List<string>> GetProPackageListAsync()
         {
             using var client = new CliHttpClient();
-
             var url = $"{CliUrls.WwwAbpIo}api/app/nugetPackage/proPackageNames";
 
-            var responseMessage = await client.GetHttpResponseMessageWithRetryAsync(
-                url: url,
-                cancellationToken: CancellationTokenProvider.Token,
-                logger: Logger
-            );
-
-            if (responseMessage.IsSuccessStatusCode)
+            using (var responseMessage = await client.GetHttpResponseMessageWithRetryAsync(url, CancellationTokenProvider.Token, Logger))
             {
-                return JsonSerializer.Deserialize<List<string>>(await responseMessage.Content.ReadAsStringAsync());
-            }
+                if (responseMessage.IsSuccessStatusCode)
+                {
+                    return JsonSerializer.Deserialize<List<string>>(await responseMessage.Content.ReadAsStringAsync());
+                }
 
-            var exceptionMessage = "Remote server returns '" + (int)responseMessage.StatusCode + "-" + responseMessage.ReasonPhrase + "'. ";
-            var remoteServiceErrorMessage = await RemoteServiceExceptionHandler.GetAbpRemoteServiceErrorAsync(responseMessage);
+                var exceptionMessage = "Remote server returns '" + (int)responseMessage.StatusCode + "-" + responseMessage.ReasonPhrase + "'. ";
+                var remoteServiceErrorMessage = await RemoteServiceExceptionHandler.GetAbpRemoteServiceErrorAsync(responseMessage);
 
-            if (remoteServiceErrorMessage != null)
-            {
-                exceptionMessage += remoteServiceErrorMessage;
-            }
+                if (remoteServiceErrorMessage != null)
+                {
+                    exceptionMessage += remoteServiceErrorMessage;
+                }
 
-            Logger.LogError(exceptionMessage);
-            return null;
+                Logger.LogError(exceptionMessage);
+                return null;
+            }
         }
 
         public class NuGetVersionResultDto
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateInfoProvider.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateInfoProvider.cs
index b69e898068..2aefcfd1a9 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateInfoProvider.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateInfoProvider.cs
@@ -76,22 +76,18 @@ namespace Volo.Abp.Cli.ProjectBuilding
 
                 using (var client = new CliHttpClient())
                 {
-                    var response = await client.GetHttpResponseMessageWithRetryAsync(
-                        url,
-                        CancellationTokenProvider.Token,
-                        Logger);
-
-                    if (!response.IsSuccessStatusCode)
+                    using (var response = await client.GetHttpResponseMessageWithRetryAsync(url, CancellationTokenProvider.Token, Logger))
                     {
-                        throw new Exception($"ERROR: Remote server returns '{response.StatusCode}'");
-                    }
+                        if (!response.IsSuccessStatusCode)
+                        {
+                            throw new Exception($"ERROR: Remote server returns '{response.StatusCode}'");
+                        }
 
-                    await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(response);
+                        await RemoteServiceExceptionHandler.EnsureSuccessfulHttpResponseAsync(response);
 
-                    var responseContent = await response.Content.ReadAsStringAsync();
-                    var result = JsonSerializer.Deserialize<bool>(responseContent);
-
-                    return result;
+                        var responseContent = await response.Content.ReadAsStringAsync();
+                        return JsonSerializer.Deserialize<bool>(responseContent);
+                    }
                 }
             }
             catch (Exception)
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackagesUpdater.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackagesUpdater.cs
index c71e9591c0..722bfbcbf9 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackagesUpdater.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmPackagesUpdater.cs
@@ -58,7 +58,7 @@ namespace Volo.Abp.Cli.ProjectModification
 
             async Task UpdateAsync(string file)
             {
-                var updated = await UpdatePackagesInFile(file, includePreviews,includeReleaseCandidates, switchToStable);
+                var updated = await UpdatePackagesInFile(file, includePreviews, includeReleaseCandidates, switchToStable);
                 packagesUpdated.TryAdd(file, updated);
             }
 
@@ -157,18 +157,19 @@ namespace Volo.Abp.Cli.ProjectModification
             {
                 using (var client = new CliHttpClient(TimeSpan.FromMinutes(1)))
                 {
-                    var response = await client.GetHttpResponseMessageWithRetryAsync(
-                        url: $"{CliUrls.WwwAbpIo}api/myget/apikey/",
-                        cancellationToken: CancellationTokenProvider.Token,
-                        logger: Logger
-                    );
-
-                    return Encoding.Default.GetString(await response.Content.ReadAsByteArrayAsync());
+                    using (var response = await client.GetHttpResponseMessageWithRetryAsync(
+                        $"{CliUrls.WwwAbpIo}api/myget/apikey/",
+                        CancellationTokenProvider.Token,
+                        Logger
+                    ))
+                    {
+                        return Encoding.Default.GetString(await response.Content.ReadAsByteArrayAsync());
+                    }
                 }
             }
             catch (Exception)
             {
-                return "";
+                return string.Empty;
             }
         }
 
@@ -217,7 +218,7 @@ namespace Volo.Abp.Cli.ProjectModification
             bool includeReleaseCandidates = false,
             bool switchToStable = false)
         {
-            var currentVersion = (string) package.Value;
+            var currentVersion = (string)package.Value;
 
             var version = "";
             if ((includePreviews || (!switchToStable && currentVersion.Contains("-preview"))) && !includeReleaseCandidates)
@@ -290,12 +291,12 @@ namespace Volo.Abp.Cli.ProjectModification
 
         protected virtual List<JProperty> GetAbpPackagesFromPackageJson(JObject fileObject)
         {
-            var dependencyList = new[] {"dependencies", "devDependencies", "peerDependencies"};
+            var dependencyList = new[] { "dependencies", "devDependencies", "peerDependencies" };
             var abpPackages = new List<JProperty>();
 
             foreach (var dependencyListName in dependencyList)
             {
-                var dependencies = (JObject) fileObject[dependencyListName];
+                var dependencies = (JObject)fileObject[dependencyListName];
 
                 if (dependencies == null)
                 {