[Win] Make paths configurable in which Unity installations are searched

Author: sttz

sttz.InstallUnity/Installer/Configuration.cs

@@ -62,13 +62,18 @@ public class Configuration
         + "/Applications/Unity {major}.{minor}.{patch}{type}{build};"
         + "/Applications/Unity {major}.{minor}.{patch}{type}{build} ({hash})";
 
-
     [Description("Windows installation paths, separted by ; (first non-existing will be used, variables: {major} {minor} {patch} {type} {build} {hash} {ProgramFiles}).")]
     public string installPathWindows = 
           "{ProgramFiles}\\Unity {major}.{minor};"
         + "{ProgramFiles}\\Unity {major}.{minor}.{patch}{type}{build};"
         + "{ProgramFiles}\\Unity {major}.{minor}.{patch}{type}{build} ({hash});";
 
+    [Description("Windows directories which are searched for Unity installations, separted by ; (variables: {ProgramFiles}).")]
+    public string searchPathWindows = 
+          "{ProgramFiles};"
+        + "{ProgramFiles}\\Unity\\Editor;"
+        + "{ProgramFiles}\\Unity\\Hub\\Editor;";
+
     // -------- Serialization --------
 
     /// <summary>

sttz.InstallUnity/Installer/IInstallerPlatform.cs

@@ -46,6 +46,15 @@ public interface IInstallerPlatform
     /// </summary>
     string GetConfigurationDirectory();
 
+    /// <summary>
+    /// Set the configuration instance to use.
+    /// </summary>
+    /// <remarks>
+    /// Note that other methods might be called before the configuraiton
+    /// is set, namely <see cref="GetConfigurationDirectory"/>.
+    /// </remarks>
+    void SetConfiguration(Configuration configuration);
+
     /// <summary>
     /// The directory where cache files are stored.
     /// </summary>

sttz.InstallUnity/Installer/Platforms/MacPlatform.cs

@@ -91,6 +91,11 @@ public string GetConfigurationDirectory()
         return GetUserApplicationSupportDirectory();
     }
 
+    public void SetConfiguration(Configuration configuration)
+    {
+        // Not used
+    }
+
     public string GetCacheDirectory()
     {
         return GetUserApplicationSupportDirectory();

sttz.InstallUnity/Installer/Platforms/WindowsPlatform.cs

@@ -25,7 +25,6 @@ public class WindowsPlatform : IInstallerPlatform
     /// <summary>
     /// Paths where Unity installations are searched in.
     /// </summary>
-    /// <value></value>
     static readonly string[] INSTALL_LOCATIONS = new string[] {
         ProgramFilesPath,
         Path.Combine(ProgramFilesPath, "Unity", "Editor"),
@@ -53,6 +52,11 @@ string GetLocalApplicationDataDirectory()
             UnityInstaller.PRODUCT_NAME);
     }
 
+    public void SetConfiguration(Configuration configuration)
+    {
+        this.configuration = configuration;
+    }
+
     public Task<CachePlatform> GetCurrentPlatform()
     {
         return Task.FromResult(CachePlatform.Windows);
@@ -115,12 +119,23 @@ public Task<Installation> CompleteInstall(bool aborted, CancellationToken cancel
 
     public async Task<IEnumerable<Installation>> FindInstallations(CancellationToken cancellation = default)
     {
+        var locations = INSTALL_LOCATIONS;
+        if (configuration != null && !string.IsNullOrEmpty(configuration.searchPathWindows)) {
+            locations = configuration.searchPathWindows.Split(';', StringSplitOptions.RemoveEmptyEntries);
+            var comparison = StringComparison.OrdinalIgnoreCase;
+            for (int i = 0; i < locations.Length; i++) {
+                locations[i] = Helpers.Replace(locations[i], "{ProgramFiles}", ProgramFilesPath, comparison);
+            }
+        }
+
         var unityInstallations = new List<Installation>();
-        foreach (var installPath in INSTALL_LOCATIONS)
+        foreach (var installPath in locations)
         {
             if (!Directory.Exists(installPath))
                 continue;
 
+            Logger.LogDebug($"Searching directory for Unity installations: {installPath}");
+
             foreach (var unityCandidate in Directory.EnumerateDirectories(installPath))
             {
                 var unityExePath = Path.Combine(unityCandidate, "Editor", "Unity.exe");
@@ -133,7 +148,8 @@ public async Task<IEnumerable<Installation>> FindInstallations(CancellationToken
                 var versionInfo = FileVersionInfo.GetVersionInfo(unityExePath);
                 var splitCharacter = versionInfo.ProductVersion.Contains("_") ? '_' : '.'; // Versions are on format 2020.3.34f1_xxxx or 2020.3.34f1.xxxx
 
-                Logger.LogDebug($"Found version {versionInfo.ProductVersion}");
+                Logger.LogDebug($"Found version {versionInfo.ProductVersion} at path: {unityCandidate}");
+
                 unityInstallations.Add(new Installation {
                     executable = unityExePath,
                     path = unityCandidate,
@@ -260,6 +276,8 @@ public async Task Uninstall(Installation installation, CancellationToken cancell
 
     ILogger Logger = UnityInstaller.CreateLogger<WindowsPlatform>();
 
+    Configuration configuration;
+
     VersionMetadata installing;
     string installationPaths;
     bool installedEditor;
@@ -294,7 +312,7 @@ string GetInstallationPath(UnityVersion version, string installationPaths)
         if (!string.IsNullOrEmpty(installationPaths))
         {
             var comparison = StringComparison.OrdinalIgnoreCase;
-            var paths = installationPaths.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries);
+            var paths = installationPaths.Split(';', StringSplitOptions.RemoveEmptyEntries);
             foreach (var path in paths)
             {
                 expanded = path.Trim();