Bump event-stream to 3.3.4

Update Azure Data Studio to 1.3.3
Add Routine_Type to CreateStoredProc fixes #3257 (#3286 )
2026-02-17 11:01:37 -05:00 · 2018-11-26 16:34:03 -08:00 · 2018-11-26 16:32:34 -08:00 · 2018-11-26 15:26:12 -08:00 · 2018-11-26 15:14:36 -08:00 · 2018-11-26 14:49:06 -08:00
213 changed files with 14073 additions and 2651 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,58 +0,0 @@
-sudo: false
-language: cpp
-
-os:
-  - linux
-  - osx
-
-cache:
-  directories:
-    - $HOME/.cache/yarn
-
-notifications:
-  email: false
-  webhooks:
-    - http://vscode-probot.westus.cloudapp.azure.com:3450/travis/notifications
-    - http://vscode-test-probot.westus.cloudapp.azure.com:3450/travis/notifications
-
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - gcc-4.9
-      - g++-4.9
-      - gcc-4.9-multilib
-      - g++-4.9-multilib
-      - zip
-      - libgtk2.0-0
-      - libx11-dev
-      - libxkbfile-dev
-      - libsecret-1-dev
-
-before_install:
-  - git submodule update --init --recursive
-  - nvm install 8.9.1
-  - nvm use 8.9.1
-  - npm i -g yarn
-  # - npm config set python `which python`
-  - if [ $TRAVIS_OS_NAME == "linux" ]; then
-      export CXX="g++-4.9" CC="gcc-4.9" DISPLAY=:99.0;
-      sh -e /etc/init.d/xvfb start;
-      sleep 3;
-    fi
-  # Make npm logs less verbose
-  # - npm config set depth 0
-  # - npm config set loglevel warn
-
-install:
-  - yarn
-
-script:
-  - node_modules/.bin/gulp electron --silent
-  - node_modules/.bin/gulp compile --silent --max_old_space_size=4096
-  - node_modules/.bin/gulp optimize-vscode --silent --max_old_space_size=4096
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./scripts/test.sh --coverage --reporter dot; else ./scripts/test.sh --reporter dot; fi
-
-after_success:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then node_modules/.bin/coveralls < .build/coverage/lcov.info; fi
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,28 @@
 # Change Log

+## Version 1.2.4
+* Release date: November 6, 2018
+* Release status: General Availability
+
+## What's new in this version
+* Update to the SQL Server 2019 Preview extension
+* Introducing Paste the Plan extension
+* Introducing High Color queries extension, including SSMS editor theme
+* Fixes in SQL Server Agent, Profiler, and Import extensions
+* Fix .Net Core Socket KeepAlive issue causing dropped inactive connections on macOS
+* Upgrade SQL Tools Service to .Net Core 2.2 Preview 3 (for eventual AAD support)
+* Fix customer reported GitHub issues
+
+## Contributions and "thank you"
+We would like to thank all our users who raised issues, and in particular the following users who helped contribute fixes:
+
+* rdaniels6813  for `Add query plan theme support #3031`
+* Ruturaj123 for `Fixed some typos and grammatical errors #3027`
+* PromoFaux for `Use emoji shortcodes in CONTRIBUTING.md instead of <20> #3009`
+* ckaczor for `Fix: DATETIMEOFFSET data types should be ISO formatted #714`
+* hi-im-T0dd for `Fixed sync issue with my forked master so this commit is correct #2948`
+* hi-im-T0dd for `Fixed when right clicking and selecting Manage-correct name displays #2794`
+
 ## Version 1.1.3
 * Release date: October 18, 2018
 * Release status: General Availability
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 # Azure Data Studio

 [![Join the chat at https://gitter.im/Microsoft/sqlopsstudio](https://badges.gitter.im/Microsoft/sqlopsstudio.svg)](https://gitter.im/Microsoft/sqlopsstudio?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Build Status](https://dev.azure.com/ms/azuredatastudio/_apis/build/status/Microsoft.azuredatastudio)](https://dev.azure.com/ms/azuredatastudio/_build/latest?definitionId=4)

 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.

@@ -8,12 +9,12 @@ Azure Data Studio is a data management tool that enables you to work with SQL Se

 Platform | Link
 -- | --
-Windows Setup Installer | https://go.microsoft.com/fwlink/?linkid=2030731
-Windows ZIP | https://go.microsoft.com/fwlink/?linkid=2030736
-macOS ZIP | https://go.microsoft.com/fwlink/?linkid=2030738
-Linux TAR.GZ | https://go.microsoft.com/fwlink/?linkid=2030741
-Linux RPM | https://go.microsoft.com/fwlink/?linkid=2030746
-Linux DEB | https://go.microsoft.com/fwlink/?linkid=2030750
+Windows Setup Installer | https://go.microsoft.com/fwlink/?linkid=2038320
+Windows ZIP | https://go.microsoft.com/fwlink/?linkid=2038323
+macOS ZIP | https://go.microsoft.com/fwlink/?linkid=2038327
+Linux TAR.GZ | https://go.microsoft.com/fwlink/?linkid=2038332
+Linux RPM | https://go.microsoft.com/fwlink/?linkid=2038401
+Linux DEB | https://go.microsoft.com/fwlink/?linkid=2038405

 Go to our [download page](https://aka.ms/azuredatastudio) for more specific instructions.

@@ -61,6 +62,12 @@ The [Microsoft Enterprise and Developer Privacy Statement](https://privacy.micro
 ## Contributions and "Thank You"
 We would like to thank all our users who raised issues, and in particular the following users who helped contribute fixes:

+* rdaniels6813  for `Add query plan theme support #3031`
+* Ruturaj123 for `Fixed some typos and grammatical errors #3027`
+* PromoFaux for `Use emoji shortcodes in CONTRIBUTING.md instead of <20> #3009`
+* ckaczor for `Fix: DATETIMEOFFSET data types should be ISO formatted #714`
+* hi-im-T0dd for `Fixed sync issue with my forked master so this commit is correct #2948`
+* hi-im-T0dd for `Fixed when right clicking and selecting Manage-correct name displays #2794`
 * philoushka  for `center the icon #2760`
 * anthonypants for `Typo #2775`
 * kstolte for `Fix Invalid Configuration in Launch.json #2789`
@@ -103,7 +110,6 @@ We would like to thank all our users who raised issues, and in particular the fo
  * Russian: Andrey Veselov, Anton Fontanov, Anton Savin, Elena Ostrovskaia, Igor Babichev, Maxim Zelensky, Rodion Fedechkin, Tasha T, Vladimir Zyryanov
  * Portuguese Brazil: Daniel de Sousa, Diogo Duarte, Douglas Correa, Douglas Eccker, José Emanuel Mendes, Marcelo Fernandes, Marcondes Alexandre, Roberto Fonseca, Rodrigo Crespi

-
 And of course, we'd like to thank the authors of all upstream dependencies.  Please see a full list in the [ThirdPartyNotices.txt](https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/ThirdPartyNotices.txt)

 ## License
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -34,6 +34,7 @@ expressly granted herein, whether by implication, estoppel or otherwise.
    jquery-ui: https://github.com/jquery/jquery-ui
    jquery.event.drag: https://github.com/devongovett/jquery.event.drag
    jschardet: https://github.com/aadsm/jschardet
+    JupyterLab: https://github.com/jupyterlab/jupyterlab
    make-error: https://github.com/JsCommunity/make-error
    minimist: https://github.com/substack/minimist
    moment: https://github.com/moment/moment
@@ -1166,6 +1167,43 @@ That's all there is to it!
 =========================================
 END OF jschardet NOTICES AND INFORMATION

+%% JupyterLab NOTICES AND INFORMATION BEGIN HERE
+Copyright (c) 2015 Project Jupyter Contributors
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Semver File License
+===================
+
+The semver.py file is from https://github.com/podhmo/python-semver
+which is licensed under the "MIT" license.  See the semver.py file for details.
+
+END OF JupyterLab NOTICES AND INFORMATION
+
 %% make-error NOTICES AND INFORMATION BEGIN HERE
 =========================================
 ISC © Julien Fontanet
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,19 +0,0 @@
-environment:
-  ELECTRON_RUN_AS_NODE: 1
-  VSCODE_BUILD_VERBOSE: true
-
-cache:
-  - '%LOCALAPPDATA%\Yarn\cache'
-
-install:
-  - ps: Install-Product node 8.9.1 x64
-
-build_script:
-  - yarn
-  - .\node_modules\.bin\gulp electron
-  - npm run compile
-
-test_script:
-  - node --version
-  - .\scripts\test.bat
-  - .\scripts\test-integration.bat
--- a/azure-pipelines-linux-mac.yml
+++ b/azure-pipelines-linux-mac.yml
@@ -0,0 +1,38 @@
+steps:
+- task: NodeTool@0
+  inputs:
+    versionSpec: '8.x'
+  displayName: 'Install Node.js'
+
+- script: |
+    git submodule update --init --recursive
+    nvm install 8.9.1
+    nvm use 8.9.1
+    npm i -g yarn
+  displayName: 'preinstall'
+
+- script: |
+    export CXX="g++-4.9" CC="gcc-4.9" DISPLAY=:99.0
+    sh -e /etc/init.d/xvfb start
+    sleep 3
+  displayName: 'Linux preinstall'
+  condition: eq(variables['Agent.OS'], 'Linux')
+
+- script: |
+    yarn
+  displayName:  'Install'
+
+- script: |
+    node_modules/.bin/gulp electron --silent
+    node_modules/.bin/gulp compile --silent --max_old_space_size=4096
+    node_modules/.bin/gulp optimize-vscode --silent --max_old_space_size=4096
+  displayName: 'Scripts'
+
+- script: |
+    ./scripts/test.sh --reporter mocha-junit-reporter
+  displayName: 'Tests'
+
+- task: PublishTestResults@2
+  inputs:
+    testResultsFiles: '**/test-results.xml'    
+  condition: succeededOrFailed()
--- a/azure-pipelines-windows.yml
+++ b/azure-pipelines-windows.yml
@@ -0,0 +1,26 @@
+steps:
+- task: NodeTool@0
+  inputs:
+    versionSpec: '8.9'
+  displayName: 'Install Node.js'
+
+- script: |
+    yarn
+  displayName: 'Yarn Install'
+
+- script: |
+    .\node_modules\.bin\gulp electron
+  displayName: 'Electron'
+
+- script: |
+    npm run compile
+  displayName: 'Compile'
+
+- script: |
+    .\scripts\test.bat --reporter mocha-junit-reporter
+  displayName: 'Test'
+
+- task: PublishTestResults@2
+  inputs:
+    testResultsFiles: 'test-results.xml'
+  condition: succeededOrFailed()
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -0,0 +1,29 @@
+trigger:
+- master
+- releases/*
+
+jobs:
+
+# All tasks on Windows
+- job: build_all_windows
+  displayName: Build all tasks (Windows)
+  pool:
+    vmImage: vs2017-win2016
+  steps:
+  - template: azure-pipelines-windows.yml
+
+# All tasks on Linux
+- job: build_all_linux
+  displayName: Build all tasks (Linux)
+  pool:
+    vmImage: 'Ubuntu 16.04'
+  steps:
+  - template: azure-pipelines-linux-mac.yml
+
+# All tasks on macOS
+- job: build_all_darwin
+  displayName: Build all tasks (macOS)
+  pool:
+    vmImage: macos-10.13
+  steps:
+  - template: azure-pipelines-linux-mac.yml
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -129,6 +129,7 @@ const vscodeResources = [
 	'out-build/sql/parts/jobManagement/common/media/*.svg',
 	'out-build/sql/media/objectTypes/*.svg',
 	'out-build/sql/media/icons/*.svg',
+	'out-build/sql/parts/notebook/media/**/*.svg',
 	'!**/test/**'
 ];

--- a/build/package.json
+++ b/build/package.json
@@ -9,20 +9,21 @@
    "@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",
+    "@types/xml2js": "0.0.33",
    "azure-storage": "^2.1.0",
    "decompress": "^4.2.0",
+    "del": "^3.0.0",
    "documentdb": "1.13.0",
-    "service-downloader": "github:anthonydresser/service-downloader#0.1.5",
    "fs-extra-promise": "^1.0.1",
+    "github-releases": "^0.4.1",
    "mime": "^1.3.4",
    "minimist": "^1.2.0",
+    "request": "^2.85.0",
+    "service-downloader": "github:anthonydresser/service-downloader#0.1.5",
    "typescript": "2.9.2",
    "vscode": "^1.0.1",
-    "xml2js": "^0.4.17",
-    "github-releases": "^0.4.1",
-    "request": "^2.85.0"
+    "xml2js": "^0.4.17"
  },
  "scripts": {
    "compile": "tsc -p tsconfig.build.json",
--- a/build/yarn.lock
+++ b/build/yarn.lock
@@ -46,6 +46,7 @@
 "@types/minimatch@^3.0.3":
  version "3.0.3"
  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
+  integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==

 "@types/node@*":
  version "8.0.51"
@@ -570,6 +571,18 @@ deep-assign@^1.0.0:
  dependencies:
    is-obj "^1.0.0"

+del@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
+  integrity sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=
+  dependencies:
+    globby "^6.1.0"
+    is-path-cwd "^1.0.0"
+    is-path-in-cwd "^1.0.0"
+    p-map "^1.1.1"
+    pify "^3.0.0"
+    rimraf "^2.2.8"
+
 delayed-stream@~1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
@@ -941,6 +954,29 @@ glob@^5.0.3:
    once "^1.3.0"
    path-is-absolute "^1.0.0"

+glob@^7.0.3:
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
+  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+globby@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
+  integrity sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=
+  dependencies:
+    array-union "^1.0.1"
+    glob "^7.0.3"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
 glogg@^1.0.0:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.1.tgz#dcf758e44789cc3f3d32c1f3562a3676e6a34810"
@@ -1312,6 +1348,25 @@ is-obj@^1.0.0:
  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
  integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=

+is-path-cwd@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
+  integrity sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=
+
+is-path-in-cwd@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
+  integrity sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==
+  dependencies:
+    is-path-inside "^1.0.0"
+
+is-path-inside@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
+  integrity sha1-jvW33lBDej/cprToZe96pVy0gDY=
+  dependencies:
+    path-is-inside "^1.0.1"
+
 is-posix-bracket@^0.1.0:
  version "0.1.1"
  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
@@ -1777,6 +1832,11 @@ os-tmpdir@~1.0.2:
  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=

+p-map@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
+  integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==
+
 parse-glob@^3.0.4:
  version "3.0.4"
  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
@@ -1797,6 +1857,11 @@ path-is-absolute@^1.0.0:
  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=

+path-is-inside@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
+  integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
+
 pause-stream@0.0.11:
  version "0.0.11"
  resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"
@@ -1819,7 +1884,7 @@ performance-now@^2.1.0:
  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=

-pify@^2.3.0:
+pify@^2.0.0, pify@^2.3.0:
  version "2.3.0"
  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
@@ -2117,7 +2182,7 @@ requires-port@~1.0.0:
  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=

-rimraf@2:
+rimraf@2, rimraf@^2.2.8:
  version "2.6.2"
  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
  integrity sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==
--- a/docs/UX-Design-Guidelines.md
+++ b/docs/UX-Design-Guidelines.md
@@ -0,0 +1 @@
+
--- a/extensions/agent/src/dialogs/operatorDialog.ts
+++ b/extensions/agent/src/dialogs/operatorDialog.ts
@@ -35,7 +35,7 @@ export class OperatorDialog extends AgentDialog<OperatorData> {
 	private static readonly PagerSundayCheckBoxLabel: string = localize('createOperator.PagerSundayCheckBox', 'Sunday');
 	private static readonly WorkdayBeginLabel: string = localize('createOperator.workdayBegin', 'Workday begin');
 	private static readonly WorkdayEndLabel: string = localize('createOperator.workdayEnd', 'Workday end');
-	private static readonly PagerDutyScheduleLabel: string = localize('createOperator.PagerDutySchedule', 'Pager on duty schdule');
+	private static readonly PagerDutyScheduleLabel: string = localize('createOperator.PagerDutySchedule', 'Pager on duty schedule');

 	// Notifications tab strings
 	private static readonly AlertsTableLabel: string = localize('createOperator.AlertListHeading', 'Alert list');
--- a/extensions/azurecore/package.json
+++ b/extensions/azurecore/package.json
@@ -147,7 +147,7 @@
 		}
 	},
 	"dependencies": {
-		"request": "2.63.0",
+		"request": "2.88.0",
 		"azure-arm-resource": "^7.0.0",
 		"azure-arm-sql": "^5.0.1",
 		"vscode-nls": "^4.0.0"
--- a/extensions/azurecore/yarn.lock
+++ b/extensions/azurecore/yarn.lock
@@ -10,6 +10,7 @@
 "@types/node@^8.0.24":
  version "8.10.36"
  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.36.tgz#eac05d576fbcd0b4ea3c912dc58c20475c08d9e4"
+  integrity sha512-SL6KhfM7PTqiFmbCW3eVNwVBZ+88Mrzbuvn9olPsfv43mbiWaFY+nRcz/TGGku0/lc2FepdMbImdMY1JrQ+zbw==

 "@types/node@^8.0.47":
  version "8.10.30"
@@ -41,18 +42,6 @@ ajv@^5.3.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.4"
  resolved "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
@@ -65,10 +54,6 @@ assert-plus@1.0.0, assert-plus@^1.0.0:
  resolved "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=

-assert-plus@^0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.1.5.tgz#ee74009413002d84cec7219c6ac811812e723160"
-
 async@2.6.0:
  version "2.6.0"
  resolved "https://registry.npmjs.org/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
@@ -76,9 +61,10 @@ async@2.6.0:
  dependencies:
    lodash "^4.14.0"

-async@>=0.6.0, async@^2.0.1:
+async@>=0.6.0:
  version "2.6.1"
  resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
+  integrity sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==
  dependencies:
    lodash "^4.17.10"

@@ -87,10 +73,6 @@ asynckit@^0.4.0:
  resolved "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=

-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.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
@@ -129,22 +111,6 @@ bcrypt-pbkdf@^1.0.0:
  dependencies:
    tweetnacl "^0.14.3"

-bl@~1.0.0:
-  version "1.0.3"
-  resolved "http://registry.npmjs.org/bl/-/bl-1.0.3.tgz#fc5421a28fd4226036c3b3891a66a25bc64d226e"
-  dependencies:
-    readable-stream "~2.0.5"
-
-bluebird@^2.9.30:
-  version "2.11.0"
-  resolved "http://registry.npmjs.org/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"
-
 brace-expansion@^1.1.7:
  version "1.1.11"
  resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -163,25 +129,11 @@ buffer-equal-constant-time@1.0.1:
  resolved "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
  integrity sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=

-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.npmjs.org/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=

-chalk@^1.0.0:
-  version "1.1.3"
-  resolved "http://registry.npmjs.org/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"
-
 circular-json@^0.3.1:
  version "0.3.3"
  resolved "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"
@@ -199,9 +151,10 @@ combined-stream@1.0.6:
  dependencies:
    delayed-stream "~1.0.0"

-combined-stream@^1.0.5, combined-stream@~1.0.1, combined-stream@~1.0.6:
+combined-stream@~1.0.6:
  version "1.0.7"
  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
+  integrity sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==
  dependencies:
    delayed-stream "~1.0.0"

@@ -210,28 +163,15 @@ commander@2.15.1:
  resolved "http://registry.npmjs.org/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
  integrity sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==

-commander@^2.8.1:
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
-
 concat-map@0.0.1:
  version "0.0.1"
  resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=

-core-util-is@1.0.2, core-util-is@~1.0.0:
+core-util-is@1.0.2:
  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"
-
-ctype@0.5.3:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/ctype/-/ctype-0.5.3.tgz#82c18c2461f74114ef16c135224ad0b9144ca12f"
+  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=

 dashdash@^1.12.0:
  version "1.14.1"
@@ -282,13 +222,15 @@ ecdsa-sig-formatter@1.0.10:
  dependencies:
    safe-buffer "^5.0.1"

-escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2:
+escape-string-regexp@1.0.5:
  version "1.0.5"
  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=

-extend@~3.0.0, extend@~3.0.2:
+extend@~3.0.2:
  version "3.0.2"
  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==

 extsprintf@1.3.0:
  version "1.3.0"
@@ -310,17 +252,10 @@ fast-json-stable-stringify@^2.0.0:
  resolved "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=

-forever-agent@~0.6.0, forever-agent@~0.6.1:
+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"
+  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=

 form-data@~2.3.2:
  version "2.3.2"
@@ -336,18 +271,6 @@ fs.realpath@^1.0.0:
  resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=

-generate-function@^2.0.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.3.1.tgz#f069617690c10c868e73b8465746764f97c3479f"
-  dependencies:
-    is-property "^1.0.2"
-
-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.npmjs.org/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
@@ -377,15 +300,6 @@ har-schema@^2.0.0:
  resolved "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=

-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.1.0:
  version "5.1.0"
  resolved "https://registry.npmjs.org/har-validator/-/har-validator-5.1.0.tgz#44657f5688a22cfd4b72486e81b3a3fb11742c29"
@@ -394,43 +308,16 @@ har-validator@~5.1.0:
    ajv "^5.3.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"
-
 has-flag@^3.0.0:
  version "3.0.0"
  resolved "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=

-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"
-
 he@1.1.1:
  version "1.1.1"
  resolved "https://registry.npmjs.org/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
  integrity sha1-k0EP0hsAlzUVH4howvJx80J+I/0=

-hoek@2.x.x:
-  version "2.16.3"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
-
-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.npmjs.org/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
@@ -448,33 +335,16 @@ inflight@^1.0.4:
    once "^1.3.0"
    wrappy "1"

-inherits@2, inherits@~2.0.1:
+inherits@2:
  version "2.0.3"
  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=

 is-buffer@^1.1.6:
  version "1.1.6"
  resolved "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==

-is-my-ip-valid@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz#7b351b8e8edd4d3995d4d066680e664d94696824"
-
-is-my-json-valid@^2.12.0:
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.19.0.tgz#8fd6e40363cd06b963fa877d444bfb5eddc62175"
-  dependencies:
-    generate-function "^2.0.0"
-    generate-object-property "^1.1.0"
-    is-my-ip-valid "^1.0.0"
-    jsonpointer "^4.0.0"
-    xtend "^4.0.0"
-
-is-property@^1.0.0, is-property@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
-
 is-stream@^1.1.0:
  version "1.1.0"
  resolved "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
@@ -485,13 +355,10 @@ is-typedarray@~1.0.0:
  resolved "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=

-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:
+isstream@~0.1.2:
  version "0.1.2"
  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=

 jsbn@~0.1.0:
  version "0.1.1"
@@ -508,13 +375,10 @@ json-schema@0.2.3:
  resolved "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=

-json-stringify-safe@~5.0.0, json-stringify-safe@~5.0.1:
+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"
+  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=

 jsprim@^1.2.2:
  version "1.4.1"
@@ -553,9 +417,10 @@ mime-db@~1.36.0:
  resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.36.0.tgz#5020478db3c7fe93aad7bbcc4dcf869c43363397"
  integrity sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw==

-mime-types@^2.1.11, mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.2:
+mime-types@^2.1.12, mime-types@~2.1.19:
  version "2.1.20"
  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.20.tgz#930cb719d571e903738520f8470911548ca2cc19"
+  integrity sha512-HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==
  dependencies:
    mime-db "~1.36.0"

@@ -631,14 +496,6 @@ ms@2.0.0:
  resolved "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=

-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:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
-
 oauth-sign@~0.9.0:
  version "0.9.0"
  resolved "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
@@ -666,10 +523,6 @@ postinstall-build@^5.0.1:
  resolved "https://registry.npmjs.org/postinstall-build/-/postinstall-build-5.0.3.tgz#238692f712a481d8f5bc8960e94786036241efc7"
  integrity sha512-vPvPe8TKgp4FLgY3+DfxCE5PIfoXBK2lyLfNCxsRbDsV6vS4oU5RG/IWxrblMn6heagbnMED3MemUQllQ2bQUg==

-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"
-
 psl@^1.1.24:
  version "1.1.29"
  resolved "https://registry.npmjs.org/psl/-/psl-1.1.29.tgz#60f580d360170bb722a797cc704411e6da850c67"
@@ -680,53 +533,14 @@ punycode@^1.4.1:
  resolved "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=

-qs@~5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-5.1.0.tgz#4d932e5c7ea411cca76a312d39a606200fd50cd9"
-
 qs@~6.5.2:
  version "6.5.2"
  resolved "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==

-readable-stream@~2.0.5:
-  version "2.0.6"
-  resolved "http://registry.npmjs.org/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 "http://registry.npmjs.org/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", request@^2.88.0:
+request@2.88.0, "request@>= 2.52.0", request@^2.88.0:
  version "2.88.0"
-  resolved "https://registry.npmjs.org/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
  integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
  dependencies:
    aws-sign2 "~0.7.0"
@@ -804,12 +618,6 @@ should@^13.2.1:
    should-type-adaptors "^1.0.1"
    should-util "^1.0.0"

-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"
-
 sshpk@^1.7.0:
  version "1.14.2"
  resolved "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz#c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"
@@ -826,20 +634,6 @@ sshpk@^1.7.0:
    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:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.6.tgz#7880225b0d4ad10e30927d167a1d6f2fd3b33a72"
-
-strip-ansi@^3.0.0:
-  version "3.0.1"
-  resolved "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  dependencies:
-    ansi-regex "^2.0.0"
-
 supports-color@5.4.0:
  version "5.4.0"
  resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
@@ -847,18 +641,15 @@ supports-color@5.4.0:
  dependencies:
    has-flag "^3.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"
-
 through@^2.3.8:
  version "2.3.8"
  resolved "http://registry.npmjs.org/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=

-tough-cookie@>=0.12.0, tough-cookie@~2.4.3:
+tough-cookie@~2.4.3:
  version "2.4.3"
  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
+  integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==
  dependencies:
    psl "^1.1.24"
    punycode "^1.4.1"
@@ -870,10 +661,6 @@ tunnel-agent@^0.6.0:
  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"
-
 tunnel@0.0.5:
  version "0.0.5"
  resolved "https://registry.npmjs.org/tunnel/-/tunnel-0.0.5.tgz#d1532254749ed36620fcd1010865495a1fa9d0ae"
@@ -898,10 +685,6 @@ typemoq@^2.1.0:
  resolved "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz#06dce34a0e68a7babc29b365b8e74b8925203961"
  integrity sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==

-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, uuid@^3.2.1, uuid@^3.3.2:
  version "3.3.2"
  resolved "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
@@ -934,7 +717,3 @@ wrappy@1:
 xpath.js@~1.1.0:
  version "1.1.0"
  resolved "https://registry.npmjs.org/xpath.js/-/xpath.js-1.1.0.tgz#3816a44ed4bb352091083d002a383dd5104a5ff1"
-
-xtend@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
--- a/extensions/import/package.json
+++ b/extensions/import/package.json
@@ -53,7 +53,7 @@
    }
  },
  "dependencies": {
-    "dataprotocol-client": "github:Microsoft/sqlops-dataprotocolclient#0.2.7",
+    "dataprotocol-client": "github:Microsoft/sqlops-dataprotocolclient#0.2.10",
    "opener": "^1.4.3",
    "service-downloader": "github:anthonydresser/service-downloader#0.1.5",
    "vscode-extension-telemetry": "0.0.18",
--- a/extensions/import/yarn.lock
+++ b/extensions/import/yarn.lock
@@ -11,7 +11,8 @@ agent-base@4, agent-base@^4.1.0:

 applicationinsights@1.0.1:
  version "1.0.1"
-  resolved "https://registry.npmjs.org/applicationinsights/-/applicationinsights-1.0.1.tgz#53446b830fe8d5d619eee2a278b31d3d25030927"
+  resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-1.0.1.tgz#53446b830fe8d5d619eee2a278b31d3d25030927"
+  integrity sha1-U0Rrgw/o1dYZ7uKieLMdPSUDCSc=
  dependencies:
    diagnostic-channel "0.2.0"
    diagnostic-channel-publishers "0.2.1"
@@ -35,7 +36,7 @@ buffer-alloc-unsafe@^1.1.0:
  resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
  integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==

-buffer-alloc@^1.1.0:
+buffer-alloc@^1.2.0:
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
  integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==
@@ -74,19 +75,26 @@ core-util-is@~1.0.0:
  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=

-"dataprotocol-client@github:Microsoft/sqlops-dataprotocolclient#0.2.7":
-  version "0.2.6"
-  resolved "https://codeload.github.com/Microsoft/sqlops-dataprotocolclient/tar.gz/85653d8b305af8aef334728d71f07bdc240dfcb7"
+"dataprotocol-client@github:Microsoft/sqlops-dataprotocolclient#0.2.10":
+  version "0.2.10"
+  resolved "https://codeload.github.com/Microsoft/sqlops-dataprotocolclient/tar.gz/4de3f7caf0eba54159911b977ddb4f5d7c0a9ca8"
  dependencies:
    vscode-languageclient "3.5.1"

-debug@3.1.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"
  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
  dependencies:
    ms "2.0.0"

+debug@^3.1.0:
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
+  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
+  dependencies:
+    ms "^2.1.1"
+
 decompress-tar@^4.0.0, decompress-tar@^4.1.0, decompress-tar@^4.1.1:
  version "4.1.1"
  resolved "https://registry.yarnpkg.com/decompress-tar/-/decompress-tar-4.1.1.tgz#718cbd3fcb16209716e70a26b84e7ba4592e5af1"
@@ -142,11 +150,13 @@ decompress@^4.2.0:

 diagnostic-channel-publishers@0.2.1:
  version "0.2.1"
-  resolved "https://registry.npmjs.org/diagnostic-channel-publishers/-/diagnostic-channel-publishers-0.2.1.tgz#8e2d607a8b6d79fe880b548bc58cc6beb288c4f3"
+  resolved "https://registry.yarnpkg.com/diagnostic-channel-publishers/-/diagnostic-channel-publishers-0.2.1.tgz#8e2d607a8b6d79fe880b548bc58cc6beb288c4f3"
+  integrity sha1-ji1geottef6IC1SLxYzGvrKIxPM=

 diagnostic-channel@0.2.0:
  version "0.2.0"
-  resolved "https://registry.npmjs.org/diagnostic-channel/-/diagnostic-channel-0.2.0.tgz#cc99af9612c23fb1fff13612c72f2cbfaa8d5a17"
+  resolved "https://registry.yarnpkg.com/diagnostic-channel/-/diagnostic-channel-0.2.0.tgz#cc99af9612c23fb1fff13612c72f2cbfaa8d5a17"
+  integrity sha1-zJmvlhLCP7H/8TYSxy8sv6qNWhc=
  dependencies:
    semver "^5.3.0"

@@ -158,9 +168,9 @@ end-of-stream@^1.0.0:
    once "^1.4.0"

 es6-promise@^4.0.3:
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.4.tgz#dc4221c2b16518760bd8c39a52d8f356fc00ed29"
-  integrity sha512-/NdNZVJg+uZgtm9eS3O6lrOLYmQag2DjdEXuPaHlZ6RuVqgqaVZfgYCepEIKsLqwdQArOPtC3XzRLqGGfT8KQQ==
+  version "4.2.5"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.5.tgz#da6d0d5692efb461e082c14817fe2427d8f5d054"
+  integrity sha512-n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg==

 es6-promisify@^5.0.0:
  version "5.0.0"
@@ -210,9 +220,9 @@ get-stream@^2.2.0:
    pinkie-promise "^2.0.0"

 graceful-fs@^4.1.10:
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
-  integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
+  version "4.1.15"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
+  integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==

 "graceful-readlink@>= 1.0.0":
  version "1.0.1"
@@ -284,6 +294,11 @@ ms@2.0.0:
  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=

+ms@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
+  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
+
 object-assign@^4.0.1:
  version "4.1.1"
  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
@@ -297,9 +312,9 @@ once@^1.4.0:
    wrappy "1"

 opener@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/opener/-/opener-1.4.3.tgz#5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8"
-  integrity sha1-XG2ixdflgx6P+jlklQ+NZnSskLg=
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.1.tgz#6d2f0e77f1a0af0032aca716c2c1fbb8e7e8abed"
+  integrity sha512-goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA==

 os-tmpdir@~1.0.2:
  version "1.0.2"
@@ -365,7 +380,8 @@ seek-bzip@^1.0.5:

 semver@^5.3.0:
  version "5.6.0"
-  resolved "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
+  integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==

 "service-downloader@github:anthonydresser/service-downloader#0.1.5":
  version "0.1.5"
@@ -393,16 +409,16 @@ strip-dirs@^2.0.0:
    is-natural-number "^4.0.1"

 tar-stream@^1.5.2:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.1.tgz#f84ef1696269d6223ca48f6e1eeede3f7e81f395"
-  integrity sha512-IFLM5wp3QrJODQFPm6/to3LJZrONdBY/otxcvDIQzu217zKye6yVR3hhi9lAjrC2Z+m/j5oDxMPb1qcd8cIvpA==
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz#8ea55dab37972253d9a9af90fdcd559ae435c555"
+  integrity sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==
  dependencies:
    bl "^1.0.0"
-    buffer-alloc "^1.1.0"
+    buffer-alloc "^1.2.0"
    end-of-stream "^1.0.0"
    fs-constants "^1.0.0"
    readable-stream "^2.3.0"
-    to-buffer "^1.1.0"
+    to-buffer "^1.1.1"
    xtend "^4.0.0"

 through@^2.3.6:
@@ -417,15 +433,15 @@ tmp@^0.0.33:
  dependencies:
    os-tmpdir "~1.0.2"

-to-buffer@^1.1.0:
+to-buffer@^1.1.1:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80"
  integrity sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==

 unbzip2-stream@^1.0.9:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.2.5.tgz#73a033a567bbbde59654b193c44d48a7e4f43c47"
-  integrity sha512-izD3jxT8xkzwtXRUZjtmRwKnZoeECrfZ8ra/ketwOcusbZEp4mjULMnJOCfTDZBgGQAAY1AJ/IgxcwkavcX9Og==
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.3.1.tgz#7854da51622a7e63624221196357803b552966a1"
+  integrity sha512-fIZnvdjblYs7Cru/xC6tCPVhz7JkYcVQQkePwMLyQELzYTds2Xn8QefPVnvdVhhZqubxNA1cASXEH5wcK0Bucw==
  dependencies:
    buffer "^3.0.1"
    through "^2.3.6"
@@ -437,7 +453,8 @@ util-deprecate@~1.0.1:

 vscode-extension-telemetry@0.0.18:
  version "0.0.18"
-  resolved "https://registry.npmjs.org/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.18.tgz#602ba20d8c71453aa34533a291e7638f6e5c0327"
+  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.18.tgz#602ba20d8c71453aa34533a291e7638f6e5c0327"
+  integrity sha512-Vw3Sr+dZwl+c6PlsUwrTtCOJkgrmvS3OUVDQGcmpXWAgq9xGq6as0K4pUx+aGqTjzLAESmWSrs6HlJm6J6Khcg==
  dependencies:
    applicationinsights "1.0.1"

@@ -467,9 +484,9 @@ vscode-languageserver-types@3.5.0:
  integrity sha1-5I15li8LjgLelV4/UkkI4rGcA3Q=

 vscode-nls@^3.2.1:
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398"
-  integrity sha512-FTjdqa4jDDoBjJqr36O8lmmZf/55kQ2w4ZY/+GL6K92fq765BqO3aYw21atnXUno/P04V5DWagNl4ybDIndJsw==
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.5.tgz#25520c1955108036dec607c85e00a522f247f1a4"
+  integrity sha512-ITtoh3V4AkWXMmp3TB97vsMaHRgHhsSFPsUdzlueSL+dRZbSNTZeOmdQv60kjCV306ghPxhDeoNUEm3+EZMuyw==

 wrappy@1:
  version "1.0.2"
@@ -491,4 +508,5 @@ yauzl@^2.4.2:

 zone.js@0.7.6:
  version "0.7.6"
-  resolved "https://registry.npmjs.org/zone.js/-/zone.js-0.7.6.tgz#fbbc39d3e0261d0986f1ba06306eb3aeb0d22009"
+  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.7.6.tgz#fbbc39d3e0261d0986f1ba06306eb3aeb0d22009"
+  integrity sha1-+7w50+AmHQmG8boGMG6zrrDSIAk=
--- a/extensions/markdown-language-features/package.json
+++ b/extensions/markdown-language-features/package.json
@@ -23,7 +23,8 @@
 		"onCommand:markdown.showLockedPreviewToSide",
 		"onCommand:markdown.showSource",
 		"onCommand:markdown.showPreviewSecuritySelector",
-		"onWebviewPanel:markdown.preview"
+		"onWebviewPanel:markdown.preview",
+		"onCommand:notebook.showPreview"
 	],
 	"contributes": {
 		"commands": [
@@ -77,6 +78,11 @@
 				"command": "markdown.preview.toggleLock",
 				"title": "%markdown.preview.toggleLock.title%",
 				"category": "Markdown"
+			},
+			{
+				"command": "notebook.showPreview",
+				"title": "notebook.showPreview",
+				"category": "Notebook"
 			}
 		],
 		"menus": {
@@ -154,6 +160,10 @@
 				{
 					"command": "markdown.preview.toggleLock",
 					"when": "markdownPreviewFocus"
+				},
+				{
+					"command": "notebook.showPreview",
+					"when": "false"
 				}
 			]
 		},
--- a/extensions/markdown-language-features/src/commandManager.ts
+++ b/extensions/markdown-language-features/src/commandManager.ts
@@ -8,7 +8,8 @@ import * as vscode from 'vscode';
 export interface Command {
 	readonly id: string;

-	execute(...args: any[]): void;
+	// {{SQL CARBON EDIT}}
+	execute(...args: any[]): any;
 }

 export class CommandManager {
@@ -26,7 +27,8 @@ export class CommandManager {
 		return command;
 	}

-	private registerCommand(id: string, impl: (...args: any[]) => void, thisArg?: any) {
+	// {{SQL CARBON EDIT}}
+	private registerCommand(id: string, impl: (...args: any[]) => any, thisArg?: any) {
 		if (this.commands.has(id)) {
 			return;
 		}
--- a/extensions/markdown-language-features/src/commands/index.ts
+++ b/extensions/markdown-language-features/src/commands/index.ts
@@ -11,3 +11,5 @@ export { RefreshPreviewCommand } from './refreshPreview';
 export { ShowPreviewSecuritySelectorCommand } from './showPreviewSecuritySelector';
 export { MoveCursorToPositionCommand } from './moveCursorToPosition';
 export { ToggleLockCommand } from './toggleLock';
+// {{SQL CARBON EDIT}}
+export { ShowNotebookPreview } from './showNotebookPreview';
--- a/extensions/markdown-language-features/src/commands/showNotebookPreview.ts
+++ b/extensions/markdown-language-features/src/commands/showNotebookPreview.ts
@@ -0,0 +1,20 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import * as vscode from 'vscode';
+
+import { Command } from '../commandManager';
+import { MarkdownEngine } from '../markdownEngine';
+
+export class ShowNotebookPreview implements Command {
+	public readonly id = 'notebook.showPreview';
+
+	public constructor(
+		private readonly engine: MarkdownEngine
+	) { }
+
+	public async execute(document: vscode.Uri, textContent: string): Promise<string> {
+		return this.engine.renderText(document, textContent);
+	}
+}
--- a/extensions/markdown-language-features/src/extension.ts
+++ b/extensions/markdown-language-features/src/extension.ts
@@ -59,6 +59,8 @@ export function activate(context: vscode.ExtensionContext) {
 	commandManager.register(new commands.OnPreviewStyleLoadErrorCommand());
 	commandManager.register(new commands.OpenDocumentLinkCommand(engine));
 	commandManager.register(new commands.ToggleLockCommand(previewManager));
+	// {{SQL CARBON EDIT}}
+	commandManager.register(new commands.ShowNotebookPreview(engine));

 	context.subscriptions.push(vscode.workspace.onDidChangeConfiguration(() => {
 		logger.updateConfiguration();
--- a/extensions/markdown-language-features/src/markdownEngine.ts
+++ b/extensions/markdown-language-features/src/markdownEngine.ts
@@ -86,6 +86,12 @@ export class MarkdownEngine {
 		return { text, offset };
 	}

+	// {{SQL CARBON EDIT}}
+	public async renderText(document: vscode.Uri, text: string): Promise<string> {
+		const engine = await this.getEngine(document);
+		return engine.render(text);
+	}
+
 	public async render(document: vscode.Uri, stripFrontmatter: boolean, text: string): Promise<string> {
 		let offset = 0;
 		if (stripFrontmatter) {
--- a/extensions/mssql/package.json
+++ b/extensions/mssql/package.json
@@ -18,7 +18,7 @@
    "update-grammar": "node ../../build/npm/update-grammar.js Microsoft/vscode-mssql syntaxes/SQL.plist ./syntaxes/sql.tmLanguage.json"
  },
  "dependencies": {
-    "dataprotocol-client": "github:Microsoft/sqlops-dataprotocolclient#0.2.8",
+    "dataprotocol-client": "github:Microsoft/sqlops-dataprotocolclient#0.2.10",
    "opener": "^1.4.3",
    "service-downloader": "github:anthonydresser/service-downloader#0.1.5",
    "vscode-extension-telemetry": "^0.0.15"
@@ -345,7 +345,7 @@
          "specialValueType": null,
          "isIdentity": false,
          "name": "asynchronousProcessing",
-          "displayName": "Asynchronous processing enabled",
+          "displayName": "Asynchronous processing",
          "description": "When true, enables usage of the Asynchronous functionality in the .Net Framework Data Provider",
          "groupName": "Initialization",
          "valueType": "boolean",
@@ -387,7 +387,7 @@
          "specialValueType": null,
          "isIdentity": false,
          "name": "columnEncryptionSetting",
-          "displayName": "Column encryption setting",
+          "displayName": "Column encryption",
          "description": "Default column encryption setting for all the commands on the connection",
          "groupName": "Security",
          "valueType": "category",
--- a/extensions/mssql/snippets/mssql.json
+++ b/extensions/mssql/snippets/mssql.json
@@ -163,6 +163,7 @@
 			"\tFROM INFORMATION_SCHEMA.ROUTINES",
 			"WHERE SPECIFIC_SCHEMA = N'${2:dbo}'",
 			"\tAND SPECIFIC_NAME = N'${1:StoredProcedureName}'",
+			"\tAND ROUTINE_TYPE = N'PROCEDURE'"
 			")",
 			"DROP PROCEDURE ${2:dbo}.${1:StoredProcedureName}",
 			"GO",
--- a/extensions/mssql/src/config.json
+++ b/extensions/mssql/src/config.json
@@ -1,6 +1,6 @@
 {
 	"downloadUrl": "https://github.com/Microsoft/sqltoolsservice/releases/download/v{#version#}/microsoft.sqltools.servicelayer-{#fileName#}",
-	"version": "1.5.0-alpha.52",
+	"version": "1.5.0-alpha.58",
 	"downloadFileNames": {
 		"Windows_86": "win-x86-netcoreapp2.2.zip",
 		"Windows_64": "win-x64-netcoreapp2.2.zip",
--- a/extensions/mssql/yarn.lock
+++ b/extensions/mssql/yarn.lock
@@ -36,7 +36,7 @@ buffer-alloc-unsafe@^1.1.0:
  resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
  integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==

-buffer-alloc@^1.1.0:
+buffer-alloc@^1.2.0:
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
  integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==
@@ -75,19 +75,26 @@ core-util-is@~1.0.0:
  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=

-"dataprotocol-client@github:Microsoft/sqlops-dataprotocolclient#0.2.8":
-  version "0.2.8"
-  resolved "https://codeload.github.com/Microsoft/sqlops-dataprotocolclient/tar.gz/3ec3ec3fa63a8dae958c18a85b91fec74c50aec5"
+"dataprotocol-client@github:Microsoft/sqlops-dataprotocolclient#0.2.10":
+  version "0.2.10"
+  resolved "https://codeload.github.com/Microsoft/sqlops-dataprotocolclient/tar.gz/4de3f7caf0eba54159911b977ddb4f5d7c0a9ca8"
  dependencies:
    vscode-languageclient "3.5.1"

-debug@3.1.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"
  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
  dependencies:
    ms "2.0.0"

+debug@^3.1.0:
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
+  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
+  dependencies:
+    ms "^2.1.1"
+
 decompress-tar@^4.0.0, decompress-tar@^4.1.0, decompress-tar@^4.1.1:
  version "4.1.1"
  resolved "https://registry.yarnpkg.com/decompress-tar/-/decompress-tar-4.1.1.tgz#718cbd3fcb16209716e70a26b84e7ba4592e5af1"
@@ -161,9 +168,9 @@ end-of-stream@^1.0.0:
    once "^1.4.0"

 es6-promise@^4.0.3:
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.4.tgz#dc4221c2b16518760bd8c39a52d8f356fc00ed29"
-  integrity sha512-/NdNZVJg+uZgtm9eS3O6lrOLYmQag2DjdEXuPaHlZ6RuVqgqaVZfgYCepEIKsLqwdQArOPtC3XzRLqGGfT8KQQ==
+  version "4.2.5"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.5.tgz#da6d0d5692efb461e082c14817fe2427d8f5d054"
+  integrity sha512-n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg==

 es6-promisify@^5.0.0:
  version "5.0.0"
@@ -213,9 +220,9 @@ get-stream@^2.2.0:
    pinkie-promise "^2.0.0"

 graceful-fs@^4.1.10:
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
-  integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
+  version "4.1.15"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
+  integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==

 "graceful-readlink@>= 1.0.0":
  version "1.0.1"
@@ -287,6 +294,11 @@ ms@2.0.0:
  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=

+ms@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
+  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
+
 object-assign@^4.0.1:
  version "4.1.1"
  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
@@ -300,9 +312,9 @@ once@^1.4.0:
    wrappy "1"

 opener@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/opener/-/opener-1.4.3.tgz#5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8"
-  integrity sha1-XG2ixdflgx6P+jlklQ+NZnSskLg=
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.1.tgz#6d2f0e77f1a0af0032aca716c2c1fbb8e7e8abed"
+  integrity sha512-goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA==

 os-tmpdir@~1.0.2:
  version "1.0.2"
@@ -367,9 +379,9 @@ seek-bzip@^1.0.5:
    commander "~2.8.1"

 semver@^5.3.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
-  integrity sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
+  integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==

 "service-downloader@github:anthonydresser/service-downloader#0.1.5":
  version "0.1.5"
@@ -397,16 +409,16 @@ strip-dirs@^2.0.0:
    is-natural-number "^4.0.1"

 tar-stream@^1.5.2:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.1.tgz#f84ef1696269d6223ca48f6e1eeede3f7e81f395"
-  integrity sha512-IFLM5wp3QrJODQFPm6/to3LJZrONdBY/otxcvDIQzu217zKye6yVR3hhi9lAjrC2Z+m/j5oDxMPb1qcd8cIvpA==
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz#8ea55dab37972253d9a9af90fdcd559ae435c555"
+  integrity sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==
  dependencies:
    bl "^1.0.0"
-    buffer-alloc "^1.1.0"
+    buffer-alloc "^1.2.0"
    end-of-stream "^1.0.0"
    fs-constants "^1.0.0"
    readable-stream "^2.3.0"
-    to-buffer "^1.1.0"
+    to-buffer "^1.1.1"
    xtend "^4.0.0"

 through@^2.3.6:
@@ -421,15 +433,15 @@ tmp@^0.0.33:
  dependencies:
    os-tmpdir "~1.0.2"

-to-buffer@^1.1.0:
+to-buffer@^1.1.1:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80"
  integrity sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==

 unbzip2-stream@^1.0.9:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.2.5.tgz#73a033a567bbbde59654b193c44d48a7e4f43c47"
-  integrity sha512-izD3jxT8xkzwtXRUZjtmRwKnZoeECrfZ8ra/ketwOcusbZEp4mjULMnJOCfTDZBgGQAAY1AJ/IgxcwkavcX9Og==
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.3.1.tgz#7854da51622a7e63624221196357803b552966a1"
+  integrity sha512-fIZnvdjblYs7Cru/xC6tCPVhz7JkYcVQQkePwMLyQELzYTds2Xn8QefPVnvdVhhZqubxNA1cASXEH5wcK0Bucw==
  dependencies:
    buffer "^3.0.1"
    through "^2.3.6"
--- a/extensions/profiler/client/src/dialogs/profilerCreateSessionDialog.ts
+++ b/extensions/profiler/client/src/dialogs/profilerCreateSessionDialog.ts
@@ -12,12 +12,10 @@ import { CreateSessionData } from '../data/createSessionData';
 const localize = nls.loadMessageBundle();

 export class CreateSessionDialog {
-
 	// Top level
-	private readonly DialogTitle: string = localize('createSessionDialog.newSession', 'New Session');
 	private readonly CancelButtonText: string = localize('createSessionDialog.cancel', 'Cancel');
-	private readonly CreateButtonText: string = localize('createSessionDialog.create', 'Create');
-	private readonly DialogTitleText: string = localize('createSessionDialog.title', 'Create New Profiler Session');
+	private readonly CreateButtonText: string = localize('createSessionDialog.create', 'Start');
+	private readonly DialogTitleText: string = localize('createSessionDialog.title', 'Start New Profiler Session');

 	// UI Components
 	private dialog: sqlops.window.modelviewdialog.Dialog;
@@ -25,23 +23,28 @@ export class CreateSessionDialog {
 	private sessionNameBox: sqlops.InputBoxComponent;

 	private model: CreateSessionData;
+	private readonly _providerType: string;

 	private _onSuccess: vscode.EventEmitter<CreateSessionData> = new vscode.EventEmitter<CreateSessionData>();
 	public readonly onSuccess: vscode.Event<CreateSessionData> = this._onSuccess.event;


-	constructor(ownerUri: string, templates: Array<sqlops.ProfilerSessionTemplate>) {
+	constructor(ownerUri: string, providerType: string, templates: Array<sqlops.ProfilerSessionTemplate>) {
 		if (typeof (templates) === 'undefined' || templates === null) {
 			throw new Error(localize('createSessionDialog.templatesInvalid', "Invalid templates list, cannot open dialog"));
 		}
 		if (typeof (ownerUri) === 'undefined' || ownerUri === null) {
 			throw new Error(localize('createSessionDialog.dialogOwnerInvalid', "Invalid dialog owner, cannot open dialog"));
 		}
+		if (typeof (providerType) === 'undefined' || providerType === null) {
+			throw new Error(localize('createSessionDialog.invalidProviderType', "Invalid provider type, cannot open dialog"));
+		}
+		this._providerType = providerType;
 		this.model = new CreateSessionData(ownerUri, templates);
 	}

 	public async showDialog(): Promise<void> {
-		this.dialog = sqlops.window.modelviewdialog.createDialog(this.DialogTitle);
+		this.dialog = sqlops.window.modelviewdialog.createDialog(this.DialogTitleText);
 		this.initializeContent();
 		this.dialog.okButton.onClick(() => this.execute());
 		this.dialog.cancelButton.onClick(() => { });
@@ -65,6 +68,10 @@ export class CreateSessionDialog {
 					value: ''
 				}).component();

+			this.templatesBox.onValueChanged(() => {
+				this.updateSessionName();
+			});
+
 			let formModel = view.modelBuilder.formContainer()
 				.withFormItems([{
 					components: [{
@@ -76,13 +83,14 @@ export class CreateSessionDialog {

 						title: localize('createSessionDialog.enterSessionName', "Enter session name:")
 					}],
-					title: this.DialogTitleText
+					title: ''
 				}]).withLayout({ width: '100%' }).component();

 			await view.initializeModel(formModel);

 			if (this.model.templates) {
 				this.templatesBox.values = this.model.getTemplateNames();
+				this.updateSessionName();
 			}

 			this.sessionNameBox.onTextChanged(() => {
@@ -96,9 +104,14 @@ export class CreateSessionDialog {
 		});
 	}

+	private updateSessionName() {
+		if (this.templatesBox.value) {
+			this.sessionNameBox.value = `ADS_${this.templatesBox.value.toString()}`
+		}
+	}
+
 	private async execute(): Promise<void> {
-		let currentConnection = await sqlops.connection.getCurrentConnection();
-		let profilerService = sqlops.dataprotocol.getProvider<sqlops.ProfilerProvider>(currentConnection.providerName, sqlops.DataProviderType.ProfilerProvider);
+		let profilerService = sqlops.dataprotocol.getProvider<sqlops.ProfilerProvider>(this._providerType, sqlops.DataProviderType.ProfilerProvider);

 		let name = this.sessionNameBox.value;
 		let selected = this.templatesBox.value.toString();
--- a/extensions/profiler/client/src/mainController.ts
+++ b/extensions/profiler/client/src/mainController.ts
@@ -29,8 +29,8 @@ export class MainController {
 	}

 	public activate(): void {
-		vscode.commands.registerCommand('profiler.openCreateSessionDialog', (ownerUri: string, templates: Array<sqlops.ProfilerSessionTemplate>) => {
-			let dialog = new CreateSessionDialog(ownerUri, templates);
+		vscode.commands.registerCommand('profiler.openCreateSessionDialog', (ownerUri: string, providerType: string, templates: Array<sqlops.ProfilerSessionTemplate>) => {
+			let dialog = new CreateSessionDialog(ownerUri, providerType, templates);
 			dialog.showDialog();
 		});
 	}
--- a/extensions/profiler/package.json
+++ b/extensions/profiler/package.json
@@ -2,7 +2,7 @@
  "name": "profiler",
  "displayName": "SQL Server Profiler",
  "description": "SQL Server Profiler for Azure Data Studio",
-  "version": "0.3.0",
+  "version": "0.5.0",
  "publisher": "Microsoft",
  "preview": true,
  "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt",
@@ -26,11 +26,10 @@
    "Microsoft.mssql"
  ],
  "contributes": {
-
    "commands": [
      {
        "command": "profiler.newProfiler",
-        "title": "New Profiler",
+        "title": "Launch Profiler",
        "category": "Profiler"
      },
      {
@@ -49,6 +48,15 @@
        "category": "Profiler"
      }
    ],
+    "menus": {
+      "objectExplorer/item/context": [
+        {
+          "command": "profiler.newProfiler",
+          "when": "connectionProvider == MSSQL && nodeType && nodeType == Server",
+          "group": "profiler"
+        }
+      ]
+    },
    "outputChannels": [
      "sqlprofiler"
    ]
--- a/extensions/theme-carbon/themes/dark_carbon.json
+++ b/extensions/theme-carbon/themes/dark_carbon.json
@@ -67,7 +67,8 @@
 		"panel.background": "#212121",
 		"panel.border": "#515151",
 		"panelTitle.activeForeground": "#ffffff",
-		"panelTitle.inactiveForeground": "#888888"
+		"panelTitle.inactiveForeground": "#888888",
+		"panelTitle.activeBorder": "#026dc8"
 	},
 	"tokenColors": [
 		{
--- a/extensions/theme-carbon/themes/light_carbon.json
+++ b/extensions/theme-carbon/themes/light_carbon.json
@@ -77,7 +77,8 @@
 		"panel.background": "#ffffff",
 		"panel.border": "#c8c8c8",
 		"panelTitle.activeForeground": "#212121",
-		"panelTitle.inactiveForeground": "#757575"
+		"panelTitle.inactiveForeground": "#757575",
+		"panelTitle.activeBorder": "#026dc8"
 	},
 	"tokenColors": [
 		{
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "azuredatastudio",
-  "version": "1.2.4",
+  "version": "1.3.3",
  "distro": "8c3e97e3425cc9814496472ab73e076de2ba99ee",
  "author": {
    "name": "Microsoft Corporation"
@@ -37,8 +37,10 @@
    "@angular/router": "~4.1.3",
    "@angular/upgrade": "~4.1.3",
    "@types/chart.js": "^2.7.31",
+    "@types/htmlparser2": "^3.7.31",
    "angular2-grid": "2.0.6",
    "angular2-slickgrid": "github:Microsoft/angular2-slickgrid#1.4.6",
+    "ansi_up": "^3.0.0",
    "applicationinsights": "0.18.0",
    "chart.js": "^2.6.0",
    "fast-plist": "0.1.2",
@@ -64,8 +66,9 @@
    "pretty-data": "^0.40.0",
    "reflect-metadata": "^0.1.8",
    "rxjs": "5.4.0",
+    "sanitize-html": "^1.19.1",
    "semver": "^5.5.0",
-    "slickgrid": "github:anthonydresser/SlickGrid#2.3.28",
+    "slickgrid": "github:anthonydresser/SlickGrid#2.3.29",
    "spdlog": "0.7.1",
    "sudo-prompt": "8.2.0",
    "svg.js": "^2.2.5",
@@ -85,6 +88,7 @@
    "@types/keytar": "4.0.1",
    "@types/minimist": "1.2.0",
    "@types/mocha": "2.2.39",
+    "@types/sanitize-html": "^1.18.2",
    "@types/semver": "5.3.30",
    "@types/sinon": "1.16.34",
    "@types/winreg": "^1.2.30",
@@ -98,7 +102,7 @@
    "documentdb": "^1.5.1",
    "electron-mksnapshot": "~1.7.0",
    "eslint": "^3.4.0",
-    "event-stream": "^3.1.7",
+    "event-stream": "^3.3.4",
    "express": "^4.13.1",
    "glob": "^5.0.13",
    "gulp": "^3.9.1",
--- a/resources/xlf/sqlops-core/sql.xlf
+++ b/resources/xlf/sqlops-core/sql.xlf
@@ -611,7 +611,7 @@
  </body></file>
  <file original="src/sql/parts/connection/common/connectionActions" source-language="en" datatype="plaintext"><body>
    <trans-unit id="ClearRecentlyUsedLabel">
-      <source xml:lang="en">Clear Recent Connections List</source>
+      <source xml:lang="en">Clear List</source>
    </trans-unit>
    <trans-unit id="ClearedRecentConnections">
      <source xml:lang="en">Recent connections list cleared</source>
@@ -1039,10 +1039,10 @@
      <source xml:lang="en">Connection</source>
    </trans-unit>
    <trans-unit id="recentConnectionTitle">
-      <source xml:lang="en">Recent connections</source>
+      <source xml:lang="en">Recent Connections</source>
    </trans-unit>
    <trans-unit id="savedConnectionTitle">
-      <source xml:lang="en">Saved connections</source>
+      <source xml:lang="en">Saved Connections</source>
    </trans-unit>
    <trans-unit id="connectType">
      <source xml:lang="en">Connection type</source>
@@ -1520,9 +1520,6 @@
    </trans-unit>
  </body></file>
  <file original="src/sql/parts/profiler/contrib/profilerActions" source-language="en" datatype="plaintext"><body>
-    <trans-unit id="profiler.connect">
-      <source xml:lang="en">Connect</source>
-    </trans-unit>
    <trans-unit id="profilerAction.disconnect">
      <source xml:lang="en">Disconnect</source>
    </trans-unit>
@@ -1533,16 +1530,13 @@
      <source xml:lang="en">Start</source>
    </trans-unit>
    <trans-unit id="create">
-      <source xml:lang="en">Create</source>
-    </trans-unit>
-    <trans-unit id="profiler.capture">
-      <source xml:lang="en">Pause Capture</source>
+      <source xml:lang="en">New Session</source>
    </trans-unit>
    <trans-unit id="profilerAction.resumeCapture">
-      <source xml:lang="en">Resume Capture</source>
+      <source xml:lang="en">Resume</source>
    </trans-unit>
    <trans-unit id="profilerAction.pauseCapture">
-      <source xml:lang="en">Pause Capture</source>
+      <source xml:lang="en">Pause</source>
    </trans-unit>
    <trans-unit id="profilerStop.stop">
      <source xml:lang="en">Stop</source>
@@ -1550,9 +1544,6 @@
    <trans-unit id="profiler.clear">
      <source xml:lang="en">Clear Data</source>
    </trans-unit>
-    <trans-unit id="profiler.autoscrollOn">
-      <source xml:lang="en">Auto Scroll: On</source>
-    </trans-unit>
    <trans-unit id="profilerAction.autoscrollOn">
      <source xml:lang="en">Auto Scroll: On</source>
    </trans-unit>
@@ -1572,7 +1563,7 @@
      <source xml:lang="en">Find Previous String</source>
    </trans-unit>
    <trans-unit id="profilerAction.newProfiler">
-      <source xml:lang="en">New Profiler</source>
+      <source xml:lang="en">Launch Profiler</source>
    </trans-unit>
  </body></file>
  <file original="src/sql/base/browser/ui/selectBox/selectBox" source-language="en" datatype="plaintext"><body>
@@ -1644,7 +1635,7 @@
  </body></file>
  <file original="src/sql/parts/connection/connectionDialog/advancedPropertiesController" source-language="en" datatype="plaintext"><body>
    <trans-unit id="connectionAdvancedProperties">
-      <source xml:lang="en">Advanced properties</source>
+      <source xml:lang="en">Advanced Properties</source>
    </trans-unit>
    <trans-unit id="advancedProperties.discard">
      <source xml:lang="en">Discard</source>
--- a/resources/xlf/vscode-extensions/profiler.xlf
+++ b/resources/xlf/vscode-extensions/profiler.xlf
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
  <file original="extensions/profiler/client\out/dialogs/profilerCreateSessionDialog" source-language="en" datatype="plaintext"><body>
-    <trans-unit id="createSessionDialog.newSession">
-      <source xml:lang="en">New Session</source>
-    </trans-unit>
    <trans-unit id="createSessionDialog.cancel">
      <source xml:lang="en">Cancel</source>
    </trans-unit>
--- a/scripts/test.bat
+++ b/scripts/test.bat
@@ -12,12 +12,18 @@ set CODE=".build\electron\%NAMESHORT%"

 rem TFS Builds
 if not "%BUILD_BUILDID%" == "" (
+	if not "%ADD_REPORTER%" == "" (
+		%CODE% .\node_modules\mocha\bin\_mocha --reporter mocha-junit-reporter %*
+	)
+
+	if "%ADD_REPORTER%" == "" (
 		%CODE% .\node_modules\mocha\bin\_mocha %*
 	)
+)

 rem Otherwise
 if "%BUILD_BUILDID%" == "" (
-	%CODE% .\node_modules\mocha\bin\_mocha --reporter dot %*
+	%CODE% .\node_modules\mocha\bin\_mocha --reporter mocha-junit-reporter %*
 )
 popd

--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -1,7 +1,7 @@
 #!/bin/bash


-if [[ "$OSTYPE" == "darwin"* ]]; then
+if [[ "$OSTYPE" == "darwin"* ]] || [[ "$AGENT_OS" == "Darwin"* ]]; then
 	realpath() { [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"; }
 	ROOT=$(dirname $(dirname $(realpath "$0")))

@@ -14,7 +14,7 @@ fi

 cd $ROOT

-if [[ "$OSTYPE" == "darwin"* ]]; then
+if [[ "$OSTYPE" == "darwin"* ]] || [[ "$AGENT_OS" == "Darwin"* ]]; then
 	NAME=`node -p "require('./product.json').nameLong"`
 	CODE="./.build/electron/$NAME.app/Contents/MacOS/Electron"
 else
@@ -30,7 +30,7 @@ node build/lib/electron.js || ./node_modules/.bin/gulp electron

 # Unit Tests
 export ELECTRON_RUN_AS_NODE=1
-if [[ "$OSTYPE" == "darwin"* ]]; then
+if [[ "$OSTYPE" == "darwin"* ]] || [[ "$AGENT_OS" == "Darwin"* ]]; then
 	cd $ROOT ; ulimit -n 4096 ; \
 		"$CODE" \
 		node_modules/mocha/bin/_mocha "$@"
--- a/src/sql/base/browser/ui/modal/media/modal.css
+++ b/src/sql/base/browser/ui/modal/media/modal.css
@@ -56,6 +56,7 @@

 .modal .modal-title {
 	font-size: 15px;
+	font-weight: 600;
 }

 .modal .modal-title-icon {
@@ -147,7 +148,7 @@
 }

 .modal .footer-button {
-	margin-right: 5px;
+	margin-left: 5px;
 }

 .modal .right-footer .footer-button:last-of-type {
@@ -235,8 +236,8 @@

 .modal.flyout-dialog .dialog-message-detail {
 	margin-top: 5px;
-	white-space: normal;
-	-webkit-user-select: text;
+	white-space: pre-wrap;
+	user-select: text;
 	font-size: 11px;
 }

--- a/src/sql/base/browser/ui/modal/media/optionsDialog.css
+++ b/src/sql/base/browser/ui/modal/media/optionsDialog.css
@@ -20,11 +20,34 @@
 }

 .optionsDialog-options-groups {
-	padding: 15px;
-	height: calc(100% - 150px);
+	margin-top: 10px;
+	flex: 1 1;
 	overflow-y: auto;
 }

+.optionsDialog-options-groups {
+	margin: 10px 0px;
+	flex: 1 1;
+	overflow-y: auto;
+}
+
+.vs .optionsDialog-options-groups {
+	box-shadow: 0 1px 4px 1px rgba(220, 220, 220, 0.71);
+}
+
+.vs-dark .optionsDialog-options-groups {
+	box-shadow: 0 4px 5px 0px rgba(0, 0, 0, 0.71);
+}
+
+.optionsDialog-options-groups .split-view-view .header {
+	padding-left: 28px !important;
+	background-position-x: 8px !important;
+}
+
+.optionsDialog-options-groups .split-view-view .body {
+	padding-left: 5px !important;
+}
+
 .backButtonIcon {
 	content: url('back.svg');
 	width: 20px;
@@ -33,21 +56,42 @@
 	cursor: pointer;
 }

-.vs-dark.monaco-shell .backButtonIcon {
+.hc-black .backButtonIcon,
+.vs-dark .backButtonIcon {
 	content: url('back_inverse.svg');
 }

 .optionsDialog-description {
-	padding: 15px;
+    height: 90px;
+    margin: 15px;
    overflow-y: auto;
 }

+.optionsDialog-description .modal-title {
+	background-repeat: no-repeat;
+	background-position: 2px center;
+	padding-left: 25px;
+	background-size: 16px;
+}
+
+.vs .optionsDialog-description .modal-title {
+	background-image: url('info_notification.svg')
+}
+
+.vs-dark .optionsDialog-description .modal-title,
+.hc-black .optionsDialog-description .modal-title {
+	background-image: url('info_notification_inverse.svg')
+}
+
 .optionsDialog-options {
-	height: calc(100% - 30px);
+	height: 100%;
+	display: flex;
+	flex-direction: column;
 }

 .optionsDialog-description-content {
-	padding: 10px;
+	padding-top: 10px;
+	padding-left: 25px;
 }

 .optionsDialog-table{
--- a/src/sql/base/browser/ui/modal/modal.ts
+++ b/src/sql/base/browser/ui/modal/modal.ts
@@ -72,8 +72,8 @@ const defaultOptions: IModalOptions = {
 };

 export abstract class Modal extends Disposable implements IThemable {
-
-	private _messageElement: HTMLElement;
+	protected _useDefaultMessageBoxLocation: boolean = true;
+	protected _messageElement: HTMLElement;
 	private _messageIcon: HTMLElement;
 	private _messageSeverity: Builder;
 	private _messageSummary: Builder;
@@ -253,8 +253,10 @@ export abstract class Modal extends Disposable implements IThemable {
 			this._messageElement = this._modalMessageSection.getHTMLElement();
 			this.updateElementVisibility(this._messageElement, false);

+			if (this._useDefaultMessageBoxLocation) {
 				parts.push(this._messageElement);
 			}
+		}

 		// This modal body section refers to the body of of the dialog
 		let body: Builder;
--- a/src/sql/base/browser/ui/modal/optionsDialog.ts
+++ b/src/sql/base/browser/ui/modal/optionsDialog.ts
@@ -125,7 +125,7 @@ export class OptionsDialog extends Modal {
 		});

 		let builder = new Builder(this._body);
-		builder.div({ class: 'Connection-divider' }, (dividerContainer) => {
+		builder.div({}, (dividerContainer) => {
 			this._dividerBuilder = dividerContainer;
 		});

--- a/src/sql/base/browser/ui/panel/media/panel.css
+++ b/src/sql/base/browser/ui/panel/media/panel.css
@@ -46,9 +46,9 @@ panel {
 }

 .tabbedPanel .tabList .tab .tabLabel {
-	text-transform: uppercase;
-	font-size: 13px;
+	font-size: 14px;
 	padding-bottom: 4px;
+	font-weight: 600;
 }

 .tabbedPanel.vertical .tabList .tab .tabLabel {
--- a/src/sql/base/browser/ui/panel/panel.ts
+++ b/src/sql/base/browser/ui/panel/panel.ts
@@ -36,7 +36,6 @@ export interface IPanelTab {
 interface IInternalPanelTab extends IPanelTab {
 	header: HTMLElement;
 	label: HTMLElement;
-	dispose(): void;
 }

 const defaultOptions: IPanelOptions = {
@@ -143,8 +142,6 @@ export class TabbedPanel extends Disposable implements IThemable {
 		this.tabList.appendChild(tabHeaderElement);
 		tab.header = tabHeaderElement;
 		tab.label = tabLabel;
-		tab.dispose = () => { };
-		this._register(tab);
 	}

 	public showTab(id: PanelTabIdentifier): void {
--- a/src/sql/base/browser/ui/panel/panelStyles.ts
+++ b/src/sql/base/browser/ui/panel/panelStyles.ts
@@ -19,6 +19,7 @@ registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
 			.tabbedPanel > .title .tabList .tab .tabLabel.active {
 				color: ${titleActive};
 				border-bottom-color: ${titleActiveBorder};
+				border-bottom-width: 2px;
 			}

 			.tabbedPanel > .title .tabList .tab-header.active {
--- a/src/sql/base/browser/ui/radioButton/radioButton.ts
+++ b/src/sql/base/browser/ui/radioButton/radioButton.ts
@@ -28,8 +28,11 @@ export class RadioButton extends Widget {
 		super();
 		this.inputElement = document.createElement('input');
 		this.inputElement.type = 'radio';
+		this.inputElement.style.verticalAlign = 'middle';
+		this.inputElement.style.margin = '3px';

 		this._label = document.createElement('span');
+		this._label.style.verticalAlign = 'middle';

 		this.label = opts.label;
 		this.enabled = opts.enabled || true;
--- a/src/sql/base/browser/ui/selectBox/media/selectBox.css
+++ b/src/sql/base/browser/ui/selectBox/media/selectBox.css
@@ -0,0 +1,10 @@
+.labelOnTopContainer {
+    display: flex;
+    flex-direction: column;
+}
+
+.labelOnLeftContainer {
+    display: flex;
+    flex-direction: row;
+    margin-right: 5px;
+}
--- a/src/sql/base/browser/ui/selectBox/selectBox.ts
+++ b/src/sql/base/browser/ui/selectBox/selectBox.ts
@@ -4,6 +4,8 @@
 *--------------------------------------------------------------------------------------------*/

 'use strict';
+import 'vs/css!./media/selectBox';
+
 import { SelectBox as vsSelectBox, ISelectBoxStyles as vsISelectBoxStyles, ISelectBoxOptions } from 'vs/base/browser/ui/selectBox/selectBox';
 import { Color } from 'vs/base/common/color';
 import { IContextViewProvider, AnchorAlignment } from 'vs/base/browser/ui/contextview/contextview';
@@ -30,6 +32,7 @@ export class SelectBox extends vsSelectBox {
 	private _optionsDictionary;
 	private _dialogOptions: string[];
 	private _selectedOption: string;
+	private _selectBoxOptions: ISelectBoxOptions;
 	private enabledSelectBackground: Color;
 	private enabledSelectForeground: Color;
 	private enabledSelectBorder: Color;
@@ -72,6 +75,7 @@ export class SelectBox extends vsSelectBox {

 		// explicitly set the accessible role so that the screen readers can read the control type properly
 		this.selectElement.setAttribute('role', 'combobox');
+		this._selectBoxOptions = selectBoxOptions;
 	}

 	public style(styles: ISelectBoxStyles): void {
@@ -118,6 +122,10 @@ export class SelectBox extends vsSelectBox {
 		return this._selectedOption;
 	}

+	public get values(): string[] {
+		return this._dialogOptions;
+	}
+
 	public enable(): void {
 		this.selectElement.disabled = false;
 		this.selectBackground = this.enabledSelectBackground;
@@ -226,4 +234,34 @@ export class SelectBox extends vsSelectBox {
 			default: return { border: this.inputValidationErrorBorder, background: this.inputValidationErrorBackground };
 		}
 	}
+
+	public render(container: HTMLElement): void {
+		let selectOptions: ISelectBoxOptionsWithLabel = this._selectBoxOptions as ISelectBoxOptionsWithLabel;
+
+		if (selectOptions && selectOptions.labelText && selectOptions.labelText !== undefined) {
+			let outerContainer = document.createElement('div');
+			let selectContainer = document.createElement('div');
+
+			outerContainer.className = selectOptions.labelOnTop ? 'labelOnTopContainer' : 'labelOnLeftContainer';
+
+			let labelText = document.createElement('div');
+			labelText.className = 'action-item-label';
+			labelText.innerHTML = selectOptions.labelText;
+
+			container.appendChild(outerContainer);
+			outerContainer.appendChild(labelText);
+			outerContainer.appendChild(selectContainer);
+
+			super.render(selectContainer);
+			this.selectElement.classList.add('action-item-label');
+		}
+		else {
+			super.render(container);
+		}
+	}
+}
+
+export interface ISelectBoxOptionsWithLabel extends ISelectBoxOptions {
+	labelText?: string;
+	labelOnTop?: boolean;
 }
--- a/src/sql/base/browser/ui/table/asyncDataView.ts
+++ b/src/sql/base/browser/ui/table/asyncDataView.ts
@@ -3,67 +3,64 @@
 *  Licensed under the Source EULA. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/

+import { IDisposableDataProvider } from 'sql/base/browser/ui/table/interfaces';
+
 export interface IObservableCollection<T> {
 	getLength(): number;
 	at(index: number): T;
 	getRange(start: number, end: number): T[];
-	setCollectionChangedCallback(callback: (change: CollectionChange, startIndex: number, count: number) => void): void;
-}
-
-export interface IGridDataRow {
-	row?: number;
-	values: any[];
-}
-
-export enum CollectionChange {
-	ItemsReplaced
+	setCollectionChangedCallback(callback: (startIndex: number, count: number) => void): void;
+	setLength(number): void;
+	dispose(): void;
 }

 class LoadCancellationToken {
 	isCancelled: boolean;
 }

-class DataWindow<TData> {
-	private _dataSourceLength: number;
-	private _data: TData[];
+class DataWindow<T> {
+	private _data: T[];
 	private _length: number = 0;
 	private _offsetFromDataSource: number = -1;

-	private loadFunction: (offset: number, count: number) => Thenable<TData[]>;
 	private lastLoadCancellationToken: LoadCancellationToken;
-	private loadCompleteCallback: (start: number, end: number) => void;
-	private placeholderItemGenerator: (index: number) => TData;

-	constructor(dataSourceLength: number,
-		loadFunction: (offset: number, count: number) => Thenable<TData[]>,
-		placeholderItemGenerator: (index: number) => TData,
-		loadCompleteCallback: (start: number, end: number) => void) {
-		this._dataSourceLength = dataSourceLength;
-		this.loadFunction = loadFunction;
-		this.placeholderItemGenerator = placeholderItemGenerator;
-		this.loadCompleteCallback = loadCompleteCallback;
+	constructor(
+		private loadFunction: (offset: number, count: number) => Thenable<T[]>,
+		private placeholderItemGenerator: (index: number) => T,
+		private loadCompleteCallback: (start: number, end: number) => void
+	) { }
+
+	dispose() {
+		this._data = undefined;
+		this.loadFunction = undefined;
+		this.placeholderItemGenerator = undefined;
+		this.loadCompleteCallback = undefined;
+		if (this.lastLoadCancellationToken) {
+			this.lastLoadCancellationToken.isCancelled = true;
+		}
 	}

-	getStartIndex(): number {
+	public getStartIndex(): number {
 		return this._offsetFromDataSource;
 	}

-	getEndIndex(): number {
+	public getEndIndex(): number {
 		return this._offsetFromDataSource + this._length;
 	}

-	contains(dataSourceIndex: number): boolean {
+	public contains(dataSourceIndex: number): boolean {
 		return dataSourceIndex >= this.getStartIndex() && dataSourceIndex < this.getEndIndex();
 	}

-	getItem(index: number): TData {
+	public getItem(index: number): T {
 		if (!this._data) {
 			return this.placeholderItemGenerator(index);
 		}
 		return this._data[index - this._offsetFromDataSource];
 	}

-	positionWindow(offset: number, length: number): void {
+	public positionWindow(offset: number, length: number): void {
 		this._offsetFromDataSource = offset;
 		this._length = length;
 		this._data = undefined;
@@ -76,10 +73,9 @@ class DataWindow<TData> {
 			return;
 		}

-		let cancellationToken = new LoadCancellationToken();
-		this.lastLoadCancellationToken = cancellationToken;
+		this.lastLoadCancellationToken = new LoadCancellationToken();
 		this.loadFunction(offset, length).then(data => {
-			if (!cancellationToken.isCancelled) {
+			if (!this.lastLoadCancellationToken.isCancelled) {
 				this._data = data;
 				this.loadCompleteCallback(this._offsetFromDataSource, this._offsetFromDataSource + this._length);
 			}
@@ -87,47 +83,53 @@ class DataWindow<TData> {
 	}
 }

-export class VirtualizedCollection<TData> implements IObservableCollection<TData> {
+export class VirtualizedCollection<T extends Slick.SlickData> implements IObservableCollection<T> {
+	private _bufferWindowBefore: DataWindow<T>;
+	private _window: DataWindow<T>;
+	private _bufferWindowAfter: DataWindow<T>;

-	private _length: number;
-	private _windowSize: number;
-	private _bufferWindowBefore: DataWindow<TData>;
-	private _window: DataWindow<TData>;
-	private _bufferWindowAfter: DataWindow<TData>;
-
-	private collectionChangedCallback: (change: CollectionChange, startIndex: number, count: number) => void;
-
-	constructor(windowSize: number,
-		length: number,
-		loadFn: (offset: number, count: number) => Thenable<TData[]>,
-		private _placeHolderGenerator: (index: number) => TData) {
-		this._windowSize = windowSize;
-		this._length = length;
+	private collectionChangedCallback: (startIndex: number, count: number) => void;

+	constructor(
+		private readonly windowSize: number,
+		private placeHolderGenerator: (index: number) => T,
+		private length: number,
+		loadFn: (offset: number, count: number) => Thenable<T[]>
+	) {
 		let loadCompleteCallback = (start: number, end: number) => {
 			if (this.collectionChangedCallback) {
-				this.collectionChangedCallback(CollectionChange.ItemsReplaced, start, end - start);
+				this.collectionChangedCallback(start, end - start);
 			}
 		};

-		this._bufferWindowBefore = new DataWindow(length, loadFn, _placeHolderGenerator, loadCompleteCallback);
-		this._window = new DataWindow(length, loadFn, _placeHolderGenerator, loadCompleteCallback);
-		this._bufferWindowAfter = new DataWindow(length, loadFn, _placeHolderGenerator, loadCompleteCallback);
+		this._bufferWindowBefore = new DataWindow(loadFn, placeHolderGenerator, loadCompleteCallback);
+		this._window = new DataWindow(loadFn, placeHolderGenerator, loadCompleteCallback);
+		this._bufferWindowAfter = new DataWindow(loadFn, placeHolderGenerator, loadCompleteCallback);
 	}

-	setCollectionChangedCallback(callback: (change: CollectionChange, startIndex: number, count: number) => void): void {
+	dispose() {
+		this._bufferWindowAfter.dispose();
+		this._bufferWindowBefore.dispose();
+		this._window.dispose();
+	}
+
+	public setCollectionChangedCallback(callback: (startIndex: number, count: number) => void): void {
 		this.collectionChangedCallback = callback;
 	}

-	getLength(): number {
-		return this._length;
+	public getLength(): number {
+		return this.length;
 	}

-	at(index: number): TData {
+	setLength(number: any): void {
+		this.length = number;
+	}
+
+	public at(index: number): T {
 		return this.getRange(index, index + 1)[0];
 	}

-	getRange(start: number, end: number): TData[] {
+	public getRange(start: number, end: number): T[] {

 		// current data may contain placeholders
 		let currentData = this.getRangeFromCurrent(start, end);
@@ -142,7 +144,7 @@ export class VirtualizedCollection<TData> implements IObservableCollection<TData
 			this._bufferWindowAfter = this._window;
 			this._window = this._bufferWindowBefore;
 			this._bufferWindowBefore = windowToRecycle;
-			let newWindowOffset = Math.max(0, this._window.getStartIndex() - this._windowSize);
+			let newWindowOffset = Math.max(0, this._window.getStartIndex() - this.windowSize);

 			this._bufferWindowBefore.positionWindow(newWindowOffset, this._window.getStartIndex() - newWindowOffset);
 		} else if (start >= this._bufferWindowAfter.getStartIndex()) {
@@ -151,8 +153,8 @@ export class VirtualizedCollection<TData> implements IObservableCollection<TData
 			this._bufferWindowBefore = this._window;
 			this._window = this._bufferWindowAfter;
 			this._bufferWindowAfter = windowToRecycle;
-			let newWindowOffset = Math.min(this._window.getStartIndex() + this._windowSize, this._length);
-			let newWindowLength = Math.min(this._length - newWindowOffset, this._windowSize);
+			let newWindowOffset = Math.min(this._window.getStartIndex() + this.windowSize, this.length);
+			let newWindowLength = Math.min(this.length - newWindowOffset, this.windowSize);

 			this._bufferWindowAfter.positionWindow(newWindowOffset, newWindowLength);
 		}
@@ -160,7 +162,7 @@ export class VirtualizedCollection<TData> implements IObservableCollection<TData
 		return currentData;
 	}

-	private getRangeFromCurrent(start: number, end: number): TData[] {
+	private getRangeFromCurrent(start: number, end: number): T[] {
 		let currentData = [];
 		for (let i = 0; i < end - start; i++) {
 			currentData.push(this.getDataFromCurrent(start + i));
@@ -169,7 +171,7 @@ export class VirtualizedCollection<TData> implements IObservableCollection<TData
 		return currentData;
 	}

-	private getDataFromCurrent(index: number): TData {
+	private getDataFromCurrent(index: number): T {
 		if (this._bufferWindowBefore.contains(index)) {
 			return this._bufferWindowBefore.getItem(index);
 		} else if (this._bufferWindowAfter.contains(index)) {
@@ -178,38 +180,50 @@ export class VirtualizedCollection<TData> implements IObservableCollection<TData
 			return this._window.getItem(index);
 		}

-		return this._placeHolderGenerator(index);
+		return this.placeHolderGenerator(index);
 	}

 	private resetWindowsAroundIndex(index: number): void {

-		let bufferWindowBeforeStart = Math.max(0, index - this._windowSize * 1.5);
-		let bufferWindowBeforeEnd = Math.max(0, index - this._windowSize / 2);
+		let bufferWindowBeforeStart = Math.max(0, index - this.windowSize * 1.5);
+		let bufferWindowBeforeEnd = Math.max(0, index - this.windowSize / 2);
 		this._bufferWindowBefore.positionWindow(bufferWindowBeforeStart, bufferWindowBeforeEnd - bufferWindowBeforeStart);

 		let mainWindowStart = bufferWindowBeforeEnd;
-		let mainWindowEnd = Math.min(mainWindowStart + this._windowSize, this._length);
+		let mainWindowEnd = Math.min(mainWindowStart + this.windowSize, this.length);
 		this._window.positionWindow(mainWindowStart, mainWindowEnd - mainWindowStart);

 		let bufferWindowAfterStart = mainWindowEnd;
-		let bufferWindowAfterEnd = Math.min(bufferWindowAfterStart + this._windowSize, this._length);
+		let bufferWindowAfterEnd = Math.min(bufferWindowAfterStart + this.windowSize, this.length);
 		this._bufferWindowAfter.positionWindow(bufferWindowAfterStart, bufferWindowAfterEnd - bufferWindowAfterStart);
 	}
 }

-export class AsyncDataProvider<TData extends IGridDataRow> implements Slick.DataProvider<TData> {
+export class AsyncDataProvider<T extends Slick.SlickData> implements IDisposableDataProvider<T> {

-	constructor(private dataRows: IObservableCollection<TData>) { }
+	constructor(public dataRows: IObservableCollection<T>) { }

 	public getLength(): number {
-		return this.dataRows ? this.dataRows.getLength() : 0;
+		return this.dataRows.getLength();
 	}

-	public getItem(index: number): TData {
-		return !this.dataRows ? undefined : this.dataRows.at(index);
+	public getItem(index: number): T {
+		return this.dataRows.at(index);
 	}

-	public getRange(start: number, end: number): TData[] {
-		return !this.dataRows ? undefined : this.dataRows.getRange(start, end);
+	public getRange(start: number, end: number): T[] {
+		return this.dataRows.getRange(start, end);
+	}
+
+	public set length(length: number) {
+		this.dataRows.setLength(length);
+	}
+
+	public get length(): number {
+		return this.dataRows.getLength();
+	}
+
+	dispose() {
+		this.dataRows.dispose();
 	}
 }
--- a/src/sql/base/browser/ui/table/interfaces.ts
+++ b/src/sql/base/browser/ui/table/interfaces.ts
@@ -0,0 +1,31 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IListStyles } from 'vs/base/browser/ui/list/listWidget';
+import { Color } from 'vs/base/common/color';
+
+export interface IDisposableDataProvider<T> extends Slick.DataProvider<T> {
+	dispose(): void;
+}
+
+export interface ITableMouseEvent {
+	anchor: HTMLElement | { x: number, y: number };
+	cell?: { row: number, cell: number };
+}
+
+export interface ITableStyles extends IListStyles {
+	tableHeaderBackground?: Color;
+	tableHeaderForeground?: Color;
+}
+
+export interface ITableSorter<T> {
+	sort(args: Slick.OnSortEventArgs<T>);
+}
+
+export interface ITableConfiguration<T> {
+	dataProvider?: IDisposableDataProvider<T> | Array<T>;
+	columns?: Slick.Column<T>[];
+	sorter?: ITableSorter<T>;
+}
--- a/src/sql/base/browser/ui/table/plugins/rowNumberColumn.plugin.ts
+++ b/src/sql/base/browser/ui/table/plugins/rowNumberColumn.plugin.ts
@@ -5,8 +5,6 @@

 'use strict';

-import { range } from 'vs/base/common/arrays';
-
 export interface IRowNumberColumnOptions {
 	numberOfRows: number;
 	cssClass?: string;
@@ -17,7 +15,7 @@ const sizePerDigit = 15;
 export class RowNumberColumn<T> implements Slick.Plugin<T> {
 	private handler = new Slick.EventHandler();
 	private grid: Slick.Grid<T>;
-
+	private currentColumnWidth: number;

 	constructor(private options: IRowNumberColumnOptions) {
 	}
@@ -52,19 +50,25 @@ export class RowNumberColumn<T> implements Slick.Plugin<T> {
 		}
 	}

+	public updateRowCount(rowNum: number) {
+		this.options.numberOfRows = rowNum;
+		let columnWidth = Math.max(this.options.numberOfRows.toString().length * sizePerDigit, 22);
+		if (columnWidth !== this.currentColumnWidth) {
+			this.grid.setColumnWidths([this.getColumnDefinition()]);
+		}
+	}
+
 	public getColumnDefinition(): Slick.Column<T> {
 		// that smallest we can make it is 22 due to padding and margins in the cells
-		let columnWidth = Math.max(this.options.numberOfRows.toString().length * sizePerDigit, 22);
+		this.currentColumnWidth = Math.max(this.options.numberOfRows.toString().length * sizePerDigit, 22);
 		return {
 			id: 'rowNumber',
 			name: '',
 			field: 'rowNumber',
-			width: columnWidth,
-			minWidth: columnWidth,
-			maxWidth: columnWidth,
+			width: this.currentColumnWidth,
 			resizable: false,
 			cssClass: this.options.cssClass,
-			focusable: false,
+			focusable: true,
 			selectable: false,
 			formatter: (r, c, v, cd, dc) => this.formatter(r, c, v, cd, dc)
 		};
--- a/src/sql/base/browser/ui/table/table.ts
+++ b/src/sql/base/browser/ui/table/table.ts
@@ -5,28 +5,18 @@

 import 'vs/css!./media/table';
 import { TableDataView } from './tableDataView';
+import { IDisposableDataProvider, ITableSorter, ITableMouseEvent, ITableConfiguration, ITableStyles } from 'sql/base/browser/ui/table/interfaces';

 import { IThemable } from 'vs/platform/theme/common/styler';
-import { IListStyles } from 'vs/base/browser/ui/list/listWidget';
 import * as DOM from 'vs/base/browser/dom';
-import { Color } from 'vs/base/common/color';
 import { mixin } from 'vs/base/common/objects';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { IDisposable } from 'vs/base/common/lifecycle';
 import { Orientation } from 'vs/base/browser/ui/splitview/splitview';
 import { Widget } from 'vs/base/browser/ui/widget';
 import { isArray, isBoolean } from 'vs/base/common/types';
 import { Event, Emitter } from 'vs/base/common/event';
 import { range } from 'vs/base/common/arrays';
-
-export interface ITableMouseEvent {
-	anchor: HTMLElement | { x: number, y: number };
-	cell?: { row: number, cell: number };
-}
-
-export interface ITableStyles extends IListStyles {
-	tableHeaderBackground?: Color;
-	tableHeaderForeground?: Color;
-}
+import { $ } from 'vs/base/browser/builder';

 function getDefaultOptions<T>(): Slick.GridOptions<T> {
 	return <Slick.GridOptions<T>>{
@@ -35,23 +25,13 @@ function getDefaultOptions<T>(): Slick.GridOptions<T> {
 	};
 }

-export interface ITableSorter<T> {
-	sort(args: Slick.OnSortEventArgs<T>);
-}
-
-export interface ITableConfiguration<T> {
-	dataProvider?: Slick.DataProvider<T> | Array<T>;
-	columns?: Slick.Column<T>[];
-	sorter?: ITableSorter<T>;
-}
-
 export class Table<T extends Slick.SlickData> extends Widget implements IThemable, IDisposable {
 	private styleElement: HTMLStyleElement;
 	private idPrefix: string;

 	private _grid: Slick.Grid<T>;
 	private _columns: Slick.Column<T>[];
-	private _data: Slick.DataProvider<T>;
+	private _data: IDisposableDataProvider<T>;
 	private _sorter: ITableSorter<T>;

 	private _autoscroll: boolean;
@@ -60,8 +40,6 @@ export class Table<T extends Slick.SlickData> extends Widget implements IThemabl

 	private _classChangeTimeout: number;

-	private _disposables: IDisposable[] = [];
-
 	private _onContextMenu = new Emitter<ITableMouseEvent>();
 	public readonly onContextMenu: Event<ITableMouseEvent> = this._onContextMenu.event;

@@ -76,6 +54,8 @@ export class Table<T extends Slick.SlickData> extends Widget implements IThemabl
 			this._data = configuration.dataProvider;
 		}

+		this._register(this._data);
+
 		if (configuration && configuration.columns) {
 			this._columns = configuration.columns;
 		} else {
@@ -117,6 +97,12 @@ export class Table<T extends Slick.SlickData> extends Widget implements IThemabl
 			});
 		}

+		this._register({
+			dispose: () => {
+				this._grid.destroy();
+			}
+		});
+
 		this.mapMouseEvent(this._grid.onContextMenu, this._onContextMenu);
 		this.mapMouseEvent(this._grid.onClick, this._onClick);
 	}
@@ -131,7 +117,8 @@ export class Table<T extends Slick.SlickData> extends Widget implements IThemabl
 	}

 	public dispose() {
-		dispose(this._disposables);
+		$(this._container).dispose();
+		super.dispose();
 	}

 	public invalidateRows(rows: number[], keepEditor: boolean) {
@@ -166,7 +153,7 @@ export class Table<T extends Slick.SlickData> extends Widget implements IThemabl
 		this._grid.setData(this._data, true);
 	}

-	getData(): Slick.DataProvider<T> {
+	getData(): IDisposableDataProvider<T> {
 		return this._data;
 	}

--- a/src/sql/base/browser/ui/table/tableDataView.ts
+++ b/src/sql/base/browser/ui/table/tableDataView.ts
@@ -9,6 +9,8 @@ import { Event, Emitter } from 'vs/base/common/event';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as types from 'vs/base/common/types';

+import { IDisposableDataProvider } from 'sql/base/browser/ui/table/interfaces';
+
 export interface IFindPosition {
 	col: number;
 	row: number;
@@ -20,7 +22,7 @@ function defaultSort<T>(args: Slick.OnSortEventArgs<T>, data: Array<T>): Array<T
 	return data.sort((a, b) => (a[field] === b[field] ? 0 : (a[field] > b[field] ? 1 : -1)) * sign);
 }

-export class TableDataView<T extends Slick.SlickData> implements Slick.DataProvider<T> {
+export class TableDataView<T extends Slick.SlickData> implements IDisposableDataProvider<T> {
 	private _data: Array<T>;
 	private _findArray: Array<IFindPosition>;
 	private _findObs: Observable<IFindPosition>;
@@ -154,4 +156,10 @@ export class TableDataView<T extends Slick.SlickData> implements Slick.DataProvi
 	get findCount(): number {
 		return types.isUndefinedOrNull(this._findArray) ? 0 : this._findArray.length;
 	}
+
+	dispose() {
+		this._data = undefined;
+		this._findArray = undefined;
+		this._findObs = undefined;
+	}
 }
--- a/src/sql/base/browser/ui/taskbar/media/taskbar.css
+++ b/src/sql/base/browser/ui/taskbar/media/taskbar.css
@@ -19,6 +19,7 @@
 .carbon-taskbar {
 	width: 100%;
 	position: relative;
+	margin: 2px 0px 2px 0px;
 }

 .carbon-taskbar.monaco-toolbar .monaco-action-bar.animated .actions-container {
@@ -39,11 +40,6 @@
 	align-items: center;
 }

-.carbon-taskbar {
-	margin-top: 2px;
-	margin-bottom: 2px;
-}
-
 .carbon-taskbar .action-item {
 	margin-right: 5px;
 }
@@ -54,6 +50,11 @@
 	padding-left: 15px;
 }

+ .carbon-taskbar .action-item-label {
+	display: flex;
+	padding-right: 5px;
+ }
+
 .listDatabasesSelectBox {
 	padding-left: 2px;
 	min-width: 100px;
--- a/src/sql/base/browser/ui/taskbar/taskbar.ts
+++ b/src/sql/base/browser/ui/taskbar/taskbar.ts
@@ -146,4 +146,5 @@ export class Taskbar {
 	public dispose(): void {
 		this.actionBar.dispose();
 	}
+
 }
--- a/src/sql/media/icons/check.svg
+++ b/src/sql/media/icons/check.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="-2 -2 16 16" enable-background="new -2 -2 16 16"><polygon fill="#424242" points="9,0 4.5,9 3,6 0,6 3,12 6,12 12,0"/></svg>
--- a/src/sql/media/icons/check_inverse.svg
+++ b/src/sql/media/icons/check_inverse.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="-2 -2 16 16" enable-background="new -2 -2 16 16"><polygon fill="#C5C5C5" points="9,0 4.5,9 3,6 0,6 3,12 6,12 12,0"/></svg>
--- a/src/sql/media/icons/common-icons.css
+++ b/src/sql/media/icons/common-icons.css
@@ -227,6 +227,51 @@
 	background: url('unpin.svg') center center no-repeat;
 }

+.vs .sql.icon.pause {
+	background-image: url('pause.svg')
+}
+
+.vs-dark .sql.icon.pause,
+.hc-black .sql.icon.pause {
+	background-image: url('pause_inverse.svg')
+}
+
+.vs .sql.icon.continue {
+	background-image: url('continue.svg')
+}
+
+.vs-dark .sql.icon.continue,
+.hc-black .sql.icon.continue {
+	background-image: url('continue_inverse.svg')
+}
+
+.vs .sql.icon.checked {
+	background-image: url('check.svg')
+}
+
+.vs-dark .sql.icon.checked,
+.hc-black .sql.icon.checked {
+	background-image: url('check_inverse.svg')
+}
+
+.vs .sql.icon.start {
+	background-image: url('start.svg')
+}
+
+.vs-dark .sql.icon.start,
+.hc-black .sql.icon.start {
+	background-image: url('start_inverse.svg')
+}
+
+.vs .sql.icon.stop {
+	background-image: url('stop.svg')
+}
+
+.vs-dark .sql.icon.stop,
+.hc-black .sql.icon.stop {
+	background-image: url('stop_inverse.svg')
+}
+
 .small {
 	width: 16px;
 	height: 16px;
--- a/src/sql/media/icons/continue.svg
+++ b/src/sql/media/icons/continue.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#f6f6f6;}.icon-canvas-transparent{opacity:0;}.icon-vs-action-blue{fill:#00539c;}</style></defs><title>continue</title><g id="canvas"><path class="icon-canvas-transparent" d="M16,0V16H0V0Z"/></g><g id="outline" style="display: none;"><path class="icon-vs-out" d="M15.64,8l-7.8,6H2V2H7.84Z"/></g><g id="iconBg"><path class="icon-vs-action-blue" d="M3,3H5V13H3ZM7.5,3V13L14,8Z"/></g></svg>
--- a/src/sql/media/icons/continue_inverse.svg
+++ b/src/sql/media/icons/continue_inverse.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#252526;}.icon-canvas-transparent{opacity:0;}.icon-vs-action-blue{fill:#75beff;}</style></defs><title>continue</title><g id="canvas"><path class="icon-canvas-transparent" d="M16,0V16H0V0Z"/></g><g id="outline" style="display: none;"><path class="icon-vs-out" d="M15.64,8l-7.8,6H2V2H7.84Z"/></g><g id="iconBg"><path class="icon-vs-action-blue" d="M3,3H5V13H3ZM7.5,3V13L14,8Z"/></g></svg>
--- a/src/sql/media/icons/pause.svg
+++ b/src/sql/media/icons/pause.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#f6f6f6;}.icon-canvas-transparent{opacity:0;}.icon-vs-action-blue{fill:#00539c;}</style></defs><title>pause</title><g id="canvas"><path class="icon-canvas-transparent" d="M16,0V16H0V0Z"/></g><g id="outline" style="display: none;"><path class="icon-vs-out" d="M13,2V14H8.5V2ZM3,14H7.5V2H3Z"/></g><g id="iconBg"><path class="icon-vs-action-blue" d="M4,3H6.5V13H4ZM9.5,3V13H12V3Z"/></g></svg>
--- a/src/sql/media/icons/pause_inverse.svg
+++ b/src/sql/media/icons/pause_inverse.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#252526;}.icon-canvas-transparent{opacity:0;}.icon-vs-action-blue{fill:#75beff;}</style></defs><title>pause</title><g id="canvas"><path class="icon-canvas-transparent" d="M16,0V16H0V0Z"/></g><g id="outline" style="display: none;"><path class="icon-vs-out" d="M13,2V14H8.5V2ZM3,14H7.5V2H3Z"/></g><g id="iconBg"><path class="icon-vs-action-blue" d="M4,3H6.5V13H4ZM9.5,3V13H12V3Z"/></g></svg>
--- a/src/sql/media/icons/start.svg
+++ b/src/sql/media/icons/start.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#f6f6f6;}.icon-canvas-transparent{opacity:0;}.icon-vs-action-green{fill:#388a34;}</style></defs><title>continue</title><g id="canvas"><path class="icon-canvas-transparent" d="M16,0V16H0V0Z"/></g><g id="outline" style="display: none;"><path class="icon-vs-out" d="M14.334,8,3.667,16H3V0h.667Z"/></g><g id="iconBg"><path class="icon-vs-action-green" d="M4,1.5v13L12.667,8,4,1.5Z"/></g></svg>
--- a/src/sql/media/icons/start_inverse.svg
+++ b/src/sql/media/icons/start_inverse.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#252526;}.icon-canvas-transparent{opacity:0;}.icon-vs-action-green{fill:#89d185;}</style></defs><title>continue</title><g id="canvas"><path class="icon-canvas-transparent" d="M16,0V16H0V0Z"/></g><g id="outline" style="display: none;"><path class="icon-vs-out" d="M14.334,8,3.667,16H3V0h.667Z"/></g><g id="iconBg"><path class="icon-vs-action-green" d="M4,1.5v13L12.667,8,4,1.5Z"/></g></svg>
--- a/src/sql/media/icons/stop.svg
+++ b/src/sql/media/icons/stop.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#f6f6f6;}.icon-canvas-transparent{opacity:0;}.icon-vs-action-red{fill:#a1260d;}</style></defs><title>stop</title><g id="canvas"><path class="icon-canvas-transparent" d="M16,0V16H0V0Z"/></g><g id="outline" style="display: none;"><path class="icon-vs-out" d="M14,2V14H2V2Z"/></g><g id="iconBg"><path class="icon-vs-action-red" d="M13,3V13H3V3Z"/></g></svg>
--- a/src/sql/media/icons/stop_inverse.svg
+++ b/src/sql/media/icons/stop_inverse.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#252526;}.icon-canvas-transparent{opacity:0;}.icon-vs-action-red{fill:#f48771;}</style></defs><title>stop</title><g id="canvas"><path class="icon-canvas-transparent" d="M16,0V16H0V0Z"/></g><g id="outline" style="display: none;"><path class="icon-vs-out" d="M14,2V14H2V2Z"/></g><g id="iconBg"><path class="icon-vs-action-red" d="M13,3V13H3V3Z"/></g></svg>
--- a/src/sql/parts/common/customInputConverter.ts
+++ b/src/sql/parts/common/customInputConverter.ts
@@ -3,15 +3,22 @@
 *  Licensed under the Source EULA. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/

+import * as path from 'path';
+
+import { Registry } from 'vs/platform/registry/common/platform';
 import { EditorInput, IEditorInput } from 'vs/workbench/common/editor';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput';
 import { FileEditorInput } from 'vs/workbench/parts/files/common/editors/fileEditorInput';
+import URI from 'vs/base/common/uri';
+
 import { QueryResultsInput } from 'sql/parts/query/common/queryResultsInput';
 import { QueryInput } from 'sql/parts/query/common/queryInput';
-import URI from 'vs/base/common/uri';
 import { IQueryEditorOptions } from 'sql/parts/query/common/queryEditorService';
 import { QueryPlanInput } from 'sql/parts/queryPlan/queryPlanInput';
+import { NotebookInput, NotebookInputModel, NotebookInputValidator } from 'sql/parts/notebook/notebookInput';
+import { Extensions, INotebookProviderRegistry } from 'sql/services/notebook/notebookRegistry';
+import { DEFAULT_NOTEBOOK_PROVIDER } from 'sql/services/notebook/notebookService';

 const fs = require('fs');

@@ -28,7 +35,7 @@ export const sqlModeId = 'sql';
 * to that type.
 * @param input The input to check for conversion
 * @param options Editor options for controlling the conversion
- * @param instantiationService The instatianation service to use to create the new input types
+ * @param instantiationService The instantiation service to use to create the new input types
 */
 export function convertEditorInput(input: EditorInput, options: IQueryEditorOptions, instantiationService: IInstantiationService): EditorInput {
 	let denyQueryEditor = options && options.denyQueryEditor;
@@ -48,8 +55,25 @@ export function convertEditorInput(input: EditorInput, options: IQueryEditorOpti
 			let queryPlanInput: QueryPlanInput = instantiationService.createInstance(QueryPlanInput, queryPlanXml, 'aaa', undefined);
 			return queryPlanInput;
 		}
-	}

+		//Notebook
+		let notebookValidator = instantiationService.createInstance(NotebookInputValidator);
+		uri = getNotebookEditorUri(input);
+		if(uri && notebookValidator.isNotebookEnabled()){
+			//TODO: We need to pass in notebook data either through notebook input or notebook service
+			let fileName: string = 'untitled';
+			let providerId: string = DEFAULT_NOTEBOOK_PROVIDER;
+			if (input) {
+				fileName = input.getName();
+				providerId = getProviderForFileName(fileName);
+			}
+			let notebookInputModel = new NotebookInputModel(uri, undefined, false, undefined);
+			notebookInputModel.providerId = providerId;
+			//TO DO: Second parameter has to be the content.
+			let notebookInput: NotebookInput = instantiationService.createInstance(NotebookInput, fileName, notebookInputModel);
+			return notebookInput;
+		}
+	}
 	return input;
 }

@@ -129,6 +153,47 @@ function getQueryPlanEditorUri(input: EditorInput): URI {
 	return undefined;
 }

+
+/**
+ * If input is a supported notebook editor file (.ipynb), return it's URI. Otherwise return undefined.
+ * @param input The EditorInput to get the URI of.
+ */
+function getNotebookEditorUri(input: EditorInput): URI {
+	if (!input || !input.getName()) {
+		return undefined;
+	}
+
+
+
+	// If this editor is not already of type notebook input
+	if (!(input instanceof NotebookInput)) {
+		let uri: URI = getSupportedInputResource(input);
+		if (uri) {
+			if (hasFileExtension(getNotebookFileExtensions(), input, false)) {
+				return uri;
+			}
+		}
+	}
+
+	return undefined;
+}
+
+function getNotebookFileExtensions() {
+	let notebookRegistry = Registry.as<INotebookProviderRegistry>(Extensions.NotebookProviderContribution);
+	return notebookRegistry.getSupportedFileExtensions();
+}
+
+function getProviderForFileName(fileName: string) {
+	let fileExt = path.extname(fileName);
+	if (fileExt && fileExt.startsWith('.')) {
+		fileExt = fileExt.slice(1,fileExt.length);
+		let notebookRegistry = Registry.as<INotebookProviderRegistry>(Extensions.NotebookProviderContribution);
+		return notebookRegistry.getProviderForFileType(fileExt);
+	}
+	return DEFAULT_NOTEBOOK_PROVIDER;
+}
+
+
 /**
 * Checks whether the given EditorInput is set to either undefined or sql mode
 * @param input The EditorInput to check the mode of
--- a/src/sql/parts/connection/common/connectionActions.ts
+++ b/src/sql/parts/connection/common/connectionActions.ts
@@ -26,7 +26,7 @@ import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService
 export class ClearRecentConnectionsAction extends Action {

 	public static ID = 'clearRecentConnectionsAction';
-	public static LABEL = nls.localize('ClearRecentlyUsedLabel', 'Clear Recent Connections List');
+	public static LABEL = nls.localize('ClearRecentlyUsedLabel', 'Clear List');
 	public static ICON = 'search-action clear-search-results';

 	private _onRecentConnectionsRemoved = new Emitter<void>();
@@ -83,7 +83,7 @@ export class ClearRecentConnectionsAction extends Action {
 				{ key: nls.localize('connectionAction.no', 'No'), value: false }
 			];

-			self._quickOpenService.pick(choices.map(x => x.key), { placeHolder: nls.localize('ClearRecentlyUsedLabel', 'Clear Recent Connections List'), ignoreFocusLost: true }).then((choice) => {
+			self._quickOpenService.pick(choices.map(x => x.key), { placeHolder: nls.localize('ClearRecentlyUsedLabel', 'Clear List'), ignoreFocusLost: true }).then((choice) => {
 				let confirm = choices.find(x => x.key === choice);
 				resolve(confirm && confirm.value);
 			});
--- a/src/sql/parts/connection/connectionDialog/advancedPropertiesController.ts
+++ b/src/sql/parts/connection/connectionDialog/advancedPropertiesController.ts
@@ -38,7 +38,7 @@ export class AdvancedPropertiesController {
 	public get advancedDialog() {
 		if (!this._advancedDialog) {
 			this._advancedDialog = this._instantiationService.createInstance(
-				OptionsDialog, localize('connectionAdvancedProperties', 'Advanced properties'), TelemetryKeys.ConnectionAdvancedProperties, { hasBackButton: true });
+				OptionsDialog, localize('connectionAdvancedProperties', 'Advanced Properties'), TelemetryKeys.ConnectionAdvancedProperties, { hasBackButton: true });
 			this._advancedDialog.cancelLabel = localize('advancedProperties.discard', 'Discard');
 			this._advancedDialog.onCloseEvent(() => this._onCloseAdvancedProperties());
 			this._advancedDialog.onOk(() => this.handleOnOk());
--- a/src/sql/parts/connection/connectionDialog/connectionDialogWidget.ts
+++ b/src/sql/parts/connection/connectionDialog/connectionDialogWidget.ts
@@ -37,6 +37,7 @@ import * as styler from 'vs/platform/theme/common/styler';
 import * as DOM from 'vs/base/browser/dom';
 import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
+import { SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme';

 export interface OnShowUIResponse {
 	selectedProviderType: string;
@@ -49,7 +50,7 @@ export class ConnectionDialogWidget extends Modal {
 	private _noRecentConnectionBuilder: Builder;
 	private _savedConnectionBuilder: Builder;
 	private _noSavedConnectionBuilder: Builder;
-	private _dividerBuilder: Builder;
+	private _connectionDetailTitle: Builder;
 	private _connectButton: Button;
 	private _closeButton: Button;
 	private _providerTypeSelectBox: SelectBox;
@@ -82,6 +83,8 @@ export class ConnectionDialogWidget extends Modal {
 	private _onResetConnection = new Emitter<void>();
 	public onResetConnection: Event<void> = this._onResetConnection.event;

+	private _connecting = false;
+
 	constructor(
 		private providerTypeOptions: string[],
 		private selectedProviderType: string,
@@ -143,7 +146,7 @@ export class ConnectionDialogWidget extends Modal {
 		this._panel = new TabbedPanel(connectionContainer.getHTMLElement());
 		this._recentConnectionTabId = this._panel.pushTab({
 			identifier: 'recent_connection',
-			title: localize('recentConnectionTitle', 'Recent connections'),
+			title: localize('recentConnectionTitle', 'Recent Connections'),
 			view: {
 				render: c => {
 					recentConnectionTab.appendTo(c);
@@ -154,7 +157,7 @@ export class ConnectionDialogWidget extends Modal {

 		let savedConnectionTabId = this._panel.pushTab({
 			identifier: 'saved_connection',
-			title: localize('savedConnectionTitle', 'Saved connections'),
+			title: localize('savedConnectionTitle', 'Saved Connections'),
 			view: {
 				layout: () => { },
 				render: c => {
@@ -179,8 +182,9 @@ export class ConnectionDialogWidget extends Modal {
 			}
 		});

-		this._bodyBuilder.div({ class: 'Connection-divider' }, (dividerContainer) => {
-			this._dividerBuilder = dividerContainer;
+		this._bodyBuilder.div({ class: 'connection-details-title' }, (dividerContainer) => {
+			this._connectionDetailTitle = dividerContainer;
+			this._connectionDetailTitle.text(localize('connectionDetailsTitle', 'Connection Details'));
 		});

 		this._bodyBuilder.div({ class: 'connection-type' }, (modelTableContent) => {
@@ -217,10 +221,12 @@ export class ConnectionDialogWidget extends Modal {
 	private updateTheme(theme: IColorTheme): void {
 		let borderColor = theme.getColor(contrastBorder);
 		let border = borderColor ? borderColor.toString() : null;
-		if (this._dividerBuilder) {
-			this._dividerBuilder.style('border-top-width', border ? '1px' : null);
-			this._dividerBuilder.style('border-top-style', border ? 'solid' : null);
-			this._dividerBuilder.style('border-top-color', border);
+		let backgroundColor = theme.getColor(SIDE_BAR_BACKGROUND);
+		if (this._connectionDetailTitle) {
+			this._connectionDetailTitle.style('border-width', border ? '1px 0px' : null);
+			this._connectionDetailTitle.style('border-style', border ? 'solid none' : null);
+			this._connectionDetailTitle.style('border-color', border);
+			this._connectionDetailTitle.style('background-color', backgroundColor ? backgroundColor.toString() : null);
 		}
 	}

@@ -244,6 +250,7 @@ export class ConnectionDialogWidget extends Modal {

 	private connect(element?: IConnectionProfile): void {
 		if (this._connectButton.enabled) {
+			this._connecting = true;
 			this._connectButton.enabled = false;
 			this._providerTypeSelectBox.disable();
 			this.showSpinner();
@@ -264,8 +271,9 @@ export class ConnectionDialogWidget extends Modal {
 	}

 	private cancel() {
+		let wasConnecting = this._connecting;
 		this._onCancel.fire();
-		if (!this._databaseDropdownExpanded) {
+		if (!this._databaseDropdownExpanded && !wasConnecting) {
 			this.close();
 		}
 	}
@@ -277,17 +285,13 @@ export class ConnectionDialogWidget extends Modal {

 	private createRecentConnectionList(): void {
 		this._recentConnectionBuilder.div({ class: 'connection-recent-content' }, (recentConnectionContainer) => {
-			let recentHistoryLabel = localize('recentHistory', 'Recent history');
 			recentConnectionContainer.div({ class: 'recent-titles-container' }, (container) => {
-				container.div({ class: 'connection-history-label' }, (recentTitle) => {
-					recentTitle.text(recentHistoryLabel);
-				});
 				container.div({ class: 'connection-history-actions' }, (actionsContainer) => {
 					this._actionbar = this._register(new ActionBar(actionsContainer.getHTMLElement(), { animated: false }));
 					let clearAction = this._instantiationService.createInstance(ClearRecentConnectionsAction, ClearRecentConnectionsAction.ID, ClearRecentConnectionsAction.LABEL);
 					clearAction.useConfirmationMessage = true;
 					clearAction.onRecentConnectionsRemoved(() => this.open(false));
-					this._actionbar.push(clearAction, { icon: true, label: false });
+					this._actionbar.push(clearAction, { icon: true, label: true });
 				});
 			});
 			recentConnectionContainer.div({ class: 'server-explorer-viewlet' }, (divContainer: Builder) => {
@@ -426,6 +430,7 @@ export class ConnectionDialogWidget extends Modal {
 		this._connectButton.enabled = true;
 		this._providerTypeSelectBox.enable();
 		this._onResetConnection.fire();
+		this._connecting = false;
 	}

 	public get newConnectionParams(): INewConnectionParams {
--- a/src/sql/parts/connection/connectionDialog/media/connectionDialog.css
+++ b/src/sql/parts/connection/connectionDialog/media/connectionDialog.css
@@ -9,25 +9,35 @@
 }

 .connection-input {
-	padding-right:8px;
 	width: 200px;
 	padding-bottom: 5px;
 }

 .connection-dialog {
-	height: calc(100% - 20px);
+	height: 100%;
+	display: flex;
+	flex-direction: column;
+	overflow-x: hidden;
+	overflow-y: auto;
 }

 .connection-dialog .tabbedPanel {
 	border-top-color: transparent;
-	height: calc(100% - 350px);
-	display: block;
+	flex: 1 1;
 	min-height: 120px;
+	overflow: hidden;
+	margin: 0px 11px;
+}
+.connection-dialog .tabBody {
+	overflow: hidden;
+    flex: 1 1;
+    display: flex;
+    flex-direction: column;
 }

 .connection-recent, .connection-saved {
-	margin: 15px;
-	height: calc(100% - 60px);
+	margin: 5px;
+	flex: 1 1;
 	overflow-y: auto;
 }

@@ -45,6 +55,8 @@
 .recent-titles-container {
 	display: flex;
 	justify-content: space-between;
+	margin: 5px;
+	flex: 0 0 auto;
 }

 .connection-provider-info {
@@ -53,7 +65,13 @@
 }

 .connection-recent-content {
-	height: calc(100% - 20px);
+	height: 100%;
+	display: flex;
+	flex-direction: column;
+}
+
+.connection-recent-content .server-explorer-viewlet {
+	flex: 1 1;
 }

 .connection-table-content {
@@ -66,8 +84,9 @@
 }

 .connection-type {
-	margin: 15px;
-	overflow-y: hidden;
+	flex: 0 0 auto;
+	overflow: hidden;
+	margin: 0px 13px;
 }

 .connection-dialog .connection-history-actions .action-label.icon {
@@ -76,8 +95,9 @@
 	line-height: 20px;
 	min-width: 20px;
 	background-size: 16px;
-	background-position: center center;
+	background-position: 2px center;
 	background-repeat: no-repeat;
+	padding-left: 25px;
 }

 .search-action.clear-search-results {
@@ -88,3 +108,10 @@
 .hc-black .search-action.clear-search-results {
 	background: url('clear-search-results-dark.svg');
 }
+
+.connection-details-title {
+	font-size: 14px;
+	margin: 5px 0px;
+	padding: 5px 15px;
+	font-weight: 600;
+}
--- a/src/sql/parts/connection/connectionDialog/media/sqlConnection.css
+++ b/src/sql/parts/connection/connectionDialog/media/sqlConnection.css
@@ -5,6 +5,5 @@

 .advanced-button {
 	width: 100px;
-	padding-right:8px;
 	padding-bottom: 5px;
 }
--- a/src/sql/parts/grid/services/sharedServices.ts
+++ b/src/sql/parts/grid/services/sharedServices.ts
@@ -3,7 +3,6 @@
 *  Licensed under the Source EULA. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/

-import { $ } from 'vs/base/browser/dom';
 import { escape } from 'sql/base/common/strings';

 export class DBCellValue {
@@ -41,20 +40,24 @@ export function hyperLinkFormatter(row: number, cell: any, value: any, columnDef
 */
 export function textFormatter(row: number, cell: any, value: any, columnDef: any, dataContext: any): string {
 	let cellClasses = 'grid-cell-value-container';
-	let valueToDisplay: string = '';
+	let valueToDisplay = '';
+	let titleValue = '';

 	if (DBCellValue.isDBCellValue(value)) {
 		valueToDisplay = 'NULL';
 		if (!value.isNull) {
-			valueToDisplay = escape(value.displayValue.replace(/(\r\n|\n|\r)/g, ' '));
+			valueToDisplay = value.displayValue.replace(/(\r\n|\n|\r)/g, ' ');
+			valueToDisplay = escape(valueToDisplay.length > 250 ? valueToDisplay.slice(0, 250) + '...' : valueToDisplay);
+			titleValue = value.displayValue;
 		} else {
 			cellClasses += ' missing-value';
 		}
 	} else if (typeof value === 'string') {
-		valueToDisplay = escape(value);
+		valueToDisplay = escape(value.length > 250 ? value.slice(0, 250) + '...' : value);
+		titleValue = value;
 	}

-	return `<span title="${valueToDisplay}" class="${cellClasses}">${valueToDisplay}</span>`;
+	return `<span title="${titleValue}" class="${cellClasses}">${valueToDisplay}</span>`;
 }

 /** The following code is a rewrite over the both formatter function using dom builder
--- a/src/sql/parts/jobManagement/common/jobManagementUtilities.ts
+++ b/src/sql/parts/jobManagement/common/jobManagementUtilities.ts
@@ -33,7 +33,7 @@ export class JobManagementUtilities {
 			case(4): return nls.localize('agentUtilities.idle', 'Idle');
 			case(5): return nls.localize('agentUtilities.suspended', 'Suspended');
 			case(6): return nls.localize('agentUtilities.obsolete', '[Obsolete]');
-			case(7): return nls.localize('agentUtilities.performingCompletionActions', 'PerformingCompletionActions');
+			case(7): return 'PerformingCompletionActions';
 			default: return nls.localize('agentUtilities.statusUnknown', 'Status Unknown');
 		}
 	}
--- a/src/sql/parts/jobManagement/common/media/jobs.css
+++ b/src/sql/parts/jobManagement/common/media/jobs.css
@@ -304,15 +304,15 @@ table.jobprevruns > tbody {
 	background-image: url('refresh_inverse.svg');
 }

-.actionbar-container .monaco-action-bar > ul.actions-container {
+.agent-actionbar-container .monaco-action-bar > ul.actions-container {
 	padding-top: 10px;
 }

-jobsview-component .actionbar-container {
+jobsview-component .agent-actionbar-container {
    height: 40px;
 }

-.actionbar-container .monaco-action-bar > ul.actions-container > li.action-item {
+.agent-actionbar-container .monaco-action-bar > ul.actions-container > li.action-item {
 	padding-left: 20px;
 }

--- a/src/sql/parts/jobManagement/views/alertsView.component.html
+++ b/src/sql/parts/jobManagement/views/alertsView.component.html
@@ -10,6 +10,6 @@
 	<div class="icon in-progress" *ngIf="_showProgressWheel === true"></div>
 </div>

-<div #actionbarContainer class="actionbar-container"></div>
+<div #actionbarContainer class="agent-actionbar-container"></div>

 <div #jobalertsgrid class="jobalertsview-grid"></div>
--- a/src/sql/parts/jobManagement/views/alertsView.component.ts
+++ b/src/sql/parts/jobManagement/views/alertsView.component.ts
@@ -15,7 +15,7 @@ import 'vs/css!sql/base/browser/ui/table/media/table';
 import * as dom from 'vs/base/browser/dom';
 import * as nls from 'vs/nls';
 import * as sqlops from 'sqlops';
-import { Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, OnInit } from '@angular/core';
+import { Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, OnInit, OnDestroy } from '@angular/core';
 import { TabChild } from 'sql/base/browser/ui/panel/tab.component';
 import { Table } from 'sql/base/browser/ui/table/table';
 import { AgentViewComponent } from 'sql/parts/jobManagement/agent/agentView.component';
@@ -41,7 +41,7 @@ export const ROW_HEIGHT: number = 45;
 	templateUrl: decodeURI(require.toUrl('./alertsView.component.html')),
 	providers: [{ provide: TabChild, useExisting: forwardRef(() => AlertsViewComponent) }],
 })
-export class AlertsViewComponent extends JobManagementView implements OnInit {
+export class AlertsViewComponent extends JobManagementView implements OnInit, OnDestroy {

 	private columns: Array<Slick.Column<any>> = [
 		{
@@ -69,6 +69,7 @@ export class AlertsViewComponent extends JobManagementView implements OnInit {
 	private _isCloud: boolean;
 	private _alertsCacheObject: AlertsCacheObject;

+	private _didTabChange: boolean;
 	@ViewChild('jobalertsgrid') _gridEl: ElementRef;

 	public alerts: sqlops.AgentAlertInfo[];
@@ -86,6 +87,7 @@ export class AlertsViewComponent extends JobManagementView implements OnInit {
 		@Inject(IKeybindingService)  keybindingService: IKeybindingService,
 		@Inject(IDashboardService) _dashboardService: IDashboardService) {
 		super(commonService, _dashboardService, contextMenuService, keybindingService, instantiationService);
+		this._didTabChange = false;
 		this._isCloud = commonService.connectionManagementService.connectionInfo.serverInfo.isCloud;
 		let alertsCacheObjectMap = this._jobManagementService.alertsCacheObjectMap;
 		let alertsCache = alertsCacheObjectMap[this._serverName];
@@ -104,6 +106,10 @@ export class AlertsViewComponent extends JobManagementView implements OnInit {
 		this._parentComponent = this._agentViewComponent;
 	}

+	ngOnDestroy() {
+		this._didTabChange = true;
+	}
+
 	public layout() {
 		let height = dom.getContentHeight(this._gridEl.nativeElement) - 10;
 		if (height < 0) {
@@ -166,8 +172,10 @@ export class AlertsViewComponent extends JobManagementView implements OnInit {
 					// TODO: handle error
 				}
 				this._showProgressWheel = false;
-				if (this.isVisible) {
+				if (this.isVisible && !this._didTabChange) {
 					this._cd.detectChanges();
+				} else if (this._didTabChange) {
+					return;
 				}
 			});
 		}
--- a/src/sql/parts/jobManagement/views/jobHistory.component.html
+++ b/src/sql/parts/jobManagement/views/jobHistory.component.html
@@ -15,7 +15,7 @@
 </div>

 <!-- Actions -->
-<div #actionbarContainer class="actionbar-container"></div>
+<div #actionbarContainer class="agent-actionbar-container"></div>

 <!-- Overview  -->
 <div class="overview-container">
--- a/src/sql/parts/jobManagement/views/jobHistory.css
+++ b/src/sql/parts/jobManagement/views/jobHistory.css
@@ -257,14 +257,14 @@ jobhistory-component > .jobhistory-heading-container > .icon.in-progress {
 	padding-left: 20px;
 }

-jobhistory-component > .actionbar-container .monaco-action-bar > ul.actions-container {
+jobhistory-component > .agent-actionbar-container .monaco-action-bar > ul.actions-container {
 	border-top: 3px solid #f4f4f4;
 }

-.vs-dark jobhistory-component > .actionbar-container .monaco-action-bar > ul.actions-container {
+.vs-dark jobhistory-component > .agent-actionbar-container .monaco-action-bar > ul.actions-container {
 	border-top: 3px solid #444444;
 }

-.hc-black jobhistory-component > .actionbar-container .monaco-action-bar > ul.actions-container {
+.hc-black jobhistory-component > .agent-actionbar-container .monaco-action-bar > ul.actions-container {
 	border-top: 3px solid #2b56f2;
 }
--- a/src/sql/parts/jobManagement/views/jobsView.component.html
+++ b/src/sql/parts/jobManagement/views/jobsView.component.html
@@ -10,6 +10,6 @@
 	<div class="icon in-progress" *ngIf="_showProgressWheel === true"></div>
 </div>

-<div #actionbarContainer class="actionbar-container"></div>
+<div #actionbarContainer class="agent-actionbar-container"></div>

 <div #jobsgrid class="jobview-grid"></div>
--- a/src/sql/parts/jobManagement/views/jobsView.component.ts
+++ b/src/sql/parts/jobManagement/views/jobsView.component.ts
@@ -15,7 +15,7 @@ import 'vs/css!sql/base/browser/ui/table/media/table';
 import * as sqlops from 'sqlops';
 import * as nls from 'vs/nls';
 import * as dom from 'vs/base/browser/dom';
-import { Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, OnInit } from '@angular/core';
+import { Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, OnInit, OnDestroy } from '@angular/core';
 import { TabChild } from 'sql/base/browser/ui/panel/tab.component';
 import { Table } from 'sql/base/browser/ui/table/table';
 import { AgentViewComponent } from 'sql/parts/jobManagement/agent/agentView.component';
@@ -47,7 +47,7 @@ export const ROW_HEIGHT: number = 45;
 	providers: [{ provide: TabChild, useExisting: forwardRef(() => JobsViewComponent) }],
 })

-export class JobsViewComponent extends JobManagementView implements OnInit  {
+export class JobsViewComponent extends JobManagementView implements OnInit, OnDestroy {

 	private columns: Array<Slick.Column<any>> = [
 		{
@@ -91,6 +91,8 @@ export class JobsViewComponent extends JobManagementView implements OnInit  {
 	private jobSchedules: { [jobId: string]: sqlops.AgentJobScheduleInfo[]; } = Object.create(null);
 	public contextAction = NewJobAction;

+	private _didTabChange: boolean;
+
 	@ViewChild('jobsgrid') _gridEl: ElementRef;

 	constructor(
@@ -107,6 +109,7 @@ export class JobsViewComponent extends JobManagementView implements OnInit  {
 		@Inject(IDashboardService) _dashboardService: IDashboardService
 	) {
 		super(commonService, _dashboardService, contextMenuService, keybindingService, instantiationService);
+		this._didTabChange = false;
 		let jobCacheObjectMap = this._jobManagementService.jobCacheObjectMap;
 		let jobCache = jobCacheObjectMap[this._serverName];
 		if (jobCache) {
@@ -126,8 +129,12 @@ export class JobsViewComponent extends JobManagementView implements OnInit  {
 		this._register(this._themeService.onDidColorThemeChange(e => this.updateTheme(e)));
 	}

+	ngOnDestroy() {
+		this._didTabChange = true;
+	}
+
 	public layout() {
-		let jobsViewToolbar = $('jobsview-component .actionbar-container').get(0);
+		let jobsViewToolbar = $('jobsview-component .agent-actionbar-container').get(0);
 		let statusBar = $('.part.statusbar').get(0);
 		if (jobsViewToolbar && statusBar) {
 			let toolbarBottom = jobsViewToolbar.getBoundingClientRect().bottom;
@@ -208,8 +215,10 @@ export class JobsViewComponent extends JobManagementView implements OnInit  {
 				}

 				this._showProgressWheel = false;
-				if (this.isVisible) {
+				if (this.isVisible && !this._didTabChange) {
 					this._cd.detectChanges();
+				} else if (this._didTabChange) {
+					return;
 				}
 			});
 		}
@@ -579,7 +588,7 @@ export class JobsViewComponent extends JobManagementView implements OnInit  {
 	private async curateJobHistory(jobs: sqlops.AgentJobInfo[], ownerUri: string) {
 		const self = this;
 		jobs.forEach(async (job) => {
-			await this._jobManagementService.getJobHistory(ownerUri, job.jobId, job.name).then((result) => {
+			await this._jobManagementService.getJobHistory(ownerUri, job.jobId, job.name).then(async(result) => {
 				if (result) {
 					self.jobSteps[job.jobId] = result.steps ? result.steps : [];
 					self.jobAlerts[job.jobId] = result.alerts ? result.alerts : [];
@@ -594,7 +603,10 @@ export class JobsViewComponent extends JobManagementView implements OnInit  {
 					} else {
 						previousRuns = jobHistories;
 					}
+					// dont create the charts if the tab changed
+					if (!self._didTabChange) {
 						self.createJobChart(job.jobId, previousRuns);
+					}
 					if (self._agentViewComponent.expanded.has(job.jobId)) {
 						let lastJobHistory = jobHistories[jobHistories.length - 1];
 						let item = self.dataView.getItemById(job.jobId + '.error');
--- a/src/sql/parts/jobManagement/views/operatorsView.component.html
+++ b/src/sql/parts/jobManagement/views/operatorsView.component.html
@@ -10,6 +10,6 @@
 	<div class="icon in-progress" *ngIf="_showProgressWheel === true"></div>
 </div>

-<div #actionbarContainer class="actionbar-container"></div>
+<div #actionbarContainer class="agent-actionbar-container"></div>

 <div #operatorsgrid class="joboperatorsview-grid"></div>
--- a/src/sql/parts/jobManagement/views/operatorsView.component.ts
+++ b/src/sql/parts/jobManagement/views/operatorsView.component.ts
@@ -15,7 +15,7 @@ import 'vs/css!sql/base/browser/ui/table/media/table';
 import * as dom from 'vs/base/browser/dom';
 import * as nls from 'vs/nls';
 import * as sqlops from 'sqlops';
-import { Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, OnInit } from '@angular/core';
+import { Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, OnInit, OnDestroy } from '@angular/core';
 import { Table } from 'sql/base/browser/ui/table/table';
 import { AgentViewComponent } from 'sql/parts/jobManagement/agent/agentView.component';
 import { IJobManagementService } from 'sql/parts/jobManagement/common/interfaces';
@@ -42,7 +42,7 @@ export const ROW_HEIGHT: number = 45;
 	providers: [{ provide: TabChild, useExisting: forwardRef(() => OperatorsViewComponent) }],
 })

-export class OperatorsViewComponent extends JobManagementView implements OnInit {
+export class OperatorsViewComponent extends JobManagementView implements OnInit, OnDestroy {

 	private columns: Array<Slick.Column<any>> = [
 		{
@@ -68,6 +68,7 @@ export class OperatorsViewComponent extends JobManagementView implements OnInit
 	private _isCloud: boolean;
 	private _operatorsCacheObject: OperatorsCacheObject;

+	private _didTabChange: boolean;
 	@ViewChild('operatorsgrid') _gridEl: ElementRef;

 	public operators: sqlops.AgentOperatorInfo[];
@@ -104,6 +105,10 @@ export class OperatorsViewComponent extends JobManagementView implements OnInit
 		this._parentComponent = this._agentViewComponent;
 	}

+	ngOnDestroy() {
+		this._didTabChange = true;
+	}
+
 	public layout() {
 		let height = dom.getContentHeight(this._gridEl.nativeElement) - 10;
 		if (height < 0) {
@@ -169,8 +174,10 @@ export class OperatorsViewComponent extends JobManagementView implements OnInit
 					// TODO: handle error
 				}
 				this._showProgressWheel = false;
-				if (this.isVisible) {
+				if (this.isVisible && !this._didTabChange) {
 					this._cd.detectChanges();
+				} else if (this._didTabChange) {
+					return;
 				}
 			});
 		}
--- a/src/sql/parts/jobManagement/views/proxiesView.component.html
+++ b/src/sql/parts/jobManagement/views/proxiesView.component.html
@@ -10,6 +10,6 @@
 	<div class="icon in-progress" *ngIf="_showProgressWheel === true"></div>
 </div>

-<div #actionbarContainer class="actionbar-container"></div>
+<div #actionbarContainer class="agent-actionbar-container"></div>

 <div #proxiesgrid class="jobproxiesview-grid"></div>
--- a/src/sql/parts/jobManagement/views/proxiesView.component.ts
+++ b/src/sql/parts/jobManagement/views/proxiesView.component.ts
@@ -15,7 +15,7 @@ import 'vs/css!sql/base/browser/ui/table/media/table';
 import * as dom from 'vs/base/browser/dom';
 import * as sqlops from 'sqlops';
 import * as nls from 'vs/nls';
-import { Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, OnInit } from '@angular/core';
+import { Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, OnInit, OnDestroy } from '@angular/core';
 import { Table } from 'sql/base/browser/ui/table/table';
 import { AgentViewComponent } from 'sql/parts/jobManagement/agent/agentView.component';
 import { IJobManagementService } from 'sql/parts/jobManagement/common/interfaces';
@@ -42,7 +42,7 @@ export const ROW_HEIGHT: number = 45;
 	providers: [{ provide: TabChild, useExisting: forwardRef(() => ProxiesViewComponent) }],
 })

-export class ProxiesViewComponent extends JobManagementView implements OnInit {
+export class ProxiesViewComponent extends JobManagementView implements OnInit, OnDestroy {

 	private NewProxyText: string = nls.localize('jobProxyToolbar-NewItem', "New Proxy");
 	private RefreshText: string = nls.localize('jobProxyToolbar-Refresh', "Refresh");
@@ -75,6 +75,7 @@ export class ProxiesViewComponent extends JobManagementView implements OnInit {
 	public proxies: sqlops.AgentProxyInfo[];
 	public readonly contextAction = NewProxyAction;

+	private _didTabChange: boolean;
 	@ViewChild('proxiesgrid') _gridEl: ElementRef;

 	constructor(
@@ -108,6 +109,10 @@ export class ProxiesViewComponent extends JobManagementView implements OnInit {
 		this._parentComponent = this._agentViewComponent;
 	}

+	ngOnDestroy() {
+		this._didTabChange = true;
+	}
+
 	public layout() {
 		let height = dom.getContentHeight(this._gridEl.nativeElement) - 10;
 		if (height < 0) {
@@ -172,8 +177,10 @@ export class ProxiesViewComponent extends JobManagementView implements OnInit {
 					// TODO: handle error
 				}
 				this._showProgressWheel = false;
-				if (this.isVisible) {
+				if (this.isVisible && !this._didTabChange) {
 					this._cd.detectChanges();
+				} else if (this._didTabChange) {
+					return;
 				}
 			});
 		}
--- a/src/sql/parts/modelComponents/loadingComponent.component.ts
+++ b/src/sql/parts/modelComponents/loadingComponent.component.ts
@@ -5,7 +5,7 @@

 import 'vs/css!./loadingComponent';
 import {
-	Component, Input, Inject, ChangeDetectorRef, forwardRef, OnDestroy, AfterViewInit, ViewChild, ElementRef
+	Component, Input, Inject, ChangeDetectorRef, forwardRef, OnDestroy, AfterViewInit, ElementRef
 } from '@angular/core';

 import * as sqlops from 'sqlops';
@@ -31,9 +31,6 @@ export default class LoadingComponent extends ComponentBase implements IComponen
 	@Input() descriptor: IComponentDescriptor;
 	@Input() modelStore: IModelStore;

-	@ViewChild('spinnerElement', { read: ElementRef }) private _spinnerElement: ElementRef;
-	@ViewChild('childElement', { read: ElementRef }) private _childElement: ElementRef;
-
 	constructor(
 		@Inject(forwardRef(() => ChangeDetectorRef)) changeRef: ChangeDetectorRef,
 		@Inject(forwardRef(() => ElementRef)) el: ElementRef) {
--- a/src/sql/parts/modelComponents/loadingSpinner.component.ts
+++ b/src/sql/parts/modelComponents/loadingSpinner.component.ts
@@ -0,0 +1,30 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import 'vs/css!./loadingComponent';
+import {
+	Component, Input, Inject, ChangeDetectorRef, forwardRef, ElementRef
+} from '@angular/core';
+
+import * as nls from 'vs/nls';
+
+@Component({
+	selector: 'loading-spinner',
+	template: `
+		<div class="modelview-loadingComponent-container" *ngIf="loading">
+			<div class="modelview-loadingComponent-spinner" *ngIf="loading" [title]=_loadingTitle #spinnerElement></div>
+		</div>
+	`
+})
+export default class LoadingSpinner {
+	private readonly _loadingTitle = nls.localize('loadingMessage', 'Loading');
+
+	@Input() loading: boolean;
+
+	constructor(
+		@Inject(forwardRef(() => ChangeDetectorRef)) changeRef: ChangeDetectorRef,
+		@Inject(forwardRef(() => ElementRef)) el: ElementRef) {
+	}
+}
--- a/src/sql/parts/modelComponents/queryTextEditor.ts
+++ b/src/sql/parts/modelComponents/queryTextEditor.ts
@@ -70,6 +70,9 @@ export class QueryTextEditor extends BaseTextEditor {
 			options.minimap = {
 				enabled: false
 			};
+			options.overviewRulerLanes = 0;
+			options.overviewRulerBorder = false;
+			options.hideCursorInOverviewRuler = true;
 		}
 		return options;
 	}
--- a/src/sql/parts/notebook/cellViews/code.component.html
+++ b/src/sql/parts/notebook/cellViews/code.component.html
@@ -0,0 +1,14 @@
+<!--
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+-->
+<div style="overflow: hidden; width: 100%; height: 100%; display: flex; flex-flow: row">
+	<div #toolbar class="toolbar" style="flex: 0 0 auto; display: flex; flex-flow:column; width: 40px; min-height: 40px; padding-top: 10px; orientation: portrait">
+	</div>
+	<div #editor class="editor" style="flex: 1 1 auto; overflow: hidden;">
+	</div>
+	<div #moreactions class="toolbar" style="flex: 0 0 auto; display: flex; flex-flow:column; width: 20px; min-height: 20px; max-height: 20px; padding-top: 10px; orientation: portrait">
+	</div>
+</div>
--- a/src/sql/parts/notebook/cellViews/code.component.ts
+++ b/src/sql/parts/notebook/cellViews/code.component.ts
@@ -0,0 +1,187 @@
+/*---------------------------------------------------------------------------------------------
+*  Copyright (c) Microsoft Corporation. All rights reserved.
+*  Licensed under the Source EULA. See License.txt in the project root for license information.
+*--------------------------------------------------------------------------------------------*/
+import 'vs/css!./code';
+
+import { OnInit, Component, Input, Inject, forwardRef, ElementRef, ChangeDetectorRef, OnDestroy, ViewChild, Output, EventEmitter } from '@angular/core';
+
+import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service';
+import { AngularDisposable } from 'sql/base/common/lifecycle';
+import { QueryTextEditor } from 'sql/parts/modelComponents/queryTextEditor';
+
+import { IColorTheme, IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
+import * as themeColors from 'vs/workbench/common/theme';
+import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
+import { SimpleProgressService } from 'vs/editor/standalone/browser/simpleServices';
+import { IProgressService } from 'vs/platform/progress/common/progress';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { ITextModel } from 'vs/editor/common/model';
+import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput';
+import URI from 'vs/base/common/uri';
+import { localize } from 'vs/nls';
+import { Action } from 'vs/base/common/actions';
+import { ActionBar, ActionsOrientation } from 'vs/base/browser/ui/actionbar/actionbar';
+import { Schemas } from 'vs/base/common/network';
+import * as DOM from 'vs/base/browser/dom';
+import { IModeService } from 'vs/editor/common/services/modeService';
+import { IModelService } from 'vs/editor/common/services/modelService';
+import { IContextMenuService, IContextViewService } from 'vs/platform/contextview/browser/contextView';
+import { ICellModel } from 'sql/parts/notebook/models/modelInterfaces';
+import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar';
+import { RunCellAction, DeleteCellAction, AddCellAction, CellContext } from 'sql/parts/notebook/cellViews/codeActions';
+import { NotebookModel } from 'sql/parts/notebook/models/notebookModel';
+import { ToggleMoreWidgetAction } from 'sql/parts/dashboard/common/actions';
+import { CellTypes } from 'sql/parts/notebook/models/contracts';
+import { INotificationService } from 'vs/platform/notification/common/notification';
+
+export const CODE_SELECTOR: string = 'code-component';
+
+@Component({
+	selector: CODE_SELECTOR,
+	templateUrl: decodeURI(require.toUrl('./code.component.html'))
+})
+export class CodeComponent extends AngularDisposable implements OnInit {
+	@ViewChild('toolbar', { read: ElementRef }) private toolbarElement: ElementRef;
+	@ViewChild('moreactions', { read: ElementRef }) private moreactionsElement: ElementRef;
+	@ViewChild('editor', { read: ElementRef }) private codeElement: ElementRef;
+	@Input() cellModel: ICellModel;
+
+	@Output() public onContentChanged = new EventEmitter<void>();
+
+	@Input() set model(value: NotebookModel) {
+		this._model = value;
+	}
+
+	protected _actionBar: Taskbar;
+	protected _moreActions: ActionBar;
+	private readonly _minimumHeight = 30;
+	private _editor: QueryTextEditor;
+	private _editorInput: UntitledEditorInput;
+	private _editorModel: ITextModel;
+	private _uri: string;
+	private _model: NotebookModel;
+
+	constructor(
+		@Inject(forwardRef(() => CommonServiceInterface)) private _bootstrapService: CommonServiceInterface,
+		@Inject(forwardRef(() => ChangeDetectorRef)) private _changeRef: ChangeDetectorRef,
+		@Inject(IWorkbenchThemeService) private themeService: IWorkbenchThemeService,
+		@Inject(IInstantiationService) private _instantiationService: IInstantiationService,
+		@Inject(IModelService) private _modelService: IModelService,
+		@Inject(IModeService) private _modeService: IModeService,
+		@Inject(IContextMenuService) private contextMenuService: IContextMenuService,
+		@Inject(IContextViewService) private contextViewService: IContextViewService,
+		@Inject(INotificationService) private notificationService: INotificationService,
+	) {
+		super();
+	}
+
+	ngOnInit() {
+		this._register(this.themeService.onDidColorThemeChange(this.updateTheme, this));
+		this.updateTheme(this.themeService.getColorTheme());
+		this.initActionBar();
+	}
+
+	ngOnChanges() {
+		this.updateLanguageMode();
+		this.updateModel();
+	}
+
+	ngAfterContentInit(): void {
+		this.createEditor();
+		this._register(DOM.addDisposableListener(window, DOM.EventType.RESIZE, e => {
+			this.layout();
+		}));
+	}
+
+	get model(): NotebookModel {
+		return this._model;
+	}
+
+	private createEditor(): void {
+		let instantiationService = this._instantiationService.createChild(new ServiceCollection([IProgressService, new SimpleProgressService()]));
+		this._editor = instantiationService.createInstance(QueryTextEditor);
+		this._editor.create(this.codeElement.nativeElement);
+		this._editor.setVisible(true);
+		this._editor.setMinimumHeight(this._minimumHeight);
+		let uri = this.createUri();
+		this._editorInput = instantiationService.createInstance(UntitledEditorInput, uri, false, this.cellModel.language, '', '');
+		this._editor.setInput(this._editorInput, undefined);
+		this._editorInput.resolve().then(model => {
+			this._editorModel = model.textEditorModel;
+			this._modelService.updateModel(this._editorModel, this.cellModel.source);
+		});
+
+		this._register(this._editor);
+		this._register(this._editorInput);
+		this._register(this._editorModel.onDidChangeContent(e => {
+			this._editor.setHeightToScrollHeight();
+			this.cellModel.source = this._editorModel.getValue();
+			this.onContentChanged.emit();
+		}));
+		this.layout();
+	}
+
+	public layout(): void {
+		this._editor.layout(new DOM.Dimension(
+			DOM.getContentWidth(this.codeElement.nativeElement),
+			DOM.getContentHeight(this.codeElement.nativeElement)));
+		this._editor.setHeightToScrollHeight();
+	}
+
+	protected initActionBar() {
+		let context = new CellContext(this.model, this.cellModel);
+		let runCellAction = this._instantiationService.createInstance(RunCellAction);
+
+		let taskbar = <HTMLElement>this.toolbarElement.nativeElement;
+		this._actionBar = new Taskbar(taskbar, this.contextMenuService);
+		this._actionBar.context = context;
+		this._actionBar.setContent([
+			{ action: runCellAction }
+		]);
+
+		let moreActionsElement = <HTMLElement>this.moreactionsElement.nativeElement;
+		this._moreActions = new ActionBar(moreActionsElement, { orientation: ActionsOrientation.VERTICAL });
+		this._moreActions.context = { target: moreActionsElement };
+
+		let actions: Action[] = [];
+		actions.push(this._instantiationService.createInstance(AddCellAction, 'codeBefore', localize('codeBefore', 'Insert Code before'), CellTypes.Code, false));
+		actions.push(this._instantiationService.createInstance(AddCellAction, 'codeAfter', localize('codeAfter', 'Insert Code after'), CellTypes.Code, true));
+		actions.push(this._instantiationService.createInstance(AddCellAction, 'markdownBefore', localize('markdownBefore', 'Insert Markdown before'), CellTypes.Markdown, false));
+		actions.push(this._instantiationService.createInstance(AddCellAction, 'markdownAfter', localize('markdownAfter', 'Insert Markdown after'), CellTypes.Markdown, true));
+		actions.push(this._instantiationService.createInstance(DeleteCellAction, 'delete', localize('delete', 'Delete')));
+
+		this._moreActions.push(this._instantiationService.createInstance(ToggleMoreWidgetAction, actions, context), { icon: true, label: false });
+	}
+
+	private createUri(): URI {
+		let uri = URI.from({ scheme: Schemas.untitled, path: `notebook-editor-${this.cellModel.id}` });
+		// Use this to set the internal (immutable) and public (shared with extension) uri properties
+		this.cellModel.cellUri = uri;
+		return uri;
+	}
+
+	/// Editor Functions
+	private updateModel() {
+		if (this._editorModel) {
+			this._modelService.updateModel(this._editorModel, this.cellModel.source);
+		}
+	}
+
+	private updateLanguageMode() {
+		if (this._editorModel && this._editor) {
+			this._modeService.getOrCreateMode(this.cellModel.language).then((modeValue) => {
+				this._modelService.setMode(this._editorModel, modeValue);
+			});
+		}
+	}
+
+	private updateTheme(theme: IColorTheme): void {
+		let toolbarEl = <HTMLElement>this.toolbarElement.nativeElement;
+		toolbarEl.style.borderRightColor = theme.getColor(themeColors.SIDE_BAR_BACKGROUND, true).toString();
+
+		let moreactionsEl = <HTMLElement>this.moreactionsElement.nativeElement;
+		moreactionsEl.style.borderRightColor = theme.getColor(themeColors.SIDE_BAR_BACKGROUND, true).toString();
+	}
+
+}
--- a/src/sql/parts/notebook/cellViews/code.css
+++ b/src/sql/parts/notebook/cellViews/code.css
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+
+code-component {
+	height: 100%;
+	width: 100%;
+	display: block;
+}
+
+code-component .toolbar {
+	border-right-width: 1px;
+	border-right-style: solid;
+}
+
+code-component .toolbarIconRun {
+	height: 20px;
+	background-image: url('../media/light/execute_cell.svg');
+	padding-bottom: 10px;
+}
+
+.vs-dark code-component .toolbarIconRun,
+.hc-black code-component .toolbarIconRun {
+	background-image: url('../media/dark/execute_cell_inverse.svg');
+}
+
+code-component .toolbarIconStop {
+	height: 20px;
+	background-image: url('../media/light/stop_cell.svg');
+	padding-bottom: 10px;
+}
+
+.vs-dark code-component .toolbarIconStop,
+.hc-black code-component .toolbarIconStop {
+	background-image: url('../media/dark/stop_cell_inverse.svg');
+}
+
+/* overview ruler */
+code-component .monaco-editor .decorationsOverviewRuler {
+	visibility: hidden;
+}
+
+code-component .carbon-taskbar .icon {
+	background-size: 20px;
+	width: 40px;
+}
+
+code-component .action-label.icon.toggle-more {
+	height: 20px;
+	width: 20px;
+}
+
+code-component .carbon-taskbar.monaco-toolbar .monaco-action-bar.animated .actions-container
+{
+	padding-left: 10px
+}
--- a/src/sql/parts/notebook/cellViews/codeActions.ts
+++ b/src/sql/parts/notebook/cellViews/codeActions.ts
@@ -0,0 +1,187 @@
+/*---------------------------------------------------------------------------------------------
+*  Copyright (c) Microsoft Corporation. All rights reserved.
+*  Licensed under the Source EULA. See License.txt in the project root for license information.
+*--------------------------------------------------------------------------------------------*/
+
+import { nb } from 'sqlops';
+
+import { Action } from 'vs/base/common/actions';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { localize } from 'vs/nls';
+import { CellType } from 'sql/parts/notebook/models/contracts';
+import { NotebookModel } from 'sql/parts/notebook/models/notebookModel';
+import { getErrorMessage } from 'sql/parts/notebook/notebookUtils';
+import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
+import { ICellModel, FutureInternal } from 'sql/parts/notebook/models/modelInterfaces';
+import { ToggleableAction } from 'sql/parts/notebook/notebookActions';
+
+let notebookMoreActionMsg = localize('notebook.failed', "Please select active cell and try again");
+
+function hasModelAndCell(context: CellContext, notificationService: INotificationService): boolean  {
+	if (!context || !context.model) {
+		return false;
+	}
+	if (context.cell === undefined) {
+		notificationService.notify({
+			severity: Severity.Error,
+			message: notebookMoreActionMsg
+		});
+		return false;
+	}
+	return true;
+}
+
+export class CellContext {
+	constructor(public model: NotebookModel, private _cell?: ICellModel) {
+	}
+
+	public get cell(): ICellModel {
+		return this._cell ? this._cell : this.model.activeCell;
+	}
+}
+
+abstract class CellActionBase extends Action {
+
+	constructor(id: string, label: string, icon: string, protected notificationService: INotificationService) {
+		super(id, label, icon);
+	}
+
+	public run(context: CellContext): TPromise<boolean> {
+		if (hasModelAndCell(context, this.notificationService)) {
+			return TPromise.wrap(this.runCellAction(context).then(() => true));
+		}
+		return TPromise.as(true);
+	}
+
+	abstract runCellAction(context: CellContext): Promise<void>;
+}
+
+export class RunCellAction extends ToggleableAction {
+	public static ID = 'notebook.runCell';
+	public static LABEL = 'Run cell';
+
+	constructor(@INotificationService private notificationService: INotificationService) {
+		super(RunCellAction.ID, {
+			shouldToggleTooltip: true,
+			toggleOnLabel: localize('runCell', 'Run cell'),
+			toggleOnClass: 'toolbarIconRun',
+			toggleOffLabel: localize('stopCell', 'Cancel execution'),
+			toggleOffClass: 'toolbarIconStop',
+			isOn: true
+		});
+	}
+
+	public run(context: CellContext): TPromise<boolean> {
+		if (hasModelAndCell(context, this.notificationService)) {
+			return TPromise.wrap(this.runCellAction(context).then(() => true));
+		}
+		return TPromise.as(true);
+	}
+
+	public async runCellAction(context: CellContext): Promise<void> {
+        try {
+			let model = context.model;
+			let cell = context.cell;
+            let kernel = await this.getOrStartKernel(model);
+            if (!kernel) {
+                return;
+			}
+            // If cell is currently running and user clicks the stop/cancel button, call kernel.interrupt()
+            // This matches the same behavior as JupyterLab
+            if (cell.future && cell.future.inProgress) {
+                cell.future.inProgress = false;
+                await kernel.interrupt();
+            } else {
+                // TODO update source based on editor component contents
+                let content = cell.source;
+                if (content) {
+                    this.toggle(false);
+                    let future = await kernel.requestExecute({
+                        code: content,
+                        stop_on_error: true
+                    }, false);
+                    cell.setFuture(future as FutureInternal);
+                    // For now, await future completion. Later we should just track and handle cancellation based on model notifications
+                    let reply = await future.done;
+                }
+            }
+        } catch (error) {
+            let message = getErrorMessage(error);
+            this.notificationService.error(message);
+        } finally {
+            this.toggle(true);
+		}
+    }
+
+    private async getOrStartKernel(model: NotebookModel): Promise<nb.IKernel> {
+        let clientSession = model && model.clientSession;
+        if (!clientSession) {
+            this.notificationService.error(localize('notebookNotReady', 'The session for this notebook is not yet ready'));
+            return undefined;
+        } else if (!clientSession.isReady || clientSession.status === 'dead') {
+            this.notificationService.info(localize('sessionNotReady', 'The session for this notebook will start momentarily'));
+            await clientSession.kernelChangeCompleted;
+        }
+        if (!clientSession.kernel) {
+            let defaultKernel = model && model.defaultKernel && model.defaultKernel.name;
+            if (!defaultKernel) {
+                this.notificationService.error(localize('noDefaultKernel', 'No kernel is available for this notebook'));
+                return undefined;
+            }
+            await clientSession.changeKernel({
+                name: defaultKernel
+            });
+        }
+        return clientSession.kernel;
+    }
+}
+
+export class AddCellAction extends CellActionBase {
+	constructor(
+		id: string, label: string, private cellType: CellType, private isAfter: boolean,
+		@INotificationService notificationService: INotificationService
+	) {
+		super(id, label, undefined, notificationService);
+	}
+
+	runCellAction(context: CellContext): Promise<void> {
+		try {
+			let model = context.model;
+			let index = model.cells.findIndex((cell) => cell.id === context.cell.id);
+			if (index !== undefined && this.isAfter) {
+				index += 1;
+			}
+			model.addCell(this.cellType, index);
+		} catch (error) {
+			let message = getErrorMessage(error);
+
+			this.notificationService.notify({
+				severity: Severity.Error,
+				message: message
+			});
+		}
+		return Promise.resolve();
+	}
+}
+
+export class DeleteCellAction extends CellActionBase {
+	constructor(id: string, label: string,
+		@INotificationService notificationService: INotificationService
+	) {
+		super(id, label, undefined, notificationService);
+	}
+
+	runCellAction(context: CellContext): Promise<void> {
+		try {
+				context.model.deleteCell(context.cell);
+		} catch (error) {
+			let message = getErrorMessage(error);
+
+			this.notificationService.notify({
+				severity: Severity.Error,
+				message: message
+			});
+		}
+		return Promise.resolve();
+	}
+}
--- a/src/sql/parts/notebook/cellViews/codeCell.component.html
+++ b/src/sql/parts/notebook/cellViews/codeCell.component.html
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+-->
+<div style="overflow: hidden; width: 100%; height: 100%; display: flex; flex-flow: column">
+	<div class="notebook-code" style="flex: 0 0 auto;">
+		<code-component [cellModel]="cellModel" [model]="model"></code-component>
+	</div>
+	<div #codeCellOutput class="notebook-output" style="flex: 0 0 auto;">
+		<output-area-component *ngIf="cellModel.outputs && cellModel.outputs.length > 0" [cellModel]="cellModel">
+		</output-area-component>
+	</div>
+</div>
--- a/src/sql/parts/notebook/cellViews/codeCell.component.ts
+++ b/src/sql/parts/notebook/cellViews/codeCell.component.ts
@@ -0,0 +1,63 @@
+/*---------------------------------------------------------------------------------------------
+*  Copyright (c) Microsoft Corporation. All rights reserved.
+*  Licensed under the Source EULA. See License.txt in the project root for license information.
+*--------------------------------------------------------------------------------------------*/
+import 'vs/css!./codeCell';
+
+import { OnInit, Component, Input, Inject, forwardRef, ElementRef, ChangeDetectorRef, OnDestroy, ViewChild } from '@angular/core';
+
+import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service';
+import { CellView } from 'sql/parts/notebook/cellViews/interfaces';
+
+import { IColorTheme, IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
+import * as themeColors from 'vs/workbench/common/theme';
+import { ICellModel } from 'sql/parts/notebook/models/modelInterfaces';
+import { NotebookModel } from 'sql/parts/notebook/models/notebookModel';
+
+
+export const CODE_SELECTOR: string = 'code-cell-component';
+
+@Component({
+	selector: CODE_SELECTOR,
+	templateUrl: decodeURI(require.toUrl('./codeCell.component.html'))
+})
+export class CodeCellComponent extends CellView implements OnInit {
+	@ViewChild('codeCellOutput', { read: ElementRef }) private outputPreview: ElementRef;
+	private _model: NotebookModel;
+	@Input() cellModel: ICellModel;
+	@Input() set model(value: NotebookModel) {
+		this._model = value;
+	}
+
+	constructor(
+		@Inject(forwardRef(() => ChangeDetectorRef)) private _changeRef: ChangeDetectorRef,
+		@Inject(IWorkbenchThemeService) private themeService: IWorkbenchThemeService
+	) {
+		super();
+	}
+
+	ngOnInit() {
+		this._register(this.themeService.onDidColorThemeChange(this.updateTheme, this));
+		this.updateTheme(this.themeService.getColorTheme());
+		if (this.cellModel) {
+			this.cellModel.onOutputsChanged(() => {
+				this._changeRef.detectChanges();
+			});
+		}
+	}
+
+	// Todo: implement layout
+	public layout() {
+
+	}
+
+	private updateTheme(theme: IColorTheme): void {
+		let outputElement = <HTMLElement>this.outputPreview.nativeElement;
+		outputElement.style.borderTopColor = theme.getColor(themeColors.SIDE_BAR_BACKGROUND, true).toString();
+	}
+
+	get model(): NotebookModel {
+		return this._model;
+	}
+
+}
--- a/src/sql/parts/notebook/cellViews/codeCell.css
+++ b/src/sql/parts/notebook/cellViews/codeCell.css
@@ -0,0 +1,14 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+code-cell-component {
+	display: block;
+}
+
+code-cell-component .notebook-output {
+	border-top-width: 1px;
+	border-top-style: solid;
+	user-select: initial;
+}
--- a/src/sql/parts/notebook/cellViews/interfaces.ts
+++ b/src/sql/parts/notebook/cellViews/interfaces.ts
@@ -0,0 +1,17 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { OnDestroy } from '@angular/core';
+import { AngularDisposable } from 'sql/base/common/lifecycle';
+
+export abstract class CellView extends AngularDisposable implements OnDestroy {
+	constructor() {
+		super();
+	}
+
+	public abstract layout(): void;
+}
+
+
--- a/src/sql/parts/notebook/cellViews/output.component.html
+++ b/src/sql/parts/notebook/cellViews/output.component.html
@@ -0,0 +1,11 @@
+<!--
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+-->
+<div style="overflow: hidden; width: 100%; height: 100%; display: flex; flex-flow: column">
+	<div style="flex: 0 0 auto; user-select: initial;">
+		<div #output ></div>
+	</div>
+</div>
--- a/src/sql/parts/notebook/cellViews/output.component.ts
+++ b/src/sql/parts/notebook/cellViews/output.component.ts
@@ -0,0 +1,95 @@
+/*---------------------------------------------------------------------------------------------
+*  Copyright (c) Microsoft Corporation. All rights reserved.
+*  Licensed under the Source EULA. See License.txt in the project root for license information.
+*--------------------------------------------------------------------------------------------*/
+import 'vs/css!./code';
+
+import { OnInit, Component, Input, Inject, forwardRef, ElementRef, ChangeDetectorRef, OnDestroy, ViewChild, Output, EventEmitter } from '@angular/core';
+import { AngularDisposable } from 'sql/base/common/lifecycle';
+import { nb } from 'sqlops';
+import { INotebookService } from 'sql/services/notebook/notebookService';
+import { MimeModel } from 'sql/parts/notebook/outputs/common/mimemodel';
+import * as outputProcessor from '../outputs/common/outputProcessor';
+import { RenderMimeRegistry } from 'sql/parts/notebook/outputs/registry';
+import 'vs/css!sql/parts/notebook/outputs/style/index';
+
+export const OUTPUT_SELECTOR: string = 'output-component';
+
+@Component({
+	selector: OUTPUT_SELECTOR,
+	templateUrl: decodeURI(require.toUrl('./output.component.html'))
+})
+export class OutputComponent extends AngularDisposable implements OnInit {
+	@ViewChild('output', { read: ElementRef }) private outputElement: ElementRef;
+	@Input() cellOutput: nb.ICellOutput;
+	private _trusted: boolean;
+	private _initialized: boolean = false;
+	private readonly _minimumHeight = 30;
+	registry: RenderMimeRegistry;
+
+
+	constructor(
+		@Inject(INotebookService) private _notebookService: INotebookService
+	) {
+		super();
+		this.registry = _notebookService.getMimeRegistry();
+	}
+
+	ngOnInit() {
+		this.renderOutput();
+		this._initialized = true;
+	}
+
+	private renderOutput() {
+		let node = this.outputElement.nativeElement;
+		let output = this.cellOutput;
+		let options = outputProcessor.getBundleOptions({ value: output, trusted: this.trustedMode });
+		// TODO handle safe/unsafe mapping
+		this.createRenderedMimetype(options, node);
+	}
+
+	public layout(): void {
+	}
+
+	get trustedMode(): boolean {
+		return this._trusted;
+	}
+
+	@Input()
+	set trustedMode(value: boolean) {
+		this._trusted = value;
+		if (this._initialized) {
+			this.renderOutput();
+		}
+	}
+
+	protected createRenderedMimetype(options: MimeModel.IOptions, node: HTMLElement): void {
+		let mimeType = this.registry.preferredMimeType(
+			options.data,
+			options.trusted ? 'any' : 'ensure'
+		);
+		if (mimeType) {
+			let output = this.registry.createRenderer(mimeType);
+			output.node = node;
+			let model = new MimeModel(options);
+			output.renderModel(model).catch(error => {
+				// Manually append error message to output
+				output.node.innerHTML = `<pre>Javascript Error: ${error.message}</pre>`;
+				// Remove mime-type-specific CSS classes
+				output.node.className = 'p-Widget jp-RenderedText';
+				output.node.setAttribute(
+					'data-mime-type',
+					'application/vnd.jupyter.stderr'
+				);
+			});
+			//this.setState({ node: node });
+		} else {
+			// TODO Localize
+			node.innerHTML =
+				`No ${options.trusted ? '' : '(safe) '}renderer could be ` +
+				'found for output. It has the following MIME types: ' +
+				Object.keys(options.data).join(', ');
+			//this.setState({ node: node });
+		}
+	}
+}
--- a/src/sql/parts/notebook/cellViews/outputArea.component.html
+++ b/src/sql/parts/notebook/cellViews/outputArea.component.html
@@ -0,0 +1,12 @@
+<!--
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+-->
+<div style="overflow: hidden; width: 100%; height: 100%; display: flex; flex-flow: column">
+	<div style="flex: 0 0 auto;">
+		<output-component *ngFor="let output of cellModel.outputs" [cellOutput]="output" [trustedMode] = "cellModel.trustedMode" >
+		</output-component>
+	</div>
+</div>
--- a/src/sql/parts/notebook/cellViews/outputArea.component.ts
+++ b/src/sql/parts/notebook/cellViews/outputArea.component.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.
+*--------------------------------------------------------------------------------------------*/
+import 'vs/css!./code';
+import { OnInit, Component, Input, Inject, forwardRef, ChangeDetectorRef } from '@angular/core';
+import { AngularDisposable } from 'sql/base/common/lifecycle';
+import { ICellModel } from 'sql/parts/notebook/models/modelInterfaces';
+
+export const OUTPUT_AREA_SELECTOR: string = 'output-area-component';
+
+@Component({
+	selector: OUTPUT_AREA_SELECTOR,
+	templateUrl: decodeURI(require.toUrl('./outputArea.component.html'))
+})
+export class OutputAreaComponent extends AngularDisposable implements OnInit {
+	@Input() cellModel: ICellModel;
+
+	private readonly _minimumHeight = 30;
+
+	constructor(
+		@Inject(forwardRef(() => ChangeDetectorRef)) private _changeRef: ChangeDetectorRef,
+	) {
+		super();
+	}
+	ngOnInit(): void {
+		if (this.cellModel) {
+			this.cellModel.onOutputsChanged(() => {
+				this._changeRef.detectChanges();
+			});
+		}
+	}
+}
--- a/src/sql/parts/notebook/cellViews/textCell.component.html
+++ b/src/sql/parts/notebook/cellViews/textCell.component.html
@@ -0,0 +1,13 @@
+<!--
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+-->
+<div style="overflow: hidden; width: 100%; height: 100%; display: flex; flex-flow: column">
+	<div class="notebook-text" style="flex: 0 0 auto;">
+		<code-component *ngIf="isEditMode" [cellModel]="cellModel" (onContentChanged)="handleContentChanged()"></code-component>
+	</div>
+	<div #preview class="notebook-preview" style="flex: 0 0 auto;" (dblclick)="toggleEditMode()">
+	</div>
+</div>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Karl Burtram	15ae55136f	Bump event-stream to 3.3.4	2018-11-26 16:34:03 -08:00
Karl Burtram	b18abd954f	Update Azure Data Studio to 1.3.3	2018-11-26 16:32:34 -08:00
Allen Cook	b45f79a1f8	Add Routine_Type to CreateStoredProc fixes #3257 (#3286 )	2018-11-26 15:26:12 -08:00
Alan Ren	01a03b4c84	revert the taskbar icon size change (#3306 )	2018-11-26 15:14:36 -08:00
Anthony Dresser	e48328af34	Handle qp clear input correctly (#3258 ) * handle clearing xml in qp view * formatting	2018-11-26 14:49:06 -08:00
Anthony Dresser	8925d44807	Result Streaming (#3124 ) * handle releasing data when the grid is unrendered * update sqlops * add complete to sqlops * update protocol * update protocol * formatting * update sqlops.d.ts * stash * better handling of results streaming * formatting * improvments to result streaming * bump slickgrid and address a performance bottleneck * remove unnecessary code * formatting * update locks * optimize large values in the grid * formatting * formatting * update yarn * bump packages * yarn * bump * yarn lock * locking * yarn	2018-11-26 14:30:35 -08:00
Karl Burtram	213283510f	Bump SQL Tools to 1.5.0-alpha.58 for results streaming	2018-11-26 13:54:56 -08:00
Alan Ren	9f8190dc28	make taskbar more readable (#3290 )	2018-11-20 15:09:24 -08:00
Alan Ren	c32d4ee2f7	fix for 3245 (#3281 )	2018-11-19 14:47:41 -08:00
Aditya Bist	2c867a4b2c	unlocalized string (#3259 )	2018-11-17 08:37:42 -08:00
Alan Ren	da5194bdcb	fix for 3262 (#3263 )	2018-11-16 21:19:32 -08:00
Chris LaFreniere	bbb27aed10	Notebook: Re-Enable Attach to Dropdown Functionality (#3250 ) * first attach to working * Transfer changes from sqlopsstudioextensions PR 448 * Transfer changes from sqlopsstudioextensions PR 447 * Transfer changes from sqlopsstudioextensions PR 456 * Transfer changes from sqlopsstudioextensions PR 465 * Transfer changes from sqlopsstudioextensions PR 463 * Transfer changes from sqlopsstudioextensions PR 482 * Transfer changes from sqlopsstudioextensions PR 485 * Session and Kernel implementation except executeRequest * Attach to port compiling * Further tweaks to attach to dropdown, re-enable opening connection dialog * Revert "Merge remote-tracking branch 'origin/Notebook/sessionExtension' into feature/workingAttachTo" This reverts commit 94703db87c85416c4ae36762afc1094d6e71166a, reversing changes made to e4dc25331036d259e9c762cfe8741f957bb5c590. * Fix code formatting * Fix for new Add new connection issue	2018-11-16 20:47:58 -08:00
Alan Ren	c02fbaeae7	min height for event detail view when expanding (#3255 )	2018-11-16 15:07:56 -08:00
Karl Burtram	847218da73	Disconnect Object Explorer node when session is disconnected from SQL Tools Service (#3249 ) * WIP * WIP * Send disconnect event to OE * Bump dataprotocol to 0.2.9 * Cleanupps * Address a couple feedback	2018-11-16 13:08:20 -08:00
Kevin Cunnane	90dc788893	Implement Session support through the extension host (#3228 ) Full plumb through of Session support. Also fixed some test issues - Load session and get necessary information in kernels list - Run Cell button now works as expected - Added a ToggleAction base class which can be used for anything that switches icons. I'd still prefer to have this be dynamic and as clean as the extension classes - Fixed account test unhandled promise rejections (caused by incorrect / invalid tests) that made it hard to see all the test run output.	2018-11-16 10:35:03 -08:00
Karl Burtram	f3525cc555	Bump Azure Data Studio to 1.3.2	2018-11-15 17:24:12 -08:00
abist	198f243181	scoped the agent action bar class style	2018-11-15 16:11:20 -08:00
Alan Ren	8e049f4af5	align the radio button with text (#3241 )	2018-11-15 14:01:32 -08:00
Danny McCormick	ff465a59b6	Remove travis and appveyor (#3234 ) * Delete .travis.yml * Delete appveyor.yml	2018-11-15 11:52:36 -08:00
Danny McCormick	68b4f3ca04	Add Azure Pipelines status badge (#3233 )	2018-11-15 11:51:42 -08:00
Chris LaFreniere	6b31f2b3f2	Stop Showing Overview Rulers in Notebooks (#3226 ) * Stop showing decorationsOverviewRuler in notebook code cells by setting hidden visibility in css * Also change overviewRuler options in IEdtorOptions for safety * address CR comments in css file	2018-11-15 11:47:03 -08:00
Raj	63cf0f1548	Trusted/Not-trusted functionality implementation (#3211 ) * 3194: Hookup trusted/not-trusted functionality and css changes * 3194: Trusted implementation changes * 3194: Code review changes * 3225: No border in between code-cell and output	2018-11-14 19:07:10 -08:00
Yurong He	e607f68b3e	Add more actions to cell (#3217 ) * Added toggle more actions to cell * Resolve PR comments -- Added INotificationService for notification msg * Reduced ToggleMoreAction to smaller size. So the dropdown could be displayed closer to it instead of at the buttom of the cell.	2018-11-14 17:51:59 -08:00
Yurong He	db3bb82dbd	Change code and text font to 11 (#3216 ) Ajust the padding top to 0 Change task bar height to 36	2018-11-14 15:36:24 -08:00
Yurong He	5889c600fa	Resend selectBox change to on against master. PR against nativeNotebook was approved already. (#3215 )	2018-11-14 13:48:41 -08:00
Matt Irvine	d7d4c7236c	Update azure-pipelines-windows file test path (#3214 )	2018-11-14 13:41:55 -08:00
Kevin Cunnane	f54d8ce36f	Merge changes from the Notebook feature branch. These will be preserved as they have important history.	2018-11-14 11:33:59 -08:00
Kevin Cunnane	43faa13cb5	Add notebook feature flag that is enabled by default (#3210 ) * Add notebook feature flag that is enabled by default - After this, the `notebook.enabled` flag must be set to true when testing notebook integration	2018-11-14 11:33:22 -08:00
Matt Irvine	85a2d994f3	Don't close connection dialog when cancelling a connection (#3207 )	2018-11-13 16:44:26 -08:00
Kevin Cunnane	d8cd78cd6b	Merge master	2018-11-13 16:35:17 -08:00
Alan Ren	3e59a5bcd2	update version to 0.4.0 (#3205 )	2018-11-13 15:20:31 -08:00
Aditya Bist	0efb89d6ff	fix loading perf when switching tabs (#3169 )	2018-11-13 13:06:45 -08:00
Matt Irvine	6697c075cb	Use newer version of request in azurecore (#3202 )	2018-11-13 12:59:16 -08:00
Chris LaFreniere	06660160e7	Vertical Toolbar Improvements and Fix for Untitled File Load Issue (#3189 ) * Add horizontal toolbar * Add vertical toolbar * Fix for untitled scheme file load * further fixes to vertical toolbar * Addressing PR comments	2018-11-13 11:05:54 -08:00
Kevin Cunnane	0b571737b7	Support notebook file types contribution (#3196 ) * Support notebook file types contribution - Extensions can define a provider and what file types it should be used for - Verified that this works for Jupyter Content & Server Managers. - Starts Jupyter server as expected Not in this PR: - Support for session manager end to end - Tests	2018-11-12 17:32:53 -08:00
Raj	0a486a280d	3190: Code and Text cells from tool bar (#3191 ) * 3190: Code and Text cells from tool bar * 3190: Adding images under media folder and to css	2018-11-12 11:41:02 -08:00
Alan Ren	bd53e685d0	bump to .53 (#3187 )	2018-11-09 10:57:30 -08:00
Raj	a2bbf3f44e	3147: Notebook markdown cell should be opened in preview mode (#3168 ) * 3147: Notebook markdown cell should be opened in preview mode * 3147: Default ability to double click a cell to add text * Misc changes * CSS cleanup * Localization stuff * Remove constants file in Notebook codebase	2018-11-09 10:38:14 -08:00
Alan Ren	410bb62906	fix for stop session error and session selection lost issue (#3167 ) * fix for stop session error and session selection lost issue * remove the console.error call	2018-11-08 16:51:39 -08:00
Alan Ren	cbb4ac3e20	make it preserve the line breaks (#3176 )	2018-11-08 16:34:27 -08:00
Yurong He	7508192ab9	Added empty kernel and hook up with Kernel drop down (#3173 ) * Initial toolbar work - This is in-progress and needs additional fixes * Resolve PR comments * Added empty kernel and hook up with Kernel dropdown * Resolve PR comments	2018-11-08 14:27:20 -08:00
Raj	bbf6cbd8fb	Hookup trusted flag to both code cell and markdown preview (#3166 ) * 1133: Notebook file registration changes * File registration stuff * Yarn files * Outputview Changes * Misc changes * Changes to code component name space * Output view changes * notebook output view changes * Latest changes * Output view changes * Code review changes on output view * CSS file and misc changes * Hookup trusted mode to code cell and markdown * Return default sanitizer * Misc changes - code review comments	2018-11-08 14:12:59 -08:00
Kevin Cunnane	9765269d27	Begin defining Extension-based Notebook Provider (#3172 ) Implements provider contribution in the MainThreadNotebook, with matching function calls in the ExtHostNotebook class. This will allow us to proxy through notebook providers (specifically, creation of a notebook manager with required content, server managers) from an extension up through to the main process. Implemented in this PR: - Callthroughs for content and server manager APIs - Very basic unit tests covering provider & manager registration Not implemented: - Fuller unit tests on the specific callthrough methods for content & server manager. - Contribution point needed to test this (so we can actually pass through the extension's existing Notebook implementation)	2018-11-08 13:06:40 -08:00
Alan Ren	61746b7ff7	Update UX-Design-Guidelines.md	2018-11-08 10:37:45 -08:00
Alan Ren	e6066c2cb5	Rename UX-Design-Guidelines to UX-Design-Guidelines.md	2018-11-08 10:29:43 -08:00
Alan Ren	633a918590	Create UX-Design-Guidelines	2018-11-08 10:29:16 -08:00
Raj	71c14a0837	Output view changes (#3146 ) * 1133: Notebook file registration changes * File registration stuff * Yarn files * Outputview Changes * Misc changes * Changes to code component name space * Output view changes * notebook output view changes * Latest changes * Output view changes * Code review changes on output view * CSS file and misc changes	2018-11-07 14:19:33 -08:00
Alan Ren	9bbed2c275	fix for issue 3157 (#3158 ) * fix for issue 3157 * use state instead of _state	2018-11-07 12:00:51 -08:00
Alan Ren	d9ba4d9130	profiler improvements (#3151 ) * profiler improvements * fix for issue 3114	2018-11-07 11:25:24 -08:00
Kevin Cunnane	ecd40de7ec	Integrate notebook service with notebook UI (#3143 ) Port notebookView code over to notebook.component.ts. Integrate loading of notebook contents into the UI	2018-11-06 16:31:37 -08:00
Olivier Truong	e2bd6c06ec	typo (#3025 ) without instead of wihtout	2018-11-06 11:22:27 -08:00
Karl Burtram	a26be76d79	Update readme for Nov release (#3138 )	2018-11-06 11:21:40 -08:00
Danny McCormick	3b68c1eb69	Add Azure Pipelines (#3140 ) * Adding ci files * Single pipeline * Add test reporting * Try adding mocha-junit-reporter * More complete test reporting * Cleaning up * Trying to find location of test file * Added searching logic to wrong file * Trying different method of getting test results * Add reporter option * Adding alternate way of getting mac os * Get rid of bad comments	2018-11-06 11:21:26 -08:00
Alan Ren	f7879bdbf9	Alanren/custom message box location (#3139 ) * make message box associated with wizard page * missed one condition check after renaming * fix compilation error	2018-11-06 10:44:02 -08:00
Karl Burtram	dbb0fc519f	Update Azure Data Studio to 1.3.1	2018-11-06 10:40:58 -08:00
Alan Ren	b931ccfabf	fix for 1705 (#3131 )	2018-11-06 10:34:58 -08:00
Matt Irvine	eeab048f46	Use correct foreground color for copy details button (#3126 )	2018-11-06 10:14:25 -08:00
Yurong He	5da89ac05b	Add localContentManger and dummy sessionManager (#3130 ) * - keyboard binding to arrow keys - toggle markdown editor by double click * Added localContentManger and dummpy sessionManager	2018-11-05 17:55:13 -08:00
Anthony Dresser	e2b446be1c	change default setting for showing default connection info in settings (#3043 )	2018-11-05 16:08:55 -08:00
Anthony Dresser	5f2e17a738	Query Editor Memory improvements (#3041 ) * working through memory issues * work in progress * add missing value * work in progress * more work in progress * various more memory fixes * additional improvements * fix imports * change test that we dispose queries on close not dispose * update tests	2018-11-05 16:08:41 -08:00
Aditya Bist	399d6d0045	fixed operator typo (#3113 )	2018-11-05 10:19:50 -08:00
Alan Ren	f36f3ffd21	connect dialog ux improvement (#3105 ) * connect dialog ux improvement * more style updates	2018-11-04 17:10:05 -08:00
Kevin Cunnane	3c785ae7d8	Merge master	2018-11-04 15:15:27 -08:00
Kevin Cunnane	00cd772cbc	Snippets: fix sqlCreateTable, remove database refs & use dbo schema (#3094 ) - Fixed issues with sqlCreateTable snippet, which meant it couldn't effectively be used to tab through all fields and then hit execute without errors. Specifically fixed bugs where types like NVARCHAR were incorrectly escaped and the Id part of a column was outside the name section, both causing intellisense & execution breaks - Changed SchemaName to dbo. This helps hit the "80% case" where objects are in the most common schema - Removed DatabaseName from most snippets. The core issue is this requires you to manually type the exact database name into the snippet which is really hard. We should consider having separate "with Database" snippets or support SQLCMD variables which would let us default to the current database without needing users to manually type them in as alternatives, but having basic snippets just work on current DB is important.	2018-11-02 14:26:03 -07:00
Kevin Cunnane	d434724a54	Remove handle from API (#3093 ) - This was missed in previous checkin	2018-11-01 17:00:46 -07:00
Karl Burtram	b6c9a3bb89	Bump Azure Data Studio to 1.2.4	2018-11-01 15:06:58 -07:00
Kevin Cunnane	fc3bf45a7f	Port most notebook model code over to be behind a service (#3068 ) - Defines a new NotebookService in Azure Data Studio which will be used to interact with notebooks. Since notebooks can require per-file instantiation the provider is just used to create & track managers for a given URI. - Inject this into notebook.component.ts and pass required parameters that'll be used to properly initialize a manger into the method. Actual initialization not done yet. - Port over & recompile notebook model code - Define most required APIs in sqlops.proposed.d.ts. In the future, these will be used by extensions to contribute their own providers.	2018-10-31 22:01:40 -07:00
Karl Burtram	cbf6c06e4b	Bump SQL Tools to 1.5.0-alpha.52	2018-10-31 20:37:47 -07:00
Anthony Dresser	cff21124da	Auto Scale Axis (#3070 ) * fix input to chart that was causes scales to not auto size * formatting * formatting * added comments	2018-10-31 20:27:40 -07:00
Aditya Bist	ce7893c2e5	Agent/edit job logic (#3023 ) * lumped stepdata with jobdata in job dialog * fix bug with empty steps * added clumped and update steps and schedules from job dialog * edit data sends one call instead of multiple * cleaned code	2018-10-31 16:40:36 -07:00
Alan Ren	f7dcaa38ff	fix for issue 3065 (#3067 ) * fix for 3065 * remove the parameter, no need to save connection	2018-10-31 16:13:09 -07:00
Karl Burtram	8ce1013a26	Remove SQL Import dashboard tab (#3064 )	2018-10-31 15:23:24 -07:00
Aditya Bist	114d67b408	fixed null ref (#3061 )	2018-10-31 13:50:44 -07:00
Alan Ren	56c2d16560	a few ux improvements (#3057 ) * style update * checkbox styler * casing update	2018-10-31 13:44:12 -07:00
Alan Ren	2238c42432	fix for issue 2719 (#3060 )	2018-10-31 13:22:08 -07:00
Karl Burtram	64f6cf6747	Bump SQL Tools to 1.5.0-alpha.51	2018-10-31 13:16:38 -07:00
Karl Burtram	c0e9f1ca43	Fix build break in previous Query Plan commit	2018-10-31 13:00:23 -07:00
David Shiflet	7f66087d8c	Add a command line interface for connecting to a SQL Server (#3047 ) * Add switches for server, database, user, integrated auth * Refactor into new commandline service * Open query editor when passed server on command line * Add tests	2018-10-31 13:05:37 -04:00
Ryan	18671b7cca	Add query plan theme support (#2991 ) (#3031 ) Add monaco-editor and monaco-editor-hover to output otherwise backgrounds collide.	2018-10-31 10:03:02 -07:00
Alan Ren	233156c744	fix missing footer for backup dialog (#3056 ) @MattIrv Thanks for helping out	2018-10-30 16:17:14 -07:00
Kevin Cunnane	ac0ffab99c	Merge remote-tracking branch 'origin/master' into feature/nativeNotebook	2018-10-30 16:08:19 -07:00
Ruturaj Gujar	5e964d2105	Fixed some typos and grammatical errors (#3027 )	2018-10-30 11:54:48 -07:00
Karl Burtram	59e7a5fa4b	Change 'None' to 'Do not save' in Connection Dialog (#3051 )	2018-10-30 10:45:47 -07:00
Karl Burtram	8452f577d2	Bump Azure Data Studio to 1.2.3	2018-10-30 10:27:03 -07:00
Abbie Petchtes	533f2734f1	Add markdown cell to Notebook (#3014 ) * add markdown cell * add markdown preview for Notebook * formatting * address comment	2018-10-26 16:20:06 -07:00
Raj	2859bee4c0	1133: Notebook file registration changes (#2969 ) * 1133: Notebook file registration changes * File registration stuff	2018-10-24 13:47:41 -07:00
Abbie Petchtes	972f857c71	Cell code fit and finish (#2972 ) * add the look and feel for code cell * formatting * adding the active cell * formatting	2018-10-23 12:22:19 -07:00
AbbiePetcht	d2eb1488fd	Merge branch 'master' into feature/nativeNotebook	2018-10-23 10:23:10 -07:00
AbbiePetcht	508e4eac61	Merge branch 'master' into feature/nativeNotebook	2018-10-17 10:58:49 -07:00
AbbiePetcht	fd1d807012	Merge branch 'master' into feature/nativeNotebook	2018-10-16 16:30:11 -07:00
Abbie Petchtes	906c4c7f39	Add code cell (#2909 ) * initial work for addig code and code cell type * add cell model and create editor for each cell * formatting * fix resizing issue * small changes * address comment	2018-10-16 16:28:15 -07:00
AbbiePetcht	668e43f57c	Merge branch 'master' into feature/nativeNotebook	2018-10-12 13:01:43 -07:00
Abbie Petchtes	6d260c195f	create new notebook editor and add the place holder for toolbar and cell list (#2817 ) * create new notebook editor and add the place holder for toolbar and cell list * address comments	2018-10-11 16:14:54 -07:00
AbbiePetcht	fdfecbb3f7	Merge branch 'master' into feature/nativeNotebook	2018-10-11 10:23:30 -07:00
				`@@ -0,0 +1 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="-2 -2 16 16" enable-background="new -2 -2 16 16"><polygon fill="#424242" points="9,0 4.5,9 3,6 0,6 3,12 6,12 12,0"/></svg>`
				`@@ -0,0 +1 @@`
				<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#f6f6f6;}.icon-canvas-transparent{opacity:0;}.icon-vs-action-blue{fill:#00539c;}</style></defs><title>continue</title><g id="canvas"><path class="icon-canvas-transparent" d="M16,0V16H0V0Z"/></g><g id="outline" style="display: none;"><path class="icon-vs-out" d="M15.64,8l-7.8,6H2V2H7.84Z"/></g><g id="iconBg"><path class="icon-vs-action-blue" d="M3,3H5V13H3ZM7.5,3V13L14,8Z"/></g></svg>