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.
Bump Azure Data Studio to 1.2.4
2026-02-18 11:01:36 -05:00 · 2018-11-02 14:26:53 -07:00 · 2018-11-01 15:10:50 -07:00 · 2018-10-31 20:38:22 -07:00 · 2018-10-31 20:33:09 -07:00 · 2018-10-31 20:32:59 -07:00
312 changed files with 2768 additions and 19030 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,58 @@
+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,28 +1,5 @@
 # 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,7 +1,6 @@
 # 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.

@@ -9,12 +8,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=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
+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

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

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

-* 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`
@@ -110,6 +103,7 @@ 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,7 +34,6 @@ 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
@@ -1167,43 +1166,6 @@ 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
@@ -0,0 +1,19 @@
+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
@@ -1,38 +0,0 @@
-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
@@ -1,26 +0,0 @@
-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
@@ -1,29 +0,0 @@
-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,7 +129,6 @@ 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,21 +9,20 @@
    "@types/mime": "0.0.29",
    "@types/minimatch": "^3.0.3",
    "@types/node": "8.0.33",
-    "@types/request": "^2.47.0",
    "@types/xml2js": "0.0.33",
+    "@types/request": "^2.47.0",
    "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"
+    "xml2js": "^0.4.17",
+    "github-releases": "^0.4.1",
+    "request": "^2.85.0"
  },
  "scripts": {
    "compile": "tsc -p tsconfig.build.json",
@@ -31,4 +30,4 @@
    "postinstall": "npm run compile",
    "npmCheckJs": "tsc --noEmit"
  }
-}
+}
--- a/build/win32/code.iss
+++ b/build/win32/code.iss
@@ -91,17 +91,17 @@ Filename: "{app}\{#ExeBasename}.exe"; Description: "{cm:LaunchProgram,{#NameLong
 #else
 #define SoftwareClassesRootKey "HKLM"
 #endif
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}SourceFile"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,{#NameLong}}"; Flags: uninsdeletekey
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}SourceFile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}SourceFile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""
+Root: HKCR; Subkey: "{#RegValueName}SourceFile"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,{#NameLong}}"; Flags: uninsdeletekey
+Root: HKCR; Subkey: "{#RegValueName}SourceFile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"
+Root: HKCR; Subkey: "{#RegValueName}SourceFile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""
 Root: HKCU; Subkey: "Environment"; ValueType: expandsz; ValueName: "Path"; ValueData: "{olddata};{app}\bin"; Tasks: addtopath; Check: NeedsAddPath(ExpandConstant('{app}\bin'))

-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.sql\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\.sql\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.sql"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.sql"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,SQL}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.sql"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.sql\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\{#RegValueName}.sql\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
+Root: HKCU; Subkey: "Software\Classes\.sql\OpenWithProgids"; ValueType: none; ValueName: "{#RegValueName}"; Flags: deletevalue uninsdeletevalue; Tasks: associatewithfiles
+Root: HKCU; Subkey: "Software\Classes\.sql\OpenWithProgids"; ValueType: string; ValueName: "{#RegValueName}.sql"; ValueData: ""; Flags: uninsdeletevalue; Tasks: associatewithfiles
+Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.sql"; ValueType: string; ValueName: ""; ValueData: "{cm:SourceFile,SQL}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.sql"; ValueType: string; ValueName: "AppUserModelID"; ValueData: "{#AppUserId}"; Flags: uninsdeletekey; Tasks: associatewithfiles
+Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.sql\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\resources\app\resources\win32\code_file.ico"; Tasks: associatewithfiles
+Root: HKCU; Subkey: "Software\Classes\{#RegValueName}.sql\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%1"""; Tasks: associatewithfiles
 ; Environment
 #if "user" == InstallTarget
 #define EnvironmentRootKey "HKCU"
--- a/build/yarn.lock
+++ b/build/yarn.lock
@@ -46,7 +46,6 @@
 "@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"
@@ -571,18 +570,6 @@ 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"
@@ -954,29 +941,6 @@ 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"
@@ -1348,25 +1312,6 @@ 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"
@@ -1832,11 +1777,6 @@ 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"
@@ -1857,11 +1797,6 @@ 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"
@@ -1884,7 +1819,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.0.0, pify@^2.3.0:
+pify@^2.3.0:
  version "2.3.0"
  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
@@ -2182,7 +2117,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.2.8:
+rimraf@2:
  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
@@ -1 +0,0 @@
-
--- a/extensions/agent/package.json
+++ b/extensions/agent/package.json
@@ -2,7 +2,7 @@
  "name": "agent",
  "displayName": "SQL Server Agent",
  "description": "Manage and troubleshoot SQL Server Agent jobs",
-  "version": "0.35.2",
+  "version": "0.35.0",
  "publisher": "Microsoft",
  "preview": true,
  "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt",
--- a/extensions/agent/src/data/jobData.ts
+++ b/extensions/agent/src/data/jobData.ts
@@ -45,7 +45,6 @@ export class JobData implements IAgentDialogData {
 	public jobSchedules: sqlops.AgentJobScheduleInfo[];
 	public alerts: sqlops.AgentAlertInfo[];
 	public jobId: string;
-	public startStepId: number;

 	constructor(
 		ownerUri: string,
@@ -61,11 +60,10 @@ export class JobData implements IAgentDialogData {
 			this.category = jobInfo.category;
 			this.description = jobInfo.description;
 			this.enabled = jobInfo.enabled;
-			this.jobSteps = jobInfo.jobSteps;
-			this.jobSchedules = jobInfo.jobSchedules;
-			this.alerts = jobInfo.alerts;
+			this.jobSteps = jobInfo.JobSteps;
+			this.jobSchedules = jobInfo.JobSchedules;
+			this.alerts = jobInfo.Alerts;
 			this.jobId = jobInfo.jobId;
-			this.startStepId = jobInfo.startStepId;
 		}
 	}

@@ -143,17 +141,17 @@ export class JobData implements IAgentDialogData {
 			name: this.name,
 			owner: this.owner,
 			description: this.description,
-			emailLevel: this.emailLevel,
-			pageLevel: this.pageLevel,
-			eventLogLevel: this.eventLogLevel,
-			deleteLevel: this.deleteLevel,
-			operatorToEmail: this.operatorToEmail,
-			operatorToPage: this.operatorToPage,
+			EmailLevel: this.emailLevel,
+			PageLevel: this.pageLevel,
+			EventLogLevel: this.eventLogLevel,
+			DeleteLevel: this.deleteLevel,
+			OperatorToEmail: this.operatorToEmail,
+			OperatorToPage: this.operatorToPage,
 			enabled: this.enabled,
 			category: this.category,
-			alerts: this.alerts,
-			jobSchedules: this.jobSchedules,
-			jobSteps: this.jobSteps,
+			Alerts: this.alerts,
+			JobSchedules: this.jobSchedules,
+			JobSteps: this.jobSteps,
 			// The properties below are not collected from UI
 			// We could consider using a seperate class for create job request
 			//
@@ -168,8 +166,7 @@ export class JobData implements IAgentDialogData {
 			categoryType: 1, // LocalJob, hard-coding the value, corresponds to the target tab in SSMS
 			lastRun: '',
 			nextRun: '',
-			jobId: this.jobId,
-			startStepId: this.startStepId
+			jobId: this.jobId
 		};
 	}
 }
--- a/extensions/agent/src/data/jobStepData.ts
+++ b/extensions/agent/src/data/jobStepData.ts
@@ -123,7 +123,6 @@ export class JobStepData implements IAgentDialogData {
 		stepData.retryInterval = jobStepInfo.retryInterval,
 		stepData.proxyName = jobStepInfo.proxyName;
 		stepData.dialogMode = AgentDialogMode.EDIT;
-		stepData.viaJobDialog = true;
 		return stepData;
 	}

--- a/extensions/agent/src/dialogs/agentDialog.ts
+++ b/extensions/agent/src/dialogs/agentDialog.ts
@@ -20,9 +20,6 @@ export abstract class AgentDialog<T extends IAgentDialogData> {
 	public readonly onSuccess: vscode.Event<T> = this._onSuccess.event;
 	public dialog: sqlops.window.modelviewdialog.Dialog;

-	// Dialog Name for Telemetry
-	public dialogName: string;
-
 	constructor(public ownerUri: string, public model: T, public title: string) {
 	}

@@ -34,9 +31,8 @@ export abstract class AgentDialog<T extends IAgentDialogData> {

 	protected abstract async initializeDialog(dialog: sqlops.window.modelviewdialog.Dialog);

-	public async openDialog(dialogName?: string) {
-		let event = dialogName ? dialogName : null;
-		this.dialog = sqlops.window.modelviewdialog.createDialog(this.title, event);
+	public async openDialog() {
+		this.dialog = sqlops.window.modelviewdialog.createDialog(this.title);

 		await this.model.initialize();

--- a/extensions/agent/src/dialogs/alertDialog.ts
+++ b/extensions/agent/src/dialogs/alertDialog.ts
@@ -116,10 +116,6 @@ export class AlertDialog extends AgentDialog<AlertData> {
 	private static readonly DelayMinutesTextBoxLabel: string =  localize('alertDialog.DelayMinutes', 'Delay Minutes');
 	private static readonly DelaySecondsTextBoxLabel: string =  localize('alertDialog.DelaySeconds', 'Delay Seconds');

-	// Event Name strings
-	private readonly NewAlertDialog = 'NewAlertDialogOpen';
-	private readonly EditAlertDialog = 'EditAlertDialogOpened';
-
 	// UI Components
 	private generalTab: sqlops.window.modelviewdialog.DialogTab;
 	private responseTab: sqlops.window.modelviewdialog.DialogTab;
@@ -153,7 +149,6 @@ export class AlertDialog extends AgentDialog<AlertData> {
 	private delayMinutesTextBox: sqlops.InputBoxComponent;
 	private delaySecondsTextBox: sqlops.InputBoxComponent;

-	private isEdit: boolean = false;
 	private databases: string[];
 	private jobModel: JobData;
 	public jobId: string;
@@ -171,8 +166,6 @@ export class AlertDialog extends AgentDialog<AlertData> {
 		this.jobModel = jobModel;
 		this.jobId = this.jobId ? this.jobId : this.jobModel.jobId;
 		this.jobName = this.jobName ? this.jobName : this.jobModel.name;
-		this.isEdit = alertInfo ? true : false;
-		this.dialogName = this.isEdit ? this.EditAlertDialog : this.NewAlertDialog;
 	}

 	protected async initializeDialog(dialog: sqlops.window.modelviewdialog.Dialog) {
--- a/extensions/agent/src/dialogs/jobDialog.ts
+++ b/extensions/agent/src/dialogs/jobDialog.ts
@@ -42,12 +42,11 @@ export class JobDialog extends AgentDialog<JobData>  {
 	private readonly StepsTable_TypeColumnString: string = localize('jobDialog.type', 'Type');
 	private readonly StepsTable_SuccessColumnString: string = localize('jobDialog.onSuccess', 'On Success');
 	private readonly StepsTable_FailureColumnString: string = localize('jobDialog.onFailure', 'On Failure');
-	private readonly NewStepButtonString: string = localize('jobDialog.new', 'New Step');
-	private readonly EditStepButtonString: string = localize('jobDialog.edit', 'Edit Step');
-	private readonly DeleteStepButtonString: string = localize('jobDialog.delete', 'Delete Step');
+	private readonly NewStepButtonString: string = localize('jobDialog.new', 'New...');
+	private readonly EditStepButtonString: string = localize('jobDialog.edit', 'Edit');
+	private readonly DeleteStepButtonString: string = localize('jobDialog.delete', 'Delete');
 	private readonly MoveStepUpButtonString: string = localize('jobDialog.moveUp', 'Move Step Up');
-	private readonly MoveStepDownButtonString: string = localize('jobDialog.moveDown', 'Move Step Down');
-	private readonly StartStepDropdownString: string = localize('jobDialog.startStepAt', 'Start step');
+	private readonly MoveStepDownButtonString: string = localize('jobDialog.moveDown', 'Move Step Up');

 	// Notifications tab strings
 	private readonly NotificationsTabTopLabelString: string = localize('jobDialog.notificationsTabTop', 'Actions to perform when the job completes');
@@ -68,10 +67,6 @@ export class JobDialog extends AgentDialog<JobData>  {
 	private readonly AlertEnabledLabelString: string = localize('jobDialog.alertEnabledLabel', 'Enabled');
 	private readonly AlertTypeLabelString: string = localize('jobDialog.alertTypeLabel', 'Type');

-	// Event Name strings
-	private readonly NewJobDialogEvent: string = 'NewJobDialogOpened';
-	private readonly EditJobDialogEvent: string  = 'EditJobDialogOpened';
-
 	// UI Components
 	private generalTab: sqlops.window.modelviewdialog.DialogTab;
 	private stepsTab: sqlops.window.modelviewdialog.DialogTab;
@@ -106,7 +101,6 @@ export class JobDialog extends AgentDialog<JobData>  {
 	private eventLogConditionDropdown: sqlops.DropDownComponent;
 	private deleteJobCheckBox: sqlops.CheckBoxComponent;
 	private deleteJobConditionDropdown: sqlops.DropDownComponent;
-	private startStepDropdown: sqlops.DropDownComponent;

 	// Schedule tab controls
 	private schedulesTable: sqlops.TableComponent;
@@ -121,7 +115,6 @@ export class JobDialog extends AgentDialog<JobData>  {
 	private steps: sqlops.AgentJobStepInfo[];
 	private schedules: sqlops.AgentJobScheduleInfo[];
 	private alerts: sqlops.AgentAlertInfo[] = [];
-	private startStepDropdownValues: sqlops.CategoryValue[] = [];

 	constructor(ownerUri: string, jobInfo: sqlops.AgentJobInfo = undefined) {
 		super(
@@ -132,7 +125,6 @@ export class JobDialog extends AgentDialog<JobData>  {
 		this.schedules = this.model.jobSchedules ? this.model.jobSchedules : [];
 		this.alerts = this.model.alerts ? this.model.alerts : [];
 		this.isEdit = jobInfo ? true : false;
-		this.dialogName = this.isEdit ? this.EditJobDialogEvent : this.NewJobDialogEvent;
 	}

 	protected async initializeDialog() {
@@ -226,26 +218,19 @@ export class JobDialog extends AgentDialog<JobData>  {
 						this.StepsTable_FailureColumnString
 					],
 					data: data,
-					height: 650
+					height: 750
 				}).component();

-			this.startStepDropdown = view.modelBuilder.dropDown().withProperties({ width: 180 }).component();
-			this.startStepDropdown.enabled = this.steps.length > 1 ? true : false;
-			this.steps.forEach((step) => {
-				this.startStepDropdownValues.push({ displayName: step.id + ': ' + step.stepName, name: step.id.toString() });
-			});
-			this.startStepDropdown.values = this.startStepDropdownValues;
-
 			this.moveStepUpButton = view.modelBuilder.button()
 				.withProperties({
 					label: this.MoveStepUpButtonString,
-					width: 120
+					width: 80
 				}).component();

 			this.moveStepDownButton = view.modelBuilder.button()
 				.withProperties({
 					label: this.MoveStepDownButtonString,
-					width: 120
+					width: 80
 				}).component();

 			this.moveStepUpButton.enabled = false;
@@ -253,7 +238,7 @@ export class JobDialog extends AgentDialog<JobData>  {

 			this.newStepButton = view.modelBuilder.button().withProperties({
 				label: this.NewStepButtonString,
-				width: 140
+				width: 80
 			}).component();

 			let stepDialog = new JobStepDialog(this.model.ownerUri, '' , this.model, null, true);
@@ -261,11 +246,6 @@ export class JobDialog extends AgentDialog<JobData>  {
 				let stepInfo = JobStepData.convertToAgentJobStepInfo(step);
 				this.steps.push(stepInfo);
 				this.stepsTable.data = this.convertStepsToData(this.steps);
-				this.startStepDropdownValues = [];
-				this.steps.forEach((step) => {
-					this.startStepDropdownValues.push({ displayName: step.id + ': ' + step.stepName, name: step.id.toString() });
-				});
-				this.startStepDropdown.values = this.startStepDropdownValues;
 			});
 			this.newStepButton.onDidClick((e)=>{
 				if (this.nameTextBox.value && this.nameTextBox.value.length > 0) {
@@ -278,127 +258,53 @@ export class JobDialog extends AgentDialog<JobData>  {

 			this.editStepButton = view.modelBuilder.button().withProperties({
 				label: this.EditStepButtonString,
-				width: 140
+				width: 80
 			}).component();

 			this.deleteStepButton = view.modelBuilder.button().withProperties({
 				label: this.DeleteStepButtonString,
-				width: 140
+				width: 80
 			}).component();

 			this.stepsTable.enabled = false;
 			this.editStepButton.enabled = false;
 			this.deleteStepButton.enabled = false;

-			this.moveStepUpButton.onDidClick(() => {
-                let rowNumber = this.stepsTable.selectedRows[0];
-				let previousRow = rowNumber - 1;
-				let previousStep = this.steps[previousRow];
-				let previousStepId = this.steps[previousRow].id;
-				let currentStep = this.steps[rowNumber];
-				let currentStepId = this.steps[rowNumber].id;
-				this.steps[previousRow] = currentStep;
-				this.steps[rowNumber] = previousStep;
-				this.stepsTable.data = this.convertStepsToData(this.steps);
-				this.steps[previousRow].id = previousStepId;
-				this.steps[rowNumber].id = currentStepId;
-			});
-
-			this.moveStepDownButton.onDidClick(() => {
-				let rowNumber = this.stepsTable.selectedRows[0];
-				let nextRow = rowNumber + 1;
-				let nextStep = this.steps[nextRow];
-				let nextStepId = this.steps[nextRow].id;
-				let currentStep = this.steps[rowNumber];
-				let currentStepId = this.steps[rowNumber].id;
-				this.steps[nextRow] = currentStep;
-				this.steps[rowNumber] = nextStep;
-				this.stepsTable.data = this.convertStepsToData(this.steps);
-				this.steps[nextRow].id = nextStepId;
-				this.steps[rowNumber].id = currentStepId;
-			});
-
-			this.editStepButton.onDidClick(() => {
-				if (this.stepsTable.selectedRows.length === 1) {
-					let rowNumber = this.stepsTable.selectedRows[0];
-					let stepData = this.model.jobSteps[rowNumber];
-					let editStepDialog = new JobStepDialog(this.model.ownerUri, '' , this.model, stepData, true);
-					editStepDialog.onSuccess((step) => {
-						let stepInfo = JobStepData.convertToAgentJobStepInfo(step);
-						for (let i = 0; i < this.steps.length; i++) {
-							if (this.steps[i].id === stepInfo.id) {
-								this.steps[i] = stepInfo;
-							}
-						}
-						this.stepsTable.data = this.convertStepsToData(this.steps);
-						this.startStepDropdownValues = [];
-						this.steps.forEach((step) => {
-							this.startStepDropdownValues.push({ displayName: step.id + ': ' + step.stepName, name: step.id.toString() });
-						});
-						this.startStepDropdown.values = this.startStepDropdownValues;
-
-					});
-					editStepDialog.openDialog();
-				}
-			});
-
-			this.deleteStepButton.onDidClick(() => {
-				if (this.stepsTable.selectedRows.length === 1) {
-					let rowNumber = this.stepsTable.selectedRows[0];
-					AgentUtils.getAgentService().then((agentService) => {
-						let steps = this.model.jobSteps ? this.model.jobSteps : [];
-						let stepData = this.model.jobSteps[rowNumber];
-						agentService.deleteJobStep(this.ownerUri, stepData).then((result) => {
-							if (result && result.success) {
-								delete steps[rowNumber];
-								let data = this.convertStepsToData(steps);
-								this.stepsTable.data = data;
-								this.startStepDropdownValues = [];
-								this.steps.forEach((step) => {
-									this.startStepDropdownValues.push({ displayName: step.id + ': ' + step.stepName, name: step.id.toString() });
-								});
-								this.startStepDropdown.values = this.startStepDropdownValues;
-							}
-						});
-					});
-				}
-			});
-
-			this.stepsTable.onRowSelected((row) => {
+			this.stepsTable.onRowSelected(() => {
 				// only let edit or delete steps if there's
 				// one step selection
 				if (this.stepsTable.selectedRows.length === 1) {
 					let rowNumber = this.stepsTable.selectedRows[0];
-					// if it's not the last step
-					if (this.steps.length !== rowNumber + 1) {
-						this.moveStepDownButton.enabled = true;
-					}
-					// if it's not the first step
-					if (rowNumber !== 0) {
-						this.moveStepUpButton.enabled = true;
-					}
+					let stepData = this.model.jobSteps[rowNumber];
 					this.deleteStepButton.enabled = true;
 					this.editStepButton.enabled = true;
+					this.editStepButton.onDidClick(() => {
+						let stepDialog = new JobStepDialog(this.model.ownerUri, '' , this.model, stepData, true);
+						stepDialog.openDialog();
+					});
+
+					this.deleteStepButton.onDidClick(() => {
+						AgentUtils.getAgentService().then((agentService) => {
+							let steps = this.model.jobSteps ? this.model.jobSteps : [];
+							agentService.deleteJobStep(this.ownerUri, stepData).then((result) => {
+								if (result && result.success) {
+									delete steps[rowNumber];
+									let data = this.convertStepsToData(steps);
+									this.stepsTable.data = data;
+								}
+							});
+						});
+					});
 				}
 			});
-			let stepMoveContainer = this.createRowContainer(view).withItems([this.startStepDropdown, this.moveStepUpButton, this.moveStepDownButton]).component();
-			let stepsDialogContainer = this.createRowContainer(view).withItems([this.newStepButton, this.editStepButton, this.deleteStepButton]).component();
-			let formModel = view.modelBuilder.formContainer().withFormItems([
-				{
+
+			let formModel = view.modelBuilder.formContainer()
+				.withFormItems([{
 					component: this.stepsTable,
-					title: this.JobStepsTopLabelString
-				},
-				{
-					component: stepMoveContainer,
-					title: this.StartStepDropdownString
-				},
-				{
-					component: stepsDialogContainer,
-					title: ''
-				}
-			]).withLayout({ width: '100%' }).component();
+					title: this.JobStepsTopLabelString,
+					actions: [this.moveStepUpButton, this.moveStepDownButton, this.newStepButton, this.editStepButton, this.deleteStepButton]
+				}]).withLayout({ width: '100%' }).component();
 			await view.initializeModel(formModel);
-			this.setConditionDropdownSelectedValue(this.startStepDropdown, this.model.startStepId);
 		});
 	}

@@ -661,7 +567,6 @@ export class JobDialog extends AgentDialog<JobData>  {
 		this.model.pageLevel = this.getActualConditionValue(this.pagerCheckBox, this.pagerConditionDropdown);
 		this.model.eventLogLevel = this.getActualConditionValue(this.eventLogCheckBox, this.eventLogConditionDropdown);
 		this.model.deleteLevel = this.getActualConditionValue(this.deleteJobCheckBox, this.deleteJobConditionDropdown);
-		this.model.startStepId = +this.getDropdownValue(this.startStepDropdown);
 		if (!this.model.jobSteps) {
 			this.model.jobSteps = [];
 		}
--- a/extensions/agent/src/dialogs/jobStepDialog.ts
+++ b/extensions/agent/src/dialogs/jobStepDialog.ts
@@ -67,9 +67,6 @@ export class JobStepDialog extends AgentDialog<JobStepData> {
 	private readonly QuitJobReportingSuccess: string = localize('jobStepDialog.quitJobSuccess', 'Quit the job reporting success');
 	private readonly QuitJobReportingFailure: string = localize('jobStepDialog.quitJobFailure', 'Quit the job reporting failure');

-	// Event Name strings
-	private readonly NewStepDialog = 'NewStepDialogOpened';
-	private readonly EditStepDialog = 'EditStepDialogOpened';
 	// UI Components

 	// Dialogs
@@ -134,7 +131,6 @@ export class JobStepDialog extends AgentDialog<JobStepData> {
 		this.jobModel = jobModel;
 		this.jobName = this.jobName ?  this.jobName : this.jobModel.name;
 		this.server = server;
-		this.dialogName = this.isEdit ? this.EditStepDialog : this.NewStepDialog;
 	}

 	private initializeUIComponents() {
@@ -523,7 +519,6 @@ export class JobStepDialog extends AgentDialog<JobStepData> {
 		this.model.failureAction = this.failureActionDropdown.value as string;
 		this.model.outputFileName = this.outputFileNameBox.value;
 		this.model.appendToLogFile = this.appendToExistingFileCheckbox.checked;
-		this.model.command = this.commandTextBox.value ? this.commandTextBox.value : '';
 	}

 	public async initializeDialog() {
--- 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 schedule');
+	private static readonly PagerDutyScheduleLabel: string = localize('createOperator.PagerDutySchedule', 'Pager on duty schdule');

 	// Notifications tab strings
 	private static readonly AlertsTableLabel: string = localize('createOperator.AlertListHeading', 'Alert list');
@@ -43,10 +43,6 @@ export class OperatorDialog extends AgentDialog<OperatorData> {
 	private static readonly AlertEmailColumnLabel: string = localize('createOperator.AlertEmailColumnLabel', 'E-mail');
 	private static readonly AlertPagerColumnLabel: string = localize('createOperator.AlertPagerColumnLabel', 'Pager');

-	// Event strings
-	private readonly NewOperatorDialog = 'NewOperatorDialogOpened';
-	private readonly EditOperatorDialog = 'EditOperatorDialogOpened';
-
 	// UI Components
 	private generalTab: sqlops.window.modelviewdialog.DialogTab;
 	private notificationsTab: sqlops.window.modelviewdialog.DialogTab;
@@ -72,15 +68,12 @@ export class OperatorDialog extends AgentDialog<OperatorData> {

 	// Notification tab controls
 	private alertsTable: sqlops.TableComponent;
-	private isEdit: boolean = false;

 	constructor(ownerUri: string, operatorInfo: sqlops.AgentOperatorInfo = undefined) {
 		super(
 			ownerUri,
 			new OperatorData(ownerUri, operatorInfo),
 			operatorInfo ? OperatorDialog.EditDialogTitle : OperatorDialog.CreateDialogTitle);
-		this.isEdit = operatorInfo ? true : false;
-		this.dialogName = this.isEdit ? this.EditOperatorDialog : this.NewOperatorDialog;
 	}

 	protected async initializeDialog(dialog: sqlops.window.modelviewdialog.Dialog) {
--- a/extensions/agent/src/dialogs/proxyDialog.ts
+++ b/extensions/agent/src/dialogs/proxyDialog.ts
@@ -36,9 +36,6 @@ export class ProxyDialog extends AgentDialog<ProxyData>  {
 	private static readonly PowerShellLabel: string = localize('createProxy.PowerShell', 'PowerShell');
 	private static readonly SubSystemHeadingLabel: string = localize('createProxy.subSystemHeading', 'Active to the following subsytems');

-	private readonly NewProxyDialog = 'NewProxyDialogOpened';
-	private readonly EditProxyDialog = 'EditProxyDialogOpened';
-
 	// UI Components
 	private generalTab: sqlops.window.modelviewdialog.DialogTab;

@@ -59,7 +56,6 @@ export class ProxyDialog extends AgentDialog<ProxyData>  {
 	private powershellCheckBox: sqlops.CheckBoxComponent;

 	private credentials: sqlops.CredentialInfo[];
-	private isEdit: boolean = false;

 	constructor(ownerUri: string, proxyInfo: sqlops.AgentProxyInfo = undefined, credentials: sqlops.CredentialInfo[]) {
 		super(
@@ -67,8 +63,6 @@ export class ProxyDialog extends AgentDialog<ProxyData>  {
 			new ProxyData(ownerUri, proxyInfo),
 			proxyInfo ? ProxyDialog.EditDialogTitle : ProxyDialog.CreateDialogTitle);
 		this.credentials = credentials;
-		this.isEdit = proxyInfo ? true : false;
-		this.dialogName = this.isEdit ? this.EditProxyDialog : this.NewProxyDialog;
 	}

 	protected async initializeDialog(dialog: sqlops.window.modelviewdialog.Dialog) {
--- a/extensions/agent/src/mainController.ts
+++ b/extensions/agent/src/mainController.ts
@@ -40,13 +40,13 @@ export class MainController {
    public activate(): void {
        vscode.commands.registerCommand('agent.openJobDialog', (ownerUri: string, jobInfo: sqlops.AgentJobInfo) => {
            let dialog = new JobDialog(ownerUri, jobInfo);
-            dialog.dialogName ? dialog.openDialog(dialog.dialogName) : dialog.openDialog();
+            dialog.openDialog();
        });
        vscode.commands.registerCommand('agent.openNewStepDialog', (ownerUri: string, server: string, jobInfo: sqlops.AgentJobInfo, jobStepInfo: sqlops.AgentJobStepInfo) => {
            AgentUtils.getAgentService().then((agentService) => {
                let jobData: JobData = new JobData(ownerUri, jobInfo, agentService);
                let dialog = new JobStepDialog(ownerUri, server, jobData, jobStepInfo, false);
-                dialog.dialogName ? dialog.openDialog(dialog.dialogName) : dialog.openDialog();
+                dialog.openDialog();
            });
        });
        vscode.commands.registerCommand('agent.openPickScheduleDialog', (ownerUri: string, jobName: string) => {
@@ -57,16 +57,17 @@ export class MainController {
            AgentUtils.getAgentService().then((agentService) => {
                let jobData: JobData = new JobData(ownerUri, jobInfo, agentService);
                let dialog = new AlertDialog(ownerUri, jobData, alertInfo, false);
-                dialog.dialogName ? dialog.openDialog(dialog.dialogName) : dialog.openDialog();
+                dialog.openDialog();
            });
        });
        vscode.commands.registerCommand('agent.openOperatorDialog', (ownerUri: string, operatorInfo: sqlops.AgentOperatorInfo) => {
            let dialog = new OperatorDialog(ownerUri, operatorInfo);
-            dialog.dialogName ? dialog.openDialog(dialog.dialogName) : dialog.openDialog();
+            dialog.openDialog();
        });
        vscode.commands.registerCommand('agent.openProxyDialog', (ownerUri: string, proxyInfo: sqlops.AgentProxyInfo, credentials: sqlops.CredentialInfo[]) => {
            let dialog = new ProxyDialog(ownerUri, proxyInfo, credentials);
-            dialog.dialogName ? dialog.openDialog(dialog.dialogName) : dialog.openDialog();
+            dialog.openDialog();
+            MainController.showNotYetImplemented();
        });
    }

--- a/extensions/azurecore/package.json
+++ b/extensions/azurecore/package.json
@@ -147,7 +147,7 @@
 		}
 	},
 	"dependencies": {
-		"request": "2.88.0",
+		"request": "2.63.0",
 		"azure-arm-resource": "^7.0.0",
 		"azure-arm-sql": "^5.0.1",
 		"vscode-nls": "^4.0.0"
--- a/extensions/azurecore/src/account-provider/azureAccountProvider.ts
+++ b/extensions/azurecore/src/account-provider/azureAccountProvider.ts
@@ -69,8 +69,8 @@ export class AzureAccountProvider implements sqlops.AccountProvider {
 		return this._tokenCache.clear();
 	}

-	public getSecurityToken(account: AzureAccount, resource: sqlops.AzureResource): Thenable<AzureAccountSecurityTokenCollection> {
-		return this.doIfInitialized(() => this.getAccessTokens(account, resource));
+	public getSecurityToken(account: AzureAccount): Thenable<AzureAccountSecurityTokenCollection> {
+		return this.doIfInitialized(() => this.getAccessTokens(account));
 	}

 	public initialize(restoredAccounts: sqlops.Account[]): Thenable<sqlops.Account[]> {
@@ -90,7 +90,7 @@ export class AzureAccountProvider implements sqlops.AccountProvider {

 			// Attempt to get fresh tokens. If this fails then the account is stale.
 			// NOTE: Based on ADAL implementation, getting tokens should use the refresh token if necessary
-			let task = this.getAccessTokens(account, sqlops.AzureResource.ResourceManagement)
+			let task = this.getAccessTokens(account)
 				.then(
 				() => {
 					return account;
@@ -161,14 +161,9 @@ export class AzureAccountProvider implements sqlops.AccountProvider {
 			: Promise.reject(localize('accountProviderNotInitialized', 'Account provider not initialized, cannot perform action'));
 	}

-	private getAccessTokens(account: AzureAccount, resource: sqlops.AzureResource): Thenable<AzureAccountSecurityTokenCollection> {
+	private getAccessTokens(account: AzureAccount): Thenable<AzureAccountSecurityTokenCollection> {
 		let self = this;

-		const resourceIdMap = new Map<sqlops.AzureResource, string>([
-			[sqlops.AzureResource.ResourceManagement, self._metadata.settings.armResource.id],
-			[sqlops.AzureResource.Sql, self._metadata.settings.sqlResource.id]
-		]);
-
 		let accessTokenPromises: Thenable<void>[] = [];
 		let tokenCollection: AzureAccountSecurityTokenCollection = {};
 		for (let tenant of account.properties.tenants) {
@@ -177,7 +172,7 @@ export class AzureAccountProvider implements sqlops.AccountProvider {
 				let context = new adal.AuthenticationContext(authorityUrl, null, self._tokenCache);

 				context.acquireToken(
-					resourceIdMap.get(resource),
+					self._metadata.settings.armResource.id,
 					tenant.userId,
 					self._metadata.settings.clientId,
 					(error: Error, response: adal.TokenResponse | adal.ErrorResponse) => {
--- a/extensions/azurecore/src/account-provider/interfaces.ts
+++ b/extensions/azurecore/src/account-provider/interfaces.ts
@@ -81,11 +81,6 @@ export interface Settings {
 	 */
 	armResource?: Resource;

-	/**
-	 * Information that describes the SQL Azure resource
-	 */
-	sqlResource?: Resource;
-
 	/**
 	 * A list of tenant IDs to authenticate against. If defined, then these IDs will be used
 	 * instead of querying the tenants endpoint of the armResource
--- a/extensions/azurecore/src/account-provider/providerSettings.ts
+++ b/extensions/azurecore/src/account-provider/providerSettings.ts
@@ -27,10 +27,6 @@ const publicAzureSettings: ProviderSettings = {
 				id: 'https://management.core.windows.net/',
 				endpoint: 'https://management.azure.com'
 			},
-			sqlResource: {
-				id: 'https://database.windows.net/',
-				endpoint: 'https://database.windows.net'
-			},
 			redirectUri: 'http://localhost/redirect'
 		}
 	}
--- a/extensions/azurecore/src/account-provider/tokenCache.ts
+++ b/extensions/azurecore/src/account-provider/tokenCache.ts
@@ -223,16 +223,22 @@ export default class TokenCache implements adal.TokenCache {
 		return this.getOrCreateEncryptionParams()
 			.then(encryptionParams => {
 				try {
-					return self.decryptCache('utf8', encryptionParams);
-				} catch (e) {
-					try {
-						// try to parse using 'binary' encoding and rewrite cache as UTF8
-						let response = self.decryptCache('binary', encryptionParams);
-						self.writeCache(response);
-						return response;
-					} catch (e) {
-						throw e;
+					let cacheCipher = fs.readFileSync(self._cacheSerializationPath, TokenCache.FsOptions);
+
+					let decipher = crypto.createDecipheriv(TokenCache.CipherAlgorithm, encryptionParams.key, encryptionParams.initializationVector);
+					let cacheJson = decipher.update(cacheCipher, 'hex', 'binary');
+					cacheJson += decipher.final('binary');
+
+					// Deserialize the JSON into the array of tokens
+					let cacheObj = <adal.TokenResponse[]>JSON.parse(cacheJson);
+					for (let objIndex in cacheObj) {
+						// Rehydrate Date objects since they will always serialize as a string
+						cacheObj[objIndex].expiresOn = new Date(<string>cacheObj[objIndex].expiresOn);
 					}
+
+					return cacheObj;
+				} catch (e) {
+					throw e;
 				}
 			})
 			.then(null, err => {
@@ -242,22 +248,6 @@ export default class TokenCache implements adal.TokenCache {
 			});
 	}

-	private decryptCache(encoding: crypto.Utf8AsciiBinaryEncoding, encryptionParams: EncryptionParams): adal.TokenResponse[] {
-		let cacheCipher = fs.readFileSync(this._cacheSerializationPath, TokenCache.FsOptions);
-		let decipher = crypto.createDecipheriv(TokenCache.CipherAlgorithm, encryptionParams.key, encryptionParams.initializationVector);
-		let cacheJson = decipher.update(cacheCipher, 'hex', encoding);
-		cacheJson += decipher.final(encoding);
-
-		// Deserialize the JSON into the array of tokens
-		let cacheObj = <adal.TokenResponse[]>JSON.parse(cacheJson);
-		for (let objIndex in cacheObj) {
-			// Rehydrate Date objects since they will always serialize as a string
-			cacheObj[objIndex].expiresOn = new Date(<string>cacheObj[objIndex].expiresOn);
-		}
-
-		return cacheObj;
-	}
-
 	private removeFromCache(cache: adal.TokenResponse[], entries: adal.TokenResponse[]): adal.TokenResponse[] {
 		entries.forEach((entry: adal.TokenResponse) => {
 			// Check to see if the entry exists
@@ -284,7 +274,7 @@ export default class TokenCache implements adal.TokenCache {
 					let cacheJson = JSON.stringify(cache);

 					let cipher = crypto.createCipheriv(TokenCache.CipherAlgorithm, encryptionParams.key, encryptionParams.initializationVector);
-					let cacheCipher = cipher.update(cacheJson, 'utf8', 'hex');
+					let cacheCipher = cipher.update(cacheJson, 'binary', 'hex');
 					cacheCipher += cipher.final('hex');

 					fs.writeFileSync(self._cacheSerializationPath, cacheCipher, TokenCache.FsOptions);
--- a/extensions/azurecore/src/apiWrapper.ts
+++ b/extensions/azurecore/src/apiWrapper.ts
@@ -212,8 +212,8 @@ export class ApiWrapper {
 		return sqlops.accounts.getAllAccounts();
 	}

-	public getSecurityToken(account: sqlops.Account, resource: sqlops.AzureResource): Thenable<{}> {
-		return sqlops.accounts.getSecurityToken(account, resource);
+	public getSecurityToken(account: sqlops.Account): Thenable<{}> {
+		return sqlops.accounts.getSecurityToken(account);
 	}

 	public readonly onDidChangeAccounts = sqlops.accounts.onDidChangeAccounts;
--- a/extensions/azurecore/src/azureResource/commands.ts
+++ b/extensions/azurecore/src/azureResource/commands.ts
@@ -6,7 +6,7 @@
 'use strict';

 import { window, QuickPickItem } from 'vscode';
-import * as sqlops from 'sqlops';
+import { IConnectionProfile } from 'sqlops';
 import { generateGuid } from './utils';
 import { ApiWrapper } from '../apiWrapper';
 import { TreeNode } from '../treeNodes';
@@ -30,7 +30,7 @@ export function registerAzureResourceCommands(apiWrapper: ApiWrapper, tree: Azur

 		let subscriptions = await accountNode.getCachedSubscriptions();
 		if (!subscriptions || subscriptions.length === 0) {
-			const credentials = await servicePool.credentialService.getCredentials(accountNode.account, sqlops.AzureResource.ResourceManagement);
+			const credentials = await servicePool.credentialService.getCredentials(accountNode.account);
 			subscriptions = await servicePool.subscriptionService.getSubscriptions(accountNode.account, credentials);
 		}

@@ -71,7 +71,7 @@ export function registerAzureResourceCommands(apiWrapper: ApiWrapper, tree: Azur
 	});

 	apiWrapper.registerCommand('azureresource.connectsqldb', async (node?: TreeNode) => {
-		let connectionProfile: sqlops.IConnectionProfile = {
+		let connectionProfile: IConnectionProfile = {
 			id: generateGuid(),
 			connectionName: undefined,
 			serverName: undefined,
--- a/extensions/azurecore/src/azureResource/interfaces.ts
+++ b/extensions/azurecore/src/azureResource/interfaces.ts
@@ -6,29 +6,29 @@
 'use strict';

 import { ServiceClientCredentials } from 'ms-rest';
-import * as sqlops from 'sqlops';
+import { Account, DidChangeAccountsParams } from 'sqlops';
 import { Event } from 'vscode';

 import { AzureResourceSubscription, AzureResourceDatabaseServer, AzureResourceDatabase } from './models';

 export interface IAzureResourceAccountService {
-	getAccounts(): Promise<sqlops.Account[]>;
+	getAccounts(): Promise<Account[]>;

-	readonly onDidChangeAccounts: Event<sqlops.DidChangeAccountsParams>;
+	readonly onDidChangeAccounts: Event<DidChangeAccountsParams>;
 }

 export interface IAzureResourceCredentialService {
-	getCredentials(account: sqlops.Account, resource: sqlops.AzureResource): Promise<ServiceClientCredentials[]>;
+	getCredentials(account: Account): Promise<ServiceClientCredentials[]>;
 }

 export interface IAzureResourceSubscriptionService {
-	getSubscriptions(account: sqlops.Account, credentials: ServiceClientCredentials[]): Promise<AzureResourceSubscription[]>;
+	getSubscriptions(account: Account, credentials: ServiceClientCredentials[]): Promise<AzureResourceSubscription[]>;
 }

 export interface IAzureResourceSubscriptionFilterService {
-	getSelectedSubscriptions(account: sqlops.Account): Promise<AzureResourceSubscription[]>;
+	getSelectedSubscriptions(account: Account): Promise<AzureResourceSubscription[]>;

-	saveSelectedSubscriptions(account: sqlops.Account, selectedSubscriptions: AzureResourceSubscription[]): Promise<void>;
+	saveSelectedSubscriptions(account: Account, selectedSubscriptions: AzureResourceSubscription[]): Promise<void>;
 }

 export interface IAzureResourceDatabaseServerService {
--- a/extensions/azurecore/src/azureResource/services/credentialService.ts
+++ b/extensions/azurecore/src/azureResource/services/credentialService.ts
@@ -5,7 +5,7 @@

 'use strict';

-import * as sqlops from 'sqlops';
+import { Account } from 'sqlops';
 import { TokenCredentials, ServiceClientCredentials } from 'ms-rest';
 import { ApiWrapper } from '../../apiWrapper';
 import * as nls from 'vscode-nls';
@@ -21,10 +21,10 @@ export class AzureResourceCredentialService implements IAzureResourceCredentialS
 		this._apiWrapper = apiWrapper;
 	}

-	public async getCredentials(account: sqlops.Account, resource: sqlops.AzureResource): Promise<ServiceClientCredentials[]> {
+	public async getCredentials(account: Account): Promise<ServiceClientCredentials[]> {
 		try {
 			let credentials: TokenCredentials[] = [];
-			let tokens = await this._apiWrapper.getSecurityToken(account, resource);
+			let tokens = await this._apiWrapper.getSecurityToken(account);

 			for (let tenant of account.properties.tenants) {
 				let token = tokens[tenant.id].token;
--- a/extensions/azurecore/src/azureResource/tree/baseTreeNodes.ts
+++ b/extensions/azurecore/src/azureResource/tree/baseTreeNodes.ts
@@ -5,7 +5,7 @@

 'use strict';

-import * as sqlops from 'sqlops';
+import { Account } from 'sqlops';
 import { ServiceClientCredentials } from 'ms-rest';
 import { TreeNode } from '../../treeNodes';

@@ -28,7 +28,7 @@ export abstract class AzureResourceTreeNodeBase extends TreeNode {

 export abstract class AzureResourceContainerTreeNodeBase extends AzureResourceTreeNodeBase {
 	public constructor(
-		public readonly account: sqlops.Account,
+		public readonly account: Account,
 		treeChangeHandler: IAzureResourceTreeChangeHandler,
 		parent: TreeNode
 	) {
@@ -45,7 +45,7 @@ export abstract class AzureResourceContainerTreeNodeBase extends AzureResourceTr

 	protected async getCredentials(): Promise<ServiceClientCredentials[]> {
 		try {
-			return await this.servicePool.credentialService.getCredentials(this.account, sqlops.AzureResource.ResourceManagement);
+			return await this.servicePool.credentialService.getCredentials(this.account);
 		} catch (error) {
 			if (error instanceof AzureResourceCredentialError) {
 				this.servicePool.contextService.showErrorMessage(error.message);
--- a/extensions/azurecore/src/test/azureResource/tree/accountTreeNode.test.ts
+++ b/extensions/azurecore/src/test/azureResource/tree/accountTreeNode.test.ts
@@ -87,7 +87,7 @@ describe('AzureResourceAccountTreeNode.info', function(): void {
 		mockServicePool.subscriptionService = mockSubscriptionService.object;
 		mockServicePool.subscriptionFilterService = mockSubscriptionFilterService.object;

-		mockCredentialService.setup((o) => o.getCredentials(mockAccount, sqlops.AzureResource.ResourceManagement)).returns(() => Promise.resolve(mockCredentials));
+		mockCredentialService.setup((o) => o.getCredentials(mockAccount)).returns(() => Promise.resolve(mockCredentials));
 		mockCacheService.setup((o) => o.get(TypeMoq.It.isAnyString())).returns(() => mockSubscriptionCache);
 		mockCacheService.setup((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny())).returns(() => mockSubscriptionCache.subscriptions[mockAccount.key.accountId] = mockSubscriptions);
 	});
@@ -164,7 +164,7 @@ describe('AzureResourceAccountTreeNode.getChildren', function(): void {
 		mockServicePool.subscriptionService = mockSubscriptionService.object;
 		mockServicePool.subscriptionFilterService = mockSubscriptionFilterService.object;

-		mockCredentialService.setup((o) => o.getCredentials(mockAccount, sqlops.AzureResource.ResourceManagement)).returns(() => Promise.resolve(mockCredentials));
+		mockCredentialService.setup((o) => o.getCredentials(mockAccount)).returns(() => Promise.resolve(mockCredentials));
 		mockCacheService.setup((o) => o.get(TypeMoq.It.isAnyString())).returns(() => mockSubscriptionCache);
 		mockCacheService.setup((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny())).returns(() => mockSubscriptionCache.subscriptions[mockAccount.key.accountId] = mockSubscriptions);
 	});
@@ -177,7 +177,7 @@ describe('AzureResourceAccountTreeNode.getChildren', function(): void {

 		const children = await accountTreeNode.getChildren();

-		mockCredentialService.verify((o) => o.getCredentials(mockAccount, sqlops.AzureResource.ResourceManagement), TypeMoq.Times.once());
+		mockCredentialService.verify((o) => o.getCredentials(mockAccount), TypeMoq.Times.once());
 		mockSubscriptionService.verify((o) => o.getSubscriptions(mockAccount, mockCredentials), TypeMoq.Times.once());
 		mockCacheService.verify((o) => o.get(TypeMoq.It.isAnyString()), TypeMoq.Times.once());
 		mockCacheService.verify((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny()), TypeMoq.Times.once());
@@ -213,7 +213,7 @@ describe('AzureResourceAccountTreeNode.getChildren', function(): void {
 		await accountTreeNode.getChildren();
 		const children = await accountTreeNode.getChildren();

-		mockCredentialService.verify((o) => o.getCredentials(mockAccount, sqlops.AzureResource.ResourceManagement), TypeMoq.Times.exactly(1));
+		mockCredentialService.verify((o) => o.getCredentials(mockAccount), TypeMoq.Times.exactly(1));
 		mockSubscriptionService.verify((o) => o.getSubscriptions(mockAccount, mockCredentials), TypeMoq.Times.exactly(1));
 		mockCacheService.verify((o) => o.get(TypeMoq.It.isAnyString()), TypeMoq.Times.exactly(2));
 		mockCacheService.verify((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny()), TypeMoq.Times.exactly(1));
@@ -267,7 +267,7 @@ describe('AzureResourceAccountTreeNode.getChildren', function(): void {

 		const children = await accountTreeNode.getChildren();

-		mockCredentialService.verify((o) => o.getCredentials(mockAccount, sqlops.AzureResource.ResourceManagement), TypeMoq.Times.once());
+		mockCredentialService.verify((o) => o.getCredentials(mockAccount), TypeMoq.Times.once());
 		mockSubscriptionService.verify((o) => o.getSubscriptions(mockAccount, mockCredentials), TypeMoq.Times.once());
 		mockCacheService.verify((o) => o.get(TypeMoq.It.isAnyString()), TypeMoq.Times.never());
 		mockCacheService.verify((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny()), TypeMoq.Times.never());
--- a/extensions/azurecore/src/test/azureResource/tree/databaseContainerTreeNode.test.ts
+++ b/extensions/azurecore/src/test/azureResource/tree/databaseContainerTreeNode.test.ts
@@ -118,7 +118,7 @@ describe('AzureResourceDatabaseContainerTreeNode.getChildren', function(): void
 		mockServicePool.credentialService = mockCredentialService.object;
 		mockServicePool.databaseService = mockDatabaseService.object;

-		mockCredentialService.setup((o) => o.getCredentials(mockAccount, sqlops.AzureResource.ResourceManagement)).returns(() => Promise.resolve(mockCredentials));
+		mockCredentialService.setup((o) => o.getCredentials(mockAccount)).returns(() => Promise.resolve(mockCredentials));
 		mockCacheService.setup((o) => o.get(TypeMoq.It.isAnyString())).returns(() => mockDatabaseContainerCache);
 		mockCacheService.setup((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny())).returns(() => mockDatabaseContainerCache.databases[mockSubscription.id] = mockDatabases);
 	});
@@ -130,7 +130,7 @@ describe('AzureResourceDatabaseContainerTreeNode.getChildren', function(): void

 		const children = await databaseContainerTreeNode.getChildren();

-		mockCredentialService.verify((o) => o.getCredentials(mockAccount, sqlops.AzureResource.ResourceManagement), TypeMoq.Times.once());
+		mockCredentialService.verify((o) => o.getCredentials(mockAccount), TypeMoq.Times.once());
 		mockDatabaseService.verify((o) => o.getDatabases(mockSubscription, mockCredentials), TypeMoq.Times.once());
 		mockCacheService.verify((o) => o.get(TypeMoq.It.isAnyString()), TypeMoq.Times.once());
 		mockCacheService.verify((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny()), TypeMoq.Times.once());
@@ -160,7 +160,7 @@ describe('AzureResourceDatabaseContainerTreeNode.getChildren', function(): void
 		await databaseContainerTreeNode.getChildren();
 		const children = await databaseContainerTreeNode.getChildren();

-		mockCredentialService.verify((o) => o.getCredentials(mockAccount, sqlops.AzureResource.ResourceManagement), TypeMoq.Times.exactly(1));
+		mockCredentialService.verify((o) => o.getCredentials(mockAccount), TypeMoq.Times.exactly(1));
 		mockDatabaseService.verify((o) => o.getDatabases(mockSubscription, mockCredentials), TypeMoq.Times.exactly(1));
 		mockCacheService.verify((o) => o.get(TypeMoq.It.isAnyString()), TypeMoq.Times.exactly(2));
 		mockCacheService.verify((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny()), TypeMoq.Times.exactly(1));
@@ -193,7 +193,7 @@ describe('AzureResourceDatabaseContainerTreeNode.getChildren', function(): void
 		const databaseContainerTreeNode = new AzureResourceDatabaseContainerTreeNode(mockSubscription, mockAccount, mockTreeChangeHandler.object, undefined);
 		const children = await databaseContainerTreeNode.getChildren();

-		mockCredentialService.verify((o) => o.getCredentials(mockAccount, sqlops.AzureResource.ResourceManagement), TypeMoq.Times.once());
+		mockCredentialService.verify((o) => o.getCredentials(mockAccount), TypeMoq.Times.once());
 		mockDatabaseService.verify((o) => o.getDatabases(mockSubscription, mockCredentials), TypeMoq.Times.once());
 		mockCacheService.verify((o) => o.get(TypeMoq.It.isAnyString()), TypeMoq.Times.never());
 		mockCacheService.verify((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny()), TypeMoq.Times.never());
--- a/extensions/azurecore/src/test/azureResource/tree/databaseServerContainerTreeNode.test.ts
+++ b/extensions/azurecore/src/test/azureResource/tree/databaseServerContainerTreeNode.test.ts
@@ -118,7 +118,7 @@ describe('AzureResourceDatabaseServerContainerTreeNode.getChildren', function():
 		mockServicePool.credentialService = mockCredentialService.object;
 		mockServicePool.databaseServerService = mockDatabaseServerService.object;

-		mockCredentialService.setup((o) => o.getCredentials(mockAccount, sqlops.AzureResource.ResourceManagement)).returns(() => Promise.resolve(mockCredentials));
+		mockCredentialService.setup((o) => o.getCredentials(mockAccount)).returns(() => Promise.resolve(mockCredentials));
 		mockCacheService.setup((o) => o.get(TypeMoq.It.isAnyString())).returns(() => mockDatabaseServerContainerCache);
 		mockCacheService.setup((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny())).returns(() => mockDatabaseServerContainerCache.databaseServers[mockSubscription.id] = mockDatabaseServers);
 	});
@@ -130,7 +130,7 @@ describe('AzureResourceDatabaseServerContainerTreeNode.getChildren', function():

 		const children = await databaseServerContainerTreeNode.getChildren();

-		mockCredentialService.verify((o) => o.getCredentials(mockAccount, sqlops.AzureResource.ResourceManagement), TypeMoq.Times.once());
+		mockCredentialService.verify((o) => o.getCredentials(mockAccount), TypeMoq.Times.once());
 		mockDatabaseServerService.verify((o) => o.getDatabaseServers(mockSubscription, mockCredentials), TypeMoq.Times.once());
 		mockCacheService.verify((o) => o.get(TypeMoq.It.isAnyString()), TypeMoq.Times.once());
 		mockCacheService.verify((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny()), TypeMoq.Times.once());
@@ -160,7 +160,7 @@ describe('AzureResourceDatabaseServerContainerTreeNode.getChildren', function():
 		await databaseServerContainerTreeNode.getChildren();
 		const children = await databaseServerContainerTreeNode.getChildren();

-		mockCredentialService.verify((o) => o.getCredentials(mockAccount, sqlops.AzureResource.ResourceManagement), TypeMoq.Times.exactly(1));
+		mockCredentialService.verify((o) => o.getCredentials(mockAccount), TypeMoq.Times.exactly(1));
 		mockDatabaseServerService.verify((o) => o.getDatabaseServers(mockSubscription, mockCredentials), TypeMoq.Times.exactly(1));
 		mockCacheService.verify((o) => o.get(TypeMoq.It.isAnyString()), TypeMoq.Times.exactly(2));
 		mockCacheService.verify((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny()), TypeMoq.Times.exactly(1));
@@ -193,7 +193,7 @@ describe('AzureResourceDatabaseServerContainerTreeNode.getChildren', function():
 		const databaseServerContainerTreeNode = new AzureResourceDatabaseServerContainerTreeNode(mockSubscription, mockAccount, mockTreeChangeHandler.object, undefined);
 		const children = await databaseServerContainerTreeNode.getChildren();

-		mockCredentialService.verify((o) => o.getCredentials(mockAccount, sqlops.AzureResource.ResourceManagement), TypeMoq.Times.once());
+		mockCredentialService.verify((o) => o.getCredentials(mockAccount), TypeMoq.Times.once());
 		mockDatabaseServerService.verify((o) => o.getDatabaseServers(mockSubscription, mockCredentials), TypeMoq.Times.once());
 		mockCacheService.verify((o) => o.get(TypeMoq.It.isAnyString()), TypeMoq.Times.never());
 		mockCacheService.verify((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny()), TypeMoq.Times.never());
--- a/extensions/azurecore/yarn.lock
+++ b/extensions/azurecore/yarn.lock
@@ -10,7 +10,6 @@
 "@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"
@@ -42,6 +41,18 @@ 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"
@@ -54,6 +65,10 @@ 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"
@@ -61,10 +76,9 @@ async@2.6.0:
  dependencies:
    lodash "^4.14.0"

-async@>=0.6.0:
+async@>=0.6.0, async@^2.0.1:
  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"

@@ -73,6 +87,10 @@ 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"
@@ -111,6 +129,22 @@ 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"
@@ -129,11 +163,25 @@ 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"
@@ -151,10 +199,9 @@ combined-stream@1.0.6:
  dependencies:
    delayed-stream "~1.0.0"

-combined-stream@~1.0.6:
+combined-stream@^1.0.5, combined-stream@~1.0.1, 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"

@@ -163,15 +210,28 @@ 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.2, core-util-is@~1.0.0:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+
+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"

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

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

-extend@~3.0.2:
+extend@~3.0.0, 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"
@@ -252,10 +310,17 @@ 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.1:
+forever-agent@~0.6.0, forever-agent@~0.6.1:
  version "0.6.1"
  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
+
+form-data@~1.0.0-rc1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-1.0.1.tgz#ae315db9a4907fa065502304a66d7733475ee37c"
+  dependencies:
+    async "^2.0.1"
+    combined-stream "^1.0.5"
+    mime-types "^2.1.11"

 form-data@~2.3.2:
  version "2.3.2"
@@ -271,6 +336,18 @@ 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"
@@ -300,6 +377,15 @@ 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"
@@ -308,16 +394,43 @@ 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"
@@ -335,16 +448,33 @@ inflight@^1.0.4:
    once "^1.3.0"
    wrappy "1"

-inherits@2:
+inherits@2, inherits@~2.0.1:
  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"
@@ -355,10 +485,13 @@ is-typedarray@~1.0.0:
  resolved "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=

-isstream@~0.1.2:
+isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+
+isstream@~0.1.1, isstream@~0.1.2:
  version "0.1.2"
  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=

 jsbn@~0.1.0:
  version "0.1.1"
@@ -375,10 +508,13 @@ 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.1:
+json-stringify-safe@~5.0.0, json-stringify-safe@~5.0.1:
  version "5.0.1"
  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
+
+jsonpointer@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"

 jsprim@^1.2.2:
  version "1.4.1"
@@ -417,10 +553,9 @@ 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.12, mime-types@~2.1.19:
+mime-types@^2.1.11, mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.2:
  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"

@@ -496,6 +631,14 @@ 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"
@@ -523,6 +666,10 @@ 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"
@@ -533,14 +680,53 @@ 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==

-request@2.88.0, "request@>= 2.52.0", request@^2.88.0:
+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:
  version "2.88.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
+  resolved "https://registry.npmjs.org/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
  integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
  dependencies:
    aws-sign2 "~0.7.0"
@@ -618,6 +804,12 @@ 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"
@@ -634,6 +826,20 @@ 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"
@@ -641,15 +847,18 @@ 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@~2.4.3:
+tough-cookie@>=0.12.0, 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"
@@ -661,6 +870,10 @@ 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"
@@ -685,6 +898,10 @@ 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"
@@ -717,3 +934,7 @@ 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
@@ -2,7 +2,7 @@
  "name": "import",
  "displayName": "SQL Server Import",
  "description": "SQL Server Import for Azure Data Studio supports importing CSV or JSON files into SQL Server.",
-  "version": "0.5.0",
+  "version": "0.4.0",
  "publisher": "Microsoft",
  "preview": true,
  "engines": {
@@ -33,15 +33,6 @@
          "light": "./images/light_icon.svg",
          "dark": "./images/dark_icon.svg"
        }
-      },
-      {
-        "command": "dacFx.start",
-        "title": "Data-tier Application Wizard",
-        "category": "Data-tier Application",
-        "icon": {
-          "light": "./images/light_icon.svg",
-          "dark": "./images/dark_icon.svg"
-        }
      }
    ],
    "keybindings": [
@@ -57,17 +48,12 @@
          "command": "flatFileImport.start",
          "when": "connectionProvider == MSSQL && nodeType && nodeType == Database",
          "group": "import"
-        },
-        {
-          "command": "dacFx.start",
-          "when": "connectionProvider == MSSQL && nodeType && nodeType == Database",
-          "group": "export"
        }
      ]
    }
  },
  "dependencies": {
-    "dataprotocol-client": "github:Microsoft/sqlops-dataprotocolclient#0.2.10",
+    "dataprotocol-client": "github:Microsoft/sqlops-dataprotocolclient#0.2.7",
    "opener": "^1.4.3",
    "service-downloader": "github:anthonydresser/service-downloader#0.1.5",
    "vscode-extension-telemetry": "0.0.18",
--- a/extensions/import/src/controllers/mainController.ts
+++ b/extensions/import/src/controllers/mainController.ts
@@ -13,7 +13,6 @@ import { FlatFileWizard } from '../wizard/flatFileWizard';
 import { ServiceClient } from '../services/serviceClient';
 import { ApiType, managerInstance } from '../services/serviceApiManager';
 import { FlatFileProvider } from '../services/contracts';
-import { DataTierApplicationWizard } from '../wizard/dataTierApplicationWizard';

 /**
 * The main controller class that initializes the extension
@@ -36,15 +35,10 @@ export default class MainController extends ControllerBase {
 			this.initializeFlatFileProvider(provider);
 		});

-		this.initializeDacFxWizard();
 		return Promise.resolve(true);
 	}

 	private initializeFlatFileProvider(provider: FlatFileProvider) {
 		sqlops.tasks.registerTask('flatFileImport.start', (profile: sqlops.IConnectionProfile, ...args: any[]) => new FlatFileWizard(provider).start(profile, args));
 	}
-
-	private initializeDacFxWizard() {
-		sqlops.tasks.registerTask('dacFx.start', (profile: sqlops.IConnectionProfile, ...args: any[]) => new DataTierApplicationWizard().start(profile, args));
-	}
 }
--- a/extensions/import/src/wizard/api/basePage.ts
+++ b/extensions/import/src/wizard/api/basePage.ts
@@ -1,139 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-
-import * as sqlops from 'sqlops';
-import { BaseDataModel } from './models';
-
-export abstract class BasePage {
-
-	protected readonly wizardPage: sqlops.window.modelviewdialog.WizardPage;
-	protected readonly model: BaseDataModel;
-	protected readonly view: sqlops.ModelView;
-
-	/**
-	 * This method constructs all the elements of the page.
-	 * @returns {Promise<boolean>}
-	 */
-	public async abstract start(): Promise<boolean>;
-
-	/**
-	 * This method is called when the user is entering the page.
-	 * @returns {Promise<boolean>}
-	 */
-	public async abstract onPageEnter(): Promise<boolean>;
-
-	/**
-	 * This method is called when the user is leaving the page.
-	 * @returns {Promise<boolean>}
-	 */
-	async onPageLeave(): Promise<boolean> {
-		return true;
-	}
-
-	/**
-	 * Override this method to cleanup what you don't need cached in the page.
-	 * @returns {Promise<boolean>}
-	 */
-	public async cleanup(): Promise<boolean> {
-		return true;
-	}
-
-	/**
-	 * Sets up a navigation validator.
-	 * This will be called right before onPageEnter().
-	 */
-	public abstract setupNavigationValidator();
-
-	protected async getServerValues(): Promise<{ connection, displayName, name }[]> {
-		let cons = await sqlops.connection.getActiveConnections();
-		// This user has no active connections ABORT MISSION
-		if (!cons || cons.length === 0) {
-			return undefined;
-		}
-
-		let count = -1;
-		let idx = -1;
-
-
-		let values = cons.map(c => {
-			// Handle the code to remember what the user's choice was from before
-			count++;
-			if (idx === -1) {
-				if (this.model.server && c.connectionId === this.model.server.connectionId) {
-					idx = count;
-				} else if (this.model.serverId && c.connectionId === this.model.serverId) {
-					idx = count;
-				}
-			}
-
-			let db = c.options.databaseDisplayName;
-			let usr = c.options.user;
-			let srv = c.options.server;
-
-			if (!db) {
-				db = '<default>';
-			}
-
-			if (!usr) {
-				usr = 'default';
-			}
-
-			let finalName = `${srv}, ${db} (${usr})`;
-			return {
-				connection: c,
-				displayName: finalName,
-				name: c.connectionId
-			};
-		});
-
-		if (idx >= 0) {
-			let tmp = values[0];
-			values[0] = values[idx];
-			values[idx] = tmp;
-		} else {
-			this.deleteServerValues();
-		}
-
-		return values;
-	}
-
-	protected async getDatabaseValues(): Promise<{ displayName, name }[]> {
-		let idx = -1;
-		let count = -1;
-		let values = (await sqlops.connection.listDatabases(this.model.server.connectionId)).map(db => {
-			count++;
-			if (this.model.database && db === this.model.database) {
-				idx = count;
-			}
-
-			return {
-				displayName: db,
-				name: db
-			};
-		});
-
-		if (idx >= 0) {
-			let tmp = values[0];
-			values[0] = values[idx];
-			values[idx] = tmp;
-		} else {
-			this.deleteDatabaseValues();
-		}
-
-		return values;
-	}
-
-	protected deleteServerValues() {
-		delete this.model.server;
-		delete this.model.serverId;
-		delete this.model.database;
-	}
-
-	protected deleteDatabaseValues() {
-		return;
-	}
-}
-
--- a/extensions/import/src/wizard/api/dacFxConfigPage.ts
+++ b/extensions/import/src/wizard/api/dacFxConfigPage.ts
@@ -1,158 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-
-import * as sqlops from 'sqlops';
-import * as nls from 'vscode-nls';
-import * as os from 'os';
-import * as path from 'path';
-import { DataTierApplicationWizard } from '../dataTierApplicationWizard';
-import { DacFxDataModel } from './models';
-import { BasePage } from './basePage';
-
-const localize = nls.loadMessageBundle();
-
-export abstract class DacFxConfigPage extends BasePage {
-
-	protected readonly wizardPage: sqlops.window.modelviewdialog.WizardPage;
-	protected readonly instance: DataTierApplicationWizard;
-	protected readonly model: DacFxDataModel;
-	protected readonly view: sqlops.ModelView;
-	protected serverDropdown: sqlops.DropDownComponent;
-	protected databaseTextBox: sqlops.InputBoxComponent;
-	protected databaseDropdown: sqlops.DropDownComponent;
-	protected databaseLoader: sqlops.LoadingComponent;
-	protected fileTextBox: sqlops.InputBoxComponent;
-	protected fileButton: sqlops.ButtonComponent;
-	protected fileExtension: string;
-
-	protected constructor(instance: DataTierApplicationWizard, wizardPage: sqlops.window.modelviewdialog.WizardPage, model: DacFxDataModel, view: sqlops.ModelView) {
-		super();
-		this.instance = instance;
-		this.wizardPage = wizardPage;
-		this.model = model;
-		this.view = view;
-	}
-
-	public setupNavigationValidator() {
-		this.instance.registerNavigationValidator(() => {
-			return true;
-		});
-	}
-
-	protected async createServerDropdown(isTargetServer: boolean): Promise<sqlops.FormComponent> {
-		this.serverDropdown = this.view.modelBuilder.dropDown().withProperties({
-			required: true
-		}).component();
-
-		// Handle server changes
-		this.serverDropdown.onValueChanged(async () => {
-			this.model.server = (this.serverDropdown.value as ConnectionDropdownValue).connection;
-			this.model.serverName = (this.serverDropdown.value as ConnectionDropdownValue).displayName;
-			await this.populateDatabaseDropdown();
-		});
-
-		let targetServerTitle = localize('dacFx.targetServerDropdownTitle', 'Target Server');
-		let sourceServerTitle = localize('dacFx.sourceServerDropdownTitle', 'Source Server');
-
-		return {
-			component: this.serverDropdown,
-			title: isTargetServer ? targetServerTitle : sourceServerTitle
-		};
-	}
-
-	protected async populateServerDropdown(): Promise<boolean> {
-		let values = await this.getServerValues();
-		if (values === undefined) {
-			return false;
-		}
-
-		this.model.server = values[0].connection;
-		this.model.serverName = values[0].displayName;
-
-		this.serverDropdown.updateProperties({
-			values: values
-		});
-		return true;
-	}
-
-	protected async createDatabaseTextBox(): Promise<sqlops.FormComponent> {
-		this.databaseTextBox = this.view.modelBuilder.inputBox().withProperties({
-			required: true
-		}).component();
-
-		this.databaseTextBox.onTextChanged(async () => {
-			this.model.database = this.databaseTextBox.value;
-		});
-
-		return {
-			component: this.databaseTextBox,
-			title: localize('dacFx.databaseNameTextBox', 'Target Database')
-		};
-	}
-
-	protected async createDatabaseDropdown(): Promise<sqlops.FormComponent> {
-		this.databaseDropdown = this.view.modelBuilder.dropDown().withProperties({
-			required: true
-		}).component();
-
-		// Handle database changes
-		this.databaseDropdown.onValueChanged(async () => {
-			this.model.database = (<sqlops.CategoryValue>this.databaseDropdown.value).name;
-			this.fileTextBox.value = this.generateFilePath();
-			this.model.filePath = this.fileTextBox.value;
-		});
-
-		this.databaseLoader = this.view.modelBuilder.loadingComponent().withItem(this.databaseDropdown).component();
-
-		return {
-			component: this.databaseLoader,
-			title: localize('dacFx.sourceDatabaseDropdownTitle', 'Source Database')
-		};
-	}
-
-	protected async populateDatabaseDropdown(): Promise<boolean> {
-		this.databaseLoader.loading = true;
-		this.databaseDropdown.updateProperties({ values: [] });
-
-		if (!this.model.server) {
-			this.databaseLoader.loading = false;
-			return false;
-		}
-
-		let values = await this.getDatabaseValues();
-		this.model.database = values[0].name;
-		this.model.filePath = this.generateFilePath();
-		this.fileTextBox.value = this.model.filePath;
-
-		this.databaseDropdown.updateProperties({
-			values: values
-		});
-		this.databaseLoader.loading = false;
-
-		return true;
-	}
-
-	protected async createFileBrowserParts() {
-		this.fileTextBox = this.view.modelBuilder.inputBox().withProperties({
-			required: true
-		}).component();
-
-		this.fileButton = this.view.modelBuilder.button().withProperties({
-			label: '•••',
-		}).component();
-	}
-
-	protected generateFilePath(): string {
-		let now = new Date();
-		let datetime = now.getFullYear() + '-' + (now.getMonth() + 1) + '-' + now.getDate() + '-' + now.getHours() + '-' + now.getMinutes();
-		return path.join(os.homedir(), this.model.database + '-' + datetime + this.fileExtension);
-	}
-}
-
-interface ConnectionDropdownValue extends sqlops.CategoryValue {
-	connection: sqlops.connection.Connection;
-}
-
--- a/extensions/import/src/wizard/api/importPage.ts
+++ b/extensions/import/src/wizard/api/importPage.ts
@@ -8,9 +8,8 @@ import { ImportDataModel } from './models';
 import * as sqlops from 'sqlops';
 import { FlatFileProvider } from '../../services/contracts';
 import { FlatFileWizard } from '../flatFileWizard';
-import { BasePage } from './basePage';

-export abstract class ImportPage extends BasePage {
+export abstract class ImportPage {

 	protected readonly wizardPage: sqlops.window.modelviewdialog.WizardPage;
 	protected readonly instance: FlatFileWizard;
@@ -19,11 +18,42 @@ export abstract class ImportPage extends BasePage {
 	protected readonly provider: FlatFileProvider;

 	protected constructor(instance: FlatFileWizard, wizardPage: sqlops.window.modelviewdialog.WizardPage, model: ImportDataModel, view: sqlops.ModelView, provider: FlatFileProvider) {
-		super();
 		this.instance = instance;
 		this.wizardPage = wizardPage;
 		this.model = model;
 		this.view = view;
 		this.provider = provider;
 	}
+
+	/**
+	 * This method constructs all the elements of the page.
+	 * @returns {Promise<boolean>}
+	 */
+	public async abstract start(): Promise<boolean>;
+
+	/**
+	 * This method is called when the user is entering the page.
+	 * @returns {Promise<boolean>}
+	 */
+	public async abstract onPageEnter(): Promise<boolean>;
+
+	/**
+	 * This method is called when the user is leaving the page.
+	 * @returns {Promise<boolean>}
+	 */
+	public async abstract onPageLeave(): Promise<boolean>;
+
+	/**
+	 * Sets up a navigation validator.
+	 * This will be called right before onPageEnter().
+	 */
+	public abstract setupNavigationValidator();
+
+	/**
+	 * Override this method to cleanup what you don't need cached in the page.
+	 * @returns {Promise<boolean>}
+	 */
+	public async cleanup(): Promise<boolean> {
+		return true;
+	}
 }
--- a/extensions/import/src/wizard/api/models.ts
+++ b/extensions/import/src/wizard/api/models.ts
@@ -6,19 +6,15 @@

 import * as sqlops from 'sqlops';

-export interface BaseDataModel {
-	server: sqlops.connection.Connection;
-	serverId: string;
-	database: string;
-}
-
 /**
 * The main data model that communicates between the pages.
 */
-export interface ImportDataModel extends BaseDataModel {
+export interface ImportDataModel {
 	ownerUri: string;
 	proseColumns: ColumnMetadata[];
 	proseDataPreview: string[][];
+	server: sqlops.connection.Connection;
+	serverId: string;
 	database: string;
 	table: string;
 	schema: string;
@@ -35,14 +31,3 @@ export interface ColumnMetadata {
 	primaryKey: boolean;
 	nullable: boolean;
 }
-
-/**
- * Data model to communicate between DacFx pages
- */
-export interface DacFxDataModel extends BaseDataModel {
-	serverName: string;
-	serverId: string;
-	filePath: string;
-	version: string;
-	upgradeExisting: boolean;
-}
--- a/extensions/import/src/wizard/dataTierApplicationWizard.ts
+++ b/extensions/import/src/wizard/dataTierApplicationWizard.ts
@@ -1,253 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-'use strict';
-import * as vscode from 'vscode';
-import * as nls from 'vscode-nls';
-import * as sqlops from 'sqlops';
-import { SelectOperationPage } from './pages/selectOperationpage';
-import { DeployConfigPage } from './pages/deployConfigPage';
-import { DacFxSummaryPage } from './pages/dacFxSummaryPage';
-import { ExportConfigPage } from './pages/exportConfigPage';
-import { ExtractConfigPage } from './pages/extractConfigPage';
-import { ImportConfigPage } from './pages/importConfigPage';
-import { DacFxDataModel } from './api/models';
-import { BasePage } from './api/basePage';
-
-const localize = nls.loadMessageBundle();
-
-class Page {
-	wizardPage: sqlops.window.modelviewdialog.WizardPage;
-	dacFxPage: BasePage;
-
-	constructor(wizardPage: sqlops.window.modelviewdialog.WizardPage) {
-		this.wizardPage = wizardPage;
-	}
-}
-
-export enum Operation {
-	deploy,
-	extract,
-	import,
-	export
-}
-
-export class DataTierApplicationWizard {
-	public wizard: sqlops.window.modelviewdialog.Wizard;
-	private connection: sqlops.connection.Connection;
-	private model: DacFxDataModel;
-	public pages: Map<string, Page> = new Map<string, Page>();
-	public selectedOperation: Operation;
-
-	constructor() {
-	}
-
-	public async start(p: any, ...args: any[]) {
-		this.model = <DacFxDataModel>{};
-
-		let profile = p ? <sqlops.IConnectionProfile>p.connectionProfile : undefined;
-		if (profile) {
-			this.model.serverId = profile.id;
-			this.model.database = profile.databaseName;
-		}
-
-		this.connection = await sqlops.connection.getCurrentConnection();
-		if (!this.connection) {
-			this.connection = await sqlops.connection.openConnectionDialog();
-		}
-
-		this.wizard = sqlops.window.modelviewdialog.createWizard('Data-tier Application Wizard');
-		let selectOperationWizardPage = sqlops.window.modelviewdialog.createWizardPage(localize('dacFx.selectOperationPageName', 'Select an Operation'));
-		let deployConfigWizardPage = sqlops.window.modelviewdialog.createWizardPage(localize('dacFx.deployConfigPageName', 'Select Deploy Dacpac Settings'));
-		let summaryWizardPage = sqlops.window.modelviewdialog.createWizardPage(localize('dacFx.summaryPageName', 'Summary'));
-		let extractConfigWizardPage = sqlops.window.modelviewdialog.createWizardPage(localize('dacFx.extractConfigPageName', 'Select Extract Dacpac Settings'));
-		let importConfigWizardPage = sqlops.window.modelviewdialog.createWizardPage(localize('dacFx.importConfigPageName', 'Select Import Bacpac Settings'));
-		let exportConfigWizardPage = sqlops.window.modelviewdialog.createWizardPage(localize('dacFx.exportConfigPageName', 'Select Export Bacpac Settings'));
-
-		this.pages.set('selectOperation', new Page(selectOperationWizardPage));
-		this.pages.set('deployConfig', new Page(deployConfigWizardPage));
-		this.pages.set('extractConfig', new Page(extractConfigWizardPage));
-		this.pages.set('importConfig', new Page(importConfigWizardPage));
-		this.pages.set('exportConfig', new Page(exportConfigWizardPage));
-		this.pages.set('summary', new Page(summaryWizardPage));
-
-		selectOperationWizardPage.registerContent(async (view) => {
-			let selectOperationDacFxPage = new SelectOperationPage(this, selectOperationWizardPage, this.model, view);
-			this.pages.get('selectOperation').dacFxPage = selectOperationDacFxPage;
-			await selectOperationDacFxPage.start().then(() => {
-				selectOperationDacFxPage.setupNavigationValidator();
-				selectOperationDacFxPage.onPageEnter();
-			});
-		});
-
-		deployConfigWizardPage.registerContent(async (view) => {
-			let deployConfigDacFxPage = new DeployConfigPage(this, deployConfigWizardPage, this.model, view);
-			this.pages.get('deployConfig').dacFxPage = deployConfigDacFxPage;
-			await deployConfigDacFxPage.start();
-		});
-
-		extractConfigWizardPage.registerContent(async (view) => {
-			let extractConfigDacFxPage = new ExtractConfigPage(this, extractConfigWizardPage, this.model, view);
-			this.pages.get('extractConfig').dacFxPage = extractConfigDacFxPage;
-			await extractConfigDacFxPage.start();
-		});
-
-		importConfigWizardPage.registerContent(async (view) => {
-			let importConfigDacFxPage = new ImportConfigPage(this, importConfigWizardPage, this.model, view);
-			this.pages.get('importConfig').dacFxPage = importConfigDacFxPage;
-			await importConfigDacFxPage.start();
-		});
-
-		exportConfigWizardPage.registerContent(async (view) => {
-			let exportConfigDacFxPage = new ExportConfigPage(this, exportConfigWizardPage, this.model, view);
-			this.pages.get('exportConfig').dacFxPage = exportConfigDacFxPage;
-			await exportConfigDacFxPage.start();
-		});
-
-		summaryWizardPage.registerContent(async (view) => {
-			let summaryDacFxPage = new DacFxSummaryPage(this, summaryWizardPage, this.model, view);
-			this.pages.get('summary').dacFxPage = summaryDacFxPage;
-			await summaryDacFxPage.start();
-		});
-
-		this.wizard.onPageChanged(async (event) => {
-			let idx = event.newPage;
-			let page: Page;
-
-			if (idx === 1) {
-				switch (this.selectedOperation) {
-					case Operation.deploy: {
-						page = this.pages.get('deployConfig');
-						break;
-					}
-					case Operation.extract: {
-						page = this.pages.get('extractConfig');
-						break;
-					}
-					case Operation.import: {
-						page = this.pages.get('importConfig');
-						break;
-					}
-					case Operation.export: {
-						page = this.pages.get('exportConfig');
-						break;
-					}
-				}
-			} else if (idx === 2) {
-				page = this.pages.get('summary');
-			}
-
-			if (page !== undefined) {
-				page.dacFxPage.setupNavigationValidator();
-				page.dacFxPage.onPageEnter();
-			}
-		});
-
-		this.wizard.pages = [selectOperationWizardPage, deployConfigWizardPage, summaryWizardPage];
-		this.wizard.generateScriptButton.hidden = true;
-		this.wizard.doneButton.onClick(async () => await this.executeOperation());
-
-		this.wizard.open();
-	}
-
-	public registerNavigationValidator(validator: (pageChangeInfo: sqlops.window.modelviewdialog.WizardPageChangeInfo) => boolean) {
-		this.wizard.registerNavigationValidator(validator);
-	}
-
-	public setDoneButton(operation: Operation): void {
-		switch (operation) {
-			case Operation.deploy: {
-				this.wizard.doneButton.label = localize('dacFx.deployButton', 'Deploy');
-				this.selectedOperation = Operation.deploy;
-				break;
-			}
-			case Operation.extract: {
-				this.wizard.doneButton.label = localize('dacFx.extractButton', 'Extract');
-				this.selectedOperation = Operation.extract;
-				break;
-			}
-			case Operation.import: {
-				this.wizard.doneButton.label = localize('dacFx.importButton', 'Import');
-				this.selectedOperation = Operation.import;
-				break;
-			}
-			case Operation.export: {
-				this.wizard.doneButton.label = localize('dacFx.exportButton', 'Export');
-				this.selectedOperation = Operation.export;
-				break;
-			}
-		}
-	}
-
-	private async executeOperation() {
-		switch (this.selectedOperation) {
-			case Operation.deploy: {
-				await this.deploy();
-				break;
-			}
-			case Operation.extract: {
-				await this.extract();
-				break;
-			}
-			case Operation.import: {
-				await this.import();
-				break;
-			}
-			case Operation.export: {
-				await this.export();
-				break;
-			}
-		}
-	}
-
-	private async deploy() {
-		let service = await DataTierApplicationWizard.getService();
-		let ownerUri = await sqlops.connection.getUriForConnection(this.model.server.connectionId);
-
-		let result = await service.deployDacpac(this.model.filePath, this.model.database, this.model.upgradeExisting, ownerUri, sqlops.TaskExecutionMode.execute);
-		if (!result || !result.success) {
-			vscode.window.showErrorMessage(
-				localize('alertData.deployErrorMessage', "Deploy failed '{0}'", result.errorMessage ? result.errorMessage : 'Unknown'));
-		}
-	}
-
-	private async extract() {
-		let service = await DataTierApplicationWizard.getService();
-		let ownerUri = await sqlops.connection.getUriForConnection(this.model.server.connectionId);
-
-		let result = await service.extractDacpac(this.model.database, this.model.filePath, this.model.database, this.model.version, ownerUri, sqlops.TaskExecutionMode.execute);
-		if (!result || !result.success) {
-			vscode.window.showErrorMessage(
-				localize('alertData.extractErrorMessage', "Extract failed '{0}'", result.errorMessage ? result.errorMessage : 'Unknown'));
-		}
-	}
-
-	private async export() {
-		let service = await DataTierApplicationWizard.getService();
-		let ownerUri = await sqlops.connection.getUriForConnection(this.model.server.connectionId);
-
-		let result = await service.exportBacpac(this.model.database, this.model.filePath, ownerUri, sqlops.TaskExecutionMode.execute);
-		if (!result || !result.success) {
-			vscode.window.showErrorMessage(
-				localize('alertData.exportErrorMessage', "Export failed '{0}'", result.errorMessage ? result.errorMessage : 'Unknown'));
-		}
-	}
-
-	private async import() {
-		let service = await DataTierApplicationWizard.getService();
-		let ownerUri = await sqlops.connection.getUriForConnection(this.model.server.connectionId);
-
-		let result = await service.importBacpac(this.model.filePath, this.model.database, ownerUri, sqlops.TaskExecutionMode.execute);
-		if (!result || !result.success) {
-			vscode.window.showErrorMessage(
-				localize('alertData.importErrorMessage', "Import failed '{0}'", result.errorMessage ? result.errorMessage : 'Unknown'));
-		}
-	}
-
-	public static async getService(): Promise<sqlops.DacFxServicesProvider> {
-		let currentConnection = await sqlops.connection.getCurrentConnection();
-		let service = sqlops.dataprotocol.getProvider<sqlops.DacFxServicesProvider>(currentConnection.providerName, sqlops.DataProviderType.DacFxServicesProvider);
-		return service;
-	}
-}
--- a/extensions/import/src/wizard/pages/dacFxSummaryPage.ts
+++ b/extensions/import/src/wizard/pages/dacFxSummaryPage.ts
@@ -1,112 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-import * as sqlops from 'sqlops';
-import * as nls from 'vscode-nls';
-import { DacFxDataModel } from '../api/models';
-import { DataTierApplicationWizard, Operation } from '../dataTierApplicationWizard';
-import { BasePage } from '../api/basePage';
-
-const localize = nls.loadMessageBundle();
-
-export class DacFxSummaryPage extends BasePage {
-
-	protected readonly wizardPage: sqlops.window.modelviewdialog.WizardPage;
-	protected readonly instance: DataTierApplicationWizard;
-	protected readonly model: DacFxDataModel;
-	protected readonly view: sqlops.ModelView;
-
-	private form: sqlops.FormContainer;
-	private table: sqlops.TableComponent;
-	private loader: sqlops.LoadingComponent;
-
-	public constructor(instance: DataTierApplicationWizard, wizardPage: sqlops.window.modelviewdialog.WizardPage, model: DacFxDataModel, view: sqlops.ModelView) {
-		super();
-		this.instance = instance;
-		this.wizardPage = wizardPage;
-		this.model = model;
-		this.view = view;
-	}
-
-	async start(): Promise<boolean> {
-		this.table = this.view.modelBuilder.table().component();
-		this.loader = this.view.modelBuilder.loadingComponent().withItem(this.table).component();
-		this.form = this.view.modelBuilder.formContainer().withFormItems(
-			[
-				{
-					component: this.table,
-					title: ''
-				}
-			]
-		).component();
-		await this.view.initializeModel(this.form);
-		return true;
-	}
-
-	async onPageEnter(): Promise<boolean> {
-		this.populateTable();
-		this.loader.loading = false;
-		return true;
-	}
-
-	public setupNavigationValidator() {
-		this.instance.registerNavigationValidator(() => {
-			if (this.loader.loading) {
-				return false;
-			}
-			return true;
-		});
-	}
-
-	private populateTable() {
-		let data = [];
-		let targetServer = localize('dacfx.targetServerName', 'Target Server');
-		let targetDatabase = localize('dacfx.targetDatabaseName', 'Target Database');
-		let sourceServer = localize('dacfx.sourceServerName', 'Source Server');
-		let sourceDatabase = localize('dacfx.sourceDatabaseName', 'Source Database');
-		let fileLocation = localize('dacfx.fileLocation', 'File Location');
-
-		switch (this.instance.selectedOperation) {
-			case Operation.deploy: {
-				data = [
-					[targetServer, this.model.serverName],
-					[fileLocation, this.model.filePath],
-					[targetDatabase, this.model.database]];
-				break;
-			}
-			case Operation.extract: {
-				data = [
-					[sourceServer, this.model.serverName],
-					[sourceDatabase, this.model.database],
-					[localize('dacfxExtract.version', 'Version'), this.model.version],
-					[fileLocation, this.model.filePath]];
-				break;
-			}
-			case Operation.import: {
-				data = [
-					[targetServer, this.model.serverName],
-					[fileLocation, this.model.filePath],
-					[targetDatabase, this.model.database]];
-				break;
-			}
-			case Operation.export: {
-				data = [
-					[sourceServer, this.model.serverName],
-					[sourceDatabase, this.model.database],
-					[fileLocation, this.model.filePath]];
-				break;
-			}
-		}
-
-		this.table.updateProperties({
-			data: data,
-			columns: ['Setting', 'Value'],
-			width: 600,
-			height: 200
-		});
-	}
-}
-
--- a/extensions/import/src/wizard/pages/deployConfigPage.ts
+++ b/extensions/import/src/wizard/pages/deployConfigPage.ts
@@ -1,190 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-import * as sqlops from 'sqlops';
-import * as nls from 'vscode-nls';
-import * as vscode from 'vscode';
-import * as path from 'path';
-import * as os from 'os';
-import { DacFxDataModel } from '../api/models';
-import { DataTierApplicationWizard } from '../dataTierApplicationWizard';
-import { DacFxConfigPage } from '../api/dacFxConfigPage';
-
-const localize = nls.loadMessageBundle();
-
-export class DeployConfigPage extends DacFxConfigPage {
-
-	protected readonly wizardPage: sqlops.window.modelviewdialog.WizardPage;
-	protected readonly instance: DataTierApplicationWizard;
-	protected readonly model: DacFxDataModel;
-	protected readonly view: sqlops.ModelView;
-	private databaseDropdownComponent: sqlops.FormComponent;
-	private databaseComponent: sqlops.FormComponent;
-	private formBuilder: sqlops.FormBuilder;
-	private form: sqlops.FormContainer;
-
-	public constructor(instance: DataTierApplicationWizard, wizardPage: sqlops.window.modelviewdialog.WizardPage, model: DacFxDataModel, view: sqlops.ModelView) {
-		super(instance, wizardPage, model, view);
-		this.fileExtension = '.bacpac';
-	}
-
-	async start(): Promise<boolean> {
-				let serverComponent = await this.createServerDropdown(true);
-		let fileBrowserComponent = await this.createFileBrowser();
-		this.databaseComponent = await this.createDatabaseTextBox();
-		this.databaseComponent.title = localize('dacFx.databaseNameTextBox', 'Database Name');
-		this.databaseDropdownComponent = await this.createDeployDatabaseDropdown();
-		this.databaseDropdownComponent.title = localize('dacFx.databaseNameDropdown', 'Database Name');
-		let radioButtons = await this.createRadiobuttons();
-
-		this.formBuilder = this.view.modelBuilder.formContainer()
-			.withFormItems(
-				[
-					fileBrowserComponent,
-					serverComponent,
-					radioButtons,
-					this.databaseDropdownComponent
-				], {
-					horizontal: true,
-					componentWidth: 400
-				});
-
-		this.form = this.formBuilder.component();
-		await this.view.initializeModel(this.form);
-		return true;
-	}
-
-	async onPageEnter(): Promise<boolean> {
-		let r1 = await this.populateServerDropdown();
-		let r2 = await this.populateDeployDatabaseDropdown();
-		return r1 && r2;
-	}
-
-	private async createFileBrowser(): Promise<sqlops.FormComponent> {
-		this.createFileBrowserParts();
-
-		this.fileButton.onDidClick(async (click) => {
-			let fileUris = await vscode.window.showOpenDialog(
-				{
-					canSelectFiles: true,
-					canSelectFolders: false,
-					canSelectMany: false,
-					defaultUri: vscode.Uri.file(os.homedir()),
-					openLabel: localize('dacFxDeploy.openFile', 'Open'),
-					filters: {
-						'dacpac Files': ['dacpac'],
-					}
-				}
-			);
-
-			if (!fileUris || fileUris.length === 0) {
-				return;
-			}
-
-			let fileUri = fileUris[0];
-			this.fileTextBox.value = fileUri.fsPath;
-			this.model.filePath = fileUri.fsPath;
-		});
-
-		this.fileTextBox.onTextChanged(async () => {
-			this.model.filePath = this.fileTextBox.value;
-			this.databaseTextBox.value = this.generateDatabaseName(this.model.filePath);
-			if (!this.model.upgradeExisting) {
-				this.model.database = this.databaseTextBox.value;
-			}
-		});
-
-		return {
-			component: this.fileTextBox,
-			title: localize('dacFxDeploy.fileTextboxTitle', 'File Location'),
-			actions: [this.fileButton]
-		};
-	}
-
-	private async createRadiobuttons(): Promise<sqlops.FormComponent> {
-		let upgradeRadioButton = this.view.modelBuilder.radioButton()
-			.withProperties({
-				name: 'updateExisting',
-				label: localize('dacFx.upgradeRadioButtonLabel', 'Upgrade Existing Database'),
-			}).component();
-
-		let newRadioButton = this.view.modelBuilder.radioButton()
-			.withProperties({
-				name: 'updateExisting',
-				label: localize('dacFx.newRadioButtonLabel', 'New Database'),
-			}).component();
-
-		upgradeRadioButton.onDidClick(() => {
-			this.model.upgradeExisting = true;
-			this.formBuilder.removeFormItem(this.databaseComponent);
-			this.formBuilder.addFormItem(this.databaseDropdownComponent, { horizontal: true, componentWidth: 400 });
-			this.model.database = (<sqlops.CategoryValue>this.databaseDropdown.value).name;
-		});
-
-		newRadioButton.onDidClick(() => {
-			this.model.upgradeExisting = false;
-			this.formBuilder.removeFormItem(this.databaseDropdownComponent);
-			this.formBuilder.addFormItem(this.databaseComponent, { horizontal: true, componentWidth: 400 });
-			this.model.database = this.databaseTextBox.value;
-		});
-
-		// Initialize with upgrade existing true
-		upgradeRadioButton.checked = true;
-		this.model.upgradeExisting = true;
-
-		let flexRadioButtonsModel = this.view.modelBuilder.flexContainer()
-			.withLayout({
-				flexFlow: 'row',
-			}).withItems([
-				upgradeRadioButton, newRadioButton]
-			).component();
-
-		return {
-			component: flexRadioButtonsModel,
-			title: localize('dacFx.targetDatabaseRadioButtonsTitle', 'Target Database')
-		};
-	}
-
-	protected async createDeployDatabaseDropdown(): Promise<sqlops.FormComponent> {
-			this.databaseDropdown = this.view.modelBuilder.dropDown().withProperties({
-			required: true
-		}).component();
-		// Handle database changes
-		this.databaseDropdown.onValueChanged(async () => {
-			this.model.database = (<sqlops.CategoryValue>this.databaseDropdown.value).name;
-		});
-		this.databaseLoader = this.view.modelBuilder.loadingComponent().withItem(this.databaseDropdown).component();
-		return {
-			component: this.databaseLoader,
-			title: localize('dacFx.targetDatabaseDropdownTitle', 'Database Name')
-		};
-	}
-
-	protected async populateDeployDatabaseDropdown(): Promise<boolean> {
-		this.databaseLoader.loading = true;
-		this.databaseDropdown.updateProperties({ values: [] });
-		if (!this.model.server) {
-			this.databaseLoader.loading = false;
-			return false;
-		}
-		let values = await this.getDatabaseValues();
-
-		if (this.model.database === undefined) {
-			this.model.database = values[0].name;
-		}
-
-		this.databaseDropdown.updateProperties({
-			values: values
-		});
-		this.databaseLoader.loading = false;
-		return true;
-	}
-
-	private generateDatabaseName(filePath: string): string {
-		let result = path.parse(filePath);
-		return result.name;
-	}
-}
--- a/extensions/import/src/wizard/pages/exportConfigPage.ts
+++ b/extensions/import/src/wizard/pages/exportConfigPage.ts
@@ -1,100 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-import * as sqlops from 'sqlops';
-import * as nls from 'vscode-nls';
-import * as vscode from 'vscode';
-import { DacFxDataModel } from '../api/models';
-import { DataTierApplicationWizard } from '../dataTierApplicationWizard';
-import { DacFxConfigPage } from '../api/dacFxConfigPage';
-
-const localize = nls.loadMessageBundle();
-
-export class ExportConfigPage extends DacFxConfigPage {
-
-	protected readonly wizardPage: sqlops.window.modelviewdialog.WizardPage;
-	protected readonly instance: DataTierApplicationWizard;
-	protected readonly model: DacFxDataModel;
-	protected readonly view: sqlops.ModelView;
-
-	private form: sqlops.FormContainer;
-
-	public constructor(instance: DataTierApplicationWizard, wizardPage: sqlops.window.modelviewdialog.WizardPage, model: DacFxDataModel, view: sqlops.ModelView) {
-		super(instance, wizardPage, model, view);
-		this.fileExtension = '.bacpac';
-	}
-
-	async start(): Promise<boolean> {
-		let databaseComponent = await this.createDatabaseDropdown();
-		let serverComponent = await this.createServerDropdown(false);
-		let fileBrowserComponent = await this.createFileBrowser();
-
-		this.form = this.view.modelBuilder.formContainer()
-			.withFormItems(
-				[
-					serverComponent,
-					databaseComponent,
-					fileBrowserComponent,
-				], {
-					horizontal: true,
-					componentWidth: 400
-				}).component();
-		await this.view.initializeModel(this.form);
-		return true;
-	}
-
-	async onPageEnter(): Promise<boolean> {
-		let r1 = await this.populateServerDropdown();
-		let r2 = await this.populateDatabaseDropdown();
-		return r1 && r2;
-	}
-
-	public setupNavigationValidator() {
-		this.instance.registerNavigationValidator(() => {
-			if (this.databaseLoader.loading) {
-				return false;
-			}
-			return true;
-		});
-	}
-
-	private async createFileBrowser(): Promise<sqlops.FormComponent> {
-		this.createFileBrowserParts();
-
-		// default filepath
-		this.fileTextBox.value = this.generateFilePath();
-		this.model.filePath = this.fileTextBox.value;
-
-		this.fileButton.onDidClick(async (click) => {
-			let fileUri = await vscode.window.showSaveDialog(
-				{
-					defaultUri: vscode.Uri.file(this.fileTextBox.value),
-					saveLabel: localize('dacfxExport.saveFile', 'Save'),
-					filters: {
-						'bacpac Files': ['bacpac'],
-					}
-				}
-			);
-
-			if (!fileUri) {
-				return;
-			}
-
-			this.fileTextBox.value = fileUri.fsPath;
-			this.model.filePath = fileUri.fsPath;
-		});
-
-		this.fileTextBox.onTextChanged(async () => {
-			this.model.filePath = this.fileTextBox.value;
-		});
-
-		return {
-			component: this.fileTextBox,
-			title: localize('dacFxExport.fileTextboxTitle', 'File Location'),
-			actions: [this.fileButton]
-		};
-	}
-}
--- a/extensions/import/src/wizard/pages/extractConfigPage.ts
+++ b/extensions/import/src/wizard/pages/extractConfigPage.ts
@@ -1,122 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-import * as sqlops from 'sqlops';
-import * as nls from 'vscode-nls';
-import * as vscode from 'vscode';
-import { DacFxDataModel } from '../api/models';
-import { DataTierApplicationWizard } from '../dataTierApplicationWizard';
-import { DacFxConfigPage } from '../api/dacFxConfigPage';
-
-const localize = nls.loadMessageBundle();
-
-export class ExtractConfigPage extends DacFxConfigPage {
-
-	protected readonly wizardPage: sqlops.window.modelviewdialog.WizardPage;
-	protected readonly instance: DataTierApplicationWizard;
-	protected readonly model: DacFxDataModel;
-	protected readonly view: sqlops.ModelView;
-
-	private form: sqlops.FormContainer;
-	private versionTextBox: sqlops.InputBoxComponent;
-
-	public constructor(instance: DataTierApplicationWizard, wizardPage: sqlops.window.modelviewdialog.WizardPage, model: DacFxDataModel, view: sqlops.ModelView) {
-		super(instance, wizardPage, model, view);
-		this.fileExtension = '.dacpac';
-	}
-
-	async start(): Promise<boolean> {
-		let databaseComponent = await this.createDatabaseDropdown();
-		let serverComponent = await this.createServerDropdown(false);
-		let fileBrowserComponent = await this.createFileBrowser();
-		let versionComponent = await this.createVersionTextBox();
-
-		this.form = this.view.modelBuilder.formContainer()
-			.withFormItems(
-				[
-					serverComponent,
-					databaseComponent,
-					versionComponent,
-					fileBrowserComponent,
-				], {
-					horizontal: true,
-					componentWidth: 400
-				}).component();
-		await this.view.initializeModel(this.form);
-		return true;
-	}
-
-	async onPageEnter(): Promise<boolean> {
-		let r1 = await this.populateServerDropdown();
-		let r2 = await this.populateDatabaseDropdown();
-		return r1 && r2;
-	}
-
-	public setupNavigationValidator() {
-		this.instance.registerNavigationValidator(() => {
-			if (this.databaseLoader.loading) {
-				return false;
-			}
-			return true;
-		});
-	}
-
-	private async createFileBrowser(): Promise<sqlops.FormComponent> {
-		this.createFileBrowserParts();
-
-		// default filepath
-		this.fileTextBox.value = this.generateFilePath();
-		this.model.filePath = this.fileTextBox.value;
-
-		this.fileButton.onDidClick(async (click) => {
-			let fileUri = await vscode.window.showSaveDialog(
-				{
-					defaultUri: vscode.Uri.file(this.fileTextBox.value),
-					saveLabel: localize('dacfxExtract.saveFile', 'Save'),
-					filters: {
-						'dacpac Files': ['dacpac'],
-					}
-				}
-			);
-
-			if (!fileUri) {
-				return;
-			}
-
-			this.fileTextBox.value = fileUri.fsPath;
-			this.model.filePath = fileUri.fsPath;
-		});
-
-		this.fileTextBox.onTextChanged(async () => {
-			this.model.filePath = this.fileTextBox.value;
-		});
-
-		return {
-			component: this.fileTextBox,
-			title: localize('dacFxExtract.fileTextboxTitle', 'File Location'),
-			actions: [this.fileButton]
-		};
-	}
-
-	private async createVersionTextBox(): Promise<sqlops.FormComponent> {
-		this.versionTextBox = this.view.modelBuilder.inputBox().withProperties({
-			required: true
-		}).component();
-
-		// default filepath
-		this.versionTextBox.value = '1.0.0.0';
-		this.model.version = this.versionTextBox.value;
-
-		this.versionTextBox.onTextChanged(async () => {
-			this.model.version = this.versionTextBox.value;
-		});
-
-		return {
-			component: this.versionTextBox,
-			title: localize('dacFxExtract.versionTextboxTitle', 'Version (use x.x.x.x where x is a number)'),
-		};
-	}
-}
--- a/extensions/import/src/wizard/pages/fileConfigPage.ts
+++ b/extensions/import/src/wizard/pages/fileConfigPage.ts
@@ -102,9 +102,57 @@ export class FileConfigPage extends ImportPage {
 	}

 	private async populateServerDropdown(): Promise<boolean> {
-		let values = await this.getServerValues();
-		if (values === undefined) {
-			return false;
+		let cons = await sqlops.connection.getActiveConnections();
+		// This user has no active connections ABORT MISSION
+		if (!cons || cons.length === 0) {
+			return true;
+		}
+
+
+		let count = -1;
+		let idx = -1;
+
+
+		let values = cons.map(c => {
+			// Handle the code to remember what the user's choice was from before
+			count++;
+			if (idx === -1) {
+				if (this.model.server && c.connectionId === this.model.server.connectionId) {
+					idx = count;
+				} else if (this.model.serverId && c.connectionId === this.model.serverId) {
+					idx = count;
+				}
+			}
+
+			let db = c.options.databaseDisplayName;
+			let usr = c.options.user;
+			let srv = c.options.server;
+
+			if (!db) {
+				db = '<default>';
+			}
+
+			if (!usr) {
+				usr = 'default';
+			}
+
+			let finalName = `${srv}, ${db} (${usr})`;
+			return {
+				connection: c,
+				displayName: finalName,
+				name: c.connectionId
+			};
+		});
+
+		if (idx >= 0) {
+			let tmp = values[0];
+			values[0] = values[idx];
+			values[idx] = tmp;
+		} else {
+			delete this.model.server;
+			delete this.model.serverId;
+			delete this.model.database;
+			delete this.model.schema;
 		}

 		this.model.server = values[0].connection;
@@ -147,7 +195,29 @@ export class FileConfigPage extends ImportPage {
 			return false;
 		}

-		let values = await this.getDatabaseValues();
+
+		let idx = -1;
+		let count = -1;
+		let values = (await sqlops.connection.listDatabases(this.model.server.connectionId)).map(db => {
+			count++;
+			if (this.model.database && db === this.model.database) {
+				idx = count;
+			}
+
+			return {
+				displayName: db,
+				name: db
+			};
+		});
+
+		if (idx >= 0) {
+			let tmp = values[0];
+			values[0] = values[idx];
+			values[idx] = tmp;
+		} else {
+			delete this.model.database;
+			delete this.model.schema;
+		}

 		this.model.database = values[0].name;

@@ -307,18 +377,6 @@ export class FileConfigPage extends ImportPage {
 		return true;
 	}

-	protected deleteServerValues() {
-		delete this.model.server;
-		delete this.model.serverId;
-		delete this.model.database;
-		delete this.model.schema;
-	}
-
-	protected deleteDatabaseValues() {
-		delete this.model.database;
-		delete this.model.schema;
-	}
-
 	// private async populateTableNames(): Promise<boolean> {
 	// 	this.tableNames = [];
 	// 	let databaseName = (<sqlops.CategoryValue>this.databaseDropdown.value).name;
--- a/extensions/import/src/wizard/pages/importConfigPage.ts
+++ b/extensions/import/src/wizard/pages/importConfigPage.ts
@@ -1,101 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-import * as sqlops from 'sqlops';
-import * as nls from 'vscode-nls';
-import * as vscode from 'vscode';
-import * as path from 'path';
-import * as os from 'os';
-import { DacFxDataModel } from '../api/models';
-import { DataTierApplicationWizard } from '../dataTierApplicationWizard';
-import { DacFxConfigPage } from '../api/dacFxConfigPage';
-
-const localize = nls.loadMessageBundle();
-
-export class ImportConfigPage extends DacFxConfigPage {
-
-	protected readonly wizardPage: sqlops.window.modelviewdialog.WizardPage;
-	protected readonly instance: DataTierApplicationWizard;
-	protected readonly model: DacFxDataModel;
-	protected readonly view: sqlops.ModelView;
-
-	private form: sqlops.FormContainer;
-
-	public constructor(instance: DataTierApplicationWizard, wizardPage: sqlops.window.modelviewdialog.WizardPage, model: DacFxDataModel, view: sqlops.ModelView) {
-		super(instance, wizardPage, model, view);
-		this.fileExtension = '.bacpac';
-	}
-
-	async start(): Promise<boolean> {
-		let databaseComponent = await this.createDatabaseTextBox();
-		let serverComponent = await this.createServerDropdown(true);
-		let fileBrowserComponent = await this.createFileBrowser();
-
-		this.form = this.view.modelBuilder.formContainer()
-			.withFormItems(
-				[
-					fileBrowserComponent,
-					serverComponent,
-					databaseComponent,
-				], {
-					horizontal: true,
-					componentWidth: 400
-				}).component();
-		await this.view.initializeModel(this.form);
-		return true;
-	}
-
-	async onPageEnter(): Promise<boolean> {
-		let r1 = await this.populateServerDropdown();
-		return r1;
-	}
-
-	private async createFileBrowser(): Promise<sqlops.FormComponent> {
-		this.createFileBrowserParts();
-
-		this.fileButton.onDidClick(async (click) => {
-			let fileUris = await vscode.window.showOpenDialog(
-				{
-					canSelectFiles: true,
-					canSelectFolders: false,
-					canSelectMany: false,
-					defaultUri: vscode.Uri.file(os.homedir()),
-					openLabel: localize('dacFxImport.openFile', 'Open'),
-					filters: {
-						'bacpac Files': ['bacpac'],
-					}
-				}
-			);
-
-			if (!fileUris || fileUris.length === 0) {
-				return;
-			}
-
-			let fileUri = fileUris[0];
-			this.fileTextBox.value = fileUri.fsPath;
-			this.model.filePath = fileUri.fsPath;
-			this.model.database = this.generateDatabaseName(this.model.filePath);
-			this.databaseTextBox.value = this.model.database;
-		});
-
-		this.fileTextBox.onTextChanged(async () => {
-			this.model.filePath = this.fileTextBox.value;
-			this.model.database = this.generateDatabaseName(this.model.filePath);
-			this.databaseTextBox.value = this.model.database;
-		});
-
-		return {
-			component: this.fileTextBox,
-			title: localize('dacFxImport.fileTextboxTitle', 'File Location'),
-			actions: [this.fileButton]
-		};
-	}
-
-	private generateDatabaseName(filePath: string): string {
-		let result = path.parse(filePath);
-		return result.name;
-	}
-}
--- a/extensions/import/src/wizard/pages/selectOperationpage.ts
+++ b/extensions/import/src/wizard/pages/selectOperationpage.ts
@@ -1,174 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-import * as sqlops from 'sqlops';
-import * as nls from 'vscode-nls';
-import { DacFxDataModel } from '../api/models';
-import { DataTierApplicationWizard, Operation } from '../dataTierApplicationWizard';
-import { BasePage } from '../api/basePage';
-
-const localize = nls.loadMessageBundle();
-
-export class SelectOperationPage extends BasePage {
-
-	protected readonly wizardPage: sqlops.window.modelviewdialog.WizardPage;
-	protected readonly instance: DataTierApplicationWizard;
-	protected readonly model: DacFxDataModel;
-	protected readonly view: sqlops.ModelView;
-
-	private deployRadioButton: sqlops.RadioButtonComponent;
-	private extractRadioButton: sqlops.RadioButtonComponent;
-	private importRadioButton: sqlops.RadioButtonComponent;
-	private exportRadioButton: sqlops.RadioButtonComponent;
-	private form: sqlops.FormContainer;
-
-	public constructor(instance: DataTierApplicationWizard, wizardPage: sqlops.window.modelviewdialog.WizardPage, model: DacFxDataModel, view: sqlops.ModelView) {
-		super();
-		this.instance = instance;
-		this.wizardPage = wizardPage;
-		this.model = model;
-		this.view = view;
-	}
-
-	async start(): Promise<boolean> {
-		let deployComponent = await this.createDeployRadioButton();
-		let extractComponent = await this.createExtractRadioButton();
-		let importComponent = await this.createImportRadioButton();
-		let exportComponent = await this.createExportRadioButton();
-
-		this.form = this.view.modelBuilder.formContainer()
-			.withFormItems(
-				[
-					deployComponent,
-					extractComponent,
-					importComponent,
-					exportComponent
-				], {
-					horizontal: true
-				}).component();
-		await this.view.initializeModel(this.form);
-
-		// default have the first radio button checked
-		this.deployRadioButton.checked = true;
-		this.instance.setDoneButton(Operation.deploy);
-		return true;
-	}
-
-	async onPageEnter(): Promise<boolean> {
-		let numPages = this.instance.wizard.pages.length;
-		for (let i = numPages - 1; i > 2; --i) {
-			await this.instance.wizard.removePage(i);
-		}
-
-		return true;
-	}
-
-	private async createDeployRadioButton(): Promise<sqlops.FormComponent> {
-		this.deployRadioButton = this.view.modelBuilder.radioButton()
-			.withProperties({
-				name: 'selectedOperation',
-				label: localize('dacFx.deployRadioButtonLabel', 'Deploy a data-tier application .dacpac file to an instance of SQL Server [Deploy Dacpac]'),
-			}).component();
-
-		this.deployRadioButton.onDidClick(() => {
-			// remove the previous page
-			this.instance.wizard.removePage(1);
-
-			// add deploy page
-			let page = this.instance.pages.get('deployConfig');
-			this.instance.wizard.addPage(page.wizardPage, 1);
-
-			// change button text and operation
-			this.instance.setDoneButton(Operation.deploy);
-		});
-
-		return {
-			component: this.deployRadioButton,
-			title: ''
-		};
-	}
-
-	private async createExtractRadioButton(): Promise<sqlops.FormComponent> {
-		this.extractRadioButton = this.view.modelBuilder.radioButton()
-			.withProperties({
-				name: 'selectedOperation',
-				label: localize('dacFx.extractRadioButtonLabel', 'Extract a data-tier application from an instance of SQL Server to a .dacpac file [Extract Dacpac]'),
-			}).component();
-
-		this.extractRadioButton.onDidClick(() => {
-			// remove the previous pages
-			this.instance.wizard.removePage(1);
-
-			// add the extract page
-			let page = this.instance.pages.get('extractConfig');
-			this.instance.wizard.addPage(page.wizardPage, 1);
-
-			// change button text and operation
-			this.instance.setDoneButton(Operation.extract);
-		});
-
-		return {
-			component: this.extractRadioButton,
-			title: ''
-		};
-	}
-
-	private async createImportRadioButton(): Promise<sqlops.FormComponent> {
-		this.importRadioButton = this.view.modelBuilder.radioButton()
-			.withProperties({
-				name: 'selectedOperation',
-				label: localize('dacFx.importRadioButtonLabel', 'Create a database from a .bacpac file [Import Bacpac]'),
-			}).component();
-
-		this.importRadioButton.onDidClick(() => {
-			// remove the  previous page
-			this.instance.wizard.removePage(1);
-
-			// add the import page
-			let page = this.instance.pages.get('importConfig');
-			this.instance.wizard.addPage(page.wizardPage, 1);
-
-			// change button text and operation
-			this.instance.setDoneButton(Operation.import);
-		});
-
-		return {
-			component: this.importRadioButton,
-			title: ''
-		};
-	}
-
-	private async createExportRadioButton(): Promise<sqlops.FormComponent> {
-		this.exportRadioButton = this.view.modelBuilder.radioButton()
-			.withProperties({
-				name: 'selectedOperation',
-				label: localize('dacFx.exportRadioButtonLabel', 'Export the schema and data from a database to the logical .bacpac file format [Export Bacpac]'),
-			}).component();
-
-		this.exportRadioButton.onDidClick(() => {
-			// remove the 2 previous pages
-			this.instance.wizard.removePage(1);
-
-			// add the export pages
-			let page = this.instance.pages.get('exportConfig');
-			this.instance.wizard.addPage(page.wizardPage, 1);
-
-			// change button text and operation
-			this.instance.setDoneButton(Operation.export);
-		});
-
-		return {
-			component: this.exportRadioButton,
-			title: ''
-		};
-	}
-
-	public setupNavigationValidator() {
-		this.instance.registerNavigationValidator(() => {
-			return true;
-		});
-	}
-}
--- a/extensions/import/yarn.lock
+++ b/extensions/import/yarn.lock
@@ -11,8 +11,7 @@ agent-base@4, agent-base@^4.1.0:

 applicationinsights@1.0.1:
  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-1.0.1.tgz#53446b830fe8d5d619eee2a278b31d3d25030927"
-  integrity sha1-U0Rrgw/o1dYZ7uKieLMdPSUDCSc=
+  resolved "https://registry.npmjs.org/applicationinsights/-/applicationinsights-1.0.1.tgz#53446b830fe8d5d619eee2a278b31d3d25030927"
  dependencies:
    diagnostic-channel "0.2.0"
    diagnostic-channel-publishers "0.2.1"
@@ -36,7 +35,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.2.0:
+buffer-alloc@^1.1.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,26 +74,19 @@ 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.10":
-  version "0.2.10"
-  resolved "https://codeload.github.com/Microsoft/sqlops-dataprotocolclient/tar.gz/4de3f7caf0eba54159911b977ddb4f5d7c0a9ca8"
+"dataprotocol-client@github:Microsoft/sqlops-dataprotocolclient#0.2.7":
+  version "0.2.6"
+  resolved "https://codeload.github.com/Microsoft/sqlops-dataprotocolclient/tar.gz/85653d8b305af8aef334728d71f07bdc240dfcb7"
  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"
@@ -150,13 +142,11 @@ decompress@^4.2.0:

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

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

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

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

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

 graceful-fs@^4.1.10:
-  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==
+  version "4.1.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
+  integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=

 "graceful-readlink@>= 1.0.0":
  version "1.0.1"
@@ -294,11 +284,6 @@ 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"
@@ -312,9 +297,9 @@ once@^1.4.0:
    wrappy "1"

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

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

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

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

 tar-stream@^1.5.2:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz#8ea55dab37972253d9a9af90fdcd559ae435c555"
-  integrity sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==
+  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==
  dependencies:
    bl "^1.0.0"
-    buffer-alloc "^1.2.0"
+    buffer-alloc "^1.1.0"
    end-of-stream "^1.0.0"
    fs-constants "^1.0.0"
    readable-stream "^2.3.0"
-    to-buffer "^1.1.1"
+    to-buffer "^1.1.0"
    xtend "^4.0.0"

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

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

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

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

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

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

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

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

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

-	// {{SQL CARBON EDIT}}
-	private registerCommand(id: string, impl: (...args: any[]) => any, thisArg?: any) {
+	private registerCommand(id: string, impl: (...args: any[]) => void, 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,5 +11,3 @@ 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
@@ -1,20 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-import * as 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,8 +59,6 @@ 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,12 +86,6 @@ 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.10",
+    "dataprotocol-client": "github:Microsoft/sqlops-dataprotocolclient#0.2.8",
    "opener": "^1.4.3",
    "service-downloader": "github:anthonydresser/service-downloader#0.1.5",
    "vscode-extension-telemetry": "^0.0.15"
@@ -285,10 +285,6 @@
            {
              "displayName": "Windows Authentication",
              "name": "Integrated"
-            },
-            {
-              "displayName": "Azure Active Directory - Universal with MFA support",
-              "name": "AzureMFA"
            }
          ],
          "isRequired": true,
@@ -349,7 +345,7 @@
          "specialValueType": null,
          "isIdentity": false,
          "name": "asynchronousProcessing",
-          "displayName": "Asynchronous processing",
+          "displayName": "Asynchronous processing enabled",
          "description": "When true, enables usage of the Asynchronous functionality in the .Net Framework Data Provider",
          "groupName": "Initialization",
          "valueType": "boolean",
@@ -391,7 +387,7 @@
          "specialValueType": null,
          "isIdentity": false,
          "name": "columnEncryptionSetting",
-          "displayName": "Column encryption",
+          "displayName": "Column encryption setting",
          "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,7 +163,6 @@
 			"\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.63",
+	"version": "1.5.0-alpha.52",
 	"downloadFileNames": {
 		"Windows_86": "win-x86-netcoreapp2.2.zip",
 		"Windows_64": "win-x64-netcoreapp2.2.zip",
--- a/extensions/mssql/src/contracts.ts
+++ b/extensions/mssql/src/contracts.ts
@@ -291,60 +291,3 @@ export namespace DeleteAgentJobScheduleRequest {
 }

 // ------------------------------- < Agent Management > ------------------------------------
-
-// ------------------------------- < DacFx > ------------------------------------
-
-export enum TaskExecutionMode {
-	execute = 0,
-	script = 1,
-	executeAndScript = 2,
-}
-export interface ExportParams {
-	databaseName: string;
-	packageFilePath: string;
-	ownerUri: string;
-	taskExecutionMode: TaskExecutionMode;
-}
-
-export interface ImportParams {
-	packageFilePath: string;
-	databaseName: string;
-	ownerUri: string;
-	taskExecutionMode: TaskExecutionMode;
-}
-
-
-export interface ExtractParams {
-	databaseName: string;
-	packageFilePath: string;
-	applicationName: string;
-	applicationVersion: string;
-	ownerUri: string;
-	taskExecutionMode: TaskExecutionMode;
-}
-
-export interface DeployParams {
-	packageFilePath: string;
-	databaseName: string;
-	upgradeExisting: boolean;
-	ownerUri: string;
-	taskExecutionMode: TaskExecutionMode;
-}
-
-export namespace ExportRequest {
-	export const type = new RequestType<ExportParams, sqlops.DacFxResult, void, void>('dacfx/export');
-}
-
-export namespace ImportRequest {
-	export const type = new RequestType<ImportParams, sqlops.DacFxResult, void, void>('dacfx/import');
-}
-
-export namespace ExtractRequest {
-	export const type = new RequestType<ExtractParams, sqlops.DacFxResult, void, void>('dacfx/extract');
-}
-
-export namespace DeployRequest {
-	export const type = new RequestType<DeployParams, sqlops.DacFxResult, void, void>('dacfx/deploy');
-}
-
-// ------------------------------- < DacFx > ------------------------------------
--- a/extensions/mssql/src/features.ts
+++ b/extensions/mssql/src/features.ts
@@ -8,7 +8,7 @@ import { SqlOpsDataClient, SqlOpsFeature } from 'dataprotocol-client';
 import { ClientCapabilities, StaticFeature, RPCMessageType, ServerCapabilities } from 'vscode-languageclient';
 import { Disposable } from 'vscode';
 import { Telemetry } from './telemetry';
-import * as contracts from './contracts';
+import * as contracts  from './contracts';
 import * as sqlops from 'sqlops';
 import * as Utils from './utils';
 import * as UUID from 'vscode-languageclient/lib/utils/uuid';
@@ -28,94 +28,6 @@ export class TelemetryFeature implements StaticFeature {
 	}
 }

-export class DacFxServicesFeature extends SqlOpsFeature<undefined> {
-	private static readonly messageTypes: RPCMessageType[] = [
-		contracts.ExportRequest.type,
-		contracts.ImportRequest.type,
-		contracts.ExtractRequest.type,
-		contracts.DeployRequest.type
-	];
-
-	constructor(client: SqlOpsDataClient) {
-		super(client, DacFxServicesFeature.messageTypes);
-	}
-
-	public fillClientCapabilities(capabilities: ClientCapabilities): void {
-	}
-
-	public initialize(capabilities: ServerCapabilities): void {
-		this.register(this.messages, {
-			id: UUID.generateUuid(),
-			registerOptions: undefined
-		});
-	}
-
-	protected registerProvider(options: undefined): Disposable {
-		const client = this._client;
-		let self = this;
-
-		let exportBacpac = (databaseName: string, packageFilePath: string, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): Thenable<sqlops.DacFxResult> => {
-			let params: contracts.ExportParams = { databaseName: databaseName, packageFilePath: packageFilePath, ownerUri: ownerUri, taskExecutionMode: taskExecutionMode };
-			return client.sendRequest(contracts.ExportRequest.type, params).then(
-				r => {
-					return r;
-				},
-				e => {
-					client.logFailedRequest(contracts.ExportRequest.type, e);
-					return Promise.resolve(undefined);
-				}
-			);
-		};
-
-		let importBacpac = (packageFilePath: string, databaseName: string, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): Thenable<sqlops.DacFxResult> => {
-			let params: contracts.ImportParams = { packageFilePath: packageFilePath, databaseName: databaseName, ownerUri: ownerUri, taskExecutionMode: taskExecutionMode };
-			return client.sendRequest(contracts.ImportRequest.type, params).then(
-				r => {
-					return r;
-				},
-				e => {
-					client.logFailedRequest(contracts.ImportRequest.type, e);
-					return Promise.resolve(undefined);
-				}
-			);
-		};
-
-		let extractDacpac = (databaseName: string, packageFilePath: string, applicationName: string, applicationVersion: string, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): Thenable<sqlops.DacFxResult> => {
-			let params: contracts.ExtractParams = { databaseName: databaseName, packageFilePath: packageFilePath, applicationName: applicationName, applicationVersion: applicationVersion, ownerUri: ownerUri, taskExecutionMode: taskExecutionMode };
-			return client.sendRequest(contracts.ExtractRequest.type, params).then(
-				r => {
-					return r;
-				},
-				e => {
-					client.logFailedRequest(contracts.ExtractRequest.type, e);
-					return Promise.resolve(undefined);
-				}
-			);
-		};
-
-		let deployDacpac = (packageFilePath: string, targetDatabaseName: string, upgradeExisting: boolean, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): Thenable<sqlops.DacFxResult> => {
-			let params: contracts.DeployParams = { packageFilePath: packageFilePath, databaseName: targetDatabaseName, upgradeExisting: upgradeExisting, ownerUri: ownerUri, taskExecutionMode: taskExecutionMode };
-			return client.sendRequest(contracts.DeployRequest.type, params).then(
-				r => {
-					return r;
-				},
-				e => {
-					client.logFailedRequest(contracts.DeployRequest.type, e);
-					return Promise.resolve(undefined);
-				}
-			);
-		};
-
-		return sqlops.dataprotocol.registerDacFxServicesProvider({
-			providerId: client.providerId,
-			exportBacpac,
-			importBacpac,
-			extractDacpac,
-			deployDacpac
-		});
-	}
-}
-
 export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 	private static readonly messagesTypes: RPCMessageType[] = [
 		contracts.AgentJobsRequest.type,
@@ -317,7 +229,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 		};

 		// Alert management methods
-		let getAlerts = (ownerUri: string): Thenable<sqlops.AgentAlertsResult> => {
+		let  getAlerts = (ownerUri: string): Thenable<sqlops.AgentAlertsResult>  => {
 			let params: contracts.AgentAlertsParams = {
 				ownerUri: ownerUri
 			};
@@ -387,7 +299,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 		};

 		// Operator management methods
-		let getOperators = (ownerUri: string): Thenable<sqlops.AgentOperatorsResult> => {
+		let  getOperators = (ownerUri: string): Thenable<sqlops.AgentOperatorsResult>  => {
 			let params: contracts.AgentOperatorsParams = {
 				ownerUri: ownerUri
 			};
@@ -457,7 +369,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 		};

 		// Proxy management methods
-		let getProxies = (ownerUri: string): Thenable<sqlops.AgentProxiesResult> => {
+		let  getProxies = (ownerUri: string): Thenable<sqlops.AgentProxiesResult>  => {
 			let params: contracts.AgentProxiesParams = {
 				ownerUri: ownerUri
 			};
@@ -527,7 +439,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {
 		};

 		// Agent Credential Method
-		let getCredentials = (ownerUri: string): Thenable<sqlops.GetCredentialsResult> => {
+		let  getCredentials = (ownerUri: string): Thenable<sqlops.GetCredentialsResult>  => {
 			let params: contracts.GetCredentialsParams = {
 				ownerUri: ownerUri
 			};
@@ -543,7 +455,7 @@ export class AgentServicesFeature extends SqlOpsFeature<undefined> {


 		// Job Schedule management methods
-		let getJobSchedules = (ownerUri: string): Thenable<sqlops.AgentJobSchedulesResult> => {
+		let  getJobSchedules = (ownerUri: string): Thenable<sqlops.AgentJobSchedulesResult>  => {
 			let params: contracts.AgentJobScheduleParams = {
 				ownerUri: ownerUri
 			};
--- a/extensions/mssql/src/main.ts
+++ b/extensions/mssql/src/main.ts
@@ -16,7 +16,7 @@ import { CredentialStore } from './credentialstore/credentialstore';
 import { AzureResourceProvider } from './resourceProvider/resourceProvider';
 import * as Utils from './utils';
 import { Telemetry, LanguageClientErrorHandler } from './telemetry';
-import { TelemetryFeature, AgentServicesFeature, DacFxServicesFeature } from './features';
+import { TelemetryFeature, AgentServicesFeature } from './features';

 const baseConfig = require('./config.json');
 const outputChannel = vscode.window.createOutputChannel(Constants.serviceName);
@@ -55,8 +55,7 @@ export async function activate(context: vscode.ExtensionContext) {
 			// we only want to add new features
 			...SqlOpsDataClient.defaultFeatures,
 			TelemetryFeature,
-			AgentServicesFeature,
-			DacFxServicesFeature,
+			AgentServicesFeature
 		],
 		outputChannel: new CustomOutputChannel()
 	};
--- 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.2.0:
+buffer-alloc@^1.1.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,26 +75,19 @@ 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.10":
-  version "0.2.10"
-  resolved "https://codeload.github.com/Microsoft/sqlops-dataprotocolclient/tar.gz/4de3f7caf0eba54159911b977ddb4f5d7c0a9ca8"
+"dataprotocol-client@github:Microsoft/sqlops-dataprotocolclient#0.2.8":
+  version "0.2.8"
+  resolved "https://codeload.github.com/Microsoft/sqlops-dataprotocolclient/tar.gz/3ec3ec3fa63a8dae958c18a85b91fec74c50aec5"
  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"
@@ -168,9 +161,9 @@ end-of-stream@^1.0.0:
    once "^1.4.0"

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

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

 graceful-fs@^4.1.10:
-  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==
+  version "4.1.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
+  integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=

 "graceful-readlink@>= 1.0.0":
  version "1.0.1"
@@ -294,11 +287,6 @@ 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"
@@ -312,9 +300,9 @@ once@^1.4.0:
    wrappy "1"

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

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

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

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

 tar-stream@^1.5.2:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz#8ea55dab37972253d9a9af90fdcd559ae435c555"
-  integrity sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==
+  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==
  dependencies:
    bl "^1.0.0"
-    buffer-alloc "^1.2.0"
+    buffer-alloc "^1.1.0"
    end-of-stream "^1.0.0"
    fs-constants "^1.0.0"
    readable-stream "^2.3.0"
-    to-buffer "^1.1.1"
+    to-buffer "^1.1.0"
    xtend "^4.0.0"

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

-to-buffer@^1.1.1:
+to-buffer@^1.1.0:
  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.3.1"
-  resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.3.1.tgz#7854da51622a7e63624221196357803b552966a1"
-  integrity sha512-fIZnvdjblYs7Cru/xC6tCPVhz7JkYcVQQkePwMLyQELzYTds2Xn8QefPVnvdVhhZqubxNA1cASXEH5wcK0Bucw==
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.2.5.tgz#73a033a567bbbde59654b193c44d48a7e4f43c47"
+  integrity sha512-izD3jxT8xkzwtXRUZjtmRwKnZoeECrfZ8ra/ketwOcusbZEp4mjULMnJOCfTDZBgGQAAY1AJ/IgxcwkavcX9Og==
  dependencies:
    buffer "^3.0.1"
    through "^2.3.6"
--- a/extensions/notebook/README.md
+++ b/extensions/notebook/README.md
@@ -1,17 +0,0 @@
-# Notebook extension for Azure Data Studio
-
-Welcome to the Notebook extension for Azure Data Studio! This extension supports core notebook functionality including configuration settings, actions such as New / Open Notebook, and more.
-
-## Code of Conduct
-
-This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
-
-## Privacy Statement
-
-The [Microsoft Enterprise and Developer Privacy Statement](https://privacy.microsoft.com/en-us/privacystatement) describes the privacy statement of this software.
-
-## License
-
-Copyright (c) Microsoft Corporation. All rights reserved.
-
-Licensed under the [Source EULA](https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt).
--- a/extensions/notebook/package.json
+++ b/extensions/notebook/package.json
@@ -1,71 +0,0 @@
-{
-	"name": "notebook",
-	"displayName": "%displayName%",
-	"description": "%description%",
-	"version": "0.1.0",
-	"publisher": "Microsoft",
-	"engines": {
-		"vscode": "*",
-		"sqlops": "*"
-	},
-	"main": "./out/extension",
-	"activationEvents": [
-		"*"
-	],
-	"contributes": {
-		"configuration": {
-			"type": "object",
-			"title": "%notebook.configuration.title%",
-			"properties": {
-				"notebook.enabled": {
-					"type": "boolean",
-					"default": true,
-					"description": "%notebook.enabled.description%"
-				}
-			}
-		},
-		"commands": [
-			{
-				"command": "notebook.command.new",
-				"title": "%notebook.command.new%",
-				"icon": {
-					"dark": "resources/dark/new_notebook_inverse.svg",
-					"light": "resources/light/new_notebook.svg"
-				}
-			},
-			{
-				"command": "notebook.command.open",
-				"title": "%notebook.command.open%",
-				"icon": {
-					"dark": "resources/dark/open_notebook_inverse.svg",
-					"light": "resources/light/open_notebook.svg"
-				}
-			}
-		],
-		"menus": {
-			"commandPalette": [
-				{
-					"command": "notebook.command.new",
-					"when": "config.notebook.enabled"
-				},
-				{
-					"command": "notebook.command.open",
-					"when": "config.notebook.enabled"
-				}
-			]
-		},
-		"keybindings": [
-			{
-				"command": "notebook.command.new",
-				"key": "Ctrl+Shift+N",
-				"when": "config.notebook.enabled"
-			}
-		]
-	},
-	"dependencies": {
-		"vscode-nls": "^4.0.0"
-	},
-	"devDependencies": {
-		"@types/node": "8.0.33"
-	}
-}
--- a/extensions/notebook/package.nls.json
+++ b/extensions/notebook/package.nls.json
@@ -1,8 +0,0 @@
-{
-	"displayName": "Notebook Core Extensions",
-	"description": "Defines the Data-procotol based Notebook contribution and many Notebook commands and contributions.",
-	"notebook.configuration.title": "Notebook configuration",
-	"notebook.enabled.description": "Enable viewing notebook files using built-in notebook editor.",
-	"notebook.command.new": "New Notebook",
-	"notebook.command.open": "Open Notebook"
-}
--- a/extensions/notebook/resources/dark/new_notebook_inverse.svg
+++ b/extensions/notebook/resources/dark/new_notebook_inverse.svg
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#fff;}.cls-2{fill:#388a34;}</style></defs><title>new_notebook_inverse</title><path class="cls-1" d="M11.87,1.24V.33H9.13A3.78,3.78,0,0,0,7.92.52a3.48,3.48,0,0,0-1.07.58A3.6,3.6,0,0,0,5.78.52,3.78,3.78,0,0,0,4.57.33H1.83v.91H0V13.1H9.67v-.91H7a4,4,0,0,1,.47-.39A2.39,2.39,0,0,1,8,11.52a2.2,2.2,0,0,1,.53-.18,2.93,2.93,0,0,1,.61-.06h2.74V2.15h.91V9h.91V1.24Zm-9.13,0H4.57a3,3,0,0,1,1,.17,2.58,2.58,0,0,1,.85.49v8.93a3.94,3.94,0,0,0-.88-.35,3.73,3.73,0,0,0-.94-.12H2.74Zm-1.82,11v-10h.91v9.13H4.57a2.93,2.93,0,0,1,.61.06,2.55,2.55,0,0,1,.53.18,2.68,2.68,0,0,1,.49.28,3.29,3.29,0,0,1,.46.39Zm8.21-1.83a3.73,3.73,0,0,0-.94.12,4.22,4.22,0,0,0-.89.35V1.9a2.74,2.74,0,0,1,.86-.49,2.91,2.91,0,0,1,1-.17H11v9.12ZM12.87,10v2.2h-2.2v.91h3V10Z"/><polygon class="cls-2" points="16 12.19 16 13.13 13.8 13.13 13.8 15.33 12.87 15.33 12.87 13.13 10.67 13.13 10.67 12.19 12.87 12.19 12.87 9.99 13.8 9.99 13.8 12.19 16 12.19"/><path class="cls-2" d="M13.8,12.19V10h-.93v2.2h-2.2v.94h2.2v2.2h.93v-2.2H16v-.94Z"/></svg>
--- a/extensions/notebook/resources/dark/open_notebook_inverse.svg
+++ b/extensions/notebook/resources/dark/open_notebook_inverse.svg
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#fff;}.cls-2{fill:#0095d7;}</style></defs><title>open_notebook_inverse</title><path class="cls-1" d="M12.55,4.21l-.08-.11h-.56l-.69.06a1.54,1.54,0,0,0-.23.29v8.69H9.18a3.32,3.32,0,0,0-.93.13,3.34,3.34,0,0,0-.87.34V4.76a2.88,2.88,0,0,1,.43-.31A5.58,5.58,0,0,1,8.29,3.3a2.63,2.63,0,0,0-.3.09A3.62,3.62,0,0,0,6.93,4a3.68,3.68,0,0,0-1.07-.57A3.58,3.58,0,0,0,4.67,3.2H2v.9H.15V15.85H13.72V5.48ZM2.86,4.1H4.67a2.61,2.61,0,0,1,1,.17,2.32,2.32,0,0,1,.86.49v8.85a3.27,3.27,0,0,0-.88-.34,3.22,3.22,0,0,0-.93-.13H2.86ZM1,15V5H2v9H4.67a3.94,3.94,0,0,1,.61.06,3.2,3.2,0,0,1,.52.18,4.19,4.19,0,0,1,.49.29,2.28,2.28,0,0,1,.45.39ZM12.8,15H7.11a2.7,2.7,0,0,1,.47-.39A2.83,2.83,0,0,1,8,14.28a3.42,3.42,0,0,1,.54-.18A3.81,3.81,0,0,1,9.18,14h2.73V5h.89Z"/><polygon class="cls-2" points="13.2 3.56 13.2 3.58 13.19 3.57 13.2 3.56"/><path class="cls-2" d="M13.19,3.57h0v0Z"/><polygon class="cls-2" points="13.2 3.56 13.2 3.58 13.19 3.57 13.2 3.56"/><polygon class="cls-2" points="14.21 1.65 14.19 1.65 14.19 1.63 14.21 1.65"/><path class="cls-2" d="M15.91,2.1,14.2,3.81l-.38.38-.62-.61v0l1-1H12.79a3.35,3.35,0,0,0-1.09.26h0a3.94,3.94,0,0,0-.86.52l-.24.21s0,0,0,0a3.3,3.3,0,0,0-.51.67,3.1,3.1,0,0,0-.26.47A3.41,3.41,0,0,0,9.5,6.11H8.6a4.68,4.68,0,0,1,.16-1.19A4.74,4.74,0,0,1,9,4.26a2.21,2.21,0,0,1,.2-.41,4.66,4.66,0,0,1,.36-.51c.1-.13.22-.26.34-.39a4.14,4.14,0,0,1,.66-.53,1.19,1.19,0,0,1,.23-.16,2.79,2.79,0,0,1,.34-.18l.31-.13.42-.14a4.32,4.32,0,0,1,1.19-.16h1.15l-1-1L13.82,0Z"/></svg>
--- a/extensions/notebook/resources/light/new_notebook.svg
+++ b/extensions/notebook/resources/light/new_notebook.svg
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#388a34;}</style></defs><title>new_notebook</title><path d="M11.86,1.24V.33H9.13A3.78,3.78,0,0,0,7.91.52a3.48,3.48,0,0,0-1.07.58A3.6,3.6,0,0,0,5.78.52,3.78,3.78,0,0,0,4.57.33H1.83v.91H0V13.1H9.66v-.91H7a4,4,0,0,1,.47-.39A2.39,2.39,0,0,1,8,11.52a2.2,2.2,0,0,1,.53-.18,2.93,2.93,0,0,1,.61-.06h2.74V2.15h.91V9h.91V1.24Zm-9.13,0H4.57a3,3,0,0,1,1,.17,2.58,2.58,0,0,1,.85.49v8.93a3.94,3.94,0,0,0-.88-.35,3.73,3.73,0,0,0-.94-.12H2.73Zm-1.82,11v-10h.91v9.13H4.57a2.93,2.93,0,0,1,.61.06,2.55,2.55,0,0,1,.53.18,2.68,2.68,0,0,1,.49.28,3.29,3.29,0,0,1,.46.39Zm8.21-1.83a3.73,3.73,0,0,0-.94.12,4.22,4.22,0,0,0-.89.35V1.9a2.74,2.74,0,0,1,.86-.49,2.91,2.91,0,0,1,1-.17h1.82v9.12ZM12.86,10v2.2h-2.2v.91h3V10Z"/><polygon class="cls-1" points="15.99 12.19 15.99 13.13 13.79 13.13 13.79 15.33 12.87 15.33 12.87 13.13 10.66 13.13 10.66 12.19 12.87 12.19 12.87 9.99 13.79 9.99 13.79 12.19 15.99 12.19"/><path class="cls-1" d="M13.79,12.19V10h-.93v2.2h-2.2v.94h2.2v2.2h.93v-2.2H16v-.94Z"/></svg>
--- a/extensions/notebook/resources/light/open_notebook.svg
+++ b/extensions/notebook/resources/light/open_notebook.svg
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#00539c;}</style></defs><title>open_notebook</title><path d="M12.4,4.21l-.08-.11h-.56l-.69.06a1.54,1.54,0,0,0-.23.29v8.69H9a3.32,3.32,0,0,0-.93.13,3.34,3.34,0,0,0-.87.34V4.76a2.88,2.88,0,0,1,.43-.31A5.58,5.58,0,0,1,8.14,3.3a2.63,2.63,0,0,0-.3.09A3.62,3.62,0,0,0,6.78,4a3.68,3.68,0,0,0-1.07-.57A3.58,3.58,0,0,0,4.52,3.2H1.81v.9H0V15.85H13.57V5.48ZM2.71,4.1H4.52a2.61,2.61,0,0,1,1,.17,2.32,2.32,0,0,1,.86.49v8.85a3.27,3.27,0,0,0-.88-.34,3.22,3.22,0,0,0-.93-.13H2.71ZM.9,15V5h.91v9H4.52a3.94,3.94,0,0,1,.61.06,3.2,3.2,0,0,1,.52.18,4.19,4.19,0,0,1,.49.29,2.28,2.28,0,0,1,.45.39Zm11.75,0H7a2.7,2.7,0,0,1,.47-.39,2.83,2.83,0,0,1,.47-.29,3.42,3.42,0,0,1,.54-.18A3.81,3.81,0,0,1,9,14h2.73V5h.89Z"/><polygon class="cls-1" points="13.05 3.56 13.05 3.58 13.04 3.57 13.05 3.56"/><path class="cls-1" d="M13,3.57h0v0Z"/><polygon class="cls-1" points="13.05 3.56 13.05 3.58 13.04 3.57 13.05 3.56"/><polygon class="cls-1" points="14.06 1.65 14.04 1.65 14.04 1.63 14.06 1.65"/><path class="cls-1" d="M15.76,2.1,14,3.81l-.38.38L13,3.58v0l1-1H12.64a3.35,3.35,0,0,0-1.09.26h0a3.94,3.94,0,0,0-.86.52l-.24.21s0,0,0,0a3.3,3.3,0,0,0-.51.67,3.1,3.1,0,0,0-.26.47,3.41,3.41,0,0,0-.27,1.39h-.9a4.68,4.68,0,0,1,.16-1.19,4.74,4.74,0,0,1,.25-.66,2.21,2.21,0,0,1,.2-.41,4.66,4.66,0,0,1,.36-.51c.1-.13.22-.26.34-.39a4.14,4.14,0,0,1,.66-.53,1.19,1.19,0,0,1,.23-.16A2.79,2.79,0,0,1,11,2.08l.31-.13.42-.14a4.32,4.32,0,0,1,1.19-.16h1.15l-1-1L13.67,0Z"/></svg>
--- a/extensions/notebook/src/extension.ts
+++ b/extensions/notebook/src/extension.ts
@@ -1,50 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-'use strict';
-
-import * as vscode from 'vscode';
-import * as sqlops from 'sqlops';
-import * as nls from 'vscode-nls';
-const localize = nls.loadMessageBundle();
-
-let counter = 0;
-
-export function activate(extensionContext: vscode.ExtensionContext) {
-	extensionContext.subscriptions.push(vscode.commands.registerCommand('notebook.command.new', () => {
-		let title = `Untitled-${counter++}`;
-		let untitledUri = vscode.Uri.parse(`untitled:${title}`);
-		sqlops.nb.showNotebookDocument(untitledUri).then(success => {
-
-		}, (err: Error) => {
-			vscode.window.showErrorMessage(err.message);
-		});
-	}));
-	extensionContext.subscriptions.push(vscode.commands.registerCommand('notebook.command.open', () => {
-		openNotebook();
-	}));
-
-}
-
-async function openNotebook(): Promise<void> {
-	try {
-		let filter = {};
-		// TODO support querying valid notebook file types
-		filter[localize('notebookFiles', 'Notebooks')] = ['ipynb'];
-		let file = await vscode.window.showOpenDialog({
-			filters: filter
-		});
-		if (file) {
-			let doc = await vscode.workspace.openTextDocument(file[0]);
-			vscode.window.showTextDocument(doc);
-		}
-	} catch (err) {
-		vscode.window.showErrorMessage(err);
-	}
-}
-
-// this method is called when your extension is deactivated
-export function deactivate() {
-}
--- a/extensions/notebook/src/typings/refs.d.ts
+++ b/extensions/notebook/src/typings/refs.d.ts
@@ -1,9 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-/// <reference path='../../../../src/sql/sqlops.d.ts'/>
-/// <reference path='../../../../src/sql/sqlops.proposed.d.ts'/>
-/// <reference path='../../../../src/vs/vscode.d.ts'/>
-/// <reference types='@types/node'/>
--- a/extensions/notebook/tsconfig.json
+++ b/extensions/notebook/tsconfig.json
@@ -1,22 +0,0 @@
-{
-	"compileOnSave": true,
-	"compilerOptions": {
-		"module": "commonjs",
-		"target": "es6",
-		"outDir": "./out",
-		"lib": [
-			"es6", "es2015.promise"
-		],
-		"typeRoots": [
-			"./node_modules/@types"
-		],
-		"sourceMap": true,
-		"emitDecoratorMetadata": true,
-		"experimentalDecorators": true,
-		"moduleResolution": "node",
-		"declaration": true
-	},
-	"exclude": [
-		"node_modules"
-	]
-}
--- a/extensions/notebook/yarn.lock
+++ b/extensions/notebook/yarn.lock
@@ -1,13 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@types/node@8.0.33":
-  version "8.0.33"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.33.tgz#1126e94374014e54478092830704f6ea89df04cd"
-  integrity sha512-vmCdO8Bm1ExT+FWfC9sd9r4jwqM7o97gGy2WBshkkXbf/2nLAJQUrZfIhw27yVOtLUev6kSZc4cav/46KbDd8A==
-
-vscode-nls@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002"
-  integrity sha512-qCfdzcH+0LgQnBpZA53bA32kzp9rpq/f66Som577ObeuDlFIrtbEJ+A/+CCxjIh4G8dpJYNCKIsxpRAHIfsbNw==
--- a/extensions/profiler/client/src/dialogs/profilerCreateSessionDialog.ts
+++ b/extensions/profiler/client/src/dialogs/profilerCreateSessionDialog.ts
@@ -12,10 +12,12 @@ 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', 'Start');
-	private readonly DialogTitleText: string = localize('createSessionDialog.title', 'Start New Profiler Session');
+	private readonly CreateButtonText: string = localize('createSessionDialog.create', 'Create');
+	private readonly DialogTitleText: string = localize('createSessionDialog.title', 'Create New Profiler Session');

 	// UI Components
 	private dialog: sqlops.window.modelviewdialog.Dialog;
@@ -23,28 +25,23 @@ 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, providerType: string, templates: Array<sqlops.ProfilerSessionTemplate>) {
+	constructor(ownerUri: 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.DialogTitleText);
+		this.dialog = sqlops.window.modelviewdialog.createDialog(this.DialogTitle);
 		this.initializeContent();
 		this.dialog.okButton.onClick(() => this.execute());
 		this.dialog.cancelButton.onClick(() => { });
@@ -68,10 +65,6 @@ export class CreateSessionDialog {
 					value: ''
 				}).component();

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

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

 			await view.initializeModel(formModel);

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

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

-	private updateSessionName() {
-		if (this.templatesBox.value) {
-			this.sessionNameBox.value = `ADS_${this.templatesBox.value.toString()}`
-		}
-	}
-
 	private async execute(): Promise<void> {
-		let profilerService = sqlops.dataprotocol.getProvider<sqlops.ProfilerProvider>(this._providerType, sqlops.DataProviderType.ProfilerProvider);
+		let currentConnection = await sqlops.connection.getCurrentConnection();
+		let profilerService = sqlops.dataprotocol.getProvider<sqlops.ProfilerProvider>(currentConnection.providerName, 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, providerType: string, templates: Array<sqlops.ProfilerSessionTemplate>) => {
-			let dialog = new CreateSessionDialog(ownerUri, providerType, templates);
+		vscode.commands.registerCommand('profiler.openCreateSessionDialog', (ownerUri: string, templates: Array<sqlops.ProfilerSessionTemplate>) => {
+			let dialog = new CreateSessionDialog(ownerUri, 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.6.0",
+  "version": "0.3.0",
  "publisher": "Microsoft",
  "preview": true,
  "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt",
@@ -26,9 +26,11 @@
    "Microsoft.mssql"
  ],
  "contributes": {
-    "commands": [{
+
+    "commands": [
+      {
        "command": "profiler.newProfiler",
-        "title": "Launch Profiler",
+        "title": "New Profiler",
        "category": "Profiler"
      },
      {
@@ -47,25 +49,6 @@
        "category": "Profiler"
      }
    ],
-    "menus": {
-      "commandPalette": [{
-          "command": "profiler.start",
-          "when": "False"
-        },
-        {
-          "command": "profiler.stop",
-          "when": "False"
-        }, {
-          "command": "profiler.openCreateSessionDialog",
-          "when": "False"
-        }
-      ],
-      "objectExplorer/item/context": [{
-        "command": "profiler.newProfiler",
-        "when": "connectionProvider == MSSQL && nodeType && nodeType == Server",
-        "group": "profiler"
-      }]
-    },
    "outputChannels": [
      "sqlprofiler"
    ]
@@ -76,4 +59,4 @@
  "devDependencies": {
    "vscode": "1.0.1"
  }
-}
+}
--- a/extensions/sql/syntaxes/sql.tmLanguage.json
+++ b/extensions/sql/syntaxes/sql.tmLanguage.json
--- a/extensions/theme-carbon/themes/dark_carbon.json
+++ b/extensions/theme-carbon/themes/dark_carbon.json
@@ -67,8 +67,7 @@
 		"panel.background": "#212121",
 		"panel.border": "#515151",
 		"panelTitle.activeForeground": "#ffffff",
-		"panelTitle.inactiveForeground": "#888888",
-		"panelTitle.activeBorder": "#026dc8"
+		"panelTitle.inactiveForeground": "#888888"
 	},
 	"tokenColors": [
 		{
--- a/extensions/theme-carbon/themes/light_carbon.json
+++ b/extensions/theme-carbon/themes/light_carbon.json
@@ -77,8 +77,7 @@
 		"panel.background": "#ffffff",
 		"panel.border": "#c8c8c8",
 		"panelTitle.activeForeground": "#212121",
-		"panelTitle.inactiveForeground": "#757575",
-		"panelTitle.activeBorder": "#026dc8"
+		"panelTitle.inactiveForeground": "#757575"
 	},
 	"tokenColors": [
 		{
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "azuredatastudio",
-  "version": "1.3.7",
+  "version": "1.2.4",
  "distro": "8c3e97e3425cc9814496472ab73e076de2ba99ee",
  "author": {
    "name": "Microsoft Corporation"
@@ -37,10 +37,8 @@
    "@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",
@@ -66,9 +64,8 @@
    "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.29",
+    "slickgrid": "github:anthonydresser/SlickGrid#2.3.28",
    "spdlog": "0.7.1",
    "sudo-prompt": "8.2.0",
    "svg.js": "^2.2.5",
@@ -88,9 +85,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/should": "^13.0.0",
    "@types/sinon": "1.16.34",
    "@types/winreg": "^1.2.30",
    "asar": "^0.14.0",
@@ -103,12 +98,12 @@
    "documentdb": "^1.5.1",
    "electron-mksnapshot": "~1.7.0",
    "eslint": "^3.4.0",
-    "event-stream": "3.3.4",
+    "event-stream": "^3.1.7",
    "express": "^4.13.1",
    "glob": "^5.0.13",
    "gulp": "^3.9.1",
-    "gulp-atom-electron": "^1.19.2",
-    "gulp-azure-storage": "^0.8.2",
+    "gulp-atom-electron": "^1.16.1",
+    "gulp-azure-storage": "^0.7.0",
    "gulp-bom": "^1.0.0",
    "gulp-buffer": "0.0.2",
    "gulp-cli": "^2.0.1",
@@ -121,7 +116,7 @@
    "gulp-json-editor": "^2.2.1",
    "gulp-mocha": "^2.1.3",
    "gulp-plumber": "^1.2.0",
-    "gulp-remote-src": "^0.4.4",
+    "gulp-remote-src": "^0.4.0",
    "gulp-rename": "^1.2.0",
    "gulp-replace": "^0.5.4",
    "gulp-shell": "^0.5.2",
@@ -130,7 +125,7 @@
    "gulp-tslint": "^8.1.2",
    "gulp-uglify": "^3.0.0",
    "gulp-util": "^3.0.6",
-    "gulp-vinyl-zip": "^2.1.2",
+    "gulp-vinyl-zip": "^1.2.2",
    "husky": "^0.13.1",
    "innosetup-compiler": "^5.5.60",
    "is": "^3.1.0",
@@ -149,10 +144,8 @@
    "queue": "3.0.6",
    "remap-istanbul": "^0.6.4",
    "rimraf": "^2.2.8",
-    "should": "^13.2.3",
    "sinon": "^1.17.2",
    "source-map": "^0.4.4",
-    "temp-write": "^3.4.0",
    "tslint": "^5.9.1",
    "typemoq": "^0.3.2",
    "typescript": "2.9.2",
@@ -177,7 +170,6 @@
    "windows-process-tree": "0.2.2"
  },
  "resolutions": {
-    "rc": "1.2.8",
-    "event-stream": "3.3.4"
+    "rc": "1.2.8"
  }
 }
--- 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 List</source>
+      <source xml:lang="en">Clear Recent Connections 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,6 +1520,9 @@
    </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>
@@ -1530,13 +1533,16 @@
      <source xml:lang="en">Start</source>
    </trans-unit>
    <trans-unit id="create">
-      <source xml:lang="en">New Session</source>
+      <source xml:lang="en">Create</source>
+    </trans-unit>
+    <trans-unit id="profiler.capture">
+      <source xml:lang="en">Pause Capture</source>
    </trans-unit>
    <trans-unit id="profilerAction.resumeCapture">
-      <source xml:lang="en">Resume</source>
+      <source xml:lang="en">Resume Capture</source>
    </trans-unit>
    <trans-unit id="profilerAction.pauseCapture">
-      <source xml:lang="en">Pause</source>
+      <source xml:lang="en">Pause Capture</source>
    </trans-unit>
    <trans-unit id="profilerStop.stop">
      <source xml:lang="en">Stop</source>
@@ -1544,6 +1550,9 @@
    <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>
@@ -1563,7 +1572,7 @@
      <source xml:lang="en">Find Previous String</source>
    </trans-unit>
    <trans-unit id="profilerAction.newProfiler">
-      <source xml:lang="en">Launch Profiler</source>
+      <source xml:lang="en">New Profiler</source>
    </trans-unit>
  </body></file>
  <file original="src/sql/base/browser/ui/selectBox/selectBox" source-language="en" datatype="plaintext"><body>
@@ -1635,7 +1644,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,6 +1,9 @@
 <?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,18 +12,12 @@ 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 %*
-	)
+	%CODE% .\node_modules\mocha\bin\_mocha %*
 )

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

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


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

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

 cd $ROOT

-if [[ "$OSTYPE" == "darwin"* ]] || [[ "$AGENT_OS" == "Darwin"* ]]; then
+if [[ "$OSTYPE" == "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"* ]] || [[ "$AGENT_OS" == "Darwin"* ]]; then
+if [[ "$OSTYPE" == "darwin"* ]]; then
 	cd $ROOT ; ulimit -n 4096 ; \
 		"$CODE" \
 		node_modules/mocha/bin/_mocha "$@"
--- a/src/sql/base/browser/ui/modal/dialogHelper.ts
+++ b/src/sql/base/browser/ui/modal/dialogHelper.ts
@@ -12,10 +12,9 @@ import * as types from 'vs/base/common/types';

 import * as sqlops from 'sqlops';

-export function appendRow(container: Builder, label: string, labelClass: string, cellContainerClass: string, rowContainerClass?: string): Builder {
+export function appendRow(container: Builder, label: string, labelClass: string, cellContainerClass: string): Builder {
 	let cellContainer: Builder;
-	let rowAttributes = rowContainerClass ? { class: rowContainerClass } : {};
-	container.element('tr', rowAttributes, (rowContainer) => {
+	container.element('tr', {}, (rowContainer) => {
 		rowContainer.element('td', { class: labelClass }, (labelCellContainer) => {
 			labelCellContainer.div({}, (labelContainer) => {
 				labelContainer.text(label);
--- a/src/sql/base/browser/ui/modal/media/modal.css
+++ b/src/sql/base/browser/ui/modal/media/modal.css
@@ -56,7 +56,6 @@

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

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

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

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

 .modal.flyout-dialog .dialog-message-detail {
 	margin-top: 5px;
-	white-space: pre-wrap;
-	user-select: text;
+	white-space: normal;
+	-webkit-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,34 +20,11 @@
 }

 .optionsDialog-options-groups {
-	margin-top: 10px;
-	flex: 1 1;
+	padding: 15px;
+	height: calc(100% - 150px);
 	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;
@@ -56,42 +33,21 @@
 	cursor: pointer;
 }

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

 .optionsDialog-description {
-    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')
+	padding: 15px;
+	overflow-y: auto;
 }

 .optionsDialog-options {
-	height: 100%;
-	display: flex;
-	flex-direction: column;
+	height: calc(100% - 30px);
 }

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

 .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 {
-	protected _useDefaultMessageBoxLocation: boolean = true;
-	protected _messageElement: HTMLElement;
+
+	private _messageElement: HTMLElement;
 	private _messageIcon: HTMLElement;
 	private _messageSeverity: Builder;
 	private _messageSummary: Builder;
@@ -253,9 +253,7 @@ 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);
-			}
+			parts.push(this._messageElement);
 		}

 		// This modal body section refers to the body of of the dialog
--- 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({}, (dividerContainer) => {
+		builder.div({ class: 'Connection-divider' }, (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 {
-	font-size: 14px;
+	text-transform: uppercase;
+	font-size: 13px;
 	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,6 +36,7 @@ export interface IPanelTab {
 interface IInternalPanelTab extends IPanelTab {
 	header: HTMLElement;
 	label: HTMLElement;
+	dispose(): void;
 }

 const defaultOptions: IPanelOptions = {
@@ -142,6 +143,8 @@ 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,7 +19,6 @@ 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,11 +28,8 @@ 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
@@ -1,10 +0,0 @@
-.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,8 +4,6 @@
 *--------------------------------------------------------------------------------------------*/

 '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';
@@ -32,7 +30,6 @@ 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;
@@ -75,12 +72,6 @@ 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;
-		var focusTracker = dom.trackFocus(this.selectElement);
-		this._register(focusTracker);
-		this._register(focusTracker.onDidBlur(() => this._hideMessage()));
-		this._register(focusTracker.onDidFocus(() => this._showMessage()));
 	}

 	public style(styles: ISelectBoxStyles): void {
@@ -127,10 +118,6 @@ 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;
@@ -147,10 +134,6 @@ export class SelectBox extends vsSelectBox {
 		this.applyStyles();
 	}

-	public hasFocus(): boolean {
-		return document.activeElement === this.selectElement;
-	}
-
 	public showMessage(message: IMessage): void {
 		this.message = message;

@@ -172,9 +155,7 @@ export class SelectBox extends vsSelectBox {

 		aria.alert(alertText);

-		if (this.hasFocus()) {
-			this._showMessage();
-		}
+		this._showMessage();
 	}

 	public _showMessage(): void {
@@ -245,34 +226,4 @@ 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,64 +3,67 @@
 *  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: (startIndex: number, count: number) => void): void;
-	setLength(number): void;
-	dispose(): void;
+	setCollectionChangedCallback(callback: (change: CollectionChange, startIndex: number, count: number) => void): void;
+}
+
+export interface IGridDataRow {
+	row?: number;
+	values: any[];
+}
+
+export enum CollectionChange {
+	ItemsReplaced
 }

 class LoadCancellationToken {
 	isCancelled: boolean;
 }

-class DataWindow<T> {
-	private _data: T[];
+class DataWindow<TData> {
+	private _dataSourceLength: number;
+	private _data: TData[];
 	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(
-		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;
-		}
+	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;
 	}

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

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

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

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

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

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

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

-	private collectionChangedCallback: (startIndex: number, count: number) => void;
+	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;

-	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(start, end - start);
+				this.collectionChangedCallback(CollectionChange.ItemsReplaced, start, end - start);
 			}
 		};

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

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

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

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

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

 		// current data may contain placeholders
 		let currentData = this.getRangeFromCurrent(start, end);
@@ -144,7 +142,7 @@ export class VirtualizedCollection<T extends Slick.SlickData> implements IObserv
 			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()) {
@@ -153,8 +151,8 @@ export class VirtualizedCollection<T extends Slick.SlickData> implements IObserv
 			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);
 		}
@@ -162,7 +160,7 @@ export class VirtualizedCollection<T extends Slick.SlickData> implements IObserv
 		return currentData;
 	}

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

-	private getDataFromCurrent(index: number): T {
+	private getDataFromCurrent(index: number): TData {
 		if (this._bufferWindowBefore.contains(index)) {
 			return this._bufferWindowBefore.getItem(index);
 		} else if (this._bufferWindowAfter.contains(index)) {
@@ -180,50 +178,38 @@ export class VirtualizedCollection<T extends Slick.SlickData> implements IObserv
 			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<T extends Slick.SlickData> implements IDisposableDataProvider<T> {
+export class AsyncDataProvider<TData extends IGridDataRow> implements Slick.DataProvider<TData> {

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

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

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

-	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();
+	public getRange(start: number, end: number): TData[] {
+		return !this.dataRows ? undefined : this.dataRows.getRange(start, end);
 	}
 }
--- a/src/sql/base/browser/ui/table/interfaces.ts
+++ b/src/sql/base/browser/ui/table/interfaces.ts
@@ -1,31 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { 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/Show More
+++ b/Show More
Author	SHA1	Message	Date
Kevin Cunnane	1ebfd02356	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:53 -07:00
Karl Burtram	c942bc1dbb	Bump Azure Data Studio to 1.2.4	2018-11-01 15:10:50 -07:00
Karl Burtram	8439cde610	Bump SQL Tools to 1.5.0-alpha.52	2018-10-31 20:38:22 -07:00
Anthony Dresser	2080c525a7	Auto Scale Axis (#3070 ) * fix input to chart that was causes scales to not auto size * formatting * formatting * added comments	2018-10-31 20:33:09 -07:00
Aditya Bist	db2d380b6c	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 20:32:59 -07:00
Alan Ren	a06f80bdb1	fix for issue 3065 (#3067 ) * fix for 3065 * remove the parameter, no need to save connection	2018-10-31 20:32:51 -07:00
Karl Burtram	1f76c85b1b	Remove SQL Import dashboard tab (#3064 )	2018-10-31 20:32:37 -07:00
Karl Burtram	cffc18d5ea	Revert "Revert "Add a command line interface for connecting to a SQL Server (#3047 )"" This reverts commit `a747b6a500`.	2018-10-31 20:32:17 -07:00
Karl Burtram	a747b6a500	Revert "Add a command line interface for connecting to a SQL Server (#3047 )" This reverts commit `7f66087d8c`.	2018-10-31 14:39:46 -07:00
Aditya Bist	711b7bf622	fixed null ref (#3061 )	2018-10-31 14:25:39 -07:00
Alan Ren	9b0757de9c	a few ux improvements (#3057 ) * style update * checkbox styler * casing update	2018-10-31 14:25:26 -07:00
Alan Ren	b9a0744a83	fix for issue 2719 (#3060 )	2018-10-31 14:25:14 -07:00
Karl Burtram	c69915ca58	Bump SQL Tools to 1.5.0-alpha.51	2018-10-31 13:17:20 -07:00
Karl Burtram	a16835918a	Fix build break in previous Query Plan commit	2018-10-31 13:04:32 -07:00
David Shiflet	f9e27d7112	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 10:14:36 -07:00
Ryan	c072ba9c5c	Add query plan theme support (#2991 ) (#3031 ) Add monaco-editor and monaco-editor-hover to output otherwise backgrounds collide.	2018-10-31 10:14:26 -07:00
Alan Ren	807fb2ed8a	fix missing footer for backup dialog (#3056 ) @MattIrv Thanks for helping out	2018-10-31 09:46:14 -07:00
Ruturaj Gujar	daf347b728	Fixed some typos and grammatical errors (#3027 )	2018-10-31 09:46:06 -07:00
Karl Burtram	e76222db7a	Change 'None' to 'Do not save' in Connection Dialog (#3051 )	2018-10-30 10:46:24 -07:00
Karl Burtram	f676090901	Bump Azure Data Studio to 1.2.3	2018-10-30 10:28:29 -07:00
				`@@ -1 +0,0 @@`
				<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#fff;}.cls-2{fill:#388a34;}</style></defs><title>new_notebook_inverse</title><path class="cls-1" d="M11.87,1.24V.33H9.13A3.78,3.78,0,0,0,7.92.52a3.48,3.48,0,0,0-1.07.58A3.6,3.6,0,0,0,5.78.52,3.78,3.78,0,0,0,4.57.33H1.83v.91H0V13.1H9.67v-.91H7a4,4,0,0,1,.47-.39A2.39,2.39,0,0,1,8,11.52a2.2,2.2,0,0,1,.53-.18,2.93,2.93,0,0,1,.61-.06h2.74V2.15h.91V9h.91V1.24Zm-9.13,0H4.57a3,3,0,0,1,1,.17,2.58,2.58,0,0,1,.85.49v8.93a3.94,3.94,0,0,0-.88-.35,3.73,3.73,0,0,0-.94-.12H2.74Zm-1.82,11v-10h.91v9.13H4.57a2.93,2.93,0,0,1,.61.06,2.55,2.55,0,0,1,.53.18,2.68,2.68,0,0,1,.49.28,3.29,3.29,0,0,1,.46.39Zm8.21-1.83a3.73,3.73,0,0,0-.94.12,4.22,4.22,0,0,0-.89.35V1.9a2.74,2.74,0,0,1,.86-.49,2.91,2.91,0,0,1,1-.17H11v9.12ZM12.87,10v2.2h-2.2v.91h3V10Z"/><polygon class="cls-2" points="16 12.19 16 13.13 13.8 13.13 13.8 15.33 12.87 15.33 12.87 13.13 10.67 13.13 10.67 12.19 12.87 12.19 12.87 9.99 13.8 9.99 13.8 12.19 16 12.19"/><path class="cls-2" d="M13.8,12.19V10h-.93v2.2h-2.2v.94h2.2v2.2h.93v-2.2H16v-.94Z"/></svg>