From a01140f531fa1816831b17c0f0a56f3e91e75fdb Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 21 Sep 2021 16:50:22 +0300 Subject: [PATCH 1/2] Update ProjectNameValidator.cs --- .../Volo/Abp/Cli/Utils/ProjectNameValidator.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/ProjectNameValidator.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/ProjectNameValidator.cs index 7864b387d0..98de427ee2 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/ProjectNameValidator.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/ProjectNameValidator.cs @@ -53,7 +53,7 @@ namespace Volo.Abp.Cli.Utils { foreach (var illegalKeyword in IllegalKeywords) { - if (projectName.Contains(illegalKeyword)) + if (projectName.Split(".").Contains(illegalKeyword)) { throw new CliUsageException("Project name cannot contain the word \"" + illegalKeyword + "\". Specify a different name."); } From d2dc246ab79f28e6e5b24be9d5601b55fde1ebef Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 21 Sep 2021 16:55:52 +0300 Subject: [PATCH 2/2] Update ProjectNameValidation_Tests.cs --- .../Volo/Abp/Cli/ProjectNameValidation_Tests.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/ProjectNameValidation_Tests.cs b/framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/ProjectNameValidation_Tests.cs index 85d9fcc2b7..bac75cc770 100644 --- a/framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/ProjectNameValidation_Tests.cs +++ b/framework/test/Volo.Abp.Cli.Core.Tests/Volo/Abp/Cli/ProjectNameValidation_Tests.cs @@ -58,6 +58,9 @@ namespace Volo.Abp.Cli { var args = new CommandLineArgs("new", illegalKeyword); await _newCommand.ExecuteAsync(args).ShouldThrowAsync(); + + args = new CommandLineArgs("new", "Acme." + illegalKeyword); + await _newCommand.ExecuteAsync(args).ShouldThrowAsync(); } }