Merge branch 'develop' into nick/add-salesforcedx-webview-ui-package

forcedotcom · Jun 4, 2018 · e84a517 · e84a517
2 parents 1138a45 + 8ace1d7
commit e84a517
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/packages/salesforcedx-vscode-apex-debugger/README.md b/packages/salesforcedx-vscode-apex-debugger/README.md
@@ -17,13 +17,6 @@ Before you set up the Apex Debugger, make sure that you have these essentials.
 * [Visual Studio Code](https://code.visualstudio.com/download) v1.17 or later
 * The latest versions of the [salesforcedx-vscode-core](https://marketplace.visualstudio.com/items?itemName=salesforce.salesforcedx-vscode-core) and [salesforcedx-vscode-apex](https://marketplace.visualstudio.com/items?itemName=salesforce.salesforcedx-vscode-apex) extensions (We suggest that you install all extensions in the [salesforcedx-vscode](https://marketplace.visualstudio.com/items?itemName=salesforce.salesforcedx-vscode) extension pack.)
 
----
-**NOTE:** Having an active Visual Studio Live Share session stops the Apex Debugger from working. Before you use the Apex Debugger, set the `liveshare.excludedDebugTypes` setting to `["apex-replay", "apex"]`. For instructions, see [User and Workspace Settings](https://code.visualstudio.com/docs/getstarted/settings) in the Visual Studio Code docs.
-
-Microsoft is aware of this issue. For details, see [Debugger extension receives different order of requests with an active Live Share session #480](https://github.com/MicrosoftDocs/live-share/issues/480).
-
----
-
 ## Set Up the Apex Debugger
 The first time that you use the Apex Debugger in VS Code, complete these setup steps.
 

diff --git a/packages/salesforcedx-vscode-lwc-next/package.json b/packages/salesforcedx-vscode-lwc-next/package.json
@@ -27,7 +27,7 @@
     "ajv": "^6.1.1",
     "eslint": "4.16.0",
     "eslint-plugin-lwc": "0.3.2",
-    "lwc-language-server": "1.5.0",
+    "lwc-language-server": "1.5.1",
     "rxjs": "^5.4.1",
     "vscode-languageclient": "3.5.1"
   },

diff --git a/packages/salesforcedx-vscode-lwc/package.json b/packages/salesforcedx-vscode-lwc/package.json
@@ -27,7 +27,7 @@
     "ajv": "^6.1.1",
     "eslint": "4.16.0",
     "eslint-plugin-lwc": "0.3.2",
-    "lwc-language-server": "1.5.0",
+    "lwc-language-server": "1.5.1",
     "rxjs": "^5.4.1",
     "vscode-languageclient": "3.5.1"
   },