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

@@ -0,0 +1,15 @@
+**/vs/nls.build.js
+**/vs/nls.js
+**/vs/css.build.js
+**/vs/css.js
+**/vs/loader.js
+**/insane/**
+**/marked/**
+**/test/**/*.js
+**/node_modules/**
+**/vscode-api-tests/testWorkspace/**
+**/vscode-api-tests/testWorkspace2/**
+**/extensions/**/out/**
+**/extensions/**/build/**
+**/extensions/markdown-language-features/media/**
+**/extensions/typescript-basics/test/colorize-fixtures/**

.eslintrc.json

@@ -1,20 +1,873 @@
 {
-	"root": true,
-	"env": {
-		"node": true,
-		"es6": true
-	},
-	"rules": {
-		"no-console": 0,
-		"no-cond-assign": 0,
-		"no-unused-vars": 1,
-		"no-extra-semi": "warn",
-		"semi": "warn"
-	},
-	"extends": "eslint:recommended",
-	"parserOptions": {
-		"ecmaFeatures": {
-			"experimentalObjectRestSpread": true
-		}
-	}
+    "root": true,
+    "parser": "@typescript-eslint/parser",
+    "parserOptions": {
+        "ecmaVersion": 6,
+        "sourceType": "module"
+    },
+    "plugins": [
+        "@typescript-eslint",
+        "jsdoc"
+    ],
+    "rules": {
+        "constructor-super": "warn",
+        "curly": "warn",
+        "eqeqeq": "warn",
+        "no-buffer-constructor": "warn",
+        "no-caller": "warn",
+        "no-debugger": "warn",
+        "no-duplicate-case": "warn",
+        "no-duplicate-imports": "warn",
+        "no-eval": "warn",
+        "no-extra-semi": "warn",
+        "no-new-wrappers": "warn",
+        "no-redeclare": "off",
+        "no-sparse-arrays": "warn",
+        "no-throw-literal": "warn",
+        "no-unsafe-finally": "warn",
+        "no-unused-labels": "warn",
+        "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",
+        "@typescript-eslint/semi": "warn",
+        "@typescript-eslint/class-name-casing": "warn",
+        "code-no-unused-expressions": [
+            "warn",
+            {
+                "allowTernary": true
+            }
+        ],
+        "code-translation-remind": "warn",
+        "code-no-nls-in-standalone-editor": "warn",
+        "code-no-standalone-editor": "warn",
+        "code-no-unexternalized-strings": "warn",
+        "code-layering": [
+            "warn",
+            {
+                "common": [],
+                "node": [
+                    "common"
+                ],
+                "browser": [
+                    "common"
+                ],
+                "electron-main": [
+                    "common",
+                    "node"
+                ],
+                "electron-browser": [
+                    "common",
+                    "browser",
+                    "node"
+                ]
+            }
+        ],
+        "code-import-patterns": [
+            "warn",
+            // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+            // !!! Do not relax these rules !!!
+            // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+            {
+                "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",
+					"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!./**/*",
+					"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/**",
+					"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"
+                ]
+            },
+            {
+                "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",
+					"typemoq",
+                    "sinon",
+                    "crypto",
+					"xterm*",
+					"azdata"
+                ]
+            },
+            {
+                "target": "**/test/**",
+                "restrictions": [
+                    "**/{vs,sql}/**",
+                    "assert",
+					"typemoq",
+                    "sinon",
+                    "crypto",
+                    "xterm*"
+                ]
+            }
+        ]
+    },
+    "overrides": [
+        {
+            "files": [
+                "*.js"
+            ],
+            "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.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,7 +6,8 @@ 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/locker.yml

@@ -1,6 +1,6 @@
 {
   daysAfterClose: 45,
   daysSinceLastUpdate: 3,
-  ignoredLabels: [],
+  ignoredLabels: ['A11y_ADS_OctTestPass', 'A11y_ADS_Schema_Dacpac_Backup', 'A11y_AzureDataStudio', 'A11yExclusion', 'A11yMAS', 'A11yResolved: Will Not Fix', 'A11yTCS'],
   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,13 +2,16 @@ 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:
@@ -35,22 +38,38 @@ jobs:
       name: Install Dependencies
     - run: yarn electron x64
       name: Download Electron
-    - run: yarn gulp hygiene --skip-tslint
+    - run: yarn gulp hygiene
       name: Run Hygiene Checks
-    - run: yarn gulp tslint
-      name: Run TSLint Checks
-    - run: yarn strict-null-check # {{SQL CARBON EDIT}} add step
-      name: Run Strict Null Check
+    - 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.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
+    #   name: Run Integration Tests (Electron)
 
   windows:
     runs-on: windows-2016
@@ -69,22 +88,24 @@ jobs:
       name: Install Dependencies
     - run: yarn electron
       name: Download Electron
-    - run: yarn gulp hygiene --skip-tslint
+    - run: yarn gulp hygiene
       name: Run Hygiene Checks
-    - run: yarn gulp tslint
-      name: Run TSLint Checks
-    - run: yarn strict-null-check # {{SQL CARBON EDIT}} add step
-      name: Run Strict Null Check
+    - 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: .\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
@@ -100,19 +121,47 @@ jobs:
       name: Install Dependencies
     - run: yarn electron x64
       name: Download Electron
-    - run: yarn gulp hygiene --skip-tslint
+    - run: yarn gulp hygiene
       name: Run Hygiene Checks
-    - run: yarn gulp tslint
-      name: Run TSLint Checks
-    - run: yarn strict-null-check # {{SQL CARBON EDIT}} add step
-      name: Run Strict Null Check
+    - 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: ./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"

.github/workflows/tslint.yml

@@ -1,13 +0,0 @@
-name: TSLint Enforcement
-on: [pull_request]
-jobs:
-  job:
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    steps:
-      - uses: actions/checkout@v1
-      - name: TSLint
-        uses: aaomidi/gh-action-tslint@master
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          tslint_config: 'tslint-sql.json'

.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/extensions.json

@@ -2,7 +2,6 @@
 	// See https://go.microsoft.com/fwlink/?LinkId=827846
 	// for the documentation about the extensions.json format
 	"recommendations": [
-		"ms-vscode.vscode-typescript-tslint-plugin",
 		"dbaeumer.vscode-eslint",
 		"EditorConfig.EditorConfig",
 		"msjsdiag.debugger-for-chrome"

.vscode/launch.json

@@ -16,8 +16,6 @@
 			"request": "attach",
 			"name": "Attach to Extension Host",
 			"port": 5870,
-			"timeout": 30000,
-			"restart": true,
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
 			]
@@ -36,7 +34,10 @@
 			"port": 5876,
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
-			]
+			],
+			"presentation": {
+				"hidden": true,
+			}
 		},
 		{
 			"type": "node",
@@ -54,7 +55,10 @@
 			"port": 5875,
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
-			]
+			],
+			"presentation": {
+				"hidden": true,
+			}
 		},
 		{
 			"type": "chrome",
@@ -84,9 +88,15 @@
 			"urlFilter": "*workbench.html*",
 			"runtimeArgs": [
 				"--inspect=5875",
-				"--no-cached-data"
+				"--no-cached-data",
+			],
+			"webRoot": "${workspaceFolder}",
+			// Settings for js-debug:
+			"userDataDir": false,
+			"pauseForSourceMap": false,
+			"outFiles": [
+				"${workspaceFolder}/out/**/*.js"
 			],
-			"webRoot": "${workspaceFolder}"
 		},
 		{
 			"type": "node",
@@ -101,7 +111,11 @@
 			],
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
-			]
+			],
+			"presentation": {
+				"group": "2_launch",
+				"order": 1
+			}
 		},
 		{
 			"type": "chrome",
@@ -135,13 +149,21 @@
 			"runtimeArgs": [
 				"web"
 			],
+			"presentation": {
+				"group": "2_launch",
+				"order": 2
+			}
 		},
 		{
 			"type": "chrome",
 			"request": "launch",
 			"name": "Launch ADS (Web, Chrome) (TBD)",
 			"url": "http://localhost:8080",
-			"preLaunchTask": "Run web"
+			"preLaunchTask": "Run web",
+			"presentation": {
+				"group": "2_launch",
+				"order": 3
+			}
 		},
 		{
 			"type": "node",
@@ -152,16 +174,11 @@
 			"cwd": "${workspaceFolder}/extensions/git",
 			"outFiles": [
 				"${workspaceFolder}/extensions/git/out/**/*.js"
-			]
-		},
-		{
-			"name": "Launch Built-in Extension",
-			"type": "extensionHost",
-			"request": "launch",
-			"runtimeExecutable": "${execPath}",
-			"args": [
-				"--extensionDevelopmentPath=${workspaceRoot}/extensions/debug-auto-launch"
-			]
+			],
+			"presentation": {
+				"group": "5_tests",
+				"order": 10
+			}
 		},
 		{
 			"type": "node",
@@ -171,13 +188,17 @@
 			"cwd": "${workspaceFolder}/test/smoke",
 			"env": {
 				"BUILD_ARTIFACTSTAGINGDIRECTORY": "${workspaceFolder}"
+			},
+			"presentation": {
+				"group": "5_tests",
+				"order": 8
 			}
 		},
 		{
 			"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"
@@ -195,6 +216,9 @@
 			],
 			"env": {
 				"MOCHA_COLORS": "true"
+			},
+			"presentation": {
+				"hidden": true
 			}
 		},
 		{
@@ -245,19 +269,16 @@
 				"Run Extension Unit Tests"
 			]
 		},
-		{
-			"name": "Debug Extension Integration Tests",
-			"configurations": [
-				"Attach to Extension Host",
-				"Run Extension Integration Tests"
-			]
-		},
 		{
 			"name": "Debug azuredatastudio Main and Renderer",
 			"configurations": [
 				"Launch azuredatastudio",
 				"Attach to Main Process"
-			]
+			],
+			"presentation": {
+				"group": "1_vscode",
+				"order": 1
+			}
 		},
 		{
 			"name": "Debug azuredatastudio Main, Renderer & Extension Host",
@@ -265,28 +286,33 @@
 				"Launch azuredatastudio",
 				"Attach to Main Process",
 				"Attach to Extension Host"
-			]
-		},
-		{
-			"name": "Debug Renderer and search processes",
-			"configurations": [
-				"Launch azuredatastudio",
-				"Attach to Search Process"
-			]
+			],
+			"presentation": {
+				"group": "1_vscode",
+				"order": 3
+			}
 		},
 		{
 			"name": "Debug Renderer and Extension Host processes",
 			"configurations": [
 				"Launch azuredatastudio",
 				"Attach to Extension Host"
-			]
+			],
+			"presentation": {
+				"group": "1_vscode",
+				"order": 2
+			}
 		},
 		{
 			"name": "Attach Renderer and Extension Host",
 			"configurations": [
 				"Attach to azuredatastudio",
 				"Attach to Extension Host"
-			]
+			],
+			"presentation": {
+				"group": "1_vscode",
+				"order": 2
+			}
 		}
 	]
 }

.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

@@ -0,0 +1,9 @@
+# Query: \\w+\\?\\..+![(.[]
+# Flags: RegExp
+# ContextLines: 2
+src/vs/base/browser/ui/tree/asyncDataTree.ts:
+  270  			} : undefined,
+  271  			isChecked: options.ariaProvider!.isChecked ? (e) => {
+  272: 				return options.ariaProvider?.isChecked!(e.element as T);
+  273  			} : undefined
+  274  		},

.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": [
@@ -37,6 +39,11 @@
 			}
 		}
 	],
+	"eslint.options": {
+		"rulePaths": [
+			"./build/lib/eslint"
+		]
+	},
 	"typescript.tsdk": "node_modules/typescript/lib",
 	"npm.exclude": "**/extensions/**",
 	"npm.packageManager": "yarn",
@@ -62,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

@@ -33,40 +33,18 @@
 		},
 		{
 			"type": "npm",
-			"script": "strict-function-types-watch",
-			"label": "TS - Strict Function Types",
+			"script": "strict-vscode-watch",
+			"label": "TS - Strict VSCode",
 			"isBackground": true,
 			"presentation": {
 				"reveal": "never"
 			},
 			"problemMatcher": {
 				"base": "$tsc-watch",
-				"owner": "typescript-function-types",
+				"owner": "typescript-vscode",
 				"applyTo": "allDocuments"
 			}
 		},
-		{
-			"type": "npm",
-			"script": "strict-null-check-watch",
-			"label": "TS - Strict Null Checks",
-			"isBackground": true,
-			"presentation": {
-				"reveal": "never"
-			},
-			"problemMatcher": {
-				"base": "$tsc-watch",
-				"owner": "typescript-strict-null-checks",
-				"applyTo": "allDocuments"
-			}
-		},
-		{
-			"type": "gulp",
-			"task": "tslint",
-			"label": "Run tslint",
-			"problemMatcher": [
-				"$tslint5"
-			]
-		},
 		{
 			"label": "Run tests",
 			"type": "shell",
@@ -104,7 +82,6 @@
 			"command": "yarn web -- --no-launch",
 			"label": "Run web",
 			"isBackground": true,
-			// This section to make error go away when launching the debug config
 			"problemMatcher": {
 				"pattern": {
 					"regexp": ""
@@ -118,5 +95,13 @@
 				"reveal": "never"
 			}
 		},
+		{
+			"type": "npm",
+			"script": "eslint",
+			"problemMatcher": {
+				"source": "eslint",
+				"base": "$eslint-stylish"
+			}
+		}
 	]
 }

.yarnrc

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

CHANGELOG.md

@@ -1,5 +1,48 @@
 # 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
+* Hotfix for bug https://github.com/microsoft/azuredatastudio/issues/8768
+
+## Version 1.14.0
+* Release date: December 19, 2019
+* Release status: General Availability
+* Added bigdatacluster.ignoreSslVerification setting to allow ignoring SSL verification errors when connecting to a BDC [#8129](https://github.com/microsoft/azuredatastudio/issues/8129)
+* Changed attach to connection dropdown in Notebooks to only list the currently active connection [#8582](https://github.com/microsoft/azuredatastudio/pull/8582)
+* Allow changing default language flavor for offline query editors [#8419](https://github.com/microsoft/azuredatastudio/pull/8419)
+* GA status for Big Data Cluster/SQL 2019 features [#8269](https://github.com/microsoft/azuredatastudio/issues/8269)
+* Resolved [bugs and issues](https://github.com/microsoft/azuredatastudio/milestone/44?closed=1).
+
+## Contributions and "thank you"
+We would like to thank all our users who raised issues, and in particular the following users who helped contribute fixes:
+
 ## Version 1.13.1
 * Release date: November 15, 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=2109256
-Windows System Installer | https://go.microsoft.com/fwlink/?linkid=2109085
-Windows ZIP | https://go.microsoft.com/fwlink/?linkid=2109255
-macOS ZIP | https://go.microsoft.com/fwlink/?linkid=2109180
-Linux TAR.GZ | https://go.microsoft.com/fwlink/?linkid=2109179
-Linux RPM | https://go.microsoft.com/fwlink/?linkid=2109178
-Linux DEB | https://go.microsoft.com/fwlink/?linkid=2109254
+| 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

azure-pipelines.yml

@@ -17,6 +17,6 @@ jobs:
 
 - job: macOS
   pool:
-    vmImage: macOS 10.13
+    vmImage: macOS-latest
   steps:
   - template: build/azure-pipelines/darwin/continuous-build-darwin.yml

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

@@ -24,20 +24,17 @@ steps:
     yarn electron x64
   displayName: Download Electron
 - script: |
-    yarn gulp hygiene --skip-tslint
+    yarn gulp hygiene
   displayName: Run Hygiene Checks
-- script: |
-    yarn gulp tslint
-  displayName: Run TSLint Checks
 - script: | # {{SQL CARBON EDIT}} add step
-    yarn strict-null-check
+    yarn strict-vscode
   displayName: Run Strict Null Check.
-- script: | # {{SQL CARBON EDIT}} add step
-    yarn tslint
-  displayName: Run TSLint (gci)
 # - script: | {{SQL CARBON EDIT}} remove step
 #     yarn monaco-compile-check
 #   displayName: Run Monaco Editor Checks
+- script: |
+    yarn valid-layers-check
+  displayName: Run Valid Layers Checks
 - script: |
     yarn compile
   displayName: Compile Sources
@@ -46,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,9 +5,6 @@ REPO="$(pwd)"
 # ensure drop directories exist
 mkdir -p $REPO/.build/darwin/{archive,server}
 
-# remove pkg from archive
-zip -d $REPO/.build/darwin/archive/azuredatastudio-darwin.zip "*.pkg"
-
 # 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

@@ -0,0 +1,22 @@
+<?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-executable-page-protection</key>
+	<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
@@ -64,6 +70,8 @@ steps:
       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
@@ -84,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
@@ -105,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:
@@ -122,13 +177,57 @@ steps:
         [
           {
             "keyCode": "CP-401337-Apple",
-            "operationSetCode": "MacAppDeveloperSign",
-            "parameters": [],
+            "operationCode": "MacAppDeveloperSign",
+            "parameters": {
+              "Hardening": "Enable"
+            },
             "toolName": "sign",
             "toolVersion": "1.0"
           }
         ]
-      SessionTimeout: 20
+      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: |
       set -e
@@ -146,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/Dockerfile

@@ -2,11 +2,16 @@
 FROM ubuntu:16.04
 
 # Update Software repository
-RUN apt-get update --fix-missing
+RUN apt-get update && apt-get upgrade -y
 
 RUN apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb libgtk-3-0 \
 	libkrb5-dev git apt-transport-https ca-certificates curl gnupg-agent software-properties-common \
-	libnss3 libasound2 make gcc libx11-dev fakeroot rpm
+	libnss3 libasound2 make gcc libx11-dev fakeroot rpm libgconf-2-4 libunwind8 g++-4.8
+
+RUN rm /usr/bin/gcc
+RUN rm /usr/bin/g++
+RUN ln -s /usr/bin/gcc-4.8 /usr/bin/gcc
+RUN ln -s /usr/bin/g++-4.8 /usr/bin/g++
 
 #docker
 RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
@@ -15,6 +20,8 @@ RUN add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubunt
 RUN apt-get update
 RUN apt-get -y install docker-ce docker-ce-cli containerd.io
 
+# This image needs to be built on a linux host; some weird stuff happens and the xvfb service won't start
+# if built on a windows host.
 ADD ./xvfb.init /etc/init.d/xvfb
 RUN chmod +x /etc/init.d/xvfb
 RUN update-rc.d xvfb defaults

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

@@ -32,20 +32,17 @@ steps:
     yarn electron x64
   displayName: Download Electron
 - script: |
-    yarn gulp hygiene --skip-tslint
+    yarn gulp hygiene
   displayName: Run Hygiene Checks
-- script: |
-    yarn gulp tslint
-  displayName: Run TSLint Checks
-- script: | # {{SQL CARBON EDIT}} add gci checks
-    yarn tslint
-  displayName: Run TSLint (gci)
 - script: | # {{SQL CARBON EDIT}} add strict null check
-    yarn strict-null-check
+    yarn strict-vscode
   displayName: Run Strict Null Check
 # - script: | {{SQL CARBON EDIT}} remove monaco editor checks
 #     yarn monaco-compile-check
 #   displayName: Run Monaco Editor Checks
+- script: |
+    yarn valid-layers-check
+  displayName: Run Valid Layers Checks
 - script: |
     yarn compile
   displayName: Compile Sources
@@ -54,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

@@ -63,6 +63,8 @@ steps:
       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
@@ -83,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
@@ -145,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-build.yml

@@ -102,7 +102,7 @@ jobs:
 - job: macOS
   condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), eq(variables['VSCODE_BUILD_MACOS'], 'true'))
   pool:
-    vmImage: macOS 10.13
+    vmImage: macOS-latest
   dependsOn:
   - Compile
   steps:

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
@@ -88,10 +105,10 @@ steps:
 
 - script: |
     set -e
-    yarn gulp hygiene --skip-tslint
-    yarn gulp tslint
+    yarn gulp hygiene
     yarn monaco-compile-check
-  displayName: Run hygiene, tslint and monaco compile checks
+    yarn valid-layers-check
+  displayName: Run hygiene, monaco compile & valid layers checks
   condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
 - script: |

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

@@ -1,7 +1,7 @@
 resources:
   containers:
   - container: linux-x64
-    image: sqltoolscontainers.azurecr.io/linux-build-agent:x64
+    image: sqltoolscontainers.azurecr.io/linux-build-agent:1
     endpoint: ContainerRegistry
 
 jobs:
@@ -10,16 +10,21 @@ 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
   condition: eq(variables['VSCODE_BUILD_MACOS'], 'true')
   pool:
-    vmImage: macOS 10.13
+    vmImage: macOS-latest
   dependsOn:
   - Compile
   steps:
   - template: darwin/sql-product-build-darwin.yml
+  timeoutInMinutes: 180
 
 - job: Linux
   condition: eq(variables['VSCODE_BUILD_LINUX'], 'true')
@@ -30,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')
@@ -39,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'))
@@ -57,6 +74,7 @@ jobs:
   dependsOn:
   - macOS
   - Linux
+  - Docker
   - Windows
   - Windows_Test
   steps:

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

@@ -87,9 +87,11 @@ steps:
 
 - script: |
     set -e
-    yarn gulp hygiene --skip-tslint
-    yarn gulp tslint
-  displayName: Run hygiene, tslint
+    yarn sqllint
+    yarn gulp hygiene
+    yarn strict-vscode
+    yarn valid-layers-check
+  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

@@ -29,20 +29,17 @@ steps:
 - powershell: |
     yarn electron
 - script: |
-    yarn gulp hygiene --skip-tslint
+    yarn gulp hygiene
   displayName: Run Hygiene Checks
-- script: |
-    yarn gulp tslint
-  displayName: Run TSLint Checks
 - script: | # {{SQL CARBON EDIT}} add step
-    yarn tslint
-  displayName: Run TSLint (gci)
-- script: | # {{SQL CARBON EDIT}} add step
-    yarn strict-null-check
+    yarn strict-vscode
   displayName: Run Strict Null Check
 # - powershell: | {{SQL CARBON EDIT}} remove step
 #     yarn monaco-compile-check
 #   displayName: Run Monaco Editor Checks
+- script: |
+    yarn valid-layers-check
+  displayName: Run Valid Layers Checks
 - powershell: |
     yarn compile
   displayName: Compile Sources
@@ -51,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

@@ -66,6 +66,8 @@ steps:
       $env:CHILD_CONCURRENCY="1"
       exec { 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
@@ -88,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"
@@ -101,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)
@@ -108,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
@@ -260,17 +258,7 @@ steps:
       searchFolder: '$(Build.SourcesDirectory)'
       failTaskOnFailedTests: true
     continueOnError: true
-    condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
-
-  - task: PublishTestResults@2
-    displayName: 'Publish Integration and Smoke Test Results'
-    inputs:
-      testResultsFiles: '*.xml'
-      searchFolder: '$(Build.ArtifactStagingDirectory)\test-results'
-      mergeTestResults: true
-      failTaskOnFailedTests: true
-    continueOnError: true
-    condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
+    condition: and(succeeded(), eq(variables['RUN_UNSTABLE_TESTS'], 'true'))
 
   - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
     displayName: 'Component Detection'

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
@@ -38,7 +41,7 @@ steps:
   inputs:
     azureSubscription: 'ClientToolsInfra_670062 (88d5392f-a34f-4769-b405-f597fc533613)'
     KeyVaultName: SqlToolsSecretStore
-    SecretsFilter: 'ads-integration-test-azure-server,ads-integration-test-azure-server-password,ads-integration-test-azure-server-username,ads-integration-test-bdc-server,ads-integration-test-bdc-server-password,ads-integration-test-bdc-server-username,ads-integration-test-standalone-server,ads-integration-test-standalone-server-password,ads-integration-test-standalone-server-username'
+    SecretsFilter: 'ads-integration-test-azure-server,ads-integration-test-azure-server-password,ads-integration-test-azure-server-username,ads-integration-test-bdc-server,ads-integration-test-bdc-server-password,ads-integration-test-bdc-server-username,ads-integration-test-standalone-server,ads-integration-test-standalone-server-password,ads-integration-test-standalone-server-username,ads-integration-test-standalone-server-2019,ads-integration-test-standalone-server-password-2019,ads-integration-test-standalone-server-username-2019'
 
 - 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:
@@ -60,29 +63,9 @@ steps:
     AZURE_SQL_USERNAME: $(ads-integration-test-azure-server-username)
     AZURE_SQL_PWD: $(ads-integration-test-azure-server-password)
     AZURE_SQL: $(ads-integration-test-azure-server)
-
-- powershell: |
-    . build/azure-pipelines/win32/exec.ps1
-    $ErrorActionPreference = "Stop"
-    $AppRoot = "$(Agent.TempDirectory)\azuredatastudio-win32-x64"
-    $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
-  condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))
-  displayName: Run release tests
-  env:
-    ADS_TEST_GREP: (.*@REL@|integration test setup)
-    ADS_TEST_INVERT_GREP: 0
-    BDC_BACKEND_USERNAME: $(ads-integration-test-bdc-server-username)
-    BDC_BACKEND_PWD: $(ads-integration-test-bdc-server-password)
-    BDC_BACKEND_HOSTNAME: $(ads-integration-test-bdc-server)
-    STANDALONE_SQL_USERNAME: $(ads-integration-test-standalone-server-username)
-    STANDALONE_SQL_PWD: $(ads-integration-test-standalone-server-password)
-    STANDALONE_SQL: $(ads-integration-test-standalone-server)
-    AZURE_SQL_USERNAME: $(ads-integration-test-azure-server-username)
-    AZURE_SQL_PWD: $(ads-integration-test-azure-server-password)
-    AZURE_SQL: $(ads-integration-test-azure-server)
+    STANDALONE_SQL_USERNAME_2019: $(ads-integration-test-standalone-server-username-2019)
+    STANDALONE_SQL_PWD_2019: $(ads-integration-test-standalone-server-password-2019)
+    STANDALONE_SQL_2019: $(ads-integration-test-standalone-server-2019)
 
 - powershell: |
     . build/azure-pipelines/win32/exec.ps1
@@ -104,3 +87,16 @@ steps:
     AZURE_SQL_USERNAME: $(ads-integration-test-azure-server-username)
     AZURE_SQL_PWD: $(ads-integration-test-azure-server-password)
     AZURE_SQL: $(ads-integration-test-azure-server)
+    STANDALONE_SQL_USERNAME_2019: $(ads-integration-test-standalone-server-username-2019)
+    STANDALONE_SQL_PWD_2019: $(ads-integration-test-standalone-server-password-2019)
+    STANDALONE_SQL_2019: $(ads-integration-test-standalone-server-2019)
+
+- task: PublishTestResults@2
+  displayName: 'Publish Integration and Smoke Test Results'
+  inputs:
+    testResultsFiles: '*.xml'
+    searchFolder: '$(Build.ArtifactStagingDirectory)\test-results'
+    mergeTestResults: true
+    failTaskOnFailedTests: true
+  continueOnError: true
+  condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))

build/builtInExtensions-insiders.json

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

build/builtInExtensions.json

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

build/builtin/browser-main.js

@@ -6,11 +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 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) {
@@ -111,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 {
@@ -123,4 +122,4 @@ function main() {
 	render(el, { builtin, control });
 }
 
-window.onload = main;
+window.onload = main;

build/gulpfile.editor.js

@@ -16,15 +16,17 @@ 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');
 
-var root = path.dirname(__dirname);
-var sha1 = util.getVersion(root);
-var semver = require('./monaco/package.json').version;
-var headerVersion = semver + '(' + sha1 + ')';
+let root = path.dirname(__dirname);
+let sha1 = util.getVersion(root);
+let semver = require('./monaco/package.json').version;
+let headerVersion = semver + '(' + sha1 + ')';
 
 // Build
 
-var editorEntryPoints = [
+let editorEntryPoints = [
 	{
 		name: 'vs/editor/editor.main',
 		include: [],
@@ -40,11 +42,11 @@ var editorEntryPoints = [
 	}
 ];
 
-var editorResources = [
+let editorResources = [
 	'out-editor-build/vs/base/browser/ui/codiconLabel/**/*.ttf'
 ];
 
-var BUNDLED_FILE_HEADER = [
+let BUNDLED_FILE_HEADER = [
 	'/*!-----------------------------------------------------------',
 	' * Copyright (c) Microsoft Corporation. All rights reserved.',
 	' * Version: ' + headerVersion,
@@ -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));
@@ -197,7 +199,7 @@ const compileEditorESMTask = task.define('compile-editor-esm', () => {
 });
 
 function toExternalDTS(contents) {
-	let lines = contents.split('\n');
+	let lines = contents.split(/\r\n|\r|\n/);
 	let killNextCloseCurlyBrace = false;
 	for (let i = 0; i < lines.length; i++) {
 		let line = lines[i];
@@ -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) {
@@ -263,7 +270,7 @@ const finalEditorResourcesTask = task.define('final-editor-resources', () => {
 		// package.json
 		gulp.src('build/monaco/package.json')
 			.pipe(es.through(function (data) {
-				var json = JSON.parse(data.contents.toString());
+				let json = JSON.parse(data.contents.toString());
 				json.private = false;
 				data.contents = Buffer.from(JSON.stringify(json, null, '  '));
 				this.emit('data', data);
@@ -307,10 +314,10 @@ const finalEditorResourcesTask = task.define('final-editor-resources', () => {
 				return;
 			}
 
-			var relativePathToMap = path.relative(path.join(data.relative), path.join('min-maps', data.relative + '.map'));
+			let relativePathToMap = path.relative(path.join(data.relative), path.join('min-maps', data.relative + '.map'));
 
-			var strContents = data.contents.toString();
-			var newStr = '//# sourceMappingURL=' + relativePathToMap.replace(/\\/g, '/');
+			let strContents = data.contents.toString();
+			let newStr = '//# sourceMappingURL=' + relativePathToMap.replace(/\\/g, '/');
 			strContents = strContents.replace(/\/\/# sourceMappingURL=[^ ]+$/, newStr);
 
 			data.contents = Buffer.from(strContents);
@@ -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,56 @@ 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);
+	fs.writeFileSync(path.join(root, 'src/vs/editor/common/standalone/standaloneEnums.ts'), result.enums);
+	return Promise.resolve(true);
+}));
+
 //#region monaco type checking
 
 function createTscCompileTask(watch) {
@@ -391,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

@@ -8,10 +8,8 @@
 const gulp = require('gulp');
 const filter = require('gulp-filter');
 const es = require('event-stream');
-const gulptslint = require('gulp-tslint');
 const gulpeslint = require('gulp-eslint');
 const tsfmt = require('typescript-formatter');
-const tslint = require('tslint');
 const VinylFile = require('vinyl');
 const vfs = require('vinyl-fs');
 const path = require('path');
@@ -35,7 +33,9 @@ const all = [
 	'scripts/**/*',
 	'src/**/*',
 	'test/**/*',
-	'!**/node_modules/**'
+	'!test/**/out/**',
+	'!**/node_modules/**',
+	'!build/actions/**/dist/*' // {{ SQL CARBON EDIT }}
 ];
 
 const indentationFilter = [
@@ -55,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/**',
@@ -86,8 +85,8 @@ 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}',
-	'!build/{lib,tslintRules,download}/**/*.js',
+	'!**/*.{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',
 	'!build/azure-pipelines/**/*.config',
@@ -97,14 +96,17 @@ 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/**',
 	'!extensions/resource-deployment/notebooks/**',
 	'!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 = [
@@ -126,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',
@@ -142,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',
@@ -152,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',
@@ -172,7 +173,7 @@ const copyrightFilter = [
 	'!**/*.bacpac'
 ];
 
-const eslintFilter = [
+const jsHygieneFilter = [
 	'src/**/*.js',
 	'build/gulpfile.*.js',
 	'!src/vs/loader.js',
@@ -185,7 +186,10 @@ const eslintFilter = [
 	'!**/test/**'
 ];
 
-const tslintBaseFilter = [
+const tsHygieneFilter = [
+	'src/**/*.ts',
+	'test/**/*.ts',
+	'extensions/**/*.ts',
 	'!**/fixtures/**',
 	'!**/typings/**',
 	'!**/node_modules/**',
@@ -196,68 +200,10 @@ const tslintBaseFilter = [
 	'!extensions/html-language-features/server/lib/jquery.d.ts',
 	'!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/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/extensionRecommendationsService.ts' // {{SQL CARBON EDIT}} skip this because known issue
 ];
 
-// {{SQL CARBON EDIT}}
-const sqlFilter = [
-	'src/sql/**',
-	'extensions/**',
-	// Ignore VS Code extensions
-	'!extensions/bat/**',
-	'!extensions/configuration-editing/**',
-	'!extensions/docker/**',
-	'!extensions/extension-editing/**',
-	'!extensions/git/**',
-	'!extensions/git-ui/**',
-	'!extensions/image-preview/**',
-	'!extensions/insights-default/**',
-	'!extensions/json/**',
-	'!extensions/json-language-features/**',
-	'!extensions/markdown-basics/**',
-	'!extensions/markdown-language-features/**',
-	'!extensions/merge-conflict/**',
-	'!extensions/powershell/**',
-	'!extensions/python/**',
-	'!extensions/r/**',
-	'!extensions/theme-*/**',
-	'!extensions/vscode-*/**',
-	'!extensions/xml/**',
-	'!extensions/xml-language-features/**',
-	'!extensions/yarml/**',
-];
-
-const tslintCoreFilter = [
-	'src/**/*.ts',
-	'test/**/*.ts',
-	'!extensions/**/*.ts',
-	'!test/automation/**',
-	'!test/smoke/**',
-	...tslintBaseFilter
-];
-
-const tslintExtensionsFilter = [
-	'extensions/**/*.ts',
-	'!src/**/*.ts',
-	'!test/**/*.ts',
-	'test/automation/**/*.ts',
-	...tslintBaseFilter
-];
-
-const tslintHygieneFilter = [
-	'src/**/*.ts',
-	'test/**/*.ts',
-	'extensions/**/*.ts',
-	'!src/vs/workbench/contrib/extensions/browser/extensionTipsService.ts', // {{SQL CARBON EDIT}} known formatting issue do to commenting out code
-	...tslintBaseFilter
-];
-
-const fileLengthFilter = filter([
-	'**',
-	'!extensions/import/*.docx',
-	'!extensions/admin-tool-ext-win/license/**'
-], {restore: true});
-
 const copyrightHeaderLines = [
 	'/*---------------------------------------------------------------------------------------------',
 	' *  Copyright (c) Microsoft Corporation. All rights reserved.',
@@ -267,27 +213,17 @@ const copyrightHeaderLines = [
 
 gulp.task('eslint', () => {
 	return vfs.src(all, { base: '.', follow: true, allowEmpty: true })
-		.pipe(filter(eslintFilter))
-		.pipe(gulpeslint('src/.eslintrc'))
+		.pipe(filter(jsHygieneFilter.concat(tsHygieneFilter)))
+		.pipe(gulpeslint({
+			configFile: '.eslintrc.json',
+			rulePaths: ['./build/lib/eslint']
+		}))
 		.pipe(gulpeslint.formatEach('compact'))
-		.pipe(gulpeslint.failAfterError());
-});
-
-gulp.task('tslint', () => {
-	return es.merge([
-
-		// Core: include type information (required by certain rules like no-nodejs-globals)
-		vfs.src(all, { base: '.', follow: true, allowEmpty: true })
-			.pipe(filter(tslintCoreFilter))
-			.pipe(gulptslint.default({ rulesDirectory: 'build/lib/tslint', program: tslint.Linter.createProgram('src/tsconfig.json') }))
-			.pipe(gulptslint.default.report({ emitError: true })),
-
-		// Exenstions: do not include type information
-		vfs.src(all, { base: '.', follow: true, allowEmpty: true })
-			.pipe(filter(tslintExtensionsFilter))
-			.pipe(gulptslint.default({ rulesDirectory: 'build/lib/tslint' }))
-			.pipe(gulptslint.default.report({ emitError: true }))
-	]).pipe(es.through());
+		.pipe(gulpeslint.results(results => {
+			if (results.warningCount > 0 || results.errorCount > 0) {
+				throw new Error('eslint failed with warnings and/or errors');
+			}
+		}));
 });
 
 function checkPackageJSON(actualPath) {
@@ -309,7 +245,7 @@ function checkPackageJSON(actualPath) {
 
 const checkPackageJSONTask = task.define('check-package-json', () => {
 	return gulp.src('package.json')
-		.pipe(es.through(function() {
+		.pipe(es.through(function () {
 			checkPackageJSON.call(this, 'remote/package.json');
 			checkPackageJSON.call(this, 'remote/web/package.json');
 		}));
@@ -376,8 +312,6 @@ function hygiene(some) {
 			replace: undefined,
 			tsconfig: undefined,
 			tsconfigFile: undefined,
-			tslint: undefined,
-			tslintFile: undefined,
 			tsfmtFile: undefined,
 			vscode: undefined,
 			vscodeFile: undefined
@@ -386,7 +320,7 @@ function hygiene(some) {
 			let formatted = result.dest.replace(/\r\n/gm, '\n');
 
 			if (original !== formatted) {
-				console.error("File not formatted. Run the 'Format Document' command to fix it:", file.relative);
+				console.error('File not formatted. Run the \'Format Document\' command to fix it:', file.relative);
 				errorCount++;
 			}
 			cb(null, file);
@@ -396,33 +330,6 @@ function hygiene(some) {
 		});
 	});
 
-	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.`);
-			errorCount++;
-		}
-		if (file.relative.length > 150) {
-			console.error(`File path ${file.relative} exceeds acceptable file-length. Rename the path to have less than 150 characters.`);
-			errorCount++;
-		}
-
-		this.emit('data', file);
-	});
-
-	const tslintConfiguration = tslint.Configuration.findConfiguration('tslint.json', '.');
-	const tslintOptions = { fix: false, formatter: 'json' };
-	const tsLinter = new tslint.Linter(tslintOptions);
-
-	const tsl = es.through(function (file) {
-		const contents = file.contents.toString('utf8');
-		tsLinter.lint(file.relative, contents, tslintConfiguration.results);
-		this.emit('data', file);
-	});
-
 	let input;
 
 	if (Array.isArray(some) || typeof some === 'string' || !some) {
@@ -436,22 +343,9 @@ function hygiene(some) {
 		input = some;
 	}
 
-	// {{SQL CARBON EDIT}} Linting for SQL
-	const tslintSqlConfiguration = tslint.Configuration.findConfiguration('tslint-sql.json', '.');
-	const tslintSqlOptions = { fix: false, formatter: 'json' };
-	const sqlTsLinter = new tslint.Linter(tslintSqlOptions);
-
-	const sqlTsl = es.through(function (file) { //TODO restore
-		const contents = file.contents.toString('utf8');
-		sqlTsLinter.lint(file.relative, contents, tslintSqlConfiguration.results);
-	});
-
 	const productJsonFilter = filter('product.json', { restore: true });
 
 	const result = input
-		.pipe(fileLengthFilter)
-		.pipe(filelength)
-		.pipe(fileLengthFilter.restore)
 		.pipe(filter(f => !f.stat.isDirectory()))
 		.pipe(productJsonFilter)
 		.pipe(process.env['BUILD_SOURCEVERSION'] ? es.through() : productJson)
@@ -461,22 +355,21 @@ function hygiene(some) {
 		.pipe(filter(copyrightFilter))
 		.pipe(copyrights);
 
-	let typescript = result
-		.pipe(filter(tslintHygieneFilter))
+	const typescript = result
+		.pipe(filter(tsHygieneFilter))
 		.pipe(formatting);
 
-	if (!process.argv.some(arg => arg === '--skip-tslint')) {
-		typescript = typescript.pipe(tsl);
-		typescript = typescript
-			.pipe(filter(sqlFilter)) // {{SQL CARBON EDIT}}
-			.pipe(sqlTsl);
-	}
-
 	const javascript = result
-		.pipe(filter(eslintFilter))
-		.pipe(gulpeslint('src/.eslintrc'))
+		.pipe(filter(jsHygieneFilter.concat(tsHygieneFilter)))
+		.pipe(gulpeslint({
+			configFile: '.eslintrc.json',
+			rulePaths: ['./build/lib/eslint']
+		}))
 		.pipe(gulpeslint.formatEach('compact'))
-		.pipe(gulpeslint.failAfterError());
+		.pipe(gulpeslint.results(results => {
+			errorCount += results.warningCount;
+			errorCount += results.errorCount;
+		}));
 
 	let count = 0;
 	return es.merge(typescript, javascript)
@@ -488,33 +381,6 @@ function hygiene(some) {
 			this.emit('data', data);
 		}, function () {
 			process.stdout.write('\n');
-
-			const tslintResult = tsLinter.getResult();
-			if (tslintResult.failures.length > 0) {
-				for (const failure of tslintResult.failures) {
-					const name = failure.getFileName();
-					const position = failure.getStartPosition();
-					const line = position.getLineAndCharacter().line;
-					const character = position.getLineAndCharacter().character;
-
-					console.error(`${name}:${line + 1}:${character + 1}:${failure.getFailure()}`);
-				}
-				errorCount += tslintResult.failures.length;
-			}
-
-			const sqlTslintResult = sqlTsLinter.getResult();
-			if (sqlTslintResult.failures.length > 0) {
-				for (const failure of sqlTslintResult.failures) {
-					const name = failure.getFileName();
-					const position = failure.getStartPosition();
-					const line = position.getLineAndCharacter().line;
-					const character = position.getLineAndCharacter().character;
-
-					console.error(`${name}:${line + 1}:${character + 1}:${failure.getFailure()}`);
-				}
-				errorCount += sqlTslintResult.failures.length;
-			}
-
 			if (errorCount > 0) {
 				this.emit('error', 'Hygiene failed with ' + errorCount + ' errors. Check \'build/gulpfile.hygiene.js\'.');
 			} else {

build/gulpfile.reh.js

@@ -118,7 +118,7 @@ function mixinServer(watch) {
 	const packageJSONPath = path.join(path.dirname(__dirname), 'package.json');
 	function exec(cmdLine) {
 		console.log(cmdLine);
-		cp.execSync(cmdLine, { stdio: "inherit" });
+		cp.execSync(cmdLine, { stdio: 'inherit' });
 	}
 	function checkout() {
 		const packageJSON = JSON.parse(fs.readFileSync(packageJSONPath).toString());

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);
-		var 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);
-	var 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
 	})
 ));
@@ -150,9 +148,9 @@ gulp.task(minifyVSCodeTask);
  * @return {Object} A map of paths to checksums.
  */
 function computeChecksums(out, filenames) {
-	var result = {};
+	let result = {};
 	filenames.forEach(function (filename) {
-		var fullPath = path.join(process.cwd(), out, filename);
+		let fullPath = path.join(process.cwd(), out, filename);
 		result[filename] = computeChecksum(fullPath);
 	});
 	return result;
@@ -165,9 +163,9 @@ function computeChecksums(out, filenames) {
  * @return {string} The checksum for `filename`.
  */
 function computeChecksum(filename) {
-	var contents = fs.readFileSync(filename);
+	let contents = fs.readFileSync(filename);
 
-	var hash = crypto
+	let hash = crypto
 		.createHash('md5')
 		.update(contents)
 		.digest('base64')
@@ -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'
 		]);
@@ -236,7 +235,6 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 		const api = gulp.src('src/vs/vscode.d.ts').pipe(rename('out/vs/vscode.d.ts'));
 		// {{SQL CARBON EDIT}}
 		const dataApi = gulp.src('src/sql/azdata.d.ts').pipe(rename('out/sql/azdata.d.ts'));
-		const sqlopsAPI = gulp.src('src/sql/sqlops.d.ts').pipe(rename('out/sql/sqlops.d.ts'));
 
 		const telemetry = gulp.src('.build/telemetry/**', { base: '.build/telemetry', dot: true });
 
@@ -253,8 +251,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 			productJsonStream,
 			license,
 			api,
-			dataApi,
-			sqlopsAPI, // {{SQL CARBON EDIT}}
+			dataApi, // {{SQL CARBON EDIT}}
 			telemetry,
 			sources,
 			deps
@@ -276,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 })))
@@ -330,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

@@ -23,7 +23,7 @@ const commit = util.getVersion(root);
 const linuxPackageRevision = Math.floor(new Date().getTime() / 1000);
 
 function getDebPackageArch(arch) {
-	return { x64: 'amd64', arm: 'armhf', arm64: "arm64" }[arch];
+	return { x64: 'amd64', arm: 'armhf', arm64: 'arm64' }[arch];
 }
 
 function prepareDebPackage(arch) {
@@ -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'));
 
@@ -118,7 +116,7 @@ function getRpmBuildPath(rpmArch) {
 }
 
 function getRpmPackageArch(arch) {
-	return { x64: 'x86_64', arm: 'armhf', arm64: "arm64" }[arch];
+	return { x64: 'x86_64', arm: 'armhf', arm64: 'arm64' }[arch];
 }
 
 function prepareRpmPackage(arch) {
@@ -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,10 +18,7 @@ const fancyLog = require('fancy-log');
 const ansiColors = require('ansi-colors');
 
 const root = path.dirname(path.dirname(__dirname));
-// {{SQL CARBON EDIT}}
-const quality = process.env['VSCODE_QUALITY'];
-const builtInExtensions = quality && quality === 'stable' ? require('../builtInExtensions.json') : require('../builtInExtensions-insiders.json');
-// {{SQL CARBON EDIT}} - END
+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/code-import-patterns.js

@@ -0,0 +1,59 @@
+"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 path_1 = require("path");
+const minimatch = require("minimatch");
+const utils_1 = require("./utils");
+module.exports = new class {
+    constructor() {
+        this.meta = {
+            messages: {
+                badImport: 'Imports violates \'{{restrictions}}\' restrictions. See https://github.com/microsoft/vscode/wiki/Source-Code-Organization'
+            },
+            docs: {
+                url: 'https://github.com/microsoft/vscode/wiki/Source-Code-Organization'
+            }
+        };
+    }
+    create(context) {
+        const configs = context.options;
+        for (const config of configs) {
+            if (minimatch(context.getFilename(), config.target)) {
+                return utils_1.createImportRuleListener((node, value) => this._checkImport(context, config, node, value));
+            }
+        }
+        return {};
+    }
+    _checkImport(context, config, node, path) {
+        // resolve relative paths
+        if (path[0] === '.') {
+            path = path_1.join(context.getFilename(), path);
+        }
+        let restrictions;
+        if (typeof config.restrictions === 'string') {
+            restrictions = [config.restrictions];
+        }
+        else {
+            restrictions = config.restrictions;
+        }
+        let matched = false;
+        for (const pattern of restrictions) {
+            if (minimatch(path, pattern)) {
+                matched = true;
+                break;
+            }
+        }
+        if (!matched) {
+            // None of the restrictions matched
+            context.report({
+                loc: node.loc,
+                messageId: 'badImport',
+                data: {
+                    restrictions: restrictions.join(' or ')
+                }
+            });
+        }
+    }
+};

build/lib/eslint/code-import-patterns.ts

@@ -0,0 +1,75 @@
+/*---------------------------------------------------------------------------------------------
+ *  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';
+import { join } from 'path';
+import * as minimatch from 'minimatch';
+import { createImportRuleListener } from './utils';
+
+interface ImportPatternsConfig {
+	target: string;
+	restrictions: string | string[];
+}
+
+export = new class implements eslint.Rule.RuleModule {
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		messages: {
+			badImport: 'Imports violates \'{{restrictions}}\' restrictions. See https://github.com/microsoft/vscode/wiki/Source-Code-Organization'
+		},
+		docs: {
+			url: 'https://github.com/microsoft/vscode/wiki/Source-Code-Organization'
+		}
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+
+		const configs = <ImportPatternsConfig[]>context.options;
+
+		for (const config of configs) {
+			if (minimatch(context.getFilename(), config.target)) {
+				return createImportRuleListener((node, value) => this._checkImport(context, config, node, value));
+			}
+		}
+
+		return {};
+	}
+
+	private _checkImport(context: eslint.Rule.RuleContext, config: ImportPatternsConfig, node: TSESTree.Node, path: string) {
+
+		// resolve relative paths
+		if (path[0] === '.') {
+			path = join(context.getFilename(), path);
+		}
+
+		let restrictions: string[];
+		if (typeof config.restrictions === 'string') {
+			restrictions = [config.restrictions];
+		} else {
+			restrictions = config.restrictions;
+		}
+
+		let matched = false;
+		for (const pattern of restrictions) {
+			if (minimatch(path, pattern)) {
+				matched = true;
+				break;
+			}
+		}
+
+		if (!matched) {
+			// None of the restrictions matched
+			context.report({
+				loc: node.loc,
+				messageId: 'badImport',
+				data: {
+					restrictions: restrictions.join(' or ')
+				}
+			});
+		}
+	}
+};
+

build/lib/eslint/code-layering.js

@@ -0,0 +1,68 @@
+"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 path_1 = require("path");
+const utils_1 = require("./utils");
+module.exports = new class {
+    constructor() {
+        this.meta = {
+            messages: {
+                layerbreaker: 'Bad layering. You are not allowed to access {{from}} from here, allowed layers are: [{{allowed}}]'
+            },
+            docs: {
+                url: 'https://github.com/microsoft/vscode/wiki/Source-Code-Organization'
+            }
+        };
+    }
+    create(context) {
+        const fileDirname = path_1.dirname(context.getFilename());
+        const parts = fileDirname.split(/\\|\//);
+        const ruleArgs = context.options[0];
+        let config;
+        for (let i = parts.length - 1; i >= 0; i--) {
+            if (ruleArgs[parts[i]]) {
+                config = {
+                    allowed: new Set(ruleArgs[parts[i]]).add(parts[i]),
+                    disallowed: new Set()
+                };
+                Object.keys(ruleArgs).forEach(key => {
+                    if (!config.allowed.has(key)) {
+                        config.disallowed.add(key);
+                    }
+                });
+                break;
+            }
+        }
+        if (!config) {
+            // nothing
+            return {};
+        }
+        return utils_1.createImportRuleListener((node, path) => {
+            if (path[0] === '.') {
+                path = path_1.join(path_1.dirname(context.getFilename()), path);
+            }
+            const parts = path_1.dirname(path).split(/\\|\//);
+            for (let i = parts.length - 1; i >= 0; i--) {
+                const part = parts[i];
+                if (config.allowed.has(part)) {
+                    // GOOD - same layer
+                    break;
+                }
+                if (config.disallowed.has(part)) {
+                    // BAD - wrong layer
+                    context.report({
+                        loc: node.loc,
+                        messageId: 'layerbreaker',
+                        data: {
+                            from: part,
+                            allowed: [...config.allowed.keys()].join(', ')
+                        }
+                    });
+                    break;
+                }
+            }
+        });
+    }
+};

build/lib/eslint/code-layering.ts

@@ -0,0 +1,83 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { join, dirname } from 'path';
+import { createImportRuleListener } from './utils';
+
+type Config = {
+	allowed: Set<string>;
+	disallowed: Set<string>;
+};
+
+export = new class implements eslint.Rule.RuleModule {
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		messages: {
+			layerbreaker: 'Bad layering. You are not allowed to access {{from}} from here, allowed layers are: [{{allowed}}]'
+		},
+		docs: {
+			url: 'https://github.com/microsoft/vscode/wiki/Source-Code-Organization'
+		}
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+
+		const fileDirname = dirname(context.getFilename());
+		const parts = fileDirname.split(/\\|\//);
+		const ruleArgs = <Record<string, string[]>>context.options[0];
+
+		let config: Config | undefined;
+		for (let i = parts.length - 1; i >= 0; i--) {
+			if (ruleArgs[parts[i]]) {
+				config = {
+					allowed: new Set(ruleArgs[parts[i]]).add(parts[i]),
+					disallowed: new Set()
+				};
+				Object.keys(ruleArgs).forEach(key => {
+					if (!config!.allowed.has(key)) {
+						config!.disallowed.add(key);
+					}
+				});
+				break;
+			}
+		}
+
+		if (!config) {
+			// nothing
+			return {};
+		}
+
+		return createImportRuleListener((node, path) => {
+			if (path[0] === '.') {
+				path = join(dirname(context.getFilename()), path);
+			}
+
+			const parts = dirname(path).split(/\\|\//);
+			for (let i = parts.length - 1; i >= 0; i--) {
+				const part = parts[i];
+
+				if (config!.allowed.has(part)) {
+					// GOOD - same layer
+					break;
+				}
+
+				if (config!.disallowed.has(part)) {
+					// BAD - wrong layer
+					context.report({
+						loc: node.loc,
+						messageId: 'layerbreaker',
+						data: {
+							from: part,
+							allowed: [...config!.allowed.keys()].join(', ')
+						}
+					});
+					break;
+				}
+			}
+		});
+	}
+};
+

build/lib/eslint/code-no-nls-in-standalone-editor.js

@@ -0,0 +1,38 @@
+"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 path_1 = require("path");
+const utils_1 = require("./utils");
+module.exports = new class NoNlsInStandaloneEditorRule {
+    constructor() {
+        this.meta = {
+            messages: {
+                noNls: 'Not allowed to import vs/nls in standalone editor modules. Use standaloneStrings.ts'
+            }
+        };
+    }
+    create(context) {
+        const fileName = context.getFilename();
+        if (/vs(\/|\\)editor(\/|\\)standalone(\/|\\)/.test(fileName)
+            || /vs(\/|\\)editor(\/|\\)common(\/|\\)standalone(\/|\\)/.test(fileName)
+            || /vs(\/|\\)editor(\/|\\)editor.api/.test(fileName)
+            || /vs(\/|\\)editor(\/|\\)editor.main/.test(fileName)
+            || /vs(\/|\\)editor(\/|\\)editor.worker/.test(fileName)) {
+            return utils_1.createImportRuleListener((node, path) => {
+                // resolve relative paths
+                if (path[0] === '.') {
+                    path = path_1.join(context.getFilename(), path);
+                }
+                if (/vs(\/|\\)nls/.test(path)) {
+                    context.report({
+                        loc: node.loc,
+                        messageId: 'noNls'
+                    });
+                }
+            });
+        }
+        return {};
+    }
+};

build/lib/eslint/code-no-nls-in-standalone-editor.ts

@@ -0,0 +1,48 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { join } from 'path';
+import { createImportRuleListener } from './utils';
+
+export = new class NoNlsInStandaloneEditorRule implements eslint.Rule.RuleModule {
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		messages: {
+			noNls: 'Not allowed to import vs/nls in standalone editor modules. Use standaloneStrings.ts'
+		}
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+
+		const fileName = context.getFilename();
+		if (
+			/vs(\/|\\)editor(\/|\\)standalone(\/|\\)/.test(fileName)
+			|| /vs(\/|\\)editor(\/|\\)common(\/|\\)standalone(\/|\\)/.test(fileName)
+			|| /vs(\/|\\)editor(\/|\\)editor.api/.test(fileName)
+			|| /vs(\/|\\)editor(\/|\\)editor.main/.test(fileName)
+			|| /vs(\/|\\)editor(\/|\\)editor.worker/.test(fileName)
+		) {
+			return createImportRuleListener((node, path) => {
+				// resolve relative paths
+				if (path[0] === '.') {
+					path = join(context.getFilename(), path);
+				}
+
+				if (
+					/vs(\/|\\)nls/.test(path)
+				) {
+					context.report({
+						loc: node.loc,
+						messageId: 'noNls'
+					});
+				}
+			});
+		}
+
+		return {};
+	}
+};
+

build/lib/eslint/code-no-standalone-editor.js

@@ -0,0 +1,41 @@
+"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 path_1 = require("path");
+const utils_1 = require("./utils");
+module.exports = new class NoNlsInStandaloneEditorRule {
+    constructor() {
+        this.meta = {
+            messages: {
+                badImport: 'Not allowed to import standalone editor modules.'
+            },
+            docs: {
+                url: 'https://github.com/microsoft/vscode/wiki/Source-Code-Organization'
+            }
+        };
+    }
+    create(context) {
+        if (/vs(\/|\\)editor/.test(context.getFilename())) {
+            // the vs/editor folder is allowed to use the standalone editor
+            return {};
+        }
+        return utils_1.createImportRuleListener((node, path) => {
+            // resolve relative paths
+            if (path[0] === '.') {
+                path = path_1.join(context.getFilename(), path);
+            }
+            if (/vs(\/|\\)editor(\/|\\)standalone(\/|\\)/.test(path)
+                || /vs(\/|\\)editor(\/|\\)common(\/|\\)standalone(\/|\\)/.test(path)
+                || /vs(\/|\\)editor(\/|\\)editor.api/.test(path)
+                || /vs(\/|\\)editor(\/|\\)editor.main/.test(path)
+                || /vs(\/|\\)editor(\/|\\)editor.worker/.test(path)) {
+                context.report({
+                    loc: node.loc,
+                    messageId: 'badImport'
+                });
+            }
+        });
+    }
+};

build/lib/eslint/code-no-standalone-editor.ts

@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { join } from 'path';
+import { createImportRuleListener } from './utils';
+
+export = new class NoNlsInStandaloneEditorRule implements eslint.Rule.RuleModule {
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		messages: {
+			badImport: 'Not allowed to import standalone editor modules.'
+		},
+		docs: {
+			url: 'https://github.com/microsoft/vscode/wiki/Source-Code-Organization'
+		}
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+
+		if (/vs(\/|\\)editor/.test(context.getFilename())) {
+			// the vs/editor folder is allowed to use the standalone editor
+			return {};
+		}
+
+		return createImportRuleListener((node, path) => {
+
+			// resolve relative paths
+			if (path[0] === '.') {
+				path = join(context.getFilename(), path);
+			}
+
+			if (
+				/vs(\/|\\)editor(\/|\\)standalone(\/|\\)/.test(path)
+				|| /vs(\/|\\)editor(\/|\\)common(\/|\\)standalone(\/|\\)/.test(path)
+				|| /vs(\/|\\)editor(\/|\\)editor.api/.test(path)
+				|| /vs(\/|\\)editor(\/|\\)editor.main/.test(path)
+				|| /vs(\/|\\)editor(\/|\\)editor.worker/.test(path)
+			) {
+				context.report({
+					loc: node.loc,
+					messageId: 'badImport'
+				});
+			}
+		});
+	}
+};
+

build/lib/eslint/code-no-unexternalized-strings.js

@@ -0,0 +1,111 @@
+"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");
+function isStringLiteral(node) {
+    return !!node && node.type === experimental_utils_1.AST_NODE_TYPES.Literal && typeof node.value === 'string';
+}
+function isDoubleQuoted(node) {
+    return node.raw[0] === '"' && node.raw[node.raw.length - 1] === '"';
+}
+module.exports = new (_a = class NoUnexternalizedStrings {
+        constructor() {
+            this.meta = {
+                messages: {
+                    doubleQuoted: 'Only use double-quoted strings for externalized strings.',
+                    badKey: 'The key \'{{key}}\' doesn\'t conform to a valid localize identifier.',
+                    duplicateKey: 'Duplicate key \'{{key}}\' with different message value.',
+                    badMessage: 'Message argument to \'{{message}}\' must be a string literal.'
+                }
+            };
+        }
+        create(context) {
+            const externalizedStringLiterals = new Map();
+            const doubleQuotedStringLiterals = new Set();
+            function collectDoubleQuotedStrings(node) {
+                if (isStringLiteral(node) && isDoubleQuoted(node)) {
+                    doubleQuotedStringLiterals.add(node);
+                }
+            }
+            function visitLocalizeCall(node) {
+                // localize(key, message)
+                const [keyNode, messageNode] = node.arguments;
+                // (1)
+                // extract key so that it can be checked later
+                let key;
+                if (isStringLiteral(keyNode)) {
+                    doubleQuotedStringLiterals.delete(keyNode); //todo@joh reconsider
+                    key = keyNode.value;
+                }
+                else if (keyNode.type === experimental_utils_1.AST_NODE_TYPES.ObjectExpression) {
+                    for (let property of keyNode.properties) {
+                        if (property.type === experimental_utils_1.AST_NODE_TYPES.Property && !property.computed) {
+                            if (property.key.type === experimental_utils_1.AST_NODE_TYPES.Identifier && property.key.name === 'key') {
+                                if (isStringLiteral(property.value)) {
+                                    doubleQuotedStringLiterals.delete(property.value); //todo@joh reconsider
+                                    key = property.value.value;
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                }
+                if (typeof key === 'string') {
+                    let array = externalizedStringLiterals.get(key);
+                    if (!array) {
+                        array = [];
+                        externalizedStringLiterals.set(key, array);
+                    }
+                    array.push({ call: node, message: messageNode });
+                }
+                // (2)
+                // remove message-argument from doubleQuoted list and make
+                // sure it is a string-literal
+                doubleQuotedStringLiterals.delete(messageNode);
+                if (!isStringLiteral(messageNode)) {
+                    context.report({
+                        loc: messageNode.loc,
+                        messageId: 'badMessage',
+                        data: { message: context.getSourceCode().getText(node) }
+                    });
+                }
+            }
+            function reportBadStringsAndBadKeys() {
+                // (1)
+                // report all strings that are in double quotes
+                for (const node of doubleQuotedStringLiterals) {
+                    context.report({ loc: node.loc, messageId: 'doubleQuoted' });
+                }
+                for (const [key, values] of externalizedStringLiterals) {
+                    // (2)
+                    // report all invalid NLS keys
+                    if (!key.match(NoUnexternalizedStrings._rNlsKeys)) {
+                        for (let value of values) {
+                            context.report({ loc: value.call.loc, messageId: 'badKey', data: { key } });
+                        }
+                    }
+                    // (2)
+                    // report all invalid duplicates (same key, different message)
+                    if (values.length > 1) {
+                        for (let i = 1; i < values.length; i++) {
+                            if (context.getSourceCode().getText(values[i - 1].message) !== context.getSourceCode().getText(values[i].message)) {
+                                context.report({ loc: values[i].call.loc, messageId: 'duplicateKey', data: { key } });
+                            }
+                        }
+                    }
+                }
+            }
+            return {
+                ['Literal']: (node) => collectDoubleQuotedStrings(node),
+                ['ExpressionStatement[directive] Literal:exit']: (node) => doubleQuotedStringLiterals.delete(node),
+                ['CallExpression[callee.type="MemberExpression"][callee.object.name="nls"][callee.property.name="localize"]:exit']: (node) => visitLocalizeCall(node),
+                ['CallExpression[callee.name="localize"][arguments.length>=2]:exit']: (node) => visitLocalizeCall(node),
+                ['Program:exit']: reportBadStringsAndBadKeys,
+            };
+        }
+    },
+    _a._rNlsKeys = /^[_a-zA-Z0-9][ .\-_a-zA-Z0-9]*$/,
+    _a);

build/lib/eslint/code-no-unexternalized-strings.ts

@@ -0,0 +1,126 @@
+/*---------------------------------------------------------------------------------------------
+ *  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';
+
+function isStringLiteral(node: TSESTree.Node | null | undefined): node is TSESTree.StringLiteral {
+	return !!node && node.type === AST_NODE_TYPES.Literal && typeof node.value === 'string';
+}
+
+function isDoubleQuoted(node: TSESTree.StringLiteral): boolean {
+	return node.raw[0] === '"' && node.raw[node.raw.length - 1] === '"';
+}
+
+export = new class NoUnexternalizedStrings implements eslint.Rule.RuleModule {
+
+	private static _rNlsKeys = /^[_a-zA-Z0-9][ .\-_a-zA-Z0-9]*$/;
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		messages: {
+			doubleQuoted: 'Only use double-quoted strings for externalized strings.',
+			badKey: 'The key \'{{key}}\' doesn\'t conform to a valid localize identifier.',
+			duplicateKey: 'Duplicate key \'{{key}}\' with different message value.',
+			badMessage: 'Message argument to \'{{message}}\' must be a string literal.'
+		}
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+
+		const externalizedStringLiterals = new Map<string, { call: TSESTree.CallExpression, message: TSESTree.Node }[]>();
+		const doubleQuotedStringLiterals = new Set<TSESTree.Node>();
+
+		function collectDoubleQuotedStrings(node: TSESTree.Literal) {
+			if (isStringLiteral(node) && isDoubleQuoted(node)) {
+				doubleQuotedStringLiterals.add(node);
+			}
+		}
+
+		function visitLocalizeCall(node: TSESTree.CallExpression) {
+
+			// localize(key, message)
+			const [keyNode, messageNode] = (<TSESTree.CallExpression>node).arguments;
+
+			// (1)
+			// extract key so that it can be checked later
+			let key: string | undefined;
+			if (isStringLiteral(keyNode)) {
+				doubleQuotedStringLiterals.delete(keyNode); //todo@joh reconsider
+				key = keyNode.value;
+
+			} else if (keyNode.type === AST_NODE_TYPES.ObjectExpression) {
+				for (let property of keyNode.properties) {
+					if (property.type === AST_NODE_TYPES.Property && !property.computed) {
+						if (property.key.type === AST_NODE_TYPES.Identifier && property.key.name === 'key') {
+							if (isStringLiteral(property.value)) {
+								doubleQuotedStringLiterals.delete(property.value); //todo@joh reconsider
+								key = property.value.value;
+								break;
+							}
+						}
+					}
+				}
+			}
+			if (typeof key === 'string') {
+				let array = externalizedStringLiterals.get(key);
+				if (!array) {
+					array = [];
+					externalizedStringLiterals.set(key, array);
+				}
+				array.push({ call: node, message: messageNode });
+			}
+
+			// (2)
+			// remove message-argument from doubleQuoted list and make
+			// sure it is a string-literal
+			doubleQuotedStringLiterals.delete(messageNode);
+			if (!isStringLiteral(messageNode)) {
+				context.report({
+					loc: messageNode.loc,
+					messageId: 'badMessage',
+					data: { message: context.getSourceCode().getText(<any>node) }
+				});
+			}
+		}
+
+		function reportBadStringsAndBadKeys() {
+			// (1)
+			// report all strings that are in double quotes
+			for (const node of doubleQuotedStringLiterals) {
+				context.report({ loc: node.loc, messageId: 'doubleQuoted' });
+			}
+
+			for (const [key, values] of externalizedStringLiterals) {
+
+				// (2)
+				// report all invalid NLS keys
+				if (!key.match(NoUnexternalizedStrings._rNlsKeys)) {
+					for (let value of values) {
+						context.report({ loc: value.call.loc, messageId: 'badKey', data: { key } });
+					}
+				}
+
+				// (2)
+				// report all invalid duplicates (same key, different message)
+				if (values.length > 1) {
+					for (let i = 1; i < values.length; i++) {
+						if (context.getSourceCode().getText(<any>values[i - 1].message) !== context.getSourceCode().getText(<any>values[i].message)) {
+							context.report({ loc: values[i].call.loc, messageId: 'duplicateKey', data: { key } });
+						}
+					}
+				}
+			}
+		}
+
+		return {
+			['Literal']: (node: any) => collectDoubleQuotedStrings(node),
+			['ExpressionStatement[directive] Literal:exit']: (node: any) => doubleQuotedStringLiterals.delete(node),
+			['CallExpression[callee.type="MemberExpression"][callee.object.name="nls"][callee.property.name="localize"]:exit']: (node: any) => visitLocalizeCall(node),
+			['CallExpression[callee.name="localize"][arguments.length>=2]:exit']: (node: any) => visitLocalizeCall(node),
+			['Program:exit']: reportBadStringsAndBadKeys,
+		};
+	}
+};
+

build/lib/eslint/code-no-unused-expressions.js

@@ -0,0 +1,145 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// FORKED FROM https://github.com/eslint/eslint/blob/b23ad0d789a909baf8d7c41a35bc53df932eaf30/lib/rules/no-unused-expressions.js
+// and added support for `OptionalCallExpression`, see https://github.com/facebook/create-react-app/issues/8107 and https://github.com/eslint/eslint/issues/12642
+
+/**
+ * @fileoverview Flag expressions in statement position that do not side effect
+ * @author Michael Ficarra
+ */
+
+'use strict';
+
+//------------------------------------------------------------------------------
+// Rule Definition
+//------------------------------------------------------------------------------
+
+module.exports = {
+	meta: {
+		type: 'suggestion',
+
+		docs: {
+			description: 'disallow unused expressions',
+			category: 'Best Practices',
+			recommended: false,
+			url: 'https://eslint.org/docs/rules/no-unused-expressions'
+		},
+
+		schema: [
+			{
+				type: 'object',
+				properties: {
+					allowShortCircuit: {
+						type: 'boolean',
+						default: false
+					},
+					allowTernary: {
+						type: 'boolean',
+						default: false
+					},
+					allowTaggedTemplates: {
+						type: 'boolean',
+						default: false
+					}
+				},
+				additionalProperties: false
+			}
+		]
+	},
+
+	create(context) {
+		const config = context.options[0] || {},
+			allowShortCircuit = config.allowShortCircuit || false,
+			allowTernary = config.allowTernary || false,
+			allowTaggedTemplates = config.allowTaggedTemplates || false;
+
+		// eslint-disable-next-line jsdoc/require-description
+        /**
+         * @param {ASTNode} node any node
+         * @returns {boolean} whether the given node structurally represents a directive
+         */
+		function looksLikeDirective(node) {
+			return node.type === 'ExpressionStatement' &&
+				node.expression.type === 'Literal' && typeof node.expression.value === 'string';
+		}
+
+		// eslint-disable-next-line jsdoc/require-description
+        /**
+         * @param {Function} predicate ([a] -> Boolean) the function used to make the determination
+         * @param {a[]} list the input list
+         * @returns {a[]} the leading sequence of members in the given list that pass the given predicate
+         */
+		function takeWhile(predicate, list) {
+			for (let i = 0; i < list.length; ++i) {
+				if (!predicate(list[i])) {
+					return list.slice(0, i);
+				}
+			}
+			return list.slice();
+		}
+
+		// eslint-disable-next-line jsdoc/require-description
+        /**
+         * @param {ASTNode} node a Program or BlockStatement node
+         * @returns {ASTNode[]} the leading sequence of directive nodes in the given node's body
+         */
+		function directives(node) {
+			return takeWhile(looksLikeDirective, node.body);
+		}
+
+		// eslint-disable-next-line jsdoc/require-description
+        /**
+         * @param {ASTNode} node any node
+         * @param {ASTNode[]} ancestors the given node's ancestors
+         * @returns {boolean} whether the given node is considered a directive in its current position
+         */
+		function isDirective(node, ancestors) {
+			const parent = ancestors[ancestors.length - 1],
+				grandparent = ancestors[ancestors.length - 2];
+
+			return (parent.type === 'Program' || parent.type === 'BlockStatement' &&
+				(/Function/u.test(grandparent.type))) &&
+				directives(parent).indexOf(node) >= 0;
+		}
+
+        /**
+         * Determines whether or not a given node is a valid expression. Recurses on short circuit eval and ternary nodes if enabled by flags.
+         * @param {ASTNode} node any node
+         * @returns {boolean} whether the given node is a valid expression
+         */
+		function isValidExpression(node) {
+			if (allowTernary) {
+
+				// Recursive check for ternary and logical expressions
+				if (node.type === 'ConditionalExpression') {
+					return isValidExpression(node.consequent) && isValidExpression(node.alternate);
+				}
+			}
+
+			if (allowShortCircuit) {
+				if (node.type === 'LogicalExpression') {
+					return isValidExpression(node.right);
+				}
+			}
+
+			if (allowTaggedTemplates && node.type === 'TaggedTemplateExpression') {
+				return true;
+			}
+
+			return /^(?:Assignment|OptionalCall|Call|New|Update|Yield|Await)Expression$/u.test(node.type) ||
+				(node.type === 'UnaryExpression' && ['delete', 'void'].indexOf(node.operator) >= 0);
+		}
+
+		return {
+			ExpressionStatement(node) {
+				if (!isValidExpression(node.expression) && !isDirective(node, context.getAncestors())) {
+					context.report({ node, message: 'Expected an assignment or function call and instead saw an expression.' });
+				}
+			}
+		};
+
+	}
+};

build/lib/eslint/code-translation-remind.js

@@ -0,0 +1,57 @@
+"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 fs_1 = require("fs");
+const utils_1 = require("./utils");
+module.exports = new (_a = class TranslationRemind {
+        constructor() {
+            this.meta = {
+                messages: {
+                    missing: 'Please add \'{{resource}}\' to ./build/lib/i18n.resources.json file to use translations here.'
+                }
+            };
+        }
+        create(context) {
+            return utils_1.createImportRuleListener((node, path) => this._checkImport(context, node, path));
+        }
+        _checkImport(context, node, path) {
+            if (path !== TranslationRemind.NLS_MODULE) {
+                return;
+            }
+            const currentFile = context.getFilename();
+            const matchService = currentFile.match(/vs\/workbench\/services\/\w+/);
+            const matchPart = currentFile.match(/vs\/workbench\/contrib\/\w+/);
+            if (!matchService && !matchPart) {
+                return;
+            }
+            const resource = matchService ? matchService[0] : matchPart[0];
+            let resourceDefined = false;
+            let json;
+            try {
+                json = fs_1.readFileSync('./build/lib/i18n.resources.json', 'utf8');
+            }
+            catch (e) {
+                console.error('[translation-remind rule]: File with resources to pull from Transifex was not found. Aborting translation resource check for newly defined workbench part/service.');
+                return;
+            }
+            const workbenchResources = JSON.parse(json).workbench;
+            workbenchResources.forEach((existingResource) => {
+                if (existingResource.name === resource) {
+                    resourceDefined = true;
+                    return;
+                }
+            });
+            if (!resourceDefined) {
+                context.report({
+                    loc: node.loc,
+                    messageId: 'missing',
+                    data: { resource }
+                });
+            }
+        }
+    },
+    _a.NLS_MODULE = 'vs/nls',
+    _a);