From bfa674fcdfa146e585c1424997c46e9a3b6eb585 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 14:23:08 +0300 Subject: [PATCH] CliOptions to AbpCliOptions --- .../Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs | 2 +- .../Volo/Abp/Cli/{CliOptions.cs => AbpCliOptions.cs} | 4 ++-- .../Volo/Abp/Cli/Commands/CommandSelector.cs | 4 ++-- .../Volo/Abp/Cli/Commands/HelpCommand.cs | 10 +++++----- .../Volo/Abp/Cli/Commands/UpdateCommand.cs | 4 ++-- .../Abp/Cli/ProjectBuilding/AbpIoSourceCodeStore.cs | 4 ++-- .../Abp/Cli/ProjectBuilding/ModuleProjectBuilder.cs | 4 ++-- .../Abp/Cli/ProjectBuilding/TemplateProjectBuilder.cs | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/{CliOptions.cs => AbpCliOptions.cs} (89%) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs index b51ef5fb2d..a616d29409 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs @@ -23,7 +23,7 @@ namespace Volo.Abp.Cli // a permanent fix will probably be published with the release of .net core 3.0: https://github.com/dotnet/corefx/issues/36553 AppContext.SetSwitch("System.Net.Http.UseSocketsHttpHandler", false); - Configure(options => + Configure(options => { options.Commands["help"] = typeof(HelpCommand); options.Commands["new"] = typeof(NewCommand); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliOptions.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliOptions.cs similarity index 89% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliOptions.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliOptions.cs index ca9e61bf82..8cca4a160e 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliOptions.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliOptions.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; namespace Volo.Abp.Cli { - public class CliOptions + public class AbpCliOptions { public Dictionary Commands { get; } @@ -17,7 +17,7 @@ namespace Volo.Abp.Cli /// public string ToolName { get; set; } = "CLI"; - public CliOptions() + public AbpCliOptions() { Commands = new Dictionary(StringComparer.OrdinalIgnoreCase); } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CommandSelector.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CommandSelector.cs index 595917e845..f77a002370 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CommandSelector.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CommandSelector.cs @@ -8,9 +8,9 @@ namespace Volo.Abp.Cli.Commands { public class CommandSelector : ICommandSelector, ITransientDependency { - protected CliOptions Options { get; } + protected AbpCliOptions Options { get; } - public CommandSelector(IOptions options) + public CommandSelector(IOptions options) { Options = options.Value; } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/HelpCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/HelpCommand.cs index 38e8d075d0..dd9145e8db 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/HelpCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/HelpCommand.cs @@ -13,15 +13,15 @@ namespace Volo.Abp.Cli.Commands public class HelpCommand : IConsoleCommand, ITransientDependency { public ILogger Logger { get; set; } - protected CliOptions CliOptions { get; } + protected AbpCliOptions AbpCliOptions { get; } protected IHybridServiceScopeFactory ServiceScopeFactory { get; } - public HelpCommand(IOptions cliOptions, + public HelpCommand(IOptions cliOptions, IHybridServiceScopeFactory serviceScopeFactory) { ServiceScopeFactory = serviceScopeFactory; Logger = NullLogger.Instance; - CliOptions = cliOptions.Value; + AbpCliOptions = cliOptions.Value; } public async Task ExecuteAsync(CommandLineArgs commandLineArgs) @@ -32,7 +32,7 @@ namespace Volo.Abp.Cli.Commands return; } - var commandType = CliOptions.Commands[commandLineArgs.Target]; + var commandType = AbpCliOptions.Commands[commandLineArgs.Target]; using (var scope = ServiceScopeFactory.CreateScope()) { @@ -53,7 +53,7 @@ namespace Volo.Abp.Cli.Commands sb.AppendLine("Command List:"); sb.AppendLine(""); - foreach (var command in CliOptions.Commands.ToArray()) + foreach (var command in AbpCliOptions.Commands.ToArray()) { string shortDescription; diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/UpdateCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/UpdateCommand.cs index 97c11f1f29..0f31af2eb0 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/UpdateCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/UpdateCommand.cs @@ -21,14 +21,14 @@ namespace Volo.Abp.Cli.Commands private readonly VoloNugetPackagesVersionUpdater _nugetPackagesVersionUpdater; private readonly NpmPackagesUpdater _npmPackagesUpdater; private readonly ICliAnalyticsCollect _cliAnalyticsCollect; - private readonly CliOptions _options; + private readonly AbpCliOptions _options; private readonly IJsonSerializer _jsonSerializer; public UpdateCommand(VoloNugetPackagesVersionUpdater nugetPackagesVersionUpdater, NpmPackagesUpdater npmPackagesUpdater, ICliAnalyticsCollect cliAnalyticsCollect, IJsonSerializer jsonSerializer, - IOptions options) + IOptions options) { _nugetPackagesVersionUpdater = nugetPackagesVersionUpdater; _npmPackagesUpdater = npmPackagesUpdater; diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoSourceCodeStore.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoSourceCodeStore.cs index ac51be6fac..fd0a0e5246 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoSourceCodeStore.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoSourceCodeStore.cs @@ -21,7 +21,7 @@ namespace Volo.Abp.Cli.ProjectBuilding { public ILogger Logger { get; set; } - protected CliOptions Options { get; } + protected AbpCliOptions Options { get; } protected IJsonSerializer JsonSerializer { get; } @@ -30,7 +30,7 @@ namespace Volo.Abp.Cli.ProjectBuilding protected ICancellationTokenProvider CancellationTokenProvider { get; } public AbpIoSourceCodeStore( - IOptions options, + IOptions options, IJsonSerializer jsonSerializer, IRemoteServiceExceptionHandler remoteServiceExceptionHandler, ICancellationTokenProvider cancellationTokenProvider) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ModuleProjectBuilder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ModuleProjectBuilder.cs index 57332bd5e2..48f109e1d3 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ModuleProjectBuilder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ModuleProjectBuilder.cs @@ -20,14 +20,14 @@ namespace Volo.Abp.Cli.ProjectBuilding protected ISourceCodeStore SourceCodeStore { get; } protected IModuleInfoProvider ModuleInfoProvider { get; } protected ICliAnalyticsCollect CliAnalyticsCollect { get; } - protected CliOptions Options { get; } + protected AbpCliOptions Options { get; } protected IJsonSerializer JsonSerializer { get; } protected IApiKeyService ApiKeyService { get; } public ModuleProjectBuilder(ISourceCodeStore sourceCodeStore, IModuleInfoProvider moduleInfoProvider, ICliAnalyticsCollect cliAnalyticsCollect, - IOptions options, + IOptions options, IJsonSerializer jsonSerializer, IApiKeyService apiKeyService) { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateProjectBuilder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateProjectBuilder.cs index e1248b32f0..9d31e10200 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateProjectBuilder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateProjectBuilder.cs @@ -20,14 +20,14 @@ namespace Volo.Abp.Cli.ProjectBuilding protected ISourceCodeStore SourceCodeStore { get; } protected ITemplateInfoProvider TemplateInfoProvider { get; } protected ICliAnalyticsCollect CliAnalyticsCollect { get; } - protected CliOptions Options { get; } + protected AbpCliOptions Options { get; } protected IJsonSerializer JsonSerializer { get; } protected IApiKeyService ApiKeyService { get; } public TemplateProjectBuilder(ISourceCodeStore sourceCodeStore, ITemplateInfoProvider templateInfoProvider, ICliAnalyticsCollect cliAnalyticsCollect, - IOptions options, + IOptions options, IJsonSerializer jsonSerializer, IApiKeyService apiKeyService) {