Bump ADS to 1.5.2

* make connectiondialog react to provider event

* fix unit test error

* code review comments

.editorconfig

@@ -1,4 +1,4 @@
-# EditorConfig is awesome: https://EditorConfig.org
+# EditorConfig is awesome: http://EditorConfig.org
 
 # top-most EditorConfig file
 root = true
@@ -6,6 +6,7 @@ root = true
 # Tab indentation
 [*]
 indent_style = tab
+indent_size = 4
 trim_trailing_whitespace = true
 
 # The indent size used in the `package.json` file cannot be changed

.gitattributes

@@ -6,5 +6,4 @@ ThirdPartyNotices.txt eol=crlf
 *.bat eol=crlf
 *.cmd eol=crlf
 *.ps1 eol=lf
-*.sh eol=lf
+*.sh eol=lf
-*.rtf -text

.github/ISSUE_TEMPLATE/bug_report.md

@@ -2,7 +2,7 @@
 name: Bug report
 about: Create a report to help us improve
 title: ''
-labels: Bug
+labels: ''
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/feature_request.md

@@ -2,7 +2,7 @@
 name: Feature request
 about: Suggest an idea for this project
 title: ''
-labels: Enhancement
+labels: feature request
 assignees: ''
 
 ---

.github/classifier.yml

@@ -1,5 +1,5 @@
 {
-  perform: false,
+  perform: true,
   alwaysRequireAssignee: false,
   labelsRequiringAssignee: [],
   autoAssignees: {

.github/needs_more_info.yml

@@ -1,6 +1,6 @@
 {
   daysUntilClose: 7,
-  needsMoreInfoLabel: 'needs more info',
+  needsMoreInfoLabel: 'more info',
-  perform: true,
+  perform: false,
-  closeComment: "This issue has been closed automatically because it needs more information and has not had recent activity in the last 7 days. If you have more info to help resolve the issue, leave a comment"
+  closeComment: "This issue has been closed automatically because it needs more information and has not had recent activity. See also our [issue reporting](https://aka.ms/vscodeissuereporting) guidelines.\n\nHappy Coding!"
 }

.gitignore

@@ -1,5 +1,4 @@
 .DS_Store
-.cache
 npm-debug.log
 Thumbs.db
 node_modules/
@@ -15,16 +14,6 @@ out-editor-min/
 out-monaco-editor-core/
 out-vscode/
 out-vscode-min/
-out-vscode-reh/
-out-vscode-reh-min/
-out-vscode-reh-pkg/
-out-vscode-reh-web/
-out-vscode-reh-web-min/
-out-vscode-reh-web-pkg/
-out-vscode-web/
-out-vscode-web-min/
-src/vs/server
-resources/server
 build/node_modules
 coverage/
 test_data/

.nvmrc

@@ -1 +1 @@
-10
+8.9.2

.vscode/cglicenses.schema.json

@@ -1,61 +1,23 @@
 {
 	"type": "array",
 	"items": {
-		"oneOf": [
+		"type": "object",
-			{
+		"required": [
-				"type": "object",
+			"name",
-				"required": [
+			"licenseDetail"
-					"name",
+		],
-					"prependLicenseText"
+		"properties": {
-				],
+			"name": {
-				"properties": {
+				"type": "string",
-					"name": {
+				"description": "The name of the dependency"
-						"type": "string",
-						"description": "The name of the dependency"
-					},
-					"fullLicenseText": {
-						"type": "array",
-						"description": "The complete license text of the dependency",
-						"items": {
-							"type": "string"
-						}
-					},
-					"prependLicenseText": {
-						"type": "array",
-						"description": "A piece of text to prepend to the auto-detected license text of the dependency",
-						"items": {
-							"type": "string"
-						}
-					}
-				}
 			},
-			{
+			"licenseDetail": {
-				"type": "object",
+				"type": "array",
-				"required": [
+				"description": "The complete license text of the dependency",
-					"name",
+				"items": {
-					"fullLicenseText"
+					"type": "string"
-				],
-				"properties": {
-					"name": {
-						"type": "string",
-						"description": "The name of the dependency"
-					},
-					"fullLicenseText": {
-						"type": "array",
-						"description": "The complete license text of the dependency",
-						"items": {
-							"type": "string"
-						}
-					},
-					"prependLicenseText": {
-						"type": "array",
-						"description": "A piece of text to prepend to the auto-detected license text of the dependency",
-						"items": {
-							"type": "string"
-						}
-					}
 				}
 			}
-		]
+		}
 	}
-}
+}

.vscode/extensions.json

@@ -4,7 +4,6 @@
 	"recommendations": [
 		"ms-vscode.vscode-typescript-tslint-plugin",
 		"dbaeumer.vscode-eslint",
-		"EditorConfig.EditorConfig",
 		"msjsdiag.debugger-for-chrome"
 	]
 }

.vscode/launch.json

@@ -66,42 +66,23 @@
 			"request": "launch",
 			"name": "Launch azuredatastudio",
 			"windows": {
-				"runtimeExecutable": "${workspaceFolder}/scripts/sql.bat",
+				"runtimeExecutable": "${workspaceFolder}/scripts/sql.bat"
-				"timeout": 20000
 			},
 			"osx": {
-				"runtimeExecutable": "${workspaceFolder}/scripts/sql.sh",
+				"runtimeExecutable": "${workspaceFolder}/scripts/sql.sh"
-				"timeout": 20000
 			},
 			"linux": {
-				"runtimeExecutable": "${workspaceFolder}/scripts/sql.sh",
+				"runtimeExecutable": "${workspaceFolder}/scripts/sql.sh"
-				"timeout": 20000
 			},
-			"env": {
-				"VSCODE_EXTHOST_WILL_SEND_SOCKET": null
-			},
-			"breakOnLoad": false,
 			"urlFilter": "*workbench.html*",
 			"runtimeArgs": [
-				"--inspect=5875",
+				"--inspect=5875", "--no-cached-data"
-				"--no-cached-data"
 			],
-			"webRoot": "${workspaceFolder}"
+			"skipFiles": [
-		},
+				"**/winjs*.js"
-		{
-			"type": "node",
-			"request": "launch",
-			"name": "Launch ADS (Main Process)",
-			"runtimeExecutable": "${workspaceFolder}/scripts/sql.sh",
-			"windows": {
-				"runtimeExecutable": "${workspaceFolder}/scripts/sql.bat",
-			},
-			"runtimeArgs": [
-				"--no-cached-data"
 			],
-			"outFiles": [
+			"webRoot": "${workspaceFolder}",
-				"${workspaceFolder}/out/**/*.js"
+			"timeout": 45000
-			]
 		},
 		{
 			"type": "chrome",
@@ -166,23 +147,7 @@
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
 			]
-		},
+		}
-		{
-			"type": "chrome",
-			"request": "launch",
-			"name": "Run Extension Unit Tests",
-			"windows": {
-				"runtimeExecutable": "${workspaceFolder}/scripts/test-extensions-unit.bat"
-			},
-			"osx": {
-				"runtimeExecutable": "${workspaceFolder}/scripts/test-extensions-unit.sh"
-			},
-			"linux": {
-				"runtimeExecutable": "${workspaceFolder}/scripts/test-extensions-unit.sh"
-			},
-			"webRoot": "${workspaceFolder}",
-			"timeout": 45000
-		},
 	],
 	"compounds": [
 		{
@@ -192,13 +157,6 @@
 				"Run Unit Tests"
 			]
 		},
-		{
-			"name": "Debug Extension Unit Tests",
-			"configurations": [
-				"Attach to Extension Host",
-				"Run Extension Unit Tests"
-			]
-		},
 		{
 			"name": "Debug azuredatastudio Main and Renderer",
 			"configurations": [
@@ -221,4 +179,4 @@
 			]
 		}
 	]
-}
+}

.vscode/settings.json

@@ -1,5 +1,6 @@
 {
 	"editor.insertSpaces": false,
+	"files.eol": "\n",
 	"files.trimTrailingWhitespace": true,
 	"files.exclude": {
 		".git": true,
@@ -39,26 +40,15 @@
 	],
 	"typescript.tsdk": "node_modules/typescript/lib",
 	"npm.exclude": "**/extensions/**",
+	"git.ignoreLimitWarning": true,
 	"emmet.excludeLanguages": [],
 	"typescript.preferences.importModuleSpecifier": "non-relative",
 	"typescript.preferences.quoteStyle": "single",
-	"json.schemas": [
+	"json.schemas": [{
-		{
+		"fileMatch": [ "cgmanifest.json" ],
-			"fileMatch": [
+		"url": "./.vscode/cgmanifest.schema.json"
-				"cgmanifest.json"
+	}, {
-			],
+		"fileMatch": [ "cglicenses.json" ],
-			"url": "./.vscode/cgmanifest.schema.json"
+		"url": "./.vscode/cglicenses.schema.json"
-		},
+	}]
-		{
+}
-			"fileMatch": [
-				"cglicenses.json"
-			],
-			"url": "./.vscode/cglicenses.schema.json"
-		}
-	],
-	"git.ignoreLimitWarning": true,
-	"remote.extensionKind": {
-		"msjsdiag.debugger-for-chrome": "workspace"
-	},
-	"files.insertFinalNewline": true
-}

.vscode/shared.code-snippets

@@ -23,13 +23,11 @@
 		"description": "Insert Copyright Statement"
 	},
 	"TS -> Inject Service": {
-		"scope": "typescript",
 		"description": "Constructor Injection Pattern",
 		"prefix": "@inject",
 		"body": "@$1 private readonly _$2: ${1},$0"
 	},
 	"TS -> Event & Emitter": {
-		"scope": "typescript",
 		"prefix": "emitter",
 		"description": "Add emitter and event properties",
 		"body": [

.vscode/tasks.json

@@ -28,32 +28,21 @@
 				}
 			}
 		},
-		{
-			"type": "npm",
-			"script": "strict-initialization-watch",
-			"label": "TS - Strict Initialization",
-			"isBackground": true,
-			"presentation": {
-				"reveal": "never"
-			},
-			"problemMatcher": {
-				"base": "$tsc-watch",
-				"owner": "typescript-strict-initialization",
-				"applyTo": "allDocuments"
-			}
-		},
 		{
 			"type": "npm",
 			"script": "strict-null-check-watch",
-			"label": "TS - Strict Null Cheks",
+			"label": "TS - Strict Null Checks",
 			"isBackground": true,
 			"presentation": {
 				"reveal": "never"
 			},
 			"problemMatcher": {
 				"base": "$tsc-watch",
-				"owner": "typescript-strict-null-checks",
+				"owner": "typescript-strict-null",
 				"applyTo": "allDocuments"
+			},
+			"runOptions": {
+				"runOn": "folderOpen"
 			}
 		},
 		{
@@ -95,7 +84,6 @@
 			"type": "gulp",
 			"task": "hygiene",
 			"problemMatcher": []
-		},
+		}
-
 	]
 }

.yarnrc

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

CHANGELOG.md

@@ -1,109 +1,5 @@
 # Change Log
 
-## Version 1.10.0
-* Release date: August 14, 2019
-* Release status: General Availability
-
-## What's new in this version
-* [SandDance](https://github.com/microsoft/SandDance) integration — A new way to interact with data. Download the extension [here](https://docs.microsoft.com/sql/azure-data-studio/sanddance-extension)
-* Notebook improvements
-   * Better loading performance
-   * Ability to right click SQL results grid to save your results as CSV, JSON, etc.
-   * Buttons to add code or text cells in-line
-   * [Other fixes and improvements](https://github.com/microsoft/azuredatastudio/issues?q=is%3Aissue+label%3A%22Area%3A+Notebooks%22+milestone%3A%22August+2019+Release%22+is%3Aclosed)
-* SQL Server Dacpac extension can support Azure Active Directory authentication
-* Updated SQL Server 2019 extension
-* Visual Studio Code May Release Merge 1.37 - this includes changes from [1.36](https://code.visualstudio.com/updates/v1_37) and [1.37](https://code.visualstudio.com/updates/v1_37)
-* Resolved [bugs and issues](https://github.com/microsoft/azuredatastudio/milestone/39?closed=1).
-
-## Version 1.9.0
-* Release date: July 11, 2019
-* Release status: General Availability
-
-## What's new in this version
-* Release of [SentryOne Plan Explorer Extension](https://www.sentryone.com/products/sentryone-plan-explorer-extension-azure-data-studio)
-* **Schema Compare**
-    * Schema Compare File Support (.SCMP)
-    * Cancel support
-    * [Other fixes and improvements](https://github.com/Microsoft/azuredatastudio/issues?q=is%3Aissue+milestone%3A%22July+2019+Release%22+is%3Aclosed+label%3A%22Area%3A+Schema+Compare%22)
-* **Notebooks**
-    * Plotly Support
-    * Open Notebook from Browser
-    * Python Package Management
-    * Performance & Markdown Enhancements
-    * Improved Keyboard Shortcuts
-    * [Other fixes and improvements](https://github.com/Microsoft/azuredatastudio/issues?q=is%3Aissue+milestone%3A%22July+2019+Release%22+is%3Aclosed+label%3A%22Area%3A+Notebooks%22)
-* **SQL Server Profiler**
-    * Filtering by Database Name
-    * Copy & Paste Support
-    * Save/Load Filter
-* SQL Server 2019 Support
-* New Language Packs Available
-* Visual Studio Code May Release Merge 1.35 - the latest improvements can be found [here](https://code.visualstudio.com/updates/v1_35)
-* Resolved [bugs and issues](https://github.com/microsoft/azuredatastudio/milestone/35?closed=1).
-
-## Version 1.8.0
-* Release date: June 6, 2019
-* Release status: General Availability
-
-## What's new in this version
-* Initial release of the Database Admin Tool Extensions for Windows *Preview* extension
-* Initial release of the Central Management Servers extension
-* **Schema Compare**
-   * Added Exclude/Include Options
-   * Generate Script opens script after being generated
-   * Removed double scroll bars
-   * Formatting and layout improvements
-   * Complete changes can be found [here](https://github.com/microsoft/azuredatastudio/issues?q=is%3Aissue+milestone%3A%22June+2019+Release%22+label%3A%22Area%3A+Schema+Compare%22+is%3Aclosed)
-* Messages panel moved into results panel - when users ran SQL queries, results and messages were in stacked panels. Now they are in separate tabs in a single panel similar to SSMS.
-* **Notebook**
-   * Users can now choose to use their own Python 3 or Anaconda installs in notebooks
-   * Multiple Stability + fit/finish fixes
-   * View the full list of improvements and fixes [here](https://github.com/microsoft/azuredatastudio/issues?q=is%3Aissue+milestone%3A%22June+2019+Release%22+is%3Aclosed+label%3A%22Area%3A+Notebooks%22)
-* Visual Studio Code May Release Merge 1.34 - the latest improvements can be found [here](https://code.visualstudio.com/updates/v1_34)
-* Resolved [bugs and issues](https://github.com/microsoft/azuredatastudio/milestone/32?closed=1).
-
-## Version 1.7.0
-* Release date: May 8, 2019
-* Release status: General Availability
-
-## What's new in this version
-* Announcing Schema Compare *Preview* extension
-* Tasks Panel UX improvement
-* Announcing new Welcome page
-* Resolved [bugs and issues](https://github.com/microsoft/azuredatastudio/milestone/31?closed=1).
-
-## Contributions and "thank you"
-We would like to thank all our users who raised issues.
-
-## Version 1.6.0
-* Release date: April 18, 2019
-* Release status: General Availability
-
-## What's new in this version
-* Align with latest VS Code editor platform (currently 1.33.1)
-* Resolved [bugs and issues](https://github.com/Microsoft/azuredatastudio/milestone/26?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:
-
-* yamatoya for `fix the format (#4899)`
-
-## Version 1.5.1
-* Release date: March 18, 2019
-* Release status: General Availability
-
-## What's new in this version
-* Announcing T-SQL Notebooks
-* Announcing PostgreSQL extension
-* Announcing SQL Server Dacpac extension
-* Resolved [bugs and issues](https://github.com/Microsoft/azuredatastudio/milestone/25?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:
-
-* GeoffYoung for `Fix sqlDropColumn description #4422`
-
 ## Version 1.4.5
 * Release date: February 13, 2019
 * Release status: General Availability

CODE_OF_CONDUCT.md

@@ -0,0 +1 @@
+This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.

CONTRIBUTING.md

@@ -24,9 +24,7 @@ The built-in tool for reporting an issue, which you can access by using `Report
 
 Please include the following with each issue.
 
-* Version of Azure Data Studio (formerly SQL Operations Studio)
+* Version of Azure Data Studio (formerly SQL Operations Studio).
-
-* Your operating system
 
 > **Tip:** You can easily create an issue using `Report Issues` from Azure Data Studio Help menu.
 

README.md

@@ -1,25 +1,25 @@
 # Azure Data Studio
 
 [![Join the chat at https://gitter.im/Microsoft/sqlopsstudio](https://badges.gitter.im/Microsoft/sqlopsstudio.svg)](https://gitter.im/Microsoft/sqlopsstudio?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Build Status](https://dev.azure.com/azuredatastudio/azuredatastudio/_apis/build/status/Azure%20Data%20Studio%20CI?branchName=master)](https://dev.azure.com/azuredatastudio/azuredatastudio/_build/latest?definitionId=4&branchName=master)
+[![Build Status](https://dev.azure.com/ms/azuredatastudio/_apis/build/status/Microsoft.azuredatastudio)](https://dev.azure.com/ms/azuredatastudio/_build/latest?definitionId=4)
 
 Azure Data Studio is a data management tool that enables you to work with SQL Server, Azure SQL DB and SQL DW from Windows, macOS and Linux.
 
-## **Download the latest Azure Data Studio release**
+**Download the latest Azure Data Studio release**
 
 Platform | Link
 -- | --
-Windows User Installer | https://go.microsoft.com/fwlink/?linkid=2100710
+Windows User Installer | https://go.microsoft.com/fwlink/?linkid=2072725
-Windows System Installer | https://go.microsoft.com/fwlink/?linkid=2100711
+Windows System Installer | https://go.microsoft.com/fwlink/?linkid=2072728
-Windows ZIP | https://go.microsoft.com/fwlink/?linkid=2100712
+Windows ZIP | https://go.microsoft.com/fwlink/?linkid=2072354
-macOS ZIP | https://go.microsoft.com/fwlink/?linkid=2100809
+macOS ZIP | https://go.microsoft.com/fwlink/?linkid=2072737
-Linux TAR.GZ | https://go.microsoft.com/fwlink/?linkid=2100714
+Linux TAR.GZ | https://go.microsoft.com/fwlink/?linkid=2072360
-Linux RPM | https://go.microsoft.com/fwlink/?linkid=2100810
+Linux RPM | https://go.microsoft.com/fwlink/?linkid=2072741
-Linux DEB | https://go.microsoft.com/fwlink/?linkid=2100672
+Linux DEB | https://go.microsoft.com/fwlink/?linkid=2072744
 
 Go to our [download page](https://aka.ms/azuredatastudio) for more specific instructions.
 
-## Try out the latest insiders build from `master`:
+Try out the latest insiders build from `master`:
 - [Windows User Installer - **Insiders build**](https://azuredatastudio-update.azurewebsites.net/latest/win32-x64-user/insider)
 - [Windows System Installer - **Insiders build**](https://azuredatastudio-update.azurewebsites.net/latest/win32-x64/insider)
 - [Windows ZIP - **Insiders build**](https://azuredatastudio-update.azurewebsites.net/latest/win32-x64-archive/insider)
@@ -28,7 +28,7 @@ Go to our [download page](https://aka.ms/azuredatastudio) for more specific inst
 
 See the [change log](https://github.com/Microsoft/azuredatastudio/blob/master/CHANGELOG.md) for additional details of what's in this release.
 
-## **Feature Highlights**
+**Feature Highlights**
 
 - Cross-Platform DB management for Windows, macOS and Linux with simple XCopy deployment
 - SQL Server Connection Management with Connection Dialog, Server Groups, Azure Integration and Registered Servers
@@ -68,9 +68,6 @@ The [Microsoft Enterprise and Developer Privacy Statement](https://privacy.micro
 ## 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:
 
-* Stevoni for `Corrected Keyboard Shortcut Execution Issue #5480`
-* yamatoya for `fix the format #4899`
-* GeoffYoung for `Fix sqlDropColumn description #4422`
 * AlexFsmn for `Added context menu for DBs in explorer view to backup & restore db. #2277`
 * sadedil for `Missing feature request: Save as XML #3729`
 * gbritton1 for `Removed reference to object explorer #3463`

ThirdPartyNotices.txt

@@ -46,6 +46,7 @@ expressly granted herein, whether by implication, estoppel or otherwise.
     node-fetch: https://github.com/bitinn/node-fetch
     node-pty: https://github.com/Tyriar/node-pty
     nsfw: https://github.com/Axosoft/nsfw
+    pretty-data: https://github.com/vkiryukhin/pretty-data
     primeng: https://github.com/primefaces/primeng
     process-nextick-args: https://github.com/calvinmetcalf/process-nextick-args
     pty.js: https://github.com/chjj/pty.js
@@ -342,6 +343,32 @@ END OF emmet NOTICES AND INFORMATION
 =========================================
 The MIT License (MIT)
 
+Copyright (c) 2015 JD Ballard
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+=========================================
+END OF error-ex NOTICES AND INFORMATION
+
+%% escape-string-regexp NOTICES AND INFORMATION BEGIN HERE
+=========================================
+The MIT License (MIT)
+
 Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -1419,6 +1446,16 @@ SOFTWARE.
 =========================================
 END OF nsfw NOTICES AND INFORMATION
 
+%% pretty-data NOTICES AND INFORMATION BEGIN HERE
+=========================================
+License: Dual licensed under the MIT and GPL licenses:
+
+http://www.opensource.org/licenses/mit-license.php
+
+http://www.gnu.org/licenses/gpl.html
+=========================================
+END OF pretty-data NOTICES AND INFORMATION
+
 %% primeng NOTICES AND INFORMATION BEGIN HERE
 =========================================
 The MIT License (MIT)
@@ -2403,6 +2440,7 @@ General Public License.
 
 -------------------------------START OF THIRD-PARTY NOTICES-------------------------------------------
 
+===================================ExcelDataReader (BEGIN)
 The MIT License (MIT)
 
 Copyright (c) 2014 ExcelDataReader
@@ -2428,4 +2466,4 @@ SOFTWARE.
 
 -------------------------------END OF THIRD-PARTY NOTICES-------------------------------------------
 =========================================
-END OF Microsoft.ProgramSynthesis.Detection NOTICES AND INFORMATION
+END OF Microsoft.ProgramSynthesis.Detection NOTICES AND INFORMATION

azure-pipelines-linux-mac.yml

@@ -1,84 +1,46 @@
 steps:
-  - script: |
+- task: NodeTool@0
-      export CXX="g++-4.9" CC="gcc-4.9" DISPLAY=:10
+  inputs:
-      sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
+    versionSpec: '8.x'
-      sudo chmod +x /etc/init.d/xvfb
+  displayName: 'Install Node.js'
-      sudo update-rc.d xvfb defaults
-      sudo service xvfb start
-      sudo apt-get install -y libkrb5-dev
-      # sh -e /etc/init.d/xvfb start
-      # sleep 3
-    displayName: "Linux preinstall"
-    condition: eq(variables['Agent.OS'], 'Linux')
 
-  - task: NodeTool@0
+- script: |
-    inputs:
+    git submodule update --init --recursive
-      versionSpec: "10.15.1"
+    nvm install 8.9.1
+    nvm use 8.9.1
+    npm i -g yarn
+  displayName: 'preinstall'
 
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
+- script: |
-    inputs:
+    export CXX="g++-4.9" CC="gcc-4.9" DISPLAY=:10
-      keyfile: ".yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock"
+    sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
-      targetfolder: "**/node_modules, !**/node_modules/**/node_modules"
+    sudo chmod +x /etc/init.d/xvfb
-      vstsFeed: "$(build-cache)"
+    sudo update-rc.d xvfb defaults
+    sudo service xvfb start
+    # sh -e /etc/init.d/xvfb start
+    # sleep 3
+  displayName: 'Linux preinstall'
+  condition: eq(variables['Agent.OS'], 'Linux')
 
-  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
+- script: |
-    inputs:
+    yarn
-      versionSpec: "1.10.1"
+  displayName:  'Install'
 
-  - script: |
+- script: |
-      yarn --frozen-lockfile
+    node_modules/.bin/gulp electron
-    displayName: Install Dependencies
+    node_modules/.bin/gulp compile --max_old_space_size=4096
-    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
+    node_modules/.bin/gulp optimize-vscode --max_old_space_size=4096
-    env:
+  displayName: 'Scripts'
-      GITHUB_TOKEN: $(GITHUB_TOKEN)
 
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
+- script: |
-    inputs:
+    DISPLAY=:10 ./scripts/test.sh --reporter mocha-junit-reporter
-      keyfile: ".yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock"
+  displayName: 'Tests'
-      targetfolder: "**/node_modules, !**/node_modules/**/node_modules"
-      vstsFeed: "$(build-cache)"
-    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 
-  - script: |
+- task: PublishTestResults@2
-      yarn gulp electron-x64
+  inputs:
-    displayName: Download Electron
+    testResultsFiles: '**/test-results.xml'
-    env:
+  condition: succeededOrFailed()
-      GITHUB_TOKEN: $(GITHUB_TOKEN)
 
-  - script: |
+- script: |
-      yarn gulp hygiene
+    yarn run tslint
-    displayName: Run Hygiene Checks
+  displayName: 'Run TSLint'
-
-  - script: |
-      yarn tslint
-    displayName: "Run TSLint"
-
-  - script: |
-      yarn strict-null-check
-    displayName: "Run Strict Null Check"
-
-  - script: |
-      yarn compile
-    displayName: "Compile"
-
-  - script: |
-      DISPLAY=:10 ./scripts/test.sh --reporter mocha-junit-reporter
-    displayName: "Tests"
-    condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))
-
-  - script: |
-      DISPLAY=:10 ./scripts/test.sh --reporter mocha-junit-reporter --coverage
-    displayName: "Tests"
-    condition: and(succeeded(), ne(variables['Agent.OS'], 'Linux'))
-
-  - task: PublishTestResults@2
-    inputs:
-      testResultsFiles: "**/test-results.xml"
-    condition: succeededOrFailed()
-
-  - task: PublishCodeCoverageResults@1
-    inputs:
-      codeCoverageTool: "cobertura"
-      summaryFileLocation: $(System.DefaultWorkingDirectory)/.build/coverage/cobertura-coverage.xml
-      reportDirectory: $(System.DefaultWorkingDirectory)/.build/coverage/lcov-reports
-    condition: ne(variables['Agent.OS'], 'Linux')

azure-pipelines-windows.yml

@@ -1,65 +1,30 @@
 steps:
-  - task: NodeTool@0
+- task: NodeTool@0
-    inputs:
+  inputs:
-      versionSpec: "10.15.1"
+    versionSpec: '8.9'
+  displayName: 'Install Node.js'
 
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
+- script: |
-    inputs:
+    yarn
-      keyfile: ".yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock"
+  displayName: 'Yarn Install'
-      targetfolder: "**/node_modules, !**/node_modules/**/node_modules"
-      vstsFeed: "$(build-cache)"
 
-  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3
+- script: |
-    inputs:
+    .\node_modules\.bin\gulp electron
-      versionSpec: "1.10.1"
+  displayName: 'Electron'
 
-  - script: |
+- script: |
-      yarn --frozen-lockfile
+    npm run compile
-    displayName: Install Dependencies
+  displayName: 'Compile'
-    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
-    env:
-      GITHUB_TOKEN: $(GITHUB_TOKEN)
 
-  - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
+- script: |
-    inputs:
+    .\scripts\test.bat --reporter mocha-junit-reporter
-      keyfile: ".yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock"
+  displayName: 'Test'
-      targetfolder: "**/node_modules, !**/node_modules/**/node_modules"
-      vstsFeed: "$(build-cache)"
-    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 
-  - script: |
+- task: PublishTestResults@2
-      yarn gulp electron-x64
+  inputs:
-    displayName: "Electron"
+    testResultsFiles: 'test-results.xml'
-    env:
+  condition: succeededOrFailed()
-      GITHUB_TOKEN: $(GITHUB_TOKEN)
 
-  - script: |
+- script: |
-      yarn gulp hygiene
+    yarn run tslint
-    displayName: Run Hygiene Checks
+  displayName: 'Run TSLint'
-
-  - script: |
-      yarn tslint
-    displayName: "Run TSLint"
-
-  - script: |
-      yarn strict-null-check
-    displayName: "Run Strict Null Check"
-
-  - script: |
-      yarn compile
-    displayName: "Compile"
-
-  - script: |
-      .\scripts\test.bat --reporter mocha-junit-reporter --coverage
-    displayName: "Test"
-
-  - task: PublishTestResults@2
-    inputs:
-      testResultsFiles: "test-results.xml"
-    condition: succeededOrFailed()
-
-  - task: PublishCodeCoverageResults@1
-    inputs:
-      codeCoverageTool: "cobertura"
-      summaryFileLocation: $(System.DefaultWorkingDirectory)\.build\coverage\cobertura-coverage.xml
-      reportDirectory: $(System.DefaultWorkingDirectory)\.build\coverage\lcov-report

azure-pipelines.yml

@@ -1,22 +1,29 @@
 trigger:
-  - master
+- master
-  - release/*
+- releases/*
 
 jobs:
-  - job: Windows
-    pool:
-      vmImage: VS2017-Win2016
-    steps:
-      - template: azure-pipelines-windows.yml
 
-  - job: Linux
+# All tasks on Windows
-    pool:
+- job: build_all_windows
-      vmImage: "Ubuntu-16.04"
+  displayName: Build all tasks (Windows)
-    steps:
+  pool:
-      - template: azure-pipelines-linux-mac.yml
+    vmImage: vs2017-win2016
+  steps:
+  - template: azure-pipelines-windows.yml
 
-  - job: macOS
+# All tasks on Linux
-    pool:
+- job: build_all_linux
-      vmImage: macOS 10.13
+  displayName: Build all tasks (Linux)
-    steps:
+  pool:
-      - template: azure-pipelines-linux-mac.yml
+    vmImage: 'Ubuntu 16.04'
+  steps:
+  - template: azure-pipelines-linux-mac.yml
+
+# All tasks on macOS
+- job: build_all_darwin
+  displayName: Build all tasks (macOS)
+  pool:
+    vmImage: macos-10.13
+  steps:
+  - template: azure-pipelines-linux-mac.yml

build/.cachesalt

@@ -1 +0,0 @@
-2019-07-11T05:47:05.444Z

build/.nativeignore

@@ -1,134 +0,0 @@
-# cleanup rules for native node modules, .gitignore style
-
-nan/**
-*/node_modules/nan/**
-
-fsevents/binding.gyp
-fsevents/fsevents.cc
-fsevents/build/**
-fsevents/src/**
-fsevents/test/**
-!fsevents/**/*.node
-
-vscode-sqlite3/binding.gyp
-vscode-sqlite3/benchmark/**
-vscode-sqlite3/cloudformation/**
-vscode-sqlite3/deps/**
-vscode-sqlite3/test/**
-vscode-sqlite3/build/**
-vscode-sqlite3/src/**
-!vscode-sqlite3/build/Release/*.node
-
-oniguruma/binding.gyp
-oniguruma/build/**
-oniguruma/src/**
-oniguruma/deps/**
-!oniguruma/build/Release/*.node
-!oniguruma/src/*.js
-
-windows-mutex/binding.gyp
-windows-mutex/build/**
-windows-mutex/src/**
-!windows-mutex/**/*.node
-
-native-keymap/binding.gyp
-native-keymap/build/**
-native-keymap/src/**
-native-keymap/deps/**
-!native-keymap/build/Release/*.node
-
-native-is-elevated/binding.gyp
-native-is-elevated/build/**
-native-is-elevated/src/**
-native-is-elevated/deps/**
-!native-is-elevated/build/Release/*.node
-
-native-watchdog/binding.gyp
-native-watchdog/build/**
-native-watchdog/src/**
-!native-watchdog/build/Release/*.node
-
-spdlog/binding.gyp
-spdlog/build/**
-spdlog/deps/**
-spdlog/src/**
-spdlog/test/**
-!spdlog/build/Release/*.node
-
-jschardet/dist/**
-
-windows-foreground-love/binding.gyp
-windows-foreground-love/build/**
-windows-foreground-love/src/**
-!windows-foreground-love/**/*.node
-
-windows-process-tree/binding.gyp
-windows-process-tree/build/**
-windows-process-tree/src/**
-!windows-process-tree/**/*.node
-
-keytar/binding.gyp
-keytar/build/**
-keytar/src/**
-keytar/script/**
-keytar/node_modules/**
-!keytar/**/*.node
-
-node-pty/binding.gyp
-node-pty/build/**
-node-pty/src/**
-node-pty/tools/**
-node-pty/deps/**
-!node-pty/build/Release/*.exe
-!node-pty/build/Release/*.dll
-!node-pty/build/Release/*.node
-
-emmet/node_modules/**
-
-pty.js/build/**
-!pty.js/build/Release/**
-
-# START SQL Modules
-
-@angular/**/src/**
-@angular/**/testing/**
-
-angular2-grid/components/**
-angular2-grid/directives/**
-angular2-grid/interfaces/**
-angular2-grid/modules/**
-
-angular2-slickgrid/.vscode/**
-angular2-slickgrid/components/**
-angular2-slickgrid/examples/**
-
-jquery-ui/external/**
-jquery-ui/demos/**
-
-slickgrid/node_modules/**
-slickgrid/examples/**
-
-# END SQL Modules
-
-nsfw/binding.gyp
-nsfw/build/**
-nsfw/src/**
-nsfw/openpa/**
-nsfw/includes/**
-!nsfw/build/Release/*.node
-!nsfw/**/*.a
-
-vsda/build/**
-vsda/ci/**
-vsda/src/**
-vsda/.gitignore
-vsda/binding.gyp
-vsda/README.md
-vsda/targets
-!vsda/build/Release/vsda.node
-
-vscode-windows-ca-certs/**/*
-!vscode-windows-ca-certs/package.json
-!vscode-windows-ca-certs/**/*.node
-
-node-addon-api/**/*

build/azure-pipelines/common/extract-telemetry.sh

@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-cd $BUILD_STAGINGDIRECTORY
-mkdir extraction
-cd extraction
-git clone --depth 1 https://github.com/Microsoft/vscode-extension-telemetry.git
-git clone --depth 1 https://github.com/Microsoft/vscode-chrome-debug-core.git
-git clone --depth 1 https://github.com/Microsoft/vscode-node-debug2.git
-git clone --depth 1 https://github.com/Microsoft/vscode-node-debug.git
-git clone --depth 1 https://github.com/Microsoft/vscode-html-languageservice.git
-git clone --depth 1 https://github.com/Microsoft/vscode-json-languageservice.git
-$BUILD_SOURCESDIRECTORY/build/node_modules/.bin/vscode-telemetry-extractor --sourceDir $BUILD_SOURCESDIRECTORY --excludedDir $BUILD_SOURCESDIRECTORY/extensions --outputDir . --applyEndpoints
-$BUILD_SOURCESDIRECTORY/build/node_modules/.bin/vscode-telemetry-extractor --config $BUILD_SOURCESDIRECTORY/build/azure-pipelines/common/telemetry-config.json -o .
-mkdir -p $BUILD_SOURCESDIRECTORY/.build/telemetry
-mv declarations-resolved.json $BUILD_SOURCESDIRECTORY/.build/telemetry/telemetry-core.json
-mv config-resolved.json $BUILD_SOURCESDIRECTORY/.build/telemetry/telemetry-extensions.json
-cd ..
-rm -rf extraction

build/azure-pipelines/common/installDistro.ts

@@ -0,0 +1,18 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as  cp from 'child_process';
+
+function yarnInstall(packageName: string): void {
+	cp.execSync(`yarn add --no-lockfile ${packageName}`);
+}
+
+const product = require('../../../product.json');
+const dependencies = product.dependencies || {} as { [name: string]: string; };
+
+Object.keys(dependencies).forEach(name => {
+	const url = dependencies[name];
+	yarnInstall(url);
+});

build/azure-pipelines/common/publish.ts

@@ -6,6 +6,7 @@
 'use strict';
 
 import * as fs from 'fs';
+import { execSync } from 'child_process';
 import { Readable } from 'stream';
 import * as crypto from 'crypto';
 import * as azure from 'azure-storage';
@@ -65,7 +66,8 @@ interface Asset {
 	platform: string;
 	type: string;
 	url: string;
-	mooncakeUrl?: string;
+	// {{SQL CARBON EDIT}}
+	mooncakeUrl: string | undefined;
 	hash: string;
 	sha256hash: string;
 	size: number;
@@ -152,6 +154,9 @@ async function publish(commit: string, quality: string, platform: string, type:
 
 	const queuedBy = process.env['BUILD_QUEUEDBY']!;
 	const sourceBranch = process.env['BUILD_SOURCEBRANCH']!;
+	const isReleased = quality === 'insider'
+		&& /^master$|^refs\/heads\/master$/.test(sourceBranch)
+		&& /Project Collection Service Accounts|Microsoft.VisualStudio.Services.TFS/.test(queuedBy);
 
 	console.log('Publishing...');
 	console.log('Quality:', quality);
@@ -161,6 +166,7 @@ async function publish(commit: string, quality: string, platform: string, type:
 	console.log('Version:', version);
 	console.log('Commit:', commit);
 	console.log('Is Update:', isUpdate);
+	console.log('Is Released:', isReleased);
 	console.log('File:', file);
 
 	const stat = await new Promise<fs.Stats>((c, e) => fs.stat(file, (err, stat) => err ? e(err) : c(stat)));
@@ -180,18 +186,56 @@ async function publish(commit: string, quality: string, platform: string, type:
 	const blobService = azure.createBlobService(storageAccount, process.env['AZURE_STORAGE_ACCESS_KEY_2']!)
 		.withFilter(new azure.ExponentialRetryPolicyFilter(20));
 
+	// {{SQL CARBON EDIT}}
 	await assertContainer(blobService, quality);
 
 	const blobExists = await doesAssetExist(blobService, quality, blobName);
 
-	if (blobExists) {
+	const promises = [];
+
+	if (!blobExists) {
+		promises.push(uploadBlob(blobService, quality, blobName, file));
+	}
+
+	// {{SQL CARBON EDIT}}
+	if (process.env['MOONCAKE_STORAGE_ACCESS_KEY']) {
+		const mooncakeBlobService = azure.createBlobService(storageAccount, process.env['MOONCAKE_STORAGE_ACCESS_KEY']!, `${storageAccount}.blob.core.chinacloudapi.cn`)
+			.withFilter(new azure.ExponentialRetryPolicyFilter(20));
+
+		// mooncake is fussy and far away, this is needed!
+		mooncakeBlobService.defaultClientRequestTimeoutInMs = 10 * 60 * 1000;
+
+		await Promise.all([
+			assertContainer(blobService, quality),
+			assertContainer(mooncakeBlobService, quality)
+		]);
+
+		const [blobExists, moooncakeBlobExists] = await Promise.all([
+			doesAssetExist(blobService, quality, blobName),
+			doesAssetExist(mooncakeBlobService, quality, blobName)
+		]);
+
+		const promises: Array<Promise<void>> = [];
+
+		if (!blobExists) {
+			promises.push(uploadBlob(blobService, quality, blobName, file));
+		}
+
+		if (!moooncakeBlobExists) {
+			promises.push(uploadBlob(mooncakeBlobService, quality, blobName, file));
+		}
+	} else {
+		console.log('Skipping Mooncake publishing.');
+	}
+
+	if (promises.length === 0) {
 		console.log(`Blob ${quality}, ${blobName} already exists, not publishing again.`);
 		return;
 	}
 
 	console.log('Uploading blobs to Azure storage...');
 
-	await uploadBlob(blobService, quality, blobName, file);
+	await Promise.all(promises);
 
 	console.log('Blobs successfully uploaded.');
 
@@ -203,6 +247,8 @@ async function publish(commit: string, quality: string, platform: string, type:
 		platform: platform,
 		type: type,
 		url: `${process.env['AZURE_CDN_URL']}/${quality}/${blobName}`,
+		// {{SQL CARBON EDIT}}
+		mooncakeUrl: process.env['MOONCAKE_CDN_URL'] ? `${process.env['MOONCAKE_CDN_URL']}/${quality}/${blobName}` : undefined,
 		hash: sha1hash,
 		sha256hash,
 		size
@@ -215,15 +261,11 @@ async function publish(commit: string, quality: string, platform: string, type:
 
 	console.log('Asset:', JSON.stringify(asset, null, '  '));
 
-	// {{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 release = {
 		id: commit,
 		timestamp: (new Date()).getTime(),
 		version,
-		isReleased: isReleased,
+		isReleased: config.frozen ? false : isReleased,
 		sourceBranch,
 		queuedBy,
 		assets: [] as Array<Asset>,
@@ -242,10 +284,8 @@ async function publish(commit: string, quality: string, platform: string, type:
 }
 
 function main(): void {
-	const commit = process.env['BUILD_SOURCEVERSION'];
+	if (process.env['VSCODE_BUILD_SKIP_PUBLISH']) {
-
+		console.warn('Skipping publish due to VSCODE_BUILD_SKIP_PUBLISH');
-	if (!commit) {
-		console.warn('Skipping publish due to missing BUILD_SOURCEVERSION');
 		return;
 	}
 
@@ -253,7 +293,11 @@ function main(): void {
 		boolean: ['upload-only']
 	});
 
-	const [quality, platform, type, name, version, _isUpdate, file] = opts._;
+	// {{SQL CARBON EDIT}}
+	let [quality, platform, type, name, version, _isUpdate, file, commit] = opts._;
+	if (!commit) {
+		commit = execSync('git rev-parse HEAD', { encoding: 'utf8' }).trim();
+	}
 
 	publish(commit, quality, platform, type, name, version, _isUpdate, file, opts).catch(err => {
 		console.error(err);

build/azure-pipelines/common/release.ts

@@ -1,109 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-import { DocumentClient } from 'documentdb';
-
-interface Config {
-	id: string;
-	frozen: boolean;
-}
-
-function createDefaultConfig(quality: string): Config {
-	return {
-		id: quality,
-		frozen: false
-	};
-}
-
-function getConfig(quality: string): Promise<Config> {
-	const client = new DocumentClient(process.env['AZURE_DOCUMENTDB_ENDPOINT']!, { masterKey: process.env['AZURE_DOCUMENTDB_MASTERKEY'] });
-	const collection = 'dbs/builds/colls/config';
-	const query = {
-		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) => {
-			if (err && err.code !== 409) { return e(err); }
-
-			c(!results || results.length === 0 ? createDefaultConfig(quality) : results[0] as any as Config);
-		});
-	});
-}
-
-function doRelease(commit: string, quality: string): Promise<void> {
-	const client = new DocumentClient(process.env['AZURE_DOCUMENTDB_ENDPOINT']!, { masterKey: process.env['AZURE_DOCUMENTDB_MASTERKEY'] });
-	const collection = 'dbs/builds/colls/' + quality;
-	const query = {
-		query: 'SELECT TOP 1 * FROM c WHERE c.id = @id',
-		parameters: [{ name: '@id', value: commit }]
-	};
-
-	let updateTries = 0;
-
-	function update(): Promise<void> {
-		updateTries++;
-
-		return new Promise<void>((c, e) => {
-			client.queryDocuments(collection, query).toArray((err, results) => {
-				if (err) { return e(err); }
-				if (results.length !== 1) { return e(new Error('No documents')); }
-
-				const release = results[0];
-				release.isReleased = true;
-
-				client.replaceDocument(release._self, release, err => {
-					if (err && err.code === 409 && updateTries < 5) { return c(update()); }
-					if (err) { return e(err); }
-
-					console.log('Build successfully updated.');
-					c();
-				});
-			});
-		});
-	}
-
-	return update();
-}
-
-async function release(commit: string, quality: string): Promise<void> {
-	const config = await getConfig(quality);
-
-	console.log('Quality config:', config);
-
-	if (config.frozen) {
-		console.log(`Skipping release because quality ${quality} is frozen.`);
-		return;
-	}
-
-	await doRelease(commit, quality);
-}
-
-function env(name: string): string {
-	const result = process.env[name];
-
-	if (!result) {
-		throw new Error(`Skipping release due to missing env: ${name}`);
-	}
-
-	return result;
-}
-
-async function main(): Promise<void> {
-	const commit = env('BUILD_SOURCEVERSION');
-	const quality = env('VSCODE_QUALITY');
-
-	await release(commit, quality);
-}
-
-main().catch(err => {
-	console.error(err);
-	process.exit(1);
-});

build/azure-pipelines/common/symbols.ts

@@ -36,6 +36,7 @@ export interface IVersionAccessor extends IApplicationAccessor {
 enum Platform {
 	WIN_32 = 'win32-ia32',
 	WIN_64 = 'win32-x64',
+	LINUX_32 = 'linux-ia32',
 	LINUX_64 = 'linux-x64',
 	MAC_OS = 'darwin-x64'
 }
@@ -146,10 +147,6 @@ async function ensureVersionAndSymbols(options: IOptions) {
 	// Check version does not exist
 	console.log(`HockeyApp: checking for existing version ${options.versions.code} (${options.platform})`);
 	const versions = await getVersions({ accessToken: options.access.hockeyAppToken, appId: options.access.hockeyAppId });
-	if (!Array.isArray(versions.app_versions)) {
-		throw new Error(`Unexpected response: ${JSON.stringify(versions)}`);
-	}
-
 	if (versions.app_versions.some(v => v.version === options.versions.code)) {
 		console.log(`HockeyApp: Returning without uploading symbols because version ${options.versions.code} (${options.platform}) was already found`);
 		return;
@@ -188,17 +185,13 @@ const hockeyAppToken = process.argv[3];
 const is64 = process.argv[4] === 'x64';
 const hockeyAppId = process.argv[5];
 
-if (process.argv.length !== 6) {
-	throw new Error(`HockeyApp: Unexpected number of arguments. Got ${process.argv}`);
-}
-
 let platform: Platform;
 if (process.platform === 'darwin') {
 	platform = Platform.MAC_OS;
 } else if (process.platform === 'win32') {
 	platform = is64 ? Platform.WIN_64 : Platform.WIN_32;
 } else {
-	platform = Platform.LINUX_64;
+	platform = is64 ? Platform.LINUX_64 : Platform.LINUX_32;
 }
 
 // Create version and upload symbols in HockeyApp
@@ -219,9 +212,7 @@ if (repository && codeVersion && electronVersion && (product.quality === 'stable
 	}).then(() => {
 		console.log('HockeyApp: done');
 	}).catch(error => {
-		console.error(`HockeyApp: error ${error} (AppID: ${hockeyAppId})`);
+		console.error(`HockeyApp: error (${error})`);
-
-		return process.exit(1);
 	});
 } else {
 	console.log(`HockeyApp: skipping due to unexpected context (repository: ${repository}, codeVersion: ${codeVersion}, electronVersion: ${electronVersion}, quality: ${product.quality})`);

build/azure-pipelines/common/sync-mooncake.ts

@@ -1,171 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-import * as url from 'url';
-import * as azure from 'azure-storage';
-import * as mime from 'mime';
-import { DocumentClient, RetrievedDocument } from 'documentdb';
-
-function log(...args: any[]) {
-	console.log(...[`[${new Date().toISOString()}]`, ...args]);
-}
-
-function error(...args: any[]) {
-	console.error(...[`[${new Date().toISOString()}]`, ...args]);
-}
-
-if (process.argv.length < 3) {
-	error('Usage: node sync-mooncake.js <quality>');
-	process.exit(-1);
-}
-
-interface Build extends RetrievedDocument {
-	assets: Asset[];
-}
-
-interface Asset {
-	platform: string;
-	type: string;
-	url: string;
-	mooncakeUrl: string;
-	hash: string;
-	sha256hash: string;
-	size: number;
-	supportsFastUpdate?: boolean;
-}
-
-function updateBuild(commit: string, quality: string, platform: string, type: string, asset: Asset): Promise<void> {
-	const client = new DocumentClient(process.env['AZURE_DOCUMENTDB_ENDPOINT']!, { masterKey: process.env['AZURE_DOCUMENTDB_MASTERKEY'] });
-	const collection = 'dbs/builds/colls/' + quality;
-	const updateQuery = {
-		query: 'SELECT TOP 1 * FROM c WHERE c.id = @id',
-		parameters: [{ name: '@id', value: commit }]
-	};
-
-	let updateTries = 0;
-
-	function _update(): Promise<void> {
-		updateTries++;
-
-		return new Promise<void>((c, e) => {
-			client.queryDocuments(collection, updateQuery).toArray((err, results) => {
-				if (err) { return e(err); }
-				if (results.length !== 1) { return e(new Error('No documents')); }
-
-				const release = results[0];
-
-				release.assets = [
-					...release.assets.filter((a: any) => !(a.platform === platform && a.type === type)),
-					asset
-				];
-
-				client.replaceDocument(release._self, release, err => {
-					if (err && err.code === 409 && updateTries < 5) { return c(_update()); }
-					if (err) { return e(err); }
-
-					log('Build successfully updated.');
-					c();
-				});
-			});
-		});
-	}
-
-	return _update();
-}
-
-async function sync(commit: string, quality: string): Promise<void> {
-	log(`Synchronizing Mooncake assets for ${quality}, ${commit}...`);
-
-	const cosmosdb = new DocumentClient(process.env['AZURE_DOCUMENTDB_ENDPOINT']!, { masterKey: process.env['AZURE_DOCUMENTDB_MASTERKEY'] });
-	const collection = `dbs/builds/colls/${quality}`;
-	const query = {
-		query: 'SELECT TOP 1 * FROM c WHERE c.id = @id',
-		parameters: [{ name: '@id', value: commit }]
-	};
-
-	const build = await new Promise<Build>((c, e) => {
-		cosmosdb.queryDocuments(collection, query).toArray((err, results) => {
-			if (err) { return e(err); }
-			if (results.length !== 1) { return e(new Error('No documents')); }
-			c(results[0] as Build);
-		});
-	});
-
-	log(`Found build for ${commit}, with ${build.assets.length} assets`);
-
-	const storageAccount = process.env['AZURE_STORAGE_ACCOUNT_2']!;
-
-	const blobService = azure.createBlobService(storageAccount, process.env['AZURE_STORAGE_ACCESS_KEY_2']!)
-		.withFilter(new azure.ExponentialRetryPolicyFilter(20));
-
-	const mooncakeBlobService = azure.createBlobService(storageAccount, process.env['MOONCAKE_STORAGE_ACCESS_KEY']!, `${storageAccount}.blob.core.chinacloudapi.cn`)
-		.withFilter(new azure.ExponentialRetryPolicyFilter(20));
-
-	// mooncake is fussy and far away, this is needed!
-	blobService.defaultClientRequestTimeoutInMs = 10 * 60 * 1000;
-	mooncakeBlobService.defaultClientRequestTimeoutInMs = 10 * 60 * 1000;
-
-	for (const asset of build.assets) {
-		try {
-			const blobPath = url.parse(asset.url).path;
-
-			if (!blobPath) {
-				throw new Error(`Failed to parse URL: ${asset.url}`);
-			}
-
-			const blobName = blobPath.replace(/^\/\w+\//, '');
-
-			log(`Found ${blobName}`);
-
-			if (asset.mooncakeUrl) {
-				log(`  Already in Mooncake ✔️`);
-				continue;
-			}
-
-			const readStream = blobService.createReadStream(quality, blobName, undefined!);
-			const blobOptions: azure.BlobService.CreateBlockBlobRequestOptions = {
-				contentSettings: {
-					contentType: mime.lookup(blobPath),
-					cacheControl: 'max-age=31536000, public'
-				}
-			};
-
-			const writeStream = mooncakeBlobService.createWriteStreamToBlockBlob(quality, blobName, blobOptions, undefined);
-
-			log(`  Uploading to Mooncake...`);
-			await new Promise((c, e) => readStream.pipe(writeStream).on('finish', c).on('error', e));
-
-			log(`  Updating build in DB...`);
-			asset.mooncakeUrl = `${process.env['MOONCAKE_CDN_URL']}${blobPath}`;
-			await updateBuild(commit, quality, asset.platform, asset.type, asset);
-
-			log(`  Done ✔️`);
-		} catch (err) {
-			error(err);
-		}
-	}
-
-	log(`All done ✔️`);
-}
-
-function main(): void {
-	const commit = process.env['BUILD_SOURCEVERSION'];
-
-	if (!commit) {
-		error('Skipping publish due to missing BUILD_SOURCEVERSION');
-		return;
-	}
-
-	const quality = process.argv[2];
-
-	sync(commit, quality).catch(err => {
-		error(err);
-		process.exit(1);
-	});
-}
-
-main();

build/azure-pipelines/common/telemetry-config.json

@@ -1,72 +0,0 @@
-[
-	{
-		"eventPrefix": "typescript-language-features/",
-		"sourceDirs": [
-			"../../s/extensions/typescript-language-features"
-		],
-		"excludedDirs": [],
-		"applyEndpoints": true
-	},
-	{
-		"eventPrefix": "git/",
-		"sourceDirs": [
-			"../../s/extensions/git"
-		],
-		"excludedDirs": [],
-		"applyEndpoints": true
-	},
-	{
-		"eventPrefix": "extension-telemetry/",
-		"sourceDirs": [
-			"vscode-extension-telemetry"
-		],
-		"excludedDirs": [],
-		"applyEndpoints": true
-	},
-	{
-		"eventPrefix": "vscode-markdown/",
-		"sourceDirs": [
-			"../../s/extensions/markdown-language-features"
-		],
-		"excludedDirs": [],
-		"applyEndpoints": true
-	},
-	{
-		"eventPrefix": "html-language-features/",
-		"sourceDirs": [
-			"../../s/extensions/html-language-features",
-			"vscode-html-languageservice"
-		],
-		"excludedDirs": [],
-		"applyEndpoints": true
-	},
-	{
-		"eventPrefix": "json-language-features/",
-		"sourceDirs": [
-			"../../s/extensions/json-language-features",
-			"vscode-json-languageservice"
-		],
-		"excludedDirs": [],
-		"applyEndpoints": true
-	},
-	{
-		"eventPrefix": "ms-vscode.node2/",
-		"sourceDirs": [
-			"vscode-chrome-debug-core",
-			"vscode-node-debug2"
-		],
-		"excludedDirs": [],
-		"applyEndpoints": true,
-		"patchDebugEvents": true
-	},
-	{
-		"eventPrefix": "ms-vscode.node/",
-		"sourceDirs": [
-			"vscode-chrome-debug-core",
-			"vscode-node-debug"
-		],
-		"excludedDirs": [],
-		"applyEndpoints": true,
-		"patchDebugEvents": true
-	}
-]

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

@@ -1,25 +1,13 @@
 steps:
 - task: NodeTool@0
   inputs:
-    versionSpec: "10.15.1"
+    versionSpec: "8.12.0"
-- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-  inputs:
-    keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
-    targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-    vstsFeed: '$(ArtifactFeed)'
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
   inputs:
     versionSpec: "1.10.1"
 - script: |
-    yarn --frozen-lockfile
+    yarn
   displayName: Install Dependencies
-  condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
-- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
-  inputs:
-    keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
-    targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-    vstsFeed: '$(ArtifactFeed)'
-  condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 - script: |
     yarn gulp electron-x64
   displayName: Download Electron
@@ -29,6 +17,9 @@ steps:
 - script: |
     yarn monaco-compile-check
   displayName: Run Monaco Editor Checks
+- script: |
+    yarn strict-null-check
+  displayName: Run Strict Null Checks
 - script: |
     yarn compile
   displayName: Compile Sources
@@ -46,4 +37,4 @@ steps:
   inputs:
     testResultsFiles: '*-results.xml'
     searchFolder: '$(Build.ArtifactStagingDirectory)/test-results'
-  condition: succeededOrFailed()
+  condition: succeededOrFailed()

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

@@ -1,96 +1,29 @@
 steps:
-- script: |
-    mkdir -p .build
-    echo -n $BUILD_SOURCEVERSION > .build/commit
-    echo -n $VSCODE_QUALITY > .build/quality
-  displayName: Prepare cache flag
-
-- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-  inputs:
-    keyfile: 'build/.cachesalt, .build/commit, .build/quality'
-    targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min'
-    vstsFeed: 'npm-vscode'
-    platformIndependent: true
-    alias: 'Compilation'
-
-- script: |
-    set -e
-    exit 1
-  displayName: Check RestoreCache
-  condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
-
 - task: NodeTool@0
   inputs:
-    versionSpec: "10.15.1"
+    versionSpec: "8.12.0"
 
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
   inputs:
     versionSpec: "1.10.1"
 
-- task: AzureKeyVault@1
+- script: |
-  displayName: 'Azure Key Vault: Get Secrets'
+    set -e
-  inputs:
+    echo "machine monacotools.visualstudio.com password $(VSO_PAT)" > ~/.netrc
-    azureSubscription: 'vscode-builds-subscription'
+    yarn
-    KeyVaultName: vscode
+    yarn gulp -- hygiene
+    yarn monaco-compile-check
+    yarn strict-null-check
+    VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" yarn gulp -- mixin
+    node build/azure-pipelines/common/installDistro.js
+    node build/lib/builtInExtensions.js
+  displayName: Prepare build
 
 - script: |
     set -e
-
+    VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" \
-    cat << EOF > ~/.netrc
+    AZURE_STORAGE_ACCESS_KEY="$(AZURE_STORAGE_ACCESS_KEY)" \
-    machine github.com
+    yarn gulp -- vscode-darwin-min upload-vscode-sourcemaps
-    login vscode
-    password $(github-distro-mixin-password)
-    EOF
-
-    git config user.email "vscode@microsoft.com"
-    git config user.name "VSCode"
-  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'
-    targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-    vstsFeed: 'npm-vscode'
-
-- script: |
-    set -e
-    CHILD_CONCURRENCY=1 yarn --frozen-lockfile
-  displayName: Install dependencies
-  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'
-    targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-    vstsFeed: 'npm-vscode'
-  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
-
-- script: |
-    set -e
-    VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-      yarn gulp vscode-darwin-min-ci
-    VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-      yarn gulp vscode-reh-darwin-min-ci
-    VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-      yarn gulp vscode-reh-web-darwin-min-ci
   displayName: Build
 
 - script: |
@@ -99,33 +32,6 @@ steps:
     # APP_NAME="`ls $(agent.builddirectory)/VSCode-darwin | head -n 1`"
     # yarn smoketest -- --build "$(agent.builddirectory)/VSCode-darwin/$APP_NAME"
   displayName: Run unit tests
-  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-
-- script: |
-    set -e
-    ./scripts/test-integration.sh --build --tfs "Integration Tests"
-  displayName: Run integration tests
-  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-
-- 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 -
-    yarn smoketest --web --headless
-  continueOnError: true
-  displayName: Run smoke tests
-  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
 - script: |
     set -e
@@ -153,12 +59,31 @@ steps:
 
 - script: |
     set -e
-    VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+
-    AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
+    # remove pkg from archive
-    AZURE_STORAGE_ACCESS_KEY="$(ticino-storage-key)" \
+    zip -d ../VSCode-darwin.zip "*.pkg"
-    AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
+
-    VSCODE_HOCKEYAPP_TOKEN="$(vscode-hockeyapp-token)" \
+    # publish the build
-    ./build/azure-pipelines/darwin/publish.sh
+    PACKAGEJSON=`ls ../VSCode-darwin/*.app/Contents/Resources/app/package.json`
+    VERSION=`node -p "require(\"$PACKAGEJSON\").version"`
+    AZURE_DOCUMENTDB_MASTERKEY="$(AZURE_DOCUMENTDB_MASTERKEY)" \
+    AZURE_STORAGE_ACCESS_KEY_2="$(AZURE_STORAGE_ACCESS_KEY_2)" \
+    MOONCAKE_STORAGE_ACCESS_KEY="$(MOONCAKE_STORAGE_ACCESS_KEY)" \
+    node build/azure-pipelines/common/publish.js \
+      "$(VSCODE_QUALITY)" \
+      darwin \
+      archive \
+      "VSCode-darwin-$(VSCODE_QUALITY).zip" \
+      $VERSION \
+      true \
+      ../VSCode-darwin.zip
+
+    # publish hockeyapp symbols
+    node build/azure-pipelines/common/symbols.js "$(VSCODE_MIXIN_PASSWORD)" "$(VSCODE_HOCKEYAPP_TOKEN)" "$(VSCODE_ARCH)" "$(VSCODE_HOCKEYAPP_ID_MACOS)"
+
+    # upload configuration
+    AZURE_STORAGE_ACCESS_KEY="$(AZURE_STORAGE_ACCESS_KEY)" \
+    yarn gulp -- upload-vscode-configuration
   displayName: Publish
 
 - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0

build/azure-pipelines/darwin/publish.sh

@@ -1,36 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-# remove pkg from archive
-zip -d ../VSCode-darwin.zip "*.pkg"
-
-# publish the build
-PACKAGEJSON=`ls ../VSCode-darwin/*.app/Contents/Resources/app/package.json`
-VERSION=`node -p "require(\"$PACKAGEJSON\").version"`
-node build/azure-pipelines/common/publish.js \
-	"$VSCODE_QUALITY" \
-	darwin \
-	archive \
-	"VSCode-darwin-$VSCODE_QUALITY.zip" \
-	$VERSION \
-	true \
-	../VSCode-darwin.zip
-
-# package Remote Extension Host
-pushd .. && mv vscode-reh-darwin vscode-server-darwin && zip -Xry vscode-server-darwin.zip vscode-server-darwin && popd
-
-# publish Remote Extension Host
-node build/azure-pipelines/common/publish.js \
-	"$VSCODE_QUALITY" \
-	server-darwin \
-	archive-unsigned \
-	"vscode-server-darwin.zip" \
-	$VERSION \
-	true \
-	../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"
-
-# upload configuration
-yarn gulp upload-vscode-configuration

build/azure-pipelines/distro-build.yml

@@ -1,42 +0,0 @@
-trigger:
-  branches:
-    include: ['master', 'release/*']
-pr:
-  branches:
-    include: ['master', 'release/*']
-
-steps:
-- task: NodeTool@0
-  inputs:
-    versionSpec: "10.15.1"
-
-- task: AzureKeyVault@1
-  displayName: 'Azure Key Vault: Get Secrets'
-  inputs:
-    azureSubscription: 'vscode-builds-subscription'
-    KeyVaultName: vscode
-
-- script: |
-    set -e
-
-    cat << EOF > ~/.netrc
-    machine github.com
-    login vscode
-    password $(github-distro-mixin-password)
-    EOF
-
-    git config user.email "vscode@microsoft.com"
-    git config user.name "VSCode"
-
-    git remote add distro "https://github.com/$VSCODE_MIXIN_REPO.git"
-    git fetch distro
-
-    # Push master branch into oss/master
-    git push distro origin/master:refs/heads/oss/master
-
-    # Push every release branch into oss/release
-    git for-each-ref --format="%(refname:short)" refs/remotes/origin/release/* | sed 's/^origin\/\(.*\)$/\0:refs\/heads\/oss\/\1/' | xargs git push distro
-
-    git merge $(node -p "require('./package.json').distro")
-
-  displayName: Sync & Merge Distro

build/azure-pipelines/exploration-build.yml

@@ -1,43 +0,0 @@
-pool:
-  vmImage: 'Ubuntu-16.04'
-
-steps:
-- task: NodeTool@0
-  inputs:
-    versionSpec: "10.15.1"
-
-- task: AzureKeyVault@1
-  displayName: 'Azure Key Vault: Get Secrets'
-  inputs:
-    azureSubscription: 'vscode-builds-subscription'
-    KeyVaultName: vscode
-
-- script: |
-    set -e
-
-    cat << EOF > ~/.netrc
-    machine github.com
-    login vscode
-    password $(github-distro-mixin-password)
-    EOF
-
-    git config user.email "vscode@microsoft.com"
-    git config user.name "VSCode"
-
-    git checkout origin/electron-6.0.x
-    git merge origin/master
-
-    # Push master branch into exploration branch
-    git push origin HEAD:electron-6.0.x
-
-  displayName: Sync & Merge Exploration
-
-trigger: none
-pr: none
-
-schedules:
-- cron: "0 5 * * Mon-Fri"
-  displayName: Mon-Fri at 7:00
-  branches:
-    include:
-    - master

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

@@ -2,32 +2,20 @@ steps:
 - script: |
     set -e
     sudo apt-get update
-    sudo apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb libgtk-3-0
+    sudo apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 libgconf-2-4 dbus xvfb libgtk-3-0
     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
 - task: NodeTool@0
   inputs:
-    versionSpec: "10.15.1"
+    versionSpec: "8.12.0"
-- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-  inputs:
-    keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
-    targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-    vstsFeed: '$(ArtifactFeed)'
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
   inputs:
     versionSpec: "1.10.1"
 - script: |
-    yarn --frozen-lockfile
+    yarn
   displayName: Install Dependencies
-  condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
-- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
-  inputs:
-    keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
-    targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-    vstsFeed: '$(ArtifactFeed)'
-  condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 - script: |
     yarn gulp electron-x64
   displayName: Download Electron
@@ -37,6 +25,9 @@ steps:
 - script: |
     yarn monaco-compile-check
   displayName: Run Monaco Editor Checks
+- script: |
+    yarn strict-null-check
+  displayName: Run Strict Null Checks
 - script: |
     yarn compile
   displayName: Compile Sources
@@ -46,12 +37,9 @@ steps:
 - script: |
     DISPLAY=:10 ./scripts/test.sh --tfs "Unit Tests"
   displayName: Run Unit Tests
-- script: |
-    DISPLAY=:10 ./scripts/test-integration.sh --tfs "Integration Tests"
-  displayName: Run Integration Tests
 - task: PublishTestResults@2
   displayName: Publish Tests Results
   inputs:
     testResultsFiles: '*-results.xml'
     searchFolder: '$(Build.ArtifactStagingDirectory)/test-results'
-  condition: succeededOrFailed()
+  condition: succeededOrFailed()

build/azure-pipelines/linux/multiarch/alpine/build.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-set -e
-echo 'noop'

build/azure-pipelines/linux/multiarch/alpine/prebuild.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-set -e
-echo 'noop'

build/azure-pipelines/linux/multiarch/alpine/publish.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-set -e
-echo 'noop'

build/azure-pipelines/linux/multiarch/arm64/build.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-set -e
-echo 'noop'

build/azure-pipelines/linux/multiarch/arm64/prebuild.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-set -e
-echo 'noop'

build/azure-pipelines/linux/multiarch/arm64/publish.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-set -e
-echo 'noop'

build/azure-pipelines/linux/multiarch/armhf/build.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-set -e
-echo 'noop'

build/azure-pipelines/linux/multiarch/armhf/prebuild.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-set -e
-echo 'noop'

build/azure-pipelines/linux/multiarch/armhf/publish.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-set -e
-echo 'noop'

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

@@ -1,116 +0,0 @@
-steps:
-- script: |
-    mkdir -p .build
-    echo -n $BUILD_SOURCEVERSION > .build/commit
-    echo -n $VSCODE_QUALITY > .build/quality
-  displayName: Prepare cache flag
-
-- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-  inputs:
-    keyfile: 'build/.cachesalt, .build/commit, .build/quality'
-    targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min'
-    vstsFeed: 'npm-vscode'
-    platformIndependent: true
-    alias: 'Compilation'
-
-- script: |
-    set -e
-    exit 1
-  displayName: Check RestoreCache
-  condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
-
-- task: NodeTool@0
-  inputs:
-    versionSpec: "10.15.1"
-
-- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-  inputs:
-    versionSpec: "1.10.1"
-
-- task: AzureKeyVault@1
-  displayName: 'Azure Key Vault: Get Secrets'
-  inputs:
-    azureSubscription: 'vscode-builds-subscription'
-    KeyVaultName: vscode
-
-- task: Docker@1
-  displayName: 'Pull image'
-  inputs:
-    azureSubscriptionEndpoint: 'vscode-builds-subscription'
-    azureContainerRegistry: vscodehub.azurecr.io
-    command: 'Run an image'
-    imageName: 'vscode-linux-build-agent:$(VSCODE_ARCH)'
-    containerCommand: uname
-
-- script: |
-    set -e
-
-    cat << EOF > ~/.netrc
-    machine github.com
-    login vscode
-    password $(github-distro-mixin-password)
-    EOF
-
-    git config user.email "vscode@microsoft.com"
-    git config user.name "VSCode"
-  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'
-    targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-    vstsFeed: 'npm-vscode'
-
-- script: |
-    set -e
-    CHILD_CONCURRENCY=1 yarn --frozen-lockfile
-  displayName: Install dependencies
-  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'
-    targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-    vstsFeed: 'npm-vscode'
-  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
-
-- script: |
-    set -e
-    CHILD_CONCURRENCY=1 ./build/azure-pipelines/linux/multiarch/$(VSCODE_ARCH)/prebuild.sh
-  displayName: Prebuild
-
-- script: |
-    set -e
-    ./build/azure-pipelines/linux/multiarch/$(VSCODE_ARCH)/build.sh
-  displayName: Build
-
-- script: |
-    set -e
-    AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
-    AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
-    VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-    VSCODE_HOCKEYAPP_TOKEN="$(vscode-hockeyapp-token)" \
-    ./build/azure-pipelines/linux/multiarch/$(VSCODE_ARCH)/publish.sh
-  displayName: Publish
-
-- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-  displayName: 'Component Detection'
-  continueOnError: true

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

@@ -1,131 +1,112 @@
 steps:
-- script: |
-    mkdir -p .build
-    echo -n $BUILD_SOURCEVERSION > .build/commit
-    echo -n $VSCODE_QUALITY > .build/quality
-  displayName: Prepare cache flag
-
-- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-  inputs:
-    keyfile: 'build/.cachesalt, .build/commit, .build/quality'
-    targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min'
-    vstsFeed: 'npm-vscode'
-    platformIndependent: true
-    alias: 'Compilation'
-
-- script: |
-    set -e
-    exit 1
-  displayName: Check RestoreCache
-  condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
-
 - task: NodeTool@0
   inputs:
-    versionSpec: "10.15.1"
+    versionSpec: "8.12.0"
 
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
   inputs:
     versionSpec: "1.10.1"
 
-- task: AzureKeyVault@1
+- script: |
-  displayName: 'Azure Key Vault: Get Secrets'
+    set -e
-  inputs:
+    export npm_config_arch="$(VSCODE_ARCH)"
-    azureSubscription: 'vscode-builds-subscription'
+    if [[ "$(VSCODE_ARCH)" == "ia32" ]]; then
-    KeyVaultName: vscode
+      export PKG_CONFIG_PATH="/usr/lib/i386-linux-gnu/pkgconfig"
+    fi
+
+    echo "machine monacotools.visualstudio.com password $(VSO_PAT)" > ~/.netrc
+    CHILD_CONCURRENCY=1 yarn
+    npm run gulp -- hygiene
+    npm run monaco-compile-check
+    npm run strict-null-check
+    VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" npm run gulp -- mixin
+    node build/azure-pipelines/common/installDistro.js
+    node build/lib/builtInExtensions.js
 
 - script: |
     set -e
-    cat << EOF > ~/.netrc
+    VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" npm run gulp -- vscode-linux-$(VSCODE_ARCH)-min
-    machine github.com
+  name: build
-    login vscode
-    password $(github-distro-mixin-password)
-    EOF
-
-    git config user.email "vscode@microsoft.com"
-    git config user.name "VSCode"
-  displayName: Prepare tooling
 
 - script: |
     set -e
-    git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
+    npm run gulp -- "electron-$(VSCODE_ARCH)"
-    git fetch distro
-    git merge $(node -p "require('./package.json').distro")
-  displayName: Merge distro
 
-- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
+    # xvfb seems to be crashing often, let's make sure it's always up
-  inputs:
-    keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
-    targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-    vstsFeed: 'npm-vscode'
-
-- script: |
-    set -e
-    CHILD_CONCURRENCY=1 yarn --frozen-lockfile
-  displayName: Install dependencies
-  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'
-    targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-    vstsFeed: 'npm-vscode'
-  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
-
-- script: |
-    set -e
-    VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-      yarn gulp vscode-linux-x64-min-ci
-    VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-      yarn gulp vscode-reh-linux-x64-min-ci
-    VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-      yarn gulp vscode-reh-web-linux-x64-min-ci
-  displayName: Build
-
-- script: |
-    set -e
     service xvfb start
-  displayName: Start xvfb
-  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-- script: |
-    set -e
     DISPLAY=:10 ./scripts/test.sh --build --tfs "Unit Tests"
-  displayName: Run unit tests
+    # yarn smoketest -- --build "$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)"
-  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+  name: test
 
 - script: |
     set -e
-    DISPLAY=:10 ./scripts/test-integration.sh --build --tfs "Integration Tests"
+    REPO="$(pwd)"
-    # yarn smoketest -- --build "$(agent.builddirectory)/VSCode-linux-x64"
+    ROOT="$REPO/.."
-  displayName: Run integration tests
+    ARCH="$(VSCODE_ARCH)"
-  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-- script: |
+    # Publish tarball
-    set -e
+    PLATFORM_LINUX="linux-$(VSCODE_ARCH)"
-    AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
+    [[ "$ARCH" == "ia32" ]] && DEB_ARCH="i386" || DEB_ARCH="amd64"
-    AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
+    [[ "$ARCH" == "ia32" ]] && RPM_ARCH="i386" || RPM_ARCH="x86_64"
-    VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+    BUILDNAME="VSCode-$PLATFORM_LINUX"
-    VSCODE_HOCKEYAPP_TOKEN="$(vscode-hockeyapp-token)" \
+    BUILD="$ROOT/$BUILDNAME"
-    ./build/azure-pipelines/linux/publish.sh
+    BUILD_VERSION="$(date +%s)"
-  displayName: Publish
+    [ -z "$VSCODE_QUALITY" ] && TARBALL_FILENAME="code-$BUILD_VERSION.tar.gz" || TARBALL_FILENAME="code-$VSCODE_QUALITY-$BUILD_VERSION.tar.gz"
+    TARBALL_PATH="$ROOT/$TARBALL_FILENAME"
+    PACKAGEJSON="$BUILD/resources/app/package.json"
+    VERSION=$(node -p "require(\"$PACKAGEJSON\").version")
 
-- task: PublishPipelineArtifact@0
+    rm -rf $ROOT/code-*.tar.*
-  displayName: 'Publish Pipeline Artifact'
+    (cd $ROOT && tar -czf $TARBALL_PATH $BUILDNAME)
-  inputs:
+
-    artifactName: snap-x64
+    AZURE_DOCUMENTDB_MASTERKEY="$(AZURE_DOCUMENTDB_MASTERKEY)" \
-    targetPath: .build/linux/snap-tarball
+    AZURE_STORAGE_ACCESS_KEY_2="$(AZURE_STORAGE_ACCESS_KEY_2)" \
+    MOONCAKE_STORAGE_ACCESS_KEY="$(MOONCAKE_STORAGE_ACCESS_KEY)" \
+    node build/azure-pipelines/common/publish.js "$VSCODE_QUALITY" "$PLATFORM_LINUX" archive-unsigned "$TARBALL_FILENAME" "$VERSION" true "$TARBALL_PATH"
+
+    # Publish hockeyapp symbols
+    node build/azure-pipelines/common/symbols.js "$(VSCODE_MIXIN_PASSWORD)" "$(VSCODE_HOCKEYAPP_TOKEN)" "$(VSCODE_ARCH)" "$(VSCODE_HOCKEYAPP_ID_LINUX64)"
+
+    # Publish DEB
+    npm run gulp -- "vscode-linux-$(VSCODE_ARCH)-build-deb"
+    PLATFORM_DEB="linux-deb-$ARCH"
+    [[ "$ARCH" == "ia32" ]] && DEB_ARCH="i386" || DEB_ARCH="amd64"
+    DEB_FILENAME="$(ls $REPO/.build/linux/deb/$DEB_ARCH/deb/)"
+    DEB_PATH="$REPO/.build/linux/deb/$DEB_ARCH/deb/$DEB_FILENAME"
+
+    AZURE_DOCUMENTDB_MASTERKEY="$(AZURE_DOCUMENTDB_MASTERKEY)" \
+    AZURE_STORAGE_ACCESS_KEY_2="$(AZURE_STORAGE_ACCESS_KEY_2)" \
+    MOONCAKE_STORAGE_ACCESS_KEY="$(MOONCAKE_STORAGE_ACCESS_KEY)" \
+    node build/azure-pipelines/common/publish.js "$VSCODE_QUALITY" "$PLATFORM_DEB" package "$DEB_FILENAME" "$VERSION" true "$DEB_PATH"
+
+    # Publish RPM
+    npm run gulp -- "vscode-linux-$(VSCODE_ARCH)-build-rpm"
+    PLATFORM_RPM="linux-rpm-$ARCH"
+    [[ "$ARCH" == "ia32" ]] && RPM_ARCH="i386" || RPM_ARCH="x86_64"
+    RPM_FILENAME="$(ls $REPO/.build/linux/rpm/$RPM_ARCH/ | grep .rpm)"
+    RPM_PATH="$REPO/.build/linux/rpm/$RPM_ARCH/$RPM_FILENAME"
+
+    AZURE_DOCUMENTDB_MASTERKEY="$(AZURE_DOCUMENTDB_MASTERKEY)" \
+    AZURE_STORAGE_ACCESS_KEY_2="$(AZURE_STORAGE_ACCESS_KEY_2)" \
+    MOONCAKE_STORAGE_ACCESS_KEY="$(MOONCAKE_STORAGE_ACCESS_KEY)" \
+    node build/azure-pipelines/common/publish.js "$VSCODE_QUALITY" "$PLATFORM_RPM" package "$RPM_FILENAME" "$VERSION" true "$RPM_PATH"
+
+    # Publish Snap
+    npm run gulp -- "vscode-linux-$(VSCODE_ARCH)-prepare-snap"
+
+    # Pack snap tarball artifact, in order to preserve file perms
+    mkdir -p $REPO/.build/linux/snap-tarball
+    SNAP_TARBALL_PATH="$REPO/.build/linux/snap-tarball/snap-$(VSCODE_ARCH).tar.gz"
+    rm -rf $SNAP_TARBALL_PATH
+    (cd .build/linux && tar -czf $SNAP_TARBALL_PATH snap)
 
 - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
   displayName: 'Component Detection'
   continueOnError: true
+
+- task: PublishPipelineArtifact@0
+  displayName: 'Publish Pipeline Artifact'
+  inputs:
+    artifactName: snap-$(VSCODE_ARCH)
+    targetPath: .build/linux/snap-tarball

build/azure-pipelines/linux/publish.sh

@@ -1,60 +0,0 @@
-#!/usr/bin/env bash
-set -e
-REPO="$(pwd)"
-ROOT="$REPO/.."
-
-# Publish tarball
-PLATFORM_LINUX="linux-x64"
-BUILDNAME="VSCode-$PLATFORM_LINUX"
-BUILD="$ROOT/$BUILDNAME"
-BUILD_VERSION="$(date +%s)"
-[ -z "$VSCODE_QUALITY" ] && TARBALL_FILENAME="code-$BUILD_VERSION.tar.gz" || TARBALL_FILENAME="code-$VSCODE_QUALITY-$BUILD_VERSION.tar.gz"
-TARBALL_PATH="$ROOT/$TARBALL_FILENAME"
-PACKAGEJSON="$BUILD/resources/app/package.json"
-VERSION=$(node -p "require(\"$PACKAGEJSON\").version")
-
-rm -rf $ROOT/code-*.tar.*
-(cd $ROOT && tar -czf $TARBALL_PATH $BUILDNAME)
-
-node build/azure-pipelines/common/publish.js "$VSCODE_QUALITY" "$PLATFORM_LINUX" archive-unsigned "$TARBALL_FILENAME" "$VERSION" true "$TARBALL_PATH"
-
-# Publish Remote Extension Host
-LEGACY_SERVER_BUILD_NAME="vscode-reh-$PLATFORM_LINUX"
-SERVER_BUILD_NAME="vscode-server-$PLATFORM_LINUX"
-SERVER_TARBALL_FILENAME="vscode-server-$PLATFORM_LINUX.tar.gz"
-SERVER_TARBALL_PATH="$ROOT/$SERVER_TARBALL_FILENAME"
-
-rm -rf $ROOT/vscode-server-*.tar.*
-(cd $ROOT && mv $LEGACY_SERVER_BUILD_NAME $SERVER_BUILD_NAME && tar --owner=0 --group=0 -czf $SERVER_TARBALL_PATH $SERVER_BUILD_NAME)
-
-node build/azure-pipelines/common/publish.js "$VSCODE_QUALITY" "server-$PLATFORM_LINUX" archive-unsigned "$SERVER_TARBALL_FILENAME" "$VERSION" true "$SERVER_TARBALL_PATH"
-
-# Publish hockeyapp symbols
-node build/azure-pipelines/common/symbols.js "$VSCODE_MIXIN_PASSWORD" "$VSCODE_HOCKEYAPP_TOKEN" "x64" "$VSCODE_HOCKEYAPP_ID_LINUX64"
-
-# Publish DEB
-yarn gulp "vscode-linux-x64-build-deb"
-PLATFORM_DEB="linux-deb-x64"
-DEB_ARCH="amd64"
-DEB_FILENAME="$(ls $REPO/.build/linux/deb/$DEB_ARCH/deb/)"
-DEB_PATH="$REPO/.build/linux/deb/$DEB_ARCH/deb/$DEB_FILENAME"
-
-node build/azure-pipelines/common/publish.js "$VSCODE_QUALITY" "$PLATFORM_DEB" package "$DEB_FILENAME" "$VERSION" true "$DEB_PATH"
-
-# Publish RPM
-yarn gulp "vscode-linux-x64-build-rpm"
-PLATFORM_RPM="linux-rpm-x64"
-RPM_ARCH="x86_64"
-RPM_FILENAME="$(ls $REPO/.build/linux/rpm/$RPM_ARCH/ | grep .rpm)"
-RPM_PATH="$REPO/.build/linux/rpm/$RPM_ARCH/$RPM_FILENAME"
-
-node build/azure-pipelines/common/publish.js "$VSCODE_QUALITY" "$PLATFORM_RPM" package "$RPM_FILENAME" "$VERSION" true "$RPM_PATH"
-
-# Publish Snap
-yarn gulp "vscode-linux-x64-prepare-snap"
-
-# Pack snap tarball artifact, in order to preserve file perms
-mkdir -p $REPO/.build/linux/snap-tarball
-SNAP_TARBALL_PATH="$REPO/.build/linux/snap-tarball/snap-x64.tar.gz"
-rm -rf $SNAP_TARBALL_PATH
-(cd .build/linux && tar -czf $SNAP_TARBALL_PATH snap)

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

@@ -1,43 +1,30 @@
 steps:
 - task: NodeTool@0
   inputs:
-    versionSpec: "10.15.1"
+    versionSpec: "8.12.0"
 
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
   inputs:
     versionSpec: "1.10.1"
 
-- task: AzureKeyVault@1
-  displayName: 'Azure Key Vault: Get Secrets'
-  inputs:
-    azureSubscription: 'vscode-builds-subscription'
-    KeyVaultName: vscode
-
 - task: DownloadPipelineArtifact@0
   displayName: 'Download Pipeline Artifact'
   inputs:
-    artifactName: snap-x64
+    artifactName: snap-$(VSCODE_ARCH)
     targetPath: .build/linux/snap-tarball
 
 - script: |
     set -e
 
-    # Get snapcraft version
-    snapcraft --version
-
-    # Make sure we get latest packages
-    sudo apt-get update
-    sudo apt-get upgrade -y
-
-    # Define variables
     REPO="$(pwd)"
-    SNAP_ROOT="$REPO/.build/linux/snap/x64"
+    ARCH="$(VSCODE_ARCH)"
+    SNAP_ROOT="$REPO/.build/linux/snap/$ARCH"
 
     # Install build dependencies
     (cd build && yarn)
 
     # Unpack snap tarball artifact, in order to preserve file perms
-    SNAP_TARBALL_PATH="$REPO/.build/linux/snap-tarball/snap-x64.tar.gz"
+    SNAP_TARBALL_PATH="$REPO/.build/linux/snap-tarball/snap-$ARCH.tar.gz"
     (cd .build/linux && tar -xzf $SNAP_TARBALL_PATH)
 
     # Create snap package
@@ -46,9 +33,10 @@ steps:
     PACKAGEJSON="$(ls $SNAP_ROOT/code*/usr/share/code*/resources/app/package.json)"
     VERSION=$(node -p "require(\"$PACKAGEJSON\").version")
     SNAP_PATH="$SNAP_ROOT/$SNAP_FILENAME"
-    (cd $SNAP_ROOT/code-* && sudo --preserve-env snapcraft snap --output "$SNAP_PATH")
+    (cd $SNAP_ROOT/code-* && snapcraft snap --output "$SNAP_PATH")
 
     # Publish snap package
-    AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
+    AZURE_DOCUMENTDB_MASTERKEY="$(AZURE_DOCUMENTDB_MASTERKEY)" \
-    AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
+    AZURE_STORAGE_ACCESS_KEY_2="$(AZURE_STORAGE_ACCESS_KEY_2)" \
-    node build/azure-pipelines/common/publish.js "$VSCODE_QUALITY" "linux-snap-x64" package "$SNAP_FILENAME" "$VERSION" true "$SNAP_PATH"
+    MOONCAKE_STORAGE_ACCESS_KEY="$(MOONCAKE_STORAGE_ACCESS_KEY)" \
+    node build/azure-pipelines/common/publish.js "$VSCODE_QUALITY" "linux-snap-$ARCH" package "$SNAP_FILENAME" "$VERSION" true "$SNAP_PATH"

build/azure-pipelines/mixin.js

@@ -1,41 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-const json = require('gulp-json-editor');
-const buffer = require('gulp-buffer');
-const filter = require('gulp-filter');
-const es = require('event-stream');
-const vfs = require('vinyl-fs');
-const fancyLog = require('fancy-log');
-const ansiColors = require('ansi-colors');
-
-function main() {
-	const quality = process.env['VSCODE_QUALITY'];
-
-	if (!quality) {
-		console.log('Missing VSCODE_QUALITY, skipping mixin');
-		return;
-	}
-
-	const productJsonFilter = filter('product.json', { restore: true });
-
-	fancyLog(ansiColors.blue('[mixin]'), `Mixing in sources:`);
-	return vfs
-		.src(`quality/${quality}/**`, { base: `quality/${quality}` })
-		.pipe(filter(f => !f.isDirectory()))
-		.pipe(productJsonFilter)
-		.pipe(buffer())
-		.pipe(json(o => Object.assign({}, require('../product.json'), o)))
-		.pipe(productJsonFilter.restore)
-		.pipe(es.mapSync(function (f) {
-			fancyLog(ansiColors.blue('[mixin]'), f.relative, ansiColors.green('✔︎'));
-			return f;
-		}))
-		.pipe(vfs.dest('.'));
-}
-
-main();

build/azure-pipelines/product-build.yml

@@ -1,150 +1,65 @@
 resources:
   containers:
   - container: vscode-x64
-    image: vscodehub.azurecr.io/vscode-linux-build-agent:x64
+    image: joaomoreno/vscode-linux-build-agent:x64
-    endpoint: VSCodeHub
+  - container: vscode-ia32
+    image: joaomoreno/vscode-linux-build-agent:ia32
   - container: snapcraft
-    image: snapcore/snapcraft:stable
+    image: snapcore/snapcraft
 
 jobs:
-- job: Compile
-  pool:
-    vmImage: 'Ubuntu-16.04'
-  container: vscode-x64
-  steps:
-  - template: product-compile.yml
-
 - job: Windows
-  condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), eq(variables['VSCODE_BUILD_WIN32'], 'true'))
+  condition: eq(variables['VSCODE_BUILD_WIN32'], 'true')
   pool:
     vmImage: VS2017-Win2016
   variables:
     VSCODE_ARCH: x64
-  dependsOn:
-  - Compile
   steps:
   - template: win32/product-build-win32.yml
 
 - job: Windows32
-  condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), eq(variables['VSCODE_BUILD_WIN32_32BIT'], 'true'))
+  condition: eq(variables['VSCODE_BUILD_WIN32_32BIT'], 'true')
   pool:
     vmImage: VS2017-Win2016
   variables:
     VSCODE_ARCH: ia32
-  dependsOn:
-  - Compile
   steps:
   - template: win32/product-build-win32.yml
 
 - job: Linux
-  condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), eq(variables['VSCODE_BUILD_LINUX'], 'true'))
+  condition: eq(variables['VSCODE_BUILD_LINUX'], 'true')
   pool:
     vmImage: 'Ubuntu-16.04'
+  variables:
+    VSCODE_ARCH: x64
   container: vscode-x64
-  dependsOn:
-  - Compile
   steps:
   - template: linux/product-build-linux.yml
 
 - job: LinuxSnap
-  condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), eq(variables['VSCODE_BUILD_LINUX'], 'true'))
+  condition: eq(variables['VSCODE_BUILD_LINUX'], 'true')
   pool:
     vmImage: 'Ubuntu-16.04'
+  variables:
+    VSCODE_ARCH: x64
   container: snapcraft
   dependsOn: Linux
   steps:
   - template: linux/snap-build-linux.yml
 
-- job: LinuxArmhf
+- job: Linux32
-  condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), eq(variables['VSCODE_BUILD_LINUX_ARMHF'], 'true'), ne(variables['VSCODE_QUALITY'], 'stable'))
+  condition: eq(variables['VSCODE_BUILD_LINUX_32BIT'], 'true')
   pool:
     vmImage: 'Ubuntu-16.04'
   variables:
-    VSCODE_ARCH: armhf
+    VSCODE_ARCH: ia32
-  dependsOn:
+  container: vscode-ia32
-  - Compile
   steps:
-  - template: linux/product-build-linux-multiarch.yml
+  - template: linux/product-build-linux.yml
-
-- job: LinuxArm64
-  condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), eq(variables['VSCODE_BUILD_LINUX_ARM64'], 'true'), ne(variables['VSCODE_QUALITY'], 'stable'))
-  pool:
-    vmImage: 'Ubuntu-16.04'
-  variables:
-    VSCODE_ARCH: arm64
-  dependsOn:
-  - Compile
-  steps:
-  - template: linux/product-build-linux-multiarch.yml
-
-- job: LinuxAlpine
-  condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), eq(variables['VSCODE_BUILD_LINUX_ALPINE'], 'true'), ne(variables['VSCODE_QUALITY'], 'stable'))
-  pool:
-    vmImage: 'Ubuntu-16.04'
-  variables:
-    VSCODE_ARCH: alpine
-  dependsOn:
-  - Compile
-  steps:
-  - template: linux/product-build-linux-multiarch.yml
-
-- job: LinuxWeb
-  condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), eq(variables['VSCODE_BUILD_WEB'], 'true'))
-  pool:
-    vmImage: 'Ubuntu-16.04'
-  variables:
-    VSCODE_ARCH: x64
-  dependsOn:
-  - Compile
-  steps:
-  - template: web/product-build-web.yml
 
 - job: macOS
-  condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), eq(variables['VSCODE_BUILD_MACOS'], 'true'))
+  condition: eq(variables['VSCODE_BUILD_MACOS'], 'true')
   pool:
     vmImage: macOS 10.13
-  dependsOn:
-  - Compile
   steps:
-  - template: darwin/product-build-darwin.yml
+  - template: darwin/product-build-darwin.yml
-
-- job: Release
-  condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), or(eq(variables['VSCODE_RELEASE'], 'true'), and(or(eq(variables['VSCODE_QUALITY'], 'insider'), eq(variables['VSCODE_QUALITY'], 'exploration')), eq(variables['Build.Reason'], 'Schedule'))))
-  pool:
-    vmImage: 'Ubuntu-16.04'
-  dependsOn:
-  - Windows
-  - Windows32
-  - Linux
-  - LinuxSnap
-  - LinuxArmhf
-  - LinuxAlpine
-  - macOS
-  steps:
-  - template: release.yml
-
-- job: Mooncake
-  pool:
-    vmImage: 'Ubuntu-16.04'
-  condition: and(succeededOrFailed(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'))
-  dependsOn:
-  - Windows
-  - Windows32
-  - Linux
-  - LinuxSnap
-  - LinuxArmhf
-  - LinuxAlpine
-  - LinuxWeb
-  - macOS
-  steps:
-  - template: sync-mooncake.yml
-
-trigger: none
-pr: none
-
-schedules:
-- cron: "0 5 * * Mon-Fri"
-  displayName: Mon-Fri at 7:00
-  branches:
-    include:
-    - master

build/azure-pipelines/product-compile.yml

@@ -1,125 +0,0 @@
-steps:
-- script: |
-    mkdir -p .build
-    echo -n $BUILD_SOURCEVERSION > .build/commit
-    echo -n $VSCODE_QUALITY > .build/quality
-  displayName: Prepare cache flag
-
-- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-  inputs:
-    keyfile: 'build/.cachesalt, .build/commit, .build/quality'
-    targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min'
-    vstsFeed: 'npm-vscode'
-    platformIndependent: true
-    alias: 'Compilation'
-
-- task: NodeTool@0
-  inputs:
-    versionSpec: "10.15.1"
-  condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
-
-- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-  inputs:
-    versionSpec: "1.10.1"
-  condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
-
-- task: AzureKeyVault@1
-  displayName: 'Azure Key Vault: Get Secrets'
-  inputs:
-    azureSubscription: 'vscode-builds-subscription'
-    KeyVaultName: vscode
-  condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
-
-- script: |
-    set -e
-    cat << EOF > ~/.netrc
-    machine github.com
-    login vscode
-    password $(github-distro-mixin-password)
-    EOF
-
-    git config user.email "vscode@microsoft.com"
-    git config user.name "VSCode"
-  displayName: Prepare tooling
-  condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
-
-- 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
-  condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
-
-- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-  inputs:
-    keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
-    targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-    vstsFeed: 'npm-vscode'
-  condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
-
-- script: |
-    set -e
-    CHILD_CONCURRENCY=1 yarn --frozen-lockfile
-  displayName: Install dependencies
-  condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'), 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'
-    targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-    vstsFeed: 'npm-vscode'
-  condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'), ne(variables['CacheRestored'], 'true'))
-
-- script: |
-    set -e
-    yarn postinstall
-  displayName: Run postinstall scripts
-  condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'), eq(variables['CacheRestored'], 'true'))
-
-# Mixin must run before optimize, because the CSS loader will
-# inline small SVGs
-- script: |
-    set -e
-    node build/azure-pipelines/mixin
-  displayName: Mix in quality
-  condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
-
-- script: |
-    set -e
-    yarn gulp hygiene
-    yarn monaco-compile-check
-  displayName: Run hygiene checks
-  condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-
-- script: |
-    set -
-    ./build/azure-pipelines/common/extract-telemetry.sh
-  displayName: Extract Telemetry
-  condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
-
-- script: |
-    set -e
-    yarn gulp compile-build
-    yarn gulp compile-extensions-build
-    yarn gulp minify-vscode
-    yarn gulp minify-vscode-reh
-    yarn gulp minify-vscode-reh-web
-  displayName: Compile
-  condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
-
-- script: |
-    set -e
-    AZURE_STORAGE_ACCESS_KEY="$(ticino-storage-key)" \
-      node build/azure-pipelines/upload-sourcemaps
-  displayName: Upload sourcemaps
-  condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
-
-- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
-  inputs:
-    keyfile: 'build/.cachesalt, .build/commit, .build/quality'
-    targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min'
-    vstsFeed: 'npm-vscode'
-    platformIndependent: true
-    alias: 'Compilation'
-  condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))

build/azure-pipelines/publish-types/.gitignore

@@ -1,2 +0,0 @@
-node_modules/
-*.js

build/azure-pipelines/publish-types/check-version.js

@@ -1,36 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-Object.defineProperty(exports, "__esModule", { value: true });
-const cp = require("child_process");
-let tag = '';
-try {
-    tag = cp
-        .execSync('git describe --tags `git rev-list --tags --max-count=1`')
-        .toString()
-        .trim();
-    if (!isValidTag(tag)) {
-        throw Error(`Invalid tag ${tag}`);
-    }
-}
-catch (err) {
-    console.error(err);
-    console.error('Failed to update types');
-    process.exit(1);
-}
-function isValidTag(t) {
-    if (t.split('.').length !== 3) {
-        return false;
-    }
-    const [major, minor, bug] = t.split('.');
-    // Only release for tags like 1.34.0
-    if (bug !== '0') {
-        return false;
-    }
-    if (parseInt(major, 10) === NaN || parseInt(minor, 10) === NaN) {
-        return false;
-    }
-    return true;
-}

build/azure-pipelines/publish-types/check-version.ts

@@ -1,43 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-import * as cp from 'child_process';
-
-let tag = '';
-try {
-	tag = cp
-		.execSync('git describe --tags `git rev-list --tags --max-count=1`')
-		.toString()
-		.trim();
-
-	if (!isValidTag(tag)) {
-		throw Error(`Invalid tag ${tag}`);
-	}
-} catch (err) {
-	console.error(err);
-	console.error('Failed to update types');
-	process.exit(1);
-}
-
-function isValidTag(t: string) {
-	if (t.split('.').length !== 3) {
-		return false;
-	}
-
-	const [major, minor, bug] = t.split('.');
-
-	// Only release for tags like 1.34.0
-	if (bug !== '0') {
-		return false;
-	}
-
-	if (parseInt(major, 10) === NaN || parseInt(minor, 10) === NaN) {
-		return false;
-	}
-
-	return true;
-}

build/azure-pipelines/publish-types/publish-types.yml

@@ -1,67 +0,0 @@
-# Publish @types/vscode for each release
-
-trigger:
-  branches:
-    include: ['refs/tags/*']
-
-pr: none
-
-steps:
-- task: NodeTool@0
-  inputs:
-    versionSpec: "10.15.1"
-
-- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-  inputs:
-    versionSpec: "1.10.1"
-
-- bash: |
-    # Install build dependencies
-    (cd build && yarn)
-    node build/azure-pipelines/publish-types/check-version.js
-  displayName: Check version
-
-- bash: |
-    git config --global user.email "vscode@microsoft.com"
-    git config --global user.name "VSCode"
-
-    git clone https://$(GITHUB_TOKEN)@github.com/DefinitelyTyped/DefinitelyTyped.git --depth=1
-    node build/azure-pipelines/publish-types/update-types.js
-
-    TAG_VERSION=$(git describe --tags `git rev-list --tags --max-count=1`)
-
-    cd DefinitelyTyped
-
-    git diff --color | cat
-    git add -A
-    git status
-    git checkout -b "vscode-types-$TAG_VERSION"
-    git commit -m "VS Code $TAG_VERSION Extension API"
-    git push origin "vscode-types-$TAG_VERSION"
-
-  displayName: Push update to DefinitelyTyped
-
-- bash: |
-    TAG_VERSION=$(git describe --tags `git rev-list --tags --max-count=1`)
-    CHANNEL="G1C14HJ2F"
-
-    MESSAGE="DefinitelyTyped/DefinitelyTyped#vscode-types-$TAG_VERSION created. Endgame master, please open this link, examine changes and create a PR:"
-    LINK="https://github.com/DefinitelyTyped/DefinitelyTyped/compare/vscode-types-$TAG_VERSION?quick_pull=1&body=Updating%20VS%20Code%20Extension%20API.%20See%20https%3A%2F%2Fgithub.com%2Fmicrosoft%2Fvscode%2Fissues%2F70175%20for%20details."
-    MESSAGE2="[@octref, @jrieken, @kmaetzel, @egamma]. Please review and merge PR to publish @types/vscode."
-
-    curl -X POST -H "Authorization: Bearer $(SLACK_TOKEN)" \
-    -H 'Content-type: application/json; charset=utf-8' \
-    --data '{"channel":"'"$CHANNEL"'", "link_names": true, "text":"'"$MESSAGE"'"}' \
-    https://slack.com/api/chat.postMessage
-
-    curl -X POST -H "Authorization: Bearer $(SLACK_TOKEN)" \
-    -H 'Content-type: application/json; charset=utf-8' \
-    --data '{"channel":"'"$CHANNEL"'", "link_names": true, "text":"'"$LINK"'"}' \
-    https://slack.com/api/chat.postMessage
-
-    curl -X POST -H "Authorization: Bearer $(SLACK_TOKEN)" \
-    -H 'Content-type: application/json; charset=utf-8' \
-    --data '{"channel":"'"$CHANNEL"'", "link_names": true, "text":"'"$MESSAGE2"'"}' \
-    https://slack.com/api/chat.postMessage
-
-  displayName: Send message on Slack

build/azure-pipelines/publish-types/update-types.js

@@ -1,62 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs = require("fs");
-const cp = require("child_process");
-const path = require("path");
-let tag = '';
-try {
-    tag = cp
-        .execSync('git describe --tags `git rev-list --tags --max-count=1`')
-        .toString()
-        .trim();
-    const dtsUri = `https://raw.githubusercontent.com/microsoft/vscode/${tag}/src/vs/vscode.d.ts`;
-    const outPath = path.resolve(process.cwd(), 'DefinitelyTyped/types/vscode/index.d.ts');
-    cp.execSync(`curl ${dtsUri} --output ${outPath}`);
-    updateDTSFile(outPath, tag);
-    console.log(`Done updating vscode.d.ts at ${outPath}`);
-}
-catch (err) {
-    console.error(err);
-    console.error('Failed to update types');
-    process.exit(1);
-}
-function updateDTSFile(outPath, tag) {
-    const oldContent = fs.readFileSync(outPath, 'utf-8');
-    const newContent = getNewFileContent(oldContent, tag);
-    fs.writeFileSync(outPath, newContent);
-}
-function getNewFileContent(content, tag) {
-    const oldheader = [
-        `/*---------------------------------------------------------------------------------------------`,
-        ` *  Copyright (c) Microsoft Corporation. All rights reserved.`,
-        ` *  Licensed under the Source EULA. See License.txt in the project root for license information.`,
-        ` *--------------------------------------------------------------------------------------------*/`
-    ].join('\n');
-    return getNewFileHeader(tag) + content.slice(oldheader.length);
-}
-function getNewFileHeader(tag) {
-    const [major, minor] = tag.split('.');
-    const shorttag = `${major}.${minor}`;
-    const header = [
-        `// Type definitions for Visual Studio Code ${shorttag}`,
-        `// Project: https://github.com/microsoft/vscode`,
-        `// Definitions by: Visual Studio Code Team, Microsoft <https://github.com/Microsoft>`,
-        `// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped`,
-        ``,
-        `/*---------------------------------------------------------------------------------------------`,
-        ` *  Copyright (c) Microsoft Corporation. All rights reserved.`,
-        ` *  Licensed under the Source EULA.`,
-        ` *  See https://github.com/Microsoft/vscode/blob/master/LICENSE.txt for license information.`,
-        ` *--------------------------------------------------------------------------------------------*/`,
-        ``,
-        `/**`,
-        ` * Type Definition for Visual Studio Code ${shorttag} Extension API`,
-        ` * See https://code.visualstudio.com/api for more information`,
-        ` */`
-    ].join('\n');
-    return header;
-}

build/azure-pipelines/publish-types/update-types.ts

@@ -1,73 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-import * as fs from 'fs';
-import * as cp from 'child_process';
-import * as path from 'path';
-
-let tag = '';
-try {
-	tag = cp
-		.execSync('git describe --tags `git rev-list --tags --max-count=1`')
-		.toString()
-		.trim();
-
-	const dtsUri = `https://raw.githubusercontent.com/microsoft/vscode/${tag}/src/vs/vscode.d.ts`;
-	const outPath = path.resolve(process.cwd(), 'DefinitelyTyped/types/vscode/index.d.ts');
-	cp.execSync(`curl ${dtsUri} --output ${outPath}`);
-
-	updateDTSFile(outPath, tag);
-
-	console.log(`Done updating vscode.d.ts at ${outPath}`);
-} catch (err) {
-	console.error(err);
-	console.error('Failed to update types');
-	process.exit(1);
-}
-
-function updateDTSFile(outPath: string, tag: string) {
-	const oldContent = fs.readFileSync(outPath, 'utf-8');
-	const newContent = getNewFileContent(oldContent, tag);
-
-	fs.writeFileSync(outPath, newContent);
-}
-
-function getNewFileContent(content: string, tag: string) {
-	const oldheader = [
-		`/*---------------------------------------------------------------------------------------------`,
-		` *  Copyright (c) Microsoft Corporation. All rights reserved.`,
-		` *  Licensed under the Source EULA. See License.txt in the project root for license information.`,
-		` *--------------------------------------------------------------------------------------------*/`
-	].join('\n');
-
-	return getNewFileHeader(tag) + content.slice(oldheader.length);
-}
-
-function getNewFileHeader(tag: string) {
-	const [major, minor] = tag.split('.');
-	const shorttag = `${major}.${minor}`;
-
-	const header = [
-		`// Type definitions for Visual Studio Code ${shorttag}`,
-		`// Project: https://github.com/microsoft/vscode`,
-		`// Definitions by: Visual Studio Code Team, Microsoft <https://github.com/Microsoft>`,
-		`// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped`,
-		``,
-		`/*---------------------------------------------------------------------------------------------`,
-		` *  Copyright (c) Microsoft Corporation. All rights reserved.`,
-		` *  Licensed under the Source EULA.`,
-		` *  See https://github.com/Microsoft/vscode/blob/master/LICENSE.txt for license information.`,
-		` *--------------------------------------------------------------------------------------------*/`,
-		``,
-		`/**`,
-		` * Type Definition for Visual Studio Code ${shorttag} Extension API`,
-		` * See https://code.visualstudio.com/api for more information`,
-		` */`
-	].join('\n');
-
-	return header;
-}

build/azure-pipelines/release.yml

@@ -1,22 +0,0 @@
-steps:
-- task: NodeTool@0
-  inputs:
-    versionSpec: "10.x"
-
-- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-  inputs:
-    versionSpec: "1.x"
-
-- task: AzureKeyVault@1
-  displayName: 'Azure Key Vault: Get Secrets'
-  inputs:
-    azureSubscription: 'vscode-builds-subscription'
-    KeyVaultName: vscode
-
-- script: |
-    set -e
-
-    (cd build ; yarn)
-
-    AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
-    node build/azure-pipelines/common/release.js

build/azure-pipelines/sync-mooncake.yml

@@ -1,24 +0,0 @@
-steps:
-- task: NodeTool@0
-  inputs:
-    versionSpec: "10.15.1"
-
-- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-  inputs:
-    versionSpec: "1.10.1"
-
-- task: AzureKeyVault@1
-  displayName: 'Azure Key Vault: Get Secrets'
-  inputs:
-    azureSubscription: 'vscode-builds-subscription'
-    KeyVaultName: vscode
-
-- script: |
-    set -e
-
-    (cd build ; yarn)
-
-    AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
-    AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
-    MOONCAKE_STORAGE_ACCESS_KEY="$(vscode-mooncake-storage-key)" \
-    node build/azure-pipelines/common/sync-mooncake.js "$VSCODE_QUALITY"

build/azure-pipelines/upload-sourcemaps.js

@@ -1,57 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-const path = require('path');
-const es = require('event-stream');
-const azure = require('gulp-azure-storage');
-const vfs = require('vinyl-fs');
-const util = require('../lib/util');
-const root = path.dirname(path.dirname(__dirname));
-const commit = util.getVersion(root);
-
-// optionally allow to pass in explicit base/maps to upload
-const [, , base, maps] = process.argv;
-
-const fetch = function (base, maps = `${base}/**/*.map`) {
-	return vfs.src(maps, { base })
-		.pipe(es.mapSync(f => {
-			f.path = `${f.base}/core/${f.relative}`;
-			return f;
-		}));
-};
-
-function main() {
-	const sources = [];
-
-	// vscode client maps (default)
-	if (!base) {
-		const vs = fetch('out-vscode-min'); // client source-maps only
-		sources.push(vs);
-
-		const extensionsOut = vfs.src(['.build/extensions/**/*.js.map', '!**/node_modules/**'], { base: '.build' });
-		sources.push(extensionsOut);
-	}
-
-	// specific client base/maps
-	else {
-		sources.push(fetch(base, maps));
-	}
-
-	return es.merge(...sources)
-		.pipe(es.through(function (data) {
-			console.log('Uploading Sourcemap', data.relative); // debug
-			this.emit('data', data);
-		}))
-		.pipe(azure.upload({
-			account: process.env.AZURE_STORAGE_ACCOUNT,
-			key: process.env.AZURE_STORAGE_ACCESS_KEY,
-			container: 'sourcemaps',
-			prefix: commit + '/'
-		}));
-}
-
-main();

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

@@ -1,106 +0,0 @@
-steps:
-- script: |
-    mkdir -p .build
-    echo -n $BUILD_SOURCEVERSION > .build/commit
-    echo -n $VSCODE_QUALITY > .build/quality
-  displayName: Prepare cache flag
-
-- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-  inputs:
-    keyfile: 'build/.cachesalt, .build/commit, .build/quality'
-    targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min'
-    vstsFeed: 'npm-vscode'
-    platformIndependent: true
-    alias: 'Compilation'
-
-- script: |
-    set -e
-    exit 1
-  displayName: Check RestoreCache
-  condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
-
-- task: NodeTool@0
-  inputs:
-    versionSpec: "10.15.1"
-
-- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-  inputs:
-    versionSpec: "1.10.1"
-
-- task: AzureKeyVault@1
-  displayName: 'Azure Key Vault: Get Secrets'
-  inputs:
-    azureSubscription: 'vscode-builds-subscription'
-    KeyVaultName: vscode
-
-- script: |
-    set -e
-    cat << EOF > ~/.netrc
-    machine github.com
-    login vscode
-    password $(github-distro-mixin-password)
-    EOF
-
-    git config user.email "vscode@microsoft.com"
-    git config user.name "VSCode"
-  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'
-#     targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-#     vstsFeed: 'npm-vscode'
-
-- script: |
-    set -e
-    CHILD_CONCURRENCY=1 yarn --frozen-lockfile
-  displayName: Install dependencies
-  # 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'
-#     targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-#     vstsFeed: 'npm-vscode'
-#   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
-
-- script: |
-    set -e
-    VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-      yarn gulp vscode-web-min-ci
-  displayName: Build
-
-  # upload only the workbench.web.api.js source maps because
-  # we just compiled these bits in the previous step and the
-  # general task to upload source maps has already been run
-- script: |
-    set -e
-    AZURE_STORAGE_ACCESS_KEY="$(ticino-storage-key)" \
-      node build/azure-pipelines/upload-sourcemaps out-vscode-web-min out-vscode-web-min/vs/workbench/workbench.web.api.js.map
-  displayName: Upload sourcemaps (Web)
-
-- script: |
-    set -e
-    AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \
-    AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \
-    VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-    ./build/azure-pipelines/web/publish.sh
-  displayName: Publish

build/azure-pipelines/web/publish.sh

@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-set -e
-REPO="$(pwd)"
-ROOT="$REPO/.."
-
-# Publish Web Client
-WEB_BUILD_NAME="vscode-web"
-WEB_TARBALL_FILENAME="vscode-web.tar.gz"
-WEB_TARBALL_PATH="$ROOT/$WEB_TARBALL_FILENAME"
-BUILD="$ROOT/$WEB_BUILD_NAME"
-PACKAGEJSON="$BUILD/package.json"
-VERSION=$(node -p "require(\"$PACKAGEJSON\").version")
-
-rm -rf $ROOT/vscode-web.tar.*
-
-(cd $ROOT && tar --owner=0 --group=0 -czf $WEB_TARBALL_PATH $WEB_BUILD_NAME)
-
-node build/azure-pipelines/common/publish.js "$VSCODE_QUALITY" "web-standalone" archive-unsigned "$WEB_TARBALL_FILENAME" "$VERSION" true "$WEB_TARBALL_PATH"

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

@@ -1,7 +1,7 @@
 steps:
 - task: NodeTool@0
   inputs:
-    versionSpec: "10.15.1"
+    versionSpec: "8.12.0"
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
   inputs:
     versionSpec: "1.10.1"
@@ -9,21 +9,9 @@ steps:
   inputs:
     versionSpec: '2.x'
     addToPath: true
-- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-  inputs:
-    keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
-    targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-    vstsFeed: '$(ArtifactFeed)'
 - powershell: |
-    yarn --frozen-lockfile
+    yarn
   displayName: Install Dependencies
-  condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
-- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
-  inputs:
-    keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
-    targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-    vstsFeed: '$(ArtifactFeed)'
-  condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 - powershell: |
     yarn gulp electron
   displayName: Download Electron
@@ -33,6 +21,9 @@ steps:
 - powershell: |
     yarn monaco-compile-check
   displayName: Run Monaco Editor Checks
+- script: |
+    yarn strict-null-check
+  displayName: Run Strict Null Checks
 - powershell: |
     yarn compile
   displayName: Compile Sources

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

@@ -1,27 +1,7 @@
 steps:
-- powershell: |
-    mkdir .build -ea 0
-    "$env:BUILD_SOURCEVERSION" | Out-File -Encoding ascii -NoNewLine .build\commit
-    "$env:VSCODE_QUALITY" | Out-File -Encoding ascii -NoNewLine .build\quality
-  displayName: Prepare cache flag
-
-- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-  inputs:
-    keyfile: 'build/.cachesalt, .build/commit, .build/quality'
-    targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min'
-    vstsFeed: 'npm-vscode'
-    platformIndependent: true
-    alias: 'Compilation'
-
-- powershell: |
-    $ErrorActionPreference = "Stop"
-    exit 1
-  displayName: Check RestoreCache
-  condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
-
 - task: NodeTool@0
   inputs:
-    versionSpec: "10.15.1"
+    versionSpec: "8.12.0"
 
 - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
   inputs:
@@ -32,98 +12,41 @@ steps:
     versionSpec: '2.x'
     addToPath: true
 
-- task: AzureKeyVault@1
-  displayName: 'Azure Key Vault: Get Secrets'
-  inputs:
-    azureSubscription: 'vscode-builds-subscription'
-    KeyVaultName: vscode
-
-- powershell: |
-    . build/azure-pipelines/win32/exec.ps1
-    $ErrorActionPreference = "Stop"
-    "machine github.com`nlogin vscode`npassword $(github-distro-mixin-password)" | Out-File "$env:USERPROFILE\_netrc" -Encoding ASCII
-
-    exec { git config user.email "vscode@microsoft.com" }
-    exec { git config user.name "VSCode" }
-
-    mkdir .build -ea 0
-    "$(VSCODE_ARCH)" | Out-File -Encoding ascii -NoNewLine .build\arch
-  displayName: Prepare tooling
-
-- powershell: |
-    . build/azure-pipelines/win32/exec.ps1
-    $ErrorActionPreference = "Stop"
-    exec { git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git" }
-    exec { git fetch distro }
-    exec { git merge $(node -p "require('./package.json').distro") }
-  displayName: Merge distro
-
-- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
-  inputs:
-    keyfile: 'build/.cachesalt, .build/arch, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
-    targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
-    vstsFeed: 'npm-vscode'
-
 - powershell: |
     . build/azure-pipelines/win32/exec.ps1
     $ErrorActionPreference = "Stop"
+    "machine monacotools.visualstudio.com password $(VSO_PAT)" | Out-File "$env:USERPROFILE\_netrc" -Encoding ASCII
     $env:npm_config_arch="$(VSCODE_ARCH)"
     $env:CHILD_CONCURRENCY="1"
-    exec { yarn --frozen-lockfile }
+    $env:VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)"
-  displayName: Install dependencies
+    exec { yarn }
-  condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
+    exec { npm run gulp -- hygiene }
-
+    exec { npm run monaco-compile-check }
-- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
+    exec { npm run strict-null-check }
-  inputs:
+    exec { npm run gulp -- mixin }
-    keyfile: 'build/.cachesalt, .build/arch, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
+    exec { node build/azure-pipelines/common/installDistro.js }
-    targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
+    exec { node build/lib/builtInExtensions.js }
-    vstsFeed: 'npm-vscode'
-  condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 
 - powershell: |
     . build/azure-pipelines/win32/exec.ps1
     $ErrorActionPreference = "Stop"
-    exec { yarn postinstall }
+    $env:VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)"
-  displayName: Run postinstall scripts
+    exec { npm run gulp -- "vscode-win32-$(VSCODE_ARCH)-min" }
-  condition: and(succeeded(), eq(variables['CacheRestored'], 'true'))
+    exec { npm run gulp -- "vscode-win32-$(VSCODE_ARCH)-inno-updater" }
+  name: build
 
 - powershell: |
     . build/azure-pipelines/win32/exec.ps1
     $ErrorActionPreference = "Stop"
-    exec { node build/azure-pipelines/mixin }
+    exec { npm run gulp -- "electron-$(VSCODE_ARCH)" }
-  displayName: Mix in quality
-
-- powershell: |
-    . build/azure-pipelines/win32/exec.ps1
-    $ErrorActionPreference = "Stop"
-    $env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)"
-    exec { yarn gulp "vscode-win32-$env:VSCODE_ARCH-min-ci" }
-    exec { yarn gulp "vscode-reh-win32-$env:VSCODE_ARCH-min-ci" }
-    exec { yarn gulp "vscode-reh-web-win32-$env:VSCODE_ARCH-min-ci" }
-    exec { yarn gulp "vscode-win32-$env:VSCODE_ARCH-code-helper" }
-    exec { yarn gulp "vscode-win32-$env:VSCODE_ARCH-inno-updater" }
-  displayName: Build
-
-- powershell: |
-    . build/azure-pipelines/win32/exec.ps1
-    $ErrorActionPreference = "Stop"
-    exec { yarn gulp "electron-$(VSCODE_ARCH)" }
     exec { .\scripts\test.bat --build --tfs "Unit Tests" }
-  displayName: Run unit tests
+    # yarn smoketest -- --build "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"
-  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+  name: test
-
-- powershell: |
-    . build/azure-pipelines/win32/exec.ps1
-    $ErrorActionPreference = "Stop"
-    exec { yarn gulp "electron-$(VSCODE_ARCH)" }
-    exec { .\scripts\test-integration.bat --build --tfs "Integration Tests" }
-  displayName: Run integration tests
-  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
 - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
   inputs:
     ConnectedServiceName: 'ESRP CodeSign'
-    FolderPath: '$(agent.builddirectory)/VSCode-win32-$(VSCODE_ARCH),$(agent.builddirectory)/vscode-reh-win32-$(VSCODE_ARCH)'
+    FolderPath: '$(agent.builddirectory)/VSCode-win32-$(VSCODE_ARCH)'
     Pattern: '*.dll,*.exe,*.node'
     signConfigType: inlineSignParams
     inlineOperation: |
@@ -191,18 +114,38 @@ steps:
 
 - powershell: |
     $ErrorActionPreference = "Stop"
-    .\build\azure-pipelines\win32\import-esrp-auth-cert.ps1 -AuthCertificateBase64 $(esrp-auth-certificate) -AuthCertificateKey $(esrp-auth-certificate-key)
+    .\build\azure-pipelines\win32\import-esrp-auth-cert.ps1 -AuthCertificateBase64 $(ESRP_AUTH_CERTIFICATE) -AuthCertificateKey $(ESRP_AUTH_CERTIFICATE_KEY)
   displayName: Import ESRP Auth Certificate
 
 - powershell: |
     . build/azure-pipelines/win32/exec.ps1
     $ErrorActionPreference = "Stop"
-    $env:AZURE_STORAGE_ACCESS_KEY_2 = "$(vscode-storage-key)"
+    exec { npm run gulp -- "vscode-win32-$(VSCODE_ARCH)-archive" "vscode-win32-$(VSCODE_ARCH)-system-setup" "vscode-win32-$(VSCODE_ARCH)-user-setup" --sign }
-    $env:AZURE_DOCUMENTDB_MASTERKEY = "$(builds-docdb-key-readwrite)"
+
-    $env:VSCODE_HOCKEYAPP_TOKEN = "$(vscode-hockeyapp-token)"
+    $Repo = "$(pwd)"
-    $env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)"
+    $Root = "$Repo\.."
-    .\build\azure-pipelines\win32\publish.ps1
+    $SystemExe = "$Repo\.build\win32-$(VSCODE_ARCH)\system-setup\VSCodeSetup.exe"
-  displayName: Publish
+    $UserExe = "$Repo\.build\win32-$(VSCODE_ARCH)\user-setup\VSCodeSetup.exe"
+    $Zip = "$Repo\.build\win32-$(VSCODE_ARCH)\archive\VSCode-win32-$(VSCODE_ARCH).zip"
+    $Build = "$Root\VSCode-win32-$(VSCODE_ARCH)"
+
+    # get version
+    $PackageJson = Get-Content -Raw -Path "$Build\resources\app\package.json" | ConvertFrom-Json
+    $Version = $PackageJson.version
+    $Quality = "$env:VSCODE_QUALITY"
+    $env:AZURE_STORAGE_ACCESS_KEY_2 = "$(AZURE_STORAGE_ACCESS_KEY_2)"
+    $env:MOONCAKE_STORAGE_ACCESS_KEY = "$(MOONCAKE_STORAGE_ACCESS_KEY)"
+    $env:AZURE_DOCUMENTDB_MASTERKEY = "$(AZURE_DOCUMENTDB_MASTERKEY)"
+
+    $assetPlatform = if ("$(VSCODE_ARCH)" -eq "ia32") { "win32" } else { "win32-x64" }
+
+    exec { node build/azure-pipelines/common/publish.js $Quality "$global:assetPlatform-archive" archive "VSCode-win32-$(VSCODE_ARCH)-$Version.zip" $Version true $Zip }
+    exec { node build/azure-pipelines/common/publish.js $Quality "$global:assetPlatform" setup "VSCodeSetup-$(VSCODE_ARCH)-$Version.exe" $Version true $SystemExe }
+    exec { node build/azure-pipelines/common/publish.js $Quality "$global:assetPlatform-user" setup "VSCodeUserSetup-$(VSCODE_ARCH)-$Version.exe" $Version true $UserExe }
+
+    # publish hockeyapp symbols
+    $hockeyAppId = if ("$(VSCODE_ARCH)" -eq "ia32") { "$(VSCODE_HOCKEYAPP_ID_WIN32)" } else { "$(VSCODE_HOCKEYAPP_ID_WIN64)" }
+    exec { node build/azure-pipelines/common/symbols.js "$(VSCODE_MIXIN_PASSWORD)" "$(VSCODE_HOCKEYAPP_TOKEN)" "$(VSCODE_ARCH)" $hockeyAppId }
 
 - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
   displayName: 'Component Detection'

build/azure-pipelines/win32/publish.ps1

@@ -1,37 +0,0 @@
-. build/azure-pipelines/win32/exec.ps1
-$ErrorActionPreference = "Stop"
-
-$Arch = "$env:VSCODE_ARCH"
-
-exec { yarn gulp "vscode-win32-$Arch-archive" "vscode-win32-$Arch-system-setup" "vscode-win32-$Arch-user-setup" --sign }
-
-$Repo = "$(pwd)"
-$Root = "$Repo\.."
-$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"
-$ServerZip = "$Repo\.build\vscode-server-win32-$Arch.zip"
-$Build = "$Root\VSCode-win32-$Arch"
-
-# Create server archive
-exec { Rename-Item -Path $LegacyServer -NewName $ServerName }
-exec { .\node_modules\7zip\7zip-lite\7z.exe a -tzip $ServerZip $Server -r }
-
-# get version
-$PackageJson = Get-Content -Raw -Path "$Build\resources\app\package.json" | ConvertFrom-Json
-$Version = $PackageJson.version
-$Quality = "$env:VSCODE_QUALITY"
-
-$AssetPlatform = if ("$Arch" -eq "ia32") { "win32" } else { "win32-x64" }
-
-exec { node build/azure-pipelines/common/publish.js $Quality "$AssetPlatform-archive" archive "VSCode-win32-$Arch-$Version.zip" $Version true $Zip }
-exec { node build/azure-pipelines/common/publish.js $Quality "$AssetPlatform" setup "VSCodeSetup-$Arch-$Version.exe" $Version true $SystemExe }
-exec { node build/azure-pipelines/common/publish.js $Quality "$AssetPlatform-user" setup "VSCodeUserSetup-$Arch-$Version.exe" $Version true $UserExe }
-exec { node build/azure-pipelines/common/publish.js $Quality "server-$AssetPlatform" archive "vscode-server-win32-$Arch.zip" $Version true $ServerZip }
-
-# 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 }

build/builtInExtensions-insiders.json

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

build/builtin/main.js

@@ -10,7 +10,7 @@ const path = require('path');
 let window = null;
 
 app.once('ready', () => {
-	window = new BrowserWindow({ width: 800, height: 600, webPreferences: { nodeIntegration: true, webviewTag: true } });
+	window = new BrowserWindow({ width: 800, height: 600 });
 	window.setMenuBarVisibility(false);
 	window.loadURL(url.format({ pathname: path.join(__dirname, 'index.html'), protocol: 'file:', slashes: true }));
 	// window.webContents.openDevTools();

build/gulpfile.compile.js

@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-const gulp = require('gulp');
-const util = require('./lib/util');
-const task = require('./lib/task');
-const compilation = require('./lib/compilation');
-
-// Full compile, including nls and inline sources in sourcemaps, for build
-const compileBuildTask = task.define('compile-build', task.series(util.rimraf('out-build'), compilation.compileTask('src', 'out-build', true)));
-gulp.task(compileBuildTask);
-exports.compileBuildTask = compileBuildTask;

build/gulpfile.editor.js

@@ -6,7 +6,6 @@
 const gulp = require('gulp');
 const path = require('path');
 const util = require('./lib/util');
-const task = require('./lib/task');
 const common = require('./lib/optimize');
 const es = require('event-stream');
 const File = require('vinyl');
@@ -49,6 +48,9 @@ var editorResources = [
 	'!**/test/**'
 ];
 
+var editorOtherSources = [
+];
+
 var BUNDLED_FILE_HEADER = [
 	'/*!-----------------------------------------------------------',
 	' * Copyright (c) Microsoft Corporation. All rights reserved.',
@@ -61,7 +63,8 @@ var BUNDLED_FILE_HEADER = [
 
 const languages = i18n.defaultLanguages.concat([]);  // i18n.defaultLanguages.concat(process.env.VSCODE_QUALITY !== 'stable' ? i18n.extraLanguages : []);
 
-const extractEditorSrcTask = task.define('extract-editor-src', () => {
+gulp.task('clean-editor-src', util.rimraf('out-editor-src'));
+gulp.task('extract-editor-src', ['clean-editor-src'], function () {
 	console.log(`If the build fails, consider tweaking shakeLevel below to a lower value.`);
 	const apiusages = monacoapi.execute().usageContent;
 	const extrausages = fs.readFileSync(path.join(root, 'build', 'monaco', 'monaco.usage.recipe')).toString();
@@ -81,7 +84,6 @@ const extractEditorSrcTask = task.define('extract-editor-src', () => {
 			'typings/thenable.d.ts',
 			'typings/es6-promise.d.ts',
 			'typings/require-monaco.d.ts',
-			"typings/lib.es2018.promise.d.ts",
 			'vs/monaco.d.ts'
 		],
 		libs: [
@@ -93,16 +95,20 @@ const extractEditorSrcTask = task.define('extract-editor-src', () => {
 			'vs/base/browser/ui/octiconLabel/octiconLabel': 'vs/base/browser/ui/octiconLabel/octiconLabel.mock',
 		},
 		shakeLevel: 2, // 0-Files, 1-InnerFile, 2-ClassMembers
-		importIgnorePattern: /(^vs\/css!)|(promise-polyfill\/polyfill)/,
+		importIgnorePattern: /^vs\/css!/,
 		destRoot: path.join(root, 'out-editor-src')
 	});
 });
 
-const compileEditorAMDTask = task.define('compile-editor-amd', compilation.compileTask('out-editor-src', 'out-editor-build', true));
+// Full compile, including nls and inline sources in sourcemaps, for build
+gulp.task('clean-editor-build', util.rimraf('out-editor-build'));
+gulp.task('compile-editor-build', ['clean-editor-build', 'extract-editor-src'], compilation.compileTask('out-editor-src', 'out-editor-build', true));
 
-const optimizeEditorAMDTask = task.define('optimize-editor-amd', common.optimizeTask({
+gulp.task('clean-optimized-editor', util.rimraf('out-editor'));
+gulp.task('optimize-editor', ['clean-optimized-editor', 'compile-editor-build'], common.optimizeTask({
 	src: 'out-editor-build',
 	entryPoints: editorEntryPoints,
+	otherSources: editorOtherSources,
 	resources: editorResources,
 	loaderConfig: {
 		paths: {
@@ -119,9 +125,11 @@ const optimizeEditorAMDTask = task.define('optimize-editor-amd', common.optimize
 	languages: languages
 }));
 
-const minifyEditorAMDTask = task.define('minify-editor-amd', common.minifyTask('out-editor'));
+gulp.task('clean-minified-editor', util.rimraf('out-editor-min'));
+gulp.task('minify-editor', ['clean-minified-editor', 'optimize-editor'], common.minifyTask('out-editor'));
 
-const createESMSourcesAndResourcesTask = task.define('extract-editor-esm', () => {
+gulp.task('clean-editor-esm', util.rimraf('out-editor-esm'));
+gulp.task('extract-editor-esm', ['clean-editor-esm', 'clean-editor-distro', 'extract-editor-src'], function () {
 	standalone.createESMSourcesAndResources2({
 		srcFolder: './out-editor-src',
 		outFolder: './out-editor-esm',
@@ -143,8 +151,7 @@ const createESMSourcesAndResourcesTask = task.define('extract-editor-esm', () =>
 		}
 	});
 });
-
+gulp.task('compile-editor-esm', ['extract-editor-esm', 'clean-editor-distro'], function () {
-const compileEditorESMTask = task.define('compile-editor-esm', () => {
 	if (process.platform === 'win32') {
 		const result = cp.spawnSync(`..\\node_modules\\.bin\\tsc.cmd`, {
 			cwd: path.join(__dirname, '../out-editor-esm')
@@ -195,16 +202,8 @@ function toExternalDTS(contents) {
 	return lines.join('\n');
 }
 
-function filterStream(testFunc) {
+gulp.task('clean-editor-distro', util.rimraf('out-monaco-editor-core'));
-	return es.through(function (data) {
+gulp.task('editor-distro', ['clean-editor-distro', 'compile-editor-esm', 'minify-editor', 'optimize-editor'], function () {
-		if (!testFunc(data.relative)) {
-			return;
-		}
-		this.emit('data', data);
-	});
-}
-
-const finalEditorResourcesTask = task.define('final-editor-resources', () => {
 	return es.merge(
 		// other assets
 		es.merge(
@@ -234,14 +233,6 @@ const finalEditorResourcesTask = task.define('final-editor-resources', () => {
 			}))
 			.pipe(gulp.dest('out-monaco-editor-core')),
 
-		// version.txt
-		gulp.src('build/monaco/version.txt')
-			.pipe(es.through(function (data) {
-				data.contents = Buffer.from(`monaco-editor-core: https://github.com/Microsoft/vscode/tree/${sha1}`);
-				this.emit('data', data);
-			}))
-			.pipe(gulp.dest('out-monaco-editor-core')),
-
 		// README.md
 		gulp.src('build/monaco/README-npm.md')
 			.pipe(es.through(function (data) {
@@ -275,7 +266,7 @@ const finalEditorResourcesTask = task.define('final-editor-resources', () => {
 
 			var strContents = data.contents.toString();
 			var newStr = '//# sourceMappingURL=' + relativePathToMap.replace(/\\/g, '/');
-			strContents = strContents.replace(/\/\/# sourceMappingURL=[^ ]+$/, newStr);
+			strContents = strContents.replace(/\/\/\# sourceMappingURL=[^ ]+$/, newStr);
 
 			data.contents = Buffer.from(strContents);
 			this.emit('data', data);
@@ -291,31 +282,59 @@ const finalEditorResourcesTask = task.define('final-editor-resources', () => {
 	);
 });
 
-gulp.task('editor-distro',
+gulp.task('analyze-editor-distro', function () {
-	task.series(
+	// @ts-ignore
-		task.parallel(
+	var bundleInfo = require('../out-editor/bundleInfo.json');
-			util.rimraf('out-editor-src'),
+	var graph = bundleInfo.graph;
-			util.rimraf('out-editor-build'),
+	var bundles = bundleInfo.bundles;
-			util.rimraf('out-editor-esm'),
+
-			util.rimraf('out-monaco-editor-core'),
+	var inverseGraph = {};
-			util.rimraf('out-editor'),
+	Object.keys(graph).forEach(function (module) {
-			util.rimraf('out-editor-min')
+		var dependencies = graph[module];
-		),
+		dependencies.forEach(function (dep) {
-		extractEditorSrcTask,
+			inverseGraph[dep] = inverseGraph[dep] || [];
-		task.parallel(
+			inverseGraph[dep].push(module);
-			task.series(
+		});
-				compileEditorAMDTask,
+	});
-				optimizeEditorAMDTask,
+
-				minifyEditorAMDTask
+	var detailed = {};
-			),
+	Object.keys(bundles).forEach(function (entryPoint) {
-			task.series(
+		var included = bundles[entryPoint];
-				createESMSourcesAndResourcesTask,
+		var includedMap = {};
-				compileEditorESMTask
+		included.forEach(function (included) {
-			)
+			includedMap[included] = true;
-		),
+		});
-		finalEditorResourcesTask
+
-	)
+		var explanation = [];
-);
+		included.map(function (included) {
+			if (included.indexOf('!') >= 0) {
+				return;
+			}
+
+			var reason = (inverseGraph[included] || []).filter(function (mod) {
+				return !!includedMap[mod];
+			});
+			explanation.push({
+				module: included,
+				reason: reason
+			});
+		});
+
+		detailed[entryPoint] = explanation;
+	});
+
+	console.log(JSON.stringify(detailed, null, '\t'));
+});
+
+function filterStream(testFunc) {
+	return es.through(function (data) {
+		if (!testFunc(data.relative)) {
+			return;
+		}
+		this.emit('data', data);
+	});
+}
+
 
 //#region monaco type checking
 
@@ -335,7 +354,6 @@ function createTscCompileTask(watch) {
 			let errors = [];
 			let reporter = createReporter();
 			let report;
-			// eslint-disable-next-line no-control-regex
 			let magic = /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g; // https://stackoverflow.com/questions/25245716/remove-all-ansi-colors-styles-from-strings
 
 			child.stdout.on('data', data => {
@@ -369,10 +387,7 @@ function createTscCompileTask(watch) {
 	};
 }
 
-const monacoTypecheckWatchTask = task.define('monaco-typecheck-watch', createTscCompileTask(true));
+gulp.task('monaco-typecheck-watch', createTscCompileTask(true));
-exports.monacoTypecheckWatchTask = monacoTypecheckWatchTask;
+gulp.task('monaco-typecheck', createTscCompileTask(false));
-
-const monacoTypecheckTask = task.define('monaco-typecheck', createTscCompileTask(false));
-exports.monacoTypecheckTask = monacoTypecheckTask;
 
 //#endregion

build/gulpfile.extensions.js

@@ -11,8 +11,8 @@ const path = require('path');
 const tsb = require('gulp-tsb');
 const es = require('event-stream');
 const filter = require('gulp-filter');
+const rimraf = require('rimraf');
 const util = require('./lib/util');
-const task = require('./lib/task');
 const watcher = require('./lib/watch');
 const createReporter = require('./lib/reporter').createReporter;
 const glob = require('glob');
@@ -22,7 +22,6 @@ const root = path.dirname(__dirname);
 const commit = util.getVersion(root);
 const plumber = require('gulp-plumber');
 const _ = require('underscore');
-const ext = require('./lib/extensions');
 
 const extensionsPath = path.join(path.dirname(__dirname), 'extensions');
 
@@ -44,6 +43,16 @@ const tasks = compilations.map(function (tsconfigFile) {
 
 	const name = relativeDirname.replace(/\//g, '-');
 
+	// Tasks
+	const clean = 'clean-extension:' + name;
+	const compile = 'compile-extension:' + name;
+	const watch = 'watch-extension:' + name;
+
+	// Build Tasks
+	const cleanBuild = 'clean-extension-build:' + name;
+	const compileBuild = 'compile-extension-build:' + name;
+	const watchBuild = 'watch-extension-build:' + name;
+
 	const root = path.join('extensions', relativeDirname);
 	const srcBase = path.join(root, 'src');
 	const src = path.join(srcBase, '**');
@@ -102,18 +111,18 @@ const tasks = compilations.map(function (tsconfigFile) {
 
 	const srcOpts = { cwd: path.dirname(__dirname), base: srcBase };
 
-	const cleanTask = task.define(`clean-extension-${name}`, util.rimraf(out));
+	gulp.task(clean, cb => rimraf(out, cb));
 
-	const compileTask = task.define(`compile-extension:${name}`, task.series(cleanTask, () => {
+	gulp.task(compile, [clean], () => {
 		const pipeline = createPipeline(false, true);
 		const input = gulp.src(src, srcOpts);
 
 		return input
 			.pipe(pipeline())
 			.pipe(gulp.dest(out));
-	}));
+	});
 
-	const watchTask = task.define(`watch-extension:${name}`, task.series(cleanTask, () => {
+	gulp.task(watch, [clean], () => {
 		const pipeline = createPipeline(false);
 		const input = gulp.src(src, srcOpts);
 		const watchInput = watcher(src, srcOpts);
@@ -121,43 +130,43 @@ const tasks = compilations.map(function (tsconfigFile) {
 		return watchInput
 			.pipe(util.incremental(pipeline, input))
 			.pipe(gulp.dest(out));
-	}));
+	});
 
-	const compileBuildTask = task.define(`compile-build-extension-${name}`, task.series(cleanTask, () => {
+	gulp.task(cleanBuild, cb => rimraf(out, cb));
+
+	gulp.task(compileBuild, [clean], () => {
 		const pipeline = createPipeline(true, true);
 		const input = gulp.src(src, srcOpts);
 
 		return input
 			.pipe(pipeline())
 			.pipe(gulp.dest(out));
-	}));
+	});
 
-	// Tasks
+	gulp.task(watchBuild, [clean], () => {
-	gulp.task(compileTask);
+		const pipeline = createPipeline(true);
-	gulp.task(watchTask);
+		const input = gulp.src(src, srcOpts);
+		const watchInput = watcher(src, srcOpts);
 
-	return { compileTask, watchTask, compileBuildTask };
+		return watchInput
+			.pipe(util.incremental(() => pipeline(), input))
+			.pipe(gulp.dest(out));
+	});
+
+	return {
+		clean: clean,
+		compile: compile,
+		watch: watch,
+		cleanBuild: cleanBuild,
+		compileBuild: compileBuild,
+		watchBuild: watchBuild
+	};
 });
 
-const compileExtensionsTask = task.define('compile-extensions', task.parallel(...tasks.map(t => t.compileTask)));
+gulp.task('clean-extensions', tasks.map(t => t.clean));
-gulp.task(compileExtensionsTask);
+gulp.task('compile-extensions', tasks.map(t => t.compile));
-exports.compileExtensionsTask = compileExtensionsTask;
+gulp.task('watch-extensions', tasks.map(t => t.watch));
 
-const watchExtensionsTask = task.define('watch-extensions', task.parallel(...tasks.map(t => t.watchTask)));
+gulp.task('clean-extensions-build', tasks.map(t => t.cleanBuild));
-gulp.task(watchExtensionsTask);
+gulp.task('compile-extensions-build', tasks.map(t => t.compileBuild));
-exports.watchExtensionsTask = watchExtensionsTask;
+gulp.task('watch-extensions-build', tasks.map(t => t.watchBuild));
-
-const compileExtensionsBuildLegacyTask = task.define('compile-extensions-build-legacy', task.parallel(...tasks.map(t => t.compileBuildTask)));
-gulp.task(compileExtensionsBuildLegacyTask);
-
-// Azure Pipelines
-
-const cleanExtensionsBuildTask = task.define('clean-extensions-build', util.rimraf('.build/extensions'));
-const compileExtensionsBuildTask = task.define('compile-extensions-build', task.series(
-	cleanExtensionsBuildTask,
-	task.define('bundle-extensions-build', () => ext.packageLocalExtensionsStream().pipe(gulp.dest('.build'))),
-	task.define('bundle-marketplace-extensions-build', () => ext.packageMarketplaceExtensionsStream().pipe(gulp.dest('.build'))),
-));
-
-gulp.task(compileExtensionsBuildTask);
-exports.compileExtensionsBuildTask = compileExtensionsBuildTask;

build/gulpfile.hygiene.js

@@ -42,16 +42,15 @@ const indentationFilter = [
 
 	// except specific files
 	'!ThirdPartyNotices.txt',
-	'!LICENSE.{txt,rtf}',
+	'!LICENSE.txt',
-	'!LICENSES.chromium.html',
 	'!**/LICENSE',
 	'!src/vs/nls.js',
 	'!src/vs/nls.build.js',
 	'!src/vs/css.js',
 	'!src/vs/css.build.js',
 	'!src/vs/loader.js',
-	'!src/vs/base/common/insane/insane.js',
 	'!src/vs/base/common/marked/marked.js',
+	'!src/vs/base/common/winjs.base.js',
 	'!src/vs/base/node/terminateProcess.sh',
 	'!src/vs/base/node/cpuUsage.sh',
 	'!test/assert.js',
@@ -65,7 +64,6 @@ const indentationFilter = [
 
 	// except multiple specific files
 	'!**/package.json',
-	'!**/package-lock.json', // {{SQL CARBON EDIT}}
 	'!**/yarn.lock',
 	'!**/yarn-error.log',
 
@@ -84,23 +82,14 @@ const indentationFilter = [
 	'!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',
+	'!build/{lib,tslintRules}/**/*.js',
 	'!build/**/*.sh',
 	'!build/azure-pipelines/**/*.js',
 	'!build/azure-pipelines/**/*.config',
 	'!**/Dockerfile',
-	'!**/Dockerfile.*',
 	'!**/*.Dockerfile',
 	'!**/*.dockerfile',
-	'!extensions/markdown-language-features/media/*.js',
+	'!extensions/markdown-language-features/media/*.js'
-	// {{SQL CARBON EDIT}}
-	'!**/*.{xlf,docx,sql,vsix,bacpac,ipynb}',
-	'!extensions/mssql/sqltoolsservice/**',
-	'!extensions/import/flatfileimportservice/**',
-	'!extensions/admin-tool-ext-win/ssmsmin/**',
-	'!extensions/resource-deployment/notebooks/**',
-	'!extensions/mssql/notebooks/**',
-	'!extensions/big-data-cluster/src/bigDataCluster/controller/apiGenerated.ts'
 ];
 
 const copyrightFilter = [
@@ -121,49 +110,13 @@ const copyrightFilter = [
 	'!**/*.opts',
 	'!**/*.disabled',
 	'!**/*.code-workspace',
-	'!**/promise-polyfill/polyfill.js',
 	'!build/**/*.init',
 	'!resources/linux/snap/snapcraft.yaml',
 	'!resources/linux/snap/electron-launch',
 	'!resources/win32/bin/code.js',
-	'!resources/completions/**',
 	'!extensions/markdown-language-features/media/highlight.css',
 	'!extensions/html-language-features/server/src/modes/typescript/*',
-	'!extensions/*/server/bin/*',
+	'!extensions/*/server/bin/*'
-	'!src/vs/editor/test/node/classification/typescript-test.ts',
-	// {{SQL CARBON EDIT}}
-	'!extensions/notebook/src/intellisense/text.ts',
-	'!extensions/mssql/src/objectExplorerNodeProvider/webhdfs.ts',
-	'!src/sql/workbench/parts/notebook/browser/outputs/tableRenderers.ts',
-	'!src/sql/workbench/parts/notebook/common/models/url.ts',
-	'!src/sql/workbench/parts/notebook/browser/models/renderMimeInterfaces.ts',
-	'!src/sql/workbench/parts/notebook/browser/models/outputProcessor.ts',
-	'!src/sql/workbench/parts/notebook/browser/models/mimemodel.ts',
-	'!src/sql/workbench/parts/notebook/browser/cellViews/media/*.css',
-	'!src/sql/base/browser/ui/table/plugins/rowSelectionModel.plugin.ts',
-	'!src/sql/base/browser/ui/table/plugins/rowDetailView.ts',
-	'!src/sql/base/browser/ui/table/plugins/headerFilter.plugin.ts',
-	'!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/parts/notebook/browser/outputs/sanitizer.ts',
-	'!src/sql/workbench/parts/notebook/browser/outputs/renderers.ts',
-	'!src/sql/workbench/parts/notebook/browser/outputs/registry.ts',
-	'!src/sql/workbench/parts/notebook/browser/outputs/factories.ts',
-	'!src/sql/workbench/parts/notebook/common/models/nbformat.ts',
-	'!extensions/markdown-language-features/media/tomorrow.css',
-	'!src/sql/workbench/browser/modelComponents/media/highlight.css',
-	'!src/sql/workbench/parts/notebook/electron-browser/cellViews/media/highlight.css',
-	'!extensions/mssql/sqltoolsservice/**',
-	'!extensions/import/flatfileimportservice/**',
-	'!extensions/notebook/src/prompts/**',
-	'!extensions/mssql/src/prompts/**',
-	'!extensions/notebook/resources/jupyter_config/**',
-	'!extensions/query-history/images/**',
-	'!**/*.gif',
-	'!**/*.xlf',
-	'!**/*.dacpac',
-	'!**/*.bacpac'
 ];
 
 const eslintFilter = [
@@ -174,57 +127,26 @@ const eslintFilter = [
 	'!src/vs/nls.js',
 	'!src/vs/css.build.js',
 	'!src/vs/nls.build.js',
-	'!src/**/insane.js',
+	'!src/**/winjs.base.js',
 	'!src/**/marked.js',
 	'!**/test/**'
 ];
 
-const tslintBaseFilter = [
+const tslintFilter = [
+	'src/**/*.ts',
+	'test/**/*.ts',
+	'extensions/**/*.ts',
 	'!**/fixtures/**',
 	'!**/typings/**',
 	'!**/node_modules/**',
-	'!extensions/typescript-basics/test/colorize-fixtures/**',
+	'!extensions/typescript/test/colorize-fixtures/**',
 	'!extensions/vscode-api-tests/testWorkspace/**',
 	'!extensions/vscode-api-tests/testWorkspace2/**',
 	'!extensions/**/*.test.ts',
-	'!extensions/html-language-features/server/lib/jquery.d.ts',
+	'!extensions/html-language-features/server/lib/jquery.d.ts'
-	// {{SQL CARBON EDIT}}
-	'!extensions/big-data-cluster/src/bigDataCluster/controller/apiGenerated.ts'
 ];
 
 // {{SQL CARBON EDIT}}
-const useStrictFilter = [
-	'src/**'
-];
-
-const sqlFilter = [
-	'src/sql/**'
-];
-
-// {{SQL CARBON EDIT}}
-
-const tslintCoreFilter = [
-	'src/**/*.ts',
-	'test/**/*.ts',
-	'!extensions/**/*.ts',
-	'!test/smoke/**',
-	...tslintBaseFilter
-];
-
-const tslintExtensionsFilter = [
-	'extensions/**/*.ts',
-	'!src/**/*.ts',
-	'!test/**/*.ts',
-	...tslintBaseFilter
-];
-
-const tslintHygieneFilter = [
-	'src/**/*.ts',
-	'test/**/*.ts',
-	'extensions/**/*.ts',
-	...tslintBaseFilter
-];
-
 const copyrightHeaderLines = [
 	'/*---------------------------------------------------------------------------------------------',
 	' *  Copyright (c) Microsoft Corporation. All rights reserved.',
@@ -241,36 +163,18 @@ gulp.task('eslint', () => {
 });
 
 gulp.task('tslint', () => {
-	return es.merge([
+  // {{SQL CARBON EDIT}}
+	const options = { emitError: false };
 
-		// Core: include type information (required by certain rules like no-nodejs-globals)
+	return vfs.src(all, { base: '.', follow: true, allowEmpty: true })
-		vfs.src(all, { base: '.', follow: true, allowEmpty: true })
+		.pipe(filter(tslintFilter))
-			.pipe(filter(tslintCoreFilter))
+		.pipe(gulptslint.default({ rulesDirectory: 'build/lib/tslint' }))
-			.pipe(gulptslint.default({ rulesDirectory: 'build/lib/tslint', program: tslint.Linter.createProgram('src/tsconfig.json') }))
+		.pipe(gulptslint.default.report(options));
-			.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());
 });
 
 function hygiene(some) {
 	let errorCount = 0;
 
-	const productJson = es.through(function (file) {
-		// const product = JSON.parse(file.contents.toString('utf8'));
-
-		// if (product.extensionsGallery) { // {{SQL CARBON EDIT}} @todo we need to research on what the point of this is
-		// 	console.error('product.json: Contains "extensionsGallery"');
-		// 	errorCount++;
-		// }
-
-		this.emit('data', file);
-	});
-
 	const indentation = es.through(function (file) {
 		const lines = file.contents.toString('utf8').split(/\r\n|\r|\n/);
 		file.__lines = lines;
@@ -293,8 +197,8 @@ function hygiene(some) {
 	});
 
 	const copyrights = es.through(function (file) {
-
 		const lines = file.__lines;
+
 		for (let i = 0; i < copyrightHeaderLines.length; i++) {
 			if (lines[i] !== copyrightHeaderLines[i]) {
 				console.error(file.relative + ': Missing or bad copyright statement');
@@ -306,23 +210,6 @@ function hygiene(some) {
 		this.emit('data', file);
 	});
 
-	// {{SQL CARBON EDIT}}
-	// Check for unnecessary 'use strict' lines. These are automatically added by the alwaysStrict compiler option so don't need to be added manually
-	const useStrict = es.through(function (file) {
-		const lines = file.__lines;
-		// Only take the first 10 lines to reduce false positives- the compiler will throw an error if it's not the first non-comment line in a file
-		// (10 is used to account for copyright and extraneous newlines)
-		lines.slice(0, 10).forEach((line, i) => {
-			if (/\s*'use\s*strict\s*'/.test(line)) {
-				console.error(file.relative + '(' + (i + 1) + ',1): Unnecessary \'use strict\' - this is already added by the compiler');
-				errorCount++;
-			}
-		});
-
-		this.emit('data', file);
-	});
-	// {{SQL CARBON EDIT}} END
-
 	const formatting = es.map(function (file, cb) {
 		tsfmt.processString(file.path, file.contents.toString('utf8'), {
 			verify: false,
@@ -343,7 +230,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:', file.relative);
 				errorCount++;
 			}
 			cb(null, file);
@@ -371,87 +258,31 @@ function hygiene(some) {
 		input = some;
 	}
 
-	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) {
-		const contents = file.contents.toString('utf8');
-		sqlTsLinter.lint(file.relative, contents, tslintSqlConfiguration.results);
-
-		this.emit('data', file);
-	});
-
-	const productJsonFilter = filter('product.json', { restore: true });
-
 	const result = input
 		.pipe(filter(f => !f.stat.isDirectory()))
-		.pipe(productJsonFilter)
-		.pipe(process.env['BUILD_SOURCEVERSION'] ? es.through() : productJson)
-		.pipe(productJsonFilter.restore)
 		.pipe(filter(indentationFilter))
 		.pipe(indentation)
-		.pipe(filter(copyrightFilter))
+		.pipe(filter(copyrightFilter));
-		.pipe(copyrights);
+    // {{SQL CARBON EDIT}}
+		// .pipe(copyrights);
 
 	const typescript = result
-		.pipe(filter(tslintHygieneFilter))
+		.pipe(filter(tslintFilter))
 		.pipe(formatting)
-		.pipe(tsl)
+		.pipe(tsl);
-		// {{SQL CARBON EDIT}}
-		.pipe(filter(useStrictFilter))
-		.pipe(useStrict)
-		.pipe(filter(sqlFilter))
-		.pipe(sqlTsl);
 
 	const javascript = result
 		.pipe(filter(eslintFilter))
 		.pipe(gulpeslint('src/.eslintrc'))
-		.pipe(gulpeslint.formatEach('compact'))
+		.pipe(gulpeslint.formatEach('compact'));
-		.pipe(gulpeslint.failAfterError());
+    // {{SQL CARBON EDIT}}
+		// .pipe(gulpeslint.failAfterError());
 
 	let count = 0;
 	return es.merge(typescript, javascript)
 		.pipe(es.through(function (data) {
-			count++;
+       // {{SQL CARBON EDIT}}
-			if (process.env['TRAVIS'] && count % 10 === 0) {
+       this.emit('end');
-				process.stdout.write('.');
-			}
-			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 {
-				this.emit('end');
-			}
 		}));
 }
 
@@ -469,7 +300,7 @@ function createGitIndexVinyls(paths) {
 				return e(err);
 			}
 
-			cp.exec(`git show ":${relativePath}"`, { maxBuffer: 2000 * 1024, encoding: 'buffer' }, (err, out) => {
+			cp.exec(`git show :${relativePath}`, { maxBuffer: 2000 * 1024, encoding: 'buffer' }, (err, out) => {
 				if (err) {
 					return e(err);
 				}

build/gulpfile.mixin.js

@@ -6,13 +6,21 @@
 'use strict';
 
 const gulp = require('gulp');
+const json = require('gulp-json-editor');
+const buffer = require('gulp-buffer');
+const filter = require('gulp-filter');
+const es = require('event-stream');
+const util = require('./lib/util');
+const remote = require('gulp-remote-src');
+const zip = require('gulp-vinyl-zip');
 
 // {{SQL CARBON EDIT}}
 const jeditor = require('gulp-json-editor');
-const product = require('../product.json');
+
+const pkg = require('../package.json');
 
 gulp.task('mixin', function () {
-	// {{SQL CARBON EDIT}}
+  // {{SQL CARBON EDIT}}
 	const updateUrl = process.env['SQLOPS_UPDATEURL'];
 	if (!updateUrl) {
 		console.log('Missing SQLOPS_UPDATEURL, skipping mixin');
@@ -26,53 +34,19 @@ gulp.task('mixin', function () {
 		return;
 	}
 
-	// {{SQL CARBON EDIT}} - apply ADS insiders values if needed
+	// {{SQL CARBON EDIT}}
+	let serviceUrl = 'https://sqlopsextensions.blob.core.windows.net/marketplace/v1/extensionsGallery.json';
+	if (quality === 'insider') {
+		serviceUrl = `https://sqlopsextensions.blob.core.windows.net/marketplace/v1/extensionsGallery-${quality}.json`;
+	}
 	let newValues = {
-		"nameShort": product.nameShort,
-		"nameLong": product.nameLong,
-		"applicationName": product.applicationName,
-		"dataFolderName": product.dataFolderName,
-		"win32MutexName": product.win32MutexName,
-		"win32DirName": product.win32DirName,
-		"win32NameVersion": product.win32NameVersion,
-		"win32RegValueName": product.win32RegValueName,
-		"win32AppId": product.win32AppId,
-		"win32x64AppId": product.win32x64AppId,
-		"win32UserAppId": product.win32UserAppId,
-		"win32x64UserAppId": product.win32x64UserAppId,
-		"win32AppUserModelId": product.win32AppUserModelId,
-		"win32ShellNameShort": product.win32ShellNameShort,
-		"darwinBundleIdentifier": product.darwinBundleIdentifier,
 		"updateUrl": updateUrl,
 		"quality": quality,
 		"extensionsGallery": {
-			"serviceUrl": 'https://sqlopsextensions.blob.core.windows.net/marketplace/v1/extensionsGallery.json'
+			"serviceUrl": serviceUrl
 		}
 	};
 
-	if (quality === 'insider') {
-		let dashSuffix =  '-insiders';
-		let dotSuffix =  '.insiders';
-		let displaySuffix = ' - Insiders';
-
-		newValues.extensionsGallery.serviceUrl = `https://sqlopsextensions.blob.core.windows.net/marketplace/v1/extensionsGallery-${quality}.json`;
-		newValues.nameShort += dashSuffix;
-		newValues.nameLong += displaySuffix;
-		newValues.applicationName += dashSuffix;
-		newValues.dataFolderName += dashSuffix;
-		newValues.win32MutexName += dashSuffix;
-		newValues.win32DirName += displaySuffix;
-		newValues.win32NameVersion += displaySuffix;
-		newValues.win32RegValueName += dashSuffix;
-		newValues.win32AppId = "{{9F0801B2-DEE3-4272-A2C6-FBDF25BAAF0F}";
-		newValues.win32x64AppId = "{{6748A5FD-29EB-4BA6-B3C6-E7B981B8D6B0}";
-		newValues.win32UserAppId = "{{0F8CD1ED-483C-40EB-8AD2-8ED784651AA1}";
-		newValues.win32x64UserAppId += dashSuffix;
-		newValues.win32AppUserModelId += dotSuffix;
-		newValues.win32ShellNameShort += displaySuffix;
-		newValues.darwinBundleIdentifier += dotSuffix;
-	}
-
 	return gulp.src('./product.json')
 		.pipe(jeditor(newValues))
 		.pipe(gulp.dest('.'));

build/gulpfile.reh.js

@@ -1,145 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-const gulp = require('gulp');
-
-const path = require('path');
-const es = require('event-stream');
-const util = require('./lib/util');
-const task = require('./lib/task');
-const vfs = require('vinyl-fs');
-const flatmap = require('gulp-flatmap');
-const gunzip = require('gulp-gunzip');
-const untar = require('gulp-untar');
-const File = require('vinyl');
-const fs = require('fs');
-const remote = require('gulp-remote-retry-src');
-const rename = require('gulp-rename');
-const filter = require('gulp-filter');
-const cp = require('child_process');
-
-const REPO_ROOT = path.dirname(__dirname);
-
-const BUILD_TARGETS = [
-	{ platform: 'win32', arch: 'ia32', pkgTarget: 'node8-win-x86' },
-	{ platform: 'win32', arch: 'x64', pkgTarget: 'node8-win-x64' },
-	{ platform: 'darwin', arch: null, pkgTarget: 'node8-macos-x64' },
-	{ platform: 'linux', arch: 'ia32', pkgTarget: 'node8-linux-x86' },
-	{ platform: 'linux', arch: 'x64', pkgTarget: 'node8-linux-x64' },
-	{ platform: 'linux', arch: 'armhf', pkgTarget: 'node8-linux-armv7' },
-	{ platform: 'linux', arch: 'arm64', pkgTarget: 'node8-linux-arm64' },
-	{ platform: 'linux', arch: 'alpine', pkgTarget: 'node8-linux-alpine' },
-];
-
-const noop = () => { return Promise.resolve(); };
-
-gulp.task('vscode-reh-win32-ia32-min', noop);
-gulp.task('vscode-reh-win32-x64-min', noop);
-gulp.task('vscode-reh-darwin-min', noop);
-gulp.task('vscode-reh-linux-x64-min', noop);
-gulp.task('vscode-reh-linux-armhf-min', noop);
-gulp.task('vscode-reh-linux-arm64-min', noop);
-gulp.task('vscode-reh-linux-alpine-min', noop);
-
-gulp.task('vscode-reh-web-win32-ia32-min', noop);
-gulp.task('vscode-reh-web-win32-x64-min', noop);
-gulp.task('vscode-reh-web-darwin-min', noop);
-gulp.task('vscode-reh-web-linux-x64-min', noop);
-gulp.task('vscode-reh-web-linux-alpine-min', noop);
-
-function getNodeVersion() {
-	const yarnrc = fs.readFileSync(path.join(REPO_ROOT, 'remote', '.yarnrc'), 'utf8');
-	const target = /^target "(.*)"$/m.exec(yarnrc)[1];
-	return target;
-}
-
-const nodeVersion = getNodeVersion();
-
-BUILD_TARGETS.forEach(({ platform, arch }) => {
-	if (platform === 'darwin') {
-		arch = 'x64';
-	}
-
-	gulp.task(task.define(`node-${platform}-${arch}`, () => {
-		const nodePath = path.join('.build', 'node', `v${nodeVersion}`, `${platform}-${arch}`);
-
-		if (!fs.existsSync(nodePath)) {
-			util.rimraf(nodePath);
-
-			return nodejs(platform, arch)
-				.pipe(vfs.dest(nodePath));
-		}
-
-		return Promise.resolve(null);
-	}));
-});
-
-const defaultNodeTask = gulp.task(`node-${process.platform}-${process.arch}`);
-
-if (defaultNodeTask) {
-	gulp.task(task.define('node', defaultNodeTask));
-}
-
-function nodejs(platform, arch) {
-	if (arch === 'ia32') {
-		arch = 'x86';
-	}
-
-	if (platform === 'win32') {
-		return remote(`/dist/v${nodeVersion}/win-${arch}/node.exe`, { base: 'https://nodejs.org' })
-			.pipe(rename('node.exe'));
-	}
-
-	if (arch === 'alpine') {
-		const contents = cp.execSync(`docker run --rm node:${nodeVersion}-alpine /bin/sh -c 'cat \`which node\`'`, { maxBuffer: 100 * 1024 * 1024, encoding: 'buffer' });
-		return es.readArray([new File({ path: 'node', contents, stat: { mode: parseInt('755', 8) } })]);
-	}
-
-	if (platform === 'darwin') {
-		arch = 'x64';
-	}
-
-	if (arch === 'armhf') {
-		arch = 'armv7l';
-	}
-
-	return remote(`/dist/v${nodeVersion}/node-v${nodeVersion}-${platform}-${arch}.tar.gz`, { base: 'https://nodejs.org' })
-		.pipe(flatmap(stream => stream.pipe(gunzip()).pipe(untar())))
-		.pipe(filter('**/node'))
-		.pipe(util.setExecutableBit('**'))
-		.pipe(rename('node'));
-}
-
-function mixinServer(watch) {
-	const packageJSONPath = path.join(path.dirname(__dirname), 'package.json');
-	function exec(cmdLine) {
-		console.log(cmdLine);
-		cp.execSync(cmdLine, { stdio: "inherit" });
-	}
-	function checkout() {
-		const packageJSON = JSON.parse(fs.readFileSync(packageJSONPath).toString());
-		exec('git fetch distro');
-		exec(`git checkout ${packageJSON['distro']} -- src/vs/server resources/server`);
-		exec('git reset HEAD src/vs/server resources/server');
-	}
-	checkout();
-	if (watch) {
-		console.log('Enter watch mode (observing package.json)');
-		const watcher = fs.watch(packageJSONPath);
-		watcher.addListener('change', () => {
-			try {
-				checkout();
-			} catch (e) {
-				console.log(e);
-			}
-		});
-	}
-	return Promise.resolve();
-}
-
-gulp.task(task.define('mixin-server', () => mixinServer(false)));
-gulp.task(task.define('mixin-server-watch', () => mixinServer(true)));

build/gulpfile.sql.js

@@ -10,10 +10,6 @@ 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 platformInfo = require('service-downloader/out/platform').PlatformInformation;
-const path = require('path');
 
 gulp.task('clean-mssql-extension', util.rimraf('extensions/mssql/node_modules'));
 gulp.task('clean-credentials-extension', util.rimraf('extensions/credentials/node_modules'));
@@ -32,6 +28,7 @@ const formatFiles = (some) => {
 				console.info('ran formatting on file ' + file.path + ' result: ' + result.message);
 				if (result.error) {
 					console.error(result.message);
+					errorCount++;
 				}
 				cb(null, file);
 
@@ -43,7 +40,7 @@ const formatFiles = (some) => {
 			.pipe(filter(f => !f.stat.isDirectory()))
 			.pipe(formatting);
 
-};
+}
 
 const formatStagedFiles = () => {
 	const cp = require('child_process');
@@ -84,49 +81,4 @@ const formatStagedFiles = () => {
 				process.exit(1);
 			});
 		});
-};
+}
-
-function installService() {
-	let config = require('../extensions/mssql/src/config.json');
-	return platformInfo.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();
-});
-
-function installSsmsMin() {
-	const config = require('../extensions/admin-tool-ext-win/src/config.json');
-	return platformInfo.getCurrent().then(p => {
-		const runtime = p.runtimeId;
-		// 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);
-		});
-	});
-}
-
-gulp.task('install-ssmsmin', () => {
-	return installSsmsMin();
-});

build/gulpfile.test.js

@@ -0,0 +1,15 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+const gulp = require('gulp');
+const mocha = require('gulp-mocha');
+
+gulp.task('test', function () {
+	return gulp.src('test/all.js')
+		.pipe(mocha({ ui: 'tdd', delay: true }))
+		.once('end', function () { process.exit(); });
+});

build/gulpfile.vscode.js

@@ -20,7 +20,7 @@ const filter = require('gulp-filter');
 const json = require('gulp-json-editor');
 const _ = require('underscore');
 const util = require('./lib/util');
-const task = require('./lib/task');
+const ext = require('./lib/extensions');
 const buildfile = require('../src/buildfile');
 const common = require('./lib/optimize');
 const root = path.dirname(__dirname);
@@ -29,14 +29,20 @@ const packageJson = require('../package.json');
 const product = require('../product.json');
 const crypto = require('crypto');
 const i18n = require('./lib/i18n');
-const ext = require('./lib/extensions'); // {{SQL CARBON EDIT}}
+// {{SQL CARBON EDIT}}
+const serviceDownloader = require('service-downloader').ServiceDownloadProvider;
+const platformInfo = require('service-downloader/out/platform').PlatformInformation;
+const glob = require('glob');
+// {{SQL CARBON EDIT}} - End
 const deps = require('./dependencies');
 const getElectronVersion = require('./lib/electron').getElectronVersion;
 const createAsar = require('./lib/asar').createAsar;
-const { compileBuildTask } = require('./gulpfile.compile');
+const minimist = require('minimist');
-const { compileExtensionsBuildTask } = require('./gulpfile.extensions');
 
 const productionDependencies = deps.getProductionDependencies(path.dirname(__dirname));
+// @ts-ignore
+// {{SQL CARBON EDIT}}
+var del = require('del');
 
 const baseModules = Object.keys(process.binding('natives')).filter(n => !/^_|\//.test(n));
 // {{SQL CARBON EDIT}}
@@ -46,21 +52,15 @@ const nodeModules = [
 	'rxjs/Observable',
 	'rxjs/Subject',
 	'rxjs/Observer',
-	'slickgrid/lib/jquery.event.drag-2.3.0',
+	'ng2-charts/ng2-charts']
-	'slickgrid/lib/jquery-ui-1.9.2',
-	'slickgrid/slick.core',
-	'slickgrid/slick.grid',
-	'slickgrid/slick.editors',
-	'slickgrid/slick.dataview']
 	.concat(Object.keys(product.dependencies || {}))
 	.concat(_.uniq(productionDependencies.map(d => d.name)))
 	.concat(baseModules);
 
 // Build
 const vscodeEntryPoints = _.flatten([
-	buildfile.entrypoint('vs/workbench/workbench.desktop.main'),
+	buildfile.entrypoint('vs/workbench/workbench.main'),
 	buildfile.base,
-	buildfile.serviceWorker,
 	buildfile.workbench,
 	buildfile.code
 ]);
@@ -74,22 +74,19 @@ const vscodeResources = [
 	'out-build/bootstrap-amd.js',
 	'out-build/bootstrap-window.js',
 	'out-build/paths.js',
-	'out-build/vs/**/*.{svg,png,html}',
+	'out-build/vs/**/*.{svg,png,cur,html}',
-	'!out-build/vs/code/browser/**/*.html',
 	'out-build/vs/base/common/performance.js',
-	'out-build/vs/base/node/languagePacks.js',
+	'out-build/vs/base/node/{stdForkStart.js,terminateProcess.sh,cpuUsage.sh}',
-	'out-build/vs/base/node/{stdForkStart.js,terminateProcess.sh,cpuUsage.sh,ps.sh}',
 	'out-build/vs/base/browser/ui/octiconLabel/octicons/**',
 	'out-build/vs/workbench/browser/media/*-theme.css',
-	'out-build/vs/workbench/contrib/debug/**/*.json',
+	'out-build/vs/workbench/parts/debug/**/*.json',
-	'out-build/vs/workbench/contrib/externalTerminal/**/*.scpt',
+	'out-build/vs/workbench/parts/execution/**/*.scpt',
-	'out-build/vs/workbench/contrib/webview/browser/pre/*.js',
+	'out-build/vs/workbench/parts/webview/electron-browser/webview-pre.js',
-	'out-build/vs/workbench/contrib/webview/electron-browser/pre/*.js',
 	'out-build/vs/**/markdown.css',
-	'out-build/vs/workbench/contrib/tasks/**/*.json',
+	'out-build/vs/workbench/parts/tasks/**/*.json',
-	'out-build/vs/workbench/contrib/welcome/walkThrough/**/*.md',
+	'out-build/vs/workbench/parts/welcome/walkThrough/**/*.md',
-	'out-build/vs/platform/files/**/*.exe',
+	'out-build/vs/workbench/services/files/**/*.exe',
-	'out-build/vs/platform/files/**/*.md',
+	'out-build/vs/workbench/services/files/**/*.md',
 	'out-build/vs/code/electron-browser/workbench/**',
 	'out-build/vs/code/electron-browser/sharedProcess/sharedProcess.js',
 	'out-build/vs/code/electron-browser/issue/issueReporter.js',
@@ -102,47 +99,51 @@ const vscodeResources = [
 	'out-build/sql/parts/admin/**/*.html',
 	'out-build/sql/parts/connection/connectionDialog/media/*.{gif,png,svg}',
 	'out-build/sql/parts/common/dblist/**/*.html',
-	'out-build/sql/workbench/parts/dashboard/**/*.html',
+	'out-build/sql/parts/dashboard/**/*.html',
 	'out-build/sql/parts/disasterRecovery/**/*.html',
 	'out-build/sql/parts/common/modal/media/**',
-	'out-build/sql/workbench/parts/grid/media/**',
+	'out-build/sql/parts/grid/load/lib/**',
-	'out-build/sql/workbench/parts/grid/views/**/*.html',
+	'out-build/sql/parts/grid/load/loadJquery.js',
+	'out-build/sql/parts/grid/media/**',
+	'out-build/sql/parts/grid/views/**/*.html',
 	'out-build/sql/parts/tasks/**/*.html',
 	'out-build/sql/parts/taskHistory/viewlet/media/**',
 	'out-build/sql/parts/jobManagement/common/media/*.svg',
 	'out-build/sql/media/objectTypes/*.svg',
 	'out-build/sql/media/icons/*.svg',
-	'out-build/sql/workbench/parts/notebook/media/**/*.svg',
+	'out-build/sql/parts/notebook/media/**/*.svg',
-	'out-build/sql/setup.js',
 	'!**/test/**'
 ];
 
-const optimizeVSCodeTask = task.define('optimize-vscode', task.series(
+const BUNDLED_FILE_HEADER = [
-	util.rimraf('out-vscode'),
+	'/*!--------------------------------------------------------',
-	common.optimizeTask({
+	' * Copyright (C) Microsoft Corporation. All rights reserved.',
-		src: 'out-build',
+	' *--------------------------------------------------------*/'
-		entryPoints: vscodeEntryPoints,
+].join('\n');
-		resources: vscodeResources,
+
-		loaderConfig: common.loaderConfig(nodeModules),
+gulp.task('clean-optimized-vscode', util.rimraf('out-vscode'));
-		out: 'out-vscode',
+gulp.task('optimize-vscode', ['clean-optimized-vscode', 'compile-build', 'compile-extensions-build'], common.optimizeTask({
-		bundleInfo: undefined
+	src: 'out-build',
-	})
+	entryPoints: vscodeEntryPoints,
-));
+	otherSources: [],
-gulp.task(optimizeVSCodeTask);
+	resources: vscodeResources,
+	loaderConfig: common.loaderConfig(nodeModules),
+	header: BUNDLED_FILE_HEADER,
+	out: 'out-vscode',
+	bundleInfo: undefined
+}));
+
+
+gulp.task('optimize-index-js', ['optimize-vscode'], () => {
+	const fullpath = path.join(process.cwd(), 'out-vscode/vs/code/electron-browser/workbench/workbench.js');
+	const contents = fs.readFileSync(fullpath).toString();
+	const newContents = contents.replace('[/*BUILD->INSERT_NODE_MODULES*/]', JSON.stringify(nodeModules));
+	fs.writeFileSync(fullpath, newContents);
+});
 
 const sourceMappingURLBase = `https://ticino.blob.core.windows.net/sourcemaps/${commit}`;
-const minifyVSCodeTask = task.define('minify-vscode', task.series(
+gulp.task('clean-minified-vscode', util.rimraf('out-vscode-min'));
-	optimizeVSCodeTask,
+gulp.task('minify-vscode', ['clean-minified-vscode', 'optimize-index-js'], common.minifyTask('out-vscode', `${sourceMappingURLBase}/core`));
-	util.rimraf('out-vscode-min'),
-	() => {
-		const fullpath = path.join(process.cwd(), 'out-vscode/bootstrap-window.js');
-		const contents = fs.readFileSync(fullpath).toString();
-		const newContents = contents.replace('[/*BUILD->INSERT_NODE_MODULES*/]', JSON.stringify(nodeModules));
-		fs.writeFileSync(fullpath, newContents);
-	},
-	common.minifyTask('out-vscode', `${sourceMappingURLBase}/core`)
-));
-gulp.task(minifyVSCodeTask);
 
 // Package
 
@@ -163,7 +164,7 @@ const config = {
 	version: getElectronVersion(),
 	productAppName: product.nameLong,
 	companyName: 'Microsoft Corporation',
-	copyright: 'Copyright (C) 2019 Microsoft. All rights reserved',
+	copyright: 'Copyright (C) 2018 Microsoft. All rights reserved',
 	darwinIcon: 'resources/darwin/code.icns',
 	darwinBundleIdentifier: product.darwinBundleIdentifier,
 	darwinApplicationCategoryType: 'public.app-category.developer-tools',
@@ -179,13 +180,13 @@ const config = {
 		urlSchemes: [product.urlProtocol]
 	}],
 	darwinForceDarkModeSupport: true,
-	darwinCredits: darwinCreditsTemplate ? Buffer.from(darwinCreditsTemplate({ commit: commit, date: new Date().toISOString() })) : undefined,
+	darwinCredits: darwinCreditsTemplate ? Buffer.from(darwinCreditsTemplate({ commit: commit, date: new Date().toISOString() })) : void 0,
 	linuxExecutableName: product.applicationName,
 	winIcon: 'resources/win32/code.ico',
-	token: process.env['VSCODE_MIXIN_PASSWORD'] || process.env['GITHUB_TOKEN'] || undefined,
+	token: process.env['VSCODE_MIXIN_PASSWORD'] || process.env['GITHUB_TOKEN'] || void 0,
 
 	// @ts-ignore JSON checking: electronRepository is optional
-	repo: product.electronRepository || undefined
+	repo: product.electronRepository || void 0
 };
 
 function getElectron(arch) {
@@ -205,11 +206,13 @@ function getElectron(arch) {
 	};
 }
 
-gulp.task(task.define('electron', task.series(util.rimraf('.build/electron'), getElectron(process.arch))));
+gulp.task('clean-electron', util.rimraf('.build/electron'));
-gulp.task(task.define('electron-ia32', task.series(util.rimraf('.build/electron'), getElectron('ia32'))));
+gulp.task('electron', ['clean-electron'], getElectron(process.arch));
-gulp.task(task.define('electron-x64', task.series(util.rimraf('.build/electron'), getElectron('x64'))));
+gulp.task('electron-ia32', ['clean-electron'], getElectron('ia32'));
-gulp.task(task.define('electron-arm', task.series(util.rimraf('.build/electron'), getElectron('armv7l'))));
+gulp.task('electron-x64', ['clean-electron'], getElectron('x64'));
-gulp.task(task.define('electron-arm64', task.series(util.rimraf('.build/electron'), getElectron('arm64'))));
+gulp.task('electron-arm', ['clean-electron'], getElectron('arm'));
+gulp.task('electron-arm64', ['clean-electron'], getElectron('arm64'));
+
 
 /**
  * Compute checksums for some files.
@@ -245,35 +248,39 @@ function computeChecksum(filename) {
 	return hash;
 }
 
-function packageTask(platform, arch, sourceFolderName, destinationFolderName, opts) {
+function packageTask(platform, arch, opts) {
 	opts = opts || {};
 
-	const destination = path.join(path.dirname(root), destinationFolderName);
+	// {{SQL CARBON EDIT}}
+	const destination = path.join(path.dirname(root), 'azuredatastudio') + (platform ? '-' + platform : '') + (arch ? '-' + arch : '');
 	platform = platform || process.platform;
 
 	return () => {
-		const out = sourceFolderName;
+		const out = opts.minified ? 'out-vscode-min' : 'out-vscode';
 
 		const checksums = computeChecksums(out, [
-			'vs/workbench/workbench.desktop.main.js',
+			'vs/workbench/workbench.main.js',
-			'vs/workbench/workbench.desktop.main.css',
+			'vs/workbench/workbench.main.css',
 			'vs/code/electron-browser/workbench/workbench.html',
 			'vs/code/electron-browser/workbench/workbench.js'
 		]);
 
 		const src = gulp.src(out + '/**', { base: '.' })
 			.pipe(rename(function (path) { path.dirname = path.dirname.replace(new RegExp('^' + out), 'out'); }))
-			.pipe(util.setExecutableBit(['**/*.sh']));
+			.pipe(util.setExecutableBit(['**/*.sh']))
+			.pipe(filter(['**', '!**/*.js.map']));
+
+		const root = path.resolve(path.join(__dirname, '..'));
 
 		// {{SQL CARBON EDIT}}
 		ext.packageBuiltInExtensions();
 
-		const extensions = gulp.src('.build/extensions/**', { base: '.build', dot: true });
+		const sources = es.merge(src, ext.packageExtensionsStream({
-
+			sourceMappingURLBase: sourceMappingURLBase
-		const sources = es.merge(src, extensions)
+		}));
-			.pipe(filter(['**', '!**/*.js.map'], { dot: true }));
 
 		let version = packageJson.version;
+		// @ts-ignore JSON checking: quality is optional
 		const quality = product.quality;
 
 		if (quality && quality !== 'stable') {
@@ -302,39 +309,102 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 		const productJsonStream = gulp.src(['product.json'], { base: '.' })
 			.pipe(json(productJsonUpdate));
 
-		const license = gulp.src(['LICENSES.chromium.html', product.licenseFileName, 'ThirdPartyNotices.txt', 'licenses/**'], { base: '.', allowEmpty: true });
+		const license = gulp.src(['LICENSES.chromium.html', 'LICENSE.txt', 'ThirdPartyNotices.txt', 'licenses/**'], { base: '.' });
+
+		const watermark = gulp.src(['resources/letterpress.svg', 'resources/letterpress-dark.svg', 'resources/letterpress-hc.svg'], { base: '.' });
 
 		// TODO the API should be copied to `out` during compile, not here
 		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 dataApi = gulp.src('src/vs/data.d.ts').pipe(rename('out/sql/data.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 });
+		const depsSrc = [
+			..._.flatten(productionDependencies.map(d => path.relative(root, d.path)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`])),
+			// @ts-ignore JSON checking: dependencies is optional
+			..._.flatten(Object.keys(product.dependencies || {}).map(d => [`node_modules/${d}/**`, `!node_modules/${d}/**/{test,tests}/**`]))
+		];
 
-		const root = path.resolve(path.join(__dirname, '..'));
+		const deps = gulp.src(depsSrc, { base: '.', dot: true })
-		const dependenciesSrc = _.flatten(productionDependencies.map(d => path.relative(root, d.path)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`]));
-
-		const deps = gulp.src(dependenciesSrc, { base: '.', dot: true })
 			.pipe(filter(['**', '!**/package-lock.json']))
-			.pipe(util.cleanNodeModules(path.join(__dirname, '.nativeignore')))
+			.pipe(util.cleanNodeModule('fsevents', ['binding.gyp', 'fsevents.cc', 'build/**', 'src/**', 'test/**'], ['**/*.node']))
+			.pipe(util.cleanNodeModule('vscode-sqlite3', ['binding.gyp', 'benchmark/**', 'cloudformation/**', 'deps/**', 'test/**', 'build/**', 'src/**'], ['build/Release/*.node']))
+			.pipe(util.cleanNodeModule('oniguruma', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], ['build/Release/*.node', 'src/*.js']))
+			.pipe(util.cleanNodeModule('windows-mutex', ['binding.gyp', 'build/**', 'src/**'], ['**/*.node']))
+			.pipe(util.cleanNodeModule('native-keymap', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], ['build/Release/*.node']))
+			.pipe(util.cleanNodeModule('native-is-elevated', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], ['build/Release/*.node']))
+			.pipe(util.cleanNodeModule('native-watchdog', ['binding.gyp', 'build/**', 'src/**'], ['build/Release/*.node']))
+			.pipe(util.cleanNodeModule('spdlog', ['binding.gyp', 'build/**', 'deps/**', 'src/**', 'test/**'], ['build/Release/*.node']))
+			.pipe(util.cleanNodeModule('jschardet', ['dist/**']))
+			.pipe(util.cleanNodeModule('windows-foreground-love', ['binding.gyp', 'build/**', 'src/**'], ['**/*.node']))
+			.pipe(util.cleanNodeModule('windows-process-tree', ['binding.gyp', 'build/**', 'src/**'], ['**/*.node']))
+			.pipe(util.cleanNodeModule('gc-signals', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], ['build/Release/*.node', 'src/index.js']))
+			.pipe(util.cleanNodeModule('keytar', ['binding.gyp', 'build/**', 'src/**', 'script/**', 'node_modules/**'], ['**/*.node']))
+			.pipe(util.cleanNodeModule('node-pty', ['binding.gyp', 'build/**', 'src/**', 'tools/**'], ['build/Release/*.exe', 'build/Release/*.dll', 'build/Release/*.node']))
+			// {{SQL CARBON EDIT}}
+			.pipe(util.cleanNodeModule('chart.js', ['node_modules/**'], undefined))
+			.pipe(util.cleanNodeModule('emmet', ['node_modules/**'], undefined))
+			.pipe(util.cleanNodeModule('pty.js', ['build/**'], ['build/Release/**']))
+			.pipe(util.cleanNodeModule('jquery-ui', ['external/**', 'demos/**'], undefined))
+			.pipe(util.cleanNodeModule('core-js', ['**/**'], undefined))
+			.pipe(util.cleanNodeModule('slickgrid', ['node_modules/**', 'examples/**'], undefined))
+			.pipe(util.cleanNodeModule('nsfw', ['binding.gyp', 'build/**', 'src/**', 'openpa/**', 'includes/**'], ['**/*.node', '**/*.a']))
+			.pipe(util.cleanNodeModule('vscode-nsfw', ['binding.gyp', 'build/**', 'src/**', 'openpa/**', 'includes/**'], ['**/*.node', '**/*.a']))
+			// {{SQL CARBON EDIT}} - End
+			.pipe(util.cleanNodeModule('vsda', ['binding.gyp', 'README.md', 'build/**', '*.bat', '*.sh', '*.cpp', '*.h'], ['build/Release/vsda.node']))
 			.pipe(createAsar(path.join(process.cwd(), 'node_modules'), ['**/*.node', '**/vscode-ripgrep/bin/*', '**/node-pty/build/Release/*'], 'app/node_modules.asar'));
 
+		// {{SQL CARBON EDIT}}
+		let copiedModules = gulp.src([
+			'node_modules/jquery/**/*.*',
+			'node_modules/reflect-metadata/**/*.*',
+			'node_modules/slickgrid/**/*.*',
+			'node_modules/underscore/**/*.*',
+			'node_modules/zone.js/**/*.*',
+			'node_modules/chart.js/**/*.*',
+		], { base: '.', dot: true });
+
 		let all = es.merge(
 			packageJsonStream,
 			productJsonStream,
 			license,
+			watermark,
 			api,
+			// {{SQL CARBON EDIT}}
+			copiedModules,
 			dataApi,
-			sqlopsAPI, // {{SQL CARBON EDIT}}
-			telemetry,
 			sources,
 			deps
 		);
 
 		if (platform === 'win32') {
 			all = es.merge(all, gulp.src([
-				// {{SQL CARBON EDIT}} remove unused icons
+				'resources/win32/bower.ico',
+				'resources/win32/c.ico',
+				'resources/win32/config.ico',
+				'resources/win32/cpp.ico',
+				'resources/win32/csharp.ico',
+				'resources/win32/css.ico',
+				'resources/win32/default.ico',
+				'resources/win32/go.ico',
+				'resources/win32/html.ico',
+				'resources/win32/jade.ico',
+				'resources/win32/java.ico',
+				'resources/win32/javascript.ico',
+				'resources/win32/json.ico',
+				'resources/win32/less.ico',
+				'resources/win32/markdown.ico',
+				'resources/win32/php.ico',
+				'resources/win32/powershell.ico',
+				'resources/win32/python.ico',
+				'resources/win32/react.ico',
+				'resources/win32/ruby.ico',
+				'resources/win32/sass.ico',
+				'resources/win32/shell.ico',
+				'resources/win32/sql.ico',
+				'resources/win32/typescript.ico',
+				'resources/win32/vue.ico',
+				'resources/win32/xml.ico',
+				'resources/win32/yaml.ico',
 				'resources/win32/code_70x70.png',
 				'resources/win32/code_150x150.png'
 			], { base: '.' }));
@@ -351,20 +421,10 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 			.pipe(util.skipDirectories())
 			.pipe(util.fixWin32DirectoryPermissions())
 			.pipe(electron(_.extend({}, config, { platform, arch, ffmpegChromium: true })))
-			.pipe(filter(['**', '!LICENSE', '!LICENSES.chromium.html', '!version'], { dot: true }));
+			.pipe(filter(['**', '!LICENSE', '!LICENSES.chromium.html', '!version']));
-
-		if (platform === 'linux') {
-			result = es.merge(result, gulp.src('resources/completions/bash/code', { base: '.' })
-				.pipe(replace('@@APPNAME@@', product.applicationName))
-				.pipe(rename(function (f) { f.basename = product.applicationName; })));
-
-			result = es.merge(result, gulp.src('resources/completions/zsh/_code', { base: '.' })
-				.pipe(replace('@@APPNAME@@', product.applicationName))
-				.pipe(rename(function (f) { f.basename = '_' + product.applicationName; })));
-		}
 
 		if (platform === 'win32') {
-			result = es.merge(result, gulp.src('resources/win32/bin/code.js', { base: 'resources/win32', allowEmpty: true }));
+			result = es.merge(result, gulp.src('resources/win32/bin/code.js', { base: 'resources/win32' }));
 
 			result = es.merge(result, gulp.src('resources/win32/bin/code.cmd', { base: 'resources/win32' })
 				.pipe(replace('@@NAME@@', product.nameShort))
@@ -372,19 +432,14 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 
 			result = es.merge(result, gulp.src('resources/win32/bin/code.sh', { base: 'resources/win32' })
 				.pipe(replace('@@NAME@@', product.nameShort))
-				.pipe(replace('@@PRODNAME@@', product.nameLong))
-				.pipe(replace('@@VERSION@@', version))
 				.pipe(replace('@@COMMIT@@', commit))
 				.pipe(replace('@@APPNAME@@', product.applicationName))
-				.pipe(replace('@@DATAFOLDER@@', product.dataFolderName))
-				.pipe(replace('@@QUALITY@@', quality))
 				.pipe(rename(function (f) { f.basename = product.applicationName; f.extname = ''; })));
 
 			result = es.merge(result, gulp.src('resources/win32/VisualElementsManifest.xml', { base: 'resources/win32' })
 				.pipe(rename(product.nameShort + '.VisualElementsManifest.xml')));
 		} else if (platform === 'linux') {
 			result = es.merge(result, gulp.src('resources/linux/bin/code.sh', { base: '.' })
-				.pipe(replace('@@PRODNAME@@', product.nameLong))
 				.pipe(replace('@@NAME@@', product.applicationName))
 				.pipe(rename('bin/' + product.applicationName)));
 		}
@@ -404,40 +459,38 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 
 const buildRoot = path.dirname(root);
 
-const BUILD_TARGETS = [
+// {{SQL CARBON EDIT}}
-	{ platform: 'win32', arch: 'ia32' },
+gulp.task('vscode-win32-x64-azurecore', ['optimize-vscode'], ext.packageExtensionTask('azurecore', 'win32', 'x64'));
-	{ platform: 'win32', arch: 'x64' },
+gulp.task('vscode-darwin-azurecore', ['optimize-vscode'], ext.packageExtensionTask('azurecore', 'darwin'));
-	{ platform: 'darwin', arch: null, opts: { stats: true } },
+gulp.task('vscode-linux-x64-azurecore', ['optimize-vscode'], ext.packageExtensionTask('azurecore', 'linux', 'x64'));
-	{ platform: 'linux', arch: 'ia32' },
-	{ platform: 'linux', arch: 'x64' },
-	{ platform: 'linux', arch: 'arm' },
-	{ platform: 'linux', arch: 'arm64' },
-];
-BUILD_TARGETS.forEach(buildTarget => {
-	const dashed = (str) => (str ? `-${str}` : ``);
-	const platform = buildTarget.platform;
-	const arch = buildTarget.arch;
-	const opts = buildTarget.opts;
 
-	['', 'min'].forEach(minified => {
+gulp.task('vscode-win32-x64-mssql', ['vscode-linux-x64-azurecore', 'optimize-vscode'], ext.packageExtensionTask('mssql', 'win32', 'x64'));
-		const sourceFolderName = `out-vscode${dashed(minified)}`;
+gulp.task('vscode-darwin-mssql', ['vscode-linux-x64-azurecore', 'optimize-vscode'], ext.packageExtensionTask('mssql', 'darwin'));
-		const destinationFolderName = `azuredatastudio${dashed(platform)}${dashed(arch)}`;
+gulp.task('vscode-linux-x64-mssql', ['vscode-linux-x64-azurecore', 'optimize-vscode'], ext.packageExtensionTask('mssql', 'linux', 'x64'));
 
-		const vscodeTaskCI = task.define(`vscode${dashed(platform)}${dashed(arch)}${dashed(minified)}-ci`, task.series(
+gulp.task('clean-vscode-win32-ia32', util.rimraf(path.join(buildRoot, 'azuredatastudio-win32-ia32')));
-			util.rimraf(path.join(buildRoot, destinationFolderName)),
+gulp.task('clean-vscode-win32-x64', util.rimraf(path.join(buildRoot, 'azuredatastudio-win32-x64')));
-			packageTask(platform, arch, sourceFolderName, destinationFolderName, opts)
+gulp.task('clean-vscode-darwin', util.rimraf(path.join(buildRoot, 'azuredatastudio-darwin')));
-		));
+gulp.task('clean-vscode-linux-ia32', util.rimraf(path.join(buildRoot, 'azuredatastudio-linux-ia32')));
-		gulp.task(vscodeTaskCI);
+gulp.task('clean-vscode-linux-x64', util.rimraf(path.join(buildRoot, 'azuredatastudio-linux-x64')));
+gulp.task('clean-vscode-linux-arm', util.rimraf(path.join(buildRoot, 'azuredatastudio-linux-arm')));
+gulp.task('clean-vscode-linux-arm64', util.rimraf(path.join(buildRoot, 'azuredatastudio-linux-arm64')));
 
-		const vscodeTask = task.define(`vscode${dashed(platform)}${dashed(arch)}${dashed(minified)}`, task.series(
+gulp.task('vscode-win32-ia32', ['optimize-vscode', 'clean-vscode-win32-ia32'], packageTask('win32', 'ia32'));
-			compileBuildTask,
+gulp.task('vscode-win32-x64', ['vscode-win32-x64-azurecore', 'vscode-win32-x64-mssql', 'optimize-vscode', 'clean-vscode-win32-x64'], packageTask('win32', 'x64'));
-			compileExtensionsBuildTask,
+gulp.task('vscode-darwin', ['vscode-darwin-azurecore', 'vscode-darwin-mssql', 'optimize-vscode', 'clean-vscode-darwin'], packageTask('darwin', null, { stats: true }));
-			minified ? minifyVSCodeTask : optimizeVSCodeTask,
+gulp.task('vscode-linux-ia32', ['optimize-vscode', 'clean-vscode-linux-ia32'], packageTask('linux', 'ia32'));
-			vscodeTaskCI
+gulp.task('vscode-linux-x64', ['vscode-linux-x64-azurecore', 'vscode-linux-x64-mssql', 'optimize-vscode', 'clean-vscode-linux-x64'], packageTask('linux', 'x64'));
-		));
+gulp.task('vscode-linux-arm', ['optimize-vscode', 'clean-vscode-linux-arm'], packageTask('linux', 'arm'));
-		gulp.task(vscodeTask);
+gulp.task('vscode-linux-arm64', ['optimize-vscode', 'clean-vscode-linux-arm64'], packageTask('linux', 'arm64'));
-	});
+
-});
+gulp.task('vscode-win32-ia32-min', ['minify-vscode', 'clean-vscode-win32-ia32'], packageTask('win32', 'ia32', { minified: true }));
+gulp.task('vscode-win32-x64-min', ['minify-vscode', 'clean-vscode-win32-x64'], packageTask('win32', 'x64', { minified: true }));
+gulp.task('vscode-darwin-min', ['minify-vscode', 'clean-vscode-darwin'], packageTask('darwin', null, { minified: true, stats: true }));
+gulp.task('vscode-linux-ia32-min', ['minify-vscode', 'clean-vscode-linux-ia32'], packageTask('linux', 'ia32', { minified: true }));
+gulp.task('vscode-linux-x64-min', ['minify-vscode', 'clean-vscode-linux-x64'], packageTask('linux', 'x64', { minified: true }));
+gulp.task('vscode-linux-arm-min', ['minify-vscode', 'clean-vscode-linux-arm'], packageTask('linux', 'arm', { minified: true }));
+gulp.task('vscode-linux-arm64-min', ['minify-vscode', 'clean-vscode-linux-arm64'], packageTask('linux', 'arm64', { minified: true }));
 
 // Transifex Localizations
 
@@ -460,46 +513,30 @@ const apiHostname = process.env.TRANSIFEX_API_URL;
 const apiName = process.env.TRANSIFEX_API_NAME;
 const apiToken = process.env.TRANSIFEX_API_TOKEN;
 
-gulp.task(task.define(
+gulp.task('vscode-translations-push', ['optimize-vscode'], function () {
-	'vscode-translations-push',
+	const pathToMetadata = './out-vscode/nls.metadata.json';
-	task.series(
+	const pathToExtensions = './extensions/*';
-		compileBuildTask,
+	const pathToSetup = 'build/win32/**/{Default.isl,messages.en.isl}';
-		compileExtensionsBuildTask,
-		optimizeVSCodeTask,
-		function () {
-			const pathToMetadata = './out-vscode/nls.metadata.json';
-			const pathToExtensions = './extensions/*';
-			const pathToSetup = 'build/win32/**/{Default.isl,messages.en.isl}';
 
-			return es.merge(
+	return es.merge(
-				gulp.src(pathToMetadata).pipe(i18n.createXlfFilesForCoreBundle()),
+		gulp.src(pathToMetadata).pipe(i18n.createXlfFilesForCoreBundle()),
-				gulp.src(pathToSetup).pipe(i18n.createXlfFilesForIsl()),
+		gulp.src(pathToSetup).pipe(i18n.createXlfFilesForIsl()),
-				gulp.src(pathToExtensions).pipe(i18n.createXlfFilesForExtensions())
+		gulp.src(pathToExtensions).pipe(i18n.createXlfFilesForExtensions())
-			).pipe(i18n.findObsoleteResources(apiHostname, apiName, apiToken)
+	).pipe(i18n.findObsoleteResources(apiHostname, apiName, apiToken)
-			).pipe(i18n.pushXlfFiles(apiHostname, apiName, apiToken));
+	).pipe(i18n.pushXlfFiles(apiHostname, apiName, apiToken));
-		}
+});
-	)
-));
 
-gulp.task(task.define(
+gulp.task('vscode-translations-export', ['optimize-vscode'], function () {
-	'vscode-translations-export',
+	const pathToMetadata = './out-vscode/nls.metadata.json';
-	task.series(
+	const pathToExtensions = './extensions/*';
-		compileBuildTask,
+	const pathToSetup = 'build/win32/**/{Default.isl,messages.en.isl}';
-		compileExtensionsBuildTask,
-		optimizeVSCodeTask,
-		function () {
-			const pathToMetadata = './out-vscode/nls.metadata.json';
-			const pathToExtensions = './extensions/*';
-			const pathToSetup = 'build/win32/**/{Default.isl,messages.en.isl}';
 
-			return es.merge(
+	return es.merge(
-				gulp.src(pathToMetadata).pipe(i18n.createXlfFilesForCoreBundle()),
+		gulp.src(pathToMetadata).pipe(i18n.createXlfFilesForCoreBundle()),
-				gulp.src(pathToSetup).pipe(i18n.createXlfFilesForIsl()),
+		gulp.src(pathToSetup).pipe(i18n.createXlfFilesForIsl()),
-				gulp.src(pathToExtensions).pipe(i18n.createXlfFilesForExtensions())
+		gulp.src(pathToExtensions).pipe(i18n.createXlfFilesForExtensions())
-			).pipe(vfs.dest('../vscode-translations-export'));
+	).pipe(vfs.dest('../vscode-translations-export'));
-		}
+});
-	)
-));
 
 gulp.task('vscode-translations-pull', function () {
 	return es.merge([...i18n.defaultLanguages, ...i18n.extraLanguages].map(language => {
@@ -510,20 +547,91 @@ gulp.task('vscode-translations-pull', function () {
 
 gulp.task('vscode-translations-import', function () {
 	// {{SQL CARBON EDIT}} - Replace function body with our own
-	return new Promise(function(resolve) {
+	[...i18n.defaultLanguages, ...i18n.extraLanguages].forEach(language => {
-		[...i18n.defaultLanguages, ...i18n.extraLanguages].forEach(language => {
+		gulp.src(`../vscode-localization/${language.id}/build/*/*.xlf`)
-			let languageId = language.translationId ? language.translationId : language.id;
+			.pipe(i18n.prepareI18nFiles())
-			gulp.src(`resources/xlf/${languageId}/**/*.xlf`)
+			.pipe(vfs.dest(`./i18n/${language.folderName}`));
-				.pipe(i18n.prepareI18nFiles())
-				.pipe(vfs.dest(`./i18n/${language.folderName}`));
-			resolve();
-		});
 	});
 	// {{SQL CARBON EDIT}} - End
 });
 
+// Sourcemaps
+
+gulp.task('upload-vscode-sourcemaps', ['vscode-darwin-min', 'minify-vscode'], () => {
+	const vs = gulp.src('out-vscode-min/**/*.map', { base: 'out-vscode-min' })
+		.pipe(es.mapSync(f => {
+			f.path = `${f.base}/core/${f.relative}`;
+			return f;
+		}));
+
+	const extensionsOut = gulp.src('extensions/**/out/**/*.map', { base: '.' });
+	const extensionsDist = gulp.src('extensions/**/dist/**/*.map', { base: '.' });
+
+	return es.merge(vs, extensionsOut, extensionsDist)
+		.pipe(es.through(function (data) {
+			// debug
+			console.log('Uploading Sourcemap', data.relative);
+			this.emit('data', data);
+		}))
+		.pipe(azure.upload({
+			account: process.env.AZURE_STORAGE_ACCOUNT,
+			key: process.env.AZURE_STORAGE_ACCESS_KEY,
+			container: 'sourcemaps',
+			prefix: commit + '/'
+		}));
+});
+
+const allConfigDetailsPath = path.join(os.tmpdir(), 'configuration.json');
+gulp.task('upload-vscode-configuration', ['generate-vscode-configuration'], () => {
+	if (!shouldSetupSettingsSearch()) {
+		const branch = process.env.BUILD_SOURCEBRANCH;
+		console.log(`Only runs on master and release branches, not ${branch}`);
+		return;
+	}
+
+	if (!fs.existsSync(allConfigDetailsPath)) {
+		throw new Error(`configuration file at ${allConfigDetailsPath} does not exist`);
+	}
+
+	const settingsSearchBuildId = getSettingsSearchBuildId(packageJson);
+	if (!settingsSearchBuildId) {
+		throw new Error('Failed to compute build number');
+	}
+
+	return gulp.src(allConfigDetailsPath)
+		.pipe(azure.upload({
+			account: process.env.AZURE_STORAGE_ACCOUNT,
+			key: process.env.AZURE_STORAGE_ACCESS_KEY,
+			container: 'configuration',
+			prefix: `${settingsSearchBuildId}/${commit}/`
+		}));
+});
+
+function shouldSetupSettingsSearch() {
+	const branch = process.env.BUILD_SOURCEBRANCH;
+	return branch && (/\/master$/.test(branch) || branch.indexOf('/release/') >= 0);
+}
+
+function getSettingsSearchBuildId(packageJson) {
+	try {
+		const branch = process.env.BUILD_SOURCEBRANCH;
+		const branchId = branch.indexOf('/release/') >= 0 ? 0 :
+			/\/master$/.test(branch) ? 1 :
+				2; // Some unexpected branch
+
+		const out = cp.execSync(`git rev-list HEAD --count`);
+		const count = parseInt(out.toString());
+
+		// <version number><commit count><branchId (avoid unlikely conflicts)>
+		// 1.25.1, 1,234,567 commits, master = 1250112345671
+		return util.versionStringToNumber(packageJson.version) * 1e8 + count * 10 + branchId;
+	} catch (e) {
+		throw new Error('Could not determine build number: ' + e.toString());
+	}
+}
+
 // This task is only run for the MacOS build
-const generateVSCodeConfigurationTask = task.define('generate-vscode-configuration', () => {
+gulp.task('generate-vscode-configuration', () => {
 	return new Promise((resolve, reject) => {
 		const buildDir = process.env['AGENT_BUILDDIRECTORY'];
 		if (!buildDir) {
@@ -560,57 +668,27 @@ const generateVSCodeConfigurationTask = task.define('generate-vscode-configurati
 	});
 });
 
-const allConfigDetailsPath = path.join(os.tmpdir(), 'configuration.json');
+// {{SQL CARBON EDIT}}
-gulp.task(task.define(
+// Install service locally before building carbon
-	'upload-vscode-configuration',
-	task.series(
-		generateVSCodeConfigurationTask,
-		() => {
-			if (!shouldSetupSettingsSearch()) {
-				const branch = process.env.BUILD_SOURCEBRANCH;
-				console.log(`Only runs on master and release branches, not ${branch}`);
-				return;
-			}
 
-			if (!fs.existsSync(allConfigDetailsPath)) {
+function installService() {
-				throw new Error(`configuration file at ${allConfigDetailsPath} does not exist`);
+	let config = require('../extensions/mssql/src/config.json');
-			}
+	return platformInfo.getCurrent().then(p => {
-
+		let runtime = p.runtimeId;
-			const settingsSearchBuildId = getSettingsSearchBuildId(packageJson);
+		// fix path since it won't be correct
-			if (!settingsSearchBuildId) {
+		config.installDirectory = path.join(__dirname, '../extensions/mssql/src', config.installDirectory);
-				throw new Error('Failed to compute build number');
+		var installer = new serviceDownloader(config);
-			}
+		let serviceInstallFolder = installer.getInstallDirectory(runtime);
-
+		console.log('Cleaning up the install folder: ' + serviceInstallFolder);
-			return gulp.src(allConfigDetailsPath)
+		return del(serviceInstallFolder + '/*').then(() => {
-				.pipe(azure.upload({
+			console.log('Installing the service. Install folder: ' + serviceInstallFolder);
-					account: process.env.AZURE_STORAGE_ACCOUNT,
+			return installer.installService(runtime);
-					key: process.env.AZURE_STORAGE_ACCESS_KEY,
+		}, delError => {
-					container: 'configuration',
+			console.log('failed to delete the install folder error: ' + delError);
-					prefix: `${settingsSearchBuildId}/${commit}/`
+		});
-				}));
+	});
-		}
-	)
-));
-
-function shouldSetupSettingsSearch() {
-	const branch = process.env.BUILD_SOURCEBRANCH;
-	return branch && (/\/master$/.test(branch) || branch.indexOf('/release/') >= 0);
 }
 
-function getSettingsSearchBuildId(packageJson) {
+gulp.task('install-sqltoolsservice', () => {
-	try {
+	return installService();
-		const branch = process.env.BUILD_SOURCEBRANCH;
+});
-		const branchId = branch.indexOf('/release/') >= 0 ? 0 :
-			/\/master$/.test(branch) ? 1 :
-				2; // Some unexpected branch
-
-		const out = cp.execSync(`git rev-list HEAD --count`);
-		const count = parseInt(out.toString());
-
-		// <version number><commit count><branchId (avoid unlikely conflicts)>
-		// 1.25.1, 1,234,567 commits, master = 1250112345671
-		return util.versionStringToNumber(packageJson.version) * 1e8 + count * 10 + branchId;
-	} catch (e) {
-		throw new Error('Could not determine build number: ' + e.toString());
-	}
-}

build/gulpfile.vscode.linux.js

@@ -12,22 +12,18 @@ const shell = require('gulp-shell');
 const es = require('event-stream');
 const vfs = require('vinyl-fs');
 const util = require('./lib/util');
-const task = require('./lib/task');
 const packageJson = require('../package.json');
 const product = require('../product.json');
 const rpmDependencies = require('../resources/linux/rpm/dependencies.json');
-const path = require('path');
-const root = path.dirname(__dirname);
-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', ia32: 'i386', arm: 'armhf', arm64: "arm64" }[arch];
 }
 
 function prepareDebPackage(arch) {
-	// {{SQL CARBON EDIT}}
+  // {{SQL CARBON EDIT}}
 	const binaryDir = '../azuredatastudio-linux-' + arch;
 	const debArch = getDebPackageArch(arch);
 	const destination = '.build/linux/deb/' + debArch + '/' + product.applicationName + '-' + debArch;
@@ -43,7 +39,7 @@ function prepareDebPackage(arch) {
 			.pipe(replace('@@NAME_LONG@@', product.nameLong))
 			.pipe(replace('@@NAME_SHORT@@', product.nameShort))
 			.pipe(replace('@@NAME@@', product.applicationName))
-			.pipe(replace('@@ICON@@', product.linuxIconName))
+			.pipe(replace('@@ICON@@', product.applicationName))
 			.pipe(replace('@@URLPROTOCOL@@', product.urlProtocol));
 
 		const appdata = gulp.src('resources/linux/code.appdata.xml', { base: '.' })
@@ -53,15 +49,7 @@ function prepareDebPackage(arch) {
 			.pipe(rename('usr/share/appdata/' + product.applicationName + '.appdata.xml'));
 
 		const icon = gulp.src('resources/linux/code.png', { base: '.' })
-			.pipe(rename('usr/share/pixmaps/' + product.linuxIconName + '.png'));
+			.pipe(rename('usr/share/pixmaps/' + product.applicationName + '.png'));
-
-		const bash_completion = gulp.src('resources/completions/bash/code')
-			.pipe(replace('@@APPNAME@@', product.applicationName))
-			.pipe(rename('usr/share/bash-completion/completions/' + product.applicationName));
-
-		const zsh_completion = gulp.src('resources/completions/zsh/_code')
-			.pipe(replace('@@APPNAME@@', product.applicationName))
-			.pipe(rename('usr/share/zsh/vendor-completions/_' + product.applicationName));
 
 		const code = gulp.src(binaryDir + '/**/*', { base: binaryDir })
 			.pipe(rename(function (p) { p.dirname = 'usr/share/' + product.applicationName + '/' + p.dirname; }));
@@ -97,7 +85,7 @@ function prepareDebPackage(arch) {
 			.pipe(replace('@@UPDATEURL@@', product.updateUrl || '@@UPDATEURL@@'))
 			.pipe(rename('DEBIAN/postinst'));
 
-		const all = es.merge(control, postinst, postrm, prerm, desktops, appdata, icon, bash_completion, zsh_completion, code);
+		const all = es.merge(control, postinst, postrm, prerm, desktops, appdata, icon, code);
 
 		return all.pipe(vfs.dest(destination));
 	};
@@ -117,7 +105,7 @@ function getRpmBuildPath(rpmArch) {
 }
 
 function getRpmPackageArch(arch) {
-	return { x64: 'x86_64', arm: 'armhf', arm64: "arm64" }[arch];
+	return { x64: 'x86_64', ia32: 'i386', arm: 'armhf', arm64: "arm64" }[arch];
 }
 
 function prepareRpmPackage(arch) {
@@ -136,7 +124,7 @@ function prepareRpmPackage(arch) {
 			.pipe(replace('@@NAME_LONG@@', product.nameLong))
 			.pipe(replace('@@NAME_SHORT@@', product.nameShort))
 			.pipe(replace('@@NAME@@', product.applicationName))
-			.pipe(replace('@@ICON@@', product.linuxIconName))
+			.pipe(replace('@@ICON@@', product.applicationName))
 			.pipe(replace('@@URLPROTOCOL@@', product.urlProtocol));
 
 		const appdata = gulp.src('resources/linux/code.appdata.xml', { base: '.' })
@@ -146,15 +134,7 @@ function prepareRpmPackage(arch) {
 			.pipe(rename('usr/share/appdata/' + product.applicationName + '.appdata.xml'));
 
 		const icon = gulp.src('resources/linux/code.png', { base: '.' })
-			.pipe(rename('BUILD/usr/share/pixmaps/' + product.linuxIconName + '.png'));
+			.pipe(rename('BUILD/usr/share/pixmaps/' + product.applicationName + '.png'));
-
-		const bash_completion = gulp.src('resources/completions/bash/code')
-			.pipe(replace('@@APPNAME@@', product.applicationName))
-			.pipe(rename('BUILD/usr/share/bash-completion/completions/' + product.applicationName));
-
-		const zsh_completion = gulp.src('resources/completions/zsh/_code')
-			.pipe(replace('@@APPNAME@@', product.applicationName))
-			.pipe(rename('BUILD/usr/share/zsh/site-functions/_' + product.applicationName));
 
 		const code = gulp.src(binaryDir + '/**/*', { base: binaryDir })
 			.pipe(rename(function (p) { p.dirname = 'BUILD/usr/share/' + product.applicationName + '/' + p.dirname; }));
@@ -162,7 +142,6 @@ function prepareRpmPackage(arch) {
 		const spec = gulp.src('resources/linux/rpm/code.spec.template', { base: '.' })
 			.pipe(replace('@@NAME@@', product.applicationName))
 			.pipe(replace('@@NAME_LONG@@', product.nameLong))
-			.pipe(replace('@@ICON@@', product.linuxIconName))
 			.pipe(replace('@@VERSION@@', packageJson.version))
 			.pipe(replace('@@RELEASE@@', linuxPackageRevision))
 			.pipe(replace('@@ARCHITECTURE@@', rpmArch))
@@ -177,7 +156,7 @@ function prepareRpmPackage(arch) {
 		const specIcon = gulp.src('resources/linux/rpm/code.xpm', { base: '.' })
 			.pipe(rename('SOURCES/' + product.applicationName + '.xpm'));
 
-		const all = es.merge(code, desktops, appdata, icon, bash_completion, zsh_completion, spec, specIcon);
+		const all = es.merge(code, desktops, appdata, icon, spec, specIcon);
 
 		return all.pipe(vfs.dest(getRpmBuildPath(rpmArch)));
 	};
@@ -201,39 +180,36 @@ function getSnapBuildPath(arch) {
 }
 
 function prepareSnapPackage(arch) {
-	// {{SQL CARBON EDIT}}
+	const binaryDir = '../VSCode-linux-' + arch;
-	const binaryDir = '../azuredatastudio-linux-' + arch;
 	const destination = getSnapBuildPath(arch);
 
 	return function () {
 		const desktop = gulp.src('resources/linux/code.desktop', { base: '.' })
-			.pipe(rename(`usr/share/applications/${product.applicationName}.desktop`));
-
-		const desktopUrlHandler = gulp.src('resources/linux/code-url-handler.desktop', { base: '.' })
-			.pipe(rename(`usr/share/applications/${product.applicationName}-url-handler.desktop`));
-
-		const desktops = es.merge(desktop, desktopUrlHandler)
 			.pipe(replace('@@NAME_LONG@@', product.nameLong))
 			.pipe(replace('@@NAME_SHORT@@', product.nameShort))
 			.pipe(replace('@@NAME@@', product.applicationName))
-			.pipe(replace('@@ICON@@', `/usr/share/pixmaps/${product.linuxIconName}.png`))
+			.pipe(replace('@@ICON@@', `/usr/share/pixmaps/${product.applicationName}.png`))
-			.pipe(replace('@@URLPROTOCOL@@', product.urlProtocol));
+			.pipe(rename(`usr/share/applications/${product.applicationName}.desktop`));
 
 		const icon = gulp.src('resources/linux/code.png', { base: '.' })
-			.pipe(rename(`usr/share/pixmaps/${product.linuxIconName}.png`));
+			.pipe(rename(`usr/share/pixmaps/${product.applicationName}.png`));
 
 		const code = gulp.src(binaryDir + '/**/*', { base: binaryDir })
 			.pipe(rename(function (p) { p.dirname = `usr/share/${product.applicationName}/${p.dirname}`; }));
 
 		const snapcraft = gulp.src('resources/linux/snap/snapcraft.yaml', { base: '.' })
 			.pipe(replace('@@NAME@@', product.applicationName))
-			.pipe(replace('@@VERSION@@', commit.substr(0, 8)))
+			.pipe(replace('@@VERSION@@', `${packageJson.version}-${linuxPackageRevision}`))
 			.pipe(rename('snap/snapcraft.yaml'));
 
+		const snapUpdate = gulp.src('resources/linux/snap/snapUpdate.sh', { base: '.' })
+			.pipe(replace('@@NAME@@', product.applicationName))
+			.pipe(rename(`usr/share/${product.applicationName}/snapUpdate.sh`));
+
 		const electronLaunch = gulp.src('resources/linux/snap/electron-launch', { base: '.' })
 			.pipe(rename('electron-launch'));
 
-		const all = es.merge(desktops, icon, code, snapcraft, electronLaunch);
+		const all = es.merge(desktop, icon, code, snapcraft, electronLaunch, snapUpdate);
 
 		return all.pipe(vfs.dest(destination));
 	};
@@ -244,35 +220,116 @@ function buildSnapPackage(arch) {
 	return shell.task(`cd ${snapBuildPath} && snapcraft build`);
 }
 
-const BUILD_TARGETS = [
+function getFlatpakArch(arch) {
-	{ arch: 'x64' },
+	return { x64: 'x86_64', ia32: 'i386', arm: 'arm' }[arch];
-	{ arch: 'arm' },
+}
-	{ arch: 'arm64' },
-];
 
-BUILD_TARGETS.forEach((buildTarget) => {
+function prepareFlatpak(arch) {
-	const arch = buildTarget.arch;
+  // {{SQL CARBON EDIT}}
+	const binaryDir = '../azuredatastudio-linux-' + arch;
+	const flatpakArch = getFlatpakArch(arch);
+	const destination = '.build/linux/flatpak/' + flatpakArch;
 
-	{
+	return function () {
-		const debArch = getDebPackageArch(arch);
+		// This is not imported in the global scope to avoid requiring ImageMagick
-		const prepareDebTask = task.define(`vscode-linux-${arch}-prepare-deb`, task.series(util.rimraf(`.build/linux/deb/${debArch}`), prepareDebPackage(arch)));
+		// (or GraphicsMagick) when not building building Flatpak bundles.
-		// gulp.task(prepareDebTask);
+		const imgResize = require('gulp-image-resize');
-		const buildDebTask = task.define(`vscode-linux-${arch}-build-deb`, task.series(prepareDebTask, buildDebPackage(arch)));
+
-		gulp.task(buildDebTask);
+		const all = [16, 24, 32, 48, 64, 128, 192, 256, 512].map(function (size) {
+			return gulp.src('resources/linux/code.png', { base: '.' })
+				.pipe(imgResize({ width: size, height: size, format: "png", noProfile: true }))
+				.pipe(rename('share/icons/hicolor/' + size + 'x' + size + '/apps/' + flatpakManifest.appId + '.png'));
+		});
+
+		all.push(gulp.src('resources/linux/code.desktop', { base: '.' })
+			.pipe(replace('Exec=/usr/share/@@NAME@@/@@NAME@@', 'Exec=' + product.applicationName))
+			.pipe(replace('@@NAME_LONG@@', product.nameLong))
+			.pipe(replace('@@NAME_SHORT@@', product.nameShort))
+			.pipe(replace('@@NAME@@', product.applicationName))
+			.pipe(rename('share/applications/' + flatpakManifest.appId + '.desktop')));
+
+		all.push(gulp.src('resources/linux/code.appdata.xml', { base: '.' })
+			.pipe(replace('@@NAME_LONG@@', product.nameLong))
+			.pipe(replace('@@NAME@@', flatpakManifest.appId))
+			.pipe(replace('@@LICENSE@@', product.licenseName))
+			.pipe(rename('share/appdata/' + flatpakManifest.appId + '.appdata.xml')));
+
+		all.push(gulp.src(binaryDir + '/**/*', { base: binaryDir })
+			.pipe(rename(function (p) {
+				p.dirname = 'share/' + product.applicationName + '/' + p.dirname;
+			})));
+
+		return es.merge(all).pipe(vfs.dest(destination));
+	};
+}
+
+function buildFlatpak(arch) {
+	const flatpakArch = getFlatpakArch(arch);
+	const manifest = {};
+	for (var k in flatpakManifest) {
+		manifest[k] = flatpakManifest[k];
 	}
-
+	manifest.files = [
-	{
+		['.build/linux/flatpak/' + flatpakArch, '/'],
-		const rpmArch = getRpmPackageArch(arch);
+	];
-		const prepareRpmTask = task.define(`vscode-linux-${arch}-prepare-rpm`, task.series(util.rimraf(`.build/linux/rpm/${rpmArch}`), prepareRpmPackage(arch)));
+	const buildOptions = {
-		// gulp.task(prepareRpmTask);
+		arch: flatpakArch,
-		const buildRpmTask = task.define(`vscode-linux-${arch}-build-rpm`, task.series(prepareRpmTask, buildRpmPackage(arch)));
+		subject: product.nameLong + ' ' + packageJson.version + '.' + linuxPackageRevision,
-		gulp.task(buildRpmTask);
+	};
+	// If requested, use the configured path for the OSTree repository.
+	if (process.env.FLATPAK_REPO) {
+		buildOptions.repoDir = process.env.FLATPAK_REPO;
+	} else {
+		buildOptions.bundlePath = manifest.appId + '-' + flatpakArch + '.flatpak';
 	}
-
+	// Setup PGP signing if requested.
-	{
+	if (process.env.GPG_KEY_ID !== undefined) {
-		const prepareSnapTask = task.define(`vscode-linux-${arch}-prepare-snap`, task.series(util.rimraf(`.build/linux/snap/${arch}`), prepareSnapPackage(arch)));
+		buildOptions.gpgSign = process.env.GPG_KEY_ID;
-		gulp.task(prepareSnapTask);
+		if (process.env.GPG_HOMEDIR) {
-		const buildSnapTask = task.define(`vscode-linux-${arch}-build-snap`, task.series(prepareSnapTask, buildSnapPackage(arch)));
+			buildOptions.gpgHomedir = process.env.GPG_HOME_DIR;
-		gulp.task(buildSnapTask);
+		}
 	}
-});
+	return function (cb) {
+		require('flatpak-bundler').bundle(manifest, buildOptions, cb);
+	};
+}
+
+gulp.task('clean-vscode-linux-ia32-deb', util.rimraf('.build/linux/deb/i386'));
+gulp.task('clean-vscode-linux-x64-deb', util.rimraf('.build/linux/deb/amd64'));
+gulp.task('clean-vscode-linux-arm-deb', util.rimraf('.build/linux/deb/armhf'));
+gulp.task('clean-vscode-linux-arm64-deb', util.rimraf('.build/linux/deb/arm64'));
+gulp.task('clean-vscode-linux-ia32-rpm', util.rimraf('.build/linux/rpm/i386'));
+gulp.task('clean-vscode-linux-x64-rpm', util.rimraf('.build/linux/rpm/x86_64'));
+gulp.task('clean-vscode-linux-arm-rpm', util.rimraf('.build/linux/rpm/armhf'));
+gulp.task('clean-vscode-linux-arm64-rpm', util.rimraf('.build/linux/rpm/arm64'));
+gulp.task('clean-vscode-linux-ia32-snap', util.rimraf('.build/linux/snap/x64'));
+gulp.task('clean-vscode-linux-x64-snap', util.rimraf('.build/linux/snap/x64'));
+gulp.task('clean-vscode-linux-arm-snap', util.rimraf('.build/linux/snap/x64'));
+gulp.task('clean-vscode-linux-arm64-snap', util.rimraf('.build/linux/snap/x64'));
+
+gulp.task('vscode-linux-ia32-prepare-deb', ['clean-vscode-linux-ia32-deb'], prepareDebPackage('ia32'));
+gulp.task('vscode-linux-x64-prepare-deb', ['clean-vscode-linux-x64-deb'], prepareDebPackage('x64'));
+gulp.task('vscode-linux-arm-prepare-deb', ['clean-vscode-linux-arm-deb'], prepareDebPackage('arm'));
+gulp.task('vscode-linux-arm64-prepare-deb', ['clean-vscode-linux-arm64-deb'], prepareDebPackage('arm64'));
+gulp.task('vscode-linux-ia32-build-deb', ['vscode-linux-ia32-prepare-deb'], buildDebPackage('ia32'));
+gulp.task('vscode-linux-x64-build-deb', ['vscode-linux-x64-prepare-deb'], buildDebPackage('x64'));
+gulp.task('vscode-linux-arm-build-deb', ['vscode-linux-arm-prepare-deb'], buildDebPackage('arm'));
+gulp.task('vscode-linux-arm64-build-deb', ['vscode-linux-arm64-prepare-deb'], buildDebPackage('arm64'));
+
+gulp.task('vscode-linux-ia32-prepare-rpm', ['clean-vscode-linux-ia32-rpm'], prepareRpmPackage('ia32'));
+gulp.task('vscode-linux-x64-prepare-rpm', ['clean-vscode-linux-x64-rpm'], prepareRpmPackage('x64'));
+gulp.task('vscode-linux-arm-prepare-rpm', ['clean-vscode-linux-arm-rpm'], prepareRpmPackage('arm'));
+gulp.task('vscode-linux-arm64-prepare-rpm', ['clean-vscode-linux-arm64-rpm'], prepareRpmPackage('arm64'));
+gulp.task('vscode-linux-ia32-build-rpm', ['vscode-linux-ia32-prepare-rpm'], buildRpmPackage('ia32'));
+gulp.task('vscode-linux-x64-build-rpm', ['vscode-linux-x64-prepare-rpm'], buildRpmPackage('x64'));
+gulp.task('vscode-linux-arm-build-rpm', ['vscode-linux-arm-prepare-rpm'], buildRpmPackage('arm'));
+gulp.task('vscode-linux-arm64-build-rpm', ['vscode-linux-arm64-prepare-rpm'], buildRpmPackage('arm64'));
+
+gulp.task('vscode-linux-ia32-prepare-snap', ['clean-vscode-linux-ia32-snap'], prepareSnapPackage('ia32'));
+gulp.task('vscode-linux-x64-prepare-snap', ['clean-vscode-linux-x64-snap'], prepareSnapPackage('x64'));
+gulp.task('vscode-linux-arm-prepare-snap', ['clean-vscode-linux-arm-snap'], prepareSnapPackage('arm'));
+gulp.task('vscode-linux-arm64-prepare-snap', ['clean-vscode-linux-arm64-snap'], prepareSnapPackage('arm64'));
+gulp.task('vscode-linux-ia32-build-snap', ['vscode-linux-ia32-prepare-snap'], buildSnapPackage('ia32'));
+gulp.task('vscode-linux-x64-build-snap', ['vscode-linux-x64-prepare-snap'], buildSnapPackage('x64'));
+gulp.task('vscode-linux-arm-build-snap', ['vscode-linux-arm-prepare-snap'], buildSnapPackage('arm'));
+gulp.task('vscode-linux-arm64-build-snap', ['vscode-linux-arm64-prepare-snap'], buildSnapPackage('arm64'));

build/gulpfile.vscode.web.js

@@ -1,155 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-const gulp = require('gulp');
-const path = require('path');
-const es = require('event-stream');
-const util = require('./lib/util');
-const task = require('./lib/task');
-const common = require('./lib/optimize');
-const product = require('../product.json');
-const rename = require('gulp-rename');
-const filter = require('gulp-filter');
-const json = require('gulp-json-editor');
-const _ = require('underscore');
-const deps = require('./dependencies');
-const vfs = require('vinyl-fs');
-const packageJson = require('../package.json');
-const { compileBuildTask } = require('./gulpfile.compile');
-
-const REPO_ROOT = path.dirname(__dirname);
-const commit = util.getVersion(REPO_ROOT);
-const BUILD_ROOT = path.dirname(REPO_ROOT);
-const WEB_FOLDER = path.join(REPO_ROOT, 'remote', 'web');
-
-const productionDependencies = deps.getProductionDependencies(WEB_FOLDER);
-
-const nodeModules = Object.keys(product.dependencies || {})
-	.concat(_.uniq(productionDependencies.map(d => d.name)));
-
-const vscodeWebResources = [
-
-	// Workbench
-	'out-build/vs/{base,platform,editor,workbench}/**/*.{svg,png,html}',
-	'out-build/vs/base/browser/ui/octiconLabel/octicons/**',
-	'out-build/vs/**/markdown.css',
-
-	// Webview
-	'out-build/vs/workbench/contrib/webview/browser/pre/*.js',
-
-	// Extension Worker
-	'out-build/vs/workbench/services/extensions/worker/extensionHostWorkerMain.js',
-
-	// Excludes
-	'!out-build/vs/**/{node,electron-browser,electron-main}/**',
-	'!out-build/vs/editor/standalone/**',
-	'!out-build/vs/workbench/**/*-tb.png',
-	'!**/test/**'
-];
-
-const buildfile = require('../src/buildfile');
-
-const vscodeWebEntryPoints = [
-	buildfile.workbenchWeb,
-	buildfile.serviceWorker,
-	buildfile.workerExtensionHost,
-	buildfile.keyboardMaps,
-	buildfile.base
-];
-
-const optimizeVSCodeWebTask = task.define('optimize-vscode-web', task.series(
-	util.rimraf('out-vscode-web'),
-	common.optimizeTask({
-		src: 'out-build',
-		entryPoints: _.flatten(vscodeWebEntryPoints),
-		otherSources: [],
-		resources: vscodeWebResources,
-		loaderConfig: common.loaderConfig(nodeModules),
-		out: 'out-vscode-web',
-		bundleInfo: undefined
-	})
-));
-
-const minifyVSCodeWebTask = task.define('minify-vscode-web', task.series(
-	optimizeVSCodeWebTask,
-	util.rimraf('out-vscode-web-min'),
-	common.minifyTask('out-vscode-web', `https://ticino.blob.core.windows.net/sourcemaps/${commit}/core`)
-));
-gulp.task(minifyVSCodeWebTask);
-
-function packageTask(sourceFolderName, destinationFolderName) {
-	const destination = path.join(BUILD_ROOT, destinationFolderName);
-
-	return () => {
-		const src = gulp.src(sourceFolderName + '/**', { base: '.' })
-			.pipe(rename(function (path) { path.dirname = path.dirname.replace(new RegExp('^' + sourceFolderName), 'out'); }))
-			.pipe(filter(['**', '!**/*.js.map']));
-
-		const sources = es.merge(src);
-
-		let version = packageJson.version;
-		const quality = product.quality;
-
-		if (quality && quality !== 'stable') {
-			version += '-' + quality;
-		}
-
-		const name = product.nameShort;
-		const packageJsonStream = gulp.src(['remote/web/package.json'], { base: 'remote/web' })
-			.pipe(json({ name, version }));
-
-		const date = new Date().toISOString();
-
-		const productJsonStream = gulp.src(['product.json'], { base: '.' })
-			.pipe(json({ commit, date }));
-
-		const license = gulp.src(['remote/LICENSE'], { base: 'remote' });
-
-		const dependenciesSrc = _.flatten(productionDependencies.map(d => path.relative(REPO_ROOT, d.path)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`, `!${d}/.bin/**`]));
-
-		const deps = gulp.src(dependenciesSrc, { base: 'remote/web', dot: true })
-			.pipe(filter(['**', '!**/package-lock.json']))
-			.pipe(util.cleanNodeModules(path.join(__dirname, '.nativeignore')));
-
-		const favicon = gulp.src('resources/server/favicon.ico', { base: 'resources/server' });
-
-		let all = es.merge(
-			packageJsonStream,
-			productJsonStream,
-			license,
-			sources,
-			deps,
-			favicon
-		);
-
-		let result = all
-			.pipe(util.skipDirectories())
-			.pipe(util.fixWin32DirectoryPermissions());
-
-		return result.pipe(vfs.dest(destination));
-	};
-}
-
-const dashed = (str) => (str ? `-${str}` : ``);
-
-['', 'min'].forEach(minified => {
-	const sourceFolderName = `out-vscode-web${dashed(minified)}`;
-	const destinationFolderName = `vscode-web`;
-
-	const vscodeWebTaskCI = task.define(`vscode-web${dashed(minified)}-ci`, task.series(
-		minified ? minifyVSCodeWebTask : optimizeVSCodeWebTask,
-		util.rimraf(path.join(BUILD_ROOT, destinationFolderName)),
-		packageTask(sourceFolderName, destinationFolderName)
-	));
-	gulp.task(vscodeWebTaskCI);
-
-	const vscodeWebTask = task.define(`vscode-web${dashed(minified)}`, task.series(
-		compileBuildTask,
-		vscodeWebTaskCI
-	));
-	gulp.task(vscodeWebTask);
-});

build/gulpfile.vscode.win32.js

@@ -12,7 +12,6 @@ const assert = require('assert');
 const cp = require('child_process');
 const _7z = require('7zip')['7z'];
 const util = require('./lib/util');
-const task = require('./lib/task');
 const pkg = require('../package.json');
 const product = require('../product.json');
 const vfs = require('vinyl-fs');
@@ -26,7 +25,7 @@ const zipDir = arch => path.join(repoPath, '.build', `win32-${arch}`, 'archive')
 const zipPath = arch => path.join(zipDir(arch), `VSCode-win32-${arch}.zip`);
 const setupDir = (arch, target) => path.join(repoPath, '.build', `win32-${arch}`, `${target}-setup`);
 const issPath = path.join(__dirname, 'win32', 'code.iss');
-const innoSetupPath = path.join(path.dirname(path.dirname(require.resolve('innosetup'))), 'bin', 'ISCC.exe');
+const innoSetupPath = path.join(path.dirname(path.dirname(require.resolve('innosetup-compiler'))), 'bin', 'ISCC.exe');
 const signPS1 = path.join(repoPath, 'build', 'azure-pipelines', 'win32', 'sign.ps1');
 
 function packageInnoSetup(iss, options, cb) {
@@ -49,8 +48,9 @@ function packageInnoSetup(iss, options, cb) {
 	const defs = keys.map(key => `/d${key}=${definitions[key]}`);
 	const args = [
 		iss,
-		...defs,
+		...defs
-		`/sesrp=powershell.exe -ExecutionPolicy bypass ${signPS1} $f`
+		//,
+		//`/sesrp=powershell.exe -ExecutionPolicy bypass ${signPS1} $f`
 	];
 
 	cp.spawn(innoSetupPath, args, { stdio: ['ignore', 'inherit', 'inherit'] })
@@ -107,8 +107,8 @@ function buildWin32Setup(arch, target) {
 }
 
 function defineWin32SetupTasks(arch, target) {
-	const cleanTask = util.rimraf(setupDir(arch, target));
+	gulp.task(`clean-vscode-win32-${arch}-${target}-setup`, util.rimraf(setupDir(arch, target)));
-	gulp.task(task.define(`vscode-win32-${arch}-${target}-setup`, task.series(cleanTask, buildWin32Setup(arch, target))));
+	gulp.task(`vscode-win32-${arch}-${target}-setup`, [`clean-vscode-win32-${arch}-${target}-setup`], buildWin32Setup(arch, target));
 }
 
 defineWin32SetupTasks('ia32', 'system');
@@ -126,8 +126,11 @@ function archiveWin32Setup(arch) {
 	};
 }
 
-gulp.task(task.define('vscode-win32-ia32-archive', task.series(util.rimraf(zipDir('ia32')), archiveWin32Setup('ia32'))));
+gulp.task('clean-vscode-win32-ia32-archive', util.rimraf(zipDir('ia32')));
-gulp.task(task.define('vscode-win32-x64-archive', task.series(util.rimraf(zipDir('x64')), archiveWin32Setup('x64'))));
+gulp.task('vscode-win32-ia32-archive', ['clean-vscode-win32-ia32-archive'], archiveWin32Setup('ia32'));
+
+gulp.task('clean-vscode-win32-x64-archive', util.rimraf(zipDir('x64')));
+gulp.task('vscode-win32-x64-archive', ['clean-vscode-win32-x64-archive'], archiveWin32Setup('x64'));
 
 function copyInnoUpdater(arch) {
 	return () => {
@@ -136,17 +139,15 @@ function copyInnoUpdater(arch) {
 	};
 }
 
-function updateIcon(executablePath) {
+gulp.task('vscode-win32-ia32-copy-inno-updater', copyInnoUpdater('ia32'));
+gulp.task('vscode-win32-x64-copy-inno-updater', copyInnoUpdater('x64'));
+
+function patchInnoUpdater(arch) {
 	return cb => {
 		const icon = path.join(repoPath, 'resources', 'win32', 'code.ico');
-		rcedit(executablePath, { icon }, cb);
+		rcedit(path.join(buildPath(arch), 'tools', 'inno_updater.exe'), { icon }, cb);
 	};
 }
 
-gulp.task(task.define('vscode-win32-ia32-inno-updater', task.series(copyInnoUpdater('ia32'), updateIcon(path.join(buildPath('ia32'), 'tools', 'inno_updater.exe')))));
+gulp.task('vscode-win32-ia32-inno-updater', ['vscode-win32-ia32-copy-inno-updater'], patchInnoUpdater('ia32'));
-gulp.task(task.define('vscode-win32-x64-inno-updater', task.series(copyInnoUpdater('x64'), updateIcon(path.join(buildPath('x64'), 'tools', 'inno_updater.exe')))));
+gulp.task('vscode-win32-x64-inno-updater', ['vscode-win32-x64-copy-inno-updater'], patchInnoUpdater('x64'));
-
-// CodeHelper.exe icon
-
-gulp.task(task.define('vscode-win32-ia32-code-helper', task.series(updateIcon(path.join(buildPath('ia32'), 'resources', 'app', 'out', 'vs', 'platform', 'files', 'node', 'watcher', 'win32', 'CodeHelper.exe')))));
-gulp.task(task.define('vscode-win32-x64-code-helper', task.series(updateIcon(path.join(buildPath('x64'), 'resources', 'app', 'out', 'vs', 'platform', 'files', 'node', 'watcher', 'win32', 'CodeHelper.exe')))));

build/lib/builtInExtensions.js

@@ -14,13 +14,10 @@ const es = require('event-stream');
 const rename = require('gulp-rename');
 const vfs = require('vinyl-fs');
 const ext = require('./extensions');
-const fancyLog = require('fancy-log');
+const util = require('gulp-util');
-const ansiColors = require('ansi-colors');
 
 const root = path.dirname(path.dirname(__dirname));
-// {{SQL CARBON EDIT}}
+const builtInExtensions = require('../builtInExtensions.json');
-const builtInExtensions = require('../builtInExtensions-insiders.json');
-// {{SQL CARBON EDIT}} - END
 const controlFilePath = path.join(os.homedir(), '.vscode-oss-dev', 'extensions', 'control.json');
 
 function getExtensionPath(extension) {
@@ -46,7 +43,7 @@ function isUpToDate(extension) {
 
 function syncMarketplaceExtension(extension) {
 	if (isUpToDate(extension)) {
-		fancyLog(ansiColors.blue('[marketplace]'), `${extension.name}@${extension.version}`, ansiColors.green('✔︎'));
+		util.log(util.colors.blue('[marketplace]'), `${extension.name}@${extension.version}`, util.colors.green('✔︎'));
 		return es.readArray([]);
 	}
 
@@ -55,13 +52,13 @@ function syncMarketplaceExtension(extension) {
 	return ext.fromMarketplace(extension.name, extension.version, extension.metadata)
 		.pipe(rename(p => p.dirname = `${extension.name}/${p.dirname}`))
 		.pipe(vfs.dest('.build/builtInExtensions'))
-		.on('end', () => fancyLog(ansiColors.blue('[marketplace]'), extension.name, ansiColors.green('✔︎')));
+		.on('end', () => util.log(util.colors.blue('[marketplace]'), extension.name, util.colors.green('✔︎')));
 }
 
 function syncExtension(extension, controlState) {
 	switch (controlState) {
 		case 'disabled':
-			fancyLog(ansiColors.blue('[disabled]'), ansiColors.gray(extension.name));
+			util.log(util.colors.blue('[disabled]'), util.colors.gray(extension.name));
 			return es.readArray([]);
 
 		case 'marketplace':
@@ -69,15 +66,15 @@ function syncExtension(extension, controlState) {
 
 		default:
 			if (!fs.existsSync(controlState)) {
-				fancyLog(ansiColors.red(`Error: Built-in extension '${extension.name}' is configured to run from '${controlState}' but that path does not exist.`));
+				util.log(util.colors.red(`Error: Built-in extension '${extension.name}' is configured to run from '${controlState}' but that path does not exist.`));
 				return es.readArray([]);
 
 			} else if (!fs.existsSync(path.join(controlState, 'package.json'))) {
-				fancyLog(ansiColors.red(`Error: Built-in extension '${extension.name}' is configured to run from '${controlState}' but there is no 'package.json' file in that directory.`));
+				util.log(util.colors.red(`Error: Built-in extension '${extension.name}' is configured to run from '${controlState}' but there is no 'package.json' file in that directory.`));
 				return es.readArray([]);
 			}
 
-			fancyLog(ansiColors.blue('[local]'), `${extension.name}: ${ansiColors.cyan(controlState)}`, ansiColors.green('✔︎'));
+			util.log(util.colors.blue('[local]'), `${extension.name}: ${util.colors.cyan(controlState)}`, util.colors.green('✔︎'));
 			return es.readArray([]);
 	}
 }
@@ -96,8 +93,8 @@ function writeControlFile(control) {
 }
 
 function main() {
-	fancyLog('Syncronizing built-in extensions...');
+	util.log('Syncronizing built-in extensions...');
-	fancyLog(`You can manage built-in extensions with the ${ansiColors.cyan('--builtin')} flag`);
+	util.log(`You can manage built-in extensions with the ${util.colors.cyan('--builtin')} flag`);
 
 	const control = readControlFile();
 	const streams = [];

build/lib/compilation.js

@@ -16,8 +16,7 @@ const monacodts = require("../monaco/api");
 const nls = require("./nls");
 const reporter_1 = require("./reporter");
 const util = require("./util");
-const fancyLog = require("fancy-log");
+const util2 = require("gulp-util");
-const ansiColors = require("ansi-colors");
 const watch = require('./watch');
 const reporter = reporter_1.createReporter();
 function getTypeScriptCompilerOptions(src) {
@@ -112,6 +111,7 @@ class MonacoGenerator {
         this._executeSoonTimer = null;
         this._isWatch = isWatch;
         this.stream = es.through();
+        this._watchers = [];
         this._watchedFiles = {};
         let onWillReadFile = (moduleId, filePath) => {
             if (!this._isWatch) {
@@ -121,10 +121,12 @@ class MonacoGenerator {
                 return;
             }
             this._watchedFiles[filePath] = true;
-            fs.watchFile(filePath, () => {
+            const watcher = fs.watch(filePath);
+            watcher.addListener('change', () => {
                 this._declarationResolver.invalidateCache(moduleId);
                 this._executeSoon();
             });
+            this._watchers.push(watcher);
         };
         this._fsProvider = new class extends monacodts.FSProvider {
             readFileSync(moduleId, filePath) {
@@ -134,9 +136,11 @@ class MonacoGenerator {
         };
         this._declarationResolver = new monacodts.DeclarationResolver(this._fsProvider);
         if (this._isWatch) {
-            fs.watchFile(monacodts.RECIPE_PATH, () => {
+            const recipeWatcher = fs.watch(monacodts.RECIPE_PATH);
+            recipeWatcher.addListener('change', () => {
                 this._executeSoon();
             });
+            this._watchers.push(recipeWatcher);
         }
     }
     _executeSoon() {
@@ -149,6 +153,9 @@ class MonacoGenerator {
             this.execute();
         }, 20);
     }
+    dispose() {
+        this._watchers.forEach(watcher => watcher.close());
+    }
     _run() {
         let r = monacodts.run3(this._declarationResolver);
         if (!r && !this._isWatch) {
@@ -158,7 +165,7 @@ class MonacoGenerator {
         return r;
     }
     _log(message, ...rest) {
-        fancyLog(ansiColors.cyan('[monaco.d.ts]'), message, ...rest);
+        util2.log(util2.colors.cyan('[monaco.d.ts]'), message, ...rest);
     }
     execute() {
         const startTime = Date.now();

build/lib/compilation.ts

@@ -17,9 +17,7 @@ import * as monacodts from '../monaco/api';
 import * as nls from './nls';
 import { createReporter } from './reporter';
 import * as util from './util';
-import * as fancyLog from 'fancy-log';
+import * as util2 from 'gulp-util';
-import * as ansiColors from 'ansi-colors';
-
 const watch = require('./watch');
 
 const reporter = createReporter();
@@ -137,6 +135,7 @@ class MonacoGenerator {
 	private readonly _isWatch: boolean;
 	public readonly stream: NodeJS.ReadWriteStream;
 
+	private readonly _watchers: fs.FSWatcher[];
 	private readonly _watchedFiles: { [filePath: string]: boolean; };
 	private readonly _fsProvider: monacodts.FSProvider;
 	private readonly _declarationResolver: monacodts.DeclarationResolver;
@@ -144,6 +143,7 @@ class MonacoGenerator {
 	constructor(isWatch: boolean) {
 		this._isWatch = isWatch;
 		this.stream = es.through();
+		this._watchers = [];
 		this._watchedFiles = {};
 		let onWillReadFile = (moduleId: string, filePath: string) => {
 			if (!this._isWatch) {
@@ -154,10 +154,12 @@ class MonacoGenerator {
 			}
 			this._watchedFiles[filePath] = true;
 
-			fs.watchFile(filePath, () => {
+			const watcher = fs.watch(filePath);
+			watcher.addListener('change', () => {
 				this._declarationResolver.invalidateCache(moduleId);
 				this._executeSoon();
 			});
+			this._watchers.push(watcher);
 		};
 		this._fsProvider = new class extends monacodts.FSProvider {
 			public readFileSync(moduleId: string, filePath: string): Buffer {
@@ -168,9 +170,11 @@ class MonacoGenerator {
 		this._declarationResolver = new monacodts.DeclarationResolver(this._fsProvider);
 
 		if (this._isWatch) {
-			fs.watchFile(monacodts.RECIPE_PATH, () => {
+			const recipeWatcher = fs.watch(monacodts.RECIPE_PATH);
+			recipeWatcher.addListener('change', () => {
 				this._executeSoon();
 			});
+			this._watchers.push(recipeWatcher);
 		}
 	}
 
@@ -186,6 +190,10 @@ class MonacoGenerator {
 		}, 20);
 	}
 
+	public dispose(): void {
+		this._watchers.forEach(watcher => watcher.close());
+	}
+
 	private _run(): monacodts.IMonacoDeclarationResult | null {
 		let r = monacodts.run3(this._declarationResolver);
 		if (!r && !this._isWatch) {
@@ -196,7 +204,7 @@ class MonacoGenerator {
 	}
 
 	private _log(message: any, ...rest: any[]): void {
-		fancyLog(ansiColors.cyan('[monaco.d.ts]'), message, ...rest);
+		util2.log(util2.colors.cyan('[monaco.d.ts]'), message, ...rest);
 	}
 
 	public execute(): void {

build/lib/electron.js

@@ -24,7 +24,7 @@ module.exports.getElectronVersion = getElectronVersion;
 if (require.main === module) {
 	const version = getElectronVersion();
 	const versionFile = path.join(root, '.build', 'electron', 'version');
-	const isUpToDate = fs.existsSync(versionFile) && fs.readFileSync(versionFile, 'utf8') === `${version}`;
+	const isUpToDate = fs.existsSync(versionFile) && fs.readFileSync(versionFile, 'utf8') === `v${version}`;
 
 	process.exit(isUpToDate ? 0 : 1);
 }

build/lib/extensions.js

@@ -13,36 +13,83 @@ const File = require("vinyl");
 const vsce = require("vsce");
 const stats_1 = require("./stats");
 const util2 = require("./util");
-const remote = require("gulp-remote-retry-src");
+const remote = require("gulp-remote-src");
 const vzip = require('gulp-vinyl-zip');
 const filter = require("gulp-filter");
 const rename = require("gulp-rename");
-const fancyLog = require("fancy-log");
+const util = require('gulp-util');
-const ansiColors = require("ansi-colors");
 const buffer = require('gulp-buffer');
 const json = require("gulp-json-editor");
 const webpack = require('webpack');
 const webpackGulp = require('webpack-stream');
-const util = require('./util');
+const root = path.resolve(path.join(__dirname, '..', '..'));
-const root = path.dirname(path.dirname(__dirname));
+// {{SQL CARBON EDIT}}
-const commit = util.getVersion(root);
+const _ = require("underscore");
-const sourceMappingURLBase = `https://ticino.blob.core.windows.net/sourcemaps/${commit}`;
+const vfs = require("vinyl-fs");
-function fromLocal(extensionPath) {
+const deps = require('../dependencies');
-    const webpackFilename = path.join(extensionPath, 'extension.webpack.config.js');
+const extensionsRoot = path.join(root, 'extensions');
-    const input = fs.existsSync(webpackFilename)
+const extensionsProductionDependencies = deps.getProductionDependencies(extensionsRoot);
-        ? fromLocalWebpack(extensionPath)
+function packageBuiltInExtensions() {
-        : fromLocalNormal(extensionPath);
+    const sqlBuiltInLocalExtensionDescriptions = glob.sync('extensions/*/package.json')
-    const tmLanguageJsonFilter = filter('**/*.tmLanguage.json', { restore: true });
+        .map(manifestPath => {
-    return input
+        const extensionPath = path.dirname(path.join(root, manifestPath));
-        .pipe(tmLanguageJsonFilter)
+        const extensionName = path.basename(extensionPath);
-        .pipe(buffer())
+        return { name: extensionName, path: extensionPath };
-        .pipe(es.mapSync((f) => {
+    })
-        f.contents = Buffer.from(JSON.stringify(JSON.parse(f.contents.toString('utf8'))));
+        .filter(({ name }) => excludedExtensions.indexOf(name) === -1)
-        return f;
+        .filter(({ name }) => builtInExtensions.every(b => b.name !== name))
-    }))
+        .filter(({ name }) => sqlBuiltInExtensions.indexOf(name) >= 0);
-        .pipe(tmLanguageJsonFilter.restore);
+    sqlBuiltInLocalExtensionDescriptions.forEach(element => {
+        const packagePath = path.join(path.dirname(root), element.name + '.vsix');
+        console.info('Creating vsix for ' + element.path + ' result:' + packagePath);
+        vsce.createVSIX({
+            cwd: element.path,
+            packagePath: packagePath,
+            useYarn: true
+        });
+    });
 }
-function fromLocalWebpack(extensionPath) {
+exports.packageBuiltInExtensions = packageBuiltInExtensions;
+function packageExtensionTask(extensionName, platform, arch) {
+    var destination = path.join(path.dirname(root), 'azuredatastudio') + (platform ? '-' + platform : '') + (arch ? '-' + arch : '');
+    if (platform === 'darwin') {
+        destination = path.join(destination, 'Azure Data Studio.app', 'Contents', 'Resources', 'app', 'extensions', extensionName);
+    }
+    else {
+        destination = path.join(destination, 'resources', 'app', 'extensions', extensionName);
+    }
+    platform = platform || process.platform;
+    return () => {
+        const root = path.resolve(path.join(__dirname, '../..'));
+        const localExtensionDescriptions = glob.sync('extensions/*/package.json')
+            .map(manifestPath => {
+            const extensionPath = path.dirname(path.join(root, manifestPath));
+            const extensionName = path.basename(extensionPath);
+            return { name: extensionName, path: extensionPath };
+        })
+            .filter(({ name }) => extensionName === name);
+        const localExtensions = es.merge(...localExtensionDescriptions.map(extension => {
+            return fromLocal(extension.path);
+        }));
+        let result = localExtensions
+            .pipe(util2.skipDirectories())
+            .pipe(util2.fixWin32DirectoryPermissions())
+            .pipe(filter(['**', '!LICENSE', '!LICENSES.chromium.html', '!version']));
+        return result.pipe(vfs.dest(destination));
+    };
+}
+exports.packageExtensionTask = packageExtensionTask;
+// {{SQL CARBON EDIT}} - End
+function fromLocal(extensionPath, sourceMappingURLBase) {
+    const webpackFilename = path.join(extensionPath, 'extension.webpack.config.js');
+    if (fs.existsSync(webpackFilename)) {
+        return fromLocalWebpack(extensionPath, sourceMappingURLBase);
+    }
+    else {
+        return fromLocalNormal(extensionPath);
+    }
+}
+function fromLocalWebpack(extensionPath, sourceMappingURLBase) {
     const result = es.through();
     const packagedDependencies = [];
     const packageJsonConfig = require(path.join(extensionPath, 'package.json'));
@@ -87,9 +134,9 @@ function fromLocalWebpack(extensionPath) {
             return data;
         }))
             .pipe(packageJsonFilter.restore);
-        const webpackStreams = webpackConfigLocations.map(webpackConfigPath => {
+        const webpackStreams = webpackConfigLocations.map(webpackConfigPath => () => {
             const webpackDone = (err, stats) => {
-                fancyLog(`Bundled extension: ${ansiColors.yellow(path.join(path.basename(extensionPath), path.relative(extensionPath, webpackConfigPath)))}...`);
+                util.log(`Bundled extension: ${util.colors.yellow(path.join(path.basename(extensionPath), path.relative(extensionPath, webpackConfigPath)))}...`);
                 if (err) {
                     result.emit('error', err);
                 }
@@ -113,14 +160,22 @@ function fromLocalWebpack(extensionPath) {
                 // source map handling:
                 // * rewrite sourceMappingURL
                 // * save to disk so that upload-task picks this up
-                const contents = data.contents.toString('utf8');
+                if (sourceMappingURLBase) {
-                data.contents = Buffer.from(contents.replace(/\n\/\/# sourceMappingURL=(.*)$/gm, function (_m, g1) {
+                    const contents = data.contents.toString('utf8');
-                    return `\n//# sourceMappingURL=${sourceMappingURLBase}/extensions/${path.basename(extensionPath)}/${relativeOutputPath}/${g1}`;
+                    data.contents = Buffer.from(contents.replace(/\n\/\/# sourceMappingURL=(.*)$/gm, function (_m, g1) {
-                }), 'utf8');
+                        return `\n//# sourceMappingURL=${sourceMappingURLBase}/extensions/${path.basename(extensionPath)}/${relativeOutputPath}/${g1}`;
+                    }), 'utf8');
+                    if (/\.js\.map$/.test(data.path)) {
+                        if (!fs.existsSync(path.dirname(data.path))) {
+                            fs.mkdirSync(path.dirname(data.path));
+                        }
+                        fs.writeFileSync(data.path, data.contents);
+                    }
+                }
                 this.emit('data', data);
             }));
         });
-        es.merge(...webpackStreams, patchFilesStream)
+        es.merge(sequence(webpackStreams), patchFilesStream)
             // .pipe(es.through(function (data) {
             // 	// debug
             // 	console.log('out', data.path, data.contents.length);
@@ -157,10 +212,9 @@ const baseHeaders = {
     'X-Market-User-Id': '291C1CD0-051A-4123-9B4B-30D60EF52EE2',
 };
 function fromMarketplace(extensionName, version, metadata) {
-    // {{SQL CARBON EDIT}}
+    const [publisher, name] = extensionName.split('.');
-    const [, name] = extensionName.split('.');
+    const url = `https://marketplace.visualstudio.com/_apis/public/gallery/publishers/${publisher}/vsextensions/${name}/${version}/vspackage`;
-    const url = `https://sqlopsextensions.blob.core.windows.net/extensions/${name}/${name}-${version}.vsix`;
+    util.log('Downloading extension:', util.colors.yellow(`${extensionName}@${version}`), '...');
-    fancyLog('Downloading extension:', ansiColors.yellow(`${extensionName}@${version}`), '...');
     const options = {
         base: url,
         requestOptions: {
@@ -182,7 +236,6 @@ exports.fromMarketplace = fromMarketplace;
 const excludedExtensions = [
     'vscode-api-tests',
     'vscode-colorize-tests',
-    'vscode-test-resolver',
     'ms-vscode.node-debug',
     'ms-vscode.node-debug2',
     // {{SQL CARBON EDIT}}
@@ -192,24 +245,39 @@ const excludedExtensions = [
 const sqlBuiltInExtensions = [
     // Add SQL built-in extensions here.
     // the extension will be excluded from SQLOps package and will have separate vsix packages
-    'admin-tool-ext-win',
     'agent',
     'import',
     'profiler',
     'admin-pack',
-    'dacpac',
+    'big-data-cluster',
-    'schema-compare',
+    'dacpac'
-    'cms',
-    'query-history'
 ];
-// make resource deployment and BDC extension only available in insiders
+var azureExtensions = ['azurecore', 'mssql'];
-if (process.env['VSCODE_QUALITY'] === 'stable') {
+const builtInExtensions = require('../builtInExtensions.json');
-    sqlBuiltInExtensions.push('resource-deployment');
+/**
-    sqlBuiltInExtensions.push('big-data-cluster');
+ * We're doing way too much stuff at once, with webpack et al. So much stuff
+ * that while downloading extensions from the marketplace, node js doesn't get enough
+ * stack frames to complete the download in under 2 minutes, at which point the
+ * marketplace server cuts off the http request. So, we sequentialize the extensino tasks.
+ */
+function sequence(streamProviders) {
+    const result = es.through();
+    function pop() {
+        if (streamProviders.length === 0) {
+            result.emit('end');
+        }
+        else {
+            const fn = streamProviders.shift();
+            fn()
+                .on('end', function () { setTimeout(pop, 0); })
+                .pipe(result, { end: false });
+        }
+    }
+    pop();
+    return result;
 }
-const builtInExtensions = process.env['VSCODE_QUALITY'] === 'stable' ? require('../builtInExtensions.json') : require('../builtInExtensions-insiders.json');
+function packageExtensionsStream(optsIn) {
-// {{SQL CARBON EDIT}} - End
+    const opts = optsIn || {};
-function packageLocalExtensionsStream() {
     const localExtensionDescriptions = glob.sync('extensions/*/package.json')
         .map(manifestPath => {
         const extensionPath = path.dirname(path.join(root, manifestPath));
@@ -217,86 +285,36 @@ function packageLocalExtensionsStream() {
         return { name: extensionName, path: extensionPath };
     })
         .filter(({ name }) => excludedExtensions.indexOf(name) === -1)
+        .filter(({ name }) => opts.desiredExtensions ? opts.desiredExtensions.indexOf(name) >= 0 : true)
         .filter(({ name }) => builtInExtensions.every(b => b.name !== name))
-        .filter(({ name }) => sqlBuiltInExtensions.indexOf(name) === -1); // {{SQL CARBON EDIT}} add aditional filter
+        // {{SQL CARBON EDIT}}
-    const nodeModules = gulp.src('extensions/node_modules/**', { base: '.' });
+        .filter(({ name }) => sqlBuiltInExtensions.indexOf(name) === -1)
-    const localExtensions = localExtensionDescriptions.map(extension => {
+        .filter(({ name }) => azureExtensions.indexOf(name) === -1);
-        return fromLocal(extension.path)
+    const localExtensions = () => sequence([...localExtensionDescriptions.map(extension => () => {
-            .pipe(rename(p => p.dirname = `extensions/${extension.name}/${p.dirname}`));
+            return fromLocal(extension.path, opts.sourceMappingURLBase)
-    });
+                .pipe(rename(p => p.dirname = `extensions/${extension.name}/${p.dirname}`));
-    return es.merge(nodeModules, ...localExtensions)
+        })]);
-        .pipe(util2.setExecutableBit(['**/*.sh']));
+    // {{SQL CARBON EDIT}}
+    const extensionDepsSrc = [
+        ..._.flatten(extensionsProductionDependencies.map((d) => path.relative(root, d.path)).map((d) => [`${d}/**`, `!${d}/**/{test,tests}/**`])),
+    ];
+    const localExtensionDependencies = () => gulp.src(extensionDepsSrc, { base: '.', dot: true })
+        .pipe(filter(['**', '!**/package-lock.json']))
+        .pipe(util2.cleanNodeModule('account-provider-azure', ['node_modules/date-utils/doc/**', 'node_modules/adal_node/node_modules/**'], undefined))
+        .pipe(util2.cleanNodeModule('typescript', ['**/**'], undefined));
+    // Original code commented out here
+    // const localExtensionDependencies = () => gulp.src('extensions/node_modules/**', { base: '.' });
+    // const marketplaceExtensions = () => es.merge(
+    // 	...builtInExtensions
+    // 		.filter(({ name }) => opts.desiredExtensions ? opts.desiredExtensions.indexOf(name) >= 0 : true)
+    // 		.map(extension => {
+    // 			return fromMarketplace(extension.name, extension.version, extension.metadata)
+    // 				.pipe(rename(p => p.dirname = `extensions/${extension.name}/${p.dirname}`));
+    // 		})
+    // );
+    return sequence([localExtensions, localExtensionDependencies,])
+        .pipe(util2.setExecutableBit(['**/*.sh']))
+        .pipe(filter(['**', '!**/*.js.map']));
+    // {{SQL CARBON EDIT}} - End
 }
-exports.packageLocalExtensionsStream = packageLocalExtensionsStream;
+exports.packageExtensionsStream = packageExtensionsStream;
-function packageMarketplaceExtensionsStream() {
-    const extensions = builtInExtensions.map(extension => {
-        return fromMarketplace(extension.name, extension.version, extension.metadata)
-            .pipe(rename(p => p.dirname = `extensions/${extension.name}/${p.dirname}`));
-    });
-    return es.merge(extensions)
-        .pipe(util2.setExecutableBit(['**/*.sh']));
-}
-exports.packageMarketplaceExtensionsStream = packageMarketplaceExtensionsStream;
-const vfs = require("vinyl-fs");
-function packageBuiltInExtensions() {
-    const sqlBuiltInLocalExtensionDescriptions = glob.sync('extensions/*/package.json')
-        .map(manifestPath => {
-        const extensionPath = path.dirname(path.join(root, manifestPath));
-        const extensionName = path.basename(extensionPath);
-        return { name: extensionName, path: extensionPath };
-    })
-        .filter(({ name }) => excludedExtensions.indexOf(name) === -1)
-        .filter(({ name }) => builtInExtensions.every(b => b.name !== name))
-        .filter(({ name }) => sqlBuiltInExtensions.indexOf(name) >= 0);
-    const visxDirectory = path.join(path.dirname(root), 'vsix');
-    try {
-        if (!fs.existsSync(visxDirectory)) {
-            fs.mkdirSync(visxDirectory);
-        }
-    }
-    catch (err) {
-        // don't fail the build if the output directory already exists
-        console.warn(err);
-    }
-    sqlBuiltInLocalExtensionDescriptions.forEach(element => {
-        let pkgJson = JSON.parse(fs.readFileSync(path.join(element.path, 'package.json'), { encoding: 'utf8' }));
-        const packagePath = path.join(visxDirectory, `${pkgJson.name}-${pkgJson.version}.vsix`);
-        console.info('Creating vsix for ' + element.path + ' result:' + packagePath);
-        vsce.createVSIX({
-            cwd: element.path,
-            packagePath: packagePath,
-            useYarn: true
-        });
-    });
-}
-exports.packageBuiltInExtensions = packageBuiltInExtensions;
-function packageExtensionTask(extensionName, platform, arch) {
-    var destination = path.join(path.dirname(root), 'azuredatastudio') + (platform ? '-' + platform : '') + (arch ? '-' + arch : '');
-    if (platform === 'darwin') {
-        destination = path.join(destination, 'Azure Data Studio.app', 'Contents', 'Resources', 'app', 'extensions', extensionName);
-    }
-    else {
-        destination = path.join(destination, 'resources', 'app', 'extensions', extensionName);
-    }
-    platform = platform || process.platform;
-    return () => {
-        const root = path.resolve(path.join(__dirname, '../..'));
-        const localExtensionDescriptions = glob.sync('extensions/*/package.json')
-            .map(manifestPath => {
-            const extensionPath = path.dirname(path.join(root, manifestPath));
-            const extensionName = path.basename(extensionPath);
-            return { name: extensionName, path: extensionPath };
-        })
-            .filter(({ name }) => extensionName === name);
-        const localExtensions = es.merge(...localExtensionDescriptions.map(extension => {
-            return fromLocal(extension.path);
-        }));
-        let result = localExtensions
-            .pipe(util2.skipDirectories())
-            .pipe(util2.fixWin32DirectoryPermissions())
-            .pipe(filter(['**', '!LICENSE', '!LICENSES.chromium.html', '!version']));
-        return result.pipe(vfs.dest(destination));
-    };
-}
-exports.packageExtensionTask = packageExtensionTask;
-// {{SQL CARBON EDIT}} - End

build/lib/extensions.ts

@@ -13,40 +13,90 @@ import * as File from 'vinyl';
 import * as vsce from 'vsce';
 import { createStatsStream } from './stats';
 import * as util2 from './util';
-import remote = require('gulp-remote-retry-src');
+import remote = require('gulp-remote-src');
 const vzip = require('gulp-vinyl-zip');
 import filter = require('gulp-filter');
 import rename = require('gulp-rename');
-import * as fancyLog from 'fancy-log';
+const util = require('gulp-util');
-import * as ansiColors from 'ansi-colors';
 const buffer = require('gulp-buffer');
 import json = require('gulp-json-editor');
 const webpack = require('webpack');
 const webpackGulp = require('webpack-stream');
-const util = require('./util');
-const root = path.dirname(path.dirname(__dirname));
-const commit = util.getVersion(root);
-const sourceMappingURLBase = `https://ticino.blob.core.windows.net/sourcemaps/${commit}`;
 
-function fromLocal(extensionPath: string): Stream {
+const root = path.resolve(path.join(__dirname, '..', '..'));
-	const webpackFilename = path.join(extensionPath, 'extension.webpack.config.js');
-	const input = fs.existsSync(webpackFilename)
-		? fromLocalWebpack(extensionPath)
-		: fromLocalNormal(extensionPath);
 
-	const tmLanguageJsonFilter = filter('**/*.tmLanguage.json', { restore: true });
+// {{SQL CARBON EDIT}}
+import * as _ from 'underscore';
+import * as vfs from 'vinyl-fs';
+const deps = require('../dependencies');
+const extensionsRoot = path.join(root, 'extensions');
+const extensionsProductionDependencies = deps.getProductionDependencies(extensionsRoot);
 
-	return input
+export function packageBuiltInExtensions() {
-		.pipe(tmLanguageJsonFilter)
+	const sqlBuiltInLocalExtensionDescriptions = glob.sync('extensions/*/package.json')
-		.pipe(buffer())
+		.map(manifestPath => {
-		.pipe(es.mapSync((f: File) => {
+			const extensionPath = path.dirname(path.join(root, manifestPath));
-			f.contents = Buffer.from(JSON.stringify(JSON.parse(f.contents.toString('utf8'))));
+			const extensionName = path.basename(extensionPath);
-			return f;
+			return { name: extensionName, path: extensionPath };
-		}))
+		})
-		.pipe(tmLanguageJsonFilter.restore);
+		.filter(({ name }) => excludedExtensions.indexOf(name) === -1)
+		.filter(({ name }) => builtInExtensions.every(b => b.name !== name))
+		.filter(({ name }) => sqlBuiltInExtensions.indexOf(name) >= 0);
+	sqlBuiltInLocalExtensionDescriptions.forEach(element => {
+		const packagePath = path.join(path.dirname(root), element.name + '.vsix');
+		console.info('Creating vsix for ' + element.path + ' result:' + packagePath);
+		vsce.createVSIX({
+			cwd: element.path,
+			packagePath: packagePath,
+			useYarn: true
+		});
+	});
 }
 
-function fromLocalWebpack(extensionPath: string): Stream {
+export function packageExtensionTask(extensionName: string, platform: string, arch: string) {
+	var destination = path.join(path.dirname(root), 'azuredatastudio') + (platform ? '-' + platform : '') + (arch ? '-' + arch : '');
+	if (platform === 'darwin') {
+		destination = path.join(destination, 'Azure Data Studio.app', 'Contents', 'Resources', 'app', 'extensions', extensionName);
+	} else {
+		destination = path.join(destination, 'resources', 'app', 'extensions', extensionName);
+	}
+
+	platform = platform || process.platform;
+
+	return () => {
+		const root = path.resolve(path.join(__dirname, '../..'));
+		const localExtensionDescriptions = glob.sync('extensions/*/package.json')
+			.map(manifestPath => {
+				const extensionPath = path.dirname(path.join(root, manifestPath));
+				const extensionName = path.basename(extensionPath);
+				return { name: extensionName, path: extensionPath };
+			})
+			.filter(({ name }) => extensionName === name);
+
+		const localExtensions = es.merge(...localExtensionDescriptions.map(extension => {
+			return fromLocal(extension.path);
+		}));
+
+		let result = localExtensions
+			.pipe(util2.skipDirectories())
+			.pipe(util2.fixWin32DirectoryPermissions())
+			.pipe(filter(['**', '!LICENSE', '!LICENSES.chromium.html', '!version']));
+
+		return result.pipe(vfs.dest(destination));
+	};
+}
+// {{SQL CARBON EDIT}} - End
+
+function fromLocal(extensionPath: string, sourceMappingURLBase?: string): Stream {
+	const webpackFilename = path.join(extensionPath, 'extension.webpack.config.js');
+	if (fs.existsSync(webpackFilename)) {
+		return fromLocalWebpack(extensionPath, sourceMappingURLBase);
+	} else {
+		return fromLocalNormal(extensionPath);
+	}
+}
+
+function fromLocalWebpack(extensionPath: string, sourceMappingURLBase: string | undefined): Stream {
 	const result = es.through();
 
 	const packagedDependencies: string[] = [];
@@ -102,10 +152,10 @@ function fromLocalWebpack(extensionPath: string): Stream {
 			.pipe(packageJsonFilter.restore);
 
 
-		const webpackStreams = webpackConfigLocations.map(webpackConfigPath => {
+		const webpackStreams = webpackConfigLocations.map(webpackConfigPath => () => {
 
 			const webpackDone = (err: any, stats: any) => {
-				fancyLog(`Bundled extension: ${ansiColors.yellow(path.join(path.basename(extensionPath), path.relative(extensionPath, webpackConfigPath)))}...`);
+				util.log(`Bundled extension: ${util.colors.yellow(path.join(path.basename(extensionPath), path.relative(extensionPath, webpackConfigPath)))}...`);
 				if (err) {
 					result.emit('error', err);
 				}
@@ -134,16 +184,24 @@ function fromLocalWebpack(extensionPath: string): Stream {
 					// source map handling:
 					// * rewrite sourceMappingURL
 					// * save to disk so that upload-task picks this up
-					const contents = (<Buffer>data.contents).toString('utf8');
+					if (sourceMappingURLBase) {
-					data.contents = Buffer.from(contents.replace(/\n\/\/# sourceMappingURL=(.*)$/gm, function (_m, g1) {
+						const contents = (<Buffer>data.contents).toString('utf8');
-						return `\n//# sourceMappingURL=${sourceMappingURLBase}/extensions/${path.basename(extensionPath)}/${relativeOutputPath}/${g1}`;
+						data.contents = Buffer.from(contents.replace(/\n\/\/# sourceMappingURL=(.*)$/gm, function (_m, g1) {
-					}), 'utf8');
+							return `\n//# sourceMappingURL=${sourceMappingURLBase}/extensions/${path.basename(extensionPath)}/${relativeOutputPath}/${g1}`;
+						}), 'utf8');
 
+						if (/\.js\.map$/.test(data.path)) {
+							if (!fs.existsSync(path.dirname(data.path))) {
+								fs.mkdirSync(path.dirname(data.path));
+							}
+							fs.writeFileSync(data.path, data.contents);
+						}
+					}
 					this.emit('data', data);
 				}));
 		});
 
-		es.merge(...webpackStreams, patchFilesStream)
+		es.merge(sequence(webpackStreams), patchFilesStream)
 			// .pipe(es.through(function (data) {
 			// 	// debug
 			// 	console.log('out', data.path, data.contents.length);
@@ -188,11 +246,10 @@ const baseHeaders = {
 };
 
 export function fromMarketplace(extensionName: string, version: string, metadata: any): Stream {
-	// {{SQL CARBON EDIT}}
+	const [publisher, name] = extensionName.split('.');
-	const [, name] = extensionName.split('.');
+	const url = `https://marketplace.visualstudio.com/_apis/public/gallery/publishers/${publisher}/vsextensions/${name}/${version}/vspackage`;
-	const url = `https://sqlopsextensions.blob.core.windows.net/extensions/${name}/${name}-${version}.vsix`;
 
-	fancyLog('Downloading extension:', ansiColors.yellow(`${extensionName}@${version}`), '...');
+	util.log('Downloading extension:', util.colors.yellow(`${extensionName}@${version}`), '...');
 
 	const options = {
 		base: url,
@@ -214,10 +271,17 @@ export function fromMarketplace(extensionName: string, version: string, metadata
 		.pipe(packageJsonFilter.restore);
 }
 
+interface IPackageExtensionsOptions {
+	/**
+	 * Set to undefined to package all of them.
+	 */
+	desiredExtensions?: string[];
+	sourceMappingURLBase?: string;
+}
+
 const excludedExtensions = [
 	'vscode-api-tests',
 	'vscode-colorize-tests',
-	'vscode-test-resolver',
 	'ms-vscode.node-debug',
 	'ms-vscode.node-debug2',
 	// {{SQL CARBON EDIT}}
@@ -228,23 +292,15 @@ const excludedExtensions = [
 const sqlBuiltInExtensions = [
 	// Add SQL built-in extensions here.
 	// the extension will be excluded from SQLOps package and will have separate vsix packages
-	'admin-tool-ext-win',
 	'agent',
 	'import',
 	'profiler',
 	'admin-pack',
-	'dacpac',
+	'big-data-cluster',
-	'schema-compare',
+	'dacpac'
-	'cms',
-	'query-history'
 ];
-
+var azureExtensions = ['azurecore', 'mssql'];
-// make resource deployment and BDC extension only available in insiders
+// {{SQL CARBON EDIT}} - End
-if (process.env['VSCODE_QUALITY'] === 'stable') {
-	sqlBuiltInExtensions.push('resource-deployment');
-	sqlBuiltInExtensions.push('big-data-cluster');
-}
-
 
 interface IBuiltInExtension {
 	name: string;
@@ -253,12 +309,35 @@ interface IBuiltInExtension {
 	metadata: any;
 }
 
-const builtInExtensions: IBuiltInExtension[] = process.env['VSCODE_QUALITY'] === 'stable' ? require('../builtInExtensions.json') : require('../builtInExtensions-insiders.json');
+const builtInExtensions: IBuiltInExtension[] = require('../builtInExtensions.json');
 
-// {{SQL CARBON EDIT}} - End
+/**
+ * We're doing way too much stuff at once, with webpack et al. So much stuff
+ * that while downloading extensions from the marketplace, node js doesn't get enough
+ * stack frames to complete the download in under 2 minutes, at which point the
+ * marketplace server cuts off the http request. So, we sequentialize the extensino tasks.
+ */
+function sequence(streamProviders: { (): Stream }[]): Stream {
+	const result = es.through();
 
+	function pop() {
+		if (streamProviders.length === 0) {
+			result.emit('end');
+		} else {
+			const fn = streamProviders.shift()!;
+			fn()
+				.on('end', function () { setTimeout(pop, 0); })
+				.pipe(result, { end: false });
+		}
+	}
+
+	pop();
+	return result;
+}
+
+export function packageExtensionsStream(optsIn?: IPackageExtensionsOptions): NodeJS.ReadWriteStream {
+	const opts = optsIn || {};
 
-export function packageLocalExtensionsStream(): NodeJS.ReadWriteStream {
 	const localExtensionDescriptions = (<string[]>glob.sync('extensions/*/package.json'))
 		.map(manifestPath => {
 			const extensionPath = path.dirname(path.join(root, manifestPath));
@@ -266,94 +345,41 @@ export function packageLocalExtensionsStream(): NodeJS.ReadWriteStream {
 			return { name: extensionName, path: extensionPath };
 		})
 		.filter(({ name }) => excludedExtensions.indexOf(name) === -1)
+		.filter(({ name }) => opts.desiredExtensions ? opts.desiredExtensions.indexOf(name) >= 0 : true)
 		.filter(({ name }) => builtInExtensions.every(b => b.name !== name))
-		.filter(({ name }) => sqlBuiltInExtensions.indexOf(name) === -1); // {{SQL CARBON EDIT}} add aditional filter
+		// {{SQL CARBON EDIT}}
+		.filter(({ name }) => sqlBuiltInExtensions.indexOf(name) === -1)
+		.filter(({ name }) => azureExtensions.indexOf(name) === -1);
 
-	const nodeModules = gulp.src('extensions/node_modules/**', { base: '.' });
+	const localExtensions = () => sequence([...localExtensionDescriptions.map(extension => () => {
-	const localExtensions = localExtensionDescriptions.map(extension => {
+		return fromLocal(extension.path, opts.sourceMappingURLBase)
-		return fromLocal(extension.path)
 			.pipe(rename(p => p.dirname = `extensions/${extension.name}/${p.dirname}`));
-	});
+	})]);
 
-	return es.merge(nodeModules, ...localExtensions)
+	// {{SQL CARBON EDIT}}
-		.pipe(util2.setExecutableBit(['**/*.sh']));
+	const extensionDepsSrc = [
+		..._.flatten(extensionsProductionDependencies.map((d: any) => path.relative(root, d.path)).map((d: any) => [`${d}/**`, `!${d}/**/{test,tests}/**`])),
+	];
+
+	const localExtensionDependencies = () => gulp.src(extensionDepsSrc, { base: '.', dot: true })
+			.pipe(filter(['**', '!**/package-lock.json']))
+			.pipe(util2.cleanNodeModule('account-provider-azure', ['node_modules/date-utils/doc/**', 'node_modules/adal_node/node_modules/**'], undefined))
+			.pipe(util2.cleanNodeModule('typescript', ['**/**'], undefined));
+
+	// Original code commented out here
+	// const localExtensionDependencies = () => gulp.src('extensions/node_modules/**', { base: '.' });
+
+	// const marketplaceExtensions = () => es.merge(
+	// 	...builtInExtensions
+	// 		.filter(({ name }) => opts.desiredExtensions ? opts.desiredExtensions.indexOf(name) >= 0 : true)
+	// 		.map(extension => {
+	// 			return fromMarketplace(extension.name, extension.version, extension.metadata)
+	// 				.pipe(rename(p => p.dirname = `extensions/${extension.name}/${p.dirname}`));
+	// 		})
+	// );
+
+	return sequence([localExtensions, localExtensionDependencies, /*marketplaceExtensions*/])
+		.pipe(util2.setExecutableBit(['**/*.sh']))
+		.pipe(filter(['**', '!**/*.js.map']));
+	// {{SQL CARBON EDIT}} - End
 }
-
-export function packageMarketplaceExtensionsStream(): NodeJS.ReadWriteStream {
-	const extensions = builtInExtensions.map(extension => {
-		return fromMarketplace(extension.name, extension.version, extension.metadata)
-			.pipe(rename(p => p.dirname = `extensions/${extension.name}/${p.dirname}`));
-	});
-
-	return es.merge(extensions)
-		.pipe(util2.setExecutableBit(['**/*.sh']));
-}
-
-// {{SQL CARBON EDIT}}
-import * as _ from 'underscore';
-import * as vfs from 'vinyl-fs';
-
-export function packageBuiltInExtensions() {
-	const sqlBuiltInLocalExtensionDescriptions = glob.sync('extensions/*/package.json')
-		.map(manifestPath => {
-			const extensionPath = path.dirname(path.join(root, manifestPath));
-			const extensionName = path.basename(extensionPath);
-			return { name: extensionName, path: extensionPath };
-		})
-		.filter(({ name }) => excludedExtensions.indexOf(name) === -1)
-		.filter(({ name }) => builtInExtensions.every(b => b.name !== name))
-		.filter(({ name }) => sqlBuiltInExtensions.indexOf(name) >= 0);
-	const visxDirectory = path.join(path.dirname(root), 'vsix');
-	try {
-		if (!fs.existsSync(visxDirectory)) {
-			fs.mkdirSync(visxDirectory);
-		}
-	} catch (err) {
-		// don't fail the build if the output directory already exists
-		console.warn(err);
-	}
-	sqlBuiltInLocalExtensionDescriptions.forEach(element => {
-		let pkgJson = JSON.parse(fs.readFileSync(path.join(element.path, 'package.json'), { encoding: 'utf8' }));
-		const packagePath = path.join(visxDirectory, `${pkgJson.name}-${pkgJson.version}.vsix`);
-		console.info('Creating vsix for ' + element.path + ' result:' + packagePath);
-		vsce.createVSIX({
-			cwd: element.path,
-			packagePath: packagePath,
-			useYarn: true
-		});
-	});
-}
-
-export function packageExtensionTask(extensionName: string, platform: string, arch: string) {
-	var destination = path.join(path.dirname(root), 'azuredatastudio') + (platform ? '-' + platform : '') + (arch ? '-' + arch : '');
-	if (platform === 'darwin') {
-		destination = path.join(destination, 'Azure Data Studio.app', 'Contents', 'Resources', 'app', 'extensions', extensionName);
-	} else {
-		destination = path.join(destination, 'resources', 'app', 'extensions', extensionName);
-	}
-
-	platform = platform || process.platform;
-
-	return () => {
-		const root = path.resolve(path.join(__dirname, '../..'));
-		const localExtensionDescriptions = glob.sync('extensions/*/package.json')
-			.map(manifestPath => {
-				const extensionPath = path.dirname(path.join(root, manifestPath));
-				const extensionName = path.basename(extensionPath);
-				return { name: extensionName, path: extensionPath };
-			})
-			.filter(({ name }) => extensionName === name);
-
-		const localExtensions = es.merge(...localExtensionDescriptions.map(extension => {
-			return fromLocal(extension.path);
-		}));
-
-		let result = localExtensions
-			.pipe(util2.skipDirectories())
-			.pipe(util2.fixWin32DirectoryPermissions())
-			.pipe(filter(['**', '!LICENSE', '!LICENSES.chromium.html', '!version']));
-
-		return result.pipe(vfs.dest(destination));
-	};
-}
-// {{SQL CARBON EDIT}} - End

build/lib/git.js

@@ -17,14 +17,14 @@ function getVersion(repo) {
         head = fs.readFileSync(headPath, 'utf8').trim();
     }
     catch (e) {
-        return undefined;
+        return void 0;
     }
     if (/^[0-9a-f]{40}$/i.test(head)) {
         return head;
     }
     const refMatch = /^ref: (.*)$/.exec(head);
     if (!refMatch) {
-        return undefined;
+        return void 0;
     }
     const ref = refMatch[1];
     const refPath = path.join(git, ref);
@@ -40,7 +40,7 @@ function getVersion(repo) {
         refsRaw = fs.readFileSync(packedRefsPath, 'utf8').trim();
     }
     catch (e) {
-        return undefined;
+        return void 0;
     }
     const refsRegex = /^([0-9a-f]{40})\s+(.+)$/gm;
     let refsMatch;

build/lib/git.ts

@@ -18,7 +18,7 @@ export function getVersion(repo: string): string | undefined {
 	try {
 		head = fs.readFileSync(headPath, 'utf8').trim();
 	} catch (e) {
-		return undefined;
+		return void 0;
 	}
 
 	if (/^[0-9a-f]{40}$/i.test(head)) {
@@ -28,7 +28,7 @@ export function getVersion(repo: string): string | undefined {
 	const refMatch = /^ref: (.*)$/.exec(head);
 
 	if (!refMatch) {
-		return undefined;
+		return void 0;
 	}
 
 	const ref = refMatch[1];
@@ -46,7 +46,7 @@ export function getVersion(repo: string): string | undefined {
 	try {
 		refsRaw = fs.readFileSync(packedRefsPath, 'utf8').trim();
 	} catch (e) {
-		return undefined;
+		return void 0;
 	}
 
 	const refsRegex = /^([0-9a-f]{40})\s+(.+)$/gm;

build/lib/i18n.js

@@ -13,16 +13,15 @@ const xml2js = require("xml2js");
 const glob = require("glob");
 const https = require("https");
 const gulp = require("gulp");
-const fancyLog = require("fancy-log");
+const util = require("gulp-util");
-const ansiColors = require("ansi-colors");
 const iconv = require("iconv-lite");
 const NUMBER_OF_CONCURRENT_DOWNLOADS = 4;
 function log(message, ...rest) {
-    fancyLog(ansiColors.green('[i18n]'), message, ...rest);
+    util.log(util.colors.green('[i18n]'), message, ...rest);
 }
 exports.defaultLanguages = [
-    { id: 'zh-tw', folderName: 'cht', translationId: 'zh-hant' },
+    { id: 'zh-tw', folderName: 'cht', transifexId: 'zh-hant' },
-    { id: 'zh-cn', folderName: 'chs', translationId: 'zh-hans' },
+    { id: 'zh-cn', folderName: 'chs', transifexId: 'zh-hans' },
     { id: 'ja', folderName: 'jpn' },
     { id: 'ko', folderName: 'kor' },
     { id: 'de', folderName: 'deu' },
@@ -372,11 +371,7 @@ function processCoreBundleFormat(fileHeader, languages, json, emitter) {
             }
         });
     });
-    let languageDirectory = path.join(__dirname, '..', '..', '..', 'vscode-loc', 'i18n');
+    let languageDirectory = path.join(__dirname, '..', '..', 'i18n');
-    if (!fs.existsSync(languageDirectory)) {
-        log(`No VS Code localization repository found. Looking at ${languageDirectory}`);
-        log(`To bundle translations please check out the vscode-loc repository as a sibling of the vscode repository.`);
-    }
     let sortedLanguages = sortLanguages(languages);
     sortedLanguages.forEach((language) => {
         if (process.env['VSCODE_BUILD_VERBOSE']) {
@@ -384,25 +379,22 @@ function processCoreBundleFormat(fileHeader, languages, json, emitter) {
         }
         statistics[language.id] = 0;
         let localizedModules = Object.create(null);
-        let languageFolderName = language.translationId || language.id;
+        let languageFolderName = language.folderName || language.id;
-        let i18nFile = path.join(languageDirectory, `vscode-language-pack-${languageFolderName}`, 'translations', 'main.i18n.json');
+        let cwd = path.join(languageDirectory, languageFolderName, 'src');
-        let allMessages;
-        if (fs.existsSync(i18nFile)) {
-            let content = stripComments(fs.readFileSync(i18nFile, 'utf8'));
-            allMessages = JSON.parse(content);
-        }
         modules.forEach((module) => {
             let order = keysSection[module];
-            let moduleMessage;
+            let i18nFile = path.join(cwd, module) + '.i18n.json';
-            if (allMessages) {
+            let messages = null;
-                moduleMessage = allMessages.contents[module];
+            if (fs.existsSync(i18nFile)) {
+                let content = stripComments(fs.readFileSync(i18nFile, 'utf8'));
+                messages = JSON.parse(content);
             }
-            if (!moduleMessage) {
+            else {
                 if (process.env['VSCODE_BUILD_VERBOSE']) {
                     log(`No localized messages found for module ${module}. Using default messages.`);
                 }
-                moduleMessage = defaultMessages[module];
+                messages = defaultMessages[module];
-                statistics[language.id] = statistics[language.id] + Object.keys(moduleMessage).length;
+                statistics[language.id] = statistics[language.id] + Object.keys(messages).length;
             }
             let localizedMessages = [];
             order.forEach((keyInfo) => {
@@ -413,7 +405,7 @@ function processCoreBundleFormat(fileHeader, languages, json, emitter) {
                 else {
                     key = keyInfo.key;
                 }
-                let message = moduleMessage[key];
+                let message = messages[key];
                 if (!message) {
                     if (process.env['VSCODE_BUILD_VERBOSE']) {
                         log(`No localized message found for key ${key} in module ${module}. Using default message.`);
@@ -498,7 +490,7 @@ function getResource(sourceFile) {
     else if (/^vs\/code/.test(sourceFile)) {
         return { name: 'vs/code', project: workbenchProject };
     }
-    else if (/^vs\/workbench\/contrib/.test(sourceFile)) {
+    else if (/^vs\/workbench\/parts/.test(sourceFile)) {
         resource = sourceFile.split('/', 4).join('/');
         return { name: resource, project: workbenchProject };
     }
@@ -586,7 +578,7 @@ function createXlfFilesForExtensions() {
             }
             return _xlf;
         }
-        gulp.src([`./extensions/${extensionName}/package.nls.json`, `./extensions/${extensionName}/**/nls.metadata.json`], { allowEmpty: true }).pipe(event_stream_1.through(function (file) {
+        gulp.src([`./extensions/${extensionName}/package.nls.json`, `./extensions/${extensionName}/**/nls.metadata.json`]).pipe(event_stream_1.through(function (file) {
             if (file.isBuffer()) {
                 const buffer = file.contents;
                 const basename = path.basename(file.path);
@@ -963,7 +955,7 @@ function retrieveResource(language, resource, apiHostname, credentials) {
     return limiter.queue(() => new Promise((resolve, reject) => {
         const slug = resource.name.replace(/\//g, '_');
         const project = resource.project;
-        let transifexLanguageId = language.id === 'ps' ? 'en' : language.translationId || language.id;
+        let transifexLanguageId = language.id === 'ps' ? 'en' : language.transifexId || language.id;
         const options = {
             hostname: apiHostname,
             path: `/api/2/project/${project}/resource/${slug}/translation/${transifexLanguageId}?file&mode=onlyreviewed`,
@@ -1046,7 +1038,7 @@ function prepareI18nPackFiles(externalExtensions, resultingTranslationPaths, pse
     let extensionsPacks = {};
     let errors = [];
     return event_stream_1.through(function (xlf) {
-        let project = path.basename(path.dirname(xlf.relative));
+        let project = path.dirname(xlf.relative);
         let resource = path.basename(xlf.relative, '.xlf');
         let contents = xlf.contents.toString();
         let parsePromise = pseudo ? XLF.parsePseudo(contents) : XLF.parse(contents);

build/lib/i18n.resources.json

@@ -27,155 +27,135 @@
 			"project": "vscode-workbench"
 		},
 		{
-			"name": "vs/workbench/api/common",
+			"name": "vs/workbench/parts/cli",
 			"project": "vscode-workbench"
 		},
 		{
-			"name": "vs/workbench/contrib/cli",
+			"name": "vs/workbench/parts/codeEditor",
 			"project": "vscode-workbench"
 		},
 		{
-			"name": "vs/workbench/contrib/codeEditor",
+			"name": "vs/workbench/parts/comments",
 			"project": "vscode-workbench"
 		},
 		{
-			"name": "vs/workbench/contrib/callHierarchy",
+			"name": "vs/workbench/parts/debug",
 			"project": "vscode-workbench"
 		},
 		{
-			"name": "vs/workbench/contrib/comments",
+			"name": "vs/workbench/parts/emmet",
 			"project": "vscode-workbench"
 		},
 		{
-			"name": "vs/workbench/contrib/debug",
+			"name": "vs/workbench/parts/execution",
 			"project": "vscode-workbench"
 		},
 		{
-			"name": "vs/workbench/contrib/emmet",
+			"name": "vs/workbench/parts/extensions",
 			"project": "vscode-workbench"
 		},
 		{
-			"name": "vs/workbench/contrib/extensions",
+			"name": "vs/workbench/parts/feedback",
 			"project": "vscode-workbench"
 		},
 		{
-			"name": "vs/workbench/contrib/externalTerminal",
+			"name": "vs/workbench/parts/files",
 			"project": "vscode-workbench"
 		},
 		{
-			"name": "vs/workbench/contrib/feedback",
+			"name": "vs/workbench/parts/html",
 			"project": "vscode-workbench"
 		},
 		{
-			"name": "vs/workbench/contrib/files",
+			"name": "vs/workbench/parts/markers",
 			"project": "vscode-workbench"
 		},
 		{
-			"name": "vs/workbench/contrib/html",
+			"name": "vs/workbench/parts/localizations",
 			"project": "vscode-workbench"
 		},
 		{
-			"name": "vs/workbench/contrib/issue",
+			"name": "vs/workbench/parts/logs",
 			"project": "vscode-workbench"
 		},
 		{
-			"name": "vs/workbench/contrib/markers",
+			"name": "vs/workbench/parts/output",
 			"project": "vscode-workbench"
 		},
 		{
-			"name": "vs/workbench/contrib/localizations",
+			"name": "vs/workbench/parts/performance",
 			"project": "vscode-workbench"
 		},
 		{
-			"name": "vs/workbench/contrib/logs",
+			"name": "vs/workbench/parts/preferences",
 			"project": "vscode-workbench"
 		},
 		{
-			"name": "vs/workbench/contrib/output",
+			"name": "vs/workbench/parts/quickopen",
 			"project": "vscode-workbench"
 		},
 		{
-			"name": "vs/workbench/contrib/performance",
+			"name": "vs/workbench/parts/relauncher",
 			"project": "vscode-workbench"
 		},
 		{
-			"name": "vs/workbench/contrib/preferences",
+			"name": "vs/workbench/parts/scm",
 			"project": "vscode-workbench"
 		},
 		{
-			"name": "vs/workbench/contrib/quickopen",
+			"name": "vs/workbench/parts/search",
 			"project": "vscode-workbench"
 		},
 		{
-			"name": "vs/workbench/contrib/remote",
+			"name": "vs/workbench/parts/snippets",
 			"project": "vscode-workbench"
 		},
 		{
-			"name": "vs/workbench/contrib/relauncher",
+			"name": "vs/workbench/parts/stats",
 			"project": "vscode-workbench"
 		},
 		{
-			"name": "vs/workbench/contrib/scm",
+			"name": "vs/workbench/parts/surveys",
 			"project": "vscode-workbench"
 		},
 		{
-			"name": "vs/workbench/contrib/search",
+			"name": "vs/workbench/parts/tasks",
 			"project": "vscode-workbench"
 		},
 		{
-			"name": "vs/workbench/contrib/snippets",
+			"name": "vs/workbench/parts/terminal",
 			"project": "vscode-workbench"
 		},
 		{
-			"name": "vs/workbench/contrib/format",
+			"name": "vs/workbench/parts/themes",
 			"project": "vscode-workbench"
 		},
 		{
-			"name": "vs/workbench/contrib/stats",
+			"name": "vs/workbench/parts/trust",
 			"project": "vscode-workbench"
 		},
 		{
-			"name": "vs/workbench/contrib/surveys",
+			"name": "vs/workbench/parts/update",
 			"project": "vscode-workbench"
 		},
 		{
-			"name": "vs/workbench/contrib/tasks",
+			"name": "vs/workbench/parts/url",
 			"project": "vscode-workbench"
 		},
 		{
-			"name": "vs/workbench/contrib/terminal",
+			"name": "vs/workbench/parts/watermark",
 			"project": "vscode-workbench"
 		},
 		{
-			"name": "vs/workbench/contrib/themes",
+			"name": "vs/workbench/parts/webview",
 			"project": "vscode-workbench"
 		},
 		{
-			"name": "vs/workbench/contrib/trust",
+			"name": "vs/workbench/parts/welcome",
 			"project": "vscode-workbench"
 		},
 		{
-			"name": "vs/workbench/contrib/update",
+			"name": "vs/workbench/parts/outline",
-			"project": "vscode-workbench"
-		},
-		{
-			"name": "vs/workbench/contrib/url",
-			"project": "vscode-workbench"
-		},
-		{
-			"name": "vs/workbench/contrib/watermark",
-			"project": "vscode-workbench"
-		},
-		{
-			"name": "vs/workbench/contrib/webview",
-			"project": "vscode-workbench"
-		},
-		{
-			"name": "vs/workbench/contrib/welcome",
-			"project": "vscode-workbench"
-		},
-		{
-			"name": "vs/workbench/contrib/outline",
 			"project": "vscode-workbench"
 		},
 		{
@@ -215,17 +195,13 @@
 			"project": "vscode-workbench"
 		},
 		{
-			"name": "vs/workbench/services/extensionManagement",
+			"name": "vs/workbench/services/jsonschemas",
 			"project": "vscode-workbench"
 		},
 		{
 			"name": "vs/workbench/services/files",
 			"project": "vscode-workbench"
 		},
-		{
-			"name": "vs/workbench/services/integrity",
-			"project": "vscode-workbench"
-		},
 		{
 			"name": "vs/workbench/services/keybinding",
 			"project": "vscode-workbench"
@@ -262,17 +238,9 @@
 			"name": "vs/workbench/services/decorations",
 			"project": "vscode-workbench"
 		},
-		{
-			"name": "vs/workbench/services/label",
-			"project": "vscode-workbench"
-		},
 		{
 			"name": "vs/workbench/services/preferences",
 			"project": "vscode-preferences"
-		},
-		{
-			"name": "vs/workbench/services/notification",
-			"project": "vscode-workbench"
 		}
 	]
 }

build/lib/i18n.ts

@@ -13,19 +13,19 @@ import * as xml2js from 'xml2js';
 import * as glob from 'glob';
 import * as https from 'https';
 import * as gulp from 'gulp';
-import * as fancyLog from 'fancy-log';
+
-import * as ansiColors from 'ansi-colors';
+import * as util from 'gulp-util';
 import * as iconv from 'iconv-lite';
 
 const NUMBER_OF_CONCURRENT_DOWNLOADS = 4;
 
 function log(message: any, ...rest: any[]): void {
-	fancyLog(ansiColors.green('[i18n]'), message, ...rest);
+	util.log(util.colors.green('[i18n]'), message, ...rest);
 }
 
 export interface Language {
-	id: string; // language id, e.g. zh-tw, de
+	id: string; // laguage id, e.g. zh-tw, de
-	translationId?: string; // language id used in translation tools, e.g. zh-hant, de (optional, if not set, the id is used)
+	transifexId?: string; // language id used in transifex, e.g zh-hant, de (optional, if not set, the id is used)
 	folderName?: string; // language specific folder name, e.g. cht, deu  (optional, if not set, the id is used)
 }
 
@@ -38,8 +38,8 @@ export interface InnoSetup {
 }
 
 export const defaultLanguages: Language[] = [
-	{ id: 'zh-tw', folderName: 'cht', translationId: 'zh-hant' },
+	{ id: 'zh-tw', folderName: 'cht', transifexId: 'zh-hant' },
-	{ id: 'zh-cn', folderName: 'chs', translationId: 'zh-hans' },
+	{ id: 'zh-cn', folderName: 'chs', transifexId: 'zh-hans' },
 	{ id: 'ja', folderName: 'jpn' },
 	{ id: 'ko', folderName: 'kor' },
 	{ id: 'de', folderName: 'deu' },
@@ -144,15 +144,6 @@ interface BundledExtensionFormat {
 	};
 }
 
-interface I18nFormat {
-	version: string;
-	contents: {
-		[module: string]: {
-			[messageKey: string]: string;
-		};
-	};
-}
-
 export class Line {
 	private buffer: string[] = [];
 
@@ -495,11 +486,7 @@ function processCoreBundleFormat(fileHeader: string, languages: Language[], json
 		});
 	});
 
-	let languageDirectory = path.join(__dirname, '..', '..', '..', 'vscode-loc', 'i18n');
+	let languageDirectory = path.join(__dirname, '..', '..', 'i18n');
-	if (!fs.existsSync(languageDirectory)) {
-		log(`No VS Code localization repository found. Looking at ${languageDirectory}`);
-		log(`To bundle translations please check out the vscode-loc repository as a sibling of the vscode repository.`);
-	}
 	let sortedLanguages = sortLanguages(languages);
 	sortedLanguages.forEach((language) => {
 		if (process.env['VSCODE_BUILD_VERBOSE']) {
@@ -508,25 +495,21 @@ function processCoreBundleFormat(fileHeader: string, languages: Language[], json
 
 		statistics[language.id] = 0;
 		let localizedModules: Map<string[]> = Object.create(null);
-		let languageFolderName = language.translationId || language.id;
+		let languageFolderName = language.folderName || language.id;
-		let i18nFile = path.join(languageDirectory, `vscode-language-pack-${languageFolderName}`, 'translations', 'main.i18n.json');
+		let cwd = path.join(languageDirectory, languageFolderName, 'src');
-		let allMessages: I18nFormat | undefined;
-		if (fs.existsSync(i18nFile)) {
-			let content = stripComments(fs.readFileSync(i18nFile, 'utf8'));
-			allMessages = JSON.parse(content);
-		}
 		modules.forEach((module) => {
 			let order = keysSection[module];
-			let moduleMessage: { [messageKey: string]: string } | undefined;
+			let i18nFile = path.join(cwd, module) + '.i18n.json';
-			if (allMessages) {
+			let messages: Map<string> | null = null;
-				moduleMessage = allMessages.contents[module];
+			if (fs.existsSync(i18nFile)) {
-			}
+				let content = stripComments(fs.readFileSync(i18nFile, 'utf8'));
-			if (!moduleMessage) {
+				messages = JSON.parse(content);
+			} else {
 				if (process.env['VSCODE_BUILD_VERBOSE']) {
 					log(`No localized messages found for module ${module}. Using default messages.`);
 				}
-				moduleMessage = defaultMessages[module];
+				messages = defaultMessages[module];
-				statistics[language.id] = statistics[language.id] + Object.keys(moduleMessage).length;
+				statistics[language.id] = statistics[language.id] + Object.keys(messages).length;
 			}
 			let localizedMessages: string[] = [];
 			order.forEach((keyInfo) => {
@@ -536,7 +519,7 @@ function processCoreBundleFormat(fileHeader: string, languages: Language[], json
 				} else {
 					key = keyInfo.key;
 				}
-				let message: string = moduleMessage![key];
+				let message: string = messages![key];
 				if (!message) {
 					if (process.env['VSCODE_BUILD_VERBOSE']) {
 						log(`No localized message found for key ${key} in module ${module}. Using default message.`);
@@ -622,7 +605,7 @@ export function getResource(sourceFile: string): Resource {
 		return { name: 'vs/base', project: editorProject };
 	} else if (/^vs\/code/.test(sourceFile)) {
 		return { name: 'vs/code', project: workbenchProject };
-	} else if (/^vs\/workbench\/contrib/.test(sourceFile)) {
+	} else if (/^vs\/workbench\/parts/.test(sourceFile)) {
 		resource = sourceFile.split('/', 4).join('/');
 		return { name: resource, project: workbenchProject };
 	} else if (/^vs\/workbench\/services/.test(sourceFile)) {
@@ -709,7 +692,7 @@ export function createXlfFilesForExtensions(): ThroughStream {
 			}
 			return _xlf;
 		}
-		gulp.src([`./extensions/${extensionName}/package.nls.json`, `./extensions/${extensionName}/**/nls.metadata.json`], { allowEmpty: true }).pipe(through(function (file: File) {
+		gulp.src([`./extensions/${extensionName}/package.nls.json`, `./extensions/${extensionName}/**/nls.metadata.json`]).pipe(through(function (file: File) {
 			if (file.isBuffer()) {
 				const buffer: Buffer = file.contents as Buffer;
 				const basename = path.basename(file.path);
@@ -1110,7 +1093,7 @@ function retrieveResource(language: Language, resource: Resource, apiHostname: s
 	return limiter.queue(() => new Promise<File | null>((resolve, reject) => {
 		const slug = resource.name.replace(/\//g, '_');
 		const project = resource.project;
-		let transifexLanguageId = language.id === 'ps' ? 'en' : language.translationId || language.id;
+		let transifexLanguageId = language.id === 'ps' ? 'en' : language.transifexId || language.id;
 		const options = {
 			hostname: apiHostname,
 			path: `/api/2/project/${project}/resource/${slug}/translation/${transifexLanguageId}?file&mode=onlyreviewed`,
@@ -1211,7 +1194,7 @@ export function prepareI18nPackFiles(externalExtensions: Map<string>, resultingT
 	let extensionsPacks: Map<I18nPack> = {};
 	let errors: any[] = [];
 	return through(function (this: ThroughStream, xlf: File) {
-		let project = path.basename(path.dirname(xlf.relative));
+		let project = path.dirname(xlf.relative);
 		let resource = path.basename(xlf.relative, '.xlf');
 		let contents = xlf.contents.toString();
 		let parsePromise = pseudo ? XLF.parsePseudo(contents) : XLF.parse(contents);
@@ -1378,4 +1361,4 @@ function decodeEntities(value: string): string {
 
 function pseudify(message: string) {
 	return '\uFF3B' + message.replace(/[aouei]/g, '$&$&') + '\uFF3D';
-}
+}

build/lib/node.js

@@ -1,15 +0,0 @@
-"use strict";
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-Object.defineProperty(exports, "__esModule", { value: true });
-const path = require("path");
-const fs = require("fs");
-const root = path.dirname(path.dirname(__dirname));
-const yarnrcPath = path.join(root, 'remote', '.yarnrc');
-const yarnrc = fs.readFileSync(yarnrcPath, 'utf8');
-const version = /^target\s+"([^"]+)"$/m.exec(yarnrc)[1];
-const node = process.platform === 'win32' ? 'node.exe' : 'node';
-const nodePath = path.join(root, '.build', 'node', `v${version}`, `${process.platform}-${process.arch}`, node);
-console.log(nodePath);

build/lib/node.ts

@@ -1,16 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as path from 'path';
-import * as fs from 'fs';
-
-const root = path.dirname(path.dirname(__dirname));
-const yarnrcPath = path.join(root, 'remote', '.yarnrc');
-const yarnrc = fs.readFileSync(yarnrcPath, 'utf8');
-const version = /^target\s+"([^"]+)"$/m.exec(yarnrc)![1];
-const node = process.platform === 'win32' ? 'node.exe' : 'node';
-const nodePath = path.join(root, '.build', 'node', `v${version}`, `${process.platform}-${process.arch}`, node);
-
-console.log(nodePath);

build/lib/optimize.js

@@ -13,8 +13,7 @@ const flatmap = require("gulp-flatmap");
 const sourcemaps = require("gulp-sourcemaps");
 const uglify = require("gulp-uglify");
 const composer = require("gulp-uglify/composer");
-const fancyLog = require("fancy-log");
+const gulpUtil = require("gulp-util");
-const ansiColors = require("ansi-colors");
 const path = require("path");
 const pump = require("pump");
 const uglifyes = require("uglify-es");
@@ -25,7 +24,7 @@ const stats_1 = require("./stats");
 const util = require("./util");
 const REPO_ROOT_PATH = path.join(__dirname, '../..');
 function log(prefix, message) {
-    fancyLog(ansiColors.cyan('[' + prefix + ']'), message);
+    gulpUtil.log(gulpUtil.colors.cyan('[' + prefix + ']'), message);
 }
 // {{SQL CARBON EDIT}}
 function loaderConfig(emptyPaths) {
@@ -60,7 +59,7 @@ function loader(src, bundledFileHeader, bundleLoader) {
             isFirst = false;
             this.emit('data', new VinylFile({
                 path: 'fake',
-                base: '',
+                base: undefined,
                 contents: Buffer.from(bundledFileHeader)
             }));
             this.emit('data', data);
@@ -96,7 +95,7 @@ function toConcatStream(src, bundledFileHeader, sources, dest) {
     }
     const treatedSources = sources.map(function (source) {
         const root = source.path ? REPO_ROOT_PATH.replace(/\\/g, '/') : '';
-        const base = source.path ? root + `/${src}` : '';
+        const base = source.path ? root + `/${src}` : undefined;
         return new VinylFile({
             path: source.path ? root + '/' + source.path.replace(/\\/g, '/') : 'fake',
             base: base,
@@ -113,17 +112,13 @@ function toBundleStream(src, bundledFileHeader, bundles) {
         return toConcatStream(src, bundledFileHeader, bundle.sources, bundle.dest);
     }));
 }
-const DEFAULT_FILE_HEADER = [
-    '/*!--------------------------------------------------------',
-    ' * Copyright (C) Microsoft Corporation. All rights reserved.',
-    ' *--------------------------------------------------------*/'
-].join('\n');
 function optimizeTask(opts) {
     const src = opts.src;
     const entryPoints = opts.entryPoints;
+    const otherSources = opts.otherSources;
     const resources = opts.resources;
     const loaderConfig = opts.loaderConfig;
-    const bundledFileHeader = opts.header || DEFAULT_FILE_HEADER;
+    const bundledFileHeader = opts.header;
     const bundleLoader = (typeof opts.bundleLoader === 'undefined' ? true : opts.bundleLoader);
     const out = opts.out;
     return function () {
@@ -143,7 +138,7 @@ function optimizeTask(opts) {
                 }
                 filteredResources.push('!' + resource);
             });
-            gulp.src(filteredResources, { base: `${src}`, allowEmpty: true }).pipe(resourcesStream);
+            gulp.src(filteredResources, { base: `${src}` }).pipe(resourcesStream);
             const bundleInfoArray = [];
             if (opts.bundleInfo) {
                 bundleInfoArray.push(new VinylFile({
@@ -154,7 +149,20 @@ function optimizeTask(opts) {
             }
             es.readArray(bundleInfoArray).pipe(bundleInfoStream);
         });
-        const result = es.merge(loader(src, bundledFileHeader, bundleLoader), bundlesStream, resourcesStream, bundleInfoStream);
+        const otherSourcesStream = es.through();
+        const otherSourcesStreamArr = [];
+        gulp.src(otherSources, { base: `${src}` })
+            .pipe(es.through(function (data) {
+            otherSourcesStreamArr.push(toConcatStream(src, bundledFileHeader, [data], data.relative));
+        }, function () {
+            if (!otherSourcesStreamArr.length) {
+                setTimeout(function () { otherSourcesStream.emit('end'); }, 0);
+            }
+            else {
+                es.merge(otherSourcesStreamArr).pipe(otherSourcesStream);
+            }
+        }));
+        const result = es.merge(loader(src, bundledFileHeader, bundleLoader), bundlesStream, otherSourcesStream, resourcesStream, bundleInfoStream);
         return result
             .pipe(sourcemaps.write('./', {
             sourceRoot: undefined,
@@ -217,12 +225,7 @@ function minifyTask(src, sourceMapBaseUrl) {
     return cb => {
         const jsFilter = filter('**/*.js', { restore: true });
         const cssFilter = filter('**/*.css', { restore: true });
-        pump(gulp.src([src + '/**', '!' + src + '/**/*.map']), jsFilter, sourcemaps.init({ loadMaps: true }), uglifyWithCopyrights(), jsFilter.restore, cssFilter, minifyCSS({ reduceIdents: false }), cssFilter.restore, sourcemaps.mapSources((sourcePath) => {
+        pump(gulp.src([src + '/**', '!' + src + '/**/*.map']), jsFilter, sourcemaps.init({ loadMaps: true }), uglifyWithCopyrights(), jsFilter.restore, cssFilter, minifyCSS({ reduceIdents: false }), cssFilter.restore, sourcemaps.write('./', {
-            if (sourcePath === 'bootstrap-fork.js') {
-                return 'bootstrap-fork.orig.js';
-            }
-            return sourcePath;
-        }), sourcemaps.write('./', {
             sourceMappingURL,
             sourceRoot: undefined,
             includeContent: true,

build/lib/optimize.ts

@@ -14,8 +14,7 @@ import * as flatmap from 'gulp-flatmap';
 import * as sourcemaps from 'gulp-sourcemaps';
 import * as uglify from 'gulp-uglify';
 import * as composer from 'gulp-uglify/composer';
-import * as fancyLog from 'fancy-log';
+import * as gulpUtil from 'gulp-util';
-import * as ansiColors from 'ansi-colors';
 import * as path from 'path';
 import * as pump from 'pump';
 import * as sm from 'source-map';
@@ -29,7 +28,7 @@ import * as util from './util';
 const REPO_ROOT_PATH = path.join(__dirname, '../..');
 
 function log(prefix: string, message: string): void {
-	fancyLog(ansiColors.cyan('[' + prefix + ']'), message);
+	gulpUtil.log(gulpUtil.colors.cyan('[' + prefix + ']'), message);
 }
 
 // {{SQL CARBON EDIT}}
@@ -74,7 +73,7 @@ function loader(src: string, bundledFileHeader: string, bundleLoader: boolean):
 					isFirst = false;
 					this.emit('data', new VinylFile({
 						path: 'fake',
-						base: '',
+						base: undefined,
 						contents: Buffer.from(bundledFileHeader)
 					}));
 					this.emit('data', data);
@@ -114,7 +113,7 @@ function toConcatStream(src: string, bundledFileHeader: string, sources: bundle.
 
 	const treatedSources = sources.map(function (source) {
 		const root = source.path ? REPO_ROOT_PATH.replace(/\\/g, '/') : '';
-		const base = source.path ? root + `/${src}` : '';
+		const base = source.path ? root + `/${src}` : undefined;
 
 		return new VinylFile({
 			path: source.path ? root + '/' + source.path.replace(/\\/g, '/') : 'fake',
@@ -144,6 +143,10 @@ export interface IOptimizeTaskOpts {
 	 * (for AMD files, will get bundled and get Copyright treatment)
 	 */
 	entryPoints: bundle.IEntryPoint[];
+	/**
+	 * (for non-AMD files that should get Copyright treatment)
+	 */
+	otherSources: string[];
 	/**
 	 * (svg, etc.)
 	 */
@@ -156,7 +159,7 @@ export interface IOptimizeTaskOpts {
 	/**
 	 * (basically the Copyright treatment)
 	 */
-	header?: string;
+	header: string;
 	/**
 	 * (emit bundleInfo.json file)
 	 */
@@ -171,18 +174,13 @@ export interface IOptimizeTaskOpts {
 	languages?: Language[];
 }
 
-const DEFAULT_FILE_HEADER = [
-	'/*!--------------------------------------------------------',
-	' * Copyright (C) Microsoft Corporation. All rights reserved.',
-	' *--------------------------------------------------------*/'
-].join('\n');
-
 export function optimizeTask(opts: IOptimizeTaskOpts): () => NodeJS.ReadWriteStream {
 	const src = opts.src;
 	const entryPoints = opts.entryPoints;
+	const otherSources = opts.otherSources;
 	const resources = opts.resources;
 	const loaderConfig = opts.loaderConfig;
-	const bundledFileHeader = opts.header || DEFAULT_FILE_HEADER;
+	const bundledFileHeader = opts.header;
 	const bundleLoader = (typeof opts.bundleLoader === 'undefined' ? true : opts.bundleLoader);
 	const out = opts.out;
 
@@ -204,7 +202,7 @@ export function optimizeTask(opts: IOptimizeTaskOpts): () => NodeJS.ReadWriteStr
 				}
 				filteredResources.push('!' + resource);
 			});
-			gulp.src(filteredResources, { base: `${src}`, allowEmpty: true }).pipe(resourcesStream);
+			gulp.src(filteredResources, { base: `${src}` }).pipe(resourcesStream);
 
 			const bundleInfoArray: VinylFile[] = [];
 			if (opts.bundleInfo) {
@@ -217,9 +215,24 @@ export function optimizeTask(opts: IOptimizeTaskOpts): () => NodeJS.ReadWriteStr
 			es.readArray(bundleInfoArray).pipe(bundleInfoStream);
 		});
 
+		const otherSourcesStream = es.through();
+		const otherSourcesStreamArr: NodeJS.ReadWriteStream[] = [];
+
+		gulp.src(otherSources, { base: `${src}` })
+			.pipe(es.through(function (data) {
+				otherSourcesStreamArr.push(toConcatStream(src, bundledFileHeader, [data], data.relative));
+			}, function () {
+				if (!otherSourcesStreamArr.length) {
+					setTimeout(function () { otherSourcesStream.emit('end'); }, 0);
+				} else {
+					es.merge(otherSourcesStreamArr).pipe(otherSourcesStream);
+				}
+			}));
+
 		const result = es.merge(
 			loader(src, bundledFileHeader, bundleLoader),
 			bundlesStream,
+			otherSourcesStream,
 			resourcesStream,
 			bundleInfoStream
 		);
@@ -306,13 +319,6 @@ export function minifyTask(src: string, sourceMapBaseUrl?: string): (cb: any) =>
 			cssFilter,
 			minifyCSS({ reduceIdents: false }),
 			cssFilter.restore,
-			(<any>sourcemaps).mapSources((sourcePath: string) => {
-				if (sourcePath === 'bootstrap-fork.js') {
-					return 'bootstrap-fork.orig.js';
-				}
-
-				return sourcePath;
-			}),
 			sourcemaps.write('./', {
 				sourceMappingURL,
 				sourceRoot: undefined,

build/lib/reporter.js

@@ -6,8 +6,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const es = require("event-stream");
 const _ = require("underscore");
-const fancyLog = require("fancy-log");
+const util = require("gulp-util");
-const ansiColors = require("ansi-colors");
 const fs = require("fs");
 const path = require("path");
 const allErrors = [];
@@ -18,7 +17,7 @@ function onStart() {
         return;
     }
     startTime = new Date().getTime();
-    fancyLog(`Starting ${ansiColors.green('compilation')}...`);
+    util.log(`Starting ${util.colors.green('compilation')}...`);
 }
 function onEnd() {
     if (--count > 0) {
@@ -39,7 +38,7 @@ function log() {
     errors.map(err => {
         if (!seen.has(err)) {
             seen.add(err);
-            fancyLog(`${ansiColors.red('Error')}: ${err}`);
+            util.log(`${util.colors.red('Error')}: ${err}`);
         }
     });
     const regex = /^([^(]+)\((\d+),(\d+)\): (.*)$/;
@@ -54,7 +53,7 @@ function log() {
     catch (err) {
         //noop
     }
-    fancyLog(`Finished ${ansiColors.green('compilation')} with ${errors.length} errors after ${ansiColors.magenta((new Date().getTime() - startTime) + ' ms')}`);
+    util.log(`Finished ${util.colors.green('compilation')} with ${errors.length} errors after ${util.colors.magenta((new Date().getTime() - startTime) + ' ms')}`);
 }
 function createReporter() {
     const errors = [];

build/lib/reporter.ts

@@ -7,8 +7,7 @@
 
 import * as es from 'event-stream';
 import * as _ from 'underscore';
-import * as fancyLog from 'fancy-log';
+import * as util from 'gulp-util';
-import * as ansiColors from 'ansi-colors';
 import * as fs from 'fs';
 import * as path from 'path';
 
@@ -22,7 +21,7 @@ function onStart(): void {
 	}
 
 	startTime = new Date().getTime();
-	fancyLog(`Starting ${ansiColors.green('compilation')}...`);
+	util.log(`Starting ${util.colors.green('compilation')}...`);
 }
 
 function onEnd(): void {
@@ -48,7 +47,7 @@ function log(): void {
 	errors.map(err => {
 		if (!seen.has(err)) {
 			seen.add(err);
-			fancyLog(`${ansiColors.red('Error')}: ${err}`);
+			util.log(`${util.colors.red('Error')}: ${err}`);
 		}
 	});
 
@@ -66,7 +65,7 @@ function log(): void {
 		//noop
 	}
 
-	fancyLog(`Finished ${ansiColors.green('compilation')} with ${errors.length} errors after ${ansiColors.magenta((new Date().getTime() - startTime!) + ' ms')}`);
+	util.log(`Finished ${util.colors.green('compilation')} with ${errors.length} errors after ${util.colors.magenta((new Date().getTime() - startTime!) + ' ms')}`);
 }
 
 export interface IReporter {

build/lib/standalone.js

@@ -27,23 +27,23 @@ function writeFile(filePath, contents) {
     fs.writeFileSync(filePath, contents);
 }
 function extractEditor(options) {
-    const tsConfig = JSON.parse(fs.readFileSync(path.join(options.sourcesRoot, 'tsconfig.monaco.json')).toString());
+    const tsConfig = JSON.parse(fs.readFileSync(path.join(options.sourcesRoot, 'tsconfig.json')).toString());
     let compilerOptions;
     if (tsConfig.extends) {
         compilerOptions = Object.assign({}, require(path.join(options.sourcesRoot, tsConfig.extends)).compilerOptions, tsConfig.compilerOptions);
-        delete tsConfig.extends;
     }
     else {
         compilerOptions = tsConfig.compilerOptions;
     }
     tsConfig.compilerOptions = compilerOptions;
-    compilerOptions.noEmit = false;
     compilerOptions.noUnusedLocals = false;
     compilerOptions.preserveConstEnums = false;
     compilerOptions.declaration = false;
     compilerOptions.moduleResolution = ts.ModuleResolutionKind.Classic;
+    delete compilerOptions.types;
+    delete tsConfig.extends;
+    tsConfig.exclude = [];
     options.compilerOptions = compilerOptions;
-    console.log(`Running with shakeLevel ${tss.toStringShakeLevel(options.shakeLevel)}`);
     let result = tss.shake(options);
     for (let fileName in result) {
         if (result.hasOwnProperty(fileName)) {
@@ -119,7 +119,8 @@ function createESMSourcesAndResources2(options) {
         return path.join(OUT_RESOURCES_FOLDER, dest);
     };
     const allFiles = walkDirRecursive(SRC_FOLDER);
-    for (const file of allFiles) {
+    for (let i = 0; i < allFiles.length; i++) {
+        const file = allFiles[i];
         if (options.ignores.indexOf(file.replace(/\\/g, '/')) >= 0) {
             continue;
         }