Merge pull request #12972 from akunzai/improve-yarn-detection

Improve the `yarn` command detection

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

@@ -54,6 +54,11 @@ public class InstallLibsService : IInstallLibsService, ITransientDependency
             return;
         }
 
+        if (!IsYarnAvailable())
+        {
+            Logger.LogWarning("YARN is not installed, which may cause package inconsistency, please use YARN instead of NPM. visit https://classic.yarnpkg.com/lang/en/docs/install/ and install YARN");
+        }
+
         Logger.LogInformation($"Found {projectPaths.Count} projects.");
         foreach (var projectPath in projectPaths)
         {
@@ -253,17 +258,10 @@ public class InstallLibsService : IInstallLibsService, ITransientDependency
 
     private bool IsYarnAvailable()
     {
-        var output = CmdHelper.RunCmdAndGetOutput("npm list yarn -g --depth 0").Trim();
+        var output = CmdHelper.RunCmdAndGetOutput("yarn -v").Trim();
-        if (output.Contains("empty"))
+        if (!SemanticVersion.TryParse(output, out var version)){
-        {
             return false;
         }
-
-        if (!SemanticVersion.TryParse(output.Substring(output.IndexOf('@') + 1), out var version))
-        {
-            return false;
-        }
-
         return version > SemanticVersion.Parse("1.20.0");
     }
 }