From da529664a6426120f2214176ee61568007048fb3 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Mon, 22 Aug 2022 16:10:56 +0800 Subject: [PATCH 1/3] Support compressed dlls --- .../Volo/Abp/Cli/Bundling/BundlingService.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Bundling/BundlingService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Bundling/BundlingService.cs index 492e938874..faf176dee9 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Bundling/BundlingService.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Bundling/BundlingService.cs @@ -113,8 +113,12 @@ public class BundlingService : IBundlingService, ITransientDependency var contributor = CreateContributorInstance(bundleDefinition.BundleContributorType); contributor.AddScripts(scriptContext); } - - scriptContext.Add("_framework/blazor.webassembly.js"); + + if (scriptContext.BundleDefinitions.All(x => x.Source != "_framework/blazor.webassembly.js")) + { + scriptContext.Add("_framework/blazor.webassembly.js"); + } + return scriptContext; } From d6053c6f18051a45f765e01a0d50c4b230d33003 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Mon, 22 Aug 2022 16:21:25 +0800 Subject: [PATCH 2/3] Update BundlingService --- .../Volo.Abp.Cli.Core/Volo/Abp/Cli/Bundling/BundlingService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Bundling/BundlingService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Bundling/BundlingService.cs index faf176dee9..5d2e6b51f9 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Bundling/BundlingService.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Bundling/BundlingService.cs @@ -210,7 +210,7 @@ public class BundlingService : IBundlingService, ITransientDependency builder.Append($" "); From 054e25d975414f7464b8adf73a15985b81906c51 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Mon, 22 Aug 2022 16:39:36 +0800 Subject: [PATCH 3/3] Update BundlingService --- .../Volo/Abp/Cli/Bundling/BundlingService.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Bundling/BundlingService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Bundling/BundlingService.cs index 5d2e6b51f9..65212fe69f 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Bundling/BundlingService.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Bundling/BundlingService.cs @@ -114,11 +114,10 @@ public class BundlingService : IBundlingService, ITransientDependency contributor.AddScripts(scriptContext); } - if (scriptContext.BundleDefinitions.All(x => x.Source != "_framework/blazor.webassembly.js")) - { - scriptContext.Add("_framework/blazor.webassembly.js"); - } - + scriptContext.BundleDefinitions.AddIfNotContains( + x => x.Source == "_framework/blazor.webassembly.js", + () => new BundleDefinition { Source = "_framework/blazor.webassembly.js" }); + return scriptContext; }