Browse Source

Update BundlingService.cs

pull/18876/head
maliming 3 years ago
parent
commit
097e24d210
No known key found for this signature in database GPG Key ID: A646B9CB645ECEA4
  1. 35
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Bundling/BundlingService.cs

35
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Bundling/BundlingService.cs

@ -104,40 +104,11 @@ public class BundlingService : IBundlingService, ITransientDependency
scriptDefinitions = GenerateScriptDefinitions(scriptContext); scriptDefinitions = GenerateScriptDefinitions(scriptContext);
} }
string fileName = null; string fileName;
if (bundleConfig.IsBlazorWebApp) if (bundleConfig.IsBlazorWebApp)
{ {
var projectDirectory = directory.RemovePostFix(".Client")!; var projectDirectory = Path.GetDirectoryName(directory);
if (File.Exists(Path.Combine(projectDirectory, "Components", "App.razor"))) fileName = Directory.GetFiles(projectDirectory!, "App.razor", SearchOption.AllDirectories).FirstOrDefault();
{
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.");
}
} }
else else
{ {

Loading…
Cancel
Save