Browse Source

fix(cli): use ToUpperInvariant/ToLowerInvariant across CLI Core project

pull/25128/head
maliming 1 week ago
parent
commit
4af07a7c58
No known key found for this signature in database GPG Key ID: A646B9CB645ECEA4
  1. 2
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs
  2. 2
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/BundleCommand.cs
  3. 10
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs
  4. 6
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProxyCommandBase.cs
  5. 2
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/Services/SuiteAppSettingsService.cs
  6. 4
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SuiteCommand.cs
  7. 2
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoSourceCodeStore.cs
  8. 2
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppNoLayersTemplateBase.cs
  9. 2
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs
  10. 2
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs
  11. 2
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ServiceProxying/Angular/AngularServiceProxyGenerator.cs

2
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs

@ -165,7 +165,7 @@ public class CliService : ITransientDependency
promptInput = GetPromptInput(); promptInput = GetPromptInput();
} while (promptInput?.ToLower() != "exit"); } while (promptInput?.ToLowerInvariant() != "exit");
} }
private async Task RunBatchAsync(CommandLineArgs commandLineArgs) private async Task RunBatchAsync(CommandLineArgs commandLineArgs)

2
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/BundleCommand.cs

@ -75,7 +75,7 @@ public class BundleCommand : IConsoleCommand, ITransientDependency
var projectType = commandLineArgs.Options.GetOrNull(Options.ProjectType.Short, Options.ProjectType.Long); var projectType = commandLineArgs.Options.GetOrNull(Options.ProjectType.Short, Options.ProjectType.Long);
projectType ??= BundlingConsts.WebAssembly; projectType ??= BundlingConsts.WebAssembly;
return projectType.ToLower() switch { return projectType.ToLowerInvariant() switch {
"webassembly" => BundlingConsts.WebAssembly, "webassembly" => BundlingConsts.WebAssembly,
"maui-blazor" => BundlingConsts.MauiBlazor, "maui-blazor" => BundlingConsts.MauiBlazor,
_ => throw new CliUsageException(ExceptionMessageHelper.GetInvalidOptionExceptionMessage("Project Type")) _ => throw new CliUsageException(ExceptionMessageHelper.GetInvalidOptionExceptionMessage("Project Type"))

10
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs

@ -687,7 +687,7 @@ public abstract class ProjectCreationCommandBase
protected virtual Theme? GetThemeByTemplateOrNull(CommandLineArgs commandLineArgs, string template = "app") protected virtual Theme? GetThemeByTemplateOrNull(CommandLineArgs commandLineArgs, string template = "app")
{ {
var theme = commandLineArgs.Options.GetOrNull(Options.Theme.Long)?.ToLower(); var theme = commandLineArgs.Options.GetOrNull(Options.Theme.Long)?.ToLowerInvariant();
return template switch return template switch
{ {
@ -725,7 +725,7 @@ public abstract class ProjectCreationCommandBase
return null; return null;
} }
var themeStyle = commandLineArgs.Options.GetOrNull(Options.ThemeStyle.Long)?.ToLower(); var themeStyle = commandLineArgs.Options.GetOrNull(Options.ThemeStyle.Long)?.ToLowerInvariant();
return themeStyle switch return themeStyle switch
{ {
@ -803,9 +803,9 @@ public abstract class ProjectCreationCommandBase
var commandBuilder = new StringBuilder($"npx ng g @abp/ng.schematics:create-lib --package-name {libraryName}"); var commandBuilder = new StringBuilder($"npx ng g @abp/ng.schematics:create-lib --package-name {libraryName}");
commandBuilder.Append($" --is-secondary-entrypoint {isSecondaryEndpoint.ToString().ToLower()}"); commandBuilder.Append($" --is-secondary-entrypoint {isSecondaryEndpoint.ToString().ToLowerInvariant()}");
commandBuilder.Append($" --is-module-template {isModuleTemplate.ToString().ToLower()}"); commandBuilder.Append($" --is-module-template {isModuleTemplate.ToString().ToLowerInvariant()}");
commandBuilder.Append($" --override {isOverride.ToString().ToLower()}"); commandBuilder.Append($" --override {isOverride.ToString().ToLowerInvariant()}");
var result = CmdHelper.RunCmdAndGetOutput(commandBuilder.ToString(), workingDirectory); var result = CmdHelper.RunCmdAndGetOutput(commandBuilder.ToString(), workingDirectory);
return await Task.FromResult(result); return await Task.FromResult(result);

6
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProxyCommandBase.cs

@ -33,7 +33,7 @@ public abstract class ProxyCommandBase<T> : IConsoleCommand, ITransientDependenc
public async Task ExecuteAsync(CommandLineArgs commandLineArgs) public async Task ExecuteAsync(CommandLineArgs commandLineArgs)
{ {
var generateType = commandLineArgs.Options.GetOrNull(Options.GenerateType.Short, Options.GenerateType.Long)?.ToUpper(); var generateType = commandLineArgs.Options.GetOrNull(Options.GenerateType.Short, Options.GenerateType.Long)?.ToUpperInvariant();
if (string.IsNullOrWhiteSpace(generateType)) if (string.IsNullOrWhiteSpace(generateType))
{ {
@ -75,9 +75,9 @@ public abstract class ProxyCommandBase<T> : IConsoleCommand, ITransientDependenc
ServiceType? serviceType = null; ServiceType? serviceType = null;
if (!serviceTypeArg.IsNullOrWhiteSpace()) if (!serviceTypeArg.IsNullOrWhiteSpace())
{ {
serviceType = serviceTypeArg.ToLower() == "application" serviceType = serviceTypeArg.ToLowerInvariant() == "application"
? ServiceType.Application ? ServiceType.Application
: serviceTypeArg.ToLower() == "integration" : serviceTypeArg.ToLowerInvariant() == "integration"
? ServiceType.Integration ? ServiceType.Integration
: ServiceType.All; : ServiceType.All;
} }

2
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/Services/SuiteAppSettingsService.cs

@ -110,7 +110,7 @@ public class SuiteAppSettingsService : ITransientDependency
var dotnetToolList = CmdHelper.RunCmdAndGetOutput("dotnet tool list -g", out int exitCode); var dotnetToolList = CmdHelper.RunCmdAndGetOutput("dotnet tool list -g", out int exitCode);
var suiteLine = dotnetToolList.Split(Environment.NewLine) var suiteLine = dotnetToolList.Split(Environment.NewLine)
.FirstOrDefault(l => l.ToLower().StartsWith("volo.abp.suite ")); .FirstOrDefault(l => l.ToLowerInvariant().StartsWith("volo.abp.suite "));
if (string.IsNullOrEmpty(suiteLine)) if (string.IsNullOrEmpty(suiteLine))
{ {

4
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SuiteCommand.cs

@ -252,7 +252,7 @@ public class SuiteCommand : IConsoleCommand, ITransientDependency
var dotnetToolList = CmdHelper.RunCmdAndGetOutput("dotnet tool list -g", out int exitCode); var dotnetToolList = CmdHelper.RunCmdAndGetOutput("dotnet tool list -g", out int exitCode);
var suiteLine = dotnetToolList.Split(Environment.NewLine) var suiteLine = dotnetToolList.Split(Environment.NewLine)
.FirstOrDefault(l => l.ToLower().StartsWith("volo.abp.suite ")); .FirstOrDefault(l => l.ToLowerInvariant().StartsWith("volo.abp.suite "));
if (string.IsNullOrEmpty(suiteLine)) if (string.IsNullOrEmpty(suiteLine))
{ {
@ -542,7 +542,7 @@ public class SuiteCommand : IConsoleCommand, ITransientDependency
private IEnumerable<Process> GetProcessesRelatedWithSuite() private IEnumerable<Process> GetProcessesRelatedWithSuite()
{ {
return (from p in Process.GetProcesses() return (from p in Process.GetProcesses()
where p.ProcessName.ToLower().Contains("abp-suite") where p.ProcessName.ToLowerInvariant().Contains("abp-suite")
select p); select p);
} }

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

@ -356,7 +356,7 @@ public class AbpIoSourceCodeStore : ISourceCodeStore, ITransientDependency
private static bool IsNetworkSource(string source) private static bool IsNetworkSource(string source)
{ {
return source.ToLower().StartsWith("http"); return source.ToLowerInvariant().StartsWith("http");
} }
private List<(string TemplateName, string Version)> GetLocalTemplates() private List<(string TemplateName, string Version)> GetLocalTemplates()

2
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppNoLayersTemplateBase.cs

@ -241,7 +241,7 @@ public abstract class AppNoLayersTemplateBase : TemplateInfo
if (context.BuildArgs.Theme != Theme.NotSpecified) if (context.BuildArgs.Theme != Theme.NotSpecified)
{ {
context.Symbols.Add(context.BuildArgs.Theme.Value.ToString().ToUpper()); context.Symbols.Add(context.BuildArgs.Theme.Value.ToString().ToUpperInvariant());
} }
if (context.BuildArgs.Theme == Theme.LeptonX) if (context.BuildArgs.Theme == Theme.LeptonX)

2
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs

@ -228,7 +228,7 @@ public abstract class AppTemplateBase : TemplateInfo
if (context.BuildArgs.Theme != Theme.NotSpecified) if (context.BuildArgs.Theme != Theme.NotSpecified)
{ {
context.Symbols.Add(context.BuildArgs.Theme.Value.ToString().ToUpper()); context.Symbols.Add(context.BuildArgs.Theme.Value.ToString().ToUpperInvariant());
} }
if (context.BuildArgs.Theme == Theme.LeptonX) if (context.BuildArgs.Theme == Theme.LeptonX)

2
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs

@ -41,7 +41,7 @@ public abstract class MicroserviceTemplateBase : TemplateInfo
if (context.BuildArgs.Theme != Theme.NotSpecified) if (context.BuildArgs.Theme != Theme.NotSpecified)
{ {
context.Symbols.Add(context.BuildArgs.Theme.Value.ToString().ToUpper()); context.Symbols.Add(context.BuildArgs.Theme.Value.ToString().ToUpperInvariant());
} }
if (context.BuildArgs.Theme == Theme.LeptonX) if (context.BuildArgs.Theme == Theme.LeptonX)

2
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ServiceProxying/Angular/AngularServiceProxyGenerator.cs

@ -85,7 +85,7 @@ public class AngularServiceProxyGenerator : ServiceProxyGeneratorBase<AngularSer
} }
var serviceType = GetServiceType(args) ?? Volo.Abp.Cli.ServiceProxying.ServiceType.Application; var serviceType = GetServiceType(args) ?? Volo.Abp.Cli.ServiceProxying.ServiceType.Application;
commandBuilder.Append($" --service-type {serviceType.ToString().ToLower()}"); commandBuilder.Append($" --service-type {serviceType.ToString().ToLowerInvariant()}");
_cmdhelper.RunCmd(commandBuilder.ToString()); _cmdhelper.RunCmd(commandBuilder.ToString());

Loading…
Cancel
Save