diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs index 52bbac8e43..9dd10558f7 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs @@ -165,7 +165,7 @@ public class CliService : ITransientDependency promptInput = GetPromptInput(); - } while (promptInput?.ToLower() != "exit"); + } while (promptInput?.ToLowerInvariant() != "exit"); } private async Task RunBatchAsync(CommandLineArgs commandLineArgs) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/BundleCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/BundleCommand.cs index c0b6c0f965..ff56b5b414 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/BundleCommand.cs +++ b/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); projectType ??= BundlingConsts.WebAssembly; - return projectType.ToLower() switch { + return projectType.ToLowerInvariant() switch { "webassembly" => BundlingConsts.WebAssembly, "maui-blazor" => BundlingConsts.MauiBlazor, _ => throw new CliUsageException(ExceptionMessageHelper.GetInvalidOptionExceptionMessage("Project Type")) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs index 51ade9be0c..d1f29ef14d 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs +++ b/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") { - var theme = commandLineArgs.Options.GetOrNull(Options.Theme.Long)?.ToLower(); + var theme = commandLineArgs.Options.GetOrNull(Options.Theme.Long)?.ToLowerInvariant(); return template switch { @@ -725,7 +725,7 @@ public abstract class ProjectCreationCommandBase return null; } - var themeStyle = commandLineArgs.Options.GetOrNull(Options.ThemeStyle.Long)?.ToLower(); + var themeStyle = commandLineArgs.Options.GetOrNull(Options.ThemeStyle.Long)?.ToLowerInvariant(); 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}"); - commandBuilder.Append($" --is-secondary-entrypoint {isSecondaryEndpoint.ToString().ToLower()}"); - commandBuilder.Append($" --is-module-template {isModuleTemplate.ToString().ToLower()}"); - commandBuilder.Append($" --override {isOverride.ToString().ToLower()}"); + commandBuilder.Append($" --is-secondary-entrypoint {isSecondaryEndpoint.ToString().ToLowerInvariant()}"); + commandBuilder.Append($" --is-module-template {isModuleTemplate.ToString().ToLowerInvariant()}"); + commandBuilder.Append($" --override {isOverride.ToString().ToLowerInvariant()}"); var result = CmdHelper.RunCmdAndGetOutput(commandBuilder.ToString(), workingDirectory); return await Task.FromResult(result); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProxyCommandBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProxyCommandBase.cs index 425242ed70..b7b61e6a90 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProxyCommandBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProxyCommandBase.cs @@ -33,7 +33,7 @@ public abstract class ProxyCommandBase : IConsoleCommand, ITransientDependenc 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)) { @@ -75,9 +75,9 @@ public abstract class ProxyCommandBase : IConsoleCommand, ITransientDependenc ServiceType? serviceType = null; if (!serviceTypeArg.IsNullOrWhiteSpace()) { - serviceType = serviceTypeArg.ToLower() == "application" + serviceType = serviceTypeArg.ToLowerInvariant() == "application" ? ServiceType.Application - : serviceTypeArg.ToLower() == "integration" + : serviceTypeArg.ToLowerInvariant() == "integration" ? ServiceType.Integration : ServiceType.All; } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/Services/SuiteAppSettingsService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/Services/SuiteAppSettingsService.cs index 665fcbb6cd..197e2b9bb5 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/Services/SuiteAppSettingsService.cs +++ b/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 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)) { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SuiteCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SuiteCommand.cs index 80d5a5a13b..f5ce341bf8 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SuiteCommand.cs +++ b/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 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)) { @@ -542,7 +542,7 @@ public class SuiteCommand : IConsoleCommand, ITransientDependency private IEnumerable GetProcessesRelatedWithSuite() { return (from p in Process.GetProcesses() - where p.ProcessName.ToLower().Contains("abp-suite") + where p.ProcessName.ToLowerInvariant().Contains("abp-suite") select p); } 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 411be841ed..a594613b44 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 @@ -356,7 +356,7 @@ public class AbpIoSourceCodeStore : ISourceCodeStore, ITransientDependency private static bool IsNetworkSource(string source) { - return source.ToLower().StartsWith("http"); + return source.ToLowerInvariant().StartsWith("http"); } private List<(string TemplateName, string Version)> GetLocalTemplates() diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppNoLayersTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppNoLayersTemplateBase.cs index c83a5fc29d..8246aa34ea 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppNoLayersTemplateBase.cs +++ b/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) { - context.Symbols.Add(context.BuildArgs.Theme.Value.ToString().ToUpper()); + context.Symbols.Add(context.BuildArgs.Theme.Value.ToString().ToUpperInvariant()); } if (context.BuildArgs.Theme == Theme.LeptonX) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs index ff656d7598..170664dae1 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs +++ b/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) { - context.Symbols.Add(context.BuildArgs.Theme.Value.ToString().ToUpper()); + context.Symbols.Add(context.BuildArgs.Theme.Value.ToString().ToUpperInvariant()); } if (context.BuildArgs.Theme == Theme.LeptonX) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs index ace0abacb9..b0c57ce0c9 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs +++ b/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) { - context.Symbols.Add(context.BuildArgs.Theme.Value.ToString().ToUpper()); + context.Symbols.Add(context.BuildArgs.Theme.Value.ToString().ToUpperInvariant()); } if (context.BuildArgs.Theme == Theme.LeptonX) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ServiceProxying/Angular/AngularServiceProxyGenerator.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ServiceProxying/Angular/AngularServiceProxyGenerator.cs index 3a29358350..31dd1a76d4 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ServiceProxying/Angular/AngularServiceProxyGenerator.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ServiceProxying/Angular/AngularServiceProxyGenerator.cs @@ -85,7 +85,7 @@ public class AngularServiceProxyGenerator : ServiceProxyGeneratorBase