From 8f65f58d82f54b742d5ffe6717c7e1d68f7bea6a Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Wed, 26 Jun 2024 10:54:25 +0800 Subject: [PATCH 1/2] Remove Blazor.Client project if UI is not Blazor --- .../Microservice/MicroserviceTemplateBase.cs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs index a70f1db649..0d66937841 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs @@ -172,6 +172,8 @@ public abstract class MicroserviceTemplateBase : TemplateInfo steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor", null, "/apps/blazor/src/MyCompanyName.MyProjectName.Blazor")); + steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor.Client", null, + "/apps/blazor/src/MyCompanyName.MyProjectName.Blazor.Client")); steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.ProductService.Blazor", "/services/product/MyCompanyName.MyProjectName.ProductService.sln", "/services/product/src/MyCompanyName.MyProjectName.ProductService.Blazor")); @@ -217,6 +219,13 @@ public abstract class MicroserviceTemplateBase : TemplateInfo steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor", null, "/apps/blazor/src/MyCompanyName.MyProjectName.Blazor")); + + steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor.Client", + "/apps/blazor/MyCompanyName.MyProjectName.Blazor.sln", + "/apps/blazor/src/MyCompanyName.MyProjectName.Blazor.Client")); + steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor.Client", + null, + "/apps/blazor/src/MyCompanyName.MyProjectName.Blazor.Client")); steps.Add(new RemoveProjectFromTyeStep("blazor")); steps.Add(new TemplateProjectRenameStep("MyCompanyName.MyProjectName.Blazor.Server", @@ -230,6 +239,8 @@ public abstract class MicroserviceTemplateBase : TemplateInfo case UiFramework.NotSpecified: steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor", null, "/apps/blazor/src/MyCompanyName.MyProjectName.Blazor")); + steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor.Client", null, + "/apps/blazor/src/MyCompanyName.MyProjectName.Blazor.Client")); steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor.Server", null, "/apps/blazor/src/MyCompanyName.MyProjectName.Blazor.Server")); steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.ProductService.Blazor", From 6b00799526b98b64fb26cf5ac126f171c768390d Mon Sep 17 00:00:00 2001 From: maliming Date: Wed, 26 Jun 2024 13:20:09 +0800 Subject: [PATCH 2/2] Update `datatables.net` to `2.0.2`. https://github.com/abpframework/abp/pull/19340 --- npm/packs/datatables.net-bs5/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm/packs/datatables.net-bs5/package.json b/npm/packs/datatables.net-bs5/package.json index 03bcece395..d37ed04f99 100644 --- a/npm/packs/datatables.net-bs5/package.json +++ b/npm/packs/datatables.net-bs5/package.json @@ -6,7 +6,7 @@ }, "dependencies": { "@abp/datatables.net": "~8.2.0-rc.5", - "datatables.net-bs5": "^1.11.4" + "datatables.net-bs5": "^2.0.2" }, "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431", "homepage": "https://abp.io",