From 6d0d9fd4c68f2f20755e1220bd998eeae411dbbc Mon Sep 17 00:00:00 2001
From: Hadrian Tang <hadrianwttang@outlook.com>
Date: Sun, 29 Mar 2020 14:25:10 +0800
Subject: [PATCH 1/2] Use VSTest v2

https://github.com/microsoft/vstest/issues/443#issuecomment-277467717
---
 src/main.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main.ts b/src/main.ts
index 23acc962..5adf819f 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -83,11 +83,11 @@ async function FindVSTest(pathToVSWhere:string):Promise<string>{
     core.setFailed("Unable to find VSTest.Console.exe");
   }
 
-  vsTestPath = path.join(vsTestPath.trimRight(), '\\Common7\\IDE\\CommonExtensions\\Microsoft\\TestWindow\\vstest.console.exe')
+  vsTestPath = path.join(vsTestPath.trimRight(), '\\Common7\\IDE\\Extensions\\TestPlatform\\vstest.console.exe')
 
   var folderForVSTest = path.dirname(vsTestPath)
   core.debug(`VSTest = ${vsTestPath}`);
   core.debug(`Folder for VSTest ${folderForVSTest}`);
 
   return folderForVSTest;
-}
\ No newline at end of file
+}

From 096a8a4a0c1ced389be903f7984e7a3f22b12495 Mon Sep 17 00:00:00 2001
From: Hadrian Tang <hadrianwttang@outlook.com>
Date: Sun, 29 Mar 2020 14:30:02 +0800
Subject: [PATCH 2/2] Update JS as well

---
 lib/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/main.js b/lib/main.js
index 46ade03b..ca9941e2 100644
--- a/lib/main.js
+++ b/lib/main.js
@@ -82,7 +82,7 @@ function FindVSTest(pathToVSWhere) {
         if (vsTestPath === "") {
             core.setFailed("Unable to find VSTest.Console.exe");
         }
-        vsTestPath = path.join(vsTestPath.trimRight(), '\\Common7\\IDE\\CommonExtensions\\Microsoft\\TestWindow\\vstest.console.exe');
+        vsTestPath = path.join(vsTestPath.trimRight(), '\\Common7\\IDE\\Extensions\\TestPlatform\\vstest.console.exe');
         var folderForVSTest = path.dirname(vsTestPath);
         core.debug(`VSTest = ${vsTestPath}`);
         core.debug(`Folder for VSTest ${folderForVSTest}`);