Merge branch 'fruffin-fix-2618' into develop

* fruffin-fix-2618: Added support for VS2019 in MSTest runner
cake-build · Sep 4, 2019 · a28a6f2 · a28a6f2
2 parents f3411b8 + 836613e
commit a28a6f2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/Cake.Common.Tests/Unit/Tools/MSTest/MSTestRunnerTests.cs b/src/Cake.Common.Tests/Unit/Tools/MSTest/MSTestRunnerTests.cs
@@ -97,6 +97,9 @@ public void Should_Use_MSTest_From_Tool_Path_If_Provided_On_Windows(string toolP
         [InlineData("/ProgramFilesX86/Microsoft Visual Studio/2017/Enterprise/Common7/IDE/mstest.exe")]
         [InlineData("/ProgramFilesX86/Microsoft Visual Studio/2017/Professional/Common7/IDE/mstest.exe")]
         [InlineData("/ProgramFilesX86/Microsoft Visual Studio/2017/Community/Common7/IDE/mstest.exe")]
+        [InlineData("/ProgramFilesX86/Microsoft Visual Studio/2019/Enterprise/Common7/IDE/mstest.exe")]
+        [InlineData("/ProgramFilesX86/Microsoft Visual Studio/2019/Professional/Common7/IDE/mstest.exe")]
+        [InlineData("/ProgramFilesX86/Microsoft Visual Studio/2019/Community/Common7/IDE/mstest.exe")]
         public void Should_Use_Available_Tool_Path(string existingToolPath)
         {
             // Given

diff --git a/src/Cake.Common/Tools/MSTest/MSTestRunner.cs b/src/Cake.Common/Tools/MSTest/MSTestRunner.cs
@@ -114,7 +114,7 @@ protected override IEnumerable<string> GetToolExecutableNames()
         /// <returns>The default tool path.</returns>
         protected override IEnumerable<FilePath> GetAlternativeToolPaths(MSTestSettings settings)
         {
-            foreach (var yearAndEdition in new[] { "2017/Enterprise", "2017/Professional", "2017/Community" })
+            foreach (var yearAndEdition in new[] { "2017/Enterprise", "2017/Professional", "2017/Community", "2019/Enterprise", "2019/Professional", "2019/Community" })
             {
                 var path = GetYearAndEditionToolPath(yearAndEdition);
                 if (_fileSystem.Exist(path))