Merge pull request #7093 from abpframework/auto-merge/rel-4-1/55

Merge branch dev with rel-4.1

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

@@ -64,6 +64,10 @@ namespace Volo.Abp.Cli.Commands
             {
                 Logger.LogInformation("Template: " + template);
             }
+            else
+            {
+                template = (await TemplateInfoProvider.GetDefaultAsync()).Name;
+            }
 
             var version = commandLineArgs.Options.GetOrNull(Options.Version.Short, Options.Version.Long);
             if (version != null)
@@ -226,7 +230,8 @@ namespace Volo.Abp.Cli.Commands
 
             Logger.LogInformation($"'{projectName}' has been successfully created to '{outputFolder}'");
 
-            if (AppTemplateBase.IsAppTemplate(template ?? (await TemplateInfoProvider.GetDefaultAsync()).Name))
+
+            if (AppTemplateBase.IsAppTemplate(template))
             {
                 var isCommercial = template == AppProTemplate.TemplateName;
                 OpenThanksPage(uiFramework, databaseProvider, isTiered || commandLineArgs.Options.ContainsKey("separate-identity-server"), isCommercial);

npm/ng-packs/packages/theme-basic/testing/src/lib/theme-basic-testing.module.ts

@@ -5,7 +5,11 @@ import {
   ValidationErrorComponent,
 } from '@abp/ng.theme.basic';
 import { ModuleWithProviders, NgModule } from '@angular/core';
-import { VALIDATION_ERROR_TEMPLATE, VALIDATION_TARGET_SELECTOR } from '@ngx-validate/core';
+import {
+  VALIDATION_ERROR_TEMPLATE,
+  VALIDATION_INVALID_CLASSES,
+  VALIDATION_TARGET_SELECTOR,
+} from '@ngx-validate/core';
 
 @NgModule({
   exports: [BaseThemeBasicModule],
@@ -26,6 +30,10 @@ export class ThemeBasicTestingModule {
           provide: VALIDATION_TARGET_SELECTOR,
           useValue: '.form-group',
         },
+        {
+          provide: VALIDATION_INVALID_CLASSES,
+          useValue: 'is-invalid',
+        },
       ],
     };
   }