read session data from file

Author: TylerLeonhardt

test/PowerShellEditorServices.Test.Host/ServerTestsBase.cs

@@ -11,6 +11,7 @@
 using System.Diagnostics;
 using System.IO;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Microsoft.PowerShell.EditorServices.Test.Host
@@ -35,12 +36,15 @@ protected async Task<Tuple<int, int>> LaunchService(
             string scriptPath = Path.Combine(modulePath, "Start-EditorServices.ps1");
 
 #if CoreCLR
+            string assemblyPath = this.GetType().GetTypeInfo().Assembly.Location;
             FileVersionInfo fileVersionInfo =
-                FileVersionInfo.GetVersionInfo(this.GetType().GetTypeInfo().Assembly.Location);
+                FileVersionInfo.GetVersionInfo(assemblyPath);
 #else
+            string assemblyPath = this.GetType().Assembly.Location;
             FileVersionInfo fileVersionInfo =
-                FileVersionInfo.GetVersionInfo(this.GetType().Assembly.Location);
+                FileVersionInfo.GetVersionInfo(assemblyPath);
 #endif
+            string sessionPath = Path.Combine(Path.GetDirectoryName(assemblyPath), "session.json");
 
             string editorServicesModuleVersion =
                 string.Format(
@@ -59,7 +63,7 @@ protected async Task<Tuple<int, int>> LaunchService(
                     "-BundledModulesPath \\\"" + modulePath + "\\\" " +
                     "-LogLevel \"Verbose\" " +
                     "-LogPath \"" + logPath + "\" " +
-                    "-SessionDetailsPath \".\\sessionDetails\" " +
+                    "-SessionDetailsPath \"" + sessionPath + "\" " +
                     "-FeatureFlags @() " +
                     "-AdditionalModules @() ",
                    editorServicesModuleVersion);
@@ -98,40 +102,20 @@ protected async Task<Tuple<int, int>> LaunchService(
             this.serviceProcess.Start();
 
             // Wait for the server to finish initializing
-            Task<string> stdoutTask = this.serviceProcess.StandardOutput.ReadLineAsync();
-            Task<string> stderrTask = this.serviceProcess.StandardError.ReadLineAsync();
-            Task<string> completedRead = await Task.WhenAny<string>(stdoutTask, stderrTask);
-
-            if (completedRead == stdoutTask)
+            while(!File.Exists(sessionPath))
             {
-                JObject result = JObject.Parse(completedRead.Result);
-                if (result["status"].Value<string>() == "started")
-                {
-                    return new Tuple<int, int>(
-                        result["languageServicePort"].Value<int>(),
-                        result["debugServicePort"].Value<int>());
-                }
-
-                return null;
+                Thread.Sleep(100);
             }
-            else
-            {
-                // Must have read an error?  Keep reading from error stream
-                string errorString = completedRead.Result;
-                Task<string> errorRead = this.serviceProcess.StandardError.ReadToEndAsync();
 
-                // Lets give the read operation 5 seconds to complete. Ideally, it shouldn't
-                // take that long at all, but just in case...
-                if (errorRead.Wait(5000))
-                {
-                    if (!string.IsNullOrEmpty(errorRead.Result))
-                    {
-                        errorString += errorRead.Result + Environment.NewLine;
-                    }
-                }
-
-                throw new Exception("Could not launch powershell.exe:\r\n\r\n" + errorString);
+            JObject result = JObject.Parse(File.ReadAllText(sessionPath));
+            if (result["status"].Value<string>() == "started")
+            {
+                return new Tuple<int, int>(
+                    result["languageServicePort"].Value<int>(),
+                    result["debugServicePort"].Value<int>());
             }
+
+            return null;
         }
 
         protected void KillService()