Merge pull request #19756 from abpframework/CLI-BundlingService

Compatible with `app-nolayers`.
abpframework · May 9, 2024 · 405cebd · 405cebd
2 parents ac716a2 + 8d25ce4
commit 405cebd
Showing 1 changed file with 7 additions and 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
@@ -107,9 +107,15 @@ public async Task BundleAsync(string directory, bool forceBuild, string projectT
         if (!bundleConfig.InteractiveAuto)
         {
             var fileName = bundleConfig.IsBlazorWebApp
-                ? Directory.GetFiles(Path.GetDirectoryName(projectFilePath)!.Replace(".Client", ""), "App.razor", SearchOption.AllDirectories).FirstOrDefault()
+                ? Directory.GetFiles(Path.GetDirectoryName(projectFilePath)!.Replace(".Client", ""), "App.razor", SearchOption.AllDirectories).FirstOrDefault() ??
+                  Directory.GetFiles(Path.GetDirectoryName(projectFilePath)!.Replace(".Blazor", ".Host"), "App.razor", SearchOption.AllDirectories).FirstOrDefault()
                 : Path.Combine(PathHelper.GetWwwRootPath(directory), "index.html");
 
+            if (fileName == null)
+            {
+                throw new BundlingException($"App.razor file could not be found in the {projectFilePath} directory.");
+            }
+
             await UpdateDependenciesInBlazorFileAsync(fileName, styleDefinitions, scriptDefinitions);
 
             Logger.LogInformation($"Script and style references in the {fileName} file have been updated.");