Bunch of fixes for test adapter

Author: Paul van Brenk

Nodejs/Product/TestAdapter/TestExecutor.cs

@@ -145,8 +145,6 @@ public void RunTests(IEnumerable<string> sources, IRunContext runContext, IFrame
         /// <param name="frameworkHandle">Handle to framework.  Used for recording results</param>
         public void RunTests(IEnumerable<TestCase> tests, IRunContext runContext, IFrameworkHandle frameworkHandle)
         {
-            Debugger.Launch();
-
             ValidateArg.NotNull(tests, "tests");
             ValidateArg.NotNull(runContext, "runContext");
             ValidateArg.NotNull(frameworkHandle, "frameworkHandle");

Nodejs/Product/TestAdapterShim/AssemblyResolver.cs

@@ -3,6 +3,7 @@
 using System;
 using System.IO;
 using System.Reflection;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
 
 namespace Microsoft.NodejsTools.TestAdapter
 {
@@ -13,11 +14,24 @@ public AssemblyResolver()
             AppDomain.CurrentDomain.AssemblyResolve += OnAssemblyResolve;
         }
 
+        internal static string GetVSInstallDir()
+        {
+
+            var vsTestFrameworkAssembly = typeof(ITestExecutor).Assembly;
+            var testAdapterPath = vsTestFrameworkAssembly.Location;
+
+            // C:\Program Files (x86)\Microsoft Visual Studio\2017\VSUJSLT\Common7\IDE\CommonExtensions\Microsoft\NodeJs Tools Unit Test Adapter\Microsoft.nodejstools.TestAdapter.dll
+            var indexOfCommon7Ide = testAdapterPath.IndexOf("common7", StringComparison.OrdinalIgnoreCase);
+            string vsInstallDir = testAdapterPath.Substring(0, indexOfCommon7Ide);
+
+            return vsInstallDir;
+        }
+
         private static Assembly OnAssemblyResolve(object sender, ResolveEventArgs args)
         {
             // Use the setup API to find the VS install Dir, then build paths to the Private and Public Assemblies folders
-            string installPath = @"C:\vs2017";
-            string ideFolder = Path.Combine(installPath, "Common7\\IDE");
+            var installPath = GetVSInstallDir();
+            var ideFolder = Path.Combine(installPath, "Common7\\IDE");
             var paths = new[] {
                 Path.Combine(ideFolder, "PrivateAssemblies"),
                 Path.Combine(ideFolder, "PublicAssemblies"),
@@ -26,7 +40,7 @@ private static Assembly OnAssemblyResolve(object sender, ResolveEventArgs args)
 
             // This is what comes in for args.Name, but we really just want the dll file name:
             // "Microsoft.Build, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
-            string resolveTargetAssemblyName = args.Name.Substring(0, args.Name.IndexOf(',')) + ".dll";
+            var resolveTargetAssemblyName = args.Name.Substring(0, args.Name.IndexOf(',')) + ".dll";
 
             foreach (var path in paths)
             {
@@ -42,7 +56,7 @@ private static Assembly OnAssemblyResolve(object sender, ResolveEventArgs args)
         private static bool ResolveAssemblyPath(string possibleDirectory, string assemblyName, out Assembly resolvedAssembly)
         {
             resolvedAssembly = null;
-            string candidateAssemblyPath = Path.Combine(possibleDirectory, assemblyName);
+            var candidateAssemblyPath = Path.Combine(possibleDirectory, assemblyName);
             if (File.Exists(candidateAssemblyPath))
             {
                 resolvedAssembly = Assembly.LoadFrom(candidateAssemblyPath);

Nodejs/Product/TestAdapterVsix/TestAdapterVsix.csproj

@@ -54,7 +54,7 @@
     <ProjectReference Include="..\TestAdapter\TestAdapter.csproj">
       <Project>{5085df35-3a32-4894-835e-e5a3956d4f57}</Project>
       <Name>TestAdapter</Name>
-      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3bPkgdefProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
+      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
       <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
       <Private>True</Private>
       <VSIXSubPath>.</VSIXSubPath>