Merge pull request #16429 from abpframework/auto-merge/rel-7-2/1909

Merge branch dev with rel-7.2

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ServiceProxying/CSharp/CSharpServiceProxyGenerator.cs

@@ -82,6 +82,7 @@ public class CSharpServiceProxyGenerator : ServiceProxyGeneratorBase<CSharpServi
         "using System;",
         "using System.Collections.Generic;",
         "using System.Threading.Tasks;",
+        "using Volo.Abp;",
         "using Volo.Abp.Application.Dtos;",
         "using Volo.Abp.Http.Client;",
         "using Volo.Abp.Http.Modeling;",
@@ -94,6 +95,7 @@ public class CSharpServiceProxyGenerator : ServiceProxyGeneratorBase<CSharpServi
         "using System;",
         "using System.Collections.Generic;",
         "using System.Threading.Tasks;",
+        "using Volo.Abp;",
         "using Volo.Abp.Application.Dtos;",
         "using Volo.Abp.Application.Services;"
     };
@@ -102,6 +104,7 @@ public class CSharpServiceProxyGenerator : ServiceProxyGeneratorBase<CSharpServi
     {
         "using System;",
         "using System.Collections.Generic;",
+        "using Volo.Abp;",
         "using Volo.Abp.Application.Dtos;",
         "using Volo.Abp.ObjectExtending;",
     };

npm/ng-packs/packages/account/src/lib/components/personal-settings/personal-settings-half-row.component.ts

@@ -9,16 +9,14 @@ import { UntypedFormGroup } from '@angular/forms';
 @Component({
   selector: 'abp-personal-settings-half-row',
   template: ` <div class="w-50 d-inline">
-    <div class="mb-3">
-      <label [attr.for]="name" class="form-label">{{ displayName | abpLocalization }} </label>
-      <input
-        type="text"
-        [attr.id]="id"
-        class="form-control"
-        [attr.name]="name"
-        [formControlName]="name"
-      />
-    </div>
+    <label [attr.for]="name" class="form-label">{{ displayName | abpLocalization }} </label>
+    <input
+      type="text"
+      [attr.id]="id"
+      class="form-control"
+      [attr.name]="name"
+      [formControlName]="name"
+    />
   </div>`,
   styles: [],
   viewProviders: [EXTENSIBLE_FORM_VIEW_PROVIDER],

npm/packs/utils/angular.json

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