From a36fe74269866cc6f94cddda37fdccb402b44839 Mon Sep 17 00:00:00 2001 From: Alper Ebicoglu Date: Wed, 14 Apr 2021 03:20:34 +0300 Subject: [PATCH] refactor BlazorProjectTypeChecker #8573 --- .../Cli/ProjectModification/ProjectFinder.cs | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectFinder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectFinder.cs index 57adc5dd9b..6c41fa3330 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectFinder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectFinder.cs @@ -51,10 +51,16 @@ namespace Volo.Abp.Cli.ProjectModification return FindProjectEndsWith(projectFiles, assemblyNames, ".Blazor"); case NuGetPackageTarget.BlazorWebAssembly: var BlazorWebAssemblyTargetProject = FindProjectEndsWith(projectFiles, assemblyNames, ".Blazor"); - return BlazorWebAssemblyTargetProject != null && !BlazorProjectTypeChecker.IsBlazorServerProject(BlazorWebAssemblyTargetProject) ? BlazorWebAssemblyTargetProject : null; + return BlazorWebAssemblyTargetProject != null && + !BlazorProjectTypeChecker.IsBlazorServerProject(BlazorWebAssemblyTargetProject) + ? BlazorWebAssemblyTargetProject + : null; case NuGetPackageTarget.BlazorServer: var BlazorServerTargetProject = FindProjectEndsWith(projectFiles, assemblyNames, ".Blazor"); - return BlazorServerTargetProject != null && BlazorProjectTypeChecker.IsBlazorServerProject(BlazorServerTargetProject) ? BlazorServerTargetProject : null; + return BlazorServerTargetProject != null && + BlazorProjectTypeChecker.IsBlazorServerProject(BlazorServerTargetProject) + ? BlazorServerTargetProject + : null; default: return null; } @@ -95,7 +101,9 @@ namespace Volo.Abp.Cli.ProjectModification } project = FindProjectEndsWith(projectFiles, assemblyNames, ".Blazor"); - if (project != null && BlazorProjectTypeChecker.IsBlazorServerProject(project)) + if (project != null && + File.Exists(project) && + BlazorProjectTypeChecker.IsBlazorServerProject(project)) { projects.Add(project); } @@ -126,8 +134,8 @@ namespace Volo.Abp.Cli.ProjectModification for (var i = 0; i < assemblyNames.Length; i++) { var assemblyName = assemblyNames[i]; - if(assemblyName.EndsWith(postfix, StringComparison.OrdinalIgnoreCase) && - (excludePostfix == null || !assemblyName.EndsWith(excludePostfix))) + if (assemblyName.EndsWith(postfix, StringComparison.OrdinalIgnoreCase) && + (excludePostfix == null || !assemblyName.EndsWith(excludePostfix))) { return projectFiles[i]; } @@ -171,4 +179,4 @@ namespace Volo.Abp.Cli.ProjectModification return projectFolders.ToArray(); } } -} +} \ No newline at end of file