Skip to content

add VSTEST paths for VS2019 #2542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

add VSTEST paths for VS2019 #2542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64727e1
add paths for VS2019
robertpi Aug 25, 2020
2cac7e1
use vswhere to find mstest path
robertpi Sep 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 8 additions & 13 deletions src/app/Fake.DotNet.Testing.MSTest/MSTest.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,16 @@ module Fake.DotNet.Testing.MSTest

open System
open System.Text
open BlackFox.VsWhere
open Fake.Core
open Fake.IO
open Fake.Testing.Common

/// [omit]
let mstestPaths =
[| @"[ProgramFilesX86]\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\";
@"[ProgramFilesX86]\Microsoft Visual Studio\2019\Professional\Common7\IDE\";
@"[ProgramFilesX86]\Microsoft Visual Studio\2019\Community\Common7\IDE\";
@"[ProgramFilesX86]\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\";
@"[ProgramFilesX86]\Microsoft Visual Studio\2017\Professional\Common7\IDE\";
@"[ProgramFilesX86]\Microsoft Visual Studio\2017\Community\Common7\IDE\";
@"[ProgramFilesX86]\Microsoft Visual Studio 14.0\Common7\IDE";
@"[ProgramFilesX86]\Microsoft Visual Studio 12.0\Common7\IDE";
@"[ProgramFilesX86]\Microsoft Visual Studio 11.0\Common7\IDE";
@"[ProgramFilesX86]\Microsoft Visual Studio 10.0\Common7\IDE" |]

let private getAllVsPath () =
VsInstances.getWithPackage "Microsoft.VisualStudio.PackageGroup.TestTools.MSTestV2.Managed" false
|> List.map (fun vs -> Path.combine vs.InstallationPath "Common7\\Tools")


/// [omit]
let mstestexe =
Expand Down Expand Up @@ -64,7 +59,7 @@ let MSTestDefaults =
Tests = []
TimeOut = TimeSpan.FromMinutes 5.
ToolPath =
match Process.tryFindFile mstestPaths mstestexe with
match Process.tryFindFile (getAllVsPath ()) mstestexe with
| Some path -> path
| None -> ""
Details = []
Expand Down
3 changes: 2 additions & 1 deletion src/app/Fake.DotNet.Testing.MSTest/paket.references
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
group netcore

FSharp.Core
NETStandard.Library
NETStandard.Library
BlackFox.VsWhere
3 changes: 3 additions & 0 deletions src/app/Fake.DotNet.Testing.VSTest/VSTest.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ open System.Text
/// [omit]
let private vsTestPaths =
[|
@"[ProgramFilesX86]\Microsoft Visual Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\TestWindow"
@"[ProgramFilesX86]\Microsoft Visual Studio\2019\Professional\Common7\IDE\CommonExtensions\Microsoft\TestWindow"
@"[ProgramFilesX86]\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\CommonExtensions\Microsoft\TestWindow"
@"[ProgramFilesX86]\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\CommonExtensions\Microsoft\TestWindow"
@"[ProgramFilesX86]\Microsoft Visual Studio 14.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow"
@"[ProgramFilesX86]\Microsoft Visual Studio 12.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow"
Expand Down