CliOptions to AbpCliOptions

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<CliOptions>(options =>
+            Configure<AbpCliOptions>(options =>
             {
                 options.Commands["help"] = typeof(HelpCommand);
                 options.Commands["new"] = typeof(NewCommand);

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliOptions.cs → 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<string, Type> Commands { get; }
 
@@ -17,7 +17,7 @@ namespace Volo.Abp.Cli
         /// </summary>
         public string ToolName { get; set; } = "CLI";
 
-        public CliOptions()
+        public AbpCliOptions()
         {
             Commands = new Dictionary<string, Type>(StringComparer.OrdinalIgnoreCase);
         }

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<CliOptions> options)
+        public CommandSelector(IOptions<AbpCliOptions> options)
         {
             Options = options.Value;
         }

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<HelpCommand> Logger { get; set; }
-        protected CliOptions CliOptions { get; }
+        protected AbpCliOptions AbpCliOptions { get; }
         protected IHybridServiceScopeFactory ServiceScopeFactory { get; }
 
-        public HelpCommand(IOptions<CliOptions> cliOptions,
+        public HelpCommand(IOptions<AbpCliOptions> cliOptions,
             IHybridServiceScopeFactory serviceScopeFactory)
         {
             ServiceScopeFactory = serviceScopeFactory;
             Logger = NullLogger<HelpCommand>.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;
 

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<CliOptions> options)
+            IOptions<AbpCliOptions> options)
         {
             _nugetPackagesVersionUpdater = nugetPackagesVersionUpdater;
             _npmPackagesUpdater = npmPackagesUpdater;

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoSourceCodeStore.cs

@@ -21,7 +21,7 @@ namespace Volo.Abp.Cli.ProjectBuilding
     {
         public ILogger<AbpIoSourceCodeStore> 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<CliOptions> options,
+            IOptions<AbpCliOptions> options,
             IJsonSerializer jsonSerializer,
             IRemoteServiceExceptionHandler remoteServiceExceptionHandler,
             ICancellationTokenProvider cancellationTokenProvider)

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<CliOptions> options,
+            IOptions<AbpCliOptions> options,
             IJsonSerializer jsonSerializer,
             IApiKeyService apiKeyService)
         {

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<CliOptions> options,
+            IOptions<AbpCliOptions> options,
             IJsonSerializer jsonSerializer, 
             IApiKeyService apiKeyService)
         {