Merge pull request #16411 from abpframework/auto-merge/rel-7-2/1906

Merge branch dev with rel-7.2

docs/en/UI/Angular/Basic-Theme.md

@@ -72,7 +72,7 @@ Or, you can download the [source code](https://github.com/abpframework/abp/blob/
             "prefix": "abp",
             "architect": {
                 "build": {
-                    "builder": "@angular-devkit/build-ng-packagr:build",
+                    "builder": "@angular-devkit/build-angular:ng-packagr",
                     "options": {
                         "tsConfig": "projects/theme-basic/tsconfig.lib.json",
                         "project": "projects/theme-basic/ng-package.json"

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

@@ -91,7 +91,7 @@ public class AngularSourceCodeAdder : ITransientDependency
                 new JProperty("prefix", "abp"),
                 new JProperty("architect", new JObject(
                     new JProperty("build", new JObject(
-                        new JProperty("builder", "@angular-devkit/build-ng-packagr:build"),
+                        new JProperty("builder", "@angular-devkit/build-angular:ng-packagr"),
                         new JProperty("options", new JObject(
                             new JProperty("tsConfig", $"projects/{project}/tsconfig.lib.json"),
                             new JProperty("project", $"projects/{project}/ng-package.json")

modules/cms-kit/angular/angular.json

@@ -10,7 +10,7 @@
       "prefix": "lib",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-ng-packagr:build",
+          "builder": "@angular-devkit/build-angular:ng-packagr",
           "options": {
             "tsConfig": "projects/cms-kit/tsconfig.lib.json",
             "project": "projects/cms-kit/ng-package.json"

npm/packs/utils/angular.json

@@ -10,7 +10,7 @@
       "prefix": "lib",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-ng-packagr:build",
+          "builder": "@angular-devkit/build-angular:ng-packagr",
           "options": {
             "tsConfig": "projects/utils/tsconfig.lib.json",
             "project": "projects/utils/ng-package.json"