Merge branch 'dev' into enisn/identity-server-index

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/LIbs/InstallLibsService.cs

@@ -85,13 +85,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);
@@ -113,8 +106,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");