Roc
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
7 additions and
8 deletions
-
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/LIbs/InstallLibsService.cs
|
|
|
@ -80,13 +80,6 @@ public class InstallLibsService : IInstallLibsService, ITransientDependency |
|
|
|
// MVC or BLAZOR SERVER
|
|
|
|
if (projectPath.EndsWith(".csproj")) |
|
|
|
{ |
|
|
|
var packageJsonFilePath = Path.Combine(Path.GetDirectoryName(projectPath), "package.json"); |
|
|
|
|
|
|
|
if (!File.Exists(packageJsonFilePath)) |
|
|
|
{ |
|
|
|
continue; |
|
|
|
} |
|
|
|
|
|
|
|
if (IsYarnAvailable()) |
|
|
|
{ |
|
|
|
RunYarn(projectDirectory); |
|
|
|
@ -108,8 +101,14 @@ public class InstallLibsService : IInstallLibsService, ITransientDependency |
|
|
|
.Where(file => ExcludeDirectory.All(x => file.IndexOf(x, StringComparison.OrdinalIgnoreCase) == -1)) |
|
|
|
.Where(file => |
|
|
|
{ |
|
|
|
if (file.EndsWith("csproj")) |
|
|
|
if (file.EndsWith(".csproj")) |
|
|
|
{ |
|
|
|
var packageJsonFilePath = Path.Combine(Path.GetDirectoryName(file), "package.json"); |
|
|
|
if (!File.Exists(packageJsonFilePath)) |
|
|
|
{ |
|
|
|
return false; |
|
|
|
} |
|
|
|
|
|
|
|
using (var reader = File.OpenText(file)) |
|
|
|
{ |
|
|
|
return reader.ReadToEnd().Contains("Microsoft.NET.Sdk.Web"); |
|
|
|
|