Merge from vscode 9bc92b4

winzig · Feb 19, 2020 · 1e30863 · 1e30863
1 parent 98584d3
commit 1e30863
Show file tree

Hide file tree

Showing 253 changed files with 6,409 additions and 2,291 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -193,7 +193,7 @@
                     "typemoq",
                     "sinon",
                     "vs/nls",
-                    "azdata",
+					"azdata",
                     "**/{vs,sql}/base/common/**",
                     "**/{vs,sql}/base/test/common/**",
                     "**/{vs,sql}/base/parts/*/common/**",

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -16,8 +16,6 @@
 			"request": "attach",
 			"name": "Attach to Extension Host",
 			"port": 5870,
-			"timeout": 30000,
-			"restart": true,
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
 			]

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -31,20 +31,6 @@
 				}
 			}
 		},
-		{
-			"type": "npm",
-			"script": "strict-function-types-watch",
-			"label": "TS - Strict Function Types",
-			"isBackground": true,
-			"presentation": {
-				"reveal": "never"
-			},
-			"problemMatcher": {
-				"base": "$tsc-watch",
-				"owner": "typescript-function-types",
-				"applyTo": "allDocuments"
-			}
-		},
 		{
 			"type": "npm",
 			"script": "strict-vscode-watch",

diff --git a/build/azure-pipelines/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml
@@ -207,7 +207,7 @@ steps:
           "toolVersion": "1.0"
         }
       ]
-    SessionTimeout: 120
+    SessionTimeout: 60
   displayName: Notarization
 
 - script: |