fix #2431 and RIDER-104221

GitOrigin-RevId: ff0092f28c01ba6c38512b804cef9975f20a71c1
JetBrains · Feb 18, 2024 · cc2a0e8 · cc2a0e8
1 parent 5819d06
commit cc2a0e8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/unity/PathLocator/PathLocator.csproj b/unity/PathLocator/PathLocator.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Version>1.0.8</Version>
+    <Version>1.0.9</Version>
     <authors>JetBrains</authors>
     <LangVersion>10</LangVersion>
     <PackageId>JetBrains.Rider.PathLocator</PackageId>

diff --git a/unity/PathLocator/RiderPathLocator.cs b/unity/PathLocator/RiderPathLocator.cs
@@ -60,7 +60,7 @@ public RiderInfo[] GetAllRiderPaths()
     private RiderInfo[] CollectAllRiderPathsLinux()
     {
       var installInfos = new List<RiderInfo>();
-      var appsPath = GetAppsRootPathInToolbox();
+      var appsPath = GetAppsInstallLocation();
 
       installInfos.AddRange(CollectToolbox20Linux(appsPath, "*rider*", "bin/rider.sh"));
       installInfos.AddRange(CollectToolbox20Linux(appsPath, "*fleet*", "bin/Fleet"));
@@ -123,7 +123,7 @@ private RiderInfo[] CollectRiderInfosMac()
       installInfos.AddRange(CollectFromApplications("*Rider*.app"));
       installInfos.AddRange(CollectFromApplications("*Fleet*.app"));
 
-      var appsPath = GetAppsRootPathInToolbox();
+      var appsPath = GetAppsInstallLocation();
       var riderRootPath = Path.Combine(appsPath, "Rider");
       installInfos.AddRange(CollectPathsFromToolbox(riderRootPath, "", "Rider*.app", true)
         .Select(a => new RiderInfo(this, a, true)));
@@ -165,7 +165,7 @@ private RiderInfo[] CollectRiderInfosWindows()
     {
       var installInfos = new List<RiderInfo>();
 
-      var appsPath = GetAppsRootPathInToolbox();
+      var appsPath = GetAppsInstallLocation();
       var riderRootPath = Path.Combine(appsPath, "Rider");
       installInfos.AddRange(CollectPathsFromToolbox(riderRootPath, "bin", "rider64.exe", false).ToList()
         .Select(a => new RiderInfo(this, a, true)).ToList());
@@ -199,9 +199,18 @@ private void CollectToolbox20(string dir, string pattern, string relPath, List<R
       }
     }
 
-    private string GetAppsRootPathInToolbox()
+    private string GetAppsInstallLocation()
     {
       var toolboxPath = GetToolboxPath();
+      var settingsJson = Path.Combine(toolboxPath, ".settings.json");
+
+      if (File.Exists(settingsJson))
+      {
+        var path = SettingsJson.GetInstallLocationFromJson(RiderLocatorEnvironment, File.ReadAllText(settingsJson));
+        if (!string.IsNullOrEmpty(path))
+          return path;
+      }
+
       return Path.Combine(toolboxPath, "apps");
     }
 
@@ -240,15 +249,6 @@ private string GetToolboxPath()
       }
 
       var toolboxPath = Path.Combine(localAppData, @"JetBrains/Toolbox");
-      var settingsJson = Path.Combine(toolboxPath, ".settings.json");
-
-      if (File.Exists(settingsJson))
-      {
-        var path = SettingsJson.GetInstallLocationFromJson(RiderLocatorEnvironment, File.ReadAllText(settingsJson));
-        if (!string.IsNullOrEmpty(path))
-          toolboxPath = path;
-      }
-
       return toolboxPath;
     }
 
@@ -306,7 +306,7 @@ private Version GetBuildNumberFromInput(string input)
     [UsedImplicitly] // Rider package
     public bool GetIsToolbox(string path)
     {
-      return Path.GetFullPath(path).StartsWith(Path.GetFullPath(GetAppsRootPathInToolbox()));
+      return Path.GetFullPath(path).StartsWith(Path.GetFullPath(GetAppsInstallLocation()));
     }
 
     private string GetRelativePathToBuildTxt()