diff --git a/lsp-multi-root-sample/.vscode/settings.json b/lsp-multi-root-sample/.vscode/settings.json
index ed5b51ff..12511c65 100644
--- a/lsp-multi-root-sample/.vscode/settings.json
+++ b/lsp-multi-root-sample/.vscode/settings.json
@@ -5,5 +5,6 @@
 	"search.exclude": {
 		"out": true // set this to false to include "out" folder in search results
 	},
-	"typescript.tsdk": "./node_modules/typescript/lib"
+	"typescript.tsdk": "./node_modules/typescript/lib",
+	"typescript.tsc.autoDetect": "off"
 }
\ No newline at end of file
diff --git a/lsp-multi-root-sample/.vscode/tasks.json b/lsp-multi-root-sample/.vscode/tasks.json
index c3bccf46..76b7e4fc 100644
--- a/lsp-multi-root-sample/.vscode/tasks.json
+++ b/lsp-multi-root-sample/.vscode/tasks.json
@@ -2,31 +2,17 @@
 	"version": "2.0.0",
 	"tasks": [
 		{
-			"taskName": "Compile",
+			"taskName": "compile",
 			"dependsOn": [
-				"Client Compile",
-				"Server Compile"
+				"compile:client",
+				"compile:server"
 			],
 			"problemMatcher": []
 		},
 		{
-			"taskName": "Client Compile",
-			"type": "shell",
-			"command": "npm run client-compile",
-			"group": "build",
-			"presentation": {
-				"panel": "dedicated",
-				"reveal": "never"
-
-			},
-			"problemMatcher": [
-				"$tsc"
-			]
-		},
-		{
-			"taskName": "Server Compile",
-			"type": "shell",
-			"command": "npm run server-compile",
+			"label": "compile:client",
+			"type": "npm",
+			"script": "compile:client",
 			"group": "build",
 			"presentation": {
 				"panel": "dedicated",
@@ -37,10 +23,23 @@
 			]
 		},
 		{
-			"taskName": "Watch",
+			"label": "compile:server",
+			"type": "npm",
+			"script": "compile:server",
+			"group": "build",
+			"presentation": {
+				"panel": "dedicated",
+				"reveal": "never"
+			},
+			"problemMatcher": [
+				"$tsc"
+			]
+		},
+		{
+			"taskName": "watch",
 			"dependsOn": [
-				"Client Watch",
-				"Server Watch"
+				"watch:client",
+				"watch:server"
 			],
 			"group": {
 				"kind": "build",
@@ -49,9 +48,9 @@
 			"problemMatcher": []
 		},
 		{
-			"taskName": "Client Watch",
-			"type": "shell",
-			"command": "npm run client-watch",
+			"label": "watch:client",
+			"type": "npm",
+			"script": "watch:client",
 			"isBackground": true,
 			"group": "build",
 			"presentation": {
@@ -63,9 +62,9 @@
 			]
 		},
 		{
-			"taskName": "Server Watch",
-			"type": "shell",
-			"command": "npm run server-watch",
+			"label": "watch:server",
+			"type": "npm",
+			"script": "watch:server",
 			"isBackground": true,
 			"group": "build",
 			"presentation": {
diff --git a/lsp-multi-root-sample/package.json b/lsp-multi-root-sample/package.json
index df23ba91..c3641c89 100644
--- a/lsp-multi-root-sample/package.json
+++ b/lsp-multi-root-sample/package.json
@@ -12,10 +12,10 @@
 	"scripts": {
 		"postinstall": "cd server && npm install && cd ../client && npm install && cd ..",
 		"compile": "tsc -p client/tsconfig.json && cd server && npm run installServer && cd .. && tsc -p server/tsconfig.json",
-		"client-compile": "tsc -p client/tsconfig.json",
-		"client-watch": "tsc -w -p client/tsconfig.json",
-		"server-compile": "cd server && npm run installServer && cd .. && tsc -p server/tsconfig.json",
-		"server-watch": "cd server && npm run installServer && cd .. && tsc -w -p server/tsconfig.json"
+		"compile:client": "tsc -p client/tsconfig.json",
+		"watch:client": "tsc -w -p client/tsconfig.json",
+		"compile:server": "cd server && npm run installServer && cd .. && tsc -p server/tsconfig.json",
+		"watch:server": "cd server && npm run installServer && cd .. && tsc -w -p server/tsconfig.json"
 	},
 	"devDependencies": {
 		"@types/mocha": "^2.2.42",