diff --git a/aspnet-core/framework/cli/LINGYUN.Abp.Cli/LINGYUN.Abp.Cli.csproj b/aspnet-core/framework/cli/LINGYUN.Abp.Cli/LINGYUN.Abp.Cli.csproj index d058740c3..6176a8657 100644 --- a/aspnet-core/framework/cli/LINGYUN.Abp.Cli/LINGYUN.Abp.Cli.csproj +++ b/aspnet-core/framework/cli/LINGYUN.Abp.Cli/LINGYUN.Abp.Cli.csproj @@ -4,8 +4,8 @@ Exe - net8.0 - 8.3.4 + net9.0 + 9.0.4 colin Use LINGYUN.MicroService.Templates command line true diff --git a/aspnet-core/framework/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/Commands/LocalFileCreateProjectService.cs b/aspnet-core/framework/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/Commands/LocalFileCreateProjectService.cs index facacbf37..559226db0 100644 --- a/aspnet-core/framework/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/Commands/LocalFileCreateProjectService.cs +++ b/aspnet-core/framework/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/Commands/LocalFileCreateProjectService.cs @@ -83,10 +83,11 @@ namespace LINGYUN.Abp.Cli.Commands Logger.LogInformation("Rewrite Package and company name."); - await TryReplacePackageAndCompanyNameWithProjectFile( + await TryReplacePackageAndCompanyAndProjectNameWithProjectFile( projectFiles, createArgs.PackageName, createArgs.SolutionName.CompanyName, + createArgs.SolutionName.ProjectName, dbm); Logger.LogInformation("Rewrite appsettings.json."); @@ -231,15 +232,17 @@ namespace LINGYUN.Abp.Cli.Commands // } // } - protected async virtual Task TryReplacePackageAndCompanyNameWithProjectFile( + protected async virtual Task TryReplacePackageAndCompanyAndProjectNameWithProjectFile( List projectFiles, string packageName, string companyName, + string projectName, string dbm = "MySQL") { - var canReplaceFiles = projectFiles.Where(f => !f.IsFolder && !f.Name.Contains("appsettings")); - foreach (var projectFile in canReplaceFiles) + var canReplaceWithNotProjectFiles = projectFiles.Where(f => !f.IsFolder && !f.Name.Contains("appsettings")); + foreach (var projectFile in canReplaceWithNotProjectFiles) { + await ReplaceFileTextAsync(projectFile, "project-name", projectName.ToKebabCase()); await ReplaceFileTextAsync(projectFile, "PackageName", packageName); await ReplaceFileTextAsync(projectFile, "CompanyName", companyName); await ReplaceFileTextAsync(projectFile, "DatabaseManagementName", dbm);