Browse Source

remove unncessary async usage #7618

pull/7619/head
Alper Ebicoglu 6 years ago
parent
commit
f69f8c9fd6
  1. 16
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs

16
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs

@ -36,7 +36,7 @@ namespace Volo.Abp.Cli.ProjectModification
protected ProjectNpmPackageAdder ProjectNpmPackageAdder { get; } protected ProjectNpmPackageAdder ProjectNpmPackageAdder { get; }
protected NpmGlobalPackagesChecker NpmGlobalPackagesChecker { get; } protected NpmGlobalPackagesChecker NpmGlobalPackagesChecker { get; }
protected IRemoteServiceExceptionHandler RemoteServiceExceptionHandler { get; } protected IRemoteServiceExceptionHandler RemoteServiceExceptionHandler { get; }
private readonly CliHttpClientFactory _cliHttpClientFactory; private readonly CliHttpClientFactory _cliHttpClientFactory;
@ -54,7 +54,7 @@ namespace Volo.Abp.Cli.ProjectModification
NugetPackageToLocalReferenceConverter nugetPackageToLocalReferenceConverter, NugetPackageToLocalReferenceConverter nugetPackageToLocalReferenceConverter,
AngularModuleSourceCodeAdder angularModuleSourceCodeAdder, AngularModuleSourceCodeAdder angularModuleSourceCodeAdder,
NewCommand newCommand, NewCommand newCommand,
BundleCommand bundleCommand, BundleCommand bundleCommand,
CliHttpClientFactory cliHttpClientFactory) CliHttpClientFactory cliHttpClientFactory)
{ {
JsonSerializer = jsonSerializer; JsonSerializer = jsonSerializer;
@ -175,7 +175,7 @@ namespace Volo.Abp.Cli.ProjectModification
{ {
await RemoveProjectByTarget(module, moduleSolutionFile, NuGetPackageTarget.EntityFrameworkCore, isProjectTiered); await RemoveProjectByTarget(module, moduleSolutionFile, NuGetPackageTarget.EntityFrameworkCore, isProjectTiered);
await RemoveProjectByPostFix(module, moduleSolutionFile, "test", ".EntityFrameworkCore.Tests"); await RemoveProjectByPostFix(module, moduleSolutionFile, "test", ".EntityFrameworkCore.Tests");
await ChangeDomainTestReferenceToMongoDB(module, moduleSolutionFile); ChangeDomainTestReferenceToMongoDB(module, moduleSolutionFile);
} }
} }
@ -230,7 +230,7 @@ namespace Volo.Abp.Cli.ProjectModification
} }
} }
private async Task ChangeDomainTestReferenceToMongoDB(ModuleWithMastersInfo module, string moduleSolutionFile) private void ChangeDomainTestReferenceToMongoDB(ModuleWithMastersInfo module, string moduleSolutionFile)
{ {
var testPath = Path.Combine(Path.GetDirectoryName(moduleSolutionFile), "test"); var testPath = Path.Combine(Path.GetDirectoryName(moduleSolutionFile), "test");
@ -505,7 +505,7 @@ namespace Volo.Abp.Cli.ProjectModification
} }
} }
protected virtual async Task RunMigrator(string[] projectFiles) protected virtual void RunMigrator(string[] projectFiles)
{ {
var dbMigratorProject = projectFiles.FirstOrDefault(p => p.EndsWith(".DbMigrator.csproj")); var dbMigratorProject = projectFiles.FirstOrDefault(p => p.EndsWith(".DbMigrator.csproj"));
@ -520,13 +520,13 @@ namespace Volo.Abp.Cli.ProjectModification
{ {
if (newTemplate || newProTemplate) if (newTemplate || newProTemplate)
{ {
return await GetEmptyModuleProjectInfoAsync(moduleName, newProTemplate); return GetEmptyModuleProjectInfo(moduleName, newProTemplate);
} }
var url = $"{CliUrls.WwwAbpIo}api/app/module/byNameWithDetails/?name=" + moduleName; var url = $"{CliUrls.WwwAbpIo}api/app/module/byNameWithDetails/?name=" + moduleName;
var client = _cliHttpClientFactory.CreateClient(); var client = _cliHttpClientFactory.CreateClient();
using (var response = await client.GetAsync(url)) using (var response = await client.GetAsync(url, _cliHttpClientFactory.GetCancellationToken()))
{ {
if (!response.IsSuccessStatusCode) if (!response.IsSuccessStatusCode)
{ {
@ -543,7 +543,7 @@ namespace Volo.Abp.Cli.ProjectModification
} }
} }
private async Task<ModuleWithMastersInfo> GetEmptyModuleProjectInfoAsync(string moduleName, private ModuleWithMastersInfo GetEmptyModuleProjectInfo(string moduleName,
bool newProTemplate = false) bool newProTemplate = false)
{ {
var module = new ModuleWithMastersInfo var module = new ModuleWithMastersInfo

Loading…
Cancel
Save