import correct welcome page (#10117)

* merge cherry picked changes

* merges cherry picked commit

.config/CredScanSuppressions.json

@@ -0,0 +1,17 @@
+{
+    "tool": "Credential Scanner",
+    "suppressions": [
+        {
+            "file": "src\\vs\\base\\test\\common\\uri.test.ts",
+            "_justification": "External code"
+        },
+        {
+            "file": "build\\actions\\AutoLabel\\dist\\index.js",
+            "_justification": "False positive from webpacked code"
+        },
+        {
+            "file": "build\\actions\\AutoMerge\\dist\\index.js",
+            "_justification": "False positive from webpacked code"
+        }
+    ]
+}

.eslintignore

@@ -3,7 +3,6 @@
 **/vs/css.build.js
 **/vs/css.js
 **/vs/loader.js
-**/promise-polyfill/**
 **/insane/**
 **/marked/**
 **/test/**/*.js

.eslintrc.json

@@ -26,7 +26,18 @@
         "no-throw-literal": "warn",
         "no-unsafe-finally": "warn",
         "no-unused-labels": "warn",
-        "no-restricted-globals": ["warn", "name", "length", "event", "closed", "external", "status", "origin", "orientation"], // non-complete list of globals that are easy to access unintentionally
+        "no-restricted-globals": [
+            "warn",
+            "name",
+            "length",
+            "event",
+            "closed",
+            "external",
+            "status",
+            "origin",
+            "orientation",
+            "context"
+        ], // non-complete list of globals that are easy to access unintentionally
         "no-var": "warn",
         "jsdoc/no-types": "warn",
         "semi": "off",
@@ -45,7 +56,7 @@
         "code-layering": [
             "warn",
             {
-                "common": ["browser"], // {{SQL CARBON EDIT}} @anthonydresser not ideal, but for our purposes its fine for now,
+                "common": [],
                 "node": [
                     "common"
                 ],
@@ -69,195 +80,729 @@
             // !!! Do not relax these rules !!!
             // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
             {
-				"target": "**/{vs,sql}/base/common/**",
-				"restrictions": [
+                "target": "**/{vs,sql}/base/common/**",
+                "restrictions": [
+                    "vs/nls",
+                    "**/{vs,sql}/base/common/**"
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/base/test/common/**",
+                "restrictions": [
+                    "assert",
+                    "sinon",
+                    "vs/nls",
+                    "**/{vs,sql}/base/common/**",
+                    "**/{vs,sql}/base/test/common/**"
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/base/browser/**",
+                "restrictions": [
+                    "vs/nls",
+                    "vs/css!./**/*",
+                    "**/{vs,sql}/base/{common,browser}/**",
+                    "@angular/*",
+                    "rxjs/*"
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/base/node/**",
+                "restrictions": [
+                    "vs/nls",
+					"**/{vs,sql}/base/{common,node}/**",
+                    "*" // node modules
+                ]
+            },
+            {
+                // vs/base/test/browser contains tests for vs/base/browser
+                "target": "**/{vs,sql}/base/test/browser/**",
+                "restrictions": [
+                    "assert",
+                    "sinon",
+                    "vs/nls",
+                    "**/{vs,sql}/base/{common,browser}/**",
+                    "**/{vs,sql}/base/test/{common,browser}/**",
+                    "@angular/*",
+                    "rxjs/*"
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/base/parts/*/common/**",
+                "restrictions": [
+                    "vs/nls",
+                    "**/{vs,sql}/base/common/**",
+                    "**/{vs,sql}/base/parts/*/common/**"
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/base/parts/*/browser/**",
+                "restrictions": [
+                    "vs/nls",
+                    "vs/css!./**/*",
+                    "**/{vs,sql}/base/{common,browser}/**",
+                    "**/{vs,sql}/base/parts/*/{common,browser}/**",
+                    "@angular/*",
+                    "rxjs/*"
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/base/parts/*/node/**",
+                "restrictions": [
+                    "vs/nls",
+                    "**/{vs,sql}/base/{common,node}/**",
+                    "**/{vs,sql}/base/parts/*/{common,node}/**",
+                    "*" // node modules
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/base/parts/*/electron-browser/**",
+                "restrictions": [
+                    "vs/nls",
+                    "vs/css!./**/*",
+                    "**/{vs,sql}/base/{common,browser,node,electron-browser}/**",
+                    "**/{vs,sql}/base/parts/*/{common,browser,node,electron-browser}/**",
+                    "*" // node modules
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/base/parts/*/electron-main/**",
+                "restrictions": [
+                    "vs/nls",
+                    "**/{vs,sql}/base/{common,node,electron-main}/**",
+                    "**/{vs,sql}/base/parts/*/{common,node,electron-main}/**",
+                    "*" // node modules
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/platform/*/common/**",
+                "restrictions": [
+                    "vs/nls",
+                    "azdata",
+                    "**/{vs,sql}/base/common/**",
+                    "**/{vs,sql}/base/parts/*/common/**",
+                    "**/{vs,sql}/platform/*/common/**"
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/platform/*/test/common/**",
+                "restrictions": [
+                    "assert",
+                    "typemoq",
+                    "sinon",
+                    "vs/nls",
+					"azdata",
+                    "**/{vs,sql}/base/common/**",
+                    "**/{vs,sql}/base/test/common/**",
+                    "**/{vs,sql}/base/parts/*/common/**",
+                    "**/{vs,sql}/platform/*/common/**",
+                    "**/{vs,sql}/platform/*/test/common/**"
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/platform/*/browser/**",
+                "restrictions": [
+                    "vs/nls",
+                    "azdata",
+                    "vs/css!./**/*",
+                    "**/{vs,sql}/base/{common,browser}/**",
+                    "**/{vs,sql}/base/parts/*/{common,browser}/**",
+                    "**/{vs,sql}/platform/*/{common,browser}/**"
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/platform/*/node/**",
+                "restrictions": [
 					"vs/nls",
-					"**/{vs,sql}/base/common/**"
-				]
-			},
-			{
-				"target": "**/{vs,sql}/base/test/common/**",
-				"restrictions": [
-					"assert",
-					"sinon",
-					"vs/nls",
-					"**/{vs,sql}/base/common/**",
-					"**/{vs,sql}/base/test/common/**"
-				]
-			},
-			{
-				"target": "**/{vs,sql}/base/browser/**",
-				"restrictions": [
+					"azdata",
+                    "**/{vs,sql}/base/{common,node}/**",
+                    "**/{vs,sql}/base/parts/*/{common,node}/**",
+                    "**/{vs,sql}/platform/*/{common,node}/**",
+                    "*" // node modules
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/platform/*/electron-browser/**",
+                "restrictions": [
+                    "vs/nls",
+                    "azdata",
+                    "vs/css!./**/*",
+                    "**/{vs,sql}/base/{common,browser,node}/**",
+                    "**/{vs,sql}/base/parts/*/{common,browser,node,electron-browser}/**",
+                    "**/{vs,sql}/platform/*/{common,browser,node,electron-browser}/**",
+                    "*" // node modules
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/platform/*/electron-main/**",
+                "restrictions": [
 					"vs/nls",
+					"azdata",
+                    "**/{vs,sql}/base/{common,node,electron-main}/**",
+                    "**/{vs,sql}/base/parts/*/{common,node,electron-main}/**",
+                    "**/{vs,sql}/platform/*/{common,node,electron-main}/**",
+                    "**/{vs,sql}/code/**",
+                    "*" // node modules
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/platform/*/test/browser/**",
+                "restrictions": [
+                    "assert",
+                    "typemoq",
+                    "sinon",
+                    "azdata",
+                    "vs/nls",
+                    "**/{vs,sql}/base/{common,browser}/**",
+                    "**/{vs,sql}/base/test/{common,browser}/**",
+                    "**/{vs,sql}/platform/*/{common,browser}/**",
+                    "**/{vs,sql}/platform/*/test/{common,browser}/**"
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/editor/common/**",
+                "restrictions": [
+                    "vs/nls",
+                    "**/{vs,sql}/base/common/**",
+                    "**/{vs,sql}/base/worker/**",
+                    "**/{vs,sql}/platform/*/common/**",
+                    "**/{vs,sql}/editor/common/**"
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/editor/test/common/**",
+                "restrictions": [
+                    "assert",
+                    "sinon",
+                    "vs/nls",
+                    "**/{vs,sql}/base/common/**",
+                    "**/{vs,sql}/platform/*/common/**",
+                    "**/{vs,sql}/platform/*/test/common/**",
+                    "**/{vs,sql}/editor/common/**",
+                    "**/{vs,sql}/editor/test/common/**"
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/editor/browser/**",
+                "restrictions": [
+                    "vs/nls",
+                    "vs/css!./**/*",
+                    "**/{vs,sql}/base/{common,browser}/**",
+                    "**/{vs,sql}/platform/*/{common,browser}/**",
+                    "**/{vs,sql}/editor/{common,browser}/**"
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/editor/test/browser/**",
+                "restrictions": [
+                    "assert",
+                    "sinon",
+                    "vs/nls",
+                    "**/{vs,sql}/base/{common,browser}/**",
+                    "**/{vs,sql}/platform/*/{common,browser}/**",
+                    "**/{vs,sql}/platform/*/test/{common,browser}/**",
+                    "**/{vs,sql}/editor/{common,browser}/**",
+                    "**/{vs,sql}/editor/test/{common,browser}/**"
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/editor/standalone/common/**",
+                "restrictions": [
+                    "vs/nls",
+                    "**/{vs,sql}/base/common/**",
+                    "**/{vs,sql}/platform/*/common/**",
+                    "**/{vs,sql}/editor/common/**",
+                    "**/{vs,sql}/editor/standalone/common/**"
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/editor/standalone/test/common/**",
+                "restrictions": [
+                    "assert",
+                    "sinon",
+                    "vs/nls",
+                    "**/{vs,sql}/base/common/**",
+                    "**/{vs,sql}/platform/*/common/**",
+                    "**/{vs,sql}/platform/*/test/common/**",
+                    "**/{vs,sql}/editor/common/**",
+                    "**/{vs,sql}/editor/test/common/**"
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/editor/standalone/browser/**",
+                "restrictions": [
+                    "vs/nls",
+                    "vs/css!./**/*",
+                    "**/{vs,sql}/base/{common,browser}/**",
+                    "**/{vs,sql}/base/parts/*/{common,browser}/**",
+                    "**/{vs,sql}/platform/*/{common,browser}/**",
+                    "**/{vs,sql}/editor/{common,browser}/**",
+                    "**/{vs,sql}/editor/contrib/**",
+                    "**/{vs,sql}/editor/standalone/{common,browser}/**"
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/editor/standalone/test/browser/**",
+                "restrictions": [
+                    "assert",
+                    "sinon",
+                    "vs/nls",
+                    "**/{vs,sql}/base/{common,browser}/**",
+                    "**/{vs,sql}/platform/*/{common,browser}/**",
+                    "**/{vs,sql}/platform/*/test/{common,browser}/**",
+                    "**/{vs,sql}/editor/{common,browser}/**",
+                    "**/{vs,sql}/editor/standalone/{common,browser}/**",
+                    "**/{vs,sql}/editor/test/{common,browser}/**"
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/editor/contrib/*/test/**",
+                "restrictions": [
+                    "assert",
+                    "sinon",
+                    "vs/nls",
+                    "**/{vs,sql}/base/{common,browser}/**",
+                    "**/{vs,sql}/base/test/{common,browser}/**",
+                    "**/{vs,sql}/base/parts/*/{common,browser}/**",
+                    "**/{vs,sql}/platform/*/{common,browser}/**",
+                    "**/{vs,sql}/platform/*/test/{common,browser}/**",
+                    "**/{vs,sql}/editor/{common,browser}/**",
+                    "**/{vs,sql}/editor/test/{common,browser}/**",
+                    "**/{vs,sql}/editor/contrib/**"
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/editor/contrib/**",
+                "restrictions": [
+                    "vs/nls",
+                    "vs/css!./**/*",
+                    "**/{vs,sql}/base/{common,browser}/**",
+                    "**/{vs,sql}/base/parts/*/{common,browser}/**",
+                    "**/{vs,sql}/platform/{common,browser}/**",
+                    "**/{vs,sql}/platform/*/{common,browser}/**",
+                    "**/{vs,sql}/editor/{common,browser}/**",
+                    "**/{vs,sql}/editor/contrib/**"
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/workbench/common/**",
+                "restrictions": [
+                    "vs/nls",
+                    "azdata",
+                    "**/{vs,sql}/base/common/**",
+                    "**/{vs,sql}/base/parts/*/common/**",
+                    "**/{vs,sql}/platform/*/common/**",
+                    "**/{vs,sql}/editor/common/**",
+                    "**/{vs,sql}/editor/contrib/*/common/**",
+                    "**/{vs,sql}/workbench/common/**",
+                    "**/{vs,sql}/workbench/services/*/common/**",
+                    "assert"
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/workbench/browser/**",
+                "restrictions": [
+                    "vs/nls",
+                    "azdata",
+                    "@angular/*",
+                    "vs/css!./**/*",
+                    "**/{vs,sql}/base/{common,browser}/**",
+                    "**/{vs,sql}/base/parts/*/{common,browser}/**",
+                    "**/{vs,sql}/platform/*/{common,browser}/**",
+                    "**/{vs,sql}/editor/{common,browser}/**",
+                    "**/{vs,sql}/editor/contrib/**", // editor/contrib is equivalent to /browser/ by convention
+                    "**/{vs,sql}/workbench/workbench.web.api",
+                    "**/{vs,sql}/workbench/{common,browser}/**",
+                    "**/{vs,sql}/workbench/services/*/{common,browser}/**",
+                    "assert"
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/workbench/api/common/**",
+                "restrictions": [
+                    "vscode",
+                    "azdata",
+                    "vs/nls",
+                    "**/{vs,sql}/base/common/**",
+                    "**/{vs,sql}/platform/*/common/**",
+                    "**/{vs,sql}/editor/common/**",
+                    "**/{vs,sql}/editor/contrib/*/common/**",
+                    "**/{vs,sql}/workbench/api/common/**",
+                    "**/{vs,sql}/workbench/common/**",
+                    "**/{vs,sql}/workbench/services/*/common/**",
+                    "**/{vs,sql}/workbench/contrib/*/common/**"
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/workbench/api/worker/**",
+                "restrictions": [
+                    "vscode",
+                    "azdata",
+                    "vs/nls",
+                    "**/{vs,sql}/**/{common,worker}/**"
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/workbench/electron-browser/**",
+                "restrictions": [
+                    "vs/nls",
+                    "vs/css!./**/*",
+                    "**/{vs,sql}/base/{common,browser,node,electron-browser}/**",
+                    "**/{vs,sql}/base/parts/*/{common,browser,node,electron-browser}/**",
+                    "**/{vs,sql}/platform/*/{common,browser,node,electron-browser}/**",
+                    "**/{vs,sql}/editor/{common,browser,node,electron-browser}/**",
+                    "**/{vs,sql}/editor/contrib/**", // editor/contrib is equivalent to /browser/ by convention
+                    "**/{vs,sql}/workbench/{common,browser,node,electron-browser,api}/**",
+                    "**/{vs,sql}/workbench/services/*/{common,browser,node,electron-browser}/**",
+                    "*" // node modules
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/workbench/services/**/test/**",
+                "restrictions": [
+                    "vs/nls",
+                    "vs/css!./**/*",
+                    "**/{vs,sql}/base/**",
+                    "**/{vs,sql}/platform/**",
+                    "**/{vs,sql}/editor/**",
+                    "**/{vs,sql}/workbench/{common,browser,node,electron-browser}/**",
+                    "vs/workbench/contrib/files/common/editors/fileEditorInput",
+                    "**/{vs,sql}/workbench/services/**",
+                    "**/{vs,sql}/workbench/test/**",
+                    "*" // node modules
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/workbench/services/**/common/**",
+                "restrictions": [
+                    "vs/nls",
+                    "azdata",
+                    "**/{vs,sql}/base/**/common/**",
+                    "**/{vs,sql}/platform/**/common/**",
+                    "**/{vs,sql}/editor/common/**",
+                    "**/{vs,sql}/workbench/workbench.web.api",
+                    "**/{vs,sql}/workbench/common/**",
+                    "**/{vs,sql}/workbench/services/**/common/**",
+                    "**/{vs,sql}/workbench/api/**/common/**",
+                    "vs/workbench/contrib/files/common/editors/fileEditorInput", // this should be fine, it only accesses constants from contrib
+                    "vscode-textmate"
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/workbench/services/**/worker/**",
+                "restrictions": [
+                    "vs/nls",
+                    "**/{vs,sql}/base/**/common/**",
+                    "**/{vs,sql}/platform/**/common/**",
+                    "**/{vs,sql}/editor/common/**",
+                    "**/{vs,sql}/workbench/**/common/**",
+                    "**/{vs,sql}/workbench/**/worker/**",
+                    "**/{vs,sql}/workbench/services/**/common/**",
+                    "vscode"
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/workbench/services/**/browser/**",
+                "restrictions": [
+                    "vs/nls",
+                    "vs/css!./**/*",
+                    "azdata",
+                    "vscode",
+                    "**/{vs,sql}/base/**/{common,browser,worker}/**",
+                    "**/{vs,sql}/platform/**/{common,browser}/**",
+                    "**/{vs,sql}/editor/{common,browser}/**",
+                    "**/{vs,sql}/workbench/workbench.web.api",
+                    "**/{vs,sql}/workbench/{common,browser}/**",
+                    "**/{vs,sql}/workbench/api/{common,browser}/**",
+                    "**/{vs,sql}/workbench/services/**/{common,browser}/**",
+                    "vscode-textmate",
+                    "onigasm-umd",
+                    "sanitize-html",
+                    "@angular/*",
+                    "rxjs/**"
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/workbench/services/**/node/**",
+                "restrictions": [
+                    "vs/nls",
+                    "**/{vs,sql}/base/**/{common,node}/**",
+                    "**/{vs,sql}/platform/**/{common,node}/**",
+                    "**/{vs,sql}/editor/{common,node}/**",
+                    "**/{vs,sql}/workbench/{common,node}/**",
+                    "**/{vs,sql}/workbench/api/{common,node}/**",
+                    "**/{vs,sql}/workbench/services/**/{common,node}/**",
+                    "*" // node modules
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/workbench/services/**/electron-browser/**",
+                "restrictions": [
+                    "vs/nls",
+                    "vs/css!./**/*",
+                    "**/{vs,sql}/base/**/{common,browser,worker,node,electron-browser}/**",
+                    "**/{vs,sql}/platform/**/{common,browser,node,electron-browser}/**",
+                    "**/{vs,sql}/editor/**",
+                    "**/{vs,sql}/workbench/{common,browser,node,electron-browser,api}/**",
+                    "**/{vs,sql}/workbench/services/**/{common,browser,node,electron-browser}/**",
+                    "*" // node modules
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/workbench/contrib/**/test/**",
+                "restrictions": [
+                    "assert",
+                    "vs/nls",
+                    "vs/css!./**/*",
+                    "**/{vs,sql}/base/**",
+                    "**/{vs,sql}/platform/**",
+                    "**/{vs,sql}/editor/**",
+                    "**/{vs,sql}/workbench/{common,browser,node,electron-browser}/**",
+                    "**/{vs,sql}/workbench/services/**",
+                    "**/{vs,sql}/workbench/contrib/**",
+                    "**/{vs,sql}/workbench/test/**",
+                    "**"
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/workbench/contrib/terminal/browser/**",
+                "restrictions": [
+                    // xterm and its addons are strictly browser-only components
+                    "xterm",
+                    "xterm-addon-*",
+                    "vs/nls",
+                    "vs/css!./**/*",
+                    "**/{vs,sql}/base/**/{common,browser}/**",
+                    "**/{vs,sql}/platform/**/{common,browser}/**",
+                    "**/{vs,sql}/editor/**",
+                    "**/{vs,sql}/workbench/{common,browser}/**",
+                    "**/{vs,sql}/workbench/contrib/**/{common,browser}/**",
+					"**/{vs,sql}/workbench/services/**/{common,browser}/**"
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/workbench/contrib/extensions/browser/**",
+                "restrictions": [
+                    "semver-umd",
+                    "vs/nls",
+                    "vs/css!./**/*",
+                    "**/{vs,sql}/base/**/{common,browser}/**",
+                    "**/{vs,sql}/platform/**/{common,browser}/**",
+                    "**/{vs,sql}/editor/**",
+                    "**/{vs,sql}/workbench/{common,browser}/**",
+                    "**/{vs,sql}/workbench/contrib/**/{common,browser}/**",
+                    "**/{vs,sql}/workbench/services/**/{common,browser}/**"
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/workbench/contrib/update/browser/update.ts",
+                "restrictions": [
+                    "semver-umd",
+                    "vs/nls",
+                    "vs/css!./**/*",
+                    "**/{vs,sql}/base/**/{common,browser}/**",
+                    "**/{vs,sql}/platform/**/{common,browser}/**",
+                    "**/{vs,sql}/editor/**",
+                    "**/{vs,sql}/workbench/{common,browser}/**",
+                    "**/{vs,sql}/workbench/contrib/**/{common,browser}/**",
+                    "**/{vs,sql}/workbench/services/**/{common,browser}/**"
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/workbench/contrib/**/common/**",
+                "restrictions": [
+                    "vs/nls",
 					"vs/css!./**/*",
-					"**/{vs,sql}/base/{common,browser}/**",
+					"azdata",
+                    "**/{vs,sql}/base/**/common/**",
+                    "**/{vs,sql}/platform/**/common/**",
+                    "**/{vs,sql}/editor/**",
+                    "**/{vs,sql}/workbench/common/**",
+                    "**/{vs,sql}/workbench/api/common/**",
+                    "**/{vs,sql}/workbench/services/**/common/**",
+                    "**/{vs,sql}/workbench/contrib/**/common/**"
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/workbench/contrib/**/browser/**",
+                "restrictions": [
+                    "vs/nls",
+                    "vs/css!./**/*",
+					"azdata",
+					"vscode",
+                    "**/{vs,sql}/base/**/{common,browser}/**",
+                    "**/{vs,sql}/platform/**/{common,browser}/**",
+                    "**/{vs,sql}/editor/**",
+                    "**/{vs,sql}/workbench/{common,browser}/**",
+                    "**/{vs,sql}/workbench/api/{common,browser}/**",
+                    "**/{vs,sql}/workbench/services/**/{common,browser}/**",
+					"**/{vs,sql}/workbench/contrib/**/{common,browser}/**",
 					"@angular/*",
-					"rxjs/*"
-				]
-			},
-			{
-				"target": "**/{vs,sql}/base/node/**",
-				"restrictions": [
-					"vs/nls",
-					"**/{vs,sql}/base/{common,browser,node}/**",
-					"!path" // node modules (except path where we have our own impl)
-				]
-			},
-			{
-				// vs/base/test/browser contains tests for vs/base/browser
-				"target": "**/{vs,sql}/base/test/browser/**",
-				"restrictions": [
-					"assert",
-					"vs/nls",
-					"**/{vs,sql}/base/{common,browser}/**",
-					"**/{vs,sql}/base/test/{common,browser}/**",
-					"@angular/*",
-					"rxjs/*"
-				]
-			},
-			{
-				"target": "**/{vs,sql}/base/parts/*/common/**",
-				"restrictions": [
-					"vs/nls",
-					"**/{vs,sql}/base/common/**",
-					"**/{vs,sql}/base/parts/*/common/**"
-				]
-			},
-			{
-				"target": "**/{vs,sql}/base/parts/*/browser/**",
-				"restrictions": [
-					"vs/nls",
-					"vs/css!./**/*",
-					"**/{vs,sql}/base/{common,browser}/**",
-					"**/{vs,sql}/base/parts/*/{common,browser}/**",
-					"@angular/*",
-					"rxjs/*"
-				]
-			},
-			{
-				"target": "**/{vs,sql}/base/parts/*/node/**",
-				"restrictions": [
-					"vs/nls",
-					"**/{vs,sql}/base/{common,browser,node}/**",
-					"**/{vs,sql}/base/parts/*/{common,browser,node}/**",
-					"!path" // node modules (except path where we have our own impl)
-				]
-			},
-			{
-				"target": "**/{vs,sql}/base/parts/*/electron-browser/**",
-				"restrictions": [
-					"vs/nls",
-					"vs/css!./**/*",
-					"**/{vs,sql}/base/{common,browser,node,electron-browser}/**",
-					"**/{vs,sql}/base/parts/*/{common,browser,node,electron-browser}/**",
-					"!path", // node modules (except path where we have our own impl)
-					"@angular/*",
-					"rxjs/*"
-				]
-			},
-			{
-				"target": "**/{vs,sql}/base/parts/*/electron-main/**",
-				"restrictions": [
-					"vs/nls",
-					"**/{vs,sql}/base/{common,browser,node,electron-main}/**",
-					"**/{vs,sql}/base/parts/*/{common,browser,node,electron-main}/**",
-					"!path", // node modules (except path where we have our own impl)
-					"@angular/*",
-					"rxjs/*"
-				]
-			},
-			{
-				"target": "**/{vs,sql}/platform/*/common/**",
-				"restrictions": [
-					"vs/nls",
-					"**/{vs,sql}/base/common/**",
-					"**/{vs,sql}/base/parts/*/common/**",
-					"**/{vs,sql}/{platform,workbench}/**/common/**",
-					"**/vs/editor/common/**",
-					"azdata" // TODO remove
-				]
-			},
-			{
-				"target": "**/{vs,sql}/platform/*/test/common/**",
-				"restrictions": [
-					"assert",
-					"sinon",
-					"vs/nls",
-					"**/{vs,sql}/base/common/**",
-					"**/{vs,sql}/{platform,workbench}/**/common/**",
-					"**/{vs,sql}/{base,platform,workbench}/**/test/common/**",
+					"rxjs/**",
+					"ng2-charts",
+					"chart.js",
+					"plotly.js-dist",
+					"angular2-grid",
+					"html-query-plan"
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/workbench/contrib/**/node/**",
+                "restrictions": [
+                    "vs/nls",
+                    "vs/css!./**/*",
+                    "**/{vs,sql}/base/**/{common,node}/**",
+                    "**/{vs,sql}/platform/**/{common,node}/**",
+                    "**/{vs,sql}/editor/**/common/**",
+                    "**/{vs,sql}/workbench/{common,node}/**",
+                    "**/{vs,sql}/workbench/api/{common,node}/**",
+                    "**/{vs,sql}/workbench/services/**/{common,node}/**",
+                    "**/{vs,sql}/workbench/contrib/**/{common,node}/**",
+                    "*" // node modules
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/workbench/contrib/**/electron-browser/**",
+                "restrictions": [
+                    "vs/nls",
+                    "vs/css!./**/*",
+                    "**/{vs,sql}/base/**/{common,browser,worker,node,electron-browser}/**",
+                    "**/{vs,sql}/platform/**/{common,browser,node,electron-browser}/**",
+                    "**/{vs,sql}/editor/**",
+                    "**/{vs,sql}/workbench/{common,browser,node,electron-browser,api}/**",
+                    "**/{vs,sql}/workbench/services/**/{common,browser,node,electron-browser}/**",
+                    "**/{vs,sql}/workbench/contrib/**/{common,browser,node,electron-browser}/**",
+                    "*" // node modules
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/code/node/**",
+                "restrictions": [
+                    "vs/nls",
+                    "**/{vs,sql}/base/**/{common,node}/**",
+                    "**/{vs,sql}/base/parts/**/{common,node}/**",
+                    "**/{vs,sql}/platform/**/{common,node}/**",
+                    "**/{vs,sql}/code/**/{common,node}/**",
+                    "*" // node modules
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/code/electron-browser/**",
+                "restrictions": [
+                    "vs/nls",
+                    "vs/css!./**/*",
+                    "**/{vs,sql}/base/**/{common,browser,node,electron-browser}/**",
+                    "**/{vs,sql}/base/parts/**/{common,browser,node,electron-browser}/**",
+                    "**/{vs,sql}/platform/**/{common,browser,node,electron-browser}/**",
+                    "**/{vs,sql}/code/**/{common,browser,node,electron-browser}/**",
+                    "*" // node modules
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/code/electron-main/**",
+                "restrictions": [
+                    "vs/nls",
+                    "**/{vs,sql}/base/**/{common,node,electron-main}/**",
+                    "**/{vs,sql}/base/parts/**/{common,node,electron-main}/**",
+                    "**/{vs,sql}/platform/**/{common,node,electron-main}/**",
+                    "**/{vs,sql}/code/**/{common,node,electron-main}/**",
+                    "*" // node modules
+                ]
+            },
+            {
+                "target": "**/{vs,sql}/server/**",
+                "restrictions": [
+                    "vs/nls",
+                    "**/{vs,sql}/base/**/{common,node}/**",
+                    "**/{vs,sql}/base/parts/**/{common,node}/**",
+                    "**/{vs,sql}/platform/**/{common,node}/**",
+                    "**/{vs,sql}/workbench/**/{common,node}/**",
+                    "**/{vs,sql}/server/**",
+                    "**/{vs,sql}/code/**/{common,node}/**",
+                    "*" // node modules
+                ]
+            },
+            {
+                "target": "**/extensions/**",
+                "restrictions": "**/*"
+            },
+            {
+                "target": "**/test/smoke/**",
+                "restrictions": [
+                    "**/test/smoke/**",
+                    "*" // node modules
+                ]
+            },
+            {
+                "target": "**/test/automation/**",
+                "restrictions": [
+                    "**/test/automation/**",
+                    "*" // node modules
+                ]
+            },
+            {
+                "target": "**/test/integration/**",
+                "restrictions": [
+                    "**/test/integration/**",
+                    "*" // node modules
+                ]
+            },
+            {
+                "target": "**/api/**.test.ts",
+                "restrictions": [
+                    "**/{vs,sql}/**",
+                    "assert",
+                    "sinon",
+                    "crypto",
+					"vscode",
 					"typemoq",
-					"azdata" // TODO remove
-				]
-			},
-			{
-				"target": "**/{vs,sql}/platform/*/browser/**",
-				"restrictions": [
-					"vs/nls",
-					"vs/css!./**/*",
-					"**/{vs,sql}/base/{common,browser}/**",
-					"**/{vs,sql}/base/parts/*/{common,browser}/**",
-					"**/{vs,sql}/{platform,workbench}/**/{common,browser}/**",
-					"**/vs/editor/{common,browser}/**",
-					"@angular/*",
-					"rxjs/*",
-					"azdata" // TODO remove
-				]
-			},
-			{
-				"target": "**/{vs,sql}/platform/*/node/**",
-				"restrictions": [
-					"vs/nls",
-					"**/{vs,sql}/base/{common,browser,node}/**",
-					"**/{vs,sql}/base/parts/*/{common,browser,node}/**",
-					"**/{vs,sql}/{platform,workbench}/**/{common,browser,node}/**",
-					"**/vs/editor/{common,browser,node}/**",
-					"!path", // node modules (except path where we have our own impl)
-					"azdata" // TODO remove
-				]
-			},
-			{
-				"target": "**/{vs,sql}/platform/*/electron-browser/**",
-				"restrictions": [
-					"vs/nls",
-					"vs/css!./**/*",
-					"**/{vs,sql}/base/{common,browser,node}/**",
-					"**/{vs,sql}/base/parts/*/{common,browser,node,electron-browser}/**",
-					"**/{vs,sql}/{platform,workbench}/**/{common,browser,node,electron-browser}/**",
-					"**/vs/editor/{common,browser,node,electron-browser}/**",
-					"!path", // node modules (except path where we have our own impl)
-					"@angular/*",
-					"rxjs/*",
-					"azdata" // TODO remove
-				]
-			},
-			{
-				"target": "**/{vs,sql}/platform/*/electron-main/**",
-				"restrictions": [
-					"vs/nls",
-					"**/{vs,sql}/base/{common,browser,node}/**",
-					"**/{vs,sql}/base/parts/*/{common,browser,node,electron-browser}/**",
-					"**/{vs,sql}/{platform,workbench}/**/{common,browser,node,electron-main}/**",
-					"**/vs/editor/{common,browser,node,electron-main}/**",
-					"!path", // node modules (except path where we have our own impl)
-					"azdata" // TODO remove
-				]
-			},
-			{
-				"target": "**/{vs,sql}/platform/*/test/browser/**",
-				"restrictions": [
+					"azdata"
+                ]
+            },
+            {
+                "target": "**/{node,electron-browser,electron-main}/**/*.test.ts",
+                "restrictions": [
+                    "**/{vs,sql}/**",
+                    "**" // node modules
+                ]
+            },
+            {
+                "target": "**/{node,electron-browser,electron-main}/**/test/**",
+                "restrictions": [
+                    "**/{vs,sql}/**",
+                    "*" // node modules
+                ]
+            },
+            {
+                "target": "**/test/{node,electron-browser,electron-main}/**",
+                "restrictions": [
+                    "**/{vs,sql}/**",
+                    "*" // node modules
+                ]
+            },
+            {
+                "target": "**/**.test.ts",
+                "restrictions": [
+                    "**/{vs,sql}/**",
 					"assert",
-					"sinon",
-					"vs/nls",
-					"**/{vs,sql}/base/{common,browser}/**",
-					"**/{vs,sql}/{platform,workbench}/**/{common,browser}/**",
-					"**/{vs,sql}/{base,platform,workbench}/**/test/{common,browser}/**",
 					"typemoq",
-					"@angular/*",
-					"rxjs/*",
-					"azdata" // TODO remove
-				]
-			}
+                    "sinon",
+                    "crypto",
+					"xterm*",
+					"azdata"
+                ]
+            },
+            {
+                "target": "**/test/**",
+                "restrictions": [
+                    "**/{vs,sql}/**",
+                    "assert",
+					"typemoq",
+                    "sinon",
+                    "crypto",
+                    "xterm*"
+                ]
+            }
         ]
     },
     "overrides": [
@@ -268,6 +813,61 @@
             "rules": {
                 "jsdoc/no-types": "off"
             }
+        },
+        {
+            "files": [
+                "**/sql/**"
+            ],
+            "rules": {
+                "no-sync": "warn",
+                "strict": ["warn", "never"],
+                "no-console": "warn"
+            }
+        },
+        {
+            "files": [
+                "**/vscode.d.ts",
+                "**/vscode.proposed.d.ts"
+            ],
+            "rules": {
+                "vscode-dts-create-func": "warn",
+                "vscode-dts-literal-or-types": "warn",
+                "vscode-dts-interface-naming": "warn",
+                "vscode-dts-event-naming": [
+                    "warn",
+                    {
+                        "allowed": [
+                            "onCancellationRequested",
+                            "event"
+                        ],
+                        "verbs": [
+                            "accept",
+                            "change",
+                            "close",
+                            "collapse",
+                            "create",
+                            "delete",
+                            "dispose",
+                            "edit",
+                            "end",
+                            "expand",
+                            "hide",
+                            "open",
+                            "override",
+                            "receive",
+                            "register",
+                            "rename",
+                            "save",
+                            "send",
+                            "start",
+                            "terminate",
+                            "trigger",
+                            "unregister",
+                            "write"
+                        ]
+                    }
+                ]
+            }
         }
     ]
 }

.eslintrc.sql.json

@@ -1,7 +0,0 @@
-{
-	"extends": ".eslintrc.json",
-	"rules": {
-		"no-sync": "warn",
-		"strict": ["warn", "never"]
-	}
-}

.eslintrc.sql.ts.json

@@ -0,0 +1,20 @@
+{
+	"parser": "@typescript-eslint/parser",
+	"parserOptions": {
+		"ecmaVersion": 6,
+		"sourceType": "module",
+		"project": "./tsconfig.sql.json"
+	},
+	"plugins": [
+		"@typescript-eslint",
+		"jsdoc"
+	],
+	"rules": {
+		"@typescript-eslint/no-floating-promises": [
+			"error",
+			{
+				"ignoreVoid": true
+			}
+		]
+	}
+}

.github/ISSUE_TEMPLATE/bug_report.md

@@ -6,6 +6,7 @@ labels: ''
 assignees: ''
 
 ---
+<!-- ⚠️⚠️ Do Not Delete This! bug_report_template ⚠️⚠️ -->
 <!-- Please read our Rules of Conduct: https://opensource.microsoft.com/codeofconduct/ -->
 <!-- Please search existing issues to avoid creating duplicates. -->
 <!-- Also please test using the latest insiders build to make sure your issue has not already been fixed. -->

.github/commands.yml

@@ -1,12 +1,11 @@
 {
-  perform: false,
+  perform: true,
   commands: [
     {
       type: 'label',
-      name: 'duplicate',
-      allowTriggerByBot: true,
-      action: 'close',
-      comment: "Thanks for creating this issue! We figured it's covering the same as another one we already have. Thus, we closed this one as a duplicate. You can search for existing issues [here](https://aka.ms/vscodeissuesearch). See also our [issue reporting](https://aka.ms/vscodeissuereporting) guidelines.\n\nHappy Coding!"
+      name: 'Needs Logs',
+      action: 'comment',
+      comment: "We need more info to debug your particular issue. If you could attach your logs to the issue (ensure no private data is in them), it would help us fix the issue much faster.\n\nTo find your logs:\n\n- Open command palette (Click **View** -> **Command Palette**)\n- Run the command: **`Developer: Open Logs Folder`**\n\nThis will open the log file locally. Please include renderer.log"
     }
   ]
 }

.github/feature-requests.yml

@@ -1,34 +0,0 @@
-{
-  typeLabel: {
-    name: 'feature-request'
-  },
-  candidateMilestone: {
-    number: 107,
-    name: 'Backlog Candidates'
-  },
-  approvedMilestone: {
-    number: 8,
-    name: 'Backlog'
-  },
-  onLabeled: {
-    delay: 60,
-    perform: true
-  },
-  onCandidateMilestoned: {
-    candidatesComment: "This feature request is now a candidate for our backlog. The community has 60 days to upvote the issue. If it receives 20 upvotes we will move it to our backlog. If not, we will close it. To learn more about how we handle feature requests, please see our [documentation](https://aka.ms/vscode-issue-lifecycle).\n\nHappy Coding!",
-    perform: true
-  },
-  onMonitorUpvotes: {
-    upvoteThreshold: 20,
-    acceptanceComment: ":slightly_smiling_face: This feature request received a sufficient number of community upvotes and we moved it to our backlog. To learn more about how we handle feature requests, please see our [documentation](https://aka.ms/vscode-issue-lifecycle).\n\nHappy Coding!",
-    perform: true
-  },
-  onMonitorDaysOnCandidateMilestone: {
-    daysOnMilestone: 60,
-    warningPeriod: 10,
-    numberOfCommentsToPreventAutomaticRejection: 20,
-    rejectionComment: ":slightly_frowning_face: In the last 60 days, this feature request has received less than 20 community upvotes and we closed it. Still a big Thank You to you for taking the time to create this issue! To learn more about how we handle feature requests, please see our [documentation](https://aka.ms/vscode-issue-lifecycle).\n\nHappy Coding!",
-    warningComment: "This feature request has not yet received the 20 community upvotes it takes to make to our backlog. 10 days to go. To learn more about how we handle feature requests, please see our [documentation](https://aka.ms/vscode-issue-lifecycle).\n\nHappy Coding",
-    perform: true
-  }
-}

.github/mergers.json

@@ -0,0 +1,7 @@
+[
+  "kenvanhyning",
+  "kburtram",
+  "udeeshagautam",
+  "qifahs",
+  "chlafreniere"
+]

.github/new_release.yml

@@ -1,6 +0,0 @@
-{
-  newReleaseLabel: 'new-release',
-  newReleaseColor: '006b75',
-  daysAfterRelease: 5,
-  perform: true
-}

.github/workflows/ci.yml

@@ -2,55 +2,74 @@ name: CI
 
 on:
   push:
-    branches:
-      - master
-      - release/*
-  pull_request:
-    branches:
-      - master
-      - release/*
+    branches-ignore:
+      - '**'
+  # push:
+  #   branches:
+  #     - master
+  #     - release/*
+  # pull_request:
+  #   branches:
+  #     - master
+  #     - release/*
 
 jobs:
-  # linux:
-  #   runs-on: ubuntu-latest
-  #   env:
-  #     CHILD_CONCURRENCY: "1"
-  #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  #   steps:
-  #   - uses: actions/checkout@v1
-  #   # TODO: rename azure-pipelines/linux/xvfb.init to github-actions
-  #   - run: |
-  #       sudo apt-get update
-  #       sudo apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb libgtk-3-0 libkrb5-dev # {{SQL CARBON EDIT}} add kerberos dep
-  #       sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
-  #       sudo chmod +x /etc/init.d/xvfb
-  #       sudo update-rc.d xvfb defaults
-  #       sudo service xvfb start
-  #     name: Setup Build Environment
-  #   - uses: actions/setup-node@v1
-  #     with:
-  #       node-version: 10
-  #   # TODO: cache node modules
-  #   - run: yarn --frozen-lockfile
-  #     name: Install Dependencies
-  #   - run: yarn electron x64
-  #     name: Download Electron
-  #   - run: yarn gulp hygiene
-  #     name: Run Hygiene Checks
-    # - run: yarn strict-vscode # {{SQL CARBON EDIT}} add step
-    #   name: Run Strict Compile Options
-  #   # - run: yarn monaco-compile-check {{SQL CARBON EDIT}} remove step
-  #   #   name: Run Monaco Editor Checks
-  #   - run: yarn valid-layers-check
-  #     name: Run Valid Layers Checks
-  #   - run: yarn compile
-  #     name: Compile Sources
-  #   # - run: yarn download-builtin-extensions {{SQL CARBON EDIT}} remove step
-  #   #   name: Download Built-in Extensions
-  #   - run: DISPLAY=:10 ./scripts/test.sh --tfs "Unit Tests"
-  #     name: Run Unit Tests
-  #   # - run: DISPLAY=:10 ./scripts/test-integration.sh --tfs "Integration Tests" {{SQL CARBON EDIT}} remove step
-  #   #   name: Run Integration Tests
+  linux:
+    runs-on: ubuntu-latest
+    env:
+      CHILD_CONCURRENCY: "1"
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+    - uses: actions/checkout@v1
+    # TODO: rename azure-pipelines/linux/xvfb.init to github-actions
+    - run: |
+        sudo apt-get update
+        sudo apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb libgtk-3-0 libkrb5-dev # {{SQL CARBON EDIT}} add kerberos dep
+        sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
+        sudo chmod +x /etc/init.d/xvfb
+        sudo update-rc.d xvfb defaults
+        sudo service xvfb start
+      name: Setup Build Environment
+    - uses: actions/setup-node@v1
+      with:
+        node-version: 10
+    # TODO: cache node modules
+    - run: yarn --frozen-lockfile
+      name: Install Dependencies
+    - run: yarn electron x64
+      name: Download Electron
+    - run: yarn gulp hygiene
+      name: Run Hygiene Checks
+    - run: yarn strict-vscode # {{SQL CARBON EDIT}} add step
+      name: Run Strict Compile Options
+    # - run: yarn monaco-compile-check {{SQL CARBON EDIT}} remove step
+    #   name: Run Monaco Editor Checks
+    - run: yarn valid-layers-check
+      name: Run Valid Layers Checks
+    - run: yarn compile
+      name: Compile Sources
+    # - run: yarn download-builtin-extensions {{SQL CARBON EDIT}} remove step
+    #   name: Download Built-in Extensions
+    - run: DISPLAY=:10 ./scripts/test.sh --tfs "Unit Tests" --coverage --runGlob "**/sql/**/*.test.js"
+      name: Run Unit Tests (Electron)
+    - run: DISPLAY=:10 ./scripts/test-extensions-unit.sh
+      name: Run Extension Unit Tests (Electron)
+    # {{SQL CARBON EDIT}} Add coveralls. We merge first to get around issue where parallel builds weren't being combined correctly
+    - run: |
+        mkdir .build/coverage-combined
+        cat .build/coverage-single/lcov.info ./extensions/admin-tool-ext-win/coverage/lcov.info ./extensions/agent/coverage/lcov.info ./extensions/azurecore/coverage/lcov.info ./extensions/cms/coverage/lcov.info ./extensions/dacpac/coverage/lcov.info ./extensions/schema-compare/coverage/lcov.info ./extensions/notebook/coverage/lcov.info ./extensions/resource-deployment/coverage/lcov.info ./extensions/machine-learning-services/coverage/lcov.info > .build/coverage-combined/lcov.info
+      name: Merge coverage reports
+    - name: Upload Code Coverage
+      uses: coverallsapp/github-action@v1.0.1
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        path-to-lcov: '.build/coverage-combined/lcov.info'
+
+    # Fails with cryptic error (e.g. https://github.com/microsoft/vscode/pull/90292/checks?check_run_id=433681926#step:13:9)
+    # - run: DISPLAY=:10 yarn test-browser --browser chromium
+    #   name: Run Unit Tests (Browser)
+    # - run: DISPLAY=:10 ./scripts/test-integration.sh --tfs "Integration Tests" {{SQL CARBON EDIT}} remove step
+    #   name: Run Integration Tests (Electron)
 
   windows:
     runs-on: windows-2016
@@ -82,9 +101,11 @@ jobs:
     # - run: yarn download-builtin-extensions {{SQL CARBON EDIT}} remove step
     #   name: Download Built-in Extensions
     - run: .\scripts\test.bat --tfs "Unit Tests"
-      name: Run Unit Tests
+      name: Run Unit Tests (Electron)
+    # - run: yarn test-browser --browser chromium {{SQL CARBON EDIT}} disable for now @TODO @anthonydresser
+    #   name: Run Unit Tests (Browser)
     # - run: .\scripts\test-integration.bat --tfs "Integration Tests" {{SQL CARBON EDIT}} remove step
-    #   name: Run Integration Tests
+    #   name: Run Integration Tests (Electron)
 
   darwin:
     runs-on: macos-latest
@@ -113,6 +134,34 @@ jobs:
     # - run: yarn download-builtin-extensions {{SQL CARBON EDIT}} remove step
     #   name: Download Built-in Extensions
     - run: ./scripts/test.sh --tfs "Unit Tests"
-      name: Run Unit Tests
-    # - run: ./scripts/test-integration.sh --tfs "Integration Tests" {{SQL CARBON EDIT}} remove step
-    #   name: Run Integration Tests
+      name: Run Unit Tests (Electron)
+  #   - run: yarn test-browser --browser chromium --browser webkit
+  #     name: Run Unit Tests (Browser)
+  #   - run: ./scripts/test-integration.sh --tfs "Integration Tests"
+  #     name: Run Integration Tests (Electron)
+
+  # monaco:
+  #   runs-on: ubuntu-latest
+  #   env:
+  #     CHILD_CONCURRENCY: "1"
+  #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  #   steps:
+  #   - uses: actions/checkout@v1
+  #   # TODO: rename azure-pipelines/linux/xvfb.init to github-actions
+  #   - run: |
+  #       sudo apt-get update
+  #       sudo apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb libgtk-3-0 libgbm1
+  #       sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
+  #       sudo chmod +x /etc/init.d/xvfb
+  #       sudo update-rc.d xvfb defaults
+  #       sudo service xvfb start
+  #     name: Setup Build Environment
+  #   - uses: actions/setup-node@v1
+  #     with:
+  #       node-version: 10
+  #   - run: yarn --frozen-lockfile
+  #     name: Install Dependencies
+  #   - run: yarn monaco-compile-check
+  #     name: Run Monaco Editor Checks
+  #   - run: yarn gulp editor-esm-bundle
+  #     name: Editor Distro & ESM Bundle

.github/workflows/merger.yml

@@ -0,0 +1,16 @@
+name: AutoMerger
+
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  release_labeler:
+    name: Auto Merger
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v2
+      - uses: ./build/actions/AutoMerge
+        env:
+          GITHUB_TOKEN: "${{ secrets.GithubMerger }}"

.github/workflows/portlabel.yml

@@ -0,0 +1,19 @@
+name: Port Request Labeler
+
+on:
+  pull_request:
+    branches:
+      - release/**
+
+jobs:
+  release_labeler:
+    name: Release labeler
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v2
+      - uses: ./build/actions/AutoLabel
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+        with:
+          label: "Port Request"

.gitignore

@@ -11,6 +11,7 @@ out-editor/
 out-editor-src/
 out-editor-build/
 out-editor-esm/
+out-editor-esm-bundle/
 out-editor-min/
 out-monaco-editor-core/
 out-vscode/

.vscode/launch.json

@@ -16,8 +16,6 @@
 			"request": "attach",
 			"name": "Attach to Extension Host",
 			"port": 5870,
-			"timeout": 30000,
-			"restart": true,
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
 			]
@@ -94,8 +92,11 @@
 			],
 			"webRoot": "${workspaceFolder}",
 			// Settings for js-debug:
+			"userDataDir": false,
 			"pauseForSourceMap": false,
-			"outFiles": ["${workspaceFolder}/out/**/*.js"],
+			"outFiles": [
+				"${workspaceFolder}/out/**/*.js"
+			],
 		},
 		{
 			"type": "node",
@@ -197,7 +198,7 @@
 			"type": "node",
 			"request": "launch",
 			"name": "Run Unit Tests",
-			"program": "${workspaceFolder}/test/electron/index.js",
+			"program": "${workspaceFolder}/test/unit/electron/index.js",
 			"runtimeExecutable": "${workspaceFolder}/.build/electron/Azure Data Studio.app/Contents/MacOS/Electron",
 			"windows": {
 				"runtimeExecutable": "${workspaceFolder}/.build/electron/azuredatastudio.exe"

.vscode/searches/es6.code-search

@@ -0,0 +1,63 @@
+# Query: @deprecated ES6
+# Flags: CaseSensitive WordMatch
+# ContextLines: 2
+
+9 results - 4 files
+
+src/vs/base/common/arrays.ts:
+  401  
+  402  /**
+  403:  * @deprecated ES6: use `Array.findIndex`
+  404   */
+  405  export function firstIndex<T>(array: ReadonlyArray<T>, fn: (item: T) => boolean): number {
+
+  417  
+  418  /**
+  419:  * @deprecated ES6: use `Array.find`
+  420   */
+  421  export function first<T>(array: ReadonlyArray<T>, fn: (item: T) => boolean, notFoundValue: T): T;
+
+  560  
+  561  /**
+  562:  * @deprecated ES6: use `Array.find`
+  563   */
+  564  export function find<T>(arr: ArrayLike<T>, predicate: (value: T, index: number, arr: ArrayLike<T>) => any): T | undefined {
+
+src/vs/base/common/map.ts:
+   9  
+  10  /**
+  11:  * @deprecated ES6: use `[...SetOrMap.values()]`
+  12   */
+  13  export function values<V = any>(set: Set<V>): V[];
+
+  20  
+  21  /**
+  22:  * @deprecated ES6: use `[...map.keys()]`
+  23   */
+  24  export function keys<K, V>(map: Map<K, V>): K[] {
+
+src/vs/base/common/objects.ts:
+  115  
+  116  /**
+  117:  * @deprecated ES6
+  118   */
+  119  export function assign<T>(destination: T): T;
+
+src/vs/base/common/strings.ts:
+   15  
+   16  /**
+   17:  * @deprecated ES6: use `String.padStart`
+   18   */
+   19  export function pad(n: number, l: number, char: string = '0'): string {
+
+  146  
+  147  /**
+  148:  * @deprecated ES6: use `String.startsWith`
+  149   */
+  150  export function startsWith(haystack: string, needle: string): boolean {
+
+  167  
+  168  /**
+  169:  * @deprecated ES6: use `String.endsWith`
+  170   */
+  171  export function endsWith(haystack: string, needle: string): boolean {

.vscode/searches/ts36031.code-search

@@ -1,7 +1,6 @@
 # Query: \\w+\\?\\..+![(.[]
 # Flags: RegExp
 # ContextLines: 2
-
 src/vs/base/browser/ui/tree/asyncDataTree.ts:
   270  			} : undefined,
   271  			isChecked: options.ariaProvider!.isChecked ? (e) => {

.vscode/settings.json

@@ -22,6 +22,8 @@
 		"i18n/**": true,
 		"extensions/**/out/**": true,
 		"test/smoke/out/**": true,
+		"test/automation/out/**": true,
+		"test/integration/browser/out/**": true,
 		"src/vs/base/test/node/uri.test.data.txt": true
 	},
 	"lcov.path": [
@@ -67,5 +69,8 @@
 		"msjsdiag.debugger-for-chrome": "workspace"
 	},
 	"gulp.autoDetect": "off",
-	"files.insertFinalNewline": true
+	"files.insertFinalNewline": true,
+  "[typescript]": {
+		"editor.defaultFormatter": "vscode.typescript-language-features"
+	}
 }

.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",

.yarnrc

@@ -1,3 +1,3 @@
 disturl "https://atom.io/download/electron"
-target "6.1.6"
+target "7.1.11"
 runtime "electron"

CHANGELOG.md

@@ -1,5 +1,31 @@
 # Change Log
 
+## Version 1.16.0
+* Release date: March 18, 2020
+* Release status: General Availability
+* Notebooks:
+	* Charting
+	* Creating Jupyter books
+* Postgres extension update - Users can now authenticate to Azure Postgres servers with their linked Azure account
+* Accessibility bugs
+* VS Code merge
+* In the next release, GitHub releases will no longer contain the binary files to the latest version. Rather, they will contain links to the latest release. This will have no impact on users using the in-app update functionality.
+
+## Version 1.15.1
+* Release date: February 19, 2020
+* Release status: General Availability
+* Resolved [#9145 Edit Data render the result grid incorrectly when using custom query](https://github.com/microsoft/azuredatastudio/issues/9145).
+* Resolved [#9149 Show Active Connections](https://github.com/microsoft/azuredatastudio/issues/9149).
+
+## Version 1.15.0
+* Release date: February 13, 2020
+* Release status: General Availability
+* New Azure Sign-in improvement - Added improved Azure Sign-in experience, including removal of copy/paste of device code to make a more seamless connected experience.
+* Find in Notebook support - Users can now use Ctrl+F inside of a notebook. Find in Notebook support searches line by line through both code and text cells.
+* VS Code merge from 1.38 to 1.42 - This release includes updates to VS Code from the 3 previous VS Code releases. Read their [release notes](https://code.visualstudio.com/updates/v1_42) to learn more.
+* Fix for the ["white/blank screen"](https://github.com/microsoft/azuredatastudio/issues/8775) issue reported by many users.
+* Resolved [bugs and issues](https://github.com/microsoft/azuredatastudio/issues?q=is%3Aissue+label%3ABug+milestone%3A%22February+2020%22+is%3Aclosed).
+
 ## Version 1.14.1
 * Release date: December 26, 2019
 * Release status: General Availability

README.md

@@ -8,15 +8,16 @@ Azure Data Studio is a data management tool that enables you to work with SQL Se
 
 ## **Download the latest Azure Data Studio release**
 
-Platform | Link
--- | --
-Windows User Installer | https://go.microsoft.com/fwlink/?linkid=2113530
-Windows System Installer | https://go.microsoft.com/fwlink/?linkid=2113628
-Windows ZIP | https://go.microsoft.com/fwlink/?linkid=2113529
-macOS ZIP | https://go.microsoft.com/fwlink/?linkid=2113528
-Linux TAR.GZ | https://go.microsoft.com/fwlink/?linkid=2113627
-Linux RPM | https://go.microsoft.com/fwlink/?linkid=2113718
-Linux DEB | https://go.microsoft.com/fwlink/?linkid=2113344
+| Platform																|
+| ---------------------------------------	|
+| [Windows User Installer][win-user]			|
+| [Windows System Installer][win-system]	|
+| [Windows ZIP][win-zip]									|
+| [macOS ZIP][osx-zip]										|
+| [Linux TAR.GZ][linux-zip]								|
+| [Linux RPM][linux-rpm]									|
+| [Linux DEB][linux-deb]									|
+
 
 Go to our [download page](https://aka.ms/azuredatastudio) for more specific instructions.
 
@@ -140,3 +141,11 @@ And of course, we'd like to thank the authors of all upstream dependencies.  Ple
 Copyright (c) Microsoft Corporation. All rights reserved.
 
 Licensed under the [Source EULA](LICENSE.txt).
+
+[win-user]: https://go.microsoft.com/fwlink/?linkid=2121609
+[win-system]: https://go.microsoft.com/fwlink/?linkid=2121612
+[win-zip]: https://go.microsoft.com/fwlink/?linkid=2121511
+[osx-zip]: https://go.microsoft.com/fwlink/?linkid=2121611
+[linux-zip]: https://go.microsoft.com/fwlink/?linkid=2121510
+[linux-rpm]: https://go.microsoft.com/fwlink/?linkid=2121613
+[linux-deb]: https://go.microsoft.com/fwlink/?linkid=2121610

ThirdPartyNotices.txt

@@ -12,6 +12,7 @@ expressly granted herein, whether by implication, estoppel or otherwise.
     angular2-grid: https://github.com/BTMorton/angular2-grid
     angular2-slickgrid: https://github.com/Microsoft/angular2-slickgrid
     applicationinsights: https://github.com/Microsoft/ApplicationInsights-node.js
+		axios: https://github.com/axios/axios
     bootstrap: https://github.com/twbs/bootstrap
     chart.js: https://github.com/Timer/chartjs
     chokidar: https://github.com/paulmillr/chokidar
@@ -38,6 +39,7 @@ expressly granted herein, whether by implication, estoppel or otherwise.
     jschardet: https://github.com/aadsm/jschardet
     jupyter-powershell: https://github.com/vors/jupyter-powershell
     JupyterLab: https://github.com/jupyterlab/jupyterlab
+		keytar: https://github.com/atom/node-keytar
     make-error: https://github.com/JsCommunity/make-error
     minimist: https://github.com/substack/minimist
     moment: https://github.com/moment/moment
@@ -50,6 +52,7 @@ expressly granted herein, whether by implication, estoppel or otherwise.
     primeng: https://github.com/primefaces/primeng
     process-nextick-args: https://github.com/calvinmetcalf/process-nextick-args
     pty.js: https://github.com/chjj/pty.js
+		qs: https://github.com/ljharb/qs
     reflect-metadata: https://github.com/rbuckton/reflect-metadata
     request: https://github.com/request/request
     rxjs: https://github.com/ReactiveX/RxJS

build/.nativeignore

@@ -108,6 +108,8 @@ jquery-ui/demos/**
 slickgrid/node_modules/**
 slickgrid/examples/**
 
+kerberos/build/**
+
 # END SQL Modules
 
 nsfw/binding.gyp

build/actions/AutoLabel/.eslintrc.json

@@ -0,0 +1,17 @@
+{
+    "env": {
+        "commonjs": true,
+        "es6": true,
+        "node": true
+    },
+    "extends": "eslint:recommended",
+    "globals": {
+        "Atomics": "readonly",
+        "SharedArrayBuffer": "readonly"
+    },
+    "parserOptions": {
+        "ecmaVersion": 2018
+    },
+    "rules": {
+    }
+}

build/actions/AutoLabel/.gitignore

@@ -0,0 +1,98 @@
+
+# Created by https://www.gitignore.io/api/node
+# Edit at https://www.gitignore.io/?templates=node
+
+### Node ###
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# TypeScript v1 declaration files
+typings/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+.env.test
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+
+# next.js build output
+.next
+
+# nuxt.js build output
+.nuxt
+
+# react / gatsby 
+public/
+
+# vuepress build output
+.vuepress/dist
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# End of https://www.gitignore.io/api/node

build/actions/AutoLabel/action.yml

@@ -0,0 +1,9 @@
+name: 'Auto Labeler'
+description: 'Automatically add a label to a PR'
+author: 'aaomidi'
+inputs: 
+  token:
+    description: 'The GITHUB_TOKEN secret'
+runs:
+  using: 'node12'
+  main: 'dist/index.js'

build/actions/AutoLabel/dist/index.d.ts

@@ -0,0 +1 @@
+export {};

build/actions/AutoLabel/package.json

@@ -0,0 +1,24 @@
+{
+  "name": "auto-merge",
+  "version": "1.0.0",
+  "main": "src/index.js",
+  "repository": "git@github.com:aaomidi/AutoLabel.git",
+  "author": "Amir Omidi <amir@aaomidi.com>",
+  "license": "MIT",
+  "scripts": {
+    "package": "ncc build src/index.ts -o dist",
+    "lint": "eslint src/index.js"
+  },
+  "devDependencies": {
+    "@types/node": "^12.11.1",
+    "@zeit/ncc": "^0.21.1",
+    "eslint": "^6.8.0",
+    "typescript": "^3.8.3"
+  },
+  "dependencies": {
+    "@actions/core": "^1.1.3",
+    "@actions/github": "^1.1.0",
+    "@octokit/rest": "^16.33.1",
+    "actions-toolkit": "^3.0.1"
+  }
+}

build/actions/AutoLabel/src/index.ts

@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Toolkit } from 'actions-toolkit';
+
+const tools = new Toolkit({
+	event: 'pull_request',
+	secrets: ['GITHUB_TOKEN']
+});
+
+const label = tools.inputs.label || 'Port Request';
+
+async function run() {
+	try {
+		let prNumber = tools.context.payload?.pull_request?.number;
+
+		if (prNumber === undefined) {
+			console.error('PR Number was undefined');
+			tools.log.error('PR Number was undefined');
+			return;
+		}
+
+		tools.github.issues.addLabels({
+			...tools.context.repo,
+			labels: [label],
+			issue_number: prNumber
+		});
+
+	} catch (ex) {
+		console.error(ex);
+		tools.log.error(ex);
+	}
+}
+
+run();

build/actions/AutoLabel/tsconfig.json

@@ -0,0 +1,76 @@
+{
+	"compilerOptions": {
+		/* Basic Options */
+		"target": "es6",
+		/* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */
+		"module": "commonjs",
+		/* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
+		// "lib": [],                             /* Specify library files to be included in the compilation. */
+		// "allowJs": true,                       /* Allow javascript files to be compiled. */
+		// "checkJs": true,                       /* Report errors in .js files. */
+		// "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
+		"declaration": true,
+		/* Generates corresponding '.d.ts' file. */
+		// "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
+		"sourceMap": true,
+		/* Generates corresponding '.map' file. */
+		// "outFile": "./",                       /* Concatenate and emit output to single file. */
+		"outDir": "out",
+		/* Redirect output structure to the directory. */
+		// "rootDir": "./",                       /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
+		// "composite": true,                     /* Enable project compilation */
+		// "removeComments": true,                /* Do not emit comments to output. */
+		// "noEmit": true,                        /* Do not emit outputs. */
+		// "importHelpers": true,                 /* Import emit helpers from 'tslib'. */
+		// "downlevelIteration": true,            /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
+		// "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
+
+		/* Strict Type-Checking Options */
+		"strict": true,
+		/* Enable all strict type-checking options. */
+		// "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
+		"strictNullChecks": true,
+		/* Enable strict null checks. */
+		// "strictFunctionTypes": true,           /* Enable strict checking of function types. */
+		// "strictPropertyInitialization": true,  /* Enable strict checking of property initialization in classes. */
+		// "noImplicitThis": true,                /* Raise error on 'this' expressions with an implied 'any' type. */
+		"alwaysStrict": true,
+		/* Parse in strict mode and emit "use strict" for each source file. */
+
+		/* Additional Checks */
+		// "noUnusedLocals": true,                /* Report errors on unused locals. */
+		// "noUnusedParameters": true,            /* Report errors on unused parameters. */
+		// "noImplicitReturns": true,             /* Report error when not all code paths in function return a value. */
+		// "noFallthroughCasesInSwitch": true,    /* Report errors for fallthrough cases in switch statement. */
+
+		/* Module Resolution Options */
+		// "moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
+		// "baseUrl": "./",                       /* Base directory to resolve non-absolute module names. */
+		// "paths": {},                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
+		// "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
+		// "typeRoots": [],                       /* List of folders to include type definitions from. */
+		"types": ["node"],
+		"skipLibCheck": true,
+		/* Type declaration files to be included in compilation. */
+		"allowSyntheticDefaultImports": true,
+		/* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
+		"esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
+		// "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
+
+		/* Source Map Options */
+		// "sourceRoot": "",                      /* Specify the location where debugger should locate TypeScript files instead of source locations. */
+		// "mapRoot": "",                         /* Specify the location where debugger should locate map files instead of generated locations. */
+		// "inlineSourceMap": true,               /* Emit a single file with source maps instead of having a separate file. */
+		// "inlineSources": true,                 /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
+
+		/* Experimental Options */
+		// "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
+		// "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
+	},
+	"include": [
+		"./src/**/*.ts"
+	],
+	"exclude": [
+		"node_modules"
+	]
+}

build/actions/AutoMerge/.eslintrc.json

@@ -0,0 +1,17 @@
+{
+    "env": {
+        "commonjs": true,
+        "es6": true,
+        "node": true
+    },
+    "extends": "eslint:recommended",
+    "globals": {
+        "Atomics": "readonly",
+        "SharedArrayBuffer": "readonly"
+    },
+    "parserOptions": {
+        "ecmaVersion": 2018
+    },
+    "rules": {
+    }
+}

build/actions/AutoMerge/.gitignore

@@ -0,0 +1,100 @@
+
+# Created by https://www.gitignore.io/api/node
+# Edit at https://www.gitignore.io/?templates=node
+
+### Node ###
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# TypeScript v1 declaration files
+typings/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+.env.test
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+
+# next.js build output
+.next
+
+# nuxt.js build output
+.nuxt
+
+# react / gatsby 
+public/
+
+# vuepress build output
+.vuepress/dist
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# End of https://www.gitignore.io/api/node
+
+out/

build/actions/AutoMerge/action.yml

@@ -0,0 +1,6 @@
+name: 'Auto Merge'
+description: 'Automatically merges a PR based on command'
+author: 'aaomidi'
+runs:
+  using: 'node12'
+  main: 'dist/index.js'

build/actions/AutoMerge/dist/index.d.ts

@@ -0,0 +1 @@
+export {};

build/actions/AutoMerge/package.json

@@ -0,0 +1,24 @@
+{
+  "name": "auto-merge",
+  "version": "1.0.0",
+  "main": "src/index.js",
+  "repository": "git@github.com:aaomidi/AutoMerge.git",
+  "author": "Amir Omidi <amir@aaomidi.com>",
+  "license": "MIT",
+  "scripts": {
+    "package": "ncc build src/index.ts -o dist",
+    "lint": "eslint src/index.js"
+  },
+  "devDependencies": {
+    "@types/node": "^12.11.1",
+    "@zeit/ncc": "^0.21.1",
+    "eslint": "^6.8.0",
+    "typescript": "^3.8.3"
+  },
+  "dependencies": {
+    "@actions/core": "^1.1.3",
+    "@actions/github": "^1.1.0",
+    "@octokit/rest": "^16.33.1",
+    "actions-toolkit": "^3.0.1"
+  }
+}

build/actions/AutoMerge/src/index.ts

@@ -0,0 +1,134 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { Toolkit } from 'actions-toolkit';
+import { Octokit } from '@octokit/rest';
+
+interface LabelDefinition {
+	id: number,
+	name: string
+}
+
+interface RepoContext {
+	repo: string,
+	owner: string
+}
+
+const tools = new Toolkit({
+	event: 'issue_comment',
+	secrets: ['GITHUB_TOKEN']
+});
+
+const labelToCheckFor = tools.inputs.label || 'Approved';
+
+const fileToCheckFor = tools.inputs.filePath || './.github/mergers.json';
+
+const checkMerged = async (repoContext: RepoContext, pullNumber: number): Promise<boolean> => {
+	let isMerged: boolean;
+	try {
+		const result = await tools.github.pulls.checkIfMerged({
+			...repoContext,
+			pull_number: pullNumber
+		});
+		isMerged = result.status === 204;
+	} catch (ex) {
+		isMerged = false;
+	}
+	return isMerged;
+};
+
+const checkCollabrator = async (repoContext: RepoContext, username: string): Promise<boolean> => {
+	let isCollabrator: boolean;
+	try {
+		const result = await tools.github.repos.checkCollaborator({
+			...repoContext,
+			username,
+		});
+		isCollabrator = result.status === 204;
+	} catch (ex) {
+		isCollabrator = false;
+	}
+	return isCollabrator;
+};
+
+tools.command('merge', async () => {
+	try {
+		const issue = tools.context.payload.issue;
+
+		if (issue?.pull_request === undefined) {
+			console.log('This command only works on pull requests');
+			return;
+		}
+
+		const sender = tools.context.payload.sender;
+
+		const senderName = sender?.login ?? ' Unknown Sender';
+		const issueNumber = issue?.number;
+
+		if (!issueNumber) {
+			return tools.log.error('Issue number not defined.');
+		}
+
+		const isMerged = await checkMerged(tools.context.repo, issueNumber);
+
+		if (isMerged === true) {
+			console.log('PR is already merged');
+			return;
+		}
+
+		const mergers: string[] = JSON.parse(tools.getFile(fileToCheckFor));
+
+		if (!mergers.includes(senderName)) {
+			console.log('Unrecognized user tried to merge!', senderName);
+			return;
+		}
+
+		const isCollabrator = await checkCollabrator(tools.context.repo, senderName);
+
+		if (isCollabrator !== true) {
+			console.log('User is not a collabrator');
+			return;
+		}
+
+		const labels: LabelDefinition[] = issue.labels || [];
+
+		const foundLabel = labels.find(l => l.name === labelToCheckFor);
+
+		if (foundLabel === undefined) {
+			console.log(`Label ${labelToCheckFor} must be applied`);
+			const createCommentParams: Octokit.IssuesCreateCommentParams = {
+				...tools.context.repo,
+				issue_number: issueNumber,
+				body: `The label ${labelToCheckFor} is required for using this command.`
+			};
+			await tools.github.issues.createComment(createCommentParams);
+			return;
+		}
+
+		const createCommentParams: Octokit.IssuesCreateCommentParams = {
+			...tools.context.repo,
+			issue_number: issueNumber,
+			body: `Merging PR based on approval from @${senderName}`
+		};
+
+		const commentResult = await tools.github.issues.createComment(createCommentParams);
+
+		if (commentResult.status !== 201) {
+			console.log('Comment not created');
+			return;
+		}
+
+		const mergeResult = await tools.github.pulls.merge({
+			...tools.context.repo,
+			pull_number: issueNumber,
+			merge_method: 'squash'
+		});
+		console.log(mergeResult);
+	} catch (ex) {
+		console.error(ex);
+	}
+});
+
+console.log('Running...');

build/actions/AutoMerge/tsconfig.json

@@ -0,0 +1,76 @@
+{
+	"compilerOptions": {
+		/* Basic Options */
+		"target": "es6",
+		/* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */
+		"module": "commonjs",
+		/* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
+		// "lib": [],                             /* Specify library files to be included in the compilation. */
+		// "allowJs": true,                       /* Allow javascript files to be compiled. */
+		// "checkJs": true,                       /* Report errors in .js files. */
+		// "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
+		"declaration": true,
+		/* Generates corresponding '.d.ts' file. */
+		// "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
+		"sourceMap": true,
+		/* Generates corresponding '.map' file. */
+		// "outFile": "./",                       /* Concatenate and emit output to single file. */
+		"outDir": "out",
+		/* Redirect output structure to the directory. */
+		// "rootDir": "./",                       /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
+		// "composite": true,                     /* Enable project compilation */
+		// "removeComments": true,                /* Do not emit comments to output. */
+		// "noEmit": true,                        /* Do not emit outputs. */
+		// "importHelpers": true,                 /* Import emit helpers from 'tslib'. */
+		// "downlevelIteration": true,            /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
+		// "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
+
+		/* Strict Type-Checking Options */
+		"strict": true,
+		/* Enable all strict type-checking options. */
+		// "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
+		"strictNullChecks": true,
+		/* Enable strict null checks. */
+		// "strictFunctionTypes": true,           /* Enable strict checking of function types. */
+		// "strictPropertyInitialization": true,  /* Enable strict checking of property initialization in classes. */
+		// "noImplicitThis": true,                /* Raise error on 'this' expressions with an implied 'any' type. */
+		"alwaysStrict": true,
+		/* Parse in strict mode and emit "use strict" for each source file. */
+
+		/* Additional Checks */
+		// "noUnusedLocals": true,                /* Report errors on unused locals. */
+		// "noUnusedParameters": true,            /* Report errors on unused parameters. */
+		// "noImplicitReturns": true,             /* Report error when not all code paths in function return a value. */
+		// "noFallthroughCasesInSwitch": true,    /* Report errors for fallthrough cases in switch statement. */
+
+		/* Module Resolution Options */
+		// "moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
+		// "baseUrl": "./",                       /* Base directory to resolve non-absolute module names. */
+		// "paths": {},                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
+		// "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
+		// "typeRoots": [],                       /* List of folders to include type definitions from. */
+		"types": ["node"],
+		"skipLibCheck": true,
+		/* Type declaration files to be included in compilation. */
+		"allowSyntheticDefaultImports": true,
+		/* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
+		"esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
+		// "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
+
+		/* Source Map Options */
+		// "sourceRoot": "",                      /* Specify the location where debugger should locate TypeScript files instead of source locations. */
+		// "mapRoot": "",                         /* Specify the location where debugger should locate map files instead of generated locations. */
+		// "inlineSourceMap": true,               /* Emit a single file with source maps instead of having a separate file. */
+		// "inlineSources": true,                 /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
+
+		/* Experimental Options */
+		// "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
+		// "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
+	},
+	"include": [
+		"./src/**/*.ts"
+	],
+	"exclude": [
+		"node_modules"
+	]
+}

build/azure-pipelines/common/createAsset.ts

@@ -44,15 +44,16 @@ async function doesAssetExist(blobService: azure.BlobService, quality: string, b
 	return existsResult.exists;
 }
 
-async function uploadBlob(blobService: azure.BlobService, quality: string, blobName: string, file: string): Promise<void> {
+async function uploadBlob(blobService: azure.BlobService, quality: string, blobName: string, filePath: string, fileName: string): Promise<void> {
 	const blobOptions: azure.BlobService.CreateBlockBlobRequestOptions = {
 		contentSettings: {
-			contentType: mime.lookup(file),
+			contentType: mime.lookup(filePath),
+			contentDisposition: `attachment; filename="${fileName}"`,
 			cacheControl: 'max-age=31536000, public'
 		}
 	};
 
-	await new Promise((c, e) => blobService.createBlockBlobFromLocalFile(quality, blobName, file, blobOptions, err => err ? e(err) : c()));
+	await new Promise((c, e) => blobService.createBlockBlobFromLocalFile(quality, blobName, filePath, blobOptions, err => err ? e(err) : c()));
 }
 
 function getEnv(name: string): string {
@@ -66,24 +67,24 @@ function getEnv(name: string): string {
 }
 
 async function main(): Promise<void> {
-	const [, , platform, type, name, file] = process.argv;
+	const [, , platform, type, fileName, filePath] = process.argv;
 	const quality = getEnv('VSCODE_QUALITY');
 	const commit = getEnv('BUILD_SOURCEVERSION');
 
 	console.log('Creating asset...');
 
-	const stat = await new Promise<fs.Stats>((c, e) => fs.stat(file, (err, stat) => err ? e(err) : c(stat)));
+	const stat = await new Promise<fs.Stats>((c, e) => fs.stat(filePath, (err, stat) => err ? e(err) : c(stat)));
 	const size = stat.size;
 
 	console.log('Size:', size);
 
-	const stream = fs.createReadStream(file);
+	const stream = fs.createReadStream(filePath);
 	const [sha1hash, sha256hash] = await Promise.all([hashStream('sha1', stream), hashStream('sha256', stream)]);
 
 	console.log('SHA1:', sha1hash);
 	console.log('SHA256:', sha256hash);
 
-	const blobName = commit + '/' + name;
+	const blobName = commit + '/' + fileName;
 	const storageAccount = process.env['AZURE_STORAGE_ACCOUNT_2']!;
 
 	const blobService = azure.createBlobService(storageAccount, process.env['AZURE_STORAGE_ACCESS_KEY_2']!)
@@ -98,7 +99,7 @@ async function main(): Promise<void> {
 
 	console.log('Uploading blobs to Azure storage...');
 
-	await uploadBlob(blobService, quality, blobName, file);
+	await uploadBlob(blobService, quality, blobName, filePath, fileName);
 
 	console.log('Blobs successfully uploaded.');
 

build/azure-pipelines/common/publish.ts

@@ -49,11 +49,12 @@ function getConfig(quality: string): Promise<Config> {
 		query: `SELECT TOP 1 * FROM c WHERE c.id = @quality`,
 		parameters: [
 			{ name: '@quality', value: quality }
-		]
+		],
+
 	};
 
 	return new Promise<Config>((c, e) => {
-		client.queryDocuments(collection, query).toArray((err, results) => {
+		client.queryDocuments(collection, query, { enableCrossPartitionQuery: true }).toArray((err, results) => {
 			if (err && err.code !== 409) { return e(err); }
 
 			c(!results || results.length === 0 ? createDefaultConfig(quality) : results[0] as any as Config);
@@ -86,7 +87,7 @@ function createOrUpdate(commit: string, quality: string, platform: string, type:
 		updateTries++;
 
 		return new Promise<void>((c, e) => {
-			client.queryDocuments(collection, updateQuery).toArray((err, results) => {
+			client.queryDocuments(collection, updateQuery, { enableCrossPartitionQuery: true }).toArray((err, results) => {
 				if (err) { return e(err); }
 				if (results.length !== 1) { return e(new Error('No documents')); }
 
@@ -217,7 +218,13 @@ async function publish(commit: string, quality: string, platform: string, type:
 
 	// {{SQL CARBON EDIT}}
 	// Insiders: nightly build from master
-	const isReleased = (quality === 'insider' && /^master$|^refs\/heads\/master$/.test(sourceBranch) && /Project Collection Service Accounts|Microsoft.VisualStudio.Services.TFS/.test(queuedBy));
+	const isReleased = (
+		(
+			(quality === 'insider' && /^master$|^refs\/heads\/master$/.test(sourceBranch)) ||
+			(quality === 'rc1' && /^release\/|^refs\/heads\/release\//.test(sourceBranch))
+		) &&
+		/Project Collection Service Accounts|Microsoft.VisualStudio.Services.TFS/.test(queuedBy)
+	);
 
 	const release = {
 		id: commit,

build/azure-pipelines/darwin/continuous-build-darwin.yml

@@ -43,10 +43,13 @@ steps:
 #   displayName: Download Built-in Extensions
 - script: |
     ./scripts/test.sh --tfs "Unit Tests"
-  displayName: Run Unit Tests
+  displayName: Run Unit Tests (Electron)
+# - script: | {{SQL CARBON EDIT}} disable for now @TODO @anthonydresser
+#     yarn test-browser --browser chromium --browser webkit
+#   displayName: Run Unit Tests (Browser)
 # - script: | {{SQL CARBON EDIT}} remove step
 #     ./scripts/test-integration.sh --tfs "Integration Tests"
-#   displayName: Run Integration Tests
+#   displayName: Run Integration Tests (Electron)
 - task: PublishTestResults@2
   displayName: Publish Tests Results
   inputs:

build/azure-pipelines/darwin/createDrop.sh

@@ -5,11 +5,6 @@ REPO="$(pwd)"
 # ensure drop directories exist
 mkdir -p $REPO/.build/darwin/{archive,server}
 
-# remove pkg from archive
-if [[ "$SIGNED" == "true" ]]; then
-	zip -d $REPO/.build/darwin/archive/azuredatastudio-darwin.zip "*.pkg"
-fi
-
 # package Remote Extension Host
 pushd .. && mv azuredatastudio-reh-darwin azuredatastudio-server-darwin && zip -Xry $REPO/.build/darwin/server/azuredatastudio-server-darwin.zip azuredatastudio-server-darwin && popd
 

build/azure-pipelines/darwin/entitlements.plist

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>com.apple.security.cs.allow-jit</key>
+    <true/>
+    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+    <true/>
+    <key>com.apple.security.cs.disable-library-validation</key>
+    <true/>
+    <key>com.apple.security.cs.allow-dyld-environment-variables</key>
+    <true/>
+</dict>
+</plist>

build/azure-pipelines/darwin/entitlements.xml

@@ -10,5 +10,13 @@
 	<true/>
 	<key>com.apple.security.cs.disable-library-validation</key>
 	<true/>
+	<key>com.apple.security.network.client</key>
+	<true/>
+	<key>com.apple.security.network.server</key>
+	<true/>
+	<key>com.apple.security.app-sandbox</key>
+	<false/>
+	<key>com.apple.security.automation.apple-events</key>
+	<true/>
 </dict>
 </plist>

build/azure-pipelines/darwin/product-build-darwin.yml

@@ -77,6 +77,23 @@ steps:
     yarn postinstall
   displayName: Run postinstall scripts
   condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
+  env:
+    OSS_GITHUB_ID: "a5d3c261b032765a78de"
+    OSS_GITHUB_SECRET: $(oss-github-client-secret)
+    INSIDERS_GITHUB_ID: "31f02627809389d9f111"
+    INSIDERS_GITHUB_SECRET: $(insiders-github-client-secret)
+    STABLE_GITHUB_ID: "baa8a44b5e861d918709"
+    STABLE_GITHUB_SECRET: $(stable-github-client-secret)
+    EXPLORATION_GITHUB_ID: "94e8376d3a90429aeaea"
+    EXPLORATION_GITHUB_SECRET: $(exploration-github-client-secret)
+    VSO_GITHUB_ID: "3d4be8f37a0325b5817d"
+    VSO_GITHUB_SECRET: $(vso-github-client-secret)
+    VSO_PPE_GITHUB_ID: "eabf35024dc2e891a492"
+    VSO_PPE_GITHUB_SECRET: $(vso-ppe-github-client-secret)
+    VSO_DEV_GITHUB_ID: "84383ebd8a7c5f5efc5c"
+    VSO_DEV_GITHUB_SECRET: $(vso-dev-github-client-secret)
+    GITHUB_APP_ID: "Iv1.ae51e546bef24ff1"
+    GITHUB_APP_SECRET: $(github-app-client-secret)
 
 - script: |
     set -e
@@ -96,9 +113,13 @@ steps:
 - script: |
     set -e
     ./scripts/test.sh --build --tfs "Unit Tests"
-    # APP_NAME="`ls $(agent.builddirectory)/VSCode-darwin | head -n 1`"
-    # yarn smoketest -- --build "$(agent.builddirectory)/VSCode-darwin/$APP_NAME"
-  displayName: Run unit tests
+  displayName: Run unit tests (Electron)
+  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+
+- script: |
+    set -e
+    yarn test-browser --build --browser chromium --browser webkit
+  displayName: Run unit tests (Browser)
   condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
 - script: |
@@ -111,33 +132,57 @@ steps:
     INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/Electron" \
     VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-darwin" \
     ./scripts/test-integration.sh --build --tfs "Integration Tests"
-  displayName: Run integration tests
+  displayName: Run integration tests (Electron)
   condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-# Web Smoke Tests disabled due to https://github.com/microsoft/vscode/issues/80308
-# - script: |
-#     set -e
-#     cd test/smoke
-#     yarn compile
-#     cd -
-#     yarn smoketest --web --headless
-#   continueOnError: true
-#   displayName: Run web smoke tests
-#   condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-
 - script: |
     set -e
-    cd test/smoke
-    yarn compile
-    cd -
+    APP_ROOT=$(agent.builddirectory)/VSCode-darwin
+    APP_NAME="`ls $APP_ROOT | head -n 1`"
+    INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/Electron" \
+    VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-darwin" \
+    ./resources/server/test/test-remote-integration.sh
+  displayName: Run remote integration tests (Electron)
+  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+
+- script: |
+    set -e
+    VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-darwin" \
+    ./resources/server/test/test-web-integration.sh --browser webkit
+  displayName: Run integration tests (Browser)
+  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+
+- script: |
+    set -e
+    APP_ROOT=$(agent.builddirectory)/VSCode-darwin
+    APP_NAME="`ls $APP_ROOT | head -n 1`"
+    yarn smoketest --build "$APP_ROOT/$APP_NAME"
+  continueOnError: true
+  displayName: Run smoke tests (Electron)
+  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+
+- script: |
+    set -e
+    VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-darwin" \
     yarn smoketest --web --headless
   continueOnError: true
-  displayName: Run smoke tests
+  displayName: Run smoke tests (Browser)
   condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
 - script: |
     set -e
-    pushd ../VSCode-darwin && zip -r -X -y ../VSCode-darwin.zip * && popd
+    security create-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain
+    security default-keychain -s $(agent.tempdirectory)/buildagent.keychain
+    security unlock-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain
+    echo "$(macos-developer-certificate)" | base64 -D > $(agent.tempdirectory)/cert.p12
+    security import $(agent.tempdirectory)/cert.p12 -k $(agent.tempdirectory)/buildagent.keychain -P "$(macos-developer-certificate-key)" -T /usr/bin/codesign
+    security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k pwd $(agent.tempdirectory)/buildagent.keychain
+    codesign -s 99FM488X57 --deep --force --options runtime --entitlements build/azure-pipelines/darwin/entitlements.plist $(agent.builddirectory)/VSCode-darwin/*.app
+  displayName: Set Hardened Entitlements
+
+- script: |
+    set -e
+    pushd $(agent.builddirectory)/VSCode-darwin && zip -r -X -y $(agent.builddirectory)/VSCode-darwin.zip * && popd
   displayName: Archive build
 
 - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
@@ -151,14 +196,61 @@ steps:
         {
           "keyCode": "CP-401337-Apple",
           "operationSetCode": "MacAppDeveloperSign",
-          "parameters": [ ],
+          "parameters": [
+            {
+              "parameterName": "Hardening",
+              "parameterValue": "--options=runtime"
+            }
+          ],
           "toolName": "sign",
           "toolVersion": "1.0"
         }
       ]
-    SessionTimeout: 120
+    SessionTimeout: 60
   displayName: Codesign
 
+- script: |
+    zip -d $(agent.builddirectory)/VSCode-darwin.zip "*.pkg"
+  displayName: Clean Archive
+
+- script: |
+    set -e
+    AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
+    AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
+    node build/azure-pipelines/common/createAsset.js darwin-unnotarized archive "VSCode-darwin-$VSCODE_QUALITY.zip" $(agent.builddirectory)/VSCode-darwin.zip
+  displayName: Publish Unnotarized Build
+
+- script: |
+    APP_ROOT=$(agent.builddirectory)/VSCode-darwin
+    APP_NAME="`ls $APP_ROOT | head -n 1`"
+    BUNDLE_IDENTIFIER=$(node -p "require(\"$APP_ROOT/$APP_NAME/Contents/Resources/app/product.json\").darwinBundleIdentifier")
+    echo "##vso[task.setvariable variable=BundleIdentifier]$BUNDLE_IDENTIFIER"
+  displayName: Export bundle identifier
+
+- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+  inputs:
+    ConnectedServiceName: 'ESRP CodeSign'
+    FolderPath: '$(agent.builddirectory)'
+    Pattern: 'VSCode-darwin.zip'
+    signConfigType: inlineSignParams
+    inlineOperation: |
+      [
+        {
+          "keyCode": "CP-401337-Apple",
+          "operationSetCode": "MacAppNotarize",
+          "parameters": [
+            {
+              "parameterName": "BundleId",
+              "parameterValue": "$(BundleIdentifier)"
+            }
+          ],
+          "toolName": "sign",
+          "toolVersion": "1.0"
+        }
+      ]
+    SessionTimeout: 60
+  displayName: Notarization
+
 - script: |
     set -e
     VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \

build/azure-pipelines/darwin/publish.sh

@@ -1,9 +1,6 @@
 #!/usr/bin/env bash
 set -e
 
-# remove pkg from archive
-zip -d ../VSCode-darwin.zip "*.pkg"
-
 # publish the build
 node build/azure-pipelines/common/createAsset.js \
 	darwin \
@@ -22,7 +19,9 @@ node build/azure-pipelines/common/createAsset.js \
 	../vscode-server-darwin.zip
 
 # publish hockeyapp symbols
-node build/azure-pipelines/common/symbols.js "$VSCODE_MIXIN_PASSWORD" "$VSCODE_HOCKEYAPP_TOKEN" x64 "$VSCODE_HOCKEYAPP_ID_MACOS"
+# node build/azure-pipelines/common/symbols.js "$VSCODE_MIXIN_PASSWORD" "$VSCODE_HOCKEYAPP_TOKEN" x64 "$VSCODE_HOCKEYAPP_ID_MACOS"
+# Skip hockey app because build failure.
+# https://github.com/microsoft/vscode/issues/90491
 
 # upload configuration
 yarn gulp upload-vscode-configuration

build/azure-pipelines/darwin/sql-product-build-darwin.yml

@@ -1,4 +1,10 @@
 steps:
+  - task: InstallAppleCertificate@2
+    displayName: 'Install developer certificate'
+    inputs:
+      certSecureFile: 'osx_signing_key.p12'
+    condition: eq(variables['signed'], true)
+
   - script: |
       mkdir -p .build
       echo -n $BUILD_SOURCEVERSION > .build/commit
@@ -86,11 +92,6 @@ steps:
       node build/azure-pipelines/mixin
     displayName: Mix in quality
 
-  - script: |
-      set -e
-      yarn gulp install-sqltoolsservice
-    displayName: Install sqltoolsservice
-
   - script: |
       set -e
       yarn gulp package-rebuild-extensions
@@ -107,12 +108,64 @@ steps:
     displayName: Run unit tests
     condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
 
+  - script: |
+      set -e
+      APP_ROOT=$(agent.builddirectory)/azuredatastudio-darwin
+      APP_NAME="`ls $APP_ROOT | head -n 1`"
+      yarn smoketest --build "$APP_ROOT/$APP_NAME" --screenshots "$(build.artifactstagingdirectory)/smokeshots"
+    displayName: Run smoke tests (Electron)
+    condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+
+  - script: |
+      set -e
+      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/azuredatastudio-reh-web-darwin" \
+      yarn smoketest --web --headless  --screenshots "$(build.artifactstagingdirectory)/smokeshots"
+    displayName: Run smoke tests (Browser)
+    condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+
+  - script: |
+      set -e
+      pushd ../azuredatastudio-darwin
+      ls
+
+      echo "Cleaning the application"
+      xattr -cr *.app
+      cd *.app
+      find . -name '._*' -print0 | xargs -0 rm -rf --
+      cd ..
+
+      echo "Signing the application with deep"
+      codesign --deep --force --timestamp --options runtime --entitlements $(Build.SourcesDirectory)/build/azure-pipelines/darwin/entitlements.xml -s LPV3BJJYXS *.app
+
+      cd *.app
+      ls
+      echo "Signing specific components"
+      find . -type f -print0 | xargs -0 file | grep ':  *Mach-O' | sed 's/:  *Mach-O.*//' | while read -r file; do codesign --options runtime --timestamp --entitlements $(Build.SourcesDirectory)/build/azure-pipelines/darwin/entitlements.xml -s LPV3BJJYXS --force "$file" || break; done
+
+      echo "Signing Electron again..."
+      codesign --force --timestamp --options runtime --entitlements $(Build.SourcesDirectory)/build/azure-pipelines/darwin/entitlements.xml -s LPV3BJJYXS Contents/Frameworks/Electron\ Framework.framework
+      cd ..
+
+      echo "Signing the entire application one more time"
+      codesign --force --timestamp --options runtime --entitlements $(Build.SourcesDirectory)/build/azure-pipelines/darwin/entitlements.xml -s LPV3BJJYXS *.app
+      popd
+    displayName: 'Manual codesign'
+    condition: and(succeeded(), eq(variables['signed'], true))
+
   - script: |
       set -e
       mkdir -p .build/darwin/archive
-      pushd ../azuredatastudio-darwin && zip -r -X -y $(Build.SourcesDirectory)/.build/darwin/archive/azuredatastudio-darwin.zip * && popd
+      pushd ../azuredatastudio-darwin
+      ditto -c -k --keepParent *.app $(Build.SourcesDirectory)/.build/darwin/archive/azuredatastudio-darwin.zip
+      popd
     displayName: 'Archive'
 
+  - task: PublishPipelineArtifact@0
+    displayName: 'Publish SelfSigned'
+    inputs:
+      artifactName: darwin-selfsigned
+      targetPath: $(Build.SourcesDirectory)/.build/darwin/archive/azuredatastudio-darwin.zip
+
   - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
     displayName: 'ESRP CodeSigning'
     inputs:
@@ -124,13 +177,56 @@ steps:
         [
           {
             "keyCode": "CP-401337-Apple",
-            "operationSetCode": "MacAppDeveloperSign",
-            "parameters": [],
+            "operationCode": "MacAppDeveloperSign",
+            "parameters": {
+              "Hardening": "Enable"
+            },
             "toolName": "sign",
             "toolVersion": "1.0"
           }
         ]
-      SessionTimeout: 125
+      SessionTimeout: 90
+    condition: and(succeeded(), eq(variables['signed'], true))
+
+  - script: |
+      zip -d $(Build.SourcesDirectory)/.build/darwin/archive/azuredatastudio-darwin.zip "*.pkg"
+    displayName: Clean Archive
+    condition: and(succeeded(), eq(variables['signed'], true))
+
+  - task: PublishPipelineArtifact@0
+    displayName: 'Publish Signed'
+    inputs:
+      artifactName: darwin-signed
+      targetPath: $(Build.SourcesDirectory)/.build/darwin/archive/azuredatastudio-darwin.zip
+    condition: and(succeeded(), eq(variables['signed'], true))
+
+  - task: EsrpCodeSigning@1
+    displayName: 'ESRP Notarization'
+    inputs:
+      ConnectedServiceName: 'Code Signing'
+      FolderPath: '$(Build.SourcesDirectory)/.build/darwin/archive'
+      Pattern: 'azuredatastudio-darwin.zip'
+      signConfigType: inlineSignParams
+      inlineOperation: |
+        [
+          {
+            "KeyCode": "CP-401337-Apple",
+            "OperationCode": "MacAppNotarize",
+            "Parameters": {
+              "BundleId": "com.microsoft.azuredatastudio-$(VSCODE_QUALITY)"
+            },
+            "ToolName": "sign",
+            "ToolVersion": "1.0"
+          }
+        ]
+      SessionTimeout: 120
+    condition: and(succeeded(), eq(variables['signed'], true))
+
+  - task: PublishPipelineArtifact@0
+    displayName: 'Publish Notarized'
+    inputs:
+      artifactName: darwin-notarized
+      targetPath: $(Build.SourcesDirectory)/.build/darwin/archive/azuredatastudio-darwin.zip
     condition: and(succeeded(), eq(variables['signed'], true))
 
   - script: |
@@ -149,14 +245,6 @@ steps:
     continueOnError: true
     condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
 
-  - task: PublishTestResults@2
-    displayName: 'Publish Integration and Smoke Test Results'
-    inputs:
-      testResultsFiles: 'dawin-integration-tests-results.xml'
-      searchFolder: '$(Build.ArtifactStagingDirectory)\test-results'
-    continueOnError: true
-    condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
-
   - task: PublishCodeCoverageResults@1
     displayName: 'Publish code coverage from $(Build.SourcesDirectory)/.build/coverage/cobertura-coverage.xml'
     inputs:

build/azure-pipelines/docker/createDrop.sh

@@ -0,0 +1,13 @@
+set -e
+REPO="$(pwd)"
+ROOT="$REPO/.."
+
+PLATFORM_LINUX="linux-x64"
+SERVER_BUILD_NAME="azuredatastudio-server-$PLATFORM_LINUX"
+
+# create docker
+mkdir -p $REPO/.build/docker
+docker build -t azuredatastudio-server -f $REPO/build/azure-pipelines/docker/Dockerfile $ROOT/$SERVER_BUILD_NAME
+docker save azuredatastudio-server | gzip > $REPO/.build/docker/azuredatastudio-server-docker.tar.gz
+
+node build/azure-pipelines/common/copyArtifacts.js

build/azure-pipelines/docker/sql-product-build-docker.yml

@@ -0,0 +1,96 @@
+steps:
+  - task: NodeTool@0
+    inputs:
+      versionSpec: '10.15.1'
+
+  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
+    inputs:
+      versionSpec: "1.x"
+
+  - task: AzureKeyVault@1
+    displayName: 'Azure Key Vault: Get Secrets'
+    inputs:
+      azureSubscription: 'ClientToolsInfra_670062 (88d5392f-a34f-4769-b405-f597fc533613)'
+      KeyVaultName: ado-secrets
+      SecretsFilter: 'github-distro-mixin-password'
+
+  - script: |
+      set -e
+      cat << EOF > ~/.netrc
+      machine github.com
+      login azuredatastudio
+      password $(github-distro-mixin-password)
+      EOF
+
+      git config user.email "andresse@microsoft.com"
+      git config user.name "AzureDataStudio"
+    displayName: Prepare tooling
+
+  - script: |
+      set -e
+      git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
+      git fetch distro
+      git merge $(node -p "require('./package.json').distro")
+    displayName: Merge distro
+
+  - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
+    inputs:
+      keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock, !samples/**/yarn.lock'
+      targetfolder: '**/node_modules, !**/node_modules/**/node_modules, !samples/**/node_modules'
+      vstsFeed: 'BuildCache'
+
+  - script: |
+      set -e
+      CHILD_CONCURRENCY=1 yarn --frozen-lockfile
+    displayName: Install dependencies
+    env:
+      GITHUB_TOKEN: $(github-distro-mixin-password)
+    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
+
+  - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
+    inputs:
+      keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock, !samples/**/yarn.lock'
+      targetfolder: '**/node_modules, !**/node_modules/**/node_modules, !samples/**/node_modules'
+      vstsFeed: 'BuildCache'
+    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
+
+  - script: |
+      set -e
+      yarn postinstall
+    displayName: Run postinstall scripts
+    condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
+
+  - script: |
+      set -e
+      node build/azure-pipelines/mixin
+    displayName: Mix in quality
+
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      buildType: 'current'
+      targetPath: '$(Build.SourcesDirectory)/.build'
+      artifactName: drop
+      itemPattern: |
+        drop/linux/server/*.tar.gz
+
+  - script: |
+      set -e
+      for f in $(Build.SourcesDirectory)/.build/linux/server/*.tar.gz
+      do
+        tar -C $(agent.builddirectory) -zxvf $f
+        rm $f
+      done
+    displayName: Unzip artifacts
+
+  - script: |
+      set -e
+      ./build/azure-pipelines/docker/createDrop.sh
+    displayName: Create Drop
+
+  - task: PublishBuildArtifacts@1
+    displayName: 'Publish Artifact: drop'
+
+  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
+    displayName: 'Component Detection'
+    inputs:
+      failOnAlert: true

build/azure-pipelines/linux/continuous-build-linux.yml

@@ -51,10 +51,13 @@ steps:
 #   displayName: Download Built-in Extensions
 - script: |
     DISPLAY=:10 ./scripts/test.sh --tfs "Unit Tests"
-  displayName: Run Unit Tests
+  displayName: Run Unit Tests (Electron)
+# - script: | {{SQL CARBON EDIT}} disable for now @TODO @anthonydresser
+#     DISPLAY=:10 yarn test-browser --browser chromium
+#   displayName: Run Unit Tests (Browser)
 # - script: | {{SQL CARBON EDIT}} remove step
 #     DISPLAY=:10 ./scripts/test-integration.sh --tfs "Integration Tests"
-#   displayName: Run Integration Tests
+#   displayName: Run Integration Tests (Electron)
 - task: PublishTestResults@2
   displayName: Publish Tests Results
   inputs:

build/azure-pipelines/linux/createDrop.sh

@@ -29,9 +29,4 @@ SERVER_TARBALL_PATH="$REPO/.build/linux/server/$SERVER_TARBALL_FILENAME"
 rm -rf $ROOT/azuredatastudio-server-*.tar.*
 (cd $ROOT && mv $LEGACY_SERVER_BUILD_NAME $SERVER_BUILD_NAME && tar --owner=0 --group=0 -czf $SERVER_TARBALL_PATH $SERVER_BUILD_NAME)
 
-# create docker
-mkdir -p $REPO/.build/docker
-docker build -t azuredatastudio-server -f $REPO/build/azure-pipelines/docker/Dockerfile $ROOT/$SERVER_BUILD_NAME
-docker save azuredatastudio-server | gzip > $REPO/.build/docker/azuredatastudio-server-docker.tar.gz
-
 node build/azure-pipelines/common/copyArtifacts.js

build/azure-pipelines/linux/product-build-linux-multiarch.yml

@@ -86,6 +86,23 @@ steps:
     yarn postinstall
   displayName: Run postinstall scripts
   condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
+  env:
+    OSS_GITHUB_ID: "a5d3c261b032765a78de"
+    OSS_GITHUB_SECRET: $(oss-github-client-secret)
+    INSIDERS_GITHUB_ID: "31f02627809389d9f111"
+    INSIDERS_GITHUB_SECRET: $(insiders-github-client-secret)
+    STABLE_GITHUB_ID: "baa8a44b5e861d918709"
+    STABLE_GITHUB_SECRET: $(stable-github-client-secret)
+    EXPLORATION_GITHUB_ID: "94e8376d3a90429aeaea"
+    EXPLORATION_GITHUB_SECRET: $(exploration-github-client-secret)
+    VSO_GITHUB_ID: "3d4be8f37a0325b5817d"
+    VSO_GITHUB_SECRET: $(vso-github-client-secret)
+    VSO_PPE_GITHUB_ID: "eabf35024dc2e891a492"
+    VSO_PPE_GITHUB_SECRET: $(vso-ppe-github-client-secret)
+    VSO_DEV_GITHUB_ID: "84383ebd8a7c5f5efc5c"
+    VSO_DEV_GITHUB_SECRET: $(vso-dev-github-client-secret)
+    GITHUB_APP_ID: "Iv1.ae51e546bef24ff1"
+    GITHUB_APP_SECRET: $(github-app-client-secret)
 
 - script: |
     set -e

build/azure-pipelines/linux/product-build-linux.yml

@@ -76,6 +76,23 @@ steps:
     yarn postinstall
   displayName: Run postinstall scripts
   condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
+  env:
+    OSS_GITHUB_ID: "a5d3c261b032765a78de"
+    OSS_GITHUB_SECRET: $(oss-github-client-secret)
+    INSIDERS_GITHUB_ID: "31f02627809389d9f111"
+    INSIDERS_GITHUB_SECRET: $(insiders-github-client-secret)
+    STABLE_GITHUB_ID: "baa8a44b5e861d918709"
+    STABLE_GITHUB_SECRET: $(stable-github-client-secret)
+    EXPLORATION_GITHUB_ID: "94e8376d3a90429aeaea"
+    EXPLORATION_GITHUB_SECRET: $(exploration-github-client-secret)
+    VSO_GITHUB_ID: "3d4be8f37a0325b5817d"
+    VSO_GITHUB_SECRET: $(vso-github-client-secret)
+    VSO_PPE_GITHUB_ID: "eabf35024dc2e891a492"
+    VSO_PPE_GITHUB_SECRET: $(vso-ppe-github-client-secret)
+    VSO_DEV_GITHUB_ID: "84383ebd8a7c5f5efc5c"
+    VSO_DEV_GITHUB_SECRET: $(vso-dev-github-client-secret)
+    GITHUB_APP_ID: "Iv1.ae51e546bef24ff1"
+    GITHUB_APP_SECRET: $(github-app-client-secret)
 
 - script: |
     set -e
@@ -101,7 +118,13 @@ steps:
 - script: |
     set -e
     DISPLAY=:10 ./scripts/test.sh --build --tfs "Unit Tests"
-  displayName: Run unit tests
+  displayName: Run unit tests (Electron)
+  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+
+- script: |
+    set -e
+    DISPLAY=:10 yarn test-browser --build --browser chromium
+  displayName: Run unit tests (Browser)
   condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
 - script: |
@@ -114,8 +137,24 @@ steps:
     INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME" \
     VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-linux-x64" \
     DISPLAY=:10 ./scripts/test-integration.sh --build --tfs "Integration Tests"
-    # yarn smoketest -- --build "$(agent.builddirectory)/VSCode-linux-x64"
-  displayName: Run integration tests
+  displayName: Run integration tests (Electron)
+  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+
+- script: |
+    set -e
+    APP_ROOT=$(agent.builddirectory)/VSCode-linux-x64
+    APP_NAME=$(node -p "require(\"$APP_ROOT/resources/app/product.json\").applicationName")
+    INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME" \
+    VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-linux-x64" \
+    DISPLAY=:10 ./resources/server/test/test-remote-integration.sh
+  displayName: Run remote integration tests (Electron)
+  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+
+- script: |
+    set -e
+    VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-linux-x64" \
+    DISPLAY=:10 ./resources/server/test/test-web-integration.sh --browser chromium
+  displayName: Run integration tests (Browser)
   condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
 - script: |

build/azure-pipelines/linux/publish.sh

@@ -28,7 +28,9 @@ rm -rf $ROOT/vscode-server-*.tar.*
 node build/azure-pipelines/common/createAsset.js "server-$PLATFORM_LINUX" archive-unsigned "$SERVER_TARBALL_FILENAME" "$SERVER_TARBALL_PATH"
 
 # Publish hockeyapp symbols
-node build/azure-pipelines/common/symbols.js "$VSCODE_MIXIN_PASSWORD" "$VSCODE_HOCKEYAPP_TOKEN" "x64" "$VSCODE_HOCKEYAPP_ID_LINUX64"
+# node build/azure-pipelines/common/symbols.js "$VSCODE_MIXIN_PASSWORD" "$VSCODE_HOCKEYAPP_TOKEN" "x64" "$VSCODE_HOCKEYAPP_ID_LINUX64"
+# Skip hockey app because build failure.
+# https://github.com/microsoft/vscode/issues/90491
 
 # Publish DEB
 PLATFORM_DEB="linux-deb-x64"

build/azure-pipelines/linux/sql-product-build-linux.yml

@@ -85,12 +85,6 @@ steps:
       node build/azure-pipelines/mixin
     displayName: Mix in quality
 
-  - script: |
-      set -e
-      yarn gulp install-sqltoolsservice
-      yarn gulp install-ssmsmin
-    displayName: Install extension binaries
-
   - script: |
       set -e
       yarn gulp vscode-linux-x64-min-ci
@@ -147,24 +141,23 @@ steps:
       ./build/azure-pipelines/linux/createDrop.sh
     displayName: Create Drop
 
-  - task: PublishBuildArtifacts@1
-    displayName: 'Publish Artifact: drop'
+  - task: CopyFiles@2
+    displayName: 'Copy Extension Unit Test Coverage Files to: $(Build.ArtifactStagingDirectory)'
+    inputs:
+      SourceFolder: '$(Build.SourcesDirectory)/extensions'
+      Contents: '*/coverage/**'
+      TargetFolder: '$(Build.ArtifactStagingDirectory)/test-results/coverage'
 
   - task: PublishTestResults@2
     displayName: 'Publish Test Results test-results.xml'
     inputs:
-      testResultsFiles: 'test-results.xml'
-      searchFolder: '$(Build.SourcesDirectory)'
+      testResultsFiles: '*.xml'
+      searchFolder: '$(Build.ArtifactStagingDirectory)/test-results'
     continueOnError: true
     condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
 
-  - task: PublishCodeCoverageResults@1
-    displayName: 'Publish code coverage from $(Build.SourcesDirectory)/.build/coverage/cobertura-coverage.xml'
-    inputs:
-      codeCoverageTool: Cobertura
-      summaryFileLocation: '$(Build.SourcesDirectory)/.build/coverage/cobertura-coverage.xml'
-      reportDirectory: '$(Build.SourcesDirectory)/.build/coverage'
-    continueOnError: true
+  - task: PublishBuildArtifacts@1
+    displayName: 'Publish Artifact: drop'
 
   - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
     displayName: 'Component Detection'

build/azure-pipelines/linux/xvfb.init

@@ -19,7 +19,7 @@
 [ "${NETWORKING}" = "no" ] && exit 0
 
 PROG="/usr/bin/Xvfb"
-PROG_OPTIONS=":10 -ac"
+PROG_OPTIONS=":10 -ac -screen 0 1024x768x24"
 PROG_OUTPUT="/tmp/Xvfb.out"
 
 case "$1" in
@@ -50,4 +50,4 @@ case "$1" in
 		exit 1
 esac
 
-exit $RETVAL
+exit $RETVAL

build/azure-pipelines/product-compile.yml

@@ -77,6 +77,23 @@ steps:
     yarn postinstall
   displayName: Run postinstall scripts
   condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'), eq(variables['CacheRestored'], 'true'))
+  env:
+    OSS_GITHUB_ID: "a5d3c261b032765a78de"
+    OSS_GITHUB_SECRET: $(oss-github-client-secret)
+    INSIDERS_GITHUB_ID: "31f02627809389d9f111"
+    INSIDERS_GITHUB_SECRET: $(insiders-github-client-secret)
+    STABLE_GITHUB_ID: "baa8a44b5e861d918709"
+    STABLE_GITHUB_SECRET: $(stable-github-client-secret)
+    EXPLORATION_GITHUB_ID: "94e8376d3a90429aeaea"
+    EXPLORATION_GITHUB_SECRET: $(exploration-github-client-secret)
+    VSO_GITHUB_ID: "3d4be8f37a0325b5817d"
+    VSO_GITHUB_SECRET: $(vso-github-client-secret)
+    VSO_PPE_GITHUB_ID: "eabf35024dc2e891a492"
+    VSO_PPE_GITHUB_SECRET: $(vso-ppe-github-client-secret)
+    VSO_DEV_GITHUB_ID: "84383ebd8a7c5f5efc5c"
+    VSO_DEV_GITHUB_SECRET: $(vso-dev-github-client-secret)
+    GITHUB_APP_ID: "Iv1.ae51e546bef24ff1"
+    GITHUB_APP_SECRET: $(github-app-client-secret)
 
 # Mixin must run before optimize, because the CSS loader will
 # inline small SVGs

build/azure-pipelines/sql-product-build.yml

@@ -10,6 +10,10 @@ jobs:
     vmImage: 'Ubuntu-16.04'
   container: linux-x64
   steps:
+  - script: |
+      set -e
+      echo "##vso[build.addbuildtag]$(VSCODE_QUALITY)"
+    displayName: Add Quality Build Tag
   - template: sql-product-compile.yml
 
 - job: macOS
@@ -31,6 +35,17 @@ jobs:
   - Compile
   steps:
   - template: linux/sql-product-build-linux.yml
+  timeoutInMinutes: 70
+
+- job: Docker
+  condition: eq(variables['VSCODE_BUILD_DOCKER'], 'true')
+  pool:
+    vmImage: 'Ubuntu-16.04'
+  container: linux-x64
+  dependsOn:
+  - Linux
+  steps:
+  - template: docker/sql-product-build-docker.yml
 
 - job: Windows
   condition: eq(variables['VSCODE_BUILD_WIN32'], 'true')
@@ -40,6 +55,7 @@ jobs:
   - Compile
   steps:
   - template: win32/sql-product-build-win32.yml
+  timeoutInMinutes: 70
 
 - job: Windows_Test
   condition: and(succeeded(), eq(variables['VSCODE_BUILD_WIN32'], 'true'))
@@ -58,6 +74,7 @@ jobs:
   dependsOn:
   - macOS
   - Linux
+  - Docker
   - Windows
   - Windows_Test
   steps:

build/azure-pipelines/sql-product-compile.yml

@@ -87,10 +87,11 @@ steps:
 
 - script: |
     set -e
+    yarn sqllint
     yarn gulp hygiene
     yarn strict-vscode
     yarn valid-layers-check
-  displayName: Run hygiene, tslint
+  displayName: Run hygiene, eslint
   condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
 - script: |

build/azure-pipelines/win32/ESRPClient/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="EsrpClient" version="1.0.27" />
+  <package id="Microsoft.ESRPClient" version="1.2.25" />
 </packages>

build/azure-pipelines/win32/continuous-build-win32.yml

@@ -48,10 +48,13 @@ steps:
 #   displayName: Download Built-in Extensions
 - powershell: |
     .\scripts\test.bat --tfs "Unit Tests"
-  displayName: Run Unit Tests
+  displayName: Run Unit Tests (Electron)
+# - powershell: | {{SQL CARBON EDIT}} disable for now @TODO @anthonydresser
+#     yarn test-browser --browser chromium
+#   displayName: Run Unit Tests (Browser)
 # - powershell: | {{SQL CARBON EDIT}} remove step
 #     .\scripts\test-integration.bat --tfs "Integration Tests"
-#   displayName: Run Integration Tests
+#   displayName: Run Integration Tests (Electron)
 - task: PublishTestResults@2
   displayName: Publish Tests Results
   inputs:

build/azure-pipelines/win32/product-build-win32.yml

@@ -86,6 +86,23 @@ steps:
     exec { yarn postinstall }
   displayName: Run postinstall scripts
   condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
+  env:
+    OSS_GITHUB_ID: "a5d3c261b032765a78de"
+    OSS_GITHUB_SECRET: $(oss-github-client-secret)
+    INSIDERS_GITHUB_ID: "31f02627809389d9f111"
+    INSIDERS_GITHUB_SECRET: $(insiders-github-client-secret)
+    STABLE_GITHUB_ID: "baa8a44b5e861d918709"
+    STABLE_GITHUB_SECRET: $(stable-github-client-secret)
+    EXPLORATION_GITHUB_ID: "94e8376d3a90429aeaea"
+    EXPLORATION_GITHUB_SECRET: $(exploration-github-client-secret)
+    VSO_GITHUB_ID: "3d4be8f37a0325b5817d"
+    VSO_GITHUB_SECRET: $(vso-github-client-secret)
+    VSO_PPE_GITHUB_ID: "eabf35024dc2e891a492"
+    VSO_PPE_GITHUB_SECRET: $(vso-ppe-github-client-secret)
+    VSO_DEV_GITHUB_ID: "84383ebd8a7c5f5efc5c"
+    VSO_DEV_GITHUB_SECRET: $(vso-dev-github-client-secret)
+    GITHUB_APP_ID: "Iv1.ae51e546bef24ff1"
+    GITHUB_APP_SECRET: $(github-app-client-secret)
 
 - powershell: |
     . build/azure-pipelines/win32/exec.ps1
@@ -109,7 +126,14 @@ steps:
     $ErrorActionPreference = "Stop"
     exec { yarn electron $(VSCODE_ARCH) }
     exec { .\scripts\test.bat --build --tfs "Unit Tests" }
-  displayName: Run unit tests
+  displayName: Run unit tests (Electron)
+  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+
+- powershell: |
+    . build/azure-pipelines/win32/exec.ps1
+    $ErrorActionPreference = "Stop"
+    exec { yarn test-browser --build --browser chromium }
+  displayName: Run unit tests (Browser)
   condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
 - powershell: |
@@ -122,7 +146,24 @@ steps:
     $AppProductJson = Get-Content -Raw -Path "$AppRoot\resources\app\product.json" | ConvertFrom-Json
     $AppNameShort = $AppProductJson.nameShort
     exec { $env:INTEGRATION_TEST_ELECTRON_PATH = "$AppRoot\$AppNameShort.exe"; $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-win32-$(VSCODE_ARCH)"; .\scripts\test-integration.bat --build --tfs "Integration Tests" }
-  displayName: Run integration tests
+  displayName: Run integration tests (Electron)
+  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+
+- powershell: |
+    . build/azure-pipelines/win32/exec.ps1
+    $ErrorActionPreference = "Stop"
+    $AppRoot = "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"
+    $AppProductJson = Get-Content -Raw -Path "$AppRoot\resources\app\product.json" | ConvertFrom-Json
+    $AppNameShort = $AppProductJson.nameShort
+    exec { $env:INTEGRATION_TEST_ELECTRON_PATH = "$AppRoot\$AppNameShort.exe"; $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-win32-$(VSCODE_ARCH)"; .\resources\server\test\test-remote-integration.bat }
+  displayName: Run remote integration tests (Electron)
+  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+
+- powershell: |
+    . build/azure-pipelines/win32/exec.ps1
+    $ErrorActionPreference = "Stop"
+    exec { $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-web-win32-$(VSCODE_ARCH)"; .\resources\server\test\test-web-integration.bat --browser firefox }
+  displayName: Run integration tests (Browser)
   condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
 - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1

build/azure-pipelines/win32/publish.ps1

@@ -11,13 +11,12 @@ $SystemExe = "$Repo\.build\win32-$Arch\system-setup\VSCodeSetup.exe"
 $UserExe = "$Repo\.build\win32-$Arch\user-setup\VSCodeSetup.exe"
 $Zip = "$Repo\.build\win32-$Arch\archive\VSCode-win32-$Arch.zip"
 $LegacyServer = "$Root\vscode-reh-win32-$Arch"
-$ServerName = "vscode-server-win32-$Arch"
-$Server = "$Root\$ServerName"
+$Server = "$Root\vscode-server-win32-$Arch"
 $ServerZip = "$Repo\.build\vscode-server-win32-$Arch.zip"
 $Build = "$Root\VSCode-win32-$Arch"
 
 # Create server archive
-exec { Rename-Item -Path $LegacyServer -NewName $ServerName }
+exec { xcopy $LegacyServer $Server /H /E /I }
 exec { .\node_modules\7zip\7zip-lite\7z.exe a -tzip $ServerZip $Server -r }
 
 # get version
@@ -31,6 +30,8 @@ exec { node build/azure-pipelines/common/createAsset.js "$AssetPlatform" setup "
 exec { node build/azure-pipelines/common/createAsset.js "$AssetPlatform-user" setup "VSCodeUserSetup-$Arch-$Version.exe" $UserExe }
 exec { node build/azure-pipelines/common/createAsset.js "server-$AssetPlatform" archive "vscode-server-win32-$Arch.zip" $ServerZip }
 
+# Skip hockey app because build failure.
+# https://github.com/microsoft/vscode/issues/90491
 # publish hockeyapp symbols
-$hockeyAppId = if ("$Arch" -eq "ia32") { "$env:VSCODE_HOCKEYAPP_ID_WIN32" } else { "$env:VSCODE_HOCKEYAPP_ID_WIN64" }
-exec { node build/azure-pipelines/common/symbols.js "$env:VSCODE_MIXIN_PASSWORD" "$env:VSCODE_HOCKEYAPP_TOKEN" "$Arch" $hockeyAppId }
+# $hockeyAppId = if ("$Arch" -eq "ia32") { "$env:VSCODE_HOCKEYAPP_ID_WIN32" } else { "$env:VSCODE_HOCKEYAPP_ID_WIN64" }
+# exec { node build/azure-pipelines/common/symbols.js "$env:VSCODE_MIXIN_PASSWORD" "$env:VSCODE_HOCKEYAPP_TOKEN" "$Arch" $hockeyAppId }

build/azure-pipelines/win32/sign.ps1

@@ -67,4 +67,4 @@ $Input = Create-TmpJson @{
 
 $Output = [System.IO.Path]::GetTempFileName()
 $ScriptPath = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
-& "$ScriptPath\ESRPClient\packages\EsrpClient.1.0.27\tools\ESRPClient.exe" Sign -a $Auth -p $Policy -i $Input -o $Output
+& "$ScriptPath\ESRPClient\packages\Microsoft.ESRPClient.1.2.25\tools\ESRPClient.exe" Sign -a $Auth -p $Policy -i $Input -o $Output

build/azure-pipelines/win32/sql-product-build-win32.yml

@@ -90,12 +90,6 @@ steps:
       exec { node build/azure-pipelines/mixin }
     displayName: Mix in quality
 
-  - powershell: |
-      . build/azure-pipelines/win32/exec.ps1
-      $ErrorActionPreference = "Stop"
-      exec { yarn gulp "install-sqltoolsservice" }
-    displayName: Install sqltoolsservice
-
   - powershell: |
       . build/azure-pipelines/win32/exec.ps1
       $ErrorActionPreference = "Stop"
@@ -103,6 +97,8 @@ steps:
       exec { yarn gulp "vscode-win32-x64-min-ci" }
       exec { yarn gulp "vscode-reh-win32-x64-min-ci" }
       exec { yarn gulp "vscode-reh-web-win32-x64-min-ci" }
+      exec { yarn gulp "vscode-win32-x64-code-helper" }
+      exec { yarn gulp "vscode-win32-x64-inno-updater" }
     displayName: Build
     env:
       VSCODE_MIXIN_PASSWORD: $(github-distro-mixin-password)
@@ -110,7 +106,7 @@ steps:
   - powershell: |
       . build/azure-pipelines/win32/exec.ps1
       $ErrorActionPreference = "Stop"
-      exec { .\scripts\test-unstable.bat --build --coverage --reporter mocha-junit-reporter }
+      exec { .\scripts\test-unstable.bat --build --tfs }
     continueOnError: true
     condition: and(succeeded(), eq(variables['RUN_UNSTABLE_TESTS'], 'true'))
     displayName: Run unstable tests

build/azure-pipelines/win32/sql-product-test-win32.yml

@@ -19,6 +19,9 @@ steps:
     buildType: 'current'
     targetPath: '$(Build.SourcesDirectory)\.build'
     artifactName: drop
+    itemPattern: |
+     drop/extensions/**
+     drop/win32-x64/**
 
 - powershell: |
     . build/azure-pipelines/win32/exec.ps1
@@ -47,7 +50,7 @@ steps:
     $AppProductJson = Get-Content -Raw -Path "$AppRoot\resources\app\product.json" | ConvertFrom-Json
     $AppNameShort = $AppProductJson.nameShort
     exec { $env:INTEGRATION_TEST_ELECTRON_PATH = "$AppRoot\$AppNameShort.exe"; $env:INTEGRATION_TEST_CLI_PATH = "$AppRoot\bin\$AppNameShort"; .\scripts\sql-test-integration.bat }
-  continueOnError: true
+  continueOnError: false
   condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
   displayName: Run stable tests
   env:

build/builtInExtensions.json

@@ -1,7 +0,0 @@
-[
-	{
-		"name": "Microsoft.sqlservernotebook",
-		"version": "0.3.4",
-		"repo": "https://github.com/Microsoft/azuredatastudio"
-	}
-]

build/builtin/browser-main.js

@@ -6,12 +6,10 @@
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
-// @ts-ignore review
 const { remote } = require('electron');
 const dialog = remote.dialog;
 
-const productJsonPath = path.join(__dirname, '..', '..', 'product.json');
-const builtInExtensionsPath = path.join(__dirname, '..', 'builtInExtensions.json');
+const builtInExtensionsPath = path.join(__dirname, '..', '..', 'product.json');
 const controlFilePath = path.join(os.homedir(), '.vscode-oss-dev', 'extensions', 'control.json');
 
 function readJson(filePath) {
@@ -52,7 +50,6 @@ function render(el, state) {
 	}
 
 	const ul = document.createElement('ul');
-	const { quality } = readJson(productJsonPath);
 	const { builtin, control } = state;
 
 	for (const ext of builtin) {
@@ -63,10 +60,6 @@ function render(el, state) {
 
 		const name = document.createElement('code');
 		name.textContent = ext.name;
-		if (quality && ext.forQualities && !ext.forQualities.includes(quality)) {
-			name.textContent += ` (only on ${ext.forQualities.join(', ')})`;
-		}
-
 		li.appendChild(name);
 
 		const form = document.createElement('form');
@@ -117,7 +110,7 @@ function render(el, state) {
 
 function main() {
 	const el = document.getElementById('extensions');
-	const builtin = readJson(builtInExtensionsPath);
+	const builtin = readJson(builtInExtensionsPath).builtInExtensions;
 	let control;
 
 	try {

build/gulpfile.editor.js

@@ -16,6 +16,8 @@ const cp = require('child_process');
 const compilation = require('./lib/compilation');
 const monacoapi = require('./monaco/api');
 const fs = require('fs');
+const webpack = require('webpack');
+const webpackGulp = require('webpack-stream');
 
 let root = path.dirname(__dirname);
 let sha1 = util.getVersion(root);
@@ -70,13 +72,8 @@ const extractEditorSrcTask = task.define('extract-editor-src', () => {
 			apiusages,
 			extrausages
 		],
-		libs: [
-			`lib.es5.d.ts`,
-			`lib.dom.d.ts`,
-			`lib.webworker.importscripts.d.ts`
-		],
 		shakeLevel: 2, // 0-Files, 1-InnerFile, 2-ClassMembers
-		importIgnorePattern: /(^vs\/css!)|(promise-polyfill\/polyfill)/,
+		importIgnorePattern: /(^vs\/css!)/,
 		destRoot: path.join(root, 'out-editor-src'),
 		redirects: []
 	});
@@ -129,6 +126,7 @@ const createESMSourcesAndResourcesTask = task.define('extract-editor-esm', () =>
 });
 
 const compileEditorESMTask = task.define('compile-editor-esm', () => {
+	const KEEP_PREV_ANALYSIS = false;
 	console.log(`Launching the TS compiler at ${path.join(__dirname, '../out-editor-esm')}...`);
 	let result;
 	if (process.platform === 'win32') {
@@ -147,41 +145,45 @@ const compileEditorESMTask = task.define('compile-editor-esm', () => {
 	if (result.status !== 0) {
 		console.log(`The TS Compilation failed, preparing analysis folder...`);
 		const destPath = path.join(__dirname, '../../vscode-monaco-editor-esm-analysis');
-		return util.rimraf(destPath)().then(() => {
-			fs.mkdirSync(destPath);
-
-			// initialize a new repository
-			cp.spawnSync(`git`, [`init`], {
-				cwd: destPath
-			});
-
+		const keepPrevAnalysis = (KEEP_PREV_ANALYSIS && fs.existsSync(destPath));
+		const cleanDestPath = (keepPrevAnalysis ? Promise.resolve() : util.rimraf(destPath)());
+		return cleanDestPath.then(() => {
 			// build a list of files to copy
 			const files = util.rreddir(path.join(__dirname, '../out-editor-esm'));
 
-			// copy files from src
-			for (const file of files) {
-				const srcFilePath = path.join(__dirname, '../src', file);
-				const dstFilePath = path.join(destPath, file);
-				if (fs.existsSync(srcFilePath)) {
-					util.ensureDir(path.dirname(dstFilePath));
-					const contents = fs.readFileSync(srcFilePath).toString().replace(/\r\n|\r|\n/g, '\n');
-					fs.writeFileSync(dstFilePath, contents);
+			if (!keepPrevAnalysis) {
+				fs.mkdirSync(destPath);
+
+				// initialize a new repository
+				cp.spawnSync(`git`, [`init`], {
+					cwd: destPath
+				});
+
+				// copy files from src
+				for (const file of files) {
+					const srcFilePath = path.join(__dirname, '../src', file);
+					const dstFilePath = path.join(destPath, file);
+					if (fs.existsSync(srcFilePath)) {
+						util.ensureDir(path.dirname(dstFilePath));
+						const contents = fs.readFileSync(srcFilePath).toString().replace(/\r\n|\r|\n/g, '\n');
+						fs.writeFileSync(dstFilePath, contents);
+					}
 				}
+
+				// create an initial commit to diff against
+				cp.spawnSync(`git`, [`add`, `.`], {
+					cwd: destPath
+				});
+
+				// create the commit
+				cp.spawnSync(`git`, [`commit`, `-m`, `"original sources"`, `--no-gpg-sign`], {
+					cwd: destPath
+				});
 			}
 
-			// create an initial commit to diff against
-			cp.spawnSync(`git`, [`add`, `.`], {
-				cwd: destPath
-			});
-
-			// create the commit
-			cp.spawnSync(`git`, [`commit`, `-m`, `"original sources"`, `--no-gpg-sign`], {
-				cwd: destPath
-			});
-
-			// copy files from esm
+			// copy files from tree shaken src
 			for (const file of files) {
-				const srcFilePath = path.join(__dirname, '../out-editor-esm', file);
+				const srcFilePath = path.join(__dirname, '../out-editor-src', file);
 				const dstFilePath = path.join(destPath, file);
 				if (fs.existsSync(srcFilePath)) {
 					util.ensureDir(path.dirname(dstFilePath));
@@ -227,8 +229,13 @@ function toExternalDTS(contents) {
 		if (line.indexOf('declare namespace monaco.') === 0) {
 			lines[i] = line.replace('declare namespace monaco.', 'export namespace ');
 		}
+
+		if (line.indexOf('declare let MonacoEnvironment') === 0) {
+			lines[i] = `declare global {\n    let MonacoEnvironment: Environment | undefined;\n}`;
+			// lines[i] = line.replace('declare namespace monaco.', 'export namespace ');
+		}
 	}
-	return lines.join('\n');
+	return lines.join('\n').replace(/\n\n\n+/g, '\n\n');
 }
 
 function filterStream(testFunc) {
@@ -327,6 +334,13 @@ const finalEditorResourcesTask = task.define('final-editor-resources', () => {
 	);
 });
 
+gulp.task('extract-editor-src',
+	task.series(
+		util.rimraf('out-editor-src'),
+		extractEditorSrcTask
+	)
+);
+
 gulp.task('editor-distro',
 	task.series(
 		task.parallel(
@@ -353,6 +367,49 @@ gulp.task('editor-distro',
 	)
 );
 
+const bundleEditorESMTask = task.define('editor-esm-bundle-webpack', () => {
+	const result = es.through();
+
+	const webpackConfigPath = path.join(root, 'build/monaco/monaco.webpack.config.js');
+
+	const webpackConfig = {
+		...require(webpackConfigPath),
+		...{ mode: 'production' }
+	};
+
+	const webpackDone = (err, stats) => {
+		if (err) {
+			result.emit('error', err);
+			return;
+		}
+		const { compilation } = stats;
+		if (compilation.errors.length > 0) {
+			result.emit('error', compilation.errors.join('\n'));
+		}
+		if (compilation.warnings.length > 0) {
+			result.emit('data', compilation.warnings.join('\n'));
+		}
+	};
+
+	return webpackGulp(webpackConfig, webpack, webpackDone)
+		.pipe(gulp.dest('out-editor-esm-bundle'));
+});
+
+gulp.task('editor-esm-bundle',
+	task.series(
+		task.parallel(
+			util.rimraf('out-editor-src'),
+			util.rimraf('out-editor-esm'),
+			util.rimraf('out-monaco-editor-core'),
+			util.rimraf('out-editor-esm-bundle'),
+		),
+		extractEditorSrcTask,
+		createESMSourcesAndResourcesTask,
+		compileEditorESMTask,
+		bundleEditorESMTask,
+	)
+);
+
 gulp.task('monacodts', task.define('monacodts', () => {
 	const result = monacoapi.execute();
 	fs.writeFileSync(result.filePath, result.content);
@@ -398,10 +455,8 @@ function createTscCompileTask(watch) {
 						// e.g. src/vs/base/common/strings.ts(663,5): error TS2322: Type '1234' is not assignable to type 'string'.
 						let fullpath = path.join(root, match[1]);
 						let message = match[3];
-						// @ts-ignore
 						reporter(fullpath + message);
 					} else {
-						// @ts-ignore
 						reporter(str);
 					}
 				}

build/gulpfile.hygiene.js

@@ -33,7 +33,9 @@ const all = [
 	'scripts/**/*',
 	'src/**/*',
 	'test/**/*',
-	'!**/node_modules/**'
+	'!test/**/out/**',
+	'!**/node_modules/**',
+	'!build/actions/**/dist/*' // {{ SQL CARBON EDIT }}
 ];
 
 const indentationFilter = [
@@ -53,8 +55,7 @@ const indentationFilter = [
 	'!src/vs/base/common/marked/marked.js',
 	'!src/vs/base/node/terminateProcess.sh',
 	'!src/vs/base/node/cpuUsage.sh',
-	'!test/assert.js',
-	'!build/testSetup.js',
+	'!test/unit/assert.js',
 
 	// except specific folders
 	'!test/automation/out/**',
@@ -84,7 +85,7 @@ const indentationFilter = [
 	'!src/vs/*/**/*.d.ts',
 	'!src/typings/**/*.d.ts',
 	'!extensions/**/*.d.ts',
-	'!**/*.{svg,exe,png,bmp,scpt,bat,cmd,cur,ttf,woff,eot,md,ps1,template,yaml,yml,d.ts.recipe,ico,icns}',
+	'!**/*.{svg,exe,png,bmp,scpt,bat,cmd,cur,ttf,woff,eot,md,ps1,template,yaml,yml,d.ts.recipe,ico,icns,plist}',
 	'!build/{lib,download}/**/*.js',
 	'!build/**/*.sh',
 	'!build/azure-pipelines/**/*.js',
@@ -95,7 +96,8 @@ const indentationFilter = [
 	'!**/*.dockerfile',
 	'!extensions/markdown-language-features/media/*.js',
 	// {{SQL CARBON EDIT}}
-	'!**/*.{xlf,docx,sql,vsix,bacpac,ipynb}',
+	'!build/actions/**/dist/*',
+	'!**/*.{xlf,docx,sql,vsix,bacpac,ipynb,jpg}',
 	'!extensions/mssql/sqltoolsservice/**',
 	'!extensions/import/flatfileimportservice/**',
 	'!extensions/admin-tool-ext-win/ssmsmin/**',
@@ -103,7 +105,8 @@ const indentationFilter = [
 	'!extensions/mssql/notebooks/**',
 	'!extensions/integration-tests/testData/**',
 	'!extensions/big-data-cluster/src/bigDataCluster/controller/apiGenerated.ts',
-	'!extensions/big-data-cluster/src/bigDataCluster/controller/clusterApiGenerated2.ts'
+	'!extensions/big-data-cluster/src/bigDataCluster/controller/clusterApiGenerated2.ts',
+	'!resources/linux/snap/electron-launch'
 ];
 
 const copyrightFilter = [
@@ -125,7 +128,6 @@ const copyrightFilter = [
 	'!**/*.disabled',
 	'!**/*.code-workspace',
 	'!**/*.js.map',
-	'!**/promise-polyfill/polyfill.js',
 	'!build/**/*.init',
 	'!resources/linux/snap/snapcraft.yaml',
 	'!resources/linux/snap/electron-launch',
@@ -141,9 +143,9 @@ const copyrightFilter = [
 	'!extensions/mssql/src/hdfs/webhdfs.ts',
 	'!src/sql/workbench/contrib/notebook/browser/outputs/tableRenderers.ts',
 	'!src/sql/workbench/contrib/notebook/common/models/url.ts',
-	'!src/sql/workbench/contrib/notebook/browser/models/renderMimeInterfaces.ts',
+	'!src/sql/workbench/services/notebook/browser/outputs/renderMimeInterfaces.ts',
 	'!src/sql/workbench/contrib/notebook/browser/models/outputProcessor.ts',
-	'!src/sql/workbench/contrib/notebook/browser/models/mimemodel.ts',
+	'!src/sql/workbench/services/notebook/browser/outputs/mimemodel.ts',
 	'!src/sql/workbench/contrib/notebook/browser/cellViews/media/*.css',
 	'!src/sql/base/browser/ui/table/plugins/rowSelectionModel.plugin.ts',
 	'!src/sql/base/browser/ui/table/plugins/rowDetailView.ts',
@@ -151,11 +153,11 @@ const copyrightFilter = [
 	'!src/sql/base/browser/ui/table/plugins/checkboxSelectColumn.plugin.ts',
 	'!src/sql/base/browser/ui/table/plugins/cellSelectionModel.plugin.ts',
 	'!src/sql/base/browser/ui/table/plugins/autoSizeColumns.plugin.ts',
-	'!src/sql/workbench/contrib/notebook/browser/outputs/sanitizer.ts',
+	'!src/sql/workbench/services/notebook/browser/outputs/sanitizer.ts',
 	'!src/sql/workbench/contrib/notebook/browser/outputs/renderers.ts',
-	'!src/sql/workbench/contrib/notebook/browser/outputs/registry.ts',
-	'!src/sql/workbench/contrib/notebook/browser/outputs/factories.ts',
-	'!src/sql/workbench/contrib/notebook/common/models/nbformat.ts',
+	'!src/sql/workbench/services/notebook/browser/outputs/registry.ts',
+	'!src/sql/workbench/services/notebook/browser/outputs/factories.ts',
+	'!src/sql/workbench/services/notebook/common/nbformat.ts',
 	'!extensions/markdown-language-features/media/tomorrow.css',
 	'!src/sql/workbench/browser/modelComponents/media/highlight.css',
 	'!src/sql/workbench/contrib/notebook/electron-browser/cellViews/media/highlight.css',
@@ -199,14 +201,7 @@ const tsHygieneFilter = [
 	'!extensions/big-data-cluster/src/bigDataCluster/controller/apiGenerated.ts', // {{SQL CARBON EDIT}},
 	'!extensions/big-data-cluster/src/bigDataCluster/controller/tokenApiGenerated.ts', // {{SQL CARBON EDIT}},
 	'!src/vs/workbench/services/themes/common/textMateScopeMatcher.ts', // {{SQL CARBON EDIT}} skip this because we have no plans on touching this and its not ours
-	'!src/vs/workbench/contrib/extensions/browser/extensionTipsService.ts' // {{SQL CARBON EDIT}} skip this because known issue
-];
-
-const sqlHygieneFilter = [ // for rules we want to only apply to our code
-	'src/sql/**/*.ts',
-	'!**/node_modules/**',
-	'extensions/**/*.ts',
-	'!extensions/{git,search-result,vscode-test-resolver,extension-editing,json-language-features,vscode-colorize-tests}/**/*.ts',
+	'!src/vs/workbench/contrib/extensions/browser/extensionRecommendationsService.ts' // {{SQL CARBON EDIT}} skip this because known issue
 ];
 
 const copyrightHeaderLines = [
@@ -376,20 +371,8 @@ function hygiene(some) {
 			errorCount += results.errorCount;
 		}));
 
-	const sqlJavascript = result
-		.pipe(filter(sqlHygieneFilter))
-		.pipe(gulpeslint({
-			configFile: '.eslintrc.sql.json',
-			rulePaths: ['./build/lib/eslint']
-		}))
-		.pipe(gulpeslint.formatEach('compact'))
-		.pipe(gulpeslint.results(results => {
-			errorCount += results.warningCount;
-			errorCount += results.errorCount;
-		}));
-
 	let count = 0;
-	return es.merge(typescript, javascript, sqlJavascript)
+	return es.merge(typescript, javascript)
 		.pipe(es.through(function (data) {
 			count++;
 			if (process.env['TRAVIS'] && count % 10 === 0) {

build/gulpfile.sql.js

@@ -5,13 +5,9 @@
 
 'use strict';
 const gulp = require('gulp');
-const util = require('./lib/util');
 const tsfmt = require('typescript-formatter');
 const es = require('event-stream');
 const filter = require('gulp-filter');
-const del = require('del');
-const serviceDownloader = require('service-downloader').ServiceDownloadProvider;
-const platform = require('service-downloader/out/platform').PlatformInformation;
 const path = require('path');
 const ext = require('./lib/extensions');
 const task = require('./lib/task');
@@ -19,9 +15,6 @@ const glob = require('glob');
 const vsce = require('vsce');
 const mkdirp = require('mkdirp');
 
-gulp.task('clean-mssql-extension', util.rimraf('extensions/mssql/node_modules'));
-gulp.task('clean-credentials-extension', util.rimraf('extensions/credentials/node_modules'));
-
 gulp.task('fmt', () => formatStagedFiles());
 const formatFiles = (some) => {
 	const formatting = es.map(function (file, cb) {
@@ -96,45 +89,6 @@ const formatStagedFiles = () => {
 	});
 };
 
-function installService() {
-	let config = require('../extensions/mssql/config.json');
-	return platform.getCurrent().then(p => {
-		let runtime = p.runtimeId;
-		// fix path since it won't be correct
-		config.installDirectory = path.join(__dirname, '../extensions/mssql/src', config.installDirectory);
-		let installer = new serviceDownloader(config);
-		let serviceInstallFolder = installer.getInstallDirectory(runtime);
-		console.log('Cleaning up the install folder: ' + serviceInstallFolder);
-		return del(serviceInstallFolder + '/*').then(() => {
-			console.log('Installing the service. Install folder: ' + serviceInstallFolder);
-			return installer.installService(runtime);
-		}, delError => {
-			console.log('failed to delete the install folder error: ' + delError);
-		});
-	});
-}
-
-gulp.task('install-sqltoolsservice', () => {
-	return installService();
-});
-
-gulp.task('install-ssmsmin', () => {
-	const config = require('../extensions/admin-tool-ext-win/config.json');
-	const runtime = 'Windows_64'; // admin-tool-ext is a windows only extension, and we only ship a 64 bit version, so locking the binaries as such
-	// fix path since it won't be correct
-	config.installDirectory = path.join(__dirname, '..', 'extensions', 'admin-tool-ext-win', config.installDirectory);
-	let installer = new serviceDownloader(config);
-	const serviceInstallFolder = installer.getInstallDirectory(runtime);
-	const serviceCleanupFolder = path.join(serviceInstallFolder, '..');
-	console.log('Cleaning up the install folder: ' + serviceCleanupFolder);
-	return del(serviceCleanupFolder + '/*').then(() => {
-		console.log('Installing the service. Install folder: ' + serviceInstallFolder);
-		return installer.installService(runtime);
-	}, delError => {
-		console.log('failed to delete the install folder error: ' + delError);
-	});
-});
-
 const root = path.dirname(__dirname);
 
 gulp.task('package-external-extensions', task.series(

build/gulpfile.vscode.js

@@ -36,13 +36,12 @@ const { compileBuildTask } = require('./gulpfile.compile');
 const { compileExtensionsBuildTask } = require('./gulpfile.extensions');
 
 const productionDependencies = deps.getProductionDependencies(path.dirname(__dirname));
-
 const baseModules = Object.keys(process.binding('natives')).filter(n => !/^_|\//.test(n));
-// {{SQL CARBON EDIT}}
-const nodeModules = [
+const nodeModules = [ // {{SQL CARBON EDIT}}
 	'electron',
 	'original-fs',
 	'rxjs/Observable',
+	'rxjs/add/observable/fromPromise',
 	'rxjs/Subject',
 	'rxjs/Observer',
 	'slickgrid/lib/jquery.event.drag-2.3.0',
@@ -122,7 +121,6 @@ const optimizeVSCodeTask = task.define('optimize-vscode', task.series(
 		resources: vscodeResources,
 		loaderConfig: common.loaderConfig(nodeModules),
 		out: 'out-vscode',
-		inlineAmdImages: true,
 		bundleInfo: undefined
 	})
 ));
@@ -188,6 +186,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 		const checksums = computeChecksums(out, [
 			'vs/workbench/workbench.desktop.main.js',
 			'vs/workbench/workbench.desktop.main.css',
+			'vs/workbench/services/extensions/node/extensionHostProcess.js',
 			'vs/code/electron-browser/workbench/workbench.html',
 			'vs/code/electron-browser/workbench/workbench.js'
 		]);
@@ -274,6 +273,9 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 		}
 
 		let result = all
+			.pipe(fileLengthFilter)
+			.pipe(filelength)
+			.pipe(fileLengthFilter.restore)
 			.pipe(util.skipDirectories())
 			.pipe(util.fixWin32DirectoryPermissions())
 			.pipe(electron(_.extend({}, config, { platform, arch, ffmpegChromium: true })))
@@ -328,6 +330,29 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 	};
 }
 
+const fileLengthFilter = filter([
+	'**',
+	'!extensions/import/*.docx',
+	'!extensions/admin-tool-ext-win/license/**'
+], {restore: true});
+
+const filelength = es.through(function (file) {
+
+	const fileName = path.basename(file.relative);
+	const fileDir = path.dirname(file.relative);
+	//check the filename is < 50 characters (basename gets the filename with extension).
+	if (fileName.length > 50) {
+		console.error(`File name '${fileName}' under ${fileDir} is too long. Rename file to have less than 50 characters.`);
+		throw new Error('File name exceeds acceptable length of 50 characters: ' + fileName);
+	}
+	if (file.relative.length > 150) {
+		console.error(`File path ${file.relative} exceeds acceptable file-length. Rename the path to have less than 150 characters.`);
+		throw new Error('File path exceeds acceptable path-length of 150 characters: ' + file.relative);
+	}
+
+	this.emit('data', file);
+});
+
 const buildRoot = path.dirname(root);
 
 const BUILD_TARGETS = [

build/gulpfile.vscode.linux.js

@@ -92,9 +92,7 @@ function prepareDebPackage(arch) {
 		const postinst = gulp.src('resources/linux/debian/postinst.template', { base: '.' })
 			.pipe(replace('@@NAME@@', product.applicationName))
 			.pipe(replace('@@ARCHITECTURE@@', debArch))
-			// @ts-ignore JSON checking: quality is optional
 			.pipe(replace('@@QUALITY@@', product.quality || '@@QUALITY@@'))
-			// @ts-ignore JSON checking: updateUrl is optional
 			.pipe(replace('@@UPDATEURL@@', product.updateUrl || '@@UPDATEURL@@'))
 			.pipe(rename('DEBIAN/postinst'));
 
@@ -169,9 +167,7 @@ function prepareRpmPackage(arch) {
 			.pipe(replace('@@RELEASE@@', linuxPackageRevision))
 			.pipe(replace('@@ARCHITECTURE@@', rpmArch))
 			.pipe(replace('@@LICENSE@@', product.licenseName))
-			// @ts-ignore JSON checking: quality is optional
 			.pipe(replace('@@QUALITY@@', product.quality || '@@QUALITY@@'))
-			// @ts-ignore JSON checking: updateUrl is optional
 			.pipe(replace('@@UPDATEURL@@', product.updateUrl || '@@UPDATEURL@@'))
 			.pipe(replace('@@DEPENDENCIES@@', rpmDependencies[rpmArch].join(', ')))
 			.pipe(rename('SPECS/' + product.applicationName + '.spec'));

build/lib/asar.js

@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.createAsar = void 0;
 const path = require("path");
 const es = require("event-stream");
 const pickle = require('chromium-pickle-js');

build/lib/builtInExtensions.js

@@ -18,7 +18,7 @@ const fancyLog = require('fancy-log');
 const ansiColors = require('ansi-colors');
 
 const root = path.dirname(path.dirname(__dirname));
-const builtInExtensions = require('../builtInExtensions.json');
+const builtInExtensions = JSON.parse(fs.readFileSync(path.join(__dirname, '../../product.json'), 'utf8')).builtInExtensions;
 const controlFilePath = path.join(os.homedir(), '.vscode-oss-dev', 'extensions', 'control.json');
 const ENABLE_LOGGING = !process.env['VSCODE_BUILD_BUILTIN_EXTENSIONS_SILENCE_PLEASE'];
 

build/lib/bundle.js

@@ -4,6 +4,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.bundle = void 0;
 const fs = require("fs");
 const path = require("path");
 const vm = require("vm");

build/lib/compilation.js

@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.watchTask = exports.compileTask = void 0;
 const es = require("event-stream");
 const fs = require("fs");
 const gulp = require("gulp");

build/lib/electron.js

@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.config = exports.getElectronVersion = void 0;
 const fs = require("fs");
 const path = require("path");
 const vfs = require("vinyl-fs");

build/lib/eslint/utils.js

@@ -4,6 +4,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.createImportRuleListener = void 0;
 function createImportRuleListener(validateImport) {
     function _checkImport(node) {
         if (node && node.type === 'Literal' && typeof node.value === 'string') {

build/lib/eslint/vscode-dts-create-func.js

@@ -0,0 +1,35 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+const experimental_utils_1 = require("@typescript-eslint/experimental-utils");
+module.exports = new class ApiLiteralOrTypes {
+    constructor() {
+        this.meta = {
+            docs: { url: 'https://github.com/microsoft/vscode/wiki/Extension-API-guidelines#creating-objects' },
+            messages: { sync: '`createXYZ`-functions are constructor-replacements and therefore must return sync', }
+        };
+    }
+    create(context) {
+        return {
+            ['TSDeclareFunction Identifier[name=/create.*/]']: (node) => {
+                var _a;
+                const decl = node.parent;
+                if (((_a = decl.returnType) === null || _a === void 0 ? void 0 : _a.typeAnnotation.type) !== experimental_utils_1.AST_NODE_TYPES.TSTypeReference) {
+                    return;
+                }
+                if (decl.returnType.typeAnnotation.typeName.type !== experimental_utils_1.AST_NODE_TYPES.Identifier) {
+                    return;
+                }
+                const ident = decl.returnType.typeAnnotation.typeName.name;
+                if (ident === 'Promise' || ident === 'Thenable') {
+                    context.report({
+                        node,
+                        messageId: 'sync'
+                    });
+                }
+            }
+        };
+    }
+};

build/lib/eslint/vscode-dts-create-func.ts

@@ -0,0 +1,40 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as eslint from 'eslint';
+import { TSESTree, AST_NODE_TYPES } from '@typescript-eslint/experimental-utils';
+
+export = new class ApiLiteralOrTypes implements eslint.Rule.RuleModule {
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		docs: { url: 'https://github.com/microsoft/vscode/wiki/Extension-API-guidelines#creating-objects' },
+		messages: { sync: '`createXYZ`-functions are constructor-replacements and therefore must return sync', }
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+
+		return {
+			['TSDeclareFunction Identifier[name=/create.*/]']: (node: any) => {
+
+				const decl = <TSESTree.FunctionDeclaration>(<TSESTree.Identifier>node).parent;
+
+				if (decl.returnType?.typeAnnotation.type !== AST_NODE_TYPES.TSTypeReference) {
+					return;
+				}
+				if (decl.returnType.typeAnnotation.typeName.type !== AST_NODE_TYPES.Identifier) {
+					return;
+				}
+
+				const ident = decl.returnType.typeAnnotation.typeName.name;
+				if (ident === 'Promise' || ident === 'Thenable') {
+					context.report({
+						node,
+						messageId: 'sync'
+					});
+				}
+			}
+		};
+	}
+};

build/lib/eslint/vscode-dts-event-naming.js

@@ -0,0 +1,81 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+var _a;
+const experimental_utils_1 = require("@typescript-eslint/experimental-utils");
+module.exports = new (_a = class ApiEventNaming {
+        constructor() {
+            this.meta = {
+                docs: {
+                    url: 'https://github.com/microsoft/vscode/wiki/Extension-API-guidelines#event-naming'
+                },
+                messages: {
+                    naming: 'Event names must follow this patten: `on[Did|Will]<Verb><Subject>`',
+                    verb: 'Unknown verb \'{{verb}}\' - is this really a verb? Iff so, then add this verb to the configuration',
+                    subject: 'Unknown subject \'{{subject}}\' - This subject has not been used before but it should refer to something in the API',
+                    unknown: 'UNKNOWN event declaration, lint-rule needs tweaking'
+                }
+            };
+        }
+        create(context) {
+            const config = context.options[0];
+            const allowed = new Set(config.allowed);
+            const verbs = new Set(config.verbs);
+            return {
+                ['TSTypeAnnotation TSTypeReference Identifier[name="Event"]']: (node) => {
+                    var _a, _b;
+                    const def = (_b = (_a = node.parent) === null || _a === void 0 ? void 0 : _a.parent) === null || _b === void 0 ? void 0 : _b.parent;
+                    let ident;
+                    if ((def === null || def === void 0 ? void 0 : def.type) === experimental_utils_1.AST_NODE_TYPES.Identifier) {
+                        ident = def;
+                    }
+                    else if (((def === null || def === void 0 ? void 0 : def.type) === experimental_utils_1.AST_NODE_TYPES.TSPropertySignature || (def === null || def === void 0 ? void 0 : def.type) === experimental_utils_1.AST_NODE_TYPES.ClassProperty) && def.key.type === experimental_utils_1.AST_NODE_TYPES.Identifier) {
+                        ident = def.key;
+                    }
+                    if (!ident) {
+                        // event on unknown structure...
+                        return context.report({
+                            node,
+                            message: 'unknown'
+                        });
+                    }
+                    if (allowed.has(ident.name)) {
+                        // configured exception
+                        return;
+                    }
+                    const match = ApiEventNaming._nameRegExp.exec(ident.name);
+                    if (!match) {
+                        context.report({
+                            node: ident,
+                            messageId: 'naming'
+                        });
+                        return;
+                    }
+                    // check that <verb> is spelled out (configured) as verb
+                    if (!verbs.has(match[2].toLowerCase())) {
+                        context.report({
+                            node: ident,
+                            messageId: 'verb',
+                            data: { verb: match[2] }
+                        });
+                    }
+                    // check that a subject (if present) has occurred
+                    if (match[3]) {
+                        const regex = new RegExp(match[3], 'ig');
+                        const parts = context.getSourceCode().getText().split(regex);
+                        if (parts.length < 3) {
+                            context.report({
+                                node: ident,
+                                messageId: 'subject',
+                                data: { subject: match[3] }
+                            });
+                        }
+                    }
+                }
+            };
+        }
+    },
+    _a._nameRegExp = /on(Did|Will)([A-Z][a-z]+)([A-Z][a-z]+)?/,
+    _a);

build/lib/eslint/vscode-dts-event-naming.ts

@@ -0,0 +1,91 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as eslint from 'eslint';
+import { TSESTree, AST_NODE_TYPES } from '@typescript-eslint/experimental-utils';
+
+export = new class ApiEventNaming implements eslint.Rule.RuleModule {
+
+	private static _nameRegExp = /on(Did|Will)([A-Z][a-z]+)([A-Z][a-z]+)?/;
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		docs: {
+			url: 'https://github.com/microsoft/vscode/wiki/Extension-API-guidelines#event-naming'
+		},
+		messages: {
+			naming: 'Event names must follow this patten: `on[Did|Will]<Verb><Subject>`',
+			verb: 'Unknown verb \'{{verb}}\' - is this really a verb? Iff so, then add this verb to the configuration',
+			subject: 'Unknown subject \'{{subject}}\' - This subject has not been used before but it should refer to something in the API',
+			unknown: 'UNKNOWN event declaration, lint-rule needs tweaking'
+		}
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+
+		const config = <{ allowed: string[], verbs: string[] }>context.options[0];
+		const allowed = new Set(config.allowed);
+		const verbs = new Set(config.verbs);
+
+		return {
+			['TSTypeAnnotation TSTypeReference Identifier[name="Event"]']: (node: any) => {
+
+				const def = (<TSESTree.Identifier>node).parent?.parent?.parent;
+				let ident: TSESTree.Identifier | undefined;
+
+				if (def?.type === AST_NODE_TYPES.Identifier) {
+					ident = def;
+
+				} else if ((def?.type === AST_NODE_TYPES.TSPropertySignature || def?.type === AST_NODE_TYPES.ClassProperty) && def.key.type === AST_NODE_TYPES.Identifier) {
+					ident = def.key;
+				}
+
+				if (!ident) {
+					// event on unknown structure...
+					return context.report({
+						node,
+						message: 'unknown'
+					});
+				}
+
+				if (allowed.has(ident.name)) {
+					// configured exception
+					return;
+				}
+
+				const match = ApiEventNaming._nameRegExp.exec(ident.name);
+				if (!match) {
+					context.report({
+						node: ident,
+						messageId: 'naming'
+					});
+					return;
+				}
+
+				// check that <verb> is spelled out (configured) as verb
+				if (!verbs.has(match[2].toLowerCase())) {
+					context.report({
+						node: ident,
+						messageId: 'verb',
+						data: { verb: match[2] }
+					});
+				}
+
+				// check that a subject (if present) has occurred
+				if (match[3]) {
+					const regex = new RegExp(match[3], 'ig');
+					const parts = context.getSourceCode().getText().split(regex);
+					if (parts.length < 3) {
+						context.report({
+							node: ident,
+							messageId: 'subject',
+							data: { subject: match[3] }
+						});
+					}
+				}
+			}
+		};
+	}
+};
+

build/lib/eslint/vscode-dts-interface-naming.js

@@ -0,0 +1,30 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+var _a;
+module.exports = new (_a = class ApiInterfaceNaming {
+        constructor() {
+            this.meta = {
+                messages: {
+                    naming: 'Interfaces must not be prefixed with uppercase `I`',
+                }
+            };
+        }
+        create(context) {
+            return {
+                ['TSInterfaceDeclaration Identifier']: (node) => {
+                    const name = node.name;
+                    if (ApiInterfaceNaming._nameRegExp.test(name)) {
+                        context.report({
+                            node,
+                            messageId: 'naming'
+                        });
+                    }
+                }
+            };
+        }
+    },
+    _a._nameRegExp = /I[A-Z]/,
+    _a);

build/lib/eslint/vscode-dts-interface-naming.ts

@@ -0,0 +1,35 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as eslint from 'eslint';
+import { TSESTree } from '@typescript-eslint/experimental-utils';
+
+export = new class ApiInterfaceNaming implements eslint.Rule.RuleModule {
+
+	private static _nameRegExp = /I[A-Z]/;
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		messages: {
+			naming: 'Interfaces must not be prefixed with uppercase `I`',
+		}
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+
+		return {
+			['TSInterfaceDeclaration Identifier']: (node: any) => {
+
+				const name = (<TSESTree.Identifier>node).name;
+				if (ApiInterfaceNaming._nameRegExp.test(name)) {
+					context.report({
+						node,
+						messageId: 'naming'
+					});
+				}
+			}
+		};
+	}
+};
+

build/lib/eslint/vscode-dts-literal-or-types.js

@@ -0,0 +1,23 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+module.exports = new class ApiLiteralOrTypes {
+    constructor() {
+        this.meta = {
+            docs: { url: 'https://github.com/microsoft/vscode/wiki/Extension-API-guidelines#enums' },
+            messages: { useEnum: 'Use enums, not literal-or-types', }
+        };
+    }
+    create(context) {
+        return {
+            ['TSTypeAnnotation TSUnionType TSLiteralType']: (node) => {
+                context.report({
+                    node: node,
+                    messageId: 'useEnum'
+                });
+            }
+        };
+    }
+};

build/lib/eslint/vscode-dts-literal-or-types.ts

@@ -0,0 +1,25 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as eslint from 'eslint';
+
+export = new class ApiLiteralOrTypes implements eslint.Rule.RuleModule {
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		docs: { url: 'https://github.com/microsoft/vscode/wiki/Extension-API-guidelines#enums' },
+		messages: { useEnum: 'Use enums, not literal-or-types', }
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+		return {
+			['TSTypeAnnotation TSUnionType TSLiteralType']: (node: any) => {
+				context.report({
+					node: node,
+					messageId: 'useEnum'
+				});
+			}
+		};
+	}
+};

build/lib/extensions.js

@@ -4,6 +4,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.packageRebuildExtensionsStream = exports.cleanRebuildExtensions = exports.packageExternalExtensionsStream = exports.packageMarketplaceExtensionsStream = exports.packageLocalExtensionsStream = exports.fromMarketplace = void 0;
 const es = require("event-stream");
 const fs = require("fs");
 const glob = require("glob");
@@ -27,7 +28,6 @@ const util = require('./util');
 const root = path.dirname(path.dirname(__dirname));
 const commit = util.getVersion(root);
 const sourceMappingURLBase = `https://ticino.blob.core.windows.net/sourcemaps/${commit}`;
-const product = require('../../product.json');
 function fromLocal(extensionPath) {
     const webpackFilename = path.join(extensionPath, 'extension.webpack.config.js');
     const input = fs.existsSync(webpackFilename)
@@ -182,12 +182,12 @@ function fromMarketplace(extensionName, version, metadata) {
 exports.fromMarketplace = fromMarketplace;
 const excludedExtensions = [
     'vscode-api-tests',
+    'vscode-web-playground',
     'vscode-colorize-tests',
     'vscode-test-resolver',
     'ms-vscode.node-debug',
     'ms-vscode.node-debug2',
     'integration-tests',
-    'ms.vscode.js-debug-nightly'
 ];
 // {{SQL CARBON EDIT}}
 const externalExtensions = [
@@ -213,8 +213,7 @@ const rebuildExtensions = [
     'big-data-cluster',
     'mssql'
 ];
-const builtInExtensions = require('../builtInExtensions.json')
-    .filter(({ forQualities }) => { var _a; return !product.quality || ((_a = forQualities === null || forQualities === void 0 ? void 0 : forQualities.includes) === null || _a === void 0 ? void 0 : _a.call(forQualities, product.quality)) !== false; });
+const builtInExtensions = JSON.parse(fs.readFileSync(path.join(__dirname, '../../product.json'), 'utf8')).builtInExtensions;
 function packageLocalExtensionsStream() {
     const localExtensionDescriptions = glob.sync('extensions/*/package.json')
         .map(manifestPath => {

build/lib/extensions.ts

@@ -27,7 +27,6 @@ const util = require('./util');
 const root = path.dirname(path.dirname(__dirname));
 const commit = util.getVersion(root);
 const sourceMappingURLBase = `https://ticino.blob.core.windows.net/sourcemaps/${commit}`;
-const product = require('../../product.json');
 
 function fromLocal(extensionPath: string): Stream {
 	const webpackFilename = path.join(extensionPath, 'extension.webpack.config.js');
@@ -217,12 +216,12 @@ export function fromMarketplace(extensionName: string, version: string, metadata
 
 const excludedExtensions = [
 	'vscode-api-tests',
+	'vscode-web-playground',
 	'vscode-colorize-tests',
 	'vscode-test-resolver',
 	'ms-vscode.node-debug',
 	'ms-vscode.node-debug2',
 	'integration-tests', // {{SQL CARBON EDIT}}
-	'ms.vscode.js-debug-nightly'
 ];
 
 // {{SQL CARBON EDIT}}
@@ -255,12 +254,10 @@ interface IBuiltInExtension {
 	name: string;
 	version: string;
 	repo: string;
-	forQualities?: ReadonlyArray<string>;
 	metadata: any;
 }
 
-const builtInExtensions = (<IBuiltInExtension[]>require('../builtInExtensions.json'))
-	.filter(({ forQualities }) => !product.quality || forQualities?.includes?.(product.quality) !== false);
+const builtInExtensions: IBuiltInExtension[] = JSON.parse(fs.readFileSync(path.join(__dirname, '../../product.json'), 'utf8')).builtInExtensions;
 
 export function packageLocalExtensionsStream(): NodeJS.ReadWriteStream {
 	const localExtensionDescriptions = (<string[]>glob.sync('extensions/*/package.json'))

build/lib/git.js

@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getVersion = void 0;
 const path = require("path");
 const fs = require("fs");
 /**

build/lib/i18n.js

@@ -4,6 +4,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.prepareIslFiles = exports.prepareI18nPackFiles = exports.pullI18nPackFiles = exports.prepareI18nFiles = exports.pullSetupXlfFiles = exports.pullCoreAndExtensionsXlfFiles = exports.findObsoleteResources = exports.pushXlfFiles = exports.createXlfFilesForIsl = exports.createXlfFilesForExtensions = exports.createXlfFilesForCoreBundle = exports.getResource = exports.processNlsFiles = exports.Limiter = exports.XLF = exports.Line = exports.externalExtensionsWithTranslations = exports.extraLanguages = exports.defaultLanguages = void 0;
 const path = require("path");
 const fs = require("fs");
 const event_stream_1 = require("event-stream");
@@ -100,155 +101,161 @@ class TextModel {
         return this._lines;
     }
 }
-class XLF {
-    constructor(project) {
-        this.project = project;
-        this.buffer = [];
-        this.files = Object.create(null);
-        this.numberOfMessages = 0;
-    }
-    toString() {
-        this.appendHeader();
-        for (let file in this.files) {
-            this.appendNewLine(`<file original="${file}" source-language="en" datatype="plaintext"><body>`, 2);
-            for (let item of this.files[file]) {
-                this.addStringItem(item);
-            }
-            this.appendNewLine('</body></file>', 2);
+let XLF = /** @class */ (() => {
+    class XLF {
+        constructor(project) {
+            this.project = project;
+            this.buffer = [];
+            this.files = Object.create(null);
+            this.numberOfMessages = 0;
         }
-        this.appendFooter();
-        return this.buffer.join('\r\n');
-    }
-    addFile(original, keys, messages) {
-        if (keys.length === 0) {
-            console.log('No keys in ' + original);
-            return;
-        }
-        if (keys.length !== messages.length) {
-            throw new Error(`Unmatching keys(${keys.length}) and messages(${messages.length}).`);
-        }
-        this.numberOfMessages += keys.length;
-        this.files[original] = [];
-        let existingKeys = new Set();
-        for (let i = 0; i < keys.length; i++) {
-            let key = keys[i];
-            let realKey;
-            let comment;
-            if (Is.string(key)) {
-                realKey = key;
-                comment = undefined;
-            }
-            else if (LocalizeInfo.is(key)) {
-                realKey = key.key;
-                if (key.comment && key.comment.length > 0) {
-                    comment = key.comment.map(comment => encodeEntities(comment)).join('\r\n');
+        toString() {
+            this.appendHeader();
+            for (let file in this.files) {
+                this.appendNewLine(`<file original="${file}" source-language="en" datatype="plaintext"><body>`, 2);
+                for (let item of this.files[file]) {
+                    this.addStringItem(file, item);
                 }
+                this.appendNewLine('</body></file>', 2);
             }
-            if (!realKey || existingKeys.has(realKey)) {
-                continue;
+            this.appendFooter();
+            return this.buffer.join('\r\n');
+        }
+        addFile(original, keys, messages) {
+            if (keys.length === 0) {
+                console.log('No keys in ' + original);
+                return;
             }
-            existingKeys.add(realKey);
-            let message = encodeEntities(messages[i]);
-            this.files[original].push({ id: realKey, message: message, comment: comment });
+            if (keys.length !== messages.length) {
+                throw new Error(`Unmatching keys(${keys.length}) and messages(${messages.length}).`);
+            }
+            this.numberOfMessages += keys.length;
+            this.files[original] = [];
+            let existingKeys = new Set();
+            for (let i = 0; i < keys.length; i++) {
+                let key = keys[i];
+                let realKey;
+                let comment;
+                if (Is.string(key)) {
+                    realKey = key;
+                    comment = undefined;
+                }
+                else if (LocalizeInfo.is(key)) {
+                    realKey = key.key;
+                    if (key.comment && key.comment.length > 0) {
+                        comment = key.comment.map(comment => encodeEntities(comment)).join('\r\n');
+                    }
+                }
+                if (!realKey || existingKeys.has(realKey)) {
+                    continue;
+                }
+                existingKeys.add(realKey);
+                let message = encodeEntities(messages[i]);
+                this.files[original].push({ id: realKey, message: message, comment: comment });
+            }
+        }
+        addStringItem(file, item) {
+            if (!item.id || item.message === undefined || item.message === null) {
+                throw new Error(`No item ID or value specified: ${JSON.stringify(item)}. File: ${file}`);
+            }
+            if (item.message.length === 0) {
+                log(`Item with id ${item.id} in file ${file} has an empty message.`);
+            }
+            this.appendNewLine(`<trans-unit id="${item.id}">`, 4);
+            this.appendNewLine(`<source xml:lang="en">${item.message}</source>`, 6);
+            if (item.comment) {
+                this.appendNewLine(`<note>${item.comment}</note>`, 6);
+            }
+            this.appendNewLine('</trans-unit>', 4);
+        }
+        appendHeader() {
+            this.appendNewLine('<?xml version="1.0" encoding="utf-8"?>', 0);
+            this.appendNewLine('<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">', 0);
+        }
+        appendFooter() {
+            this.appendNewLine('</xliff>', 0);
+        }
+        appendNewLine(content, indent) {
+            let line = new Line(indent);
+            line.append(content);
+            this.buffer.push(line.toString());
         }
     }
-    addStringItem(item) {
-        if (!item.id || !item.message) {
-            throw new Error(`No item ID or value specified: ${JSON.stringify(item)}`);
-        }
-        this.appendNewLine(`<trans-unit id="${item.id}">`, 4);
-        this.appendNewLine(`<source xml:lang="en">${item.message}</source>`, 6);
-        if (item.comment) {
-            this.appendNewLine(`<note>${item.comment}</note>`, 6);
-        }
-        this.appendNewLine('</trans-unit>', 4);
-    }
-    appendHeader() {
-        this.appendNewLine('<?xml version="1.0" encoding="utf-8"?>', 0);
-        this.appendNewLine('<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">', 0);
-    }
-    appendFooter() {
-        this.appendNewLine('</xliff>', 0);
-    }
-    appendNewLine(content, indent) {
-        let line = new Line(indent);
-        line.append(content);
-        this.buffer.push(line.toString());
-    }
-}
+    XLF.parsePseudo = function (xlfString) {
+        return new Promise((resolve) => {
+            let parser = new xml2js.Parser();
+            let files = [];
+            parser.parseString(xlfString, function (_err, result) {
+                const fileNodes = result['xliff']['file'];
+                fileNodes.forEach(file => {
+                    const originalFilePath = file.$.original;
+                    const messages = {};
+                    const transUnits = file.body[0]['trans-unit'];
+                    if (transUnits) {
+                        transUnits.forEach((unit) => {
+                            const key = unit.$.id;
+                            const val = pseudify(unit.source[0]['_'].toString());
+                            if (key && val) {
+                                messages[key] = decodeEntities(val);
+                            }
+                        });
+                        files.push({ messages: messages, originalFilePath: originalFilePath, language: 'ps' });
+                    }
+                });
+                resolve(files);
+            });
+        });
+    };
+    XLF.parse = function (xlfString) {
+        return new Promise((resolve, reject) => {
+            let parser = new xml2js.Parser();
+            let files = [];
+            parser.parseString(xlfString, function (err, result) {
+                if (err) {
+                    reject(new Error(`XLF parsing error: Failed to parse XLIFF string. ${err}`));
+                }
+                const fileNodes = result['xliff']['file'];
+                if (!fileNodes) {
+                    reject(new Error(`XLF parsing error: XLIFF file does not contain "xliff" or "file" node(s) required for parsing.`));
+                }
+                fileNodes.forEach((file) => {
+                    const originalFilePath = file.$.original;
+                    if (!originalFilePath) {
+                        reject(new Error(`XLF parsing error: XLIFF file node does not contain original attribute to determine the original location of the resource file.`));
+                    }
+                    let language = file.$['target-language'];
+                    if (!language) {
+                        reject(new Error(`XLF parsing error: XLIFF file node does not contain target-language attribute to determine translated language.`));
+                    }
+                    const messages = {};
+                    const transUnits = file.body[0]['trans-unit'];
+                    if (transUnits) {
+                        transUnits.forEach((unit) => {
+                            const key = unit.$.id;
+                            if (!unit.target) {
+                                return; // No translation available
+                            }
+                            let val = unit.target[0];
+                            if (typeof val !== 'string') {
+                                val = val._;
+                            }
+                            if (key && val) {
+                                messages[key] = decodeEntities(val);
+                            }
+                            else {
+                                reject(new Error(`XLF parsing error: XLIFF file ${originalFilePath} does not contain full localization data. ID or target translation for one of the trans-unit nodes is not present.`));
+                            }
+                        });
+                        files.push({ messages: messages, originalFilePath: originalFilePath, language: language.toLowerCase() });
+                    }
+                });
+                resolve(files);
+            });
+        });
+    };
+    return XLF;
+})();
 exports.XLF = XLF;
-XLF.parsePseudo = function (xlfString) {
-    return new Promise((resolve) => {
-        let parser = new xml2js.Parser();
-        let files = [];
-        parser.parseString(xlfString, function (_err, result) {
-            const fileNodes = result['xliff']['file'];
-            fileNodes.forEach(file => {
-                const originalFilePath = file.$.original;
-                const messages = {};
-                const transUnits = file.body[0]['trans-unit'];
-                if (transUnits) {
-                    transUnits.forEach((unit) => {
-                        const key = unit.$.id;
-                        const val = pseudify(unit.source[0]['_'].toString());
-                        if (key && val) {
-                            messages[key] = decodeEntities(val);
-                        }
-                    });
-                    files.push({ messages: messages, originalFilePath: originalFilePath, language: 'ps' });
-                }
-            });
-            resolve(files);
-        });
-    });
-};
-XLF.parse = function (xlfString) {
-    return new Promise((resolve, reject) => {
-        let parser = new xml2js.Parser();
-        let files = [];
-        parser.parseString(xlfString, function (err, result) {
-            if (err) {
-                reject(new Error(`XLF parsing error: Failed to parse XLIFF string. ${err}`));
-            }
-            const fileNodes = result['xliff']['file'];
-            if (!fileNodes) {
-                reject(new Error(`XLF parsing error: XLIFF file does not contain "xliff" or "file" node(s) required for parsing.`));
-            }
-            fileNodes.forEach((file) => {
-                const originalFilePath = file.$.original;
-                if (!originalFilePath) {
-                    reject(new Error(`XLF parsing error: XLIFF file node does not contain original attribute to determine the original location of the resource file.`));
-                }
-                let language = file.$['target-language'];
-                if (!language) {
-                    reject(new Error(`XLF parsing error: XLIFF file node does not contain target-language attribute to determine translated language.`));
-                }
-                const messages = {};
-                const transUnits = file.body[0]['trans-unit'];
-                if (transUnits) {
-                    transUnits.forEach((unit) => {
-                        const key = unit.$.id;
-                        if (!unit.target) {
-                            return; // No translation available
-                        }
-                        let val = unit.target[0];
-                        if (typeof val !== 'string') {
-                            val = val._;
-                        }
-                        if (key && val) {
-                            messages[key] = decodeEntities(val);
-                        }
-                        else {
-                            reject(new Error(`XLF parsing error: XLIFF file ${originalFilePath} does not contain full localization data. ID or target translation for one of the trans-unit nodes is not present.`));
-                        }
-                    });
-                    files.push({ messages: messages, originalFilePath: originalFilePath, language: language.toLowerCase() });
-                }
-            });
-            resolve(files);
-        });
-    });
-};
 class Limiter {
     constructor(maxDegreeOfParalellism) {
         this.maxDegreeOfParalellism = maxDegreeOfParalellism;

build/lib/i18n.resources.json

@@ -119,7 +119,11 @@
 			"project": "vscode-workbench"
 		},
 		{
-			"name": "vs/workbench/contrib/quickopen",
+			"name": "vs/workbench/contrib/notebook",
+			"project": "vscode-workbench"
+		},
+		{
+			"name": "vs/workbench/contrib/quickaccess",
 			"project": "vscode-workbench"
 		},
 		{
@@ -142,6 +146,10 @@
 			"name": "vs/workbench/contrib/search",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/contrib/searchEditor",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/contrib/snippets",
 			"project": "vscode-workbench"
@@ -254,6 +262,10 @@
 			"name": "vs/workbench/services/files",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/services/log",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/services/integrity",
 			"project": "vscode-workbench"
@@ -294,6 +306,10 @@
 			"name": "vs/workbench/services/textMate",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/services/workingCopy",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/services/workspaces",
 			"project": "vscode-workbench"
@@ -321,6 +337,14 @@
 		{
 			"name": "vs/workbench/services/userDataSync",
 			"project": "vscode-workbench"
+		},
+		{
+			"name": "vs/workbench/contrib/timeline",
+			"project": "vscode-workbench"
+		},
+		{
+			"name": "vs/workbench/services/authentication",
+			"project": "vscode-workbench"
 		}
 	]
 }

build/lib/i18n.ts

@@ -201,7 +201,7 @@ export class XLF {
 		for (let file in this.files) {
 			this.appendNewLine(`<file original="${file}" source-language="en" datatype="plaintext"><body>`, 2);
 			for (let item of this.files[file]) {
-				this.addStringItem(item);
+				this.addStringItem(file, item);
 			}
 			this.appendNewLine('</body></file>', 2);
 		}
@@ -243,9 +243,12 @@ export class XLF {
 		}
 	}
 
-	private addStringItem(item: Item): void {
-		if (!item.id || !item.message) {
-			throw new Error(`No item ID or value specified: ${JSON.stringify(item)}`);
+	private addStringItem(file: string, item: Item): void {
+		if (!item.id || item.message === undefined || item.message === null) {
+			throw new Error(`No item ID or value specified: ${JSON.stringify(item)}. File: ${file}`);
+		}
+		if (item.message.length === 0) {
+			log(`Item with id ${item.id} in file ${file} has an empty message.`);
 		}
 
 		this.appendNewLine(`<trans-unit id="${item.id}">`, 4);

build/lib/layersChecker.js

@@ -38,6 +38,7 @@ const CORE_TYPES = [
     'group',
     'groupEnd',
     'table',
+    'assert',
     'Error',
     'String',
     'throws',
@@ -60,7 +61,7 @@ const RULES = [
     },
     // Common: vs/base/common/platform.ts
     {
-        target: '**/vs/base/common/platform.ts',
+        target: '**/{vs,sql}/base/common/platform.ts',
         allowedTypes: [
             ...CORE_TYPES,
             // Safe access to postMessage() and friends
@@ -74,7 +75,7 @@ const RULES = [
     },
     // Common: vs/workbench/api/common/extHostExtensionService.ts
     {
-        target: '**/vs/workbench/api/common/extHostExtensionService.ts',
+        target: '**/{vs,sql}/workbench/api/common/extHostExtensionService.ts',
         allowedTypes: [
             ...CORE_TYPES,
             // Safe access to global
@@ -102,6 +103,14 @@ const RULES = [
             '@types/node' // no node.js
         ]
     },
+    // Browser (editor contrib)
+    {
+        target: '**/src/{vs,sql}/editor/contrib/**',
+        allowedTypes: CORE_TYPES,
+        disallowedDefinitions: [
+            '@types/node' // no node.js
+        ]
+    },
     // node.js
     {
         target: '**/{vs,sql}/**/node/**',

build/lib/layersChecker.ts

@@ -39,6 +39,7 @@ const CORE_TYPES = [
 	'group',
 	'groupEnd',
 	'table',
+	'assert',
 	'Error',
 	'String',
 	'throws',
@@ -64,7 +65,7 @@ const RULES = [
 
 	// Common: vs/base/common/platform.ts
 	{
-		target: '**/vs/base/common/platform.ts',
+		target: '**/{vs,sql}/base/common/platform.ts',
 		allowedTypes: [
 			...CORE_TYPES,
 
@@ -80,7 +81,7 @@ const RULES = [
 
 	// Common: vs/workbench/api/common/extHostExtensionService.ts
 	{
-		target: '**/vs/workbench/api/common/extHostExtensionService.ts',
+		target: '**/{vs,sql}/workbench/api/common/extHostExtensionService.ts',
 		allowedTypes: [
 			...CORE_TYPES,
 
@@ -112,6 +113,15 @@ const RULES = [
 		]
 	},
 
+	// Browser (editor contrib)
+	{
+		target: '**/src/{vs,sql}/editor/contrib/**',
+		allowedTypes: CORE_TYPES,
+		disallowedDefinitions: [
+			'@types/node'	// no node.js
+		]
+	},
+
 	// node.js
 	{
 		target: '**/{vs,sql}/**/node/**',

build/lib/optimize.js

@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.minifyTask = exports.optimizeTask = exports.loaderConfig = void 0;
 const es = require("event-stream");
-const fs = require("fs");
 const gulp = require("gulp");
 const concat = require("gulp-concat");
 const minifyCSS = require("gulp-cssnano");
@@ -135,14 +135,6 @@ function optimizeTask(opts) {
             if (err || !result) {
                 return bundlesStream.emit('error', JSON.stringify(err));
             }
-            if (opts.inlineAmdImages) {
-                try {
-                    result = inlineAmdImages(src, result);
-                }
-                catch (err) {
-                    return bundlesStream.emit('error', JSON.stringify(err));
-                }
-            }
             toBundleStream(src, bundledFileHeader, result.files).pipe(bundlesStream);
             // Remove css inlined resources
             const filteredResources = resources.slice();
@@ -178,39 +170,6 @@ function optimizeTask(opts) {
     };
 }
 exports.optimizeTask = optimizeTask;
-function inlineAmdImages(src, result) {
-    for (const outputFile of result.files) {
-        for (const sourceFile of outputFile.sources) {
-            if (sourceFile.path && /\.js$/.test(sourceFile.path)) {
-                sourceFile.contents = sourceFile.contents.replace(/\([^.]+\.registerAndGetAmdImageURL\(([^)]+)\)\)/g, (_, m0) => {
-                    let imagePath = m0;
-                    // remove `` or ''
-                    if ((imagePath.charAt(0) === '`' && imagePath.charAt(imagePath.length - 1) === '`')
-                        || (imagePath.charAt(0) === '\'' && imagePath.charAt(imagePath.length - 1) === '\'')) {
-                        imagePath = imagePath.substr(1, imagePath.length - 2);
-                    }
-                    if (!/\.(png|svg)$/.test(imagePath)) {
-                        console.log(`original: ${_}`);
-                        return _;
-                    }
-                    const repoLocation = path.join(src, imagePath);
-                    const absoluteLocation = path.join(REPO_ROOT_PATH, repoLocation);
-                    if (!fs.existsSync(absoluteLocation)) {
-                        const message = `Invalid amd image url in file ${sourceFile.path}: ${imagePath}`;
-                        console.log(message);
-                        throw new Error(message);
-                    }
-                    const fileContents = fs.readFileSync(absoluteLocation);
-                    const mime = /\.svg$/.test(imagePath) ? 'image/svg+xml' : 'image/png';
-                    // Mark the file as inlined so we don't ship it by itself
-                    result.cssInlinedResources.push(repoLocation);
-                    return `("data:${mime};base64,${fileContents.toString('base64')}")`;
-                });
-            }
-        }
-    }
-    return result;
-}
 /**
  * Wrap around uglify and allow the preserveComments function
  * to have a file "context" to include our copyright only once per file.