Rework timeSeries in chart viewer (#2987 )

* rework timeSeries in chart viewer * rework important to fix tests
Update Azure Data Studio to 1.1.4
2026-02-19 02:51:37 -05:00 · 2018-10-29 13:12:49 -07:00 · 2018-10-29 12:05:16 -07:00 · 2018-10-29 12:04:00 -07:00 · 2018-10-29 12:00:03 -07:00 · 2018-10-29 11:54:42 -07:00
400 changed files with 2821 additions and 25246 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,10 +1,6 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
 ---

 <!-- Please search existing issues to avoid creating duplicates. -->
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,20 +0,0 @@
---
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: feature request
-assignees: ''
-
---
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution or feature you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
--- 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,44 +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
-
-## What's new in this version
-* Introducing the Azure Resource Explorer to browse Azure SQL Databases
-* Improve Object Explorer and Query Editor connectivity robustness
-* SQL Server 2019 and SQL Agent extension improvements
-
-## Contributions and "thank you"
-We would like to thank all our users who raised issues, and in particular the following users who helped contribute fixes:
-
-* philoushka  for `center the icon #2760`
-* anthonypants for `Typo #2775`
-* kstolte for `Fix Invalid Configuration in Launch.json #2789`
-* kstolte for `Fixing a reference to SQL Ops Studio #2788`

 ## Version 1.0.0
 * Release date: September 24, 2018
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -5,9 +5,9 @@ First, please do a search in [open issues](https://github.com/Microsoft/azuredat

 If you find your issue already exists, make relevant comments and add your [reaction](https://github.com/blog/2119-add-reactions-to-pull-requests-issues-and-comments). Use a reaction in place of a "+1" comment.

-:+1: - upvote
+<EFBFBD> - upvote

-:-1: - downvote
+<EFBFBD> - downvote

 If you cannot find an existing issue that describes your bug or feature, submit an issue using the guidelines below.

--- a/README.md
+++ b/README.md
@@ -1,20 +1,19 @@
 # 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.

-**Download the latest Azure Data Studio release**
+**Download Azure Data Studio August Public Preview**

 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=2024683
+Windows ZIP | https://go.microsoft.com/fwlink/?linkid=2024680
+macOS ZIP | https://go.microsoft.com/fwlink/?linkid=2024677
+Linux TAR.GZ | https://go.microsoft.com/fwlink/?linkid=2024675
+Linux RPM | https://go.microsoft.com/fwlink/?linkid=2024672
+Linux DEB | https://go.microsoft.com/fwlink/?linkid=2024668

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

@@ -35,9 +34,9 @@ See the [change log](https://github.com/Microsoft/azuredatastudio/blob/master/CH
 - Task History window to view current task execution status, completion results with error messages and task T-SQL scripting
 - Scripting support to generate CREATE, SELECT, ALTER and DROP statements for database objects
 - Workspaces with full Git integration and Find In Files support to managing T-SQL script libraries
- Modern light-weight shell with theming, user settings, full-screen support, integrated terminal and numerous other features
+- Modern light-weight shell with theming, user settings, full screen support, integrated terminal and numerous other features

-Here are some of these features in action.
+Here's some of these features in action.

 <img src='https://github.com/Microsoft/azuredatastudio/blob/master/docs/overview_screen.jpg' width='800px'>

@@ -62,39 +61,29 @@ 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`
-* kstolte for `Fixing a reference to SQL Ops Studio #2788`
 * AlexFsmn `Feature: Ability to add connection name #2332`
 * AlexFsmn `Disabled connection name input when connecting to a server. #2566`
 * SebastianPfliegel `Added more saveAsCsv options #2099`
 * ianychoi `Fixes a typo: Mimunum -> Minimum #1994`
-* AlexFsmn `Fixed bug where proper file extension wasn't appended to the filename. #2151`
+* AlexFsmn `Fixed bug where proper file extension wasn't appended to filename. #2151`
 * AlexFsmn `Added functionality for adding any file to import wizard #2329`
 * AlexFsmn `Fixed background issue when copying a chart to clipboard #2215`
 * AlexFsmn `Fixed problem where vertical charts didn't display labels correctly. #2263`
 * AlexFsmn `Fixed Initial values for charts to match visuals #2266`
 * AlexFsmn `Renamed chart option labels #2264`
-* AlexFsmn `Added feature for the opening file after exporting to CSV/XLS/JSON & query files #2216`
+* AlexFsmn `Added feature for opening file after exporting to CSV/XLS/JSON & query files #2216`
 * AlexFsmm `Get Connection String should copy to clipboard #2175`
-* lanceklinger `Fix for double-clicking column handle in results table #1504`
+* lanceklinger `Fix for double clicking column handle in results table #1504`
 * westerncj for `Removed duplicate contribution from README.md (#753)`
 * ntovas for `Fix for duplicate extensions shown in "Save File" dialog. (#779)`
 * SebastianPfliegel for `Add cursor snippet (#475)`
-* mikaoelitiana for the fix: `revert README and CONTRIBUTING after last VSCode merge (#574)`
+* mikaoelitiana for fix: `revert README and CONTRIBUTING after last VSCode merge (#574)`
 * alextercete for `Reinstate menu item to install from VSIX (#682)`
 * alextercete for `Fix "No extension gallery service configured" error (#427)`
 * mwiedemeyer for `Fix #58: Default sort order for DB size widget (#111)`
 * AlexTroshkin for `Show disconnect in context menu only when connectionProfile connected (#150)`
 * AlexTroshkin for `Fix #138: Invalid syntax color highlighting (identity not highlighting) (#140))`
-* stebet for `Fix #153: Fixing sql snippets that failed on a DB with a case-sensitive collation. (#152)`
+* stebet for `Fix #153: Fixing sql snippets that failed on a DB with case-sensitive collation. (#152)`
 * SebastianPfliegel `Remove sqlExtensionHelp (#312)`
 * olljanat for `Implemented npm version check (#314)`
 * Adam Machanic for helping with the `whoisactive` extension
@@ -103,14 +92,15 @@ We would like to thank all our users who raised issues, and in particular the fo
  * Italian: Aldo Donetti, Alessandro Alpi, Andrea Dottor, Bruni Luca, Gianluca Hotz, Luca Nardi, Luigi Bruno, Marco Dal Pino, Mirco Vanini, Pasquale Ceglie, Riccardo Cappello, Sergio Govoni, Stefano Demiliani
  * German: Anna Henke-Gunvaldson, Ben Weissman, David Ullmer, J.M. ., Kai Modo, Konstantin Staschill, Kostja Klein, Lennart Trunk, Markus Ehrenmüller-Jensen, Mascha Kroenlein, Matthias Knoll, Mourad Louha, Thomas Hütter, Wolfgang Straßer
  * Spanish: Alberto Poblacion, Andy Gonzalez, Carlos Mendible, Christian Araujo, Daniel D, Eickhel Mendoza, Ernesto Cardenas, Ivan Toledo Ivanovic, Fran Diaz, JESUS GIL, Jorge Serrano Pérez, José Saturnino Pimentel Juárez, Mauricio Hidalgo, Pablo Iglesias, Rikhardo Estrada Rdez, Thierry DEMAN, YOLANDA CUESTA ALTIERI
-  * Japanese: Fujio Kojima, Kazushi KAMEGAWA, Masayoshi Yamada, Masayuki Ozawa, Seiji Momoto, Takashi Kanai, Takayoshi Tanaka, Yoshihisa Ozaki, 庄垣内治
+  * Japanese: Fujio Kojima, Kazushi KAMEGAWA, Masayoshi Yamada, Masayuki Ozawa , Seiji Momoto, Takashi Kanai, Takayoshi Tanaka, Yoshihisa Ozaki, 庄垣内治
  * Chinese (simplified): DAN YE, Joel Yang, Lynne Dong, Ryan（Yu） Zhang, Sheng Jiang, Wei Zhang, Zhiliang Xu
  * Chinese  (Traditional): Bruce Chen, Chiayi Yen, Kevin Yang,  Winnie Lin, 保哥 Will,  謝政廷
  * Korean: Do-Kyun Kim, Evelyn Kim, Helen Jung, Hong Jmee, jeongwoo choi, Jun Hyoung Lee, Jungsun Kim정선, Justin Yoo, Kavrith mucha, Kiwoong Youm, MinGyu Ju,  MVP_JUNO BEA, Sejun Kim, SOONMAN KWON, sung man ko, Yeongrak Choi, younggun kim, Youngjae Kim, 소영 이
  * Russian: Andrey Veselov, Anton Fontanov, Anton Savin, Elena Ostrovskaia, Igor Babichev, Maxim Zelensky, Rodion Fedechkin, Tasha T, Vladimir Zyryanov
  * Portuguese Brazil: Daniel de Sousa, Diogo Duarte, Douglas Correa, Douglas Eccker, José Emanuel Mendes, Marcelo Fernandes, Marcondes Alexandre, Roberto Fonseca, Rodrigo Crespi

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

 ## License

--- 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/lib/watch/yarn.lock
+++ b/build/lib/watch/yarn.lock
--- 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
--- 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.33.0",
  "publisher": "Microsoft",
  "preview": true,
  "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt",
--- a/extensions/agent/src/data/alertData.ts
+++ b/extensions/agent/src/data/alertData.ts
@@ -9,7 +9,6 @@ import * as vscode from 'vscode';
 import * as sqlops from 'sqlops';
 import { AgentUtils } from '../agentUtils';
 import { IAgentDialogData, AgentDialogMode } from '../interfaces';
-import { JobData } from './jobData';

 const localize = nls.loadMessageBundle();

@@ -46,19 +45,8 @@ export class AlertData implements IAgentDialogData {
 	wmiEventNamespace: string;
 	wmiEventQuery: string;

-	private viaJobDialog: boolean;
-	private jobModel: JobData;
-
-	constructor(
-		ownerUri:string,
-		alertInfo: sqlops.AgentAlertInfo,
-		jobModel?: JobData,
-		viaJobDialog: boolean = false
-	) {
+	constructor(ownerUri:string, alertInfo: sqlops.AgentAlertInfo) {
 		this.ownerUri = ownerUri;
-		this.viaJobDialog = viaJobDialog;
-		this.jobModel = jobModel;
-		this.jobName = this.jobName ? this.jobName : this.jobModel.name;

 		if (alertInfo) {
 			this.dialogMode = AgentDialogMode.EDIT;
@@ -69,9 +57,10 @@ export class AlertData implements IAgentDialogData {
 			this.eventDescriptionKeyword = alertInfo.eventDescriptionKeyword;
 			this.eventSource = alertInfo.eventSource;
 			this.hasNotification = alertInfo.hasNotification;
-			this.includeEventDescription = alertInfo.includeEventDescription ? alertInfo.includeEventDescription.toString() : null;
+			this.includeEventDescription = alertInfo.includeEventDescription.toString();
 			this.isEnabled = alertInfo.isEnabled;
 			this.jobId = alertInfo.jobId;
+			this.jobName = alertInfo.jobName;
 			this.lastOccurrenceDate = alertInfo.lastOccurrenceDate;
 			this.lastResponseDate = alertInfo.lastResponseDate;
 			this.messageId = alertInfo.messageId;
@@ -82,7 +71,7 @@ export class AlertData implements IAgentDialogData {
 			this.databaseName = alertInfo.databaseName;
 			this.countResetDate = alertInfo.countResetDate;
 			this.categoryName = alertInfo.categoryName;
-			this.alertType = alertInfo.alertType ? alertInfo.alertType.toString() : null;
+			this.alertType = alertInfo.alertType.toString();
 			this.wmiEventNamespace = alertInfo.wmiEventNamespace;
 			this.wmiEventQuery = alertInfo.wmiEventQuery;
 		}
@@ -93,18 +82,10 @@ export class AlertData implements IAgentDialogData {

 	public async save() {
 		let agentService = await AgentUtils.getAgentService();
-		let result: any;
-		// if it's called via the job dialog, add it to the
-		// job model
-		if (this.viaJobDialog) {
-			if (this.jobModel) {
-				Promise.resolve(this);
-				return;
-			}
-		} else {
-			// has to be a create alert
-			result = await agentService.createAlert(this.ownerUri, this.toAgentAlertInfo());
-		}
+		let result = this.dialogMode === AgentDialogMode.CREATE
+			? await agentService.createAlert(this.ownerUri,  this.toAgentAlertInfo())
+			: await agentService.updateAlert(this.ownerUri, this.originalName, this.toAgentAlertInfo());
+
 		if (!result || !result.success) {
 			vscode.window.showErrorMessage(
 				localize('alertData.saveErrorMessage', "Alert update failed '{0}'", result.errorMessage ? result.errorMessage : 'Unknown'));
--- a/extensions/agent/src/data/jobData.ts
+++ b/extensions/agent/src/data/jobData.ts
@@ -44,8 +44,6 @@ export class JobData implements IAgentDialogData {
 	public jobSteps: sqlops.AgentJobStepInfo[];
 	public jobSchedules: sqlops.AgentJobScheduleInfo[];
 	public alerts: sqlops.AgentAlertInfo[];
-	public jobId: string;
-	public startStepId: number;

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

@@ -119,6 +115,7 @@ export class JobData implements IAgentDialogData {
 		let result = this.dialogMode === AgentDialogMode.CREATE
 			? await this._agentService.createJob(this.ownerUri,  jobInfo)
 			: await this._agentService.updateJob(this.ownerUri, this.originalName, jobInfo);
+
 		if (!result || !result.success) {
 			vscode.window.showErrorMessage(
 				localize('jobData.saveErrorMessage', "Job update failed '{0}'", result.errorMessage ? result.errorMessage : 'Unknown'));
@@ -138,22 +135,34 @@ export class JobData implements IAgentDialogData {
 		};
 	}

+	public addJobSchedule(schedule: sqlops.AgentJobScheduleInfo) {
+		if (this.jobSchedules) {
+			let existingSchedule = this.jobSchedules.find(item => item.name === schedule.name);
+			if (!existingSchedule) {
+				this.jobSchedules.push(schedule);
+			}
+		} else {
+			this.jobSchedules = [];
+			this.jobSchedules.push(schedule);
+		}
+	}
+
 	public toAgentJobInfo(): sqlops.AgentJobInfo {
 		return {
 			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 +177,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: ''
 		};
 	}
 }
--- a/extensions/agent/src/data/jobStepData.ts
+++ b/extensions/agent/src/data/jobStepData.ts
@@ -46,13 +46,11 @@ export class JobStepData implements IAgentDialogData {
 	public retryInterval: number;
 	public proxyName: string;
 	private jobModel: JobData;
-	private viaJobDialog: boolean;

-	constructor(ownerUri:string, jobModel?: JobData, viaJobDialog: boolean = false) {
+	constructor(ownerUri:string, jobModel?: JobData) {
 		this.ownerUri = ownerUri;
 		this.jobName = jobModel.name;
 		this.jobModel = jobModel;
-		this.viaJobDialog = viaJobDialog;
 	}

 	public async initialize() {
@@ -61,16 +59,18 @@ export class JobStepData implements IAgentDialogData {
 	public async save() {
 		let agentService = await AgentUtils.getAgentService();
 		let result: any;
-		// if it's called via the job dialog, add it to the
-		// job model
-		if (this.viaJobDialog) {
-			if (this.jobModel) {
+		if (this.dialogMode === AgentDialogMode.CREATE) {
+			if (this.jobModel && this.jobModel.dialogMode === AgentDialogMode.CREATE) {
+				// create job -> create step
 				Promise.resolve(this);
 				return;
+			} else {
+				// edit job -> create step
+				result = await agentService.createJobStep(this.ownerUri, JobStepData.convertToAgentJobStepInfo(this));
 			}
-		} else {
-			// has to be a create step
-			result = await agentService.createJobStep(this.ownerUri, JobStepData.convertToAgentJobStepInfo(this));
+		} else if (this.jobModel && this.jobModel.dialogMode === AgentDialogMode.EDIT) {
+			// edit job -> edit step
+			result = await agentService.updateJobStep(this.ownerUri, this.stepName, JobStepData.convertToAgentJobStepInfo(this));
 		}
 		if (!result || !result.success) {
 			vscode.window.showErrorMessage(
@@ -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/data/pickScheduleData.ts
+++ b/extensions/agent/src/data/pickScheduleData.ts
@@ -29,6 +29,8 @@ export class PickScheduleData implements IAgentDialogData {
 	}

 	public async save() {
+		let agentService = await AgentUtils.getAgentService();
 		this.selectedSchedule.jobName = this.jobName;
+		let result = await agentService.createJobSchedule(this.ownerUri, this.selectedSchedule);
 	}
 }
--- 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
@@ -12,7 +12,6 @@ import { AgentUtils } from '../agentUtils';
 import { AlertData } from '../data/alertData';
 import { OperatorDialog } from './operatorDialog';
 import { JobDialog } from './jobDialog';
-import { JobData } from '../data/jobData';

 const localize = nls.loadMessageBundle();

@@ -116,10 +115,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,26 +148,14 @@ export class AlertDialog extends AgentDialog<AlertData> {
 	private delayMinutesTextBox: sqlops.InputBoxComponent;
 	private delaySecondsTextBox: sqlops.InputBoxComponent;

-	private isEdit: boolean = false;
+	private jobs: string[];
 	private databases: string[];
-	private jobModel: JobData;
-	public jobId: string;
-	public jobName: string;

-	constructor(
-		ownerUri: string,
-		jobModel: JobData,
-		alertInfo: sqlops.AgentAlertInfo = undefined,
-		viaJobDialog: boolean = false
-	) {
+	constructor(ownerUri: string, alertInfo: sqlops.AgentAlertInfo = undefined, jobs: string[]) {
 		super(ownerUri,
-			new AlertData(ownerUri, alertInfo, jobModel, viaJobDialog),
+			new AlertData(ownerUri, alertInfo),
 			alertInfo ? AlertDialog.EditDialogTitle : AlertDialog.CreateDialogTitle);
-		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;
+			this.jobs = jobs;
 	}

 	protected async initializeDialog(dialog: sqlops.window.modelviewdialog.Dialog) {
@@ -529,8 +512,7 @@ export class AlertDialog extends AgentDialog<AlertData> {
 	protected updateModel() {
 		this.model.name = this.nameTextBox.value;
 		this.model.isEnabled = this.enabledCheckBox.checked;
-		this.model.jobId = this.jobId;
-		this.model.jobName = this.jobName;
+
 		this.model.alertType = this.getDropdownValue(this.typeDropDown);
 		let databaseName = this.getDropdownValue(this.databaseDropDown);
 		this.model.databaseName = (databaseName !== AlertDialog.AllDatabases) ? databaseName : undefined;
--- a/extensions/agent/src/dialogs/jobDialog.ts
+++ b/extensions/agent/src/dialogs/jobDialog.ts
@@ -11,7 +11,6 @@ import { PickScheduleDialog } from './pickScheduleDialog';
 import { AlertDialog } from './alertDialog';
 import { AgentDialog } from './agentDialog';
 import { AgentUtils } from '../agentUtils';
-import { JobStepData } from '../data/jobStepData';

 const localize = nls.loadMessageBundle();

@@ -42,12 +41,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 +66,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 +100,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;
@@ -117,22 +110,12 @@ export class JobDialog extends AgentDialog<JobData>  {
 	private newAlertButton: sqlops.ButtonComponent;
 	private isEdit: boolean = false;

-	// Job objects
-	private steps: sqlops.AgentJobStepInfo[];
-	private schedules: sqlops.AgentJobScheduleInfo[];
-	private alerts: sqlops.AgentAlertInfo[] = [];
-	private startStepDropdownValues: sqlops.CategoryValue[] = [];
-
 	constructor(ownerUri: string, jobInfo: sqlops.AgentJobInfo = undefined) {
 		super(
 			ownerUri,
 			new JobData(ownerUri, jobInfo),
 			jobInfo ? JobDialog.EditDialogTitle : JobDialog.CreateDialogTitle);
-		this.steps = this.model.jobSteps ? this.model.jobSteps : [];
-		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() {
@@ -215,7 +198,12 @@ export class JobDialog extends AgentDialog<JobData>  {

 	private initializeStepsTab() {
 		this.stepsTab.registerContent(async view => {
-			let data = this.steps ? this.convertStepsToData(this.steps) : [];
+			let previewTag = view.modelBuilder.text()
+				.withProperties({
+					value: 'Feature Preview'
+				}).component();
+			let steps = this.model.jobSteps ? this.model.jobSteps : [];
+			let data = this.convertStepsToData(steps);
 			this.stepsTable = view.modelBuilder.table()
 				.withProperties({
 					columns: [
@@ -226,26 +214,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,19 +234,16 @@ 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);
+			let stepDialog = new JobStepDialog(this.model.ownerUri, '' , this.model);
 			stepDialog.onSuccess((step) => {
-				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;
+				if (!this.model.jobSteps) {
+					this.model.jobSteps = [];
+				}
+				this.model.jobSteps.push(step);
+				this.stepsTable.data = this.convertStepsToData(this.model.jobSteps);
 			});
 			this.newStepButton.onDidClick((e)=>{
 				if (this.nameTextBox.value && this.nameTextBox.value.length > 0) {
@@ -278,132 +256,67 @@ 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);
+						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];
+									this.model.jobSteps = steps;
+									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: previewTag,
+					title: ''
+				},
 				{
 					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);
 		});
 	}

 	private initializeAlertsTab() {
 		this.alertsTab.registerContent(async view => {
+			let previewTag = view.modelBuilder.text()
+			.withProperties({
+				value: 'Feature Preview'
+			}).component();
 			let alerts = this.model.alerts ? this.model.alerts : [];
 			let data = this.convertAlertsToData(alerts);
 			this.alertsTable = view.modelBuilder.table()
@@ -414,7 +327,7 @@ export class JobDialog extends AgentDialog<JobData>  {
 						this.AlertTypeLabelString
 					],
 					data: data,
-					height: 750,
+					height: 430,
 					width: 400
 				}).component();

@@ -423,24 +336,18 @@ export class JobDialog extends AgentDialog<JobData>  {
 				width: 80
 			}).component();

-			let alertDialog = new AlertDialog(this.model.ownerUri, this.model, null, true);
-			alertDialog.onSuccess((alert) => {
-				let alertInfo = alert.toAgentAlertInfo();
-				this.alerts.push(alertInfo);
-				this.alertsTable.data = this.convertAlertsToData(this.alerts);
-			});
-			this.newAlertButton.onDidClick(()=>{
-				if (this.nameTextBox.value && this.nameTextBox.value.length > 0) {
-					alertDialog.jobId = this.model.jobId;
-					alertDialog.jobName = this.model.name ? this.model.name : this.nameTextBox.value;
-					alertDialog.openDialog();
-				} else {
-					this.dialog.message = { text: this.BlankJobNameErrorText };
-				}
+			this.newAlertButton.onDidClick((e)=>{
+				let alertDialog = new AlertDialog(this.model.ownerUri, null, []);
+				alertDialog.onSuccess((dialogModel) => {
+				});
+				alertDialog.openDialog();
 			});

 			let formModel = view.modelBuilder.formContainer()
 				.withFormItems([{
+					component: previewTag,
+					title: ''
+				}, {
 					component: this.alertsTable,
 					title: this.AlertsTopLabelString,
 					actions: [this.newAlertButton]
@@ -473,11 +380,8 @@ export class JobDialog extends AgentDialog<JobData>  {
 				pickScheduleDialog.onSuccess((dialogModel) => {
 					let selectedSchedule = dialogModel.selectedSchedule;
 					if (selectedSchedule) {
-						let existingSchedule = this.schedules.find(item => item.name === selectedSchedule.name);
-						if (!existingSchedule) {
-							selectedSchedule.jobName = this.model.name ? this.model.name : this.nameTextBox.value;
-							this.schedules.push(selectedSchedule);
-						}
+						selectedSchedule.jobName = this.model.name;
+						this.model.addJobSchedule(selectedSchedule);
 						this.populateScheduleTable();
 					}
 				});
@@ -498,7 +402,8 @@ export class JobDialog extends AgentDialog<JobData>  {
 	}

 	private populateScheduleTable() {
-		let data = this.convertSchedulesToData(this.schedules);
+		let schedules = this.model.jobSchedules ? this.model.jobSchedules : [];
+		let data = this.convertSchedulesToData(schedules);
 		if (data.length > 0) {
 			this.schedulesTable.data = data;
 			this.schedulesTable.height = 750;
@@ -661,18 +566,5 @@ 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 = [];
-		}
-		this.model.jobSteps = this.steps;
-		if (!this.model.jobSchedules) {
-			this.model.jobSchedules = [];
-		}
-		this.model.jobSchedules = this.schedules;
-		if (!this.model.alerts) {
-			this.model.alerts = [];
-		}
-		this.model.alerts = this.alerts;
 	}
 }
--- 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
@@ -121,10 +118,9 @@ export class JobStepDialog extends AgentDialog<JobStepData> {
 		server: string,
 		jobModel: JobData,
 		jobStepInfo?: sqlops.AgentJobStepInfo,
-		viaJobDialog: boolean = false
 	) {
 		super(ownerUri,
-			jobStepInfo ?  JobStepData.convertToJobStepData(jobStepInfo, jobModel) : new JobStepData(ownerUri, jobModel, viaJobDialog),
+			jobStepInfo ?  JobStepData.convertToJobStepData(jobStepInfo, jobModel) : new JobStepData(ownerUri, jobModel),
 			jobStepInfo ?  JobStepDialog.EditDialogTitle : JobStepDialog.NewDialogTitle);
 		this.stepId = jobStepInfo ?
 						jobStepInfo.id : jobModel.jobSteps ?
@@ -134,7 +130,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 +518,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
@@ -14,7 +14,6 @@ import { ProxyDialog } from './dialogs/proxyDialog';
 import { JobStepDialog } from './dialogs/jobStepDialog';
 import { PickScheduleDialog } from './dialogs/pickScheduleDialog';
 import { JobData } from './data/jobData';
-import { AgentUtils } from './agentUtils';

 const localize = nls.loadMessageBundle();

@@ -40,33 +39,28 @@ 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();
-            });
+        vscode.commands.registerCommand('agent.openNewStepDialog', (ownerUri: string, server: string, jobData: JobData, jobStepInfo: sqlops.AgentJobStepInfo) => {
+			let dialog = new JobStepDialog(ownerUri, server, jobData, jobStepInfo);
+			dialog.openDialog();
        });
        vscode.commands.registerCommand('agent.openPickScheduleDialog', (ownerUri: string, jobName: string) => {
            let dialog = new PickScheduleDialog(ownerUri, jobName);
            dialog.showDialog();
        });
-        vscode.commands.registerCommand('agent.openAlertDialog', (ownerUri: string, jobInfo: sqlops.AgentJobInfo, alertInfo: sqlops.AgentAlertInfo) => {
-            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();
-            });
+        vscode.commands.registerCommand('agent.openAlertDialog', (ownerUri: string, alertInfo: sqlops.AgentAlertInfo, jobs: string[]) => {
+            let dialog = new AlertDialog(ownerUri, alertInfo, jobs);
+            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/agent/yarn.lock
+++ b/extensions/agent/yarn.lock
@@ -5,46 +5,38 @@
 ansi-regex@^3.0.0:
  version "3.0.0"
  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=

 charenc@~0.0.1:
  version "0.0.2"
  resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
-  integrity sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=

 crypt@~0.0.1:
  version "0.0.2"
  resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
-  integrity sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=

 debug@^2.2.0:
  version "2.6.9"
  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
  dependencies:
    ms "2.0.0"

 debug@^3.1.0:
  version "3.1.0"
  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
  dependencies:
    ms "2.0.0"

 is-buffer@~1.1.1:
  version "1.1.6"
  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==

 lodash@^4.16.4:
  version "4.17.10"
  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
-  integrity sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==

 md5@^2.1.0:
  version "2.2.1"
  resolved "https://registry.yarnpkg.com/md5/-/md5-2.2.1.tgz#53ab38d5fe3c8891ba465329ea23fac0540126f9"
-  integrity sha1-U6s41f48iJG6RlMp6iP6wFQBJvk=
  dependencies:
    charenc "~0.0.1"
    crypt "~0.0.1"
@@ -53,19 +45,16 @@ md5@^2.1.0:
 minimist@0.0.8:
  version "0.0.8"
  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=

 mkdirp@~0.5.1:
  version "0.5.1"
  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
  dependencies:
    minimist "0.0.8"

 mocha-junit-reporter@^1.17.0:
  version "1.17.0"
  resolved "https://registry.yarnpkg.com/mocha-junit-reporter/-/mocha-junit-reporter-1.17.0.tgz#2e5149ed40fc5d2e3ca71e42db5ab1fec9c6d85c"
-  integrity sha1-LlFJ7UD8XS48px5C21qx/snG2Fw=
  dependencies:
    debug "^2.2.0"
    md5 "^2.1.0"
@@ -76,7 +65,6 @@ mocha-junit-reporter@^1.17.0:
 mocha-multi-reporters@^1.1.7:
  version "1.1.7"
  resolved "https://registry.yarnpkg.com/mocha-multi-reporters/-/mocha-multi-reporters-1.1.7.tgz#cc7f3f4d32f478520941d852abb64d9988587d82"
-  integrity sha1-zH8/TTL0eFIJQdhSq7ZNmYhYfYI=
  dependencies:
    debug "^3.1.0"
    lodash "^4.16.4"
@@ -84,21 +72,17 @@ mocha-multi-reporters@^1.1.7:
 ms@2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=

 strip-ansi@^4.0.0:
  version "4.0.0"
  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
  dependencies:
    ansi-regex "^3.0.0"

 vscode-nls@^3.2.1:
  version "3.2.2"
  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.2.tgz#3817eca5b985c2393de325197cf4e15eb2aa5350"
-  integrity sha512-/Ur1+tgazwd51+ncRyoy0UIu4dvMdVXS9XMUULQlZIBoNGEwOhwEx9x+hHWoUjldMrOQ32t2CGKo0u6D4R6/hg==

 xml@^1.0.0:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"
-  integrity sha1-eLpyAgApxbyHuKgaPPzXS0ovweU=
--- a/extensions/azurecore/package.json
+++ b/extensions/azurecore/package.json
@@ -125,12 +125,12 @@
 			"view/item/context": [
 				{
 					"command": "azureresource.connectsqldb",
-					"when": "viewItem =~ /^azureResource\\.itemType\\.database(?:Server){0,1}$/",
+					"when": "viewItem =~ /^azureResource.itemType.database/ && viewItem != azureResource.itemType.databaseContainer && viewItem != azureResource.itemType.databaseServerContainer",
 					"group": "1azureresource@1"
 				},
 				{
 					"command": "azureresource.connectsqldb",
-					"when": "viewItem =~ /^azureResource\\.itemType\\.database(?:Server){0,1}$/",
+					"when": "viewItem =~ /^azureResource.itemType.database/ && viewItem != azureResource.itemType.databaseContainer && viewItem != azureResource.itemType.databaseServerContainer",
 					"group": "inline"
 				},
 				{
@@ -140,14 +140,14 @@
 				},
 				{
 					"command": "azureresource.refresh",
-					"when": "viewItem =~ /^azureResource\\.itemType\\.(?:account|subscription|databaseContainer|databaseServerContainer)$/",
+					"when": "viewItem != azureResource.itemType.database && viewItem != azureResource.itemType.databaseServer && viewItem != azureResource.itemType.message",
 					"group": "inline"
 				}
 			]
 		}
 	},
 	"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
@@ -5,22 +5,18 @@
 "@types/mocha@^5.2.5":
  version "5.2.5"
  resolved "https://registry.npmjs.org/@types/mocha/-/mocha-5.2.5.tgz#8a4accfc403c124a0bafe8a9fc61a05ec1032073"
-  integrity sha512-lAVp+Kj54ui/vLUFxsJTMtWvZraZxum3w3Nwkble2dNuV5VnPA+Mi2oGX9XYJAaIvZi3tn3cbjS/qcJXRb6Bww==

 "@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"
  resolved "https://registry.npmjs.org/@types/node/-/node-8.10.30.tgz#2c82cbed5f79d72280c131d2acffa88fbd8dd353"
-  integrity sha512-Le8HGMI5gjFSBqcCuKP/wfHC19oURzkU2D+ERIescUoJd+CmNEMYBib9LQ4zj1HHEZOJQWhw2ZTnbD8weASh/Q==

 adal-node@^0.1.28:
  version "0.1.28"
  resolved "https://registry.npmjs.org/adal-node/-/adal-node-0.1.28.tgz#468c4bb3ebbd96b1270669f4b9cba4e0065ea485"
-  integrity sha1-RoxLs+u9lrEnBmn0ucuk4AZepIU=
  dependencies:
    "@types/node" "^8.0.47"
    async ">=0.6.0"
@@ -35,58 +31,69 @@ adal-node@^0.1.28:
 ajv@^5.3.0:
  version "5.5.2"
  resolved "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
-  integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=
  dependencies:
    co "^4.6.0"
    fast-deep-equal "^1.0.0"
    fast-json-stable-stringify "^2.0.0"
    json-schema-traverse "^0.3.0"

+ansi-regex@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+
+ansi-styles@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+
+asn1@0.1.11:
+  version "0.1.11"
+  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.1.11.tgz#559be18376d08a4ec4dbe80877d27818639b2df7"
+
 asn1@~0.2.3:
  version "0.2.4"
  resolved "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
-  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
  dependencies:
    safer-buffer "~2.1.0"

 assert-plus@1.0.0, assert-plus@^1.0.0:
  version "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"
-  integrity sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==
  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"

 asynckit@^0.4.0:
  version "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"
-  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=

 aws4@^1.8.0:
  version "1.8.0"
  resolved "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
-  integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==

 azure-arm-resource@^7.0.0:
  version "7.0.0"
  resolved "https://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-7.0.0.tgz#e76fe2195abe354b607346c2fa0f690544176294"
-  integrity sha512-LW1OmW49d5xQo/KDBK2BNfoFVOlP8Gq9yKqP2kz0e6RURl5UXhIfN65Y4GeJramuyGIOXeGPV+NrXrzl1k4d4g==
  dependencies:
    ms-rest "^2.3.3"
    ms-rest-azure "^2.5.5"
@@ -94,7 +101,6 @@ azure-arm-resource@^7.0.0:
 azure-arm-sql@^5.0.1:
  version "5.0.1"
  resolved "https://registry.npmjs.org/azure-arm-sql/-/azure-arm-sql-5.0.1.tgz#75c0b115525d2270ab16122d47d0c666aca175d4"
-  integrity sha512-n+c1cfCnBCGL5lOdPtCHve0Meu3vclwGEJxvMBYC6e3CjiNrI0eoaPtS3Aug4M/srVJPCNOKCTyuLj0OIc7Aww==
  dependencies:
    ms-rest "^2.3.3"
    ms-rest-azure "^2.5.5"
@@ -102,19 +108,32 @@ azure-arm-sql@^5.0.1:
 balanced-match@^1.0.0:
  version "1.0.0"
  resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=

 bcrypt-pbkdf@^1.0.0:
  version "1.0.2"
  resolved "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
-  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
  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"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
  dependencies:
    balanced-match "^1.0.0"
    concat-map "0.0.1"
@@ -122,95 +141,106 @@ brace-expansion@^1.1.7:
 browser-stdout@1.3.1:
  version "1.3.1"
  resolved "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
-  integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==

 buffer-equal-constant-time@1.0.1:
  version "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"
-  integrity sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==

 co@^4.6.0:
  version "4.6.0"
  resolved "https://registry.npmjs.org/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
-  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=

 combined-stream@1.0.6:
  version "1.0.6"
  resolved "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
-  integrity sha1-cj599ugBrFYTETp+RFqbactjKBg=
  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"

 commander@2.15.1:
  version "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"
  resolved "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
  dependencies:
    assert-plus "^1.0.0"

 date-utils@*:
  version "1.2.21"
  resolved "https://registry.npmjs.org/date-utils/-/date-utils-1.2.21.tgz#61fb16cdc1274b3c9acaaffe9fc69df8720a2b64"
-  integrity sha1-YfsWzcEnSzyayq/+n8ad+HIKK2Q=

 debug@3.1.0:
  version "3.1.0"
  resolved "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
  dependencies:
    ms "2.0.0"

 delayed-stream@~1.0.0:
  version "1.0.0"
  resolved "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=

 diff@3.5.0:
  version "3.5.0"
  resolved "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
-  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==

 duplexer@^0.1.1:
  version "0.1.1"
  resolved "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
-  integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=

 ecc-jsbn@~0.1.1:
  version "0.1.2"
  resolved "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
-  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
  dependencies:
    jsbn "~0.1.0"
    safer-buffer "^2.1.0"
@@ -218,49 +248,48 @@ ecc-jsbn@~0.1.1:
 ecdsa-sig-formatter@1.0.10:
  version "1.0.10"
  resolved "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.10.tgz#1c595000f04a8897dfb85000892a0f4c33af86c3"
-  integrity sha1-HFlQAPBKiJffuFAAiSoPTDOvhsM=
  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"
  resolved "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
-  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=

 extsprintf@^1.2.0:
  version "1.4.0"
  resolved "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
-  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=

 fast-deep-equal@^1.0.0:
  version "1.1.0"
  resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
-  integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=

 fast-json-stable-stringify@^2.0.0:
  version "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"
  resolved "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
-  integrity sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=
  dependencies:
    asynckit "^0.4.0"
    combined-stream "1.0.6"
@@ -269,19 +298,28 @@ form-data@~2.3.2:
 fs.realpath@^1.0.0:
  version "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"
-  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
  dependencies:
    assert-plus "^1.0.0"

 glob@7.1.2:
  version "7.1.2"
  resolved "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
-  integrity sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==
  dependencies:
    fs.realpath "^1.0.0"
    inflight "^1.0.4"
@@ -293,35 +331,65 @@ glob@7.1.2:
 growl@1.10.5:
  version "1.10.5"
  resolved "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
-  integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==

 har-schema@^2.0.0:
  version "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"
-  integrity sha512-+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA==
  dependencies:
    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"
-  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
  dependencies:
    assert-plus "^1.0.0"
    jsprim "^1.2.2"
@@ -330,60 +398,75 @@ http-signature@~1.2.0:
 inflight@^1.0.4:
  version "1.0.6"
  resolved "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
  dependencies:
    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"
-  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=

 is-typedarray@~1.0.0:
  version "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"
  resolved "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=

 json-schema-traverse@^0.3.0:
  version "0.3.1"
  resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
-  integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=

 json-schema@0.2.3:
  version "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"
  resolved "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
-  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
  dependencies:
    assert-plus "1.0.0"
    extsprintf "1.3.0"
@@ -393,7 +476,6 @@ jsprim@^1.2.2:
 jwa@^1.1.5:
  version "1.1.6"
  resolved "https://registry.npmjs.org/jwa/-/jwa-1.1.6.tgz#87240e76c9808dbde18783cf2264ef4929ee50e6"
-  integrity sha512-tBO/cf++BUsJkYql/kBbJroKOgHWEigTKBAjjBEmrMGYd1QMBC74Hr4Wo2zCZw6ZrVhlJPvoMrkcOnlWR/DJfw==
  dependencies:
    buffer-equal-constant-time "1.0.1"
    ecdsa-sig-formatter "1.0.10"
@@ -402,7 +484,6 @@ jwa@^1.1.5:
 jws@3.x.x:
  version "3.1.5"
  resolved "https://registry.npmjs.org/jws/-/jws-3.1.5.tgz#80d12d05b293d1e841e7cb8b4e69e561adcf834f"
-  integrity sha512-GsCSexFADNQUr8T5HPJvayTjvPIfoyJPtLQBwn5a4WZQchcrPMPMAWcC1AzJVRDKyD6ZPROPAxgv6rfHViO4uQ==
  dependencies:
    jwa "^1.1.5"
    safe-buffer "^5.0.1"
@@ -410,43 +491,36 @@ jws@3.x.x:
 lodash@^4.14.0, lodash@^4.17.10, lodash@^4.17.4:
  version "4.17.11"
  resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
-  integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==

 mime-db@~1.36.0:
  version "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"

 minimatch@3.0.4, minimatch@^3.0.4:
  version "3.0.4"
  resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
  dependencies:
    brace-expansion "^1.1.7"

 minimist@0.0.8:
  version "0.0.8"
  resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=

 mkdirp@0.5.1:
  version "0.5.1"
  resolved "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
  dependencies:
    minimist "0.0.8"

 mocha@^5.2.0:
  version "5.2.0"
  resolved "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz#6d8ae508f59167f940f2b5b3c4a612ae50c90ae6"
-  integrity sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==
  dependencies:
    browser-stdout "1.3.1"
    commander "2.15.1"
@@ -463,12 +537,10 @@ mocha@^5.2.0:
 moment@^2.21.0, moment@^2.22.2:
  version "2.22.2"
  resolved "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66"
-  integrity sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y=

 ms-rest-azure@^2.5.5:
  version "2.5.9"
  resolved "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.5.9.tgz#8599943e349c91eb367d2d1dcb885017518dc712"
-  integrity sha512-qonobzWLS7Jl6qwgTuA/SfyCtnv7olvCRKrcF8nzXSj68ds4Oj3K64ntzgQajroKa0hKVMcPUFbTk1IYMGvu8w==
  dependencies:
    adal-node "^0.1.28"
    async "2.6.0"
@@ -480,7 +552,6 @@ ms-rest-azure@^2.5.5:
 ms-rest@^2.3.2, ms-rest@^2.3.3:
  version "2.3.7"
  resolved "https://registry.npmjs.org/ms-rest/-/ms-rest-2.3.7.tgz#8bfc82fb91807643fcaa487c5fc9698cd18a018c"
-  integrity sha512-zZwuckC/Uv8F1Jr1bW+U1tsDTErWhtH6W4mpxvRrta4YrKwkFeLMt53RsaDOWTqMFsVpjNuCfznV1uxeGUF3/g==
  dependencies:
    duplexer "^0.1.1"
    is-buffer "^1.1.6"
@@ -494,54 +565,95 @@ ms-rest@^2.3.2, ms-rest@^2.3.3:
 ms@2.0.0:
  version "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"
-  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==

 once@^1.3.0:
  version "1.4.0"
  resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
  dependencies:
    wrappy "1"

 path-is-absolute@^1.0.0:
  version "1.0.1"
  resolved "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=

 performance-now@^2.1.0:
  version "2.1.0"
  resolved "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=

 postinstall-build@^5.0.1:
  version "5.0.3"
  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"
-  integrity sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ==

 punycode@^1.4.1:
  version "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"
-  integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
+  resolved "https://registry.npmjs.org/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
  dependencies:
    aws-sign2 "~0.7.0"
    aws4 "^1.8.0"
@@ -567,24 +679,20 @@ request@2.88.0, "request@>= 2.52.0", request@^2.88.0:
 safe-buffer@^5.0.1, safe-buffer@^5.1.2:
  version "5.1.2"
  resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==

 safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
  version "2.1.2"
  resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
-  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==

 should-equal@^2.0.0:
  version "2.0.0"
  resolved "https://registry.npmjs.org/should-equal/-/should-equal-2.0.0.tgz#6072cf83047360867e68e98b09d71143d04ee0c3"
-  integrity sha512-ZP36TMrK9euEuWQYBig9W55WPC7uo37qzAEmbjHz4gfyuXrEUgF8cUvQVO+w+d3OMfPvSRQJ22lSm8MQJ43LTA==
  dependencies:
    should-type "^1.4.0"

 should-format@^3.0.3:
  version "3.0.3"
  resolved "https://registry.npmjs.org/should-format/-/should-format-3.0.3.tgz#9bfc8f74fa39205c53d38c34d717303e277124f1"
-  integrity sha1-m/yPdPo5IFxT04w01xcwPidxJPE=
  dependencies:
    should-type "^1.3.0"
    should-type-adaptors "^1.0.1"
@@ -592,7 +700,6 @@ should-format@^3.0.3:
 should-type-adaptors@^1.0.1:
  version "1.1.0"
  resolved "https://registry.npmjs.org/should-type-adaptors/-/should-type-adaptors-1.1.0.tgz#401e7f33b5533033944d5cd8bf2b65027792e27a"
-  integrity sha512-JA4hdoLnN+kebEp2Vs8eBe9g7uy0zbRo+RMcU0EsNy+R+k049Ki+N5tT5Jagst2g7EAja+euFuoXFCa8vIklfA==
  dependencies:
    should-type "^1.3.0"
    should-util "^1.0.0"
@@ -600,17 +707,14 @@ should-type-adaptors@^1.0.1:
 should-type@^1.3.0, should-type@^1.4.0:
  version "1.4.0"
  resolved "https://registry.npmjs.org/should-type/-/should-type-1.4.0.tgz#0756d8ce846dfd09843a6947719dfa0d4cff5cf3"
-  integrity sha1-B1bYzoRt/QmEOmlHcZ36DUz/XPM=

 should-util@^1.0.0:
  version "1.0.0"
  resolved "https://registry.npmjs.org/should-util/-/should-util-1.0.0.tgz#c98cda374aa6b190df8ba87c9889c2b4db620063"
-  integrity sha1-yYzaN0qmsZDfi6h8mInCtNtiAGM=

 should@^13.2.1:
  version "13.2.3"
  resolved "https://registry.npmjs.org/should/-/should-13.2.3.tgz#96d8e5acf3e97b49d89b51feaa5ae8d07ef58f10"
-  integrity sha512-ggLesLtu2xp+ZxI+ysJTmNjh2U0TsC+rQ/pfED9bUZZ4DKefP27D+7YJVVTvKsmjLpIi9jAa7itwDGkDDmt1GQ==
  dependencies:
    should-equal "^2.0.0"
    should-format "^3.0.3"
@@ -618,10 +722,15 @@ 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"
-  integrity sha1-xvxhZIo9nE52T9P8306hBeSSupg=
  dependencies:
    asn1 "~0.2.3"
    assert-plus "^1.0.0"
@@ -634,22 +743,37 @@ 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"
-  integrity sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==
  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"
@@ -657,24 +781,24 @@ tough-cookie@~2.4.3:
 tunnel-agent@^0.6.0:
  version "0.6.0"
  resolved "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
  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"
-  integrity sha512-gj5sdqherx4VZKMcBA4vewER7zdK25Td+z1npBqpbDys4eJrLx+SlYjJvq1bDXs2irkuJM5pf8ktaEQVipkrbA==

 tweetnacl@^0.14.3, tweetnacl@~0.14.0:
  version "0.14.5"
  resolved "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=

 typemoq@^2.1.0:
  version "2.1.0"
  resolved "https://registry.npmjs.org/typemoq/-/typemoq-2.1.0.tgz#4452ce360d92cf2a1a180f0c29de2803f87af1e8"
-  integrity sha512-DtRNLb7x8yCTv/KHlwes+NI+aGb4Vl1iPC63Hhtcvk1DpxSAZzKWQv0RQFY0jX2Uqj0SDBNl8Na4e6MV6TNDgw==
  dependencies:
    circular-json "^0.3.1"
    lodash "^4.17.4"
@@ -683,17 +807,18 @@ typemoq@^2.1.0:
 "underscore@>= 1.3.1":
  version "1.9.1"
  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"
-  integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==

 verror@1.10.0:
  version "1.10.0"
  resolved "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
-  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
  dependencies:
    assert-plus "^1.0.0"
    core-util-is "1.0.2"
@@ -702,18 +827,19 @@ verror@1.10.0:
 vscode-nls@^4.0.0:
  version "4.0.0"
  resolved "https://registry.npmjs.org/vscode-nls/-/vscode-nls-4.0.0.tgz#4001c8a6caba5cedb23a9c5ce1090395c0e44002"
-  integrity sha512-qCfdzcH+0LgQnBpZA53bA32kzp9rpq/f66Som577ObeuDlFIrtbEJ+A/+CCxjIh4G8dpJYNCKIsxpRAHIfsbNw==

 wrappy@1:
  version "1.0.2"
  resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=

 "xmldom@>= 0.1.x":
  version "0.1.27"
  resolved "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
-  integrity sha1-1QH5ezvbQDr4757MIFcxh6rawOk=

 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/configuration-editing/yarn.lock
+++ b/extensions/configuration-editing/yarn.lock
@@ -5,14 +5,11 @@
 "@types/node@7.0.4":
  version "7.0.4"
  resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.4.tgz#9aabc135979ded383325749f508894c662948c8b"
-  integrity sha1-mqvBNZed7TgzJXSfUIiUxmKUjIs=

 jsonc-parser@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-1.0.0.tgz#ddcc864ae708e60a7a6dd36daea00172fa8d9272"
-  integrity sha1-3cyGSucI5gp6bdNtrqABcvqNknI=

 vscode-nls@^3.2.4:
  version "3.2.4"
  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398"
-  integrity sha512-FTjdqa4jDDoBjJqr36O8lmmZf/55kQ2w4ZY/+GL6K92fq765BqO3aYw21atnXUno/P04V5DWagNl4ybDIndJsw==
--- a/extensions/extension-editing/yarn.lock
+++ b/extensions/extension-editing/yarn.lock
@@ -5,41 +5,34 @@
 "@types/markdown-it@0.0.2":
  version "0.0.2"
  resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-0.0.2.tgz#5d9ad19e6e6508cdd2f2596df86fd0aade598660"
-  integrity sha1-XZrRnm5lCM3S8llt+G/Qqt5ZhmA=

 "@types/node@6.0.78", "@types/node@^6.0.46":
  version "6.0.78"
  resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.78.tgz#5d4a3f579c1524e01ee21bf474e6fba09198f470"
-  integrity sha512-+vD6E8ixntRzzZukoF3uP1iV+ZjVN3koTcaeK+BEoc/kSfGbLDIGC7RmCaUgVpUfN6cWvfczFRERCyKM9mkvXg==

 argparse@^1.0.7:
  version "1.0.9"
  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
-  integrity sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=
  dependencies:
    sprintf-js "~1.0.2"

 entities@~1.1.1:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
-  integrity sha1-blwtClYhtdra7O+AuQ7ftc13cvA=

 jsonc-parser@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-1.0.0.tgz#ddcc864ae708e60a7a6dd36daea00172fa8d9272"
-  integrity sha1-3cyGSucI5gp6bdNtrqABcvqNknI=

 linkify-it@^2.0.0:
  version "2.0.3"
  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.0.3.tgz#d94a4648f9b1c179d64fa97291268bdb6ce9434f"
-  integrity sha1-2UpGSPmxwXnWT6lykSaL22zpQ08=
  dependencies:
    uc.micro "^1.0.1"

 markdown-it@^8.3.1:
  version "8.4.0"
  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.4.0.tgz#e2400881bf171f7018ed1bd9da441dac8af6306d"
-  integrity sha512-tNuOCCfunY5v5uhcO2AUMArvKAyKMygX8tfup/JrgnsDqcCATQsAExBq7o5Ml9iMmO82bk6jYNLj6khcrl0JGA==
  dependencies:
    argparse "^1.0.7"
    entities "~1.1.1"
@@ -50,26 +43,21 @@ markdown-it@^8.3.1:
 mdurl@^1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
-  integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=

 parse5@^3.0.2:
  version "3.0.2"
  resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.2.tgz#05eff57f0ef4577fb144a79f8b9a967a6cc44510"
-  integrity sha1-Be/1fw70V3+xRKefi5qWemzERRA=
  dependencies:
    "@types/node" "^6.0.46"

 sprintf-js@~1.0.2:
  version "1.0.3"
  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=

 uc.micro@^1.0.1, uc.micro@^1.0.3:
  version "1.0.3"
  resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.3.tgz#7ed50d5e0f9a9fb0a573379259f2a77458d50192"
-  integrity sha1-ftUNXg+an7ClczeSWfKndFjVAZI=

 vscode-nls@^3.2.4:
  version "3.2.4"
  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398"
-  integrity sha512-FTjdqa4jDDoBjJqr36O8lmmZf/55kQ2w4ZY/+GL6K92fq765BqO3aYw21atnXUno/P04V5DWagNl4ybDIndJsw==
--- a/extensions/git/yarn.lock
+++ b/extensions/git/yarn.lock
@@ -5,41 +5,34 @@
 "@types/byline@4.2.31":
  version "4.2.31"
  resolved "https://registry.yarnpkg.com/@types/byline/-/byline-4.2.31.tgz#0e61fcb9c03e047d21c4496554c7116297ab60cd"
-  integrity sha1-DmH8ucA+BH0hxEllVMcRYperYM0=
  dependencies:
    "@types/node" "*"

 "@types/file-type@^5.2.1":
  version "5.2.1"
  resolved "https://registry.yarnpkg.com/@types/file-type/-/file-type-5.2.1.tgz#e7af49e08187b6b7598509c5e416669d25fa3461"
-  integrity sha512-Im0cJaIPJbbpuW91OrjXnqWPZCJK/tcFy2cFX+1qjG1gubgVZPPO9OVsTVAjotN4I1E6FAV0eIqt+rR8Y1c3iA==
  dependencies:
    "@types/node" "*"

 "@types/mocha@2.2.43":
  version "2.2.43"
  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.43.tgz#03c54589c43ad048cbcbfd63999b55d0424eec27"
-  integrity sha512-xNlAmH+lRJdUMXClMTI9Y0pRqIojdxfm7DHsIxoB2iTzu3fnPmSMEN8SsSx0cdwV36d02PWCWaDUoZPDSln+xw==

 "@types/node@*":
  version "8.0.51"
  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.51.tgz#b31d716fb8d58eeb95c068a039b9b6292817d5fb"
-  integrity sha512-El3+WJk2D/ppWNd2X05aiP5l2k4EwF7KwheknQZls+I26eSICoWRhRIJ56jGgw2dqNGQ5LtNajmBU2ajS28EvQ==

 "@types/node@7.0.43":
  version "7.0.43"
  resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c"
-  integrity sha512-7scYwwfHNppXvH/9JzakbVxk0o0QUILVk1Lv64GRaxwPuGpnF1QBiwdvhDpLcymb8BpomQL3KYoWKq3wUdDMhQ==

 "@types/which@^1.0.28":
  version "1.0.28"
  resolved "https://registry.yarnpkg.com/@types/which/-/which-1.0.28.tgz#016e387629b8817bed653fe32eab5d11279c8df6"
-  integrity sha1-AW44dim4gXvtZT/jLqtdESecjfY=

 applicationinsights@1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-1.0.1.tgz#53446b830fe8d5d619eee2a278b31d3d25030927"
-  integrity sha1-U0Rrgw/o1dYZ7uKieLMdPSUDCSc=
  dependencies:
    diagnostic-channel "0.2.0"
    diagnostic-channel-publishers "0.2.1"
@@ -48,12 +41,10 @@ applicationinsights@1.0.1:
 balanced-match@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=

 brace-expansion@^1.1.7:
  version "1.1.8"
  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292"
-  integrity sha1-wHshHHyVLsH479Uad+8NHTmQopI=
  dependencies:
    balanced-match "^1.0.0"
    concat-map "0.0.1"
@@ -61,68 +52,56 @@ brace-expansion@^1.1.7:
 browser-stdout@1.3.0:
  version "1.3.0"
  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.0.tgz#f351d32969d32fa5d7a5567154263d928ae3bd1f"
-  integrity sha1-81HTKWnTL6XXpVZxVCY9korjvR8=

 byline@^5.0.0:
  version "5.0.0"
  resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1"
-  integrity sha1-dBxSFkaOrcRXsDQQEYrXfejB3bE=

 commander@2.9.0:
  version "2.9.0"
  resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
-  integrity sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=
  dependencies:
    graceful-readlink ">= 1.0.0"

 concat-map@0.0.1:
  version "0.0.1"
  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=

 debug@2.6.8:
  version "2.6.8"
  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
-  integrity sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=
  dependencies:
    ms "2.0.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=

 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=
  dependencies:
    semver "^5.3.0"

 diff@3.2.0:
  version "3.2.0"
  resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9"
-  integrity sha1-yc45Okt8vQsFinJck98pkCeGj/k=

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

 file-type@^7.2.0:
  version "7.2.0"
  resolved "https://registry.yarnpkg.com/file-type/-/file-type-7.2.0.tgz#113cfed52e1d6959ab80248906e2f25a8cdccb74"
-  integrity sha1-ETz+1S4daVmrgCSJBuLyWozcy3Q=

 fs.realpath@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=

 glob@7.1.1:
  version "7.1.1"
  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
-  integrity sha1-gFIR3wT6rxxjo2ADBs31reULLsg=
  dependencies:
    fs.realpath "^1.0.0"
    inflight "^1.0.4"
@@ -134,32 +113,26 @@ glob@7.1.1:
 "graceful-readlink@>= 1.0.0":
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
-  integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=

 growl@1.9.2:
  version "1.9.2"
  resolved "https://registry.yarnpkg.com/growl/-/growl-1.9.2.tgz#0ea7743715db8d8de2c5ede1775e1b45ac85c02f"
-  integrity sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=

 has-flag@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
-  integrity sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=

 he@1.1.1:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
-  integrity sha1-k0EP0hsAlzUVH4howvJx80J+I/0=

 iconv-lite@0.4.19:
  version "0.4.19"
  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
-  integrity sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==

 inflight@^1.0.4:
  version "1.0.6"
  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
  dependencies:
    once "^1.3.0"
    wrappy "1"
@@ -167,27 +140,22 @@ inflight@^1.0.4:
 inherits@2:
  version "2.0.3"
  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=

 isexe@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=

 jschardet@^1.6.0:
  version "1.6.0"
  resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-1.6.0.tgz#c7d1a71edcff2839db2f9ec30fc5d5ebd3c1a678"
-  integrity sha512-xYuhvQ7I9PDJIGBWev9xm0+SMSed3ZDBAmvVjbFR1ZRLAF+vlXcQu6cRI9uAlj81rzikElRVteehwV7DuX2ZmQ==

 json3@3.3.2:
  version "3.3.2"
  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
-  integrity sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=

 lodash._baseassign@^3.0.0:
  version "3.2.0"
  resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e"
-  integrity sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=
  dependencies:
    lodash._basecopy "^3.0.0"
    lodash.keys "^3.0.0"
@@ -195,27 +163,22 @@ lodash._baseassign@^3.0.0:
 lodash._basecopy@^3.0.0:
  version "3.0.1"
  resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
-  integrity sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=

 lodash._basecreate@^3.0.0:
  version "3.0.3"
  resolved "https://registry.yarnpkg.com/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz#1bc661614daa7fc311b7d03bf16806a0213cf821"
-  integrity sha1-G8ZhYU2qf8MRt9A78WgGoCE8+CE=

 lodash._getnative@^3.0.0:
  version "3.9.1"
  resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
-  integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=

 lodash._isiterateecall@^3.0.0:
  version "3.0.9"
  resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
-  integrity sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=

 lodash.create@3.1.1:
  version "3.1.1"
  resolved "https://registry.yarnpkg.com/lodash.create/-/lodash.create-3.1.1.tgz#d7f2849f0dbda7e04682bb8cd72ab022461debe7"
-  integrity sha1-1/KEnw29p+BGgruM1yqwIkYd6+c=
  dependencies:
    lodash._baseassign "^3.0.0"
    lodash._basecreate "^3.0.0"
@@ -224,17 +187,14 @@ lodash.create@3.1.1:
 lodash.isarguments@^3.0.0:
  version "3.1.0"
  resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
-  integrity sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=

 lodash.isarray@^3.0.0:
  version "3.0.4"
  resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
-  integrity sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=

 lodash.keys@^3.0.0:
  version "3.1.2"
  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
-  integrity sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=
  dependencies:
    lodash._getnative "^3.0.0"
    lodash.isarguments "^3.0.0"
@@ -243,26 +203,22 @@ lodash.keys@^3.0.0:
 minimatch@^3.0.2:
  version "3.0.4"
  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
  dependencies:
    brace-expansion "^1.1.7"

 minimist@0.0.8:
  version "0.0.8"
  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=

 mkdirp@0.5.1:
  version "0.5.1"
  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
  dependencies:
    minimist "0.0.8"

 mocha@^3.2.0:
  version "3.5.3"
  resolved "https://registry.yarnpkg.com/mocha/-/mocha-3.5.3.tgz#1e0480fe36d2da5858d1eb6acc38418b26eaa20d"
-  integrity sha512-/6na001MJWEtYxHOV1WLfsmR4YIynkUEhBwzsb+fk2qmQ3iqsi258l/Q2MWHJMImAcNpZ8DEdYAK72NHoIQ9Eg==
  dependencies:
    browser-stdout "1.3.0"
    commander "2.9.0"
@@ -280,57 +236,47 @@ mocha@^3.2.0:
 ms@2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=

 once@^1.3.0:
  version "1.4.0"
  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
  dependencies:
    wrappy "1"

 path-is-absolute@^1.0.0:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=

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

 supports-color@3.1.2:
  version "3.1.2"
  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"
-  integrity sha1-cqJiiU2dQIuVbKBf83su2KbiotU=
  dependencies:
    has-flag "^1.0.0"

 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==
  dependencies:
    applicationinsights "1.0.1"

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

 which@^1.3.0:
  version "1.3.0"
  resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
-  integrity sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==
  dependencies:
    isexe "^2.0.0"

 wrappy@1:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=

 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=
--- a/extensions/import/README.md
+++ b/extensions/import/README.md
@@ -1,50 +1,9 @@
 # Microsoft SQL Server Import for Azure Data Studio

-Microsoft SQL Server Import for Azure Data Studio includes two wizards: 
- [Import Flat File Wizard](#import-flat-file-wizard-preview)
- [Data-tier Application Wizard.](#data-tier-application-wizard-preview)
-
-## Import Flat File Wizard *(preview)*
-**The Import Flat File Wizard** is a simple way to copy data from a flat file (.csv, .txt, .json) to a SQL Server table. Checkout below the reasons for using the Import Flat File wizard, how to find this wizard, and a simple example.
-
-This experience is currently in its initial preview. Please report issues and feature requests [here.](https://github.com/microsoft/azuredatastudio/issues)
+Microsoft SQL Server Import for Azure Data Studio is a simple way to copy data from a flat file (.csv, .txt, .json) to a SQL Server table. Checkout below the reasons for using the Import Flat File wizard, how to find this wizard, and a simple example.

 <img src="https://user-images.githubusercontent.com/30873802/43433347-c958ed28-942b-11e8-8bbc-f4f2529c3978.png" width="800px" />

- ### Requirements
- * This wizard requires an active connection to a SQL Server instance to start.
- * This wizard only works on .txt and .csv files.
-
- ### How do I start the Import Flat File wizard?
- * The main entry point for the wizard is to right click a database in the Object Explorer, and click **Import wizard**.
- * If a user is connected to a SQL Server instance, the user can also press **Ctrl**+**I** to start the wizard.
-
- ### Why would I use the Import Flat File wizard?
-This wizard was created to improve the current import experience leveraging an intelligent framework known as Program Synthesis using Examples ([PROSE](https://microsoft.github.io/prose/)). For a user without specialized domain knowledge, importing data can often be a complex, error prone, and tedious task. This wizard streamlines the import process as simple as selecting an input file and unique table name, and the PROSE framework handles the rest.
-
- PROSE analyzes data patterns in your input file to infer column names, types, delimiters, and more. This framework learns the structure of the file and does all of the hard work so users don't have to.
-
- Please note that the PROSE binary components used by this extension are licensed under the [MICROSOFT SQL TOOLS IMPORT FLAT FILE  EULA](https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/extensions/import/Microsoft_SQL_Server_Import_Extension_and_Tools_Import_Flat_File_Preview.docx).
- 
-## Data-tier Application Wizard *(preview)*
-**The Data-tier Application Wizard** provides an easy to use experience to deploy and extract .dacpac files and import and export .bacpac files. 
-
-This experience is currently in its initial preview. Please report issues and feature requests [here.](https://github.com/microsoft/azuredatastudio/issues)
-
-<img src="https://user-images.githubusercontent.com/30873802/49676289-f2df6880-fa2d-11e8-8bfa-6213b7734075.png" width="800px" />
-
- ### Requirements
- * This wizard requires an active connection to a SQL Server instance to start.
-
- ### How do I start the Data-tier Application wizard?
- * The main entry point for the wizard is to right click a database in the Object Explorer, and click **Data-tier Application wizard**.
- * If a user is connected to a SQL Server instance, the user can also start the wizard from the command palette (Ctrl+Shift+P) by searching for **Data-tier Application wizard.**
-
- ### Why would I use the Data-tier Application wizard?
- This wizard was created to add the ability to extract and deploy .dacpac files and import and export .bacpac files in Azure Data Studio.
- 
-To learn more about Data-Tier Applications and working with dacpac and bacpac files, [you can read more here.](https://docs.microsoft.com/en-us/sql/relational-databases/data-tier-applications/data-tier-applications?view=sql-server-2017)
-
 ## License

 Copyright (c) Microsoft Corporation. All rights reserved.
@@ -53,6 +12,21 @@ Licensed under the [MICROSOFT SQL SERVER IMPORT EXTENSION EULA](https://raw.gith

 > Note: Microsoft SQL Server Import for Azure Data Studio extension contains the Microsoft SQL Tools Import Flat File component which is also licensed under the above EULA.

+ ## Requirements
+ * This wizard requires an active connection to a SQL Server instance to start.
+ * This wizard only works on .txt and .csv files.
+
+ ## How do I start the Flat File Import wizard?
+ * The main entry point for the wizard is to right click a database in the Object Explorer, and click **Import wizard**.
+ * If a user is connected to a SQL Server instance, the user can also press **Ctrl**+**I** to start the wizard.
+
+ ## Why would I use the Flat File Import wizard?
+ This wizard was created to improve the current import experience leveraging an intelligent framework known as Program Synthesis using Examples ([PROSE](https://microsoft.github.io/prose/)). For a user without specialized domain knowledge, importing data can often be a complex, error prone, and tedious task. This wizard streamlines the import process as simple as selecting an input file and unique table name, and the PROSE framework handles the rest.
+
+ PROSE analyzes data patterns in your input file to infer column names, types, delimiters, and more. This framework learns the structure of the file and does all of the hard work so users don't have to.
+
+ Please note that the PROSE binary components used by this extension are licensed under the [MICROSOFT SQL TOOLS IMPORT FLAT FILE  EULA](https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/extensions/import/Microsoft_SQL_Server_Import_Extension_and_Tools_Import_Flat_File_Preview.docx).
+
 ## 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.
--- 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.2.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": [
@@ -51,23 +42,45 @@
        "mac": "ctrl+i"
      }
    ],
+    "dashboard.tabs": [
+      {
+        "id": "flat-file-import",
+        "title": "Flat File Import",
+        "description": "The flat file importer.",
+        "container": {
+          "flat-file-import-container": {}
+        }
+      }
+    ],
+    "dashboard.containers": [
+      {
+        "id": "flat-file-import-container",
+        "container": {
+          "widgets-container": [
+            {
+              "name": "Tasks",
+              "widget": {
+                "tasks-widget": [
+                  "flatFileImport.start"
+                ]
+              }
+            }
+          ]
+        }
+      }
+    ],
    "menus": {
      "objectExplorer/item/context": [
        {
          "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,252 +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(this.model.server.providerName);
-		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(this.model.server.providerName);
-		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(this.model.server.providerName);
-		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(this.model.server.providerName);
-		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'));
-		}
-	}
-
-	private static async getService(providerName: string): Promise<sqlops.DacFxServicesProvider> {
-		let service = sqlops.dataprotocol.getProvider<sqlops.DacFxServicesProvider>(providerName, sqlops.DataProviderType.DacFxServicesProvider);
-		return service;
-	}
-}
--- a/extensions/import/src/wizard/flatFileWizard.ts
+++ b/extensions/import/src/wizard/flatFileWizard.ts
@@ -31,7 +31,7 @@ export class FlatFileWizard {
 	public async start(p: any, ...args: any[]) {
 		let model = <ImportDataModel>{};

-		let profile = p ? <sqlops.IConnectionProfile>p.connectionProfile : null;
+		let profile = <sqlops.IConnectionProfile>p.connectionProfile;
 		if (profile) {
 			model.serverId = profile.id;
 			model.database = profile.databaseName;
--- 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,191 +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();
-
-		//set the database to the first dropdown value if upgrading, otherwise it should get set to the textbox value
-		if (this.model.upgradeExisting) {
-			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
@@ -5,14 +5,12 @@
 agent-base@4, agent-base@^4.1.0:
  version "4.2.1"
  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
-  integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==
  dependencies:
    es6-promisify "^5.0.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"
@@ -21,12 +19,10 @@ applicationinsights@1.0.1:
 base64-js@0.0.8:
  version "0.0.8"
  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-0.0.8.tgz#1101e9544f4a76b1bc3b26d452ca96d7a35e7978"
-  integrity sha1-EQHpVE9KdrG8OybUUsqW16NeeXg=

 bl@^1.0.0:
  version "1.2.2"
  resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.2.tgz#a160911717103c07410cef63ef51b397c025af9c"
-  integrity sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==
  dependencies:
    readable-stream "^2.3.5"
    safe-buffer "^5.1.1"
@@ -34,12 +30,10 @@ bl@^1.0.0:
 buffer-alloc-unsafe@^1.1.0:
  version "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==
  dependencies:
    buffer-alloc-unsafe "^1.1.0"
    buffer-fill "^1.0.0"
@@ -47,17 +41,14 @@ buffer-alloc@^1.2.0:
 buffer-crc32@~0.2.3:
  version "0.2.13"
  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
-  integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=

 buffer-fill@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
-  integrity sha1-+PeLdniYiO858gXNY39o5wISKyw=

 buffer@^3.0.1:
  version "3.6.0"
  resolved "https://registry.yarnpkg.com/buffer/-/buffer-3.6.0.tgz#a72c936f77b96bf52f5f7e7b467180628551defb"
-  integrity sha1-pyyTb3e5a/UvX357RnGAYoVR3vs=
  dependencies:
    base64-js "0.0.8"
    ieee754 "^1.1.4"
@@ -66,39 +57,28 @@ buffer@^3.0.1:
 commander@~2.8.1:
  version "2.8.1"
  resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
-  integrity sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=
  dependencies:
    graceful-readlink ">= 1.0.0"

 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=

-"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"
-  integrity sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ==
  dependencies:
    file-type "^5.2.0"
    is-stream "^1.1.0"
@@ -107,7 +87,6 @@ decompress-tar@^4.0.0, decompress-tar@^4.1.0, decompress-tar@^4.1.1:
 decompress-tarbz2@^4.0.0:
  version "4.1.1"
  resolved "https://registry.yarnpkg.com/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz#3082a5b880ea4043816349f378b56c516be1a39b"
-  integrity sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==
  dependencies:
    decompress-tar "^4.1.0"
    file-type "^6.1.0"
@@ -118,7 +97,6 @@ decompress-tarbz2@^4.0.0:
 decompress-targz@^4.0.0:
  version "4.1.1"
  resolved "https://registry.yarnpkg.com/decompress-targz/-/decompress-targz-4.1.1.tgz#c09bc35c4d11f3de09f2d2da53e9de23e7ce1eee"
-  integrity sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==
  dependencies:
    decompress-tar "^4.1.1"
    file-type "^5.2.0"
@@ -127,7 +105,6 @@ decompress-targz@^4.0.0:
 decompress-unzip@^4.0.1:
  version "4.0.1"
  resolved "https://registry.yarnpkg.com/decompress-unzip/-/decompress-unzip-4.0.1.tgz#deaaccdfd14aeaf85578f733ae8210f9b4848f69"
-  integrity sha1-3qrM39FK6vhVePczroIQ+bSEj2k=
  dependencies:
    file-type "^3.8.0"
    get-stream "^2.2.0"
@@ -137,7 +114,6 @@ decompress-unzip@^4.0.1:
 decompress@^4.2.0:
  version "4.2.0"
  resolved "https://registry.yarnpkg.com/decompress/-/decompress-4.2.0.tgz#7aedd85427e5a92dacfe55674a7c505e96d01f9d"
-  integrity sha1-eu3YVCflqS2s/lVnSnxQXpbQH50=
  dependencies:
    decompress-tar "^4.0.0"
    decompress-tarbz2 "^4.0.0"
@@ -150,89 +126,74 @@ 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"

 end-of-stream@^1.0.0:
  version "1.4.1"
  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
-  integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==
  dependencies:
    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"

 es6-promisify@^5.0.0:
  version "5.0.0"
  resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
-  integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=
  dependencies:
    es6-promise "^4.0.3"

 eventemitter2@^5.0.1:
  version "5.0.1"
  resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-5.0.1.tgz#6197a095d5fb6b57e8942f6fd7eaad63a09c9452"
-  integrity sha1-YZegldX7a1folC9v1+qtY6CclFI=

 fd-slicer@~1.1.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
-  integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=
  dependencies:
    pend "~1.2.0"

 file-type@^3.8.0:
  version "3.9.0"
  resolved "https://registry.yarnpkg.com/file-type/-/file-type-3.9.0.tgz#257a078384d1db8087bc449d107d52a52672b9e9"
-  integrity sha1-JXoHg4TR24CHvESdEH1SpSZyuek=

 file-type@^5.2.0:
  version "5.2.0"
  resolved "https://registry.yarnpkg.com/file-type/-/file-type-5.2.0.tgz#2ddbea7c73ffe36368dfae49dc338c058c2b8ad6"
-  integrity sha1-LdvqfHP/42No365J3DOMBYwritY=

 file-type@^6.1.0:
  version "6.2.0"
  resolved "https://registry.yarnpkg.com/file-type/-/file-type-6.2.0.tgz#e50cd75d356ffed4e306dc4f5bcf52a79903a919"
-  integrity sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==

 fs-constants@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
-  integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==

 get-stream@^2.2.0:
  version "2.3.1"
  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-2.3.1.tgz#5f38f93f346009666ee0150a054167f91bdd95de"
-  integrity sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=
  dependencies:
    object-assign "^4.0.1"
    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"

 "graceful-readlink@>= 1.0.0":
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
-  integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=

 http-proxy-agent@^2.1.0:
  version "2.1.0"
  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
-  integrity sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==
  dependencies:
    agent-base "4"
    debug "3.1.0"
@@ -240,7 +201,6 @@ http-proxy-agent@^2.1.0:
 https-proxy-agent@^2.2.1:
  version "2.2.1"
  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0"
-  integrity sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==
  dependencies:
    agent-base "^4.1.0"
    debug "^3.1.0"
@@ -248,115 +208,90 @@ https-proxy-agent@^2.2.1:
 ieee754@^1.1.4:
  version "1.1.12"
  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.12.tgz#50bf24e5b9c8bb98af4964c941cdb0918da7b60b"
-  integrity sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==

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

 is-natural-number@^4.0.1:
  version "4.0.1"
  resolved "https://registry.yarnpkg.com/is-natural-number/-/is-natural-number-4.0.1.tgz#ab9d76e1db4ced51e35de0c72ebecf09f734cde8"
-  integrity sha1-q5124dtM7VHjXeDHLr7PCfc0zeg=

 is-stream@^1.1.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=

 isarray@^1.0.0, isarray@~1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=

 make-dir@^1.0.0:
  version "1.3.0"
  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
-  integrity sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==
  dependencies:
    pify "^3.0.0"

 minimist@0.0.8:
  version "0.0.8"
  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=

 mkdirp@^0.5.1:
  version "0.5.1"
  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
  dependencies:
    minimist "0.0.8"

 ms@2.0.0:
  version "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"
-  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=

 once@^1.4.0:
  version "1.4.0"
  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
  dependencies:
    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"

 os-tmpdir@~1.0.2:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=

 pend@~1.2.0:
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
-  integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA=

 pify@^2.3.0:
  version "2.3.0"
  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
-  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=

 pify@^3.0.0:
  version "3.0.0"
  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
-  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=

 pinkie-promise@^2.0.0:
  version "2.0.1"
  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
-  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
  dependencies:
    pinkie "^2.0.0"

 pinkie@^2.0.0:
  version "2.0.4"
  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=

 process-nextick-args@~2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
-  integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==

 readable-stream@^2.3.0, readable-stream@^2.3.5:
  version "2.3.6"
  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
-  integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
  dependencies:
    core-util-is "~1.0.0"
    inherits "~2.0.3"
@@ -369,19 +304,16 @@ readable-stream@^2.3.0, readable-stream@^2.3.5:
 safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
  version "5.1.2"
  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==

 seek-bzip@^1.0.5:
  version "1.0.5"
  resolved "https://registry.yarnpkg.com/seek-bzip/-/seek-bzip-1.0.5.tgz#cfe917cb3d274bcffac792758af53173eb1fabdc"
-  integrity sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=
  dependencies:
    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==
+  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"
@@ -397,51 +329,44 @@ semver@^5.3.0:
 string_decoder@~1.1.1:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
  dependencies:
    safe-buffer "~5.1.0"

 strip-dirs@^2.0.0:
  version "2.1.0"
  resolved "https://registry.yarnpkg.com/strip-dirs/-/strip-dirs-2.1.0.tgz#4987736264fc344cf20f6c34aca9d13d1d4ed6c5"
-  integrity sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==
  dependencies:
    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"
  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:
  version "2.3.8"
  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=

 tmp@^0.0.33:
  version "0.0.33"
  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
-  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
  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"
  dependencies:
    buffer "^3.0.1"
    through "^2.3.6"
@@ -449,31 +374,26 @@ unbzip2-stream@^1.0.9:
 util-deprecate@~1.0.1:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=

 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"

 vscode-jsonrpc@3.5.0:
  version "3.5.0"
  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.5.0.tgz#87239d9e166b2d7352245b8a813597804c1d63aa"
-  integrity sha1-hyOdnhZrLXNSJFuKgTWXgEwdY6o=

 vscode-languageclient@3.5.1:
  version "3.5.1"
  resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-3.5.1.tgz#c78e582459c24e58f88020dfa34065e976186a98"
-  integrity sha512-GTQ+hSq/o4c/y6GYmyP9XNrVoIu0NFZ67KltSkqN+tO0eUNDIlrVNX+3DJzzyLhSsrctuGzuYWm3t87mNAcBmQ==
  dependencies:
    vscode-languageserver-protocol "3.5.1"

 vscode-languageserver-protocol@3.5.1:
  version "3.5.1"
  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.5.1.tgz#5144a3a9eeccbd83fe2745bd4ed75fad6cc45f0d"
-  integrity sha512-1fPDIwsAv1difCV+8daOrJEGunClNJWqnUHq/ncWrjhitKWXgGmRCjlwZ3gDUTt54yRcvXz1PXJDaRNvNH6pYA==
  dependencies:
    vscode-jsonrpc "3.5.0"
    vscode-languageserver-types "3.5.0"
@@ -481,32 +401,26 @@ vscode-languageserver-protocol@3.5.1:
 vscode-languageserver-types@3.5.0:
  version "3.5.0"
  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.5.0.tgz#e48d79962f0b8e02de955e3f524908e2b19c0374"
-  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"

 wrappy@1:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=

 xtend@^4.0.0:
  version "4.0.1"
  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
-  integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=

 yauzl@^2.4.2:
  version "2.10.0"
  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
-  integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=
  dependencies:
    buffer-crc32 "~0.2.3"
    fd-slicer "~1.1.0"

 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/json-language-features/server/yarn.lock
+++ b/extensions/json-language-features/server/yarn.lock
@@ -5,43 +5,36 @@
 "@types/mocha@2.2.33":
  version "2.2.33"
  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.33.tgz#d79a0061ec270379f4d9e225f4096fb436669def"
-  integrity sha1-15oAYewnA3n02eIl9AlvtDZmne8=

 "@types/node@7.0.43":
  version "7.0.43"
  resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c"
-  integrity sha512-7scYwwfHNppXvH/9JzakbVxk0o0QUILVk1Lv64GRaxwPuGpnF1QBiwdvhDpLcymb8BpomQL3KYoWKq3wUdDMhQ==

 agent-base@4, agent-base@^4.1.0:
  version "4.1.2"
  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.1.2.tgz#80fa6cde440f4dcf9af2617cf246099b5d99f0c8"
-  integrity sha512-VE6QoEdaugY86BohRtfGmTDabxdU5sCKOkbcPA6PXKJsRzEi/7A3RCTxJal1ft/4qSfPht5/iQLhMh/wzSkkNw==
  dependencies:
    es6-promisify "^5.0.0"

 debug@3.1.0, debug@^3.1.0:
  version "3.1.0"
  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
  dependencies:
    ms "2.0.0"

 es6-promise@^4.0.3:
  version "4.1.1"
  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.1.1.tgz#8811e90915d9a0dba36274f0b242dbda78f9c92a"
-  integrity sha512-OaU1hHjgJf+b0NzsxCg7NdIYERD6Hy/PEmFLTjw+b65scuisG3Kt4QoTvJ66BBkPZ581gr0kpoVzKnxniM8nng==

 es6-promisify@^5.0.0:
  version "5.0.0"
  resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
-  integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=
  dependencies:
    es6-promise "^4.0.3"

 http-proxy-agent@^2.1.0:
  version "2.1.0"
  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
-  integrity sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==
  dependencies:
    agent-base "4"
    debug "3.1.0"
@@ -49,7 +42,6 @@ http-proxy-agent@^2.1.0:
 https-proxy-agent@^2.2.1:
  version "2.2.1"
  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0"
-  integrity sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==
  dependencies:
    agent-base "^4.1.0"
    debug "^3.1.0"
@@ -57,17 +49,14 @@ https-proxy-agent@^2.2.1:
 jsonc-parser@^2.0.1:
  version "2.0.1"
  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.0.1.tgz#9d23cd2709714fff508a1a6679d82135bee1ae60"
-  integrity sha512-9w/QyN9qF1dTlffzkmyITa6qAYt6sDArlVZqaP+CXnRh66V73wImQGG8GIBkuas0XLAxddWEWYQ8PPFoK5KNQA==

 ms@2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=

 request-light@^0.2.3:
  version "0.2.3"
  resolved "https://registry.yarnpkg.com/request-light/-/request-light-0.2.3.tgz#a18635ec6dd92f8705c019c42ef645f684d94f7e"
-  integrity sha512-KUQTybUtB/WZl7wQGAKenEJkuUX1/DyYX6PJpNEaBVyxE4v6U4Q5P65cmjdKglzcNTGIPZG857JMEAiMWVsoIw==
  dependencies:
    http-proxy-agent "^2.1.0"
    https-proxy-agent "^2.2.1"
@@ -76,7 +65,6 @@ request-light@^0.2.3:
 vscode-json-languageservice@^3.1.4:
  version "3.1.4"
  resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.1.4.tgz#72e84e2754ad117f9e8d36876c1a66fe16234235"
-  integrity sha512-RiLEhif0MzwIscoxKZ0lL1fvKUbB1DLJcPXGCm/K9WouLbEQu1OuIBsMPp3NnK+ZOW7uMXZgGfpMtWow7YgOiQ==
  dependencies:
    jsonc-parser "^2.0.1"
    vscode-languageserver-types "^3.10.0"
@@ -86,12 +74,10 @@ vscode-json-languageservice@^3.1.4:
 vscode-jsonrpc@^3.6.2:
  version "3.6.2"
  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.2.tgz#3b5eef691159a15556ecc500e9a8a0dd143470c8"
-  integrity sha512-T24Jb5V48e4VgYliUXMnZ379ItbrXgOimweKaJshD84z+8q7ZOZjJan0MeDe+Ugb+uqERDVV8SBmemaGMSMugA==

 vscode-languageserver-protocol@^3.10.0:
  version "3.10.0"
  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.10.0.tgz#f8dcdf987687f64a26e7c32d498fc781a0e886dc"
-  integrity sha512-PNNmKM0IcQPRiY1oUIxfwseBvxS5Sa5aZUpTcq/qsXWclnl8FFNs8oCCoAtyLhBXnuJvybWUNafiA78y0unJDA==
  dependencies:
    vscode-jsonrpc "^3.6.2"
    vscode-languageserver-types "^3.10.0"
@@ -99,12 +85,10 @@ vscode-languageserver-protocol@^3.10.0:
 vscode-languageserver-types@^3.10.0:
  version "3.10.0"
  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.10.0.tgz#944e5308f3b36a3f372c766f1a344e903ec9c389"
-  integrity sha512-vxmCsVZGwq8X40SuLP8Ix7V0rq5V/7iQUjRVe2Oxm+TbmjxtjK4dpHHXQCUawjA4fhPA9FwjSRbDhbvQmYCfMw==

 vscode-languageserver@^4.4.0:
  version "4.4.0"
  resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-4.4.0.tgz#b6e8b37a739ccb629d92f3635f0099d191c856fa"
-  integrity sha512-NO4JQg286YLSdU11Fko6cke19kwSob3O0bhf6xDxIJuDhUbFy0VEPRB5ITc3riVmp13+Ki344xtqJYmqfcmCrg==
  dependencies:
    vscode-languageserver-protocol "^3.10.0"
    vscode-uri "^1.0.3"
@@ -112,14 +96,11 @@ vscode-languageserver@^4.4.0:
 vscode-nls@^3.2.2, vscode-nls@^3.2.4:
  version "3.2.4"
  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398"
-  integrity sha512-FTjdqa4jDDoBjJqr36O8lmmZf/55kQ2w4ZY/+GL6K92fq765BqO3aYw21atnXUno/P04V5DWagNl4ybDIndJsw==

 vscode-uri@^1.0.3:
  version "1.0.3"
  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.3.tgz#631bdbf716dccab0e65291a8dc25c23232085a52"
-  integrity sha1-Yxvb9xbcyrDmUpGo3CXCMjIIWlI=

 vscode-uri@^1.0.5:
  version "1.0.5"
  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.5.tgz#3b899a8ef71c37f3054d79bdbdda31c7bf36f20d"
-  integrity sha1-O4majvccN/MFTXm9vdoxx7828g0=
--- a/extensions/json-language-features/yarn.lock
+++ b/extensions/json-language-features/yarn.lock
@@ -5,12 +5,10 @@
 "@types/node@7.0.43":
  version "7.0.43"
  resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c"
-  integrity sha512-7scYwwfHNppXvH/9JzakbVxk0o0QUILVk1Lv64GRaxwPuGpnF1QBiwdvhDpLcymb8BpomQL3KYoWKq3wUdDMhQ==

 applicationinsights@1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/applicationinsights/-/applicationinsights-1.0.1.tgz#53446b830fe8d5d619eee2a278b31d3d25030927"
-  integrity sha1-U0Rrgw/o1dYZ7uKieLMdPSUDCSc=
  dependencies:
    diagnostic-channel "0.2.0"
    diagnostic-channel-publishers "0.2.1"
@@ -19,43 +17,36 @@ applicationinsights@1.0.1:
 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=

 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=
  dependencies:
    semver "^5.3.0"

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

 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==
  dependencies:
    applicationinsights "1.0.1"

 vscode-jsonrpc@^3.6.2:
  version "3.6.2"
  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.2.tgz#3b5eef691159a15556ecc500e9a8a0dd143470c8"
-  integrity sha512-T24Jb5V48e4VgYliUXMnZ379ItbrXgOimweKaJshD84z+8q7ZOZjJan0MeDe+Ugb+uqERDVV8SBmemaGMSMugA==

 vscode-languageclient@^4.4.0:
  version "4.4.0"
  resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-4.4.0.tgz#b05868f6477b6f0c9910b24daae4f3e8c4b65902"
-  integrity sha512-sXBwIcwG4W5MjnDAfXf0hM5ErOcXxEBlix6QJb5ijf0gtecYygrMAqv8hag7sEg/jCCOKQdXJ4K1iZL3GZcJZg==
  dependencies:
    vscode-languageserver-protocol "^3.10.0"

 vscode-languageserver-protocol@^3.10.0:
  version "3.10.0"
  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.10.0.tgz#f8dcdf987687f64a26e7c32d498fc781a0e886dc"
-  integrity sha512-PNNmKM0IcQPRiY1oUIxfwseBvxS5Sa5aZUpTcq/qsXWclnl8FFNs8oCCoAtyLhBXnuJvybWUNafiA78y0unJDA==
  dependencies:
    vscode-jsonrpc "^3.6.2"
    vscode-languageserver-types "^3.10.0"
@@ -63,14 +54,11 @@ vscode-languageserver-protocol@^3.10.0:
 vscode-languageserver-types@^3.10.0:
  version "3.10.0"
  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.10.0.tgz#944e5308f3b36a3f372c766f1a344e903ec9c389"
-  integrity sha512-vxmCsVZGwq8X40SuLP8Ix7V0rq5V/7iQUjRVe2Oxm+TbmjxtjK4dpHHXQCUawjA4fhPA9FwjSRbDhbvQmYCfMw==

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

 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=
--- 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/markdown-language-features/yarn.lock
+++ b/extensions/markdown-language-features/yarn.lock
--- a/extensions/merge-conflict/yarn.lock
+++ b/extensions/merge-conflict/yarn.lock
@@ -5,9 +5,7 @@
 "@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@^3.2.4:
  version "3.2.4"
  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398"
-  integrity sha512-FTjdqa4jDDoBjJqr36O8lmmZf/55kQ2w4ZY/+GL6K92fq765BqO3aYw21atnXUno/P04V5DWagNl4ybDIndJsw==
--- 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
@@ -42,18 +42,18 @@
 	"Create a new Table": {
 		"prefix": "sqlCreateTable",
 		"body": [
-			"-- Create a new table called '[${1:TableName}]' in schema '[${2:dbo}]'",
+			"-- Create a new table called '[${1:TableName}]' in schema '[${2:SchemaName}]' in database '[${3:DatabaseName}]'",
 			"-- Drop the table if it already exists",
-			"IF OBJECT_ID('[${2:dbo}].[${1:TableName}]', 'U') IS NOT NULL",
-			"DROP TABLE [${2:dbo}].[${1:TableName}]",
+			"IF OBJECT_ID('[${3:DatabaseName}].[${2:SchemaName}].[${1:TableName}]', 'U') IS NOT NULL",
+			"DROP TABLE [${3:DatabaseName}].[${2:SchemaName}].[${1:TableName}]",
 			"GO",
-			"-- Create the table in the specified schema",
-			"CREATE TABLE [${2:dbo}].[${1:TableName}]",
+			"-- Create the table in the specified database and schema",
+			"CREATE TABLE [${3:DatabaseName}].[${2:SchemaName}].[${1:TableName}]",
 			"(",
-			"\t[${3:Id}] INT NOT NULL PRIMARY KEY, -- Primary Key column",
-			"\t[${4:ColumnName2}] ${5:NVARCHAR(50)} NOT NULL,",
-			"\t[${6:ColumnName3}] ${7:NVARCHAR(50)} NOT NULL",
-			"\t$0-- Specify more columns here",
+			"\t[${4:ColumnName}]Id INT NOT NULL PRIMARY KEY, -- Primary Key column",
+			"\t[${5:ColumnName1}] [NVARCHAR](50) NOT NULL,",
+			"\t[${6:ColumnName2}] [NVARCHAR](50) NOT NULL",
+			"\t-- Specify more columns here",
 			");",
 			"GO"
 		],
@@ -64,10 +64,10 @@
 	"Drop a Table": {
 		"prefix": "sqlDropTable",
 		"body": [
-				"-- Drop a table called '${1:TableName}' in schema '${2:dbo}'",
+				"-- Drop a table called '${3:TableName}' in schema '${2:SchemaName}' in Database '${1:DatabaseName}'",
 				"-- Drop the table if it already exists",
-				"IF OBJECT_ID('[${2:dbo}].[${1:TableName}]', 'U') IS NOT NULL",
-				"DROP TABLE [${2:dbo}].[${1:TableName}]",
+				"IF OBJECT_ID('[${1:DatabaseName}].[${2:SchemaName}].[${3:TableName}]', 'U') IS NOT NULL",
+				"DROP TABLE [${1:DatabaseName}].[${2:SchemaName}].[${3:TableName}]",
 				"GO"
 		],
 		"description": "Drop a Table"
@@ -76,9 +76,9 @@
 	"Add a new column to a Table": {
 		"prefix": "sqlAddColumn",
 		"body": [
-			"-- Add a new column '[${1:NewColumnName}]' to table '[${2:TableName}]' in schema '[${3:dbo}]'",
-			"ALTER TABLE [${3:dbo}].[${2:TableName}]",
-			"\tADD [${1:NewColumnName}] /*new_column_name*/ ${4:int} /*new_column_datatype*/ ${5:NULL} /*new_column_nullability*/",
+			"-- Add a new column '[${1:NewColumnName}]' to table '[${2:TableName}]' in schema '[${3:SchemaName}]' in database '[${4:DatabaseName}]'",
+			"ALTER TABLE [${4:DatabaseName}].[${3:SchemaName}].[${2:TableName}]",
+			"\tADD [${1:NewColumnName}] /*new_column_name*/ ${5:int} /*new_column_datatype*/ ${6:NULL} /*new_column_nullability*/",
 			"GO"
 		],
 		"description": "Add a new column to a Table"
@@ -87,8 +87,8 @@
 	"Drop a column from a Table": {
 		"prefix": "sqlDropColumn",
 		"body": [
-			"-- Drop '[${1:ColumnName}]' from table '[${2:TableName}]' in schema '[${3:dbo}]'",
-			"ALTER TABLE [${3:dbo}].[${2:TableName}]",
+			"-- Drop '[${1:ColumnName}]' from table '[${2:TableName}]' in schema '[${3:SchemaName}]' in database '[${4:DatabaseName}]'",
+			"ALTER TABLE [${4:DatabaseName}].[${3:SchemaName}].[${2:TableName}]",
 			"\tDROP COLUMN [${1:ColumnName}]",
 			"GO"
 		],
@@ -98,9 +98,9 @@
 	"Select rows from a Table or a View": {
 		"prefix": "sqlSelect",
 		"body": [
-			"-- Select rows from a Table or View '[${1:TableOrViewName}]' in schema '[${2:dbo}]'",
-			"SELECT * FROM [${2:dbo}].[${1:TableOrViewName}]",
-			"WHERE ${3:/* add search conditions here */}",
+			"-- Select rows from a Table or View '[${1:TableOrViewName}]' in schema '[${2:SchemaName}]' in database '[${3:DatabaseName}]'",
+			"SELECT * FROM [${3:DatabaseName}].[${2:SchemaName}].[${1:TableOrViewName}]",
+			"WHERE ${4:/* add search conditions here */}",
 			"GO"
 		],
 		"description": "Select rows from a Table or a View"
@@ -109,17 +109,17 @@
 	"Insert rows into a Table": {
 		"prefix": "sqlInsertRows",
 		"body": [
-			"-- Insert rows into table '${1:TableName}' in schema '[${2:dbo}]'",
-			"INSERT INTO [${2:dbo}].[${1:TableName}]",
+			"-- Insert rows into table '${1:TableName}' in schema '[${2:SchemaName}]' in database '[${3:DatabaseName}]'",
+			"INSERT INTO [${3:DatabaseName}].[${2:SchemaName}].[${1:TableName}]",
 			"( -- Columns to insert data into",
-			" ${3:[ColumnName1], [ColumnName2], [ColumnName3]}",
+			" ${4:[ColumnName1], [ColumnName2], [ColumnName3]}",
 			")",
 			"VALUES",
 			"( -- First row: values for the columns in the list above",
-			" ${4:ColumnValue1, ColumnValue2, ColumnValue3}",
+			" ${5:ColumnValue1, ColumnValue2, ColumnValue3}",
 			"),",
 			"( -- Second row: values for the columns in the list above",
-			" ${5:ColumnValue1, ColumnValue2, ColumnValue3}",
+			" ${6:ColumnValue1, ColumnValue2, ColumnValue3}",
 			")",
 			"-- Add more rows here",
 			"GO"
@@ -130,9 +130,9 @@
 	"Delete rows from a Table": {
 		"prefix": "sqlDeleteRows",
 		"body": [
-			"-- Delete rows from table '[${1:TableName}]' in schema '[${2:dbo}]'",
-			"DELETE FROM [${2:dbo}].[${1:TableName}]",
-			"WHERE ${3:/* add search conditions here */}",
+			"-- Delete rows from table '[${1:TableName}]' in schema '[${2:SchemaName}]' in database '[${3:DatabaseName}]'",
+			"DELETE FROM [${3:DatabaseName}].[${2:SchemaName}].[${1:TableName}]",
+			"WHERE ${4:/* add search conditions here */}",
 			"GO"
 		],
 		"description": "Delete rows from a Table"
@@ -141,13 +141,13 @@
 	"Update rows in a Table": {
 		"prefix": "sqlUpdateRows",
 		"body": [
-			"-- Update rows in table '[${1:TableName}]' in schema '[${2:dbo}]'",
-			"UPDATE [${2:dbo}].[${1:TableName}]",
+			"-- Update rows in table '[${1:TableName}]' in schema '[${2:SchemaName}]' in database '[${3:DatabaseName}]'",
+			"UPDATE [${3:DatabaseName}].[${2:SchemaName}].[${1:TableName}]",
 			"SET",
-			"\t[${3:ColumnName1}] = ${4:ColumnValue1},",
-			"\t[${5:ColumnName2}] = ${6:ColumnValue2}",
+			"\t[${4:ColumnName1}] = ${5:ColumnValue1},",
+			"\t[${6:ColumnName2}] = ${7:ColumnValue2}",
 			"\t-- Add more columns and values here",
-			"WHERE ${7:/* add search conditions here */}",
+			"WHERE ${8:/* add search conditions here */}",
 			"GO"
 		],
 		"description": "Update rows in a Table"
@@ -156,28 +156,27 @@
 	"Create a stored procedure": {
 		"prefix": "sqlCreateStoredProc",
 		"body": [
-			"-- Create a new stored procedure called '${1:StoredProcedureName}' in schema '${2:dbo}'",
+			"-- Create a new stored procedure called '${1:StoredProcedureName}' in schema '${2:SchemaName}'",
 			"-- Drop the stored procedure if it already exists",
 			"IF EXISTS (",
 			"SELECT *",
 			"\tFROM INFORMATION_SCHEMA.ROUTINES",
-			"WHERE SPECIFIC_SCHEMA = N'${2:dbo}'",
+			"WHERE SPECIFIC_SCHEMA = N'${2:SchemaName}'",
 			"\tAND SPECIFIC_NAME = N'${1:StoredProcedureName}'",
-			"\tAND ROUTINE_TYPE = N'PROCEDURE'"
 			")",
-			"DROP PROCEDURE ${2:dbo}.${1:StoredProcedureName}",
+			"DROP PROCEDURE ${2:SchemaName}.${1:StoredProcedureName}",
 			"GO",
 			"-- Create the stored procedure in the specified schema",
-			"CREATE PROCEDURE ${2:dbo}.${1:StoredProcedureName}",
-			"\t$3@param1 /*parameter name*/ $4int /*datatype_for_param1*/ = 0, /*default_value_for_param1*/",
-			"\t$5@param2 /*parameter name*/ $6int /*datatype_for_param1*/ = 0 /*default_value_for_param2*/",
+			"CREATE PROCEDURE ${2:SchemaName}.${1:StoredProcedureName}",
+			"\t$3@param1 /*parameter name*/ int /*datatype_for_param1*/ = 0, /*default_value_for_param1*/",
+			"\t$4@param2 /*parameter name*/ int /*datatype_for_param1*/ = 0 /*default_value_for_param2*/",
 			"-- add more stored procedure parameters here",
 			"AS",
 			"\t-- body of the stored procedure",
 			"\tSELECT @param1, @param2",
 			"GO",
 			"-- example to execute the stored procedure we just created",
-			"EXECUTE ${2:dbo}.${1:StoredProcedureName} 1 /*value_for_param1*/, 2 /*value_for_param2*/",
+			"EXECUTE ${2:SchemaName}.${1:StoredProcedureName} 1 /*value_for_param1*/, 2 /*value_for_param2*/",
 			"GO"
 		],
 		"description": "Create a stored procedure"
@@ -186,14 +185,14 @@
 	"Drop a stored procedure": {
 		"prefix": "sqlDropStoredProc",
 		"body": [
-			"-- Drop the stored procedure called '${1:StoredProcedureName}' in schema '${2:dbo}'",
+			"-- Drop the stored procedure called '${1:StoredProcedureName}' in schema '${2:SchemaName}'",
 			"IF EXISTS (",
 			"SELECT *",
 			"\tFROM INFORMATION_SCHEMA.ROUTINES",
-			"WHERE SPECIFIC_SCHEMA = N'${2:dbo}'",
+			"WHERE SPECIFIC_SCHEMA = N'${2:SchemaName}'",
 			"\tAND SPECIFIC_NAME = N'${1:StoredProcedureName}'",
 			")",
-			"DROP PROCEDURE ${2:dbo}.${1:StoredProcedureName}",
+			"DROP PROCEDURE ${2:SchemaName}.${1:StoredProcedureName}",
 			"GO"
 		],
 		"description": "Drop a stored procedure"
@@ -242,7 +241,7 @@
 	"Declare a cursor": {
 		"prefix": "sqlCursor",
 		"body": [
-			"-- Declare a cursor for a Table or a View '${1:TableOrViewName}' in schema '${2:dbo}'",
+			"-- Declare a cursor for a Table or a View '${1:TableOrViewName}' in schema '${2:SchemaName}'",
 			"DECLARE @ColumnName1 NVARCHAR(50), @ColumnName2 NVARCHAR(50)",
 			"",
 			"DECLARE db_cursor CURSOR FOR",
@@ -305,8 +304,8 @@
 		"prefix": "sqlCreateIndex",
 		"body": [
 			"-- Create a nonclustered index with or without a unique constraint",
-			"-- Or create a clustered index on table '[${1:TableName}]' in schema '[${2:dbo}]' in database '[${3:DatabaseName}]'",
-			"CREATE ${5:/*UNIQUE or CLUSTERED*/} INDEX IX_${4:IndexName} ON [${3:DatabaseName}].[${2:dbo}].[${1:TableName}] ([${6:ColumnName1}] DESC /*Change sort order as needed*/",
+			"-- Or create a clustered index on table '[${1:TableName}]' in schema '[${2:SchemaName}]' in database '[${3:DatabaseName}]'",
+			"CREATE ${5:/*UNIQUE or CLUSTERED*/} INDEX IX_${4:IndexName} ON [${3:DatabaseName}].[${2:SchemaName}].[${1:TableName}] ([${6:ColumnName1}] DESC /*Change sort order as needed*/",
 			"GO"
 		],
 		"description": "Create a new Index"
@@ -320,13 +319,13 @@
 			"IF OBJECT_ID('tempDB..#${1:TableName}', 'U') IS NOT NULL",
 			"DROP TABLE #${1:TableName}",
 			"GO",
-			"-- Create the temporary table from a physical table called '${4:TableName}' in schema '${3:dbo}' in database '${2:DatabaseName}'",
+			"-- Create the temporary table from a physical table called '${4:TableName}' in schema '${3:SchemaName}' in database '${2:DatabaseName}'",
 			"SELECT *",
 			"INTO #${1:TableName}",
-			"FROM [${2:DatabaseName}].[${3:[dbo}].[${4:TableName}]",
+			"FROM [${2:DatabaseName}].[${3:[SchemaName}].[${4:TableName}]",
 			"WHERE ${5:/* add search conditions here */}"
 		],
 		"description": "Create a new Temporary Table"
-	}
+	},

 }
--- 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.48",
 	"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
@@ -5,14 +5,12 @@
 agent-base@4, agent-base@^4.1.0:
  version "4.2.1"
  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
-  integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==
  dependencies:
    es6-promisify "^5.0.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=
  dependencies:
    diagnostic-channel "0.2.0"
    diagnostic-channel-publishers "0.2.1"
@@ -21,12 +19,10 @@ applicationinsights@1.0.1:
 base64-js@0.0.8:
  version "0.0.8"
  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-0.0.8.tgz#1101e9544f4a76b1bc3b26d452ca96d7a35e7978"
-  integrity sha1-EQHpVE9KdrG8OybUUsqW16NeeXg=

 bl@^1.0.0:
  version "1.2.2"
  resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.2.tgz#a160911717103c07410cef63ef51b397c025af9c"
-  integrity sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==
  dependencies:
    readable-stream "^2.3.5"
    safe-buffer "^5.1.1"
@@ -34,12 +30,10 @@ bl@^1.0.0:
 buffer-alloc-unsafe@^1.1.0:
  version "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==
  dependencies:
    buffer-alloc-unsafe "^1.1.0"
    buffer-fill "^1.0.0"
@@ -47,17 +41,14 @@ buffer-alloc@^1.2.0:
 buffer-crc32@~0.2.3:
  version "0.2.13"
  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
-  integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=

 buffer-fill@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
-  integrity sha1-+PeLdniYiO858gXNY39o5wISKyw=

 buffer@^3.0.1:
  version "3.6.0"
  resolved "https://registry.yarnpkg.com/buffer/-/buffer-3.6.0.tgz#a72c936f77b96bf52f5f7e7b467180628551defb"
-  integrity sha1-pyyTb3e5a/UvX357RnGAYoVR3vs=
  dependencies:
    base64-js "0.0.8"
    ieee754 "^1.1.4"
@@ -66,39 +57,28 @@ buffer@^3.0.1:
 commander@~2.8.1:
  version "2.8.1"
  resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
-  integrity sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=
  dependencies:
    graceful-readlink ">= 1.0.0"

 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=

-"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"
-  integrity sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ==
  dependencies:
    file-type "^5.2.0"
    is-stream "^1.1.0"
@@ -107,7 +87,6 @@ decompress-tar@^4.0.0, decompress-tar@^4.1.0, decompress-tar@^4.1.1:
 decompress-tarbz2@^4.0.0:
  version "4.1.1"
  resolved "https://registry.yarnpkg.com/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz#3082a5b880ea4043816349f378b56c516be1a39b"
-  integrity sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==
  dependencies:
    decompress-tar "^4.1.0"
    file-type "^6.1.0"
@@ -118,7 +97,6 @@ decompress-tarbz2@^4.0.0:
 decompress-targz@^4.0.0:
  version "4.1.1"
  resolved "https://registry.yarnpkg.com/decompress-targz/-/decompress-targz-4.1.1.tgz#c09bc35c4d11f3de09f2d2da53e9de23e7ce1eee"
-  integrity sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==
  dependencies:
    decompress-tar "^4.1.1"
    file-type "^5.2.0"
@@ -127,7 +105,6 @@ decompress-targz@^4.0.0:
 decompress-unzip@^4.0.1:
  version "4.0.1"
  resolved "https://registry.yarnpkg.com/decompress-unzip/-/decompress-unzip-4.0.1.tgz#deaaccdfd14aeaf85578f733ae8210f9b4848f69"
-  integrity sha1-3qrM39FK6vhVePczroIQ+bSEj2k=
  dependencies:
    file-type "^3.8.0"
    get-stream "^2.2.0"
@@ -137,7 +114,6 @@ decompress-unzip@^4.0.1:
 decompress@^4.2.0:
  version "4.2.0"
  resolved "https://registry.yarnpkg.com/decompress/-/decompress-4.2.0.tgz#7aedd85427e5a92dacfe55674a7c505e96d01f9d"
-  integrity sha1-eu3YVCflqS2s/lVnSnxQXpbQH50=
  dependencies:
    decompress-tar "^4.0.0"
    decompress-tarbz2 "^4.0.0"
@@ -151,88 +127,73 @@ 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=

 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=
  dependencies:
    semver "^5.3.0"

 end-of-stream@^1.0.0:
  version "1.4.1"
  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
-  integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==
  dependencies:
    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"

 es6-promisify@^5.0.0:
  version "5.0.0"
  resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
-  integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=
  dependencies:
    es6-promise "^4.0.3"

 eventemitter2@^5.0.1:
  version "5.0.1"
  resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-5.0.1.tgz#6197a095d5fb6b57e8942f6fd7eaad63a09c9452"
-  integrity sha1-YZegldX7a1folC9v1+qtY6CclFI=

 fd-slicer@~1.1.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
-  integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=
  dependencies:
    pend "~1.2.0"

 file-type@^3.8.0:
  version "3.9.0"
  resolved "https://registry.yarnpkg.com/file-type/-/file-type-3.9.0.tgz#257a078384d1db8087bc449d107d52a52672b9e9"
-  integrity sha1-JXoHg4TR24CHvESdEH1SpSZyuek=

 file-type@^5.2.0:
  version "5.2.0"
  resolved "https://registry.yarnpkg.com/file-type/-/file-type-5.2.0.tgz#2ddbea7c73ffe36368dfae49dc338c058c2b8ad6"
-  integrity sha1-LdvqfHP/42No365J3DOMBYwritY=

 file-type@^6.1.0:
  version "6.2.0"
  resolved "https://registry.yarnpkg.com/file-type/-/file-type-6.2.0.tgz#e50cd75d356ffed4e306dc4f5bcf52a79903a919"
-  integrity sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==

 fs-constants@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
-  integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==

 get-stream@^2.2.0:
  version "2.3.1"
  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-2.3.1.tgz#5f38f93f346009666ee0150a054167f91bdd95de"
-  integrity sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=
  dependencies:
    object-assign "^4.0.1"
    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"

 "graceful-readlink@>= 1.0.0":
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
-  integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=

 http-proxy-agent@^2.1.0:
  version "2.1.0"
  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
-  integrity sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==
  dependencies:
    agent-base "4"
    debug "3.1.0"
@@ -240,7 +201,6 @@ http-proxy-agent@^2.1.0:
 https-proxy-agent@^2.2.1:
  version "2.2.1"
  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0"
-  integrity sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==
  dependencies:
    agent-base "^4.1.0"
    debug "^3.1.0"
@@ -248,115 +208,90 @@ https-proxy-agent@^2.2.1:
 ieee754@^1.1.4:
  version "1.1.12"
  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.12.tgz#50bf24e5b9c8bb98af4964c941cdb0918da7b60b"
-  integrity sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==

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

 is-natural-number@^4.0.1:
  version "4.0.1"
  resolved "https://registry.yarnpkg.com/is-natural-number/-/is-natural-number-4.0.1.tgz#ab9d76e1db4ced51e35de0c72ebecf09f734cde8"
-  integrity sha1-q5124dtM7VHjXeDHLr7PCfc0zeg=

 is-stream@^1.1.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=

 isarray@^1.0.0, isarray@~1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=

 make-dir@^1.0.0:
  version "1.3.0"
  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
-  integrity sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==
  dependencies:
    pify "^3.0.0"

 minimist@0.0.8:
  version "0.0.8"
  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=

 mkdirp@^0.5.1:
  version "0.5.1"
  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
  dependencies:
    minimist "0.0.8"

 ms@2.0.0:
  version "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"
-  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=

 once@^1.4.0:
  version "1.4.0"
  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
  dependencies:
    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"

 os-tmpdir@~1.0.2:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=

 pend@~1.2.0:
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
-  integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA=

 pify@^2.3.0:
  version "2.3.0"
  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
-  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=

 pify@^3.0.0:
  version "3.0.0"
  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
-  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=

 pinkie-promise@^2.0.0:
  version "2.0.1"
  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
-  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
  dependencies:
    pinkie "^2.0.0"

 pinkie@^2.0.0:
  version "2.0.4"
  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=

 process-nextick-args@~2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
-  integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==

 readable-stream@^2.3.0, readable-stream@^2.3.5:
  version "2.3.6"
  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
-  integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
  dependencies:
    core-util-is "~1.0.0"
    inherits "~2.0.3"
@@ -369,19 +304,16 @@ readable-stream@^2.3.0, readable-stream@^2.3.5:
 safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
  version "5.1.2"
  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==

 seek-bzip@^1.0.5:
  version "1.0.5"
  resolved "https://registry.yarnpkg.com/seek-bzip/-/seek-bzip-1.0.5.tgz#cfe917cb3d274bcffac792758af53173eb1fabdc"
-  integrity sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=
  dependencies:
    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"

 "service-downloader@github:anthonydresser/service-downloader#0.1.5":
  version "0.1.5"
@@ -397,51 +329,44 @@ semver@^5.3.0:
 string_decoder@~1.1.1:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
  dependencies:
    safe-buffer "~5.1.0"

 strip-dirs@^2.0.0:
  version "2.1.0"
  resolved "https://registry.yarnpkg.com/strip-dirs/-/strip-dirs-2.1.0.tgz#4987736264fc344cf20f6c34aca9d13d1d4ed6c5"
-  integrity sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==
  dependencies:
    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"
  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:
  version "2.3.8"
  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=

 tmp@^0.0.33:
  version "0.0.33"
  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
-  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
  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"
  dependencies:
    buffer "^3.0.1"
    through "^2.3.6"
@@ -449,31 +374,26 @@ unbzip2-stream@^1.0.9:
 util-deprecate@~1.0.1:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=

 vscode-extension-telemetry@^0.0.15:
  version "0.0.15"
  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.15.tgz#685c32f3b67e8fb85ba689c1d7f88ff90ff87856"
-  integrity sha512-Yf6dL9r2x2GISI1xh22XsAaydSTQG/4aBitu8sGBwGr42n2TyOsIXGtXSDgqQBNZgYD6+P1EHqrrzetn9ekWTQ==
  dependencies:
    applicationinsights "1.0.1"

 vscode-jsonrpc@3.5.0:
  version "3.5.0"
  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.5.0.tgz#87239d9e166b2d7352245b8a813597804c1d63aa"
-  integrity sha1-hyOdnhZrLXNSJFuKgTWXgEwdY6o=

 vscode-languageclient@3.5.1:
  version "3.5.1"
  resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-3.5.1.tgz#c78e582459c24e58f88020dfa34065e976186a98"
-  integrity sha512-GTQ+hSq/o4c/y6GYmyP9XNrVoIu0NFZ67KltSkqN+tO0eUNDIlrVNX+3DJzzyLhSsrctuGzuYWm3t87mNAcBmQ==
  dependencies:
    vscode-languageserver-protocol "3.5.1"

 vscode-languageserver-protocol@3.5.1:
  version "3.5.1"
  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.5.1.tgz#5144a3a9eeccbd83fe2745bd4ed75fad6cc45f0d"
-  integrity sha512-1fPDIwsAv1difCV+8daOrJEGunClNJWqnUHq/ncWrjhitKWXgGmRCjlwZ3gDUTt54yRcvXz1PXJDaRNvNH6pYA==
  dependencies:
    vscode-jsonrpc "3.5.0"
    vscode-languageserver-types "3.5.0"
@@ -481,22 +401,18 @@ vscode-languageserver-protocol@3.5.1:
 vscode-languageserver-types@3.5.0:
  version "3.5.0"
  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.5.0.tgz#e48d79962f0b8e02de955e3f524908e2b19c0374"
-  integrity sha1-5I15li8LjgLelV4/UkkI4rGcA3Q=

 wrappy@1:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=

 xtend@^4.0.0:
  version "4.0.1"
  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
-  integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=

 yauzl@^2.4.2:
  version "2.10.0"
  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
-  integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=
  dependencies:
    buffer-crc32 "~0.2.3"
    fd-slicer "~1.1.0"
@@ -504,4 +420,3 @@ 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=
--- 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.2.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/profiler/yarn.lock
+++ b/extensions/profiler/yarn.lock
--- a/extensions/search-rg/yarn.lock
+++ b/extensions/search-rg/yarn.lock
--- 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
@@ -4,71 +4,67 @@
 	"type": "dark",
 	"colors": {

-		// base
-		"foreground": "#fffffe",
-		"focusBorder": "#0078d7",
+        // base
+        "foreground": "#fffffe",
+        "focusBorder": "#0E639C",
 		"selection.background": "#3062d6",

-		//text colors
-		"textLinkForeground": "#30b4ff",
-		"textLinkActiveForeground": "#30b4ff",
+        //text colors
+        "textLinkForeground": "#30B4FF",
+        "textLinkActiveForeground": "#30B4FF",

-		//Button control
-		"button.background": "#0078d7cc",
-		"button.foreground": "#ffffff",
-		"button.hoverBackground": "#0078d7",
+        //Button control
+        "button.background": "#00BCF2",
+        "button.foreground": "#212121",
+        "button.hoverBackground": "#0099BC",

-		// TODO add support for these
-		// "button.secondaryBackground": "#c8c8c8",
-		// "button.secondaryHoverBackground": "#a6a6a6",
-		// "button.secondaryForeground": "#333333",
-		// "button.disabledBackground": "#444444" ,
-		// "button.disabledForeground": "#888888" ,
+        // TODO add support for these
+        // "button.secondaryBackground": "#c8c8c8",
+        // "button.secondaryHoverBackground": "#a6a6a6",
+        // "button.secondaryForeground": "#333333",
+        // "button.disabledBackground": "#444444" ,
+        // "button.disabledForeground": "#888888" ,

-		//Checkbox
-		"checkbox.disabled.foreground": "#888888",
+        //Dropdown Control
+        "dropdown.background": "#212121",
+        "dropdown.foreground": "#fffffe",
+        "dropdown.border": "#888888",

-		//Dropdown Control
-		"dropdown.background": "#212121",
-		"dropdown.foreground": "#fffffe",
-		"dropdown.border": "#888888",
-
-		//Input Control
-		"input.background": "#212121",
+        //Input Control
+        "input.background": "#212121",
 		"input.border": "#888888",
 		"input.disabled.background": "#444444",
 		"input.disabled.foreground": "#888888",
-		"inputOption.activeBorder": "#0078d7",
-		"input.placeholderForeground": "#888888",
-		"inputValidation.errorBackground": "#b62e00",
-		"inputValidation.errorBorder": "#b62e00",
+        "inputOption.activeBorder": "#007ACC",
+        "input.placeholderForeground": "#888888",
+        "inputValidation.errorBackground": "#D02E00",
+        "inputValidation.errorBorder": "#D02E00",

-		//List and trees
-		"list.activeSelectionBackground": "#3062d6",
-		"list.hoverBackground": "#444444",
-		"pickerGroup.border": "#0078d7",
+        //List and trees
+        "list.activeSelectionBackground": "#3062d6",
+        "list.hoverBackground": "#444444",
+		"pickerGroup.border": "#00BCF2",
 		"activityBar.background": "#444444",
 		"sideBar.background": "#333333",
-		"sideBarTitle.foreground": "#bbbbbb",
-		"input.placeholderForeground": "#a6a6a6",
-		"editorGroupHeader.tabsBackground": "#444444",
-		"editor.background": "#212121",
-		"editor.foreground": "#ffffff",
-		"editorWidget.background": "#444444",
-		"editorLink.activeForeground": "#30b4ff",
-		"editorGroup.border": "#333333",
-		"editorGroup.background": "#212121",
-		"editorIndentGuide.activeBackground": "#707070",
-		"tab.activeBackground": "#212121",
-		"tab.activeForeground": "#ffffff",
-		"tab.inactiveBackground": "#444444",
-		"tab.inactiveForeground": "#b6b6b6",
+		"sideBarTitle.foreground": "#BBBBBB",
+		"input.placeholderForeground": "#A6A6A6",
+        "editorGroupHeader.tabsBackground": "#444444",
+        "editor.background": "#212121",
+        "editor.foreground": "#ffffff",
+        "editorWidget.background": "#444444",
+        "editorLink.activeForeground": "#30B4FF",
+        "editorGroup.border": "#333333",
+        "editorGroup.background": "#212121",
+        "editorIndentGuide.activeBackground": "#707070",
+        "tab.activeBackground": "#212121",
+        "tab.activeForeground": "#ffffff",
+        "tab.inactiveBackground": "#444444",
+        "tab.inactiveForeground": "#b6b6b6",
 		"tab.border": "#3c3c3c",
-		"panel.background": "#212121",
-		"panel.border": "#515151",
-		"panelTitle.activeForeground": "#ffffff",
-		"panelTitle.inactiveForeground": "#888888",
-		"panelTitle.activeBorder": "#026dc8"
+        "panel.background": "#212121",
+        "panel.border": "#515151",
+        "panelTitle.activeForeground": "#ffffff",
+		"panelTitle.inactiveForeground": "#888888"
 	},
 	"tokenColors": [
 		{
--- a/extensions/theme-carbon/themes/light_carbon.json
+++ b/extensions/theme-carbon/themes/light_carbon.json
@@ -5,18 +5,18 @@
 	"colors": {
 		// base
 		"foreground": "#4a4a4a",
-		"focusBorder": "#0078d7",
-		"selection.background": "#c9d0d9",
+		"focusBorder": "#00BCF2",
+		"selection.background": "#C9D0D9",
 		"widget.shadow": "#666666",

 		// text colors
-		"textLinkForeground": "#3062d6",
-		"textLinkActiveForeground": "#3062d6",
+		"textLinkForeground": "#3062D6",
+		"textLinkActiveForeground": "#3062D6",

 		//Button control
-		"button.background": "#0078d7cc",
-		"button.foreground": "#ffffff",
-		"button.hoverBackground": "#0078d7",
+		"button.background": "#00BCF2",
+		"button.foreground": "#212121",
+		"button.hoverBackground": "#0099BC",

 		// TODO add support for these
 		// "button.secondaryBackground": "#c8c8c8",
@@ -25,38 +25,35 @@
 		// "button.disabledBackground": "#eaeaea",
 		// "button.disabledForeground": "#888888",

-		//Checkbox
-		"checkbox.disabled.foreground": "#888888",
-
 		//Dropdown Control
-		"dropdown.background": "#ffffff",
+		"dropdown.background": "#fffffe",
 		"dropdown.foreground": "#4a4a4a",
-		"dropdown.border": "#c8c8c8",
+		"dropdown.border": "#C8C8C8",

 		//badge
 		"badge.background": "#777777",
 		"badge.foreground": "#ffffff",

 		//Input Control
-		"input.background": "#ffffff",
+		"input.background": "#fffffe",
 		"input.border": "#c8c8c8",
 		"input.disabled.background": "#dcdcdc",
 		"input.disabled.foreground": "#888888",
 		"inputOption.activeBorder": "#666666",
 		"input.placeholderForeground": "#767676",
 		"inputValidation.errorBackground": "#ffeaea",
-		"inputValidation.errorBorder": "#b62e00",
+		"inputValidation.errorBorder": "#f1897f",

 		//List and tree
 		"list.activeSelectionBackground": "#3062d6",
 		"list.hoverBackground": "#dcdcdc",
-		"pickerGroup.border": "#0078d7",
+		"pickerGroup.border": "#00BCF2",

 		// Workbench: Activity Bar
 		"activityBar.background": "#212121",

 		// Workbench: Side Bar
-		"sideBar.background": "#eaeaea",
+		"sideBar.background": "#EAEAEA",
 		"editorGroupHeader.tabsBackground": "#f4f4f4",
 		"editor.background": "#fffffe",
 		"editor.foreground": "#212121",
@@ -67,18 +64,17 @@
 		"editorIndentGuide.activeBackground": "#939393",

 		// Workbench: Tabs
-		"tab.activeBackground": "#ffffff",
-		"tab.activeForeground": "#4a4a4a",
+		"tab.activeBackground": "#FFFFFE",
+		"tab.activeForeground": "#4A4A4A",
 		"tab.inactiveBackground": "#f4f4f4",
 		"tab.inactiveForeground": "#707070",
-		"tab.border": "#eaeaea",
+		"tab.border": "#EAEAEA",
 		"tab.unfocusedInactiveForeground": "#888888",
 		"tab.unfocusedActiveForeground": "#212121",
-		"panel.background": "#ffffff",
-		"panel.border": "#c8c8c8",
+		"panel.background": "#FFFFFE",
+		"panel.border": "#C8C8C8",
 		"panelTitle.activeForeground": "#212121",
-		"panelTitle.inactiveForeground": "#757575",
-		"panelTitle.activeBorder": "#026dc8"
+		"panelTitle.inactiveForeground": "#757575"
 	},
 	"tokenColors": [
 		{
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Anthony Dresser	5d63905056	Rework timeSeries in chart viewer (#2987 ) * rework timeSeries in chart viewer * rework important to fix tests	2018-10-29 13:12:49 -07:00
Karl Burtram	cb224fbc74	Update Azure Data Studio to 1.1.4	2018-10-29 12:05:16 -07:00
Karl Burtram	067846099b	Format JSON and XML output when clicking resultgrid link (#3024 )	2018-10-29 12:04:00 -07:00
Karl Burtram	0e14908360	Merge `98d06b2892`	2018-10-29 12:00:03 -07:00
Anthony Dresser	27735dd68b	Clean up result tab better (#3015 ) * do a better job cleaning up results tab * formatting	2018-10-29 11:54:42 -07:00
Anthony Dresser	a8eaf28884	Fix time series (#2985 ) * fix time series type string * remove unused code	2018-10-29 11:54:32 -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>