Browse Source
Merge pull request #19757 from abpframework/auto-merge/prerel-8-2/2695
Merge branch dev with prerel-8.2
pull/19777/head
maliming
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with
7 additions and
1 deletions
-
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Bundling/BundlingService.cs
|
|
|
@ -107,9 +107,15 @@ public class BundlingService : IBundlingService, ITransientDependency |
|
|
|
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."); |
|
|
|
|