From 097e24d2107993532457d20d3af8c7487d2c91bc Mon Sep 17 00:00:00 2001 From: maliming Date: Fri, 2 Feb 2024 17:22:16 +0800 Subject: [PATCH] Update BundlingService.cs --- .../Volo/Abp/Cli/Bundling/BundlingService.cs | 35 ++----------------- 1 file changed, 3 insertions(+), 32 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 53a1f9bb1a..04f945cdb6 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 @@ -104,40 +104,11 @@ public class BundlingService : IBundlingService, ITransientDependency scriptDefinitions = GenerateScriptDefinitions(scriptContext); } - string fileName = null; + string fileName; if (bundleConfig.IsBlazorWebApp) { - var projectDirectory = directory.RemovePostFix(".Client")!; - if (File.Exists(Path.Combine(projectDirectory, "Components", "App.razor"))) - { - fileName = Path.Combine(projectDirectory, "Components", "App.razor"); - } - else if (File.Exists(Path.Combine(projectDirectory, "App.razor"))) - { - fileName = Path.Combine(projectDirectory, "App.razor"); - } - - if (fileName.IsNullOrEmpty()) - { - // Single Template - var serverProjectDirectory = Path.Combine(Path.GetDirectoryName(directory), "Server"); - if (Directory.Exists(serverProjectDirectory)) - { - if (File.Exists(Path.Combine(serverProjectDirectory, "Components", "App.razor"))) - { - fileName = Path.Combine(serverProjectDirectory, "Components", "App.razor"); - } - else if (File.Exists(Path.Combine(serverProjectDirectory, "App.razor"))) - { - fileName = Path.Combine(projectDirectory, "App.razor"); - } - } - } - - if (projectDirectory.IsNullOrWhiteSpace()) - { - throw new BundlingException($"App.razor file could not be found on the {projectDirectory} project."); - } + var projectDirectory = Path.GetDirectoryName(directory); + fileName = Directory.GetFiles(projectDirectory!, "App.razor", SearchOption.AllDirectories).FirstOrDefault(); } else {