Alanren/edit data1004 (#2781)

* edit data bug fix

* rename the event and use undefined instead of null

* use thenable instead of callback

* handle the new SlickGrid OnRendered event to control the keyboard focus

* use the new event to control the focus and change the add row behavior

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,7 +7,7 @@ about: Create a report to help us improve
 <!-- 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. -->
-- SQL Operations Studio Version:
+- Azure Data Studio Version:
 
 Steps to Reproduce:
 

.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"
 			},
@@ -90,7 +90,7 @@
 				"**/winjs*.js"
 			],
 			"webRoot": "${workspaceFolder}",
-			"timeout": 15000
+			"timeout": 45000
 		},
 		{
 			"type": "node",
@@ -98,12 +98,12 @@
 			"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",
@@ -132,25 +132,25 @@
 	],
 	"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 SQL Ops",
+				"Launch azuredatastudio",
 				"Attach to Extension Host"
 			]
 		}
 	]
-}
+}

.yarnrc

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

CHANGELOG.md

@@ -1,5 +1,27 @@
 # Change Log
 
+
+## 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
@@ -31,13 +53,13 @@ We would like to thank all our users who raised issues, and in particular the fo
 * Release status: Public Preview
 
 ## What's new in this version
-* SQL Server Agent for SQL Operations Studio extension improvements
+* 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 SQL Operations Studio extension improvements
+* 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
@@ -52,10 +74,10 @@ We would like to thank all our users who raised issues, and in particular the fo
 * Release status: Public Preview
 
 ## What's new in this version
-* **SQL Server Profiler for SQL Operations Studio  *Preview*** extension initial release
+* **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 SQL Operations Studio *Preview*** extension enhancements for Jobs and Job History views
+* **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
@@ -69,7 +91,7 @@ The May release is focused on stabilization and bug fixes leading up to the Buil
 
 * 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/sqlopsstudio/wiki/How-to-Disable-Telemetry-Reporting) experience and in-product links to [Privacy Statement](https://privacy.microsoft.com/en-us/privacystatement)
+* 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
@@ -95,8 +117,8 @@ The April Public Preview release contains some of the following highlights.
 * 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,7 +1,7 @@
 ## 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.
 
@@ -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,6 +1,6 @@
 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

README.md

@@ -1,25 +1,25 @@
-# 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)
 
-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 August Public Preview**
+**Download Azure Data Studio August Public Preview**
 
 Platform | Link
 -- | --
-Windows Setup Installer | https://go.microsoft.com/fwlink/?linkid=2013365
-Windows ZIP | https://go.microsoft.com/fwlink/?linkid=2013712
-macOS ZIP | https://go.microsoft.com/fwlink/?linkid=2013715
-Linux TAR.GZ | https://go.microsoft.com/fwlink/?linkid=2013718
-Linux RPM | https://go.microsoft.com/fwlink/?linkid=2013830
-Linux DEB | https://go.microsoft.com/fwlink/?linkid=2013833
+Windows Setup Installer | https://go.microsoft.com/fwlink/?linkid=2024683
+Windows ZIP | https://go.microsoft.com/fwlink/?linkid=2024680
+macOS ZIP | https://go.microsoft.com/fwlink/?linkid=2024677
+Linux TAR.GZ | https://go.microsoft.com/fwlink/?linkid=2024675
+Linux RPM | https://go.microsoft.com/fwlink/?linkid=2024672
+Linux DEB | https://go.microsoft.com/fwlink/?linkid=2024668
 
-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.
+See the [change log](https://github.com/Microsoft/azuredatastudio/blob/master/CHANGELOG.md) for additional details of what's in this release.
 
 **Feature Highlights**
 
@@ -38,29 +38,31 @@ See the [change log](https://github.com/Microsoft/sqlopsstudio/blob/master/CHANG
 
 Here's 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:
 
+* 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 filename. #2151`
@@ -84,8 +86,8 @@ We would like to thank all our users who raised issues, and in particular the fo
 * stebet for `Fix #153: Fixing sql snippets that failed on a DB with 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
+* 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
@@ -98,7 +100,7 @@ We would like to thank all our users who raised issues, and in particular the fo
   * 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

build/gulpfile.vscode.js

@@ -76,6 +76,7 @@ const sqlBuiltInExtensions = [
 	'import',
 	'profiler'
 ];
+var azureExtensions =  [ 'azurecore'];
 
 const vscodeEntryPoints = _.flatten([
 	buildfile.entrypoint('vs/workbench/workbench.main'),
@@ -208,7 +209,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'));
@@ -276,11 +277,45 @@ function packageBuiltInExtensions() {
 	});
 }
 
+// {{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 () => {
@@ -307,8 +342,10 @@ 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 => {
 			return ext.fromLocal(extension.path)
@@ -325,7 +362,6 @@ 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']));
@@ -338,7 +374,8 @@ function packageTask(platform, arch, opts) {
 			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 }));
 
@@ -460,18 +497,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 }));

build/gulpfile.vscode.linux.js

@@ -24,7 +24,7 @@ function getDebPackageArch(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;
 
@@ -104,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 () {
@@ -213,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;
 

build/gulpfile.vscode.win32.js

@@ -19,7 +19,7 @@ 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, target) => path.join(repoPath, '.build', `win32-${arch}`, `${target}-setup`);

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,13 +7,14 @@
     "@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/xml2js": "0.0.33",
     "@types/request": "^2.47.0",
     "azure-storage": "^2.1.0",
     "decompress": "^4.2.0",
     "documentdb": "1.13.0",
-    "service-downloader": "github:anthonydresser/service-downloader#0.1.2",
+    "service-downloader": "github:anthonydresser/service-downloader#0.1.5",
     "fs-extra-promise": "^1.0.1",
     "mime": "^1.3.4",
     "minimist": "^1.2.0",

build/win32/code.iss

@@ -8,14 +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
 
 DefaultGroupName={#NameLong}
 AllowNoIcons=yes
 OutputDir={#OutputDir}
-OutputBaseFilename=SqlOpsStudioSetup
+OutputBaseFilename=AzureDataStudioSetup
 Compression=lzma
 SolidCompression=yes
 AppMutex={code:GetAppMutex}
@@ -180,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}'))

build/yarn.lock

@@ -36,6 +36,10 @@
   version "0.0.29"
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-0.0.29.tgz#fbcfd330573b912ef59eeee14602bface630754b"
 
+"@types/minimatch@^3.0.3":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
+
 "@types/node@*":
   version "8.0.51"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.51.tgz#b31d716fb8d58eeb95c068a039b9b6292817d5fb"
@@ -1002,7 +1006,7 @@ hoek@4.x.x:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb"
 
-http-proxy-agent@^2.0.0:
+http-proxy-agent@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
   dependencies:
@@ -1025,7 +1029,7 @@ http-signature@~1.2.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
-https-proxy-agent@^2.1.1:
+https-proxy-agent@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0"
   dependencies:
@@ -1843,14 +1847,14 @@ semver@^5.4.1:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
 
-"service-downloader@github:anthonydresser/service-downloader#0.1.2":
-  version "0.1.2"
-  resolved "https://codeload.github.com/anthonydresser/service-downloader/tar.gz/2aa9b336b6442e17e24693ddc907030575539798"
+"service-downloader@github:anthonydresser/service-downloader#0.1.5":
+  version "0.1.5"
+  resolved "https://codeload.github.com/anthonydresser/service-downloader/tar.gz/6ebb0465573cc140e461a22f334260f55ef45546"
   dependencies:
     decompress "^4.2.0"
     eventemitter2 "^5.0.1"
-    http-proxy-agent "^2.0.0"
-    https-proxy-agent "^2.1.1"
+    http-proxy-agent "^2.1.0"
+    https-proxy-agent "^2.2.1"
     mkdirp "^0.5.1"
     tmp "^0.0.33"
 

extensions/account-provider-azure/.vscodeignore

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

extensions/account-provider-azure/npm-shrinkwrap.json

@@ -1,348 +0,0 @@
-{
-  "name": "account-provider-azure",
-  "version": "0.0.1",
-  "dependencies": {
-    "@types/node": {
-      "version": "8.5.1",
-      "from": "@types/node@>=8.0.47 <9.0.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-8.5.1.tgz"
-    },
-    "adal-node": {
-      "version": "0.1.25",
-      "from": "adal-node@0.1.25",
-      "resolved": "https://registry.npmjs.org/adal-node/-/adal-node-0.1.25.tgz"
-    },
-    "ansi-regex": {
-      "version": "2.1.1",
-      "from": "ansi-regex@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"
-    },
-    "ansi-styles": {
-      "version": "2.2.1",
-      "from": "ansi-styles@>=2.2.1 <3.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"
-    },
-    "asn1": {
-      "version": "0.1.11",
-      "from": "asn1@0.1.11",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
-    },
-    "assert-plus": {
-      "version": "0.1.5",
-      "from": "assert-plus@>=0.1.5 <0.2.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
-    },
-    "async": {
-      "version": "2.6.0",
-      "from": "async@>=0.6.0",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz"
-    },
-    "aws-sign2": {
-      "version": "0.5.0",
-      "from": "aws-sign2@>=0.5.0 <0.6.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
-    },
-    "base64url": {
-      "version": "2.0.0",
-      "from": "base64url@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz"
-    },
-    "bl": {
-      "version": "1.0.3",
-      "from": "bl@>=1.0.0 <1.1.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz"
-    },
-    "bluebird": {
-      "version": "2.11.0",
-      "from": "bluebird@>=2.9.30 <3.0.0",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz"
-    },
-    "boom": {
-      "version": "2.10.1",
-      "from": "boom@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
-    },
-    "buffer-equal-constant-time": {
-      "version": "1.0.1",
-      "from": "buffer-equal-constant-time@1.0.1",
-      "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz"
-    },
-    "caseless": {
-      "version": "0.11.0",
-      "from": "caseless@>=0.11.0 <0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
-    },
-    "chalk": {
-      "version": "1.1.3",
-      "from": "chalk@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"
-    },
-    "combined-stream": {
-      "version": "1.0.5",
-      "from": "combined-stream@>=1.0.1 <1.1.0",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"
-    },
-    "commander": {
-      "version": "2.12.2",
-      "from": "commander@>=2.8.1 <3.0.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.12.2.tgz"
-    },
-    "core-util-is": {
-      "version": "1.0.2",
-      "from": "core-util-is@>=1.0.0 <1.1.0",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
-    },
-    "cryptiles": {
-      "version": "2.0.5",
-      "from": "cryptiles@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"
-    },
-    "ctype": {
-      "version": "0.5.3",
-      "from": "ctype@0.5.3",
-      "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
-    },
-    "date-utils": {
-      "version": "1.2.21",
-      "from": "date-utils@*",
-      "resolved": "https://registry.npmjs.org/date-utils/-/date-utils-1.2.21.tgz"
-    },
-    "delayed-stream": {
-      "version": "1.0.0",
-      "from": "delayed-stream@>=1.0.0 <1.1.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
-    },
-    "ecdsa-sig-formatter": {
-      "version": "1.0.9",
-      "from": "ecdsa-sig-formatter@1.0.9",
-      "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz"
-    },
-    "escape-string-regexp": {
-      "version": "1.0.5",
-      "from": "escape-string-regexp@>=1.0.2 <2.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
-    },
-    "extend": {
-      "version": "3.0.1",
-      "from": "extend@>=3.0.0 <3.1.0",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz"
-    },
-    "forever-agent": {
-      "version": "0.6.1",
-      "from": "forever-agent@>=0.6.0 <0.7.0",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
-    },
-    "form-data": {
-      "version": "1.0.1",
-      "from": "form-data@>=1.0.0-rc1 <1.1.0",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.1.tgz"
-    },
-    "generate-function": {
-      "version": "2.0.0",
-      "from": "generate-function@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"
-    },
-    "generate-object-property": {
-      "version": "1.2.0",
-      "from": "generate-object-property@>=1.1.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"
-    },
-    "har-validator": {
-      "version": "1.8.0",
-      "from": "har-validator@>=1.6.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz"
-    },
-    "has-ansi": {
-      "version": "2.0.0",
-      "from": "has-ansi@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"
-    },
-    "hawk": {
-      "version": "3.1.3",
-      "from": "hawk@>=3.1.0 <3.2.0",
-      "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"
-    },
-    "hoek": {
-      "version": "2.16.3",
-      "from": "hoek@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
-    },
-    "http-signature": {
-      "version": "0.11.0",
-      "from": "http-signature@>=0.11.0 <0.12.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz"
-    },
-    "inherits": {
-      "version": "2.0.3",
-      "from": "inherits@>=2.0.1 <2.1.0",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
-    },
-    "is-my-json-valid": {
-      "version": "2.17.1",
-      "from": "is-my-json-valid@>=2.12.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.17.1.tgz"
-    },
-    "is-property": {
-      "version": "1.0.2",
-      "from": "is-property@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"
-    },
-    "isarray": {
-      "version": "1.0.0",
-      "from": "isarray@>=1.0.0 <1.1.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
-    },
-    "isstream": {
-      "version": "0.1.2",
-      "from": "isstream@>=0.1.1 <0.2.0",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
-    },
-    "json-stringify-safe": {
-      "version": "5.0.1",
-      "from": "json-stringify-safe@>=5.0.0 <5.1.0",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
-    },
-    "jsonpointer": {
-      "version": "4.0.1",
-      "from": "jsonpointer@>=4.0.0 <5.0.0",
-      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz"
-    },
-    "jwa": {
-      "version": "1.1.5",
-      "from": "jwa@>=1.1.4 <2.0.0",
-      "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz"
-    },
-    "jws": {
-      "version": "3.1.4",
-      "from": "jws@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz"
-    },
-    "lodash": {
-      "version": "4.17.4",
-      "from": "lodash@>=4.14.0 <5.0.0",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"
-    },
-    "mime-db": {
-      "version": "1.30.0",
-      "from": "mime-db@>=1.30.0 <1.31.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz"
-    },
-    "mime-types": {
-      "version": "2.1.17",
-      "from": "mime-types@>=2.1.2 <2.2.0",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz"
-    },
-    "oauth-sign": {
-      "version": "0.8.2",
-      "from": "oauth-sign@>=0.8.0 <0.9.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"
-    },
-    "process-nextick-args": {
-      "version": "1.0.7",
-      "from": "process-nextick-args@>=1.0.6 <1.1.0",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"
-    },
-    "punycode": {
-      "version": "1.4.1",
-      "from": "punycode@>=1.4.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"
-    },
-    "qs": {
-      "version": "5.1.0",
-      "from": "qs@>=5.1.0 <5.2.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-5.1.0.tgz"
-    },
-    "readable-stream": {
-      "version": "2.0.6",
-      "from": "readable-stream@>=2.0.5 <2.1.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"
-    },
-    "request": {
-      "version": "2.63.0",
-      "from": "request@2.63.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.63.0.tgz",
-      "dependencies": {
-        "node-uuid": {
-          "version": "1.4.8",
-          "from": "node-uuid@>=1.4.0 <1.5.0",
-          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz"
-        }
-      }
-    },
-    "safe-buffer": {
-      "version": "5.1.1",
-      "from": "safe-buffer@>=5.0.1 <6.0.0",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"
-    },
-    "sntp": {
-      "version": "1.0.9",
-      "from": "sntp@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"
-    },
-    "string_decoder": {
-      "version": "0.10.31",
-      "from": "string_decoder@>=0.10.0 <0.11.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-    },
-    "stringstream": {
-      "version": "0.0.5",
-      "from": "stringstream@>=0.0.4 <0.1.0",
-      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
-    },
-    "strip-ansi": {
-      "version": "3.0.1",
-      "from": "strip-ansi@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"
-    },
-    "supports-color": {
-      "version": "2.0.0",
-      "from": "supports-color@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
-    },
-    "tough-cookie": {
-      "version": "2.3.3",
-      "from": "tough-cookie@>=0.12.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz"
-    },
-    "tunnel-agent": {
-      "version": "0.4.3",
-      "from": "tunnel-agent@>=0.4.0 <0.5.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"
-    },
-    "underscore": {
-      "version": "1.8.3",
-      "from": "underscore@>=1.3.1",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz"
-    },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "from": "util-deprecate@>=1.0.1 <1.1.0",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-    },
-    "uuid": {
-      "version": "3.1.0",
-      "from": "uuid@>=3.1.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz"
-    },
-    "vscode-nls": {
-      "version": "2.0.2",
-      "from": "vscode-nls@2.0.2",
-      "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-2.0.2.tgz"
-    },
-    "xmldom": {
-      "version": "0.1.27",
-      "from": "xmldom@>=0.1.0",
-      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz"
-    },
-    "xpath.js": {
-      "version": "1.0.7",
-      "from": "xpath.js@>=1.0.5 <1.1.0",
-      "resolved": "https://registry.npmjs.org/xpath.js/-/xpath.js-1.0.7.tgz"
-    },
-    "xtend": {
-      "version": "4.0.1",
-      "from": "xtend@>=4.0.0 <5.0.0",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
-    }
-  }
-}

extensions/account-provider-azure/package.json

@@ -1,55 +0,0 @@
-{
-  "name": "account-provider-azure",
-  "version": "0.0.1",
-  "publisher": "Microsoft",
-  "engines": { "vscode": "*" },
-  "main": "./out/main",
-  "activationEvents": [ "*" ],
-  "scripts": {
-    "compile": "gulp compile-extension:account-provider-azure"
-  },
-  "dependencies": {
-    "adal-node": "0.1.25",
-    "request": "2.63.0",
-    "vscode-nls": "^3.2.1"
-  },
-  "devDependencies": {
-    "@types/node": "^8.0.24"
-  },
-  "contributes": {
-    "commands": [
-      {
-        "command": "accounts.clearTokenCache",
-        "title": "%accounts.clearTokenCache%",
-        "category": "Azure Accounts"
-      }
-    ],
-    "configuration": {
-      "type": "object",
-      "title": "Azure Account Configuration",
-      "properties": {
-        "accounts.azure.enablePublicCloud": {
-          "type": "boolean",
-          "default": true,
-          "description": "%config.enablePublicCloudDescription%"
-        }
-      }
-    },
-    "account-type": [
-      {
-        "id": "microsoft",
-        "icon": {
-          "light": "./out/account-provider/media/microsoft_account_light.svg",
-          "dark": "./out/account-provider/media/microsoft_account_dark.svg"
-        }
-      },
-      {
-        "id": "work_school",
-        "icon": {
-          "light": "./out/account-provider/media/work_school_account_light.svg",
-          "dark": "./out/account-provider/media/work_school_account_dark.svg"
-        }
-      }
-    ]
-  }
-}

extensions/account-provider-azure/package.nls.json

@@ -1,7 +0,0 @@
-{
-	"accounts.clearTokenCache": "Clear Azure Account Token Cache",
-	"config.enablePublicCloudDescription": "Should Azure public cloud integration be enabled",
-	"config.enableUsGovCloudDescription": "Should US Government Azure cloud (Fairfax) integration be enabled",
-	"config.enableChinaCloudDescription": "Should Azure China integration be enabled",
-	"config.enableGermanyCloudDescription": "Should Azure Germany integration be enabled"
-}

extensions/account-provider-azure/yarn.lock

@@ -1,608 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@types/node@^8.0.24", "@types/node@^8.0.47":
-  version "8.5.9"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.5.9.tgz#7155cfb4ae405bca4dd8df1a214c339e939109bf"
-
-adal-node@0.1.25:
-  version "0.1.25"
-  resolved "https://registry.yarnpkg.com/adal-node/-/adal-node-0.1.25.tgz#6554350ab42914870004c45c0d64448f3dbfcd03"
-  dependencies:
-    "@types/node" "^8.0.47"
-    async ">=0.6.0"
-    date-utils "*"
-    jws "3.x.x"
-    request ">= 2.52.0"
-    underscore ">= 1.3.1"
-    uuid "^3.1.0"
-    xmldom ">= 0.1.x"
-    xpath.js "~1.0.5"
-
-ajv@^5.1.0:
-  version "5.5.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
-  dependencies:
-    co "^4.6.0"
-    fast-deep-equal "^1.0.0"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.3.0"
-
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-
-ansi-styles@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-
-asn1@0.1.11:
-  version "0.1.11"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.1.11.tgz#559be18376d08a4ec4dbe80877d27818639b2df7"
-
-asn1@~0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
-
-assert-plus@1.0.0, assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-
-assert-plus@^0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.1.5.tgz#ee74009413002d84cec7219c6ac811812e723160"
-
-async@>=0.6.0, async@^2.0.1:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
-  dependencies:
-    lodash "^4.14.0"
-
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-
-aws-sign2@~0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.5.0.tgz#c57103f7a17fc037f02d7c2e64b602ea223f7d63"
-
-aws-sign2@~0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
-
-aws4@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
-
-base64url@2.0.0, base64url@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/base64url/-/base64url-2.0.0.tgz#eac16e03ea1438eff9423d69baa36262ed1f70bb"
-
-bcrypt-pbkdf@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
-  dependencies:
-    tweetnacl "^0.14.3"
-
-bl@~1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-1.0.3.tgz#fc5421a28fd4226036c3b3891a66a25bc64d226e"
-  dependencies:
-    readable-stream "~2.0.5"
-
-bluebird@^2.9.30:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
-
-boom@2.x.x:
-  version "2.10.1"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
-  dependencies:
-    hoek "2.x.x"
-
-boom@4.x.x:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31"
-  dependencies:
-    hoek "4.x.x"
-
-boom@5.x.x:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02"
-  dependencies:
-    hoek "4.x.x"
-
-buffer-equal-constant-time@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
-
-caseless@~0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
-
-caseless@~0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-
-chalk@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  dependencies:
-    ansi-styles "^2.2.1"
-    escape-string-regexp "^1.0.2"
-    has-ansi "^2.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^2.0.0"
-
-co@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
-
-combined-stream@^1.0.5, combined-stream@~1.0.1, combined-stream@~1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
-  dependencies:
-    delayed-stream "~1.0.0"
-
-commander@^2.8.1:
-  version "2.13.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
-
-core-util-is@1.0.2, core-util-is@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-
-cryptiles@2.x.x:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
-  dependencies:
-    boom "2.x.x"
-
-cryptiles@3.x.x:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"
-  dependencies:
-    boom "5.x.x"
-
-ctype@0.5.3:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/ctype/-/ctype-0.5.3.tgz#82c18c2461f74114ef16c135224ad0b9144ca12f"
-
-dashdash@^1.12.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  dependencies:
-    assert-plus "^1.0.0"
-
-date-utils@*:
-  version "1.2.21"
-  resolved "https://registry.yarnpkg.com/date-utils/-/date-utils-1.2.21.tgz#61fb16cdc1274b3c9acaaffe9fc69df8720a2b64"
-
-delayed-stream@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-
-ecc-jsbn@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
-  dependencies:
-    jsbn "~0.1.0"
-
-ecdsa-sig-formatter@1.0.9:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz#4bc926274ec3b5abb5016e7e1d60921ac262b2a1"
-  dependencies:
-    base64url "^2.0.0"
-    safe-buffer "^5.0.1"
-
-escape-string-regexp@^1.0.2:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-
-extend@~3.0.0, extend@~3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
-
-extsprintf@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
-
-extsprintf@^1.2.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
-
-fast-deep-equal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff"
-
-fast-json-stable-stringify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
-
-forever-agent@~0.6.0, forever-agent@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-
-form-data@~1.0.0-rc1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-1.0.1.tgz#ae315db9a4907fa065502304a66d7733475ee37c"
-  dependencies:
-    async "^2.0.1"
-    combined-stream "^1.0.5"
-    mime-types "^2.1.11"
-
-form-data@~2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.1.tgz#6fb94fbd71885306d73d15cc497fe4cc4ecd44bf"
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.5"
-    mime-types "^2.1.12"
-
-generate-function@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74"
-
-generate-object-property@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0"
-  dependencies:
-    is-property "^1.0.0"
-
-getpass@^0.1.1:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-  dependencies:
-    assert-plus "^1.0.0"
-
-har-schema@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-
-har-validator@^1.6.1:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-1.8.0.tgz#d83842b0eb4c435960aeb108a067a3aa94c0eeb2"
-  dependencies:
-    bluebird "^2.9.30"
-    chalk "^1.0.0"
-    commander "^2.8.1"
-    is-my-json-valid "^2.12.0"
-
-har-validator@~5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
-  dependencies:
-    ajv "^5.1.0"
-    har-schema "^2.0.0"
-
-has-ansi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  dependencies:
-    ansi-regex "^2.0.0"
-
-hawk@~3.1.0:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
-  dependencies:
-    boom "2.x.x"
-    cryptiles "2.x.x"
-    hoek "2.x.x"
-    sntp "1.x.x"
-
-hawk@~6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038"
-  dependencies:
-    boom "4.x.x"
-    cryptiles "3.x.x"
-    hoek "4.x.x"
-    sntp "2.x.x"
-
-hoek@2.x.x:
-  version "2.16.3"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
-
-hoek@4.x.x:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.0.tgz#72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d"
-
-http-signature@~0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-0.11.0.tgz#1796cf67a001ad5cd6849dca0991485f09089fe6"
-  dependencies:
-    asn1 "0.1.11"
-    assert-plus "^0.1.5"
-    ctype "0.5.3"
-
-http-signature@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
-  dependencies:
-    assert-plus "^1.0.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
-
-inherits@~2.0.1:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-
-is-my-json-valid@^2.12.0:
-  version "2.17.1"
-  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.17.1.tgz#3da98914a70a22f0a8563ef1511a246c6fc55471"
-  dependencies:
-    generate-function "^2.0.0"
-    generate-object-property "^1.1.0"
-    jsonpointer "^4.0.0"
-    xtend "^4.0.0"
-
-is-property@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
-
-is-typedarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-
-isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-
-isstream@~0.1.1, isstream@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-
-jsbn@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-
-json-schema-traverse@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
-
-json-schema@0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
-
-json-stringify-safe@~5.0.0, json-stringify-safe@~5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-
-jsonpointer@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
-
-jsprim@^1.2.2:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
-  dependencies:
-    assert-plus "1.0.0"
-    extsprintf "1.3.0"
-    json-schema "0.2.3"
-    verror "1.10.0"
-
-jwa@^1.1.4:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.1.5.tgz#a0552ce0220742cd52e153774a32905c30e756e5"
-  dependencies:
-    base64url "2.0.0"
-    buffer-equal-constant-time "1.0.1"
-    ecdsa-sig-formatter "1.0.9"
-    safe-buffer "^5.0.1"
-
-jws@3.x.x:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/jws/-/jws-3.1.4.tgz#f9e8b9338e8a847277d6444b1464f61880e050a2"
-  dependencies:
-    base64url "^2.0.0"
-    jwa "^1.1.4"
-    safe-buffer "^5.0.1"
-
-lodash@^4.14.0:
-  version "4.17.4"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
-
-mime-db@~1.30.0:
-  version "1.30.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
-
-mime-types@^2.1.11, mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.2:
-  version "2.1.17"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a"
-  dependencies:
-    mime-db "~1.30.0"
-
-node-uuid@~1.4.0:
-  version "1.4.8"
-  resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907"
-
-oauth-sign@~0.8.0, oauth-sign@~0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
-
-performance-now@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-
-process-nextick-args@~1.0.6:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
-
-punycode@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-
-qs@~5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-5.1.0.tgz#4d932e5c7ea411cca76a312d39a606200fd50cd9"
-
-qs@~6.5.1:
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
-
-readable-stream@~2.0.5:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "~1.0.0"
-    process-nextick-args "~1.0.6"
-    string_decoder "~0.10.x"
-    util-deprecate "~1.0.1"
-
-request@2.63.0:
-  version "2.63.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.63.0.tgz#c83e7c3485e5d9bf9b146318429bc48f1253d8be"
-  dependencies:
-    aws-sign2 "~0.5.0"
-    bl "~1.0.0"
-    caseless "~0.11.0"
-    combined-stream "~1.0.1"
-    extend "~3.0.0"
-    forever-agent "~0.6.0"
-    form-data "~1.0.0-rc1"
-    har-validator "^1.6.1"
-    hawk "~3.1.0"
-    http-signature "~0.11.0"
-    isstream "~0.1.1"
-    json-stringify-safe "~5.0.0"
-    mime-types "~2.1.2"
-    node-uuid "~1.4.0"
-    oauth-sign "~0.8.0"
-    qs "~5.1.0"
-    stringstream "~0.0.4"
-    tough-cookie ">=0.12.0"
-    tunnel-agent "~0.4.0"
-
-"request@>= 2.52.0":
-  version "2.83.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.6.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.1"
-    forever-agent "~0.6.1"
-    form-data "~2.3.1"
-    har-validator "~5.0.3"
-    hawk "~6.0.2"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.17"
-    oauth-sign "~0.8.2"
-    performance-now "^2.1.0"
-    qs "~6.5.1"
-    safe-buffer "^5.1.1"
-    stringstream "~0.0.5"
-    tough-cookie "~2.3.3"
-    tunnel-agent "^0.6.0"
-    uuid "^3.1.0"
-
-safe-buffer@^5.0.1, safe-buffer@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
-
-sntp@1.x.x:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
-  dependencies:
-    hoek "2.x.x"
-
-sntp@2.x.x:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8"
-  dependencies:
-    hoek "4.x.x"
-
-sshpk@^1.7.0:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3"
-  dependencies:
-    asn1 "~0.2.3"
-    assert-plus "^1.0.0"
-    dashdash "^1.12.0"
-    getpass "^0.1.1"
-  optionalDependencies:
-    bcrypt-pbkdf "^1.0.0"
-    ecc-jsbn "~0.1.1"
-    jsbn "~0.1.0"
-    tweetnacl "~0.14.0"
-
-string_decoder@~0.10.x:
-  version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-
-stringstream@~0.0.4, stringstream@~0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
-
-strip-ansi@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  dependencies:
-    ansi-regex "^2.0.0"
-
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-
-tough-cookie@>=0.12.0, tough-cookie@~2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561"
-  dependencies:
-    punycode "^1.4.1"
-
-tunnel-agent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  dependencies:
-    safe-buffer "^5.0.1"
-
-tunnel-agent@~0.4.0:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"
-
-tweetnacl@^0.14.3, tweetnacl@~0.14.0:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-
-"underscore@>= 1.3.1":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"
-
-util-deprecate@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-
-uuid@^3.1.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"
-
-verror@1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
-  dependencies:
-    assert-plus "^1.0.0"
-    core-util-is "1.0.2"
-    extsprintf "^1.2.0"
-
-vscode-nls@^3.2.1:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.2.tgz#3817eca5b985c2393de325197cf4e15eb2aa5350"
-
-"xmldom@>= 0.1.x":
-  version "0.1.27"
-  resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
-
-xpath.js@~1.0.5:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/xpath.js/-/xpath.js-1.0.7.tgz#7e94627f541276cbc6a6b02b5d35e9418565b3e4"
-
-xtend@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"

extensions/agent/README.md

@@ -1,6 +1,6 @@
-# Microsoft SQL Server Agent for SQL Operations Studio
+# Microsoft SQL Server Agent for Azure Data Studio
 
-Welcome to Microsoft SQL Server Agent for SQL Operations Studio! An extension for managing and troubleshooting
+Welcome to Microsoft SQL Server Agent for Azure Data Studio! An extension for managing and troubleshooting
 SQL Server Agent jobs and configuration.  The current is an early release of this extension that provides
 basic functionality for the following.
 
@@ -22,4 +22,4 @@ The [Microsoft Enterprise and Developer Privacy Statement](https://privacy.micro
 
 Copyright (c) Microsoft Corporation. All rights reserved.
 
-Licensed under the [Source EULA](https://raw.githubusercontent.com/Microsoft/sqlopsstudio/master/LICENSE.txt).
+Licensed under the [Source EULA](https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt).

extensions/agent/package.json

@@ -2,10 +2,10 @@
   "name": "agent",
   "displayName": "SQL Server Agent",
   "description": "Manage and troubleshoot SQL Server Agent jobs",
-  "version": "0.32.7",
+  "version": "0.33.0",
   "publisher": "Microsoft",
   "preview": true,
-  "license": "https://raw.githubusercontent.com/Microsoft/sqlopsstudio/master/LICENSE.txt",
+  "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt",
   "icon": "images/sqlserver.png",
   "aiKey": "AIF-5574968e-856d-40d2-af67-c89a14e76412",
   "engines": {
@@ -17,7 +17,7 @@
   "main": "./out/main",
   "repository": {
     "type": "git",
-    "url": "https://github.com/Microsoft/sqlopsstudio.git"
+    "url": "https://github.com/Microsoft/azuredatastudio.git"
   },
   "extensionDependencies": [
     "Microsoft.mssql"

extensions/agent/src/data/jobData.ts

@@ -59,6 +59,9 @@ export class JobData implements IAgentDialogData {
 			this.category = jobInfo.category;
 			this.description = jobInfo.description;
 			this.enabled = jobInfo.enabled;
+			this.jobSteps = jobInfo.JobSteps;
+			this.jobSchedules = jobInfo.JobSchedules;
+			this.alerts = jobInfo.Alerts;
 		}
 	}
 
@@ -105,8 +108,6 @@ export class JobData implements IAgentDialogData {
 			displayName: this.JobCompletionActionCondition_Always,
 			name: sqlops.JobCompletionActionCondition.Always.toString()
 		}];
-
-		this.jobSchedules = [];
 	}
 
 	public async save() {

extensions/agent/src/data/jobStepData.ts

@@ -6,37 +6,47 @@
 
 import { AgentUtils } from '../agentUtils';
 import { IAgentDialogData, AgentDialogMode } from '../interfaces';
+import { JobData } from './jobData';
+import * as nls from 'vscode-nls';
+
+const localize = nls.loadMessageBundle();
 
 export class JobStepData implements IAgentDialogData {
+
+	// Error Messages
+	private readonly CreateStepErrorMessage_JobNameIsEmpty = localize('stepData.jobNameRequired', 'Job name must be provided');
+	private readonly CreateStepErrorMessage_StepNameIsEmpty = localize('stepData.stepNameRequired', 'Step name must be provided');
+
 	public dialogMode: AgentDialogMode = AgentDialogMode.CREATE;
 	public ownerUri: string;
-	public jobId: string; //
+	public jobId: string;
 	public jobName: string;
-	public script: string; //
+	public script: string;
 	public scriptName: string;
-	public stepName: string; //
-	public subSystem: string; //
+	public stepName: string;
+	public subSystem: string;
 	public id: number;
-	public failureAction: string; //
-	public successAction: string; //
+	public failureAction: string;
+	public successAction: string;
 	public failStepId: number;
 	public successStepId: number;
 	public command: string;
 	public commandExecutionSuccessCode: number;
-	public databaseName: string; //
+	public databaseName: string;
 	public databaseUserName: string;
 	public server: string;
-	public outputFileName: string; //
+	public outputFileName: string;
 	public appendToLogFile: boolean;
 	public appendToStepHist: boolean;
 	public writeLogToTable: boolean;
 	public appendLogToTable: boolean;
-	public retryAttempts: number; //
-	public retryInterval: number; //
+	public retryAttempts: number;
+	public retryInterval: number;
 	public proxyName: string;
 
-	constructor(ownerUri:string) {
+	constructor(ownerUri:string, jobModel?: JobData) {
 		this.ownerUri = ownerUri;
+		this.jobName = jobModel.name;
 	}
 
 	public async initialize() {
@@ -51,7 +61,7 @@ export class JobStepData implements IAgentDialogData {
 			scriptName: this.scriptName,
 			stepName: this.stepName,
 			subSystem: this.subSystem,
-			id: 1,
+			id: this.id,
 			failureAction: this.failureAction,
 			successAction: this.successAction,
 			failStepId: this.failStepId,
@@ -70,7 +80,26 @@ export class JobStepData implements IAgentDialogData {
 			retryInterval: this.retryInterval,
 			proxyName: this.proxyName
 		}).then(result => {
-			console.info(result);
+			if (result && result.success) {
+				console.info(result);
+			}
 		});
 	}
+
+	public validate(): { valid: boolean, errorMessages: string[] } {
+		let validationErrors: string[] = [];
+
+		if (!(this.stepName && this.stepName.trim())) {
+			validationErrors.push(this.CreateStepErrorMessage_StepNameIsEmpty);
+		}
+
+		if (!(this.jobName && this.jobName.trim())) {
+			validationErrors.push(this.CreateStepErrorMessage_JobNameIsEmpty);
+		}
+
+		return {
+			valid: validationErrors.length === 0,
+			errorMessages: validationErrors
+		};
+	}
 }

extensions/agent/src/dialogs/agentDialog.ts

@@ -49,10 +49,8 @@ export abstract class AgentDialog<T extends IAgentDialogData> {
 
 	protected async execute() {
 		this.updateModel();
-		let success = await this.model.save();
-		if (success) {
-			this._onSuccess.fire(this.model);
-		}
+		await this.model.save();
+		this._onSuccess.fire(this.model);
 	}
 
 	protected async cancel() {

extensions/agent/src/dialogs/jobDialog.ts

@@ -10,6 +10,7 @@ import { JobStepDialog } from './jobStepDialog';
 import { PickScheduleDialog } from './pickScheduleDialog';
 import { AlertDialog } from './alertDialog';
 import { AgentDialog } from './agentDialog';
+import { AgentUtils } from '../agentUtils';
 
 const localize = nls.loadMessageBundle();
 
@@ -62,6 +63,8 @@ export class JobDialog extends AgentDialog<JobData>  {
 	private readonly AlertsTopLabelString: string = localize('jobDialog.alertsList', 'Alerts list');
 	private readonly NewAlertButtonString: string = localize('jobDialog.newAlert', 'New Alert');
 	private readonly AlertNameLabelString: string = localize('jobDialog.alertNameLabel', 'Alert Name');
+	private readonly AlertEnabledLabelString: string = localize('jobDialog.alertEnabledLabel', 'Enabled');
+	private readonly AlertTypeLabelString: string = localize('jobDialog.alertTypeLabel', 'Type');
 
 	// UI Components
 	private generalTab: sqlops.window.modelviewdialog.DialogTab;
@@ -197,6 +200,8 @@ export class JobDialog extends AgentDialog<JobData>  {
 				.withProperties({
 					value: 'Feature Preview'
 				}).component();
+			let steps = this.model.jobSteps ? this.model.jobSteps : [];
+			let data = this.convertStepsToData(steps);
 			this.stepsTable = view.modelBuilder.table()
 				.withProperties({
 					columns: [
@@ -206,8 +211,8 @@ export class JobDialog extends AgentDialog<JobData>  {
 						this.StepsTable_SuccessColumnString,
 						this.StepsTable_FailureColumnString
 					],
-					data: [],
-					height: 430
+					data: data,
+					height: 750
 				}).component();
 
 			this.moveStepUpButton = view.modelBuilder.button()
@@ -230,10 +235,14 @@ export class JobDialog extends AgentDialog<JobData>  {
 				width: 80
 			}).component();
 
+			let stepDialog = new JobStepDialog(this.model.ownerUri, '' , data.length + 1, this.model);
+			stepDialog.onSuccess((step) => {
+				this.model.jobSteps.push(step);
+				this.stepsTable.data = this.convertStepsToData(this.model.jobSteps);
+			});
 			this.newStepButton.onDidClick((e)=>{
 				if (this.nameTextBox.value && this.nameTextBox.value.length > 0) {
-					let stepDialog = new JobStepDialog(this.model.ownerUri, this.nameTextBox.value, '' , 1, this.model);
-					stepDialog.openNewStepDialog();
+					stepDialog.openDialog();
 				} else {
 					this.dialog.message = { text: this.BlankJobNameErrorText };
 				}
@@ -250,6 +259,39 @@ export class JobDialog extends AgentDialog<JobData>  {
 			}).component();
 
 			this.stepsTable.enabled = false;
+			this.editStepButton.enabled = false;
+			this.deleteStepButton.enabled = false;
+
+			this.stepsTable.onRowSelected(() => {
+				// only let edit or delete steps if there's
+				// one step selection
+				if (this.stepsTable.selectedRows.length === 1) {
+					let rowNumber = this.stepsTable.selectedRows[0];
+					let stepData = steps[rowNumber];
+					this.deleteStepButton.enabled = true;
+					this.editStepButton.enabled = true;
+					this.editStepButton.onDidClick((e) => {
+						// implement edit steps
+
+						// let stepDialog = new JobStepDialog(this.model.ownerUri, this.nameTextBox.value, '' , 1, this.model);
+						// stepDialog.openNewStepDialog();
+					});
+
+					this.deleteStepButton.onDidClick((e) => {
+						AgentUtils.getAgentService().then((agentService) => {
+							let steps = this.model.jobSteps ? this.model.jobSteps : [];
+							agentService.deleteJobStep(this.ownerUri, stepData).then((result) => {
+								if (result && result.success) {
+									delete steps[rowNumber];
+									this.model.jobSteps = steps;
+									let data = this.convertStepsToData(steps);
+									this.stepsTable.data = data;
+								}
+							});
+						});
+					});
+				}
+			});
 
 			let formModel = view.modelBuilder.formContainer()
 				.withFormItems([{
@@ -271,12 +313,16 @@ export class JobDialog extends AgentDialog<JobData>  {
 			.withProperties({
 				value: 'Feature Preview'
 			}).component();
+			let alerts = this.model.alerts ? this.model.alerts : [];
+			let data = this.convertAlertsToData(alerts);
 			this.alertsTable = view.modelBuilder.table()
 				.withProperties({
 					columns: [
-						this.AlertNameLabelString
+						this.AlertNameLabelString,
+						this.AlertEnabledLabelString,
+						this.AlertTypeLabelString
 					],
-					data: [],
+					data: data,
 					height: 430,
 					width: 400
 				}).component();
@@ -312,10 +358,12 @@ export class JobDialog extends AgentDialog<JobData>  {
 			this.schedulesTable = view.modelBuilder.table()
 				.withProperties({
 					columns: [
-						this.ScheduleNameLabelString
+						PickScheduleDialog.SchedulesIDText,
+						PickScheduleDialog.ScheduleNameLabelText,
+						PickScheduleDialog.ScheduleDescription
 					],
 					data: [],
-					height: 430,
+					height: 750,
 					width: 420
 				}).component();
 
@@ -350,13 +398,11 @@ export class JobDialog extends AgentDialog<JobData>  {
 	}
 
 	private populateScheduleTable() {
-		if (this.model.jobSchedules) {
-			let data: any[][] = [];
-			for (let i = 0; i < this.model.jobSchedules.length; ++i) {
-				let schedule = this.model.jobSchedules[i];
-				data[i] = [ schedule.name ];
-			}
+		let schedules = this.model.jobSchedules ? this.model.jobSchedules : [];
+		let data = this.convertSchedulesToData(schedules);
+		if (data.length > 0) {
 			this.schedulesTable.data = data;
+			this.schedulesTable.height = 750;
 		}
 	}
 
@@ -466,6 +512,44 @@ export class JobDialog extends AgentDialog<JobData>  {
 		});
 	}
 
+	private convertStepsToData(jobSteps: sqlops.AgentJobStepInfo[]): any[][] {
+		let result = [];
+		jobSteps.forEach(jobStep => {
+			let cols = [];
+			cols.push(jobStep.id);
+			cols.push(jobStep.stepName);
+			cols.push(jobStep.subSystem);
+			cols.push(jobStep.successAction);
+			cols.push(jobStep.failureAction);
+			result.push(cols);
+		});
+		return result;
+	}
+
+	private convertSchedulesToData(jobSchedules: sqlops.AgentJobScheduleInfo[]): any[][] {
+		let result = [];
+		jobSchedules.forEach(schedule => {
+			let cols = [];
+			cols.push(schedule.id);
+			cols.push(schedule.name);
+			cols.push(schedule.description);
+			result.push(cols);
+		});
+		return result;
+	}
+
+	private convertAlertsToData(alerts: sqlops.AgentAlertInfo[]): any[][] {
+		let result = [];
+		alerts.forEach(alert => {
+			let cols = [];
+			cols.push(alert.name);
+			cols.push(alert.isEnabled);
+			cols.push(alert.alertType.toString());
+			result.push(cols);
+		});
+		return result;
+	}
+
 	protected updateModel() {
 		this.model.name = this.nameTextBox.value;
 		this.model.owner = this.ownerTextBox.value;

extensions/agent/src/dialogs/jobStepDialog.ts

@@ -9,11 +9,12 @@ import * as vscode from 'vscode';
 import { JobStepData } from '../data/jobStepData';
 import { AgentUtils } from '../agentUtils';
 import { JobData } from '../data/jobData';
+import { AgentDialog } from './agentDialog';
 const path = require('path');
 
 const localize = nls.loadMessageBundle();
 
-export class JobStepDialog {
+export class JobStepDialog extends AgentDialog<JobStepData> {
 
 	// TODO: localize
 	// Top level
@@ -67,7 +68,6 @@ export class JobStepDialog {
 	// UI Components
 
 	// Dialogs
-	private dialog: sqlops.window.modelviewdialog.Dialog;
 	private fileBrowserDialog: sqlops.window.modelviewdialog.Dialog;
 
 	// Dialog tabs
@@ -105,35 +105,27 @@ export class JobStepDialog {
 
 	private fileBrowserTree: sqlops.FileBrowserTreeComponent;
 	private jobModel: JobData;
-	private model: JobStepData;
-	private ownerUri: string;
 	private jobName: string;
 	private server: string;
 	private stepId: number;
 
 	constructor(
 		ownerUri: string,
-		jobName: string,
 		server: string,
 		stepId: number,
 		jobModel?: JobData
 	) {
-		this.model = new JobStepData(ownerUri);
+		super(ownerUri, new JobStepData(ownerUri, jobModel), 'New Step');
 		this.stepId = stepId;
-		this.ownerUri = ownerUri;
-		this.jobName = jobName;
+		this.jobName = jobModel.name;
 		this.server = server;
 		this.jobModel = jobModel;
 	}
 
 	private initializeUIComponents() {
-		this.dialog = sqlops.window.modelviewdialog.createDialog(this.DialogTitle);
 		this.generalTab = sqlops.window.modelviewdialog.createTab(this.GeneralTabText);
 		this.advancedTab = sqlops.window.modelviewdialog.createTab(this.AdvancedTabText);
 		this.dialog.content = [this.generalTab, this.advancedTab];
-		this.dialog.okButton.onClick(async () => await this.execute());
-		this.dialog.okButton.label = this.OkButtonText;
-		this.dialog.cancelButton.label = this.CancelButtonText;
 	}
 
 	private createCommands(view, queryProvider: sqlops.QueryProvider) {
@@ -478,7 +470,7 @@ export class JobStepDialog {
 		return outputFileForm;
 	}
 
-	protected execute() {
+	protected updateModel() {
 		this.model.stepName = this.nameTextBox.value;
 		if (!this.model.stepName || this.model.stepName.length === 0) {
 			this.dialog.message = this.dialog.message = { text: this.BlankStepNameErrorText };
@@ -499,12 +491,20 @@ export class JobStepDialog {
 		this.model.appendToLogFile = this.appendToExistingFileCheckbox.checked;
 	}
 
-	public async openNewStepDialog() {
+	public async initializeDialog() {
 		let databases = await AgentUtils.getDatabases(this.ownerUri);
 		let queryProvider = await AgentUtils.getQueryProvider();
 		this.initializeUIComponents();
 		this.createGeneralTab(databases, queryProvider);
 		this.createAdvancedTab();
-		sqlops.window.modelviewdialog.openDialog(this.dialog);
+		this.dialog.registerCloseValidator(() => {
+			this.updateModel();
+			let validationResult = this.model.validate();
+			if (!validationResult.valid) {
+				// TODO: Show Error Messages
+				console.error(validationResult.errorMessages.join(','));
+			}
+			return validationResult.valid;
+		});
 	}
 }

extensions/agent/src/dialogs/pickScheduleDialog.ts

@@ -18,8 +18,11 @@ export class PickScheduleDialog {
 	private readonly DialogTitle: string = localize('pickSchedule.jobSchedules', 'Job Schedules');
 	private readonly OkButtonText: string = localize('pickSchedule.ok', 'OK');
 	private readonly CancelButtonText: string = localize('pickSchedule.cancel', 'Cancel');
-	private readonly ScheduleNameLabelText: string = localize('pickSchedule.scheduleName', 'Schedule Name');
-	private readonly SchedulesLabelText: string = localize('pickSchedule.schedules', 'Schedules');
+	private readonly SchedulesLabelText: string = localize('pickSchedule.availableSchedules', 'Available Schedules:');
+	public static readonly ScheduleNameLabelText: string = localize('pickSchedule.scheduleName', 'Name');
+	public static readonly SchedulesIDText: string = localize('pickSchedule.scheduleID','ID');
+	public static readonly ScheduleDescription: string = localize('pickSchedule.description','Description');
+
 
 	// UI Components
 	private dialog: sqlops.window.modelviewdialog.Dialog;
@@ -50,11 +53,13 @@ export class PickScheduleDialog {
 			this.schedulesTable = view.modelBuilder.table()
 				.withProperties({
 					columns: [
-						this.ScheduleNameLabelText
+						PickScheduleDialog.SchedulesIDText,
+						PickScheduleDialog.ScheduleNameLabelText,
+						PickScheduleDialog.ScheduleDescription
 					],
 					data: [],
-					height: '80em',
-					width: '40em'
+					height: 750,
+					width: 430
 				}).component();
 
 			let formModel = view.modelBuilder.formContainer()
@@ -69,7 +74,7 @@ export class PickScheduleDialog {
 				let data: any[][] = [];
 				for (let i = 0; i < this.model.schedules.length; ++i) {
 					let schedule = this.model.schedules[i];
-					data[i] = [ schedule.name ];
+					data[i] = [ schedule.id, schedule.name, schedule.description ];
 				}
 				this.schedulesTable.data = data;
 			}

extensions/agent/src/interfaces.ts

@@ -13,5 +13,5 @@ export enum AgentDialogMode {
 export interface IAgentDialogData {
 	dialogMode: AgentDialogMode;
 	initialize(): void;
-	save(): void;
+	save(): Promise<void>;
 }

extensions/agent/src/mainController.ts

@@ -40,9 +40,9 @@ export class MainController {
             let dialog = new JobDialog(ownerUri, jobInfo);
             dialog.openDialog();
         });
-        vscode.commands.registerCommand('agent.openNewStepDialog', (ownerUri: string, jobId: string, server: string, stepId: number) => {
-			let dialog = new JobStepDialog(ownerUri, jobId, server, stepId);
-			dialog.openNewStepDialog();
+        vscode.commands.registerCommand('agent.openNewStepDialog', (ownerUri: string, server: string, stepId: number) => {
+			let dialog = new JobStepDialog(ownerUri, server, stepId);
+			dialog.openDialog();
         });
         vscode.commands.registerCommand('agent.openPickScheduleDialog', (ownerUri: string) => {
             let dialog = new PickScheduleDialog(ownerUri);
@@ -57,9 +57,8 @@ export class MainController {
             dialog.openDialog();
         });
         vscode.commands.registerCommand('agent.openProxyDialog', (ownerUri: string, proxyInfo: sqlops.AgentProxyInfo, credentials: sqlops.CredentialInfo[]) => {
-            //@TODO: reenable create proxy after snapping July release (7/14/18)
-            // let dialog = new ProxyDialog(ownerUri, proxyInfo, credentials);
-            // dialog.openDialog();
+            let dialog = new ProxyDialog(ownerUri, proxyInfo, credentials);
+            dialog.openDialog();
             MainController.showNotYetImplemented();
         });
     }

extensions/azurecore/README.md

@@ -0,0 +1,21 @@
+# Azure (Core) extension for Azure Data Studio
+
+Welcome to the Azure (Core) extension for Azure Data Studio! This extension supports core Azure functionality such as browsing and connecting to Azure data endpoints. In the current release the following features are supported:
+
+* Log in to Azure and browse your accounts, subscriptions and data resources
+* See Azure SQL Databases and Servers in the tree, and open these connections in Object Explorer
+* Filter the list of subscriptions for a given account, to make finding specific databases easier
+
+## Code of Conduct
+
+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.
+
+## Privacy Statement
+
+The [Microsoft Enterprise and Developer Privacy Statement](https://privacy.microsoft.com/en-us/privacystatement) describes the privacy statement of this software.
+
+## License
+
+Copyright (c) Microsoft Corporation. All rights reserved.
+
+Licensed under the [Source EULA](https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt).

extensions/azurecore/package.json

@@ -0,0 +1,162 @@
+{
+	"name": "azurecore",
+	"displayName": "%azure.displayName%",
+	"description": "%azure.description",
+	"version": "0.1.0",
+	"publisher": "Microsoft",
+	"preview": true,
+	"engines": {
+		"vscode": "^1.25.0",
+		"sqlops": "*"
+	},
+	"activationEvents": [
+		"*"
+	],
+	"main": "./out/extension",
+	"contributes": {
+		"configuration": [
+			{
+				"type": "object",
+				"title": "%azure.config.title%",
+				"properties": {
+					"azureResource.resourceFilter": {
+						"type": "array",
+						"default": null,
+						"description": "%azure.resourceFilter.description%"
+					}
+				}
+			},
+			{
+				"type": "object",
+				"title": "Azure Account Configuration",
+				"properties": {
+					"accounts.azure.enablePublicCloud": {
+						"type": "boolean",
+						"default": true,
+						"description": "%config.enablePublicCloudDescription%"
+					}
+				}
+			}
+		],
+		"account-type": [
+			{
+				"id": "microsoft",
+				"icon": {
+					"light": "./out/account-provider/media/microsoft_account_light.svg",
+					"dark": "./out/account-provider/media/microsoft_account_dark.svg"
+				}
+			},
+			{
+				"id": "work_school",
+				"icon": {
+					"light": "./out/account-provider/media/work_school_account_light.svg",
+					"dark": "./out/account-provider/media/work_school_account_dark.svg"
+				}
+			}
+		],
+		"commands": [
+			{
+				"command": "accounts.clearTokenCache",
+				"title": "%accounts.clearTokenCache%",
+				"category": "Azure Accounts"
+			},
+			{
+				"command": "azureresource.refreshall",
+				"title": "%azureresource.refreshall%",
+				"icon": {
+					"dark": "resources/dark/refresh_inverse.svg",
+					"light": "resources/light/refresh.svg"
+				}
+			},
+			{
+				"command": "azureresource.refresh",
+				"title": "%azureresource.refresh%",
+				"icon": {
+					"dark": "resources/dark/refresh_inverse.svg",
+					"light": "resources/light/refresh.svg"
+				}
+			},
+			{
+				"command": "azureresource.signin",
+				"title": "%azureresource.signin%"
+			},
+			{
+				"command": "azureresource.connectsqldb",
+				"title": "%azureresource.connectsqldb%",
+				"icon": {
+					"dark": "resources/dark/connect_to_inverse.svg",
+					"light": "resources/light/connect_to.svg"
+				}
+			},
+			{
+				"command": "azureresource.selectsubscriptions",
+				"title": "%azureresource.selectsubscriptions%",
+				"icon": {
+					"dark": "resources/dark/filter_inverse.svg",
+					"light": "resources/light/filter.svg"
+				}
+			}
+		],
+		"viewsContainers": {
+			"activitybar": [
+				{
+					"id": "azureResource",
+					"title": "%azure.title%",
+					"icon": "resources/azure.svg"
+				}
+			]
+		},
+		"views": {
+			"azureResource": [
+				{
+					"id": "azureResourceExplorer",
+					"name": "%azure.resourceExplorer.title%"
+				}
+			]
+		},
+		"menus": {
+			"view/title": [
+				{
+					"command": "azureresource.refreshall",
+					"when": "view == azureResourceExplorer",
+					"group": "navigation@1"
+				}
+			],
+			"view/item/context": [
+				{
+					"command": "azureresource.connectsqldb",
+					"when": "viewItem =~ /^azureResource.itemType.database/ && viewItem != azureResource.itemType.databaseContainer && viewItem != azureResource.itemType.databaseServerContainer",
+					"group": "1azureresource@1"
+				},
+				{
+					"command": "azureresource.connectsqldb",
+					"when": "viewItem =~ /^azureResource.itemType.database/ && viewItem != azureResource.itemType.databaseContainer && viewItem != azureResource.itemType.databaseServerContainer",
+					"group": "inline"
+				},
+				{
+					"command": "azureresource.selectsubscriptions",
+					"when": "viewItem == azureResource.itemType.account",
+					"group": "inline"
+				},
+				{
+					"command": "azureresource.refresh",
+					"when": "viewItem != azureResource.itemType.database && viewItem != azureResource.itemType.databaseServer && viewItem != azureResource.itemType.message",
+					"group": "inline"
+				}
+			]
+		}
+	},
+	"dependencies": {
+		"request": "2.63.0",
+		"azure-arm-resource": "^7.0.0",
+		"azure-arm-sql": "^5.0.1",
+		"vscode-nls": "^4.0.0"
+	},
+	"devDependencies": {
+		"@types/mocha": "^5.2.5",
+		"@types/node": "^8.0.24",
+		"mocha": "^5.2.0",
+		"should": "^13.2.1",
+		"typemoq": "^2.1.0"
+	}
+}

extensions/azurecore/package.nls.json

@@ -0,0 +1,18 @@
+{
+	"azure.displayName": "Azure (Core)",
+	"azure.description": "Browse and work with Azure resources",
+	"azure.config.title": "Azure Resource Configuration",
+	"azure.resourceFilter.description": "The resource filter, each element is an account id, a subscription id and name separated by a slash",
+	"azureresource.refreshall": "Refresh All",
+	"azureresource.refresh": "Refresh",
+	"azureresource.signin": "Sign In",
+	"azureresource.connectsqldb": "Connect",
+	"azureresource.selectsubscriptions": "Select Subscriptions",
+	"azure.title": "Azure",
+	"azure.resourceExplorer.title": "Resource Explorer",
+	"accounts.clearTokenCache": "Clear Azure Account Token Cache",
+	"config.enablePublicCloudDescription": "Should Azure public cloud integration be enabled",
+	"config.enableUsGovCloudDescription": "Should US Government Azure cloud (Fairfax) integration be enabled",
+	"config.enableChinaCloudDescription": "Should Azure China integration be enabled",
+	"config.enableGermanyCloudDescription": "Should Azure Germany integration be enabled"
+}

extensions/azurecore/resources/azure.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="28" width="28" version="1.1" viewBox="0 0 50 50" xmlns="http://www.w3.org/2000/svg">
+  <g>
+    <path fill="#0072C6" d="M11.423,44.326l23.623-4.156L22.894,25.748l6.328-17.346L50,44.33L11.423,44.326z M27.566,5.67L11.469,40.109v-0.034H0l12.717-21.975L27.566,5.67z" />
+  </g>
+</svg>

extensions/azurecore/resources/dark/account_inverse.svg

@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#fff;}</style></defs><title>account_inverse</title><path class="cls-1" d="M8,.11a7.71,7.71,0,1,0,7.72,7.72A7.73,7.73,0,0,0,8,.11ZM4.2,13.36a4,4,0,0,1,.13-.93,3.69,3.69,0,0,1,1-1.66A3.56,3.56,0,0,1,6,10.19a4,4,0,0,1,.9-.38,4.17,4.17,0,0,1,1-.13A3.79,3.79,0,0,1,9.43,10a3.61,3.61,0,0,1,2,2,3.74,3.74,0,0,1,.29,1.47A6.62,6.62,0,0,1,8,14.54,6.71,6.71,0,0,1,4.2,13.36Zm2-5a2.76,2.76,0,0,1-.54-.79,2.43,2.43,0,0,1-.19-1,2.4,2.4,0,0,1,.19-1,2.82,2.82,0,0,1,.54-.8A2.81,2.81,0,0,1,7,4.25a2.4,2.4,0,0,1,1-.19,2.43,2.43,0,0,1,1,.19,2.76,2.76,0,0,1,.79.54,2.46,2.46,0,0,1,.54.8,2.4,2.4,0,0,1,.2,1,2.44,2.44,0,0,1-.2,1A2.59,2.59,0,0,1,8.92,8.86a2.44,2.44,0,0,1-1,.2,2.4,2.4,0,0,1-1-.2A2.46,2.46,0,0,1,6.18,8.32ZM12.3,13a4.39,4.39,0,0,0-.18-.89,4.22,4.22,0,0,0-.57-1.19A4.24,4.24,0,0,0,9.44,9.31a3.41,3.41,0,0,0,.68-.5A3.36,3.36,0,0,0,11,7.39a3.32,3.32,0,0,0,.11-.83,3.09,3.09,0,0,0-.24-1.22,3.26,3.26,0,0,0-.67-1,3,3,0,0,0-1-.67,3,3,0,0,0-1.22-.25,2.93,2.93,0,0,0-1.22.25A3.07,3.07,0,0,0,5.07,5.34a2.93,2.93,0,0,0-.25,1.22,3,3,0,0,0,.12.84,3,3,0,0,0,.32.76,3.3,3.3,0,0,0,.52.65,3.06,3.06,0,0,0,.68.5A4.41,4.41,0,0,0,5.27,10a4.1,4.1,0,0,0-.91,1,4.18,4.18,0,0,0-.58,1.18,4.41,4.41,0,0,0-.18.8A6.66,6.66,0,0,1,1.28,7.83,6.72,6.72,0,1,1,12.3,13Z"/></svg>

extensions/azurecore/resources/dark/connect_to_inverse.svg

@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16"><defs><style>.cls-1,.cls-2{clip-rule:evenodd;}.cls-2,.cls-5,.cls-7{fill:#fff;}.cls-3,.cls-5{fill-rule:evenodd;}.cls-4{clip-path:url(#clip-path);}.cls-6{clip-path:url(#clip-path-2);}</style><clipPath id="clip-path"><path class="cls-1" d="M11.5-15.92v3.5a3.4,3.4,0,0,1-.23,1.24,3.48,3.48,0,0,1-.63,1.05,3.57,3.57,0,0,1-1,.77A3.43,3.43,0,0,1,8.5-9v6h-1V-9a3.39,3.39,0,0,1-1.2-.4,3.59,3.59,0,0,1-.95-.77,3.48,3.48,0,0,1-.63-1.05,3.4,3.4,0,0,1-.23-1.24v-3.5h1v-3h1v3h3v-3h1v3Zm-1,1h-5v2.5a2.45,2.45,0,0,0,.2,1,2.53,2.53,0,0,0,.53.8,2.53,2.53,0,0,0,.8.53,2.45,2.45,0,0,0,1,.2,2.42,2.42,0,0,0,1-.2,2.53,2.53,0,0,0,.79-.53,2.59,2.59,0,0,0,.54-.8,2.41,2.41,0,0,0,.2-1Z"/></clipPath><clipPath id="clip-path-2"><path class="cls-2" d="M11.5,3V6.5a3.4,3.4,0,0,1-.23,1.24,3.48,3.48,0,0,1-.63,1.05,3.57,3.57,0,0,1-1,.77A3.43,3.43,0,0,1,8.5,10v6h-1V10a3.39,3.39,0,0,1-1.2-.4,3.59,3.59,0,0,1-.95-.77,3.48,3.48,0,0,1-.63-1.05A3.4,3.4,0,0,1,4.5,6.5V3h1V0h1V3h3V0h1V3Zm-1,1h-5V6.5a2.45,2.45,0,0,0,.2,1A2.49,2.49,0,0,0,7,8.8,2.45,2.45,0,0,0,8,9a2.42,2.42,0,0,0,1-.2,2.53,2.53,0,0,0,.79-.53,2.59,2.59,0,0,0,.54-.8,2.41,2.41,0,0,0,.2-1Z"/></clipPath></defs><title>connect_to_inverse</title><path class="cls-3" d="M11.5-15.92v3.5a3.4,3.4,0,0,1-.23,1.24,3.48,3.48,0,0,1-.63,1.05,3.57,3.57,0,0,1-1,.77A3.43,3.43,0,0,1,8.5-9v6h-1V-9a3.39,3.39,0,0,1-1.2-.4,3.59,3.59,0,0,1-.95-.77,3.48,3.48,0,0,1-.63-1.05,3.4,3.4,0,0,1-.23-1.24v-3.5h1v-3h1v3h3v-3h1v3Zm-1,1h-5v2.5a2.45,2.45,0,0,0,.2,1,2.53,2.53,0,0,0,.53.8,2.53,2.53,0,0,0,.8.53,2.45,2.45,0,0,0,1,.2,2.42,2.42,0,0,0,1-.2,2.53,2.53,0,0,0,.79-.53,2.59,2.59,0,0,0,.54-.8,2.41,2.41,0,0,0,.2-1Z"/><g class="cls-4"><rect x="-0.5" y="-23.92" width="17" height="26"/></g><path class="cls-5" d="M11.5,3V6.5a3.4,3.4,0,0,1-.23,1.24,3.48,3.48,0,0,1-.63,1.05,3.57,3.57,0,0,1-1,.77A3.43,3.43,0,0,1,8.5,10v6h-1V10a3.39,3.39,0,0,1-1.2-.4,3.59,3.59,0,0,1-.95-.77,3.48,3.48,0,0,1-.63-1.05A3.4,3.4,0,0,1,4.5,6.5V3h1V0h1V3h3V0h1V3Zm-1,1h-5V6.5a2.45,2.45,0,0,0,.2,1A2.49,2.49,0,0,0,7,8.8,2.45,2.45,0,0,0,8,9a2.42,2.42,0,0,0,1-.2,2.53,2.53,0,0,0,.79-.53,2.59,2.59,0,0,0,.54-.8,2.41,2.41,0,0,0,.2-1Z"/><g class="cls-6"><rect class="cls-7" x="-0.5" y="-5" width="17" height="26"/></g></svg>

extensions/azurecore/resources/dark/filter_inverse.svg

@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{font-size:12px;font-family:FullMDL2Assets, Full MDL2 Assets;}.cls-1,.cls-2{fill:#fff;}</style></defs><title>filter_inverse_16x16</title><text class="cls-1" transform="translate(0.03 12.1)"> </text><path class="cls-2" d="M.05,1.63H16V3.33l-6,6v6.27H6V9.31l-6-6ZM15,2.91V2.62H1v.29l6,6v5.69H9V8.89Z"/></svg>

extensions/azurecore/resources/dark/folder_inverse.svg

@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#231f20;}.cls-2{fill:#fff;}</style></defs><title>folder_inverse_16x16</title><polygon class="cls-1" points="13.59 2.34 13.58 2.35 13.58 2.33 13.59 2.34"/><text></text><path class="cls-2" d="M16,14.13H0v-12a1,1,0,0,1,.08-.39,1,1,0,0,1,.53-.53A1,1,0,0,1,1,1.13H4.75a2.16,2.16,0,0,1,.61.07,2.26,2.26,0,0,1,.45.18,2.14,2.14,0,0,1,.36.24l.32.24a1.8,1.8,0,0,0,.34.18,1.12,1.12,0,0,0,.43.07H15a1,1,0,0,1,.39.08,1,1,0,0,1,.53.53,1,1,0,0,1,.08.39ZM1,2.13v1H4.75a1.36,1.36,0,0,0,.33,0A1,1,0,0,0,5.34,3l.23-.16.25-.21-.25-.21-.23-.16a1,1,0,0,0-.26-.1,1.36,1.36,0,0,0-.33,0Zm14,11v-10H7.25a1.12,1.12,0,0,0-.43.07,1.8,1.8,0,0,0-.34.18l-.32.24a2.14,2.14,0,0,1-.36.24,2.26,2.26,0,0,1-.45.18,2.16,2.16,0,0,1-.61.07H1v9Z"/></svg>

extensions/azurecore/resources/dark/refresh_inverse.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M13.451 5.609l-.579-.939-1.068.812-.076.094c-.335.415-.927 1.341-1.124 2.876l-.021.165.033.163.071.345c0 1.654-1.346 3-3 3-.795 0-1.545-.311-2.107-.868-.563-.567-.873-1.317-.873-2.111 0-1.431 1.007-2.632 2.351-2.929v2.926s2.528-2.087 2.984-2.461h.012l3.061-2.582-4.919-4.1h-1.137v2.404c-3.429.318-6.121 3.211-6.121 6.721 0 1.809.707 3.508 1.986 4.782 1.277 1.282 2.976 1.988 4.784 1.988 3.722 0 6.75-3.028 6.75-6.75 0-1.245-.349-2.468-1.007-3.536z" fill="#2D2D30"/><path d="M12.6 6.134l-.094.071c-.269.333-.746 1.096-.91 2.375.057.277.092.495.092.545 0 2.206-1.794 4-4 4-1.098 0-2.093-.445-2.817-1.164-.718-.724-1.163-1.718-1.163-2.815 0-2.206 1.794-4 4-4l.351.025v1.85s1.626-1.342 1.631-1.339l1.869-1.577-3.5-2.917v2.218l-.371-.03c-3.176 0-5.75 2.574-5.75 5.75 0 1.593.648 3.034 1.695 4.076 1.042 1.046 2.482 1.694 4.076 1.694 3.176 0 5.75-2.574 5.75-5.75-.001-1.106-.318-2.135-.859-3.012z" fill="#C5C5C5"/></svg>

extensions/azurecore/resources/dark/sql_database_inverse.svg

@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#fff;}</style></defs><title>sql_database_inverse</title><g id="iconBg"><rect class="cls-1" x="8" y="8" width="1.12" height="3.35"/><path class="cls-1" d="M7.75.13C4.25.13,1.3,1.34,1.3,2.59V13.3c0,1.36,3.67,2.57,7.13,2.57s6.27-1.15,6.27-2.46V2.7C14.7,1.39,11.26.13,7.75.13ZM5.77,8H3.53V9.12H5.77v3.35H2.42V11.35H4.65V10.23H2.42V6.89H5.77Zm-.5-4.51L5,3.42a5.74,5.74,0,0,1-.7-.23,1.92,1.92,0,0,1-.56-.33.51.51,0,0,1-.2-.37c0-.69,2-1.25,4.46-1.25s4.47.56,4.47,1.25a.51.51,0,0,1-.2.37,1.92,1.92,0,0,1-.56.33,6.38,6.38,0,0,1-.7.23l-.31.07-.6.11A13.55,13.55,0,0,1,8,3.75a13.55,13.55,0,0,1-2.1-.15ZM11,14,9.44,12.47H6.88V6.89h3.35v4.79l1.51,1.51Zm2.63-1.51H11.35V6.89h1.11v4.46h1.12Z"/></g></svg>

extensions/azurecore/resources/dark/sql_server_inverse.svg

@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#fff;}</style></defs><title>sql_server_inverse</title><path id="iconBg" class="cls-1" d="M6.43.14C3,.14.15,1.31.15,2.53V13c0,1.32,3.58,2.49,6.94,2.49a12.79,12.79,0,0,0,1.41-.07,4.86,4.86,0,0,1-1.77-3.24H5.59V6.71H8.85v.82A4.88,4.88,0,0,1,9.93,7v-.3H11v0a4.94,4.94,0,0,1,.54,0,4.86,4.86,0,0,1,1.63.3V2.63C13.19,1.36,9.84.14,6.43.14ZM4.5,7.79H2.33V8.88H4.5v3.26H1.24V11H3.41V10H1.24V6.71H4.5ZM6.64,3.65c-2.4,0-4.34-.55-4.34-1.22S4.24,1.21,6.64,1.21,11,1.75,11,2.43,9,3.65,6.64,3.65Zm0,4.14V11h.06a4.87,4.87,0,0,1,1-2.49V7.79Zm4.89,2.72a1.09,1.09,0,1,0,1.09,1.09A1.08,1.08,0,0,0,11.56,10.51Zm0,0a1.09,1.09,0,1,0,1.09,1.09A1.08,1.08,0,0,0,11.56,10.51Zm0,0a1.09,1.09,0,1,0,1.09,1.09A1.08,1.08,0,0,0,11.56,10.51Zm0,0a1.09,1.09,0,1,0,1.09,1.09A1.08,1.08,0,0,0,11.56,10.51Zm4.29,1.63a3.18,3.18,0,0,0,.06-.54,3.3,3.3,0,0,0-.06-.55l-1.34-.17a2.85,2.85,0,0,0-.36-.86L15,8.95a4.79,4.79,0,0,0-.78-.78L13.14,9a2.85,2.85,0,0,0-.86-.36l-.17-1.34a3.31,3.31,0,0,0-.55-.06,3.31,3.31,0,0,0-.54.06l-.17,1.34A2.85,2.85,0,0,0,10,9L8.91,8.17a4.74,4.74,0,0,0-.77.78L9,10a3.13,3.13,0,0,0-.36.86L7.27,11a4.89,4.89,0,0,0,0,.55,5.12,5.12,0,0,0,0,.55l1.35.16a2.77,2.77,0,0,0,.36.87l-.84,1.07a4,4,0,0,0,.77.77L10,14.19a3.13,3.13,0,0,0,.86.36L11,15.89a5,5,0,0,0,.54.06,4.86,4.86,0,0,0,.55-.06l.17-1.34a3.13,3.13,0,0,0,.86-.36l1.07.83a4.37,4.37,0,0,0,.78-.77l-.84-1.07a3,3,0,0,0,.36-.87Zm-4.29,1.63a2.17,2.17,0,1,1,2.18-2.17A2.17,2.17,0,0,1,11.56,13.77Zm0-3.26a1.09,1.09,0,1,0,1.09,1.09A1.08,1.08,0,0,0,11.56,10.51Zm0,0a1.09,1.09,0,1,0,1.09,1.09A1.08,1.08,0,0,0,11.56,10.51Zm0,0a1.09,1.09,0,1,0,1.09,1.09A1.08,1.08,0,0,0,11.56,10.51Zm0,0a1.09,1.09,0,1,0,1.09,1.09A1.08,1.08,0,0,0,11.56,10.51Zm0,0a1.09,1.09,0,1,0,1.09,1.09A1.08,1.08,0,0,0,11.56,10.51Z"/></svg>

extensions/azurecore/resources/dark/subscription_inverse.svg

@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#fff;}</style></defs><title>subscription_inverse</title><path class="cls-1" d="M15.63,5.94A8.32,8.32,0,0,0,14.83,4a8.36,8.36,0,0,0-1.24-1.6A7.69,7.69,0,0,0,12,1.21,7.57,7.57,0,0,0,10.1.41a7.75,7.75,0,0,0-4.2,0A7.9,7.9,0,0,0,4,1.21,7.63,7.63,0,0,0,2.4,2.45,8,8,0,0,0,1.17,4a7.9,7.9,0,0,0-.8,1.89A7.76,7.76,0,0,0,.08,8a7.66,7.66,0,0,0,.28,2.1A7.9,7.9,0,0,0,1.17,12a7.71,7.71,0,0,0,1.24,1.6A8,8,0,0,0,4,14.88a7.78,7.78,0,0,0,1.9.79,7.71,7.71,0,0,0,4.19,0A7.55,7.55,0,0,0,12,14.88,8.1,8.1,0,0,0,14.83,12a8.32,8.32,0,0,0,.8-1.89A7.66,7.66,0,0,0,15.92,8,7.76,7.76,0,0,0,15.63,5.94Zm-1.09,3.9a6.87,6.87,0,0,1-.69,1.62,6.5,6.5,0,0,1-1.06,1.38,7.07,7.07,0,0,1-1.37,1.06,7.21,7.21,0,0,1-1.62.68,6.64,6.64,0,0,1-3.61,0,6.85,6.85,0,0,1-1.62-.68A7.07,7.07,0,0,1,3.2,12.84a5.73,5.73,0,0,1-.9-1.13L5.92,8.1l2.25,2.25,4.5-4.5V8.31h.75V4.56H9.67v.75h2.47l-4,4L5.92,7l-4,4a6.92,6.92,0,0,1-.46-1.2A6.63,6.63,0,0,1,1.21,8a6.74,6.74,0,0,1,.24-1.8,6.48,6.48,0,0,1,.69-1.62A6.42,6.42,0,0,1,3.2,3.24,7.07,7.07,0,0,1,4.57,2.18,6.85,6.85,0,0,1,6.2,1.5a6.91,6.91,0,0,1,3.61,0,7.21,7.21,0,0,1,1.62.68A7.07,7.07,0,0,1,12.8,3.24a6.76,6.76,0,0,1,1.06,1.38,6.87,6.87,0,0,1,.69,1.62A6.74,6.74,0,0,1,14.79,8,6.63,6.63,0,0,1,14.55,9.84Z"/></svg>

extensions/azurecore/resources/light/account.svg

@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><title>account</title><path d="M8,.52a7.71,7.71,0,1,0,7.72,7.72A7.73,7.73,0,0,0,8,.52ZM4.2,13.77a4,4,0,0,1,.13-.93,3.69,3.69,0,0,1,1-1.66A3.56,3.56,0,0,1,6,10.6a4,4,0,0,1,.9-.38,4.17,4.17,0,0,1,1-.13,3.79,3.79,0,0,1,1.48.29,3.61,3.61,0,0,1,2,2,3.74,3.74,0,0,1,.29,1.47A6.62,6.62,0,0,1,8,15,6.71,6.71,0,0,1,4.2,13.77Zm2-5a2.76,2.76,0,0,1-.54-.79,2.43,2.43,0,0,1-.19-1,2.4,2.4,0,0,1,.19-1,2.82,2.82,0,0,1,.54-.8A2.81,2.81,0,0,1,7,4.66a2.4,2.4,0,0,1,1-.19,2.43,2.43,0,0,1,1,.19,2.76,2.76,0,0,1,.79.54,2.46,2.46,0,0,1,.54.8,2.4,2.4,0,0,1,.2,1,2.44,2.44,0,0,1-.2,1A2.59,2.59,0,0,1,8.92,9.27a2.44,2.44,0,0,1-1,.2,2.4,2.4,0,0,1-1-.2A2.46,2.46,0,0,1,6.18,8.73Zm6.12,4.66a4.39,4.39,0,0,0-.18-.89,4.22,4.22,0,0,0-.57-1.19A4.24,4.24,0,0,0,9.44,9.72a3.41,3.41,0,0,0,.68-.5A3.36,3.36,0,0,0,11,7.8,3.32,3.32,0,0,0,11.07,7a3.09,3.09,0,0,0-.24-1.22,3.26,3.26,0,0,0-.67-1,3,3,0,0,0-1-.67,3,3,0,0,0-1.22-.25,2.93,2.93,0,0,0-1.22.25A3.07,3.07,0,0,0,5.07,5.75,2.93,2.93,0,0,0,4.82,7a3,3,0,0,0,.12.84,3,3,0,0,0,.32.76,3.3,3.3,0,0,0,.52.65,3.06,3.06,0,0,0,.68.5,4.41,4.41,0,0,0-1.19.65,4.1,4.1,0,0,0-.91,1,4.18,4.18,0,0,0-.58,1.18,4.41,4.41,0,0,0-.18.8A6.66,6.66,0,0,1,1.28,8.24a6.72,6.72,0,1,1,11,5.15Z"/></svg>

extensions/azurecore/resources/light/connect_to.svg

@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16"><defs><style>.cls-1,.cls-2{clip-rule:evenodd;}.cls-2,.cls-5,.cls-7{fill:#fff;}.cls-3,.cls-5{fill-rule:evenodd;}.cls-4{clip-path:url(#clip-path);}.cls-6{clip-path:url(#clip-path-2);}</style><clipPath id="clip-path"><path class="cls-1" d="M11.5,3V6.5a3.4,3.4,0,0,1-.23,1.24,3.48,3.48,0,0,1-.63,1.05,3.57,3.57,0,0,1-1,.77A3.43,3.43,0,0,1,8.5,10v6h-1V10a3.39,3.39,0,0,1-1.2-.4,3.59,3.59,0,0,1-.95-.77,3.48,3.48,0,0,1-.63-1.05A3.4,3.4,0,0,1,4.5,6.5V3h1V0h1V3h3V0h1V3Zm-1,1h-5V6.5a2.45,2.45,0,0,0,.2,1A2.49,2.49,0,0,0,7,8.8,2.45,2.45,0,0,0,8,9a2.42,2.42,0,0,0,1-.2,2.53,2.53,0,0,0,.79-.53,2.59,2.59,0,0,0,.54-.8,2.41,2.41,0,0,0,.2-1Z"/></clipPath><clipPath id="clip-path-2"><path class="cls-2" d="M11.5,21.92v3.5a3.4,3.4,0,0,1-.23,1.24,3.48,3.48,0,0,1-.63,1.05,3.57,3.57,0,0,1-1,.77,3.43,3.43,0,0,1-1.19.4v6h-1v-6a3.39,3.39,0,0,1-1.2-.4,3.59,3.59,0,0,1-.95-.77,3.48,3.48,0,0,1-.63-1.05,3.4,3.4,0,0,1-.23-1.24v-3.5h1v-3h1v3h3v-3h1v3Zm-1,1h-5v2.5a2.45,2.45,0,0,0,.2,1A2.49,2.49,0,0,0,7,27.72a2.45,2.45,0,0,0,1,.2,2.42,2.42,0,0,0,1-.2,2.53,2.53,0,0,0,.79-.53,2.59,2.59,0,0,0,.54-.8,2.41,2.41,0,0,0,.2-1Z"/></clipPath></defs><title>connect_to</title><path class="cls-3" d="M11.5,3V6.5a3.4,3.4,0,0,1-.23,1.24,3.48,3.48,0,0,1-.63,1.05,3.57,3.57,0,0,1-1,.77A3.43,3.43,0,0,1,8.5,10v6h-1V10a3.39,3.39,0,0,1-1.2-.4,3.59,3.59,0,0,1-.95-.77,3.48,3.48,0,0,1-.63-1.05A3.4,3.4,0,0,1,4.5,6.5V3h1V0h1V3h3V0h1V3Zm-1,1h-5V6.5a2.45,2.45,0,0,0,.2,1A2.49,2.49,0,0,0,7,8.8,2.45,2.45,0,0,0,8,9a2.42,2.42,0,0,0,1-.2,2.53,2.53,0,0,0,.79-.53,2.59,2.59,0,0,0,.54-.8,2.41,2.41,0,0,0,.2-1Z"/><g class="cls-4"><rect x="-0.5" y="-5" width="17" height="26"/></g><path class="cls-5" d="M11.5,21.92v3.5a3.4,3.4,0,0,1-.23,1.24,3.48,3.48,0,0,1-.63,1.05,3.57,3.57,0,0,1-1,.77,3.43,3.43,0,0,1-1.19.4v6h-1v-6a3.39,3.39,0,0,1-1.2-.4,3.59,3.59,0,0,1-.95-.77,3.48,3.48,0,0,1-.63-1.05,3.4,3.4,0,0,1-.23-1.24v-3.5h1v-3h1v3h3v-3h1v3Zm-1,1h-5v2.5a2.45,2.45,0,0,0,.2,1A2.49,2.49,0,0,0,7,27.72a2.45,2.45,0,0,0,1,.2,2.42,2.42,0,0,0,1-.2,2.53,2.53,0,0,0,.79-.53,2.59,2.59,0,0,0,.54-.8,2.41,2.41,0,0,0,.2-1Z"/><g class="cls-6"><rect class="cls-7" x="-0.5" y="13.92" width="17" height="26"/></g></svg>

extensions/azurecore/resources/light/filter.svg

@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{font-size:12px;font-family:FullMDL2Assets, Full MDL2 Assets;}</style></defs><title>filter_16x16</title><text class="cls-1" transform="translate(0 12)"> </text><path d="M0,1.53H16V3.24l-6,6v6.27H6V9.22l-6-6ZM15,2.82V2.53H1v.29l6,6v5.69H9V8.8Z"/></svg>

extensions/azurecore/resources/light/folder.svg

@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#231f20;}</style></defs><title>folder_16x16</title><polygon class="cls-1" points="13.59 2.21 13.58 2.22 13.58 2.2 13.59 2.21"/><text></text><path d="M16,14H0V2a1,1,0,0,1,.08-.39,1,1,0,0,1,.53-.53A1,1,0,0,1,1,1H4.75a2.16,2.16,0,0,1,.61.07,2.26,2.26,0,0,1,.45.18,2.14,2.14,0,0,1,.36.24l.32.24a1.8,1.8,0,0,0,.34.18A1.12,1.12,0,0,0,7.25,2H15a1,1,0,0,1,.39.08,1,1,0,0,1,.53.53A1,1,0,0,1,16,3ZM1,2V3H4.75a1.36,1.36,0,0,0,.33,0,1,1,0,0,0,.26-.1l.23-.16.25-.21-.25-.21-.23-.16A1,1,0,0,0,5.08,2a1.36,1.36,0,0,0-.33,0ZM15,13V3H7.25a1.12,1.12,0,0,0-.43.07,1.8,1.8,0,0,0-.34.18l-.32.24a2.14,2.14,0,0,1-.36.24,2.26,2.26,0,0,1-.45.18A2.16,2.16,0,0,1,4.75,4H1v9Z"/></svg>

extensions/azurecore/resources/light/refresh.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M13.451 5.609l-.579-.939-1.068.812-.076.094c-.335.415-.927 1.341-1.124 2.876l-.021.165.033.163.071.345c0 1.654-1.346 3-3 3-.795 0-1.545-.311-2.107-.868-.563-.567-.873-1.317-.873-2.111 0-1.431 1.007-2.632 2.351-2.929v2.926s2.528-2.087 2.984-2.461h.012l3.061-2.582-4.919-4.1h-1.137v2.404c-3.429.318-6.121 3.211-6.121 6.721 0 1.809.707 3.508 1.986 4.782 1.277 1.282 2.976 1.988 4.784 1.988 3.722 0 6.75-3.028 6.75-6.75 0-1.245-.349-2.468-1.007-3.536z" fill="#F6F6F6"/><path d="M12.6 6.134l-.094.071c-.269.333-.746 1.096-.91 2.375.057.277.092.495.092.545 0 2.206-1.794 4-4 4-1.098 0-2.093-.445-2.817-1.164-.718-.724-1.163-1.718-1.163-2.815 0-2.206 1.794-4 4-4l.351.025v1.85s1.626-1.342 1.631-1.339l1.869-1.577-3.5-2.917v2.218l-.371-.03c-3.176 0-5.75 2.574-5.75 5.75 0 1.593.648 3.034 1.695 4.076 1.042 1.046 2.482 1.694 4.076 1.694 3.176 0 5.75-2.574 5.75-5.75-.001-1.106-.318-2.135-.859-3.012z" fill="#424242"/></svg>

extensions/azurecore/resources/light/sql_database.svg

@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#212121;}.cls-2{fill:#fff;}</style></defs><title>sql_database</title><g id="iconBg"><path class="cls-1" d="M8,8H9.12v3.35H8Z"/><path class="cls-1" d="M7.75.13C4.25.13,1.3,1.34,1.3,2.59V13.3c0,1.36,3.67,2.56,7.12,2.56s6.27-1.15,6.27-2.46V2.7C14.7,1.39,11.26.13,7.75.13ZM8,1.24c2.46,0,4.46.56,4.46,1.25S10.43,3.74,8,3.74,3.5,3.18,3.5,2.49,5.5,1.24,8,1.24ZM5.77,8H3.54V9.12H5.77v3.35H2.42V11.35H4.65V10.23H2.42V6.88H5.77ZM11,14,9.44,12.46H6.88V6.88h3.35v4.79l1.51,1.51Zm2.63-1.51H11.35V6.88h1.12v4.46h1.12Z"/></g><g id="iconFg"><path class="cls-2" d="M3.54,8V9.12H5.77v3.35H2.42V11.35H4.65V10.23H2.42V6.88H5.77V8ZM11,14,9.44,12.46H6.88V6.88h3.35v4.79l1.51,1.51ZM8,11.35H9.12V8H8Zm4.46,0V6.88H11.35v5.58h2.23V11.35Zm-9-8.86c0,.69,2,1.25,4.46,1.25s4.46-.56,4.46-1.25S10.43,1.23,8,1.23,3.5,1.8,3.5,2.49Z"/></g></svg>

extensions/azurecore/resources/light/sql_server.svg

@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#212121;}.cls-2{fill:#fff;}</style></defs><title>sql_server</title><path id="iconBg" class="cls-1" d="M6.72,12.14H5.58V6.71H8.84v.83A4.85,4.85,0,0,1,9.93,7v-.3H11v.05a5,5,0,0,1,.54-.05,4.83,4.83,0,0,1,1.63.3V2.63c0-1.27-3.35-2.5-6.76-2.5S.15,1.31.15,2.53V13c0,1.32,3.57,2.5,6.94,2.5.49,0,1,0,1.41-.07A4.86,4.86,0,0,1,6.72,12.14ZM6.64,1.21C9,1.21,11,1.75,11,2.43S9,3.65,6.64,3.65,2.29,3.1,2.29,2.43,4.24,1.21,6.64,1.21ZM4.5,7.79H2.32V8.88H4.5v3.26H1.24V11.05H3.41V10H1.24V6.71H4.5Zm2.23,3.26H6.67V7.79H7.76v.76A4.84,4.84,0,0,0,6.72,11.05Zm7.79,1.26a3.06,3.06,0,0,1-.36.86L15,14.24a4.32,4.32,0,0,1-.77.77l-1.07-.83a3,3,0,0,1-.86.36l-.17,1.34a4.17,4.17,0,0,1-.55.06,4.14,4.14,0,0,1-.55-.06l-.17-1.34a3,3,0,0,1-.86-.36L8.91,15a4.32,4.32,0,0,1-.77-.77L9,13.18a3,3,0,0,1-.36-.86l-1.34-.17a4,4,0,0,1-.06-.55A4.14,4.14,0,0,1,7.27,11l1.34-.17A3,3,0,0,1,9,10L8.14,8.95a4.32,4.32,0,0,1,.77-.77L10,9a3,3,0,0,1,.86-.36L11,7.31a4.14,4.14,0,0,1,.55-.06,4.14,4.14,0,0,1,.55.06l.17,1.34a3,3,0,0,1,.86.36l1.07-.83a4.32,4.32,0,0,1,.77.77L14.15,10a3,3,0,0,1,.36.86l1.34.17a4.14,4.14,0,0,1,.06.55,4.14,4.14,0,0,1-.06.55ZM11.56,9.42a2.17,2.17,0,1,0,2.17,2.17,2.17,2.17,0,0,0-2.17-2.17Zm0,1.09a1.09,1.09,0,1,0,1.09,1.09A1.09,1.09,0,0,0,11.56,10.51Z"/><g id="iconFg"><path class="cls-2" d="M9.93,6.71H11v.05A4.87,4.87,0,0,0,9.93,7ZM6.64,3.65C9,3.65,11,3.1,11,2.43S9,1.2,6.64,1.2s-4.34.55-4.34,1.22S4.24,3.65,6.64,3.65ZM1.24,6.71V10H3.41v1.09H1.24v1.09H4.5V8.88H2.32V7.79H4.5V6.71ZM6.67,11.6a5,5,0,0,1,.05-.54H6.67V7.79H7.76v.76a4.92,4.92,0,0,1,1.09-1V6.71H5.58v5.43H6.72A5,5,0,0,1,6.67,11.6Z"/></g></svg>

extensions/azurecore/resources/light/subscription.svg

@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><title>subscription</title><path d="M15.63,5.9A8.32,8.32,0,0,0,14.83,4a8.36,8.36,0,0,0-1.24-1.6A7.69,7.69,0,0,0,12,1.17,7.57,7.57,0,0,0,10.1.37a7.75,7.75,0,0,0-4.2,0A7.9,7.9,0,0,0,4,1.17,7.63,7.63,0,0,0,2.4,2.41,8,8,0,0,0,1.17,4,7.9,7.9,0,0,0,.37,5.9,7.76,7.76,0,0,0,.08,8a7.66,7.66,0,0,0,.28,2.1A7.9,7.9,0,0,0,1.17,12a7.71,7.71,0,0,0,1.24,1.6A8,8,0,0,0,4,14.84a7.78,7.78,0,0,0,1.9.79,7.71,7.71,0,0,0,4.19,0A7.55,7.55,0,0,0,12,14.84,8.1,8.1,0,0,0,14.83,12a8.32,8.32,0,0,0,.8-1.89A7.66,7.66,0,0,0,15.92,8,7.76,7.76,0,0,0,15.63,5.9ZM14.55,9.8a6.87,6.87,0,0,1-.69,1.62A6.5,6.5,0,0,1,12.8,12.8a7.07,7.07,0,0,1-1.37,1.06,7.21,7.21,0,0,1-1.62.68,6.64,6.64,0,0,1-3.61,0,6.85,6.85,0,0,1-1.62-.68A7.07,7.07,0,0,1,3.2,12.8a5.73,5.73,0,0,1-.9-1.13L5.92,8.06l2.25,2.25,4.5-4.5V8.27h.75V4.52H9.67v.75h2.47l-4,4L5.92,7l-4,4a6.92,6.92,0,0,1-.46-1.2A6.63,6.63,0,0,1,1.21,8a6.74,6.74,0,0,1,.24-1.8,6.48,6.48,0,0,1,.69-1.62A6.42,6.42,0,0,1,3.2,3.2,7.07,7.07,0,0,1,4.57,2.14,6.85,6.85,0,0,1,6.2,1.46a6.91,6.91,0,0,1,3.61,0,7.21,7.21,0,0,1,1.62.68A7.07,7.07,0,0,1,12.8,3.2a6.76,6.76,0,0,1,1.06,1.38,6.87,6.87,0,0,1,.69,1.62A6.74,6.74,0,0,1,14.79,8,6.63,6.63,0,0,1,14.55,9.8Z"/></svg>

extensions/azurecore/src/account-provider/azureAccountProviderService.ts

@@ -20,7 +20,7 @@ let localize = nls.loadMessageBundle();
 
 export class AzureAccountProviderService implements vscode.Disposable {
 	// CONSTANTS ///////////////////////////////////////////////////////////////
-	private static CommandClearTokenCache = 'accounts.azure.clearTokenCache';
+	private static CommandClearTokenCache = 'accounts.clearTokenCache';
 	private static ConfigurationSection = 'accounts.azure';
 	private static CredentialNamespace = 'azureAccountProviderCredentials';
 

extensions/azurecore/src/apiWrapper.ts

@@ -0,0 +1,225 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 vscode from 'vscode';
+import * as sqlops from 'sqlops';
+
+import * as constants from './constants';
+
+/**
+ * Wrapper class to act as a facade over VSCode and Data APIs and allow us to test / mock callbacks into
+ * this API from our code
+ *
+ * @export
+ * @class ApiWrapper
+ */
+export class ApiWrapper {
+	// Data APIs
+	public registerConnectionProvider(provider: sqlops.ConnectionProvider): vscode.Disposable {
+		return sqlops.dataprotocol.registerConnectionProvider(provider);
+	}
+
+	public registerObjectExplorerProvider(provider: sqlops.ObjectExplorerProvider): vscode.Disposable {
+		return sqlops.dataprotocol.registerObjectExplorerProvider(provider);
+	}
+
+	public registerTaskServicesProvider(provider: sqlops.TaskServicesProvider): vscode.Disposable {
+		return sqlops.dataprotocol.registerTaskServicesProvider(provider);
+	}
+
+	public registerFileBrowserProvider(provider: sqlops.FileBrowserProvider): vscode.Disposable {
+		return sqlops.dataprotocol.registerFileBrowserProvider(provider);
+	}
+
+	public registerCapabilitiesServiceProvider(provider: sqlops.CapabilitiesProvider): vscode.Disposable {
+		return sqlops.dataprotocol.registerCapabilitiesServiceProvider(provider);
+	}
+
+	public registerModelViewProvider(widgetId: string, handler: (modelView: sqlops.ModelView) => void): void {
+		return sqlops.ui.registerModelViewProvider(widgetId, handler);
+	}
+
+	public registerWebviewProvider(widgetId: string, handler: (webview: sqlops.DashboardWebview) => void): void {
+		return sqlops.dashboard.registerWebviewProvider(widgetId, handler);
+	}
+
+	public createDialog(title: string): sqlops.window.modelviewdialog.Dialog {
+		return sqlops.window.modelviewdialog.createDialog(title);
+	}
+
+	public openDialog(dialog: sqlops.window.modelviewdialog.Dialog): void {
+		return sqlops.window.modelviewdialog.openDialog(dialog);
+	}
+
+	public closeDialog(dialog: sqlops.window.modelviewdialog.Dialog): void {
+		return sqlops.window.modelviewdialog.closeDialog(dialog);
+	}
+
+	public registerTaskHandler(taskId: string, handler: (profile: sqlops.IConnectionProfile) => void): void {
+		sqlops.tasks.registerTask(taskId, handler);
+	}
+
+	public startBackgroundOperation(operationInfo: sqlops.BackgroundOperationInfo): void {
+		sqlops.tasks.startBackgroundOperation(operationInfo);
+	}
+
+	public getActiveConnections(): Thenable<sqlops.connection.Connection[]> {
+		return sqlops.connection.getActiveConnections();
+	}
+
+	public getCurrentConnection(): Thenable<sqlops.connection.Connection> {
+		return sqlops.connection.getCurrentConnection();
+	}
+
+	public createModelViewEditor(title: string, options?: sqlops.ModelViewEditorOptions): sqlops.workspace.ModelViewEditor {
+		return sqlops.workspace.createModelViewEditor(title, options);
+	}
+
+	// VSCode APIs
+	public createTerminal(name?: string, shellPath?: string, shellArgs?: string[]): vscode.Terminal {
+		return vscode.window.createTerminal(name, shellPath, shellArgs);
+	}
+
+	public createTerminalWithOptions(options: vscode.TerminalOptions): vscode.Terminal {
+		return vscode.window.createTerminal(options);
+	}
+
+	public executeCommand(command: string, ...rest: any[]): Thenable<any> {
+		return vscode.commands.executeCommand(command, ...rest);
+	}
+
+	public getFilePathRelativeToWorkspace(uri: vscode.Uri): string {
+		return vscode.workspace.asRelativePath(uri);
+	}
+
+	public getWorkspaceFolders(): vscode.WorkspaceFolder[] {
+		return vscode.workspace.workspaceFolders;
+	}
+
+	public getWorkspacePathFromUri(uri: vscode.Uri): string | undefined {
+		let workspaceFolder = vscode.workspace.getWorkspaceFolder(uri);
+		return workspaceFolder ? workspaceFolder.uri.fsPath : undefined;
+	}
+
+	public registerCommand(command: string, callback: (...args: any[]) => any, thisArg?: any): vscode.Disposable {
+		return vscode.commands.registerCommand(command, callback, thisArg);
+	}
+
+	public registerDocumentOpenHandler(handler: (doc: vscode.TextDocument) => any): vscode.Disposable {
+		return vscode.workspace.onDidOpenTextDocument(handler);
+	}
+
+	public registerTreeDataProvider<T>(viewId: string, treeDataProvider: vscode.TreeDataProvider<T>): vscode.Disposable {
+		return vscode.window.registerTreeDataProvider(viewId, treeDataProvider);
+	}
+
+	public setCommandContext(key: string, value: any): Thenable<any> {
+		return vscode.commands.executeCommand(constants.BuiltInCommands.SetContext, key, value);
+	}
+
+	/**
+	 * Get the configuration for a extensionName
+	 * @param extensionName The string name of the extension to get the configuration for
+	 * @param resource The optional URI, as a URI object or a string, to use to get resource-scoped configurations
+	 */
+	public getConfiguration(extensionName?: string, resource?: vscode.Uri | string): vscode.WorkspaceConfiguration {
+		if (typeof resource === 'string') {
+			try {
+				resource = this.parseUri(resource);
+			} catch (e) {
+				resource = undefined;
+			}
+		}
+		return vscode.workspace.getConfiguration(extensionName, resource as vscode.Uri);
+	}
+
+	public getExtensionConfiguration(): vscode.WorkspaceConfiguration {
+		return this.getConfiguration(constants.extensionConfigSectionName);
+	}
+
+	/**
+	 * Parse uri
+	 */
+	public parseUri(uri: string): vscode.Uri {
+		return vscode.Uri.parse(uri);
+	}
+
+	public showOpenDialog(options: vscode.OpenDialogOptions): Thenable<vscode.Uri[] | undefined> {
+		return vscode.window.showOpenDialog(options);
+	}
+
+	public showSaveDialog(options: vscode.SaveDialogOptions): Thenable<vscode.Uri> {
+		return vscode.window.showSaveDialog(options);
+	}
+
+	public openTextDocument(uri: vscode.Uri): Thenable<vscode.TextDocument>;
+	public openTextDocument(options: { language?: string; content?: string; }): Thenable<vscode.TextDocument>;
+	public openTextDocument(uriOrOptions): Thenable<vscode.TextDocument> {
+		return vscode.workspace.openTextDocument(uriOrOptions);
+	}
+
+	public showTextDocument(document: vscode.TextDocument, column?: vscode.ViewColumn, preserveFocus?: boolean, preview?: boolean): Thenable<vscode.TextEditor> {
+		let options: vscode.TextDocumentShowOptions = {
+			viewColumn: column,
+			preserveFocus: preserveFocus,
+			preview: preview
+		};
+		return vscode.window.showTextDocument(document, options);
+	}
+
+	public showErrorMessage(message: string, ...items: string[]): Thenable<string | undefined> {
+		return vscode.window.showErrorMessage(message, ...items);
+	}
+
+	public showWarningMessage(message: string, ...items: string[]): Thenable<string | undefined> {
+		return vscode.window.showWarningMessage(message, ...items);
+	}
+
+	public showInformationMessage(message: string, ...items: string[]): Thenable<string | undefined> {
+		return vscode.window.showInformationMessage(message, ...items);
+	}
+
+	public createStatusBarItem(alignment?: vscode.StatusBarAlignment, priority?: number): vscode.StatusBarItem {
+		return vscode.window.createStatusBarItem(alignment, priority);
+	}
+
+	public get workspaceFolders(): vscode.WorkspaceFolder[] {
+		return vscode.workspace.workspaceFolders;
+	}
+
+	public createOutputChannel(name: string): vscode.OutputChannel {
+		return vscode.window.createOutputChannel(name);
+	}
+
+	public createWizardPage(title: string): sqlops.window.modelviewdialog.WizardPage {
+		return sqlops.window.modelviewdialog.createWizardPage(title);
+	}
+
+	public registerCompletionItemProvider(selector: vscode.DocumentSelector, provider: vscode.CompletionItemProvider, ...triggerCharacters: string[]): vscode.Disposable {
+		return vscode.languages.registerCompletionItemProvider(selector, provider, ...triggerCharacters);
+	}
+
+	public createTab(title: string): sqlops.window.modelviewdialog.DialogTab {
+		return sqlops.window.modelviewdialog.createTab(title);
+	}
+
+	// Account APIs
+	public getAllAccounts(): Thenable<sqlops.Account[]> {
+		return sqlops.accounts.getAllAccounts();
+	}
+
+	public getSecurityToken(account: sqlops.Account): Thenable<{}> {
+		return sqlops.accounts.getSecurityToken(account);
+	}
+
+	public readonly onDidChangeAccounts = sqlops.accounts.onDidChangeAccounts;
+
+	// Connection APIs
+	public openConnectionDialog(providers: string[], initialConnectionProfile?: sqlops.IConnectionProfile, connectionCompletionOptions?: sqlops.IConnectionCompletionOptions): Thenable<sqlops.connection.Connection> {
+		return sqlops.connection.openConnectionDialog(providers, initialConnectionProfile, connectionCompletionOptions);
+	}
+}

extensions/azurecore/src/appContext.ts

@@ -0,0 +1,28 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 vscode from 'vscode';
+import { ApiWrapper } from './apiWrapper';
+
+/**
+ * Global context for the application
+ */
+export class AppContext {
+
+	private serviceMap: Map<string, any> = new Map();
+	constructor(public readonly extensionContext: vscode.ExtensionContext, public readonly apiWrapper: ApiWrapper) {
+		this.apiWrapper = apiWrapper || new ApiWrapper();
+	}
+
+	public getService<T>(serviceName: string): T {
+		return this.serviceMap.get(serviceName) as T;
+	}
+
+	public registerService<T>(serviceName: string, service: T): void {
+		this.serviceMap.set(serviceName, service);
+	}
+}

extensions/azurecore/src/azureResource/commands.ts

@@ -0,0 +1,120 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { window, QuickPickItem } from 'vscode';
+import { IConnectionProfile } from 'sqlops';
+import { generateGuid } from './utils';
+import { ApiWrapper } from '../apiWrapper';
+import { TreeNode } from '../treeNodes';
+
+import { AzureResourceTreeProvider } from './tree/treeProvider';
+import { AzureResourceDatabaseServerTreeNode } from './tree/databaseServerTreeNode';
+import { AzureResourceDatabaseTreeNode } from './tree/databaseTreeNode';
+import { AzureResourceAccountTreeNode } from './tree/accountTreeNode';
+import { AzureResourceServicePool } from './servicePool';
+import { AzureResourceSubscription } from './models';
+
+export function registerAzureResourceCommands(apiWrapper: ApiWrapper, tree: AzureResourceTreeProvider): void {
+	apiWrapper.registerCommand('azureresource.selectsubscriptions', async (node?: TreeNode) => {
+		if (!(node instanceof AzureResourceAccountTreeNode)) {
+			return;
+		}
+
+		const accountNode = node as AzureResourceAccountTreeNode;
+
+		const servicePool = AzureResourceServicePool.getInstance();
+
+		let subscriptions = await accountNode.getCachedSubscriptions();
+		if (!subscriptions || subscriptions.length === 0) {
+			const credentials = await servicePool.credentialService.getCredentials(accountNode.account);
+			subscriptions = await servicePool.subscriptionService.getSubscriptions(accountNode.account, credentials);
+		}
+
+		const selectedSubscriptions = (await servicePool.subscriptionFilterService.getSelectedSubscriptions(accountNode.account)) || <AzureResourceSubscription[]>[];
+		const selectedSubscriptionIds: string[] = [];
+		if (selectedSubscriptions.length > 0) {
+			selectedSubscriptionIds.push(...selectedSubscriptions.map((subscription) => subscription.id));
+		} else {
+			// ALL subscriptions are selected by default
+			selectedSubscriptionIds.push(...subscriptions.map((subscription) => subscription.id));
+		}
+
+		interface SubscriptionQuickPickItem extends QuickPickItem {
+			subscription: AzureResourceSubscription;
+		}
+
+		const subscriptionItems: SubscriptionQuickPickItem[] = subscriptions.map((subscription) => {
+			return {
+				label: subscription.name,
+				picked: selectedSubscriptionIds.indexOf(subscription.id) !== -1,
+				subscription: subscription
+			};
+		});
+
+		const pickedSubscriptionItems = (await window.showQuickPick(subscriptionItems, { canPickMany: true }));
+		if (pickedSubscriptionItems && pickedSubscriptionItems.length > 0) {
+			tree.refresh(node, false);
+
+			const pickedSubscriptions = pickedSubscriptionItems.map((subscriptionItem) => subscriptionItem.subscription);
+			await servicePool.subscriptionFilterService.saveSelectedSubscriptions(accountNode.account, pickedSubscriptions);
+		}
+	});
+
+	apiWrapper.registerCommand('azureresource.refreshall', () => tree.notifyNodeChanged(undefined));
+
+	apiWrapper.registerCommand('azureresource.refresh', async (node?: TreeNode) => {
+		tree.refresh(node, true);
+	});
+
+	apiWrapper.registerCommand('azureresource.connectsqldb', async (node?: TreeNode) => {
+		let connectionProfile: IConnectionProfile = {
+			id: generateGuid(),
+			connectionName: undefined,
+			serverName: undefined,
+			databaseName: undefined,
+			userName: undefined,
+			password: '',
+			authenticationType: undefined,
+			savePassword: true,
+			groupFullName: '',
+			groupId: '',
+			providerName: undefined,
+			saveProfile: true,
+			options: {
+			}
+		};
+
+		if (node instanceof AzureResourceDatabaseServerTreeNode) {
+			let databaseServer = node.databaseServer;
+			connectionProfile.connectionName = `connection to '${databaseServer.defaultDatabaseName}' on '${databaseServer.fullName}'`;
+			connectionProfile.serverName = databaseServer.fullName;
+			connectionProfile.databaseName = databaseServer.defaultDatabaseName;
+			connectionProfile.userName = databaseServer.loginName;
+			connectionProfile.authenticationType = 'SqlLogin';
+			connectionProfile.providerName = 'MSSQL';
+		}
+
+		if (node instanceof AzureResourceDatabaseTreeNode) {
+			let database = node.database;
+			connectionProfile.connectionName = `connection to '${database.name}' on '${database.serverFullName}'`;
+			connectionProfile.serverName = database.serverFullName;
+			connectionProfile.databaseName = database.name;
+			connectionProfile.userName = database.loginName;
+			connectionProfile.authenticationType = 'SqlLogin';
+			connectionProfile.providerName = 'MSSQL';
+		}
+
+		const conn = await apiWrapper.openConnectionDialog(undefined, connectionProfile, { saveConnection: true, showDashboard: true });
+		if (conn) {
+			apiWrapper.executeCommand('workbench.view.connections');
+		}
+	});
+
+	apiWrapper.registerCommand('azureresource.signin', async (node?: TreeNode) => {
+		apiWrapper.executeCommand('sql.action.accounts.manageLinkedAccount');
+	});
+}

extensions/azurecore/src/azureResource/constants.ts

@@ -0,0 +1,16 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+export enum AzureResourceItemType {
+	account = 'azureResource.itemType.account',
+	subscription = 'azureResource.itemType.subscription',
+	databaseContainer = 'azureResource.itemType.databaseContainer',
+	database = 'azureResource.itemType.database',
+	databaseServerContainer = 'azureResource.itemType.databaseServerContainer',
+	databaseServer = 'azureResource.itemType.databaseServer',
+	message = 'azureResource.itemType.message'
+}

extensions/azurecore/src/azureResource/errors.ts

@@ -0,0 +1,15 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+export class AzureResourceCredentialError extends Error {
+	constructor(
+		message: string,
+		public innerError: Error
+	) {
+		super(message);
+	}
+}

extensions/azurecore/src/azureResource/interfaces.ts

@@ -0,0 +1,54 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { ServiceClientCredentials } from 'ms-rest';
+import { Account, DidChangeAccountsParams } from 'sqlops';
+import { Event } from 'vscode';
+
+import { AzureResourceSubscription, AzureResourceDatabaseServer, AzureResourceDatabase } from './models';
+
+export interface IAzureResourceAccountService {
+	getAccounts(): Promise<Account[]>;
+
+	readonly onDidChangeAccounts: Event<DidChangeAccountsParams>;
+}
+
+export interface IAzureResourceCredentialService {
+	getCredentials(account: Account): Promise<ServiceClientCredentials[]>;
+}
+
+export interface IAzureResourceSubscriptionService {
+	getSubscriptions(account: Account, credentials: ServiceClientCredentials[]): Promise<AzureResourceSubscription[]>;
+}
+
+export interface IAzureResourceSubscriptionFilterService {
+	getSelectedSubscriptions(account: Account): Promise<AzureResourceSubscription[]>;
+
+	saveSelectedSubscriptions(account: Account, selectedSubscriptions: AzureResourceSubscription[]): Promise<void>;
+}
+
+export interface IAzureResourceDatabaseServerService {
+	getDatabaseServers(subscription: AzureResourceSubscription, credentials: ServiceClientCredentials[]): Promise<AzureResourceDatabaseServer[]>;
+}
+
+export interface IAzureResourceDatabaseService {
+	getDatabases(subscription: AzureResourceSubscription, credentials: ServiceClientCredentials[]): Promise<AzureResourceDatabase[]>;
+}
+
+export interface IAzureResourceCacheService {
+	get<T>(key: string): T | undefined;
+
+	update<T>(key: string, value: T): void;
+}
+
+export interface IAzureResourceContextService {
+	getAbsolutePath(relativePath: string): string;
+
+	executeCommand(commandId: string, ...args: any[]): void;
+
+	showErrorMessage(errorMessage: string): void;
+}

extensions/azurecore/src/azureResource/models.ts

@@ -0,0 +1,25 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+export interface AzureResourceSubscription {
+	id: string;
+	name: string;
+}
+
+export interface AzureResourceDatabaseServer {
+	name: string;
+	fullName: string;
+	loginName: string;
+	defaultDatabaseName: string;
+}
+
+export interface AzureResourceDatabase {
+	name: string;
+	serverName: string;
+	serverFullName: string;
+	loginName: string;
+}

extensions/azurecore/src/azureResource/servicePool.ts

@@ -0,0 +1,35 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import {
+	IAzureResourceAccountService,
+	IAzureResourceCredentialService,
+	IAzureResourceSubscriptionService,
+	IAzureResourceSubscriptionFilterService,
+	IAzureResourceDatabaseService,
+	IAzureResourceDatabaseServerService,
+	IAzureResourceCacheService,
+	IAzureResourceContextService } from './interfaces';
+
+export class AzureResourceServicePool {
+	private constructor() { }
+
+	public static getInstance(): AzureResourceServicePool {
+		return AzureResourceServicePool._instance;
+	}
+
+	public contextService: IAzureResourceContextService;
+	public cacheService: IAzureResourceCacheService;
+	public accountService: IAzureResourceAccountService;
+	public credentialService: IAzureResourceCredentialService;
+	public subscriptionService: IAzureResourceSubscriptionService;
+	public subscriptionFilterService: IAzureResourceSubscriptionFilterService;
+	public databaseService: IAzureResourceDatabaseService;
+	public databaseServerService: IAzureResourceDatabaseServerService;
+
+	private static readonly _instance = new AzureResourceServicePool();
+}

extensions/azurecore/src/azureResource/services/accountService.ts

@@ -0,0 +1,32 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { Event } from 'vscode';
+import { Account, DidChangeAccountsParams } from 'sqlops';
+import { ApiWrapper } from '../../apiWrapper';
+
+import { IAzureResourceAccountService } from '../interfaces';
+
+export class AzureResourceAccountService implements IAzureResourceAccountService {
+	public constructor(
+		apiWrapper: ApiWrapper
+	) {
+		this._apiWrapper = apiWrapper;
+		this._onDidChangeAccounts = this._apiWrapper.onDidChangeAccounts;
+	}
+
+	public async getAccounts(): Promise<Account[]> {
+		return await this._apiWrapper.getAllAccounts();
+	}
+
+	public get onDidChangeAccounts(): Event<DidChangeAccountsParams> {
+		return this._onDidChangeAccounts;
+	}
+
+	private _apiWrapper: ApiWrapper = undefined;
+	private _onDidChangeAccounts: Event<DidChangeAccountsParams> = undefined;
+}

extensions/azurecore/src/azureResource/services/cacheService.ts

@@ -0,0 +1,25 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { ExtensionContext } from "vscode";
+
+import { IAzureResourceCacheService } from "../interfaces";
+
+export class AzureResourceCacheService implements IAzureResourceCacheService {
+	public constructor(
+		public readonly context: ExtensionContext
+	) {
+	}
+
+	public get<T>(key: string): T | undefined {
+		return this.context.workspaceState.get(key);
+	}
+
+	public update<T>(key: string, value: T): void {
+		this.context.workspaceState.update(key, value);
+	}
+}

extensions/azurecore/src/azureResource/services/contextService.ts

@@ -0,0 +1,36 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { ExtensionContext } from "vscode";
+import { ApiWrapper } from "../../apiWrapper";
+
+import { IAzureResourceContextService } from "../interfaces";
+
+export class AzureResourceContextService implements IAzureResourceContextService {
+	public constructor(
+		context: ExtensionContext,
+		apiWrapper: ApiWrapper
+	) {
+		this._context = context;
+		this._apiWrapper = apiWrapper;
+	}
+
+	public getAbsolutePath(relativePath: string): string {
+		return this._context.asAbsolutePath(relativePath);
+	}
+
+	public executeCommand(commandId: string, ...args: any[]): void {
+		this._apiWrapper.executeCommand(commandId, args);
+	}
+
+	public showErrorMessage(errorMessage: string): void {
+		this._apiWrapper.showErrorMessage(errorMessage);
+	}
+
+	private _context: ExtensionContext = undefined;
+	private _apiWrapper: ApiWrapper = undefined;
+}

extensions/azurecore/src/azureResource/services/credentialService.ts

@@ -0,0 +1,43 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { Account } from 'sqlops';
+import { TokenCredentials, ServiceClientCredentials } from 'ms-rest';
+import { ApiWrapper } from '../../apiWrapper';
+import * as nls from 'vscode-nls';
+const localize = nls.loadMessageBundle();
+
+import { IAzureResourceCredentialService } from '../interfaces';
+import { AzureResourceCredentialError } from '../errors';
+
+export class AzureResourceCredentialService implements IAzureResourceCredentialService {
+	public constructor(
+		apiWrapper: ApiWrapper
+	) {
+		this._apiWrapper = apiWrapper;
+	}
+
+	public async getCredentials(account: Account): Promise<ServiceClientCredentials[]> {
+		try {
+			let credentials: TokenCredentials[] = [];
+			let tokens = await this._apiWrapper.getSecurityToken(account);
+
+			for (let tenant of account.properties.tenants) {
+				let token = tokens[tenant.id].token;
+				let tokenType = tokens[tenant.id].tokenType;
+
+				credentials.push(new TokenCredentials(token, tokenType));
+			}
+
+			return credentials;
+		} catch (error) {
+			throw new AzureResourceCredentialError(localize('azureResource.services.credentialService.credentialError', 'Failed to get credential for account {0}. Please refresh the account.', account.key.accountId), error);
+		}
+	}
+
+	private _apiWrapper: ApiWrapper = undefined;
+}

extensions/azurecore/src/azureResource/services/databaseServerService.ts

@@ -0,0 +1,39 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { ServiceClientCredentials } from 'ms-rest';
+import { SqlManagementClient } from 'azure-arm-sql';
+
+import { IAzureResourceDatabaseServerService } from '../interfaces';
+import { AzureResourceSubscription, AzureResourceDatabaseServer } from '../models';
+
+export class AzureResourceDatabaseServerService implements IAzureResourceDatabaseServerService {
+	public async getDatabaseServers(subscription: AzureResourceSubscription, credentials: ServiceClientCredentials[]): Promise<AzureResourceDatabaseServer[]> {
+		let databaseServers: AzureResourceDatabaseServer[] = [];
+		for (let cred of credentials) {
+			let sqlManagementClient = new SqlManagementClient(cred, subscription.id);
+			try {
+				let svrs = await sqlManagementClient.servers.list();
+				svrs.forEach((svr) => databaseServers.push({
+					name: svr.name,
+					fullName: svr.fullyQualifiedDomainName,
+					loginName: svr.administratorLogin,
+					defaultDatabaseName: 'master'
+				}));
+			} catch (error) {
+				if (error.code === 'InvalidAuthenticationTokenTenant' && error.statusCode === 401) {
+					/**
+					 * There may be multiple tenants for an account and it may throw exceptions like following. Just swallow the exception here.
+					 *   The access token is from the wrong issuer. It must match one of the tenants associated with this subscription.
+					 */
+				}
+			}
+		}
+
+		return databaseServers;
+	}
+}

extensions/azurecore/src/azureResource/services/databaseService.ts

@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { ServiceClientCredentials } from 'ms-rest';
+import { SqlManagementClient } from 'azure-arm-sql';
+
+import { IAzureResourceDatabaseService } from '../interfaces';
+import { AzureResourceSubscription, AzureResourceDatabase } from '../models';
+
+export class AzureResourceDatabaseService implements IAzureResourceDatabaseService {
+	public async getDatabases(subscription: AzureResourceSubscription, credentials: ServiceClientCredentials[]): Promise<AzureResourceDatabase[]> {
+		let databases: AzureResourceDatabase[] = [];
+		for (let cred of credentials) {
+			let sqlManagementClient = new SqlManagementClient(cred, subscription.id);
+			try {
+				let svrs = await sqlManagementClient.servers.list();
+				for (let svr of svrs) {
+					// Extract resource group name from svr.id
+					let svrIdRegExp = new RegExp(`\/subscriptions\/${subscription.id}\/resourceGroups\/(.+)\/providers\/Microsoft\.Sql\/servers\/${svr.name}`);
+					if (!svrIdRegExp.test(svr.id)) {
+						continue;
+					}
+
+					let founds = svrIdRegExp.exec(svr.id);
+					let resouceGroup = founds[1];
+
+					let dbs = await sqlManagementClient.databases.listByServer(resouceGroup, svr.name);
+					dbs.forEach((db) => databases.push({
+						name: db.name,
+						serverName: svr.name,
+						serverFullName: svr.fullyQualifiedDomainName,
+						loginName: svr.administratorLogin
+					}));
+				}
+			} catch (error) {
+				if (error.code === 'InvalidAuthenticationTokenTenant' && error.statusCode === 401) {
+					/**
+					 * There may be multiple tenants for an account and it may throw exceptions like following. Just swallow the exception here.
+					 *   The access token is from the wrong issuer. It must match one of the tenants associated with this subscription.
+					 */
+				}
+			}
+		}
+
+		return databases;
+	}
+}

extensions/azurecore/src/azureResource/services/subscriptionFilterService.ts

@@ -0,0 +1,77 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { WorkspaceConfiguration, ConfigurationTarget } from 'vscode';
+import { Account } from 'sqlops';
+
+import { IAzureResourceSubscriptionFilterService, IAzureResourceCacheService } from '../interfaces';
+import { AzureResourceSubscription } from '../models';
+
+interface AzureResourceSelectedSubscriptionsCache {
+	selectedSubscriptions: { [accountId: string]: AzureResourceSubscription[]};
+}
+
+export class AzureResourceSubscriptionFilterService implements IAzureResourceSubscriptionFilterService {
+	public constructor(
+		cacheService: IAzureResourceCacheService
+	) {
+		this._cacheService = cacheService;
+	}
+
+	public async getSelectedSubscriptions(account: Account): Promise<AzureResourceSubscription[]> {
+		let selectedSubscriptions: AzureResourceSubscription[] = [];
+
+		const cache = this._cacheService.get<AzureResourceSelectedSubscriptionsCache>(AzureResourceSubscriptionFilterService.CacheKey);
+		if (cache) {
+			selectedSubscriptions = cache.selectedSubscriptions[account.key.accountId];
+		}
+
+		return selectedSubscriptions;
+	}
+
+	public async saveSelectedSubscriptions(account: Account, selectedSubscriptions: AzureResourceSubscription[]): Promise<void> {
+		let selectedSubscriptionsCache: { [accountId: string]: AzureResourceSubscription[]} = {};
+
+		const cache = this._cacheService.get<AzureResourceSelectedSubscriptionsCache>(AzureResourceSubscriptionFilterService.CacheKey);
+		if (cache) {
+			selectedSubscriptionsCache = cache.selectedSubscriptions;
+		}
+
+		if (!selectedSubscriptionsCache) {
+			selectedSubscriptionsCache = {};
+		}
+
+		selectedSubscriptionsCache[account.key.accountId] = selectedSubscriptions;
+
+		this._cacheService.update<AzureResourceSelectedSubscriptionsCache>(AzureResourceSubscriptionFilterService.CacheKey, { selectedSubscriptions: selectedSubscriptionsCache });
+
+		const filters: string[] = [];
+		for (const accountId in selectedSubscriptionsCache) {
+			filters.push(...selectedSubscriptionsCache[accountId].map((subcription) => `${accountId}/${subcription.id}/${subcription.name}`));
+		}
+
+		const resourceFilterConfig = this._config.inspect<string[]>(AzureResourceSubscriptionFilterService.FilterConfigName);
+		let configTarget = ConfigurationTarget.Global;
+		if (resourceFilterConfig) {
+			if (resourceFilterConfig.workspaceFolderValue) {
+				configTarget = ConfigurationTarget.WorkspaceFolder;
+			} else if (resourceFilterConfig.workspaceValue) {
+				configTarget = ConfigurationTarget.Workspace;
+			} else if (resourceFilterConfig.globalValue) {
+				configTarget = ConfigurationTarget.Global;
+			}
+		}
+
+		await this._config.update(AzureResourceSubscriptionFilterService.FilterConfigName, filters, configTarget);
+	}
+
+	private _config: WorkspaceConfiguration = undefined;
+	private _cacheService: IAzureResourceCacheService = undefined;
+
+	private static readonly FilterConfigName = 'resourceFilter';
+	private static readonly CacheKey = 'azureResource.cache.selectedSubscriptions';
+}

extensions/azurecore/src/azureResource/services/subscriptionService.ts

@@ -0,0 +1,33 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { Account } from 'sqlops';
+import { ServiceClientCredentials } from 'ms-rest';
+import { SubscriptionClient } from 'azure-arm-resource';
+
+import { IAzureResourceSubscriptionService } from '../interfaces';
+import { AzureResourceSubscription } from '../models';
+
+export class AzureResourceSubscriptionService implements IAzureResourceSubscriptionService {
+	public async getSubscriptions(account: Account, credentials: ServiceClientCredentials[]): Promise<AzureResourceSubscription[]> {
+		let subscriptions: AzureResourceSubscription[] = [];
+		for (let cred of credentials) {
+			let subClient = new SubscriptionClient.SubscriptionClient(cred);
+			try {
+				let subs = await subClient.subscriptions.list();
+				subs.forEach((sub) => subscriptions.push({
+					id: sub.subscriptionId,
+					name: sub.displayName
+				}));
+			} catch (error) {
+				// Swallow the exception here.
+			}
+		}
+
+		return subscriptions;
+	}
+}

extensions/azurecore/src/azureResource/tree/accountNotSignedInTreeNode.ts

@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { TreeItem, TreeItemCollapsibleState } from 'vscode';
+import { NodeInfo } from 'sqlops';
+import { TreeNode } from '../../treeNodes';
+import * as nls from 'vscode-nls';
+const localize = nls.loadMessageBundle();
+
+import { AzureResourceItemType } from '../constants';
+
+export class AzureResourceAccountNotSignedInTreeNode extends TreeNode {
+	public getChildren(): TreeNode[] | Promise<TreeNode[]> {
+		return [];
+	}
+
+	public getTreeItem(): TreeItem | Promise<TreeItem> {
+		let item = new TreeItem(AzureResourceAccountNotSignedInTreeNode.SignInLabel, TreeItemCollapsibleState.None);
+		item.contextValue = AzureResourceItemType.message;
+		item.command = {
+			title: AzureResourceAccountNotSignedInTreeNode.SignInLabel,
+			command: 'azureresource.signin',
+			arguments: [this]
+		};
+		return item;
+	}
+
+	public getNodeInfo(): NodeInfo {
+		return {
+			label: AzureResourceAccountNotSignedInTreeNode.SignInLabel,
+			isLeaf: true,
+			errorMessage: undefined,
+			metadata: undefined,
+			nodePath: this.generateNodePath(),
+			nodeStatus: undefined,
+			nodeType: AzureResourceItemType.message,
+			nodeSubType: undefined,
+			iconType: AzureResourceItemType.message
+		};
+	}
+
+	public get nodePathValue(): string {
+		return 'message_accountNotSignedIn';
+	}
+
+	private static readonly SignInLabel = localize('azureResource.tree.accountNotSignedInTreeNode.signIn', 'Sign in to Azure ...');
+}

extensions/azurecore/src/azureResource/tree/accountTreeNode.ts

@@ -0,0 +1,155 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { TreeItem, TreeItemCollapsibleState } from 'vscode';
+import { Account, NodeInfo } from 'sqlops';
+import { TreeNode } from '../../treeNodes';
+import * as nls from 'vscode-nls';
+const localize = nls.loadMessageBundle();
+
+import { AzureResourceContainerTreeNodeBase } from './baseTreeNodes';
+import { AzureResourceItemType } from '../constants';
+import { AzureResourceSubscriptionTreeNode } from './subscriptionTreeNode';
+import { AzureResourceMessageTreeNode } from './messageTreeNode';
+import { AzureResourceErrorMessageUtil } from '../utils';
+import { AzureResourceSubscription } from '../models';
+import { IAzureResourceTreeChangeHandler } from './treeProvider';
+
+export class AzureResourceAccountTreeNode extends AzureResourceContainerTreeNodeBase {
+	public constructor(
+		account: Account,
+		treeChangeHandler: IAzureResourceTreeChangeHandler
+	) {
+		super(account, treeChangeHandler, undefined);
+
+		this._id = `account_${this.account.key.accountId}`;
+		this._label = this.generateLabel();
+	}
+
+	public async getChildren(): Promise<TreeNode[]> {
+		try {
+			let subscriptions: AzureResourceSubscription[] = [];
+
+			if (this._isClearingCache) {
+				const credentials = await this.getCredentials();
+				subscriptions = (await this.servicePool.subscriptionService.getSubscriptions(this.account, credentials)) || <AzureResourceSubscription[]>[];
+
+				let cache = this.getCache<AzureResourceSubscriptionsCache>();
+				if (!cache) {
+					cache = { subscriptions: { } };
+				}
+				cache.subscriptions[this.account.key.accountId] = subscriptions;
+				this.updateCache<AzureResourceSubscriptionsCache>(cache);
+
+				this._isClearingCache = false;
+			} else {
+				subscriptions = await this.getCachedSubscriptions();
+			}
+
+			this._totalSubscriptionCount = subscriptions.length;
+
+			let selectedSubscriptions = await this.servicePool.subscriptionFilterService.getSelectedSubscriptions(this.account);
+			let selectedSubscriptionIds = (selectedSubscriptions || <AzureResourceSubscription[]>[]).map((subscription) => subscription.id);
+			if (selectedSubscriptionIds.length > 0) {
+				subscriptions = subscriptions.filter((subscription) => selectedSubscriptionIds.indexOf(subscription.id) !== -1);
+				this._selectedSubscriptionCount = selectedSubscriptionIds.length;
+			} else {
+				// ALL subscriptions are listed by default
+				this._selectedSubscriptionCount = this._totalSubscriptionCount;
+			}
+
+			this.refreshLabel();
+
+			if (subscriptions.length === 0) {
+				return [AzureResourceMessageTreeNode.create(AzureResourceAccountTreeNode.NoSubscriptions, this)];
+			} else {
+				return subscriptions.map((subscription) => new AzureResourceSubscriptionTreeNode(subscription, this.account, this.treeChangeHandler, this));
+			}
+		} catch (error) {
+			return [AzureResourceMessageTreeNode.create(AzureResourceErrorMessageUtil.getErrorMessage(error), this)];
+		}
+	}
+
+	public async getCachedSubscriptions(): Promise<AzureResourceSubscription[]> {
+		const subscriptions: AzureResourceSubscription[] = [];
+		const cache = this.getCache<AzureResourceSubscriptionsCache>();
+		if (cache) {
+			subscriptions.push(...cache.subscriptions[this.account.key.accountId]);
+		}
+		return subscriptions;
+	}
+
+	public getTreeItem(): TreeItem | Promise<TreeItem> {
+		let item = new TreeItem(this._label, TreeItemCollapsibleState.Collapsed);
+		item.id = this._id;
+		item.contextValue = AzureResourceItemType.account;
+		item.iconPath = {
+			dark: this.servicePool.contextService.getAbsolutePath('resources/dark/account_inverse.svg'),
+			light: this.servicePool.contextService.getAbsolutePath('resources/light/account.svg')
+		};
+		return item;
+	}
+
+	public getNodeInfo(): NodeInfo {
+		return {
+			label: this._label,
+			isLeaf: false,
+			errorMessage: undefined,
+			metadata: undefined,
+			nodePath: this.generateNodePath(),
+			nodeStatus: undefined,
+			nodeType: AzureResourceItemType.account,
+			nodeSubType: undefined,
+			iconType: AzureResourceItemType.account
+		};
+	}
+
+	public get nodePathValue(): string {
+		return this._id;
+	}
+
+	public get totalSubscriptionCount(): number {
+		return this._totalSubscriptionCount;
+	}
+
+	public get selectedSubscriptionCount(): number {
+		return this._selectedSubscriptionCount;
+	}
+
+	protected refreshLabel(): void {
+		const newLabel = this.generateLabel();
+		if (this._label !== newLabel) {
+			this._label = newLabel;
+			this.treeChangeHandler.notifyNodeChanged(this);
+		}
+	}
+
+	protected get cacheKey(): string {
+		return 'azureResource.cache.subscriptions';
+	}
+
+	private generateLabel(): string {
+		let label = `${this.account.displayInfo.displayName} (${this.account.key.accountId})`;
+
+		if (this._totalSubscriptionCount !== 0) {
+			label += ` (${this._selectedSubscriptionCount} / ${this._totalSubscriptionCount} subscriptions)`;
+		}
+
+		return label;
+	}
+
+	private _id: string = undefined;
+	private _label: string = undefined;
+	private _totalSubscriptionCount = 0;
+	private _selectedSubscriptionCount = 0;
+
+	private static readonly NoSubscriptions = localize('azureResource.tree.accountTreeNode.noSubscriptions', 'No Subscriptions found.');
+}
+
+interface AzureResourceSubscriptionsCache {
+	subscriptions: { [accountId: string]: AzureResourceSubscription[] };
+}

extensions/azurecore/src/azureResource/tree/baseTreeNodes.ts

@@ -0,0 +1,71 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { Account } from 'sqlops';
+import { ServiceClientCredentials } from 'ms-rest';
+import { TreeNode } from '../../treeNodes';
+
+import { AzureResourceServicePool } from '../servicePool';
+import { AzureResourceCredentialError } from '../errors';
+import { IAzureResourceTreeChangeHandler } from './treeChangeHandler';
+
+export abstract class AzureResourceTreeNodeBase extends TreeNode {
+	public constructor(
+		public readonly treeChangeHandler: IAzureResourceTreeChangeHandler,
+		parent: TreeNode
+	) {
+		super();
+
+		this.parent = parent;
+	}
+
+	public readonly servicePool = AzureResourceServicePool.getInstance();
+}
+
+export abstract class AzureResourceContainerTreeNodeBase extends AzureResourceTreeNodeBase {
+	public constructor(
+		public readonly account: Account,
+		treeChangeHandler: IAzureResourceTreeChangeHandler,
+		parent: TreeNode
+	) {
+		super(treeChangeHandler, parent);
+	}
+
+	public clearCache(): void {
+		this._isClearingCache = true;
+	}
+
+	public get isClearingCache(): boolean {
+		return this._isClearingCache;
+	}
+
+	protected async getCredentials(): Promise<ServiceClientCredentials[]> {
+		try {
+			return await this.servicePool.credentialService.getCredentials(this.account);
+		} catch (error) {
+			if (error instanceof AzureResourceCredentialError) {
+				this.servicePool.contextService.showErrorMessage(error.message);
+
+				this.servicePool.contextService.executeCommand('azureresource.signin');
+			} else {
+				throw error;
+			}
+		}
+	}
+
+	protected updateCache<T>(cache: T): void {
+		this.servicePool.cacheService.update<T>(this.cacheKey, cache);
+	}
+
+	protected getCache<T>(): T {
+		return this.servicePool.cacheService.get<T>(this.cacheKey);
+	}
+
+	protected abstract get cacheKey(): string;
+
+	protected _isClearingCache = true;
+}

extensions/azurecore/src/azureResource/tree/databaseContainerTreeNode.ts

@@ -0,0 +1,103 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { TreeItem, TreeItemCollapsibleState } from 'vscode';
+import { Account, NodeInfo } from 'sqlops';
+import { TreeNode } from '../../treeNodes';
+import * as nls from 'vscode-nls';
+const localize = nls.loadMessageBundle();
+
+import { AzureResourceContainerTreeNodeBase } from './baseTreeNodes';
+import { AzureResourceItemType } from '../constants';
+import { AzureResourceErrorMessageUtil } from '../utils';
+import { AzureResourceDatabaseTreeNode } from './databaseTreeNode';
+import { AzureResourceMessageTreeNode } from './messageTreeNode';
+import { AzureResourceSubscription, AzureResourceDatabase } from '../models';
+import { IAzureResourceTreeChangeHandler } from './treeProvider';
+
+export class AzureResourceDatabaseContainerTreeNode extends AzureResourceContainerTreeNodeBase {
+	public constructor(
+		public readonly subscription: AzureResourceSubscription,
+		account: Account,
+		treeChangeHandler: IAzureResourceTreeChangeHandler,
+		parent: TreeNode
+	) {
+		super(account, treeChangeHandler, parent);
+	}
+
+	public async getChildren(): Promise<TreeNode[]> {
+		try {
+			let databases: AzureResourceDatabase[] = [];
+
+			if (this._isClearingCache) {
+				let credentials = await this.getCredentials();
+				databases = (await this.servicePool.databaseService.getDatabases(this.subscription, credentials)) || <AzureResourceDatabase[]>[];
+
+				let cache = this.getCache<AzureResourceDatabasesCache>();
+				if (!cache) {
+					cache = { databases: { } };
+				}
+				cache.databases[this.subscription.id] = databases;
+				this.updateCache(cache);
+
+				this._isClearingCache = false;
+			} else {
+				const cache = this.getCache<AzureResourceDatabasesCache>();
+				if (cache) {
+					databases = cache.databases[this.subscription.id] || <AzureResourceDatabase[]>[];
+				}
+			}
+
+			if (databases.length === 0) {
+				return [AzureResourceMessageTreeNode.create(AzureResourceDatabaseContainerTreeNode.NoDatabases, this)];
+			} else {
+				return databases.map((database) => new AzureResourceDatabaseTreeNode(database, this.treeChangeHandler, this));
+			}
+		} catch (error) {
+			return [AzureResourceMessageTreeNode.create(AzureResourceErrorMessageUtil.getErrorMessage(error), this)];
+		}
+	}
+
+	public getTreeItem(): TreeItem | Promise<TreeItem> {
+		let item = new TreeItem(AzureResourceDatabaseContainerTreeNode.Label, TreeItemCollapsibleState.Collapsed);
+		item.contextValue = AzureResourceItemType.databaseContainer;
+		item.iconPath = {
+			dark: this.servicePool.contextService.getAbsolutePath('resources/dark/folder_inverse.svg'),
+			light: this.servicePool.contextService.getAbsolutePath('resources/light/folder.svg')
+		};
+		return item;
+	}
+
+	public getNodeInfo(): NodeInfo {
+		return {
+			label: AzureResourceDatabaseContainerTreeNode.Label,
+			isLeaf: false,
+			errorMessage: undefined,
+			metadata: undefined,
+			nodePath: this.generateNodePath(),
+			nodeStatus: undefined,
+			nodeType: AzureResourceItemType.databaseContainer,
+			nodeSubType: undefined,
+			iconType: AzureResourceItemType.databaseContainer
+		};
+	}
+
+	public get nodePathValue(): string {
+		return 'databaseContainer';
+	}
+
+	protected get cacheKey(): string {
+		return 'azureResource.cache.databases';
+	}
+
+	private static readonly Label = localize('azureResource.tree.databaseContainerTreeNode.label', 'SQL Databases');
+	private static readonly NoDatabases = localize('azureResource.tree.databaseContainerTreeNode.noDatabases', 'No SQL Databases found.');
+}
+
+interface AzureResourceDatabasesCache {
+	databases: { [subscriptionId: string]: AzureResourceDatabase[] };
+}

extensions/azurecore/src/azureResource/tree/databaseServerContainerTreeNode.ts

@@ -0,0 +1,103 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { TreeItem, TreeItemCollapsibleState } from 'vscode';
+import { Account, NodeInfo } from 'sqlops';
+import { TreeNode } from '../../treeNodes';
+import * as nls from 'vscode-nls';
+const localize = nls.loadMessageBundle();
+
+import { AzureResourceContainerTreeNodeBase } from './baseTreeNodes';
+import { AzureResourceItemType } from '../constants';
+import { AzureResourceMessageTreeNode } from './messageTreeNode';
+import { AzureResourceErrorMessageUtil } from '../utils';
+import { AzureResourceSubscription, AzureResourceDatabaseServer } from '../models';
+import { AzureResourceDatabaseServerTreeNode } from './databaseServerTreeNode';
+import { IAzureResourceTreeChangeHandler } from './treeProvider';
+
+export class AzureResourceDatabaseServerContainerTreeNode extends AzureResourceContainerTreeNodeBase {
+	public constructor(
+		public readonly subscription: AzureResourceSubscription,
+		account: Account,
+		treeChangeHandler: IAzureResourceTreeChangeHandler,
+		parent: TreeNode
+	) {
+		super(account, treeChangeHandler, parent);
+	}
+
+	public async getChildren(): Promise<TreeNode[]> {
+		try {
+			let databaseServers: AzureResourceDatabaseServer[] = [];
+
+			if (this._isClearingCache) {
+				let credentials = await this.getCredentials();
+				databaseServers = (await this.servicePool.databaseServerService.getDatabaseServers(this.subscription, credentials)) || <AzureResourceDatabaseServer[]>[];
+
+				let cache = this.getCache<AzureResourceDatabaseServersCache>();
+				if (!cache) {
+					cache = { databaseServers: { } };
+				}
+				cache.databaseServers[this.subscription.id] = databaseServers;
+				this.updateCache<AzureResourceDatabaseServersCache>(cache);
+
+				this._isClearingCache = false;
+			} else {
+				const cache = this.getCache<AzureResourceDatabaseServersCache>();
+				if (cache) {
+					databaseServers = cache.databaseServers[this.subscription.id] || <AzureResourceDatabaseServer[]>[];
+				}
+			}
+
+			if (databaseServers.length === 0) {
+				return [AzureResourceMessageTreeNode.create(AzureResourceDatabaseServerContainerTreeNode.NoDatabaseServers, this)];
+			} else {
+				return databaseServers.map((server) => new AzureResourceDatabaseServerTreeNode(server, this.treeChangeHandler, this));
+			}
+		} catch (error) {
+			return [AzureResourceMessageTreeNode.create(AzureResourceErrorMessageUtil.getErrorMessage(error), this)];
+		}
+	}
+
+	public getTreeItem(): TreeItem | Promise<TreeItem> {
+		let item = new TreeItem(AzureResourceDatabaseServerContainerTreeNode.Label, TreeItemCollapsibleState.Collapsed);
+		item.contextValue = AzureResourceItemType.databaseServerContainer;
+		item.iconPath = {
+			dark: this.servicePool.contextService.getAbsolutePath('resources/dark/folder_inverse.svg'),
+			light: this.servicePool.contextService.getAbsolutePath('resources/light/folder.svg')
+		};
+		return item;
+	}
+
+	public getNodeInfo(): NodeInfo {
+		return {
+			label: AzureResourceDatabaseServerContainerTreeNode.Label,
+			isLeaf: false,
+			errorMessage: undefined,
+			metadata: undefined,
+			nodePath: this.generateNodePath(),
+			nodeStatus: undefined,
+			nodeType: AzureResourceItemType.databaseServerContainer,
+			nodeSubType: undefined,
+			iconType: AzureResourceItemType.databaseServerContainer
+		};
+	}
+
+	public get nodePathValue(): string {
+		return 'databaseServerContainer';
+	}
+
+	protected get cacheKey(): string {
+		return 'azureResource.cache.databaseServers';
+	}
+
+	private static readonly Label = localize('azureResource.tree.databaseServerContainerTreeNode.label', 'SQL Servers');
+	private static readonly NoDatabaseServers = localize('azureResource.tree.databaseContainerTreeNode.noDatabaseServers', 'No SQL Servers found.');
+}
+
+interface AzureResourceDatabaseServersCache {
+	databaseServers: { [subscriptionId: string]: AzureResourceDatabaseServer[] };
+}

extensions/azurecore/src/azureResource/tree/databaseServerTreeNode.ts

@@ -0,0 +1,57 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { TreeItem, TreeItemCollapsibleState } from 'vscode';
+import { NodeInfo } from 'sqlops';
+import { TreeNode } from '../../treeNodes';
+
+import { AzureResourceTreeNodeBase } from './baseTreeNodes';
+import { AzureResourceItemType } from '../constants';
+import { AzureResourceDatabaseServer } from '../models';
+import { IAzureResourceTreeChangeHandler } from './treeProvider';
+
+export class AzureResourceDatabaseServerTreeNode extends AzureResourceTreeNodeBase {
+	public constructor(
+		public readonly databaseServer: AzureResourceDatabaseServer,
+		treeChangeHandler: IAzureResourceTreeChangeHandler,
+		parent: TreeNode
+	) {
+		super(treeChangeHandler, parent);
+	}
+
+	public async getChildren(): Promise<TreeNode[]> {
+		return [];
+	}
+
+	public getTreeItem(): TreeItem | Promise<TreeItem> {
+		let item = new TreeItem(this.databaseServer.name, TreeItemCollapsibleState.None);
+		item.contextValue = AzureResourceItemType.databaseServer;
+		item.iconPath = {
+			dark: this.servicePool.contextService.getAbsolutePath('resources/dark/sql_server_inverse.svg'),
+			light: this.servicePool.contextService.getAbsolutePath('resources/light/sql_server.svg')
+		};
+		return item;
+	}
+
+	public getNodeInfo(): NodeInfo {
+		return {
+			label: this.databaseServer.name,
+			isLeaf: true,
+			errorMessage: undefined,
+			metadata: undefined,
+			nodePath: this.generateNodePath(),
+			nodeStatus: undefined,
+			nodeType: AzureResourceItemType.databaseServer,
+			nodeSubType: undefined,
+			iconType: AzureResourceItemType.databaseServer
+		};
+	}
+
+	public get nodePathValue(): string {
+		return `databaseServer_${this.databaseServer.name}`;
+	}
+}

extensions/azurecore/src/azureResource/tree/databaseTreeNode.ts

@@ -0,0 +1,61 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { TreeItem, TreeItemCollapsibleState } from 'vscode';
+import { NodeInfo } from 'sqlops';
+import { TreeNode } from '../../treeNodes';
+
+import { AzureResourceTreeNodeBase } from './baseTreeNodes';
+import { AzureResourceItemType } from '../constants';
+import { AzureResourceDatabase } from '../models';
+import { IAzureResourceTreeChangeHandler } from './treeProvider';
+
+export class AzureResourceDatabaseTreeNode extends AzureResourceTreeNodeBase {
+	public constructor(
+		public readonly database: AzureResourceDatabase,
+		treeChangeHandler: IAzureResourceTreeChangeHandler,
+		parent: TreeNode
+	) {
+		super(treeChangeHandler, parent);
+
+		this._label = `${this.database.name} (${this.database.serverName})`;
+	}
+
+	public async getChildren(): Promise<TreeNode[]> {
+		return [];
+	}
+
+	public getTreeItem(): TreeItem | Promise<TreeItem> {
+		let item = new TreeItem(this._label, TreeItemCollapsibleState.None);
+		item.contextValue = AzureResourceItemType.database;
+		item.iconPath = {
+			dark: this.servicePool.contextService.getAbsolutePath('resources/dark/sql_database_inverse.svg'),
+			light: this.servicePool.contextService.getAbsolutePath('resources/light/sql_database.svg')
+		};
+		return item;
+	}
+
+	public getNodeInfo(): NodeInfo {
+		return {
+			label: this._label,
+			isLeaf: true,
+			errorMessage: undefined,
+			metadata: undefined,
+			nodePath: this.generateNodePath(),
+			nodeStatus: undefined,
+			nodeType: AzureResourceItemType.database,
+			nodeSubType: undefined,
+			iconType: AzureResourceItemType.database
+		};
+	}
+
+	public get nodePathValue(): string {
+		return `database_${this.database.name}`;
+	}
+
+	private _label: string = undefined;
+}

extensions/azurecore/src/azureResource/tree/messageTreeNode.ts

@@ -0,0 +1,60 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { TreeItem, TreeItemCollapsibleState } from 'vscode';
+import { NodeInfo } from 'sqlops';
+import { TreeNode } from '../../treeNodes';
+
+import { AzureResourceItemType } from '../constants';
+
+export class AzureResourceMessageTreeNode extends TreeNode {
+	public constructor(
+		public readonly message: string,
+		parent: TreeNode
+	) {
+		super();
+
+		this.parent = parent;
+		this._id = `message_${AzureResourceMessageTreeNode._messageNum++}`;
+	}
+
+	public static create(message: string, parent: TreeNode): AzureResourceMessageTreeNode {
+		return new AzureResourceMessageTreeNode(message, parent);
+	}
+
+	public getChildren(): TreeNode[] | Promise<TreeNode[]> {
+		return [];
+	}
+
+	public getTreeItem(): TreeItem | Promise<TreeItem> {
+		let item = new TreeItem(this.message, TreeItemCollapsibleState.None);
+		item.contextValue = AzureResourceItemType.message;
+		return item;
+	}
+
+	public getNodeInfo(): NodeInfo {
+		return {
+			label: this.message,
+			isLeaf: true,
+			errorMessage: undefined,
+			metadata: undefined,
+			nodePath: this.generateNodePath(),
+			nodeStatus: undefined,
+			nodeType: AzureResourceItemType.message,
+			nodeSubType: undefined,
+			iconType: AzureResourceItemType.message
+		};
+	}
+
+	public get nodePathValue(): string {
+		return this._id;
+	}
+
+	private _id: string;
+
+	private static _messageNum: number = 0;
+}

extensions/azurecore/src/azureResource/tree/subscriptionTreeNode.ts

@@ -0,0 +1,65 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { TreeItem, TreeItemCollapsibleState } from 'vscode';
+import { Account, NodeInfo } from 'sqlops';
+import { TreeNode } from '../../treeNodes';
+
+import { AzureResourceTreeNodeBase, AzureResourceContainerTreeNodeBase } from './baseTreeNodes';
+import { AzureResourceItemType } from '../constants';
+import { AzureResourceDatabaseContainerTreeNode } from './databaseContainerTreeNode';
+import { AzureResourceDatabaseServerContainerTreeNode } from './databaseServerContainerTreeNode';
+import { AzureResourceSubscription } from '../models';
+import { IAzureResourceTreeChangeHandler } from './treeChangeHandler';
+
+export class AzureResourceSubscriptionTreeNode extends AzureResourceTreeNodeBase {
+	public constructor(
+		public readonly subscription: AzureResourceSubscription,
+		account: Account,
+		treeChangeHandler: IAzureResourceTreeChangeHandler,
+		parent: TreeNode
+	) {
+		super(treeChangeHandler, parent);
+
+		this._children.push(new AzureResourceDatabaseContainerTreeNode(subscription, account, treeChangeHandler, this));
+		this._children.push(new AzureResourceDatabaseServerContainerTreeNode(subscription, account, treeChangeHandler, this));
+	}
+
+	public async getChildren(): Promise<TreeNode[]> {
+		return this._children;
+	}
+
+	public getTreeItem(): TreeItem | Promise<TreeItem> {
+		let item = new TreeItem(this.subscription.name, TreeItemCollapsibleState.Collapsed);
+		item.contextValue = AzureResourceItemType.subscription;
+		item.iconPath = {
+			dark: this.servicePool.contextService.getAbsolutePath('resources/dark/subscription_inverse.svg'),
+			light: this.servicePool.contextService.getAbsolutePath('resources/light/subscription.svg')
+		};
+		return item;
+	}
+
+	public getNodeInfo(): NodeInfo {
+		return {
+			label: this.subscription.name,
+			isLeaf: false,
+			errorMessage: undefined,
+			metadata: undefined,
+			nodePath: this.generateNodePath(),
+			nodeStatus: undefined,
+			nodeType: AzureResourceItemType.subscription,
+			nodeSubType: undefined,
+			iconType: AzureResourceItemType.subscription
+		};
+	}
+
+	public get nodePathValue(): string {
+		return `subscription_${this.subscription.id}`;
+	}
+
+	private _children: AzureResourceContainerTreeNodeBase[] = [];
+}

extensions/azurecore/src/azureResource/tree/treeChangeHandler.ts

@@ -5,8 +5,8 @@
 
 'use strict';
 
-import * as nls from 'vscode-nls';
+import { TreeNode } from '../../treeNodes';
 
-const localize = nls.loadMessageBundle();
-
-export const extensionName = localize('extensionName', 'Azure Accounts');
+export interface IAzureResourceTreeChangeHandler {
+	notifyNodeChanged(node: TreeNode): void;
+}

extensions/azurecore/src/azureResource/tree/treeProvider.ts

@@ -0,0 +1,101 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { TreeDataProvider, EventEmitter, Event, TreeItem } from 'vscode';
+import { DidChangeAccountsParams } from 'sqlops';
+import { TreeNode } from '../../treeNodes';
+import { setInterval, clearInterval } from 'timers';
+import * as nls from 'vscode-nls';
+const localize = nls.loadMessageBundle();
+
+import { AzureResourceServicePool } from '../servicePool';
+import { AzureResourceAccountTreeNode } from './accountTreeNode';
+import { AzureResourceAccountNotSignedInTreeNode } from './accountNotSignedInTreeNode';
+import { AzureResourceMessageTreeNode } from './messageTreeNode';
+import { AzureResourceContainerTreeNodeBase, AzureResourceTreeNodeBase } from './baseTreeNodes';
+import { AzureResourceErrorMessageUtil } from '../utils';
+
+export interface IAzureResourceTreeChangeHandler {
+	notifyNodeChanged(node: TreeNode): void;
+}
+
+export class AzureResourceTreeProvider implements TreeDataProvider<TreeNode>, IAzureResourceTreeChangeHandler {
+	public constructor() {
+		AzureResourceServicePool.getInstance().accountService.onDidChangeAccounts((e: DidChangeAccountsParams) => { this._onDidChangeTreeData.fire(undefined); });
+	}
+
+	public async getChildren(element?: TreeNode): Promise<TreeNode[]> {
+		if (element) {
+			return element.getChildren(true);
+		}
+
+		if (!this.isSystemInitialized) {
+			this._loadingTimer = setInterval(async () => {
+				try {
+					// Call sqlops.accounts.getAllAccounts() to determine whether the system has been initialized.
+					await AzureResourceServicePool.getInstance().accountService.getAccounts();
+
+					// System has been initialized
+					this.isSystemInitialized = true;
+
+					if (this._loadingTimer) {
+						clearInterval(this._loadingTimer);
+					}
+
+					this._onDidChangeTreeData.fire(undefined);
+				} catch (error) {
+					// System not initialized yet
+					this.isSystemInitialized = false;
+				}
+			}, AzureResourceTreeProvider.LoadingTimerInterval);
+
+			return [AzureResourceMessageTreeNode.create(AzureResourceTreeProvider.Loading, undefined)];
+		}
+
+		try {
+			const accounts = await AzureResourceServicePool.getInstance().accountService.getAccounts();
+
+			if (accounts && accounts.length > 0) {
+				return accounts.map((account) => new AzureResourceAccountTreeNode(account, this));
+			} else {
+				return [new AzureResourceAccountNotSignedInTreeNode()];
+			}
+		} catch (error) {
+			return [AzureResourceMessageTreeNode.create(AzureResourceErrorMessageUtil.getErrorMessage(error), undefined)];
+		}
+	}
+
+	public get onDidChangeTreeData(): Event<TreeNode> {
+		return this._onDidChangeTreeData.event;
+	}
+
+	public notifyNodeChanged(node: TreeNode): void {
+		this._onDidChangeTreeData.fire(node);
+	}
+
+	public async refresh(node: TreeNode, isClearingCache: boolean): Promise<void> {
+		if (isClearingCache) {
+			if ((node instanceof AzureResourceContainerTreeNodeBase)) {
+				node.clearCache();
+			}
+		}
+
+		this._onDidChangeTreeData.fire(node);
+	}
+
+	public getTreeItem(element: TreeNode): TreeItem | Thenable<TreeItem> {
+		return element.getTreeItem();
+	}
+
+	public isSystemInitialized: boolean = false;
+
+	private _loadingTimer: NodeJS.Timer = undefined;
+	private _onDidChangeTreeData = new EventEmitter<TreeNode>();
+
+	private static readonly Loading = localize('azureResource.tree.treeProvider.loading', 'Loading ...');
+	private static readonly LoadingTimerInterval = 5000;
+}

extensions/azurecore/src/azureResource/utils.ts

@@ -0,0 +1,44 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 nls from 'vscode-nls';
+const localize = nls.loadMessageBundle();
+
+export function getErrorMessage(error: Error | string): string {
+    return (error instanceof Error) ? error.message : error;
+}
+
+
+export class AzureResourceErrorMessageUtil {
+	public static getErrorMessage(error: Error | string): string {
+		return localize('azureResource.error', 'Error: {0}', getErrorMessage(error));
+	}
+}
+
+export function generateGuid(): string {
+    let hexValues: string[] = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'];
+    // c.f. rfc4122 (UUID version 4 = xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx)
+    let oct: string = '';
+    let tmp: number;
+    /* tslint:disable:no-bitwise */
+    for (let a: number = 0; a < 4; a++) {
+        tmp = (4294967296 * Math.random()) | 0;
+        oct += hexValues[tmp & 0xF] +
+            hexValues[tmp >> 4 & 0xF] +
+            hexValues[tmp >> 8 & 0xF] +
+            hexValues[tmp >> 12 & 0xF] +
+            hexValues[tmp >> 16 & 0xF] +
+            hexValues[tmp >> 20 & 0xF] +
+            hexValues[tmp >> 24 & 0xF] +
+            hexValues[tmp >> 28 & 0xF];
+    }
+
+    // 'Set the two most significant bits (bits 6 and 7) of the clock_seq_hi_and_reserved to zero and one, respectively'
+    let clockSequenceHi: string = hexValues[8 + (Math.random() * 4) | 0];
+    return oct.substr(0, 8) + '-' + oct.substr(9, 4) + '-4' + oct.substr(13, 3) + '-' + clockSequenceHi + oct.substr(16, 3) + '-' + oct.substr(19, 12);
+    /* tslint:enable:no-bitwise */
+}

extensions/azurecore/src/constants.ts

@@ -0,0 +1,14 @@
+'use strict';
+
+import * as nls from 'vscode-nls';
+
+const localize = nls.loadMessageBundle();
+
+export const extensionConfigSectionName = 'azure';
+export const ViewType = 'view';
+
+export enum BuiltInCommands {
+	SetContext = 'setContext'
+}
+
+export const extensionName = localize('extensionName', 'Azure Accounts');

extensions/azurecore/src/controllers/controllerBase.ts

@@ -0,0 +1,34 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 vscode from 'vscode';
+
+import { AppContext } from '../appContext';
+import { ApiWrapper } from '../apiWrapper';
+
+export default abstract class ControllerBase implements vscode.Disposable {
+
+	public constructor(protected appContext: AppContext) {
+	}
+
+	protected get apiWrapper(): ApiWrapper {
+		return this.appContext.apiWrapper;
+	}
+
+	public get extensionContext(): vscode.ExtensionContext {
+		return this.appContext && this.appContext.extensionContext;
+	}
+
+	abstract activate(): Promise<boolean>;
+
+	abstract deactivate(): void;
+
+	public dispose(): void {
+		this.deactivate();
+	}
+}
+

extensions/azurecore/src/controllers/mainController.ts

@@ -0,0 +1,54 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 ControllerBase from './controllerBase';
+
+import { AzureResourceTreeProvider } from '../azureResource/tree/treeProvider';
+import { registerAzureResourceCommands } from '../azureResource/commands';
+import { AzureResourceServicePool } from '../azureResource/servicePool';
+import { AzureResourceCredentialService } from '../azureResource/services/credentialService';
+import { AzureResourceAccountService } from '../azureResource/services/accountService';
+import { AzureResourceSubscriptionService } from '../azureResource/services/subscriptionService';
+import { AzureResourceSubscriptionFilterService } from '../azureResource/services/subscriptionFilterService';
+import { AzureResourceDatabaseServerService } from '../azureResource/services/databaseServerService';
+import { AzureResourceDatabaseService } from '../azureResource/services/databaseService';
+import { AzureResourceCacheService } from '../azureResource/services/cacheService';
+import { AzureResourceContextService } from '../azureResource/services/contextService';
+
+/**
+ * The main controller class that initializes the extension
+ */
+export default class MainController extends ControllerBase {
+	// PUBLIC METHODS //////////////////////////////////////////////////////
+	/**
+	 * Deactivates the extension
+	 */
+	public deactivate(): void {
+	}
+
+	public activate(): Promise<boolean> {
+		this.configureAzureResource();
+		return Promise.resolve(true);
+	}
+
+	private configureAzureResource(): void {
+		let servicePool = AzureResourceServicePool.getInstance();
+		servicePool.cacheService = new AzureResourceCacheService(this.extensionContext);
+		servicePool.contextService = new AzureResourceContextService(this.extensionContext, this.apiWrapper);
+		servicePool.accountService = new AzureResourceAccountService(this.apiWrapper);
+		servicePool.credentialService = new AzureResourceCredentialService(this.apiWrapper);
+		servicePool.subscriptionService = new AzureResourceSubscriptionService();
+		servicePool.subscriptionFilterService = new AzureResourceSubscriptionFilterService(new AzureResourceCacheService(this.extensionContext));
+		servicePool.databaseService = new AzureResourceDatabaseService();
+		servicePool.databaseServerService = new AzureResourceDatabaseServerService();
+
+		let azureResourceTree = new AzureResourceTreeProvider();
+		this.extensionContext.subscriptions.push(this.apiWrapper.registerTreeDataProvider('azureResourceExplorer', azureResourceTree));
+
+		registerAzureResourceCommands(this.apiWrapper, azureResourceTree);
+	}
+}

extensions/azurecore/src/extension.ts

@@ -1,18 +1,20 @@
-/*---------------------------------------------------------------------------------------------
- *  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 vscode from 'vscode';
 import * as fs from 'fs';
 import * as path from 'path';
-import * as vscode from 'vscode';
 import * as os from 'os';
-
 import * as constants from './constants';
+
+import MainController from './controllers/mainController';
+import { AppContext } from './appContext';
+import ControllerBase from './controllers/controllerBase';
+import { ApiWrapper } from './apiWrapper';
 import { AzureAccountProviderService } from './account-provider/azureAccountProviderService';
 
+let controllers: ControllerBase[] = [];
+
+
 // The function is a duplicate of \src\paths.js. IT would be better to import path.js but it doesn't
 // work for now because the extension is running in different process.
 export function getAppDataPath() {
@@ -26,11 +28,16 @@ export function getAppDataPath() {
 }
 
 export function getDefaultLogLocation() {
-	return path.join(getAppDataPath(), 'sqlops');
+	return path.join(getAppDataPath(), 'azuredatastudio');
 }
 
-// EXTENSION ACTIVATION ////////////////////////////////////////////////////
-export function activate(context: vscode.ExtensionContext): void {
+
+// this method is called when your extension is activated
+// your extension is activated the very first time the command is executed
+export function activate(extensionContext: vscode.ExtensionContext) {
+	let appContext = new AppContext(extensionContext, new ApiWrapper());
+	let activations: Thenable<boolean>[] = [];
+
 	// Create the folder for storing the token caches
 	let storagePath = path.join(getDefaultLogLocation(), constants.extensionName);
 	try {
@@ -45,7 +52,30 @@ export function activate(context: vscode.ExtensionContext): void {
 	}
 
 	// Create the provider service and activate
-	const accountProviderService = new AzureAccountProviderService(context, storagePath);
-	context.subscriptions.push(accountProviderService);
+	const accountProviderService = new AzureAccountProviderService(extensionContext, storagePath);
+	extensionContext.subscriptions.push(accountProviderService);
 	accountProviderService.activate();
+
+	// Start the main controller
+	let mainController = new MainController(appContext);
+	controllers.push(mainController);
+	extensionContext.subscriptions.push(mainController);
+	activations.push(mainController.activate());
+
+	return Promise.all(activations)
+		.then((results: boolean[]) => {
+			for (let result of results) {
+				if (!result) {
+					return false;
+				}
+			}
+			return true;
+		});
+}
+
+// this method is called when your extension is deactivated
+export function deactivate() {
+	for (let controller of controllers) {
+		controller.deactivate();
+	}
 }

extensions/azurecore/src/test/azureResource/tree/accountNotSignedInTreeNode.test.ts

@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import * as should from 'should';
+import * as vscode from 'vscode';
+import 'mocha';
+
+import { AzureResourceItemType } from '../../../azureResource/constants';
+import { AzureResourceAccountNotSignedInTreeNode } from '../../../azureResource/tree/accountNotSignedInTreeNode';
+
+describe('AzureResourceAccountNotSignedInTreeNode.info', function(): void {
+	it('Should be correct.', async function(): Promise<void> {
+		const label = 'Sign in to Azure ...';
+
+		const treeNode = new AzureResourceAccountNotSignedInTreeNode();
+
+		should(treeNode.nodePathValue).equal('message_accountNotSignedIn');
+
+		const treeItem = await treeNode.getTreeItem();
+		should(treeItem.label).equal(label);
+		should(treeItem.contextValue).equal(AzureResourceItemType.message);
+		should(treeItem.collapsibleState).equal(vscode.TreeItemCollapsibleState.None);
+		should(treeItem.command).not.undefined();
+		should(treeItem.command.title).equal(label);
+		should(treeItem.command.command).equal('azureresource.signin');
+
+		const nodeInfo = treeNode.getNodeInfo();
+		should(nodeInfo.isLeaf).true();
+		should(nodeInfo.label).equal(label);
+		should(nodeInfo.nodeType).equal(AzureResourceItemType.message);
+		should(nodeInfo.iconType).equal(AzureResourceItemType.message);
+	});
+});

extensions/azurecore/src/test/azureResource/tree/accountTreeNode.test.ts

@@ -0,0 +1,294 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 should from 'should';
+import * as TypeMoq from 'typemoq';
+import * as sqlops from 'sqlops';
+import * as vscode from 'vscode';
+import 'mocha';
+import { ServiceClientCredentials } from 'ms-rest';
+
+import { AzureResourceServicePool } from '../../../azureResource/servicePool';
+import {
+	IAzureResourceCacheService,
+	IAzureResourceContextService,
+	IAzureResourceCredentialService,
+	IAzureResourceSubscriptionService,
+	IAzureResourceSubscriptionFilterService
+} from '../../../azureResource/interfaces';
+import { IAzureResourceTreeChangeHandler } from '../../../azureResource/tree/treeChangeHandler';
+import { AzureResourceAccountTreeNode } from '../../../azureResource/tree/accountTreeNode';
+import { AzureResourceSubscription } from '../../../azureResource/models';
+import { AzureResourceSubscriptionTreeNode } from '../../../azureResource/tree/subscriptionTreeNode';
+import { AzureResourceItemType } from '../../../azureResource/constants';
+import { AzureResourceMessageTreeNode } from '../../../azureResource/tree/messageTreeNode';
+
+// Mock services
+const mockServicePool = AzureResourceServicePool.getInstance();
+
+let mockCacheService: TypeMoq.IMock<IAzureResourceCacheService>;
+let mockContextService: TypeMoq.IMock<IAzureResourceContextService>;
+let mockCredentialService: TypeMoq.IMock<IAzureResourceCredentialService>;
+let mockSubscriptionService: TypeMoq.IMock<IAzureResourceSubscriptionService>;
+let mockSubscriptionFilterService: TypeMoq.IMock<IAzureResourceSubscriptionFilterService>;
+
+let mockTreeChangeHandler: TypeMoq.IMock<IAzureResourceTreeChangeHandler>;
+
+// Mock test data
+const mockAccount: sqlops.Account = {
+	key: {
+		accountId: 'mock_account',
+		providerId: 'mock_provider'
+	},
+	displayInfo: {
+		displayName: 'mock_account@test.com',
+		accountType: 'Microsoft',
+		contextualDisplayName: 'test'
+	},
+	properties: undefined,
+	isStale: false
+};
+
+const mockCredential = TypeMoq.Mock.ofType<ServiceClientCredentials>().object;
+const mockCredentials = [mockCredential];
+
+const mockSubscription1: AzureResourceSubscription = {
+	id: 'mock_subscription_1',
+	name: 'mock subscription 1'
+};
+const mockSubscription2: AzureResourceSubscription = {
+	id: 'mock_subscription_2',
+	name: 'mock subscription 2'
+};
+const mockSubscriptions = [mockSubscription1, mockSubscription2];
+const mockFilteredSubscriptions = [mockSubscription1];
+
+let mockSubscriptionCache: { subscriptions: { [accountId: string]: AzureResourceSubscription[]} };
+
+describe('AzureResourceAccountTreeNode.info', function(): void {
+	beforeEach(() => {
+		mockContextService = TypeMoq.Mock.ofType<IAzureResourceContextService>();
+		mockCacheService = TypeMoq.Mock.ofType<IAzureResourceCacheService>();
+		mockCredentialService = TypeMoq.Mock.ofType<IAzureResourceCredentialService>();
+		mockSubscriptionService = TypeMoq.Mock.ofType<IAzureResourceSubscriptionService>();
+		mockSubscriptionFilterService = TypeMoq.Mock.ofType<IAzureResourceSubscriptionFilterService>();
+
+		mockTreeChangeHandler = TypeMoq.Mock.ofType<IAzureResourceTreeChangeHandler>();
+
+		mockSubscriptionCache = { subscriptions: {} };
+
+		mockServicePool.contextService = mockContextService.object;
+		mockServicePool.cacheService = mockCacheService.object;
+		mockServicePool.credentialService = mockCredentialService.object;
+		mockServicePool.subscriptionService = mockSubscriptionService.object;
+		mockServicePool.subscriptionFilterService = mockSubscriptionFilterService.object;
+
+		mockCredentialService.setup((o) => o.getCredentials(mockAccount)).returns(() => Promise.resolve(mockCredentials));
+		mockCacheService.setup((o) => o.get(TypeMoq.It.isAnyString())).returns(() => mockSubscriptionCache);
+		mockCacheService.setup((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny())).returns(() => mockSubscriptionCache.subscriptions[mockAccount.key.accountId] = mockSubscriptions);
+	});
+
+	it('Should be correct when created.', async function(): Promise<void> {
+		const accountTreeNode = new AzureResourceAccountTreeNode(mockAccount, mockTreeChangeHandler.object);
+
+		const accountTreeNodeId = `account_${mockAccount.key.accountId}`;
+		const accountTreeNodeLabel = `${mockAccount.displayInfo.displayName} (${mockAccount.key.accountId})`;
+
+		should(accountTreeNode.nodePathValue).equal(accountTreeNodeId);
+
+		const treeItem = await accountTreeNode.getTreeItem();
+		should(treeItem.id).equal(accountTreeNodeId);
+		should(treeItem.label).equal(accountTreeNodeLabel);
+		should(treeItem.contextValue).equal(AzureResourceItemType.account);
+		should(treeItem.collapsibleState).equal(vscode.TreeItemCollapsibleState.Collapsed);
+
+		const nodeInfo = accountTreeNode.getNodeInfo();
+		should(nodeInfo.label).equal(accountTreeNodeLabel);
+		should(nodeInfo.isLeaf).false();
+		should(nodeInfo.nodeType).equal(AzureResourceItemType.account);
+		should(nodeInfo.iconType).equal(AzureResourceItemType.account);
+	});
+
+	it('Should be correct when there are subscriptions listed.', async function(): Promise<void> {
+		mockSubscriptionService.setup((o) => o.getSubscriptions(mockAccount, mockCredentials)).returns(() => Promise.resolve(mockSubscriptions));
+		mockSubscriptionFilterService.setup((o) => o.getSelectedSubscriptions(mockAccount)).returns(() => Promise.resolve(undefined));
+
+		const accountTreeNodeLabel = `${mockAccount.displayInfo.displayName} (${mockAccount.key.accountId}) (${mockSubscriptions.length} / ${mockSubscriptions.length} subscriptions)`;
+
+		const accountTreeNode = new AzureResourceAccountTreeNode(mockAccount, mockTreeChangeHandler.object);
+
+		await accountTreeNode.getChildren();
+
+		const treeItem = await accountTreeNode.getTreeItem();
+		should(treeItem.label).equal(accountTreeNodeLabel);
+
+		const nodeInfo = accountTreeNode.getNodeInfo();
+		should(nodeInfo.label).equal(accountTreeNodeLabel);
+	});
+
+	it('Should be correct when there are subscriptions filtered.', async function(): Promise<void> {
+		mockSubscriptionService.setup((o) => o.getSubscriptions(mockAccount, mockCredentials)).returns(() => Promise.resolve(mockSubscriptions));
+		mockSubscriptionFilterService.setup((o) => o.getSelectedSubscriptions(mockAccount)).returns(() => Promise.resolve(mockFilteredSubscriptions));
+
+		const accountTreeNodeLabel = `${mockAccount.displayInfo.displayName} (${mockAccount.key.accountId}) (${mockFilteredSubscriptions.length} / ${mockSubscriptions.length} subscriptions)`;
+
+		const accountTreeNode = new AzureResourceAccountTreeNode(mockAccount, mockTreeChangeHandler.object);
+
+		await accountTreeNode.getChildren();
+
+		const treeItem = await accountTreeNode.getTreeItem();
+		should(treeItem.label).equal(accountTreeNodeLabel);
+
+		const nodeInfo = accountTreeNode.getNodeInfo();
+		should(nodeInfo.label).equal(accountTreeNodeLabel);
+	});
+});
+
+describe('AzureResourceAccountTreeNode.getChildren', function(): void {
+	beforeEach(() => {
+		mockCacheService = TypeMoq.Mock.ofType<IAzureResourceCacheService>();
+		mockCredentialService = TypeMoq.Mock.ofType<IAzureResourceCredentialService>();
+		mockSubscriptionService = TypeMoq.Mock.ofType<IAzureResourceSubscriptionService>();
+		mockSubscriptionFilterService = TypeMoq.Mock.ofType<IAzureResourceSubscriptionFilterService>();
+
+		mockTreeChangeHandler = TypeMoq.Mock.ofType<IAzureResourceTreeChangeHandler>();
+
+		mockSubscriptionCache = { subscriptions: {} };
+
+		mockServicePool.cacheService = mockCacheService.object;
+		mockServicePool.credentialService = mockCredentialService.object;
+		mockServicePool.subscriptionService = mockSubscriptionService.object;
+		mockServicePool.subscriptionFilterService = mockSubscriptionFilterService.object;
+
+		mockCredentialService.setup((o) => o.getCredentials(mockAccount)).returns(() => Promise.resolve(mockCredentials));
+		mockCacheService.setup((o) => o.get(TypeMoq.It.isAnyString())).returns(() => mockSubscriptionCache);
+		mockCacheService.setup((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny())).returns(() => mockSubscriptionCache.subscriptions[mockAccount.key.accountId] = mockSubscriptions);
+	});
+
+	it('Should load subscriptions from scratch and update cache when it is clearing cache.', async function(): Promise<void> {
+		mockSubscriptionService.setup((o) => o.getSubscriptions(mockAccount, mockCredentials)).returns(() => Promise.resolve(mockSubscriptions));
+		mockSubscriptionFilterService.setup((o) => o.getSelectedSubscriptions(mockAccount)).returns(() => Promise.resolve(undefined));
+
+		const accountTreeNode = new AzureResourceAccountTreeNode(mockAccount, mockTreeChangeHandler.object);
+
+		const children = await accountTreeNode.getChildren();
+
+		mockCredentialService.verify((o) => o.getCredentials(mockAccount), TypeMoq.Times.once());
+		mockSubscriptionService.verify((o) => o.getSubscriptions(mockAccount, mockCredentials), TypeMoq.Times.once());
+		mockCacheService.verify((o) => o.get(TypeMoq.It.isAnyString()), TypeMoq.Times.once());
+		mockCacheService.verify((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny()), TypeMoq.Times.once());
+		mockSubscriptionFilterService.verify((o) => o.getSelectedSubscriptions(mockAccount), TypeMoq.Times.once());
+
+		mockTreeChangeHandler.verify((o) => o.notifyNodeChanged(accountTreeNode), TypeMoq.Times.once());
+
+		should(accountTreeNode.totalSubscriptionCount).equal(mockSubscriptions.length);
+		should(accountTreeNode.selectedSubscriptionCount).equal(mockSubscriptions.length);
+		should(accountTreeNode.isClearingCache).false();
+
+		should(children).Array();
+		should(children.length).equal(mockSubscriptions.length);
+
+		should(Object.keys(mockSubscriptionCache.subscriptions)).deepEqual([mockAccount.key.accountId]);
+		should(mockSubscriptionCache.subscriptions[mockAccount.key.accountId]).deepEqual(mockSubscriptions);
+
+		for (let ix = 0; ix < mockSubscriptions.length; ix++) {
+			const child = children[ix];
+			const subscription = mockSubscriptions[ix];
+
+			should(child).instanceof(AzureResourceSubscriptionTreeNode);
+			should(child.nodePathValue).equal(`subscription_${subscription.id}`);
+		}
+	});
+
+	it('Should load subscriptions from cache when it is not clearing cache.', async function(): Promise<void> {
+		mockSubscriptionService.setup((o) => o.getSubscriptions(mockAccount, mockCredentials)).returns(() => Promise.resolve(mockSubscriptions));
+		mockSubscriptionFilterService.setup((o) => o.getSelectedSubscriptions(mockAccount)).returns(() => Promise.resolve(undefined));
+
+		const accountTreeNode = new AzureResourceAccountTreeNode(mockAccount, mockTreeChangeHandler.object);
+
+		await accountTreeNode.getChildren();
+		const children = await accountTreeNode.getChildren();
+
+		mockCredentialService.verify((o) => o.getCredentials(mockAccount), TypeMoq.Times.exactly(1));
+		mockSubscriptionService.verify((o) => o.getSubscriptions(mockAccount, mockCredentials), TypeMoq.Times.exactly(1));
+		mockCacheService.verify((o) => o.get(TypeMoq.It.isAnyString()), TypeMoq.Times.exactly(2));
+		mockCacheService.verify((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny()), TypeMoq.Times.exactly(1));
+
+		should(children.length).equal(mockSubscriptionCache.subscriptions[mockAccount.key.accountId].length);
+
+		for (let ix = 0; ix < mockSubscriptionCache.subscriptions[mockAccount.key.accountId].length; ix++) {
+			should(children[ix].nodePathValue).equal(`subscription_${mockSubscriptionCache.subscriptions[mockAccount.key.accountId][ix].id}`);
+		}
+	});
+
+	it('Should handle when there is no subscriptions.', async function(): Promise<void> {
+		mockSubscriptionService.setup((o) => o.getSubscriptions(mockAccount, mockCredentials)).returns(() => Promise.resolve(undefined));
+
+		const accountTreeNode = new AzureResourceAccountTreeNode(mockAccount, mockTreeChangeHandler.object);
+
+		const children = await accountTreeNode.getChildren();
+
+		should(accountTreeNode.totalSubscriptionCount).equal(0);
+
+		should(children).Array();
+		should(children.length).equal(1);
+		should(children[0]).instanceof(AzureResourceMessageTreeNode);
+		should(children[0].nodePathValue).startWith('message_');
+		should(children[0].getNodeInfo().label).equal('No Subscriptions found.');
+	});
+
+	it('Should honor subscription filtering.', async function(): Promise<void> {
+		mockSubscriptionService.setup((o) => o.getSubscriptions(mockAccount, mockCredentials)).returns(() => Promise.resolve(mockSubscriptions));
+		mockSubscriptionFilterService.setup((o) => o.getSelectedSubscriptions(mockAccount)).returns(() => Promise.resolve(mockFilteredSubscriptions));
+
+		const accountTreeNode = new AzureResourceAccountTreeNode(mockAccount, mockTreeChangeHandler.object);
+
+		const children = await accountTreeNode.getChildren();
+
+		mockSubscriptionFilterService.verify((o) => o.getSelectedSubscriptions(mockAccount), TypeMoq.Times.once());
+
+		should(accountTreeNode.selectedSubscriptionCount).equal(mockFilteredSubscriptions.length);
+		should(children.length).equal(mockFilteredSubscriptions.length);
+
+		for (let ix = 0; ix < mockFilteredSubscriptions.length; ix++) {
+			should(children[ix].nodePathValue).equal(`subscription_${mockFilteredSubscriptions[ix].id}`);
+		}
+	});
+
+	it('Should handle errors.', async function(): Promise<void> {
+		const mockError = 'Test error';
+		mockSubscriptionService.setup((o) => o.getSubscriptions(mockAccount, mockCredentials)).returns(() => { throw new Error(mockError); });
+
+		const accountTreeNode = new AzureResourceAccountTreeNode(mockAccount, mockTreeChangeHandler.object);
+
+		const children = await accountTreeNode.getChildren();
+
+		mockCredentialService.verify((o) => o.getCredentials(mockAccount), TypeMoq.Times.once());
+		mockSubscriptionService.verify((o) => o.getSubscriptions(mockAccount, mockCredentials), TypeMoq.Times.once());
+		mockCacheService.verify((o) => o.get(TypeMoq.It.isAnyString()), TypeMoq.Times.never());
+		mockCacheService.verify((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny()), TypeMoq.Times.never());
+		mockSubscriptionFilterService.verify((o) => o.getSelectedSubscriptions(mockAccount), TypeMoq.Times.never());
+
+		should(children).Array();
+		should(children.length).equal(1);
+		should(children[0]).instanceof(AzureResourceMessageTreeNode);
+		should(children[0].nodePathValue).startWith('message_');
+		should(children[0].getNodeInfo().label).equal(`Error: ${mockError}`);
+	});
+});
+
+describe('AzureResourceAccountTreeNode.clearCache', function() : void {
+	beforeEach(() => {
+		mockTreeChangeHandler = TypeMoq.Mock.ofType<IAzureResourceTreeChangeHandler>();
+	});
+
+	it('Should clear cache.', async function(): Promise<void> {
+		const accountTreeNode = new AzureResourceAccountTreeNode(mockAccount, mockTreeChangeHandler.object);
+		accountTreeNode.clearCache();
+		should(accountTreeNode.isClearingCache).true();
+	});
+});

extensions/azurecore/src/test/azureResource/tree/databaseContainerTreeNode.test.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 should from 'should';
+import * as TypeMoq from 'typemoq';
+import * as sqlops from 'sqlops';
+import * as vscode from 'vscode';
+import 'mocha';
+import { ServiceClientCredentials } from 'ms-rest';
+
+import { AzureResourceServicePool } from '../../../azureResource/servicePool';
+import {
+	IAzureResourceCacheService,
+	IAzureResourceContextService,
+	IAzureResourceCredentialService,
+	IAzureResourceDatabaseService
+} from '../../../azureResource/interfaces';
+import { IAzureResourceTreeChangeHandler } from '../../../azureResource/tree/treeChangeHandler';
+import { AzureResourceSubscription, AzureResourceDatabase } from '../../../azureResource/models';
+import { AzureResourceItemType } from '../../../azureResource/constants';
+import { AzureResourceMessageTreeNode } from '../../../azureResource/tree/messageTreeNode';
+import { AzureResourceDatabaseContainerTreeNode } from '../../../azureResource/tree/databaseContainerTreeNode';
+import { AzureResourceDatabaseTreeNode } from '../../../azureResource/tree/databaseTreeNode';
+
+// Mock services
+const mockServicePool = AzureResourceServicePool.getInstance();
+
+let mockCacheService: TypeMoq.IMock<IAzureResourceCacheService>;
+let mockContextService: TypeMoq.IMock<IAzureResourceContextService>;
+let mockCredentialService: TypeMoq.IMock<IAzureResourceCredentialService>;
+let mockDatabaseService: TypeMoq.IMock<IAzureResourceDatabaseService>;
+
+let mockTreeChangeHandler: TypeMoq.IMock<IAzureResourceTreeChangeHandler>;
+
+// Mock test data
+const mockAccount: sqlops.Account = {
+	key: {
+		accountId: 'mock_account',
+		providerId: 'mock_provider'
+	},
+	displayInfo: {
+		displayName: 'mock_account@test.com',
+		accountType: 'Microsoft',
+		contextualDisplayName: 'test'
+	},
+	properties: undefined,
+	isStale: false
+};
+
+const mockCredential = TypeMoq.Mock.ofType<ServiceClientCredentials>().object;
+const mockCredentials = [mockCredential];
+
+const mockSubscription: AzureResourceSubscription = {
+	id: 'mock_subscription',
+	name: 'mock subscription'
+};
+
+const mockDatabase1: AzureResourceDatabase = {
+	name: 'mock database 1',
+	serverName: 'mock server 1',
+	serverFullName: 'mock server 1',
+	loginName: 'mock user 1'
+};
+const mockDatabase2: AzureResourceDatabase = {
+	name: 'mock database 2',
+	serverName: 'mock server 2',
+	serverFullName: 'mock server 2',
+	loginName: 'mock user 2'
+};
+const mockDatabases = [mockDatabase1, mockDatabase2];
+
+let mockDatabaseContainerCache: { databases: { [subscriptionId: string]: AzureResourceDatabase[] } };
+
+describe('AzureResourceDatabaseContainerTreeNode.info', function(): void {
+	beforeEach(() => {
+		mockContextService = TypeMoq.Mock.ofType<IAzureResourceContextService>();
+
+		mockTreeChangeHandler = TypeMoq.Mock.ofType<IAzureResourceTreeChangeHandler>();
+
+		mockServicePool.contextService = mockContextService.object;
+	});
+
+	it('Should be correct when created.', async function(): Promise<void> {
+		const databaseContainerTreeNode = new AzureResourceDatabaseContainerTreeNode(mockSubscription, mockAccount, mockTreeChangeHandler.object, undefined);
+
+		const databaseContainerTreeNodeLabel = 'SQL Databases';
+
+		should(databaseContainerTreeNode.nodePathValue).equal('databaseContainer');
+
+		const treeItem = await databaseContainerTreeNode.getTreeItem();
+		should(treeItem.label).equal(databaseContainerTreeNodeLabel);
+		should(treeItem.contextValue).equal(AzureResourceItemType.databaseContainer);
+		should(treeItem.collapsibleState).equal(vscode.TreeItemCollapsibleState.Collapsed);
+
+		const nodeInfo = databaseContainerTreeNode.getNodeInfo();
+		should(nodeInfo.isLeaf).false();
+		should(nodeInfo.label).equal(databaseContainerTreeNodeLabel);
+		should(nodeInfo.nodeType).equal(AzureResourceItemType.databaseContainer);
+		should(nodeInfo.iconType).equal(AzureResourceItemType.databaseContainer);
+	});
+});
+
+describe('AzureResourceDatabaseContainerTreeNode.getChildren', function(): void {
+	beforeEach(() => {
+		mockCacheService = TypeMoq.Mock.ofType<IAzureResourceCacheService>();
+		mockCredentialService = TypeMoq.Mock.ofType<IAzureResourceCredentialService>();
+		mockDatabaseService = TypeMoq.Mock.ofType<IAzureResourceDatabaseService>();
+
+		mockTreeChangeHandler = TypeMoq.Mock.ofType<IAzureResourceTreeChangeHandler>();
+
+		mockDatabaseContainerCache = { databases: {} };
+
+		mockServicePool.cacheService = mockCacheService.object;
+		mockServicePool.credentialService = mockCredentialService.object;
+		mockServicePool.databaseService = mockDatabaseService.object;
+
+		mockCredentialService.setup((o) => o.getCredentials(mockAccount)).returns(() => Promise.resolve(mockCredentials));
+		mockCacheService.setup((o) => o.get(TypeMoq.It.isAnyString())).returns(() => mockDatabaseContainerCache);
+		mockCacheService.setup((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny())).returns(() => mockDatabaseContainerCache.databases[mockSubscription.id] = mockDatabases);
+	});
+
+	it('Should load databases from scratch and update cache when it is clearing cache.', async function(): Promise<void> {
+		mockDatabaseService.setup((o) => o.getDatabases(mockSubscription, mockCredentials)).returns(() => Promise.resolve(mockDatabases));
+
+		const databaseContainerTreeNode = new AzureResourceDatabaseContainerTreeNode(mockSubscription, mockAccount, mockTreeChangeHandler.object, undefined);
+
+		const children = await databaseContainerTreeNode.getChildren();
+
+		mockCredentialService.verify((o) => o.getCredentials(mockAccount), TypeMoq.Times.once());
+		mockDatabaseService.verify((o) => o.getDatabases(mockSubscription, mockCredentials), TypeMoq.Times.once());
+		mockCacheService.verify((o) => o.get(TypeMoq.It.isAnyString()), TypeMoq.Times.once());
+		mockCacheService.verify((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny()), TypeMoq.Times.once());
+
+		should(databaseContainerTreeNode.isClearingCache).false();
+
+		should(children).Array();
+		should(children.length).equal(mockDatabases.length);
+
+		should(Object.keys(mockDatabaseContainerCache.databases)).deepEqual([mockSubscription.id]);
+		should(mockDatabaseContainerCache.databases[mockSubscription.id]).deepEqual(mockDatabases);
+
+		for (let ix = 0; ix < mockDatabases.length; ix++) {
+			const child = children[ix];
+			const database = mockDatabases[ix];
+
+			should(child).instanceof(AzureResourceDatabaseTreeNode);
+			should(child.nodePathValue).equal(`database_${database.name}`);
+		}
+	});
+
+	it('Should load databases from cache when it is not clearing cache.', async function(): Promise<void> {
+		mockDatabaseService.setup((o) => o.getDatabases(mockSubscription, mockCredentials)).returns(() => Promise.resolve(mockDatabases));
+
+		const databaseContainerTreeNode = new AzureResourceDatabaseContainerTreeNode(mockSubscription, mockAccount, mockTreeChangeHandler.object, undefined);
+
+		await databaseContainerTreeNode.getChildren();
+		const children = await databaseContainerTreeNode.getChildren();
+
+		mockCredentialService.verify((o) => o.getCredentials(mockAccount), TypeMoq.Times.exactly(1));
+		mockDatabaseService.verify((o) => o.getDatabases(mockSubscription, mockCredentials), TypeMoq.Times.exactly(1));
+		mockCacheService.verify((o) => o.get(TypeMoq.It.isAnyString()), TypeMoq.Times.exactly(2));
+		mockCacheService.verify((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny()), TypeMoq.Times.exactly(1));
+
+		should(children.length).equal(mockDatabaseContainerCache.databases[mockSubscription.id].length);
+
+		for (let ix = 0; ix < mockDatabaseContainerCache.databases[mockSubscription.id].length; ix++) {
+			should(children[ix].nodePathValue).equal(`database_${mockDatabaseContainerCache.databases[mockSubscription.id][ix].name}`);
+		}
+	});
+
+	it('Should handle when there is no databases.', async function(): Promise<void> {
+		mockDatabaseService.setup((o) => o.getDatabases(mockSubscription, mockCredentials)).returns(() => Promise.resolve(undefined));
+
+		const databaseContainerTreeNode = new AzureResourceDatabaseContainerTreeNode(mockSubscription, mockAccount, mockTreeChangeHandler.object, undefined);
+
+		const children = await databaseContainerTreeNode.getChildren();
+
+		should(children).Array();
+		should(children.length).equal(1);
+		should(children[0]).instanceof(AzureResourceMessageTreeNode);
+		should(children[0].nodePathValue).startWith('message_');
+		should(children[0].getNodeInfo().label).equal('No SQL Databases found.');
+	});
+
+	it('Should handle errors.', async function(): Promise<void> {
+		const mockError = 'Test error';
+		mockDatabaseService.setup((o) => o.getDatabases(mockSubscription, mockCredentials)).returns(() => { throw new Error(mockError); });
+
+		const databaseContainerTreeNode = new AzureResourceDatabaseContainerTreeNode(mockSubscription, mockAccount, mockTreeChangeHandler.object, undefined);
+		const children = await databaseContainerTreeNode.getChildren();
+
+		mockCredentialService.verify((o) => o.getCredentials(mockAccount), TypeMoq.Times.once());
+		mockDatabaseService.verify((o) => o.getDatabases(mockSubscription, mockCredentials), TypeMoq.Times.once());
+		mockCacheService.verify((o) => o.get(TypeMoq.It.isAnyString()), TypeMoq.Times.never());
+		mockCacheService.verify((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny()), TypeMoq.Times.never());
+
+		should(children).Array();
+		should(children.length).equal(1);
+		should(children[0]).instanceof(AzureResourceMessageTreeNode);
+		should(children[0].nodePathValue).startWith('message_');
+		should(children[0].getNodeInfo().label).equal(`Error: ${mockError}`);
+	});
+});
+
+describe('AzureResourceDatabaseContainerTreeNode.clearCache', function() : void {
+	beforeEach(() => {
+		mockTreeChangeHandler = TypeMoq.Mock.ofType<IAzureResourceTreeChangeHandler>();
+	});
+
+	it('Should clear cache.', async function(): Promise<void> {
+		const databaseContainerTreeNode = new AzureResourceDatabaseContainerTreeNode(mockSubscription, mockAccount, mockTreeChangeHandler.object, undefined);
+		databaseContainerTreeNode.clearCache();
+		should(databaseContainerTreeNode.isClearingCache).true();
+	});
+});

extensions/azurecore/src/test/azureResource/tree/databaseServerContainerTreeNode.test.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 should from 'should';
+import * as TypeMoq from 'typemoq';
+import * as sqlops from 'sqlops';
+import * as vscode from 'vscode';
+import 'mocha';
+import { ServiceClientCredentials } from 'ms-rest';
+
+import { AzureResourceServicePool } from '../../../azureResource/servicePool';
+import {
+	IAzureResourceCacheService,
+	IAzureResourceContextService,
+	IAzureResourceCredentialService,
+	IAzureResourceDatabaseServerService
+} from '../../../azureResource/interfaces';
+import { IAzureResourceTreeChangeHandler } from '../../../azureResource/tree/treeChangeHandler';
+import { AzureResourceSubscription, AzureResourceDatabaseServer } from '../../../azureResource/models';
+import { AzureResourceItemType } from '../../../azureResource/constants';
+import { AzureResourceMessageTreeNode } from '../../../azureResource/tree/messageTreeNode';
+import { AzureResourceDatabaseServerContainerTreeNode } from '../../../azureResource/tree/databaseServerContainerTreeNode';
+import { AzureResourceDatabaseServerTreeNode } from '../../../azureResource/tree/databaseServerTreeNode';
+
+// Mock services
+const mockServicePool = AzureResourceServicePool.getInstance();
+
+let mockCacheService: TypeMoq.IMock<IAzureResourceCacheService>;
+let mockContextService: TypeMoq.IMock<IAzureResourceContextService>;
+let mockCredentialService: TypeMoq.IMock<IAzureResourceCredentialService>;
+let mockDatabaseServerService: TypeMoq.IMock<IAzureResourceDatabaseServerService>;
+
+let mockTreeChangeHandler: TypeMoq.IMock<IAzureResourceTreeChangeHandler>;
+
+// Mock test data
+const mockAccount: sqlops.Account = {
+	key: {
+		accountId: 'mock_account',
+		providerId: 'mock_provider'
+	},
+	displayInfo: {
+		displayName: 'mock_account@test.com',
+		accountType: 'Microsoft',
+		contextualDisplayName: 'test'
+	},
+	properties: undefined,
+	isStale: false
+};
+
+const mockCredential = TypeMoq.Mock.ofType<ServiceClientCredentials>().object;
+const mockCredentials = [mockCredential];
+
+const mockSubscription: AzureResourceSubscription = {
+	id: 'mock_subscription',
+	name: 'mock subscription'
+};
+
+const mockDatabaseServer1: AzureResourceDatabaseServer = {
+	name: 'mock server 1',
+	fullName: 'mock server 1',
+	loginName: 'mock user 1',
+	defaultDatabaseName: 'master'
+};
+const mockDatabaseServer2: AzureResourceDatabaseServer = {
+	name: 'mock server 2',
+	fullName: 'mock server 2',
+	loginName: 'mock user 2',
+	defaultDatabaseName: 'master'
+};
+const mockDatabaseServers = [mockDatabaseServer1, mockDatabaseServer2];
+
+let mockDatabaseServerContainerCache: { databaseServers: { [subscriptionId: string]: AzureResourceDatabaseServer[] } };
+
+describe('AzureResourceDatabaseServerContainerTreeNode.info', function(): void {
+	beforeEach(() => {
+		mockContextService = TypeMoq.Mock.ofType<IAzureResourceContextService>();
+
+		mockTreeChangeHandler = TypeMoq.Mock.ofType<IAzureResourceTreeChangeHandler>();
+
+		mockServicePool.contextService = mockContextService.object;
+	});
+
+	it('Should be correct when created.', async function(): Promise<void> {
+		const databaseServerContainerTreeNode = new AzureResourceDatabaseServerContainerTreeNode(mockSubscription, mockAccount, mockTreeChangeHandler.object, undefined);
+
+		const databaseServerContainerTreeNodeLabel = 'SQL Servers';
+
+		should(databaseServerContainerTreeNode.nodePathValue).equal('databaseServerContainer');
+
+		const treeItem = await databaseServerContainerTreeNode.getTreeItem();
+		should(treeItem.label).equal(databaseServerContainerTreeNodeLabel);
+		should(treeItem.contextValue).equal(AzureResourceItemType.databaseServerContainer);
+		should(treeItem.collapsibleState).equal(vscode.TreeItemCollapsibleState.Collapsed);
+
+		const nodeInfo = databaseServerContainerTreeNode.getNodeInfo();
+		should(nodeInfo.isLeaf).false();
+		should(nodeInfo.label).equal(databaseServerContainerTreeNodeLabel);
+		should(nodeInfo.nodeType).equal(AzureResourceItemType.databaseServerContainer);
+		should(nodeInfo.iconType).equal(AzureResourceItemType.databaseServerContainer);
+	});
+});
+
+describe('AzureResourceDatabaseServerContainerTreeNode.getChildren', function(): void {
+	beforeEach(() => {
+		mockCacheService = TypeMoq.Mock.ofType<IAzureResourceCacheService>();
+		mockCredentialService = TypeMoq.Mock.ofType<IAzureResourceCredentialService>();
+		mockDatabaseServerService = TypeMoq.Mock.ofType<IAzureResourceDatabaseServerService>();
+
+		mockTreeChangeHandler = TypeMoq.Mock.ofType<IAzureResourceTreeChangeHandler>();
+
+		mockDatabaseServerContainerCache = { databaseServers: {} };
+
+		mockServicePool.cacheService = mockCacheService.object;
+		mockServicePool.credentialService = mockCredentialService.object;
+		mockServicePool.databaseServerService = mockDatabaseServerService.object;
+
+		mockCredentialService.setup((o) => o.getCredentials(mockAccount)).returns(() => Promise.resolve(mockCredentials));
+		mockCacheService.setup((o) => o.get(TypeMoq.It.isAnyString())).returns(() => mockDatabaseServerContainerCache);
+		mockCacheService.setup((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny())).returns(() => mockDatabaseServerContainerCache.databaseServers[mockSubscription.id] = mockDatabaseServers);
+	});
+
+	it('Should load database servers from scratch and update cache when it is clearing cache.', async function(): Promise<void> {
+		mockDatabaseServerService.setup((o) => o.getDatabaseServers(mockSubscription, mockCredentials)).returns(() => Promise.resolve(mockDatabaseServers));
+
+		const databaseServerContainerTreeNode = new AzureResourceDatabaseServerContainerTreeNode(mockSubscription, mockAccount, mockTreeChangeHandler.object, undefined);
+
+		const children = await databaseServerContainerTreeNode.getChildren();
+
+		mockCredentialService.verify((o) => o.getCredentials(mockAccount), TypeMoq.Times.once());
+		mockDatabaseServerService.verify((o) => o.getDatabaseServers(mockSubscription, mockCredentials), TypeMoq.Times.once());
+		mockCacheService.verify((o) => o.get(TypeMoq.It.isAnyString()), TypeMoq.Times.once());
+		mockCacheService.verify((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny()), TypeMoq.Times.once());
+
+		should(databaseServerContainerTreeNode.isClearingCache).false();
+
+		should(children).Array();
+		should(children.length).equal(mockDatabaseServers.length);
+
+		should(Object.keys(mockDatabaseServerContainerCache.databaseServers)).deepEqual([mockSubscription.id]);
+		should(mockDatabaseServerContainerCache.databaseServers[mockSubscription.id]).deepEqual(mockDatabaseServers);
+
+		for (let ix = 0; ix < mockDatabaseServers.length; ix++) {
+			const child = children[ix];
+			const databaseServer = mockDatabaseServers[ix];
+
+			should(child).instanceof(AzureResourceDatabaseServerTreeNode);
+			should(child.nodePathValue).equal(`databaseServer_${databaseServer.name}`);
+		}
+	});
+
+	it('Should load database servers from cache when it is not clearing cache.', async function(): Promise<void> {
+		mockDatabaseServerService.setup((o) => o.getDatabaseServers(mockSubscription, mockCredentials)).returns(() => Promise.resolve(mockDatabaseServers));
+
+		const databaseServerContainerTreeNode = new AzureResourceDatabaseServerContainerTreeNode(mockSubscription, mockAccount, mockTreeChangeHandler.object, undefined);
+
+		await databaseServerContainerTreeNode.getChildren();
+		const children = await databaseServerContainerTreeNode.getChildren();
+
+		mockCredentialService.verify((o) => o.getCredentials(mockAccount), TypeMoq.Times.exactly(1));
+		mockDatabaseServerService.verify((o) => o.getDatabaseServers(mockSubscription, mockCredentials), TypeMoq.Times.exactly(1));
+		mockCacheService.verify((o) => o.get(TypeMoq.It.isAnyString()), TypeMoq.Times.exactly(2));
+		mockCacheService.verify((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny()), TypeMoq.Times.exactly(1));
+
+		should(children.length).equal(mockDatabaseServerContainerCache.databaseServers[mockSubscription.id].length);
+
+		for (let ix = 0; ix < mockDatabaseServerContainerCache.databaseServers[mockSubscription.id].length; ix++) {
+			should(children[ix].nodePathValue).equal(`databaseServer_${mockDatabaseServerContainerCache.databaseServers[mockSubscription.id][ix].name}`);
+		}
+	});
+
+	it('Should handle when there is no database servers.', async function(): Promise<void> {
+		mockDatabaseServerService.setup((o) => o.getDatabaseServers(mockSubscription, mockCredentials)).returns(() => Promise.resolve(undefined));
+
+		const databaseContainerTreeNode = new AzureResourceDatabaseServerContainerTreeNode(mockSubscription, mockAccount, mockTreeChangeHandler.object, undefined);
+
+		const children = await databaseContainerTreeNode.getChildren();
+
+		should(children).Array();
+		should(children.length).equal(1);
+		should(children[0]).instanceof(AzureResourceMessageTreeNode);
+		should(children[0].nodePathValue).startWith('message_');
+		should(children[0].getNodeInfo().label).equal('No SQL Servers found.');
+	});
+
+	it('Should handle errors.', async function(): Promise<void> {
+		const mockError = 'Test error';
+		mockDatabaseServerService.setup((o) => o.getDatabaseServers(mockSubscription, mockCredentials)).returns(() => { throw new Error(mockError); });
+
+		const databaseServerContainerTreeNode = new AzureResourceDatabaseServerContainerTreeNode(mockSubscription, mockAccount, mockTreeChangeHandler.object, undefined);
+		const children = await databaseServerContainerTreeNode.getChildren();
+
+		mockCredentialService.verify((o) => o.getCredentials(mockAccount), TypeMoq.Times.once());
+		mockDatabaseServerService.verify((o) => o.getDatabaseServers(mockSubscription, mockCredentials), TypeMoq.Times.once());
+		mockCacheService.verify((o) => o.get(TypeMoq.It.isAnyString()), TypeMoq.Times.never());
+		mockCacheService.verify((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny()), TypeMoq.Times.never());
+
+		should(children).Array();
+		should(children.length).equal(1);
+		should(children[0]).instanceof(AzureResourceMessageTreeNode);
+		should(children[0].nodePathValue).startWith('message_');
+		should(children[0].getNodeInfo().label).equal(`Error: ${mockError}`);
+	});
+});
+
+describe('AzureResourceDatabaseServerContainerTreeNode.clearCache', function() : void {
+	beforeEach(() => {
+		mockTreeChangeHandler = TypeMoq.Mock.ofType<IAzureResourceTreeChangeHandler>();
+	});
+
+	it('Should clear cache.', async function(): Promise<void> {
+		const databaseServerContainerTreeNode = new AzureResourceDatabaseServerContainerTreeNode(mockSubscription, mockAccount, mockTreeChangeHandler.object, undefined);
+		databaseServerContainerTreeNode.clearCache();
+		should(databaseServerContainerTreeNode.isClearingCache).true();
+	});
+});

extensions/azurecore/src/test/azureResource/tree/databaseServerTreeNode.test.ts

@@ -0,0 +1,62 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 should from 'should';
+import * as TypeMoq from 'typemoq';
+import * as vscode from 'vscode';
+import 'mocha';
+
+import { AzureResourceServicePool } from '../../../azureResource/servicePool';
+import { IAzureResourceContextService } from '../../../azureResource/interfaces';
+import { IAzureResourceTreeChangeHandler } from '../../../azureResource/tree/treeChangeHandler';
+import { AzureResourceDatabaseServer } from '../../../azureResource/models';
+import { AzureResourceItemType } from '../../../azureResource/constants';
+import { AzureResourceDatabaseServerTreeNode } from '../../../azureResource/tree/databaseServerTreeNode';
+
+// Mock services
+const mockServicePool = AzureResourceServicePool.getInstance();
+
+let mockContextService: TypeMoq.IMock<IAzureResourceContextService>;
+
+let mockTreeChangeHandler: TypeMoq.IMock<IAzureResourceTreeChangeHandler>;
+
+// Mock test data
+const mockDatabaseServer: AzureResourceDatabaseServer = {
+	name: 'mock database 1',
+	fullName: 'mock server 1',
+	loginName: 'mock user 1',
+	defaultDatabaseName: 'master'
+};
+
+describe('AzureResourceDatabaseServerTreeNode.info', function(): void {
+	beforeEach(() => {
+		mockContextService = TypeMoq.Mock.ofType<IAzureResourceContextService>();
+
+		mockTreeChangeHandler = TypeMoq.Mock.ofType<IAzureResourceTreeChangeHandler>();
+
+		mockServicePool.contextService = mockContextService.object;
+	});
+
+	it('Should be correct when created.', async function(): Promise<void> {
+		const databaseServerTreeNode = new AzureResourceDatabaseServerTreeNode(mockDatabaseServer, mockTreeChangeHandler.object, undefined);
+
+		const databaseServerTreeNodeLabel = mockDatabaseServer.name;
+
+		should(databaseServerTreeNode.nodePathValue).equal(`databaseServer_${mockDatabaseServer.name}`);
+
+		const treeItem = await databaseServerTreeNode.getTreeItem();
+		should(treeItem.label).equal(databaseServerTreeNodeLabel);
+		should(treeItem.contextValue).equal(AzureResourceItemType.databaseServer);
+		should(treeItem.collapsibleState).equal(vscode.TreeItemCollapsibleState.None);
+
+		const nodeInfo = databaseServerTreeNode.getNodeInfo();
+		should(nodeInfo.isLeaf).true();
+		should(nodeInfo.label).equal(databaseServerTreeNodeLabel);
+		should(nodeInfo.nodeType).equal(AzureResourceItemType.databaseServer);
+		should(nodeInfo.iconType).equal(AzureResourceItemType.databaseServer);
+	});
+});

extensions/azurecore/src/test/azureResource/tree/databaseTreeNode.test.ts

@@ -0,0 +1,62 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 should from 'should';
+import * as TypeMoq from 'typemoq';
+import * as vscode from 'vscode';
+import 'mocha';
+
+import { AzureResourceServicePool } from '../../../azureResource/servicePool';
+import { IAzureResourceContextService } from '../../../azureResource/interfaces';
+import { IAzureResourceTreeChangeHandler } from '../../../azureResource/tree/treeChangeHandler';
+import { AzureResourceDatabase } from '../../../azureResource/models';
+import { AzureResourceItemType } from '../../../azureResource/constants';
+import { AzureResourceDatabaseTreeNode } from '../../../azureResource/tree/databaseTreeNode';
+
+// Mock services
+const mockServicePool = AzureResourceServicePool.getInstance();
+
+let mockContextService: TypeMoq.IMock<IAzureResourceContextService>;
+
+let mockTreeChangeHandler: TypeMoq.IMock<IAzureResourceTreeChangeHandler>;
+
+// Mock test data
+const mockDatabase: AzureResourceDatabase = {
+	name: 'mock database 1',
+	serverName: 'mock server 1',
+	serverFullName: 'mock server 1',
+	loginName: 'mock user 1'
+};
+
+describe('AzureResourceDatabaseTreeNode.info', function(): void {
+	beforeEach(() => {
+		mockContextService = TypeMoq.Mock.ofType<IAzureResourceContextService>();
+
+		mockTreeChangeHandler = TypeMoq.Mock.ofType<IAzureResourceTreeChangeHandler>();
+
+		mockServicePool.contextService = mockContextService.object;
+	});
+
+	it('Should be correct.', async function(): Promise<void> {
+		const databaseTreeNode = new AzureResourceDatabaseTreeNode(mockDatabase, mockTreeChangeHandler.object, undefined);
+
+		const databaseTreeNodeLabel = `${mockDatabase.name} (${mockDatabase.serverName})`;
+
+		should(databaseTreeNode.nodePathValue).equal(`database_${mockDatabase.name}`);
+
+		const treeItem = await databaseTreeNode.getTreeItem();
+		should(treeItem.label).equal(databaseTreeNodeLabel);
+		should(treeItem.contextValue).equal(AzureResourceItemType.database);
+		should(treeItem.collapsibleState).equal(vscode.TreeItemCollapsibleState.None);
+
+		const nodeInfo = databaseTreeNode.getNodeInfo();
+		should(nodeInfo.isLeaf).true();
+		should(nodeInfo.label).equal(databaseTreeNodeLabel);
+		should(nodeInfo.nodeType).equal(AzureResourceItemType.database);
+		should(nodeInfo.iconType).equal(AzureResourceItemType.database);
+	});
+});

extensions/azurecore/src/test/azureResource/tree/messageTreeNode.test.ts

@@ -0,0 +1,41 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 should from 'should';
+import * as vscode from 'vscode';
+import 'mocha';
+
+import { AzureResourceItemType } from '../../../azureResource/constants';
+import { AzureResourceMessageTreeNode } from '../../../azureResource/tree/messageTreeNode';
+
+describe('AzureResourceMessageTreeNode.info', function(): void {
+	it('Should be correct when created.', async function(): Promise<void> {
+		const mockMessage = 'Test messagse';
+		const treeNode = new AzureResourceMessageTreeNode(mockMessage, undefined);
+
+		should(treeNode.nodePathValue).startWith('message_');
+
+		const treeItem = await treeNode.getTreeItem();
+		should(treeItem.label).equal(mockMessage);
+		should(treeItem.contextValue).equal(AzureResourceItemType.message);
+		should(treeItem.collapsibleState).equal(vscode.TreeItemCollapsibleState.None);
+
+		const nodeInfo = treeNode.getNodeInfo();
+		should(nodeInfo.isLeaf).true();
+		should(nodeInfo.label).equal(mockMessage);
+		should(nodeInfo.nodeType).equal(AzureResourceItemType.message);
+		should(nodeInfo.iconType).equal(AzureResourceItemType.message);
+	});
+});
+
+describe('AzureResourceMessageTreeNode.create', function(): void {
+	it('Should create a message node.', async function(): Promise<void> {
+		const mockMessage = 'Test messagse';
+		const treeNode = AzureResourceMessageTreeNode.create(mockMessage, undefined);
+		should(treeNode).instanceof(AzureResourceMessageTreeNode);
+	});
+});

extensions/azurecore/src/test/azureResource/tree/subscriptionTreeNode.test.ts

@@ -0,0 +1,91 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import * as should from 'should';
+import * as TypeMoq from 'typemoq';
+import * as sqlops from 'sqlops';
+import * as vscode from 'vscode';
+import 'mocha';
+
+import { AzureResourceServicePool } from '../../../azureResource/servicePool';
+import { IAzureResourceContextService } from '../../../azureResource/interfaces';
+import { IAzureResourceTreeChangeHandler } from '../../../azureResource/tree/treeChangeHandler';
+import { AzureResourceSubscription } from '../../../azureResource/models';
+import { AzureResourceSubscriptionTreeNode } from '../../../azureResource/tree/subscriptionTreeNode';
+import { AzureResourceDatabaseContainerTreeNode } from '../../../azureResource/tree/databaseContainerTreeNode';
+import { AzureResourceDatabaseServerContainerTreeNode } from '../../../azureResource/tree/databaseServerContainerTreeNode';
+import { AzureResourceItemType } from '../../../azureResource/constants';
+
+// Mock services
+const mockServicePool = AzureResourceServicePool.getInstance();
+
+let mockContextService: TypeMoq.IMock<IAzureResourceContextService>;
+
+let mockTreeChangeHandler: TypeMoq.IMock<IAzureResourceTreeChangeHandler>;
+
+// Mock test data
+const mockAccount: sqlops.Account = {
+	key: {
+		accountId: 'mock_account',
+		providerId: 'mock_provider'
+	},
+	displayInfo: {
+		displayName: 'mock_account@test.com',
+		accountType: 'Microsoft',
+		contextualDisplayName: 'test'
+	},
+	properties: undefined,
+	isStale: false
+};
+
+const mockSubscription: AzureResourceSubscription = {
+	id: 'mock_subscription',
+	name: 'mock subscription'
+};
+
+describe('AzureResourceSubscriptionTreeNode.info', function(): void {
+	beforeEach(() => {
+		mockContextService = TypeMoq.Mock.ofType<IAzureResourceContextService>();
+
+		mockTreeChangeHandler = TypeMoq.Mock.ofType<IAzureResourceTreeChangeHandler>();
+
+		mockServicePool.contextService = mockContextService.object;
+	});
+
+	it('Should be correct when created.', async function(): Promise<void> {
+		const subscriptionTreeNode = new AzureResourceSubscriptionTreeNode(mockSubscription, mockAccount, mockTreeChangeHandler.object, undefined);
+
+		should(subscriptionTreeNode.nodePathValue).equal(`subscription_${mockSubscription.id}`);
+
+		const treeItem = await subscriptionTreeNode.getTreeItem();
+		should(treeItem.label).equal(mockSubscription.name);
+		should(treeItem.collapsibleState).equal(vscode.TreeItemCollapsibleState.Collapsed);
+		should(treeItem.contextValue).equal(AzureResourceItemType.subscription);
+
+		const nodeInfo = subscriptionTreeNode.getNodeInfo();
+		should(nodeInfo.label).equal(mockSubscription.name);
+		should(nodeInfo.isLeaf).equal(false);
+		should(nodeInfo.nodeType).equal(AzureResourceItemType.subscription);
+		should(nodeInfo.iconType).equal(AzureResourceItemType.subscription);
+	});
+});
+
+describe('AzureResourceSubscriptionTreeNode.getChildren', function(): void {
+	beforeEach(() => {
+		mockTreeChangeHandler = TypeMoq.Mock.ofType<IAzureResourceTreeChangeHandler>();
+	});
+
+	it('Should load database containers.', async function(): Promise<void> {
+		const subscriptionTreeNode = new AzureResourceSubscriptionTreeNode(mockSubscription, mockAccount, mockTreeChangeHandler.object, undefined);
+		const children = await subscriptionTreeNode.getChildren();
+
+		should(children).Array();
+		should(children.length).equal(2);
+		should(children[0]).instanceof(AzureResourceDatabaseContainerTreeNode);
+		should(children[1]).instanceof(AzureResourceDatabaseServerContainerTreeNode);
+	});
+});