(cake-buildGH-2679) Add GetToolExecutableNames(TSettings settings) to…

… Tool * fixes cake-build#2679
devlead · Dec 3, 2019 · f110c51 · f110c51
1 parent 090701d
commit f110c51
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/Cake.Core/Tooling/Tool.cs b/src/Cake.Core/Tooling/Tool.cs
@@ -228,6 +228,13 @@ protected IProcess RunProcess(TSettings settings, ProcessArgumentBuilder argumen
         /// <returns>The name of the tool.</returns>
         protected abstract string GetToolName();
 
+        /// <summary>
+        /// Gets the possible names of the tool executable.
+        /// </summary>
+        /// <param name="settings">The settings.</param>
+        /// <returns>The name of the tool.</returns>
+        protected virtual IEnumerable<string> GetToolExecutableNames(TSettings settings) => GetToolExecutableNames();
+
         /// <summary>
         /// Gets the possible names of the tool executable.
         /// </summary>
@@ -294,7 +301,7 @@ private FilePath GetToolPathUsingToolService(TSettings settings)
             }
 
             // Look for each possible executable name in various places.
-            var toolExeNames = GetToolExecutableNames();
+            var toolExeNames = GetToolExecutableNames(settings);
             foreach (var toolExeName in toolExeNames)
             {
                 var result = _tools.Resolve(toolExeName);
@@ -326,7 +333,7 @@ private FilePath GetToolPathObsolete(TSettings settings)
                 return toolPath.MakeAbsolute(_environment);
             }
 
-            var toolExeNames = GetToolExecutableNames();
+            var toolExeNames = GetToolExecutableNames(settings);
             string[] pathDirs = null;
 
             // Look for each possible executable name in various places.