Browse Source

Merge pull request #14994 from abpframework/issues/14948

Cli: Add MauiBlazor nuget type
pull/15020/head
liangshiwei 4 years ago
committed by GitHub
parent
commit
0e0e3a3f4e
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NuGetPackageTarget.cs
  2. 5
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectFinder.cs

3
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NuGetPackageTarget.cs

@ -16,5 +16,6 @@ public enum NuGetPackageTarget : byte
Blazor = 11, Blazor = 11,
IdentityServer = 12, //todo: Rename to AuthServer IdentityServer = 12, //todo: Rename to AuthServer
BlazorServer = 13, BlazorServer = 13,
BlazorWebAssembly = 14 BlazorWebAssembly = 14,
MauiBlazor = 15
} }

5
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectFinder.cs

@ -49,7 +49,8 @@ public static class ProjectFinder
FindProjectEndsWith(projectFiles, assemblyNames, ".Web") ?? FindProjectEndsWith(projectFiles, assemblyNames, ".Web") ??
FindProjectEndsWith(projectFiles, assemblyNames, ".HttpApi.Host"); FindProjectEndsWith(projectFiles, assemblyNames, ".HttpApi.Host");
case NuGetPackageTarget.Blazor: case NuGetPackageTarget.Blazor:
return FindProjectEndsWith(projectFiles, assemblyNames, ".Blazor"); return FindProjectEndsWith(projectFiles, assemblyNames, ".Blazor")
?? FindProjectEndsWith(projectFiles, assemblyNames, ".MauiBlazor");;
case NuGetPackageTarget.BlazorWebAssembly: case NuGetPackageTarget.BlazorWebAssembly:
var BlazorWebAssemblyTargetProject = FindProjectEndsWith(projectFiles, assemblyNames, ".Blazor"); var BlazorWebAssemblyTargetProject = FindProjectEndsWith(projectFiles, assemblyNames, ".Blazor");
return BlazorWebAssemblyTargetProject != null && return BlazorWebAssemblyTargetProject != null &&
@ -62,6 +63,8 @@ public static class ProjectFinder
BlazorProjectTypeChecker.IsBlazorServerProject(BlazorServerTargetProject) BlazorProjectTypeChecker.IsBlazorServerProject(BlazorServerTargetProject)
? BlazorServerTargetProject ? BlazorServerTargetProject
: null; : null;
case NuGetPackageTarget.MauiBlazor:
return FindProjectEndsWith(projectFiles, assemblyNames, ".MauiBlazor");
default: default:
return null; return null;
} }

Loading…
Cancel
Save