Add auto-update links in release branch

Merge branch 'master' into release/0.26
Bump SQL Ops to 0.26.5 (#691 )
2026-02-20 02:51:36 -05:00 · 2018-02-14 10:30:51 -08:00 · 2018-02-14 10:24:14 -08:00 · 2018-02-14 10:23:05 -08:00 · 2018-02-14 10:21:04 -08:00 · 2018-02-13 13:29:18 -08:00
40 changed files with 1170 additions and 2184 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,37 @@
 # Change Log

+## Version 0.26.4
+* Release date: February 15, 2017
+* Release status: Public Preview
+
+## What's new in this version
+The February release fixes several important customer reported issues, as well as various feature improvements.  We've also introduced auto-update support in February which will simplify keeping updated with the lastest changes.
+
+Here's some of the highlights in the February release.
+
+* Support Auto-Update installation on Windows and macOS
+* Publish RPM and DEB packages to offical Microsoft repos
+* Fix #6 Keep connection and selected database when opening new query tabs
+* Fix #22 'Server Name' and 'Database Name' - Can these be drop downs instead of text boxes?
+* Fix #549 Silent/Very Silent Install results in application opening after installation
+* Fix #481 Add "Check for updates" option.
+* SQL Editor colorization and auto-completion fixes
+  * #584 Keyword "FULL" not highlighted by IntelliSense
+  * #345 Colorize SQL functions within the editor
+  * #300 [#tempData] latest "]" will display green color
+  * #225 Keyword color mismatch
+  * #60 invalid sql syntax color highlighting when using temporary table in from clause
+* Introduce Connection extensibility API
+* VS Code Editor 1.19 integration
+* Update JustinPealing/html-query-plan component to pick-up several Query Plan viewer improvements
+
+## Contributions and "thank you"
+We would like to thank all our users who raised issues, and in particular the following users who helped contribute fixes:
+
+* SebastianPfliegel for `Add cursor snippet (#475)`
+* mikaoelitiana for fix: `revert README and CONTRIBUTING after last VSCode merge (#574)`
+* alextercete for `Reinstate menu item to install from VSIX (#682)`
+
 ## Version 0.25.4
 * Release date: January 17, 2017
 * Release status: Public Preview
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@

 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.

-**Download SQL Operations Studio January Public Preview**
+**Download SQL Operations Studio February Public Preview**

 Platform | Link
 -- | --
@@ -17,6 +17,8 @@ Go to our [download page](https://aka.ms/sqlopsstudio) for more specific instruc

 Try out the latest insiders build from `master` at https://github.com/Microsoft/sqlopsstudio/releases.

+See the [change log](https://github.com/Microsoft/sqlopsstudio/blob/master/CHANGELOG.md) for additional details of what's in this release.
+
 **Feature Highlights**

 - Cross-Platform DB management for Windows, macOS and Linux with simple XCopy deployment
@@ -49,6 +51,21 @@ This project has adopted the [Microsoft Open Source Code of Conduct](https://ope
 ## 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"
+We would like to thank all our users who raised issues, and in particular the following users who helped contribute fixes:
+
+* SebastianPfliegel for `Add cursor snippet (#475)`
+* mikaoelitiana for fix: `revert README and CONTRIBUTING after last VSCode merge (#574)`
+* alextercete for `Reinstate menu item to install from VSIX (#682)`
+* alextercete for `Fix "No extension gallery service configured" error (#427)`
+* SebastianPfliegel for `Add cursor snippet (#475)`
+* mwiedemeyer for `Fix #58: Default sort order for DB size widget (#111)`
+* AlexTroshkin for `Show disconnect in context menu only when connectionProfile connected (#150)`
+* AlexTroshkin for `Fix #138: Invalid syntax color highlighting (identity not highlighting) (#140))`
+* stebet for `Fix #153: Fixing sql snippets that failed on a DB with case-sensitive collation. (#152)`
+* SebastianPfliegel `Remove sqlExtensionHelp (#312)`
+* olljanat for `Implemented npm version check (#314)`
+
 ## License

 Copyright (c) Microsoft Corporation. All rights reserved.
--- a/build/gulpfile.mixin.js
+++ b/build/gulpfile.mixin.js
@@ -6,21 +6,14 @@
 'use strict';

 const gulp = require('gulp');
-const json = require('gulp-json-editor');
-const buffer = require('gulp-buffer');
-const filter = require('gulp-filter');
-const es = require('event-stream');
-const util = require('./lib/util');
-const remote = require('gulp-remote-src');
-const zip = require('gulp-vinyl-zip');
-const assign = require('object-assign');
-const pkg = require('../package.json');
+// {{SQL CARBON EDIT}}
+const jeditor = require('gulp-json-editor');

 gulp.task('mixin', function () {
-	const repo = process.env['VSCODE_MIXIN_REPO'];
-
-	if (!repo) {
-		console.log('Missing VSCODE_MIXIN_REPO, skipping mixin');
+  // {{SQL CARBON EDIT}}
+	const updateUrl = process.env['SQLOPS_UPDATEURL'];
+	if (!updateUrl) {
+		console.log('Missing SQLOPS_UPDATEURL, skipping mixin');
 		return;
 	}

@@ -31,39 +24,13 @@ gulp.task('mixin', function () {
 		return;
 	}

-	const url = `https://github.com/${repo}/archive/${pkg.distro}.zip`;
-	const opts = { base: url };
-	const username = process.env['VSCODE_MIXIN_USERNAME'];
-	const password = process.env['VSCODE_MIXIN_PASSWORD'];
+  // {{SQL CARBON EDIT}}
+	let newValues = {
+		"updateUrl": updateUrl,
+		"quality": quality
+	};

-	if (username || password) {
-		opts.auth = { user: username || '', pass: password || '' };
-	}
-
-	console.log('Mixing in sources from \'' + url + '\':');
-
-	let all = remote('', opts)
-		.pipe(zip.src())
-		.pipe(filter(function (f) { return !f.isDirectory(); }))
-		.pipe(util.rebase(1));
-
-	if (quality) {
-		const productJsonFilter = filter('product.json', { restore: true });
-		const mixin = all
-			.pipe(filter(['quality/' + quality + '/**']))
-			.pipe(util.rebase(2))
-			.pipe(productJsonFilter)
-			.pipe(buffer())
-			.pipe(json(o => assign({}, require('../product.json'), o)))
-			.pipe(productJsonFilter.restore);
-
-		all = es.merge(mixin);
-	}
-
-	return all
-		.pipe(es.mapSync(function (f) {
-			console.log(f.relative);
-			return f;
-		}))
+	return gulp.src('./product.json')
+		.pipe(jeditor(newValues))
 		.pipe(gulp.dest('.'));
 });
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -31,14 +31,17 @@ const packageJson = require('../package.json');
 const product = require('../product.json');
 const crypto = require('crypto');
 const i18n = require('./lib/i18n');
-// {{SQL CARBON EDIT}}
-var del = require('del');
 const serviceInstaller = require('../extensions-modules/lib/languageservice/serviceInstallerUtil');
 const glob = require('glob');
 const deps = require('./dependencies');
 const getElectronVersion = require('./lib/electron').getElectronVersion;

 const productionDependencies = deps.getProductionDependencies(path.dirname(__dirname));
+
+// {{SQL CARBON EDIT}}
+var del = require('del');
+const extensionsRoot = path.join(root, 'extensions');
+const extensionsProductionDependencies = deps.getProductionDependencies(extensionsRoot);
 const baseModules = Object.keys(process.binding('natives')).filter(n => !/^_|\//.test(n));
 // {{SQL CARBON EDIT}}
 const nodeModules = [
@@ -93,7 +96,7 @@ const vscodeResources = [
 	'out-build/vs/workbench/services/files/**/*.exe',
 	'out-build/vs/workbench/services/files/**/*.md',
 	'out-build/vs/code/electron-browser/sharedProcess.js',
-  // {{SQL CARBON EDIT}}
+	// {{SQL CARBON EDIT}}
 	'out-build/sql/workbench/electron-browser/splashscreen/*',
 	'out-build/sql/**/*.{svg,png,cur,html}',
 	'out-build/sql/base/browser/ui/table/media/*.{gif,png,svg}',
@@ -166,7 +169,7 @@ const config = {
 		name: product.nameLong + ' document',
 		role: 'Editor',
 		ostypes: ["TEXT", "utxt", "TUTX", "****"],
-    // {{SQL CARBON EDIT}}
+		// {{SQL CARBON EDIT}}
 		extensions: ["csv", "json", "sqlplan", "sql", "xml"],
 		iconFile: 'resources/darwin/code_file.icns'
 	}],
@@ -242,7 +245,7 @@ function computeChecksum(filename) {
 function packageTask(platform, arch, opts) {
 	opts = opts || {};

-  // {{SQL CARBON EDIT}}
+	// {{SQL CARBON EDIT}}
 	const destination = path.join(path.dirname(root), 'sqlops') + (platform ? '-' + platform : '') + (arch ? '-' + arch : '');
 	platform = platform || process.platform;

@@ -282,9 +285,18 @@ function packageTask(platform, arch, opts) {
 				.pipe(nlsFilter.restore);
 		}));

-		const localExtensionDependencies = gulp.src('extensions/node_modules/**', { base: '.' });
-
 		// {{SQL CARBON EDIT}}
+		const extensionDepsSrc = [
+			..._.flatten(extensionsProductionDependencies.map(d => path.relative(root, d.path)).map(d => [`${d}/**`, `!${d}/**/{test,tests}/**`])),
+		];
+
+		const localExtensionDependencies = gulp.src(extensionDepsSrc, { base: '.', dot: true })
+			.pipe(filter(['**', '!**/package-lock.json']))
+			.pipe(util.cleanNodeModule('account-provider-azure', ['node_modules/date-utils/doc/**', 'node_modules/adal_node/node_modules/**'], undefined))
+			.pipe(util.cleanNodeModule('dataprotocol-client', ['node_modules/**', 'src/*.js'], undefined))
+			.pipe(util.cleanNodeModule('extensions-modules', ['node_modules/**', 'src/*.js'], undefined))
+			.pipe(util.cleanNodeModule('typescript', ['**/**'], undefined));
+
 		const sources = es.merge(src, localExtensions, localExtensionDependencies)
 			.pipe(util.setExecutableBit(['**/*.sh']))
 			.pipe(filter(['**',
@@ -335,7 +347,16 @@ function packageTask(platform, arch, opts) {
 			.pipe(util.cleanNodeModule('windows-process-tree', ['binding.gyp', 'build/**', 'src/**'], ['**/*.node']))
 			.pipe(util.cleanNodeModule('gc-signals', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], ['**/*.node', 'src/index.js']))
 			.pipe(util.cleanNodeModule('keytar', ['binding.gyp', 'build/**', 'src/**', 'script/**', 'node_modules/**'], ['**/*.node']))
-			.pipe(util.cleanNodeModule('node-pty', ['binding.gyp', 'build/**', 'src/**', 'tools/**'], ['build/Release/**']))
+
+			// {{SQL CARBON EDIT}}
+			.pipe(util.cleanNodeModule('node-pty', ['binding.gyp', 'build/**', 'src/**', 'tools/**'], ['build/Release/*.node', 'build/Release/*.dll', 'build/Release/*.exe']))
+			.pipe(util.cleanNodeModule('chart.js', ['node_modules/**'], undefined))
+			.pipe(util.cleanNodeModule('emmet', ['node_modules/**'], undefined))
+			.pipe(util.cleanNodeModule('pty.js', ['build/**'], ['build/Release/**']))
+			.pipe(util.cleanNodeModule('jquery-ui', ['external/**', 'demos/**'], undefined))
+			.pipe(util.cleanNodeModule('core-js', ['**/**'], undefined))
+			.pipe(util.cleanNodeModule('slickgrid', ['node_modules/**', 'examples/**'], undefined))
+
 			.pipe(util.cleanNodeModule('nsfw', ['binding.gyp', 'build/**', 'src/**', 'openpa/**', 'includes/**'], ['**/*.node', '**/*.a']))
 			.pipe(util.cleanNodeModule('vsda', ['binding.gyp', 'README.md', 'build/**', '*.bat', '*.sh', '*.cpp', '*.h'], ['build/Release/vsda.node']));

--- a/build/npm/postinstall.js
+++ b/build/npm/postinstall.js
@@ -25,12 +25,10 @@ yarnInstall('dataprotocol-client');
 yarnInstall('extensions-modules');
 yarnInstall('extensions'); // node modules shared by all extensions

-yarnInstall('extensions'); // node modules shared by all extensions
-
 const extensions = [
 	'vscode-colorize-tests',
 	'json',
-  'mssql',
+    'mssql',
 	'configuration-editing',
 	'extension-editing',
 	'markdown',
@@ -38,7 +36,6 @@ const extensions = [
 	'merge-conflict',
 	'insights-default',
 	'account-provider-azure'
-
 ];

 extensions.forEach(extension => yarnInstall(`extensions/${extension}`));
--- a/build/tfs/common/publish.ts
+++ b/build/tfs/common/publish.ts
@@ -14,8 +14,9 @@ import * as mime from 'mime';
 import * as minimist from 'minimist';
 import { DocumentClient, NewDocument } from 'documentdb';

-if (process.argv.length < 6) {
-	console.error('Usage: node publish.js <product> <platform> <type> <name> <version> <commit> <is_update> <file>');
+// {{SQL CARBON EDIT}}
+if (process.argv.length < 9) {
+	console.error('Usage: node publish.js <product_quality> <platform> <file_type> <file_name> <version> <is_update> <file> [commit_id]');
 	process.exit(-1);
 }

@@ -183,21 +184,10 @@ async function publish(commit: string, quality: string, platform: string, type:
 	const blobService = azure.createBlobService(storageAccount, process.env['AZURE_STORAGE_ACCESS_KEY_2'])
 		.withFilter(new azure.ExponentialRetryPolicyFilter(20));

-	const mooncakeBlobService = azure.createBlobService(storageAccount, process.env['MOONCAKE_STORAGE_ACCESS_KEY'], `${storageAccount}.blob.core.chinacloudapi.cn`)
-		.withFilter(new azure.ExponentialRetryPolicyFilter(20));
+	// {{SQL CARBON EDIT}}
+	await assertContainer(blobService, quality);

-	// mooncake is fussy and far away, this is needed!
-	mooncakeBlobService.defaultClientRequestTimeoutInMs = 10 * 60 * 1000;
-
-	await Promise.all([
-		assertContainer(blobService, quality),
-		assertContainer(mooncakeBlobService, quality)
-	]);
-
-	const [blobExists, moooncakeBlobExists] = await Promise.all([
-		doesAssetExist(blobService, quality, blobName),
-		doesAssetExist(mooncakeBlobService, quality, blobName)
-	]);
+	const blobExists = await doesAssetExist(blobService, quality, blobName);

 	const promises = [];

@@ -205,8 +195,23 @@ async function publish(commit: string, quality: string, platform: string, type:
 		promises.push(uploadBlob(blobService, quality, blobName, file));
 	}

-	if (!moooncakeBlobExists) {
-		promises.push(uploadBlob(mooncakeBlobService, quality, blobName, file));
+	// {{SQL CARBON EDIT}}
+	if (process.env['MOONCAKE_STORAGE_ACCESS_KEY']) {
+		const mooncakeBlobService = azure.createBlobService(storageAccount, process.env['MOONCAKE_STORAGE_ACCESS_KEY'], `${storageAccount}.blob.core.chinacloudapi.cn`)
+			.withFilter(new azure.ExponentialRetryPolicyFilter(20));
+
+		// mooncake is fussy and far away, this is needed!
+		mooncakeBlobService.defaultClientRequestTimeoutInMs = 10 * 60 * 1000;
+
+		await assertContainer(mooncakeBlobService, quality);
+
+		const mooncakeBlobExists = await doesAssetExist(mooncakeBlobService, quality, blobName);
+
+		if (!mooncakeBlobExists) {
+			promises.push(uploadBlob(mooncakeBlobService, quality, blobName, file));
+		}
+	} else {
+		console.log('Skipping Mooncake publishing.');
 	}

 	if (promises.length === 0) {
@@ -228,7 +233,8 @@ async function publish(commit: string, quality: string, platform: string, type:
 		platform: platform,
 		type: type,
 		url: `${process.env['AZURE_CDN_URL']}/${quality}/${blobName}`,
-		mooncakeUrl: `${process.env['MOONCAKE_CDN_URL']}/${quality}/${blobName}`,
+		// {{SQL CARBON EDIT}}
+		mooncakeUrl: process.env['MOONCAKE_CDN_URL'] ? `${process.env['MOONCAKE_CDN_URL']}/${quality}/${blobName}` : undefined,
 		hash: sha1hash,
 		sha256hash,
 		size
@@ -261,8 +267,11 @@ function main(): void {
 		boolean: ['upload-only']
 	});

-	const [quality, platform, type, name, version, _isUpdate, file] = opts._;
-	const commit = execSync('git rev-parse HEAD', { encoding: 'utf8' }).trim();
+	// {{SQL CARBON EDIT}}
+	let [quality, platform, type, name, version, _isUpdate, file, commit] = opts._;
+	if (!commit) {
+		commit = execSync('git rev-parse HEAD', { encoding: 'utf8' }).trim();
+	}

 	publish(commit, quality, platform, type, name, version, _isUpdate, file, opts).catch(err => {
 		console.error(err);
--- a/build/win32/code.iss
+++ b/build/win32/code.iss
@@ -48,11 +48,11 @@ Name: "simplifiedChinese"; MessagesFile: "{#RepoDir}\build\win32\i18n\Default.zh
 Name: "traditionalChinese"; MessagesFile: "{#RepoDir}\build\win32\i18n\Default.zh-tw.isl,{#RepoDir}\build\win32\i18n\messages.zh-tw.isl" {#LocalizedLanguageFile("cht")}

 [InstallDelete]
-Type: filesandordirs; Name: {app}\resources\app\out
-Type: filesandordirs; Name: {app}\resources\app\plugins
-Type: filesandordirs; Name: {app}\resources\app\extensions
-Type: filesandordirs; Name: {app}\resources\app\node_modules
-Type: files; Name: {app}\resources\app\Credits_45.0.2454.85.html
+Type: filesandordirs; Name: "{app}\resources\app\out"; Check: IsNotUpdate
+Type: filesandordirs; Name: "{app}\resources\app\plugins"; Check: IsNotUpdate
+Type: filesandordirs; Name: "{app}\resources\app\extensions"; Check: IsNotUpdate
+Type: filesandordirs; Name: "{app}\resources\app\node_modules"; Check: IsNotUpdate
+Type: files; Name: "{app}\resources\app\Credits_45.0.2454.85.html"; Check: IsNotUpdate

 [Tasks]
 Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 0,6.1
@@ -68,6 +68,7 @@ Name: "{commondesktop}\{#NameLong}"; Filename: "{app}\{#ExeBasename}.exe"; AppUs
 Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#NameLong}"; Filename: "{app}\{#ExeBasename}.exe"; Tasks: quicklaunchicon; AppUserModelID: "{#AppUserId}"

 [Run]
+Filename: "{app}\{#ExeBasename}.exe"; Description: "{cm:LaunchProgram,{#NameLong}}"; Tasks: runcode; Flags: nowait postinstall; Check: ShouldRunAfterUpdate
 Filename: "{app}\{#ExeBasename}.exe"; Description: "{cm:LaunchProgram,{#NameLong}}"; Flags: nowait postinstall; Check: WizardNotSilent

 [Registry]
@@ -110,6 +111,33 @@ begin
  Result := not WizardSilent();
 end;

+// Updates
+function IsBackgroundUpdate(): Boolean;
+begin
+  Result := ExpandConstant('{param:update|false}') <> 'false';
+end;
+
+function IsNotUpdate(): Boolean;
+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
+function LockFileExists(): Boolean;
+begin
+  Result := FileExists(ExpandConstant('{param:update}'))
+end;
+
+function ShouldRunAfterUpdate(): Boolean;
+begin
+  if IsBackgroundUpdate() then
+    Result := not LockFileExists()
+  else
+    Result := True;
+end;
+
 // http://stackoverflow.com/a/23838239/261019
 procedure Explode(var Dest: TArrayOfString; Text: String; Separator: String);
 var
--- a/build/yarn.lock
+++ b/build/yarn.lock
@@ -344,12 +344,6 @@ commander@2.11.0:
  version "2.11.0"
  resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"

-commander@2.9.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
-  dependencies:
-    graceful-readlink ">= 1.0.0"
-
 commander@^2.9.0:
  version "2.13.0"
  resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
@@ -393,7 +387,7 @@ dashdash@^1.12.0:
 "dataprotocol-client@file:./../dataprotocol-client":
  version "1.0.0"
  dependencies:
-    vscode "1.1.5"
+    typescript "2.6.2"
    vscode-languageclient "3.5.0"

 dateformat@^2.0.0:
@@ -406,12 +400,6 @@ debug@2:
  dependencies:
    ms "2.0.0"

-debug@2.6.8:
-  version "2.6.8"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
-  dependencies:
-    ms "2.0.0"
-
 debug@3.1.0, debug@^3.1.0:
  version "3.1.0"
  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
@@ -476,10 +464,6 @@ delayed-stream@~1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"

-diff@3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9"
-
 diff@3.3.1:
  version "3.3.1"
  resolved "https://registry.yarnpkg.com/diff/-/diff-3.3.1.tgz#aa8567a6eed03c531fc89d3f711cd0e5259dec75"
@@ -585,7 +569,11 @@ extend@~1.2.1:
 "extensions-modules@file:../extensions-modules":
  version "0.1.0"
  dependencies:
-    dataprotocol-client "file:../../../Library/Caches/Yarn/v1/dataprotocol-client"
+<<<<<<< HEAD
+    dataprotocol-client "file:./../../../../AppData/Local/Yarn/cache/v1/dataprotocol-client"
+=======
+    dataprotocol-client "file:C:/Users/andresse/AppData/Local/Yarn/cache/v1/dataprotocol-client"
+>>>>>>> master
    decompress "^4.2.0"
    fs-extra-promise "^1.0.1"
    http-proxy-agent "^2.0.0"
@@ -774,18 +762,7 @@ glob-stream@^5.3.2:
    to-absolute-glob "^0.1.1"
    unique-stream "^2.0.2"

-glob@7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.2"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@7.1.2, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2:
+glob@7.1.2, glob@^7.0.5, glob@^7.1.2:
  version "7.1.2"
  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
  dependencies:
@@ -824,10 +801,6 @@ growl@1.10.3:
  version "1.10.3"
  resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.3.tgz#1926ba90cf3edfe2adb4927f5880bc22c66c790f"

-growl@1.9.2:
-  version "1.9.2"
-  resolved "https://registry.yarnpkg.com/growl/-/growl-1.9.2.tgz#0ea7743715db8d8de2c5ede1775e1b45ac85c02f"
-
 gulp-chmod@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/gulp-chmod/-/gulp-chmod-2.0.0.tgz#00c390b928a0799b251accf631aa09e01cc6299c"
@@ -836,7 +809,7 @@ gulp-chmod@^2.0.0:
    stat-mode "^0.2.0"
    through2 "^2.0.0"

-gulp-filter@^5.0.0, gulp-filter@^5.0.1:
+gulp-filter@^5.0.1:
  version "5.1.0"
  resolved "https://registry.yarnpkg.com/gulp-filter/-/gulp-filter-5.1.0.tgz#a05e11affb07cf7dcf41a7de1cb7b63ac3783e73"
  dependencies:
@@ -844,13 +817,6 @@ gulp-filter@^5.0.0, gulp-filter@^5.0.1:
    plugin-error "^0.1.2"
    streamfilter "^1.0.5"

-gulp-gunzip@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/gulp-gunzip/-/gulp-gunzip-0.0.3.tgz#7b6e07b0f58fd3d42515c48ead5a63df0572f62f"
-  dependencies:
-    through2 "~0.6.5"
-    vinyl "~0.4.6"
-
 gulp-gunzip@1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/gulp-gunzip/-/gulp-gunzip-1.0.0.tgz#15b741145e83a9c6f50886241b57cc5871f151a9"
@@ -858,7 +824,7 @@ gulp-gunzip@1.0.0:
    through2 "~0.6.5"
    vinyl "~0.4.6"

-gulp-remote-src@^0.4.2, gulp-remote-src@^0.4.3:
+gulp-remote-src@^0.4.3:
  version "0.4.3"
  resolved "https://registry.yarnpkg.com/gulp-remote-src/-/gulp-remote-src-0.4.3.tgz#5728cfd643433dd4845ddef0969f0f971a2ab4a1"
  dependencies:
@@ -920,18 +886,6 @@ gulp-util@~3.0.8:
    through2 "^2.0.0"
    vinyl "^0.5.0"

-gulp-vinyl-zip@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/gulp-vinyl-zip/-/gulp-vinyl-zip-1.4.0.tgz#56382f2ccb57231bb0478c78737ccd572973bee1"
-  dependencies:
-    event-stream "^3.3.1"
-    queue "^3.0.10"
-    through2 "^0.6.3"
-    vinyl "^0.4.6"
-    vinyl-fs "^2.0.0"
-    yauzl "^2.2.1"
-    yazl "^2.2.1"
-
 gulp-vinyl-zip@^2.1.0:
  version "2.1.0"
  resolved "https://registry.yarnpkg.com/gulp-vinyl-zip/-/gulp-vinyl-zip-2.1.0.tgz#24e40685dc05b7149995245099e0590263be8dad"
@@ -987,10 +941,6 @@ has-ansi@^2.0.0:
  dependencies:
    ansi-regex "^2.0.0"

-has-flag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
-
 has-flag@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
@@ -1228,10 +1178,6 @@ 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"

-json3@3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
-
 jsonfile@^2.1.0:
  version "2.4.0"
  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
@@ -1281,21 +1227,10 @@ lazystream@^1.0.0:
  dependencies:
    readable-stream "^2.0.5"

-lodash._baseassign@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e"
-  dependencies:
-    lodash._basecopy "^3.0.0"
-    lodash.keys "^3.0.0"
-
 lodash._basecopy@^3.0.0:
  version "3.0.1"
  resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"

-lodash._basecreate@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz#1bc661614daa7fc311b7d03bf16806a0213cf821"
-
 lodash._basetostring@^3.0.0:
  version "3.0.1"
  resolved "https://registry.yarnpkg.com/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz#d1861d877f824a52f669832dcaf3ee15566a07d5"
@@ -1328,14 +1263,6 @@ lodash._root@^3.0.0:
  version "3.0.1"
  resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"

-lodash.create@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.create/-/lodash.create-3.1.1.tgz#d7f2849f0dbda7e04682bb8cd72ab022461debe7"
-  dependencies:
-    lodash._baseassign "^3.0.0"
-    lodash._basecreate "^3.0.0"
-    lodash._isiterateecall "^3.0.0"
-
 lodash.escape@^3.0.0:
  version "3.2.0"
  resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698"
@@ -1442,7 +1369,7 @@ mime@^1.3.4:
  version "1.4.1"
  resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"

-"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4:
+"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.4:
  version "3.0.4"
  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
  dependencies:
@@ -1462,23 +1389,6 @@ mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1:
  dependencies:
    minimist "0.0.8"

-mocha@^3.2.0:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-3.5.3.tgz#1e0480fe36d2da5858d1eb6acc38418b26eaa20d"
-  dependencies:
-    browser-stdout "1.3.0"
-    commander "2.9.0"
-    debug "2.6.8"
-    diff "3.2.0"
-    escape-string-regexp "1.0.5"
-    glob "7.1.1"
-    growl "1.9.2"
-    he "1.1.1"
-    json3 "3.3.2"
-    lodash.create "3.1.1"
-    mkdirp "0.5.1"
-    supports-color "3.1.2"
-
 mocha@^4.0.1:
  version "4.1.0"
  resolved "https://registry.yarnpkg.com/mocha/-/mocha-4.1.0.tgz#7d86cfbcf35cb829e2754c32e17355ec05338794"
@@ -1660,7 +1570,7 @@ querystringify@~1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-1.0.0.tgz#6286242112c5b712fa654e526652bf6a13ff05cb"

-queue@^3.0.10, queue@^3.1.0:
+queue@^3.1.0:
  version "3.1.0"
  resolved "https://registry.yarnpkg.com/queue/-/queue-3.1.0.tgz#6c49d01f009e2256788789f2bffac6b8b9990585"
  dependencies:
@@ -1746,7 +1656,7 @@ replace-ext@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"

-request@^2.79.0, request@^2.83.0:
+request@^2.83.0:
  version "2.83.0"
  resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
  dependencies:
@@ -1857,7 +1767,7 @@ semaphore@1.0.5:
  version "1.0.5"
  resolved "https://registry.yarnpkg.com/semaphore/-/semaphore-1.0.5.tgz#b492576e66af193db95d65e25ec53f5f19798d60"

-semver@^5.3.0, semver@^5.4.1:
+semver@^5.4.1:
  version "5.5.0"
  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"

@@ -1873,22 +1783,12 @@ sntp@2.x.x:
  dependencies:
    hoek "4.x.x"

-source-map-support@^0.4.11:
-  version "0.4.18"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
-  dependencies:
-    source-map "^0.5.6"
-
 source-map-support@^0.5.0:
  version "0.5.2"
  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.2.tgz#1a6297fd5b2e762b39688c7fc91233b60984f0a5"
  dependencies:
    source-map "^0.6.0"

-source-map@^0.5.6:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-
 source-map@^0.6.0:
  version "0.6.1"
  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
@@ -1980,12 +1880,6 @@ strip-dirs@^2.0.0:
  dependencies:
    is-natural-number "^4.0.1"

-supports-color@3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"
-  dependencies:
-    has-flag "^1.0.0"
-
 supports-color@4.4.0:
  version "4.4.0"
  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.4.0.tgz#883f7ddabc165142b2a61427f3352ded195d1a3e"
@@ -2020,7 +1914,7 @@ through2-filter@^2.0.0:
    through2 "~2.0.0"
    xtend "~4.0.0"

-through2@^0.6.0, through2@^0.6.3, through2@~0.6.5:
+through2@^0.6.0, through2@~0.6.5:
  version "0.6.5"
  resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48"
  dependencies:
@@ -2078,6 +1972,10 @@ typescript@2.6.1:
  version "2.6.1"
  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.1.tgz#ef39cdea27abac0b500242d6726ab90e0c846631"

+typescript@2.6.2:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.2.tgz#3c5b6fd7f6de0914269027f03c0946758f7673a4"
+
 unbzip2-stream@^1.0.9:
  version "1.2.5"
  resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.2.5.tgz#73a033a567bbbde59654b193c44d48a7e4f43c47"
@@ -2160,7 +2058,7 @@ vinyl-source-stream@^1.1.0:
    through2 "^2.0.3"
    vinyl "^0.4.3"

-vinyl@^0.4.3, vinyl@^0.4.6, vinyl@~0.4.6:
+vinyl@^0.4.3, vinyl@~0.4.6:
  version "0.4.6"
  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.4.6.tgz#2f356c87a550a255461f36bbeb2a5ba8bf784847"
  dependencies:
@@ -2234,25 +2132,6 @@ vscode-languageserver-types@^3.5.0:
  version "3.5.0"
  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.5.0.tgz#e48d79962f0b8e02de955e3f524908e2b19c0374"

-vscode@1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/vscode/-/vscode-1.1.5.tgz#10eb104001840c3dd0813815fd4a05f8fc882d14"
-  dependencies:
-    glob "^7.1.1"
-    gulp-chmod "^2.0.0"
-    gulp-filter "^5.0.0"
-    gulp-gunzip "0.0.3"
-    gulp-remote-src "^0.4.2"
-    gulp-symdest "^1.1.0"
-    gulp-untar "^0.0.6"
-    gulp-vinyl-zip "^1.4.0"
-    mocha "^3.2.0"
-    request "^2.79.0"
-    semver "^5.3.0"
-    source-map-support "^0.4.11"
-    url-parse "^1.1.9"
-    vinyl-source-stream "^1.1.0"
-
 vscode@^1.0.1:
  version "1.1.10"
  resolved "https://registry.yarnpkg.com/vscode/-/vscode-1.1.10.tgz#d1cba378ab24f1d3ddf9cd470d242ee1472dd35b"
--- a/dataprotocol-client/package.json
+++ b/dataprotocol-client/package.json
@@ -3,8 +3,9 @@
  "version": "1.0.0",
  "description": "SQL Operations Studio studio implementation of vscode-language-client",
  "main": "lib/main.js",
+	"typings": "./lib/main",
  "scripts": {
-    "prepublish": "node ./node_modules/vscode/bin/install && tsc -p ./src",
+    "prepare": "node ./node_modules/vscode/bin/install && tsc -p ./src",
    "compile": "tsc -p ./src",
    "watch": "tsc -w -p ./src",
    "update-vscode": "node ./node_modules/vscode/bin/install"
@@ -12,11 +13,11 @@
  "author": "Microsoft",
  "license": "ISC",
  "dependencies": {
-    "vscode": "1.1.5",
+    "typescript": "2.6.2",
    "vscode-languageclient": "3.5.0"
  },
  "devDependencies": {
-    "typescript": "2.6.2"
+    "vscode": "1.1.5"
  },
  "engines": {
    "vscode": "^1.15"
--- a/dataprotocol-client/src/main.ts
+++ b/dataprotocol-client/src/main.ts
@@ -23,6 +23,7 @@ function ensure<T, K extends keyof T>(target: T, key: K): T[K] {

 export interface LanguageClientOptions extends VSLanguageClientOptions {
 	providerId: string;
+	serverConnectionMetadata: any;
 }

 /**
--- a/extensions-modules/package.json
+++ b/extensions-modules/package.json
@@ -3,7 +3,7 @@
  "version": "0.1.0",
  "description": "Shared modules for Carbon extensions",
  "dependencies": {
-    "dataprotocol-client": "file:./../dataprotocol-client",
+    "dataprotocol-client": "file:../dataprotocol-client",
    "decompress": "^4.2.0",
    "fs-extra-promise": "^1.0.1",
    "http-proxy-agent": "^2.0.0",
@@ -18,7 +18,7 @@
    "vscode": "1.0.1"
  },
  "scripts": {
-    "prepublish": "tsc -p ./src",
+    "prepare": "tsc -p ./src",
    "compile": "tsc -p ./src",
    "watch": "tsc -w -p ./src",
    "update-vscode": "node ./node_modules/vscode/bin/install"
--- a/extensions-modules/src/languageservice/serviceClient.ts
+++ b/extensions-modules/src/languageservice/serviceClient.ts
@@ -336,7 +336,22 @@ export class SqlToolsServiceClient {
 							configurationSection: SqlToolsServiceClient._constants.extensionConfigSectionName
 						},
 						errorHandler: new LanguageClientErrorHandler(SqlToolsServiceClient._constants),
-						serverConnectionMetadata: this._config.getConfigValue(Constants.serverConnectionMetadata)
+						serverConnectionMetadata: this._config.getConfigValue(Constants.serverConnectionMetadata),
+						outputChannel: {
+							append: () => {
+							},
+							appendLine: () => {
+							},
+							dispose: () => {
+							},
+							clear: () => {
+							},
+							hide: () => {
+							},
+							name: '',
+							show: () => {
+							}
+						}
 					};
 					this._serviceStatus.showServiceLoading();
 					// cache the client instance for later use
--- a/extensions-modules/yarn.lock
+++ b/extensions-modules/yarn.lock
@@ -25,24 +25,12 @@ amdefine@>=0.0.4:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"

-ansi-cyan@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-cyan/-/ansi-cyan-0.1.1.tgz#538ae528af8982f28ae30d86f2f17456d2609873"
-  dependencies:
-    ansi-wrap "0.1.0"
-
 ansi-gray@^0.1.1:
  version "0.1.1"
  resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251"
  dependencies:
    ansi-wrap "0.1.0"

-ansi-red@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-red/-/ansi-red-0.1.1.tgz#8c638f9d1080800a353c9c28c8a81ca4705d946c"
-  dependencies:
-    ansi-wrap "0.1.0"
-
 ansi-regex@^0.2.0, ansi-regex@^0.2.1:
  version "0.2.1"
  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-0.2.1.tgz#0d8e946967a3d8143f93e24e298525fc1b2235f9"
@@ -67,13 +55,6 @@ applicationinsights@0.18.0:
  version "0.18.0"
  resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-0.18.0.tgz#162ebb48a383408bc4de44db32b417307f45bbc1"

-arr-diff@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-1.1.0.tgz#687c32758163588fef7de7b36fabe495eb1a399a"
-  dependencies:
-    arr-flatten "^1.0.1"
-    array-slice "^0.2.3"
-
 arr-diff@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
@@ -84,10 +65,6 @@ arr-flatten@^1.0.1:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"

-arr-union@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-2.1.0.tgz#20f9eab5ec70f5c7d215b1077b1c39161d292c7d"
-
 array-differ@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
@@ -96,10 +73,6 @@ array-find-index@^1.0.1:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"

-array-slice@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5"
-
 array-union@^1.0.1:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
@@ -213,10 +186,6 @@ braces@^1.8.2:
    preserve "^0.2.0"
    repeat-element "^1.1.2"

-browser-stdout@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.0.tgz#f351d32969d32fa5d7a5567154263d928ae3bd1f"
-
 buffer-crc32@~0.2.3:
  version "0.2.13"
  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
@@ -322,12 +291,6 @@ commander@2.3.0:
  version "2.3.0"
  resolved "https://registry.yarnpkg.com/commander/-/commander-2.3.0.tgz#fd430e889832ec353b9acd1de217c11cb3eef873"

-commander@2.9.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
-  dependencies:
-    graceful-readlink ">= 1.0.0"
-
 commander@^2.9.0:
  version "2.13.0"
  resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
@@ -377,7 +340,7 @@ dashdash@^1.12.0:
 "dataprotocol-client@file:./../dataprotocol-client":
  version "1.0.0"
  dependencies:
-    vscode "1.1.5"
+    typescript "2.6.2"
    vscode-languageclient "3.5.0"

 dateformat@^1.0.7-1.2.3:
@@ -403,12 +366,6 @@ debug@2.2.0:
  dependencies:
    ms "0.7.1"

-debug@2.6.8:
-  version "2.6.8"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
-  dependencies:
-    ms "2.0.0"
-
 debug@^3.1.0:
  version "3.1.0"
  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
@@ -481,10 +438,6 @@ diff@1.4.0:
  version "1.4.0"
  resolved "https://registry.yarnpkg.com/diff/-/diff-1.4.0.tgz#7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"

-diff@3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9"
-
 duplexer2@0.0.2:
  version "0.0.2"
  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
@@ -536,7 +489,7 @@ escape-string-regexp@1.0.2:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz#4dbc2fe674e71949caf3fb2695ce7f2dc1d9a8d1"

-escape-string-regexp@1.0.5, escape-string-regexp@^1.0.0, escape-string-regexp@^1.0.2:
+escape-string-regexp@^1.0.0, 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"

@@ -576,12 +529,6 @@ expand-range@^1.8.1:
  dependencies:
    fill-range "^2.1.0"

-extend-shallow@^1.1.2:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-1.1.4.tgz#19d6bf94dfc09d76ba711f39b872d21ff4dd9071"
-  dependencies:
-    kind-of "^1.1.0"
-
 extend-shallow@^2.0.1:
  version "2.0.1"
  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
@@ -717,15 +664,6 @@ fs.realpath@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"

-fstream@^1.0.2:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
-  dependencies:
-    graceful-fs "^4.1.2"
-    inherits "~2.0.0"
-    mkdirp ">=0.5 0"
-    rimraf "2"
-
 fstream@~0.1.28:
  version "0.1.31"
  resolved "https://registry.yarnpkg.com/fstream/-/fstream-0.1.31.tgz#7337f058fbbbbefa8c9f561a28cab0849202c988"
@@ -802,17 +740,6 @@ glob@3.2.11:
    inherits "2"
    minimatch "0.3"

-glob@7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.2"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 glob@^5.0.15, glob@^5.0.3:
  version "5.0.15"
  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
@@ -823,7 +750,7 @@ glob@^5.0.15, glob@^5.0.3:
    once "^1.3.0"
    path-is-absolute "^1.0.0"

-glob@^7.0.5, glob@^7.1.1:
+glob@^7.0.5:
  version "7.1.2"
  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
  dependencies:
@@ -866,14 +793,6 @@ gulp-chmod@^1.3.0:
    stat-mode "^0.2.0"
    through2 "^2.0.0"

-gulp-chmod@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/gulp-chmod/-/gulp-chmod-2.0.0.tgz#00c390b928a0799b251accf631aa09e01cc6299c"
-  dependencies:
-    deep-assign "^1.0.0"
-    stat-mode "^0.2.0"
-    through2 "^2.0.0"
-
 gulp-filter@^4.0.0:
  version "4.0.0"
  resolved "https://registry.yarnpkg.com/gulp-filter/-/gulp-filter-4.0.0.tgz#395f58a256c559cdb9e0d157f1caaf5248a38dcb"
@@ -882,14 +801,6 @@ gulp-filter@^4.0.0:
    multimatch "^2.0.0"
    streamfilter "^1.0.5"

-gulp-filter@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/gulp-filter/-/gulp-filter-5.1.0.tgz#a05e11affb07cf7dcf41a7de1cb7b63ac3783e73"
-  dependencies:
-    multimatch "^2.0.0"
-    plugin-error "^0.1.2"
-    streamfilter "^1.0.5"
-
 gulp-gunzip@0.0.3:
  version "0.0.3"
  resolved "https://registry.yarnpkg.com/gulp-gunzip/-/gulp-gunzip-0.0.3.tgz#7b6e07b0f58fd3d42515c48ead5a63df0572f62f"
@@ -897,7 +808,7 @@ gulp-gunzip@0.0.3:
    through2 "~0.6.5"
    vinyl "~0.4.6"

-gulp-remote-src@^0.4.0, gulp-remote-src@^0.4.2:
+gulp-remote-src@^0.4.0:
  version "0.4.3"
  resolved "https://registry.yarnpkg.com/gulp-remote-src/-/gulp-remote-src-0.4.3.tgz#5728cfd643433dd4845ddef0969f0f971a2ab4a1"
  dependencies:
@@ -917,7 +828,7 @@ gulp-sourcemaps@1.6.0:
    through2 "^2.0.0"
    vinyl "^1.0.0"

-gulp-symdest@^1.0.0, gulp-symdest@^1.1.0:
+gulp-symdest@^1.0.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/gulp-symdest/-/gulp-symdest-1.1.0.tgz#c165320732d192ce56fd94271ffa123234bf2ae0"
  dependencies:
@@ -936,17 +847,7 @@ gulp-untar@0.0.4:
    tar "~0.1.19"
    through2 "~0.4.1"

-gulp-untar@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/gulp-untar/-/gulp-untar-0.0.6.tgz#d6bdefde7e9a8e054c9f162385a0782c4be74000"
-  dependencies:
-    event-stream "~3.3.4"
-    gulp-util "~3.0.8"
-    streamifier "~0.1.1"
-    tar "^2.2.1"
-    through2 "~2.0.3"
-
-gulp-util@^3.0.6, gulp-util@~3.0.8:
+gulp-util@^3.0.6:
  version "3.0.8"
  resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f"
  dependencies:
@@ -982,7 +883,7 @@ gulp-util@~2.2.14:
    through2 "^0.5.0"
    vinyl "^0.2.1"

-gulp-vinyl-zip@^1.1.2, gulp-vinyl-zip@^1.4.0:
+gulp-vinyl-zip@^1.1.2:
  version "1.4.0"
  resolved "https://registry.yarnpkg.com/gulp-vinyl-zip/-/gulp-vinyl-zip-1.4.0.tgz#56382f2ccb57231bb0478c78737ccd572973bee1"
  dependencies:
@@ -1032,10 +933,6 @@ has-ansi@^2.0.0:
  dependencies:
    ansi-regex "^2.0.0"

-has-flag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
-
 has-gulplog@^0.1.0:
  version "0.1.0"
  resolved "https://registry.yarnpkg.com/has-gulplog/-/has-gulplog-0.1.0.tgz#6414c82913697da51590397dafb12f22967811ce"
@@ -1060,10 +957,6 @@ hawk@~6.0.2:
    hoek "4.x.x"
    sntp "2.x.x"

-he@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
-
 hoek@2.x.x:
  version "2.16.3"
  resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
@@ -1289,10 +1182,6 @@ 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"

-json3@3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
-
 jsonfile@^2.1.0:
  version "2.4.0"
  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
@@ -1316,10 +1205,6 @@ jsprim@^1.2.2:
    json-schema "0.2.3"
    verror "1.10.0"

-kind-of@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-1.1.0.tgz#140a3d2d41a36d2efcfa9377b62c24f8495a5c44"
-
 kind-of@^3.0.2:
  version "3.2.2"
  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
@@ -1348,21 +1233,10 @@ load-json-file@^1.0.0:
    pinkie-promise "^2.0.0"
    strip-bom "^2.0.0"

-lodash._baseassign@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e"
-  dependencies:
-    lodash._basecopy "^3.0.0"
-    lodash.keys "^3.0.0"
-
 lodash._basecopy@^3.0.0:
  version "3.0.1"
  resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"

-lodash._basecreate@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz#1bc661614daa7fc311b7d03bf16806a0213cf821"
-
 lodash._basetostring@^3.0.0:
  version "3.0.1"
  resolved "https://registry.yarnpkg.com/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz#d1861d877f824a52f669832dcaf3ee15566a07d5"
@@ -1434,14 +1308,6 @@ lodash._shimkeys@~2.4.1:
  dependencies:
    lodash._objecttypes "~2.4.1"

-lodash.create@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.create/-/lodash.create-3.1.1.tgz#d7f2849f0dbda7e04682bb8cd72ab022461debe7"
-  dependencies:
-    lodash._baseassign "^3.0.0"
-    lodash._basecreate "^3.0.0"
-    lodash._isiterateecall "^3.0.0"
-
 lodash.defaults@~2.4.1:
  version "2.4.1"
  resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-2.4.1.tgz#a7e8885f05e68851144b6e12a8f3678026bc4c54"
@@ -1628,7 +1494,7 @@ minimatch@0.3:
    lru-cache "2"
    sigmund "~1.0.0"

-"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4:
+"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.4:
  version "3.0.4"
  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
  dependencies:
@@ -1650,7 +1516,7 @@ mkdirp@0.3.0:
  version "0.3.0"
  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.0.tgz#1bbf5ab1ba827af23575143490426455f481fe1e"

-mkdirp@0.5, mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1:
+mkdirp@0.5, mkdirp@0.5.1, mkdirp@^0.5.0, mkdirp@^0.5.1:
  version "0.5.1"
  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
  dependencies:
@@ -1671,23 +1537,6 @@ mocha@^2.3.3:
    supports-color "1.2.0"
    to-iso-string "0.0.2"

-mocha@^3.2.0:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-3.5.3.tgz#1e0480fe36d2da5858d1eb6acc38418b26eaa20d"
-  dependencies:
-    browser-stdout "1.3.0"
-    commander "2.9.0"
-    debug "2.6.8"
-    diff "3.2.0"
-    escape-string-regexp "1.0.5"
-    glob "7.1.1"
-    growl "1.9.2"
-    he "1.1.1"
-    json3 "3.3.2"
-    lodash.create "3.1.1"
-    mkdirp "0.5.1"
-    supports-color "3.1.2"
-
 ms@0.7.1:
  version "0.7.1"
  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
@@ -1853,16 +1702,6 @@ pinkie@^2.0.0:
  version "2.0.4"
  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"

-plugin-error@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-0.1.2.tgz#3b9bb3335ccf00f425e07437e19276967da47ace"
-  dependencies:
-    ansi-cyan "^0.1.1"
-    ansi-red "^0.1.1"
-    arr-diff "^1.0.1"
-    arr-union "^2.0.1"
-    extend-shallow "^1.1.2"
-
 preserve@^0.2.0:
  version "0.2.0"
  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
@@ -1883,10 +1722,6 @@ qs@~6.5.1:
  version "6.5.1"
  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"

-querystringify@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-1.0.0.tgz#6286242112c5b712fa654e526652bf6a13ff05cb"
-
 queue@^3.0.10, queue@^3.1.0:
  version "3.1.0"
  resolved "https://registry.yarnpkg.com/queue/-/queue-3.1.0.tgz#6c49d01f009e2256788789f2bffac6b8b9990585"
@@ -1984,7 +1819,7 @@ replace-ext@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"

-request@^2.67.0, request@^2.79.0:
+request@^2.67.0:
  version "2.83.0"
  resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
  dependencies:
@@ -2036,10 +1871,6 @@ request@~2.79.0:
    tunnel-agent "~0.4.1"
    uuid "^3.0.0"

-requires-port@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
-
 rimraf@2:
  version "2.6.2"
  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
@@ -2056,7 +1887,7 @@ seek-bzip@^1.0.5:
  dependencies:
    commander "~2.8.1"

-"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.3.0:
+"semver@2 || 3 || 4 || 5", semver@^5.1.0:
  version "5.5.0"
  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"

@@ -2086,22 +1917,12 @@ source-map-support@^0.3.2:
  dependencies:
    source-map "0.1.32"

-source-map-support@^0.4.11:
-  version "0.4.18"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
-  dependencies:
-    source-map "^0.5.6"
-
 source-map@0.1.32:
  version "0.1.32"
  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.32.tgz#c8b6c167797ba4740a8ea33252162ff08591b266"
  dependencies:
    amdefine ">=0.0.4"

-source-map@^0.5.6:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-
 sparkles@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.0.tgz#1acbbfb592436d10bbe8f785b7cc6f82815012c3"
@@ -2166,7 +1987,7 @@ streamfilter@^1.0.5:
  dependencies:
    readable-stream "^2.0.2"

-streamifier@~0.1.0, streamifier@~0.1.1:
+streamifier@~0.1.0:
  version "0.1.1"
  resolved "https://registry.yarnpkg.com/streamifier/-/streamifier-0.1.1.tgz#97e98d8fa4d105d62a2691d1dc07e820db8dfc4f"

@@ -2225,12 +2046,6 @@ supports-color@1.2.0:
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-1.2.0.tgz#ff1ed1e61169d06b3cf2d588e188b18d8847e17e"

-supports-color@3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"
-  dependencies:
-    has-flag "^1.0.0"
-
 supports-color@^0.2.0:
  version "0.2.0"
  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-0.2.0.tgz#d92de2694eb3f67323973d7ae3d8b55b4c22190a"
@@ -2248,14 +2063,6 @@ tar-stream@^1.5.2:
    readable-stream "^2.0.0"
    xtend "^4.0.0"

-tar@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
-  dependencies:
-    block-stream "*"
-    fstream "^1.0.2"
-    inherits "2"
-
 tar@~0.1.19:
  version "0.1.20"
  resolved "https://registry.yarnpkg.com/tar/-/tar-0.1.20.tgz#42940bae5b5f22c74483699126f9f3f27449cb13"
@@ -2347,6 +2154,10 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
  version "0.14.5"
  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"

+typescript@2.6.2:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.2.tgz#3c5b6fd7f6de0914269027f03c0946758f7673a4"
+
 unbzip2-stream@^1.0.9:
  version "1.2.5"
  resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.2.5.tgz#73a033a567bbbde59654b193c44d48a7e4f43c47"
@@ -2361,13 +2172,6 @@ unique-stream@^2.0.2:
    json-stable-stringify "^1.0.0"
    through2-filter "^2.0.0"

-url-parse@^1.1.9:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.2.0.tgz#3a19e8aaa6d023ddd27dcc44cb4fc8f7fec23986"
-  dependencies:
-    querystringify "~1.0.0"
-    requires-port "~1.0.0"
-
 util-deprecate@~1.0.1:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
@@ -2511,25 +2315,6 @@ vscode@1.0.1:
    source-map-support "^0.3.2"
    vinyl-source-stream "^1.1.0"

-vscode@1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/vscode/-/vscode-1.1.5.tgz#10eb104001840c3dd0813815fd4a05f8fc882d14"
-  dependencies:
-    glob "^7.1.1"
-    gulp-chmod "^2.0.0"
-    gulp-filter "^5.0.0"
-    gulp-gunzip "0.0.3"
-    gulp-remote-src "^0.4.2"
-    gulp-symdest "^1.1.0"
-    gulp-untar "^0.0.6"
-    gulp-vinyl-zip "^1.4.0"
-    mocha "^3.2.0"
-    request "^2.79.0"
-    semver "^5.3.0"
-    source-map-support "^0.4.11"
-    url-parse "^1.1.9"
-    vinyl-source-stream "^1.1.0"
-
 winreg@1.2.3:
  version "1.2.3"
  resolved "https://registry.yarnpkg.com/winreg/-/winreg-1.2.3.tgz#93ad116b2696da87d58f7265a8fcea5254a965d5"
--- a/extensions/mssql/client/src/config.json
+++ b/extensions/mssql/client/src/config.json
@@ -1,7 +1,7 @@
 {
 	"service": {
 		"downloadUrl": "https://github.com/Microsoft/sqltoolsservice/releases/download/v{#version#}/microsoft.sqltools.servicelayer-{#fileName#}",
-		"version": "1.4.0-alpha.8",
+		"version": "1.4.0-alpha.10",
 			"downloadFileNames": {
 			"Windows_86": "win-x86-netcoreapp2.0.zip",
 			"Windows_64": "win-x64-netcoreapp2.0.zip",
--- a/extensions/mssql/client/src/controllers/mainController.ts
+++ b/extensions/mssql/client/src/controllers/mainController.ts
@@ -11,7 +11,7 @@ import { Serialization } from '../serialize/serialization';
 import { AzureResourceProvider } from '../resourceProvider/resourceProvider';
 import { CredentialStore } from '../credentialstore/credentialstore';
 import { IExtensionConstants, Telemetry, Constants as SharedConstants, SqlToolsServiceClient, VscodeWrapper, Utils, PlatformInformation } from 'extensions-modules';
-import { LanguageClient } from 'dataprotocol-client';
+import { SqlOpsDataClient } from 'dataprotocol-client';
 import * as path from 'path';

 /**
@@ -67,21 +67,17 @@ export default class MainController implements vscode.Disposable {
 		return this._initialized;
 	}

-	private createClient(executableFiles: string[]): Promise<LanguageClient> {
+	private createClient(executableFiles: string[]): Promise<SqlOpsDataClient> {
 		return PlatformInformation.getCurrent(SqlToolsServiceClient.constants.getRuntimeId, SqlToolsServiceClient.constants.extensionName).then(platformInfo => {
 			return SqlToolsServiceClient.getInstance(path.join(__dirname, '../config.json')).createClient(this._context, platformInfo.runtimeId, undefined, executableFiles);
 		});
 	}

-	private createCredentialClient(): Promise<LanguageClient> {
+	private createCredentialClient(): Promise<SqlOpsDataClient> {
 		return this.createClient(['MicrosoftSqlToolsCredentials.exe', 'MicrosoftSqlToolsCredentials']);
 	}

-	private createSerializationClient(): Promise<LanguageClient> {
-		return this.createClient(['MicrosoftSqlToolsSerialization.exe', 'MicrosoftSqlToolsSerialization']);
-	}
-
-	private createResourceProviderClient(): Promise<LanguageClient> {
+	private createResourceProviderClient(): Promise<SqlOpsDataClient> {
 		return this.createClient(['SqlToolsResourceProviderService.exe', 'SqlToolsResourceProviderService']);
 	}

@@ -103,19 +99,6 @@ export default class MainController implements vscode.Disposable {
 					{ serviceInstalled: serverResult.installedBeforeInitializing ? 1 : 0 }
 				);

-				self.createSerializationClient().then(serializationClient => {
-					// Serialization
-					let serializationProvider: data.SerializationProvider = {
-						handle: 0,
-						saveAs(saveFormat: string, savePath: string, results: string, appendToFile: boolean): Thenable<data.SaveResultRequestResult> {
-							return self._serialization.saveAs(saveFormat, savePath, results, appendToFile);
-						}
-					};
-					data.serialization.registerProvider(serializationProvider);
-				}, error => {
-					Utils.logDebug('Cannot find Serialization executables. error: ' + error, MainController._extensionConstants.extensionConfigSectionName);
-				});
-
 				self.createResourceProviderClient().then(rpClient => {
 					let resourceProvider = new AzureResourceProvider(self._client, rpClient);
 					data.resources.registerResourceProvider({
@@ -131,28 +114,27 @@ export default class MainController implements vscode.Disposable {
 				});

 				self.createCredentialClient().then(credentialClient => {
-
 					self._credentialStore.languageClient = credentialClient;
-					let credentialProvider: data.CredentialProvider = {
-						handle: 0,
-						saveCredential(credentialId: string, password: string): Thenable<boolean> {
-							return self._credentialStore.saveCredential(credentialId, password);
-						},
-						readCredential(credentialId: string): Thenable<data.Credential> {
-							return self._credentialStore.readCredential(credentialId);
-						},
-						deleteCredential(credentialId: string): Thenable<boolean> {
-							return self._credentialStore.deleteCredential(credentialId);
-						}
-					};
-					data.credentials.registerProvider(credentialProvider);
-					Utils.logDebug('credentialProvider registered', MainController._extensionConstants.extensionConfigSectionName);
+					credentialClient.onReady().then(() => {
+						let credentialProvider: data.CredentialProvider = {
+							handle: 0,
+							saveCredential(credentialId: string, password: string): Thenable<boolean> {
+								return self._credentialStore.saveCredential(credentialId, password);
+							},
+							readCredential(credentialId: string): Thenable<data.Credential> {
+								return self._credentialStore.readCredential(credentialId);
+							},
+							deleteCredential(credentialId: string): Thenable<boolean> {
+								return self._credentialStore.deleteCredential(credentialId);
+							}
+						};
+						data.credentials.registerProvider(credentialProvider);
+						Utils.logDebug('credentialProvider registered', MainController._extensionConstants.extensionConfigSectionName);
+					});
 				}, error => {
 					Utils.logDebug('Cannot find credentials executables. error: ' + error, MainController._extensionConstants.extensionConfigSectionName);
 				});

-
-
 				Utils.logDebug(SharedConstants.extensionActivated, MainController._extensionConstants.extensionConfigSectionName);
 				self._initialized = true;
 				resolve(true);
--- a/extensions/mssql/client/src/credentialstore/credentialstore.ts
+++ b/extensions/mssql/client/src/credentialstore/credentialstore.ts
@@ -7,7 +7,7 @@
 import * as Contracts from '../models/contracts';
 import { ICredentialStore } from './icredentialstore';
 import { SqlToolsServiceClient, Utils } from 'extensions-modules';
-import { LanguageClient } from 'dataprotocol-client';
+import { SqlOpsDataClient } from 'dataprotocol-client';
 import * as path from 'path';

 /**
@@ -17,7 +17,7 @@ import * as path from 'path';
 */
 export class CredentialStore implements ICredentialStore {

-	public languageClient: LanguageClient;
+	public languageClient: SqlOpsDataClient;

 	constructor(private _client?: SqlToolsServiceClient) {
 		if (!this._client) {
--- a/extensions/mssql/client/src/resourceprovider/resourceprovider.ts
+++ b/extensions/mssql/client/src/resourceprovider/resourceprovider.ts
@@ -6,7 +6,7 @@

 import * as Contracts from '../models/contracts';
 import { SqlToolsServiceClient } from 'extensions-modules';
-import { LanguageClient } from 'dataprotocol-client';
+import { SqlOpsDataClient } from 'dataprotocol-client';
 import * as data from 'data';
 import * as path from 'path';

@@ -18,9 +18,9 @@ import * as path from 'path';
 */
 export class AzureResourceProvider implements data.ResourceProvider {

-	public languageClient: LanguageClient;
+	public languageClient: SqlOpsDataClient;

-	constructor(private _client?: SqlToolsServiceClient, langClient?: LanguageClient) {
+	constructor(private _client?: SqlToolsServiceClient, langClient?: SqlOpsDataClient) {
 		if (!this._client) {
 			this._client = SqlToolsServiceClient.getInstance(path.join(__dirname, '../config.json'));
 		}
--- a/extensions/mssql/client/src/serialize/serialization.ts
+++ b/extensions/mssql/client/src/serialize/serialization.ts
@@ -8,7 +8,7 @@ import * as Contracts from '../models/contracts';
 import { ISerialization } from './iserialization';
 import { SqlToolsServiceClient } from 'extensions-modules';
 import * as data from 'data';
-import { LanguageClient } from 'dataprotocol-client';
+import { SqlOpsDataClient } from 'dataprotocol-client';
 import * as path from 'path';

 /**
@@ -16,7 +16,7 @@ import * as path from 'path';
 */
 export class Serialization implements ISerialization {

-	constructor(private _client?: SqlToolsServiceClient, private _languageClient?: LanguageClient) {
+	constructor(private _client?: SqlToolsServiceClient, private _languageClient?: SqlOpsDataClient) {
 		if (!this._client) {
 			this._client = SqlToolsServiceClient.getInstance(path.join(__dirname, '../config.json'));
 		}
--- a/extensions/mssql/package.json
+++ b/extensions/mssql/package.json
@@ -15,7 +15,6 @@
  ],
  "scripts": {
    "compile": "gulp compile-extension:mssql-client",
-    "postinstall": "node ./node_modules/vscode/bin/install",
    "update-grammar": "node ../../build/npm/update-grammar.js Microsoft/vscode-mssql syntaxes/SQL.plist ./syntaxes/sql.tmLanguage.json"
  },
  "contributes": {
--- a/extensions/package.json
+++ b/extensions/package.json
@@ -6,6 +6,8 @@
    "typescript": "2.6.2",
    "extensions-modules": "file:../extensions-modules"
  },
+  "devDependencies": {
+  },
  "scripts": {
    "postinstall": "node ./postinstall"
  }
--- a/extensions/vscode-colorize-tests/package.json
+++ b/extensions/vscode-colorize-tests/package.json
@@ -9,7 +9,7 @@
 	},
 	"scripts": {
 		"vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:vscode-colorize-tests ./tsconfig.json",
-		"postinstall": "node ./node_modules/vscode/bin/install"
+		"prepare": "node ./node_modules/vscode/bin/install"
 	},
 	"devDependencies": {
 		"@types/node": "7.0.43",
--- a/extensions/yarn.lock
+++ b/extensions/yarn.lock
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "sqlops",
-  "version": "0.26.1",
+  "version": "0.26.5",
  "distro": "8c3e97e3425cc9814496472ab73e076de2ba99ee",
  "author": {
    "name": "Microsoft Corporation"
@@ -32,7 +32,7 @@
    "@angular/router": "~4.1.3",
    "@angular/upgrade": "~4.1.3",
    "angular2-grid": "2.0.6",
-    "angular2-slickgrid": "git://github.com/Microsoft/angular2-slickgrid.git#1.3.8",
+    "angular2-slickgrid": "git://github.com/Microsoft/angular2-slickgrid.git#1.3.9",
    "applicationinsights": "0.17.1",
    "chart.js": "^2.6.0",
    "core-js": "^2.4.1",
@@ -49,9 +49,9 @@
    "https-proxy-agent": "0.3.6",
    "iconv-lite": "0.4.19",
    "jquery": "3.1.0",
-    "make-error": "^1.1.1",
    "jschardet": "1.6.0",
    "keytar": "^4.0.5",
+    "make-error": "^1.1.1",
    "minimist": "1.2.0",
    "moment": "^2.15.1",
    "native-keymap": "1.2.5",
@@ -64,7 +64,7 @@
    "reflect-metadata": "^0.1.8",
    "rxjs": "5.4.0",
    "semver": "4.3.6",
-    "slickgrid": "github:anthonydresser/SlickGrid#2.3.12",
+    "slickgrid": "github:anthonydresser/SlickGrid#2.3.13",
    "spdlog": "0.3.7",
    "svg.js": "^2.2.5",
    "systemjs": "0.19.40",
@@ -99,11 +99,12 @@
    "express": "^4.13.1",
    "flatpak-bundler": "^0.1.1",
    "glob": "^5.0.13",
-    "gulp": "^3.8.9",
+    "gulp": "^3.9.1",
    "gulp-atom-electron": "1.15.1",
    "gulp-azure-storage": "^0.7.0",
    "gulp-bom": "^1.0.0",
    "gulp-buffer": "0.0.2",
+    "gulp-cli": "^2.0.1",
    "gulp-concat": "^2.6.0",
    "gulp-cssnano": "^2.1.0",
    "gulp-eslint": "^3.0.1",
@@ -145,8 +146,8 @@
    "typemoq": "^0.3.2",
    "typescript": "2.6.1",
    "typescript-formatter": "4.0.1",
-    "uglify-js": "mishoo/UglifyJS2#harmony-v2.8.22",
    "uglify-es": "^3.0.18",
+    "uglify-js": "mishoo/UglifyJS2#harmony-v2.8.22",
    "underscore": "^1.8.3",
    "vinyl": "^0.4.5",
    "vinyl-fs": "^2.4.3",
--- a/product.json
+++ b/product.json
@@ -28,5 +28,7 @@
 	"releaseNotesUrl": "https://go.microsoft.com/fwlink/?linkid=862039",
 	"documentationUrl": "https://go.microsoft.com/fwlink/?linkid=862277",
 	"commit": "9ca6200018fc206d67a47229f991901a8a453781",
-	"date": "2017-12-15T12:00:00.000Z"
+	"date": "2017-12-15T12:00:00.000Z",
+	"updateUrl": "https://sqlops-update.azurewebsites.net",
+	"quality": "stable"
 }
--- a/src/sql/base/browser/ui/editableDropdown/dropdown.ts
+++ b/src/sql/base/browser/ui/editableDropdown/dropdown.ts
@@ -198,7 +198,7 @@ export class Dropdown extends Disposable {
 					}
 				}, 0);
 				let height = filteredLength * this._renderer.getHeight(undefined, undefined) > this._options.maxHeight ? this._options.maxHeight : filteredLength * this._renderer.getHeight(undefined, undefined);
-				this.$treeContainer.style('height', height + 'px').style('width', DOM.getContentWidth(this.$input.getHTMLElement()) + 'px');
+				this.$treeContainer.style('height', height + 'px').style('width', DOM.getContentWidth(this.$input.getHTMLElement()) - 2 + 'px');
 				this._tree.layout(parseInt(this.$treeContainer.style('height')));
 				this._tree.refresh();
 			}
@@ -239,7 +239,7 @@ export class Dropdown extends Disposable {
 			this._filter.filterString = '';
 			this._dataSource.options = vals.map(i => { return { value: i }; });
 			let height = this._dataSource.options.length * 22 > this._options.maxHeight ? this._options.maxHeight : this._dataSource.options.length * 22;
-			this.$treeContainer.style('height', height + 'px').style('width', DOM.getContentWidth(this.$input.getHTMLElement()) + 'px');
+			this.$treeContainer.style('height', height + 'px').style('width', DOM.getContentWidth(this.$input.getHTMLElement()) - 2 + 'px');
 			this._tree.layout(parseInt(this.$treeContainer.style('height')));
 			this._tree.setInput(new DropdownModel());
 			this._input.validate();
--- a/src/sql/base/browser/ui/editableDropdown/media/dropdownList.css
+++ b/src/sql/base/browser/ui/editableDropdown/media/dropdownList.css
@@ -25,3 +25,13 @@
 .dropdown-tree .list-row {
 	margin-left: -33px;
 }
+
+.connection-input .dropdown .monaco-action-bar .action-label.icon.dropdown-arrow {
+	background-position: 50%;
+	background-size: cover;
+}
+
+.connection-input .monaco-action-bar .action-item .icon {
+	width: 8px;
+	height: 8px;
+}
--- a/src/sql/media/actionBarLabel.css
+++ b/src/sql/media/actionBarLabel.css
@@ -16,19 +16,19 @@
 }

 /* Activity Bar - explore */
-.monaco-workbench > .activitybar .monaco-action-bar .action-label.explore {
+.monaco-workbench > .activitybar > .content .monaco-action-bar .action-label.explore {
    -webkit-mask: url('icons/file_inverse.svg') no-repeat 50% 50%;
 	-webkit-mask-size: 25px 25px;
 }

 /* Activity Bar - source control */
-.monaco-workbench > .activitybar .monaco-action-bar .action-label.scm {
+.monaco-workbench > .activitybar > .content .monaco-action-bar .action-label.scm {
 	-webkit-mask: url('icons/sourcecontrol_inverse.svg') no-repeat 50% 50%;
 	-webkit-mask-size: 25px 25px;
 }

 /* Activity Bar - search */
-.monaco-workbench > .activitybar .monaco-action-bar .action-label.search {
+.monaco-workbench > .activitybar > .content .monaco-action-bar .action-label.search {
    -webkit-mask: url('icons/search_inverse.svg') no-repeat 50% 50%;
 	-webkit-mask-size: 25px 25px;
 }
--- a/src/sql/parts/connection/connectionDialog/connectionController.ts
+++ b/src/sql/parts/connection/connectionDialog/connectionController.ts
@@ -34,7 +34,7 @@ export class ConnectionController implements IConnectionComponentController {
 		sqlCapabilities: data.DataProtocolServerCapabilities,
 		callback: IConnectionComponentCallbacks,
 		providerName: string,
-		@IInstantiationService private _instantiationService: IInstantiationService, ) {
+		@IInstantiationService private _instantiationService: IInstantiationService ) {
 		this._container = container;
 		this._connectionManagementService = connectionManagementService;
 		this._callback = callback;
@@ -60,6 +60,8 @@ export class ConnectionController implements IConnectionComponentController {
 		tempProfile.authenticationType = authenticationType;
 		tempProfile.userName = userName;
 		tempProfile.password = password;
+		tempProfile.groupFullName = '';
+		tempProfile.saveProfile = false;
 		let uri = this._connectionManagementService.getConnectionId(tempProfile);
 		return new Promise<string[]>((resolve, reject) => {
 			if (this._databaseCache.has(uri)) {
@@ -80,7 +82,7 @@ export class ConnectionController implements IConnectionComponentController {
 								this._databaseCache.set(uri, null);
 								reject();
 							}
-						})
+						});
 					} else {
 						reject(connResult.errorMessage);
 					}
@@ -114,6 +116,7 @@ export class ConnectionController implements IConnectionComponentController {
 	}

 	public showUiComponent(container: HTMLElement): void {
+		this._databaseCache = new Map<string, string[]>();
 		this._connectionWidget.createConnectionWidget(container);
 	}

@@ -177,4 +180,16 @@ export class ConnectionController implements IConnectionComponentController {
 	public handleResetConnection(): void {
 		this._connectionWidget.handleResetConnection();
 	}
+
+	public closeDatabaseDropdown(): void {
+		this._connectionWidget.closeDatabaseDropdown();
+	}
+
+	public get databaseDropdownExpanded(): boolean {
+		return this._connectionWidget.databaseDropdownExpanded;
+	}
+
+	public set databaseDropdownExpanded(val: boolean) {
+		this._connectionWidget.databaseDropdownExpanded = val;
+	}
 }
--- a/src/sql/parts/connection/connectionDialog/connectionDialogService.ts
+++ b/src/sql/parts/connection/connectionDialog/connectionDialogService.ts
@@ -54,6 +54,8 @@ export interface IConnectionComponentController {
 	handleOnConnecting(): void;
 	handleResetConnection(): void;
 	focusOnOpen(): void;
+	closeDatabaseDropdown(): void;
+	databaseDropdownExpanded: boolean;
 }

 export class ConnectionDialogService implements IConnectionDialogService {
@@ -149,16 +151,21 @@ export class ConnectionDialogService implements IConnectionDialogService {
 	}

 	private handleOnCancel(params: INewConnectionParams): void {
-		if (params && params.input && params.connectionType === ConnectionType.editor) {
-			this._connectionManagementService.cancelEditorConnection(params.input);
+		if (this.uiController.databaseDropdownExpanded) {
+			this.uiController.closeDatabaseDropdown();
 		} else {
-			this._connectionManagementService.cancelConnection(this._model);
+			if (params && params.input && params.connectionType === ConnectionType.editor) {
+				this._connectionManagementService.cancelEditorConnection(params.input);
+			} else {
+				this._connectionManagementService.cancelConnection(this._model);
+			}
+			if (params && params.input && params.input.onConnectReject) {
+				params.input.onConnectReject();
+			}
+			this._connectionDialog.resetConnection();
+			this._connecting = false;
 		}
-		if (params && params.input && params.input.onConnectReject) {
-			params.input.onConnectReject();
-		}
-		this._connectionDialog.resetConnection();
-		this._connecting = false;
+		this.uiController.databaseDropdownExpanded = false;
 	}

 	private handleDefaultOnConnect(params: INewConnectionParams, connection: IConnectionProfile): Thenable<void> {
@@ -326,7 +333,10 @@ export class ConnectionDialogService implements IConnectionDialogService {
 			let container = withElementById(this._partService.getWorkbenchElementId()).getHTMLElement().parentElement;
 			this._container = container;
 			this._connectionDialog = this._instantiationService.createInstance(ConnectionDialogWidget, this._providerTypes, this._providerNameToDisplayNameMap[this._model.providerName]);
-			this._connectionDialog.onCancel(() => this.handleOnCancel(this._connectionDialog.newConnectionParams));
+			this._connectionDialog.onCancel(() => {
+				this._connectionDialog.databaseDropdownExpanded = this.uiController.databaseDropdownExpanded;
+				this.handleOnCancel(this._connectionDialog.newConnectionParams);
+			});
 			this._connectionDialog.onConnect((profile) => this.handleOnConnect(this._connectionDialog.newConnectionParams, profile));
 			this._connectionDialog.onShowUiComponent((input) => this.handleShowUiComponent(input));
 			this._connectionDialog.onInitDialog(() => this.handleInitDialog());
--- a/src/sql/parts/connection/connectionDialog/connectionDialogWidget.ts
+++ b/src/sql/parts/connection/connectionDialog/connectionDialogWidget.ts
@@ -56,6 +56,7 @@ export class ConnectionDialogWidget extends Modal {
 	private _recentConnectionTree: ITree;
 	private _savedConnectionTree: ITree;
 	private $connectionUIContainer: Builder;
+	private _databaseDropdownExpanded: boolean;

 	private _panel: TabbedPanel;
 	private _recentConnectionTabId: PanelTabIdentifier;
@@ -244,7 +245,9 @@ export class ConnectionDialogWidget extends Modal {

 	private cancel() {
 		this._onCancel.fire();
-		this.close();
+		if (!this._databaseDropdownExpanded) {
+			this.close();
+		}
 	}

 	public close() {
@@ -452,4 +455,12 @@ export class ConnectionDialogWidget extends Modal {
 		this._providerTypeSelectBox.selectWithOptionName(displayName);
 		this.onProviderTypeSelected(displayName);
 	}
+
+	public set databaseDropdownExpanded(val: boolean) {
+		this._databaseDropdownExpanded = val;
+	}
+
+	public get databaseDropdownExpanded(): boolean {
+		return this._databaseDropdownExpanded;
+	}
 }
--- a/src/sql/parts/connection/connectionDialog/connectionWidget.ts
+++ b/src/sql/parts/connection/connectionDialog/connectionWidget.ts
@@ -52,6 +52,7 @@ export class ConnectionWidget {
 		[Constants.mssqlProviderName]: [new AuthenticationType(Constants.integrated, false), new AuthenticationType(Constants.sqlLogin, true)]
 	};
 	private _saveProfile: boolean;
+	private _databaseDropdownExpanded: boolean = false;
 	private _defaultDatabaseName: string = localize('defaultDatabaseOption', '<Default>');
 	private _loadingDatabaseName: string = localize('loadingDatabaseOption', 'Loading...');
 	public DefaultServerGroup: IConnectionProfileGroup = {
@@ -244,11 +245,12 @@ export class ConnectionWidget {
 		}));

 		this._toDispose.push(this._databaseNameInputBox.onFocus(() => {
+			this._databaseDropdownExpanded = true;
 			if (this.serverName) {
 				this._databaseNameInputBox.values = [this._loadingDatabaseName];
 				this._callbacks.onFetchDatabases(this.serverName, this.authenticationType, this.userName, this._password).then(databases => {
 					if (databases) {
-						this._databaseNameInputBox.values = databases;
+						this._databaseNameInputBox.values = databases.sort((a, b) => a.localeCompare(b));
 					} else {
 						this._databaseNameInputBox.values = [this._defaultDatabaseName];
 					}
@@ -267,6 +269,7 @@ export class ConnectionWidget {
 				this._databaseNameInputBox.value = s;
 			}
 		}));
+
 	}

 	private onGroupSelected(selectedGroup: string) {
@@ -540,6 +543,18 @@ export class ConnectionWidget {
 		const authType = this._authTypeMap[this._providerName];
 		return authType ? authType.find(authType => this.getAuthTypeDisplayName(authType.name) === displayName) : undefined;
 	}
+
+	public closeDatabaseDropdown(): void {
+		this._databaseNameInputBox.blur();
+	}
+
+	public get databaseDropdownExpanded(): boolean {
+		return this._databaseDropdownExpanded;
+	}
+
+	public set databaseDropdownExpanded(val: boolean) {
+		this._databaseDropdownExpanded = val;
+	}
 }

 class AuthenticationType {
--- a/src/sql/parts/dashboard/common/dashboardWidgetWrapper.component.ts
+++ b/src/sql/parts/dashboard/common/dashboardWidgetWrapper.component.ts
@@ -170,6 +170,7 @@ export class DashboardWidgetWrapper implements AfterContentInit, OnInit, OnDestr
 			}
 			// Save the widget for future use
 			selector = componentMap['insights-widget'];
+			delete this._config.widget[key];
 			this._config.widget['insights-widget'] = insightConfig;
 		}
 		return selector;
--- a/src/sql/parts/dashboard/services/dashboardServiceInterface.service.ts
+++ b/src/sql/parts/dashboard/services/dashboardServiceInterface.service.ts
@@ -37,6 +37,7 @@ import { IStorageService } from 'vs/platform/storage/common/storage';
 import Event, { Emitter } from 'vs/base/common/event';
 import Severity from 'vs/base/common/severity';
 import * as nls from 'vs/nls';
+import { deepClone } from 'vs/base/common/objects';

 const DASHBOARD_SETTINGS = 'dashboard';

@@ -251,7 +252,7 @@ export class DashboardServiceInterface implements OnDestroy {
 	 */
 	public getSettings<T>(type: string): T {
 		let config = this._configService.getValue<T>([DASHBOARD_SETTINGS, type].join('.'));
-		return config;
+		return deepClone(config);
 	}

 	public writeSettings(key: string, value: any, target: ConfigurationTarget) {
--- a/src/sql/parts/disasterRecovery/restore/common/restoreServiceImpl.ts
+++ b/src/sql/parts/disasterRecovery/restore/common/restoreServiceImpl.ts
@@ -22,6 +22,9 @@ import { MssqlRestoreInfo } from 'sql/parts/disasterRecovery/restore/mssqlRestor
 import { IConnectionProfile } from 'sql/parts/connection/common/interfaces';
 import { ProviderConnectionInfo } from 'sql/parts/connection/common/providerConnectionInfo';
 import * as Utils from 'sql/parts/connection/common/utils';
+import { IObjectExplorerService } from 'sql/parts/registeredServer/common/objectExplorerService';
+import { ITaskService } from 'sql/parts/taskHistory/common/taskService';
+import { TaskStatus, TaskNode } from 'sql/parts/taskHistory/common/taskNode';

 export class RestoreService implements IRestoreService {

@@ -135,13 +138,17 @@ export class RestoreDialogController implements IRestoreDialogController {
 	private _ownerUri: string;
 	private _sessionId: string;
 	private readonly _restoreFeature = 'Restore';
+	private readonly _restoreTaskName: string = 'Restore Database';
+	private readonly _restoreCompleted : string = 'Completed';
 	private _optionValues: { [optionName: string]: any } = {};

 	constructor(
 		@IInstantiationService private _instantiationService: IInstantiationService,
 		@IRestoreService private _restoreService: IRestoreService,
 		@IConnectionManagementService private _connectionService: IConnectionManagementService,
-		@ICapabilitiesService private _capabilitiesService: ICapabilitiesService
+		@ICapabilitiesService private _capabilitiesService: ICapabilitiesService,
+		@IObjectExplorerService private _objectExplorerService: IObjectExplorerService,
+		@ITaskService private _taskService: ITaskService
 	) {
 	}

@@ -153,9 +160,29 @@ export class RestoreDialogController implements IRestoreDialogController {
 			restoreOption.taskExecutionMode = TaskExecutionMode.executeAndScript;
 		}

-		this._restoreService.restore(this._ownerUri, restoreOption);
-		let restoreDialog = this._restoreDialogs[this._currentProvider];
-		restoreDialog.close();
+		this._restoreService.restore(this._ownerUri, restoreOption).then(result => {
+			const self = this;
+			let connectionProfile = self._connectionService.getConnectionProfile(self._ownerUri);
+			let activeNode = self._objectExplorerService.getObjectExplorerNode(connectionProfile);
+			this._taskService.onTaskComplete(response => {
+				if (result.taskId === response.id && this.isSuccessfulRestore(response) && activeNode) {
+					self._objectExplorerService.refreshTreeNode(activeNode.getSession(), activeNode).then(result => {
+						self._objectExplorerService.getServerTreeView().refreshTree();
+					});
+				}
+			});
+			let restoreDialog = this._restoreDialogs[this._currentProvider];
+			restoreDialog.close();
+		});
+	}
+
+	private isSuccessfulRestore(response: TaskNode): boolean {
+		return (response.taskName === this._restoreTaskName &&
+				response.message === this._restoreCompleted &&
+				(response.status === TaskStatus.succeeded ||
+					response.status === TaskStatus.succeededWithWarning) &&
+				(response.taskExecutionMode === TaskExecutionMode.execute ||
+					response.taskExecutionMode === TaskExecutionMode.executeAndScript));
 	}

 	private handleMssqlOnValidateFile(overwriteTargetDatabase: boolean = false): void {
@@ -309,7 +336,6 @@ export class RestoreDialogController implements IRestoreDialogController {
 						let restoreDialog = this._restoreDialogs[this._currentProvider] as OptionsDialog;
 						restoreDialog.open(this.getRestoreOption(), this._optionValues);
 					}
-
 					resolve(result);
 				}, error => {
 					reject(error);
--- a/src/sql/parts/registeredServer/common/objectExplorerService.ts
+++ b/src/sql/parts/registeredServer/common/objectExplorerService.ts
@@ -63,6 +63,8 @@ export interface IObjectExplorerService {
 	isFocused(): boolean;

 	onSelectionOrFocusChange: Event<void>;
+
+	getServerTreeView(): ServerTreeView;
 }

 interface SessionStatus {
@@ -417,4 +419,8 @@ export class ObjectExplorerService implements IObjectExplorerService {
 	public isFocused(): boolean {
 		return this._serverTreeView.isFocused();
 	}
+
+	public getServerTreeView() {
+		return this._serverTreeView;
+	}
 }
--- a/src/sql/parts/taskHistory/common/taskService.ts
+++ b/src/sql/parts/taskHistory/common/taskService.ts
@@ -9,13 +9,13 @@ import { TaskNode, TaskStatus, TaskExecutionMode } from 'sql/parts/taskHistory/c
 import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import Event, { Emitter } from 'vs/base/common/event';
-export const SERVICE_ID = 'taskHistoryService';
 import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
 import { IChoiceService } from 'vs/platform/message/common/message';
 import { localize } from 'vs/nls';
 import Severity from 'vs/base/common/severity';
 import { TPromise } from 'vs/base/common/winjs.base';

+export const SERVICE_ID = 'taskHistoryService';
 export const ITaskService = createDecorator<ITaskService>(SERVICE_ID);

 export interface ITaskService {
--- a/src/vs/base/browser/ui/contextview/contextview.ts
+++ b/src/vs/base/browser/ui/contextview/contextview.ts
@@ -230,7 +230,7 @@ export class ContextView {
 		this.$view.removeClass('top', 'bottom', 'left', 'right');
 		this.$view.addClass(anchorPosition === AnchorPosition.BELOW ? 'bottom' : 'top');
 		this.$view.addClass(anchorAlignment === AnchorAlignment.LEFT ? 'left' : 'right');
-		this.$view.style({ top: result.top + 'px', left: result.left + 'px', width: 'initial' });
+		this.$view.style({ top: result.top + 'px', left: result.left + 1 + 'px', width: 'initial' });
 	}

 	public hide(data?: any): void {
--- a/src/vs/base/parts/tree/browser/tree.css
+++ b/src/vs/base/parts/tree/browser/tree.css
@@ -77,6 +77,16 @@
 	background-image: url('expanded.svg');
 }

+/* {{SQL CARBON EDIT}} -- Display a high-contrast arrow when an expandable item is selected and expanded */
+.monaco-tree.focused .monaco-tree-rows.show-twisties > .monaco-tree-row.has-children.selected.expanded > .content:before {
+	background-image: url('expanded-hc.svg');
+}
+
+/* {{SQL CARBON EDIT}} -- Display a high-contrast arrow when an expandable item is selected and collapsed */
+.monaco-tree.focused .monaco-tree-rows.show-twisties > .monaco-tree-row.has-children.selected > .content:before {
+	background-image: url('collapsed-hc.svg');
+}
+
 .monaco-tree .monaco-tree-rows > .monaco-tree-row.has-children.loading > .content:before {
 	background-image: url('loading.svg');
 }
--- a/src/vs/code/electron-main/menus.ts
+++ b/src/vs/code/electron-main/menus.ts
@@ -410,6 +410,9 @@ export class CodeMenu {
 		const autoSaveEnabled = [AutoSaveConfiguration.AFTER_DELAY, AutoSaveConfiguration.ON_FOCUS_CHANGE, AutoSaveConfiguration.ON_WINDOW_CHANGE].some(s => this.currentAutoSaveSetting === s);
 		const autoSave = new MenuItem(this.likeAction('vscode.toggleAutoSave', { label: this.mnemonicLabel(nls.localize('miAutoSave', "Auto Save")), type: 'checkbox', checked: autoSaveEnabled, enabled: this.windowsMainService.getWindowCount() > 0, click: () => this.windowsMainService.sendToFocused('vscode.toggleAutoSave') }, false));

+		// {{SQL CARBON EDIT}}
+		const installVsixExtension = this.createMenuItem(nls.localize({ key: 'miinstallVsix', comment: ['&& denotes a mnemonic'] }, "Install Extension from VSIX Package"), 'workbench.extensions.action.installVSIX');
+
 		const preferences = this.getPreferencesMenu();

 		const newWindow = new MenuItem(this.likeAction('workbench.action.newWindow', { label: this.mnemonicLabel(nls.localize({ key: 'miNewWindow', comment: ['&& denotes a mnemonic'] }, "New &&Window")), click: () => this.windowsMainService.openNewWindow(OpenContext.MENU) }));
@@ -444,6 +447,9 @@ export class CodeMenu {
 			__separator__(),
 			autoSave,
 			__separator__(),
+			// {{SQL CARBON EDIT}}
+			installVsixExtension,
+			__separator__(),
 			!isMacintosh ? preferences : null,
 			!isMacintosh ? __separator__() : null,
 			revertFile,
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
Karl Burtram	ebd620bf7b	Add auto-update links in release branch	2018-02-14 10:30:51 -08:00
Karl Burtram	79980d95e4	Merge branch 'master' into release/0.26	2018-02-14 10:24:14 -08:00
Karl Burtram	49d19a9ab8	Bump SQL Ops to 0.26.5 (#691 )	2018-02-14 10:23:05 -08:00
Anthony Dresser	f5a866aa42	clone value to keep from getting previous settings (#688 )	2018-02-14 10:21:04 -08:00
Karl Burtram	250d84923c	Update changelog and readme for February	2018-02-13 13:29:18 -08:00
Cory Rivera	f1ddea986a	Change Windows setup so that sqlops restarts after auto-updating (#684 ) * Re-add runcode line in code.iss, but with skipifsilent option. * Add check for update flag file in setup run task in code.iss.	2018-02-13 12:40:17 -08:00
Aditya Bist	040549d264	Connection Dialog: Database dropdown followup issues fix (#662 ) * databases now sorted order in dropdown * fixed bug ESC bug for conn dialog * pressing ESC now only closes dropdown instead of conn dialog * changed dropdown arrow to look similar to other arrows * align dropdown tree and spacing for all dropdowns * fixed bug where pressing esc would close conn dialog after option is chosen	2018-02-13 12:38:51 -08:00
Karl Burtram	4b51d9b386	Add another // {{SQL CARBON EDIT}} for install from vsix (#683 )	2018-02-13 10:22:02 -08:00
Alex Tercete	73fbd787d8	Reinstate menu item to install from VSIX (#682 )	2018-02-13 10:16:31 -08:00
Karl Burtram	b6f848eff1	Bump SQL Ops version to 0.23.4 for next build (#677 )	2018-02-12 17:42:09 -08:00
Anthony Dresser	6f21d6e27e	Output undefined channel for client (#675 ) * added null output channel to the client * potential fix the yarn problems	2018-02-12 17:40:26 -08:00
Anthony Dresser	af9c3d3872	bump slickgrid (#674 )	2018-02-12 17:18:07 -08:00
Matt Irvine	7806a29bed	Bump SQL Tools Service version for fix (#669 )	2018-02-12 14:02:08 -08:00
Abbie Petchtes	0412b643d2	fix rerender insight widget issue (#663 )	2018-02-12 12:30:21 -08:00
Karl Burtram	d7ee37a946	Bump SQL Ops to 0.26.3 (#659 )	2018-02-09 22:00:39 -08:00
Karl Burtram	af53a13e6b	Register credential provider after language client onReady (#657 )	2018-02-09 21:58:47 -08:00
Karl Burtram	98fa028ce5	Bump tools service to 1.4.0-alpha-9 (#658 )	2018-02-09 21:52:39 -08:00
Karl Burtram	ed4d4e33b5	Bump SQL Ops version to 0.26.2 (#651 )	2018-02-09 16:29:23 -08:00
Karl Burtram	6c83736626	Update flat action bar icons (#652 )	2018-02-09 16:21:22 -08:00
Aditya Bist	959b4fbab5	Object Explorer: Refresh OE node if database restored (#607 ) * refresh OE node if restored * refresh OE when task is completed * check task id for restore	2018-02-09 16:13:21 -08:00
Karl Burtram	3b7ff61000	Reapply publish script changes lost in VS Code 1.19 merge (#653 ) * Reapply publish script changes lost in VS Code 1.19 merge * Pick up changes from commit `0c14c3cc7f` * Add another // {{SQL CARBON EDIT}}	2018-02-09 15:26:31 -08:00
Karl Burtram	cf283a9266	Remove unneeded files from packaged builds (#642 ) * Remove unused files from packaged builds * Update package.json postinstall steps * More npm install fixes * Colorizer test fix * Clean-up typescript module * Fix yarn build on macOS * Add gulp to dev dependencies * Fix macOS build	2018-02-08 14:54:27 -08:00
Matt Irvine	e28b86ea87	Fix some minor connection db dropdown bugs (#637 ) * Fix some minor connection db dropdown bugs * Put back cache for failed list	2018-02-07 19:17:32 -08:00
Matt Irvine	362664c4d8	Redo changes for object explorer arrow colors (#633 )	2018-02-07 16:31:13 -08:00
Matt Irvine	c860a0edb2	Update angular2-slickgrid version (#628 )	2018-02-07 13:03:09 -08:00