Bump event-stream to 3.3.4

* handle clearing xml in qp view

* formatting

.gitattributes

@@ -0,0 +1,9 @@
+* text=auto
+
+LICENSE.txt eol=crlf
+ThirdPartyNotices.txt eol=crlf
+
+*.bat eol=crlf
+*.cmd eol=crlf
+*.ps1 eol=lf
+*.sh eol=lf

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,14 @@
+---
+name: Bug report
+about: Create a report to help us improve
+---
+
+<!-- Please search existing issues to avoid creating duplicates. -->
+<!-- Also please test using the latest insiders build to make sure your issue has not already been fixed. -->
+
+<!-- Use Help > Report Issue to prefill these. -->
+- Azure Data Studio Version:
+
+Steps to Reproduce:
+
+1.

.gitignore

@@ -6,6 +6,9 @@ node_modules/
 out/
 out-build/
 out-editor/
+out-editor-src/
+out-editor-build/
+out-editor-esm/
 out-editor-min/
 out-monaco-editor-core/
 out-vscode/
@@ -13,4 +16,5 @@ out-vscode-min/
 build/node_modules
 coverage/
 test_data/
+test-results/
 yarn-error.log

.travis.yml

@@ -1,60 +0,0 @@
-sudo: false
-language: cpp
-
-os:
-  - linux
-  - osx
-
-cache:
-  directories:
-    - $HOME/.cache/yarn
-
-notifications:
-  email: false
-  webhooks:
-    - http://vscode-probot.westus.cloudapp.azure.com:3450/travis/notifications
-    - http://vscode-test-probot.westus.cloudapp.azure.com:3450/travis/notifications
-
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - gcc-4.9
-      - g++-4.9
-      - gcc-4.9-multilib
-      - g++-4.9-multilib
-      - zip
-      - libgtk2.0-0
-      - libx11-dev
-      - libxkbfile-dev
-      - libsecret-1-dev
-
-before_install:
-  - git submodule update --init --recursive
-  - git clone --depth 1 https://github.com/creationix/nvm.git ./.nvm
-  - source ./.nvm/nvm.sh
-  - nvm install 8.9.1
-  - nvm use 8.9.1
-  - npm i -g yarn
-  # - npm config set python `which python`
-  - if [ $TRAVIS_OS_NAME == "linux" ]; then
-      export CXX="g++-4.9" CC="gcc-4.9" DISPLAY=:99.0;
-      sh -e /etc/init.d/xvfb start;
-      sleep 3;
-    fi
-  # Make npm logs less verbose
-  # - npm config set depth 0
-  # - npm config set loglevel warn
-
-install:
-  - yarn
-
-script:
-  - node_modules/.bin/gulp electron --silent
-  - node_modules/.bin/gulp compile --silent --max_old_space_size=4096
-  - node_modules/.bin/gulp optimize-vscode --silent --max_old_space_size=4096
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./scripts/test.sh --coverage --reporter dot; else ./scripts/test.sh --reporter dot; fi
-
-after_success:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then node_modules/.bin/coveralls < .build/coverage/lcov.info; fi

.vscode/extensions.json

@@ -1,9 +1,9 @@
 {
-	// See http://go.microsoft.com/fwlink/?LinkId=827846
+	// See https://go.microsoft.com/fwlink/?LinkId=827846
 	// for the documentation about the extensions.json format
 	"recommendations": [
 		"eg2.tslint",
 		"dbaeumer.vscode-eslint",
 		"msjsdiag.debugger-for-chrome"
 	]
-}
+}

.vscode/launch.json

@@ -66,13 +66,13 @@
 		{
 			"type": "chrome",
 			"request": "attach",
-			"name": "Attach to sqlops",
+			"name": "Attach to azuredatastudio",
 			"port": 9222
 		},
 		{
 			"type": "chrome",
 			"request": "launch",
-			"name": "Launch sqlops",
+			"name": "Launch azuredatastudio",
 			"windows": {
 				"runtimeExecutable": "${workspaceFolder}/scripts/sql.bat"
 			},
@@ -89,7 +89,8 @@
 			"skipFiles": [
 				"**/winjs*.js"
 			],
-			"webRoot": "${workspaceFolder}"
+			"webRoot": "${workspaceFolder}",
+			"timeout": 45000
 		},
 		{
 			"type": "node",
@@ -97,14 +98,15 @@
 			"name": "Unit Tests",
 			"protocol": "inspector",
 			"program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
-			"runtimeExecutable": "${workspaceFolder}/.build/electron/SQL Operations Studio.app/Contents/MacOS/Electron",
+			"runtimeExecutable": "${workspaceFolder}/.build/electron/Azure Data Studio.app/Contents/MacOS/Electron",
 			"windows": {
-				"runtimeExecutable": "${workspaceFolder}/.build/electron/sqlops.exe"
+				"runtimeExecutable": "${workspaceFolder}/.build/electron/azuredatastudio.exe"
 			},
 			"linux": {
-				"runtimeExecutable": "${workspaceFolder}/.build/electron/sqlops"
+				"runtimeExecutable": "${workspaceFolder}/.build/electron/azuredatastudio"
 			},
 			"stopOnEntry": false,
+			"outputCapture": "std",
 			"args": [
 				"--delay",
 				"--timeout",
@@ -117,22 +119,38 @@
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
 			]
+		},
+		{
+			"name": "Launch Built-in Extension",
+			"type": "extensionHost",
+			"request": "launch",
+			"runtimeExecutable": "${execPath}",
+			"args": [
+				"--extensionDevelopmentPath=${workspaceRoot}/extensions/debug-auto-launch"
+			]
 		}
 	],
 	"compounds": [
 		{
-			"name": "Debug sqlops Main and Renderer",
+			"name": "Debug azuredatastudio Main and Renderer",
 			"configurations": [
-				"Launch sqlops",
+				"Launch azuredatastudio",
 				"Attach to Main Process"
 			]
 		},
 		{
 			"name": "Search and Renderer processes",
 			"configurations": [
-				"Launch sqlops",
+				"Launch azuredatastudio",
 				"Attach to Search Process"
 			]
+		},
+		{
+			"name": "Renderer and Extension Host processes",
+			"configurations": [
+				"Launch azuredatastudio",
+				"Attach to Extension Host"
+			]
 		}
 	]
-}
+}

.vscode/settings.json

@@ -38,5 +38,11 @@
 			}
 		}
 	],
-	"typescript.tsdk": "node_modules/typescript/lib"
+	"typescript.tsdk": "node_modules/typescript/lib",
+	"npm.exclude": "**/extensions/**",
+	"git.ignoreLimitWarning": true,
+	"emmet.excludeLanguages": [],
+	"typescript.preferences.importModuleSpecifier": "non-relative",
+	"typescript.preferences.quoteStyle": "single"
+
 }

.yarnrc

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

CHANGELOG.md

@@ -1,12 +1,163 @@
 # Change Log
 
+## Version 1.2.4
+* Release date: November 6, 2018
+* Release status: General Availability
+
+## What's new in this version
+* Update to the SQL Server 2019 Preview extension
+* Introducing Paste the Plan extension
+* Introducing High Color queries extension, including SSMS editor theme
+* Fixes in SQL Server Agent, Profiler, and Import extensions
+* Fix .Net Core Socket KeepAlive issue causing dropped inactive connections on macOS
+* Upgrade SQL Tools Service to .Net Core 2.2 Preview 3 (for eventual AAD support)
+* Fix customer reported GitHub issues
+
+## 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:
+
+* rdaniels6813  for `Add query plan theme support #3031`
+* Ruturaj123 for `Fixed some typos and grammatical errors #3027`
+* PromoFaux for `Use emoji shortcodes in CONTRIBUTING.md instead of <20> #3009`
+* ckaczor for `Fix: DATETIMEOFFSET data types should be ISO formatted #714`
+* hi-im-T0dd for `Fixed sync issue with my forked master so this commit is correct #2948`
+* hi-im-T0dd for `Fixed when right clicking and selecting Manage-correct name displays #2794`
+
+## Version 1.1.3
+* Release date: October 18, 2018
+* Release status: General Availability
+
+## What's new in this version
+* Introducing the Azure Resource Explorer to browse Azure SQL Databases
+* Improve Object Explorer and Query Editor connectivity robustness
+* SQL Server 2019 and SQL Agent extension improvements
+
+## 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:
+
+* philoushka  for `center the icon #2760`
+* anthonypants for `Typo #2775`
+* kstolte for `Fix Invalid Configuration in Launch.json #2789`
+* kstolte for `Fixing a reference to SQL Ops Studio #2788`
+
+## Version 1.0.0
+* Release date: September 24, 2018
+* Release status: General Availability
+
+## What's new in this version
+* Announcing the SQL Server 2019 Preview extension.
+  * Support for SQL Server 2019 preview features including big data cluster support.
+  * Azure Data Studio Notebooks
+  * The Azure Resource Explorer viewlets you browse data-related endpoints for your Azure accounts and create connections to them in Object Explorer. In this release Azure SQL Databases and servers are supported.
+  * SQL Server Polybase Create External Table Wizard
+* Query Results Grid performance and UX improvements for large number of result sets.
+* Visual Studio Code source code refresh from 1.23 to 1.26.1 with Grid Layout and Improved Settings Editor (preview).
+* Accessibility improvements for screen reader, keyboard navigation and high-contrast.
+* Added Connection name option to provide an alternative display name in the Servers viewlet.
+
+## 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:
+
+* AlexFsmn `Feature: Ability to add connection name #2332`
+* AlexFsmn `Disabled connection name input when connecting to a server. #2566`
+
+## Version 0.33.7
+* Release date: August 30, 2018
+* Release status: Public Preview
+
+## What's new in this version
+* Announcing the SQL Server Import Extension
+* SQL Server Profiler Session management
+* SQL Server Agent improvements
+* New community extension: First Responder Kit
+* Quality of Life improvements: Connection strings
+* Fix many customer reported GitHub issues
+
+## 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:
+
+* SebastianPfliegel `Added more saveAsCsv options #2099`
+* ianychoi `Fixes a typo: Mimunum -> Minimum #1994`
+* AlexFsmn `Fixed bug where proper file extension wasn't appended to filename. #2151`
+* AlexFsmn `Added functionality for adding any file to import wizard #2329`
+* AlexFsmn `Fixed background issue when copying a chart to clipboard #2215`
+* AlexFsmn `Fixed problem where vertical charts didn't display labels correctly. #2263`
+* AlexFsmn `Fixed Initial values for charts to match visuals #2266`
+* AlexFsmn `Renamed chart option labels #2264`
+* AlexFsmn `Added feature for opening file after exporting to CSV/XLS/JSON & query files #2216`
+* AlexFsmm `Get Connection String should copy to clipboard #2175`
+
+## Version 0.31.4
+* Release date: July 19, 2018
+* Release status: Public Preview
+
+## What's new in this version
+* SQL Server Agent for Azure Data Studio extension improvements
+  * Added view of Alerts, Operators, and Proxies and icons on left pane
+  * Added dialogs for New Job, New Job Step, New Alert, and New Operator
+  * Added Delete Job, Delete Alert, and Delete Operator (right-click)
+  * Added Previous Runs visualization
+  * Added Filters for each column name
+* SQL Server Profiler for Azure Data Studio extension improvements
+  * Added Hotkeys to quickly launch and start/stop Profiler
+  * Added 5 Default Templates to view Extended Events
+  * Added Server/Database connection name
+  * Added support for Azure SQL Database instances
+  * Added suggestion to exit Profiler when tab is closed when Profiler is still running
+* Release of Combine Scripts Extension
+* Wizard and Dialog Extensibility
+* Fix GitHub Issues
+
+## Version 0.30.6
+* Release date: June 20, 2018
+* Release status: Public Preview
+
+## What's new in this version
+* **SQL Server Profiler for Azure Data Studio  *Preview*** extension initial release
+* The new **SQL Data Warehouse** extension includes rich customizable dashboard widgets surfacing insights to your data warehouse. This unlocks key scenarios around managing and tuning your data warehouse to ensure it is optimized for consistent performance.
+* **Edit Data "Filtering and Sorting"** support
+* **SQL Server Agent for Azure Data Studio *Preview*** extension enhancements for Jobs and Job History views
+* Improved **Wizard & Dialog UI Builder Framework** extensibility APIs
+* Update VS Code Platform source code integrating [March 2018 (1.22)](https://code.visualstudio.com/updates/v1_22) and [April 2018 (1.23)](https://code.visualstudio.com/updates/v1_23)  releases
+* Fix GitHub Issues
+
+## Version 0.29.3
+* Release date: May 7, 2018
+* Release status: Public Preview
+
+## What's new in this version
+The May release is focused on stabilization and bug fixes leading up to the Build conference.  This build contains the following highlights.
+
+* Announcing **Redgate SQL Search** extension available in Extension Manager
+* Community Localization available for 10 languages: **German, Spanish, French, Italian, Japanese, Korean, Portuguese, Russian, Simplified Chinese and Traditional Chinese!**
+* Reduced telemetry collection, improved [opt-out](https://github.com/Microsoft/azuredatastudio/wiki/How-to-Disable-Telemetry-Reporting) experience and in-product links to [Privacy Statement](https://privacy.microsoft.com/en-us/privacystatement)
+* Extension Manager has improved Marketplace experience to easily discover community extensions
+* SQL Agent extension Jobs and Job History view improvement
+* Updates for **whoisactive** and **Server Reports** extensions
+* Continue to fix GitHub issues
+
+## Version 0.28.6
+* Release date: April 25, 2018
+* Release status: Public Preview
+
+## What's new in this version
+The April Public Preview release contains some of the following highlights.
+
+* Improvements to SQL Agent *Preview* extension
+* Accessibility improvements for keyboard navigation, screen reader support and high-contrast mode.
+* Improved large and protected file support for saving Admin protected and >256M files within SQL Ops Studio
+* Integrated Terminal splitting to work with multiple open terminals at once
+* Reduced installation on-disk file count foot print for faster installs and startup times
+* Improvements to Server Reports extension
+* Continue to fix GitHub issues
+
 ## Version 0.27.3
 * Release date: March 28, 2017
 * Release status: Public Preview
 
 ## What's new in this version
-The March Public Preview release enables some key aspects of the SQL Operations
-Studio extensibility story.  Here are some highlights in this release.
+The March Public Preview release enables some key aspects of the Azure Data Studio
+extensibility story.  Here are some highlights in this release.
 
 * Enhance the Manage Dashboard extensibility model to support tabbed Insights and Configuration panes
 * Dashboard Insights extensions for `sp_whoisactive` from [whoisactive.com](http://whoisactive.com)

CONTRIBUTING.md

@@ -1,13 +1,13 @@
 ## Contributing Issues
 
 ### Before Submitting an Issue
-First, please do a search in [open issues](https://github.com/Microsoft/sqlopsstudio/issues) to see if the issue or feature request has already been filed. Use this [query](https://github.com/Microsoft/sqlopsstudio/issues?q=is%3Aopen+is%3Aissue+label%3Afeature-request+sort%3Areactions-%2B1-desc) to search for the most popular feature requests.
+First, please do a search in [open issues](https://github.com/Microsoft/azuredatastudio/issues) to see if the issue or feature request has already been filed. Use this [query](https://github.com/Microsoft/azuredatastudio/issues?q=is%3Aopen+is%3Aissue+label%3Afeature-request+sort%3Areactions-%2B1-desc) to search for the most popular feature requests.
 
 If you find your issue already exists, make relevant comments and add your [reaction](https://github.com/blog/2119-add-reactions-to-pull-requests-issues-and-comments). Use a reaction in place of a "+1" comment.
 
-👍 - upvote
+:+1: - upvote
 
-👎 - downvote
+:-1: - downvote
 
 If you cannot find an existing issue that describes your bug or feature, submit an issue using the guidelines below.
 
@@ -18,29 +18,29 @@ File a single issue per problem and feature request.
 * Do not enumerate multiple bugs or feature requests in the same issue.
 * Do not add your issue as a comment to an existing issue unless it's for the identical input. Many issues look similar, but have different causes.
 
-The more information you can provide, the more likely someone will be successful reproducing the issue and finding a fix. 
+The more information you can provide, the more likely someone will be successful reproducing the issue and finding a fix.
 
-Please include the following with each issue. 
+Please include the following with each issue.
 
-* Version of SQL Ops Studio
+* Version of Azure Data Studio (formerly SQL Operations Studio).
 
-> **Tip:** You can easily create an issue using `Report Issues` from SQL Operations Studio Help menu. 
+> **Tip:** You can easily create an issue using `Report Issues` from Azure Data Studio Help menu.
 
-* Reproducible steps (1... 2... 3...) and what you expected versus what you actually saw. 
-* Images, animations, or a link to a video. 
-* A code snippet that demonstrates the issue or a link to a code repository we can easily pull down onto our machine to recreate the issue. 
+* Reproducible steps (1... 2... 3...) and what you expected versus what you actually saw.
+* Images, animations, or a link to a video.
+* A code snippet that demonstrates the issue or a link to a code repository we can easily pull down onto our machine to recreate the issue.
 
-> **Note:** Because we need to copy and paste the code snippet, including a code snippet as a media file (i.e. .gif) is not sufficient. 
+> **Note:** Because we need to copy and paste the code snippet, including a code snippet as a media file (i.e. .gif) is not sufficient.
 
 * Errors in the Dev Tools Console (Help | Toggle Developer Tools)
 
 Please remember to do the following:
 
-* Search the issue repository to see if there exists a duplicate. 
-* Simplify your scripts around the issue so we can better isolate the problem. 
+* Search the issue repository to see if there exists a duplicate.
+* Simplify your scripts around the issue so we can better isolate the problem.
 
 Don't feel bad if we can't reproduce the issue and ask for more information!
 
 ## Contributing Fixes
 If you are interested in fixing issues and contributing directly to the code base,
-please see the document [How to Contribute](https://github.com/Microsoft/sqlopsstudio/wiki/How-to-Contribute).
+please see the document [How to Contribute](https://github.com/Microsoft/azuredatastudio/wiki/How-to-Contribute).

LICENSE.txt

@@ -1,14 +1,14 @@
 MICROSOFT SOFTWARE LICENSE TERMS
 
-MICROSOFT SQL OPERATIONS STUDIO
+MICROSOFT AZURE DATA STUDIO
 
 Microsoft Corporation ("Microsoft") grants you a nonexclusive, perpetual,
 royalty-free right to use, copy, and modify the software code provided by us
-("Software Code"). You may not sublicense the Software Code or any use of it 
-(except to your affiliates and to vendors to perform work on your behalf) 
-through distribution, network access, service agreement, lease, rental, or 
-otherwise. Unless applicable law gives you more rights, Microsoft reserves all 
-other rights not expressly granted herein, whether by implication, estoppel or 
+("Software Code"). You may not sublicense the Software Code or any use of it
+(except to your affiliates and to vendors to perform work on your behalf)
+through distribution, network access, service agreement, lease, rental, or
+otherwise. Unless applicable law gives you more rights, Microsoft reserves all
+other rights not expressly granted herein, whether by implication, estoppel or
 otherwise.
 
 THE SOFTWARE CODE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY

OSSREADME.json

@@ -62,7 +62,7 @@
 },
 {
 	"name": "chromium",
-	"version": "58.0.3029.110",
+	"version": "61.0.3163.100",
 	"repositoryURL": "http://www.chromium.org/Home",
 	"licenseDetail": [
 		"BSD License",
@@ -98,20 +98,20 @@
 },
 {
 	"name": "libchromiumcontent",
-	"version": "58.0.3029.110",
+	"version": "61.0.3163.100",
 	"license": "MIT",
 	"repositoryURL": "https://github.com/electron/libchromiumcontent",
 	"isProd": true
 },
 {
 	"name": "nodejs",
-	"version": "7.9.0",
+	"version": "8.9.3",
 	"repositoryURL": "https://github.com/nodejs/node",
 	"isProd": true
 },
 {
 	"name": "electron",
-	"version": "1.7.3",
+	"version": "2.0.5",
 	"license": "MIT",
 	"repositoryURL": "https://github.com/electron/electron",
 	"isProd": true
@@ -808,5 +808,944 @@
 		"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE",
 		"SOFTWARE"
 	]
+},
+{
+	"name": "mdn-data",
+	"version": "1.1.12",
+	"repositoryURL": "https://github.com/mdn/data",
+	"license": "MPL",
+	"licenseDetail": [
+		"Mozilla Public License Version 2.0",
+		"",
+		"Copyright (c) 2018 Mozilla Corporation",
+		"",
+		"==================================",
+		"",
+		"1. Definitions",
+		"--------------",
+		"",
+		"1.1. \"Contributor\"",
+		"    means each individual or legal entity that creates, contributes to",
+		"    the creation of, or owns Covered Software.",
+		"",
+		"1.2. \"Contributor Version\"",
+		"    means the combination of the Contributions of others (if any) used",
+		"    by a Contributor and that particular Contributor's Contribution.",
+		"",
+		"1.3. \"Contribution\"",
+		"    means Covered Software of a particular Contributor.",
+		"",
+		"1.4. \"Covered Software\"",
+		"    means Source Code Form to which the initial Contributor has attached",
+		"    the notice in Exhibit A, the Executable Form of such Source Code",
+		"    Form, and Modifications of such Source Code Form, in each case",
+		"    including portions thereof.",
+		"",
+		"1.5. \"Incompatible With Secondary Licenses\"",
+		"    means",
+		"",
+		"    (a) that the initial Contributor has attached the notice described",
+		"        in Exhibit B to the Covered Software; or",
+		"",
+		"    (b) that the Covered Software was made available under the terms of",
+		"        version 1.1 or earlier of the License, but not also under the",
+		"        terms of a Secondary License.",
+		"",
+		"1.6. \"Executable Form\"",
+		"    means any form of the work other than Source Code Form.",
+		"",
+		"1.7. \"Larger Work\"",
+		"    means a work that combines Covered Software with other material, in",
+		"    a separate file or files, that is not Covered Software.",
+		"",
+		"1.8. \"License\"",
+		"    means this document.",
+		"",
+		"1.9. \"Licensable\"",
+		"    means having the right to grant, to the maximum extent possible,",
+		"    whether at the time of the initial grant or subsequently, any and",
+		"    all of the rights conveyed by this License.",
+		"",
+		"1.10. \"Modifications\"",
+		"    means any of the following:",
+		"",
+		"    (a) any file in Source Code Form that results from an addition to,",
+		"        deletion from, or modification of the contents of Covered",
+		"        Software; or",
+		"",
+		"    (b) any new file in Source Code Form that contains any Covered",
+		"        Software.",
+		"",
+		"1.11. \"Patent Claims\" of a Contributor",
+		"    means any patent claim(s), including without limitation, method,",
+		"    process, and apparatus claims, in any patent Licensable by such",
+		"    Contributor that would be infringed, but for the grant of the",
+		"    License, by the making, using, selling, offering for sale, having",
+		"    made, import, or transfer of either its Contributions or its",
+		"    Contributor Version.",
+		"",
+		"1.12. \"Secondary License\"",
+		"    means either the GNU General Public License, Version 2.0, the GNU",
+		"    Lesser General Public License, Version 2.1, the GNU Affero General",
+		"    Public License, Version 3.0, or any later versions of those",
+		"    licenses.",
+		"",
+		"1.13. \"Source Code Form\"",
+		"    means the form of the work preferred for making modifications.",
+		"",
+		"1.14. \"You\" (or \"Your\")",
+		"    means an individual or a legal entity exercising rights under this",
+		"    License. For legal entities, \"You\" includes any entity that",
+		"    controls, is controlled by, or is under common control with You. For",
+		"    purposes of this definition, \"control\" means (a) the power, direct",
+		"    or indirect, to cause the direction or management of such entity,",
+		"    whether by contract or otherwise, or (b) ownership of more than",
+		"    fifty percent (50%) of the outstanding shares or beneficial",
+		"    ownership of such entity.",
+		"",
+		"2. License Grants and Conditions",
+		"--------------------------------",
+		"",
+		"2.1. Grants",
+		"",
+		"Each Contributor hereby grants You a world-wide, royalty-free,",
+		"non-exclusive license:",
+		"",
+		"(a) under intellectual property rights (other than patent or trademark)",
+		"    Licensable by such Contributor to use, reproduce, make available,",
+		"    modify, display, perform, distribute, and otherwise exploit its",
+		"    Contributions, either on an unmodified basis, with Modifications, or",
+		"    as part of a Larger Work; and",
+		"",
+		"(b) under Patent Claims of such Contributor to make, use, sell, offer",
+		"    for sale, have made, import, and otherwise transfer either its",
+		"    Contributions or its Contributor Version.",
+		"",
+		"2.2. Effective Date",
+		"",
+		"The licenses granted in Section 2.1 with respect to any Contribution",
+		"become effective for each Contribution on the date the Contributor first",
+		"distributes such Contribution.",
+		"",
+		"2.3. Limitations on Grant Scope",
+		"",
+		"The licenses granted in this Section 2 are the only rights granted under",
+		"this License. No additional rights or licenses will be implied from the",
+		"distribution or licensing of Covered Software under this License.",
+		"Notwithstanding Section 2.1(b) above, no patent license is granted by a",
+		"Contributor:",
+		"",
+		"(a) for any code that a Contributor has removed from Covered Software;",
+		"    or",
+		"",
+		"(b) for infringements caused by: (i) Your and any other third party's",
+		"    modifications of Covered Software, or (ii) the combination of its",
+		"    Contributions with other software (except as part of its Contributor",
+		"    Version); or",
+		"",
+		"(c) under Patent Claims infringed by Covered Software in the absence of",
+		"    its Contributions.",
+		"",
+		"This License does not grant any rights in the trademarks, service marks,",
+		"or logos of any Contributor (except as may be necessary to comply with",
+		"the notice requirements in Section 3.4).",
+		"",
+		"2.4. Subsequent Licenses",
+		"",
+		"No Contributor makes additional grants as a result of Your choice to",
+		"distribute the Covered Software under a subsequent version of this",
+		"License (see Section 10.2) or under the terms of a Secondary License (if",
+		"permitted under the terms of Section 3.3).",
+		"",
+		"2.5. Representation",
+		"",
+		"Each Contributor represents that the Contributor believes its",
+		"Contributions are its original creation(s) or it has sufficient rights",
+		"to grant the rights to its Contributions conveyed by this License.",
+		"",
+		"2.6. Fair Use",
+		"",
+		"This License is not intended to limit any rights You have under",
+		"applicable copyright doctrines of fair use, fair dealing, or other",
+		"equivalents.",
+		"",
+		"2.7. Conditions",
+		"",
+		"Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted",
+		"in Section 2.1.",
+		"",
+		"3. Responsibilities",
+		"-------------------",
+		"",
+		"3.1. Distribution of Source Form",
+		"",
+		"All distribution of Covered Software in Source Code Form, including any",
+		"Modifications that You create or to which You contribute, must be under",
+		"the terms of this License. You must inform recipients that the Source",
+		"Code Form of the Covered Software is governed by the terms of this",
+		"License, and how they can obtain a copy of this License. You may not",
+		"attempt to alter or restrict the recipients' rights in the Source Code",
+		"Form.",
+		"",
+		"3.2. Distribution of Executable Form",
+		"",
+		"If You distribute Covered Software in Executable Form then:",
+		"",
+		"(a) such Covered Software must also be made available in Source Code",
+		"    Form, as described in Section 3.1, and You must inform recipients of",
+		"    the Executable Form how they can obtain a copy of such Source Code",
+		"    Form by reasonable means in a timely manner, at a charge no more",
+		"    than the cost of distribution to the recipient; and",
+		"",
+		"(b) You may distribute such Executable Form under the terms of this",
+		"    License, or sublicense it under different terms, provided that the",
+		"    license for the Executable Form does not attempt to limit or alter",
+		"    the recipients' rights in the Source Code Form under this License.",
+		"",
+		"3.3. Distribution of a Larger Work",
+		"",
+		"You may create and distribute a Larger Work under terms of Your choice,",
+		"provided that You also comply with the requirements of this License for",
+		"the Covered Software. If the Larger Work is a combination of Covered",
+		"Software with a work governed by one or more Secondary Licenses, and the",
+		"Covered Software is not Incompatible With Secondary Licenses, this",
+		"License permits You to additionally distribute such Covered Software",
+		"under the terms of such Secondary License(s), so that the recipient of",
+		"the Larger Work may, at their option, further distribute the Covered",
+		"Software under the terms of either this License or such Secondary",
+		"License(s).",
+		"",
+		"3.4. Notices",
+		"",
+		"You may not remove or alter the substance of any license notices",
+		"(including copyright notices, patent notices, disclaimers of warranty,",
+		"or limitations of liability) contained within the Source Code Form of",
+		"the Covered Software, except that You may alter any license notices to",
+		"the extent required to remedy known factual inaccuracies.",
+		"",
+		"3.5. Application of Additional Terms",
+		"",
+		"You may choose to offer, and to charge a fee for, warranty, support,",
+		"indemnity or liability obligations to one or more recipients of Covered",
+		"Software. However, You may do so only on Your own behalf, and not on",
+		"behalf of any Contributor. You must make it absolutely clear that any",
+		"such warranty, support, indemnity, or liability obligation is offered by",
+		"You alone, and You hereby agree to indemnify every Contributor for any",
+		"liability incurred by such Contributor as a result of warranty, support,",
+		"indemnity or liability terms You offer. You may include additional",
+		"disclaimers of warranty and limitations of liability specific to any",
+		"jurisdiction.",
+		"",
+		"4. Inability to Comply Due to Statute or Regulation",
+		"---------------------------------------------------",
+		"",
+		"If it is impossible for You to comply with any of the terms of this",
+		"License with respect to some or all of the Covered Software due to",
+		"statute, judicial order, or regulation then You must: (a) comply with",
+		"the terms of this License to the maximum extent possible; and (b)",
+		"describe the limitations and the code they affect. Such description must",
+		"be placed in a text file included with all distributions of the Covered",
+		"Software under this License. Except to the extent prohibited by statute",
+		"or regulation, such description must be sufficiently detailed for a",
+		"recipient of ordinary skill to be able to understand it.",
+		"",
+		"5. Termination",
+		"--------------",
+		"",
+		"5.1. The rights granted under this License will terminate automatically",
+		"if You fail to comply with any of its terms. However, if You become",
+		"compliant, then the rights granted under this License from a particular",
+		"Contributor are reinstated (a) provisionally, unless and until such",
+		"Contributor explicitly and finally terminates Your grants, and (b) on an",
+		"ongoing basis, if such Contributor fails to notify You of the",
+		"non-compliance by some reasonable means prior to 60 days after You have",
+		"come back into compliance. Moreover, Your grants from a particular",
+		"Contributor are reinstated on an ongoing basis if such Contributor",
+		"notifies You of the non-compliance by some reasonable means, this is the",
+		"first time You have received notice of non-compliance with this License",
+		"from such Contributor, and You become compliant prior to 30 days after",
+		"Your receipt of the notice.",
+		"",
+		"5.2. If You initiate litigation against any entity by asserting a patent",
+		"infringement claim (excluding declaratory judgment actions,",
+		"counter-claims, and cross-claims) alleging that a Contributor Version",
+		"directly or indirectly infringes any patent, then the rights granted to",
+		"You by any and all Contributors for the Covered Software under Section",
+		"2.1 of this License shall terminate.",
+		"",
+		"5.3. In the event of termination under Sections 5.1 or 5.2 above, all",
+		"end user license agreements (excluding distributors and resellers) which",
+		"have been validly granted by You or Your distributors under this License",
+		"prior to termination shall survive termination.",
+		"",
+		"************************************************************************",
+		"*                                                                      *",
+		"*  6. Disclaimer of Warranty                                           *",
+		"*  -------------------------                                           *",
+		"*                                                                      *",
+		"*  Covered Software is provided under this License on an \"as is\"       *",
+		"*  basis, without warranty of any kind, either expressed, implied, or  *",
+		"*  statutory, including, without limitation, warranties that the       *",
+		"*  Covered Software is free of defects, merchantable, fit for a        *",
+		"*  particular purpose or non-infringing. The entire risk as to the     *",
+		"*  quality and performance of the Covered Software is with You.        *",
+		"*  Should any Covered Software prove defective in any respect, You     *",
+		"*  (not any Contributor) assume the cost of any necessary servicing,   *",
+		"*  repair, or correction. This disclaimer of warranty constitutes an   *",
+		"*  essential part of this License. No use of any Covered Software is   *",
+		"*  authorized under this License except under this disclaimer.         *",
+		"*                                                                      *",
+		"************************************************************************",
+		"",
+		"************************************************************************",
+		"*                                                                      *",
+		"*  7. Limitation of Liability                                          *",
+		"*  --------------------------                                          *",
+		"*                                                                      *",
+		"*  Under no circumstances and under no legal theory, whether tort      *",
+		"*  (including negligence), contract, or otherwise, shall any           *",
+		"*  Contributor, or anyone who distributes Covered Software as          *",
+		"*  permitted above, be liable to You for any direct, indirect,         *",
+		"*  special, incidental, or consequential damages of any character      *",
+		"*  including, without limitation, damages for lost profits, loss of    *",
+		"*  goodwill, work stoppage, computer failure or malfunction, or any    *",
+		"*  and all other commercial damages or losses, even if such party      *",
+		"*  shall have been informed of the possibility of such damages. This   *",
+		"*  limitation of liability shall not apply to liability for death or   *",
+		"*  personal injury resulting from such party's negligence to the       *",
+		"*  extent applicable law prohibits such limitation. Some               *",
+		"*  jurisdictions do not allow the exclusion or limitation of           *",
+		"*  incidental or consequential damages, so this exclusion and          *",
+		"*  limitation may not apply to You.                                    *",
+		"*                                                                      *",
+		"************************************************************************",
+		"",
+		"8. Litigation",
+		"-------------",
+		"",
+		"Any litigation relating to this License may be brought only in the",
+		"courts of a jurisdiction where the defendant maintains its principal",
+		"place of business and such litigation shall be governed by laws of that",
+		"jurisdiction, without reference to its conflict-of-law provisions.",
+		"Nothing in this Section shall prevent a party's ability to bring",
+		"cross-claims or counter-claims.",
+		"",
+		"9. Miscellaneous",
+		"----------------",
+		"",
+		"This License represents the complete agreement concerning the subject",
+		"matter hereof. If any provision of this License is held to be",
+		"unenforceable, such provision shall be reformed only to the extent",
+		"necessary to make it enforceable. Any law or regulation which provides",
+		"that the language of a contract shall be construed against the drafter",
+		"shall not be used to construe this License against a Contributor.",
+		"",
+		"10. Versions of the License",
+		"---------------------------",
+		"",
+		"10.1. New Versions",
+		"",
+		"Mozilla Foundation is the license steward. Except as provided in Section",
+		"10.3, no one other than the license steward has the right to modify or",
+		"publish new versions of this License. Each version will be given a",
+		"distinguishing version number.",
+		"",
+		"10.2. Effect of New Versions",
+		"",
+		"You may distribute the Covered Software under the terms of the version",
+		"of the License under which You originally received the Covered Software,",
+		"or under the terms of any subsequent version published by the license",
+		"steward.",
+		"",
+		"10.3. Modified Versions",
+		"",
+		"If you create software not governed by this License, and you want to",
+		"create a new license for such software, you may create and use a",
+		"modified version of this License if you rename the license and remove",
+		"any references to the name of the license steward (except to note that",
+		"such modified license differs from this License).",
+		"",
+		"10.4. Distributing Source Code Form that is Incompatible With Secondary",
+		"Licenses",
+		"",
+		"If You choose to distribute Source Code Form that is Incompatible With",
+		"Secondary Licenses under the terms of this version of the License, the",
+		"notice described in Exhibit B of this License must be attached.",
+		"",
+		"Exhibit A - Source Code Form License Notice",
+		"-------------------------------------------",
+		"",
+		"  This Source Code Form is subject to the terms of the Mozilla Public",
+		"  License, v. 2.0. If a copy of the MPL was not distributed with this",
+		"  file, You can obtain one at http://mozilla.org/MPL/2.0/.",
+		"",
+		"If it is not possible or desirable to put the notice in a particular",
+		"file, then You may include the notice in a location (such as a LICENSE",
+		"file in a relevant directory) where a recipient would be likely to look",
+		"for such a notice.",
+		"",
+		"You may add additional accurate notices of copyright ownership.",
+		"",
+		"Exhibit B - \"Incompatible With Secondary Licenses\" Notice",
+		"---------------------------------------------------------",
+		"",
+		"  This Source Code Form is \"Incompatible With Secondary Licenses\", as",
+		"  defined by the Mozilla Public License, v. 2.0."
+	]
+},
+{
+	"name": "mdn-data",
+	"version": "1.1.12",
+	"repositoryURL": "https://github.com/mdn/data",
+	"license": "MPL",
+	"licenseDetail": [
+		"Mozilla Public License Version 2.0",
+		"",
+		"Copyright (c) 2018 Mozilla Corporation",
+		"",
+		"==================================",
+		"",
+		"1. Definitions",
+		"--------------",
+		"",
+		"1.1. \"Contributor\"",
+		"    means each individual or legal entity that creates, contributes to",
+		"    the creation of, or owns Covered Software.",
+		"",
+		"1.2. \"Contributor Version\"",
+		"    means the combination of the Contributions of others (if any) used",
+		"    by a Contributor and that particular Contributor's Contribution.",
+		"",
+		"1.3. \"Contribution\"",
+		"    means Covered Software of a particular Contributor.",
+		"",
+		"1.4. \"Covered Software\"",
+		"    means Source Code Form to which the initial Contributor has attached",
+		"    the notice in Exhibit A, the Executable Form of such Source Code",
+		"    Form, and Modifications of such Source Code Form, in each case",
+		"    including portions thereof.",
+		"",
+		"1.5. \"Incompatible With Secondary Licenses\"",
+		"    means",
+		"",
+		"    (a) that the initial Contributor has attached the notice described",
+		"        in Exhibit B to the Covered Software; or",
+		"",
+		"    (b) that the Covered Software was made available under the terms of",
+		"        version 1.1 or earlier of the License, but not also under the",
+		"        terms of a Secondary License.",
+		"",
+		"1.6. \"Executable Form\"",
+		"    means any form of the work other than Source Code Form.",
+		"",
+		"1.7. \"Larger Work\"",
+		"    means a work that combines Covered Software with other material, in",
+		"    a separate file or files, that is not Covered Software.",
+		"",
+		"1.8. \"License\"",
+		"    means this document.",
+		"",
+		"1.9. \"Licensable\"",
+		"    means having the right to grant, to the maximum extent possible,",
+		"    whether at the time of the initial grant or subsequently, any and",
+		"    all of the rights conveyed by this License.",
+		"",
+		"1.10. \"Modifications\"",
+		"    means any of the following:",
+		"",
+		"    (a) any file in Source Code Form that results from an addition to,",
+		"        deletion from, or modification of the contents of Covered",
+		"        Software; or",
+		"",
+		"    (b) any new file in Source Code Form that contains any Covered",
+		"        Software.",
+		"",
+		"1.11. \"Patent Claims\" of a Contributor",
+		"    means any patent claim(s), including without limitation, method,",
+		"    process, and apparatus claims, in any patent Licensable by such",
+		"    Contributor that would be infringed, but for the grant of the",
+		"    License, by the making, using, selling, offering for sale, having",
+		"    made, import, or transfer of either its Contributions or its",
+		"    Contributor Version.",
+		"",
+		"1.12. \"Secondary License\"",
+		"    means either the GNU General Public License, Version 2.0, the GNU",
+		"    Lesser General Public License, Version 2.1, the GNU Affero General",
+		"    Public License, Version 3.0, or any later versions of those",
+		"    licenses.",
+		"",
+		"1.13. \"Source Code Form\"",
+		"    means the form of the work preferred for making modifications.",
+		"",
+		"1.14. \"You\" (or \"Your\")",
+		"    means an individual or a legal entity exercising rights under this",
+		"    License. For legal entities, \"You\" includes any entity that",
+		"    controls, is controlled by, or is under common control with You. For",
+		"    purposes of this definition, \"control\" means (a) the power, direct",
+		"    or indirect, to cause the direction or management of such entity,",
+		"    whether by contract or otherwise, or (b) ownership of more than",
+		"    fifty percent (50%) of the outstanding shares or beneficial",
+		"    ownership of such entity.",
+		"",
+		"2. License Grants and Conditions",
+		"--------------------------------",
+		"",
+		"2.1. Grants",
+		"",
+		"Each Contributor hereby grants You a world-wide, royalty-free,",
+		"non-exclusive license:",
+		"",
+		"(a) under intellectual property rights (other than patent or trademark)",
+		"    Licensable by such Contributor to use, reproduce, make available,",
+		"    modify, display, perform, distribute, and otherwise exploit its",
+		"    Contributions, either on an unmodified basis, with Modifications, or",
+		"    as part of a Larger Work; and",
+		"",
+		"(b) under Patent Claims of such Contributor to make, use, sell, offer",
+		"    for sale, have made, import, and otherwise transfer either its",
+		"    Contributions or its Contributor Version.",
+		"",
+		"2.2. Effective Date",
+		"",
+		"The licenses granted in Section 2.1 with respect to any Contribution",
+		"become effective for each Contribution on the date the Contributor first",
+		"distributes such Contribution.",
+		"",
+		"2.3. Limitations on Grant Scope",
+		"",
+		"The licenses granted in this Section 2 are the only rights granted under",
+		"this License. No additional rights or licenses will be implied from the",
+		"distribution or licensing of Covered Software under this License.",
+		"Notwithstanding Section 2.1(b) above, no patent license is granted by a",
+		"Contributor:",
+		"",
+		"(a) for any code that a Contributor has removed from Covered Software;",
+		"    or",
+		"",
+		"(b) for infringements caused by: (i) Your and any other third party's",
+		"    modifications of Covered Software, or (ii) the combination of its",
+		"    Contributions with other software (except as part of its Contributor",
+		"    Version); or",
+		"",
+		"(c) under Patent Claims infringed by Covered Software in the absence of",
+		"    its Contributions.",
+		"",
+		"This License does not grant any rights in the trademarks, service marks,",
+		"or logos of any Contributor (except as may be necessary to comply with",
+		"the notice requirements in Section 3.4).",
+		"",
+		"2.4. Subsequent Licenses",
+		"",
+		"No Contributor makes additional grants as a result of Your choice to",
+		"distribute the Covered Software under a subsequent version of this",
+		"License (see Section 10.2) or under the terms of a Secondary License (if",
+		"permitted under the terms of Section 3.3).",
+		"",
+		"2.5. Representation",
+		"",
+		"Each Contributor represents that the Contributor believes its",
+		"Contributions are its original creation(s) or it has sufficient rights",
+		"to grant the rights to its Contributions conveyed by this License.",
+		"",
+		"2.6. Fair Use",
+		"",
+		"This License is not intended to limit any rights You have under",
+		"applicable copyright doctrines of fair use, fair dealing, or other",
+		"equivalents.",
+		"",
+		"2.7. Conditions",
+		"",
+		"Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted",
+		"in Section 2.1.",
+		"",
+		"3. Responsibilities",
+		"-------------------",
+		"",
+		"3.1. Distribution of Source Form",
+		"",
+		"All distribution of Covered Software in Source Code Form, including any",
+		"Modifications that You create or to which You contribute, must be under",
+		"the terms of this License. You must inform recipients that the Source",
+		"Code Form of the Covered Software is governed by the terms of this",
+		"License, and how they can obtain a copy of this License. You may not",
+		"attempt to alter or restrict the recipients' rights in the Source Code",
+		"Form.",
+		"",
+		"3.2. Distribution of Executable Form",
+		"",
+		"If You distribute Covered Software in Executable Form then:",
+		"",
+		"(a) such Covered Software must also be made available in Source Code",
+		"    Form, as described in Section 3.1, and You must inform recipients of",
+		"    the Executable Form how they can obtain a copy of such Source Code",
+		"    Form by reasonable means in a timely manner, at a charge no more",
+		"    than the cost of distribution to the recipient; and",
+		"",
+		"(b) You may distribute such Executable Form under the terms of this",
+		"    License, or sublicense it under different terms, provided that the",
+		"    license for the Executable Form does not attempt to limit or alter",
+		"    the recipients' rights in the Source Code Form under this License.",
+		"",
+		"3.3. Distribution of a Larger Work",
+		"",
+		"You may create and distribute a Larger Work under terms of Your choice,",
+		"provided that You also comply with the requirements of this License for",
+		"the Covered Software. If the Larger Work is a combination of Covered",
+		"Software with a work governed by one or more Secondary Licenses, and the",
+		"Covered Software is not Incompatible With Secondary Licenses, this",
+		"License permits You to additionally distribute such Covered Software",
+		"under the terms of such Secondary License(s), so that the recipient of",
+		"the Larger Work may, at their option, further distribute the Covered",
+		"Software under the terms of either this License or such Secondary",
+		"License(s).",
+		"",
+		"3.4. Notices",
+		"",
+		"You may not remove or alter the substance of any license notices",
+		"(including copyright notices, patent notices, disclaimers of warranty,",
+		"or limitations of liability) contained within the Source Code Form of",
+		"the Covered Software, except that You may alter any license notices to",
+		"the extent required to remedy known factual inaccuracies.",
+		"",
+		"3.5. Application of Additional Terms",
+		"",
+		"You may choose to offer, and to charge a fee for, warranty, support,",
+		"indemnity or liability obligations to one or more recipients of Covered",
+		"Software. However, You may do so only on Your own behalf, and not on",
+		"behalf of any Contributor. You must make it absolutely clear that any",
+		"such warranty, support, indemnity, or liability obligation is offered by",
+		"You alone, and You hereby agree to indemnify every Contributor for any",
+		"liability incurred by such Contributor as a result of warranty, support,",
+		"indemnity or liability terms You offer. You may include additional",
+		"disclaimers of warranty and limitations of liability specific to any",
+		"jurisdiction.",
+		"",
+		"4. Inability to Comply Due to Statute or Regulation",
+		"---------------------------------------------------",
+		"",
+		"If it is impossible for You to comply with any of the terms of this",
+		"License with respect to some or all of the Covered Software due to",
+		"statute, judicial order, or regulation then You must: (a) comply with",
+		"the terms of this License to the maximum extent possible; and (b)",
+		"describe the limitations and the code they affect. Such description must",
+		"be placed in a text file included with all distributions of the Covered",
+		"Software under this License. Except to the extent prohibited by statute",
+		"or regulation, such description must be sufficiently detailed for a",
+		"recipient of ordinary skill to be able to understand it.",
+		"",
+		"5. Termination",
+		"--------------",
+		"",
+		"5.1. The rights granted under this License will terminate automatically",
+		"if You fail to comply with any of its terms. However, if You become",
+		"compliant, then the rights granted under this License from a particular",
+		"Contributor are reinstated (a) provisionally, unless and until such",
+		"Contributor explicitly and finally terminates Your grants, and (b) on an",
+		"ongoing basis, if such Contributor fails to notify You of the",
+		"non-compliance by some reasonable means prior to 60 days after You have",
+		"come back into compliance. Moreover, Your grants from a particular",
+		"Contributor are reinstated on an ongoing basis if such Contributor",
+		"notifies You of the non-compliance by some reasonable means, this is the",
+		"first time You have received notice of non-compliance with this License",
+		"from such Contributor, and You become compliant prior to 30 days after",
+		"Your receipt of the notice.",
+		"",
+		"5.2. If You initiate litigation against any entity by asserting a patent",
+		"infringement claim (excluding declaratory judgment actions,",
+		"counter-claims, and cross-claims) alleging that a Contributor Version",
+		"directly or indirectly infringes any patent, then the rights granted to",
+		"You by any and all Contributors for the Covered Software under Section",
+		"2.1 of this License shall terminate.",
+		"",
+		"5.3. In the event of termination under Sections 5.1 or 5.2 above, all",
+		"end user license agreements (excluding distributors and resellers) which",
+		"have been validly granted by You or Your distributors under this License",
+		"prior to termination shall survive termination.",
+		"",
+		"************************************************************************",
+		"*                                                                      *",
+		"*  6. Disclaimer of Warranty                                           *",
+		"*  -------------------------                                           *",
+		"*                                                                      *",
+		"*  Covered Software is provided under this License on an \"as is\"       *",
+		"*  basis, without warranty of any kind, either expressed, implied, or  *",
+		"*  statutory, including, without limitation, warranties that the       *",
+		"*  Covered Software is free of defects, merchantable, fit for a        *",
+		"*  particular purpose or non-infringing. The entire risk as to the     *",
+		"*  quality and performance of the Covered Software is with You.        *",
+		"*  Should any Covered Software prove defective in any respect, You     *",
+		"*  (not any Contributor) assume the cost of any necessary servicing,   *",
+		"*  repair, or correction. This disclaimer of warranty constitutes an   *",
+		"*  essential part of this License. No use of any Covered Software is   *",
+		"*  authorized under this License except under this disclaimer.         *",
+		"*                                                                      *",
+		"************************************************************************",
+		"",
+		"************************************************************************",
+		"*                                                                      *",
+		"*  7. Limitation of Liability                                          *",
+		"*  --------------------------                                          *",
+		"*                                                                      *",
+		"*  Under no circumstances and under no legal theory, whether tort      *",
+		"*  (including negligence), contract, or otherwise, shall any           *",
+		"*  Contributor, or anyone who distributes Covered Software as          *",
+		"*  permitted above, be liable to You for any direct, indirect,         *",
+		"*  special, incidental, or consequential damages of any character      *",
+		"*  including, without limitation, damages for lost profits, loss of    *",
+		"*  goodwill, work stoppage, computer failure or malfunction, or any    *",
+		"*  and all other commercial damages or losses, even if such party      *",
+		"*  shall have been informed of the possibility of such damages. This   *",
+		"*  limitation of liability shall not apply to liability for death or   *",
+		"*  personal injury resulting from such party's negligence to the       *",
+		"*  extent applicable law prohibits such limitation. Some               *",
+		"*  jurisdictions do not allow the exclusion or limitation of           *",
+		"*  incidental or consequential damages, so this exclusion and          *",
+		"*  limitation may not apply to You.                                    *",
+		"*                                                                      *",
+		"************************************************************************",
+		"",
+		"8. Litigation",
+		"-------------",
+		"",
+		"Any litigation relating to this License may be brought only in the",
+		"courts of a jurisdiction where the defendant maintains its principal",
+		"place of business and such litigation shall be governed by laws of that",
+		"jurisdiction, without reference to its conflict-of-law provisions.",
+		"Nothing in this Section shall prevent a party's ability to bring",
+		"cross-claims or counter-claims.",
+		"",
+		"9. Miscellaneous",
+		"----------------",
+		"",
+		"This License represents the complete agreement concerning the subject",
+		"matter hereof. If any provision of this License is held to be",
+		"unenforceable, such provision shall be reformed only to the extent",
+		"necessary to make it enforceable. Any law or regulation which provides",
+		"that the language of a contract shall be construed against the drafter",
+		"shall not be used to construe this License against a Contributor.",
+		"",
+		"10. Versions of the License",
+		"---------------------------",
+		"",
+		"10.1. New Versions",
+		"",
+		"Mozilla Foundation is the license steward. Except as provided in Section",
+		"10.3, no one other than the license steward has the right to modify or",
+		"publish new versions of this License. Each version will be given a",
+		"distinguishing version number.",
+		"",
+		"10.2. Effect of New Versions",
+		"",
+		"You may distribute the Covered Software under the terms of the version",
+		"of the License under which You originally received the Covered Software,",
+		"or under the terms of any subsequent version published by the license",
+		"steward.",
+		"",
+		"10.3. Modified Versions",
+		"",
+		"If you create software not governed by this License, and you want to",
+		"create a new license for such software, you may create and use a",
+		"modified version of this License if you rename the license and remove",
+		"any references to the name of the license steward (except to note that",
+		"such modified license differs from this License).",
+		"",
+		"10.4. Distributing Source Code Form that is Incompatible With Secondary",
+		"Licenses",
+		"",
+		"If You choose to distribute Source Code Form that is Incompatible With",
+		"Secondary Licenses under the terms of this version of the License, the",
+		"notice described in Exhibit B of this License must be attached.",
+		"",
+		"Exhibit A - Source Code Form License Notice",
+		"-------------------------------------------",
+		"",
+		"  This Source Code Form is subject to the terms of the Mozilla Public",
+		"  License, v. 2.0. If a copy of the MPL was not distributed with this",
+		"  file, You can obtain one at http://mozilla.org/MPL/2.0/.",
+		"",
+		"If it is not possible or desirable to put the notice in a particular",
+		"file, then You may include the notice in a location (such as a LICENSE",
+		"file in a relevant directory) where a recipient would be likely to look",
+		"for such a notice.",
+		"",
+		"You may add additional accurate notices of copyright ownership.",
+		"",
+		"Exhibit B - \"Incompatible With Secondary Licenses\" Notice",
+		"---------------------------------------------------------",
+		"",
+		"  This Source Code Form is \"Incompatible With Secondary Licenses\", as",
+		"  defined by the Mozilla Public License, v. 2.0."
+	]
+},
+{
+	"isLicense": true,
+	"name": "devtools-protocol",
+	"licenseDetail": [
+		" Copyright 2015 The Chromium Authors. All rights reserved.",
+		"",
+		" Redistribution and use in source and binary forms, with or without",
+		" modification, are permitted provided that the following conditions are",
+		" met:",
+		"",
+		"    * Redistributions of source code must retain the above copyright",
+		" notice, this list of conditions and the following disclaimer.",
+		"    * Redistributions in binary form must reproduce the above",
+		" copyright notice, this list of conditions and the following disclaimer",
+		" in the documentation and/or other materials provided with the",
+		" distribution.",
+		"    * Neither the name of Google Inc. nor the names of its",
+		" contributors may be used to endorse or promote products derived from",
+		" this software without specific prior written permission.",
+		"",
+		" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS",
+		" \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT",
+		" LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR",
+		" A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT",
+		" OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,",
+		" SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT",
+		" LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,",
+		" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY",
+		" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT",
+		" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE",
+		" OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+	]
+},
+{
+	"isLicense": true,
+	"name": "buffer-alloc",
+	"licenseDetail": [
+		"This project is licensed under the MIT license.",
+		"Copyrights are respective of each contributor listed at the beginning of each definition file.",
+		"",
+		"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."
+	]
+},
+{
+	"isLicense": true,
+	"name": "expand-template",
+	"licenseDetail": [
+		"           DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE",
+		"                    Version 2, December 2004",
+		"",
+		" Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>",
+		"",
+		" Everyone is permitted to copy and distribute verbatim or modified",
+		" copies of this license document, and changing it is allowed as long",
+		" as the name is changed.",
+		"",
+		"            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE",
+		"   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION",
+		"",
+		"  0. You just DO WHAT THE FUCK YOU WANT TO."
+	]
+},
+{
+	"isLicense": true,
+	"name": "tunnel-agent",
+	"licenseDetail": [
+		"Copyright (c) tunnel-agent authors",
+		"",
+		"Apache License",
+		"",
+		"Version 2.0, January 2004",
+		"",
+		"http://www.apache.org/licenses/",
+		"",
+		"TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION",
+		"",
+		"1. Definitions.",
+		"",
+		"\"License\" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.",
+		"",
+		"\"Licensor\" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.",
+		"",
+		"\"Legal Entity\" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, \"control\" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.",
+		"",
+		"\"You\" (or \"Your\") shall mean an individual or Legal Entity exercising permissions granted by this License.",
+		"",
+		"\"Source\" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.",
+		"",
+		"\"Object\" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.",
+		"",
+		"\"Work\" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).",
+		"",
+		"\"Derivative Works\" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.",
+		"",
+		"\"Contribution\" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, \"submitted\" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as \"Not a Contribution.\"",
+		"",
+		"\"Contributor\" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.",
+		"",
+		"2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.",
+		"",
+		"3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.",
+		"",
+		"4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:",
+		"",
+		"You must give any other recipients of the Work or Derivative Works a copy of this License; and",
+		"",
+		"You must cause any modified files to carry prominent notices stating that You changed the files; and",
+		"",
+		"You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and",
+		"",
+		"If the Work includes a \"NOTICE\" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.",
+		"",
+		"5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.",
+		"",
+		"6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.",
+		"",
+		"7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.",
+		"",
+		"8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.",
+		"",
+		"9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.",
+		"",
+		"END OF TERMS AND CONDITIONS"
+	]
+},
+{
+	"isLicense": true,
+	"name": "noop-logger",
+	"licenseDetail": [
+		"This project is licensed under the MIT license.",
+		"Copyrights are respective of each contributor listed at the beginning of each definition file.",
+		"",
+		"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."
+	]
+},
+{
+	"isLicense": true,
+	"name": "buffer-alloc-unsafe",
+	"licenseDetail": [
+		"This project is licensed under the MIT license.",
+		"Copyrights are respective of each contributor listed at the beginning of each definition file.",
+		"",
+		"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."
+	]
+},
+{
+	"isLicense": true,
+	"name": "buffer-fill",
+	"licenseDetail": [
+		"This project is licensed under the MIT license.",
+		"Copyrights are respective of each contributor listed at the beginning of each definition file.",
+		"",
+		"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."
+	]
 }
 ]

README.md

@@ -1,33 +1,26 @@
-# SQL Operations Studio
+# 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/ms/azuredatastudio/_apis/build/status/Microsoft.azuredatastudio)](https://dev.azure.com/ms/azuredatastudio/_build/latest?definitionId=4)
 
-SQL Operations 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.
+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 SQL Operations Studio March Public Preview**
+**Download the latest Azure Data Studio release**
 
 Platform | Link
 -- | --
-Windows Setup Installer | https://go.microsoft.com/fwlink/?linkid=870837
-Windows ZIP | https://go.microsoft.com/fwlink/?linkid=870838
-macOS ZIP | https://go.microsoft.com/fwlink/?linkid=870839
-Linux TAR.GZ | https://go.microsoft.com/fwlink/?linkid=870840
-Linux DEB | https://go.microsoft.com/fwlink/?linkid=870842
-Linux RPM | https://go.microsoft.com/fwlink/?linkid=870841
+Windows Setup Installer | https://go.microsoft.com/fwlink/?linkid=2038320
+Windows ZIP | https://go.microsoft.com/fwlink/?linkid=2038323
+macOS ZIP | https://go.microsoft.com/fwlink/?linkid=2038327
+Linux TAR.GZ | https://go.microsoft.com/fwlink/?linkid=2038332
+Linux RPM | https://go.microsoft.com/fwlink/?linkid=2038401
+Linux DEB | https://go.microsoft.com/fwlink/?linkid=2038405
 
-Go to our [download page](https://aka.ms/sqlopsstudio) for more specific instructions.
+Go to our [download page](https://aka.ms/azuredatastudio) for more specific instructions.
 
-Try out the latest insiders build from `master` at https://github.com/Microsoft/sqlopsstudio/releases.
+Try out the latest insiders build from `master` at https://github.com/Microsoft/azuredatastudio/releases.
 
-See the [change log](https://github.com/Microsoft/sqlopsstudio/blob/master/CHANGELOG.md) for additional details of what's in this release.
-
-**Design Discussions**
-
-The SQL Operations Studio team would like to incorporate community feedback earlier in the development process.  To facilitate this, we'd like to share our designs while features are actively being built.
-
-We're currently collecting input on the **SQL Agent** experience and enhancements to the Manage Dashboard that we're calling **"Command Center"**.  We'll add additional design feedback requests below as we start work in new feature areas.  Please leave comments on these issues to help us understand your requirements and shape feature development.
-
-* [#750 Seeking community feedback on SQL Agent UX prototype](https://github.com/Microsoft/sqlopsstudio/issues/750)
+See the [change log](https://github.com/Microsoft/azuredatastudio/blob/master/CHANGELOG.md) for additional details of what's in this release.
 
 **Feature Highlights**
 
@@ -42,49 +35,82 @@ We're currently collecting input on the **SQL Agent** experience and enhancement
 - Task History window to view current task execution status, completion results with error messages and task T-SQL scripting
 - Scripting support to generate CREATE, SELECT, ALTER and DROP statements for database objects
 - Workspaces with full Git integration and Find In Files support to managing T-SQL script libraries
-- Modern light-weight shell with theming, user settings, full screen support, integrated terminal and numerous other features
+- Modern light-weight shell with theming, user settings, full-screen support, integrated terminal and numerous other features
 
-Here's some of these features in action.
+Here are some of these features in action.
 
-<img src='https://github.com/Microsoft/sqlopsstudio/blob/master/docs/overview_screen.jpg' width='800px'>
+<img src='https://github.com/Microsoft/azuredatastudio/blob/master/docs/overview_screen.jpg' width='800px'>
 
 ## Contributing
 If you are interested in fixing issues and contributing directly to the code base,
-please see the document [How to Contribute](https://github.com/Microsoft/sqlopsstudio/wiki/How-to-Contribute), which covers the following:
+please see the document [How to Contribute](https://github.com/Microsoft/azuredatastudio/wiki/How-to-Contribute), which covers the following:
 
-* [How to build and run from source](https://github.com/Microsoft/sqlopsstudio/wiki/How-to-Contribute#Build-and-Run-From-Source)
-* [The development workflow, including debugging and running tests](https://github.com/Microsoft/sqlopsstudio/wiki/How-to-Contribute#development-workflow)
-* [Submitting pull requests](https://github.com/Microsoft/sqlopsstudio/wiki/How-to-Contribute#pull-requests)
+* [How to build and run from source](https://github.com/Microsoft/azuredatastudio/wiki/How-to-Contribute#Build-and-Run-From-Source)
+* [The development workflow, including debugging and running tests](https://github.com/Microsoft/azuredatastudio/wiki/How-to-Contribute#development-workflow)
+* [Submitting pull requests](https://github.com/Microsoft/azuredatastudio/wiki/How-to-Contribute#pull-requests)
 
 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.
 
 ## Localization
-SQL Operations Studio localization is now open for community contributions. You can contribute to localization for both software and docs. https://aka.ms/SQLOpsStudioLoc
+Azure Data Studio localization is now open for community contributions. You can contribute to localization for both software and docs. https://aka.ms/SQLOpsStudioLoc
 
-Localization is now opened for 10 languages: French, Italian, German, Spanish, Simplified Chinese, Traditional Chinese, Japanese, Korean, Russian, and Portuguese (Brazil). Help us make SQL Operations Studio available in your language!
+Localization is now opened for 10 languages: French, Italian, German, Spanish, Simplified Chinese, Traditional Chinese, Japanese, Korean, Russian, and Portuguese (Brazil). Help us make Azure Data Studio available in your language!
 
 ## Privacy Statement
 The [Microsoft Enterprise and Developer Privacy Statement](https://privacy.microsoft.com/en-us/privacystatement) describes the privacy statement of this software.
 
-## Contributions and "thank you"
+## 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:
 
+* rdaniels6813  for `Add query plan theme support #3031`
+* Ruturaj123 for `Fixed some typos and grammatical errors #3027`
+* PromoFaux for `Use emoji shortcodes in CONTRIBUTING.md instead of <20> #3009`
+* ckaczor for `Fix: DATETIMEOFFSET data types should be ISO formatted #714`
+* hi-im-T0dd for `Fixed sync issue with my forked master so this commit is correct #2948`
+* hi-im-T0dd for `Fixed when right clicking and selecting Manage-correct name displays #2794`
+* philoushka  for `center the icon #2760`
+* anthonypants for `Typo #2775`
+* kstolte for `Fix Invalid Configuration in Launch.json #2789`
+* kstolte for `Fixing a reference to SQL Ops Studio #2788`
+* AlexFsmn `Feature: Ability to add connection name #2332`
+* AlexFsmn `Disabled connection name input when connecting to a server. #2566`
+* SebastianPfliegel `Added more saveAsCsv options #2099`
+* ianychoi `Fixes a typo: Mimunum -> Minimum #1994`
+* AlexFsmn `Fixed bug where proper file extension wasn't appended to the filename. #2151`
+* AlexFsmn `Added functionality for adding any file to import wizard #2329`
+* AlexFsmn `Fixed background issue when copying a chart to clipboard #2215`
+* AlexFsmn `Fixed problem where vertical charts didn't display labels correctly. #2263`
+* AlexFsmn `Fixed Initial values for charts to match visuals #2266`
+* AlexFsmn `Renamed chart option labels #2264`
+* AlexFsmn `Added feature for the opening file after exporting to CSV/XLS/JSON & query files #2216`
+* AlexFsmm `Get Connection String should copy to clipboard #2175`
+* lanceklinger `Fix for double-clicking column handle in results table #1504`
 * westerncj for `Removed duplicate contribution from README.md (#753)`
 * ntovas for `Fix for duplicate extensions shown in "Save File" dialog. (#779)`
 * SebastianPfliegel for `Add cursor snippet (#475)`
-* mikaoelitiana for fix: `revert README and CONTRIBUTING after last VSCode merge (#574)`
+* mikaoelitiana for the fix: `revert README and CONTRIBUTING after last VSCode merge (#574)`
 * alextercete for `Reinstate menu item to install from VSIX (#682)`
 * alextercete for `Fix "No extension gallery service configured" error (#427)`
 * mwiedemeyer for `Fix #58: Default sort order for DB size widget (#111)`
 * AlexTroshkin for `Show disconnect in context menu only when connectionProfile connected (#150)`
 * AlexTroshkin for `Fix #138: Invalid syntax color highlighting (identity not highlighting) (#140))`
-* stebet for `Fix #153: Fixing sql snippets that failed on a DB with case-sensitive collation. (#152)`
+* stebet for `Fix #153: Fixing sql snippets that failed on a DB with a case-sensitive collation. (#152)`
 * SebastianPfliegel `Remove sqlExtensionHelp (#312)`
 * olljanat for `Implemented npm version check (#314)`
-* Adam Mechanic for helping with the `whoisactive` extension
-* All community localization contributors *(will get list of individuals next month)*
+* Adam Machanic for helping with the `whoisactive` extension
+* All community localization contributors:
+  * French: Adrien Clerbois, ANAS BELABBES, Antoine Griffard, Arian Papillon, Eric Macarez, Eric Van Thorre, Jérémy LANDON, Matthias GROSPERRIN, Maxime COQUEREL, Olivier Guinart, thierry DEMAN-BARCELÒ, Thomas Potier
+  * Italian: Aldo Donetti, Alessandro Alpi, Andrea Dottor, Bruni Luca, Gianluca Hotz, Luca Nardi, Luigi Bruno, Marco Dal Pino, Mirco Vanini, Pasquale Ceglie, Riccardo Cappello, Sergio Govoni, Stefano Demiliani
+  * German: Anna Henke-Gunvaldson, Ben Weissman, David Ullmer, J.M. ., Kai Modo, Konstantin Staschill, Kostja Klein, Lennart Trunk, Markus Ehrenmüller-Jensen, Mascha Kroenlein, Matthias Knoll, Mourad Louha, Thomas Hütter, Wolfgang Straßer
+  * Spanish: Alberto Poblacion, Andy Gonzalez, Carlos Mendible, Christian Araujo, Daniel D, Eickhel Mendoza, Ernesto Cardenas, Ivan Toledo Ivanovic, Fran Diaz, JESUS GIL, Jorge Serrano Pérez, José Saturnino Pimentel Juárez, Mauricio Hidalgo, Pablo Iglesias, Rikhardo Estrada Rdez, Thierry DEMAN, YOLANDA CUESTA ALTIERI
+  * Japanese: Fujio Kojima, Kazushi KAMEGAWA, Masayoshi Yamada, Masayuki Ozawa, Seiji Momoto, Takashi Kanai, Takayoshi Tanaka, Yoshihisa Ozaki, 庄垣内治
+  * Chinese (simplified): DAN YE, Joel Yang, Lynne Dong, Ryan（Yu） Zhang, Sheng Jiang, Wei Zhang, Zhiliang Xu
+  * Chinese  (Traditional): Bruce Chen, Chiayi Yen, Kevin Yang,  Winnie Lin, 保哥 Will,  謝政廷
+  * Korean: Do-Kyun Kim, Evelyn Kim, Helen Jung, Hong Jmee, jeongwoo choi, Jun Hyoung Lee, Jungsun Kim정선, Justin Yoo, Kavrith mucha, Kiwoong Youm, MinGyu Ju,  MVP_JUNO BEA, Sejun Kim, SOONMAN KWON, sung man ko, Yeongrak Choi, younggun kim, Youngjae Kim, 소영 이
+  * Russian: Andrey Veselov, Anton Fontanov, Anton Savin, Elena Ostrovskaia, Igor Babichev, Maxim Zelensky, Rodion Fedechkin, Tasha T, Vladimir Zyryanov
+  * Portuguese Brazil: Daniel de Sousa, Diogo Duarte, Douglas Correa, Douglas Eccker, José Emanuel Mendes, Marcelo Fernandes, Marcondes Alexandre, Roberto Fonseca, Rodrigo Crespi
 
-And of course we'd like to thank the authors of all upstream dependencies.  Please see a full list in the [ThirdPartyNotices.txt](https://raw.githubusercontent.com/Microsoft/sqlopsstudio/master/ThirdPartyNotices.txt)
+And of course, we'd like to thank the authors of all upstream dependencies.  Please see a full list in the [ThirdPartyNotices.txt](https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/ThirdPartyNotices.txt)
 
 ## License
 

ThirdPartyNotices.txt

@@ -1,4 +1,4 @@
-MICROSOFT SQL OPERATIONS STUDIO
+MICROSOFT Azure Data Studio
 
 THIRD-PARTY SOFTWARE NOTICES AND INFORMATION
 Do Not Translate or Localize
@@ -21,6 +21,7 @@ expressly granted herein, whether by implication, estoppel or otherwise.
     error-ex: https://github.com/Qix-/node-error-ex
     escape-string-regexp: https://github.com/sindresorhus/escape-string-regexp
     fast-plist: https://github.com/Microsoft/node-fast-plist
+    find-remove: https://www.npmjs.com/package/find-remove
     fs-extra: https://github.com/jprichardson/node-fs-extra
     gc-signals: https://github.com/Microsoft/node-gc-signals
     getmac: https://github.com/bevry/getmac
@@ -33,6 +34,7 @@ expressly granted herein, whether by implication, estoppel or otherwise.
     jquery-ui: https://github.com/jquery/jquery-ui
     jquery.event.drag: https://github.com/devongovett/jquery.event.drag
     jschardet: https://github.com/aadsm/jschardet
+    JupyterLab: https://github.com/jupyterlab/jupyterlab
     make-error: https://github.com/JsCommunity/make-error
     minimist: https://github.com/substack/minimist
     moment: https://github.com/moment/moment
@@ -1165,6 +1167,43 @@ That's all there is to it!
 =========================================
 END OF jschardet NOTICES AND INFORMATION
 
+%% JupyterLab NOTICES AND INFORMATION BEGIN HERE
+Copyright (c) 2015 Project Jupyter Contributors
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Semver File License
+===================
+
+The semver.py file is from https://github.com/podhmo/python-semver
+which is licensed under the "MIT" license.  See the semver.py file for details.
+
+END OF JupyterLab NOTICES AND INFORMATION
+
 %% make-error NOTICES AND INFORMATION BEGIN HERE
 =========================================
 ISC © Julien Fontanet
@@ -2039,4 +2078,4 @@ 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 zone.js NOTICES AND INFORMATION
+END OF zone.js NOTICES AND INFORMATION

appveyor.yml

@@ -1,20 +0,0 @@
-environment:
-  ELECTRON_RUN_AS_NODE: 1
-  VSCODE_BUILD_VERBOSE: true
-
-cache:
-  - '%LOCALAPPDATA%\Yarn\cache'
-
-install:
-  - ps: Install-Product node 8.9.1 x64
-
-build_script:
-  - yarn
-  - .\node_modules\.bin\gulp electron
-  - .\node_modules\.bin\tsc -p .\src\tsconfig.monaco.json --noEmit
-  - npm run compile
-
-test_script:
-  - node --version
-  - .\scripts\test.bat
-  - .\scripts\test-integration.bat

azure-pipelines-linux-mac.yml

@@ -0,0 +1,38 @@
+steps:
+- task: NodeTool@0
+  inputs:
+    versionSpec: '8.x'
+  displayName: 'Install Node.js'
+
+- script: |
+    git submodule update --init --recursive
+    nvm install 8.9.1
+    nvm use 8.9.1
+    npm i -g yarn
+  displayName: 'preinstall'
+
+- script: |
+    export CXX="g++-4.9" CC="gcc-4.9" DISPLAY=:99.0
+    sh -e /etc/init.d/xvfb start
+    sleep 3
+  displayName: 'Linux preinstall'
+  condition: eq(variables['Agent.OS'], 'Linux')
+
+- script: |
+    yarn
+  displayName:  'Install'
+
+- script: |
+    node_modules/.bin/gulp electron --silent
+    node_modules/.bin/gulp compile --silent --max_old_space_size=4096
+    node_modules/.bin/gulp optimize-vscode --silent --max_old_space_size=4096
+  displayName: 'Scripts'
+
+- script: |
+    ./scripts/test.sh --reporter mocha-junit-reporter
+  displayName: 'Tests'
+
+- task: PublishTestResults@2
+  inputs:
+    testResultsFiles: '**/test-results.xml'    
+  condition: succeededOrFailed()

azure-pipelines-windows.yml

@@ -0,0 +1,26 @@
+steps:
+- task: NodeTool@0
+  inputs:
+    versionSpec: '8.9'
+  displayName: 'Install Node.js'
+
+- script: |
+    yarn
+  displayName: 'Yarn Install'
+
+- script: |
+    .\node_modules\.bin\gulp electron
+  displayName: 'Electron'
+
+- script: |
+    npm run compile
+  displayName: 'Compile'
+
+- script: |
+    .\scripts\test.bat --reporter mocha-junit-reporter
+  displayName: 'Test'
+
+- task: PublishTestResults@2
+  inputs:
+    testResultsFiles: 'test-results.xml'
+  condition: succeededOrFailed()

azure-pipelines.yml

@@ -0,0 +1,29 @@
+trigger:
+- master
+- releases/*
+
+jobs:
+
+# All tasks on Windows
+- job: build_all_windows
+  displayName: Build all tasks (Windows)
+  pool:
+    vmImage: vs2017-win2016
+  steps:
+  - template: azure-pipelines-windows.yml
+
+# All tasks on Linux
+- job: build_all_linux
+  displayName: Build all tasks (Linux)
+  pool:
+    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/builtInExtensions.json

@@ -1,12 +1,12 @@
 [
 	{
 		"name": "ms-vscode.node-debug",
-		"version": "1.21.8",
+		"version": "1.26.7",
 		"repo": "https://github.com/Microsoft/vscode-node-debug"
 	},
 	{
 		"name": "ms-vscode.node-debug2",
-		"version": "1.21.2",
+		"version": "1.26.8",
 		"repo": "https://github.com/Microsoft/vscode-node-debug2"
 	}
-]
+]

build/gulpfile.editor.js

@@ -3,16 +3,21 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-var gulp = require('gulp');
-var path = require('path');
-var util = require('./lib/util');
-var common = require('./lib/optimize');
-var es = require('event-stream');
-var File = require('vinyl');
+const gulp = require('gulp');
+const path = require('path');
+const util = require('./lib/util');
+const common = require('./lib/optimize');
+const es = require('event-stream');
+const File = require('vinyl');
+const i18n = require('./lib/i18n');
+const standalone = require('./lib/standalone');
+const cp = require('child_process');
+const compilation = require('./lib/compilation');
+const monacoapi = require('./monaco/api');
+const fs = require('fs');
 
 var root = path.dirname(__dirname);
 var sha1 = util.getVersion(root);
-// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
 var semver = require('./monaco/package.json').version;
 var headerVersion = semver + '(' + sha1 + ')';
 
@@ -56,39 +61,125 @@ var BUNDLED_FILE_HEADER = [
 	''
 ].join('\n');
 
-function editorLoaderConfig() {
-	var result = common.loaderConfig();
+const languages = i18n.defaultLanguages.concat([]);  // i18n.defaultLanguages.concat(process.env.VSCODE_QUALITY !== 'stable' ? i18n.extraLanguages : []);
 
-	// never ship octicons in editor
-	result.paths['vs/base/browser/ui/octiconLabel/octiconLabel'] = 'out-build/vs/base/browser/ui/octiconLabel/octiconLabel.mock';
+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();
+	standalone.extractEditor({
+		sourcesRoot: path.join(root, 'src'),
+		entryPoints: [
+			'vs/editor/editor.main',
+			'vs/editor/editor.worker',
+			'vs/base/worker/workerMain',
+		],
+		inlineEntryPoints: [
+			apiusages,
+			extrausages
+		],
+		libs: [
+			`lib.d.ts`,
+			`lib.es2015.collection.d.ts`
+		],
+		redirects: {
+			'vs/base/browser/ui/octiconLabel/octiconLabel': 'vs/base/browser/ui/octiconLabel/octiconLabel.mock',
+		},
+		compilerOptions: {
+			module: 2, // ModuleKind.AMD
+		},
+		shakeLevel: 2, // 0-Files, 1-InnerFile, 2-ClassMembers
+		importIgnorePattern: /^vs\/css!/,
+		destRoot: path.join(root, 'out-editor-src')
+	});
+});
 
-	// force css inlining to use base64 -- see https://github.com/Microsoft/monaco-editor/issues/148
-	result['vs/css'] = {
-		inlineResources: 'base64',
-		inlineResourcesLimit: 3000 // see https://github.com/Microsoft/monaco-editor/issues/336
-	};
-
-	return result;
-}
+// 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));
 
 gulp.task('clean-optimized-editor', util.rimraf('out-editor'));
-gulp.task('optimize-editor', ['clean-optimized-editor', 'compile-client-build'], common.optimizeTask({
+gulp.task('optimize-editor', ['clean-optimized-editor', 'compile-editor-build'], common.optimizeTask({
+	src: 'out-editor-build',
 	entryPoints: editorEntryPoints,
 	otherSources: editorOtherSources,
 	resources: editorResources,
-	loaderConfig: editorLoaderConfig(),
+	loaderConfig: {
+		paths: {
+			'vs': 'out-editor-build/vs',
+			'vscode': 'empty:'
+		}
+	},
 	bundleLoader: false,
 	header: BUNDLED_FILE_HEADER,
 	bundleInfo: true,
 	out: 'out-editor',
-	languages: undefined
+	languages: languages
 }));
 
 gulp.task('clean-minified-editor', util.rimraf('out-editor-min'));
 gulp.task('minify-editor', ['clean-minified-editor', 'optimize-editor'], common.minifyTask('out-editor'));
 
+gulp.task('clean-editor-esm', util.rimraf('out-editor-esm'));
+gulp.task('extract-editor-esm', ['clean-editor-esm', 'clean-editor-distro'], function () {
+	standalone.createESMSourcesAndResources({
+		entryPoints: [
+			'vs/editor/editor.main',
+			'vs/editor/editor.worker'
+		],
+		outFolder: './out-editor-esm/src',
+		outResourcesFolder: './out-monaco-editor-core/esm',
+		redirects: {
+			'vs/base/browser/ui/octiconLabel/octiconLabel': 'vs/base/browser/ui/octiconLabel/octiconLabel.mock',
+			'vs/nls': 'vs/nls.mock',
+		}
+	});
+});
+gulp.task('compile-editor-esm', ['extract-editor-esm', 'clean-editor-distro'], function () {
+	const result = cp.spawnSync(`node`, [`../node_modules/.bin/tsc`], {
+		cwd: path.join(__dirname, '../out-editor-esm')
+	});
+	console.log(result.stdout.toString());
+});
+
+function toExternalDTS(contents) {
+	let lines = contents.split('\n');
+	let killNextCloseCurlyBrace = false;
+	for (let i = 0; i < lines.length; i++) {
+		let line = lines[i];
+
+		if (killNextCloseCurlyBrace) {
+			if ('}' === line) {
+				lines[i] = '';
+				killNextCloseCurlyBrace = false;
+				continue;
+			}
+
+			if (line.indexOf('    ') === 0) {
+				lines[i] = line.substr(4);
+			} else if (line.charAt(0) === '\t') {
+				lines[i] = line.substr(1);
+			}
+
+			continue;
+		}
+
+		if ('declare namespace monaco {' === line) {
+			lines[i] = '';
+			killNextCloseCurlyBrace = true;
+			continue;
+		}
+
+		if (line.indexOf('declare namespace monaco.') === 0) {
+			lines[i] = line.replace('declare namespace monaco.', 'export namespace ');
+		}
+	}
+	return lines.join('\n');
+}
+
 gulp.task('clean-editor-distro', util.rimraf('out-monaco-editor-core'));
-gulp.task('editor-distro', ['clean-editor-distro', 'minify-editor', 'optimize-editor'], function () {
+gulp.task('editor-distro', ['clean-editor-distro', 'compile-editor-esm', 'minify-editor', 'optimize-editor'], function () {
 	return es.merge(
 		// other assets
 		es.merge(
@@ -97,6 +188,17 @@ gulp.task('editor-distro', ['clean-editor-distro', 'minify-editor', 'optimize-ed
 			gulp.src('src/vs/monaco.d.ts')
 		).pipe(gulp.dest('out-monaco-editor-core')),
 
+		// place the .d.ts in the esm folder
+		gulp.src('src/vs/monaco.d.ts')
+			.pipe(es.through(function (data) {
+				this.emit('data', new File({
+					path: data.path.replace(/monaco\.d\.ts/, 'editor.api.d.ts'),
+					base: data.base,
+					contents: new Buffer(toExternalDTS(data.contents.toString()))
+				}));
+			}))
+			.pipe(gulp.dest('out-monaco-editor-core/esm/vs/editor')),
+
 		// package.json
 		gulp.src('build/monaco/package.json')
 			.pipe(es.through(function (data) {
@@ -157,7 +259,7 @@ gulp.task('editor-distro', ['clean-editor-distro', 'minify-editor', 'optimize-ed
 });
 
 gulp.task('analyze-editor-distro', function () {
-	// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
+	// @ts-ignore
 	var bundleInfo = require('../out-editor/bundleInfo.json');
 	var graph = bundleInfo.graph;
 	var bundles = bundleInfo.bundles;
@@ -208,3 +310,60 @@ function filterStream(testFunc) {
 		this.emit('data', data);
 	});
 }
+
+
+//#region monaco type checking
+
+function createTscCompileTask(watch) {
+	return () => {
+		const createReporter = require('./lib/reporter').createReporter;
+
+		return new Promise((resolve, reject) => {
+			const args = ['./node_modules/.bin/tsc', '-p', './src/tsconfig.monaco.json', '--noEmit'];
+			if (watch) {
+				args.push('-w');
+			}
+			const child = cp.spawn(`node`, args, {
+				cwd: path.join(__dirname, '..'),
+				// stdio: [null, 'pipe', 'inherit']
+			});
+			let errors = [];
+			let reporter = createReporter();
+			let report;
+			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 => {
+				let str = String(data);
+				str = str.replace(magic, '').trim();
+				if (str.indexOf('Starting compilation') >= 0 || str.indexOf('File change detected') >= 0) {
+					errors.length = 0;
+					report = reporter.end(false);
+
+				} else if (str.indexOf('Compilation complete') >= 0) {
+					report.end();
+
+				} else if (str) {
+					let match = /(.*\(\d+,\d+\): )(.*: )(.*)/.exec(str);
+					if (match) {
+						// trying to massage the message so that it matches the gulp-tsb error messages
+						// e.g. src/vs/base/common/strings.ts(663,5): error TS2322: Type '1234' is not assignable to type 'string'.
+						let fullpath = path.join(root, match[1]);
+						let message = match[3];
+						// @ts-ignore
+						reporter(fullpath + message);
+					} else {
+						// @ts-ignore
+						reporter(str);
+					}
+				}
+			});
+			child.on('exit', resolve);
+			child.on('error', reject);
+		});
+	};
+}
+
+gulp.task('monaco-typecheck-watch', createTscCompileTask(true));
+gulp.task('monaco-typecheck', createTscCompileTask(false));
+
+//#endregion

build/gulpfile.extensions.js

@@ -20,7 +20,7 @@ const sourcemaps = require('gulp-sourcemaps');
 const nlsDev = require('vscode-nls-dev');
 const root = path.dirname(__dirname);
 const commit = util.getVersion(root);
-const i18n = require('./lib/i18n');
+const plumber = require('gulp-plumber');
 
 const extensionsPath = path.join(path.dirname(__dirname), 'extensions');
 
@@ -31,8 +31,6 @@ const compilations = glob.sync('**/tsconfig.json', {
 
 const getBaseUrl = out => `https://ticino.blob.core.windows.net/sourcemaps/${commit}/${out}`;
 
-const languages = i18n.defaultLanguages.concat(process.env.VSCODE_QUALITY !== 'stable' ? i18n.extraLanguages : []);
-
 const tasks = compilations.map(function (tsconfigFile) {
 	const absolutePath = path.join(extensionsPath, tsconfigFile);
 	const relativeDirname = path.dirname(tsconfigFile);
@@ -57,7 +55,6 @@ const tasks = compilations.map(function (tsconfigFile) {
 	const srcBase = path.join(root, 'src');
 	const src = path.join(srcBase, '**');
 	const out = path.join(root, 'out');
-	const i18nPath = path.join(__dirname, '..', 'i18n');
 	const baseUrl = getBaseUrl(out);
 
 	let headerId, headerOut;
@@ -82,6 +79,13 @@ const tasks = compilations.map(function (tsconfigFile) {
 			const input = es.through();
 			const tsFilter = filter(['**/*.ts', '!**/lib/lib*.d.ts', '!**/node_modules/**'], { restore: true });
 			const output = input
+				.pipe(plumber({
+					errorHandler: function (err) {
+						if (err && !err.__reporter__) {
+							reporter(err);
+						}
+					}
+				}))
 				.pipe(tsFilter)
 				.pipe(util.loadSourcemaps())
 				.pipe(compilation())
@@ -94,9 +98,9 @@ const tasks = compilations.map(function (tsconfigFile) {
 					sourceRoot: '../src'
 				}))
 				.pipe(tsFilter.restore)
-				.pipe(build ? nlsDev.createAdditionalLanguageFiles(languages, i18nPath, out) : es.through())
 				.pipe(build ? nlsDev.bundleMetaDataFiles(headerId, headerOut) : es.through())
-				.pipe(build ? nlsDev.bundleLanguageFiles() : es.through())
+				// Filter out *.nls.json file. We needed them only to bundle meta data file.
+				.pipe(filter(['**', '!**/*.nls.json']))
 				.pipe(reporter.end(emitError));
 
 			return es.duplex(input, output);

build/gulpfile.hygiene.js

@@ -46,10 +46,10 @@ const indentationFilter = [
 	'!src/vs/nls.js',
 	'!src/vs/css.js',
 	'!src/vs/loader.js',
-	'!src/vs/base/common/marked/raw.marked.js',
-	'!src/vs/base/common/winjs.base.raw.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/ps-win.ps1',
+	'!src/vs/base/node/cpuUsage.sh',
 	'!test/assert.js',
 
 	// except specific folders
@@ -62,6 +62,7 @@ const indentationFilter = [
 	// except multiple specific files
 	'!**/package.json',
 	'!**/yarn.lock',
+	'!**/yarn-error.log',
 
 	// except multiple specific folders
 	'!**/octicons/**',
@@ -81,8 +82,9 @@ const indentationFilter = [
 	'!build/{lib,tslintRules}/**/*.js',
 	'!build/**/*.sh',
 	'!build/tfs/**/*.js',
+	'!build/tfs/**/*.config',
 	'!**/Dockerfile',
-	'!extensions/markdown/media/*.js'
+	'!extensions/markdown-language-features/media/*.js'
 ];
 
 const copyrightFilter = [
@@ -103,9 +105,11 @@ const copyrightFilter = [
 	'!**/*.code-workspace',
 	'!build/**/*.init',
 	'!resources/linux/snap/snapcraft.yaml',
+	'!resources/linux/snap/electron-launch',
 	'!resources/win32/bin/code.js',
-	'!extensions/markdown/media/tomorrow.css',
-	'!extensions/html/server/src/modes/typescript/*'
+	'!extensions/markdown-language-features/media/highlight.css',
+	'!extensions/html-language-features/server/src/modes/typescript/*',
+	'!extensions/*/server/bin/*'
 ];
 
 const eslintFilter = [
@@ -116,8 +120,8 @@ const eslintFilter = [
 	'!src/vs/nls.js',
 	'!src/vs/css.build.js',
 	'!src/vs/nls.build.js',
-	'!src/**/winjs.base.raw.js',
-	'!src/**/raw.marked.js',
+	'!src/**/winjs.base.js',
+	'!src/**/marked.js',
 	'!**/test/**'
 ];
 
@@ -132,15 +136,16 @@ const tslintFilter = [
 	'!extensions/vscode-api-tests/testWorkspace/**',
 	'!extensions/vscode-api-tests/testWorkspace2/**',
 	'!extensions/**/*.test.ts',
-	'!extensions/html/server/lib/jquery.d.ts'
+	'!extensions/html-language-features/server/lib/jquery.d.ts'
 ];
 
-const copyrightHeader = [
+// {{SQL CARBON EDIT}}
+const copyrightHeaderLines = [
 	'/*---------------------------------------------------------------------------------------------',
 	' *  Copyright (c) Microsoft Corporation. All rights reserved.',
 	' *  Licensed under the Source EULA. See License.txt in the project root for license information.',
 	' *--------------------------------------------------------------------------------------------*/'
-].join('\n');
+];
 
 gulp.task('eslint', () => {
 	return vfs.src(all, { base: '.', follow: true, allowEmpty: true })
@@ -202,12 +207,17 @@ function hygiene(some) {
 		tsfmt.processString(file.path, file.contents.toString('utf8'), {
 			verify: false,
 			tsfmt: true,
-			// verbose: true
+			// verbose: true,
 			// keep checkJS happy
 			editorconfig: undefined,
 			replace: undefined,
 			tsconfig: undefined,
-			tslint: undefined
+			tsconfigFile: undefined,
+			tslint: undefined,
+			tslintFile: undefined,
+			tsfmtFile: undefined,
+			vscode: undefined,
+			vscodeFile: undefined
 		}).then(result => {
 			let original = result.src.replace(/\r\n/gm, '\n');
 			let formatted = result.dest.replace(/\r\n/gm, '\n');

build/gulpfile.mixin.js

@@ -18,7 +18,6 @@ const assign = require('object-assign');
 // {{SQL CARBON EDIT}}
 const jeditor = require('gulp-json-editor');
 
-// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
 const pkg = require('../package.json');
 
 gulp.task('mixin', function () {
@@ -37,9 +36,9 @@ gulp.task('mixin', function () {
 	}
 
 	// {{SQL CARBON EDIT}}
-	let serviceUrl = 'https://raw.githubusercontent.com/Microsoft/sqlopsstudio/release/extensions/extensionsGallery.json';
+	let serviceUrl = 'https://sqlopsextensions.blob.core.windows.net/marketplace/v1/extensionsGallery.json';
 	if (quality === 'insider') {
-		serviceUrl = `https://raw.githubusercontent.com/Microsoft/sqlopsstudio/release/extensions/extensionsGallery-${quality}.json`;
+		serviceUrl = `https://sqlopsextensions.blob.core.windows.net/marketplace/v1/extensionsGallery-${quality}.json`;
 	}
 	let newValues = {
 		"updateUrl": updateUrl,
@@ -52,4 +51,4 @@ gulp.task('mixin', function () {
 	return gulp.src('./product.json')
 		.pipe(jeditor(newValues))
 		.pipe(gulp.dest('.'));
-});
+});

build/gulpfile.vscode.js

@@ -17,19 +17,15 @@ const vfs = require('vinyl-fs');
 const rename = require('gulp-rename');
 const replace = require('gulp-replace');
 const filter = require('gulp-filter');
-const buffer = require('gulp-buffer');
 const json = require('gulp-json-editor');
 const _ = require('underscore');
 const util = require('./lib/util');
 const ext = require('./lib/extensions');
 const buildfile = require('../src/buildfile');
 const common = require('./lib/optimize');
-const nlsDev = require('vscode-nls-dev');
 const root = path.dirname(__dirname);
 const commit = util.getVersion(root);
-// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
 const packageJson = require('../package.json');
-// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
 const product = require('../product.json');
 const crypto = require('crypto');
 const i18n = require('./lib/i18n');
@@ -62,7 +58,6 @@ const nodeModules = [
 
 
 // Build
-// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
 const builtInExtensions = require('./builtInExtensions.json');
 
 const excludedExtensions = [
@@ -77,8 +72,11 @@ const vsce = require('vsce');
 const sqlBuiltInExtensions = [
 	// Add SQL built-in extensions here.
 	// the extension will be excluded from SQLOps package and will have separate vsix packages
-	'agent'
+	'agent',
+	'import',
+	'profiler'
 ];
+var azureExtensions =  [ 'azurecore'];
 
 const vscodeEntryPoints = _.flatten([
 	buildfile.entrypoint('vs/workbench/workbench.main'),
@@ -90,26 +88,27 @@ const vscodeEntryPoints = _.flatten([
 const vscodeResources = [
 	'out-build/main.js',
 	'out-build/cli.js',
+	'out-build/driver.js',
 	'out-build/bootstrap.js',
 	'out-build/bootstrap-amd.js',
 	'out-build/paths.js',
 	'out-build/vs/**/*.{svg,png,cur,html}',
 	'out-build/vs/base/common/performance.js',
-	'out-build/vs/base/node/{stdForkStart.js,terminateProcess.sh,ps-win.ps1}',
+	'out-build/vs/base/node/{stdForkStart.js,terminateProcess.sh,cpuUsage.sh}',
 	'out-build/vs/base/browser/ui/octiconLabel/octicons/**',
 	'out-build/vs/workbench/browser/media/*-theme.css',
 	'out-build/vs/workbench/electron-browser/bootstrap/**',
 	'out-build/vs/workbench/parts/debug/**/*.json',
 	'out-build/vs/workbench/parts/execution/**/*.scpt',
-	'out-build/vs/workbench/parts/html/browser/webview-pre.js',
+	'out-build/vs/workbench/parts/webview/electron-browser/webview-pre.js',
 	'out-build/vs/**/markdown.css',
 	'out-build/vs/workbench/parts/tasks/**/*.json',
-	'out-build/vs/workbench/parts/terminal/electron-browser/terminalProcess.js',
 	'out-build/vs/workbench/parts/welcome/walkThrough/**/*.md',
 	'out-build/vs/workbench/services/files/**/*.exe',
 	'out-build/vs/workbench/services/files/**/*.md',
 	'out-build/vs/code/electron-browser/sharedProcess/sharedProcess.js',
 	'out-build/vs/code/electron-browser/issue/issueReporter.js',
+	'out-build/vs/code/electron-browser/processExplorer/processExplorer.js',
 	// {{SQL CARBON EDIT}}
 	'out-build/sql/workbench/electron-browser/splashscreen/*',
 	'out-build/sql/**/*.{svg,png,cur,html}',
@@ -130,6 +129,7 @@ const vscodeResources = [
 	'out-build/sql/parts/jobManagement/common/media/*.svg',
 	'out-build/sql/media/objectTypes/*.svg',
 	'out-build/sql/media/icons/*.svg',
+	'out-build/sql/parts/notebook/media/**/*.svg',
 	'!**/test/**'
 ];
 
@@ -139,17 +139,15 @@ const BUNDLED_FILE_HEADER = [
 	' *--------------------------------------------------------*/'
 ].join('\n');
 
-const languages = i18n.defaultLanguages.concat([]);  // i18n.defaultLanguages.concat(process.env.VSCODE_QUALITY !== 'stable' ? i18n.extraLanguages : []);
-
 gulp.task('clean-optimized-vscode', util.rimraf('out-vscode'));
 gulp.task('optimize-vscode', ['clean-optimized-vscode', 'compile-build', 'compile-extensions-build'], common.optimizeTask({
+	src: 'out-build',
 	entryPoints: vscodeEntryPoints,
 	otherSources: [],
 	resources: vscodeResources,
 	loaderConfig: common.loaderConfig(nodeModules),
 	header: BUNDLED_FILE_HEADER,
 	out: 'out-vscode',
-	languages: languages,
 	bundleInfo: undefined
 }));
 
@@ -166,6 +164,8 @@ gulp.task('clean-minified-vscode', util.rimraf('out-vscode-min'));
 gulp.task('minify-vscode', ['clean-minified-vscode', 'optimize-index-js'], common.minifyTask('out-vscode', baseUrl));
 
 // Package
+
+// @ts-ignore JSON checking: darwinCredits is optional
 const darwinCreditsTemplate = product.darwinCredits && _.template(fs.readFileSync(path.join(root, product.darwinCredits), 'utf8'));
 
 const config = {
@@ -195,6 +195,8 @@ const config = {
 	linuxExecutableName: product.applicationName,
 	winIcon: 'resources/win32/code.ico',
 	token: process.env['VSCODE_MIXIN_PASSWORD'] || process.env['GITHUB_TOKEN'] || void 0,
+
+	// @ts-ignore JSON checking: electronRepository is optional
 	repo: product.electronRepository || void 0
 };
 
@@ -208,7 +210,7 @@ function getElectron(arch) {
 		});
 
 		return gulp.src('package.json')
-			.pipe(json({ name: product.nameShort }))
+		.pipe(json({ name: product.nameShort }))
 			.pipe(electron(electronOpts))
 			.pipe(filter(['**', '!**/app/package.json']))
 			.pipe(vfs.dest('.build/electron'));
@@ -270,16 +272,51 @@ function packageBuiltInExtensions() {
 		console.info('Creating vsix for ' + element.path + ' result:' + packagePath);
 		vsce.createVSIX({
 				cwd: element.path,
-				packagePath: packagePath
+				packagePath: packagePath,
+				useYarn: true
 		});
 	});
 }
 
+// {{SQL CARBON EDIT}}
+function packageAzureCoreTask(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', 'azurecore');
+	} else {
+		destination = path.join(destination, 'resources', 'app', 'extensions', 'azurecore');
+	}
+
+	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 }) => azureExtensions.indexOf(name) > -1);
+
+		const localExtensions = es.merge(...localExtensionDescriptions.map(extension => {
+			return ext.fromLocal(extension.path);
+		}));
+
+		let result = localExtensions
+			.pipe(util.skipDirectories())
+			.pipe(util.fixWin32DirectoryPermissions())
+			.pipe(filter(['**', '!LICENSE', '!LICENSES.chromium.html', '!version']));
+
+		return result.pipe(vfs.dest(destination));
+	};
+}
+
 function packageTask(platform, arch, opts) {
 	opts = opts || {};
 
 	// {{SQL CARBON EDIT}}
-	const destination = path.join(path.dirname(root), 'sqlops') + (platform ? '-' + platform : '') + (arch ? '-' + arch : '');
+	const destination = path.join(path.dirname(root), 'azuredatastudio') + (platform ? '-' + platform : '') + (arch ? '-' + arch : '');
 	platform = platform || process.platform;
 
 	return () => {
@@ -306,19 +343,14 @@ function packageTask(platform, arch, opts) {
 			.filter(({ name }) => excludedExtensions.indexOf(name) === -1)
 			.filter(({ name }) => builtInExtensions.every(b => b.name !== name))
 			// {{SQL CARBON EDIT}}
-			.filter(({ name }) => sqlBuiltInExtensions.indexOf(name) === -1);
-			packageBuiltInExtensions();
+			.filter(({ name }) => sqlBuiltInExtensions.indexOf(name) === -1)
+			.filter(({ name }) => azureExtensions.indexOf(name) === -1);
+
+		packageBuiltInExtensions();
 
 		const localExtensions = es.merge(...localExtensionDescriptions.map(extension => {
-			const nlsFilter = filter('**/*.nls.json', { restore: true });
-
 			return ext.fromLocal(extension.path)
-				.pipe(rename(p => p.dirname = `extensions/${extension.name}/${p.dirname}`))
-				// 	// TODO@Dirk: this filter / buffer is here to make sure the nls.json files are buffered
-				.pipe(nlsFilter)
-				.pipe(buffer())
-				.pipe(nlsDev.createAdditionalLanguageFiles(languages, path.join(__dirname, '..', 'i18n')))
-				.pipe(nlsFilter.restore);
+				.pipe(rename(p => p.dirname = `extensions/${extension.name}/${p.dirname}`));
 		}));
 
 		// {{SQL CARBON EDIT}}
@@ -331,26 +363,32 @@ function packageTask(platform, arch, opts) {
 			.pipe(util.cleanNodeModule('account-provider-azure', ['node_modules/date-utils/doc/**', 'node_modules/adal_node/node_modules/**'], undefined))
 			.pipe(util.cleanNodeModule('typescript', ['**/**'], undefined));
 
-
 		const sources = es.merge(src, localExtensions, localExtensionDependencies)
 			.pipe(util.setExecutableBit(['**/*.sh']))
 			.pipe(filter(['**', '!**/*.js.map']));
 
 		let version = packageJson.version;
+		// @ts-ignore JSON checking: quality is optional
 		const quality = product.quality;
 
 		if (quality && quality !== 'stable') {
 			version += '-' + quality;
 		}
 
-		const name = product.nameShort;
+		// {{SQL CARBON EDIT}}
+		const name = (platform === 'darwin') ? 'Azure Data Studio' : product.nameShort;
 		const packageJsonStream = gulp.src(['package.json'], { base: '.' })
 			.pipe(json({ name, version }));
 
-		const settingsSearchBuildId = getBuildNumber();
 		const date = new Date().toISOString();
+		const productJsonUpdate = { commit, date, checksums };
+
+		if (shouldSetupSettingsSearch()) {
+			productJsonUpdate.settingsSearchBuildId = getSettingsSearchBuildId(packageJson);
+		}
+
 		const productJsonStream = gulp.src(['product.json'], { base: '.' })
-			.pipe(json({ commit, date, checksums, settingsSearchBuildId }));
+			.pipe(json(productJsonUpdate));
 
 		const license = gulp.src(['LICENSES.chromium.html', 'LICENSE.txt', 'ThirdPartyNotices.txt', 'licenses/**'], { base: '.' });
 
@@ -363,6 +401,7 @@ function packageTask(platform, arch, opts) {
 
 		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}/**`]))
 		];
 
@@ -389,6 +428,7 @@ function packageTask(platform, arch, opts) {
 			.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']))
 			.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'));
 
@@ -408,7 +448,7 @@ function packageTask(platform, arch, opts) {
 			license,
 			watermark,
 			api,
-	  // {{SQL CARBON EDIT}}
+			// {{SQL CARBON EDIT}}
 			copiedModules,
 			dataApi,
 			sources,
@@ -458,18 +498,22 @@ function packageTask(platform, arch, opts) {
 const buildRoot = path.dirname(root);
 
 // {{SQL CARBON EDIT}}
-gulp.task('clean-vscode-win32-ia32', util.rimraf(path.join(buildRoot, 'sqlops-win32-ia32')));
-gulp.task('clean-vscode-win32-x64', util.rimraf(path.join(buildRoot, 'sqlops-win32-x64')));
-gulp.task('clean-vscode-darwin', util.rimraf(path.join(buildRoot, 'sqlops-darwin')));
-gulp.task('clean-vscode-linux-ia32', util.rimraf(path.join(buildRoot, 'sqlops-linux-ia32')));
-gulp.task('clean-vscode-linux-x64', util.rimraf(path.join(buildRoot, 'sqlops-linux-x64')));
-gulp.task('clean-vscode-linux-arm', util.rimraf(path.join(buildRoot, 'sqlops-linux-arm')));
+gulp.task('vscode-win32-x64-azurecore', ['optimize-vscode'], packageAzureCoreTask('win32', 'x64'));
+gulp.task('vscode-darwin-azurecore', ['optimize-vscode'], packageAzureCoreTask('darwin'));
+gulp.task('vscode-linux-x64-azurecore', ['optimize-vscode'], packageAzureCoreTask('linux', 'x64'));
+
+gulp.task('clean-vscode-win32-ia32', util.rimraf(path.join(buildRoot, 'azuredatastudio-win32-ia32')));
+gulp.task('clean-vscode-win32-x64', util.rimraf(path.join(buildRoot, 'azuredatastudio-win32-x64')));
+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('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('vscode-win32-ia32', ['optimize-vscode', 'clean-vscode-win32-ia32'], packageTask('win32', 'ia32'));
-gulp.task('vscode-win32-x64', ['optimize-vscode', 'clean-vscode-win32-x64'], packageTask('win32', 'x64'));
-gulp.task('vscode-darwin', ['optimize-vscode', 'clean-vscode-darwin'], packageTask('darwin'));
+gulp.task('vscode-win32-x64',  ['vscode-win32-x64-azurecore', 'optimize-vscode', 'clean-vscode-win32-x64'], packageTask('win32', 'x64'));
+gulp.task('vscode-darwin', ['vscode-darwin-azurecore', 'optimize-vscode', 'clean-vscode-darwin'], packageTask('darwin'));
 gulp.task('vscode-linux-ia32', ['optimize-vscode', 'clean-vscode-linux-ia32'], packageTask('linux', 'ia32'));
-gulp.task('vscode-linux-x64', ['optimize-vscode', 'clean-vscode-linux-x64'], packageTask('linux', 'x64'));
+gulp.task('vscode-linux-x64', ['vscode-linux-x64-azurecore', '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('vscode-win32-ia32-min', ['minify-vscode', 'clean-vscode-win32-ia32'], packageTask('win32', 'ia32', { minified: true }));
@@ -522,7 +566,9 @@ gulp.task('vscode-translations-push-test', ['optimize-vscode'], function () {
 		gulp.src(pathToMetadata).pipe(i18n.createXlfFilesForCoreBundle()),
 		gulp.src(pathToSetup).pipe(i18n.createXlfFilesForIsl()),
 		gulp.src(pathToExtensions).pipe(i18n.createXlfFilesForExtensions())
-	).pipe(i18n.findObsoleteResources(apiHostname, apiName, apiToken)
+	// {{SQL CARBON EDIT}}
+	// disable since function makes calls to VS Code Transifex API
+	// ).pipe(i18n.findObsoleteResources(apiHostname, apiName, apiToken)
 	).pipe(vfs.dest('../vscode-transifex-input'));
 });
 
@@ -540,9 +586,11 @@ gulp.task('vscode-translations-import', function () {
 		gulp.src(`../vscode-localization/${language.id}/build/*/*.xlf`)
 			.pipe(i18n.prepareI18nFiles())
 			.pipe(vfs.dest(`./i18n/${language.folderName}`));
-		gulp.src(`../vscode-localization/${language.id}/setup/*/*.xlf`)
-			.pipe(i18n.prepareIslFiles(language, innoSetupConfig[language.id]))
-			.pipe(vfs.dest(`./build/win32/i18n`));
+
+		// {{SQL CARBON EDIT}}
+		// gulp.src(`../vscode-localization/${language.id}/setup/*/*.xlf`)
+		// 	.pipe(i18n.prepareIslFiles(language, innoSetupConfig[language.id]))
+		// 	.pipe(vfs.dest(`./build/win32/i18n`));
 	});
 });
 
@@ -568,22 +616,19 @@ gulp.task('upload-vscode-sourcemaps', ['minify-vscode'], () => {
 
 const allConfigDetailsPath = path.join(os.tmpdir(), 'configuration.json');
 gulp.task('upload-vscode-configuration', ['generate-vscode-configuration'], () => {
-	const branch = process.env.BUILD_SOURCEBRANCH;
-
-	if (!/\/master$/.test(branch) && branch.indexOf('/release/') < 0) {
+	if (!shouldSetupSettingsSearch()) {
+		const branch = process.env.BUILD_SOURCEBRANCH;
 		console.log(`Only runs on master and release branches, not ${branch}`);
 		return;
 	}
 
 	if (!fs.existsSync(allConfigDetailsPath)) {
-		console.error(`configuration file at ${allConfigDetailsPath} does not exist`);
-		return;
+		throw new Error(`configuration file at ${allConfigDetailsPath} does not exist`);
 	}
 
-	const settingsSearchBuildId = getBuildNumber();
+	const settingsSearchBuildId = getSettingsSearchBuildId(packageJson);
 	if (!settingsSearchBuildId) {
-		console.error('Failed to compute build number');
-		return;
+		throw new Error('Failed to compute build number');
 	}
 
 	return gulp.src(allConfigDetailsPath)
@@ -595,76 +640,29 @@ gulp.task('upload-vscode-configuration', ['generate-vscode-configuration'], () =
 		}));
 });
 
-function getBuildNumber() {
-	const previous = getPreviousVersion(packageJson.version);
-	if (!previous) {
-		return 0;
-	}
+function shouldSetupSettingsSearch() {
+	const branch = process.env.BUILD_SOURCEBRANCH;
+	return branch && (/\/master$/.test(branch) || branch.indexOf('/release/') >= 0);
+}
 
+function getSettingsSearchBuildId(packageJson) {
 	try {
-		const out = cp.execSync(`git rev-list ${previous}..HEAD --count`);
+		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());
-		return versionStringToNumber(packageJson.version) * 1e4 + count;
+
+		// <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) {
-		console.error('Could not determine build number: ' + e.toString());
-		return 0;
+		throw new Error('Could not determine build number: ' + e.toString());
 	}
 }
 
-/**
- * Given 1.17.2, return 1.17.1
- * 1.18.0 => 1.17.2.
- * 2.0.0 => 1.18.0 (or the highest 1.x)
- */
-function getPreviousVersion(versionStr) {
-	function tagExists(tagName) {
-		try {
-			cp.execSync(`git rev-parse ${tagName}`, { stdio: 'ignore' });
-			return true;
-		} catch (e) {
-			return false;
-		}
-	}
-
-	function getLastTagFromBase(semverArr, componentToTest) {
-		const baseVersion = semverArr.join('.');
-		if (!tagExists(baseVersion)) {
-			console.error('Failed to find tag for base version, ' + baseVersion);
-			return null;
-		}
-
-		let goodTag;
-		do {
-			goodTag = semverArr.join('.');
-			semverArr[componentToTest]++;
-		} while (tagExists(semverArr.join('.')));
-
-		return goodTag;
-	}
-
-	const semverArr = versionStr.split('.');
-	if (semverArr[2] > 0) {
-		semverArr[2]--;
-		return semverArr.join('.');
-	} else if (semverArr[1] > 0) {
-		semverArr[1]--;
-		return getLastTagFromBase(semverArr, 2);
-	} else {
-		semverArr[0]--;
-		return getLastTagFromBase(semverArr, 1);
-	}
-}
-
-function versionStringToNumber(versionStr) {
-	const semverRegex = /(\d+)\.(\d+)\.(\d+)/;
-	const match = versionStr.match(semverRegex);
-	if (!match) {
-		return 0;
-	}
-
-	return parseInt(match[1], 10) * 1e4 + parseInt(match[2], 10) * 1e2 + parseInt(match[3], 10);
-}
-
 // This task is only run for the MacOS build
 gulp.task('generate-vscode-configuration', () => {
 	return new Promise((resolve, reject) => {
@@ -673,6 +671,10 @@ gulp.task('generate-vscode-configuration', () => {
 			return reject(new Error('$AGENT_BUILDDIRECTORY not set'));
 		}
 
+		if (process.env.VSCODE_QUALITY !== 'insider' && process.env.VSCODE_QUALITY !== 'stable') {
+			return resolve();
+		}
+
 		const userDataDir = path.join(os.tmpdir(), 'tmpuserdata');
 		const extensionsDir = path.join(os.tmpdir(), 'tmpextdir');
 		const appName = process.env.VSCODE_QUALITY === 'insider' ? 'Visual\\ Studio\\ Code\\ -\\ Insiders.app' : 'Visual\\ Studio\\ Code.app';
@@ -696,9 +698,6 @@ gulp.task('generate-vscode-configuration', () => {
 			clearTimeout(timer);
 			reject(err);
 		});
-	}).catch(e => {
-		// Don't fail the build
-		console.error(e.toString());
 	});
 });
 

build/gulpfile.vscode.linux.js

@@ -12,45 +12,19 @@ const shell = require('gulp-shell');
 const es = require('event-stream');
 const vfs = require('vinyl-fs');
 const util = require('./lib/util');
-// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
 const packageJson = require('../package.json');
-// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
 const product = require('../product.json');
-// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
 const rpmDependencies = require('../resources/linux/rpm/dependencies.json');
 
 const linuxPackageRevision = Math.floor(new Date().getTime() / 1000);
 
-const flatpakManifest = {
-	appId: product.darwinBundleIdentifier,  // We need a reverse-url style identifier.
-	sdk: 'org.freedesktop.Sdk',
-	runtime: 'org.freedesktop.Sdk',
-	runtimeVersion: '1.4',
-	base: 'io.atom.electron.BaseApp',
-	baseFlatpakref: 'https://s3-us-west-2.amazonaws.com/electron-flatpak.endlessm.com/electron-base-app-master.flatpakref',
-	command: product.applicationName,
-	symlinks: [
-		['/share/' + product.applicationName + '/bin/' + product.applicationName, '/bin/' + product.applicationName],
-	],
-	finishArgs: [
-		'--share=ipc', '--socket=x11',  // Allow showing X11 windows.
-		'--share=network',              // Network access (e.g. for installing extension).
-		'--filesystem=host',            // Allow access to the whole file system.
-		'--device=dri',                 // Allow OpenGL rendering.
-		'--filesystem=/tmp',            // Needed for Chromium's single instance check.
-		'--socket=pulseaudio',          // Some extensions may want to play sounds...
-		'--talk-name=org.freedesktop.Notifications',  // ...or pop up notifications.
-	],
-};
-
-
 function getDebPackageArch(arch) {
 	return { x64: 'amd64', ia32: 'i386', arm: 'armhf' }[arch];
 }
 
 function prepareDebPackage(arch) {
   // {{SQL CARBON EDIT}}
-	const binaryDir = '../sqlops-linux-' + arch;
+	const binaryDir = '../azuredatastudio-linux-' + arch;
 	const debArch = getDebPackageArch(arch);
 	const destination = '.build/linux/deb/' + debArch + '/' + product.applicationName + '-' + debArch;
 
@@ -99,7 +73,9 @@ function prepareDebPackage(arch) {
 		const postinst = gulp.src('resources/linux/debian/postinst.template', { base: '.' })
 			.pipe(replace('@@NAME@@', product.applicationName))
 			.pipe(replace('@@ARCHITECTURE@@', debArch))
+			// @ts-ignore JSON checking: quality is optional
 			.pipe(replace('@@QUALITY@@', product.quality || '@@QUALITY@@'))
+			// @ts-ignore JSON checking: updateUrl is optional
 			.pipe(replace('@@UPDATEURL@@', product.updateUrl || '@@UPDATEURL@@'))
 			.pipe(rename('DEBIAN/postinst'));
 
@@ -128,7 +104,7 @@ function getRpmPackageArch(arch) {
 
 function prepareRpmPackage(arch) {
 	// {{SQL CARBON EDIT}}
-	const binaryDir = '../sqlops-linux-' + arch;
+	const binaryDir = '../azuredatastudio-linux-' + arch;
 	const rpmArch = getRpmPackageArch(arch);
 
 	return function () {
@@ -158,7 +134,9 @@ function prepareRpmPackage(arch) {
 			.pipe(replace('@@RELEASE@@', linuxPackageRevision))
 			.pipe(replace('@@ARCHITECTURE@@', rpmArch))
 			.pipe(replace('@@LICENSE@@', product.licenseName))
+			// @ts-ignore JSON checking: quality is optional
 			.pipe(replace('@@QUALITY@@', product.quality || '@@QUALITY@@'))
+			// @ts-ignore JSON checking: updateUrl is optional
 			.pipe(replace('@@UPDATEURL@@', product.updateUrl || '@@UPDATEURL@@'))
 			.pipe(replace('@@DEPENDENCIES@@', rpmDependencies[rpmArch].join(', ')))
 			.pipe(rename('SPECS/' + product.applicationName + '.spec'));
@@ -235,7 +213,7 @@ function getFlatpakArch(arch) {
 
 function prepareFlatpak(arch) {
   // {{SQL CARBON EDIT}}
-	const binaryDir = '../sqlops-linux-' + arch;
+	const binaryDir = '../azuredatastudio-linux-' + arch;
 	const flatpakArch = getFlatpakArch(arch);
 	const destination = '.build/linux/flatpak/' + flatpakArch;
 
@@ -336,10 +314,3 @@ gulp.task('vscode-linux-arm-prepare-snap', ['clean-vscode-linux-arm-snap'], prep
 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-ia32-prepare-flatpak', ['clean-vscode-linux-ia32-flatpak'], prepareFlatpak('ia32'));
-gulp.task('vscode-linux-x64-prepare-flatpak', ['clean-vscode-linux-x64-flatpak'], prepareFlatpak('x64'));
-gulp.task('vscode-linux-arm-prepare-flatpak', ['clean-vscode-linux-arm-flatpak'], prepareFlatpak('arm'));
-gulp.task('vscode-linux-ia32-flatpak', ['vscode-linux-ia32-prepare-flatpak'], buildFlatpak('ia32'));
-gulp.task('vscode-linux-x64-flatpak', ['vscode-linux-x64-prepare-flatpak'], buildFlatpak('x64'));
-gulp.task('vscode-linux-arm-flatpak', ['vscode-linux-arm-prepare-flatpak'], buildFlatpak('arm'));

build/gulpfile.vscode.win32.js

@@ -7,45 +7,71 @@
 
 const gulp = require('gulp');
 const path = require('path');
+const fs = require('fs');
 const assert = require('assert');
 const cp = require('child_process');
 const _7z = require('7zip')['7z'];
 const util = require('./lib/util');
-// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
 const pkg = require('../package.json');
-// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
 const product = require('../product.json');
 const vfs = require('vinyl-fs');
+const mkdirp = require('mkdirp');
 
 const repoPath = path.dirname(__dirname);
 // {{SQL CARBON EDIT}}
-const buildPath = arch => path.join(path.dirname(repoPath), `sqlops-win32-${arch}`);
+const buildPath = arch => path.join(path.dirname(repoPath), `azuredatastudio-win32-${arch}`);
 const zipDir = arch => path.join(repoPath, '.build', `win32-${arch}`, 'archive');
 const zipPath = arch => path.join(zipDir(arch), `VSCode-win32-${arch}.zip`);
-const setupDir = arch => path.join(repoPath, '.build', `win32-${arch}`, 'setup');
+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-compiler'))), 'bin', 'ISCC.exe');
+const signPS1 = path.join(repoPath, 'build', 'tfs', 'win32', 'sign.ps1');
 
 function packageInnoSetup(iss, options, cb) {
 	options = options || {};
 
 	const definitions = options.definitions || {};
+	const debug = process.argv.some(arg => arg === '--debug-inno');
+
+	if (debug) {
+		definitions['Debug'] = 'true';
+	}
+
 	const keys = Object.keys(definitions);
 
 	keys.forEach(key => assert(typeof definitions[key] === 'string', `Missing value for '${key}' in Inno Setup package step`));
 
 	const defs = keys.map(key => `/d${key}=${definitions[key]}`);
-	const args = [iss].concat(defs);
+	const args = [
+		iss,
+		...defs
+		//,
+		//`/sesrp=powershell.exe -ExecutionPolicy bypass ${signPS1} $f`
+	];
 
-	cp.spawn(innoSetupPath, args, { stdio: 'inherit' })
+	cp.spawn(innoSetupPath, args, { stdio: ['ignore', 'inherit', 'inherit'] })
 		.on('error', cb)
 		.on('exit', () => cb(null));
 }
 
-function buildWin32Setup(arch) {
+function buildWin32Setup(arch, target) {
+	if (target !== 'system' && target !== 'user') {
+		throw new Error('Invalid setup target');
+	}
+
 	return cb => {
-		const ia32AppId = product.win32AppId;
-		const x64AppId = product.win32x64AppId;
+		const ia32AppId = target === 'system' ? product.win32AppId : product.win32UserAppId;
+		const x64AppId = target === 'system' ? product.win32x64AppId : product.win32x64UserAppId;
+
+		const sourcePath = buildPath(arch);
+		const outputPath = setupDir(arch, target);
+		mkdirp.sync(outputPath);
+
+		const originalProductJsonPath = path.join(sourcePath, 'resources/app/product.json');
+		const productJsonPath = path.join(outputPath, 'product.json');
+		const productJson = JSON.parse(fs.readFileSync(originalProductJsonPath, 'utf8'));
+		productJson['target'] = target;
+		fs.writeFileSync(productJsonPath, JSON.stringify(productJson, undefined, '\t'));
 
 		const definitions = {
 			NameLong: product.nameLong,
@@ -53,35 +79,42 @@ function buildWin32Setup(arch) {
 			DirName: product.win32DirName,
 			Version: pkg.version,
 			RawVersion: pkg.version.replace(/-\w+$/, ''),
-			NameVersion: product.win32NameVersion,
+			NameVersion: product.win32NameVersion + (target === 'user' ? ' (User)' : ''),
 			ExeBasename: product.nameShort,
 			RegValueName: product.win32RegValueName,
 			ShellNameShort: product.win32ShellNameShort,
 			AppMutex: product.win32MutexName,
 			Arch: arch,
 			AppId: arch === 'ia32' ? ia32AppId : x64AppId,
-			IncompatibleAppId: arch === 'ia32' ? x64AppId : ia32AppId,
+			IncompatibleTargetAppId: arch === 'ia32' ? product.win32AppId : product.win32x64AppId,
+			IncompatibleArchAppId: arch === 'ia32' ? x64AppId : ia32AppId,
 			AppUserId: product.win32AppUserModelId,
 			ArchitecturesAllowed: arch === 'ia32' ? '' : 'x64',
 			ArchitecturesInstallIn64BitMode: arch === 'ia32' ? '' : 'x64',
-			SourceDir: buildPath(arch),
+			SourceDir: sourcePath,
 			RepoDir: repoPath,
-			OutputDir: setupDir(arch)
+			OutputDir: outputPath,
+			InstallTarget: target,
+			ProductJsonPath: productJsonPath
 		};
 
 		packageInnoSetup(issPath, { definitions }, cb);
 	};
 }
 
-gulp.task('clean-vscode-win32-ia32-setup', util.rimraf(setupDir('ia32')));
-gulp.task('vscode-win32-ia32-setup', ['clean-vscode-win32-ia32-setup'], buildWin32Setup('ia32'));
+function defineWin32SetupTasks(arch, target) {
+	gulp.task(`clean-vscode-win32-${arch}-${target}-setup`, util.rimraf(setupDir(arch, target)));
+	gulp.task(`vscode-win32-${arch}-${target}-setup`, [`clean-vscode-win32-${arch}-${target}-setup`], buildWin32Setup(arch, target));
+}
 
-gulp.task('clean-vscode-win32-x64-setup', util.rimraf(setupDir('x64')));
-gulp.task('vscode-win32-x64-setup', ['clean-vscode-win32-x64-setup'], buildWin32Setup('x64'));
+defineWin32SetupTasks('ia32', 'system');
+defineWin32SetupTasks('x64', 'system');
+defineWin32SetupTasks('ia32', 'user');
+defineWin32SetupTasks('x64', 'user');
 
 function archiveWin32Setup(arch) {
 	return cb => {
-		const args = ['a', '-tzip', zipPath(arch), '.', '-r'];
+		const args = ['a', '-tzip', zipPath(arch), '-x!CodeSignSummary*.md', '.', '-r'];
 
 		cp.spawn(_7z, args, { stdio: 'inherit', cwd: buildPath(arch) })
 			.on('error', cb)

build/lib/builtInExtensions.js

@@ -17,7 +17,6 @@ const ext = require('./extensions');
 const util = require('gulp-util');
 
 const root = path.dirname(path.dirname(__dirname));
-// @ts-ignore Microsoft/TypeScript#21262 complains about a require of a JSON file
 const builtInExtensions = require('../builtInExtensions.json');
 const controlFilePath = path.join(os.homedir(), '.vscode-oss-dev', 'extensions', 'control.json');
 

build/lib/compilation.js

@@ -18,17 +18,21 @@ var _ = require("underscore");
 var monacodts = require("../monaco/api");
 var fs = require("fs");
 var reporter = reporter_1.createReporter();
-var rootDir = path.join(__dirname, '../../src');
-var options = require('../../src/tsconfig.json').compilerOptions;
-options.verbose = false;
-options.sourceMap = true;
-if (process.env['VSCODE_NO_SOURCEMAP']) {
-    options.sourceMap = false;
+function getTypeScriptCompilerOptions(src) {
+    var rootDir = path.join(__dirname, "../../" + src);
+    var options = require("../../" + src + "/tsconfig.json").compilerOptions;
+    options.verbose = false;
+    options.sourceMap = true;
+    if (process.env['VSCODE_NO_SOURCEMAP']) { // To be used by developers in a hurry
+        options.sourceMap = false;
+    }
+    options.rootDir = rootDir;
+    options.sourceRoot = util.toFileUri(rootDir);
+    options.newLine = /\r\n/.test(fs.readFileSync(__filename, 'utf8')) ? 'CRLF' : 'LF';
+    return options;
 }
-options.rootDir = rootDir;
-options.sourceRoot = util.toFileUri(rootDir);
-function createCompile(build, emitError) {
-    var opts = _.clone(options);
+function createCompile(src, build, emitError) {
+    var opts = _.clone(getTypeScriptCompilerOptions(src));
     opts.inlineSources = !!build;
     opts.noFilesystemLookup = true;
     var ts = tsb.create(opts, null, null, function (err) { return reporter(err.toString()); });
@@ -50,31 +54,31 @@ function createCompile(build, emitError) {
             .pipe(sourcemaps.write('.', {
             addComment: false,
             includeContent: !!build,
-            sourceRoot: options.sourceRoot
+            sourceRoot: opts.sourceRoot
         }))
             .pipe(tsFilter.restore)
             .pipe(reporter.end(emitError));
         return es.duplex(input, output);
     };
 }
-function compileTask(out, build) {
+function compileTask(src, out, build) {
     return function () {
-        var compile = createCompile(build, true);
-        var src = es.merge(gulp.src('src/**', { base: 'src' }), gulp.src('node_modules/typescript/lib/lib.d.ts'));
+        var compile = createCompile(src, build, true);
+        var srcPipe = es.merge(gulp.src(src + "/**", { base: "" + src }), gulp.src('node_modules/typescript/lib/lib.d.ts'));
         // Do not write .d.ts files to disk, as they are not needed there.
         var dtsFilter = util.filter(function (data) { return !/\.d\.ts$/.test(data.path); });
-        return src
+        return srcPipe
             .pipe(compile())
             .pipe(dtsFilter)
             .pipe(gulp.dest(out))
             .pipe(dtsFilter.restore)
-            .pipe(monacodtsTask(out, false));
+            .pipe(src !== 'src' ? es.through() : monacodtsTask(out, false));
     };
 }
 exports.compileTask = compileTask;
 function watchTask(out, build) {
     return function () {
-        var compile = createCompile(build);
+        var compile = createCompile('src', build);
         var src = es.merge(gulp.src('src/**', { base: 'src' }), gulp.src('node_modules/typescript/lib/lib.d.ts'));
         var watchSrc = watch('src/**', { base: 'src' });
         // Do not write .d.ts files to disk, as they are not needed there.
@@ -121,6 +125,7 @@ function monacodtsTask(out, isWatch) {
                 fs.writeFileSync(result.filePath, result.content);
             }
             else {
+                fs.writeFileSync(result.filePath, result.content);
                 resultStream.emit('error', 'monaco.d.ts is no longer up to date. Please run gulp watch and commit the new file.');
             }
         }

build/lib/compilation.ts

@@ -21,18 +21,22 @@ import * as fs from 'fs';
 
 const reporter = createReporter();
 
-const rootDir = path.join(__dirname, '../../src');
-const options = require('../../src/tsconfig.json').compilerOptions;
-options.verbose = false;
-options.sourceMap = true;
-if (process.env['VSCODE_NO_SOURCEMAP']) { // To be used by developers in a hurry
-	options.sourceMap = false;
+function getTypeScriptCompilerOptions(src: string) {
+	const rootDir = path.join(__dirname, `../../${src}`);
+	const options = require(`../../${src}/tsconfig.json`).compilerOptions;
+	options.verbose = false;
+	options.sourceMap = true;
+	if (process.env['VSCODE_NO_SOURCEMAP']) { // To be used by developers in a hurry
+		options.sourceMap = false;
+	}
+	options.rootDir = rootDir;
+	options.sourceRoot = util.toFileUri(rootDir);
+	options.newLine = /\r\n/.test(fs.readFileSync(__filename, 'utf8')) ? 'CRLF' : 'LF';
+	return options;
 }
-options.rootDir = rootDir;
-options.sourceRoot = util.toFileUri(rootDir);
 
-function createCompile(build: boolean, emitError?: boolean): (token?: util.ICancellationToken) => NodeJS.ReadWriteStream {
-	const opts = _.clone(options);
+function createCompile(src: string, build: boolean, emitError?: boolean): (token?: util.ICancellationToken) => NodeJS.ReadWriteStream {
+	const opts = _.clone(getTypeScriptCompilerOptions(src));
 	opts.inlineSources = !!build;
 	opts.noFilesystemLookup = true;
 
@@ -58,7 +62,7 @@ function createCompile(build: boolean, emitError?: boolean): (token?: util.ICanc
 			.pipe(sourcemaps.write('.', {
 				addComment: false,
 				includeContent: !!build,
-				sourceRoot: options.sourceRoot
+				sourceRoot: opts.sourceRoot
 			}))
 			.pipe(tsFilter.restore)
 			.pipe(reporter.end(emitError));
@@ -67,32 +71,32 @@ function createCompile(build: boolean, emitError?: boolean): (token?: util.ICanc
 	};
 }
 
-export function compileTask(out: string, build: boolean): () => NodeJS.ReadWriteStream {
+export function compileTask(src: string, out: string, build: boolean): () => NodeJS.ReadWriteStream {
 
 	return function () {
-		const compile = createCompile(build, true);
+		const compile = createCompile(src, build, true);
 
-		const src = es.merge(
-			gulp.src('src/**', { base: 'src' }),
+		const srcPipe = es.merge(
+			gulp.src(`${src}/**`, { base: `${src}` }),
 			gulp.src('node_modules/typescript/lib/lib.d.ts'),
 		);
 
 		// Do not write .d.ts files to disk, as they are not needed there.
 		const dtsFilter = util.filter(data => !/\.d\.ts$/.test(data.path));
 
-		return src
+		return srcPipe
 			.pipe(compile())
 			.pipe(dtsFilter)
 			.pipe(gulp.dest(out))
 			.pipe(dtsFilter.restore)
-			.pipe(monacodtsTask(out, false));
+			.pipe(src !== 'src' ? es.through() : monacodtsTask(out, false));
 	};
 }
 
 export function watchTask(out: string, build: boolean): () => NodeJS.ReadWriteStream {
 
 	return function () {
-		const compile = createCompile(build);
+		const compile = createCompile('src', build);
 
 		const src = es.merge(
 			gulp.src('src/**', { base: 'src' }),
@@ -149,6 +153,7 @@ function monacodtsTask(out: string, isWatch: boolean): NodeJS.ReadWriteStream {
 			if (isWatch) {
 				fs.writeFileSync(result.filePath, result.content);
 			} else {
+				fs.writeFileSync(result.filePath, result.content);
 				resultStream.emit('error', 'monaco.d.ts is no longer up to date. Please run gulp watch and commit the new file.');
 			}
 		}

build/lib/extensions.js

@@ -44,6 +44,7 @@ function error(err) {
 var baseHeaders = {
     'X-Market-Client-Id': 'VSCode Build',
     'User-Agent': 'VSCode Build',
+    'X-Market-User-Id': '291C1CD0-051A-4123-9B4B-30D60EF52EE2',
 };
 function fromMarketplace(extensionName, version) {
     var filterType = 7;

build/lib/extensions.ts

@@ -49,6 +49,7 @@ function error(err: any): Stream {
 const baseHeaders = {
 	'X-Market-Client-Id': 'VSCode Build',
 	'User-Agent': 'VSCode Build',
+	'X-Market-User-Id': '291C1CD0-051A-4123-9B4B-30D60EF52EE2',
 };
 
 export function fromMarketplace(extensionName: string, version: string): Stream {

build/lib/i18n.js

@@ -527,6 +527,7 @@ function getResource(sourceFile) {
     else if (/^vs\/workbench/.test(sourceFile)) {
         return { name: 'vs/workbench', project: workbenchProject };
     }
+    // {{SQL CARBON EDIT}}
     else if (/^sql/.test(sourceFile)) {
         return { name: 'sql', project: sqlopsProject };
     }
@@ -1051,7 +1052,10 @@ function createI18nFile(originalFilePath, messages) {
         var key = _a[_i];
         result[key] = messages[key];
     }
-    var content = JSON.stringify(result, null, '\t').replace(/\r\n/g, '\n');
+    var content = JSON.stringify(result, null, '\t');
+    if (process.platform === 'win32') {
+        content = content.replace(/\n/g, '\r\n');
+    }
     return new File({
         path: path.join(originalFilePath + '.i18n.json'),
         contents: Buffer.from(content, 'utf8')
@@ -1085,7 +1089,7 @@ function prepareI18nPackFiles(externalExtensions, resultingTranslationPaths, pse
                         extPack = extensionsPacks[resource] = { version: i18nPackVersion, contents: {} };
                     }
                     var externalId = externalExtensions[resource];
-                    if (!externalId) {
+                    if (!externalId) { // internal extension: remove 'extensions/extensionId/' segnent
                         var secondSlash = path.indexOf('/', firstSlash + 1);
                         extPack.contents[path.substr(secondSlash + 1)] = file.messages;
                     }

build/lib/i18n.resources.json

@@ -34,6 +34,10 @@
 			"name": "vs/workbench/parts/codeEditor",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/parts/comments",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/parts/debug",
 			"project": "vscode-workbench"
@@ -74,6 +78,10 @@
 			"name": "vs/workbench/parts/logs",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/parts/navigation",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/parts/output",
 			"project": "vscode-workbench"
@@ -130,22 +138,42 @@
 			"name": "vs/workbench/parts/update",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/parts/url",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/parts/watermark",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/parts/webview",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/parts/welcome",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/parts/outline",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/services/actions",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/services/bulkEdit",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/services/configuration",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/services/configurationResolver",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/services/crashReporter",
 			"project": "vscode-workbench"
@@ -201,6 +229,10 @@
 		{
 			"name": "vs/workbench/services/decorations",
 			"project": "vscode-workbench"
+		},
+		{
+			"name": "vs/workbench/services/preferences",
+			"project": "vscode-preferences"
 		}
 	]
-}
+}

build/lib/i18n.ts

@@ -1179,7 +1179,10 @@ function createI18nFile(originalFilePath: string, messages: any): File {
 		result[key] = messages[key];
 	}
 
-	let content = JSON.stringify(result, null, '\t').replace(/\r\n/g, '\n');
+	let content = JSON.stringify(result, null, '\t');
+	if (process.platform === 'win32') {
+		content = content.replace(/\n/g, '\r\n');
+	}
 	return new File({
 		path: path.join(originalFilePath + '.i18n.json'),
 		contents: Buffer.from(content, 'utf8')

build/lib/nls.js

@@ -150,13 +150,16 @@ function isImportNode(node) {
             .filter(function (d) { return d.importClause.namedBindings.kind === ts.SyntaxKind.NamespaceImport; })
             .map(function (d) { return d.importClause.namedBindings.name; })
             .concat(importEqualsDeclarations.map(function (d) { return d.name; }))
+            // find read-only references to `nls`
             .map(function (n) { return service.getReferencesAtPosition(filename, n.pos + 1); })
             .flatten()
             .filter(function (r) { return !r.isWriteAccess; })
+            // find the deepest call expressions AST nodes that contain those references
             .map(function (r) { return collect(sourceFile, function (n) { return isCallExpressionWithinTextSpanCollectStep(r.textSpan, n); }); })
             .map(function (a) { return lazy(a).last(); })
             .filter(function (n) { return !!n; })
             .map(function (n) { return n; })
+            // only `localize` calls
             .filter(function (n) { return n.expression.kind === ts.SyntaxKind.PropertyAccessExpression && n.expression.name.getText() === 'localize'; });
         // `localize` named imports
         var allLocalizeImportDeclarations = importDeclarations

build/lib/optimize.js

@@ -17,7 +17,6 @@ var concat = require("gulp-concat");
 var VinylFile = require("vinyl");
 var bundle = require("./bundle");
 var util = require("./util");
-var i18n = require("./i18n");
 var gulpUtil = require("gulp-util");
 var flatmap = require("gulp-flatmap");
 var pump = require("pump");
@@ -40,19 +39,19 @@ function loaderConfig(emptyPaths) {
 }
 exports.loaderConfig = loaderConfig;
 var IS_OUR_COPYRIGHT_REGEXP = /Copyright \(C\) Microsoft Corporation/i;
-function loader(bundledFileHeader, bundleLoader) {
+function loader(src, bundledFileHeader, bundleLoader) {
     var sources = [
-        'out-build/vs/loader.js'
+        src + "/vs/loader.js"
     ];
     if (bundleLoader) {
         sources = sources.concat([
-            'out-build/vs/css.js',
-            'out-build/vs/nls.js'
+            src + "/vs/css.js",
+            src + "/vs/nls.js"
         ]);
     }
     var isFirst = true;
     return (gulp
-        .src(sources, { base: 'out-build' })
+        .src(sources, { base: "" + src })
         .pipe(es.through(function (data) {
         if (isFirst) {
             isFirst = false;
@@ -74,7 +73,7 @@ function loader(bundledFileHeader, bundleLoader) {
         return f;
     })));
 }
-function toConcatStream(bundledFileHeader, sources, dest) {
+function toConcatStream(src, bundledFileHeader, sources, dest) {
     var useSourcemaps = /\.js$/.test(dest) && !/\.nls\.js$/.test(dest);
     // If a bundle ends up including in any of the sources our copyright, then
     // insert a fake source at the beginning of each bundle with our copyright
@@ -94,7 +93,7 @@ function toConcatStream(bundledFileHeader, sources, dest) {
     }
     var treatedSources = sources.map(function (source) {
         var root = source.path ? REPO_ROOT_PATH.replace(/\\/g, '/') : '';
-        var base = source.path ? root + '/out-build' : '';
+        var base = source.path ? root + ("/" + src) : '';
         return new VinylFile({
             path: source.path ? root + '/' + source.path.replace(/\\/g, '/') : 'fake',
             base: base,
@@ -105,12 +104,13 @@ function toConcatStream(bundledFileHeader, sources, dest) {
         .pipe(useSourcemaps ? util.loadSourcemaps() : es.through())
         .pipe(concat(dest));
 }
-function toBundleStream(bundledFileHeader, bundles) {
+function toBundleStream(src, bundledFileHeader, bundles) {
     return es.merge(bundles.map(function (bundle) {
-        return toConcatStream(bundledFileHeader, bundle.sources, bundle.dest);
+        return toConcatStream(src, bundledFileHeader, bundle.sources, bundle.dest);
     }));
 }
 function optimizeTask(opts) {
+    var src = opts.src;
     var entryPoints = opts.entryPoints;
     var otherSources = opts.otherSources;
     var resources = opts.resources;
@@ -126,7 +126,7 @@ function optimizeTask(opts) {
             if (err) {
                 return bundlesStream.emit('error', JSON.stringify(err));
             }
-            toBundleStream(bundledFileHeader, result.files).pipe(bundlesStream);
+            toBundleStream(src, bundledFileHeader, result.files).pipe(bundlesStream);
             // Remove css inlined resources
             var filteredResources = resources.slice();
             result.cssInlinedResources.forEach(function (resource) {
@@ -135,7 +135,7 @@ function optimizeTask(opts) {
                 }
                 filteredResources.push('!' + resource);
             });
-            gulp.src(filteredResources, { base: 'out-build' }).pipe(resourcesStream);
+            gulp.src(filteredResources, { base: "" + src }).pipe(resourcesStream);
             var bundleInfoArray = [];
             if (opts.bundleInfo) {
                 bundleInfoArray.push(new VinylFile({
@@ -148,9 +148,9 @@ function optimizeTask(opts) {
         });
         var otherSourcesStream = es.through();
         var otherSourcesStreamArr = [];
-        gulp.src(otherSources, { base: 'out-build' })
+        gulp.src(otherSources, { base: "" + src })
             .pipe(es.through(function (data) {
-            otherSourcesStreamArr.push(toConcatStream(bundledFileHeader, [data], data.relative));
+            otherSourcesStreamArr.push(toConcatStream(src, bundledFileHeader, [data], data.relative));
         }, function () {
             if (!otherSourcesStreamArr.length) {
                 setTimeout(function () { otherSourcesStream.emit('end'); }, 0);
@@ -159,16 +159,12 @@ function optimizeTask(opts) {
                 es.merge(otherSourcesStreamArr).pipe(otherSourcesStream);
             }
         }));
-        var result = es.merge(loader(bundledFileHeader, bundleLoader), bundlesStream, otherSourcesStream, resourcesStream, bundleInfoStream);
+        var result = es.merge(loader(src, bundledFileHeader, bundleLoader), bundlesStream, otherSourcesStream, resourcesStream, bundleInfoStream);
         return result
             .pipe(sourcemaps.write('./', {
             sourceRoot: null,
             addComment: true,
             includeContent: true
-        }))
-            .pipe(i18n.processNlsFiles({
-            fileHeader: bundledFileHeader,
-            languages: opts.languages
         }))
             .pipe(gulp.dest(out));
     };

build/lib/optimize.ts

@@ -18,11 +18,11 @@ import * as concat from 'gulp-concat';
 import * as VinylFile from 'vinyl';
 import * as bundle from './bundle';
 import * as util from './util';
-import * as i18n from './i18n';
 import * as gulpUtil from 'gulp-util';
 import * as flatmap from 'gulp-flatmap';
 import * as pump from 'pump';
 import * as sm from 'source-map';
+import { Language } from './i18n';
 
 const REPO_ROOT_PATH = path.join(__dirname, '../..');
 
@@ -52,21 +52,21 @@ declare class FileSourceMap extends VinylFile {
 	public sourceMap: sm.RawSourceMap;
 }
 
-function loader(bundledFileHeader: string, bundleLoader: boolean): NodeJS.ReadWriteStream {
+function loader(src: string, bundledFileHeader: string, bundleLoader: boolean): NodeJS.ReadWriteStream {
 	let sources = [
-		'out-build/vs/loader.js'
+		`${src}/vs/loader.js`
 	];
 	if (bundleLoader) {
 		sources = sources.concat([
-			'out-build/vs/css.js',
-			'out-build/vs/nls.js'
+			`${src}/vs/css.js`,
+			`${src}/vs/nls.js`
 		]);
 	}
 
 	let isFirst = true;
 	return (
 		gulp
-			.src(sources, { base: 'out-build' })
+			.src(sources, { base: `${src}` })
 			.pipe(es.through(function (data) {
 				if (isFirst) {
 					isFirst = false;
@@ -89,7 +89,7 @@ function loader(bundledFileHeader: string, bundleLoader: boolean): NodeJS.ReadWr
 	);
 }
 
-function toConcatStream(bundledFileHeader: string, sources: bundle.IFile[], dest: string): NodeJS.ReadWriteStream {
+function toConcatStream(src: string, bundledFileHeader: string, sources: bundle.IFile[], dest: string): NodeJS.ReadWriteStream {
 	const useSourcemaps = /\.js$/.test(dest) && !/\.nls\.js$/.test(dest);
 
 	// If a bundle ends up including in any of the sources our copyright, then
@@ -112,7 +112,7 @@ function toConcatStream(bundledFileHeader: string, sources: bundle.IFile[], dest
 
 	const treatedSources = sources.map(function (source) {
 		const root = source.path ? REPO_ROOT_PATH.replace(/\\/g, '/') : '';
-		const base = source.path ? root + '/out-build' : '';
+		const base = source.path ? root + `/${src}` : '';
 
 		return new VinylFile({
 			path: source.path ? root + '/' + source.path.replace(/\\/g, '/') : 'fake',
@@ -126,13 +126,17 @@ function toConcatStream(bundledFileHeader: string, sources: bundle.IFile[], dest
 		.pipe(concat(dest));
 }
 
-function toBundleStream(bundledFileHeader: string, bundles: bundle.IConcatFile[]): NodeJS.ReadWriteStream {
+function toBundleStream(src:string, bundledFileHeader: string, bundles: bundle.IConcatFile[]): NodeJS.ReadWriteStream {
 	return es.merge(bundles.map(function (bundle) {
-		return toConcatStream(bundledFileHeader, bundle.sources, bundle.dest);
+		return toConcatStream(src, bundledFileHeader, bundle.sources, bundle.dest);
 	}));
 }
 
 export interface IOptimizeTaskOpts {
+	/**
+	 * The folder to read files from.
+	 */
+	src: string;
 	/**
 	 * (for AMD files, will get bundled and get Copyright treatment)
 	 */
@@ -163,11 +167,13 @@ export interface IOptimizeTaskOpts {
 	 */
 	out: string;
 	/**
-	 * (languages to process)
+	 * (out folder name)
 	 */
-	languages: i18n.Language[];
+	languages?: Language[];
 }
+
 export function optimizeTask(opts: IOptimizeTaskOpts): () => NodeJS.ReadWriteStream {
+	const src = opts.src;
 	const entryPoints = opts.entryPoints;
 	const otherSources = opts.otherSources;
 	const resources = opts.resources;
@@ -184,7 +190,7 @@ export function optimizeTask(opts: IOptimizeTaskOpts): () => NodeJS.ReadWriteStr
 		bundle.bundle(entryPoints, loaderConfig, function (err, result) {
 			if (err) { return bundlesStream.emit('error', JSON.stringify(err)); }
 
-			toBundleStream(bundledFileHeader, result.files).pipe(bundlesStream);
+			toBundleStream(src, bundledFileHeader, result.files).pipe(bundlesStream);
 
 			// Remove css inlined resources
 			const filteredResources = resources.slice();
@@ -194,7 +200,7 @@ export function optimizeTask(opts: IOptimizeTaskOpts): () => NodeJS.ReadWriteStr
 				}
 				filteredResources.push('!' + resource);
 			});
-			gulp.src(filteredResources, { base: 'out-build' }).pipe(resourcesStream);
+			gulp.src(filteredResources, { base: `${src}` }).pipe(resourcesStream);
 
 			const bundleInfoArray: VinylFile[] = [];
 			if (opts.bundleInfo) {
@@ -210,9 +216,9 @@ export function optimizeTask(opts: IOptimizeTaskOpts): () => NodeJS.ReadWriteStr
 		const otherSourcesStream = es.through();
 		const otherSourcesStreamArr: NodeJS.ReadWriteStream[] = [];
 
-		gulp.src(otherSources, { base: 'out-build' })
+		gulp.src(otherSources, { base: `${src}` })
 			.pipe(es.through(function (data) {
-				otherSourcesStreamArr.push(toConcatStream(bundledFileHeader, [data], data.relative));
+				otherSourcesStreamArr.push(toConcatStream(src, bundledFileHeader, [data], data.relative));
 			}, function () {
 				if (!otherSourcesStreamArr.length) {
 					setTimeout(function () { otherSourcesStream.emit('end'); }, 0);
@@ -222,7 +228,7 @@ export function optimizeTask(opts: IOptimizeTaskOpts): () => NodeJS.ReadWriteStr
 			}));
 
 		const result = es.merge(
-			loader(bundledFileHeader, bundleLoader),
+			loader(src, bundledFileHeader, bundleLoader),
 			bundlesStream,
 			otherSourcesStream,
 			resourcesStream,
@@ -235,10 +241,6 @@ export function optimizeTask(opts: IOptimizeTaskOpts): () => NodeJS.ReadWriteStr
 				addComment: true,
 				includeContent: true
 			}))
-			.pipe(i18n.processNlsFiles({
-				fileHeader: bundledFileHeader,
-				languages: opts.languages
-			}))
 			.pipe(gulp.dest(out));
 	};
 }

build/lib/reporter.js

@@ -34,7 +34,13 @@ catch (err) {
 }
 function log() {
     var errors = _.flatten(allErrors);
-    errors.map(function (err) { return util.log(util.colors.red('Error') + ": " + err); });
+    var seen = new Set();
+    errors.map(function (err) {
+        if (!seen.has(err)) {
+            seen.add(err);
+            util.log(util.colors.red('Error') + ": " + err);
+        }
+    });
     var regex = /^([^(]+)\((\d+),(\d+)\): (.*)$/;
     var messages = errors
         .map(function (err) { return regex.exec(err); })
@@ -67,8 +73,13 @@ function createReporter() {
             return es.through(null, function () {
                 onEnd();
                 if (emitError && errors.length > 0) {
-                    log();
-                    this.emit('error');
+                    errors.__logged__ = true;
+                    if (!errors.__logged__) {
+                        log();
+                    }
+                    var err = new Error("Found " + errors.length + " errors");
+                    err.__reporter__ = true;
+                    this.emit('error', err);
                 }
                 else {
                     this.emit('end');
@@ -80,4 +91,3 @@ function createReporter() {
     return ReportFunc;
 }
 exports.createReporter = createReporter;
-;

build/lib/reporter.ts

@@ -11,7 +11,7 @@ import * as util from 'gulp-util';
 import * as fs from 'fs';
 import * as path from 'path';
 
-const allErrors: Error[][] = [];
+const allErrors: string[][] = [];
 let startTime: number = null;
 let count = 0;
 
@@ -42,7 +42,14 @@ try {
 
 function log(): void {
 	const errors = _.flatten(allErrors);
-	errors.map(err => util.log(`${util.colors.red('Error')}: ${err}`));
+	const seen = new Set<string>();
+
+	errors.map(err => {
+		if (!seen.has(err)) {
+			seen.add(err);
+			util.log(`${util.colors.red('Error')}: ${err}`);
+		}
+	});
 
 	const regex = /^([^(]+)\((\d+),(\d+)\): (.*)$/;
 	const messages = errors
@@ -61,17 +68,17 @@ function log(): void {
 }
 
 export interface IReporter {
-	(err: Error): void;
+	(err: string): void;
 	hasErrors(): boolean;
 	end(emitError: boolean): NodeJS.ReadWriteStream;
 }
 
 export function createReporter(): IReporter {
-	const errors: Error[] = [];
+	const errors: string[] = [];
 	allErrors.push(errors);
 
 	class ReportFunc {
-		constructor(err: Error) {
+		constructor(err: string) {
 			errors.push(err);
 		}
 
@@ -87,8 +94,15 @@ export function createReporter(): IReporter {
 				onEnd();
 
 				if (emitError && errors.length > 0) {
-					log();
-					this.emit('error');
+					(errors as any).__logged__ = true;
+
+					if (!(errors as any).__logged__) {
+						log();
+					}
+
+					const err = new Error(`Found ${errors.length} errors`);
+					(err as any).__reporter__ = true;
+					this.emit('error', err);
 				} else {
 					this.emit('end');
 				}
@@ -97,4 +111,4 @@ export function createReporter(): IReporter {
 	}
 
 	return <IReporter><any>ReportFunc;
-};
+}

build/lib/standalone.js

@@ -0,0 +1,349 @@
+"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 });
+var ts = require("typescript");
+var fs = require("fs");
+var path = require("path");
+var tss = require("./treeshaking");
+var REPO_ROOT = path.join(__dirname, '../../');
+var SRC_DIR = path.join(REPO_ROOT, 'src');
+var OUT_EDITOR = path.join(REPO_ROOT, 'out-editor');
+var dirCache = {};
+function writeFile(filePath, contents) {
+    function ensureDirs(dirPath) {
+        if (dirCache[dirPath]) {
+            return;
+        }
+        dirCache[dirPath] = true;
+        ensureDirs(path.dirname(dirPath));
+        if (fs.existsSync(dirPath)) {
+            return;
+        }
+        fs.mkdirSync(dirPath);
+    }
+    ensureDirs(path.dirname(filePath));
+    fs.writeFileSync(filePath, contents);
+}
+function extractEditor(options) {
+    var result = tss.shake(options);
+    for (var fileName in result) {
+        if (result.hasOwnProperty(fileName)) {
+            writeFile(path.join(options.destRoot, fileName), result[fileName]);
+        }
+    }
+    var copied = {};
+    var copyFile = function (fileName) {
+        if (copied[fileName]) {
+            return;
+        }
+        copied[fileName] = true;
+        var srcPath = path.join(options.sourcesRoot, fileName);
+        var dstPath = path.join(options.destRoot, fileName);
+        writeFile(dstPath, fs.readFileSync(srcPath));
+    };
+    var writeOutputFile = function (fileName, contents) {
+        writeFile(path.join(options.destRoot, fileName), contents);
+    };
+    for (var fileName in result) {
+        if (result.hasOwnProperty(fileName)) {
+            var fileContents = result[fileName];
+            var info = ts.preProcessFile(fileContents);
+            for (var i = info.importedFiles.length - 1; i >= 0; i--) {
+                var importedFileName = info.importedFiles[i].fileName;
+                var importedFilePath = void 0;
+                if (/^vs\/css!/.test(importedFileName)) {
+                    importedFilePath = importedFileName.substr('vs/css!'.length) + '.css';
+                }
+                else {
+                    importedFilePath = importedFileName;
+                }
+                if (/(^\.\/)|(^\.\.\/)/.test(importedFilePath)) {
+                    importedFilePath = path.join(path.dirname(fileName), importedFilePath);
+                }
+                if (/\.css$/.test(importedFilePath)) {
+                    transportCSS(importedFilePath, copyFile, writeOutputFile);
+                }
+                else {
+                    if (fs.existsSync(path.join(options.sourcesRoot, importedFilePath + '.js'))) {
+                        copyFile(importedFilePath + '.js');
+                    }
+                }
+            }
+        }
+    }
+    var tsConfig = JSON.parse(fs.readFileSync(path.join(options.sourcesRoot, 'tsconfig.json')).toString());
+    tsConfig.compilerOptions.noUnusedLocals = false;
+    writeOutputFile('tsconfig.json', JSON.stringify(tsConfig, null, '\t'));
+    [
+        'vs/css.build.js',
+        'vs/css.d.ts',
+        'vs/css.js',
+        'vs/loader.js',
+        'vs/monaco.d.ts',
+        'vs/nls.build.js',
+        'vs/nls.d.ts',
+        'vs/nls.js',
+        'vs/nls.mock.ts',
+        'typings/lib.ie11_safe_es6.d.ts',
+        'typings/thenable.d.ts',
+        'typings/es6-promise.d.ts',
+        'typings/require.d.ts',
+    ].forEach(copyFile);
+}
+exports.extractEditor = extractEditor;
+function createESMSourcesAndResources(options) {
+    var OUT_FOLDER = path.join(REPO_ROOT, options.outFolder);
+    var OUT_RESOURCES_FOLDER = path.join(REPO_ROOT, options.outResourcesFolder);
+    var in_queue = Object.create(null);
+    var queue = [];
+    var enqueue = function (module) {
+        if (in_queue[module]) {
+            return;
+        }
+        in_queue[module] = true;
+        queue.push(module);
+    };
+    var seenDir = {};
+    var createDirectoryRecursive = function (dir) {
+        if (seenDir[dir]) {
+            return;
+        }
+        var lastSlash = dir.lastIndexOf('/');
+        if (lastSlash === -1) {
+            lastSlash = dir.lastIndexOf('\\');
+        }
+        if (lastSlash !== -1) {
+            createDirectoryRecursive(dir.substring(0, lastSlash));
+        }
+        seenDir[dir] = true;
+        try {
+            fs.mkdirSync(dir);
+        }
+        catch (err) { }
+    };
+    seenDir[REPO_ROOT] = true;
+    var toggleComments = function (fileContents) {
+        var lines = fileContents.split(/\r\n|\r|\n/);
+        var mode = 0;
+        for (var i = 0; i < lines.length; i++) {
+            var line = lines[i];
+            if (mode === 0) {
+                if (/\/\/ ESM-comment-begin/.test(line)) {
+                    mode = 1;
+                    continue;
+                }
+                if (/\/\/ ESM-uncomment-begin/.test(line)) {
+                    mode = 2;
+                    continue;
+                }
+                continue;
+            }
+            if (mode === 1) {
+                if (/\/\/ ESM-comment-end/.test(line)) {
+                    mode = 0;
+                    continue;
+                }
+                lines[i] = '// ' + line;
+                continue;
+            }
+            if (mode === 2) {
+                if (/\/\/ ESM-uncomment-end/.test(line)) {
+                    mode = 0;
+                    continue;
+                }
+                lines[i] = line.replace(/^(\s*)\/\/ ?/, function (_, indent) {
+                    return indent;
+                });
+            }
+        }
+        return lines.join('\n');
+    };
+    var write = function (filePath, contents) {
+        var absoluteFilePath;
+        if (/\.ts$/.test(filePath)) {
+            absoluteFilePath = path.join(OUT_FOLDER, filePath);
+        }
+        else {
+            absoluteFilePath = path.join(OUT_RESOURCES_FOLDER, filePath);
+        }
+        createDirectoryRecursive(path.dirname(absoluteFilePath));
+        if (/(\.ts$)|(\.js$)/.test(filePath)) {
+            contents = toggleComments(contents.toString());
+        }
+        fs.writeFileSync(absoluteFilePath, contents);
+    };
+    options.entryPoints.forEach(function (entryPoint) { return enqueue(entryPoint); });
+    while (queue.length > 0) {
+        var module_1 = queue.shift();
+        if (transportCSS(module_1, enqueue, write)) {
+            continue;
+        }
+        if (transportResource(options, module_1, enqueue, write)) {
+            continue;
+        }
+        if (transportDTS(options, module_1, enqueue, write)) {
+            continue;
+        }
+        var filename = void 0;
+        if (options.redirects[module_1]) {
+            filename = path.join(SRC_DIR, options.redirects[module_1] + '.ts');
+        }
+        else {
+            filename = path.join(SRC_DIR, module_1 + '.ts');
+        }
+        var fileContents = fs.readFileSync(filename).toString();
+        var info = ts.preProcessFile(fileContents);
+        for (var i = info.importedFiles.length - 1; i >= 0; i--) {
+            var importedFilename = info.importedFiles[i].fileName;
+            var pos = info.importedFiles[i].pos;
+            var end = info.importedFiles[i].end;
+            var importedFilepath = void 0;
+            if (/^vs\/css!/.test(importedFilename)) {
+                importedFilepath = importedFilename.substr('vs/css!'.length) + '.css';
+            }
+            else {
+                importedFilepath = importedFilename;
+            }
+            if (/(^\.\/)|(^\.\.\/)/.test(importedFilepath)) {
+                importedFilepath = path.join(path.dirname(module_1), importedFilepath);
+            }
+            enqueue(importedFilepath);
+            var relativePath = void 0;
+            if (importedFilepath === path.dirname(module_1)) {
+                relativePath = '../' + path.basename(path.dirname(module_1));
+            }
+            else if (importedFilepath === path.dirname(path.dirname(module_1))) {
+                relativePath = '../../' + path.basename(path.dirname(path.dirname(module_1)));
+            }
+            else {
+                relativePath = path.relative(path.dirname(module_1), importedFilepath);
+            }
+            if (!/(^\.\/)|(^\.\.\/)/.test(relativePath)) {
+                relativePath = './' + relativePath;
+            }
+            fileContents = (fileContents.substring(0, pos + 1)
+                + relativePath
+                + fileContents.substring(end + 1));
+        }
+        fileContents = fileContents.replace(/import ([a-zA-z0-9]+) = require\(('[^']+')\);/g, function (_, m1, m2) {
+            return "import * as " + m1 + " from " + m2 + ";";
+        });
+        fileContents = fileContents.replace(/Thenable/g, 'PromiseLike');
+        write(module_1 + '.ts', fileContents);
+    }
+    var esm_opts = {
+        "compilerOptions": {
+            "outDir": path.relative(path.dirname(OUT_FOLDER), OUT_RESOURCES_FOLDER),
+            "rootDir": "src",
+            "module": "es6",
+            "target": "es5",
+            "experimentalDecorators": true,
+            "lib": [
+                "dom",
+                "es5",
+                "es2015.collection",
+                "es2015.promise"
+            ],
+            "types": []
+        }
+    };
+    fs.writeFileSync(path.join(path.dirname(OUT_FOLDER), 'tsconfig.json'), JSON.stringify(esm_opts, null, '\t'));
+    var monacodts = fs.readFileSync(path.join(SRC_DIR, 'vs/monaco.d.ts')).toString();
+    fs.writeFileSync(path.join(OUT_FOLDER, 'vs/monaco.d.ts'), monacodts);
+}
+exports.createESMSourcesAndResources = createESMSourcesAndResources;
+function transportCSS(module, enqueue, write) {
+    if (!/\.css/.test(module)) {
+        return false;
+    }
+    var filename = path.join(SRC_DIR, module);
+    var fileContents = fs.readFileSync(filename).toString();
+    var inlineResources = 'base64'; // see https://github.com/Microsoft/monaco-editor/issues/148
+    var inlineResourcesLimit = 300000; //3000; // see https://github.com/Microsoft/monaco-editor/issues/336
+    var newContents = _rewriteOrInlineUrls(fileContents, inlineResources === 'base64', inlineResourcesLimit);
+    write(module, newContents);
+    return true;
+    function _rewriteOrInlineUrls(contents, forceBase64, inlineByteLimit) {
+        return _replaceURL(contents, function (url) {
+            var imagePath = path.join(path.dirname(module), url);
+            var fileContents = fs.readFileSync(path.join(SRC_DIR, imagePath));
+            if (fileContents.length < inlineByteLimit) {
+                var MIME = /\.svg$/.test(url) ? 'image/svg+xml' : 'image/png';
+                var DATA = ';base64,' + fileContents.toString('base64');
+                if (!forceBase64 && /\.svg$/.test(url)) {
+                    // .svg => url encode as explained at https://codepen.io/tigt/post/optimizing-svgs-in-data-uris
+                    var newText = fileContents.toString()
+                        .replace(/"/g, '\'')
+                        .replace(/</g, '%3C')
+                        .replace(/>/g, '%3E')
+                        .replace(/&/g, '%26')
+                        .replace(/#/g, '%23')
+                        .replace(/\s+/g, ' ');
+                    var encodedData = ',' + newText;
+                    if (encodedData.length < DATA.length) {
+                        DATA = encodedData;
+                    }
+                }
+                return '"data:' + MIME + DATA + '"';
+            }
+            enqueue(imagePath);
+            return url;
+        });
+    }
+    function _replaceURL(contents, replacer) {
+        // Use ")" as the terminator as quotes are oftentimes not used at all
+        return contents.replace(/url\(\s*([^\)]+)\s*\)?/g, function (_) {
+            var matches = [];
+            for (var _i = 1; _i < arguments.length; _i++) {
+                matches[_i - 1] = arguments[_i];
+            }
+            var url = matches[0];
+            // Eliminate starting quotes (the initial whitespace is not captured)
+            if (url.charAt(0) === '"' || url.charAt(0) === '\'') {
+                url = url.substring(1);
+            }
+            // The ending whitespace is captured
+            while (url.length > 0 && (url.charAt(url.length - 1) === ' ' || url.charAt(url.length - 1) === '\t')) {
+                url = url.substring(0, url.length - 1);
+            }
+            // Eliminate ending quotes
+            if (url.charAt(url.length - 1) === '"' || url.charAt(url.length - 1) === '\'') {
+                url = url.substring(0, url.length - 1);
+            }
+            if (!_startsWith(url, 'data:') && !_startsWith(url, 'http://') && !_startsWith(url, 'https://')) {
+                url = replacer(url);
+            }
+            return 'url(' + url + ')';
+        });
+    }
+    function _startsWith(haystack, needle) {
+        return haystack.length >= needle.length && haystack.substr(0, needle.length) === needle;
+    }
+}
+function transportResource(options, module, enqueue, write) {
+    if (!/\.svg/.test(module)) {
+        return false;
+    }
+    write(module, fs.readFileSync(path.join(SRC_DIR, module)));
+    return true;
+}
+function transportDTS(options, module, enqueue, write) {
+    if (options.redirects[module] && fs.existsSync(path.join(SRC_DIR, options.redirects[module] + '.ts'))) {
+        return false;
+    }
+    if (!fs.existsSync(path.join(SRC_DIR, module + '.d.ts'))) {
+        return false;
+    }
+    write(module + '.d.ts', fs.readFileSync(path.join(SRC_DIR, module + '.d.ts')));
+    var filename;
+    if (options.redirects[module]) {
+        write(module + '.js', fs.readFileSync(path.join(SRC_DIR, options.redirects[module] + '.js')));
+    }
+    else {
+        write(module + '.js', fs.readFileSync(path.join(SRC_DIR, module + '.js')));
+    }
+    return true;
+}

build/lib/standalone.ts

@@ -0,0 +1,395 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as ts from 'typescript';
+import * as fs from 'fs';
+import * as path from 'path';
+import * as tss from './treeshaking';
+
+const REPO_ROOT = path.join(__dirname, '../../');
+const SRC_DIR = path.join(REPO_ROOT, 'src');
+const OUT_EDITOR = path.join(REPO_ROOT, 'out-editor');
+
+let dirCache: { [dir: string]: boolean; } = {};
+
+function writeFile(filePath: string, contents: Buffer | string): void {
+	function ensureDirs(dirPath: string): void {
+		if (dirCache[dirPath]) {
+			return;
+		}
+		dirCache[dirPath] = true;
+
+		ensureDirs(path.dirname(dirPath));
+		if (fs.existsSync(dirPath)) {
+			return;
+		}
+		fs.mkdirSync(dirPath);
+	}
+	ensureDirs(path.dirname(filePath));
+	fs.writeFileSync(filePath, contents);
+}
+
+export function extractEditor(options: tss.ITreeShakingOptions & { destRoot: string }): void {
+	let result = tss.shake(options);
+	for (let fileName in result) {
+		if (result.hasOwnProperty(fileName)) {
+			writeFile(path.join(options.destRoot, fileName), result[fileName]);
+		}
+	}
+	let copied: { [fileName:string]: boolean; } = {};
+	const copyFile = (fileName: string) => {
+		if (copied[fileName]) {
+			return;
+		}
+		copied[fileName] = true;
+		const srcPath = path.join(options.sourcesRoot, fileName);
+		const dstPath = path.join(options.destRoot, fileName);
+		writeFile(dstPath, fs.readFileSync(srcPath));
+	};
+	const writeOutputFile = (fileName: string, contents: string) => {
+		writeFile(path.join(options.destRoot, fileName), contents);
+	};
+	for (let fileName in result) {
+		if (result.hasOwnProperty(fileName)) {
+			const fileContents = result[fileName];
+			const info = ts.preProcessFile(fileContents);
+
+			for (let i = info.importedFiles.length - 1; i >= 0; i--) {
+				const importedFileName = info.importedFiles[i].fileName;
+
+				let importedFilePath: string;
+				if (/^vs\/css!/.test(importedFileName)) {
+					importedFilePath = importedFileName.substr('vs/css!'.length) + '.css';
+				} else {
+					importedFilePath = importedFileName;
+				}
+				if (/(^\.\/)|(^\.\.\/)/.test(importedFilePath)) {
+					importedFilePath = path.join(path.dirname(fileName), importedFilePath);
+				}
+
+				if (/\.css$/.test(importedFilePath)) {
+					transportCSS(importedFilePath, copyFile, writeOutputFile);
+				} else {
+					if (fs.existsSync(path.join(options.sourcesRoot, importedFilePath + '.js'))) {
+						copyFile(importedFilePath + '.js');
+					}
+				}
+			}
+		}
+	}
+
+	const tsConfig = JSON.parse(fs.readFileSync(path.join(options.sourcesRoot, 'tsconfig.json')).toString());
+	tsConfig.compilerOptions.noUnusedLocals = false;
+	writeOutputFile('tsconfig.json', JSON.stringify(tsConfig, null, '\t'));
+
+	[
+		'vs/css.build.js',
+		'vs/css.d.ts',
+		'vs/css.js',
+		'vs/loader.js',
+		'vs/monaco.d.ts',
+		'vs/nls.build.js',
+		'vs/nls.d.ts',
+		'vs/nls.js',
+		'vs/nls.mock.ts',
+		'typings/lib.ie11_safe_es6.d.ts',
+		'typings/thenable.d.ts',
+		'typings/es6-promise.d.ts',
+		'typings/require.d.ts',
+	].forEach(copyFile);
+}
+
+export interface IOptions {
+	entryPoints: string[];
+	outFolder: string;
+	outResourcesFolder: string;
+	redirects: { [module: string]: string; };
+}
+
+export function createESMSourcesAndResources(options: IOptions): void {
+	const OUT_FOLDER = path.join(REPO_ROOT, options.outFolder);
+	const OUT_RESOURCES_FOLDER = path.join(REPO_ROOT, options.outResourcesFolder);
+
+	let in_queue: { [module: string]: boolean; } = Object.create(null);
+	let queue: string[] = [];
+
+	const enqueue = (module: string) => {
+		if (in_queue[module]) {
+			return;
+		}
+		in_queue[module] = true;
+		queue.push(module);
+	};
+
+	const seenDir: { [key: string]: boolean; } = {};
+	const createDirectoryRecursive = (dir: string) => {
+		if (seenDir[dir]) {
+			return;
+		}
+
+		let lastSlash = dir.lastIndexOf('/');
+		if (lastSlash === -1) {
+			lastSlash = dir.lastIndexOf('\\');
+		}
+		if (lastSlash !== -1) {
+			createDirectoryRecursive(dir.substring(0, lastSlash));
+		}
+		seenDir[dir] = true;
+		try { fs.mkdirSync(dir); } catch (err) { }
+	};
+
+	seenDir[REPO_ROOT] = true;
+
+	const toggleComments = (fileContents: string) => {
+		let lines = fileContents.split(/\r\n|\r|\n/);
+		let mode = 0;
+		for (let i = 0; i < lines.length; i++) {
+			const line = lines[i];
+
+			if (mode === 0) {
+				if (/\/\/ ESM-comment-begin/.test(line)) {
+					mode = 1;
+					continue;
+				}
+				if (/\/\/ ESM-uncomment-begin/.test(line)) {
+					mode = 2;
+					continue;
+				}
+				continue;
+			}
+
+			if (mode === 1) {
+				if (/\/\/ ESM-comment-end/.test(line)) {
+					mode = 0;
+					continue;
+				}
+				lines[i] = '// ' + line;
+				continue;
+			}
+
+			if (mode === 2) {
+				if (/\/\/ ESM-uncomment-end/.test(line)) {
+					mode = 0;
+					continue;
+				}
+				lines[i] = line.replace(/^(\s*)\/\/ ?/, function (_, indent) {
+					return indent;
+				});
+			}
+		}
+
+		return lines.join('\n');
+	};
+
+	const write = (filePath: string, contents: string | Buffer) => {
+		let absoluteFilePath: string;
+		if (/\.ts$/.test(filePath)) {
+			absoluteFilePath = path.join(OUT_FOLDER, filePath);
+		} else {
+			absoluteFilePath = path.join(OUT_RESOURCES_FOLDER, filePath);
+		}
+		createDirectoryRecursive(path.dirname(absoluteFilePath));
+		if (/(\.ts$)|(\.js$)/.test(filePath)) {
+			contents = toggleComments(contents.toString());
+		}
+		fs.writeFileSync(absoluteFilePath, contents);
+	};
+
+	options.entryPoints.forEach((entryPoint) => enqueue(entryPoint));
+
+	while (queue.length > 0) {
+		const module = queue.shift();
+		if (transportCSS(module, enqueue, write)) {
+			continue;
+		}
+		if (transportResource(options, module, enqueue, write)) {
+			continue;
+		}
+		if (transportDTS(options, module, enqueue, write)) {
+			continue;
+		}
+
+		let filename: string;
+		if (options.redirects[module]) {
+			filename = path.join(SRC_DIR, options.redirects[module] + '.ts');
+		} else {
+			filename = path.join(SRC_DIR, module + '.ts');
+		}
+		let fileContents = fs.readFileSync(filename).toString();
+
+		const info = ts.preProcessFile(fileContents);
+
+		for (let i = info.importedFiles.length - 1; i >= 0; i--) {
+			const importedFilename = info.importedFiles[i].fileName;
+			const pos = info.importedFiles[i].pos;
+			const end = info.importedFiles[i].end;
+
+			let importedFilepath: string;
+			if (/^vs\/css!/.test(importedFilename)) {
+				importedFilepath = importedFilename.substr('vs/css!'.length) + '.css';
+			} else {
+				importedFilepath = importedFilename;
+			}
+			if (/(^\.\/)|(^\.\.\/)/.test(importedFilepath)) {
+				importedFilepath = path.join(path.dirname(module), importedFilepath);
+			}
+
+			enqueue(importedFilepath);
+
+			let relativePath: string;
+			if (importedFilepath === path.dirname(module)) {
+				relativePath = '../' + path.basename(path.dirname(module));
+			} else if (importedFilepath === path.dirname(path.dirname(module))) {
+				relativePath = '../../' + path.basename(path.dirname(path.dirname(module)));
+			} else {
+				relativePath = path.relative(path.dirname(module), importedFilepath);
+			}
+			if (!/(^\.\/)|(^\.\.\/)/.test(relativePath)) {
+				relativePath = './' + relativePath;
+			}
+			fileContents = (
+				fileContents.substring(0, pos + 1)
+				+ relativePath
+				+ fileContents.substring(end + 1)
+			);
+		}
+
+		fileContents = fileContents.replace(/import ([a-zA-z0-9]+) = require\(('[^']+')\);/g, function (_, m1, m2) {
+			return `import * as ${m1} from ${m2};`;
+		});
+		fileContents = fileContents.replace(/Thenable/g, 'PromiseLike');
+
+		write(module + '.ts', fileContents);
+	}
+
+	const esm_opts = {
+		"compilerOptions": {
+			"outDir": path.relative(path.dirname(OUT_FOLDER), OUT_RESOURCES_FOLDER),
+			"rootDir": "src",
+			"module": "es6",
+			"target": "es5",
+			"experimentalDecorators": true,
+			"lib": [
+				"dom",
+				"es5",
+				"es2015.collection",
+				"es2015.promise"
+			],
+			"types": [
+			]
+		}
+	};
+	fs.writeFileSync(path.join(path.dirname(OUT_FOLDER), 'tsconfig.json'), JSON.stringify(esm_opts, null, '\t'));
+
+	const monacodts = fs.readFileSync(path.join(SRC_DIR, 'vs/monaco.d.ts')).toString();
+	fs.writeFileSync(path.join(OUT_FOLDER, 'vs/monaco.d.ts'), monacodts);
+
+}
+
+function transportCSS(module: string, enqueue: (module: string) => void, write: (path: string, contents: string | Buffer) => void): boolean {
+
+	if (!/\.css/.test(module)) {
+		return false;
+	}
+
+	const filename = path.join(SRC_DIR, module);
+	const fileContents = fs.readFileSync(filename).toString();
+	const inlineResources = 'base64'; // see https://github.com/Microsoft/monaco-editor/issues/148
+	const inlineResourcesLimit = 300000;//3000; // see https://github.com/Microsoft/monaco-editor/issues/336
+
+	const newContents = _rewriteOrInlineUrls(fileContents, inlineResources === 'base64', inlineResourcesLimit);
+	write(module, newContents);
+	return true;
+
+	function _rewriteOrInlineUrls(contents: string, forceBase64: boolean, inlineByteLimit: number): string {
+		return _replaceURL(contents, (url) => {
+			let imagePath = path.join(path.dirname(module), url);
+			let fileContents = fs.readFileSync(path.join(SRC_DIR, imagePath));
+
+			if (fileContents.length < inlineByteLimit) {
+				const MIME = /\.svg$/.test(url) ? 'image/svg+xml' : 'image/png';
+				let DATA = ';base64,' + fileContents.toString('base64');
+
+				if (!forceBase64 && /\.svg$/.test(url)) {
+					// .svg => url encode as explained at https://codepen.io/tigt/post/optimizing-svgs-in-data-uris
+					let newText = fileContents.toString()
+						.replace(/"/g, '\'')
+						.replace(/</g, '%3C')
+						.replace(/>/g, '%3E')
+						.replace(/&/g, '%26')
+						.replace(/#/g, '%23')
+						.replace(/\s+/g, ' ');
+					let encodedData = ',' + newText;
+					if (encodedData.length < DATA.length) {
+						DATA = encodedData;
+					}
+				}
+				return '"data:' + MIME + DATA + '"';
+			}
+
+			enqueue(imagePath);
+			return url;
+		});
+	}
+
+	function _replaceURL(contents: string, replacer: (url: string) => string): string {
+		// Use ")" as the terminator as quotes are oftentimes not used at all
+		return contents.replace(/url\(\s*([^\)]+)\s*\)?/g, (_: string, ...matches: string[]) => {
+			var url = matches[0];
+			// Eliminate starting quotes (the initial whitespace is not captured)
+			if (url.charAt(0) === '"' || url.charAt(0) === '\'') {
+				url = url.substring(1);
+			}
+			// The ending whitespace is captured
+			while (url.length > 0 && (url.charAt(url.length - 1) === ' ' || url.charAt(url.length - 1) === '\t')) {
+				url = url.substring(0, url.length - 1);
+			}
+			// Eliminate ending quotes
+			if (url.charAt(url.length - 1) === '"' || url.charAt(url.length - 1) === '\'') {
+				url = url.substring(0, url.length - 1);
+			}
+
+			if (!_startsWith(url, 'data:') && !_startsWith(url, 'http://') && !_startsWith(url, 'https://')) {
+				url = replacer(url);
+			}
+
+			return 'url(' + url + ')';
+		});
+	}
+
+	function _startsWith(haystack: string, needle: string): boolean {
+		return haystack.length >= needle.length && haystack.substr(0, needle.length) === needle;
+	}
+}
+
+function transportResource(options: IOptions, module: string, enqueue: (module: string) => void, write: (path: string, contents: string | Buffer) => void): boolean {
+
+	if (!/\.svg/.test(module)) {
+		return false;
+	}
+
+	write(module, fs.readFileSync(path.join(SRC_DIR, module)));
+	return true;
+}
+
+function transportDTS(options: IOptions, module: string, enqueue: (module: string) => void, write: (path: string, contents: string | Buffer) => void): boolean {
+
+	if (options.redirects[module] && fs.existsSync(path.join(SRC_DIR, options.redirects[module] + '.ts'))) {
+		return false;
+	}
+
+	if (!fs.existsSync(path.join(SRC_DIR, module + '.d.ts'))) {
+		return false;
+	}
+
+	write(module + '.d.ts', fs.readFileSync(path.join(SRC_DIR, module + '.d.ts')));
+	let filename: string;
+	if (options.redirects[module]) {
+		write(module + '.js', fs.readFileSync(path.join(SRC_DIR, options.redirects[module] + '.js')));
+	} else {
+		write(module + '.js', fs.readFileSync(path.join(SRC_DIR, module + '.js')));
+	}
+	return true;
+}

build/lib/treeshaking.js

@@ -0,0 +1,682 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 });
+var fs = require("fs");
+var path = require("path");
+var ts = require("typescript");
+var TYPESCRIPT_LIB_FOLDER = path.dirname(require.resolve('typescript/lib/lib.d.ts'));
+var ShakeLevel;
+(function (ShakeLevel) {
+    ShakeLevel[ShakeLevel["Files"] = 0] = "Files";
+    ShakeLevel[ShakeLevel["InnerFile"] = 1] = "InnerFile";
+    ShakeLevel[ShakeLevel["ClassMembers"] = 2] = "ClassMembers";
+})(ShakeLevel = exports.ShakeLevel || (exports.ShakeLevel = {}));
+function shake(options) {
+    var languageService = createTypeScriptLanguageService(options);
+    markNodes(languageService, options);
+    return generateResult(languageService, options.shakeLevel);
+}
+exports.shake = shake;
+//#region Discovery, LanguageService & Setup
+function createTypeScriptLanguageService(options) {
+    // Discover referenced files
+    var FILES = discoverAndReadFiles(options);
+    // Add fake usage files
+    options.inlineEntryPoints.forEach(function (inlineEntryPoint, index) {
+        FILES["inlineEntryPoint:" + index + ".ts"] = inlineEntryPoint;
+    });
+    // Resolve libs
+    var RESOLVED_LIBS = {};
+    options.libs.forEach(function (filename) {
+        var filepath = path.join(TYPESCRIPT_LIB_FOLDER, filename);
+        RESOLVED_LIBS["defaultLib:" + filename] = fs.readFileSync(filepath).toString();
+    });
+    var host = new TypeScriptLanguageServiceHost(RESOLVED_LIBS, FILES, options.compilerOptions);
+    return ts.createLanguageService(host);
+}
+/**
+ * Read imports and follow them until all files have been handled
+ */
+function discoverAndReadFiles(options) {
+    var FILES = {};
+    var in_queue = Object.create(null);
+    var queue = [];
+    var enqueue = function (moduleId) {
+        if (in_queue[moduleId]) {
+            return;
+        }
+        in_queue[moduleId] = true;
+        queue.push(moduleId);
+    };
+    options.entryPoints.forEach(function (entryPoint) { return enqueue(entryPoint); });
+    while (queue.length > 0) {
+        var moduleId = queue.shift();
+        var dts_filename = path.join(options.sourcesRoot, moduleId + '.d.ts');
+        if (fs.existsSync(dts_filename)) {
+            var dts_filecontents = fs.readFileSync(dts_filename).toString();
+            FILES[moduleId + '.d.ts'] = dts_filecontents;
+            continue;
+        }
+        var ts_filename = void 0;
+        if (options.redirects[moduleId]) {
+            ts_filename = path.join(options.sourcesRoot, options.redirects[moduleId] + '.ts');
+        }
+        else {
+            ts_filename = path.join(options.sourcesRoot, moduleId + '.ts');
+        }
+        var ts_filecontents = fs.readFileSync(ts_filename).toString();
+        var info = ts.preProcessFile(ts_filecontents);
+        for (var i = info.importedFiles.length - 1; i >= 0; i--) {
+            var importedFileName = info.importedFiles[i].fileName;
+            if (options.importIgnorePattern.test(importedFileName)) {
+                // Ignore vs/css! imports
+                continue;
+            }
+            var importedModuleId = importedFileName;
+            if (/(^\.\/)|(^\.\.\/)/.test(importedModuleId)) {
+                importedModuleId = path.join(path.dirname(moduleId), importedModuleId);
+            }
+            enqueue(importedModuleId);
+        }
+        FILES[moduleId + '.ts'] = ts_filecontents;
+    }
+    return FILES;
+}
+/**
+ * A TypeScript language service host
+ */
+var TypeScriptLanguageServiceHost = /** @class */ (function () {
+    function TypeScriptLanguageServiceHost(libs, files, compilerOptions) {
+        this._libs = libs;
+        this._files = files;
+        this._compilerOptions = compilerOptions;
+    }
+    // --- language service host ---------------
+    TypeScriptLanguageServiceHost.prototype.getCompilationSettings = function () {
+        return this._compilerOptions;
+    };
+    TypeScriptLanguageServiceHost.prototype.getScriptFileNames = function () {
+        return ([]
+            .concat(Object.keys(this._libs))
+            .concat(Object.keys(this._files)));
+    };
+    TypeScriptLanguageServiceHost.prototype.getScriptVersion = function (fileName) {
+        return '1';
+    };
+    TypeScriptLanguageServiceHost.prototype.getProjectVersion = function () {
+        return '1';
+    };
+    TypeScriptLanguageServiceHost.prototype.getScriptSnapshot = function (fileName) {
+        if (this._files.hasOwnProperty(fileName)) {
+            return ts.ScriptSnapshot.fromString(this._files[fileName]);
+        }
+        else if (this._libs.hasOwnProperty(fileName)) {
+            return ts.ScriptSnapshot.fromString(this._libs[fileName]);
+        }
+        else {
+            return ts.ScriptSnapshot.fromString('');
+        }
+    };
+    TypeScriptLanguageServiceHost.prototype.getScriptKind = function (fileName) {
+        return ts.ScriptKind.TS;
+    };
+    TypeScriptLanguageServiceHost.prototype.getCurrentDirectory = function () {
+        return '';
+    };
+    TypeScriptLanguageServiceHost.prototype.getDefaultLibFileName = function (options) {
+        return 'defaultLib:lib.d.ts';
+    };
+    TypeScriptLanguageServiceHost.prototype.isDefaultLibFileName = function (fileName) {
+        return fileName === this.getDefaultLibFileName(this._compilerOptions);
+    };
+    return TypeScriptLanguageServiceHost;
+}());
+//#endregion
+//#region Tree Shaking
+var NodeColor;
+(function (NodeColor) {
+    NodeColor[NodeColor["White"] = 0] = "White";
+    NodeColor[NodeColor["Gray"] = 1] = "Gray";
+    NodeColor[NodeColor["Black"] = 2] = "Black";
+})(NodeColor || (NodeColor = {}));
+function getColor(node) {
+    return node.$$$color || 0 /* White */;
+}
+function setColor(node, color) {
+    node.$$$color = color;
+}
+function nodeOrParentIsBlack(node) {
+    while (node) {
+        var color = getColor(node);
+        if (color === 2 /* Black */) {
+            return true;
+        }
+        node = node.parent;
+    }
+    return false;
+}
+function nodeOrChildIsBlack(node) {
+    if (getColor(node) === 2 /* Black */) {
+        return true;
+    }
+    for (var _i = 0, _a = node.getChildren(); _i < _a.length; _i++) {
+        var child = _a[_i];
+        if (nodeOrChildIsBlack(child)) {
+            return true;
+        }
+    }
+    return false;
+}
+function markNodes(languageService, options) {
+    var program = languageService.getProgram();
+    if (options.shakeLevel === 0 /* Files */) {
+        // Mark all source files Black
+        program.getSourceFiles().forEach(function (sourceFile) {
+            setColor(sourceFile, 2 /* Black */);
+        });
+        return;
+    }
+    var black_queue = [];
+    var gray_queue = [];
+    var sourceFilesLoaded = {};
+    function enqueueTopLevelModuleStatements(sourceFile) {
+        sourceFile.forEachChild(function (node) {
+            if (ts.isImportDeclaration(node)) {
+                if (!node.importClause && ts.isStringLiteral(node.moduleSpecifier)) {
+                    setColor(node, 2 /* Black */);
+                    enqueueImport(node, node.moduleSpecifier.text);
+                }
+                return;
+            }
+            if (ts.isExportDeclaration(node)) {
+                if (ts.isStringLiteral(node.moduleSpecifier)) {
+                    setColor(node, 2 /* Black */);
+                    enqueueImport(node, node.moduleSpecifier.text);
+                }
+                return;
+            }
+            if (ts.isExpressionStatement(node)
+                || ts.isIfStatement(node)
+                || ts.isIterationStatement(node, true)
+                || ts.isExportAssignment(node)) {
+                enqueue_black(node);
+            }
+            if (ts.isImportEqualsDeclaration(node)) {
+                if (/export/.test(node.getFullText(sourceFile))) {
+                    // e.g. "export import Severity = BaseSeverity;"
+                    enqueue_black(node);
+                }
+            }
+        });
+    }
+    function enqueue_gray(node) {
+        if (nodeOrParentIsBlack(node) || getColor(node) === 1 /* Gray */) {
+            return;
+        }
+        setColor(node, 1 /* Gray */);
+        gray_queue.push(node);
+    }
+    function enqueue_black(node) {
+        var previousColor = getColor(node);
+        if (previousColor === 2 /* Black */) {
+            return;
+        }
+        if (previousColor === 1 /* Gray */) {
+            // remove from gray queue
+            gray_queue.splice(gray_queue.indexOf(node), 1);
+            setColor(node, 0 /* White */);
+            // add to black queue
+            enqueue_black(node);
+            // // move from one queue to the other
+            // black_queue.push(node);
+            // setColor(node, NodeColor.Black);
+            return;
+        }
+        if (nodeOrParentIsBlack(node)) {
+            return;
+        }
+        var fileName = node.getSourceFile().fileName;
+        if (/^defaultLib:/.test(fileName) || /\.d\.ts$/.test(fileName)) {
+            setColor(node, 2 /* Black */);
+            return;
+        }
+        var sourceFile = node.getSourceFile();
+        if (!sourceFilesLoaded[sourceFile.fileName]) {
+            sourceFilesLoaded[sourceFile.fileName] = true;
+            enqueueTopLevelModuleStatements(sourceFile);
+        }
+        if (ts.isSourceFile(node)) {
+            return;
+        }
+        setColor(node, 2 /* Black */);
+        black_queue.push(node);
+        if (options.shakeLevel === 2 /* ClassMembers */ && (ts.isMethodDeclaration(node) || ts.isMethodSignature(node) || ts.isPropertySignature(node) || ts.isGetAccessor(node) || ts.isSetAccessor(node))) {
+            var references = languageService.getReferencesAtPosition(node.getSourceFile().fileName, node.name.pos + node.name.getLeadingTriviaWidth());
+            if (references) {
+                for (var i = 0, len = references.length; i < len; i++) {
+                    var reference = references[i];
+                    var referenceSourceFile = program.getSourceFile(reference.fileName);
+                    var referenceNode = getTokenAtPosition(referenceSourceFile, reference.textSpan.start, false, false);
+                    if (ts.isMethodDeclaration(referenceNode.parent)
+                        || ts.isPropertyDeclaration(referenceNode.parent)
+                        || ts.isGetAccessor(referenceNode.parent)
+                        || ts.isSetAccessor(referenceNode.parent)) {
+                        enqueue_gray(referenceNode.parent);
+                    }
+                }
+            }
+        }
+    }
+    function enqueueFile(filename) {
+        var sourceFile = program.getSourceFile(filename);
+        if (!sourceFile) {
+            console.warn("Cannot find source file " + filename);
+            return;
+        }
+        enqueue_black(sourceFile);
+    }
+    function enqueueImport(node, importText) {
+        if (options.importIgnorePattern.test(importText)) {
+            // this import should be ignored
+            return;
+        }
+        var nodeSourceFile = node.getSourceFile();
+        var fullPath;
+        if (/(^\.\/)|(^\.\.\/)/.test(importText)) {
+            fullPath = path.join(path.dirname(nodeSourceFile.fileName), importText) + '.ts';
+        }
+        else {
+            fullPath = importText + '.ts';
+        }
+        enqueueFile(fullPath);
+    }
+    options.entryPoints.forEach(function (moduleId) { return enqueueFile(moduleId + '.ts'); });
+    // Add fake usage files
+    options.inlineEntryPoints.forEach(function (_, index) { return enqueueFile("inlineEntryPoint:" + index + ".ts"); });
+    var step = 0;
+    var checker = program.getTypeChecker();
+    var _loop_1 = function () {
+        ++step;
+        var node = void 0;
+        if (step % 100 === 0) {
+            console.log(step + "/" + (step + black_queue.length + gray_queue.length) + " (" + black_queue.length + ", " + gray_queue.length + ")");
+        }
+        if (black_queue.length === 0) {
+            for (var i = 0; i < gray_queue.length; i++) {
+                var node_1 = gray_queue[i];
+                var nodeParent = node_1.parent;
+                if ((ts.isClassDeclaration(nodeParent) || ts.isInterfaceDeclaration(nodeParent)) && nodeOrChildIsBlack(nodeParent)) {
+                    gray_queue.splice(i, 1);
+                    black_queue.push(node_1);
+                    setColor(node_1, 2 /* Black */);
+                    i--;
+                }
+            }
+        }
+        if (black_queue.length > 0) {
+            node = black_queue.shift();
+        }
+        else {
+            return "break";
+        }
+        var nodeSourceFile = node.getSourceFile();
+        var loop = function (node) {
+            var _a = getRealNodeSymbol(checker, node), symbol = _a[0], symbolImportNode = _a[1];
+            if (symbolImportNode) {
+                setColor(symbolImportNode, 2 /* Black */);
+            }
+            if (symbol && !nodeIsInItsOwnDeclaration(nodeSourceFile, node, symbol)) {
+                for (var i = 0, len = symbol.declarations.length; i < len; i++) {
+                    var declaration = symbol.declarations[i];
+                    if (ts.isSourceFile(declaration)) {
+                        // Do not enqueue full source files
+                        // (they can be the declaration of a module import)
+                        continue;
+                    }
+                    if (options.shakeLevel === 2 /* ClassMembers */ && (ts.isClassDeclaration(declaration) || ts.isInterfaceDeclaration(declaration))) {
+                        enqueue_black(declaration.name);
+                        for (var j = 0; j < declaration.members.length; j++) {
+                            var member = declaration.members[j];
+                            var memberName = member.name ? member.name.getText() : null;
+                            if (ts.isConstructorDeclaration(member)
+                                || ts.isConstructSignatureDeclaration(member)
+                                || ts.isIndexSignatureDeclaration(member)
+                                || ts.isCallSignatureDeclaration(member)
+                                || memberName === 'toJSON'
+                                || memberName === 'toString'
+                                || memberName === 'dispose' // TODO: keeping all `dispose` methods
+                            ) {
+                                enqueue_black(member);
+                            }
+                        }
+                        // queue the heritage clauses
+                        if (declaration.heritageClauses) {
+                            for (var _i = 0, _b = declaration.heritageClauses; _i < _b.length; _i++) {
+                                var heritageClause = _b[_i];
+                                enqueue_black(heritageClause);
+                            }
+                        }
+                    }
+                    else {
+                        enqueue_black(declaration);
+                    }
+                }
+            }
+            node.forEachChild(loop);
+        };
+        node.forEachChild(loop);
+    };
+    while (black_queue.length > 0 || gray_queue.length > 0) {
+        var state_1 = _loop_1();
+        if (state_1 === "break")
+            break;
+    }
+}
+function nodeIsInItsOwnDeclaration(nodeSourceFile, node, symbol) {
+    for (var i = 0, len = symbol.declarations.length; i < len; i++) {
+        var declaration = symbol.declarations[i];
+        var declarationSourceFile = declaration.getSourceFile();
+        if (nodeSourceFile === declarationSourceFile) {
+            if (declaration.pos <= node.pos && node.end <= declaration.end) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+function generateResult(languageService, shakeLevel) {
+    var program = languageService.getProgram();
+    var result = {};
+    var writeFile = function (filePath, contents) {
+        result[filePath] = contents;
+    };
+    program.getSourceFiles().forEach(function (sourceFile) {
+        var fileName = sourceFile.fileName;
+        if (/^defaultLib:/.test(fileName)) {
+            return;
+        }
+        var destination = fileName;
+        if (/\.d\.ts$/.test(fileName)) {
+            if (nodeOrChildIsBlack(sourceFile)) {
+                writeFile(destination, sourceFile.text);
+            }
+            return;
+        }
+        var text = sourceFile.text;
+        var result = '';
+        function keep(node) {
+            result += text.substring(node.pos, node.end);
+        }
+        function write(data) {
+            result += data;
+        }
+        function writeMarkedNodes(node) {
+            if (getColor(node) === 2 /* Black */) {
+                return keep(node);
+            }
+            // Always keep certain top-level statements
+            if (ts.isSourceFile(node.parent)) {
+                if (ts.isExpressionStatement(node) && ts.isStringLiteral(node.expression) && node.expression.text === 'use strict') {
+                    return keep(node);
+                }
+                if (ts.isVariableStatement(node) && nodeOrChildIsBlack(node)) {
+                    return keep(node);
+                }
+            }
+            // Keep the entire import in import * as X cases
+            if (ts.isImportDeclaration(node)) {
+                if (node.importClause && node.importClause.namedBindings) {
+                    if (ts.isNamespaceImport(node.importClause.namedBindings)) {
+                        if (getColor(node.importClause.namedBindings) === 2 /* Black */) {
+                            return keep(node);
+                        }
+                    }
+                    else {
+                        var survivingImports = [];
+                        for (var i = 0; i < node.importClause.namedBindings.elements.length; i++) {
+                            var importNode = node.importClause.namedBindings.elements[i];
+                            if (getColor(importNode) === 2 /* Black */) {
+                                survivingImports.push(importNode.getFullText(sourceFile));
+                            }
+                        }
+                        var leadingTriviaWidth = node.getLeadingTriviaWidth();
+                        var leadingTrivia = sourceFile.text.substr(node.pos, leadingTriviaWidth);
+                        if (survivingImports.length > 0) {
+                            if (node.importClause && getColor(node.importClause) === 2 /* Black */) {
+                                return write(leadingTrivia + "import " + node.importClause.name.text + ", {" + survivingImports.join(',') + " } from" + node.moduleSpecifier.getFullText(sourceFile) + ";");
+                            }
+                            return write(leadingTrivia + "import {" + survivingImports.join(',') + " } from" + node.moduleSpecifier.getFullText(sourceFile) + ";");
+                        }
+                        else {
+                            if (node.importClause && getColor(node.importClause) === 2 /* Black */) {
+                                return write(leadingTrivia + "import " + node.importClause.name.text + " from" + node.moduleSpecifier.getFullText(sourceFile) + ";");
+                            }
+                        }
+                    }
+                }
+                else {
+                    if (node.importClause && getColor(node.importClause) === 2 /* Black */) {
+                        return keep(node);
+                    }
+                }
+            }
+            if (shakeLevel === 2 /* ClassMembers */ && (ts.isClassDeclaration(node) || ts.isInterfaceDeclaration(node)) && nodeOrChildIsBlack(node)) {
+                var toWrite = node.getFullText();
+                for (var i = node.members.length - 1; i >= 0; i--) {
+                    var member = node.members[i];
+                    if (getColor(member) === 2 /* Black */) {
+                        // keep method
+                        continue;
+                    }
+                    if (/^_(.*)Brand$/.test(member.name.getText())) {
+                        // TODO: keep all members ending with `Brand`...
+                        continue;
+                    }
+                    var pos = member.pos - node.pos;
+                    var end = member.end - node.pos;
+                    toWrite = toWrite.substring(0, pos) + toWrite.substring(end);
+                }
+                return write(toWrite);
+            }
+            if (ts.isFunctionDeclaration(node)) {
+                // Do not go inside functions if they haven't been marked
+                return;
+            }
+            node.forEachChild(writeMarkedNodes);
+        }
+        if (getColor(sourceFile) !== 2 /* Black */) {
+            if (!nodeOrChildIsBlack(sourceFile)) {
+                // none of the elements are reachable => don't write this file at all!
+                return;
+            }
+            sourceFile.forEachChild(writeMarkedNodes);
+            result += sourceFile.endOfFileToken.getFullText(sourceFile);
+        }
+        else {
+            result = text;
+        }
+        writeFile(destination, result);
+    });
+    return result;
+}
+//#endregion
+//#region Utils
+/**
+ * Returns the node's symbol and the `import` node (if the symbol resolved from a different module)
+ */
+function getRealNodeSymbol(checker, node) {
+    /**
+     * Returns the containing object literal property declaration given a possible name node, e.g. "a" in x = { "a": 1 }
+     */
+    /* @internal */
+    function getContainingObjectLiteralElement(node) {
+        switch (node.kind) {
+            case ts.SyntaxKind.StringLiteral:
+            case ts.SyntaxKind.NumericLiteral:
+                if (node.parent.kind === ts.SyntaxKind.ComputedPropertyName) {
+                    return ts.isObjectLiteralElement(node.parent.parent) ? node.parent.parent : undefined;
+                }
+            // falls through
+            case ts.SyntaxKind.Identifier:
+                return ts.isObjectLiteralElement(node.parent) &&
+                    (node.parent.parent.kind === ts.SyntaxKind.ObjectLiteralExpression || node.parent.parent.kind === ts.SyntaxKind.JsxAttributes) &&
+                    node.parent.name === node ? node.parent : undefined;
+        }
+        return undefined;
+    }
+    function getPropertySymbolsFromType(type, propName) {
+        function getTextOfPropertyName(name) {
+            function isStringOrNumericLiteral(node) {
+                var kind = node.kind;
+                return kind === ts.SyntaxKind.StringLiteral
+                    || kind === ts.SyntaxKind.NumericLiteral;
+            }
+            switch (name.kind) {
+                case ts.SyntaxKind.Identifier:
+                    return name.text;
+                case ts.SyntaxKind.StringLiteral:
+                case ts.SyntaxKind.NumericLiteral:
+                    return name.text;
+                case ts.SyntaxKind.ComputedPropertyName:
+                    return isStringOrNumericLiteral(name.expression) ? name.expression.text : undefined;
+            }
+        }
+        var name = getTextOfPropertyName(propName);
+        if (name && type) {
+            var result = [];
+            var symbol_1 = type.getProperty(name);
+            if (type.flags & ts.TypeFlags.Union) {
+                for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
+                    var t = _a[_i];
+                    var symbol_2 = t.getProperty(name);
+                    if (symbol_2) {
+                        result.push(symbol_2);
+                    }
+                }
+                return result;
+            }
+            if (symbol_1) {
+                result.push(symbol_1);
+                return result;
+            }
+        }
+        return undefined;
+    }
+    function getPropertySymbolsFromContextualType(typeChecker, node) {
+        var objectLiteral = node.parent;
+        var contextualType = typeChecker.getContextualType(objectLiteral);
+        return getPropertySymbolsFromType(contextualType, node.name);
+    }
+    // Go to the original declaration for cases:
+    //
+    //   (1) when the aliased symbol was declared in the location(parent).
+    //   (2) when the aliased symbol is originating from an import.
+    //
+    function shouldSkipAlias(node, declaration) {
+        if (node.kind !== ts.SyntaxKind.Identifier) {
+            return false;
+        }
+        if (node.parent === declaration) {
+            return true;
+        }
+        switch (declaration.kind) {
+            case ts.SyntaxKind.ImportClause:
+            case ts.SyntaxKind.ImportEqualsDeclaration:
+                return true;
+            case ts.SyntaxKind.ImportSpecifier:
+                return declaration.parent.kind === ts.SyntaxKind.NamedImports;
+            default:
+                return false;
+        }
+    }
+    if (!ts.isShorthandPropertyAssignment(node)) {
+        if (node.getChildCount() !== 0) {
+            return [null, null];
+        }
+    }
+    var symbol = checker.getSymbolAtLocation(node);
+    var importNode = null;
+    if (symbol && symbol.flags & ts.SymbolFlags.Alias && shouldSkipAlias(node, symbol.declarations[0])) {
+        var aliased = checker.getAliasedSymbol(symbol);
+        if (aliased.declarations) {
+            // We should mark the import as visited
+            importNode = symbol.declarations[0];
+            symbol = aliased;
+        }
+    }
+    if (symbol) {
+        // Because name in short-hand property assignment has two different meanings: property name and property value,
+        // using go-to-definition at such position should go to the variable declaration of the property value rather than
+        // go to the declaration of the property name (in this case stay at the same position). However, if go-to-definition
+        // is performed at the location of property access, we would like to go to definition of the property in the short-hand
+        // assignment. This case and others are handled by the following code.
+        if (node.parent.kind === ts.SyntaxKind.ShorthandPropertyAssignment) {
+            symbol = checker.getShorthandAssignmentValueSymbol(symbol.valueDeclaration);
+        }
+        // If the node is the name of a BindingElement within an ObjectBindingPattern instead of just returning the
+        // declaration the symbol (which is itself), we should try to get to the original type of the ObjectBindingPattern
+        // and return the property declaration for the referenced property.
+        // For example:
+        //      import('./foo').then(({ b/*goto*/ar }) => undefined); => should get use to the declaration in file "./foo"
+        //
+        //      function bar<T>(onfulfilled: (value: T) => void) { //....}
+        //      interface Test {
+        //          pr/*destination*/op1: number
+        //      }
+        //      bar<Test>(({pr/*goto*/op1})=>{});
+        if (ts.isPropertyName(node) && ts.isBindingElement(node.parent) && ts.isObjectBindingPattern(node.parent.parent) &&
+            (node === (node.parent.propertyName || node.parent.name))) {
+            var type = checker.getTypeAtLocation(node.parent.parent);
+            if (type) {
+                var propSymbols = getPropertySymbolsFromType(type, node);
+                if (propSymbols) {
+                    symbol = propSymbols[0];
+                }
+            }
+        }
+        // If the current location we want to find its definition is in an object literal, try to get the contextual type for the
+        // object literal, lookup the property symbol in the contextual type, and use this for goto-definition.
+        // For example
+        //      interface Props{
+        //          /*first*/prop1: number
+        //          prop2: boolean
+        //      }
+        //      function Foo(arg: Props) {}
+        //      Foo( { pr/*1*/op1: 10, prop2: false })
+        var element = getContainingObjectLiteralElement(node);
+        if (element && checker.getContextualType(element.parent)) {
+            var propertySymbols = getPropertySymbolsFromContextualType(checker, element);
+            if (propertySymbols) {
+                symbol = propertySymbols[0];
+            }
+        }
+    }
+    if (symbol && symbol.declarations) {
+        return [symbol, importNode];
+    }
+    return [null, null];
+}
+/** Get the token whose text contains the position */
+function getTokenAtPosition(sourceFile, position, allowPositionInLeadingTrivia, includeEndPosition) {
+    var current = sourceFile;
+    outer: while (true) {
+        // find the child that contains 'position'
+        for (var _i = 0, _a = current.getChildren(); _i < _a.length; _i++) {
+            var child = _a[_i];
+            var start = allowPositionInLeadingTrivia ? child.getFullStart() : child.getStart(sourceFile, /*includeJsDoc*/ true);
+            if (start > position) {
+                // If this child begins after position, then all subsequent children will as well.
+                break;
+            }
+            var end = child.getEnd();
+            if (position < end || (position === end && (child.kind === ts.SyntaxKind.EndOfFileToken || includeEndPosition))) {
+                current = child;
+                continue outer;
+            }
+        }
+        return current;
+    }
+}

build/lib/treeshaking.ts

@@ -0,0 +1,817 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 path from 'path';
+import * as ts from 'typescript';
+
+const TYPESCRIPT_LIB_FOLDER = path.dirname(require.resolve('typescript/lib/lib.d.ts'));
+
+export const enum ShakeLevel {
+	Files = 0,
+	InnerFile = 1,
+	ClassMembers = 2
+}
+
+export interface ITreeShakingOptions {
+	/**
+	 * The full path to the root where sources are.
+	 */
+	sourcesRoot: string;
+	/**
+	 * Module ids.
+	 * e.g. `vs/editor/editor.main` or `index`
+	 */
+	entryPoints: string[];
+	/**
+	 * Inline usages.
+	 */
+	inlineEntryPoints: string[];
+	/**
+	 * TypeScript libs.
+	 * e.g. `lib.d.ts`, `lib.es2015.collection.d.ts`
+	 */
+	libs: string[];
+	/**
+	 * TypeScript compiler options.
+	 */
+	compilerOptions: ts.CompilerOptions;
+	/**
+	 * The shake level to perform.
+	 */
+	shakeLevel: ShakeLevel;
+	/**
+	 * regex pattern to ignore certain imports e.g. `vs/css!` imports
+	 */
+	importIgnorePattern: RegExp;
+
+	redirects: { [module: string]: string; };
+}
+
+export interface ITreeShakingResult {
+	[file: string]: string;
+}
+
+export function shake(options: ITreeShakingOptions): ITreeShakingResult {
+	const languageService = createTypeScriptLanguageService(options);
+
+	markNodes(languageService, options);
+
+	return generateResult(languageService, options.shakeLevel);
+}
+
+//#region Discovery, LanguageService & Setup
+function createTypeScriptLanguageService(options: ITreeShakingOptions): ts.LanguageService {
+	// Discover referenced files
+	const FILES = discoverAndReadFiles(options);
+
+	// Add fake usage files
+	options.inlineEntryPoints.forEach((inlineEntryPoint, index) => {
+		FILES[`inlineEntryPoint:${index}.ts`] = inlineEntryPoint;
+	});
+
+	// Resolve libs
+	const RESOLVED_LIBS: ILibMap = {};
+	options.libs.forEach((filename) => {
+		const filepath = path.join(TYPESCRIPT_LIB_FOLDER, filename);
+		RESOLVED_LIBS[`defaultLib:${filename}`] = fs.readFileSync(filepath).toString();
+	});
+
+	const host = new TypeScriptLanguageServiceHost(RESOLVED_LIBS, FILES, options.compilerOptions);
+	return ts.createLanguageService(host);
+}
+
+/**
+ * Read imports and follow them until all files have been handled
+ */
+function discoverAndReadFiles(options: ITreeShakingOptions): IFileMap {
+	const FILES: IFileMap = {};
+
+	const in_queue: { [module: string]: boolean; } = Object.create(null);
+	const queue: string[] = [];
+
+	const enqueue = (moduleId: string) => {
+		if (in_queue[moduleId]) {
+			return;
+		}
+		in_queue[moduleId] = true;
+		queue.push(moduleId);
+	};
+
+	options.entryPoints.forEach((entryPoint) => enqueue(entryPoint));
+
+	while (queue.length > 0) {
+		const moduleId = queue.shift();
+		const dts_filename = path.join(options.sourcesRoot, moduleId + '.d.ts');
+		if (fs.existsSync(dts_filename)) {
+			const dts_filecontents = fs.readFileSync(dts_filename).toString();
+			FILES[moduleId + '.d.ts'] = dts_filecontents;
+			continue;
+		}
+
+		let ts_filename: string;
+		if (options.redirects[moduleId]) {
+			ts_filename = path.join(options.sourcesRoot, options.redirects[moduleId] + '.ts');
+		} else {
+			ts_filename = path.join(options.sourcesRoot, moduleId + '.ts');
+		}
+		const ts_filecontents = fs.readFileSync(ts_filename).toString();
+		const info = ts.preProcessFile(ts_filecontents);
+		for (let i = info.importedFiles.length - 1; i >= 0; i--) {
+			const importedFileName = info.importedFiles[i].fileName;
+
+			if (options.importIgnorePattern.test(importedFileName)) {
+				// Ignore vs/css! imports
+				continue;
+			}
+
+			let importedModuleId = importedFileName;
+			if (/(^\.\/)|(^\.\.\/)/.test(importedModuleId)) {
+				importedModuleId = path.join(path.dirname(moduleId), importedModuleId);
+			}
+			enqueue(importedModuleId);
+		}
+
+		FILES[moduleId + '.ts'] = ts_filecontents;
+	}
+
+	return FILES;
+}
+
+interface ILibMap { [libName: string]: string; }
+interface IFileMap { [fileName: string]: string; }
+
+/**
+ * A TypeScript language service host
+ */
+class TypeScriptLanguageServiceHost implements ts.LanguageServiceHost {
+
+	private readonly _libs: ILibMap;
+	private readonly _files: IFileMap;
+	private readonly _compilerOptions: ts.CompilerOptions;
+
+	constructor(libs: ILibMap, files: IFileMap, compilerOptions: ts.CompilerOptions) {
+		this._libs = libs;
+		this._files = files;
+		this._compilerOptions = compilerOptions;
+	}
+
+	// --- language service host ---------------
+
+	getCompilationSettings(): ts.CompilerOptions {
+		return this._compilerOptions;
+	}
+	getScriptFileNames(): string[] {
+		return (
+			[]
+				.concat(Object.keys(this._libs))
+				.concat(Object.keys(this._files))
+		);
+	}
+	getScriptVersion(fileName: string): string {
+		return '1';
+	}
+	getProjectVersion(): string {
+		return '1';
+	}
+	getScriptSnapshot(fileName: string): ts.IScriptSnapshot {
+		if (this._files.hasOwnProperty(fileName)) {
+			return ts.ScriptSnapshot.fromString(this._files[fileName]);
+		} else if (this._libs.hasOwnProperty(fileName)) {
+			return ts.ScriptSnapshot.fromString(this._libs[fileName]);
+		} else {
+			return ts.ScriptSnapshot.fromString('');
+		}
+	}
+	getScriptKind(fileName: string): ts.ScriptKind {
+		return ts.ScriptKind.TS;
+	}
+	getCurrentDirectory(): string {
+		return '';
+	}
+	getDefaultLibFileName(options: ts.CompilerOptions): string {
+		return 'defaultLib:lib.d.ts';
+	}
+	isDefaultLibFileName(fileName: string): boolean {
+		return fileName === this.getDefaultLibFileName(this._compilerOptions);
+	}
+}
+//#endregion
+
+//#region Tree Shaking
+
+const enum NodeColor {
+	White = 0,
+	Gray = 1,
+	Black = 2
+}
+
+function getColor(node: ts.Node): NodeColor {
+	return (<any>node).$$$color || NodeColor.White;
+}
+function setColor(node: ts.Node, color: NodeColor): void {
+	(<any>node).$$$color = color;
+}
+function nodeOrParentIsBlack(node: ts.Node): boolean {
+	while (node) {
+		const color = getColor(node);
+		if (color === NodeColor.Black) {
+			return true;
+		}
+		node = node.parent;
+	}
+	return false;
+}
+function nodeOrChildIsBlack(node: ts.Node): boolean {
+	if (getColor(node) === NodeColor.Black) {
+		return true;
+	}
+	for (const child of node.getChildren()) {
+		if (nodeOrChildIsBlack(child)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+function markNodes(languageService: ts.LanguageService, options: ITreeShakingOptions) {
+	const program = languageService.getProgram();
+
+	if (options.shakeLevel === ShakeLevel.Files) {
+		// Mark all source files Black
+		program.getSourceFiles().forEach((sourceFile) => {
+			setColor(sourceFile, NodeColor.Black);
+		});
+		return;
+	}
+
+	const black_queue: ts.Node[] = [];
+	const gray_queue: ts.Node[] = [];
+	const sourceFilesLoaded: { [fileName: string]: boolean } = {};
+
+	function enqueueTopLevelModuleStatements(sourceFile: ts.SourceFile): void {
+
+		sourceFile.forEachChild((node: ts.Node) => {
+
+			if (ts.isImportDeclaration(node)) {
+				if (!node.importClause && ts.isStringLiteral(node.moduleSpecifier)) {
+					setColor(node, NodeColor.Black);
+					enqueueImport(node, node.moduleSpecifier.text);
+				}
+				return;
+			}
+
+			if (ts.isExportDeclaration(node)) {
+				if (ts.isStringLiteral(node.moduleSpecifier)) {
+					setColor(node, NodeColor.Black);
+					enqueueImport(node, node.moduleSpecifier.text);
+				}
+				return;
+			}
+
+			if (
+				ts.isExpressionStatement(node)
+				|| ts.isIfStatement(node)
+				|| ts.isIterationStatement(node, true)
+				|| ts.isExportAssignment(node)
+			) {
+				enqueue_black(node);
+			}
+
+			if (ts.isImportEqualsDeclaration(node)) {
+				if (/export/.test(node.getFullText(sourceFile))) {
+					// e.g. "export import Severity = BaseSeverity;"
+					enqueue_black(node);
+				}
+			}
+
+		});
+	}
+
+	function enqueue_gray(node: ts.Node): void {
+		if (nodeOrParentIsBlack(node) || getColor(node) === NodeColor.Gray) {
+			return;
+		}
+		setColor(node, NodeColor.Gray);
+		gray_queue.push(node);
+	}
+
+	function enqueue_black(node: ts.Node): void {
+		const previousColor = getColor(node);
+
+		if (previousColor === NodeColor.Black) {
+			return;
+		}
+
+		if (previousColor === NodeColor.Gray) {
+			// remove from gray queue
+			gray_queue.splice(gray_queue.indexOf(node), 1);
+			setColor(node, NodeColor.White);
+
+			// add to black queue
+			enqueue_black(node);
+
+			// // move from one queue to the other
+			// black_queue.push(node);
+			// setColor(node, NodeColor.Black);
+			return;
+		}
+
+		if (nodeOrParentIsBlack(node)) {
+			return;
+		}
+
+		const fileName = node.getSourceFile().fileName;
+		if (/^defaultLib:/.test(fileName) || /\.d\.ts$/.test(fileName)) {
+			setColor(node, NodeColor.Black);
+			return;
+		}
+
+		const sourceFile = node.getSourceFile();
+		if (!sourceFilesLoaded[sourceFile.fileName]) {
+			sourceFilesLoaded[sourceFile.fileName] = true;
+			enqueueTopLevelModuleStatements(sourceFile);
+		}
+
+		if (ts.isSourceFile(node)) {
+			return;
+		}
+
+		setColor(node, NodeColor.Black);
+		black_queue.push(node);
+
+		if (options.shakeLevel === ShakeLevel.ClassMembers && (ts.isMethodDeclaration(node) || ts.isMethodSignature(node) || ts.isPropertySignature(node) || ts.isGetAccessor(node) || ts.isSetAccessor(node))) {
+			const references = languageService.getReferencesAtPosition(node.getSourceFile().fileName, node.name.pos + node.name.getLeadingTriviaWidth());
+			if (references) {
+				for (let i = 0, len = references.length; i < len; i++) {
+					const reference = references[i];
+					const referenceSourceFile = program.getSourceFile(reference.fileName);
+					const referenceNode = getTokenAtPosition(referenceSourceFile, reference.textSpan.start, false, false);
+					if (
+						ts.isMethodDeclaration(referenceNode.parent)
+						|| ts.isPropertyDeclaration(referenceNode.parent)
+						|| ts.isGetAccessor(referenceNode.parent)
+						|| ts.isSetAccessor(referenceNode.parent)
+					) {
+						enqueue_gray(referenceNode.parent);
+					}
+				}
+			}
+		}
+	}
+
+	function enqueueFile(filename: string): void {
+		const sourceFile = program.getSourceFile(filename);
+		if (!sourceFile) {
+			console.warn(`Cannot find source file ${filename}`);
+			return;
+		}
+		enqueue_black(sourceFile);
+	}
+
+	function enqueueImport(node: ts.Node, importText: string): void {
+		if (options.importIgnorePattern.test(importText)) {
+			// this import should be ignored
+			return;
+		}
+
+		const nodeSourceFile = node.getSourceFile();
+		let fullPath: string;
+		if (/(^\.\/)|(^\.\.\/)/.test(importText)) {
+			fullPath = path.join(path.dirname(nodeSourceFile.fileName), importText) + '.ts';
+		} else {
+			fullPath = importText + '.ts';
+		}
+		enqueueFile(fullPath);
+	}
+
+	options.entryPoints.forEach(moduleId => enqueueFile(moduleId + '.ts'));
+	// Add fake usage files
+	options.inlineEntryPoints.forEach((_, index) => enqueueFile(`inlineEntryPoint:${index}.ts`));
+
+	let step = 0;
+
+	const checker = program.getTypeChecker();
+	while (black_queue.length > 0 || gray_queue.length > 0) {
+		++step;
+		let node: ts.Node;
+
+		if (step % 100 === 0) {
+			console.log(`${step}/${step+black_queue.length+gray_queue.length} (${black_queue.length}, ${gray_queue.length})`);
+		}
+
+		if (black_queue.length === 0) {
+			for (let i = 0; i < gray_queue.length; i++) {
+				const node = gray_queue[i];
+				const nodeParent = node.parent;
+				if ((ts.isClassDeclaration(nodeParent) || ts.isInterfaceDeclaration(nodeParent)) && nodeOrChildIsBlack(nodeParent)) {
+					gray_queue.splice(i, 1);
+					black_queue.push(node);
+					setColor(node, NodeColor.Black);
+					i--;
+				}
+			}
+		}
+
+		if (black_queue.length > 0) {
+			node = black_queue.shift();
+		} else {
+			// only gray nodes remaining...
+			break;
+		}
+		const nodeSourceFile = node.getSourceFile();
+
+		const loop = (node: ts.Node) => {
+			const [symbol, symbolImportNode] = getRealNodeSymbol(checker, node);
+			if (symbolImportNode) {
+				setColor(symbolImportNode, NodeColor.Black);
+			}
+
+			if (symbol && !nodeIsInItsOwnDeclaration(nodeSourceFile, node, symbol)) {
+				for (let i = 0, len = symbol.declarations.length; i < len; i++) {
+					const declaration = symbol.declarations[i];
+					if (ts.isSourceFile(declaration)) {
+						// Do not enqueue full source files
+						// (they can be the declaration of a module import)
+						continue;
+					}
+
+					if (options.shakeLevel === ShakeLevel.ClassMembers && (ts.isClassDeclaration(declaration) || ts.isInterfaceDeclaration(declaration))) {
+						enqueue_black(declaration.name);
+
+						for (let j = 0; j < declaration.members.length; j++) {
+							const member = declaration.members[j];
+							const memberName = member.name ? member.name.getText() : null;
+							if (
+								ts.isConstructorDeclaration(member)
+								|| ts.isConstructSignatureDeclaration(member)
+								|| ts.isIndexSignatureDeclaration(member)
+								|| ts.isCallSignatureDeclaration(member)
+								|| memberName === 'toJSON'
+								|| memberName === 'toString'
+								|| memberName === 'dispose'// TODO: keeping all `dispose` methods
+							) {
+								enqueue_black(member);
+							}
+						}
+
+						// queue the heritage clauses
+						if (declaration.heritageClauses) {
+							for (let heritageClause of declaration.heritageClauses) {
+								enqueue_black(heritageClause);
+							}
+						}
+					} else {
+						enqueue_black(declaration);
+					}
+				}
+			}
+			node.forEachChild(loop);
+		};
+		node.forEachChild(loop);
+	}
+}
+
+function nodeIsInItsOwnDeclaration(nodeSourceFile: ts.SourceFile, node: ts.Node, symbol: ts.Symbol): boolean {
+	for (let i = 0, len = symbol.declarations.length; i < len; i++) {
+		const declaration = symbol.declarations[i];
+		const declarationSourceFile = declaration.getSourceFile();
+
+		if (nodeSourceFile === declarationSourceFile) {
+			if (declaration.pos <= node.pos && node.end <= declaration.end) {
+				return true;
+			}
+		}
+	}
+
+	return false;
+}
+
+function generateResult(languageService: ts.LanguageService, shakeLevel: ShakeLevel): ITreeShakingResult {
+	const program = languageService.getProgram();
+
+	let result: ITreeShakingResult = {};
+	const writeFile = (filePath: string, contents: string): void => {
+		result[filePath] = contents;
+	};
+
+	program.getSourceFiles().forEach((sourceFile) => {
+		const fileName = sourceFile.fileName;
+		if (/^defaultLib:/.test(fileName)) {
+			return;
+		}
+		const destination = fileName;
+		if (/\.d\.ts$/.test(fileName)) {
+			if (nodeOrChildIsBlack(sourceFile)) {
+				writeFile(destination, sourceFile.text);
+			}
+			return;
+		}
+
+		let text = sourceFile.text;
+		let result = '';
+
+		function keep(node: ts.Node): void {
+			result += text.substring(node.pos, node.end);
+		}
+		function write(data: string): void {
+			result += data;
+		}
+
+		function writeMarkedNodes(node: ts.Node): void {
+			if (getColor(node) === NodeColor.Black) {
+				return keep(node);
+			}
+
+			// Always keep certain top-level statements
+			if (ts.isSourceFile(node.parent)) {
+				if (ts.isExpressionStatement(node) && ts.isStringLiteral(node.expression) && node.expression.text === 'use strict') {
+					return keep(node);
+				}
+
+				if (ts.isVariableStatement(node) && nodeOrChildIsBlack(node)) {
+					return keep(node);
+				}
+			}
+
+			// Keep the entire import in import * as X cases
+			if (ts.isImportDeclaration(node)) {
+				if (node.importClause && node.importClause.namedBindings) {
+					if (ts.isNamespaceImport(node.importClause.namedBindings)) {
+						if (getColor(node.importClause.namedBindings) === NodeColor.Black) {
+							return keep(node);
+						}
+					} else {
+						let survivingImports: string[] = [];
+						for (let i = 0; i < node.importClause.namedBindings.elements.length; i++) {
+							const importNode = node.importClause.namedBindings.elements[i];
+							if (getColor(importNode) === NodeColor.Black) {
+								survivingImports.push(importNode.getFullText(sourceFile));
+							}
+						}
+						const leadingTriviaWidth = node.getLeadingTriviaWidth();
+						const leadingTrivia = sourceFile.text.substr(node.pos, leadingTriviaWidth);
+						if (survivingImports.length > 0) {
+							if (node.importClause && getColor(node.importClause) === NodeColor.Black) {
+								return write(`${leadingTrivia}import ${node.importClause.name.text}, {${survivingImports.join(',')} } from${node.moduleSpecifier.getFullText(sourceFile)};`);
+							}
+							return write(`${leadingTrivia}import {${survivingImports.join(',')} } from${node.moduleSpecifier.getFullText(sourceFile)};`);
+						} else {
+							if (node.importClause && getColor(node.importClause) === NodeColor.Black) {
+								return write(`${leadingTrivia}import ${node.importClause.name.text} from${node.moduleSpecifier.getFullText(sourceFile)};`);
+							}
+						}
+					}
+				} else {
+					if (node.importClause && getColor(node.importClause) === NodeColor.Black) {
+						return keep(node);
+					}
+				}
+			}
+
+			if (shakeLevel === ShakeLevel.ClassMembers && (ts.isClassDeclaration(node) || ts.isInterfaceDeclaration(node)) && nodeOrChildIsBlack(node)) {
+				let toWrite = node.getFullText();
+				for (let i = node.members.length - 1; i >= 0; i--) {
+					const member = node.members[i];
+					if (getColor(member) === NodeColor.Black) {
+						// keep method
+						continue;
+					}
+					if (/^_(.*)Brand$/.test(member.name.getText())) {
+						// TODO: keep all members ending with `Brand`...
+						continue;
+					}
+
+					let pos = member.pos - node.pos;
+					let end = member.end - node.pos;
+					toWrite = toWrite.substring(0, pos) + toWrite.substring(end);
+				}
+				return write(toWrite);
+			}
+
+			if (ts.isFunctionDeclaration(node)) {
+				// Do not go inside functions if they haven't been marked
+				return;
+			}
+
+			node.forEachChild(writeMarkedNodes);
+		}
+
+		if (getColor(sourceFile) !== NodeColor.Black) {
+			if (!nodeOrChildIsBlack(sourceFile)) {
+				// none of the elements are reachable => don't write this file at all!
+				return;
+			}
+			sourceFile.forEachChild(writeMarkedNodes);
+			result += sourceFile.endOfFileToken.getFullText(sourceFile);
+		} else {
+			result = text;
+		}
+
+		writeFile(destination, result);
+	});
+
+	return result;
+}
+
+//#endregion
+
+//#region Utils
+
+/**
+ * Returns the node's symbol and the `import` node (if the symbol resolved from a different module)
+ */
+function getRealNodeSymbol(checker: ts.TypeChecker, node: ts.Node): [ts.Symbol, ts.Declaration] {
+	/**
+	 * Returns the containing object literal property declaration given a possible name node, e.g. "a" in x = { "a": 1 }
+	 */
+	/* @internal */
+	function getContainingObjectLiteralElement(node: ts.Node): ts.ObjectLiteralElement | undefined {
+		switch (node.kind) {
+			case ts.SyntaxKind.StringLiteral:
+			case ts.SyntaxKind.NumericLiteral:
+				if (node.parent.kind === ts.SyntaxKind.ComputedPropertyName) {
+					return ts.isObjectLiteralElement(node.parent.parent) ? node.parent.parent : undefined;
+				}
+			// falls through
+			case ts.SyntaxKind.Identifier:
+				return ts.isObjectLiteralElement(node.parent) &&
+					(node.parent.parent.kind === ts.SyntaxKind.ObjectLiteralExpression || node.parent.parent.kind === ts.SyntaxKind.JsxAttributes) &&
+					node.parent.name === node ? node.parent : undefined;
+		}
+		return undefined;
+	}
+
+	function getPropertySymbolsFromType(type: ts.Type, propName: ts.PropertyName) {
+		function getTextOfPropertyName(name: ts.PropertyName): string {
+
+			function isStringOrNumericLiteral(node: ts.Node): node is ts.StringLiteral | ts.NumericLiteral {
+				const kind = node.kind;
+				return kind === ts.SyntaxKind.StringLiteral
+					|| kind === ts.SyntaxKind.NumericLiteral;
+			}
+
+			switch (name.kind) {
+				case ts.SyntaxKind.Identifier:
+					return name.text;
+				case ts.SyntaxKind.StringLiteral:
+				case ts.SyntaxKind.NumericLiteral:
+					return name.text;
+				case ts.SyntaxKind.ComputedPropertyName:
+					return isStringOrNumericLiteral(name.expression) ? name.expression.text : undefined!;
+			}
+		}
+
+		const name = getTextOfPropertyName(propName);
+		if (name && type) {
+			const result: ts.Symbol[] = [];
+			const symbol = type.getProperty(name);
+			if (type.flags & ts.TypeFlags.Union) {
+				for (const t of (<ts.UnionType>type).types) {
+					const symbol = t.getProperty(name);
+					if (symbol) {
+						result.push(symbol);
+					}
+				}
+				return result;
+			}
+
+			if (symbol) {
+				result.push(symbol);
+				return result;
+			}
+		}
+		return undefined;
+	}
+
+	function getPropertySymbolsFromContextualType(typeChecker: ts.TypeChecker, node: ts.ObjectLiteralElement): ts.Symbol[] {
+		const objectLiteral = <ts.ObjectLiteralExpression | ts.JsxAttributes>node.parent;
+		const contextualType = typeChecker.getContextualType(objectLiteral)!;
+		return getPropertySymbolsFromType(contextualType, node.name!)!;
+	}
+
+	// Go to the original declaration for cases:
+	//
+	//   (1) when the aliased symbol was declared in the location(parent).
+	//   (2) when the aliased symbol is originating from an import.
+	//
+	function shouldSkipAlias(node: ts.Node, declaration: ts.Node): boolean {
+		if (node.kind !== ts.SyntaxKind.Identifier) {
+			return false;
+		}
+		if (node.parent === declaration) {
+			return true;
+		}
+		switch (declaration.kind) {
+			case ts.SyntaxKind.ImportClause:
+			case ts.SyntaxKind.ImportEqualsDeclaration:
+				return true;
+			case ts.SyntaxKind.ImportSpecifier:
+				return declaration.parent.kind === ts.SyntaxKind.NamedImports;
+			default:
+				return false;
+		}
+	}
+
+	if (!ts.isShorthandPropertyAssignment(node)) {
+		if (node.getChildCount() !== 0) {
+			return [null, null];
+		}
+	}
+
+	let symbol = checker.getSymbolAtLocation(node);
+	let importNode: ts.Declaration = null;
+	if (symbol && symbol.flags & ts.SymbolFlags.Alias && shouldSkipAlias(node, symbol.declarations[0])) {
+		const aliased = checker.getAliasedSymbol(symbol);
+		if (aliased.declarations) {
+			// We should mark the import as visited
+			importNode = symbol.declarations[0];
+			symbol = aliased;
+		}
+	}
+
+	if (symbol) {
+		// Because name in short-hand property assignment has two different meanings: property name and property value,
+		// using go-to-definition at such position should go to the variable declaration of the property value rather than
+		// go to the declaration of the property name (in this case stay at the same position). However, if go-to-definition
+		// is performed at the location of property access, we would like to go to definition of the property in the short-hand
+		// assignment. This case and others are handled by the following code.
+		if (node.parent.kind === ts.SyntaxKind.ShorthandPropertyAssignment) {
+			symbol = checker.getShorthandAssignmentValueSymbol(symbol.valueDeclaration);
+		}
+
+		// If the node is the name of a BindingElement within an ObjectBindingPattern instead of just returning the
+		// declaration the symbol (which is itself), we should try to get to the original type of the ObjectBindingPattern
+		// and return the property declaration for the referenced property.
+		// For example:
+		//      import('./foo').then(({ b/*goto*/ar }) => undefined); => should get use to the declaration in file "./foo"
+		//
+		//      function bar<T>(onfulfilled: (value: T) => void) { //....}
+		//      interface Test {
+		//          pr/*destination*/op1: number
+		//      }
+		//      bar<Test>(({pr/*goto*/op1})=>{});
+		if (ts.isPropertyName(node) && ts.isBindingElement(node.parent) && ts.isObjectBindingPattern(node.parent.parent) &&
+			(node === (node.parent.propertyName || node.parent.name))) {
+			const type = checker.getTypeAtLocation(node.parent.parent);
+			if (type) {
+				const propSymbols = getPropertySymbolsFromType(type, node);
+				if (propSymbols) {
+					symbol = propSymbols[0];
+				}
+			}
+		}
+
+		// If the current location we want to find its definition is in an object literal, try to get the contextual type for the
+		// object literal, lookup the property symbol in the contextual type, and use this for goto-definition.
+		// For example
+		//      interface Props{
+		//          /*first*/prop1: number
+		//          prop2: boolean
+		//      }
+		//      function Foo(arg: Props) {}
+		//      Foo( { pr/*1*/op1: 10, prop2: false })
+		const element = getContainingObjectLiteralElement(node);
+		if (element && checker.getContextualType(element.parent as ts.Expression)) {
+			const propertySymbols = getPropertySymbolsFromContextualType(checker, element);
+			if (propertySymbols) {
+				symbol = propertySymbols[0];
+			}
+		}
+	}
+
+	if (symbol && symbol.declarations) {
+		return [symbol, importNode];
+	}
+
+	return [null, null];
+}
+
+/** Get the token whose text contains the position */
+function getTokenAtPosition(sourceFile: ts.SourceFile, position: number, allowPositionInLeadingTrivia: boolean, includeEndPosition: boolean): ts.Node {
+	let current: ts.Node = sourceFile;
+	outer: while (true) {
+		// find the child that contains 'position'
+		for (const child of current.getChildren()) {
+			const start = allowPositionInLeadingTrivia ? child.getFullStart() : child.getStart(sourceFile, /*includeJsDoc*/ true);
+			if (start > position) {
+				// If this child begins after position, then all subsequent children will as well.
+				break;
+			}
+
+			const end = child.getEnd();
+			if (position < end || (position === end && (child.kind === ts.SyntaxKind.EndOfFileToken || includeEndPosition))) {
+				current = child;
+				continue outer;
+			}
+		}
+
+		return current;
+	}
+}
+
+//#endregion

build/lib/tslint/noStandaloneEditorRule.js

@@ -0,0 +1,73 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = Object.setPrototypeOf ||
+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+var ts = require("typescript");
+var Lint = require("tslint");
+var path_1 = require("path");
+var Rule = /** @class */ (function (_super) {
+    __extends(Rule, _super);
+    function Rule() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    Rule.prototype.apply = function (sourceFile) {
+        if (/vs(\/|\\)editor/.test(sourceFile.fileName)) {
+            // the vs/editor folder is allowed to use the standalone editor
+            return [];
+        }
+        return this.applyWithWalker(new NoStandaloneEditorRuleWalker(sourceFile, this.getOptions()));
+    };
+    return Rule;
+}(Lint.Rules.AbstractRule));
+exports.Rule = Rule;
+var NoStandaloneEditorRuleWalker = /** @class */ (function (_super) {
+    __extends(NoStandaloneEditorRuleWalker, _super);
+    function NoStandaloneEditorRuleWalker(file, opts) {
+        return _super.call(this, file, opts) || this;
+    }
+    NoStandaloneEditorRuleWalker.prototype.visitImportEqualsDeclaration = function (node) {
+        if (node.moduleReference.kind === ts.SyntaxKind.ExternalModuleReference) {
+            this._validateImport(node.moduleReference.expression.getText(), node);
+        }
+    };
+    NoStandaloneEditorRuleWalker.prototype.visitImportDeclaration = function (node) {
+        this._validateImport(node.moduleSpecifier.getText(), node);
+    };
+    NoStandaloneEditorRuleWalker.prototype.visitCallExpression = function (node) {
+        _super.prototype.visitCallExpression.call(this, node);
+        // import('foo') statements inside the code
+        if (node.expression.kind === ts.SyntaxKind.ImportKeyword) {
+            var path = node.arguments[0];
+            this._validateImport(path.getText(), node);
+        }
+    };
+    NoStandaloneEditorRuleWalker.prototype._validateImport = function (path, node) {
+        // remove quotes
+        path = path.slice(1, -1);
+        // resolve relative paths
+        if (path[0] === '.') {
+            path = path_1.join(this.getSourceFile().fileName, path);
+        }
+        if (/vs(\/|\\)editor(\/|\\)standalone/.test(path)
+            || /vs(\/|\\)editor(\/|\\)common(\/|\\)standalone/.test(path)
+            || /vs(\/|\\)editor(\/|\\)editor.api/.test(path)
+            || /vs(\/|\\)editor(\/|\\)editor.main/.test(path)
+            || /vs(\/|\\)editor(\/|\\)editor.worker/.test(path)) {
+            // {{SQL CARBON EDIT}}
+            //this.addFailure(this.createFailure(node.getStart(), node.getWidth(), `Not allowed to import standalone editor modules. See https://github.com/Microsoft/vscode/wiki/Code-Organization`));
+        }
+    };
+    return NoStandaloneEditorRuleWalker;
+}(Lint.RuleWalker));

build/lib/tslint/noStandaloneEditorRule.ts

@@ -0,0 +1,66 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as ts from 'typescript';
+import * as Lint from 'tslint';
+import { join } from 'path';
+
+export class Rule extends Lint.Rules.AbstractRule {
+	public apply(sourceFile: ts.SourceFile): Lint.RuleFailure[] {
+		if (/vs(\/|\\)editor/.test(sourceFile.fileName)) {
+			// the vs/editor folder is allowed to use the standalone editor
+			return [];
+		}
+		return this.applyWithWalker(new NoStandaloneEditorRuleWalker(sourceFile, this.getOptions()));
+	}
+}
+
+class NoStandaloneEditorRuleWalker extends Lint.RuleWalker {
+
+	constructor(file: ts.SourceFile, opts: Lint.IOptions) {
+		super(file, opts);
+	}
+
+	protected visitImportEqualsDeclaration(node: ts.ImportEqualsDeclaration): void {
+		if (node.moduleReference.kind === ts.SyntaxKind.ExternalModuleReference) {
+			this._validateImport(node.moduleReference.expression.getText(), node);
+		}
+	}
+
+	protected visitImportDeclaration(node: ts.ImportDeclaration): void {
+		this._validateImport(node.moduleSpecifier.getText(), node);
+	}
+
+	protected visitCallExpression(node: ts.CallExpression): void {
+		super.visitCallExpression(node);
+
+		// import('foo') statements inside the code
+		if (node.expression.kind === ts.SyntaxKind.ImportKeyword) {
+			const [path] = node.arguments;
+			this._validateImport(path.getText(), node);
+		}
+	}
+
+	private _validateImport(path: string, node: ts.Node): void {
+		// remove quotes
+		path = path.slice(1, -1);
+
+		// resolve relative paths
+		if (path[0] === '.') {
+			path = join(this.getSourceFile().fileName, path);
+		}
+
+		if (
+			/vs(\/|\\)editor(\/|\\)standalone/.test(path)
+			|| /vs(\/|\\)editor(\/|\\)common(\/|\\)standalone/.test(path)
+			|| /vs(\/|\\)editor(\/|\\)editor.api/.test(path)
+			|| /vs(\/|\\)editor(\/|\\)editor.main/.test(path)
+			|| /vs(\/|\\)editor(\/|\\)editor.worker/.test(path)
+		) {
+			// {{SQL CARBON EDIT}}
+			//this.addFailure(this.createFailure(node.getStart(), node.getWidth(), `Not allowed to import standalone editor modules. See https://github.com/Microsoft/vscode/wiki/Code-Organization`));
+		}
+	}
+}

build/lib/tslint/translationRemindRule.js

@@ -71,7 +71,7 @@ var TranslationRemindRuleWalker = /** @class */ (function (_super) {
             }
         });
         if (!resourceDefined) {
-            this.addFailureAtNode(node, "Please add '" + resource + "' to ./builds/lib/i18n.resources.json file to use translations here.");
+            this.addFailureAtNode(node, "Please add '" + resource + "' to ./build/lib/i18n.resources.json file to use translations here.");
         }
     };
     TranslationRemindRuleWalker.NLS_MODULE = 'vs/nls';

build/lib/tslint/translationRemindRule.ts

@@ -67,7 +67,7 @@ class TranslationRemindRuleWalker extends Lint.RuleWalker {
 		});
 
 		if (!resourceDefined) {
-			this.addFailureAtNode(node, `Please add '${resource}' to ./builds/lib/i18n.resources.json file to use translations here.`);
+			this.addFailureAtNode(node, `Please add '${resource}' to ./build/lib/i18n.resources.json file to use translations here.`);
 		}
 	}
 }

build/lib/util.js

@@ -210,3 +210,12 @@ function filter(fn) {
     return result;
 }
 exports.filter = filter;
+function versionStringToNumber(versionStr) {
+    var semverRegex = /(\d+)\.(\d+)\.(\d+)/;
+    var match = versionStr.match(semverRegex);
+    if (!match) {
+        throw new Error('Version string is not properly formatted: ' + versionStr);
+    }
+    return parseInt(match[1], 10) * 1e4 + parseInt(match[2], 10) * 1e2 + parseInt(match[3], 10);
+}
+exports.versionStringToNumber = versionStringToNumber;

build/lib/util.ts

@@ -268,4 +268,14 @@ export function filter(fn: (data: any) => boolean): FilterStream {
 
 	result.restore = es.through();
 	return result;
-}
+}
+
+export function versionStringToNumber(versionStr: string) {
+	const semverRegex = /(\d+)\.(\d+)\.(\d+)/;
+	const match = versionStr.match(semverRegex);
+	if (!match) {
+		throw new Error('Version string is not properly formatted: ' + versionStr);
+	}
+
+	return parseInt(match[1], 10) * 1e4 + parseInt(match[2], 10) * 1e2 + parseInt(match[3], 10);
+}

build/monaco/LICENSE

@@ -1,6 +1,6 @@
 The Source EULA
 
-Copyright (c) 2016 Microsoft Corporation
+Copyright (c) 2016 - present Microsoft Corporation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

build/monaco/ThirdPartyNotices.txt

@@ -32,7 +32,7 @@ END OF winjs NOTICES AND INFORMATION
 
 %% string_scorer version 0.1.20 (https://github.com/joshaven/string_score)
 =========================================
-This software is released under the Source EULA:
+This software is released under the MIT license:
 
 Copyright (c) Joshaven Potter
 
@@ -60,7 +60,7 @@ END OF string_scorer NOTICES AND INFORMATION
 
 %% chjj-marked NOTICES AND INFORMATION BEGIN HERE
 =========================================
-The Source EULA
+The MIT License (MIT)
 
 Copyright (c) 2011-2014, Christopher Jeffrey (https://github.com/chjj/)
 

build/monaco/api.js

@@ -134,7 +134,25 @@ function getTopLevelDeclaration(sourceFile, typeName) {
 function getNodeText(sourceFile, node) {
     return sourceFile.getFullText().substring(node.pos, node.end);
 }
-function getMassagedTopLevelDeclarationText(sourceFile, declaration) {
+function hasModifier(modifiers, kind) {
+    if (modifiers) {
+        for (var i = 0; i < modifiers.length; i++) {
+            var mod = modifiers[i];
+            if (mod.kind === kind) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+function isStatic(member) {
+    return hasModifier(member.modifiers, ts.SyntaxKind.StaticKeyword);
+}
+function isDefaultExport(declaration) {
+    return (hasModifier(declaration.modifiers, ts.SyntaxKind.DefaultKeyword)
+        && hasModifier(declaration.modifiers, ts.SyntaxKind.ExportKeyword));
+}
+function getMassagedTopLevelDeclarationText(sourceFile, declaration, importName, usage) {
     var result = getNodeText(sourceFile, declaration);
     // if (result.indexOf('MonacoWorker') >= 0) {
     // 	console.log('here!');
@@ -142,6 +160,18 @@ function getMassagedTopLevelDeclarationText(sourceFile, declaration) {
     // }
     if (declaration.kind === ts.SyntaxKind.InterfaceDeclaration || declaration.kind === ts.SyntaxKind.ClassDeclaration) {
         var interfaceDeclaration = declaration;
+        var staticTypeName_1 = (isDefaultExport(interfaceDeclaration)
+            ? importName + ".default"
+            : importName + "." + declaration.name.text);
+        var instanceTypeName_1 = staticTypeName_1;
+        var typeParametersCnt = (interfaceDeclaration.typeParameters ? interfaceDeclaration.typeParameters.length : 0);
+        if (typeParametersCnt > 0) {
+            var arr = [];
+            for (var i = 0; i < typeParametersCnt; i++) {
+                arr.push('any');
+            }
+            instanceTypeName_1 = instanceTypeName_1 + "<" + arr.join(',') + ">";
+        }
         var members = interfaceDeclaration.members;
         members.forEach(function (member) {
             try {
@@ -151,6 +181,15 @@ function getMassagedTopLevelDeclarationText(sourceFile, declaration) {
                     result = result.replace(memberText, '');
                     // console.log('AFTER: ', result);
                 }
+                else {
+                    var memberName = member.name.text;
+                    if (isStatic(member)) {
+                        usage.push("a = " + staticTypeName_1 + "." + memberName + ";");
+                    }
+                    else {
+                        usage.push("a = (<" + instanceTypeName_1 + ">b)." + memberName + ";");
+                    }
+                }
             }
             catch (err) {
                 // life..
@@ -171,9 +210,7 @@ function format(text) {
     function getRuleProvider(options) {
         // Share this between multiple formatters using the same options.
         // This represents the bulk of the space the formatter uses.
-        var ruleProvider = new ts.formatting.RulesProvider();
-        ruleProvider.ensureUpToDate(options);
-        return ruleProvider;
+        return ts.formatting.getFormatContext(options);
     }
     function applyEdits(text, edits) {
         // Apply edits in reverse on the existing text
@@ -210,8 +247,19 @@ function createReplacer(data) {
     };
 }
 function generateDeclarationFile(out, inputFiles, recipe) {
-    var lines = recipe.split(/\r\n|\n|\r/);
+    var endl = /\r\n/.test(recipe) ? '\r\n' : '\n';
+    var lines = recipe.split(endl);
     var result = [];
+    var usageCounter = 0;
+    var usageImports = [];
+    var usage = [];
+    usage.push("var a;");
+    usage.push("var b;");
+    var generateUsageImport = function (moduleId) {
+        var importName = 'm' + (++usageCounter);
+        usageImports.push("import * as " + importName + " from '" + moduleId.replace(/\.d\.ts$/, '') + "';");
+        return importName;
+    };
     lines.forEach(function (line) {
         var m1 = line.match(/^\s*#include\(([^;)]*)(;[^)]*)?\)\:(.*)$/);
         if (m1) {
@@ -221,6 +269,7 @@ function generateDeclarationFile(out, inputFiles, recipe) {
             if (!sourceFile_1) {
                 return;
             }
+            var importName_1 = generateUsageImport(moduleId);
             var replacer_1 = createReplacer(m1[2]);
             var typeNames = m1[3].split(/,/);
             typeNames.forEach(function (typeName) {
@@ -233,7 +282,7 @@ function generateDeclarationFile(out, inputFiles, recipe) {
                     logErr('Cannot find type ' + typeName);
                     return;
                 }
-                result.push(replacer_1(getMassagedTopLevelDeclarationText(sourceFile_1, declaration)));
+                result.push(replacer_1(getMassagedTopLevelDeclarationText(sourceFile_1, declaration, importName_1, usage)));
             });
             return;
         }
@@ -245,6 +294,7 @@ function generateDeclarationFile(out, inputFiles, recipe) {
             if (!sourceFile_2) {
                 return;
             }
+            var importName_2 = generateUsageImport(moduleId);
             var replacer_2 = createReplacer(m2[2]);
             var typeNames = m2[3].split(/,/);
             var typesToExcludeMap_1 = {};
@@ -272,21 +322,23 @@ function generateDeclarationFile(out, inputFiles, recipe) {
                         }
                     }
                 }
-                result.push(replacer_2(getMassagedTopLevelDeclarationText(sourceFile_2, declaration)));
+                result.push(replacer_2(getMassagedTopLevelDeclarationText(sourceFile_2, declaration, importName_2, usage)));
             });
             return;
         }
         result.push(line);
     });
-    var resultTxt = result.join('\n');
+    var resultTxt = result.join(endl);
     resultTxt = resultTxt.replace(/\bURI\b/g, 'Uri');
     resultTxt = resultTxt.replace(/\bEvent</g, 'IEvent<');
     resultTxt = resultTxt.replace(/\bTPromise</g, 'Promise<');
     resultTxt = format(resultTxt);
-    resultTxt = resultTxt.replace(/\r\n/g, '\n');
-    return resultTxt;
+    return [
+        resultTxt,
+        usageImports.join('\n') + "\n\n" + usage.join('\n')
+    ];
 }
-function getFilesToWatch(out) {
+function getIncludesInRecipe() {
     var recipe = fs.readFileSync(RECIPE_PATH).toString();
     var lines = recipe.split(/\r\n|\n|\r/);
     var result = [];
@@ -294,30 +346,37 @@ function getFilesToWatch(out) {
         var m1 = line.match(/^\s*#include\(([^;)]*)(;[^)]*)?\)\:(.*)$/);
         if (m1) {
             var moduleId = m1[1];
-            result.push(moduleIdToPath(out, moduleId));
+            result.push(moduleId);
             return;
         }
         var m2 = line.match(/^\s*#includeAll\(([^;)]*)(;[^)]*)?\)\:(.*)$/);
         if (m2) {
             var moduleId = m2[1];
-            result.push(moduleIdToPath(out, moduleId));
+            result.push(moduleId);
             return;
         }
     });
     return result;
 }
+function getFilesToWatch(out) {
+    return getIncludesInRecipe().map(function (moduleId) { return moduleIdToPath(out, moduleId); });
+}
 exports.getFilesToWatch = getFilesToWatch;
 function run(out, inputFiles) {
     log('Starting monaco.d.ts generation');
     SOURCE_FILE_MAP = {};
     var recipe = fs.readFileSync(RECIPE_PATH).toString();
-    var result = generateDeclarationFile(out, inputFiles, recipe);
+    var _a = generateDeclarationFile(out, inputFiles, recipe), result = _a[0], usageContent = _a[1];
     var currentContent = fs.readFileSync(DECLARATION_PATH).toString();
     log('Finished monaco.d.ts generation');
+    var one = currentContent.replace(/\r\n/gm, '\n');
+    var other = result.replace(/\r\n/gm, '\n');
+    var isTheSame = one === other;
     return {
         content: result,
+        usageContent: usageContent,
         filePath: DECLARATION_PATH,
-        isTheSame: currentContent === result
+        isTheSame: isTheSame
     };
 }
 exports.run = run;
@@ -325,3 +384,78 @@ function complainErrors() {
     logErr('Not running monaco.d.ts generation due to compile errors');
 }
 exports.complainErrors = complainErrors;
+var TypeScriptLanguageServiceHost = /** @class */ (function () {
+    function TypeScriptLanguageServiceHost(libs, files, compilerOptions) {
+        this._libs = libs;
+        this._files = files;
+        this._compilerOptions = compilerOptions;
+    }
+    // --- language service host ---------------
+    TypeScriptLanguageServiceHost.prototype.getCompilationSettings = function () {
+        return this._compilerOptions;
+    };
+    TypeScriptLanguageServiceHost.prototype.getScriptFileNames = function () {
+        return ([]
+            .concat(Object.keys(this._libs))
+            .concat(Object.keys(this._files)));
+    };
+    TypeScriptLanguageServiceHost.prototype.getScriptVersion = function (fileName) {
+        return '1';
+    };
+    TypeScriptLanguageServiceHost.prototype.getProjectVersion = function () {
+        return '1';
+    };
+    TypeScriptLanguageServiceHost.prototype.getScriptSnapshot = function (fileName) {
+        if (this._files.hasOwnProperty(fileName)) {
+            return ts.ScriptSnapshot.fromString(this._files[fileName]);
+        }
+        else if (this._libs.hasOwnProperty(fileName)) {
+            return ts.ScriptSnapshot.fromString(this._libs[fileName]);
+        }
+        else {
+            return ts.ScriptSnapshot.fromString('');
+        }
+    };
+    TypeScriptLanguageServiceHost.prototype.getScriptKind = function (fileName) {
+        return ts.ScriptKind.TS;
+    };
+    TypeScriptLanguageServiceHost.prototype.getCurrentDirectory = function () {
+        return '';
+    };
+    TypeScriptLanguageServiceHost.prototype.getDefaultLibFileName = function (options) {
+        return 'defaultLib:es5';
+    };
+    TypeScriptLanguageServiceHost.prototype.isDefaultLibFileName = function (fileName) {
+        return fileName === this.getDefaultLibFileName(this._compilerOptions);
+    };
+    return TypeScriptLanguageServiceHost;
+}());
+function execute() {
+    var OUTPUT_FILES = {};
+    var SRC_FILES = {};
+    var SRC_FILE_TO_EXPECTED_NAME = {};
+    getIncludesInRecipe().forEach(function (moduleId) {
+        if (/\.d\.ts$/.test(moduleId)) {
+            var fileName_1 = path.join(SRC, moduleId);
+            OUTPUT_FILES[moduleIdToPath('src', moduleId)] = fs.readFileSync(fileName_1).toString();
+            return;
+        }
+        var fileName = path.join(SRC, moduleId) + '.ts';
+        SRC_FILES[fileName] = fs.readFileSync(fileName).toString();
+        SRC_FILE_TO_EXPECTED_NAME[fileName] = moduleIdToPath('src', moduleId);
+    });
+    var languageService = ts.createLanguageService(new TypeScriptLanguageServiceHost({}, SRC_FILES, {}));
+    var t1 = Date.now();
+    Object.keys(SRC_FILES).forEach(function (fileName) {
+        var t = Date.now();
+        var emitOutput = languageService.getEmitOutput(fileName, true);
+        OUTPUT_FILES[SRC_FILE_TO_EXPECTED_NAME[fileName]] = emitOutput.outputFiles[0].text;
+        // console.log(`Generating .d.ts for ${fileName} took ${Date.now() - t} ms`);
+    });
+    console.log("Generating .d.ts took " + (Date.now() - t1) + " ms");
+    // console.log(result.filePath);
+    // fs.writeFileSync(result.filePath, result.content.replace(/\r\n/gm, '\n'));
+    // fs.writeFileSync(path.join(SRC, 'user.ts'), result.usageContent.replace(/\r\n/gm, '\n'));
+    return run('src', OUTPUT_FILES);
+}
+exports.execute = execute;

build/monaco/api.ts

@@ -24,15 +24,15 @@ function logErr(message: any, ...rest: any[]): void {
 	util.log(util.colors.red('[monaco.d.ts]'), message, ...rest);
 }
 
-function moduleIdToPath(out:string, moduleId:string): string {
+function moduleIdToPath(out: string, moduleId: string): string {
 	if (/\.d\.ts/.test(moduleId)) {
 		return path.join(SRC, moduleId);
 	}
 	return path.join(OUT_ROOT, out, moduleId) + '.d.ts';
 }
 
-let SOURCE_FILE_MAP: {[moduleId:string]:ts.SourceFile;} = {};
-function getSourceFile(out:string, inputFiles: { [file: string]: string; }, moduleId:string): ts.SourceFile {
+let SOURCE_FILE_MAP: { [moduleId: string]: ts.SourceFile; } = {};
+function getSourceFile(out: string, inputFiles: { [file: string]: string; }, moduleId: string): ts.SourceFile {
 	if (!SOURCE_FILE_MAP[moduleId]) {
 		let filePath = path.normalize(moduleIdToPath(out, moduleId));
 
@@ -53,7 +53,7 @@ function getSourceFile(out:string, inputFiles: { [file: string]: string; }, modu
 type TSTopLevelDeclaration = ts.InterfaceDeclaration | ts.EnumDeclaration | ts.ClassDeclaration | ts.TypeAliasDeclaration | ts.FunctionDeclaration | ts.ModuleDeclaration;
 type TSTopLevelDeclare = TSTopLevelDeclaration | ts.VariableStatement;
 
-function isDeclaration(a:TSTopLevelDeclare): a is TSTopLevelDeclaration {
+function isDeclaration(a: TSTopLevelDeclare): a is TSTopLevelDeclaration {
 	return (
 		a.kind === ts.SyntaxKind.InterfaceDeclaration
 		|| a.kind === ts.SyntaxKind.EnumDeclaration
@@ -64,7 +64,7 @@ function isDeclaration(a:TSTopLevelDeclare): a is TSTopLevelDeclaration {
 	);
 }
 
-function visitTopLevelDeclarations(sourceFile:ts.SourceFile, visitor:(node:TSTopLevelDeclare)=>boolean): void {
+function visitTopLevelDeclarations(sourceFile: ts.SourceFile, visitor: (node: TSTopLevelDeclare) => boolean): void {
 	let stop = false;
 
 	let visit = (node: ts.Node): void => {
@@ -100,8 +100,8 @@ function visitTopLevelDeclarations(sourceFile:ts.SourceFile, visitor:(node:TSTop
 }
 
 
-function getAllTopLevelDeclarations(sourceFile:ts.SourceFile): TSTopLevelDeclare[] {
-	let all:TSTopLevelDeclare[] = [];
+function getAllTopLevelDeclarations(sourceFile: ts.SourceFile): TSTopLevelDeclare[] {
+	let all: TSTopLevelDeclare[] = [];
 	visitTopLevelDeclarations(sourceFile, (node) => {
 		if (node.kind === ts.SyntaxKind.InterfaceDeclaration || node.kind === ts.SyntaxKind.ClassDeclaration || node.kind === ts.SyntaxKind.ModuleDeclaration) {
 			let interfaceDeclaration = <ts.InterfaceDeclaration>node;
@@ -128,8 +128,8 @@ function getAllTopLevelDeclarations(sourceFile:ts.SourceFile): TSTopLevelDeclare
 }
 
 
-function getTopLevelDeclaration(sourceFile:ts.SourceFile, typeName:string): TSTopLevelDeclare {
-	let result:TSTopLevelDeclare = null;
+function getTopLevelDeclaration(sourceFile: ts.SourceFile, typeName: string): TSTopLevelDeclare {
+	let result: TSTopLevelDeclare = null;
 	visitTopLevelDeclarations(sourceFile, (node) => {
 		if (isDeclaration(node)) {
 			if (node.name.text === typeName) {
@@ -149,12 +149,34 @@ function getTopLevelDeclaration(sourceFile:ts.SourceFile, typeName:string): TSTo
 }
 
 
-function getNodeText(sourceFile:ts.SourceFile, node:{pos:number; end:number;}): string {
+function getNodeText(sourceFile: ts.SourceFile, node: { pos: number; end: number; }): string {
 	return sourceFile.getFullText().substring(node.pos, node.end);
 }
 
+function hasModifier(modifiers: ts.NodeArray<ts.Modifier>, kind: ts.SyntaxKind): boolean {
+	if (modifiers) {
+		for (let i = 0; i < modifiers.length; i++) {
+			let mod = modifiers[i];
+			if (mod.kind === kind) {
+				return true;
+			}
+		}
+	}
+	return false;
+}
 
-function getMassagedTopLevelDeclarationText(sourceFile:ts.SourceFile, declaration: TSTopLevelDeclare): string {
+function isStatic(member: ts.ClassElement | ts.TypeElement): boolean {
+	return hasModifier(member.modifiers, ts.SyntaxKind.StaticKeyword);
+}
+
+function isDefaultExport(declaration: ts.InterfaceDeclaration | ts.ClassDeclaration): boolean {
+	return (
+		hasModifier(declaration.modifiers, ts.SyntaxKind.DefaultKeyword)
+		&& hasModifier(declaration.modifiers, ts.SyntaxKind.ExportKeyword)
+	);
+}
+
+function getMassagedTopLevelDeclarationText(sourceFile: ts.SourceFile, declaration: TSTopLevelDeclare, importName: string, usage: string[]): string {
 	let result = getNodeText(sourceFile, declaration);
 	// if (result.indexOf('MonacoWorker') >= 0) {
 	// 	console.log('here!');
@@ -163,7 +185,23 @@ function getMassagedTopLevelDeclarationText(sourceFile:ts.SourceFile, declaratio
 	if (declaration.kind === ts.SyntaxKind.InterfaceDeclaration || declaration.kind === ts.SyntaxKind.ClassDeclaration) {
 		let interfaceDeclaration = <ts.InterfaceDeclaration | ts.ClassDeclaration>declaration;
 
-		let members:ts.NodeArray<ts.Node> = interfaceDeclaration.members;
+		const staticTypeName = (
+			isDefaultExport(interfaceDeclaration)
+				? `${importName}.default`
+				: `${importName}.${declaration.name.text}`
+		);
+
+		let instanceTypeName = staticTypeName;
+		const typeParametersCnt = (interfaceDeclaration.typeParameters ? interfaceDeclaration.typeParameters.length : 0);
+		if (typeParametersCnt > 0) {
+			let arr: string[] = [];
+			for (let i = 0; i < typeParametersCnt; i++) {
+				arr.push('any');
+			}
+			instanceTypeName = `${instanceTypeName}<${arr.join(',')}>`;
+		}
+
+		const members: ts.NodeArray<ts.ClassElement | ts.TypeElement> = interfaceDeclaration.members;
 		members.forEach((member) => {
 			try {
 				let memberText = getNodeText(sourceFile, member);
@@ -171,6 +209,13 @@ function getMassagedTopLevelDeclarationText(sourceFile:ts.SourceFile, declaratio
 					// console.log('BEFORE: ', result);
 					result = result.replace(memberText, '');
 					// console.log('AFTER: ', result);
+				} else {
+					const memberName = (<ts.Identifier | ts.StringLiteral>member.name).text;
+					if (isStatic(member)) {
+						usage.push(`a = ${staticTypeName}.${memberName};`);
+					} else {
+						usage.push(`a = (<${instanceTypeName}>b).${memberName};`);
+					}
 				}
 			} catch (err) {
 				// life..
@@ -182,7 +227,7 @@ function getMassagedTopLevelDeclarationText(sourceFile:ts.SourceFile, declaratio
 	return result;
 }
 
-function format(text:string): string {
+function format(text: string): string {
 
 	// Parse the source text
 	let sourceFile = ts.createSourceFile('file.ts', text, ts.ScriptTarget.Latest, /*setParentPointers*/ true);
@@ -196,9 +241,7 @@ function format(text:string): string {
 	function getRuleProvider(options: ts.FormatCodeSettings) {
 		// Share this between multiple formatters using the same options.
 		// This represents the bulk of the space the formatter uses.
-		let ruleProvider = new (<any>ts).formatting.RulesProvider();
-		ruleProvider.ensureUpToDate(options);
-		return ruleProvider;
+		return (ts as any).formatting.getFormatContext(options);
 	}
 
 	function applyEdits(text: string, edits: ts.TextChange[]): string {
@@ -214,10 +257,10 @@ function format(text:string): string {
 	}
 }
 
-function createReplacer(data:string): (str:string)=>string {
+function createReplacer(data: string): (str: string) => string {
 	data = data || '';
 	let rawDirectives = data.split(';');
-	let directives: [RegExp,string][] = [];
+	let directives: [RegExp, string][] = [];
 	rawDirectives.forEach((rawDirective) => {
 		if (rawDirective.length === 0) {
 			return;
@@ -231,7 +274,7 @@ function createReplacer(data:string): (str:string)=>string {
 		directives.push([new RegExp(findStr, 'g'), replaceStr]);
 	});
 
-	return (str:string)=> {
+	return (str: string) => {
 		for (let i = 0; i < directives.length; i++) {
 			str = str.replace(directives[i][0], directives[i][1]);
 		}
@@ -239,10 +282,24 @@ function createReplacer(data:string): (str:string)=>string {
 	};
 }
 
-function generateDeclarationFile(out: string, inputFiles: { [file: string]: string; }, recipe:string): string {
-	let lines = recipe.split(/\r\n|\n|\r/);
-	let result = [];
+function generateDeclarationFile(out: string, inputFiles: { [file: string]: string; }, recipe: string): [string, string] {
+	const endl = /\r\n/.test(recipe) ? '\r\n' : '\n';
 
+	let lines = recipe.split(endl);
+	let result: string[] = [];
+
+	let usageCounter = 0;
+	let usageImports: string[] = [];
+	let usage: string[] = [];
+
+	usage.push(`var a;`);
+	usage.push(`var b;`);
+
+	const generateUsageImport = (moduleId: string) => {
+		let importName = 'm' + (++usageCounter);
+		usageImports.push(`import * as ${importName} from '${moduleId.replace(/\.d\.ts$/, '')}';`);
+		return importName;
+	};
 
 	lines.forEach(line => {
 
@@ -255,6 +312,8 @@ function generateDeclarationFile(out: string, inputFiles: { [file: string]: stri
 				return;
 			}
 
+			const importName = generateUsageImport(moduleId);
+
 			let replacer = createReplacer(m1[2]);
 
 			let typeNames = m1[3].split(/,/);
@@ -268,7 +327,7 @@ function generateDeclarationFile(out: string, inputFiles: { [file: string]: stri
 					logErr('Cannot find type ' + typeName);
 					return;
 				}
-				result.push(replacer(getMassagedTopLevelDeclarationText(sourceFile, declaration)));
+				result.push(replacer(getMassagedTopLevelDeclarationText(sourceFile, declaration, importName, usage)));
 			});
 			return;
 		}
@@ -282,10 +341,12 @@ function generateDeclarationFile(out: string, inputFiles: { [file: string]: stri
 				return;
 			}
 
+			const importName = generateUsageImport(moduleId);
+
 			let replacer = createReplacer(m2[2]);
 
 			let typeNames = m2[3].split(/,/);
-			let typesToExcludeMap: {[typeName:string]:boolean;} = {};
+			let typesToExcludeMap: { [typeName: string]: boolean; } = {};
 			let typesToExcludeArr: string[] = [];
 			typeNames.forEach((typeName) => {
 				typeName = typeName.trim();
@@ -310,7 +371,7 @@ function generateDeclarationFile(out: string, inputFiles: { [file: string]: stri
 						}
 					}
 				}
-				result.push(replacer(getMassagedTopLevelDeclarationText(sourceFile, declaration)));
+				result.push(replacer(getMassagedTopLevelDeclarationText(sourceFile, declaration, importName, usage)));
 			});
 			return;
 		}
@@ -318,18 +379,20 @@ function generateDeclarationFile(out: string, inputFiles: { [file: string]: stri
 		result.push(line);
 	});
 
-	let resultTxt = result.join('\n');
+	let resultTxt = result.join(endl);
 	resultTxt = resultTxt.replace(/\bURI\b/g, 'Uri');
 	resultTxt = resultTxt.replace(/\bEvent</g, 'IEvent<');
 	resultTxt = resultTxt.replace(/\bTPromise</g, 'Promise<');
 
 	resultTxt = format(resultTxt);
 
-	resultTxt = resultTxt.replace(/\r\n/g, '\n');
-	return resultTxt;
+	return [
+		resultTxt,
+		`${usageImports.join('\n')}\n\n${usage.join('\n')}`
+	];
 }
 
-export function getFilesToWatch(out:string): string[] {
+function getIncludesInRecipe(): string[] {
 	let recipe = fs.readFileSync(RECIPE_PATH).toString();
 	let lines = recipe.split(/\r\n|\n|\r/);
 	let result = [];
@@ -339,14 +402,14 @@ export function getFilesToWatch(out:string): string[] {
 		let m1 = line.match(/^\s*#include\(([^;)]*)(;[^)]*)?\)\:(.*)$/);
 		if (m1) {
 			let moduleId = m1[1];
-			result.push(moduleIdToPath(out, moduleId));
+			result.push(moduleId);
 			return;
 		}
 
 		let m2 = line.match(/^\s*#includeAll\(([^;)]*)(;[^)]*)?\)\:(.*)$/);
 		if (m2) {
 			let moduleId = m2[1];
-			result.push(moduleIdToPath(out, moduleId));
+			result.push(moduleId);
 			return;
 		}
 	});
@@ -354,8 +417,13 @@ export function getFilesToWatch(out:string): string[] {
 	return result;
 }
 
+export function getFilesToWatch(out: string): string[] {
+	return getIncludesInRecipe().map((moduleId) => moduleIdToPath(out, moduleId));
+}
+
 export interface IMonacoDeclarationResult {
 	content: string;
+	usageContent: string;
 	filePath: string;
 	isTheSame: boolean;
 }
@@ -365,18 +433,116 @@ export function run(out: string, inputFiles: { [file: string]: string; }): IMona
 	SOURCE_FILE_MAP = {};
 
 	let recipe = fs.readFileSync(RECIPE_PATH).toString();
-	let result = generateDeclarationFile(out, inputFiles, recipe);
+	let [result, usageContent] = generateDeclarationFile(out, inputFiles, recipe);
 
 	let currentContent = fs.readFileSync(DECLARATION_PATH).toString();
 	log('Finished monaco.d.ts generation');
 
+	const one = currentContent.replace(/\r\n/gm, '\n');
+	const other = result.replace(/\r\n/gm, '\n');
+	const isTheSame = one === other;
+
 	return {
 		content: result,
+		usageContent: usageContent,
 		filePath: DECLARATION_PATH,
-		isTheSame: currentContent === result
+		isTheSame
 	};
 }
 
 export function complainErrors() {
 	logErr('Not running monaco.d.ts generation due to compile errors');
 }
+
+
+
+interface ILibMap { [libName: string]: string; }
+interface IFileMap { [fileName: string]: string; }
+
+class TypeScriptLanguageServiceHost implements ts.LanguageServiceHost {
+
+	private readonly _libs: ILibMap;
+	private readonly _files: IFileMap;
+	private readonly _compilerOptions: ts.CompilerOptions;
+
+	constructor(libs: ILibMap, files: IFileMap, compilerOptions: ts.CompilerOptions) {
+		this._libs = libs;
+		this._files = files;
+		this._compilerOptions = compilerOptions;
+	}
+
+	// --- language service host ---------------
+
+	getCompilationSettings(): ts.CompilerOptions {
+		return this._compilerOptions;
+	}
+	getScriptFileNames(): string[] {
+		return (
+			[]
+				.concat(Object.keys(this._libs))
+				.concat(Object.keys(this._files))
+		);
+	}
+	getScriptVersion(fileName: string): string {
+		return '1';
+	}
+	getProjectVersion(): string {
+		return '1';
+	}
+	getScriptSnapshot(fileName: string): ts.IScriptSnapshot {
+		if (this._files.hasOwnProperty(fileName)) {
+			return ts.ScriptSnapshot.fromString(this._files[fileName]);
+		} else if (this._libs.hasOwnProperty(fileName)) {
+			return ts.ScriptSnapshot.fromString(this._libs[fileName]);
+		} else {
+			return ts.ScriptSnapshot.fromString('');
+		}
+	}
+	getScriptKind(fileName: string): ts.ScriptKind {
+		return ts.ScriptKind.TS;
+	}
+	getCurrentDirectory(): string {
+		return '';
+	}
+	getDefaultLibFileName(options: ts.CompilerOptions): string {
+		return 'defaultLib:es5';
+	}
+	isDefaultLibFileName(fileName: string): boolean {
+		return fileName === this.getDefaultLibFileName(this._compilerOptions);
+	}
+}
+
+export function execute(): IMonacoDeclarationResult {
+
+	const OUTPUT_FILES: { [file: string]: string; } = {};
+	const SRC_FILES: IFileMap = {};
+	const SRC_FILE_TO_EXPECTED_NAME: { [filename: string]: string; } = {};
+	getIncludesInRecipe().forEach((moduleId) => {
+		if (/\.d\.ts$/.test(moduleId)) {
+			let fileName = path.join(SRC, moduleId);
+			OUTPUT_FILES[moduleIdToPath('src', moduleId)] = fs.readFileSync(fileName).toString();
+			return;
+		}
+
+		let fileName = path.join(SRC, moduleId) + '.ts';
+		SRC_FILES[fileName] = fs.readFileSync(fileName).toString();
+		SRC_FILE_TO_EXPECTED_NAME[fileName] = moduleIdToPath('src', moduleId);
+	});
+
+	const languageService = ts.createLanguageService(new TypeScriptLanguageServiceHost({}, SRC_FILES, {}));
+
+	var t1 = Date.now();
+	Object.keys(SRC_FILES).forEach((fileName) => {
+		var t = Date.now();
+		const emitOutput = languageService.getEmitOutput(fileName, true);
+		OUTPUT_FILES[SRC_FILE_TO_EXPECTED_NAME[fileName]] = emitOutput.outputFiles[0].text;
+		// console.log(`Generating .d.ts for ${fileName} took ${Date.now() - t} ms`);
+	});
+	console.log(`Generating .d.ts took ${Date.now() - t1} ms`);
+
+	// console.log(result.filePath);
+	// fs.writeFileSync(result.filePath, result.content.replace(/\r\n/gm, '\n'));
+	// fs.writeFileSync(path.join(SRC, 'user.ts'), result.usageContent.replace(/\r\n/gm, '\n'));
+
+	return run('src', OUTPUT_FILES);
+}

build/monaco/monaco.d.ts.recipe

@@ -3,9 +3,9 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-declare module monaco {
+declare namespace monaco {
 
-	type Thenable<T> = PromiseLike<T>;
+	export type Thenable<T> = PromiseLike<T>;
 
 	export interface IDisposable {
 		dispose(): void;
@@ -32,6 +32,18 @@ declare module monaco {
 		Error = 3,
 	}
 
+	export enum MarkerTag {
+		Unnecessary = 1,
+	}
+
+	export enum MarkerSeverity {
+		Hint = 1,
+		Info = 2,
+		Warning = 4,
+		Error = 8,
+	}
+
+
 #include(vs/base/common/winjs.base.d.ts): TValueCallback, ProgressCallback, Promise
 #include(vs/base/common/cancellation): CancellationTokenSource, CancellationToken
 #include(vs/base/common/uri): URI, UriComponents
@@ -46,7 +58,7 @@ declare module monaco {
 #include(vs/editor/common/core/token): Token
 }
 
-declare module monaco.editor {
+declare namespace monaco.editor {
 
 #includeAll(vs/editor/standalone/browser/standaloneEditor;modes.=>languages.;editorCommon.=>):
 #include(vs/editor/standalone/common/standaloneThemeService): BuiltinTheme, IStandaloneThemeData, IColors
@@ -58,7 +70,7 @@ export interface ICommandHandler {
 }
 #include(vs/platform/contextkey/common/contextkey): IContextKey
 #include(vs/editor/standalone/browser/standaloneServices): IEditorOverrideServices
-#include(vs/platform/markers/common/markers): IMarker, IMarkerData
+#include(vs/platform/markers/common/markers): IMarker, IMarkerData, IRelatedInformation
 #include(vs/editor/standalone/browser/colorizer): IColorizerOptions, IColorizerElementOptions
 #include(vs/base/common/scrollable): ScrollbarVisibility
 #include(vs/platform/theme/common/themeService): ThemeColor
@@ -75,7 +87,7 @@ export type IReadOnlyModel = ITextModel;
 export type IModel = ITextModel;
 }
 
-declare module monaco.languages {
+declare namespace monaco.languages {
 
 #includeAll(vs/editor/standalone/browser/standaloneLanguages;modes.=>;editorCommon.=>editor.;model.=>editor.;IMarkerData=>editor.IMarkerData):
 #includeAll(vs/editor/common/modes/languageConfiguration):
@@ -85,7 +97,7 @@ declare module monaco.languages {
 
 }
 
-declare module monaco.worker {
+declare namespace monaco.worker {
 
 #includeAll(vs/editor/common/services/editorSimpleWorker;):
 

build/monaco/monaco.usage.recipe

@@ -0,0 +1,82 @@
+
+// This file is adding references to various symbols which should not be removed via tree shaking
+
+import { ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
+import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
+import { IHighlight } from 'vs/base/parts/quickopen/browser/quickOpenModel';
+import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { CountBadge } from 'vs/base/browser/ui/countBadge/countBadge';
+import { SimpleWorkerClient, create as create1 } from 'vs/base/common/worker/simpleWorker';
+import { create as create2 } from 'vs/editor/common/services/editorSimpleWorker';
+import { QuickOpenWidget } from 'vs/base/parts/quickopen/browser/quickOpenWidget';
+import { SyncDescriptor0, SyncDescriptor1, SyncDescriptor2, SyncDescriptor3, SyncDescriptor4, SyncDescriptor5, SyncDescriptor6, SyncDescriptor7, SyncDescriptor8 } from 'vs/platform/instantiation/common/descriptors';
+import { PolyfillPromise } from 'vs/base/common/winjs.polyfill.promise';
+import { DiffNavigator } from 'vs/editor/browser/widget/diffNavigator';
+import * as editorAPI from 'vs/editor/editor.api';
+
+(function () {
+	var a: any;
+	var b: any;
+	a = (<IContextViewService>b).layout; // IContextViewProvider
+	a = (<IWorkspaceContextService>b).getWorkspaceFolder; // IWorkspaceFolderProvider
+	a = (<IWorkspaceContextService>b).getWorkspace; // IWorkspaceFolderProvider
+	a = (<CountBadge>b).style; // IThemable
+	a = (<QuickOpenWidget>b).style; // IThemable
+	a = (<IEnvironmentService>b).userHome; // IUserHomeProvider
+	a = (<DiffNavigator>b).previous; // IDiffNavigator
+	a = (<ServiceIdentifier<any>>b).type;
+	a = (<IHighlight>b).start;
+	a = (<IHighlight>b).end;
+	a = (<SimpleWorkerClient<any>>b).getProxyObject; // IWorkerClient
+	a = create1;
+	a = create2;
+
+	// promise polyfill
+	a = PolyfillPromise.all;
+	a = PolyfillPromise.race;
+	a = PolyfillPromise.resolve;
+	a = PolyfillPromise.reject;
+	a = (<PolyfillPromise>b).then;
+	a = (<PolyfillPromise>b).catch;
+
+	// injection madness
+	a = (<SyncDescriptor0<any>>b).ctor;
+	a = (<SyncDescriptor0<any>>b).bind;
+	a = (<SyncDescriptor1<any, any>>b).ctor;
+	a = (<SyncDescriptor1<any, any>>b).bind;
+	a = (<SyncDescriptor1<any, any>>b).ctor;
+	a = (<SyncDescriptor1<any, any>>b).bind;
+	a = (<SyncDescriptor2<any, any, any>>b).ctor;
+	a = (<SyncDescriptor2<any, any, any>>b).bind;
+	a = (<SyncDescriptor3<any, any, any, any>>b).ctor;
+	a = (<SyncDescriptor3<any, any, any, any>>b).bind;
+	a = (<SyncDescriptor4<any, any, any, any, any>>b).ctor;
+	a = (<SyncDescriptor4<any, any, any, any, any>>b).bind;
+	a = (<SyncDescriptor5<any, any, any, any, any, any>>b).ctor;
+	a = (<SyncDescriptor5<any, any, any, any, any, any>>b).bind;
+	a = (<SyncDescriptor6<any, any, any, any, any, any, any>>b).ctor;
+	a = (<SyncDescriptor6<any, any, any, any, any, any, any>>b).bind;
+	a = (<SyncDescriptor7<any, any, any, any, any, any, any, any>>b).ctor;
+	a = (<SyncDescriptor7<any, any, any, any, any, any, any, any>>b).bind;
+	a = (<SyncDescriptor8<any, any, any, any, any, any, any, any, any>>b).ctor;
+	a = (<SyncDescriptor8<any, any, any, any, any, any, any, any, any>>b).bind;
+
+	// exported API
+	a = editorAPI.CancellationTokenSource;
+	a = editorAPI.Emitter;
+	a = editorAPI.KeyCode;
+	a = editorAPI.KeyMod;
+	a = editorAPI.Position;
+	a = editorAPI.Range;
+	a = editorAPI.Selection;
+	a = editorAPI.SelectionDirection;
+	a = editorAPI.Severity;
+	a = editorAPI.MarkerSeverity;
+	a = editorAPI.MarkerTag;
+	a = editorAPI.Promise;
+	a = editorAPI.Uri;
+	a = editorAPI.Token;
+	a = editorAPI.editor;
+	a = editorAPI.languages;
+})();

build/monaco/package.json

@@ -1,15 +1,17 @@
 {
   "name": "monaco-editor-core",
   "private": true,
-  "version": "0.9.0",
+  "version": "0.12.0",
   "description": "A browser based code editor",
   "author": "Microsoft Corporation",
   "license": "MIT",
+  "typings": "./esm/vs/editor/editor.api.d.ts",
+  "module": "./esm/vs/editor/editor.main.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/Microsoft/vscode"
   },
-   "bugs": {
+  "bugs": {
     "url": "https://github.com/Microsoft/vscode/issues"
   }
 }

build/npm/postinstall.js

@@ -20,23 +20,17 @@ function yarnInstall(location, opts) {
 	}
 }
 
-// {{SQL CARBON EDIT}}
 yarnInstall('extensions'); // node modules shared by all extensions
 
-const extensions = [
-	'vscode-colorize-tests',
-	'json',
-  'mssql',
-	'configuration-editing',
-	'extension-editing',
-	'markdown',
-	'markdown-basics',
-	'git',
-	'merge-conflict',
-	'insights-default',
-	'account-provider-azure',
-	'agent'
-];
+const allExtensionFolders = fs.readdirSync('extensions');
+const extensions = allExtensionFolders.filter(e => {
+	try {
+		let packageJSON = JSON.parse(fs.readFileSync(path.join('extensions', e, 'package.json')).toString());
+		return packageJSON && (packageJSON.dependencies || packageJSON.devDependencies);
+	} catch (e) {
+		return false;
+	}
+});
 
 extensions.forEach(extension => yarnInstall(`extensions/${extension}`));
 

build/npm/update-grammar.js

@@ -83,7 +83,7 @@ exports.update = function (repoId, repoPath, dest, modifyGrammar, version = 'mas
 			grammar = plist.parse(content);
 		} else if (ext === '.cson') {
 			grammar = cson.parse(content);
-		} else if (ext === '.json') {
+		} else if (ext === '.json' || ext === '.JSON-tmLanguage') {
 			grammar = JSON.parse(content);
 		} else {
 			return Promise.reject(new Error('Unknown file extension: ' + ext));

build/npm/update-localization-extension.js

@@ -43,7 +43,12 @@ function update(idOrPath) {
 		let apiToken = process.env.TRANSIFEX_API_TOKEN;
 		let languageId = localization.transifexId || localization.languageId;
 		let translationDataFolder = path.join(locExtFolder, 'translations');
-
+		if (languageId === "zh-cn") {
+			languageId = "zh-hans";
+		}
+		if (languageId === "zh-tw") {
+			languageId = "zh-hant";
+		}
 		if (fs.existsSync(translationDataFolder) && fs.existsSync(path.join(translationDataFolder, 'main.i18n.json'))) {
 			console.log('Clearing  \'' + translationDataFolder + '\'...');
 			rimraf.sync(translationDataFolder);

build/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "sqlops-oss-dev-build",
+  "name": "azuredatastudio-oss-dev-build",
   "version": "1.0.0",
   "devDependencies": {
     "@types/azure": "0.9.19",
@@ -7,16 +7,21 @@
     "@types/es6-collections": "0.5.31",
     "@types/es6-promise": "0.0.33",
     "@types/mime": "0.0.29",
+    "@types/minimatch": "^3.0.3",
     "@types/node": "8.0.33",
+    "@types/request": "^2.47.0",
     "@types/xml2js": "0.0.33",
     "azure-storage": "^2.1.0",
     "decompress": "^4.2.0",
+    "del": "^3.0.0",
     "documentdb": "1.13.0",
-    "service-downloader": "github:anthonydresser/service-downloader#0.1.2",
     "fs-extra-promise": "^1.0.1",
+    "github-releases": "^0.4.1",
     "mime": "^1.3.4",
     "minimist": "^1.2.0",
-    "typescript": "2.6.1",
+    "request": "^2.85.0",
+    "service-downloader": "github:anthonydresser/service-downloader#0.1.5",
+    "typescript": "2.9.2",
     "vscode": "^1.0.1",
     "xml2js": "^0.4.17"
   },
@@ -26,4 +31,4 @@
     "postinstall": "npm run compile",
     "npmCheckJs": "tsc --noEmit"
   }
-}
+}

build/tfs/common/common.sh

@@ -1,43 +0,0 @@
-#!/bin/bash
-set -e
-
-# set agent specific npm cache
-if [ -n "$AGENT_WORKFOLDER" ]
-then
-	export npm_config_cache="$AGENT_WORKFOLDER/npm-cache"
-	echo "Using npm cache: $npm_config_cache"
-
-	export YARN_CACHE_FOLDER="$AGENT_WORKFOLDER/yarn-cache"
-	echo "Using yarn cache: $YARN_CACHE_FOLDER"
-fi
-
-SUMMARY="Task;Duration"$'\n'
-step() {
-	START=$SECONDS
-	TASK=$1; shift
-	echo ""
-	echo "*****************************************************************************"
-	echo "Start: $TASK"
-	echo "*****************************************************************************"
-	"$@"
-
-	# Calculate total duration
-	TOTAL=$(echo "$SECONDS - $START" | bc)
-	M=$(echo "$TOTAL / 60" | bc)
-	S=$(echo "$TOTAL % 60" | bc)
-	DURATION="$(printf "%02d" $M):$(printf "%02d" $S)"
-
-	echo "*****************************************************************************"
-	echo "End: $TASK, Total: $DURATION"
-	echo "*****************************************************************************"
-	SUMMARY="$SUMMARY$TASK;$DURATION"$'\n'
-}
-
-done_steps() {
-	echo ""
-	echo "Build Summary"
-	echo "============="
-	echo "${SUMMARY}" | column -t -s';'
-}
-
-trap done_steps EXIT

build/tfs/common/node.sh

@@ -1,18 +0,0 @@
-#!/bin/bash
-set -e
-
-# setup nvm
-if [[ "$OSTYPE" == "darwin"* ]]; then
-	export NVM_DIR=~/.nvm
-	source $(brew --prefix nvm)/nvm.sh --no-use
-else
-	source $NVM_DIR/nvm.sh --no-use
-fi
-
-# install node
-NODE_VERSION=8.9.1
-nvm install $NODE_VERSION
-nvm use $NODE_VERSION
-
-# install yarn
-npm i -g yarn

build/tfs/common/symbols.ts

@@ -0,0 +1,219 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 request from 'request';
+import { createReadStream, createWriteStream, unlink, mkdir } from 'fs';
+import * as github from 'github-releases';
+import { join } from 'path';
+import { tmpdir } from 'os';
+import { promisify } from 'util';
+
+const BASE_URL = 'https://rink.hockeyapp.net/api/2/';
+const HOCKEY_APP_TOKEN_HEADER = 'X-HockeyAppToken';
+
+export interface IVersions {
+	app_versions: IVersion[];
+}
+
+export interface IVersion {
+	id: number;
+	version: string;
+}
+
+export interface IApplicationAccessor {
+	accessToken: string;
+	appId: string;
+}
+
+export interface IVersionAccessor extends IApplicationAccessor {
+	id: string;
+}
+
+enum Platform {
+	WIN_32 = 'win32-ia32',
+	WIN_64 = 'win32-x64',
+	LINUX_32 = 'linux-ia32',
+	LINUX_64 = 'linux-x64',
+	MAC_OS = 'darwin-x64'
+}
+
+function symbolsZipName(platform: Platform, electronVersion: string, insiders: boolean): string {
+	return `${insiders ? 'insiders' : 'stable'}-symbols-v${electronVersion}-${platform}.zip`;
+}
+
+const SEED = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+async function tmpFile(name: string): Promise<string> {
+	let res = '';
+	for (let i = 0; i < 8; i++) {
+		res += SEED.charAt(Math.floor(Math.random() * SEED.length));
+	}
+
+	const tmpParent = join(tmpdir(), res);
+
+	await promisify(mkdir)(tmpParent);
+
+	return join(tmpParent, name);
+}
+
+function getVersions(accessor: IApplicationAccessor): Promise<IVersions> {
+	return asyncRequest<IVersions>({
+		url: `${BASE_URL}/apps/${accessor.appId}/app_versions`,
+		method: 'GET',
+		headers: {
+			[HOCKEY_APP_TOKEN_HEADER]: accessor.accessToken
+		}
+	});
+}
+
+function createVersion(accessor: IApplicationAccessor, version: string): Promise<IVersion> {
+	return asyncRequest<IVersion>({
+		url: `${BASE_URL}/apps/${accessor.appId}/app_versions/new`,
+		method: 'POST',
+		headers: {
+			[HOCKEY_APP_TOKEN_HEADER]: accessor.accessToken
+		},
+		formData: {
+			bundle_version: version
+		}
+	});
+}
+
+function updateVersion(accessor: IVersionAccessor, symbolsPath: string) {
+	return asyncRequest<IVersions>({
+		url: `${BASE_URL}/apps/${accessor.appId}/app_versions/${accessor.id}`,
+		method: 'PUT',
+		headers: {
+			[HOCKEY_APP_TOKEN_HEADER]: accessor.accessToken
+		},
+		formData: {
+			dsym: createReadStream(symbolsPath)
+		}
+	});
+}
+
+function asyncRequest<T>(options: request.UrlOptions & request.CoreOptions): Promise<T> {
+	return new Promise<T>((resolve, reject) => {
+		request(options, (error, response, body) => {
+			if (error) {
+				reject(error);
+			} else {
+				resolve(JSON.parse(body));
+			}
+		});
+	});
+}
+
+function downloadAsset(repository, assetName: string, targetPath: string, electronVersion: string) {
+	return new Promise((resolve, reject) => {
+		repository.getReleases({ tag_name: `v${electronVersion}` }, (err, releases) => {
+			if (err) {
+				reject(err);
+			} else {
+				const asset = releases[0].assets.filter(asset => asset.name === assetName)[0];
+				if (!asset) {
+					reject(new Error(`Asset with name ${assetName} not found`));
+				} else {
+					repository.downloadAsset(asset, (err, reader) => {
+						if (err) {
+							reject(err);
+						} else {
+							const writer = createWriteStream(targetPath);
+							writer.on('error', reject);
+							writer.on('close', resolve);
+							reader.on('error', reject);
+
+							reader.pipe(writer);
+						}
+					});
+				}
+			}
+		});
+	});
+}
+
+interface IOptions {
+	repository: string;
+	platform: Platform;
+	versions: { code: string; insiders: boolean; electron: string; };
+	access: { hockeyAppToken: string; hockeyAppId: string; githubToken: string };
+}
+
+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 (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;
+	}
+
+	// Download symbols for platform and electron version
+	const symbolsName = symbolsZipName(options.platform, options.versions.electron, options.versions.insiders);
+	const symbolsPath = await tmpFile('symbols.zip');
+	console.log(`HockeyApp: downloading symbols ${symbolsName} for electron ${options.versions.electron} (${options.platform}) into ${symbolsPath}`);
+	await downloadAsset(new github({ repo: options.repository, token: options.access.githubToken }), symbolsName, symbolsPath, options.versions.electron);
+
+	// Create version
+	console.log(`HockeyApp: creating new version ${options.versions.code} (${options.platform})`);
+	const version = await createVersion({ accessToken: options.access.hockeyAppToken, appId: options.access.hockeyAppId }, options.versions.code);
+
+	// Upload symbols
+	console.log(`HockeyApp: uploading symbols for version ${options.versions.code} (${options.platform})`);
+	await updateVersion({ id: String(version.id), accessToken: options.access.hockeyAppToken, appId: options.access.hockeyAppId }, symbolsPath);
+
+	// Cleanup
+	await promisify(unlink)(symbolsPath);
+}
+
+// Environment
+const pakage = require('../../../package.json');
+const product = require('../../../product.json');
+const repository = product.electronRepository;
+const electronVersion = require('../../lib/electron').getElectronVersion();
+const insiders = product.quality !== 'stable';
+let codeVersion = pakage.version;
+if (insiders) {
+	codeVersion = `${codeVersion}-insider`;
+}
+const githubToken = process.argv[2];
+const hockeyAppToken = process.argv[3];
+const is64 = process.argv[4] === 'x64';
+const hockeyAppId = process.argv[5];
+
+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 = is64 ? Platform.LINUX_64 : Platform.LINUX_32;
+}
+
+// Create version and upload symbols in HockeyApp
+if (repository && codeVersion && electronVersion && (product.quality === 'stable' || product.quality === 'insider')) {
+	ensureVersionAndSymbols({
+		repository,
+		platform,
+		versions: {
+			code: codeVersion,
+			insiders,
+			electron: electronVersion
+		},
+		access: {
+			githubToken,
+			hockeyAppToken,
+			hockeyAppId
+		}
+	}).then(() => {
+		console.log('HockeyApp: done');
+	}).catch(error => {
+		console.error(`HockeyApp: error (${error})`);
+	});
+} else {
+	console.log(`HockeyApp: skipping due to unexpected context (repository: ${repository}, codeVersion: ${codeVersion}, electronVersion: ${electronVersion}, quality: ${product.quality})`);
+}

build/tfs/continuous-build.yml

@@ -0,0 +1,15 @@
+phases:
+- phase: Windows
+  queue: Hosted VS2017
+  steps:
+  - template: win32/continuous-build-win32.yml
+
+- phase: Linux
+  queue: Hosted Linux Preview
+  steps:
+  - template: linux/continuous-build-linux.yml
+
+- phase: macOS
+  queue: Hosted macOS Preview
+  steps:
+  - template: darwin/continuous-build-darwin.yml

build/tfs/darwin/build.sh

@@ -1,58 +0,0 @@
-#!/bin/sh
-
-. ./build/tfs/common/node.sh
-. ./scripts/env.sh
-. ./build/tfs/common/common.sh
-
-export VSCODE_MIXIN_PASSWORD="$1"
-export AZURE_STORAGE_ACCESS_KEY="$2"
-export AZURE_STORAGE_ACCESS_KEY_2="$3"
-export MOONCAKE_STORAGE_ACCESS_KEY="$4"
-export AZURE_DOCUMENTDB_MASTERKEY="$5"
-VSO_PAT="$6"
-
-echo "machine monacotools.visualstudio.com password $VSO_PAT" > ~/.netrc
-
-step "Install dependencies" \
-	yarn
-
-step "Hygiene" \
-	npm run gulp -- hygiene
-
-step "Monaco Editor Check" \
-	./node_modules/.bin/tsc -p ./src/tsconfig.monaco.json --noEmit
-
-step "Mix in repository from vscode-distro" \
-	npm run gulp -- mixin
-
-step "Install distro dependencies" \
-	node build/tfs/common/installDistro.js
-
-step "Build minified & upload source maps" \
-	npm run gulp -- vscode-darwin-min upload-vscode-sourcemaps
-
-# step "Create loader snapshot"
-#	node build/lib/snapshotLoader.js
-
-step "Run unit tests" \
-	./scripts/test.sh --build --reporter dot
-
-step "Run integration tests" \
-	./scripts/test-integration.sh
-
-# function smoketest {
-# 	ARTIFACTS="$AGENT_BUILDDIRECTORY/smoketest-artifacts"
-# 	rm -rf $ARTIFACTS
-
-# 	[[ "$VSCODE_QUALITY" == "insider" ]] && VSCODE_APPNAME="Visual Studio Code - Insiders" || VSCODE_APPNAME="Visual Studio Code"
-# 	npm run smoketest -- --build "$AGENT_BUILDDIRECTORY/VSCode-darwin/$VSCODE_APPNAME.app" --log $ARTIFACTS
-# }
-
-# step "Run smoke test" \
-# 	smoketest
-
-step "Publish release" \
-	./build/tfs/darwin/release.sh
-
-step "Generate and upload configuration.json" \
-	npm run gulp -- upload-vscode-configuration

build/tfs/darwin/continuous-build-darwin.yml

@@ -0,0 +1,48 @@
+steps:
+- task: NodeTool@0
+  inputs:
+    versionSpec: "8.9.1"
+- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
+  inputs:
+    versionSpec: "1.3.2"
+- script: |
+    yarn
+  displayName: Install Dependencies
+- script: |
+    yarn gulp electron-x64
+  displayName: Download Electron
+- script: |
+    yarn gulp hygiene
+  displayName: Run Hygiene Checks
+- script: |
+    yarn check-monaco-editor-compilation
+  displayName: Run Monaco Editor Checks
+- script: |
+    yarn compile
+  displayName: Compile Sources
+- script: |
+    yarn download-builtin-extensions
+  displayName: Download Built-in Extensions
+- script: |
+    ./scripts/test.sh --tfs "Unit Tests"
+  displayName: Run Unit Tests
+- script: |
+    ./scripts/test-integration.sh --tfs "Integration Tests"
+  displayName: Run Integration Tests
+- script: |
+    yarn smoketest --screenshots "$(Build.ArtifactStagingDirectory)/artifacts" --log "$(Build.ArtifactStagingDirectory)/artifacts/smoketest.log"
+  displayName: Run Smoke Tests
+  continueOnError: true
+- task: PublishBuildArtifacts@1
+  displayName: Publish Smoketest Artifacts
+  inputs:
+    PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts'
+    ArtifactName: build-artifacts-darwin
+    publishLocation: Container
+  condition: eq(variables['System.PullRequest.IsFork'], 'False')
+- task: PublishTestResults@2
+  displayName: Publish Tests Results
+  inputs:
+    testResultsFiles: '*-results.xml'
+    searchFolder: '$(Build.ArtifactStagingDirectory)/test-results'
+  condition: succeededOrFailed()

build/tfs/darwin/enqueue.js

@@ -0,0 +1,106 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var child_process_1 = require("child_process");
+var documentdb_1 = require("documentdb");
+var azure = require("azure-storage");
+function queueSigningRequest(quality, commit) {
+    var retryOperations = new azure.ExponentialRetryPolicyFilter();
+    var queueSvc = azure
+        .createQueueService(process.env['AZURE_STORAGE_ACCOUNT_2'], process.env['AZURE_STORAGE_ACCESS_KEY_2'])
+        .withFilter(retryOperations);
+    queueSvc.messageEncoder = new azure.QueueMessageEncoder.TextBase64QueueMessageEncoder();
+    var message = quality + "/" + commit;
+    return new Promise(function (c, e) { return queueSvc.createMessage('sign-darwin', message, function (err) { return err ? e(err) : c(); }); });
+}
+function isBuildSigned(quality, commit) {
+    var client = new documentdb_1.DocumentClient(process.env['AZURE_DOCUMENTDB_ENDPOINT'], { masterKey: process.env['AZURE_DOCUMENTDB_MASTERKEY'] });
+    var collection = 'dbs/builds/colls/' + quality;
+    var updateQuery = {
+        query: 'SELECT TOP 1 * FROM c WHERE c.id = @id',
+        parameters: [{ name: '@id', value: commit }]
+    };
+    return new Promise(function (c, e) {
+        client.queryDocuments(collection, updateQuery).toArray(function (err, results) {
+            if (err) {
+                return e(err);
+            }
+            if (results.length !== 1) {
+                return c(false);
+            }
+            var release = results[0];
+            var assets = release.assets;
+            var isSigned = assets.some(function (a) { return a.platform === 'darwin' && a.type === 'archive'; });
+            c(isSigned);
+        });
+    });
+}
+// async function waitForSignedBuild(quality: string, commit: string): Promise<void> {
+// 	let retries = 0;
+// 	while (retries < 180) {
+// 		if (await isBuildSigned(quality, commit)) {
+// 			return;
+// 		}
+// 		await new Promise<void>(c => setTimeout(c, 10000));
+// 		retries++;
+// 	}
+// 	throw new Error('Timed out waiting for signed build');
+// }
+function main(quality) {
+    return __awaiter(this, void 0, void 0, function () {
+        var commit;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    commit = child_process_1.execSync('git rev-parse HEAD', { encoding: 'utf8' }).trim();
+                    console.log("Queueing signing request for '" + quality + "/" + commit + "'...");
+                    return [4 /*yield*/, queueSigningRequest(quality, commit)];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+main(process.argv[2]).catch(function (err) {
+    console.error(err);
+    process.exit(1);
+});

build/tfs/darwin/product-build-darwin.yml

@@ -0,0 +1,63 @@
+steps:
+- task: NodeTool@0
+  inputs:
+    versionSpec: "8.9.1"
+
+- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
+  inputs:
+    versionSpec: "1.3.2"
+
+- script: |
+    set -e
+    echo "machine monacotools.visualstudio.com password $(VSO_PAT)" > ~/.netrc
+    yarn
+    npm run gulp -- hygiene
+    npm run monaco-compile-check
+    VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" npm run gulp -- mixin
+    node build/tfs/common/installDistro.js
+    node build/lib/builtInExtensions.js
+
+- script: |
+    set -e
+    VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" \
+    AZURE_STORAGE_ACCESS_KEY="$(AZURE_STORAGE_ACCESS_KEY)" \
+    npm run gulp -- vscode-darwin-min upload-vscode-sourcemaps
+  name: build
+
+- script: |
+    set -e
+    ./scripts/test.sh --build --tfs "Unit Tests"
+    APP_NAME="`ls $(agent.builddirectory)/VSCode-darwin | head -n 1`"
+    # yarn smoketest -- --build "$(agent.builddirectory)/VSCode-darwin/$APP_NAME"
+  name: test
+
+- script: |
+    set -e
+    # archive the unsigned build
+    pushd ../VSCode-darwin && zip -r -X -y ../VSCode-darwin-unsigned.zip * && popd
+
+    # publish the unsigned build
+    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/tfs/common/publish.js \
+      "$(VSCODE_QUALITY)" \
+      darwin \
+      archive-unsigned \
+      "VSCode-darwin-$(VSCODE_QUALITY)-unsigned.zip" \
+      $VERSION \
+      false \
+      ../VSCode-darwin-unsigned.zip
+
+    # publish hockeyapp symbols
+    node build/tfs/common/symbols.js "$(VSCODE_MIXIN_PASSWORD)" "$(VSCODE_HOCKEYAPP_TOKEN)" "$(VSCODE_ARCH)" "$(VSCODE_HOCKEYAPP_ID_MACOS)"
+
+    # enqueue the unsigned build
+    AZURE_DOCUMENTDB_MASTERKEY="$(AZURE_DOCUMENTDB_MASTERKEY)" \
+    AZURE_STORAGE_ACCESS_KEY_2="$(AZURE_STORAGE_ACCESS_KEY_2)" \
+    node build/tfs/darwin/enqueue.js "$(VSCODE_QUALITY)"
+
+    AZURE_STORAGE_ACCESS_KEY="$(AZURE_STORAGE_ACCESS_KEY)" \
+    npm run gulp -- upload-vscode-configuration

build/tfs/darwin/release.sh

@@ -1,22 +0,0 @@
-#!/bin/sh
-
-. ./scripts/env.sh
-. ./build/tfs/common/common.sh
-
-REPO=`pwd`
-ZIP=$REPO/../VSCode-darwin-selfsigned.zip
-UNSIGNEDZIP=$REPO/../VSCode-darwin-unsigned.zip
-BUILD=$REPO/../VSCode-darwin
-PACKAGEJSON=`ls $BUILD/*.app/Contents/Resources/app/package.json`
-VERSION=`node -p "require(\"$PACKAGEJSON\").version"`
-
-rm -rf $UNSIGNEDZIP
-(cd $BUILD && \
-	step "Create unsigned archive" \
-	zip -r -X -y $UNSIGNEDZIP *)
-
-step "Upload unsigned archive" \
-	node build/tfs/common/publish.js $VSCODE_QUALITY darwin archive-unsigned VSCode-darwin-$VSCODE_QUALITY-unsigned.zip $VERSION false $UNSIGNEDZIP
-
-step "Sign build" \
-	node build/tfs/common/enqueue.js $VSCODE_QUALITY

build/tfs/linux/build-ia32.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-set -e
-./build/tfs/linux/build.sh ia32 "$@"

build/tfs/linux/build-x64.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-set -e
-./build/tfs/linux/build.sh x64 "$@"

build/tfs/linux/build.sh

@@ -1,64 +0,0 @@
-#!/bin/bash
-
-. ./build/tfs/common/node.sh
-. ./scripts/env.sh
-. ./build/tfs/common/common.sh
-
-export ARCH="$1"
-export npm_config_arch="$ARCH"
-export VSCODE_MIXIN_PASSWORD="$2"
-export AZURE_STORAGE_ACCESS_KEY="$3"
-export AZURE_STORAGE_ACCESS_KEY_2="$4"
-export MOONCAKE_STORAGE_ACCESS_KEY="$5"
-export AZURE_DOCUMENTDB_MASTERKEY="$6"
-export LINUX_REPO_PASSWORD="$7"
-VSO_PAT="$8"
-
-echo "machine monacotools.visualstudio.com password $VSO_PAT" > ~/.netrc
-
-step "Install dependencies" \
-	yarn
-
-step "Hygiene" \
-	npm run gulp -- hygiene
-
-step "Monaco Editor Check" \
-	./node_modules/.bin/tsc -p ./src/tsconfig.monaco.json --noEmit
-
-step "Mix in repository from vscode-distro" \
-	npm run gulp -- mixin
-
-step "Get Electron" \
-	npm run gulp -- "electron-$ARCH"
-
-step "Install distro dependencies" \
-	node build/tfs/common/installDistro.js
-
-step "Build minified" \
-	npm run gulp -- "vscode-linux-$ARCH-min"
-
-# step "Create loader snapshot"
-# 	node build/lib/snapshotLoader.js --arch=$ARCH
-
-step "Run unit tests" \
-	./scripts/test.sh --build --reporter dot
-
-# function smoketest {
-# 	id -u testuser &>/dev/null || (useradd -m testuser; chpasswd <<< testuser:testpassword)
-# 	sudo -i -u testuser -- sh -c 'git config --global user.name "VS Code Agent" &&  git config --global user.email "monacotools@microsoft.com"'
-
-#  	ARTIFACTS="$AGENT_BUILDDIRECTORY/smoketest-artifacts"
-# 	rm -rf $ARTIFACTS
-# 	mkdir -p $ARTIFACTS
-# 	chown -R testuser $ARTIFACTS
-
-# 	ps -o pid= -u testuser | xargs sudo kill -9
-# 	DISPLAY=:10 sudo -i -u testuser -- sh -c "cd $BUILD_SOURCESDIRECTORY/test/smoke && ./node_modules/.bin/mocha --build $AGENT_BUILDDIRECTORY/VSCode-linux-$ARCH --log $ARTIFACTS"
-# 	# DISPLAY=:10 sudo -i -u testuser -- sh -c "cd /vso/work/1/s/test/smoke && ./node_modules/.bin/mocha --build /vso/work/1/VSCode-linux-ia32"
-# }
-
-# step "Run smoke test" \
-# 	smoketest
-
-step "Publish release" \
-	./build/tfs/linux/release.sh

build/tfs/linux/continuous-build-linux.yml

@@ -0,0 +1,44 @@
+steps:
+- script: |
+    set -e
+    apt-get update
+    apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 libgconf-2-4 dbus xvfb libgtk-3-0
+    cp build/tfs/linux/x64/xvfb.init /etc/init.d/xvfb
+    chmod +x /etc/init.d/xvfb
+    update-rc.d xvfb defaults
+    ln -sf /bin/dbus-daemon /usr/bin/dbus-daemon
+    service xvfb start
+    service dbus start
+- task: NodeTool@0
+  inputs:
+    versionSpec: "8.9.1"
+- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
+  inputs:
+    versionSpec: "1.3.2"
+- script: |
+    yarn
+  displayName: Install Dependencies
+- script: |
+    yarn gulp electron-x64
+  displayName: Download Electron
+- script: |
+    yarn gulp hygiene
+  displayName: Run Hygiene Checks
+- script: |
+    yarn check-monaco-editor-compilation
+  displayName: Run Monaco Editor Checks
+- script: |
+    yarn compile
+  displayName: Compile Sources
+- script: |
+    yarn download-builtin-extensions
+  displayName: Download Built-in Extensions
+- script: |
+    DISPLAY=:10 ./scripts/test.sh --tfs "Unit Tests"
+  displayName: Run Unit Tests
+- task: PublishTestResults@2
+  displayName: Publish Tests Results
+  inputs:
+    testResultsFiles: '*-results.xml'
+    searchFolder: '$(Build.ArtifactStagingDirectory)/test-results'
+  condition: succeededOrFailed()

build/tfs/linux/frozen-check.ts

@@ -39,4 +39,11 @@ function getConfig(quality: string): Promise<Config> {
 }
 
 getConfig(process.argv[2])
-	.then(c => console.log(c.frozen), e => console.error(e));
+	.then(config => {
+		console.log(config.frozen);
+		process.exit(0);
+	})
+	.catch(err => {
+		console.error(err);
+		process.exit(1);
+	});

build/tfs/linux/product-build-linux.yml

@@ -0,0 +1,118 @@
+steps:
+- task: NodeTool@0
+  inputs:
+    versionSpec: "8.9.1"
+
+- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
+  inputs:
+    versionSpec: "1.3.2"
+
+- script: |
+    set -e
+    export npm_config_arch="$(VSCODE_ARCH)"
+    if [[ "$(VSCODE_ARCH)" == "ia32" ]]; then
+      export PKG_CONFIG_PATH="/usr/lib/i386-linux-gnu/pkgconfig"
+    fi
+
+    echo "machine monacotools.visualstudio.com password $(VSO_PAT)" > ~/.netrc
+    yarn
+    npm run gulp -- hygiene
+    npm run monaco-compile-check
+    VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" npm run gulp -- mixin
+    node build/tfs/common/installDistro.js
+    node build/lib/builtInExtensions.js
+
+- script: |
+    set -e
+    VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" npm run gulp -- vscode-linux-$(VSCODE_ARCH)-min
+  name: build
+
+- script: |
+    set -e
+    npm run gulp -- "electron-$(VSCODE_ARCH)"
+    DISPLAY=:10 ./scripts/test.sh --build --tfs "Unit Tests"
+    # yarn smoketest -- --build "$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)"
+  name: test
+
+- script: |
+    set -e
+    REPO="$(pwd)"
+    ROOT="$REPO/.."
+    ARCH="$(VSCODE_ARCH)"
+
+    # Publish tarball
+    PLATFORM_LINUX="linux-$(VSCODE_ARCH)"
+    [[ "$ARCH" == "ia32" ]] && DEB_ARCH="i386" || DEB_ARCH="amd64"
+    [[ "$ARCH" == "ia32" ]] && RPM_ARCH="i386" || RPM_ARCH="x86_64"
+    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)
+
+    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/tfs/common/publish.js "$VSCODE_QUALITY" "$PLATFORM_LINUX" archive-unsigned "$TARBALL_FILENAME" "$VERSION" true "$TARBALL_PATH"
+
+    # Publish hockeyapp symbols
+    node build/tfs/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/tfs/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/tfs/common/publish.js "$VSCODE_QUALITY" "$PLATFORM_RPM" package "$RPM_FILENAME" "$VERSION" true "$RPM_PATH"
+
+    # SNAP_FILENAME="$(ls $REPO/.build/linux/snap/$ARCH/ | grep .snap)"
+    # SNAP_PATH="$REPO/.build/linux/snap/$ARCH/$SNAP_FILENAME"
+
+    # Publish to MS repo
+    IS_FROZEN="$(AZURE_DOCUMENTDB_MASTERKEY="$(AZURE_DOCUMENTDB_MASTERKEY)" node build/tfs/linux/frozen-check.js $VSCODE_QUALITY)"
+
+    if [ -z "$VSCODE_QUALITY" ]; then
+      echo "VSCODE_QUALITY is not set, skipping repo package publish"
+    elif [ "$IS_FROZEN" = "true" ]; then
+      echo "$VSCODE_QUALITY is frozen, skipping repo package publish"
+    else
+      if [ "$BUILD_SOURCEBRANCH" = "master" ] || [ "$BUILD_SOURCEBRANCH" = "refs/heads/master" ] || [ "$VSCODE_PUBLISH_LINUX" = "true" ]; then
+        if [[ $BUILD_QUEUEDBY = *"Project Collection Service Accounts"* || $BUILD_QUEUEDBY = *"Microsoft.VisualStudio.Services.TFS"* ]]; then
+          # Write config files needed by API, use eval to force environment variable expansion
+          pushd build/tfs/linux
+          # Submit to apt repo
+          # if [ "$DEB_ARCH" = "amd64" ]; then
+            # echo "{ \"server\": \"azure-apt-cat.cloudapp.net\", \"protocol\": \"https\", \"port\": \"443\", \"repositoryId\": \"58a4adf642421134a1a48d1a\", \"username\": \"vscode\", \"password\": \"$(LINUX_REPO_PASSWORD)\" }" > apt-config.json
+            # ./repoapi_client.sh -config apt-config.json -addfile $DEB_PATH
+          # fi
+          # Submit to yum repo (disabled as it's manual until signing is automated)
+          # eval echo '{ \"server\": \"azure-apt-cat.cloudapp.net\", \"protocol\": \"https\", \"port\": \"443\", \"repositoryId\": \"58a4ae3542421134a1a48d1b\", \"username\": \"vscode\", \"password\": \"$(LINUX_REPO_PASSWORD)\" }' > yum-config.json
+
+          # ./repoapi_client.sh -config yum-config.json -addfile $RPM_PATH
+          popd
+          echo "To check repo publish status run ./repoapi_client.sh -config config.json -check <id>"
+        fi
+      fi
+    fi

build/tfs/linux/release.sh

@@ -1,81 +0,0 @@
-#!/bin/bash
-
-. ./scripts/env.sh
-. ./build/tfs/common/common.sh
-
-step "Build Debian package" \
-	npm run gulp -- "vscode-linux-$ARCH-build-deb"
-
-step "Build RPM package" \
-	npm run gulp -- "vscode-linux-$ARCH-build-rpm"
-
-# step "Build snap package" \
-# 	npm run gulp -- "vscode-linux-$ARCH-build-snap"
-
-# Variables
-PLATFORM_LINUX="linux-$ARCH"
-PLATFORM_DEB="linux-deb-$ARCH"
-PLATFORM_RPM="linux-rpm-$ARCH"
-[[ "$ARCH" == "ia32" ]] && DEB_ARCH="i386" || DEB_ARCH="amd64"
-[[ "$ARCH" == "ia32" ]] && RPM_ARCH="i386" || RPM_ARCH="x86_64"
-REPO="`pwd`"
-ROOT="$REPO/.."
-BUILDNAME="VSCode-$PLATFORM_LINUX"
-BUILD="$ROOT/$BUILDNAME"
-BUILD_VERSION="$(ls $REPO/.build/linux/deb/$DEB_ARCH/deb/ | sed -e 's/code-[a-z]*_//g' -e 's/\.deb$//g')"
-[ -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 && \
-	step "Create tar.gz archive" \
-	tar -czf $TARBALL_PATH $BUILDNAME)
-
-step "Publish tar.gz archive" \
-	node build/tfs/common/publish.js $VSCODE_QUALITY $PLATFORM_LINUX archive-unsigned $TARBALL_FILENAME $VERSION true $TARBALL_PATH
-
-DEB_FILENAME="$(ls $REPO/.build/linux/deb/$DEB_ARCH/deb/)"
-DEB_PATH="$REPO/.build/linux/deb/$DEB_ARCH/deb/$DEB_FILENAME"
-
-step "Publish Debian package" \
-	node build/tfs/common/publish.js $VSCODE_QUALITY $PLATFORM_DEB package $DEB_FILENAME $VERSION true $DEB_PATH
-
-RPM_FILENAME="$(ls $REPO/.build/linux/rpm/$RPM_ARCH/ | grep .rpm)"
-RPM_PATH="$REPO/.build/linux/rpm/$RPM_ARCH/$RPM_FILENAME"
-
-step "Publish RPM package" \
-	node build/tfs/common/publish.js $VSCODE_QUALITY $PLATFORM_RPM package $RPM_FILENAME $VERSION true $RPM_PATH
-
-# SNAP_FILENAME="$(ls $REPO/.build/linux/snap/$ARCH/ | grep .snap)"
-# SNAP_PATH="$REPO/.build/linux/snap/$ARCH/$SNAP_FILENAME"
-
-IS_FROZEN="$(node build/tfs/linux/frozen-check.js $VSCODE_QUALITY)"
-
-if [ -z "$VSCODE_QUALITY" ]; then
-	echo "VSCODE_QUALITY is not set, skipping repo package publish"
-elif [ "$IS_FROZEN" = "true" ]; then
-	echo "$VSCODE_QUALITY is frozen, skipping repo package publish"
-else
-	if [ "$BUILD_SOURCEBRANCH" = "master" ] || [ "$BUILD_SOURCEBRANCH" = "refs/heads/master" ]; then
-		if [[ $BUILD_QUEUEDBY = *"Project Collection Service Accounts"* || $BUILD_QUEUEDBY = *"Microsoft.VisualStudio.Services.TFS"* ]]; then
-			# Write config files needed by API, use eval to force environment variable expansion
-			DIRNAME=$(dirname $(readlink -f $0))
-			pushd $DIRNAME
-			# Submit to apt repo
-			if [ "$DEB_ARCH" = "amd64" ]; then
-				eval echo '{ \"server\": \"azure-apt-cat.cloudapp.net\", \"protocol\": \"https\", \"port\": \"443\", \"repositoryId\": \"58a4adf642421134a1a48d1a\", \"username\": \"$LINUX_REPO_USERNAME\", \"password\": \"$LINUX_REPO_PASSWORD\" }' > apt-config.json
-
-				step "Publish to repositories" \
-					./repoapi_client.sh -config apt-config.json -addfile $DEB_PATH
-			fi
-			# Submit to yum repo (disabled as it's manual until signing is automated)
-			# eval echo '{ \"server\": \"azure-apt-cat.cloudapp.net\", \"protocol\": \"https\", \"port\": \"443\", \"repositoryId\": \"58a4ae3542421134a1a48d1b\", \"username\": \"$LINUX_REPO_USERNAME\", \"password\": \"$LINUX_REPO_PASSWORD\" }' > yum-config.json
-
-			# ./repoapi_client.sh -config yum-config.json -addfile $RPM_PATH
-			popd
-			echo "To check repo publish status run ./repoapi_client.sh -config config.json -check <id>"
-		fi
-	fi
-fi

build/tfs/product-build.yml

@@ -0,0 +1,38 @@
+phases:
+- phase: Windows
+  condition: eq(variables['VSCODE_BUILD_WIN32'], 'true')
+  queue: Hosted VS2017
+  variables:
+    VSCODE_ARCH: x64
+  steps:
+  - template: win32/product-build-win32.yml
+
+- phase: Windows32
+  condition: eq(variables['VSCODE_BUILD_WIN32_32BIT'], 'true')
+  queue: Hosted VS2017
+  variables:
+    VSCODE_ARCH: ia32
+  steps:
+  - template: win32/product-build-win32.yml
+
+- phase: Linux
+  condition: eq(variables['VSCODE_BUILD_LINUX'], 'true')
+  queue: linux-x64
+  variables:
+    VSCODE_ARCH: x64
+  steps:
+  - template: linux/product-build-linux.yml
+
+- phase: Linux32
+  condition: eq(variables['VSCODE_BUILD_LINUX_32BIT'], 'true')
+  queue: linux-ia32
+  variables:
+    VSCODE_ARCH: ia32
+  steps:
+  - template: linux/product-build-linux.yml
+
+- phase: macOS
+  condition: eq(variables['VSCODE_BUILD_MACOS'], 'true')
+  queue: Hosted macOS Preview
+  steps:
+  - template: darwin/product-build-darwin.yml

build/tfs/win32/1_build.ps1

@@ -1,71 +0,0 @@
-Param(
-  [string]$arch,
-  [string]$mixinPassword,
-  [string]$vsoPAT
-)
-
-. .\build\tfs\win32\node.ps1
-. .\scripts\env.ps1
-. .\build\tfs\win32\lib.ps1
-
-# Create a _netrc file to download distro dependencies
-# In order to get _netrc to work, we need a HOME variable setup
-"machine monacotools.visualstudio.com password ${vsoPAT}" | Out-File "$env:HOME\_netrc" -Encoding ASCII
-
-# Set the right architecture
-$env:npm_config_arch="$arch"
-$env:CHILD_CONCURRENCY="1"
-
-step "Install dependencies" {
-  exec { & yarn }
-}
-
-step "Hygiene" {
-  exec { & npm run gulp -- hygiene }
-}
-
-step "Monaco Editor Check" {
-	exec { & .\node_modules\.bin\tsc -p .\src\tsconfig.monaco.json --noEmit }
-}
-
-$env:VSCODE_MIXIN_PASSWORD = $mixinPassword
-step "Mix in repository from vscode-distro" {
-  exec { & npm run gulp -- mixin }
-}
-
-step "Get Electron" {
-  exec { & npm run gulp -- "electron-$global:arch" }
-}
-
-step "Install distro dependencies" {
-  exec { & node build\tfs\common\installDistro.js }
-}
-
-step "Build minified" {
-  exec { & npm run gulp -- "vscode-win32-$global:arch-min" }
-}
-
-step "Copy Inno updater" {
-  exec { & npm run gulp -- "vscode-win32-$global:arch-copy-inno-updater" }
-}
-
-# step "Create loader snapshot" {
-#   exec { & 	node build\lib\snapshotLoader.js --arch=$global:arch }
-# }
-
-step "Run unit tests" {
-  exec { & .\scripts\test.bat --build --reporter dot }
-}
-
-# step "Run integration tests" {
-#   exec { & .\scripts\test-integration.bat }
-# }
-
-# step "Run smoke test" {
-# 	$Artifacts = "$env:AGENT_BUILDDIRECTORY\smoketest-artifacts"
-# 	Remove-Item -Recurse -Force -ErrorAction Ignore $Artifacts
-
-# 	exec { & npm run smoketest -- --build "$env:AGENT_BUILDDIRECTORY\VSCode-win32-$global:arch" --log "$Artifacts" }
-# }
-
-done

build/tfs/win32/2_package.ps1

@@ -1,12 +0,0 @@
-Param(
-  [string]$arch
-)
-
-. .\build\tfs\win32\node.ps1
-. .\build\tfs\win32\lib.ps1
-
-step "Create archive and setup package" {
-	exec { & npm run gulp -- "vscode-win32-$global:arch-archive" "vscode-win32-$global:arch-setup" }
-}
-
-done

build/tfs/win32/3_upload.ps1

@@ -1,35 +0,0 @@
-Param(
-   [string]$arch,
-   [string]$storageKey,
-   [string]$mooncakeStorageKey,
-	 [string]$documentDbKey
-)
-
-. .\build\tfs\win32\node.ps1
-. .\build\tfs\win32\lib.ps1
-
-$Repo = "$(pwd)"
-$Root = "$Repo\.."
-$Exe = "$Repo\.build\win32-$arch\setup\VSCodeSetup.exe"
-$Zip = "$Repo\.build\win32-$arch\archive\VSCode-win32-$arch.zip"
-$Build = "$Root\VSCode-win32-$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 = $storageKey
-$env:MOONCAKE_STORAGE_ACCESS_KEY = $mooncakeStorageKey
-$env:AZURE_DOCUMENTDB_MASTERKEY = $documentDbKey
-
-$assetPlatform = if ($arch -eq "ia32") { "win32" } else { "win32-x64" }
-
-step "Publish archive" {
-  exec { & node build/tfs/common/publish.js $Quality "$global:assetPlatform-archive" archive "VSCode-win32-$global:arch-$Version.zip" $Version true $Zip }
-}
-
-step "Publish setup package" {
-  exec { & node build/tfs/common/publish.js $Quality "$global:assetPlatform" setup "VSCodeSetup-$global:arch-$Version.exe" $Version true $Exe }
-}
-
-done

build/tfs/win32/ESRPClient/NuGet.config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <packageSources>
+        <add key="ESRP" value="https://microsoft.pkgs.visualstudio.com/_packaging/ESRP/nuget/v3/index.json" />
+    </packageSources>
+</configuration>

build/tfs/win32/ESRPClient/packages.config

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

build/tfs/win32/build_unsigned.ps1

@@ -1,86 +0,0 @@
-Param(
-  [string]$arch,
-  [string]$mixinPassword,
-  [string]$vsoPAT,
-	[string]$storageKey,
-	[string]$mooncakeStorageKey,
-	[string]$documentDbKey
-)
-
-. .\build\tfs\win32\node.ps1
-. .\scripts\env.ps1
-. .\build\tfs\win32\lib.ps1
-
-# Create a _netrc file to download distro dependencies
-# In order to get _netrc to work, we need a HOME variable setup
-"machine monacotools.visualstudio.com password ${vsoPAT}" | Out-File "$env:HOME\_netrc" -Encoding ASCII
-
-# Set the right architecture
-$env:npm_config_arch="$arch"
-$env:CHILD_CONCURRENCY="1"
-
-step "Install dependencies" {
-  exec { & yarn }
-}
-
-step "Hygiene" {
-  exec { & npm run gulp -- hygiene }
-}
-
-$env:VSCODE_MIXIN_PASSWORD = $mixinPassword
-step "Mix in repository from vscode-distro" {
-  exec { & npm run gulp -- mixin }
-}
-
-step "Get Electron" {
-  exec { & npm run gulp -- "electron-$global:arch" }
-}
-
-step "Install distro dependencies" {
-  exec { & node build\tfs\common\installDistro.js }
-}
-
-step "Build minified" {
-  exec { & npm run gulp -- "vscode-win32-$global:arch-min" }
-}
-
-step "Run unit tests" {
-  exec { & .\scripts\test.bat --build --reporter dot }
-}
-
-step "Run smoke test" {
-	$Artifacts = "$env:AGENT_BUILDDIRECTORY\smoketest-artifacts"
-	Remove-Item -Recurse -Force -ErrorAction Ignore $Artifacts
-
-	exec { & npm run smoketest -- --build "$env:AGENT_BUILDDIRECTORY\VSCode-win32-$global:arch" --log "$Artifacts" }
-}
-
-step "Create archive and setup package" {
-	exec { & npm run gulp -- "vscode-win32-$global:arch-archive" "vscode-win32-$global:arch-setup" }
-}
-
-$Repo = "$(pwd)"
-$Root = "$Repo\.."
-$Exe = "$Repo\.build\win32-$arch\setup\VSCodeSetup.exe"
-$Zip = "$Repo\.build\win32-$arch\archive\VSCode-win32-$arch.zip"
-$Build = "$Root\VSCode-win32-$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 = $storageKey
-$env:MOONCAKE_STORAGE_ACCESS_KEY = $mooncakeStorageKey
-$env:AZURE_DOCUMENTDB_MASTERKEY = $documentDbKey
-
-$assetPlatform = if ($arch -eq "ia32") { "win32" } else { "win32-x64" }
-
-step "Publish UNSIGNED archive" {
-  exec { & node build/tfs/common/publish.js $Quality "$global:assetPlatform-archive" archive-unsigned "VSCode-win32-$global:arch-$Version-unsigned.zip" $Version false $Zip }
-}
-
-step "Publish UNSIGNED setup package" {
-  exec { & node build/tfs/common/publish.js $Quality "$global:assetPlatform" setup-unsigned "VSCodeSetup-$global:arch-$Version-unsigned.exe" $Version false $Exe }
-}
-
-done

build/tfs/win32/continuous-build-win32.yml

@@ -0,0 +1,66 @@
+steps:
+- task: NodeTool@0
+  inputs:
+    versionSpec: "8.9.1"
+- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
+  inputs:
+    versionSpec: "1.3.2"
+- powershell: |
+    . build/tfs/win32/exec.ps1
+    $ErrorActionPreference = "Stop"
+    exec { yarn }
+  displayName: Install Dependencies
+- powershell: |
+    . build/tfs/win32/exec.ps1
+    $ErrorActionPreference = "Stop"
+    exec { yarn gulp electron }
+  displayName: Download Electron
+- powershell: |
+    . build/tfs/win32/exec.ps1
+    $ErrorActionPreference = "Stop"
+    exec { yarn gulp hygiene }
+  displayName: Run Hygiene Checks
+- powershell: |
+    . build/tfs/win32/exec.ps1
+    $ErrorActionPreference = "Stop"
+    exec { yarn check-monaco-editor-compilation }
+  displayName: Run Monaco Editor Checks
+- powershell: |
+    . build/tfs/win32/exec.ps1
+    $ErrorActionPreference = "Stop"
+    exec { yarn compile }
+  displayName: Compile Sources
+- powershell: |
+    . build/tfs/win32/exec.ps1
+    $ErrorActionPreference = "Stop"
+    exec { yarn download-builtin-extensions }
+  displayName: Download Built-in Extensions
+- powershell: |
+    . build/tfs/win32/exec.ps1
+    $ErrorActionPreference = "Stop"
+    exec { .\scripts\test.bat --tfs "Unit Tests" }
+  displayName: Run Unit Tests
+- powershell: |
+    . build/tfs/win32/exec.ps1
+    $ErrorActionPreference = "Stop"
+    exec { .\scripts\test-integration.bat --tfs "Integration Tests" }
+  displayName: Run Integration Tests
+- powershell: |
+    . build/tfs/win32/exec.ps1
+    $ErrorActionPreference = "Stop"
+    exec { yarn smoketest --screenshots "$(Build.ArtifactStagingDirectory)\artifacts" --log "$(Build.ArtifactStagingDirectory)\artifacts\smoketest.log" }
+  displayName: Run Smoke Tests
+  continueOnError: true
+- task: PublishBuildArtifacts@1
+  displayName: Publish Smoketest Artifacts
+  inputs:
+    PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts'
+    ArtifactName: build-artifacts-win32
+    publishLocation: Container
+  condition: eq(variables['System.PullRequest.IsFork'], 'False')
+- task: PublishTestResults@2
+  displayName: Publish Tests Results
+  inputs:
+    testResultsFiles: '*-results.xml'
+    searchFolder: '$(Build.ArtifactStagingDirectory)/test-results'
+  condition: succeededOrFailed()

build/tfs/win32/exec.ps1

@@ -0,0 +1,24 @@
+# Taken from psake https://github.com/psake/psake
+
+<#
+.SYNOPSIS
+  This is a helper function that runs a scriptblock and checks the PS variable $lastexitcode
+  to see if an error occcured. If an error is detected then an exception is thrown.
+  This function allows you to run command-line programs without having to
+  explicitly check the $lastexitcode variable.
+
+.EXAMPLE
+  exec { svn info $repository_trunk } "Error executing SVN. Please verify SVN command-line client is installed"
+#>
+function Exec
+{
+	[CmdletBinding()]
+	param(
+		[Parameter(Position=0,Mandatory=1)][scriptblock]$cmd,
+		[Parameter(Position=1,Mandatory=0)][string]$errorMessage = ($msgs.error_bad_command -f $cmd)
+	)
+	& $cmd
+	if ($lastexitcode -ne 0) {
+		throw ("Exec: " + $errorMessage)
+	}
+}

build/tfs/win32/import-esrp-auth-cert.ps1

@@ -0,0 +1,14 @@
+Param(
+  [string]$AuthCertificateBase64,
+  [string]$AuthCertificateKey
+)
+
+# Import auth certificate
+$AuthCertificateFileName = [System.IO.Path]::GetTempFileName()
+$AuthCertificateBytes = [Convert]::FromBase64String($AuthCertificateBase64)
+[IO.File]::WriteAllBytes($AuthCertificateFileName, $AuthCertificateBytes)
+$AuthCertificate = Import-PfxCertificate -FilePath $AuthCertificateFileName -CertStoreLocation Cert:\LocalMachine\My -Password (ConvertTo-SecureString $AuthCertificateKey -AsPlainText -Force)
+rm $AuthCertificateFileName
+$ESRPAuthCertificateSubjectName = $AuthCertificate.Subject
+
+Write-Output ("##vso[task.setvariable variable=ESRPAuthCertificateSubjectName;]$ESRPAuthCertificateSubjectName")

build/tfs/win32/lib.ps1

@@ -1,48 +0,0 @@
-# stop when there's an error
-$ErrorActionPreference = 'Stop'
-
-$env:HOME=$env:USERPROFILE
-
-if (Test-Path env:AGENT_WORKFOLDER) {
-	$env:HOME="${env:AGENT_WORKFOLDER}\home"
-	$env:npm_config_cache="${env:HOME}\npm-cache"
-	$env:YARN_CACHE_FOLDER="${env:HOME}\yarn-cache"
-	$env:npm_config_devdir="${env:HOME}\npm-devdir"
-	New-Item -Path "$env:HOME" -Type directory -Force | out-null
-	New-Item -Path "$env:npm_config_cache" -Type directory -Force | out-null
-}
-
-# throw when a process exits with something other than 0
-function exec([scriptblock]$cmd, [string]$errorMessage = "Error executing command: " + $cmd) {
-	& $cmd
-	if ($LastExitCode -ne 0) {
-		throw $errorMessage
-	}
-}
-
-$Summary = @()
-function step($Task, $Step) {
-	echo ""
-	echo "*****************************************************************************"
-	echo "Start: $Task"
-	echo "*****************************************************************************"
-	echo ""
-
-	$Stopwatch = [Diagnostics.Stopwatch]::StartNew()
-	Invoke-Command $Step
-	$Stopwatch.Stop()
-	$Formatted = "{0:g}" -f $Stopwatch.Elapsed
-
-	echo "*****************************************************************************"
-	echo "End: $Task, Total: $Formatted"
-	echo "*****************************************************************************"
-
-	$global:Summary += @{ "$Task" = $Formatted }
-}
-
-function done() {
-	echo ""
-	echo "Build Summary"
-	echo "============="
-	$global:Summary | Format-Table @{L="Task";E={$_.Name}}, @{L="Duration";E={$_.Value}}
-}

build/tfs/win32/node.ps1

@@ -1,7 +0,0 @@
-# install node
-$env:Path = $env:NVM_HOME + ";" + $env:NVM_SYMLINK + ";" + $env:Path
-$NodeVersion = "8.9.1"
-# nvm install $NodeVersion
-# nvm use $NodeVersion
-# npm install -g yarn
-$env:Path = $env:NVM_HOME + "\v" + $NodeVersion + ";" + $env:Path

build/tfs/win32/product-build-win32.yml

@@ -0,0 +1,166 @@
+steps:
+- task: NodeTool@0
+  inputs:
+    versionSpec: "8.9.1"
+
+- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
+  inputs:
+    versionSpec: "1.3.2"
+
+- powershell: |
+    . build/tfs/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"
+    $env:VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)"
+    exec { yarn }
+    exec { npm run gulp -- hygiene }
+    exec { npm run monaco-compile-check }
+    exec { npm run gulp -- mixin }
+    exec { node build/tfs/common/installDistro.js }
+    exec { node build/lib/builtInExtensions.js }
+
+- powershell: |
+    . build/tfs/win32/exec.ps1
+    $ErrorActionPreference = "Stop"
+    $env:VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)"
+    exec { npm run gulp -- "vscode-win32-$(VSCODE_ARCH)-min" }
+    exec { npm run gulp -- "vscode-win32-$(VSCODE_ARCH)-copy-inno-updater" }
+  name: build
+
+- powershell: |
+    . build/tfs/win32/exec.ps1
+    $ErrorActionPreference = "Stop"
+    exec { npm run gulp -- "electron-$(VSCODE_ARCH)" }
+    exec { .\scripts\test.bat --build --tfs "Unit Tests" }
+    # yarn smoketest -- --build "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"
+  name: test
+
+- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+  inputs:
+    ConnectedServiceName: 'ESRP CodeSign'
+    FolderPath: '$(agent.builddirectory)/VSCode-win32-$(VSCODE_ARCH)'
+    Pattern: '*.dll,*.exe,*.node'
+    signConfigType: inlineSignParams
+    inlineOperation: |
+      [
+        {
+          "keyCode": "CP-229803",
+          "operationSetCode": "SigntoolSign",
+          "parameters": [
+            {
+              "parameterName": "OpusName",
+              "parameterValue": "VS Code"
+            },
+            {
+              "parameterName": "OpusInfo",
+              "parameterValue": "https://code.visualstudio.com/"
+            },
+            {
+              "parameterName": "PageHash",
+              "parameterValue": "/NPH"
+            },
+            {
+              "parameterName": "TimeStamp",
+              "parameterValue": "/t \"http://ts4096.gtm.microsoft.com/TSS/AuthenticodeTS\""
+            }
+          ],
+          "toolName": "sign",
+          "toolVersion": "1.0"
+        },
+        {
+          "keyCode": "CP-230012",
+          "operationSetCode": "SigntoolSign",
+          "parameters": [
+            {
+              "parameterName": "OpusName",
+              "parameterValue": "VS Code"
+            },
+            {
+              "parameterName": "OpusInfo",
+              "parameterValue": "https://code.visualstudio.com/"
+            },
+            {
+              "parameterName": "Append",
+              "parameterValue": "/as"
+            },
+            {
+              "parameterName": "FileDigest",
+              "parameterValue": "/fd \"SHA256\""
+            },
+            {
+              "parameterName": "PageHash",
+              "parameterValue": "/NPH"
+            },
+            {
+              "parameterName": "TimeStamp",
+              "parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
+            }
+          ],
+          "toolName": "sign",
+          "toolVersion": "1.0"
+        },
+        {
+          "keyCode": "CP-230012",
+          "operationSetCode": "SigntoolVerify",
+          "parameters": [
+            {
+              "parameterName": "VerifyAll",
+              "parameterValue": "/all"
+            }
+          ],
+          "toolName": "sign",
+          "toolVersion": "1.0"
+        }
+      ]
+    SessionTimeout: 120
+
+- task: NuGetCommand@2
+  displayName: Install ESRPClient.exe
+  inputs:
+    restoreSolution: 'build\tfs\win32\ESRPClient\packages.config'
+    feedsToUse: config
+    nugetConfigPath: 'build\tfs\win32\ESRPClient\NuGet.config'
+    externalFeedCredentials: 3fc0b7f7-da09-4ae7-a9c8-d69824b1819b
+    restoreDirectory: packages
+
+- task: ESRPImportCertTask@1
+  displayName: Import ESRP Request Signing Certificate
+  inputs:
+    ESRP: 'ESRP CodeSign'
+
+- powershell: |
+    $ErrorActionPreference = "Stop"
+    .\build\tfs\win32\import-esrp-auth-cert.ps1 -AuthCertificateBase64 $(ESRP_AUTH_CERTIFICATE) -AuthCertificateKey $(ESRP_AUTH_CERTIFICATE_KEY)
+  displayName: Import ESRP Auth Certificate
+
+- powershell: |
+    . build/tfs/win32/exec.ps1
+    $ErrorActionPreference = "Stop"
+    exec { npm run gulp -- "vscode-win32-$(VSCODE_ARCH)-archive" "vscode-win32-$(VSCODE_ARCH)-system-setup" "vscode-win32-$(VSCODE_ARCH)-user-setup" }
+
+    $Repo = "$(pwd)"
+    $Root = "$Repo\.."
+    $SystemExe = "$Repo\.build\win32-$(VSCODE_ARCH)\system-setup\VSCodeSetup.exe"
+    $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/tfs/common/publish.js $Quality "$global:assetPlatform-archive" archive "VSCode-win32-$(VSCODE_ARCH)-$Version.zip" $Version true $Zip }
+    exec { node build/tfs/common/publish.js $Quality "$global:assetPlatform" setup "VSCodeSetup-$(VSCODE_ARCH)-$Version.exe" $Version true $SystemExe }
+    exec { node build/tfs/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/tfs/common/symbols.js "$(VSCODE_MIXIN_PASSWORD)" "$(VSCODE_HOCKEYAPP_TOKEN)" "$(VSCODE_ARCH)" $hockeyAppId }

build/tfs/win32/sign.ps1

@@ -0,0 +1,82 @@
+function Create-TmpJson($Obj) {
+	$FileName = [System.IO.Path]::GetTempFileName()
+	ConvertTo-Json -Depth 100 $Obj | Out-File -Encoding UTF8 $FileName
+	return $FileName
+}
+
+$Auth = Create-TmpJson @{
+	Version = "1.0.0"
+	AuthenticationType = "AAD_CERT"
+	ClientId = $env:ESRPClientId
+	AuthCert = @{
+		SubjectName = $env:ESRPAuthCertificateSubjectName
+		StoreLocation = "LocalMachine"
+		StoreName = "My"
+	}
+	RequestSigningCert = @{
+		SubjectName = $env:ESRPCertificateSubjectName
+		StoreLocation = "LocalMachine"
+		StoreName = "My"
+	}
+}
+
+$Policy = Create-TmpJson @{
+	Version = "1.0.0"
+}
+
+$Input = Create-TmpJson @{
+	Version = "1.0.0"
+	SignBatches = @(
+		@{
+			SourceLocationType = "UNC"
+			SignRequestFiles = @(
+				@{
+					SourceLocation = $args[0]
+				}
+			)
+			SigningInfo = @{
+				Operations = @(
+					@{
+						KeyCode = "CP-229803"
+						OperationCode = "SigntoolSign"
+						Parameters = @{
+							OpusName = "VS Code"
+							OpusInfo = "https://code.visualstudio.com/"
+							PageHash = "/NPH"
+							TimeStamp = "/t `"http://ts4096.gtm.microsoft.com/TSS/AuthenticodeTS`""
+						}
+						ToolName = "sign"
+						ToolVersion = "1.0"
+					},
+					@{
+						KeyCode = "CP-230012"
+						OperationCode = "SigntoolSign"
+						Parameters = @{
+							OpusName = "VS Code"
+							OpusInfo = "https://code.visualstudio.com/"
+							Append = "/as"
+							FileDigest = "/fd `"SHA256`""
+							PageHash = "/NPH"
+							TimeStamp = "/tr `"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer`" /td sha256"
+						}
+						ToolName = "sign"
+						ToolVersion = "1.0"
+					},
+					@{
+						KeyCode = "CP-230012"
+						OperationCode = "SigntoolVerify"
+						Parameters = @{
+							VerifyAll = "/all"
+						}
+						ToolName = "sign"
+						ToolVersion = "1.0"
+					}
+				)
+			}
+		}
+	)
+}
+
+$Output = [System.IO.Path]::GetTempFileName()
+# $ScriptPath = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
+# & "$ScriptPath\ESRPClient\packages\EsrpClient.1.0.27\tools\ESRPClient.exe" Sign -a $Auth -p $Policy -i $Input -o $Output

build/tsconfig.json

@@ -6,8 +6,8 @@
 		"removeComments": false,
 		"preserveConstEnums": true,
 		"sourceMap": false,
+		"resolveJsonModule": true,
 		"experimentalDecorators": true,
-		"newLine": "LF",
 		// enable JavaScript type checking for the language service
 		// use the tsconfig.build.json for compiling wich disable JavaScript
 		// type checking so that JavaScript file are not transpiled

build/win32/.gitignore

@@ -0,0 +1 @@
+code-processed.iss

build/win32/OSSREADME.json

@@ -1,198 +1,10 @@
 [
 	{
-		"name": "dtolnay/isatty",
-		"version": "0.1.6",
-		"repositoryUrl": "https://github.com/dtolnay/isatty",
+		"name": "Amanieu/thread_local-rs",
+		"version": "0.3.5",
+		"repositoryUrl": "https://github.com/Amanieu/thread_local-rs",
 		"licenseDetail": [
-			"Copyright (c) 2016",
-			"",
-			"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."
-		],
-		"isProd": true
-	},
-	{
-		"name": "rust-num/num-integer",
-		"version": "0.1.35",
-		"repositoryUrl": "https://github.com/rust-num/num-integer",
-		"licenseDetail": [
-			"Copyright (c) 2014 The Rust Project Developers",
-			"",
-			"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."
-		],
-		"isProd": true
-	},
-	{
-		"name": "rust-lang-nursery/lazy-static.rs",
-		"version": "1.0.0",
-		"repositoryUrl": "https://github.com/rust-lang-nursery/lazy-static.rs",
-		"licenseDetail": [
-			"Copyright (c) 2010 The Rust Project Developers",
-			"",
-			"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."
-		],
-		"isProd": true
-	},
-	{
-		"name": "rust-lang/libc",
-		"version": "0.2.36",
-		"repositoryUrl": "https://github.com/rust-lang/libc",
-		"licenseDetail": [
-			"Copyright (c) 2014 The Rust Project Developers",
-			"",
-			"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."
-		],
-		"isProd": true
-	},
-	{
-		"name": "retep998/winapi-rs",
-		"version": "0.2.2",
-		"repositoryUrl": "https://github.com/retep998/winapi-rs",
-		"licenseDetail": [
-			"Copyright (c) 2015 The winapi-rs Developers",
-			"",
-			"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."
-		],
-		"isProd": true
-	},
-	{
-		"name": "mrhooray/crc-rs",
-		"version": "1.7.0",
-		"repositoryUrl": "https://github.com/mrhooray/crc-rs.git",
-		"licenseDetail": [
-			"MIT License",
-			"",
-			"Copyright (c) 2017 crc-rs Developers",
-			"",
-			"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."
-		],
-		"isProd": true
-	},
-	{
-		"name": "rust-num/num",
-		"version": "0.1.41",
-		"repositoryUrl": "https://github.com/rust-num/num",
-		"licenseDetail": [
-			"Copyright (c) 2014 The Rust Project Developers",
+			"Copyright (c) 2016 The Rust Project Developers",
 			"",
 			"Permission is hereby granted, free of charge, to any",
 			"person obtaining a copy of this software and associated",
@@ -225,7 +37,7 @@
 		"version": "1.2.1",
 		"repositoryUrl": "https://github.com/BurntSushi/byteorder",
 		"licenseDetail": [
-			"The Source EULA",
+			"The MIT License (MIT)",
 			"",
 			"Copyright (c) 2015 Andrew Gallant",
 			"",
@@ -250,141 +62,13 @@
 		"isProd": true
 	},
 	{
-		"name": "rust-num/num-traits",
-		"version": "0.1.42",
-		"repositoryUrl": "https://github.com/rust-num/num-traits",
-		"licenseDetail": [
-			"Copyright (c) 2014 The Rust Project Developers",
-			"",
-			"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."
-		],
-		"isProd": true
-	},
-	{
-		"name": "slog-rs/slog",
-		"version": "2.1.1",
-		"repositoryUrl": "https://github.com/slog-rs/slog",
-		"licenseDetail": [
-			"Copyright (c) 2014 The Rust Project Developers",
-			"",
-			"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."
-		],
-		"isProd": true
-	},
-	{
-		"name": "rust-num/num-iter",
-		"version": "0.1.34",
-		"repositoryUrl": "https://github.com/rust-num/num-iter",
-		"licenseDetail": [
-			"Copyright (c) 2014 The Rust Project Developers",
-			"",
-			"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."
-		],
-		"isProd": true
-	},
-	{
-		"name": "vitiral/build_const",
+		"name": "Sgeo/take_mut",
 		"version": "0.2.0",
-		"repositoryUrl": "https://github.com/vitiral/build_const",
+		"repositoryUrl": "https://github.com/Sgeo/take_mut",
 		"licenseDetail": [
-			"The Source EULA",
+			"The MIT License (MIT)",
 			"",
-			"Copyright (c) 2017 Garrett Berg, vitiral@gmail.com",
-			"",
-			"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."
-		],
-		"isProd": true
-	},
-	{
-		"name": "redox-os/termios",
-		"version": "0.1.1",
-		"repositoryUrl": "https://github.com/redox-os/termios",
-		"licenseDetail": [
-			"MIT License",
-			"",
-			"Copyright (c) 2017 Redox OS",
+			"Copyright (c) 2016 Sgeo",
 			"",
 			"Permission is hereby granted, free of charge, to any person obtaining a copy",
 			"of this software and associated documentation files (the \"Software\"), to deal",
@@ -406,36 +90,6 @@
 		],
 		"isProd": true
 	},
-	{
-		"name": "redox-os/syscall",
-		"version": "0.1.37",
-		"repositoryUrl": "https://github.com/redox-os/syscall",
-		"licenseDetail": [
-			"Copyright (c) 2017 Redox OS Developers",
-			"",
-			"MIT License",
-			"",
-			"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."
-		],
-		"isProd": true
-	},
 	{
 		"name": "Stebalien/term",
 		"version": "0.4.6",
@@ -474,7 +128,7 @@
 		"version": "0.4.0",
 		"repositoryUrl": "https://github.com/chronotope/chrono",
 		"licenseDetail": [
-			"Rust-chrono is dual-licensed under The Source EULA [1] and",
+			"Rust-chrono is dual-licensed under The MIT License [1] and",
 			"Apache 2.0 License [2]. Copyright (c) 2014--2017, Kang Seonghoon and",
 			"contributors.",
 			"",
@@ -484,7 +138,7 @@
 			"[1]: <http://opensource.org/licenses/MIT>, which is reproduced below:",
 			"",
 			"~~~~",
-			"The Source EULA",
+			"The MIT License (MIT)",
 			"",
 			"Copyright (c) 2014, Kang Seonghoon.",
 			"",
@@ -717,11 +371,11 @@
 		"isProd": true
 	},
 	{
-		"name": "Amanieu/thread_local-rs",
-		"version": "0.3.5",
-		"repositoryUrl": "https://github.com/Amanieu/thread_local-rs",
+		"name": "dtolnay/isatty",
+		"version": "0.1.6",
+		"repositoryUrl": "https://github.com/dtolnay/isatty",
 		"licenseDetail": [
-			"Copyright (c) 2016 The Rust Project Developers",
+			"Copyright (c) 2016",
 			"",
 			"Permission is hereby granted, free of charge, to any",
 			"person obtaining a copy of this software and associated",
@@ -750,13 +404,13 @@
 		"isProd": true
 	},
 	{
-		"name": "Sgeo/take_mut",
-		"version": "0.2.0",
-		"repositoryUrl": "https://github.com/Sgeo/take_mut",
+		"name": "mrhooray/crc-rs",
+		"version": "1.7.0",
+		"repositoryUrl": "https://github.com/mrhooray/crc-rs.git",
 		"licenseDetail": [
-			"The Source EULA",
+			"MIT License",
 			"",
-			"Copyright (c) 2016 Sgeo",
+			"Copyright (c) 2017 crc-rs Developers",
 			"",
 			"Permission is hereby granted, free of charge, to any person obtaining a copy",
 			"of this software and associated documentation files (the \"Software\"), to deal",
@@ -779,11 +433,43 @@
 		"isProd": true
 	},
 	{
-		"name": "reem/rust-void",
-		"version": "1.0.2",
-		"repositoryUrl": "https://github.com/reem/rust-void.git",
+		"name": "redox-os/syscall",
+		"version": "0.1.37",
+		"repositoryUrl": "https://github.com/redox-os/syscall",
 		"licenseDetail": [
-			"Copyright (c) 2015 The rust-void Developers",
+			"Copyright (c) 2017 Redox OS Developers",
+			"",
+			"MIT License",
+			"",
+			"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."
+		],
+		"isProd": true
+	},
+	{
+		"name": "redox-os/termios",
+		"version": "0.1.1",
+		"repositoryUrl": "https://github.com/redox-os/termios",
+		"licenseDetail": [
+			"MIT License",
+			"",
+			"Copyright (c) 2017 Redox OS",
 			"",
 			"Permission is hereby granted, free of charge, to any person obtaining a copy",
 			"of this software and associated documentation files (the \"Software\"), to deal",
@@ -833,46 +519,11 @@
 		"isProd": true
 	},
 	{
-		"name": "rust-lang/time",
-		"version": "0.1.39",
-		"repositoryUrl": "https://github.com/rust-lang/time",
+		"name": "reem/rust-void",
+		"version": "1.0.2",
+		"repositoryUrl": "https://github.com/reem/rust-void.git",
 		"licenseDetail": [
-			"Copyright (c) 2014 The Rust Project Developers",
-			"",
-			"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."
-		],
-		"isProd": true
-	},
-	{
-		"name": "ticki/termion",
-		"version": "1.5.1",
-		"repositoryUrl": "https://github.com/ticki/termion",
-		"licenseDetail": [
-			"The Source EULA",
-			"",
-			"Copyright (c) 2016 Ticki",
+			"Copyright (c) 2015 The rust-void Developers",
 			"",
 			"Permission is hereby granted, free of charge, to any person obtaining a copy",
 			"of this software and associated documentation files (the \"Software\"), to deal",
@@ -921,33 +572,6 @@
 		],
 		"isProd": true
 	},
-	{
-		"name": "retep998/winapi-rs",
-		"version": "0.3.4",
-		"repositoryUrl": "https://github.com/retep998/winapi-rs",
-		"licenseDetail": [
-			"Copyright (c) 2015 The winapi-rs Developers",
-			"",
-			"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."
-		],
-		"isProd": true
-	},
 	{
 		"name": "retep998/winapi-rs",
 		"version": "0.1.1",
@@ -1029,6 +653,291 @@
 		],
 		"isProd": true
 	},
+	{
+		"name": "retep998/winapi-rs",
+		"version": "0.2.2",
+		"repositoryUrl": "https://github.com/retep998/winapi-rs",
+		"licenseDetail": [
+			"Copyright (c) 2015 The winapi-rs Developers",
+			"",
+			"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."
+		],
+		"isProd": true
+	},
+	{
+		"name": "retep998/winapi-rs",
+		"version": "0.3.4",
+		"repositoryUrl": "https://github.com/retep998/winapi-rs",
+		"licenseDetail": [
+			"Copyright (c) 2015 The winapi-rs Developers",
+			"",
+			"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."
+		],
+		"isProd": true
+	},
+	{
+		"name": "rust-lang-nursery/lazy-static.rs",
+		"version": "1.0.0",
+		"repositoryUrl": "https://github.com/rust-lang-nursery/lazy-static.rs",
+		"licenseDetail": [
+			"Copyright (c) 2010 The Rust Project Developers",
+			"",
+			"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."
+		],
+		"isProd": true
+	},
+	{
+		"name": "rust-lang/libc",
+		"version": "0.2.36",
+		"repositoryUrl": "https://github.com/rust-lang/libc",
+		"licenseDetail": [
+			"Copyright (c) 2014 The Rust Project Developers",
+			"",
+			"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."
+		],
+		"isProd": true
+	},
+	{
+		"name": "rust-lang/time",
+		"version": "0.1.39",
+		"repositoryUrl": "https://github.com/rust-lang/time",
+		"licenseDetail": [
+			"Copyright (c) 2014 The Rust Project Developers",
+			"",
+			"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."
+		],
+		"isProd": true
+	},
+	{
+		"name": "rust-num/num",
+		"version": "0.1.41",
+		"repositoryUrl": "https://github.com/rust-num/num",
+		"licenseDetail": [
+			"Copyright (c) 2014 The Rust Project Developers",
+			"",
+			"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."
+		],
+		"isProd": true
+	},
+	{
+		"name": "rust-num/num-integer",
+		"version": "0.1.35",
+		"repositoryUrl": "https://github.com/rust-num/num-integer",
+		"licenseDetail": [
+			"Copyright (c) 2014 The Rust Project Developers",
+			"",
+			"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."
+		],
+		"isProd": true
+	},
+	{
+		"name": "rust-num/num-iter",
+		"version": "0.1.34",
+		"repositoryUrl": "https://github.com/rust-num/num-iter",
+		"licenseDetail": [
+			"Copyright (c) 2014 The Rust Project Developers",
+			"",
+			"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."
+		],
+		"isProd": true
+	},
+	{
+		"name": "rust-num/num-traits",
+		"version": "0.1.42",
+		"repositoryUrl": "https://github.com/rust-num/num-traits",
+		"licenseDetail": [
+			"Copyright (c) 2014 The Rust Project Developers",
+			"",
+			"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."
+		],
+		"isProd": true
+	},
 	{
 		"name": "slog-rs/async",
 		"version": "2.2.0",
@@ -1410,6 +1319,39 @@
 		],
 		"isProd": true
 	},
+	{
+		"name": "slog-rs/slog",
+		"version": "2.1.1",
+		"repositoryUrl": "https://github.com/slog-rs/slog",
+		"licenseDetail": [
+			"Copyright (c) 2014 The Rust Project Developers",
+			"",
+			"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."
+		],
+		"isProd": true
+	},
 	{
 		"name": "slog-rs/term",
 		"version": "2.3.0",
@@ -1790,5 +1732,63 @@
 			"  defined by the Mozilla Public License, v. 2.0."
 		],
 		"isProd": true
+	},
+	{
+		"name": "ticki/termion",
+		"version": "1.5.1",
+		"repositoryUrl": "https://github.com/ticki/termion",
+		"licenseDetail": [
+			"The MIT License (MIT)",
+			"",
+			"Copyright (c) 2016 Ticki",
+			"",
+			"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."
+		],
+		"isProd": true
+	},
+	{
+		"name": "vitiral/build_const",
+		"version": "0.2.0",
+		"repositoryUrl": "https://github.com/vitiral/build_const",
+		"licenseDetail": [
+			"The MIT License (MIT)",
+			"",
+			"Copyright (c) 2017 Garrett Berg, vitiral@gmail.com",
+			"",
+			"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."
+		],
+		"isProd": true
 	}
 ]

build/win32/code.iss

@@ -8,15 +8,14 @@ AppId={#AppId}
 AppName={#NameLong}
 AppVerName={#NameVersion}
 AppPublisher=Microsoft Corporation
-AppPublisherURL=https://github.com/Microsoft/sqlopsstudio
-AppSupportURL=https://github.com/Microsoft/sqlopsstudio
-AppUpdatesURL=https://github.com/Microsoft/sqlopsstudio
+AppPublisherURL=https://github.com/Microsoft/azuredatastudio
+AppSupportURL=https://github.com/Microsoft/azuredatastudio
+AppUpdatesURL=https://github.com/Microsoft/azuredatastudio
 
-DefaultDirName={pf}\{#DirName}
 DefaultGroupName={#NameLong}
 AllowNoIcons=yes
 OutputDir={#OutputDir}
-OutputBaseFilename=SqlOpsStudioSetup
+OutputBaseFilename=AzureDataStudioSetup
 Compression=lzma
 SolidCompression=yes
 AppMutex={code:GetAppMutex}
@@ -35,6 +34,13 @@ ShowLanguageDialog=auto
 ArchitecturesAllowed={#ArchitecturesAllowed}
 ArchitecturesInstallIn64BitMode={#ArchitecturesInstallIn64BitMode}
 
+#if "user" == InstallTarget
+DefaultDirName={userpf}\{#DirName}
+PrivilegesRequired=lowest
+#else
+DefaultDirName={pf}\{#DirName}
+#endif
+
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl,{#RepoDir}\build\win32\i18n\messages.en.isl" {#LocalizedLanguageFile}
 Name: "german"; MessagesFile: "compiler:Languages\German.isl,{#RepoDir}\build\win32\i18n\messages.de.isl" {#LocalizedLanguageFile("deu")}
@@ -60,16 +66,19 @@ Type: files; Name: "{app}\resources\app\Credits_45.0.2454.85.html"; Check: IsNot
 Type: filesandordirs; Name: "{app}\_"
 
 [Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: checkedonce; Check: IsNotUpdate
 Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 0,6.1
+Name: "associatewithfiles"; Description: "{cm:AssociateWithFiles,{#NameLong}}"; GroupDescription: "{cm:Other}"; Flags: unchecked
 Name: "addtopath"; Description: "{cm:AddToPath}"; GroupDescription: "{cm:Other}"
 Name: "runcode"; Description: "{cm:RunAfter,{#NameShort}}"; GroupDescription: "{cm:Other}"; Check: WizardSilent
 
 [Files]
-Source: "*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "*"; Excludes: "\tools,\tools\*,\resources\app\product.json"; DestDir: "{code:GetDestDir}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#ProductJsonPath}"; DestDir: "{code:GetDestDir}\resources\app"; Flags: ignoreversion
 
 [Icons]
 Name: "{group}\{#NameLong}"; Filename: "{app}\{#ExeBasename}.exe"; AppUserModelID: "{#AppUserId}"
-Name: "{commondesktop}\{#NameLong}"; Filename: "{app}\{#ExeBasename}.exe"; AppUserModelID: "{#AppUserId}"
+Name: "{commondesktop}\{#NameLong}"; Filename: "{app}\{#ExeBasename}.exe"; Tasks: desktopicon; AppUserModelID: "{#AppUserId}"
 Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#NameLong}"; Filename: "{app}\{#ExeBasename}.exe"; Tasks: quicklaunchicon; AppUserModelID: "{#AppUserId}"
 
 [Run]
@@ -77,11 +86,37 @@ Filename: "{app}\{#ExeBasename}.exe"; Description: "{cm:LaunchProgram,{#NameLong
 Filename: "{app}\{#ExeBasename}.exe"; Description: "{cm:LaunchProgram,{#NameLong}}"; Flags: nowait postinstall; Check: WizardNotSilent
 
 [Registry]
+#if "user" == InstallTarget
+#define SoftwareClassesRootKey "HKCU"
+#else
+#define SoftwareClassesRootKey "HKLM"
+#endif
 Root: HKCR; Subkey: "{#RegValueName}SourceFile"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,{#NameLong}}"; Flags: uninsdeletekey
 Root: HKCR; Subkey: "{#RegValueName}SourceFile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"
 Root: HKCR; Subkey: "{#RegValueName}SourceFile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""
 Root: HKCU; Subkey: "Environment"; ValueType: expandsz; ValueName: "Path"; ValueData: "{olddata};{app}\bin"; Tasks: addtopath; Check: NeedsAddPath(ExpandConstant('{app}\bin'))
 
+Root: HKCU; Subkey: "Software\Classes\.sql\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: HKCU; Subkey: "Software\Classes\.sql\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.sql"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.sql"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,SQL}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.sql"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.sql\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.sql\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+; Environment
+#if "user" == InstallTarget
+#define EnvironmentRootKey "HKCU"
+#define EnvironmentKey "Environment"
+#define Uninstall64RootKey "HKCU64"
+#define Uninstall32RootKey "HKCU32"
+#else
+#define EnvironmentRootKey "HKLM"
+#define EnvironmentKey "System\CurrentControlSet\Control\Session Manager\Environment"
+#define Uninstall64RootKey "HKLM64"
+#define Uninstall32RootKey "HKLM32"
+#endif
+
+Root: {#EnvironmentRootKey}; Subkey: "{#EnvironmentKey}"; ValueType: expandsz; ValueName: "Path"; ValueData: "{olddata};{app}\bin"; Tasks: addtopath; Check: NeedsAddPath(ExpandConstant('{app}\bin'))
+
 [Code]
 // Don't allow installing conflicting architectures
 function InitializeSetup(): Boolean;
@@ -92,15 +127,33 @@ var
 begin
   Result := True;
 
-  if IsWin64 then begin
-    RegKey := 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\' + copy('{#IncompatibleAppId}', 2, 38) + '_is1';
+  #if "user" == InstallTarget
+    #if "ia32" == Arch
+      #define IncompatibleArchRootKey "HKLM32"
+    #else
+      #define IncompatibleArchRootKey "HKLM64"
+    #endif
+
+    if not WizardSilent() then begin
+      RegKey := 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\' + copy('{#IncompatibleTargetAppId}', 2, 38) + '_is1';
+
+      if RegKeyExists({#IncompatibleArchRootKey}, RegKey) then begin
+        if MsgBox('{#NameShort} is already installed on this system for all users. We recommend first uninstalling that version before installing this one. Are you sure you want to continue the installation?', mbConfirmation, MB_YESNO) = IDNO then begin
+          Result := false;
+        end;
+      end;
+    end;
+  #endif
+
+  if Result and IsWin64 then begin
+    RegKey := 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\' + copy('{#IncompatibleArchAppId}', 2, 38) + '_is1';
 
     if '{#Arch}' = 'ia32' then begin
-      Result := not RegKeyExists(HKLM64, RegKey);
+      Result := not RegKeyExists({#Uninstall64RootKey}, RegKey);
       ThisArch := '32';
       AltArch := '64';
     end else begin
-      Result := not RegKeyExists(HKLM32, RegKey);
+      Result := not RegKeyExists({#Uninstall32RootKey}, RegKey);
       ThisArch := '64';
       AltArch := '32';
     end;
@@ -127,9 +180,9 @@ begin
   Result := not IsBackgroundUpdate();
 end;
 
-// SqlOps will create a flag file before the update starts (/update=C:\foo\bar)
-// - if the file exists at this point, the user quit SqlOps before the update finished, so don't start SqlOps after update
-// - otherwise, the user has accepted to apply the update and SqlOps should start
+// AzureDataStudio will create a flag file before the update starts (/update=C:\foo\bar)
+// - if the file exists at this point, the user quit AzureDataStudio before the update finished, so don't start AzureDataStudio after update
+// - otherwise, the user has accepted to apply the update and AzureDataStudio should start
 function LockFileExists(): Boolean;
 begin
   Result := FileExists(ExpandConstant('{param:update}'))
@@ -209,7 +262,7 @@ function NeedsAddPath(Param: string): boolean;
 var
   OrigPath: string;
 begin
-  if not RegQueryStringValue(HKEY_CURRENT_USER, 'Environment', 'Path', OrigPath)
+  if not RegQueryStringValue({#EnvironmentRootKey}, '{#EnvironmentKey}', 'Path', OrigPath)
   then begin
     Result := True;
     exit;
@@ -228,7 +281,7 @@ begin
   if not CurUninstallStep = usUninstall then begin
     exit;
   end;
-  if not RegQueryStringValue(HKEY_CURRENT_USER, 'Environment', 'Path', Path)
+  if not RegQueryStringValue({#EnvironmentRootKey}, '{#EnvironmentKey}', 'Path', Path)
   then begin
     exit;
   end;
@@ -244,5 +297,9 @@ begin
       end;
     end;
   end;
-  RegWriteExpandStringValue(HKEY_CURRENT_USER, 'Environment', 'Path', NewPath);
+  RegWriteExpandStringValue({#EnvironmentRootKey}, '{#EnvironmentKey}', 'Path', NewPath);
 end;
+
+#ifdef Debug
+  #expr SaveToFile(AddBackslash(SourcePath) + "code-processed.iss")
+#endif

docs/UX-Design-Guidelines.md

@@ -0,0 +1 @@
+

extensions/account-provider-azure/.vscodeignore

@@ -1,3 +0,0 @@
-src/**
-tsconfig.json
-npm-shrinkwrap.json