From f796be725f8809938916f90fe487621ba55f7399 Mon Sep 17 00:00:00 2001
From: Keith Hill <r_keith_hill@hotmail.com>
Date: Mon, 25 Feb 2019 20:37:37 -0700
Subject: [PATCH 1/2] Change debugger type field back to "PowerShell" from
 poweshell

This allows the debugger to start but not sure why powershell doesn't
work. That said, the previous change meant that users would have to
update their launch.json to change the type to "powershell".  But
even when I do that, the debugger still doesn't launch. So I'm a bit
puzzled.  But this gets the debugger working again on master.

Also fixed some warnings in session.ts.
---
 package.json   | 16 ++++++++--------
 src/session.ts |  5 +++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 2ff8db5f31..f8e9726f35 100644
--- a/package.json
+++ b/package.json
@@ -307,7 +307,7 @@
     ],
     "debuggers": [
       {
-        "type": "powershell",
+        "type": "PowerShell",
         "label": "PowerShell",
         "enableBreakpointsFor": {
           "languageIds": [
@@ -329,7 +329,7 @@
             "description": "Launch current file (in active editor window) under debugger",
             "body": {
               "name": "PowerShell Launch Current File",
-              "type": "powershell",
+              "type": "PowerShell",
               "request": "launch",
               "script": "^\"\\${file}\"",
               "args": [],
@@ -341,7 +341,7 @@
             "description": "Launch current file (in active editor window) under debugger in a temporary Integrated Console.",
             "body": {
               "name": "PowerShell Launch Current File in Temporary Console",
-              "type": "powershell",
+              "type": "PowerShell",
               "request": "launch",
               "script": "^\"\\${file}\"",
               "args": [],
@@ -354,7 +354,7 @@
             "description": "Launch current file (in active editor window) under debugger, prompting first for script arguments",
             "body": {
               "name": "PowerShell Launch Current File w/Args Prompt",
-              "type": "powershell",
+              "type": "PowerShell",
               "request": "launch",
               "script": "^\"\\${file}\"",
               "args": [
@@ -368,7 +368,7 @@
             "description": "Launch specified script or path to script under debugger",
             "body": {
               "name": "PowerShell Launch ${Script}",
-              "type": "powershell",
+              "type": "PowerShell",
               "request": "launch",
               "script": "^\"\\${workspaceFolder}/${Script}\"",
               "args": [],
@@ -380,7 +380,7 @@
             "description": "Invokes Pester tests under debugger",
             "body": {
               "name": "PowerShell Pester Tests",
-              "type": "powershell",
+              "type": "PowerShell",
               "request": "launch",
               "script": "Invoke-Pester",
               "args": [],
@@ -392,7 +392,7 @@
             "description": "Open host process picker to select process to attach debugger to",
             "body": {
               "name": "PowerShell Attach to Host Process",
-              "type": "powershell",
+              "type": "PowerShell",
               "request": "attach",
               "processId": "^\"\\${command:PickPSHostProcess}\"",
               "runspaceId": 1
@@ -403,7 +403,7 @@
             "description": "Start interactive session (Debug Console) under debugger",
             "body": {
               "name": "PowerShell Interactive Session",
-              "type": "powershell",
+              "type": "PowerShell",
               "request": "launch",
               "cwd": ""
             }
diff --git a/src/session.ts b/src/session.ts
index cc7d0956c2..e6788adfd2 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -411,8 +411,9 @@ export class SessionManager implements Middleware {
         if (!this.suppressRestartPrompt &&
             (settings.useX86Host !== this.sessionSettings.useX86Host ||
              settings.powerShellExePath.toLowerCase() !== this.sessionSettings.powerShellExePath.toLowerCase() ||
-             settings.developer.powerShellExePath.toLowerCase() !==
-                this.sessionSettings.developer.powerShellExePath.toLowerCase() ||
+             (settings.developer.powerShellExePath ? settings.developer.powerShellExePath.toLowerCase() : null) !==
+                (this.sessionSettings.developer.powerShellExePath
+                    ? this.sessionSettings.developer.powerShellExePath.toLowerCase() : null) ||
              settings.developer.editorServicesLogLevel.toLowerCase() !==
                 this.sessionSettings.developer.editorServicesLogLevel.toLowerCase() ||
              settings.developer.bundledModulesPath.toLowerCase() !==

From dbc9cfffaffc4bf51b24aebc5d41480cc5f1b59b Mon Sep 17 00:00:00 2001
From: Keith Hill <r_keith_hill@hotmail.com>
Date: Mon, 25 Feb 2019 20:44:20 -0700
Subject: [PATCH 2/2] Update package-lock.json name field  to match
 package.json

---
 package-lock.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package-lock.json b/package-lock.json
index ef0fb16945..b4eab5da73 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
 {
-  "name": "PowerShell",
+  "name": "powershell",
   "version": "2.0.0",
   "lockfileVersion": 1,
   "requires": true,