Adjusted MSTest tool resolution

* Added fallback to check environment for VisualStudio path if not found in default location * Fixes cake-build#823
devlead · Apr 15, 2016 · 9a2fac1 · 9a2fac1
1 parent c2ce6b3
commit 9a2fac1
Showing 1 changed file with 23 additions and 1 deletion.
diff --git a/src/Cake.Common/Tools/MSTest/MSTestRunner.cs b/src/Cake.Common/Tools/MSTest/MSTestRunner.cs
@@ -38,7 +38,7 @@ public void Run(IEnumerable<FilePath> assemblyPaths, MSTestSettings settings)
         {
             if (assemblyPaths == null)
             {
-                throw new ArgumentNullException("assemblyPath");
+                throw new ArgumentNullException("assemblyPaths");
             }
             if (settings == null)
             {
@@ -99,6 +99,15 @@ protected override IEnumerable<FilePath> GetAlternativeToolPaths(MSTestSettings
                     yield return path;
                 }
             }
+
+            foreach (var environmentVariable in new[] { "VS140COMNTOOLS", "VS130COMNTOOLS", "VS120COMNTOOLS", "VS110COMNTOOLS", "VS100COMNTOOLS" })
+            {
+                var path = GetCommonToolPath(environmentVariable);
+                if (path != null && _fileSystem.Exist(path))
+                {
+                    yield return path;
+                }
+            }
         }
 
         private FilePath GetToolPath(string version)
@@ -107,5 +116,18 @@ private FilePath GetToolPath(string version)
             var root = programFiles.Combine(string.Concat("Microsoft Visual Studio ", version, "/Common7/IDE"));
             return root.CombineWithFilePath("mstest.exe");
         }
+
+        private FilePath GetCommonToolPath(string environmentVariable)
+        {
+            var visualStudioCommonToolsPath = _environment.GetEnvironmentVariable(environmentVariable);
+
+            if (string.IsNullOrWhiteSpace(visualStudioCommonToolsPath))
+            {
+                return null;
+            }
+
+            var root = new DirectoryPath(visualStudioCommonToolsPath).Combine("../IDE");
+            return root.CombineWithFilePath("mstest.exe");
+        }
     }
 }