Merge pull request #15064 from abpframework/auto-merge/rel-7-0/1572

Merge branch dev with rel-7.0

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Bundling/BundlingService.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml;
@@ -31,6 +32,12 @@ public class BundlingService : IBundlingService, ITransientDependency
 
     public async Task BundleAsync(string directory, bool forceBuild, string projectType = BundlingConsts.WebAssembly)
     {
+        if(RuntimeInformation.IsOSPlatform(OSPlatform.OSX) && projectType == BundlingConsts.MauiBlazor) 
+        {
+            Logger.LogWarning("ABP bundle command does not support OSX for MAUI Blazor");
+            return;
+        }
+
         var projectFiles = Directory.GetFiles(directory, "*.csproj");
         if (!projectFiles.Any())
         {
@@ -52,7 +59,7 @@ public class BundlingService : IBundlingService, ITransientDependency
                     new DotNetProjectInfo(string.Empty, projectFilePath, true)
                 };
 
-            DotNetProjectBuilder.BuildProjects(projects, string.Empty);
+            DotNetProjectBuilder.BuildProjects(projects, string.Empty); 
         }
 
         var frameworkVersion = GetTargetFrameworkVersion(projectFilePath, projectType);

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

@@ -249,7 +249,7 @@ public class AngularSourceCodeAdder : ITransientDependency
 
         fileContent = Regex.Replace(fileContent, @"apis\s*:\s*{", 
             "apis: {"+ Environment.NewLine +
-            "    " + moduleName.Split(".").Last() + ":"+ Environment.NewLine +
+            "    " + moduleName.Split(".").Last() + ": {"+ Environment.NewLine +
             "      rootNamespace: '" + moduleName + "',"+ Environment.NewLine +
             "    },");
         

npm/ng-packs/packages/components/tree/src/lib/components/tree.component.ts

@@ -41,6 +41,7 @@ export class TreeComponent {
   @Output() readonly expandedKeysChange = new EventEmitter<string[]>();
   @Output() readonly selectedNodeChange = new EventEmitter();
   @Output() readonly dropOver = new EventEmitter<DropEvent>();
+  @Output() readonly nzExpandChange = new EventEmitter<NzFormatEmitEvent>();
   @Input() noAnimation = true;
   @Input() draggable: boolean;
   @Input() checkable: boolean;
@@ -76,6 +77,7 @@ export class TreeComponent {
   onExpandedKeysChange(event) {
     this.expandedKeys = [...event.keys];
     this.expandedKeysChange.emit(event.keys);
+    this.nzExpandChange.emit(event);
   }
 
   onDrop(event: DropEvent) {

npm/ng-packs/packages/components/tree/src/lib/utils/nz-tree-adapter.ts

@@ -5,7 +5,7 @@ export abstract class BaseNode {
   constructor(public id: string, public parentId: string | null) {}
 }
 
-class TreeNode<T extends BaseNode> extends BaseNode {
+export class TreeNode<T extends BaseNode> extends BaseNode {
   title: string | undefined;
   key: string;
   icon: string | null = null;
@@ -89,7 +89,6 @@ function createTreeFromList<T extends BaseNode>(list: T[]): TreeNode<T>[] {
       tree.push(node);
     }
   });
-
   return tree;
 }