Browse Source

refactor BlazorProjectTypeChecker #8573

pull/8597/head
Alper Ebicoglu 6 years ago
parent
commit
a36fe74269
  1. 20
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectFinder.cs

20
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"); return FindProjectEndsWith(projectFiles, assemblyNames, ".Blazor");
case NuGetPackageTarget.BlazorWebAssembly: case NuGetPackageTarget.BlazorWebAssembly:
var BlazorWebAssemblyTargetProject = FindProjectEndsWith(projectFiles, assemblyNames, ".Blazor"); 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: case NuGetPackageTarget.BlazorServer:
var BlazorServerTargetProject = FindProjectEndsWith(projectFiles, assemblyNames, ".Blazor"); var BlazorServerTargetProject = FindProjectEndsWith(projectFiles, assemblyNames, ".Blazor");
return BlazorServerTargetProject != null && BlazorProjectTypeChecker.IsBlazorServerProject(BlazorServerTargetProject) ? BlazorServerTargetProject : null; return BlazorServerTargetProject != null &&
BlazorProjectTypeChecker.IsBlazorServerProject(BlazorServerTargetProject)
? BlazorServerTargetProject
: null;
default: default:
return null; return null;
} }
@ -95,7 +101,9 @@ namespace Volo.Abp.Cli.ProjectModification
} }
project = FindProjectEndsWith(projectFiles, assemblyNames, ".Blazor"); project = FindProjectEndsWith(projectFiles, assemblyNames, ".Blazor");
if (project != null && BlazorProjectTypeChecker.IsBlazorServerProject(project)) if (project != null &&
File.Exists(project) &&
BlazorProjectTypeChecker.IsBlazorServerProject(project))
{ {
projects.Add(project); projects.Add(project);
} }
@ -126,8 +134,8 @@ namespace Volo.Abp.Cli.ProjectModification
for (var i = 0; i < assemblyNames.Length; i++) for (var i = 0; i < assemblyNames.Length; i++)
{ {
var assemblyName = assemblyNames[i]; var assemblyName = assemblyNames[i];
if(assemblyName.EndsWith(postfix, StringComparison.OrdinalIgnoreCase) && if (assemblyName.EndsWith(postfix, StringComparison.OrdinalIgnoreCase) &&
(excludePostfix == null || !assemblyName.EndsWith(excludePostfix))) (excludePostfix == null || !assemblyName.EndsWith(excludePostfix)))
{ {
return projectFiles[i]; return projectFiles[i];
} }
@ -171,4 +179,4 @@ namespace Volo.Abp.Cli.ProjectModification
return projectFolders.ToArray(); return projectFolders.ToArray();
} }
} }
} }
Loading…
Cancel
Save