Merge pull request #333 from PowerShell/daviwil/debug-fixes

A couple of debug adapter fixes

Author: daviwil

src/PowerShellEditorServices.Protocol/MessageProtocol/Serializers/V8MessageSerializer.cs

@@ -34,8 +34,11 @@ public JObject SerializeMessage(Message message)
             }
             else if (message.MessageType == MessageType.Response)
             {
+                int messageId = 0;
+                int.TryParse(message.Id, out messageId);
+
                 messageObject.Add("type", JToken.FromObject("response"));
-                messageObject.Add("request_seq", JToken.FromObject(message.Id));
+                messageObject.Add("request_seq", JToken.FromObject(messageId));
                 messageObject.Add("command", message.Method);
 
                 if (message.Error != null)

src/PowerShellEditorServices/Session/RunspaceDetails.cs

@@ -104,8 +104,41 @@ public RunspaceDetails(
             PowerShellVersionDetails powerShellVersion,
             RunspaceLocation runspaceLocation,
             string connectionString)
+                : this(
+                      runspace.InstanceId,
+                      runspace,
+                      powerShellVersion,
+                      runspaceLocation,
+                      connectionString)
         {
-            this.Id = runspace.InstanceId;
+        }
+
+        /// <summary>
+        /// Creates a new instance of the RunspaceDetails class.
+        /// </summary>
+        /// <param name="instanceId">
+        /// The InstanceId Guid for the runspace.
+        /// </param>
+        /// <param name="runspace">
+        /// The runspace for which this instance contains details.
+        /// </param>
+        /// <param name="powerShellVersion">
+        /// The PowerShellVersionDetails of the runspace.
+        /// </param>
+        /// <param name="runspaceLocation">
+        /// The RunspaceLocale of the runspace.
+        /// </param>
+        /// <param name="connectionString">
+        /// The connection string of the runspace.
+        /// </param>
+        public RunspaceDetails(
+            Guid instanceId,
+            Runspace runspace,
+            PowerShellVersionDetails powerShellVersion,
+            RunspaceLocation runspaceLocation,
+            string connectionString)
+        {
+            this.Id = instanceId;
             this.Runspace = runspace;
             this.PowerShellVersion = powerShellVersion;
             this.Location = runspaceLocation;
@@ -125,6 +158,7 @@ public static RunspaceDetails Create(Runspace runspace)
         {
             Validate.IsNotNull(nameof(runspace), runspace);
 
+            var runspaceId = runspace.InstanceId;
             var runspaceLocation = RunspaceLocation.Local;
             var versionDetails = PowerShellVersionDetails.GetVersionDetails(runspace);
 
@@ -150,6 +184,11 @@ public static RunspaceDetails Create(Runspace runspace)
 
                 if (runspace.ConnectionInfo.ComputerName != "localhost")
                 {
+                    runspaceId =
+                        PowerShellContext.ExecuteScriptAndGetItem<Guid>(
+                            "$host.Runspace.InstanceId",
+                            runspace);
+
                     runspaceLocation = RunspaceLocation.Remote;
                     connectionString =
                         runspace.ConnectionInfo.ComputerName +
@@ -159,6 +198,7 @@ public static RunspaceDetails Create(Runspace runspace)
 
             return
                 new RunspaceDetails(
+                    runspaceId,
                     runspace,
                     versionDetails,
                     runspaceLocation,
@@ -185,6 +225,7 @@ public static RunspaceDetails CreateAttached(
         {
             RunspaceDetails newRunspace =
                 new RunspaceDetails(
+                    attachedRunspaceId,
                     runspaceDetails.Runspace,
                     runspaceDetails.PowerShellVersion,
                     runspaceDetails.Location,