CLI: Fix angular package version problem

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

@@ -31,7 +31,7 @@ public abstract class ProjectCreationCommandBase
     public InitialMigrationCreator InitialMigrationCreator { get; }
     public ILogger<NewCommand> Logger { get; set; }
 
-    public ThemePackageAdder ThemePackageAdder { get; set; }
+    public ThemePackageAdder ThemePackageAdder { get; }
 
     public ProjectCreationCommandBase(
         ConnectionStringProvider connectionStringProvider,
@@ -503,7 +503,7 @@ public abstract class ProjectCreationCommandBase
 
     private void ConfigureNpmPackagesForBasicTheme(ProjectBuildArgs projectArgs)
     {
-        if (projectArgs.UiFramework is UiFramework.Mvc or UiFramework.NotSpecified or UiFramework.BlazorServer)
+        if (projectArgs.UiFramework is not UiFramework.None or UiFramework.Angular)
         {
             ThemePackageAdder.AddNpmPackage(projectArgs.OutputFolder, "@abp/aspnetcore.mvc.ui.theme.basic", projectArgs.Version);
         }
@@ -513,7 +513,7 @@ public abstract class ProjectCreationCommandBase
             ThemePackageAdder.AddNpmPackage(projectArgs.OutputFolder, "@abp/aspnetcore.components.server.basictheme", projectArgs.Version);
         }
 
-        if (projectArgs.UiFramework == UiFramework.Angular)
+        if (projectArgs.UiFramework is UiFramework.Angular)
         {
             ThemePackageAdder.AddAngularPackage(projectArgs.OutputFolder, "@abp/ng.theme.basic", projectArgs.Version);
         }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ThemePackageAdder.cs

@@ -21,14 +21,18 @@ public class ThemePackageAdder : ITransientDependency
 
     public void AddNpmPackage(string rootDirectory, string package, string version)
     {
-        var packageJsonFilePaths = PackageJsonFileFinder.Find(rootDirectory);
+        var packageJsonFilePaths = PackageJsonFileFinder.Find(rootDirectory)
+            .Where(x => !File.Exists(x.RemovePostFix("package.json") + "angular.json"))
+            .ToList();
         
         AddPackage(packageJsonFilePaths, package, version);
     }
 
     public void AddAngularPackage(string rootDirectory, string package, string version)
     {
-        var angularPackageJsonFilePaths = PackageJsonFileFinder.Find(rootDirectory).Where(x => File.Exists(x.RemovePostFix("package.json") + "angular.json")).ToList();
+        var angularPackageJsonFilePaths = PackageJsonFileFinder.Find(rootDirectory)
+            .Where(x => File.Exists(x.RemovePostFix("package.json") + "angular.json"))
+            .ToList();
 
         AddPackage(angularPackageJsonFilePaths, package, version);
     }
@@ -41,7 +45,7 @@ public class ThemePackageAdder : ITransientDependency
         }
         
         var installCommand = IsYarnAvailable() ? "yarn add " : "npm install ";
-        var packageVersion = !string.IsNullOrWhiteSpace(version) ? $" --version {version}" : string.Empty;
+        var packageVersion = !string.IsNullOrWhiteSpace(version) ? $"@{version}" : string.Empty;
 
         foreach (var packageJsonFilePath in packageJsonFilePaths)
         {