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-22 18:47:03 -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
92 changed files with 742 additions and 5656 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,21 +1,5 @@
 # Change Log
 ## 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
@@ -4,16 +4,16 @@
 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=2030731
+Windows Setup Installer | https://go.microsoft.com/fwlink/?linkid=2024683
-Windows ZIP | https://go.microsoft.com/fwlink/?linkid=2030736
+Windows ZIP | https://go.microsoft.com/fwlink/?linkid=2024680
-macOS ZIP | https://go.microsoft.com/fwlink/?linkid=2030738
+macOS ZIP | https://go.microsoft.com/fwlink/?linkid=2024677
-Linux TAR.GZ | https://go.microsoft.com/fwlink/?linkid=2030741
+Linux TAR.GZ | https://go.microsoft.com/fwlink/?linkid=2024675
-Linux RPM | https://go.microsoft.com/fwlink/?linkid=2030746
+Linux RPM | https://go.microsoft.com/fwlink/?linkid=2024672
-Linux DEB | https://go.microsoft.com/fwlink/?linkid=2030750
+Linux DEB | https://go.microsoft.com/fwlink/?linkid=2024668
 Go to our [download page](https://aka.ms/azuredatastudio) for more specific instructions.
@@ -61,10 +61,6 @@ The [Microsoft Enterprise and Developer Privacy Statement](https://privacy.micro
 ## Contributions and "Thank You"
 We would like to thank all our users who raised issues, and in particular the following users who helped contribute fixes:
 * 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`
--- a/build/lib/watch/yarn.lock
+++ b/build/lib/watch/yarn.lock
--- a/build/yarn.lock
+++ b/build/yarn.lock
--- 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.34.0",
+  "version": "0.33.0",
  "publisher": "Microsoft",
  "preview": true,
  "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt",
--- 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,7 +140,7 @@
 				},
 				{
 					"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"
 				}
 			]
--- a/extensions/azurecore/yarn.lock
+++ b/extensions/azurecore/yarn.lock
@@ -5,7 +5,6 @@
 "@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"
@@ -14,12 +13,10 @@
 "@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"
@@ -34,7 +31,6 @@ 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"
@@ -56,14 +52,12 @@ asn1@0.1.11:
 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"
@@ -72,7 +66,6 @@ assert-plus@^0.1.5:
 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"
@@ -85,7 +78,6 @@ async@>=0.6.0, async@^2.0.1:
 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"
@@ -94,17 +86,14 @@ aws-sign2@~0.5.0:
 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"
@@ -112,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"
@@ -120,12 +108,10 @@ 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"
@@ -148,7 +134,6 @@ boom@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"
@@ -156,12 +141,10 @@ 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"
@@ -170,7 +153,6 @@ caseless@~0.11.0:
 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"
@@ -185,17 +167,14 @@ chalk@^1.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"
@@ -208,7 +187,6 @@ combined-stream@^1.0.5, combined-stream@~1.0.1, combined-stream@~1.0.6:
 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"
@@ -217,7 +195,6 @@ commander@^2.8.1:
 concat-map@0.0.1:
  version "0.0.1"
  resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 core-util-is@1.0.2, core-util-is@~1.0.0:
  version "1.0.2"
@@ -236,41 +213,34 @@ ctype@0.5.3:
 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"
@@ -278,7 +248,6 @@ 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"
@@ -293,22 +262,18 @@ extend@~3.0.0, extend@~3.0.2:
 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.0, forever-agent@~0.6.1:
  version "0.6.1"
@@ -325,7 +290,6 @@ form-data@~1.0.0-rc1:
 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"
@@ -334,7 +298,6 @@ 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"
@@ -351,14 +314,12 @@ generate-object-property@^1.1.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"
@@ -370,12 +331,10 @@ 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"
@@ -389,7 +348,6 @@ har-validator@^1.6.1:
 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"
@@ -403,7 +361,6 @@ has-ansi@^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"
@@ -417,7 +374,6 @@ hawk@~3.1.0:
 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"
@@ -434,7 +390,6 @@ http-signature@~0.11.0:
 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"
@@ -443,7 +398,6 @@ 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"
@@ -455,7 +409,6 @@ inherits@2, inherits@~2.0.1:
 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"
@@ -478,12 +431,10 @@ is-property@^1.0.0, is-property@^1.0.2:
 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=
 isarray@~1.0.0:
  version "1.0.0"
@@ -496,17 +447,14 @@ isstream@~0.1.1, isstream@~0.1.2:
 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.0, json-stringify-safe@~5.0.1:
  version "5.0.1"
@@ -519,7 +467,6 @@ jsonpointer@^4.0.0:
 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"
@@ -529,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"
@@ -538,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"
@@ -546,12 +491,10 @@ 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.11, mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.2:
  version "2.1.20"
@@ -562,26 +505,22 @@ mime-types@^2.1.11, mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.2:
 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"
@@ -598,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"
@@ -615,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"
@@ -629,7 +565,6 @@ 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"
@@ -642,29 +577,24 @@ oauth-sign@~0.8.0:
 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"
@@ -673,12 +603,10 @@ process-nextick-args@~1.0.6:
 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"
@@ -687,7 +615,6 @@ qs@~5.1.0:
 qs@~6.5.2:
  version "6.5.2"
  resolved "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 readable-stream@~2.0.5:
  version "2.0.6"
@@ -727,7 +654,6 @@ request@2.63.0:
 "request@>= 2.52.0", request@^2.88.0:
  version "2.88.0"
  resolved "https://registry.npmjs.org/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
  integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
  dependencies:
    aws-sign2 "~0.7.0"
    aws4 "^1.8.0"
@@ -753,24 +679,20 @@ request@2.63.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"
@@ -778,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"
@@ -786,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"
@@ -813,7 +731,6 @@ sntp@1.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"
@@ -843,7 +760,6 @@ strip-ansi@^3.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"
@@ -854,7 +770,6 @@ supports-color@^2.0.0:
 through@^2.3.8:
  version "2.3.8"
  resolved "http://registry.npmjs.org/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
 tough-cookie@>=0.12.0, tough-cookie@~2.4.3:
  version "2.4.3"
@@ -866,7 +781,6 @@ tough-cookie@>=0.12.0, 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"
@@ -877,17 +791,14 @@ tunnel-agent@~0.4.0:
 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"
@@ -896,7 +807,6 @@ 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"
@@ -905,12 +815,10 @@ util-deprecate@~1.0.1:
 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"
@@ -919,17 +827,14 @@ 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"
--- 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/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.3.0",
+  "version": "0.2.0",
  "publisher": "Microsoft",
  "preview": true,
  "engines": {
--- a/extensions/import/yarn.lock
+++ b/extensions/import/yarn.lock
@@ -5,7 +5,6 @@
 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"
@@ -20,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"
@@ -33,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.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"
@@ -46,17 +41,14 @@ buffer-alloc@^1.1.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"
@@ -65,14 +57,12 @@ 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.7":
  version "0.2.6"
@@ -83,14 +73,12 @@ core-util-is@~1.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"
 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"
@@ -99,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"
@@ -110,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"
@@ -119,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"
@@ -129,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"
@@ -153,58 +137,48 @@ diagnostic-channel@0.2.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.4"
  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.4.tgz#dc4221c2b16518760bd8c39a52d8f356fc00ed29"
  integrity sha512-/NdNZVJg+uZgtm9eS3O6lrOLYmQag2DjdEXuPaHlZ6RuVqgqaVZfgYCepEIKsLqwdQArOPtC3XzRLqGGfT8KQQ==
 es6-promisify@^5.0.0:
  version "5.0.0"
  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"
@@ -212,17 +186,14 @@ get-stream@^2.2.0:
 graceful-fs@^4.1.10:
  version "4.1.11"
  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
  integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
 "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"
@@ -230,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"
@@ -238,110 +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=
 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.4.3"
  resolved "https://registry.yarnpkg.com/opener/-/opener-1.4.3.tgz#5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8"
  integrity sha1-XG2ixdflgx6P+jlklQ+NZnSskLg=
 os-tmpdir@~1.0.2:
  version "1.0.2"
  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"
@@ -354,12 +304,10 @@ 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"
@@ -381,21 +329,18 @@ 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.1"
  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.1.tgz#f84ef1696269d6223ca48f6e1eeede3f7e81f395"
  integrity sha512-IFLM5wp3QrJODQFPm6/to3LJZrONdBY/otxcvDIQzu217zKye6yVR3hhi9lAjrC2Z+m/j5oDxMPb1qcd8cIvpA==
  dependencies:
    bl "^1.0.0"
    buffer-alloc "^1.1.0"
@@ -408,24 +353,20 @@ tar-stream@^1.5.2:
 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.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.2.5"
  resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.2.5.tgz#73a033a567bbbde59654b193c44d48a7e4f43c47"
  integrity sha512-izD3jxT8xkzwtXRUZjtmRwKnZoeECrfZ8ra/ketwOcusbZEp4mjULMnJOCfTDZBgGQAAY1AJ/IgxcwkavcX9Og==
  dependencies:
    buffer "^3.0.1"
    through "^2.3.6"
@@ -433,7 +374,6 @@ 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"
@@ -444,19 +384,16 @@ vscode-extension-telemetry@0.0.18:
 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"
@@ -464,27 +401,22 @@ 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.4"
  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.4.tgz#2166b4183c8aea884d20727f5449e62be69fd398"
  integrity sha512-FTjdqa4jDDoBjJqr36O8lmmZf/55kQ2w4ZY/+GL6K92fq765BqO3aYw21atnXUno/P04V5DWagNl4ybDIndJsw==
 wrappy@1:
  version "1.0.2"
  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"
--- 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/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/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.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.1.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,14 +57,12 @@ 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.8":
  version "0.2.8"
@@ -84,14 +73,12 @@ core-util-is@~1.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"
 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"
@@ -100,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"
@@ -111,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"
@@ -120,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"
@@ -130,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"
@@ -144,70 +127,58 @@ 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.4"
  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.4.tgz#dc4221c2b16518760bd8c39a52d8f356fc00ed29"
  integrity sha512-/NdNZVJg+uZgtm9eS3O6lrOLYmQag2DjdEXuPaHlZ6RuVqgqaVZfgYCepEIKsLqwdQArOPtC3XzRLqGGfT8KQQ==
 es6-promisify@^5.0.0:
  version "5.0.0"
  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"
@@ -215,17 +186,14 @@ get-stream@^2.2.0:
 graceful-fs@^4.1.10:
  version "4.1.11"
  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
  integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
 "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"
@@ -233,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"
@@ -241,110 +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=
 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.4.3"
  resolved "https://registry.yarnpkg.com/opener/-/opener-1.4.3.tgz#5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8"
  integrity sha1-XG2ixdflgx6P+jlklQ+NZnSskLg=
 os-tmpdir@~1.0.2:
  version "1.0.2"
  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"
@@ -357,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.5.0"
  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
  integrity sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==
 "service-downloader@github:anthonydresser/service-downloader#0.1.5":
  version "0.1.5"
@@ -385,21 +329,18 @@ 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.1"
  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.1.tgz#f84ef1696269d6223ca48f6e1eeede3f7e81f395"
  integrity sha512-IFLM5wp3QrJODQFPm6/to3LJZrONdBY/otxcvDIQzu217zKye6yVR3hhi9lAjrC2Z+m/j5oDxMPb1qcd8cIvpA==
  dependencies:
    bl "^1.0.0"
    buffer-alloc "^1.1.0"
@@ -412,24 +353,20 @@ tar-stream@^1.5.2:
 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.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.2.5"
  resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.2.5.tgz#73a033a567bbbde59654b193c44d48a7e4f43c47"
  integrity sha512-izD3jxT8xkzwtXRUZjtmRwKnZoeECrfZ8ra/ketwOcusbZEp4mjULMnJOCfTDZBgGQAAY1AJ/IgxcwkavcX9Og==
  dependencies:
    buffer "^3.0.1"
    through "^2.3.6"
@@ -437,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"
@@ -469,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"
@@ -492,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/profiler/yarn.lock
+++ b/extensions/profiler/yarn.lock
--- a/extensions/search-rg/yarn.lock
+++ b/extensions/search-rg/yarn.lock
--- a/extensions/vscode-colorize-tests/yarn.lock
+++ b/extensions/vscode-colorize-tests/yarn.lock
--- a/extensions/yarn.lock
+++ b/extensions/yarn.lock
@@ -5,4 +5,3 @@
 typescript@3.0.1:
  version "3.0.1"
  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.0.1.tgz#43738f29585d3a87575520a4b93ab6026ef11fdb"
  integrity sha512-zQIMOmC+372pC/CCVLqnQ0zSBiY7HHodU7mpQdjiZddek4GMj31I3dUJ7gAs9o65X7mnRma6OokOkc6f9jjfBg==
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "azuredatastudio",
-  "version": "1.2.2",
+  "version": "1.1.4",
  "distro": "8c3e97e3425cc9814496472ab73e076de2ba99ee",
  "author": {
    "name": "Microsoft Corporation"
--- a/src/sql/base/browser/ui/checkbox/checkbox.ts
+++ b/src/sql/base/browser/ui/checkbox/checkbox.ts
@@ -27,7 +27,6 @@ export class Checkbox extends Widget {
 		this._el = document.createElement('input');
 		this._el.type = 'checkbox';
 		this._el.style.verticalAlign = 'middle';
 		if (opts.ariaLabel) {
 			this._el.setAttribute('aria-label', opts.ariaLabel);
@@ -45,7 +44,6 @@ export class Checkbox extends Widget {
 		});
 		this._label = document.createElement('span');
 		this._label.style.verticalAlign = 'middle';
 		this.label = opts.label;
 		this.enabled = opts.enabled || true;
--- a/src/sql/base/browser/ui/modal/media/close.svg
+++ b/src/sql/base/browser/ui/modal/media/close.svg
@@ -1 +0,0 @@
 <svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><title>close</title><path d="M8.82,8.1,15,14.29l-.81.81L8,8.91,1.81,15.1,1,14.29,7.18,8.1,1,1.9l.81-.81L8,7.28,14.19,1.1,15,1.9Z"/></svg>
--- a/src/sql/base/browser/ui/modal/media/close_inverse.svg
+++ b/src/sql/base/browser/ui/modal/media/close_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;}</style></defs><title>close copy</title><path class="cls-1" d="M8.82,8.1,15,14.29l-.81.81L8,8.91,1.81,15.1,1,14.29,7.18,8.1,1,1.9l.81-.81L8,7.28,14.19,1.1,15,1.9Z"/></svg>
--- a/src/sql/base/browser/ui/modal/media/copy.svg
+++ b/src/sql/base/browser/ui/modal/media/copy.svg
@@ -1 +0,0 @@
 <svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><title>copy</title><path d="M3-.15V3.21H0V15.95H13V12.58h3V-.15ZM12,15H1.08V4.12H12Zm3-3.36H13V3.21h-9V.75H15Z"/></svg>
--- a/src/sql/base/browser/ui/modal/media/copy_inverse.svg
+++ b/src/sql/base/browser/ui/modal/media/copy_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;}</style></defs><title>copy_inverse</title><path class="cls-1" d="M3,0V3.36H0V16.1H13V12.73h3V0Zm9,15.19H1.08V4.27H12Zm3-3.36H13V3.36H4V.9H15Z"/></svg>
--- a/src/sql/base/browser/ui/modal/media/error_notification.svg
+++ b/src/sql/base/browser/ui/modal/media/error_notification.svg
@@ -1 +0,0 @@
 <svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><title>error_notification</title><path d="M8,0a7.92,7.92,0,0,1,4,1.09A8.15,8.15,0,0,1,14.91,4a8,8,0,0,1,.81,1.91,8,8,0,0,1-.81,6.16A8.15,8.15,0,0,1,12,14.92a8,8,0,0,1-8.07,0,8.15,8.15,0,0,1-2.87-2.87A8,8,0,0,1,1.09,4,8.15,8.15,0,0,1,4,1.11,7.92,7.92,0,0,1,8,0ZM8,15a6.88,6.88,0,0,0,1.86-.25,7,7,0,0,0,4.89-4.89,7.07,7.07,0,0,0,0-3.73A7,7,0,0,0,9.86,1.27a7.07,7.07,0,0,0-3.73,0A7,7,0,0,0,1.25,6.15a7.07,7.07,0,0,0,0,3.73,7,7,0,0,0,4.89,4.89A6.88,6.88,0,0,0,8,15Zm3.46-9.76L8.71,8l2.75,2.76-.7.7L8,8.73,5.24,11.48l-.7-.7L7.29,8,4.54,5.26l.7-.7L8,7.31l2.76-2.75Z"/></svg>
--- a/src/sql/base/browser/ui/modal/media/error_notification_inverse.svg
+++ b/src/sql/base/browser/ui/modal/media/error_notification_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;}</style></defs><title>error_notification_inverse</title><path class="cls-1" d="M8,0a7.92,7.92,0,0,1,4,1.09A8.15,8.15,0,0,1,14.91,4a8,8,0,0,1,.81,1.91,8,8,0,0,1-.81,6.16A8.15,8.15,0,0,1,12,14.92a8,8,0,0,1-8.07,0,8.15,8.15,0,0,1-2.87-2.87A8,8,0,0,1,1.09,4,8.15,8.15,0,0,1,4,1.11,7.92,7.92,0,0,1,8,0ZM8,15a6.88,6.88,0,0,0,1.86-.25,7,7,0,0,0,4.89-4.89,7.07,7.07,0,0,0,0-3.73A7,7,0,0,0,9.86,1.27a7.07,7.07,0,0,0-3.73,0A7,7,0,0,0,1.25,6.15a7.07,7.07,0,0,0,0,3.73,7,7,0,0,0,4.89,4.89A6.88,6.88,0,0,0,8,15Zm3.46-9.76L8.71,8l2.75,2.76-.7.7L8,8.73,5.24,11.48l-.7-.7L7.29,8,4.54,5.26l.7-.7L8,7.31l2.76-2.75Z"/></svg>
--- a/src/sql/base/browser/ui/modal/media/info_notification.svg
+++ b/src/sql/base/browser/ui/modal/media/info_notification.svg
@@ -1 +0,0 @@
 <svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><title>info_notification</title><path d="M8,16a7.93,7.93,0,0,1-2.13-.28A8,8,0,0,1,4,14.91,8,8,0,0,1,0,8,7.94,7.94,0,0,1,.28,5.88,8,8,0,0,1,1.09,4,8,8,0,0,1,4,1.1,8.08,8.08,0,0,1,5.86.3a8.13,8.13,0,0,1,4.25,0,8,8,0,0,1,3.53,2.05A8,8,0,0,1,14.9,4a8,8,0,0,1,.8,1.91,8,8,0,0,1-2.05,7.78A7.93,7.93,0,0,1,12,14.91a8,8,0,0,1-1.91.8A7.93,7.93,0,0,1,8,16ZM8,1.08a6.72,6.72,0,0,0-1.84.25A7.09,7.09,0,0,0,4.5,2,6.92,6.92,0,0,0,2,4.52a7.09,7.09,0,0,0-.7,1.66,6.87,6.87,0,0,0,0,3.67A7.07,7.07,0,0,0,2,11.5,6.92,6.92,0,0,0,4.5,14a7.09,7.09,0,0,0,1.65.7,6.89,6.89,0,0,0,3.68,0,7.07,7.07,0,0,0,1.66-.7A6.92,6.92,0,0,0,14,11.5a7.08,7.08,0,0,0,.7-1.65,6.89,6.89,0,0,0,0-3.68A7.09,7.09,0,0,0,14,4.52,6.92,6.92,0,0,0,11.48,2a7.07,7.07,0,0,0-1.66-.7A6.74,6.74,0,0,0,8,1.08Zm-.53,3.2H8.52V5.34H7.46Zm0,2.13H8.52v5.33H7.46Z"/></svg>
--- a/src/sql/base/browser/ui/modal/media/info_notification_inverse.svg
+++ b/src/sql/base/browser/ui/modal/media/info_notification_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;}</style></defs><title>info_notification_inverse</title><path class="cls-1" d="M8,16a7.93,7.93,0,0,1-2.13-.28A8,8,0,0,1,4,14.91,8,8,0,0,1,0,8,7.94,7.94,0,0,1,.28,5.88,8,8,0,0,1,1.09,4,8,8,0,0,1,4,1.1,8.08,8.08,0,0,1,5.86.3a8.13,8.13,0,0,1,4.25,0,8,8,0,0,1,3.53,2.05A8,8,0,0,1,14.9,4a8,8,0,0,1,.8,1.91,8,8,0,0,1-2.05,7.78A7.93,7.93,0,0,1,12,14.91a8,8,0,0,1-1.91.8A7.93,7.93,0,0,1,8,16ZM8,1.08a6.72,6.72,0,0,0-1.84.25A7.09,7.09,0,0,0,4.5,2,6.92,6.92,0,0,0,2,4.52a7.09,7.09,0,0,0-.7,1.66,6.87,6.87,0,0,0,0,3.67A7.07,7.07,0,0,0,2,11.5,6.92,6.92,0,0,0,4.5,14a7.09,7.09,0,0,0,1.65.7,6.89,6.89,0,0,0,3.68,0,7.07,7.07,0,0,0,1.66-.7A6.92,6.92,0,0,0,14,11.5a7.08,7.08,0,0,0,.7-1.65,6.89,6.89,0,0,0,0-3.68A7.09,7.09,0,0,0,14,4.52,6.92,6.92,0,0,0,11.48,2a7.07,7.07,0,0,0-1.66-.7A6.74,6.74,0,0,0,8,1.08Zm-.53,3.2H8.52V5.34H7.46Zm0,2.13H8.52v5.33H7.46Z"/></svg>
--- a/src/sql/base/browser/ui/modal/media/modal.css
+++ b/src/sql/base/browser/ui/modal/media/modal.css
@@ -50,8 +50,6 @@
 .monaco-shell .modal.flyout-dialog .modal-content {
 	height: 100%;
 	font-size: 11px;
 	display: flex;
 	flex-direction: column;
 }
 .modal .modal-title {
@@ -65,10 +63,13 @@
 	margin-right: 10px;
 }
-.monaco-shell .modal.flyout-dialog .modal-body,
+.monaco-shell .modal.flyout-dialog .modal-body {
 	height: calc(100% - 105px);
 }
 /* modal body for angular component dialog */
 .monaco-shell .modal.flyout-dialog .angular-modal-body {
-	margin-bottom: auto;
+	height: calc(100% - 90px);
 	height: 100%;
 }
 /* Style for body and footer in modal dialog. This should be applied to dialog created with angular component. */
@@ -127,6 +128,13 @@
 	border: 1px solid transparent;
 }
 .modal.flyout-dialog .dialogErrorMessage {
 	overflow: hidden;
 	padding-left: 10px;
 	overflow-y: auto;
 	display: flex;
 }
 .modal .modal-footer {
 	display: flex;
 }
@@ -159,132 +167,27 @@
 	margin-right: none;
 }
-
+.modal.flyout-dialog .icon.error {
-.modal.flyout-dialog .dialog-message {
+	float: left;
-	padding: 6px 10px 10px 10px;
+	margin-right: 10px;
-	font-size: 13px;
+	width: 20px;
-	display: flex;
+	height: 20px;
 	flex-direction: column;
 }
-.vs .modal.flyout-dialog .dialog-message.error,
+.modal .modal-footer .dialogErrorMessage {
-.vs-dark .modal.flyout-dialog .dialog-message.error {
+	align-items: center;
-	background-color:#B62E00 !important;
+	max-height: 30px;
-	color:#FFFFFF !important;
+	margin-right: 5px;
 }
-.vs .modal.flyout-dialog .dialog-message.warning,
+.modal .dialogErrorMessage .icon {
-.vs-dark .modal.flyout-dialog .dialog-message.warning {
+	float: left;
-	background-color:#F9E385 !important;
+	margin-right: 10px;
-	color:#4A4A4A !important;
+	width: auto;
 	height: 20px;
 }
-.vs .modal.flyout-dialog .dialog-message.info,
+.modal .modal-footer .dialogErrorMessage .errorMessage {
-.vs-dark .modal.flyout-dialog .dialog-message.info {
+	max-height: 100%;
 	background-color:#0078D7 !important;
 	color:#FFFFFF !important;
 }
 .modal.flyout-dialog .dialog-message-header {
 	overflow: hidden;
 	overflow-y: hidden;
 	display: flex;
 	flex-direction: row;
 }
 .modal.flyout-dialog .dialog-message-body {
 	margin-left: 26px;
 	overflow-y: scroll;
 	overflow-x: hidden;
 	max-height: 90px;
 	display: flex;
 	flex-direction: column;
 }
 .modal.flyout-dialog .dialog-message-icon {
 	margin-right: 10px;
 	margin-top: 5px;
 	width: 16px;
 	height: 16px;
 	min-width: 16px;
 }
 .modal.flyout-dialog .dialog-message-severity {
 	margin-right: auto;
 	line-height: 26px;
 }
 .modal.flyout-dialog .dialog-message-button {
 	min-width: 60px;
 	margin-right: 10px;
 }
 .modal.flyout-dialog .dialog-message-button > a {
 	background-position-x: 2px !important;
 	background-color: inherit !important;
 	color:inherit !important;
 	padding-left: 22px !important;
 	background-size: 16px 16px !important;
 	text-align: left !important;
 }
 .modal.flyout-dialog .dialog-message-summary {
 	overflow-x: hidden;
 	text-overflow: ellipsis;
 	white-space: nowrap;
 }
 .modal.flyout-dialog .dialog-message-summary.expanded {
 	white-space: normal;
 	overflow-x: unset;
 }
 .modal.flyout-dialog .dialog-message-detail {
 	margin-top: 5px;
 	white-space: normal;
 	-webkit-user-select: text;
 	font-size: 11px;
 }
 .hc-black .dialog-message.warning .close-message-icon,
 .close-message-icon {
 	background: url('close_inverse.svg') center center no-repeat;
 }
 .dialog-message.warning .close-message-icon {
 	background: url('close.svg') center center no-repeat;
 }
 .hc-black .dialog-message.warning .copy-message-icon,
 .copy-message-icon {
 	background: url('copy_inverse.svg') center center no-repeat;
 }
 .dialog-message.warning .copy-message-icon {
 	background: url('copy.svg') center center no-repeat;
 }
 .hc-black .dialog-message.warning .message-details-icon,
 .message-details-icon {
 	background: url('show_details_inverse.svg') center center no-repeat;
 }
 .dialog-message.warning .message-details-icon {
 	background: url('show_details.svg') center center no-repeat;
 }
 .dialog-message.info .dialog-message-icon  {
 	background: url('info_notification_inverse.svg') center center no-repeat;
 }
 .hc-black .dialog-message.warning .dialog-message-icon {
 	background: url('warning_notification_inverse.svg') center center no-repeat;
 }
 .dialog-message.warning .dialog-message-icon {
 	background: url('warning_notification.svg') center center no-repeat;
 }
 .dialog-message.error .dialog-message-icon {
 	background: url('error_notification_inverse.svg') center center no-repeat;
 }
--- a/src/sql/base/browser/ui/modal/media/show_details.svg
+++ b/src/sql/base/browser/ui/modal/media/show_details.svg
@@ -1 +0,0 @@
 <svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><title>show_details</title><path d="M1,0H15V16H1ZM14,15V1H2V15ZM13,3V4H3V3Zm0,2V6H3V5Zm0,2V8H3V7Zm0,2v1H3V9Zm0,2v1H3V11Z"/></svg>
--- a/src/sql/base/browser/ui/modal/media/show_details_inverse.svg
+++ b/src/sql/base/browser/ui/modal/media/show_details_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;}</style></defs><title>show_details_inverse</title><path class="cls-1" d="M1,0H15V16H1ZM14,15V1H2V15ZM13,3V4H3V3Zm0,2V6H3V5Zm0,2V8H3V7Zm0,2v1H3V9Zm0,2v1H3V11Z"/></svg>
--- a/src/sql/base/browser/ui/modal/media/warning_notification.svg
+++ b/src/sql/base/browser/ui/modal/media/warning_notification.svg
@@ -1 +0,0 @@
 <svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><title>warning_notification</title><path d="M8,0l8,16H0ZM8,2.4,1.73,15H14.28Zm-.53,4H8.53v5.33H7.47Zm0,7.47V12.82H8.53v1.07Z"/></svg>
--- a/src/sql/base/browser/ui/modal/media/warning_notification_inverse.svg
+++ b/src/sql/base/browser/ui/modal/media/warning_notification_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;}</style></defs><title>warning_notification_inverse</title><path class="cls-1" d="M8,0l8,16H0ZM8,2.4,1.73,15H14.28Zm-.53,4H8.53v5.33H7.47Zm0,7.47V12.82H8.53v1.07Z"/></svg>
--- a/src/sql/base/browser/ui/modal/modal.ts
+++ b/src/sql/base/browser/ui/modal/modal.ts
@@ -2,8 +2,9 @@
 *  Copyright (c) Microsoft Corporation. All rights reserved.
 *  Licensed under the Source EULA. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/
 import 'vs/css!sql/media/icons/common-icons';
 import 'vs/css!./media/modal';
-import { IThemable, attachButtonStyler } from 'vs/platform/theme/common/styler';
+import { IThemable } from 'vs/platform/theme/common/styler';
 import { Color } from 'vs/base/common/color';
 import { IPartService } from 'vs/workbench/services/part/common/partService';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
@@ -15,26 +16,18 @@ import * as DOM from 'vs/base/browser/dom';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { generateUuid } from 'vs/base/common/uuid';
 import { IContextKeyService, RawContextKey, IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { Button } from 'sql/base/browser/ui/button/button';
 import * as TelemetryUtils from 'sql/common/telemetryUtilities';
 import * as TelemetryKeys from 'sql/common/telemetryKeys';
 import { localize } from 'vs/nls';
 import { MessageLevel } from 'sql/workbench/api/common/sqlExtHostTypes';
 import * as os from 'os';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 export const MODAL_SHOWING_KEY = 'modalShowing';
 export const MODAL_SHOWING_CONTEXT = new RawContextKey<Array<string>>(MODAL_SHOWING_KEY, []);
-const INFO_ALT_TEXT = localize('infoAltText', 'Infomation');
+const INFO_ALT_TEXT = localize('infoAltText', 'Info');
 const WARNING_ALT_TEXT = localize('warningAltText', 'Warning');
 const ERROR_ALT_TEXT = localize('errorAltText', 'Error');
 const SHOW_DETAILS_TEXT = localize('showMessageDetails', 'Show Details');
 const HIDE_DETAILS_TEXT = localize('hideMessageDetails', 'Hide Details');
 const COPY_TEXT = localize('copyMessage', 'Copy');
 const CLOSE_TEXT = localize('closeMessage', 'Close');
 const MESSAGE_EXPANDED_MODE_CLASS = 'expanded';
 export interface IModalDialogStyles {
 	dialogForeground?: Color;
@@ -73,20 +66,10 @@ const defaultOptions: IModalOptions = {
 export abstract class Modal extends Disposable implements IThemable {
-	private _messageElement: HTMLElement;
+	private _errorMessage: Builder;
 	private _messageIcon: HTMLElement;
 	private _messageSeverity: Builder;
 	private _messageSummary: Builder;
 	private _messageSummaryElement: HTMLElement;
 	private _messageDetail: Builder;
 	private _messageDetailElement: HTMLElement;
 	private _toggleMessageDetailButton: Button;
 	private _copyMessageButton: Button;
 	private _closeMessageButton: Button;
 	private _messageSummaryText: string;
 	private _messageDetailText: string;
 	private _spinnerElement: HTMLElement;
 	private _errorIconElement: HTMLElement;
 	private _focusableElements: NodeListOf<Element>;
 	private _firstFocusableElement: HTMLElement;
 	private _lastFocusableElement: HTMLElement;
@@ -99,7 +82,6 @@ export abstract class Modal extends Disposable implements IThemable {
 	private _modalDialog: Builder;
 	private _modalHeaderSection: Builder;
 	private _modalMessageSection: Builder;
 	private _modalBodySection: HTMLElement;
 	private _modalFooterSection: Builder;
 	private _closeButtonInHeader: Builder;
@@ -153,8 +135,6 @@ export abstract class Modal extends Disposable implements IThemable {
 		private _name: string,
 		private _partService: IPartService,
 		private _telemetryService: ITelemetryService,
 		protected _clipboardService: IClipboardService,
 		protected _themeService: IThemeService,
 		_contextKeyService: IContextKeyService,
 		options?: IModalOptions
 	) {
@@ -169,7 +149,7 @@ export abstract class Modal extends Disposable implements IThemable {
 	/**
 	 * Build and render the modal, will call {@link Modal#renderBody}
 	 */
-	public render() {
+	public render(errorMessagesInFooter: boolean = false) {
 		let modalBodyClass = (this._modalOptions.isAngular === false ? 'modal-body' : 'modal-body-and-footer');
 		let parts: Array<HTMLElement> = [];
 		// This modal header section refers to the header of of the dialog
@@ -196,72 +176,11 @@ export abstract class Modal extends Disposable implements IThemable {
 			parts.push(this._modalHeaderSection.getHTMLElement());
 		}
 		if (this._modalOptions.isAngular === false && this._modalOptions.hasErrors) {
 			this._modalMessageSection = $().div({ class: 'dialog-message error' }, (messageContainer) => {
 				messageContainer.div({ class: 'dialog-message-header' }, (headerContainer) => {
 					headerContainer.div({ class: 'dialog-message-icon' }, (iconContainer) => {
 						this._messageIcon = iconContainer.getHTMLElement();
 					});
 					headerContainer.div({ class: 'dialog-message-severity' }, (messageSeverityContainer) => {
 						this._messageSeverity = messageSeverityContainer;
 					});
 					headerContainer.div({ class: 'dialog-message-button' }, (buttonContainer) => {
 						this._toggleMessageDetailButton = new Button(buttonContainer);
 						this._toggleMessageDetailButton.icon = 'message-details-icon';
 						this._toggleMessageDetailButton.label = SHOW_DETAILS_TEXT;
 						this._toggleMessageDetailButton.onDidClick((e) => {
 							this.toggleMessageDetail();
 						});
 					});
 					headerContainer.div({ class: 'dialog-message-button' }, (buttonContainer) => {
 						this._copyMessageButton = new Button(buttonContainer);
 						this._copyMessageButton.icon = 'copy-message-icon';
 						this._copyMessageButton.label = COPY_TEXT;
 						this._copyMessageButton.onDidClick((e) => {
 							this._clipboardService.writeText(this.getTextForClipboard());
 						});
 					});
 					headerContainer.div({ class: 'dialog-message-button' }, (buttonContainer) => {
 						this._closeMessageButton = new Button(buttonContainer);
 						this._closeMessageButton.icon = 'close-message-icon';
 						this._closeMessageButton.label = CLOSE_TEXT;
 						this._closeMessageButton.onDidClick((e) => {
 							this.setError(undefined);
 						});
 					});
 					attachButtonStyler(this._toggleMessageDetailButton, this._themeService);
 					attachButtonStyler(this._copyMessageButton, this._themeService);
 					attachButtonStyler(this._closeMessageButton, this._themeService);
 				});
 				messageContainer.div({ class: 'dialog-message-body' }, (messageBody) => {
 					messageBody.div({ class: 'dialog-message-summary' }, (summaryContainer) => {
 						this._messageSummary = summaryContainer;
 						this._messageSummaryElement = summaryContainer.getHTMLElement();
 						this._messageSummaryElement.onclick = (e) => {
 							this.toggleMessageDetail();
 						};
 					});
 					messageBody.div({ class: 'dialog-message-detail' }, (detailContainer) => {
 						this._messageDetail = detailContainer;
 						this._messageDetailElement = detailContainer.getHTMLElement();
 						this._messageDetailElement.style.display = 'none';
 					});
 				});
 			});
 			this._messageElement = this._modalMessageSection.getHTMLElement();
 			this.updateElementVisibility(this._messageElement, false);
 			parts.push(this._messageElement);
 		}
 		// This modal body section refers to the body of of the dialog
 		let body: Builder;
 		$().div({ class: modalBodyClass }, (builder) => {
 			body = builder;
 		});
 		this._modalBodySection = body.getHTMLElement();
 		parts.push(body.getHTMLElement());
@@ -295,6 +214,19 @@ export abstract class Modal extends Disposable implements IThemable {
 			builderClass += ' wide';
 		}
 		if (this._modalOptions.isAngular === false && this._modalOptions.hasErrors) {
 			let builder = errorMessagesInFooter ? this._leftFooter : body;
 			builder.div({ class: 'dialogErrorMessage', id: 'dialogErrorMessage' }, (errorMessageContainer) => {
 				errorMessageContainer.div({ class: 'sql icon error' }, (iconContainer) => {
 					this._errorIconElement = iconContainer.getHTMLElement();
 					this._errorIconElement.style.visibility = 'hidden';
 				});
 				errorMessageContainer.div({ class: 'errorMessage' }, (messageContainer) => {
 					this._errorMessage = messageContainer;
 				});
 			});
 		}
 		// The builder builds the dialog. It append header, body and footer sections.
 		this._builder = $().div({ class: builderClass, 'role': 'dialog', 'aria-label': this._title }, (dialogContainer) => {
 			this._modalDialog = dialogContainer.div({ class: 'modal-dialog ', role: 'document' }, (modalDialog) => {
@@ -341,39 +273,6 @@ export abstract class Modal extends Disposable implements IThemable {
 		}
 	}
 	private getTextForClipboard(): string {
 		return this._messageDetailText === '' ? this._messageSummaryText : `${this._messageSummaryText}${os.EOL}========================${os.EOL}${this._messageDetailText}`;
 	}
 	private updateElementVisibility(element: HTMLElement, visible: boolean) {
 		element.style.display = visible ? 'block' : 'none';
 	}
 	private updateExpandMessageState() {
 		this._messageSummaryElement.style.cursor = this.shouldShowExpandMessageButton ? 'pointer' : 'default';
 		this._messageSummaryElement.classList.remove(MESSAGE_EXPANDED_MODE_CLASS);
 		this.updateElementVisibility(this._toggleMessageDetailButton.element, this.shouldShowExpandMessageButton);
 	}
 	private toggleMessageDetail() {
 		let isExpanded = this._messageSummaryElement.classList.contains(MESSAGE_EXPANDED_MODE_CLASS);
 		if (isExpanded) {
 			this._messageSummaryElement.classList.remove(MESSAGE_EXPANDED_MODE_CLASS);
 			this._toggleMessageDetailButton.label = SHOW_DETAILS_TEXT;
 		} else {
 			this._messageSummaryElement.classList.add(MESSAGE_EXPANDED_MODE_CLASS);
 			this._toggleMessageDetailButton.label = HIDE_DETAILS_TEXT;
 		}
 		if (this._messageDetailText !== '') {
 			this.updateElementVisibility(this._messageDetailElement, !isExpanded);
 		}
 	}
 	private get shouldShowExpandMessageButton(): boolean {
 		return this._messageDetailText !== '' || this._messageSummaryElement.scrollWidth > this._messageSummaryElement.offsetWidth;
 	}
 	/**
 	 * Set focusable elements in the modal dialog
 	 */
@@ -475,45 +374,35 @@ export abstract class Modal extends Disposable implements IThemable {
 	/**
 	 * Show an error in the error message element
-	 * @param message Text to show in the message
+	 * @param err Text to show in the error message
 	 * @param level Severity level of the message
 	 * @param description Description of the message
 	 */
-	protected setError(message: string, level: MessageLevel = MessageLevel.Error, description: string = '') {
+	protected setError(err: string, level: MessageLevel = MessageLevel.Error) {
 		if (this._modalOptions.hasErrors) {
-			this._messageSummaryText = message ? message : '';
+			if (err === '') {
-			this._messageDetailText = description ? description : '';
+				this._errorIconElement.style.visibility = 'hidden';
-
+			} else {
 			if (this._messageSummaryText !== '') {
 				const levelClasses = ['info', 'warning', 'error'];
 				let selectedLevel = levelClasses[2];
-				let severityText = ERROR_ALT_TEXT;
+				let altText = ERROR_ALT_TEXT;
 				if (level === MessageLevel.Information) {
 					selectedLevel = levelClasses[0];
-					severityText = INFO_ALT_TEXT;
+					altText = INFO_ALT_TEXT;
 				} else if (level === MessageLevel.Warning) {
 					selectedLevel = levelClasses[1];
-					severityText = WARNING_ALT_TEXT;
+					altText = WARNING_ALT_TEXT;
 				}
 				levelClasses.forEach(level => {
 					if (selectedLevel === level) {
-						this._messageIcon.classList.add(level);
+						this._errorIconElement.classList.add(level);
 						this._messageElement.classList.add(level);
 					} else {
-						this._messageIcon.classList.remove(level);
+						this._errorIconElement.classList.remove(level);
 						this._messageElement.classList.remove(level);
 					}
 				});
-				this._messageIcon.title = severityText;
+				this._errorIconElement.title = altText;
-				this._messageSeverity.text(severityText);
+				this._errorIconElement.style.visibility = 'visible';
 				this._messageSummary.text(message);
 				this._messageSummary.title(message);
 				this._messageDetail.text(description);
 			}
-			this.updateElementVisibility(this._messageDetailElement, false);
+			this._errorMessage.text(err);
 			this.updateElementVisibility(this._messageElement, this._messageSummaryText !== '');
 			this.updateExpandMessageState();
 		}
 	}
@@ -607,7 +496,6 @@ export abstract class Modal extends Disposable implements IThemable {
 			this._modalDialog.style('border-style', border ? 'solid' : null);
 			this._modalDialog.style('border-color', border);
 		}
 		if (this._modalHeaderSection) {
 			this._modalHeaderSection.style('background-color', headerAndFooterBackground);
 			this._modalHeaderSection.style('border-bottom-width', border ? '1px' : null);
@@ -615,13 +503,6 @@ export abstract class Modal extends Disposable implements IThemable {
 			this._modalHeaderSection.style('border-bottom-color', border);
 		}
 		if (this._modalMessageSection) {
 			this._modalMessageSection.style('background-color', headerAndFooterBackground);
 			this._modalMessageSection.style('border-bottom-width', border ? '1px' : null);
 			this._modalMessageSection.style('border-bottom-style', border ? 'solid' : null);
 			this._modalMessageSection.style('border-bottom-color', border);
 		}
 		if (this._modalBodySection) {
 			this._modalBodySection.style.backgroundColor = bodyBackground;
 		}
--- a/src/sql/base/browser/ui/modal/optionsDialog.ts
+++ b/src/sql/base/browser/ui/modal/optionsDialog.ts
@@ -30,7 +30,6 @@ import { SplitView, CollapsibleState } from 'sql/base/browser/ui/splitview/split
 import { Builder, $ } from 'vs/base/browser/builder';
 import { Widget } from 'vs/base/browser/ui/widget';
 import { ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 export class CategoryView extends FixedCollapsibleView {
 	private _treecontainer: HTMLElement;
@@ -93,13 +92,12 @@ export class OptionsDialog extends Modal {
 		name: string,
 		options: IModalOptions,
 		@IPartService partService: IPartService,
-		@IWorkbenchThemeService private _workbenchThemeService: IWorkbenchThemeService,
+		@IWorkbenchThemeService private _themeService: IWorkbenchThemeService,
 		@IContextViewService private _contextViewService: IContextViewService,
 		@ITelemetryService telemetryService: ITelemetryService,
-		@IContextKeyService contextKeyService: IContextKeyService,
+		@IContextKeyService contextKeyService: IContextKeyService
 		@IClipboardService clipboardService: IClipboardService
 	) {
-		super(title, name, partService, telemetryService, clipboardService, _workbenchThemeService, contextKeyService, options);
+		super(title, name, partService, telemetryService, contextKeyService, options);
 	}
 	public render() {
@@ -115,8 +113,8 @@ export class OptionsDialog extends Modal {
 		attachButtonStyler(this._okButton, this._themeService);
 		attachButtonStyler(this._closeButton, this._themeService);
 		let self = this;
-		this._register(self._workbenchThemeService.onDidColorThemeChange(e => self.updateTheme(e)));
+		this._register(self._themeService.onDidColorThemeChange(e => self.updateTheme(e)));
-		self.updateTheme(self._workbenchThemeService.getColorTheme());
+		self.updateTheme(self._themeService.getColorTheme());
 	}
 	protected renderBody(container: HTMLElement) {
--- a/src/sql/base/browser/ui/modal/webViewDialog.ts
+++ b/src/sql/base/browser/ui/modal/webViewDialog.ts
@@ -45,8 +45,8 @@ export class WebViewDialog extends Modal {
 	protected findInputFocusContextKey: IContextKey<boolean>;
 	constructor(
-		@IThemeService themeService: IThemeService,
+		@IThemeService private _themeService: IThemeService,
-		@IClipboardService clipboardService: IClipboardService,
+		@IClipboardService private _clipboardService: IClipboardService,
 		@IPartService private _webViewPartService: IPartService,
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IContextKeyService contextKeyService: IContextKeyService,
@@ -54,7 +54,7 @@ export class WebViewDialog extends Modal {
 		@IEnvironmentService private _environmentService: IEnvironmentService,
 		@IInstantiationService private _instantiationService: IInstantiationService
 	) {
-		super('', TelemetryKeys.WebView, _webViewPartService, telemetryService, clipboardService, themeService, contextKeyService, { isFlyout: false, hasTitleIcon: true });
+		super('', TelemetryKeys.WebView, _webViewPartService, telemetryService, contextKeyService, { isFlyout: false, hasTitleIcon: true });
 		this._okLabel = localize('webViewDialog.ok', 'OK');
 		this._closeLabel = localize('webViewDialog.close', 'Close');
 	}
--- a/src/sql/base/browser/ui/panel/panel.ts
+++ b/src/sql/base/browser/ui/panel/panel.ts
@@ -6,7 +6,7 @@
 import { IThemable } from 'vs/platform/theme/common/styler';
 import { Event, Emitter } from 'vs/base/common/event';
 import { Dimension, EventType, $, addDisposableListener } from 'vs/base/browser/dom';
-import { $ as qb } from 'vs/base/browser/builder';
+import { $ as quickBuilder } from 'vs/base/browser/builder';
 import { IAction } from 'vs/base/common/actions';
 import { IActionOptions, ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
@@ -153,18 +153,18 @@ export class TabbedPanel extends Disposable implements IThemable {
 		}
 		if (this._shownTab) {
-			qb(this._tabMap.get(this._shownTab).label).removeClass('active');
+			this._tabMap.get(this._shownTab).label.classList.remove('active');
-			qb(this._tabMap.get(this._shownTab).header).removeClass('active');
+			this._tabMap.get(this._shownTab).header.classList.remove('active');
 			this._tabMap.get(this._shownTab).header.setAttribute('aria-selected', 'false');
 		}
 		this._shownTab = id;
 		this.tabHistory.push(id);
-		qb(this.body).empty();
+		quickBuilder(this.body).empty();
 		let tab = this._tabMap.get(this._shownTab);
 		this.body.setAttribute('aria-labelledby', tab.identifier);
-		qb(tab.label).addClass('active');
+		tab.label.classList.add('active');
-		qb(tab.header).addClass('active');
+		tab.header.classList.add('active');
 		tab.header.setAttribute('aria-selected', 'true');
 		tab.view.render(this.body);
 		this._onTabChange.fire(id);
@@ -175,11 +175,11 @@ export class TabbedPanel extends Disposable implements IThemable {
 	public removeTab(tab: PanelTabIdentifier) {
 		let actualTab = this._tabMap.get(tab);
-		qb(actualTab.header).destroy();
+		quickBuilder(actualTab.header).destroy();
 		if (actualTab.view.remove) {
 			actualTab.view.remove();
 		}
-		qb(this._tabMap.get(tab).header).destroy();
+		quickBuilder(this._tabMap.get(tab).header).destroy();
 		this._tabMap.delete(tab);
 		if (this._shownTab === tab) {
 			this._shownTab = undefined;
--- a/src/sql/parts/accountManagement/accountDialog/accountDialog.ts
+++ b/src/sql/parts/accountManagement/accountDialog/accountDialog.ts
@@ -33,7 +33,6 @@ import { AccountListRenderer, AccountListDelegate } from 'sql/parts/accountManag
 import { AccountProviderAddedEventParams, UpdateAccountListEventParams } from 'sql/services/accountManagement/eventTypes';
 import { FixedListView } from 'sql/platform/views/fixedListView';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IClipboardService } from 'sql/platform/clipboard/common/clipboardService';
 export interface IProviderViewUiComponent {
 	view: FixedListView<sqlops.Account>;
@@ -67,22 +66,19 @@ export class AccountDialog extends Modal {
 	constructor(
 		@IPartService partService: IPartService,
-		@IThemeService themeService: IThemeService,
+		@IThemeService private _themeService: IThemeService,
 		@IListService private _listService: IListService,
 		@IInstantiationService private _instantiationService: IInstantiationService,
 		@IContextMenuService private _contextMenuService: IContextMenuService,
 		@IKeybindingService private _keybindingService: IKeybindingService,
 		@ITelemetryService telemetryService: ITelemetryService,
-		@IContextKeyService contextKeyService: IContextKeyService,
+		@IContextKeyService contextKeyService: IContextKeyService
 		@IClipboardService clipboardService: IClipboardService
 	) {
 		super(
 			localize('linkedAccounts', 'Linked accounts'),
 			TelemetryKeys.Accounts,
 			partService,
 			telemetryService,
 			clipboardService,
 			themeService,
 			contextKeyService,
 			{ hasSpinner: true }
 		);
--- a/src/sql/parts/accountManagement/autoOAuthDialog/autoOAuthDialog.ts
+++ b/src/sql/parts/accountManagement/autoOAuthDialog/autoOAuthDialog.ts
@@ -21,7 +21,6 @@ import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox';
 import { attachModalDialogStyler, attachButtonStyler } from 'sql/common/theme/styler';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import * as TelemetryKeys from 'sql/common/telemetryKeys';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 export class AutoOAuthDialog extends Modal {
 	private _copyAndOpenButton: Button;
@@ -43,19 +42,16 @@ export class AutoOAuthDialog extends Modal {
 	constructor(
 		@IPartService partService: IPartService,
-		@IThemeService themeService: IThemeService,
+		@IThemeService private _themeService: IThemeService,
 		@IContextViewService private _contextViewService: IContextViewService,
 		@ITelemetryService telemetryService: ITelemetryService,
-		@IContextKeyService contextKeyService: IContextKeyService,
+		@IContextKeyService contextKeyService: IContextKeyService
 		@IClipboardService clipboardService: IClipboardService
 	) {
 		super(
 			'',
 			TelemetryKeys.AutoOAuth,
 			partService,
 			telemetryService,
 			clipboardService,
 			themeService,
 			contextKeyService,
 			{
 				isFlyout: true,
--- a/src/sql/parts/accountManagement/firewallRuleDialog/firewallRuleDialog.ts
+++ b/src/sql/parts/accountManagement/firewallRuleDialog/firewallRuleDialog.ts
@@ -29,7 +29,6 @@ import { attachModalDialogStyler, attachButtonStyler } from 'sql/common/theme/st
 import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox';
 import { IAccountPickerService } from 'sql/parts/accountManagement/common/interfaces';
 import * as TelemetryKeys from 'sql/common/telemetryKeys';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 // TODO: Make the help link 1) extensible (01/08/2018, https://github.com/Microsoft/azuredatastudio/issues/450)
 // in case that other non-Azure sign in is to be used
@@ -65,21 +64,18 @@ export class FirewallRuleDialog extends Modal {
 	constructor(
 		@IAccountPickerService private _accountPickerService: IAccountPickerService,
 		@IPartService partService: IPartService,
-		@IWorkbenchThemeService private _workbenchThemeService: IWorkbenchThemeService,
+		@IWorkbenchThemeService private _themeService: IWorkbenchThemeService,
 		@IInstantiationService private _instantiationService: IInstantiationService,
 		@IContextViewService private _contextViewService: IContextViewService,
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IWindowsService private _windowsService: IWindowsService,
 		@IClipboardService clipboardService: IClipboardService
 	) {
 		super(
 			localize('createNewFirewallRule', 'Create new firewall rule'),
 			TelemetryKeys.FireWallRule,
 			partService,
 			telemetryService,
 			clipboardService,
 			_workbenchThemeService,
 			contextKeyService,
 			{
 				isFlyout: true,
@@ -206,8 +202,8 @@ export class FirewallRuleDialog extends Modal {
 			builder.append(firewallRuleSection);
 		});
-		this._register(this._workbenchThemeService.onDidColorThemeChange(e => this.updateTheme(e)));
+		this._register(this._themeService.onDidColorThemeChange(e => this.updateTheme(e)));
-		this.updateTheme(this._workbenchThemeService.getColorTheme());
+		this.updateTheme(this._themeService.getColorTheme());
 		$(this._IPAddressInput).on(DOM.EventType.CLICK, () => {
 			this.onFirewallRuleOptionSelected(true);
--- a/src/sql/parts/connection/connectionDialog/connectionDialogService.ts
+++ b/src/sql/parts/connection/connectionDialog/connectionDialogService.ts
@@ -87,32 +87,16 @@ export class ConnectionDialogService implements IConnectionDialogService {
 		@IClipboardService private _clipboardService: IClipboardService,
 		@ICommandService private _commandService: ICommandService
 	) { }
-/**
+
- * Gets the default provider with the following actions
+	private getDefaultProviderName() {
 * 	1. Checks if master provider(map) has data
 * 	2. If so, filters provider paramter against master map
 * 	3. Fetches the result array and extracts the first element
 * 	4. If none of the above data exists, returns 'MSSQL'
 * @returns: Default provider as string
 */
 	private getDefaultProviderName(): string {
 		let defaultProvider: string;
 		if (this._providerNameToDisplayNameMap) {
 			let keys = Object.keys(this._providerNameToDisplayNameMap);
 			let filteredKeys: string[];
 			if (keys && keys.length > 0) {
-				if (this._params && this._params.providers && this._params.providers.length > 0) {
+				defaultProvider = keys[0];
 					//Filter providers from master keys.
 					filteredKeys = keys.filter(key => this._params.providers.includes(key));
 				}
 				if (filteredKeys && filteredKeys.length > 0) {
 					defaultProvider = filteredKeys[0];
 				}
 				else {
 					defaultProvider = keys[0];
 				}
 			}
 		}
 		if (!defaultProvider && this._workspaceConfigurationService) {
 			defaultProvider = WorkbenchUtils.getSqlConfigValue<string>(this._workspaceConfigurationService, Constants.defaultEngine);
 		}
--- a/src/sql/parts/connection/connectionDialog/connectionDialogWidget.ts
+++ b/src/sql/parts/connection/connectionDialog/connectionDialogWidget.ts
@@ -36,7 +36,6 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import * as styler from 'vs/platform/theme/common/styler';
 import * as DOM from 'vs/base/browser/dom';
 import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 export interface OnShowUIResponse {
 	selectedProviderType: string;
@@ -88,15 +87,14 @@ export class ConnectionDialogWidget extends Modal {
 		private providerNameToDisplayNameMap: { [providerDisplayName: string]: string },
 		@IInstantiationService private _instantiationService: IInstantiationService,
 		@IConnectionManagementService private _connectionManagementService: IConnectionManagementService,
-		@IWorkbenchThemeService private _workbenchThemeService: IWorkbenchThemeService,
+		@IWorkbenchThemeService private _themeService: IWorkbenchThemeService,
 		@IPartService _partService: IPartService,
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IContextMenuService private _contextMenuService: IContextMenuService,
-		@IContextViewService private _contextViewService: IContextViewService,
+		@IContextViewService private _contextViewService: IContextViewService
 		@IClipboardService clipboardService: IClipboardService
 	) {
-		super(localize('connection', 'Connection'), TelemetryKeys.Connection, _partService, telemetryService, clipboardService, _workbenchThemeService, contextKeyService, { hasSpinner: true, hasErrors: true });
+		super(localize('connection', 'Connection'), TelemetryKeys.Connection, _partService, telemetryService, contextKeyService, { hasSpinner: true, hasErrors: true });
 	}
 	public refresh(): void {
@@ -194,8 +192,8 @@ export class ConnectionDialogWidget extends Modal {
 		this.$connectionUIContainer.appendTo(this._bodyBuilder);
 		let self = this;
-		this._register(self._workbenchThemeService.onDidColorThemeChange(e => self.updateTheme(e)));
+		this._register(self._themeService.onDidColorThemeChange(e => self.updateTheme(e)));
-		self.updateTheme(self._workbenchThemeService.getColorTheme());
+		self.updateTheme(self._themeService.getColorTheme());
 	}
 	/**
--- a/src/sql/parts/dashboard/newDashboardTabDialog/newDashboardTabDialog.ts
+++ b/src/sql/parts/dashboard/newDashboardTabDialog/newDashboardTabDialog.ts
@@ -32,7 +32,6 @@ import * as TelemetryKeys from 'sql/common/telemetryKeys';
 import { Orientation } from 'sql/base/browser/ui/splitview/splitview';
 import { NewDashboardTabViewModel, IDashboardUITab } from 'sql/parts/dashboard/newDashboardTabDialog/newDashboardTabViewModel';
 import { IDashboardTab } from 'sql/platform/dashboard/common/dashboardRegistry';
 import { IClipboardService } from 'sql/platform/clipboard/common/clipboardService';
 class ExtensionListDelegate implements IVirtualDelegate<IDashboardUITab> {
@@ -120,22 +119,19 @@ export class NewDashboardTabDialog extends Modal {
 	constructor(
 		@IPartService partService: IPartService,
-		@IThemeService themeService: IThemeService,
+		@IThemeService private _themeService: IThemeService,
 		@IListService private _listService: IListService,
 		@IInstantiationService private _instantiationService: IInstantiationService,
 		@IContextMenuService private _contextMenuService: IContextMenuService,
 		@IKeybindingService private _keybindingService: IKeybindingService,
 		@ITelemetryService telemetryService: ITelemetryService,
-		@IContextKeyService contextKeyService: IContextKeyService,
+		@IContextKeyService contextKeyService: IContextKeyService
 		@IClipboardService clipboardService: IClipboardService
 	) {
 		super(
 			localize('newDashboardTab.openDashboardExtensions', 'Open dashboard extensions'),
 			TelemetryKeys.AddNewDashboardTab,
 			partService,
 			telemetryService,
 			clipboardService,
 			themeService,
 			contextKeyService,
 			{ hasSpinner: true }
 		);
--- a/src/sql/parts/disasterRecovery/backup/backupDialog.ts
+++ b/src/sql/parts/disasterRecovery/backup/backupDialog.ts
@@ -18,7 +18,6 @@ import { Builder } from 'vs/base/browser/builder';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { bootstrapAngular } from 'sql/services/bootstrap/bootstrapService';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 export class BackupDialog extends Modal {
 	private _bodyBuilder: Builder;
@@ -27,15 +26,14 @@ export class BackupDialog extends Modal {
 	private _moduleRef: any;
 	constructor(
-		@IThemeService themeService: IThemeService,
+		@IThemeService private _themeService: IThemeService,
 		@IPartService partService: IPartService,
 		@IConnectionManagementService private _connectionManagementService: IConnectionManagementService,
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IContextKeyService contextKeyService: IContextKeyService,
-		@IInstantiationService private _instantiationService: IInstantiationService,
+		@IInstantiationService private _instantiationService: IInstantiationService
 		@IClipboardService clipboardService: IClipboardService
 	) {
-		super('', TelemetryKeys.Backup, partService, telemetryService, clipboardService, themeService, contextKeyService, { isAngular: true, hasErrors: true });
+		super('', TelemetryKeys.Backup, partService, telemetryService, contextKeyService, { isAngular: true, hasErrors: true });
 	}
 	protected renderBody(container: HTMLElement) {
--- a/src/sql/parts/disasterRecovery/restore/restoreDialog.ts
+++ b/src/sql/parts/disasterRecovery/restore/restoreDialog.ts
@@ -42,7 +42,6 @@ import { Dropdown } from 'sql/base/browser/ui/editableDropdown/dropdown';
 import { TabbedPanel, PanelTabIdentifier } from 'sql/base/browser/ui/panel/panel';
 import { ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes';
 import { IFileBrowserDialogController } from 'sql/parts/fileBrowser/common/interfaces';
 import { IClipboardService } from 'sql/platform/clipboard/common/clipboardService';
 interface FileListElement {
 	logicalFileName: string;
@@ -130,14 +129,13 @@ export class RestoreDialog extends Modal {
 	constructor(
 		optionsMetadata: sqlops.ServiceOption[],
 		@IPartService partService: IPartService,
-		@IThemeService themeService: IThemeService,
+		@IThemeService private _themeService: IThemeService,
 		@IContextViewService private _contextViewService: IContextViewService,
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IContextKeyService contextKeyService: IContextKeyService,
-		@IFileBrowserDialogController private fileBrowserDialogService: IFileBrowserDialogController,
+		@IFileBrowserDialogController private fileBrowserDialogService: IFileBrowserDialogController
 		@IClipboardService clipboardService: IClipboardService
 	) {
-		super(localize('RestoreDialogTitle', 'Restore database'), TelemetryKeys.Restore, partService, telemetryService, clipboardService, themeService, contextKeyService, { hasErrors: true, isWide: true, hasSpinner: true });
+		super(localize('RestoreDialogTitle', 'Restore database'), TelemetryKeys.Restore, partService, telemetryService, contextKeyService, { hasErrors: true, isWide: true, hasSpinner: true });
 		this._restoreTitle = localize('restoreDialog.restoreTitle', 'Restore database');
 		this._databaseTitle = localize('restoreDialog.database', 'Database');
 		this._backupFileTitle = localize('restoreDialog.backupFile', 'Backup file');
--- a/src/sql/parts/fileBrowser/fileBrowserDialog.ts
+++ b/src/sql/parts/fileBrowser/fileBrowserDialog.ts
@@ -34,7 +34,6 @@ import { SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme';
 import { IPartService } from 'vs/workbench/services/part/common/partService';
 import * as DOM from 'vs/base/browser/dom';
 import * as strings from 'vs/base/common/strings';
 import { IClipboardService } from 'sql/platform/clipboard/common/clipboardService';
 export class FileBrowserDialog extends Modal {
 	private _viewModel: FileBrowserViewModel;
@@ -53,14 +52,13 @@ export class FileBrowserDialog extends Modal {
 	constructor(title: string,
 		@IPartService partService: IPartService,
-		@IWorkbenchThemeService private _workbenchthemeService: IWorkbenchThemeService,
+		@IWorkbenchThemeService private _themeService: IWorkbenchThemeService,
 		@IInstantiationService private _instantiationService: IInstantiationService,
 		@IContextViewService private _contextViewService: IContextViewService,
 		@ITelemetryService telemetryService: ITelemetryService,
-		@IContextKeyService contextKeyService: IContextKeyService,
+		@IContextKeyService contextKeyService: IContextKeyService
 		@IClipboardService clipboardService: IClipboardService
 	) {
-		super(title, TelemetryKeys.Backup, partService, telemetryService, clipboardService, _workbenchthemeService, contextKeyService, { isFlyout: true, hasTitleIcon: false, hasBackButton: true, hasSpinner: true });
+		super(title, TelemetryKeys.Backup, partService, telemetryService, contextKeyService, { isFlyout: true, hasTitleIcon: false, hasBackButton: true, hasSpinner: true });
 		this._viewModel = this._instantiationService.createInstance(FileBrowserViewModel);
 		this._viewModel.onAddFileTree(args => this.handleOnAddFileTree(args.rootNode, args.selectedNode, args.expandedNodes));
 		this._viewModel.onPathValidate(args => this.handleOnValidate(args.succeeded, args.message));
@@ -238,7 +236,7 @@ export class FileBrowserDialog extends Modal {
 		this._register(attachButtonStyler(this._okButton, this._themeService));
 		this._register(attachButtonStyler(this._cancelButton, this._themeService));
-		this._register(this._workbenchthemeService.onDidColorThemeChange(e => this.updateTheme()));
+		this._register(this._themeService.onDidColorThemeChange(e => this.updateTheme()));
 	}
 	// Update theming that is specific to file browser
--- a/src/sql/parts/insights/browser/insightsDialogView.ts
+++ b/src/sql/parts/insights/browser/insightsDialogView.ts
@@ -39,7 +39,6 @@ import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { MenuRegistry, ExecuteCommandAction } from 'vs/platform/actions/common/actions';
 import { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService';
 import { IClipboardService } from 'sql/platform/clipboard/common/clipboardService';
 const labelDisplay = nls.localize("insights.item", "Item");
 const valueDisplay = nls.localize("insights.value", "Value");
@@ -125,17 +124,16 @@ export class InsightsDialogView extends Modal {
 	constructor(
 		private _model: IInsightsDialogModel,
 		@IInstantiationService private _instantiationService: IInstantiationService,
-		@IThemeService themeService: IThemeService,
+		@IThemeService private _themeService: IThemeService,
 		@IListService private _listService: IListService,
 		@IPartService partService: IPartService,
 		@IContextMenuService private _contextMenuService: IContextMenuService,
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@ICommandService private _commandService: ICommandService,
-		@ICapabilitiesService private _capabilitiesService: ICapabilitiesService,
+		@ICapabilitiesService private _capabilitiesService: ICapabilitiesService
 		@IClipboardService clipboardService: IClipboardService
 	) {
-		super(nls.localize("InsightsDialogTitle", "Insights"), TelemetryKeys.Insights, partService, telemetryService, clipboardService, themeService, contextKeyService);
+		super(nls.localize("InsightsDialogTitle", "Insights"), TelemetryKeys.Insights, partService, telemetryService, contextKeyService);
 		this._model.onDataChange(e => this.build());
 	}
--- a/src/sql/parts/jobManagement/common/interfaces.ts
+++ b/src/sql/parts/jobManagement/common/interfaces.ts
@@ -7,7 +7,7 @@
 import * as sqlops from 'sqlops';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { JobCacheObject, AlertsCacheObject, ProxiesCacheObject, OperatorsCacheObject } from './jobManagementService';
+import { JobCacheObject } from './jobManagementService';
 import { Event } from 'vs/base/common/event';
 export const SERVICE_ID = 'jobManagementService';
@@ -39,10 +39,6 @@ export interface IJobManagementService {
 	getCredentials(connectionUri: string): Thenable<sqlops.GetCredentialsResult>;
 	jobAction(connectionUri: string, jobName: string, action: string): Thenable<sqlops.ResultStatus>;
-	addToCache(server: string, cache: JobCacheObject | OperatorsCacheObject);
+	addToCache(server: string, cache: JobCacheObject);
 	jobCacheObjectMap:  { [server: string]: JobCacheObject; };
 	operatorsCacheObjectMap: { [server: string]: OperatorsCacheObject; };
 	alertsCacheObjectMap: { [server: string]: AlertsCacheObject; };
 	proxiesCacheObjectMap: {[server: string]: ProxiesCacheObject };
 	addToCache(server: string, cache: JobCacheObject | ProxiesCacheObject | AlertsCacheObject | OperatorsCacheObject);
 }
--- a/src/sql/parts/jobManagement/common/jobManagementService.ts
+++ b/src/sql/parts/jobManagement/common/jobManagementService.ts
@@ -19,10 +19,7 @@ export class JobManagementService implements IJobManagementService {
 	public readonly onDidChange: Event<void> = this._onDidChange.event;
 	private _providers: { [handle: string]: sqlops.AgentServicesProvider; } = Object.create(null);
-	private _jobCacheObjectMap : {[server: string]: JobCacheObject; } = {};
+	private _jobCacheObject : {[server: string]: JobCacheObject; } = {};
 	private _operatorsCacheObjectMap: {[server: string]: OperatorsCacheObject; } = {};
 	private _alertsCacheObject: {[server: string]: AlertsCacheObject; } = {};
 	private _proxiesCacheObjectMap: {[server: string]: ProxiesCacheObject; } = {};
 	constructor(
 		@IConnectionManagementService private _connectionService: IConnectionManagementService
@@ -130,36 +127,16 @@ export class JobManagementService implements IJobManagementService {
 	}
 	public get jobCacheObjectMap(): {[server: string]: JobCacheObject;} {
-		return this._jobCacheObjectMap;
+		return this._jobCacheObject;
 	}
-	public get alertsCacheObjectMap(): {[server: string]: AlertsCacheObject; } {
+	public addToCache(server: string, cacheObject: JobCacheObject) {
-		return this._alertsCacheObject;
+		this._jobCacheObject[server] = cacheObject;
 	}
 	public get proxiesCacheObjectMap(): {[server: string]: ProxiesCacheObject; } {
 		return this._proxiesCacheObjectMap;
 	}
 	public get operatorsCacheObjectMap(): {[server: string]: OperatorsCacheObject} {
 		return this._operatorsCacheObjectMap;
 	}
 	public addToCache(server: string, cacheObject: JobCacheObject | OperatorsCacheObject | ProxiesCacheObject | AlertsCacheObject) {
 		if (cacheObject instanceof JobCacheObject) {
 			this._jobCacheObjectMap[server] = cacheObject;
 		} else if (cacheObject instanceof OperatorsCacheObject) {
 			this._operatorsCacheObjectMap[server] = cacheObject;
 		} else if (cacheObject instanceof AlertsCacheObject) {
 			this._alertsCacheObject[server] = cacheObject;
 		} else if (cacheObject instanceof ProxiesCacheObject) {
 			this._proxiesCacheObjectMap[server] = cacheObject;
 		}
 	}
 }
 /**
- * Server level caching of jobs/job histories and their views
+ * Server level caching of jobs/job histories
 */
 export class JobCacheObject {
 	_serviceBrand: any;
@@ -254,117 +231,4 @@ export class JobCacheObject {
 		public setJobSchedules(jobID: string, value: sqlops.AgentJobScheduleInfo[]) {
 			this._jobSchedules[jobID] = value;
 		}
 }
 /**
 * Server level caching of Operators
 */
 export class OperatorsCacheObject {
 	_serviceBrand: any;
 	private _operators: sqlops.AgentOperatorInfo[];
 	private _dataView: Slick.Data.DataView<any>;
 	private _serverName: string;
 	/** Getters */
 	public get operators(): sqlops.AgentOperatorInfo[] {
 		return this._operators;
 	}
 	public get dataview(): Slick.Data.DataView<any> {
 		return this._dataView;
 	}
 	public get serverName(): string {
 		return this._serverName;
 	}
 	/** Setters */
 	public set operators(value: sqlops.AgentOperatorInfo[]) {
 		this._operators = value;
 	}
 	public set dataview(value: Slick.Data.DataView<any>) {
 		this._dataView = value;
 	}
 	public set serverName(value: string) {
 		this._serverName = value;
 	}
 }
 /*
 * Server level caching of job alerts and the alerts view
 */
 export class AlertsCacheObject {
   _serviceBrand: any;
   private _alerts: sqlops.AgentAlertInfo[];
   private _dataView: Slick.Data.DataView<any>;
   private _serverName: string;
   	/** Getters */
 	public get alerts(): sqlops.AgentAlertInfo[] {
 		return this._alerts;
 	}
 	public get dataview(): Slick.Data.DataView<any> {
 		return this._dataView;
 	}
 	public get serverName(): string {
 		return this._serverName;
 	}
 	/** Setters */
 	public set alerts(value: sqlops.AgentAlertInfo[]) {
 		this._alerts = value;
 	}
 	public set dataview(value: Slick.Data.DataView<any>) {
 		this._dataView = value;
 	}
 	public set serverName(value: string) {
 		this._serverName = value;
 	}
 }
 /**
 * Server level caching of job proxies and proxies view
 */
 export class ProxiesCacheObject {
 	_serviceBrand: any;
 	private _proxies: sqlops.AgentProxyInfo[];
 	private _dataView: Slick.Data.DataView<any>;
 	private _serverName: string;
 	/**
 	 * Getters
 	 */
 	public get proxies(): sqlops.AgentProxyInfo[] {
 		return this._proxies;
 	}
 	public get dataview(): Slick.Data.DataView<any> {
 		return this._dataView;
 	}
 	public get serverName(): string {
 		return this._serverName;
 	}
 	/** Setters */
 	public set proxies(value: sqlops.AgentProxyInfo[]) {
 		this._proxies = value;
 	}
 	public set dataview(value: Slick.Data.DataView<any>) {
 		this._dataView = value;
 	}
 	public set serverName(value: string) {
 		this._serverName = value;
 	}
 }
--- a/src/sql/parts/jobManagement/common/media/jobs.css
+++ b/src/sql/parts/jobManagement/common/media/jobs.css
@@ -104,16 +104,6 @@ jobhistory-component {
    display: inline-block;
 }
 #operatorsDiv .joboperatorsview-grid .slick-cell.l1.r1 .operatorview-operatornametext,
 #alertsDiv .jobalertsview-grid .slick-cell.l1.r1 .alertview-alertnametext,
 #proxiesDiv .jobproxiesview-grid .slick-cell.l1.r1 .proxyview-proxynametext {
    text-overflow: ellipsis;
    width: 100%;
    overflow: hidden;
    white-space: nowrap;
    display: inline-block;
 }
 #jobsDiv .job-with-error {
    border-bottom: none;
 }
@@ -400,18 +390,4 @@ jobsview-component .jobview-grid .slick-cell.error-row {
 .overview-container > .overview-tab > label {
    margin-bottom: 0px;
 }
 #operatorsDiv .operatorview-operatornameindicatorenabled,
 #alertsDiv .alertview-alertnameindicatorenabled,
 #proxiesDiv .proxyview-proxynameindicatorenabled {
    width: 5px;
    background: green;
 }
 #operatorsDiv .operatorview-operatornameindicatordisabled,
 #alertsDiv .alertview-alertnameindicatordisabled,
 #proxiesDiv .proxyview-proxynameindicatordisabled {
    width: 5px;
    background: red;
 }
--- a/src/sql/parts/jobManagement/views/alertsView.component.ts
+++ b/src/sql/parts/jobManagement/views/alertsView.component.ts
@@ -30,11 +30,9 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IDashboardService } from 'sql/services/dashboard/common/dashboardService';
 import { AlertsCacheObject } from 'sql/parts/jobManagement/common/jobManagementService';
 import { RowDetailView } from 'sql/base/browser/ui/table/plugins/rowdetailview';
 export const VIEW_SELECTOR: string = 'jobalertsview-component';
-export const ROW_HEIGHT: number = 45;
+export const ROW_HEIGHT: number = 30;
@Component({
 	selector: VIEW_SELECTOR,
@@ -44,17 +42,11 @@ export const ROW_HEIGHT: number = 45;
 export class AlertsViewComponent extends JobManagementView implements OnInit {
 	private columns: Array<Slick.Column<any>> = [
-		{
+		{ name: nls.localize('jobAlertColumns.name', 'Name'), field: 'name', width: 200, id: 'name' },
-			name: nls.localize('jobAlertColumns.name', 'Name'),
+		{ name: nls.localize('jobAlertColumns.lastOccurrenceDate', 'Last Occurrence'), field: 'lastOccurrenceDate', width: 200, id: 'lastOccurrenceDate' },
-			field: 'name',
+		{ name: nls.localize('jobAlertColumns.enabled', 'Enabled'), field: 'enabled', width: 200, id: 'enabled' },
-			formatter: (row, cell, value, columnDef, dataContext) => this.renderName(row, cell, value, columnDef, dataContext),
+		{ name: nls.localize('jobAlertColumns.databaseName', 'Database Name'), field: 'databaseName', width: 200, id: 'databaseName' },
-			width: 500,
+		{ name: nls.localize('jobAlertColumns.categoryName', 'Category Name'), field: 'categoryName', width: 200, id: 'categoryName' },
 			id: 'name'
 		},
 		{ name: nls.localize('jobAlertColumns.lastOccurrenceDate', 'Last Occurrence'), field: 'lastOccurrenceDate', width: 150, id: 'lastOccurrenceDate' },
 		{ name: nls.localize('jobAlertColumns.enabled', 'Enabled'), field: 'enabled', width: 80, id: 'enabled' },
 		{ name: nls.localize('jobAlertColumns.delayBetweenResponses', 'Delay Between Responses (in secs)'), field: 'delayBetweenResponses', width: 200, id: 'delayBetweenResponses' },
 		{ name: nls.localize('jobAlertColumns.categoryName', 'Category Name'), field: 'categoryName', width: 250, id: 'categoryName' },
 	];
 	private options: Slick.GridOptions<any> = {
@@ -67,7 +59,6 @@ export class AlertsViewComponent extends JobManagementView implements OnInit {
 	private dataView: any;
 	private _isCloud: boolean;
 	private _alertsCacheObject: AlertsCacheObject;
 	@ViewChild('jobalertsgrid') _gridEl: ElementRef;
@@ -87,15 +78,6 @@ export class AlertsViewComponent extends JobManagementView implements OnInit {
 		@Inject(IDashboardService) _dashboardService: IDashboardService) {
 		super(commonService, _dashboardService, contextMenuService, keybindingService, instantiationService);
 		this._isCloud = commonService.connectionManagementService.connectionInfo.serverInfo.isCloud;
 		let alertsCacheObjectMap = this._jobManagementService.alertsCacheObjectMap;
 		let alertsCache = alertsCacheObjectMap[this._serverName];
 		if (alertsCache) {
 			this._alertsCacheObject = alertsCache;
 		} else {
 			this._alertsCacheObject = new AlertsCacheObject();
 			this._alertsCacheObject.serverName = this._serverName;
 			this._jobManagementService.addToCache(this._serverName, this._alertsCacheObject);
 		}
 	}
 	ngOnInit(){
@@ -110,67 +92,44 @@ export class AlertsViewComponent extends JobManagementView implements OnInit {
 			height = 0;
 		}
-		if (this._table) {
+		this._table.layout(new dom.Dimension(
-			this._table.layout(new dom.Dimension(
+			dom.getContentWidth(this._gridEl.nativeElement),
-				dom.getContentWidth(this._gridEl.nativeElement),
+			height));
 				height));
 		}
 	}
 	onFirstVisible() {
 		let self = this;
 		let cached: boolean = false;
 		if (this._alertsCacheObject.serverName === this._serverName) {
 			if (this._alertsCacheObject.alerts && this._alertsCacheObject.alerts.length > 0) {
 				cached = true;
 				this.alerts = this._alertsCacheObject.alerts;
 			}
 		}
 		let columns = this.columns.map((column) => {
 			column.rerenderOnResize = true;
 			return column;
 		});
-		this.dataView = new Slick.Data.DataView({ inlineFilters: false });
+		this.dataView = new Slick.Data.DataView();
-		let rowDetail = new RowDetailView({
+
 			cssClass: '_detail_selector',
 			useRowClick: false,
 			panelRows: 1
 		});
 		columns.unshift(rowDetail.getColumnDefinition());
 		$(this._gridEl.nativeElement).empty();
 		$(this.actionBarContainer.nativeElement).empty();
 		this.initActionBar();
 		this._table = new Table(this._gridEl.nativeElement, {columns}, this.options);
 		this._table.grid.setData(this.dataView, true);
 		this._register(this._table.onContextMenu(e => {
 			self.openContextMenu(e);
 		}));
-		// check for cached state
+		let ownerUri: string = this._commonService.connectionManagementService.connectionInfo.ownerUri;
-		if (cached && this._agentViewComponent.refresh !== true) {
+		this._jobManagementService.getAlerts(ownerUri).then((result) => {
-			self.onAlertsAvailable(this.alerts);
+			if (result && result.alerts) {
 				self.alerts = result.alerts;
 				self.onAlertsAvailable(result.alerts);
 			} else {
 				// TODO: handle error
 			}
 			this._showProgressWheel = false;
 			if (this.isVisible) {
 				this._cd.detectChanges();
 			}
-		} else {
+		});
 			let ownerUri: string = this._commonService.connectionManagementService.connectionInfo.ownerUri;
 			this._jobManagementService.getAlerts(ownerUri).then((result) => {
 				if (result && result.alerts) {
 					self.alerts = result.alerts;
 					self._alertsCacheObject.alerts = result.alerts;
 					self.onAlertsAvailable(result.alerts);
 				} else {
 					// TODO: handle error
 				}
 				this._showProgressWheel = false;
 				if (this.isVisible) {
 					this._cd.detectChanges();
 				}
 			});
 		}
 	}
 	private onAlertsAvailable(alerts: sqlops.AgentAlertInfo[]) {
@@ -180,7 +139,7 @@ export class AlertsViewComponent extends JobManagementView implements OnInit {
 				name: item.name,
 				lastOccurrenceDate: item.lastOccurrenceDate,
 				enabled: item.isEnabled,
-				delayBetweenResponses: item.delayBetweenResponses,
+				databaseName: item.databaseName,
 				categoryName: item.categoryName
 			};
 		});
@@ -188,7 +147,6 @@ export class AlertsViewComponent extends JobManagementView implements OnInit {
 		this.dataView.beginUpdate();
 		this.dataView.setItems(items);
 		this.dataView.endUpdate();
 		this._alertsCacheObject.dataview = this.dataView;
 		this._table.autosizeColumns();
 		this._table.resizeCanvas();
 	}
@@ -206,17 +164,6 @@ export class AlertsViewComponent extends JobManagementView implements OnInit {
 			: undefined;
 	}
 	private renderName(row, cell, value, columnDef, dataContext) {
 		let resultIndicatorClass = dataContext.enabled ? 'alertview-alertnameindicatorenabled' :
 			'alertview-alertnameindicatordisabled';
 		return '<table class="alertview-alertnametable"><tr class="alertview-alertnamerow">' +
 			'<td nowrap class=' + resultIndicatorClass + '></td>' +
 			'<td nowrap class="alertview-alertnametext">' + dataContext.name + '</td>' +
 			'</tr></table>';
 	}
 	public openCreateAlertDialog() {
 		let ownerUri: string = this._commonService.connectionManagementService.connectionInfo.ownerUri;
 		this._jobManagementService.getJobs(ownerUri).then((result) => {
--- a/src/sql/parts/jobManagement/views/jobHistory.component.ts
+++ b/src/sql/parts/jobManagement/views/jobHistory.component.ts
@@ -63,6 +63,7 @@ export class JobHistoryComponent extends JobManagementView implements OnInit {
 	private _jobCacheObject: JobCacheObject;
 	private _agentJobInfo: sqlops.AgentJobInfo;
 	private _noJobsAvailable: boolean = false;
 	private _serverName: string;
 	private static readonly INITIAL_TREE_HEIGHT: number = 780;
 	private static readonly HEADING_HEIGHT: number = 24;
--- a/src/sql/parts/jobManagement/views/jobManagementView.ts
+++ b/src/sql/parts/jobManagement/views/jobManagementView.ts
@@ -28,7 +28,6 @@ export abstract class JobManagementView extends TabChild implements AfterContent
 	protected _parentComponent: AgentViewComponent;
 	protected _table: Table<any>;
 	protected _actionBar: Taskbar;
 	protected _serverName: string;
 	public contextAction: any;
 	@ViewChild('actionbarContainer') protected actionBarContainer: ElementRef;
@@ -42,7 +41,6 @@ export abstract class JobManagementView extends TabChild implements AfterContent
 		super();
 		let self = this;
 		this._serverName = this._commonService.connectionManagementService.connectionInfo.connectionProfile.serverName;
 		this._dashboardService.onLayout((d) => {
 			self.layout();
 		});
--- a/src/sql/parts/jobManagement/views/jobsView.component.ts
+++ b/src/sql/parts/jobManagement/views/jobsView.component.ts
@@ -78,6 +78,7 @@ export class JobsViewComponent extends JobManagementView implements OnInit  {
 	private rowDetail: RowDetailView;
 	private filterPlugin: any;
 	private dataView: any;
 	private _serverName: string;
 	private _isCloud: boolean;
 	private filterStylingMap: { [columnName: string]: [any]; } = {};
 	private filterStack = ['start'];
@@ -108,6 +109,7 @@ export class JobsViewComponent extends JobManagementView implements OnInit  {
 	) {
 		super(commonService, _dashboardService, contextMenuService, keybindingService, instantiationService);
 		let jobCacheObjectMap = this._jobManagementService.jobCacheObjectMap;
 		this._serverName = commonService.connectionManagementService.connectionInfo.connectionProfile.serverName;
 		let jobCache = jobCacheObjectMap[this._serverName];
 		if (jobCache) {
 			this._jobCacheObject = jobCache;
--- a/src/sql/parts/jobManagement/views/operatorsView.component.ts
+++ b/src/sql/parts/jobManagement/views/operatorsView.component.ts
@@ -30,11 +30,9 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { IAction } from 'vs/base/common/actions';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IDashboardService } from 'sql/services/dashboard/common/dashboardService';
 import { OperatorsCacheObject } from 'sql/parts/jobManagement/common/jobManagementService';
 import { RowDetailView } from 'sql/base/browser/ui/table/plugins/rowdetailview';
 export const VIEW_SELECTOR: string = 'joboperatorsview-component';
-export const ROW_HEIGHT: number = 45;
+export const ROW_HEIGHT: number = 30;
@Component({
 	selector: VIEW_SELECTOR,
@@ -45,13 +43,7 @@ export const ROW_HEIGHT: number = 45;
 export class OperatorsViewComponent extends JobManagementView implements OnInit {
 	private columns: Array<Slick.Column<any>> = [
-		{
+		{ name: nls.localize('jobOperatorsView.name', 'Name'), field: 'name', width: 200, id: 'name' },
 			name: nls.localize('jobOperatorsView.name', 'Name'),
 			field: 'name',
 			formatter: (row, cell, value, columnDef, dataContext) => this.renderName(row, cell, value, columnDef, dataContext),
 			width: 200,
 			id: 'name'
 		},
 		{ name: nls.localize('jobOperatorsView.emailAddress', 'Email Address'), field: 'emailAddress', width: 200, id: 'emailAddress' },
 		{ name: nls.localize('jobOperatorsView.enabled', 'Enabled'), field: 'enabled', width: 200, id: 'enabled' },
 	];
@@ -65,8 +57,8 @@ export class OperatorsViewComponent extends JobManagementView implements OnInit
 	};
 	private dataView: any;
 	private _serverName: string;
 	private _isCloud: boolean;
 	private _operatorsCacheObject: OperatorsCacheObject;
 	@ViewChild('operatorsgrid') _gridEl: ElementRef;
@@ -87,15 +79,6 @@ export class OperatorsViewComponent extends JobManagementView implements OnInit
 	) {
 		super(commonService, _dashboardService, contextMenuService, keybindingService, instantiationService);
 		this._isCloud = commonService.connectionManagementService.connectionInfo.serverInfo.isCloud;
 		let operatorsCacheObject = this._jobManagementService.operatorsCacheObjectMap;
 		let operatorsCache = operatorsCacheObject[this._serverName];
 		if (operatorsCache) {
 			this._operatorsCacheObject = operatorsCache;
 		} else {
 			this._operatorsCacheObject = new OperatorsCacheObject();
 			this._operatorsCacheObject.serverName = this._serverName;
 			this._jobManagementService.addToCache(this._serverName, this._operatorsCacheObject);
 		}
 	}
 	ngOnInit(){
@@ -110,36 +93,19 @@ export class OperatorsViewComponent extends JobManagementView implements OnInit
 			height = 0;
 		}
-		if (this._table) {
+		this._table.layout(new dom.Dimension(
-			this._table.layout(new dom.Dimension(
+			dom.getContentWidth(this._gridEl.nativeElement),
-				dom.getContentWidth(this._gridEl.nativeElement),
+			height));
 				height));
 		}
 	}
 	onFirstVisible() {
 		let self = this;
 		let cached: boolean = false;
 		if (this._operatorsCacheObject.serverName === this._serverName) {
 			if (this._operatorsCacheObject.operators && this._operatorsCacheObject.operators.length > 0) {
 				cached = true;
 				this.operators = this._operatorsCacheObject.operators;
 			}
 		}
 		let columns = this.columns.map((column) => {
 			column.rerenderOnResize = true;
 			return column;
 		});
-		this.dataView = new Slick.Data.DataView({ inlineFilters: false });
+		this.dataView = new Slick.Data.DataView();
 		let rowDetail = new RowDetailView({
 			cssClass: '_detail_selector',
 			useRowClick: false,
 			panelRows: 1
 		});
 		columns.unshift(rowDetail.getColumnDefinition());
 		$(this._gridEl.nativeElement).empty();
 		$(this.actionBarContainer.nativeElement).empty();
@@ -151,29 +117,20 @@ export class OperatorsViewComponent extends JobManagementView implements OnInit
 			self.openContextMenu(e);
 		}));
-		// check for cached state
+		let ownerUri: string = this._commonService.connectionManagementService.connectionInfo.ownerUri;
-		if (cached && this._agentViewComponent.refresh !== true) {
+		this._jobManagementService.getOperators(ownerUri).then((result) => {
-			this.onOperatorsAvailable(this.operators);
+			if (result && result.operators) {
 				self.operators = result.operators;
 				self.onOperatorsAvailable(result.operators);
 			} else {
 				// TODO: handle error
 			}
 			this._showProgressWheel = false;
 			if (this.isVisible) {
 				this._cd.detectChanges();
 			}
-		} else {
+		});
 			let ownerUri: string = this._commonService.connectionManagementService.connectionInfo.ownerUri;
 			this._jobManagementService.getOperators(ownerUri).then((result) => {
 				if (result && result.operators) {
 					self.operators = result.operators;
 					self._operatorsCacheObject.operators = result.operators;
 					self.onOperatorsAvailable(result.operators);
 				} else {
 					// TODO: handle error
 				}
 				this._showProgressWheel = false;
 				if (this.isVisible) {
 					this._cd.detectChanges();
 				}
 			});
 		}
 	}
 	private onOperatorsAvailable(operators: sqlops.AgentOperatorInfo[]) {
@@ -189,7 +146,6 @@ export class OperatorsViewComponent extends JobManagementView implements OnInit
 		this.dataView.beginUpdate();
 		this.dataView.setItems(items);
 		this.dataView.endUpdate();
 		this._operatorsCacheObject.dataview = this.dataView;
 		this._table.autosizeColumns();
 		this._table.resizeCanvas();
 	}
@@ -207,15 +163,6 @@ export class OperatorsViewComponent extends JobManagementView implements OnInit
 			: undefined;
 	}
 	private renderName(row, cell, value, columnDef, dataContext) {
 		let resultIndicatorClass = dataContext.enabled ? 'operatorview-operatornameindicatorenabled' :
 			'operatorview-operatornameindicatordisabled';
 		return '<table class="operatorview-operatornametable"><tr class="operatorview-operatornamerow">' +
 			'<td nowrap class=' + resultIndicatorClass + '></td>' +
 			'<td nowrap class="operatorview-operatornametext">' + dataContext.name + '</td>' +
 			'</tr></table>';
 	}
 	public openCreateOperatorDialog() {
 		let ownerUri: string = this._commonService.connectionManagementService.connectionInfo.ownerUri;
 		this._commandService.executeCommand('agent.openOperatorDialog', ownerUri);
--- a/src/sql/parts/jobManagement/views/proxiesView.component.ts
+++ b/src/sql/parts/jobManagement/views/proxiesView.component.ts
@@ -30,11 +30,9 @@ import { IAction } from 'vs/base/common/actions';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IDashboardService } from 'sql/services/dashboard/common/dashboardService';
 import { ProxiesCacheObject } from 'sql/parts/jobManagement/common/jobManagementService';
 import { RowDetailView } from 'sql/base/browser/ui/table/plugins/rowdetailview';
 export const VIEW_SELECTOR: string = 'jobproxiesview-component';
-export const ROW_HEIGHT: number = 45;
+export const ROW_HEIGHT: number = 30;
@Component({
 	selector: VIEW_SELECTOR,
@@ -48,16 +46,8 @@ export class ProxiesViewComponent extends JobManagementView implements OnInit {
 	private RefreshText: string = nls.localize('jobProxyToolbar-Refresh', "Refresh");
 	private columns: Array<Slick.Column<any>> = [
-		{
+		{ name: nls.localize('jobProxiesView.accountName', 'Account Name'), field: 'accountName', width: 200, id: 'accountName' },
 			name: nls.localize('jobProxiesView.accountName', 'Account Name'),
 			field: 'accountName',
 			formatter: (row, cell, value, columnDef, dataContext) => this.renderName(row, cell, value, columnDef, dataContext),
 			width: 200,
 			id: 'accountName'
 		},
 		{ name: nls.localize('jobProxiesView.credentialName', 'Credential Name'), field: 'credentialName', width: 200, id: 'credentialName' },
 		{ name: nls.localize('jobProxiesView.description', 'Description'), field: 'description', width: 200, id: 'description'},
 		{ name: nls.localize('jobProxiesView.isEnabled', 'Enabled'), field: 'isEnabled', width: 200, id: 'isEnabled'}
 	];
 	private options: Slick.GridOptions<any> = {
@@ -69,8 +59,8 @@ export class ProxiesViewComponent extends JobManagementView implements OnInit {
 	};
 	private dataView: any;
 	private _serverName: string;
 	private _isCloud: boolean;
 	private _proxiesCacheObject: ProxiesCacheObject;
 	public proxies: sqlops.AgentProxyInfo[];
 	public readonly contextAction = NewProxyAction;
@@ -91,15 +81,6 @@ export class ProxiesViewComponent extends JobManagementView implements OnInit {
 	) {
 		super(commonService, _dashboardService, contextMenuService, keybindingService, instantiationService);
 		this._isCloud = commonService.connectionManagementService.connectionInfo.serverInfo.isCloud;
 		let proxiesCacheObjectMap = this._jobManagementService.proxiesCacheObjectMap;
 		let proxiesCacheObject = proxiesCacheObjectMap[this._serverName];
 		if (proxiesCacheObject) {
 			this._proxiesCacheObject = proxiesCacheObject;
 		} else {
 			this._proxiesCacheObject = new ProxiesCacheObject();
 			this._proxiesCacheObject.serverName = this._serverName;
 			this._jobManagementService.addToCache(this._serverName, this._proxiesCacheObject);
 		}
 	}
 	ngOnInit(){
@@ -114,35 +95,19 @@ export class ProxiesViewComponent extends JobManagementView implements OnInit {
 			height = 0;
 		}
-		if (this._table) {
+		this._table.layout(new dom.Dimension(
-			this._table.layout(new dom.Dimension(
+			dom.getContentWidth(this._gridEl.nativeElement),
-				dom.getContentWidth(this._gridEl.nativeElement),
+			height));
 				height));
 		}
 	}
 	onFirstVisible() {
 		let self = this;
 		let cached: boolean = false;
 		if (this._proxiesCacheObject.serverName === this._serverName) {
 			if (this._proxiesCacheObject.proxies && this._proxiesCacheObject.proxies.length > 0) {
 				cached = true;
 				this.proxies = this._proxiesCacheObject.proxies;
 			}
 		}
 		let columns = this.columns.map((column) => {
 			column.rerenderOnResize = true;
 			return column;
 		});
-		this.dataView = new Slick.Data.DataView({ inlineFilters: false });
+		this.dataView = new Slick.Data.DataView();
 		let rowDetail = new RowDetailView({
 			cssClass: '_detail_selector',
 			useRowClick: false,
 			panelRows: 1
 		});
 		columns.unshift(rowDetail.getColumnDefinition());
 		$(this._gridEl.nativeElement).empty();
 		$(this.actionBarContainer.nativeElement).empty();
@@ -154,29 +119,20 @@ export class ProxiesViewComponent extends JobManagementView implements OnInit {
 			self.openContextMenu(e);
 		}));
-		// checked for cached state
+		let ownerUri: string = this._commonService.connectionManagementService.connectionInfo.ownerUri;
-		if (cached && this._agentViewComponent.refresh !== true) {
+		this._jobManagementService.getProxies(ownerUri).then((result) => {
-			self.onProxiesAvailable(this.proxies);
+			if (result && result.proxies) {
 				self.proxies = result.proxies;
 				self.onProxiesAvailable(result.proxies);
 			} else {
 				// TODO: handle error
 			}
 			this._showProgressWheel = false;
 			if (this.isVisible) {
 				this._cd.detectChanges();
 			}
-		} else {
+		});
 			let ownerUri: string = this._commonService.connectionManagementService.connectionInfo.ownerUri;
 			this._jobManagementService.getProxies(ownerUri).then((result) => {
 				if (result && result.proxies) {
 					self.proxies = result.proxies;
 					self._proxiesCacheObject.proxies = result.proxies;
 					self.onProxiesAvailable(result.proxies);
 				} else {
 					// TODO: handle error
 				}
 				this._showProgressWheel = false;
 				if (this.isVisible) {
 					this._cd.detectChanges();
 				}
 			});
 		}
 	}
 	private onProxiesAvailable(proxies: sqlops.AgentProxyInfo[]) {
@@ -184,16 +140,13 @@ export class ProxiesViewComponent extends JobManagementView implements OnInit {
 			return {
 				id: item.accountName,
 				accountName: item.accountName,
-				credentialName: item.credentialName,
+				credentialName: item.credentialName
 				description: item.description,
 				isEnabled: item.isEnabled
 			};
 		});
 		this.dataView.beginUpdate();
 		this.dataView.setItems(items);
 		this.dataView.endUpdate();
 		this._proxiesCacheObject.dataview = this.dataView;
 		this._table.autosizeColumns();
 		this._table.resizeCanvas();
 	}
@@ -211,15 +164,6 @@ export class ProxiesViewComponent extends JobManagementView implements OnInit {
 			: undefined;
 	}
 	private renderName(row, cell, value, columnDef, dataContext) {
 		let resultIndicatorClass = dataContext.isEnabled ? 'proxyview-proxynameindicatorenabled' :
 			'proxyview-proxynameindicatordisabled';
 		return '<table class="proxyview-proxynametable"><tr class="proxyview-proxynamerow">' +
 			'<td nowrap class=' + resultIndicatorClass + '></td>' +
 			'<td nowrap class="proxyview-proxynametext">' + dataContext.accountName + '</td>' +
 			'</tr></table>';
 	}
 	public openCreateProxyDialog() {
 		let ownerUri: string = this._commonService.connectionManagementService.connectionInfo.ownerUri;
 		this._jobManagementService.getCredentials(ownerUri).then((result) => {
--- a/src/sql/parts/modelComponents/toolbarLayout.css
+++ b/src/sql/parts/modelComponents/toolbarLayout.css
@@ -39,7 +39,7 @@
 .modelview-toolbar-container .modelview-toolbar-title {
 	padding: 4px;
-	font-size: 13px;
+	font-size: 14px;
 	cursor: pointer;
 }
@@ -57,8 +57,8 @@
 /* Vertical button handling */
 .modelview-toolbar-container.toolbar-vertical  .modelview-toolbar-component modelview-button .monaco-text-button.icon {
-	padding: 20px 16px 20px 16px;
+	padding: 22px 16px 22px 16px;
-	background-size: 20px;
+	background-size: 22px;
 	margin-right: 0.3em;
 	background-position: 50% 50%;
--- a/src/sql/parts/modelComponents/tree/treeComponentRenderer.ts
+++ b/src/sql/parts/modelComponents/tree/treeComponentRenderer.ts
@@ -71,13 +71,6 @@ export class TreeDataTemplate extends Disposable {
 		}
 	}
 	public set enableCheckbox(value: boolean) {
 		if (value === undefined) {
 			value = true;
 		}
 		this._checkbox.disabled = !value;
 	}
 	public get checkbox(): HTMLInputElement {
 		return this._checkbox;
 	}
@@ -162,7 +155,6 @@ export class TreeComponentRenderer extends Disposable implements IRenderer {
 		templateData.label.textContent = label;
 		templateData.root.title = label;
 		templateData.checkboxState = this.getCheckboxState(treeNode);
 		templateData.enableCheckbox = treeNode.enabled;
 	}
 	private getCheckboxState(treeNode: ITreeComponentItem): TreeCheckboxState {
--- a/src/sql/parts/objectExplorer/serverGroupDialog/serverGroupDialog.ts
+++ b/src/sql/parts/objectExplorer/serverGroupDialog/serverGroupDialog.ts
@@ -26,7 +26,6 @@ import { ServerGroupViewModel } from 'sql/parts/objectExplorer/serverGroupDialog
 import { attachButtonStyler, attachModalDialogStyler } from 'sql/common/theme/styler';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import * as TelemetryKeys from 'sql/common/telemetryKeys';
 import { IClipboardService } from 'sql/platform/clipboard/common/clipboardService';
 export class ServerGroupDialog extends Modal {
 	private _bodyBuilder: Builder;
@@ -51,13 +50,12 @@ export class ServerGroupDialog extends Modal {
 	constructor(
 		@IPartService partService: IPartService,
-		@IThemeService themeService: IThemeService,
+		@IThemeService private _themeService: IThemeService,
 		@IContextViewService private _contextViewService: IContextViewService,
 		@ITelemetryService telemetryService: ITelemetryService,
-		@IContextKeyService contextKeyService: IContextKeyService,
+		@IContextKeyService contextKeyService: IContextKeyService
 		@IClipboardService clipboardService: IClipboardService
 	) {
-		super(localize('ServerGroupsDialogTitle', 'Server Groups'), TelemetryKeys.ServerGroups, partService, telemetryService, clipboardService, themeService, contextKeyService);
+		super(localize('ServerGroupsDialogTitle', 'Server Groups'), TelemetryKeys.ServerGroups, partService, telemetryService, contextKeyService);
 	}
 	public render() {
--- a/src/sql/parts/profiler/contrib/profilerActions.ts
+++ b/src/sql/parts/profiler/contrib/profilerActions.ts
@@ -4,7 +4,7 @@
 *--------------------------------------------------------------------------------------------*/
 'use strict';
-import 'vs/css!sql/parts/profiler/media/profiler';
+
 import { IProfilerService } from 'sql/parts/profiler/service/interfaces';
 import { IProfilerController } from 'sql/parts/profiler/editor/controller/interfaces';
 import { ProfilerInput } from 'sql/parts/profiler/editor/profilerInput';
@@ -157,7 +157,7 @@ export class ProfilerClear extends Action {
 	public static LABEL = nls.localize('profiler.clear', "Clear Data");
 	constructor(id: string, label: string) {
-		super(id, label, 'clear-results');
+		super(id, label);
 	}
 	run(input: ProfilerInput): TPromise<void> {
--- a/src/sql/parts/profiler/dialog/media/profilerDialog.css
+++ b/src/sql/parts/profiler/dialog/media/profilerDialog.css
@@ -11,11 +11,3 @@
 .tree-row > * {
 	display: inline-block;
 }
 .vs .icon.clear-results {
 	background-image: url('clear.svg');
 }
 .vs-dark .icon.clear-results {
 	background-image: url('clear_inverse.svg');
 }
--- a/src/sql/parts/profiler/dialog/profilerColumnEditorDialog.ts
+++ b/src/sql/parts/profiler/dialog/profilerColumnEditorDialog.ts
@@ -3,7 +3,7 @@
 *  Licensed under the Source EULA. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/
 'use strict';
-import 'vs/css!sql/parts/profiler/media/profiler';
+import 'vs/css!./media/profilerDialog';
 import { Modal } from 'sql/base/browser/ui/modal/modal';
 import { attachModalDialogStyler } from 'sql/common/theme/styler';
@@ -26,7 +26,6 @@ import { Event, Emitter } from 'vs/base/common/event';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { IClipboardService } from 'sql/platform/clipboard/common/clipboardService';
 class EventItem {
@@ -314,13 +313,12 @@ export class ProfilerColumnEditorDialog extends Modal {
 	constructor(
 		@IPartService _partService: IPartService,
-		@IThemeService themeService: IThemeService,
+		@IThemeService private _themeService: IThemeService,
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IContextKeyService contextKeyService: IContextKeyService,
-		@IContextViewService private _contextViewService: IContextViewService,
+		@IContextViewService private _contextViewService: IContextViewService
 		@IClipboardService clipboardService: IClipboardService
 	) {
-		super(nls.localize('profilerColumnDialog.profiler', 'Profiler'), TelemetryKeys.Profiler, _partService, telemetryService, clipboardService, themeService, contextKeyService);
+		super(nls.localize('profilerColumnDialog.profiler', 'Profiler'), TelemetryKeys.Profiler, _partService, telemetryService, contextKeyService);
 	}
 	public render(): void {
--- a/src/sql/parts/profiler/editor/controller/profilerTableEditor.ts
+++ b/src/sql/parts/profiler/editor/controller/profilerTableEditor.ts
@@ -113,7 +113,6 @@ export class ProfilerTableEditor extends BaseEditor implements IProfilerControll
 			this._stateListener.dispose();
 		}
 		this._stateListener = input.state.addChangeListener(e => this._onStateChange(e));
 		input.data.onRowCountChange(() => { this._profilerTable.updateRowCount(); });
 		if (this._findCountChangeListener) {
 			this._findCountChangeListener.dispose();
--- a/src/sql/parts/profiler/editor/profilerEditor.ts
+++ b/src/sql/parts/profiler/editor/profilerEditor.ts
@@ -252,7 +252,6 @@ export class ProfilerEditor extends BaseEditor {
 			{ action: this._pauseAction },
 			{ action: this._autoscrollAction },
 			{ action: this._instantiationService.createInstance(Actions.ProfilerClear, Actions.ProfilerClear.ID, Actions.ProfilerClear.LABEL) },
 			{ element: Taskbar.createTaskbarSeparator() },
 			{ element: viewTemplateContainer },
 			{ element: Taskbar.createTaskbarSeparator() },
 			{ element: this._connectionInfoText }
@@ -345,10 +344,6 @@ export class ProfilerEditor extends BaseEditor {
 			]
 		}, { forceFitColumns: true });
 		this._detailTableData.onRowCountChange(() => {
 			this._detailTable.updateRowCount();
 		});
 		this._tabbedPanel.pushTab({
 			identifier: 'detailTable',
 			title: nls.localize('details', "Details"),
--- a/src/sql/parts/profiler/media/clear.svg
+++ b/src/sql/parts/profiler/media/clear.svg
@@ -1 +0,0 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M7.065 13H15v2H2.056v-2h5.009zm3.661-12H7.385L8.44 2.061 7.505 3H15V1h-4.274zM3.237 9H2.056v2H15V9H3.237zm4.208-4l.995 1-.995 1H15V5H7.445z" fill="#424242"/><path d="M5.072 4.03L7.032 6 5.978 7.061l-1.96-1.97-1.961 1.97L1 6l1.96-1.97L1 2.061 2.056 1l1.96 1.97L5.977 1l1.057 1.061L5.072 4.03z" fill="#A1260D"/></svg>
--- a/src/sql/parts/profiler/media/clear_inverse.svg
+++ b/src/sql/parts/profiler/media/clear_inverse.svg
@@ -1 +0,0 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M7.065 13H15v2H2.056v-2h5.009zm3.661-12H7.385L8.44 2.061 7.505 3H15V1h-4.274zM3.237 9H2.056v2H15V9H3.237zm4.208-4l.995 1-.995 1H15V5H7.445z" fill="#C5C5C5"/><path d="M5.072 4.03L7.032 6 5.978 7.061l-1.96-1.97-1.961 1.97L1 6l1.96-1.97L1 2.061 2.056 1l1.96 1.97L5.977 1l1.057 1.061L5.072 4.03z" fill="#F48771"/></svg>
--- a/src/sql/parts/query/common/query.contribution.ts
+++ b/src/sql/parts/query/common/query.contribution.ts
@@ -120,8 +120,7 @@ actionRegistry.registerWorkbenchAction(
 	new SyncActionDescriptor(
 		RunCurrentQueryWithActualPlanKeyboardAction,
 		RunCurrentQueryWithActualPlanKeyboardAction.ID,
-		RunCurrentQueryWithActualPlanKeyboardAction.LABEL,
+		RunCurrentQueryWithActualPlanKeyboardAction.LABEL
 		{ primary: KeyMod.CtrlCmd | KeyCode.KEY_M }
 	),
 	RunCurrentQueryWithActualPlanKeyboardAction.LABEL
 );
--- a/src/sql/parts/query/editor/messagePanel.ts
+++ b/src/sql/parts/query/editor/messagePanel.ts
@@ -74,9 +74,8 @@ export class MessagePanelState {
 }
 export class MessagePanel extends ViewletPanel {
 	private messageLineCountMap = new Map<IResultMessage, number>();
 	private ds = new MessageDataSource();
-	private renderer = new MessageRenderer(this.messageLineCountMap);
+	private renderer = new MessageRenderer();
 	private model = new Model();
 	private controller: MessageController;
 	private container = $('div message-tree').getHTMLElement();
@@ -144,40 +143,29 @@ export class MessagePanel extends ViewletPanel {
 	private onMessage(message: IResultMessage | IResultMessage[]) {
 		let hasError = false;
 		let lines: number;
 		if (isArray(message)) {
 			hasError = message.find(e => e.isError) ? true : false;
 			lines = message.reduce((currentTotal, resultMessage) => currentTotal + this.countMessageLines(resultMessage), 0);
 			this.model.messages.push(...message);
 		} else {
 			hasError = message.isError;
 			lines = this.countMessageLines(message);
 			this.model.messages.push(message);
 		}
 		this.maximumBodySize += lines * 22;
 		if (hasError) {
 			this.setExpanded(true);
 		}
 		if (this.state.scrollPosition) {
 			this.tree.refresh(this.model).then(() => {
-				// Restore the previous scroll position when switching between tabs
+				this.tree.setScrollPosition(1);
 				this.tree.setScrollPosition(this.state.scrollPosition);
 			});
 		} else {
 			const previousScrollPosition = this.tree.getScrollPosition();
 			this.tree.refresh(this.model).then(() => {
 				// Scroll to the end if the user was already at the end otherwise leave the current scroll position
 				if (previousScrollPosition === 1) {
 					this.tree.setScrollPosition(1);
 				}
 			});
 		}
-	}
+		this.maximumBodySize = this.model.messages.length * 22;
 	private countMessageLines(resultMessage: IResultMessage): number {
 		let lines = resultMessage.message.split('\n').length;
 		this.messageLineCountMap.set(resultMessage, lines);
 		return lines;
 	}
 	private reset() {
@@ -232,15 +220,8 @@ class MessageDataSource implements IDataSource {
 }
 class MessageRenderer implements IRenderer {
 	constructor(private messageLineCountMap: Map<IResultMessage, number>) {
 	}
 	getHeight(tree: ITree, element: any): number {
-		const lineHeight = 22;
+		return 22;
 		if (this.messageLineCountMap.has(element)) {
 			return lineHeight * this.messageLineCountMap.get(element);
 		}
 		return lineHeight;
 	}
 	getTemplateId(tree: ITree, element: any): string {
@@ -277,7 +258,7 @@ class MessageRenderer implements IRenderer {
 	renderElement(tree: ITree, element: IResultMessage, templateId: string, templateData: IMessageTemplate | IBatchTemplate): void {
 		if (templateId === TemplateIds.MESSAGE || templateId === TemplateIds.ERROR) {
 			let data: IMessageTemplate = templateData;
-			data.message.innerText = element.message;
+			data.message.innerText = element.message.replace(/(\r\n|\n|\r)/g, ' ');
 		} else if (templateId === TemplateIds.BATCH) {
 			let data = templateData as IBatchTemplate;
 			data.timeStamp.innerText = element.time;
--- a/src/sql/parts/query/services/queryEditorService.ts
+++ b/src/sql/parts/query/services/queryEditorService.ts
@@ -124,7 +124,7 @@ export class QueryEditorService implements IQueryEditorService {
 			try {
 				// Create file path and file URI
 				let objectName = schemaName ? schemaName + '.' + tableName : tableName;
-				let filePath = this.createPrefixedSqlFilePath(objectName);
+				let filePath = this.createEditDataFileName(objectName);
 				let docUri: URI = URI.from({ scheme: Schemas.untitled, path: filePath });
 				// Create a sql document pane with accoutrements
@@ -265,26 +265,45 @@ export class QueryEditorService implements IQueryEditorService {
 	////// Private functions
 	private createUntitledSqlFilePath(): string {
-		return this.createPrefixedSqlFilePath(untitledFilePrefix);
+		let sqlFileName = (counter: number): string => {
-	}
+			return `${untitledFilePrefix}${counter}`;
 	private createPrefixedSqlFilePath(prefix: string): string {
 		let prefixFileName = (counter: number): string => {
 			return `${prefix}_${counter}`;
 		};
 		let counter = 1;
 		// Get document name and check if it exists
-		let filePath = prefixFileName(counter);
+		let filePath = sqlFileName(counter);
 		while (fs.existsSync(filePath)) {
 			counter++;
-			filePath = prefixFileName(counter);
+			filePath = sqlFileName(counter);
 		}
 		// check if this document name already exists in any open documents
 		let untitledEditors = this._untitledEditorService.getAll();
 		while (untitledEditors.find(x => x.getName().toUpperCase() === filePath.toUpperCase())) {
 			counter++;
 			filePath = sqlFileName(counter);
 		}
 		return filePath;
 	}
 	private createEditDataFileName(tableName: string): string {
 		let editDataFileName = (counter: number): string => {
 			return encodeURIComponent(`${tableName}_${counter}`);
 		};
 		let counter = 1;
 		// Get document name and check if it exists
 		let filePath = editDataFileName(counter);
 		while (fs.existsSync(filePath)) {
 			counter++;
 			filePath = editDataFileName(counter);
 		}
 		let untitledEditors = this._untitledEditorService.getAll();
 		while (untitledEditors.find(x => x.getName().toUpperCase() === filePath.toUpperCase())) {
 			counter++;
-			filePath = prefixFileName(counter);
+			filePath = editDataFileName(counter);
 		}
 		return filePath;
--- a/src/sql/platform/dialog/dialogModal.ts
+++ b/src/sql/platform/dialog/dialogModal.ts
@@ -25,7 +25,6 @@ import { Emitter } from 'vs/base/common/event';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { DialogMessage, MessageLevel } from '../../workbench/api/common/sqlExtHostTypes';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 export class DialogModal extends Modal {
 	private _dialogPane: DialogPane;
@@ -41,13 +40,12 @@ export class DialogModal extends Modal {
 		name: string,
 		options: IModalOptions,
 		@IPartService partService: IPartService,
-		@IWorkbenchThemeService themeService: IWorkbenchThemeService,
+		@IWorkbenchThemeService private _themeService: IWorkbenchThemeService,
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IClipboardService clipboardService: IClipboardService,
 		@IInstantiationService private _instantiationService: IInstantiationService
 	) {
-		super(_dialog.title, name, partService, telemetryService, clipboardService, themeService, contextKeyService, options);
+		super(_dialog.title, name, partService, telemetryService, contextKeyService, options);
 	}
 	public layout(): void {
@@ -55,7 +53,7 @@ export class DialogModal extends Modal {
 	}
 	public render() {
-		super.render();
+		super.render(true);
 		attachModalDialogStyler(this, this._themeService);
 		if (this.backButton) {
@@ -80,7 +78,7 @@ export class DialogModal extends Modal {
 		let messageChangeHandler = (message: DialogMessage) => {
 			if (message && message.text) {
-				this.setError(message.text, message.level, message.description);
+				this.setError(message.text, message.level);
 			} else {
 				this.setError('');
 			}
--- a/src/sql/platform/dialog/dialogTypes.ts
+++ b/src/sql/platform/dialog/dialogTypes.ts
@@ -63,8 +63,10 @@ export class Dialog extends ModelViewPane {
 	}
 	public set message(value: DialogMessage) {
-		this._message = value;
+		if (this._message && !value || !this._message && value || this._message && value && (this._message.level !== value.level || this._message.text !== value.text)) {
-		this._onMessageChange.fire(this._message);
+			this._message = value;
 			this._onMessageChange.fire(this._message);
 		}
 	}
 	public registerCloseValidator(validator: () => boolean | Thenable<boolean>): void {
@@ -253,7 +255,9 @@ export class Wizard {
 	}
 	public set message(value: DialogMessage) {
-		this._message = value;
+		if (this._message && !value || !this._message && value || this._message && value && (this._message.level !== value.level || this._message.text !== value.text)) {
-		this._onMessageChange.fire(this._message);
+			this._message = value;
 			this._onMessageChange.fire(this._message);
 		}
 	}
 }
--- a/src/sql/platform/dialog/media/dialogModal.css
+++ b/src/sql/platform/dialog/media/dialogModal.css
@@ -21,8 +21,6 @@
 	flex-direction: column;
 	width: 100%;
 	height: 100%;
 	overflow-x: hidden;
 	overflow-y: scroll;
 }
 .dialogModal-hidden {
--- a/src/sql/platform/dialog/media/wizardNavigation.css
+++ b/src/sql/platform/dialog/media/wizardNavigation.css
@@ -7,7 +7,8 @@
 	display: flex;
 	flex-direction: column;
 	width: 80px;
-	height: 100%;
+	height: calc(100% + 25px);
 	margin-top: -25px;
 }
 .hc-black .wizardNavigation-container {
@@ -23,7 +24,7 @@
 	flex-direction: column;
 	align-items: center;
 	justify-content: center;
-	max-height: 100px;
+	max-height: 130px;
 }
 .wizardNavigation-pageNumber a {
--- a/src/sql/platform/dialog/wizardModal.ts
+++ b/src/sql/platform/dialog/wizardModal.ts
@@ -24,7 +24,6 @@ import { attachButtonStyler } from 'vs/platform/theme/common/styler';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { Emitter } from 'vs/base/common/event';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 export class WizardModal extends Modal {
 	private _dialogPanes = new Map<WizardPage, DialogPane>();
@@ -46,13 +45,12 @@ export class WizardModal extends Modal {
 		name: string,
 		options: IModalOptions,
 		@IPartService partService: IPartService,
-		@IWorkbenchThemeService themeService: IWorkbenchThemeService,
+		@IWorkbenchThemeService private _themeService: IWorkbenchThemeService,
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IContextKeyService contextKeyService: IContextKeyService,
-		@IInstantiationService private _instantiationService: IInstantiationService,
+		@IInstantiationService private _instantiationService: IInstantiationService
 		@IClipboardService clipboardService: IClipboardService
 	) {
-		super(_wizard.title, name, partService, telemetryService, clipboardService, themeService, contextKeyService, options);
+		super(_wizard.title, name, partService, telemetryService, contextKeyService, options);
 	}
 	public layout(): void {
@@ -60,7 +58,7 @@ export class WizardModal extends Modal {
 	}
 	public render() {
-		super.render();
+		super.render(true);
 		attachModalDialogStyler(this, this._themeService);
 		if (this.backButton) {
@@ -85,7 +83,7 @@ export class WizardModal extends Modal {
 		let messageChangeHandler = (message: DialogMessage) => {
 			if (message && message.text) {
-				this.setError(message.text, message.level, message.description);
+				this.setError(message.text, message.level);
 			} else {
 				this.setError('');
 			}
--- a/src/sql/sqlops.proposed.d.ts
+++ b/src/sql/sqlops.proposed.d.ts
@@ -58,7 +58,6 @@ declare module 'sqlops' {
 	export class TreeComponentItem extends vscode.TreeItem {
 		checked?: boolean;
 		enabled?: boolean;
 	}
 	export interface ComponentBuilder<T extends Component> {
@@ -890,7 +889,6 @@ declare module 'sqlops' {
 			 */
 			export type DialogMessage = {
 				readonly text: string,
 				readonly description?: string,
 				readonly level?: MessageLevel
 			};
--- a/src/sql/workbench/api/common/sqlExtHostTypes.ts
+++ b/src/sql/workbench/api/common/sqlExtHostTypes.ts
@@ -245,7 +245,6 @@ export enum MessageLevel {
 export interface DialogMessage {
 	text: string;
 	level?: MessageLevel;
 	description?: string;
 }
 /// Card-related APIs that need to be here to avoid early load issues
--- a/src/sql/workbench/api/node/extHostModelViewTree.ts
+++ b/src/sql/workbench/api/node/extHostModelViewTree.ts
@@ -164,7 +164,7 @@ export class ExtHostTreeView<T> extends vsTreeExt.ExtHostTreeView<T> {
 	protected createTreeItem(element: T, extensionTreeItem: sqlops.TreeComponentItem, parent?: vsTreeExt.TreeNode): ITreeComponentItem {
 		let item = super.createTreeItem(element, extensionTreeItem, parent);
-		item = Object.assign({}, item, { checked: extensionTreeItem.checked, enabled: extensionTreeItem.enabled });
+		item = Object.assign({}, item, { checked: extensionTreeItem.checked });
 		return item;
 	}
 }
--- a/src/sql/workbench/common/views.ts
+++ b/src/sql/workbench/common/views.ts
@@ -7,7 +7,6 @@ import { ITreeViewDataProvider, ITreeItem } from 'vs/workbench/common/views';
 export interface ITreeComponentItem extends ITreeItem {
 	checked?: boolean;
 	enabled?: boolean;
 	onCheckedChanged?: (checked: boolean) => void;
 	children?: ITreeComponentItem[];
 }
--- a/src/sql/workbench/errorMessageDialog/errorMessageDialog.ts
+++ b/src/sql/workbench/errorMessageDialog/errorMessageDialog.ts
@@ -42,13 +42,13 @@ export class ErrorMessageDialog extends Modal {
 	public onOk: Event<void> = this._onOk.event;
 	constructor(
-		@IThemeService themeService: IThemeService,
+		@IThemeService private _themeService: IThemeService,
-		@IClipboardService clipboardService: IClipboardService,
+		@IClipboardService private _clipboardService: IClipboardService,
 		@IPartService partService: IPartService,
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IContextKeyService contextKeyService: IContextKeyService
 	) {
-		super('', TelemetryKeys.ErrorMessage, partService, telemetryService, clipboardService, themeService, contextKeyService, { isFlyout: false, hasTitleIcon: true });
+		super('', TelemetryKeys.ErrorMessage, partService, telemetryService, contextKeyService, { isFlyout: false, hasTitleIcon: true });
 		this._okLabel = localize('errorMessageDialog.ok', 'OK');
 		this._closeLabel = localize('errorMessageDialog.close', 'Close');
 	}
--- a/src/sqltest/parts/accountManagement/accountDialogController.test.ts
+++ b/src/sqltest/parts/accountManagement/accountDialogController.test.ts
@@ -88,7 +88,7 @@ function createInstantiationService(addAccountFailureEmitter?: Emitter<string>):
 		.returns(() => undefined);
 	// Create a mock account dialog
-	let accountDialog = new AccountDialog(null, null, null, instantiationService.object, null, null, null, new ContextKeyServiceStub(), null);
+	let accountDialog = new AccountDialog(null, null, null, instantiationService.object, null, null, null, new ContextKeyServiceStub());
 	let mockAccountDialog = TypeMoq.Mock.ofInstance(accountDialog);
 	mockAccountDialog.setup(x => x.onAddAccountErrorEvent)
 		.returns(() => { return addAccountFailureEmitter ? addAccountFailureEmitter.event : mockEvent.event; });
--- a/src/sqltest/parts/accountManagement/autoOAuthDialogController.test.ts
+++ b/src/sqltest/parts/accountManagement/autoOAuthDialogController.test.ts
@@ -38,7 +38,7 @@ suite('auto OAuth dialog controller tests', () => {
 		mockOnCloseEvent = new Emitter<void>();
 		// Create a mock auto OAuth dialog
-		let autoOAuthDialog = new AutoOAuthDialog(null, null, null, null, new ContextKeyServiceStub(), null);
+		let autoOAuthDialog = new AutoOAuthDialog(null, null, null, null, new ContextKeyServiceStub());
 		mockAutoOAuthDialog = TypeMoq.Mock.ofInstance(autoOAuthDialog);
 		mockAutoOAuthDialog.setup(x => x.onCancel).returns(() => mockOnCancelEvent.event);
--- a/src/sqltest/parts/accountManagement/firewallRuleDialogController.test.ts
+++ b/src/sqltest/parts/accountManagement/firewallRuleDialogController.test.ts
@@ -59,7 +59,7 @@ suite('Firewall rule dialog controller tests', () => {
 			.returns(() => mockFirewallRuleViewModel.object);
 		// Create a mock account picker
-		let firewallRuleDialog = new FirewallRuleDialog(null, null, null, instantiationService.object, null, null, new ContextKeyServiceStub(), null, null);
+		let firewallRuleDialog = new FirewallRuleDialog(null, null, null, instantiationService.object, null, null, new ContextKeyServiceStub(), null);
 		mockFirewallRuleDialog = TypeMoq.Mock.ofInstance(firewallRuleDialog);
 		let mockEvent = new Emitter<any>();
--- a/src/vs/platform/telemetry/browser/errorTelemetry.ts
+++ b/src/vs/platform/telemetry/browser/errorTelemetry.ts
@@ -166,8 +166,7 @@ export default class ErrorTelemetry {
 					"${include}": [ "${ErrorEvent}" ]
 				}
 			*/
-			// {{SQL CARBON EDIT}}
+			this._telemetryService.publicLog('UnhandledError', error, true);
 			//this._telemetryService.publicLog('UnhandledError', error, true);
 		}
 		this._buffer.length = 0;
 	}
--- a/src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts
+++ b/src/vs/platform/telemetry/test/electron-browser/telemetryService.test.ts
@@ -206,36 +206,35 @@ suite('TelemetryService', () => {
 		});
 	}));
-	// {{SQL CARBON EDIT}}
+	test('Error events', sinon.test(function (this: any) {
 	// test('Error events', sinon.test(function (this: any) {
-	// 	let origErrorHandler = Errors.errorHandler.getUnexpectedErrorHandler();
+		let origErrorHandler = Errors.errorHandler.getUnexpectedErrorHandler();
-	// 	Errors.setUnexpectedErrorHandler(() => { });
+		Errors.setUnexpectedErrorHandler(() => { });
-	// 	try {
+		try {
-	// 		let testAppender = new TestTelemetryAppender();
+			let testAppender = new TestTelemetryAppender();
-	// 		let service = new TelemetryService({ appender: testAppender }, undefined);
+			let service = new TelemetryService({ appender: testAppender }, undefined);
-	// 		const errorTelemetry = new ErrorTelemetry(service);
+			const errorTelemetry = new ErrorTelemetry(service);
-	// 		let e: any = new Error('This is a test.');
+			let e: any = new Error('This is a test.');
-	// 		// for Phantom
+			// for Phantom
-	// 		if (!e.stack) {
+			if (!e.stack) {
-	// 			e.stack = 'blah';
+				e.stack = 'blah';
-	// 		}
+			}
-	// 		Errors.onUnexpectedError(e);
+			Errors.onUnexpectedError(e);
-	// 		this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
+			this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
-	// 		assert.equal(testAppender.getEventsCount(), 1);
+			assert.equal(testAppender.getEventsCount(), 1);
-	// 		assert.equal(testAppender.events[0].eventName, 'UnhandledError');
+			assert.equal(testAppender.events[0].eventName, 'UnhandledError');
-	// 		assert.equal(testAppender.events[0].data.msg, 'This is a test.');
+			assert.equal(testAppender.events[0].data.msg, 'This is a test.');
-	// 		errorTelemetry.dispose();
+			errorTelemetry.dispose();
-	// 		service.dispose();
+			service.dispose();
-	// 	} finally {
+		} finally {
-	// 		Errors.setUnexpectedErrorHandler(origErrorHandler);
+			Errors.setUnexpectedErrorHandler(origErrorHandler);
-	// 	}
+		}
-	// }));
+	}));
 	// 	test('Unhandled Promise Error events', sinon.test(function() {
 	//
@@ -266,458 +265,457 @@ suite('TelemetryService', () => {
 	// 		}
 	// 	}));
-	// test('Handle global errors', sinon.test(function (this: any) {
+	test('Handle global errors', sinon.test(function (this: any) {
-	// 	let errorStub = sinon.stub();
+		let errorStub = sinon.stub();
-	// 	window.onerror = errorStub;
+		window.onerror = errorStub;
-
+
-	// 	let testAppender = new TestTelemetryAppender();
+		let testAppender = new TestTelemetryAppender();
-	// 	let service = new TelemetryService({ appender: testAppender }, undefined);
+		let service = new TelemetryService({ appender: testAppender }, undefined);
-	// 	const errorTelemetry = new ErrorTelemetry(service);
+		const errorTelemetry = new ErrorTelemetry(service);
-
+
-	// 	let testError = new Error('test');
+		let testError = new Error('test');
-	// 	(<any>window.onerror)('Error Message', 'file.js', 2, 42, testError);
+		(<any>window.onerror)('Error Message', 'file.js', 2, 42, testError);
-	// 	this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
+		this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
-
+
-	// 	assert.equal(errorStub.alwaysCalledWithExactly('Error Message', 'file.js', 2, 42, testError), true);
+		assert.equal(errorStub.alwaysCalledWithExactly('Error Message', 'file.js', 2, 42, testError), true);
-	// 	assert.equal(errorStub.callCount, 1);
+		assert.equal(errorStub.callCount, 1);
-
+
-	// 	assert.equal(testAppender.getEventsCount(), 1);
+		assert.equal(testAppender.getEventsCount(), 1);
-	// 	assert.equal(testAppender.events[0].eventName, 'UnhandledError');
+		assert.equal(testAppender.events[0].eventName, 'UnhandledError');
-	// 	assert.equal(testAppender.events[0].data.msg, 'Error Message');
+		assert.equal(testAppender.events[0].data.msg, 'Error Message');
-	// 	assert.equal(testAppender.events[0].data.file, 'file.js');
+		assert.equal(testAppender.events[0].data.file, 'file.js');
-	// 	assert.equal(testAppender.events[0].data.line, 2);
+		assert.equal(testAppender.events[0].data.line, 2);
-	// 	assert.equal(testAppender.events[0].data.column, 42);
+		assert.equal(testAppender.events[0].data.column, 42);
-	// 	assert.equal(testAppender.events[0].data.uncaught_error_msg, 'test');
+		assert.equal(testAppender.events[0].data.uncaught_error_msg, 'test');
-
+
-	// 	errorTelemetry.dispose();
+		errorTelemetry.dispose();
-	// 	service.dispose();
+		service.dispose();
-	// }));
+	}));
-
+
-	// test('Error Telemetry removes PII from filename with spaces', sinon.test(function (this: any) {
+	test('Error Telemetry removes PII from filename with spaces', sinon.test(function (this: any) {
-	// 	let errorStub = sinon.stub();
+		let errorStub = sinon.stub();
-	// 	window.onerror = errorStub;
+		window.onerror = errorStub;
-	// 	let settings = new ErrorTestingSettings();
+		let settings = new ErrorTestingSettings();
-	// 	let testAppender = new TestTelemetryAppender();
+		let testAppender = new TestTelemetryAppender();
-	// 	let service = new TelemetryService({ appender: testAppender }, undefined);
+		let service = new TelemetryService({ appender: testAppender }, undefined);
-	// 	const errorTelemetry = new ErrorTelemetry(service);
+		const errorTelemetry = new ErrorTelemetry(service);
-
+
-	// 	let personInfoWithSpaces = settings.personalInfo.slice(0, 2) + ' ' + settings.personalInfo.slice(2);
+		let personInfoWithSpaces = settings.personalInfo.slice(0, 2) + ' ' + settings.personalInfo.slice(2);
-	// 	let dangerousFilenameError: any = new Error('dangerousFilename');
+		let dangerousFilenameError: any = new Error('dangerousFilename');
-	// 	dangerousFilenameError.stack = settings.stack;
+		dangerousFilenameError.stack = settings.stack;
-	// 	(<any>window.onerror)('dangerousFilename', settings.dangerousPathWithImportantInfo.replace(settings.personalInfo, personInfoWithSpaces) + '/test.js', 2, 42, dangerousFilenameError);
+		(<any>window.onerror)('dangerousFilename', settings.dangerousPathWithImportantInfo.replace(settings.personalInfo, personInfoWithSpaces) + '/test.js', 2, 42, dangerousFilenameError);
-	// 	this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
+		this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
-
+
-	// 	assert.equal(errorStub.callCount, 1);
+		assert.equal(errorStub.callCount, 1);
-	// 	assert.equal(testAppender.events[0].data.file.indexOf(settings.dangerousPathWithImportantInfo.replace(settings.personalInfo, personInfoWithSpaces)), -1);
+		assert.equal(testAppender.events[0].data.file.indexOf(settings.dangerousPathWithImportantInfo.replace(settings.personalInfo, personInfoWithSpaces)), -1);
-	// 	assert.equal(testAppender.events[0].data.file, settings.importantInfo + '/test.js');
+		assert.equal(testAppender.events[0].data.file, settings.importantInfo + '/test.js');
-
+
-	// 	errorTelemetry.dispose();
+		errorTelemetry.dispose();
-	// 	service.dispose();
+		service.dispose();
-	// }));
+	}));
-
+
-
+	test('Uncaught Error Telemetry removes PII from filename', sinon.test(function (this: any) {
-	// test('Uncaught Error Telemetry removes PII from filename', sinon.test(function (this: any) {
+		let errorStub = sinon.stub();
-	// 	let errorStub = sinon.stub();
+		window.onerror = errorStub;
-	// 	window.onerror = errorStub;
+		let settings = new ErrorTestingSettings();
-	// 	let settings = new ErrorTestingSettings();
+		let testAppender = new TestTelemetryAppender();
-	// 	let testAppender = new TestTelemetryAppender();
+		let service = new TelemetryService({ appender: testAppender }, undefined);
-	// 	let service = new TelemetryService({ appender: testAppender }, undefined);
+		const errorTelemetry = new ErrorTelemetry(service);
-	// 	const errorTelemetry = new ErrorTelemetry(service);
+
-
+		let dangerousFilenameError: any = new Error('dangerousFilename');
-	// 	let dangerousFilenameError: any = new Error('dangerousFilename');
+		dangerousFilenameError.stack = settings.stack;
-	// 	dangerousFilenameError.stack = settings.stack;
+		(<any>window.onerror)('dangerousFilename', settings.dangerousPathWithImportantInfo + '/test.js', 2, 42, dangerousFilenameError);
-	// 	(<any>window.onerror)('dangerousFilename', settings.dangerousPathWithImportantInfo + '/test.js', 2, 42, dangerousFilenameError);
+		this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
-	// 	this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
+
-
+		assert.equal(errorStub.callCount, 1);
-	// 	assert.equal(errorStub.callCount, 1);
+		assert.equal(testAppender.events[0].data.file.indexOf(settings.dangerousPathWithImportantInfo), -1);
-	// 	assert.equal(testAppender.events[0].data.file.indexOf(settings.dangerousPathWithImportantInfo), -1);
+
-
+		dangerousFilenameError = new Error('dangerousFilename');
-	// 	dangerousFilenameError = new Error('dangerousFilename');
+		dangerousFilenameError.stack = settings.stack;
-	// 	dangerousFilenameError.stack = settings.stack;
+		(<any>window.onerror)('dangerousFilename', settings.dangerousPathWithImportantInfo + '/test.js', 2, 42, dangerousFilenameError);
-	// 	(<any>window.onerror)('dangerousFilename', settings.dangerousPathWithImportantInfo + '/test.js', 2, 42, dangerousFilenameError);
+		this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
-	// 	this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
+
-
+		assert.equal(errorStub.callCount, 2);
-	// 	assert.equal(errorStub.callCount, 2);
+		assert.equal(testAppender.events[0].data.file.indexOf(settings.dangerousPathWithImportantInfo), -1);
-	// 	assert.equal(testAppender.events[0].data.file.indexOf(settings.dangerousPathWithImportantInfo), -1);
+		assert.equal(testAppender.events[0].data.file, settings.importantInfo + '/test.js');
-	// 	assert.equal(testAppender.events[0].data.file, settings.importantInfo + '/test.js');
+
-
+		errorTelemetry.dispose();
-	// 	errorTelemetry.dispose();
+		service.dispose();
-	// 	service.dispose();
+	}));
-	// }));
+
-
+	test('Unexpected Error Telemetry removes PII', sinon.test(function (this: any) {
-	// test('Unexpected Error Telemetry removes PII', sinon.test(function (this: any) {
+		let origErrorHandler = Errors.errorHandler.getUnexpectedErrorHandler();
-	// 	let origErrorHandler = Errors.errorHandler.getUnexpectedErrorHandler();
+		Errors.setUnexpectedErrorHandler(() => { });
-	// 	Errors.setUnexpectedErrorHandler(() => { });
+		try {
-	// 	try {
+			let settings = new ErrorTestingSettings();
-	// 		let settings = new ErrorTestingSettings();
+			let testAppender = new TestTelemetryAppender();
-	// 		let testAppender = new TestTelemetryAppender();
+			let service = new TelemetryService({ appender: testAppender }, undefined);
-	// 		let service = new TelemetryService({ appender: testAppender }, undefined);
+			const errorTelemetry = new ErrorTelemetry(service);
-	// 		const errorTelemetry = new ErrorTelemetry(service);
+
-
+			let dangerousPathWithoutImportantInfoError: any = new Error(settings.dangerousPathWithoutImportantInfo);
-	// 		let dangerousPathWithoutImportantInfoError: any = new Error(settings.dangerousPathWithoutImportantInfo);
+			dangerousPathWithoutImportantInfoError.stack = settings.stack;
-	// 		dangerousPathWithoutImportantInfoError.stack = settings.stack;
+			Errors.onUnexpectedError(dangerousPathWithoutImportantInfoError);
-	// 		Errors.onUnexpectedError(dangerousPathWithoutImportantInfoError);
+			this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
-	// 		this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
+
-
+			assert.equal(testAppender.events[0].data.msg.indexOf(settings.personalInfo), -1);
-	// 		assert.equal(testAppender.events[0].data.msg.indexOf(settings.personalInfo), -1);
+			assert.equal(testAppender.events[0].data.msg.indexOf(settings.filePrefix), -1);
-	// 		assert.equal(testAppender.events[0].data.msg.indexOf(settings.filePrefix), -1);
+
-
+			assert.equal(testAppender.events[0].data.callstack.indexOf(settings.personalInfo), -1);
-	// 		assert.equal(testAppender.events[0].data.callstack.indexOf(settings.personalInfo), -1);
+			assert.equal(testAppender.events[0].data.callstack.indexOf(settings.filePrefix), -1);
-	// 		assert.equal(testAppender.events[0].data.callstack.indexOf(settings.filePrefix), -1);
+			assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.stack[4].replace(settings.randomUserFile, settings.anonymizedRandomUserFile)), -1);
-	// 		assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.stack[4].replace(settings.randomUserFile, settings.anonymizedRandomUserFile)), -1);
+			assert.equal(testAppender.events[0].data.callstack.split('\n').length, settings.stack.length);
-	// 		assert.equal(testAppender.events[0].data.callstack.split('\n').length, settings.stack.length);
+
-
+			errorTelemetry.dispose();
-	// 		errorTelemetry.dispose();
+			service.dispose();
-	// 		service.dispose();
+		}
-	// 	}
+		finally {
-	// 	finally {
+			Errors.setUnexpectedErrorHandler(origErrorHandler);
-	// 		Errors.setUnexpectedErrorHandler(origErrorHandler);
+		}
-	// 	}
+	}));
-	// }));
+
-
+	test('Uncaught Error Telemetry removes PII', sinon.test(function (this: any) {
-	// test('Uncaught Error Telemetry removes PII', sinon.test(function (this: any) {
+		let errorStub = sinon.stub();
-	// 	let errorStub = sinon.stub();
+		window.onerror = errorStub;
-	// 	window.onerror = errorStub;
+		let settings = new ErrorTestingSettings();
-	// 	let settings = new ErrorTestingSettings();
+		let testAppender = new TestTelemetryAppender();
-	// 	let testAppender = new TestTelemetryAppender();
+		let service = new TelemetryService({ appender: testAppender }, undefined);
-	// 	let service = new TelemetryService({ appender: testAppender }, undefined);
+		const errorTelemetry = new ErrorTelemetry(service);
-	// 	const errorTelemetry = new ErrorTelemetry(service);
+
-
+		let dangerousPathWithoutImportantInfoError: any = new Error('dangerousPathWithoutImportantInfo');
-	// 	let dangerousPathWithoutImportantInfoError: any = new Error('dangerousPathWithoutImportantInfo');
+		dangerousPathWithoutImportantInfoError.stack = settings.stack;
-	// 	dangerousPathWithoutImportantInfoError.stack = settings.stack;
+		(<any>window.onerror)(settings.dangerousPathWithoutImportantInfo, 'test.js', 2, 42, dangerousPathWithoutImportantInfoError);
-	// 	(<any>window.onerror)(settings.dangerousPathWithoutImportantInfo, 'test.js', 2, 42, dangerousPathWithoutImportantInfoError);
+		this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
-	// 	this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
+
-
+		assert.equal(errorStub.callCount, 1);
-	// 	assert.equal(errorStub.callCount, 1);
+		// Test that no file information remains, esp. personal info
-	// 	// Test that no file information remains, esp. personal info
+		assert.equal(testAppender.events[0].data.msg.indexOf(settings.personalInfo), -1);
-	// 	assert.equal(testAppender.events[0].data.msg.indexOf(settings.personalInfo), -1);
+		assert.equal(testAppender.events[0].data.msg.indexOf(settings.filePrefix), -1);
-	// 	assert.equal(testAppender.events[0].data.msg.indexOf(settings.filePrefix), -1);
+		assert.equal(testAppender.events[0].data.callstack.indexOf(settings.personalInfo), -1);
-	// 	assert.equal(testAppender.events[0].data.callstack.indexOf(settings.personalInfo), -1);
+		assert.equal(testAppender.events[0].data.callstack.indexOf(settings.filePrefix), -1);
-	// 	assert.equal(testAppender.events[0].data.callstack.indexOf(settings.filePrefix), -1);
+		assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.stack[4].replace(settings.randomUserFile, settings.anonymizedRandomUserFile)), -1);
-	// 	assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.stack[4].replace(settings.randomUserFile, settings.anonymizedRandomUserFile)), -1);
+		assert.equal(testAppender.events[0].data.callstack.split('\n').length, settings.stack.length);
-	// 	assert.equal(testAppender.events[0].data.callstack.split('\n').length, settings.stack.length);
+
-
+		errorTelemetry.dispose();
-	// 	errorTelemetry.dispose();
+		service.dispose();
-	// 	service.dispose();
+	}));
-	// }));
+
-
+	test('Unexpected Error Telemetry removes PII but preserves Code file path', sinon.test(function (this: any) {
-	// test('Unexpected Error Telemetry removes PII but preserves Code file path', sinon.test(function (this: any) {
+
-
+		let origErrorHandler = Errors.errorHandler.getUnexpectedErrorHandler();
-	// 	let origErrorHandler = Errors.errorHandler.getUnexpectedErrorHandler();
+		Errors.setUnexpectedErrorHandler(() => { });
-	// 	Errors.setUnexpectedErrorHandler(() => { });
+
-
+		try {
-	// 	try {
+			let settings = new ErrorTestingSettings();
-	// 		let settings = new ErrorTestingSettings();
+			let testAppender = new TestTelemetryAppender();
-	// 		let testAppender = new TestTelemetryAppender();
+			let service = new TelemetryService({ appender: testAppender }, undefined);
-	// 		let service = new TelemetryService({ appender: testAppender }, undefined);
+			const errorTelemetry = new ErrorTelemetry(service);
-	// 		const errorTelemetry = new ErrorTelemetry(service);
+
-
+			let dangerousPathWithImportantInfoError: any = new Error(settings.dangerousPathWithImportantInfo);
-	// 		let dangerousPathWithImportantInfoError: any = new Error(settings.dangerousPathWithImportantInfo);
+			dangerousPathWithImportantInfoError.stack = settings.stack;
-	// 		dangerousPathWithImportantInfoError.stack = settings.stack;
+
-
+			// Test that important information remains but personal info does not
-	// 		// Test that important information remains but personal info does not
+			Errors.onUnexpectedError(dangerousPathWithImportantInfoError);
-	// 		Errors.onUnexpectedError(dangerousPathWithImportantInfoError);
+			this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
-	// 		this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
+
-
+			assert.notEqual(testAppender.events[0].data.msg.indexOf(settings.importantInfo), -1);
-	// 		assert.notEqual(testAppender.events[0].data.msg.indexOf(settings.importantInfo), -1);
+			assert.equal(testAppender.events[0].data.msg.indexOf(settings.personalInfo), -1);
-	// 		assert.equal(testAppender.events[0].data.msg.indexOf(settings.personalInfo), -1);
+			assert.equal(testAppender.events[0].data.msg.indexOf(settings.filePrefix), -1);
-	// 		assert.equal(testAppender.events[0].data.msg.indexOf(settings.filePrefix), -1);
+			assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.importantInfo), -1);
-	// 		assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.importantInfo), -1);
+			assert.equal(testAppender.events[0].data.callstack.indexOf(settings.personalInfo), -1);
-	// 		assert.equal(testAppender.events[0].data.callstack.indexOf(settings.personalInfo), -1);
+			assert.equal(testAppender.events[0].data.callstack.indexOf(settings.filePrefix), -1);
-	// 		assert.equal(testAppender.events[0].data.callstack.indexOf(settings.filePrefix), -1);
+			assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.stack[4].replace(settings.randomUserFile, settings.anonymizedRandomUserFile)), -1);
-	// 		assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.stack[4].replace(settings.randomUserFile, settings.anonymizedRandomUserFile)), -1);
+			assert.equal(testAppender.events[0].data.callstack.split('\n').length, settings.stack.length);
-	// 		assert.equal(testAppender.events[0].data.callstack.split('\n').length, settings.stack.length);
+
-
+			errorTelemetry.dispose();
-	// 		errorTelemetry.dispose();
+			service.dispose();
-	// 		service.dispose();
+		}
-	// 	}
+		finally {
-	// 	finally {
+			Errors.setUnexpectedErrorHandler(origErrorHandler);
-	// 		Errors.setUnexpectedErrorHandler(origErrorHandler);
+		}
-	// 	}
+	}));
-	// }));
+
-
+	test('Uncaught Error Telemetry removes PII but preserves Code file path', sinon.test(function (this: any) {
-	// test('Uncaught Error Telemetry removes PII but preserves Code file path', sinon.test(function (this: any) {
+		let errorStub = sinon.stub();
-	// 	let errorStub = sinon.stub();
+		window.onerror = errorStub;
-	// 	window.onerror = errorStub;
+		let settings = new ErrorTestingSettings();
-	// 	let settings = new ErrorTestingSettings();
+		let testAppender = new TestTelemetryAppender();
-	// 	let testAppender = new TestTelemetryAppender();
+		let service = new TelemetryService({ appender: testAppender }, undefined);
-	// 	let service = new TelemetryService({ appender: testAppender }, undefined);
+		const errorTelemetry = new ErrorTelemetry(service);
-	// 	const errorTelemetry = new ErrorTelemetry(service);
+
-
+		let dangerousPathWithImportantInfoError: any = new Error('dangerousPathWithImportantInfo');
-	// 	let dangerousPathWithImportantInfoError: any = new Error('dangerousPathWithImportantInfo');
+		dangerousPathWithImportantInfoError.stack = settings.stack;
-	// 	dangerousPathWithImportantInfoError.stack = settings.stack;
+		(<any>window.onerror)(settings.dangerousPathWithImportantInfo, 'test.js', 2, 42, dangerousPathWithImportantInfoError);
-	// 	(<any>window.onerror)(settings.dangerousPathWithImportantInfo, 'test.js', 2, 42, dangerousPathWithImportantInfoError);
+		this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
-	// 	this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
+
-
+		assert.equal(errorStub.callCount, 1);
-	// 	assert.equal(errorStub.callCount, 1);
+		// Test that important information remains but personal info does not
-	// 	// Test that important information remains but personal info does not
+		assert.notEqual(testAppender.events[0].data.msg.indexOf(settings.importantInfo), -1);
-	// 	assert.notEqual(testAppender.events[0].data.msg.indexOf(settings.importantInfo), -1);
+		assert.equal(testAppender.events[0].data.msg.indexOf(settings.personalInfo), -1);
-	// 	assert.equal(testAppender.events[0].data.msg.indexOf(settings.personalInfo), -1);
+		assert.equal(testAppender.events[0].data.msg.indexOf(settings.filePrefix), -1);
-	// 	assert.equal(testAppender.events[0].data.msg.indexOf(settings.filePrefix), -1);
+		assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.importantInfo), -1);
-	// 	assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.importantInfo), -1);
+		assert.equal(testAppender.events[0].data.callstack.indexOf(settings.personalInfo), -1);
-	// 	assert.equal(testAppender.events[0].data.callstack.indexOf(settings.personalInfo), -1);
+		assert.equal(testAppender.events[0].data.callstack.indexOf(settings.filePrefix), -1);
-	// 	assert.equal(testAppender.events[0].data.callstack.indexOf(settings.filePrefix), -1);
+		assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.stack[4].replace(settings.randomUserFile, settings.anonymizedRandomUserFile)), -1);
-	// 	assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.stack[4].replace(settings.randomUserFile, settings.anonymizedRandomUserFile)), -1);
+		assert.equal(testAppender.events[0].data.callstack.split('\n').length, settings.stack.length);
-	// 	assert.equal(testAppender.events[0].data.callstack.split('\n').length, settings.stack.length);
+
-
+		errorTelemetry.dispose();
-	// 	errorTelemetry.dispose();
+		service.dispose();
-	// 	service.dispose();
+	}));
-	// }));
+
-
+	test('Unexpected Error Telemetry removes PII but preserves Code file path with node modules', sinon.test(function (this: any) {
-	// test('Unexpected Error Telemetry removes PII but preserves Code file path with node modules', sinon.test(function (this: any) {
+
-
+		let origErrorHandler = Errors.errorHandler.getUnexpectedErrorHandler();
-	// 	let origErrorHandler = Errors.errorHandler.getUnexpectedErrorHandler();
+		Errors.setUnexpectedErrorHandler(() => { });
-	// 	Errors.setUnexpectedErrorHandler(() => { });
+
-
+		try {
-	// 	try {
+			let settings = new ErrorTestingSettings();
-	// 		let settings = new ErrorTestingSettings();
+			let testAppender = new TestTelemetryAppender();
-	// 		let testAppender = new TestTelemetryAppender();
+			let service = new TelemetryService({ appender: testAppender }, undefined);
-	// 		let service = new TelemetryService({ appender: testAppender }, undefined);
+			const errorTelemetry = new ErrorTelemetry(service);
-	// 		const errorTelemetry = new ErrorTelemetry(service);
+
-
+			let dangerousPathWithImportantInfoError: any = new Error(settings.dangerousPathWithImportantInfo);
-	// 		let dangerousPathWithImportantInfoError: any = new Error(settings.dangerousPathWithImportantInfo);
+			dangerousPathWithImportantInfoError.stack = settings.stack;
-	// 		dangerousPathWithImportantInfoError.stack = settings.stack;
+
-
+
-
+			Errors.onUnexpectedError(dangerousPathWithImportantInfoError);
-	// 		Errors.onUnexpectedError(dangerousPathWithImportantInfoError);
+			this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
-	// 		this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
+
-
+			assert.notEqual(testAppender.events[0].data.callstack.indexOf('(' + settings.nodeModuleAsarPathToRetain), -1);
-	// 		assert.notEqual(testAppender.events[0].data.callstack.indexOf('(' + settings.nodeModuleAsarPathToRetain), -1);
+			assert.notEqual(testAppender.events[0].data.callstack.indexOf('(' + settings.nodeModulePathToRetain), -1);
-	// 		assert.notEqual(testAppender.events[0].data.callstack.indexOf('(' + settings.nodeModulePathToRetain), -1);
+			assert.notEqual(testAppender.events[0].data.callstack.indexOf('(/' + settings.nodeModuleAsarPathToRetain), -1);
-	// 		assert.notEqual(testAppender.events[0].data.callstack.indexOf('(/' + settings.nodeModuleAsarPathToRetain), -1);
+			assert.notEqual(testAppender.events[0].data.callstack.indexOf('(/' + settings.nodeModulePathToRetain), -1);
-	// 		assert.notEqual(testAppender.events[0].data.callstack.indexOf('(/' + settings.nodeModulePathToRetain), -1);
+
-
+			errorTelemetry.dispose();
-	// 		errorTelemetry.dispose();
+			service.dispose();
-	// 		service.dispose();
+		}
-	// 	}
+		finally {
-	// 	finally {
+			Errors.setUnexpectedErrorHandler(origErrorHandler);
-	// 		Errors.setUnexpectedErrorHandler(origErrorHandler);
+		}
-	// 	}
+	}));
-	// }));
+
-
+	test('Uncaught Error Telemetry removes PII but preserves Code file path', sinon.test(function (this: any) {
-	// test('Uncaught Error Telemetry removes PII but preserves Code file path', sinon.test(function (this: any) {
+		let errorStub = sinon.stub();
-	// 	let errorStub = sinon.stub();
+		window.onerror = errorStub;
-	// 	window.onerror = errorStub;
+		let settings = new ErrorTestingSettings();
-	// 	let settings = new ErrorTestingSettings();
+		let testAppender = new TestTelemetryAppender();
-	// 	let testAppender = new TestTelemetryAppender();
+		let service = new TelemetryService({ appender: testAppender }, undefined);
-	// 	let service = new TelemetryService({ appender: testAppender }, undefined);
+		const errorTelemetry = new ErrorTelemetry(service);
-	// 	const errorTelemetry = new ErrorTelemetry(service);
+
-
+		let dangerousPathWithImportantInfoError: any = new Error('dangerousPathWithImportantInfo');
-	// 	let dangerousPathWithImportantInfoError: any = new Error('dangerousPathWithImportantInfo');
+		dangerousPathWithImportantInfoError.stack = settings.stack;
-	// 	dangerousPathWithImportantInfoError.stack = settings.stack;
+		(<any>window.onerror)(settings.dangerousPathWithImportantInfo, 'test.js', 2, 42, dangerousPathWithImportantInfoError);
-	// 	(<any>window.onerror)(settings.dangerousPathWithImportantInfo, 'test.js', 2, 42, dangerousPathWithImportantInfoError);
+		this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
-	// 	this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
+
-
+		assert.equal(errorStub.callCount, 1);
-	// 	assert.equal(errorStub.callCount, 1);
+
-
+		assert.notEqual(testAppender.events[0].data.callstack.indexOf('(' + settings.nodeModuleAsarPathToRetain), -1);
-	// 	assert.notEqual(testAppender.events[0].data.callstack.indexOf('(' + settings.nodeModuleAsarPathToRetain), -1);
+		assert.notEqual(testAppender.events[0].data.callstack.indexOf('(' + settings.nodeModulePathToRetain), -1);
-	// 	assert.notEqual(testAppender.events[0].data.callstack.indexOf('(' + settings.nodeModulePathToRetain), -1);
+		assert.notEqual(testAppender.events[0].data.callstack.indexOf('(/' + settings.nodeModuleAsarPathToRetain), -1);
-	// 	assert.notEqual(testAppender.events[0].data.callstack.indexOf('(/' + settings.nodeModuleAsarPathToRetain), -1);
+		assert.notEqual(testAppender.events[0].data.callstack.indexOf('(/' + settings.nodeModulePathToRetain), -1);
-	// 	assert.notEqual(testAppender.events[0].data.callstack.indexOf('(/' + settings.nodeModulePathToRetain), -1);
+
-
+		errorTelemetry.dispose();
-	// 	errorTelemetry.dispose();
+		service.dispose();
-	// 	service.dispose();
+	}));
-	// }));
+
-
+
-
+	test('Unexpected Error Telemetry removes PII but preserves Code file path when PIIPath is configured', sinon.test(function (this: any) {
-	// test('Unexpected Error Telemetry removes PII but preserves Code file path when PIIPath is configured', sinon.test(function (this: any) {
+
-
+		let origErrorHandler = Errors.errorHandler.getUnexpectedErrorHandler();
-	// 	let origErrorHandler = Errors.errorHandler.getUnexpectedErrorHandler();
+		Errors.setUnexpectedErrorHandler(() => { });
-	// 	Errors.setUnexpectedErrorHandler(() => { });
+
-
+		try {
-	// 	try {
+			let settings = new ErrorTestingSettings();
-	// 		let settings = new ErrorTestingSettings();
+			let testAppender = new TestTelemetryAppender();
-	// 		let testAppender = new TestTelemetryAppender();
+			let service = new TelemetryService({ appender: testAppender, piiPaths: [settings.personalInfo + '/resources/app/'] }, undefined);
-	// 		let service = new TelemetryService({ appender: testAppender, piiPaths: [settings.personalInfo + '/resources/app/'] }, undefined);
+			const errorTelemetry = new ErrorTelemetry(service);
-	// 		const errorTelemetry = new ErrorTelemetry(service);
+
-
+			let dangerousPathWithImportantInfoError: any = new Error(settings.dangerousPathWithImportantInfo);
-	// 		let dangerousPathWithImportantInfoError: any = new Error(settings.dangerousPathWithImportantInfo);
+			dangerousPathWithImportantInfoError.stack = settings.stack;
-	// 		dangerousPathWithImportantInfoError.stack = settings.stack;
+
-
+			// Test that important information remains but personal info does not
-	// 		// Test that important information remains but personal info does not
+			Errors.onUnexpectedError(dangerousPathWithImportantInfoError);
-	// 		Errors.onUnexpectedError(dangerousPathWithImportantInfoError);
+			this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
-	// 		this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
+
-
+			assert.notEqual(testAppender.events[0].data.msg.indexOf(settings.importantInfo), -1);
-	// 		assert.notEqual(testAppender.events[0].data.msg.indexOf(settings.importantInfo), -1);
+			assert.equal(testAppender.events[0].data.msg.indexOf(settings.personalInfo), -1);
-	// 		assert.equal(testAppender.events[0].data.msg.indexOf(settings.personalInfo), -1);
+			assert.equal(testAppender.events[0].data.msg.indexOf(settings.filePrefix), -1);
-	// 		assert.equal(testAppender.events[0].data.msg.indexOf(settings.filePrefix), -1);
+			assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.importantInfo), -1);
-	// 		assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.importantInfo), -1);
+			assert.equal(testAppender.events[0].data.callstack.indexOf(settings.personalInfo), -1);
-	// 		assert.equal(testAppender.events[0].data.callstack.indexOf(settings.personalInfo), -1);
+			assert.equal(testAppender.events[0].data.callstack.indexOf(settings.filePrefix), -1);
-	// 		assert.equal(testAppender.events[0].data.callstack.indexOf(settings.filePrefix), -1);
+			assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.stack[4].replace(settings.randomUserFile, settings.anonymizedRandomUserFile)), -1);
-	// 		assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.stack[4].replace(settings.randomUserFile, settings.anonymizedRandomUserFile)), -1);
+			assert.equal(testAppender.events[0].data.callstack.split('\n').length, settings.stack.length);
-	// 		assert.equal(testAppender.events[0].data.callstack.split('\n').length, settings.stack.length);
+
-
+			errorTelemetry.dispose();
-	// 		errorTelemetry.dispose();
+			service.dispose();
-	// 		service.dispose();
+		}
-	// 	}
+		finally {
-	// 	finally {
+			Errors.setUnexpectedErrorHandler(origErrorHandler);
-	// 		Errors.setUnexpectedErrorHandler(origErrorHandler);
+		}
-	// 	}
+	}));
-	// }));
+
-
+	test('Uncaught Error Telemetry removes PII but preserves Code file path when PIIPath is configured', sinon.test(function (this: any) {
-	// test('Uncaught Error Telemetry removes PII but preserves Code file path when PIIPath is configured', sinon.test(function (this: any) {
+		let errorStub = sinon.stub();
-	// 	let errorStub = sinon.stub();
+		window.onerror = errorStub;
-	// 	window.onerror = errorStub;
+		let settings = new ErrorTestingSettings();
-	// 	let settings = new ErrorTestingSettings();
+		let testAppender = new TestTelemetryAppender();
-	// 	let testAppender = new TestTelemetryAppender();
+		let service = new TelemetryService({ appender: testAppender, piiPaths: [settings.personalInfo + '/resources/app/'] }, undefined);
-	// 	let service = new TelemetryService({ appender: testAppender, piiPaths: [settings.personalInfo + '/resources/app/'] }, undefined);
+		const errorTelemetry = new ErrorTelemetry(service);
-	// 	const errorTelemetry = new ErrorTelemetry(service);
+
-
+		let dangerousPathWithImportantInfoError: any = new Error('dangerousPathWithImportantInfo');
-	// 	let dangerousPathWithImportantInfoError: any = new Error('dangerousPathWithImportantInfo');
+		dangerousPathWithImportantInfoError.stack = settings.stack;
-	// 	dangerousPathWithImportantInfoError.stack = settings.stack;
+		(<any>window.onerror)(settings.dangerousPathWithImportantInfo, 'test.js', 2, 42, dangerousPathWithImportantInfoError);
-	// 	(<any>window.onerror)(settings.dangerousPathWithImportantInfo, 'test.js', 2, 42, dangerousPathWithImportantInfoError);
+		this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
-	// 	this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
+
-
+		assert.equal(errorStub.callCount, 1);
-	// 	assert.equal(errorStub.callCount, 1);
+		// Test that important information remains but personal info does not
-	// 	// Test that important information remains but personal info does not
+		assert.notEqual(testAppender.events[0].data.msg.indexOf(settings.importantInfo), -1);
-	// 	assert.notEqual(testAppender.events[0].data.msg.indexOf(settings.importantInfo), -1);
+		assert.equal(testAppender.events[0].data.msg.indexOf(settings.personalInfo), -1);
-	// 	assert.equal(testAppender.events[0].data.msg.indexOf(settings.personalInfo), -1);
+		assert.equal(testAppender.events[0].data.msg.indexOf(settings.filePrefix), -1);
-	// 	assert.equal(testAppender.events[0].data.msg.indexOf(settings.filePrefix), -1);
+		assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.importantInfo), -1);
-	// 	assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.importantInfo), -1);
+		assert.equal(testAppender.events[0].data.callstack.indexOf(settings.personalInfo), -1);
-	// 	assert.equal(testAppender.events[0].data.callstack.indexOf(settings.personalInfo), -1);
+		assert.equal(testAppender.events[0].data.callstack.indexOf(settings.filePrefix), -1);
-	// 	assert.equal(testAppender.events[0].data.callstack.indexOf(settings.filePrefix), -1);
+		assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.stack[4].replace(settings.randomUserFile, settings.anonymizedRandomUserFile)), -1);
-	// 	assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.stack[4].replace(settings.randomUserFile, settings.anonymizedRandomUserFile)), -1);
+		assert.equal(testAppender.events[0].data.callstack.split('\n').length, settings.stack.length);
-	// 	assert.equal(testAppender.events[0].data.callstack.split('\n').length, settings.stack.length);
+
-
+		errorTelemetry.dispose();
-	// 	errorTelemetry.dispose();
+		service.dispose();
-	// 	service.dispose();
+	}));
-	// }));
+
-
+	test('Unexpected Error Telemetry removes PII but preserves Missing Model error message', sinon.test(function (this: any) {
-	// test('Unexpected Error Telemetry removes PII but preserves Missing Model error message', sinon.test(function (this: any) {
+
-
+		let origErrorHandler = Errors.errorHandler.getUnexpectedErrorHandler();
-	// 	let origErrorHandler = Errors.errorHandler.getUnexpectedErrorHandler();
+		Errors.setUnexpectedErrorHandler(() => { });
-	// 	Errors.setUnexpectedErrorHandler(() => { });
+
-
+		try {
-	// 	try {
+			let settings = new ErrorTestingSettings();
-	// 		let settings = new ErrorTestingSettings();
+			let testAppender = new TestTelemetryAppender();
-	// 		let testAppender = new TestTelemetryAppender();
+			let service = new TelemetryService({ appender: testAppender }, undefined);
-	// 		let service = new TelemetryService({ appender: testAppender }, undefined);
+			const errorTelemetry = new ErrorTelemetry(service);
-	// 		const errorTelemetry = new ErrorTelemetry(service);
+
-
+			let missingModelError: any = new Error(settings.missingModelMessage);
-	// 		let missingModelError: any = new Error(settings.missingModelMessage);
+			missingModelError.stack = settings.stack;
-	// 		missingModelError.stack = settings.stack;
+
-
+			// Test that no file information remains, but this particular
-	// 		// Test that no file information remains, but this particular
+			// error message does (Received model events for missing model)
-	// 		// error message does (Received model events for missing model)
+			Errors.onUnexpectedError(missingModelError);
-	// 		Errors.onUnexpectedError(missingModelError);
+			this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
-	// 		this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
+
-
+			assert.notEqual(testAppender.events[0].data.msg.indexOf(settings.missingModelPrefix), -1);
-	// 		assert.notEqual(testAppender.events[0].data.msg.indexOf(settings.missingModelPrefix), -1);
+			assert.equal(testAppender.events[0].data.msg.indexOf(settings.personalInfo), -1);
-	// 		assert.equal(testAppender.events[0].data.msg.indexOf(settings.personalInfo), -1);
+			assert.equal(testAppender.events[0].data.msg.indexOf(settings.filePrefix), -1);
-	// 		assert.equal(testAppender.events[0].data.msg.indexOf(settings.filePrefix), -1);
+			assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.missingModelPrefix), -1);
-	// 		assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.missingModelPrefix), -1);
+			assert.equal(testAppender.events[0].data.callstack.indexOf(settings.personalInfo), -1);
-	// 		assert.equal(testAppender.events[0].data.callstack.indexOf(settings.personalInfo), -1);
+			assert.equal(testAppender.events[0].data.callstack.indexOf(settings.filePrefix), -1);
-	// 		assert.equal(testAppender.events[0].data.callstack.indexOf(settings.filePrefix), -1);
+			assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.stack[4].replace(settings.randomUserFile, settings.anonymizedRandomUserFile)), -1);
-	// 		assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.stack[4].replace(settings.randomUserFile, settings.anonymizedRandomUserFile)), -1);
+			assert.equal(testAppender.events[0].data.callstack.split('\n').length, settings.stack.length);
-	// 		assert.equal(testAppender.events[0].data.callstack.split('\n').length, settings.stack.length);
+
-
+			errorTelemetry.dispose();
-	// 		errorTelemetry.dispose();
+			service.dispose();
-	// 		service.dispose();
+		} finally {
-	// 	} finally {
+			Errors.setUnexpectedErrorHandler(origErrorHandler);
-	// 		Errors.setUnexpectedErrorHandler(origErrorHandler);
+		}
-	// 	}
+	}));
-	// }));
+
-
+	test('Uncaught Error Telemetry removes PII but preserves Missing Model error message', sinon.test(function (this: any) {
-	// test('Uncaught Error Telemetry removes PII but preserves Missing Model error message', sinon.test(function (this: any) {
+		let errorStub = sinon.stub();
-	// 	let errorStub = sinon.stub();
+		window.onerror = errorStub;
-	// 	window.onerror = errorStub;
+		let settings = new ErrorTestingSettings();
-	// 	let settings = new ErrorTestingSettings();
+		let testAppender = new TestTelemetryAppender();
-	// 	let testAppender = new TestTelemetryAppender();
+		let service = new TelemetryService({ appender: testAppender }, undefined);
-	// 	let service = new TelemetryService({ appender: testAppender }, undefined);
+		const errorTelemetry = new ErrorTelemetry(service);
-	// 	const errorTelemetry = new ErrorTelemetry(service);
+
-
+		let missingModelError: any = new Error('missingModelMessage');
-	// 	let missingModelError: any = new Error('missingModelMessage');
+		missingModelError.stack = settings.stack;
-	// 	missingModelError.stack = settings.stack;
+		(<any>window.onerror)(settings.missingModelMessage, 'test.js', 2, 42, missingModelError);
-	// 	(<any>window.onerror)(settings.missingModelMessage, 'test.js', 2, 42, missingModelError);
+		this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
-	// 	this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
+
-
+		assert.equal(errorStub.callCount, 1);
-	// 	assert.equal(errorStub.callCount, 1);
+		// Test that no file information remains, but this particular
-	// 	// Test that no file information remains, but this particular
+		// error message does (Received model events for missing model)
-	// 	// error message does (Received model events for missing model)
+		assert.notEqual(testAppender.events[0].data.msg.indexOf(settings.missingModelPrefix), -1);
-	// 	assert.notEqual(testAppender.events[0].data.msg.indexOf(settings.missingModelPrefix), -1);
+		assert.equal(testAppender.events[0].data.msg.indexOf(settings.personalInfo), -1);
-	// 	assert.equal(testAppender.events[0].data.msg.indexOf(settings.personalInfo), -1);
+		assert.equal(testAppender.events[0].data.msg.indexOf(settings.filePrefix), -1);
-	// 	assert.equal(testAppender.events[0].data.msg.indexOf(settings.filePrefix), -1);
+		assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.missingModelPrefix), -1);
-	// 	assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.missingModelPrefix), -1);
+		assert.equal(testAppender.events[0].data.callstack.indexOf(settings.personalInfo), -1);
-	// 	assert.equal(testAppender.events[0].data.callstack.indexOf(settings.personalInfo), -1);
+		assert.equal(testAppender.events[0].data.callstack.indexOf(settings.filePrefix), -1);
-	// 	assert.equal(testAppender.events[0].data.callstack.indexOf(settings.filePrefix), -1);
+		assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.stack[4].replace(settings.randomUserFile, settings.anonymizedRandomUserFile)), -1);
-	// 	assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.stack[4].replace(settings.randomUserFile, settings.anonymizedRandomUserFile)), -1);
+		assert.equal(testAppender.events[0].data.callstack.split('\n').length, settings.stack.length);
-	// 	assert.equal(testAppender.events[0].data.callstack.split('\n').length, settings.stack.length);
+
-
+		errorTelemetry.dispose();
-	// 	errorTelemetry.dispose();
+		service.dispose();
-	// 	service.dispose();
+	}));
-	// }));
+
-
+	test('Unexpected Error Telemetry removes PII but preserves No Such File error message', sinon.test(function (this: any) {
-	// test('Unexpected Error Telemetry removes PII but preserves No Such File error message', sinon.test(function (this: any) {
+
-
+		let origErrorHandler = Errors.errorHandler.getUnexpectedErrorHandler();
-	// 	let origErrorHandler = Errors.errorHandler.getUnexpectedErrorHandler();
+		Errors.setUnexpectedErrorHandler(() => { });
-	// 	Errors.setUnexpectedErrorHandler(() => { });
+
-
+		try {
-	// 	try {
+			let settings = new ErrorTestingSettings();
-	// 		let settings = new ErrorTestingSettings();
+			let testAppender = new TestTelemetryAppender();
-	// 		let testAppender = new TestTelemetryAppender();
+			let service = new TelemetryService({ appender: testAppender }, undefined);
-	// 		let service = new TelemetryService({ appender: testAppender }, undefined);
+			const errorTelemetry = new ErrorTelemetry(service);
-	// 		const errorTelemetry = new ErrorTelemetry(service);
+
-
+			let noSuchFileError: any = new Error(settings.noSuchFileMessage);
-	// 		let noSuchFileError: any = new Error(settings.noSuchFileMessage);
+			noSuchFileError.stack = settings.stack;
-	// 		noSuchFileError.stack = settings.stack;
+
-
+			// Test that no file information remains, but this particular
-	// 		// Test that no file information remains, but this particular
+			// error message does (ENOENT: no such file or directory)
-	// 		// error message does (ENOENT: no such file or directory)
+			Errors.onUnexpectedError(noSuchFileError);
-	// 		Errors.onUnexpectedError(noSuchFileError);
+			this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
-	// 		this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
+
-
+			assert.notEqual(testAppender.events[0].data.msg.indexOf(settings.noSuchFilePrefix), -1);
-	// 		assert.notEqual(testAppender.events[0].data.msg.indexOf(settings.noSuchFilePrefix), -1);
+			assert.equal(testAppender.events[0].data.msg.indexOf(settings.personalInfo), -1);
-	// 		assert.equal(testAppender.events[0].data.msg.indexOf(settings.personalInfo), -1);
+			assert.equal(testAppender.events[0].data.msg.indexOf(settings.filePrefix), -1);
-	// 		assert.equal(testAppender.events[0].data.msg.indexOf(settings.filePrefix), -1);
+			assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.noSuchFilePrefix), -1);
-	// 		assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.noSuchFilePrefix), -1);
+			assert.equal(testAppender.events[0].data.callstack.indexOf(settings.personalInfo), -1);
-	// 		assert.equal(testAppender.events[0].data.callstack.indexOf(settings.personalInfo), -1);
+			assert.equal(testAppender.events[0].data.callstack.indexOf(settings.filePrefix), -1);
-	// 		assert.equal(testAppender.events[0].data.callstack.indexOf(settings.filePrefix), -1);
+			assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.stack[4].replace(settings.randomUserFile, settings.anonymizedRandomUserFile)), -1);
-	// 		assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.stack[4].replace(settings.randomUserFile, settings.anonymizedRandomUserFile)), -1);
+			assert.equal(testAppender.events[0].data.callstack.split('\n').length, settings.stack.length);
-	// 		assert.equal(testAppender.events[0].data.callstack.split('\n').length, settings.stack.length);
+
-
+			errorTelemetry.dispose();
-	// 		errorTelemetry.dispose();
+			service.dispose();
-	// 		service.dispose();
+		} finally {
-	// 	} finally {
+			Errors.setUnexpectedErrorHandler(origErrorHandler);
-	// 		Errors.setUnexpectedErrorHandler(origErrorHandler);
+		}
-	// 	}
+	}));
-	// }));
+
-
+	test('Uncaught Error Telemetry removes PII but preserves No Such File error message', sinon.test(function (this: any) {
-	// test('Uncaught Error Telemetry removes PII but preserves No Such File error message', sinon.test(function (this: any) {
+		let origErrorHandler = Errors.errorHandler.getUnexpectedErrorHandler();
-	// 	let origErrorHandler = Errors.errorHandler.getUnexpectedErrorHandler();
+		Errors.setUnexpectedErrorHandler(() => { });
-	// 	Errors.setUnexpectedErrorHandler(() => { });
+
-
+		try {
-	// 	try {
+			let errorStub = sinon.stub();
-	// 		let errorStub = sinon.stub();
+			window.onerror = errorStub;
-	// 		window.onerror = errorStub;
+			let settings = new ErrorTestingSettings();
-	// 		let settings = new ErrorTestingSettings();
+			let testAppender = new TestTelemetryAppender();
-	// 		let testAppender = new TestTelemetryAppender();
+			let service = new TelemetryService({ appender: testAppender }, undefined);
-	// 		let service = new TelemetryService({ appender: testAppender }, undefined);
+			const errorTelemetry = new ErrorTelemetry(service);
-	// 		const errorTelemetry = new ErrorTelemetry(service);
+
-
+			let noSuchFileError: any = new Error('noSuchFileMessage');
-	// 		let noSuchFileError: any = new Error('noSuchFileMessage');
+			noSuchFileError.stack = settings.stack;
-	// 		noSuchFileError.stack = settings.stack;
+			(<any>window.onerror)(settings.noSuchFileMessage, 'test.js', 2, 42, noSuchFileError);
-	// 		(<any>window.onerror)(settings.noSuchFileMessage, 'test.js', 2, 42, noSuchFileError);
+			this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
-	// 		this.clock.tick(ErrorTelemetry.ERROR_FLUSH_TIMEOUT);
+
-
+			assert.equal(errorStub.callCount, 1);
-	// 		assert.equal(errorStub.callCount, 1);
+			// Test that no file information remains, but this particular
-	// 		// Test that no file information remains, but this particular
+			// error message does (ENOENT: no such file or directory)
-	// 		// error message does (ENOENT: no such file or directory)
+			Errors.onUnexpectedError(noSuchFileError);
-	// 		Errors.onUnexpectedError(noSuchFileError);
+			assert.notEqual(testAppender.events[0].data.msg.indexOf(settings.noSuchFilePrefix), -1);
-	// 		assert.notEqual(testAppender.events[0].data.msg.indexOf(settings.noSuchFilePrefix), -1);
+			assert.equal(testAppender.events[0].data.msg.indexOf(settings.personalInfo), -1);
-	// 		assert.equal(testAppender.events[0].data.msg.indexOf(settings.personalInfo), -1);
+			assert.equal(testAppender.events[0].data.msg.indexOf(settings.filePrefix), -1);
-	// 		assert.equal(testAppender.events[0].data.msg.indexOf(settings.filePrefix), -1);
+			assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.noSuchFilePrefix), -1);
-	// 		assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.noSuchFilePrefix), -1);
+			assert.equal(testAppender.events[0].data.callstack.indexOf(settings.personalInfo), -1);
-	// 		assert.equal(testAppender.events[0].data.callstack.indexOf(settings.personalInfo), -1);
+			assert.equal(testAppender.events[0].data.callstack.indexOf(settings.filePrefix), -1);
-	// 		assert.equal(testAppender.events[0].data.callstack.indexOf(settings.filePrefix), -1);
+			assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.stack[4].replace(settings.randomUserFile, settings.anonymizedRandomUserFile)), -1);
-	// 		assert.notEqual(testAppender.events[0].data.callstack.indexOf(settings.stack[4].replace(settings.randomUserFile, settings.anonymizedRandomUserFile)), -1);
+			assert.equal(testAppender.events[0].data.callstack.split('\n').length, settings.stack.length);
-	// 		assert.equal(testAppender.events[0].data.callstack.split('\n').length, settings.stack.length);
+
-
+			errorTelemetry.dispose();
-	// 		errorTelemetry.dispose();
+			service.dispose();
-	// 		service.dispose();
+		} finally {
-	// 	} finally {
+			Errors.setUnexpectedErrorHandler(origErrorHandler);
-	// 		Errors.setUnexpectedErrorHandler(origErrorHandler);
+		}
-	// 	}
+	}));
 	// }));
 	test('Telemetry Service sends events when enableTelemetry is on', sinon.test(function () {
 		let testAppender = new TestTelemetryAppender();
--- a/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
+++ b/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
@@ -298,7 +298,7 @@ ${this.description}
 		if (!changelogUrl) {
 			if (this.type === LocalExtensionType.System) {
-				return TPromise.as('Please check the [Azure Data Studio Release Notes](command:update.showCurrentReleaseNotes) for changes to the built-in extensions.');
+				return TPromise.as('Please check the [VS Code Release Notes](command:update.showCurrentReleaseNotes) for changes to the built-in extensions.');
 			}
 			return TPromise.wrapError<string>(new Error('not available'));
--- a/test/smoke/yarn.lock
+++ b/test/smoke/yarn.lock
--- a/yarn.lock
+++ b/yarn.lock
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"><title>close</title><path d="M8.82,8.1,15,14.29l-.81.81L8,8.91,1.81,15.1,1,14.29,7.18,8.1,1,1.9l.81-.81L8,7.28,14.19,1.1,15,1.9Z"/></svg>`
		`@@ -1 +0,0 @@`
			<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><title>error_notification</title><path d="M8,0a7.92,7.92,0,0,1,4,1.09A8.15,8.15,0,0,1,14.91,4a8,8,0,0,1,.81,1.91,8,8,0,0,1-.81,6.16A8.15,8.15,0,0,1,12,14.92a8,8,0,0,1-8.07,0,8.15,8.15,0,0,1-2.87-2.87A8,8,0,0,1,1.09,4,8.15,8.15,0,0,1,4,1.11,7.92,7.92,0,0,1,8,0ZM8,15a6.88,6.88,0,0,0,1.86-.25,7,7,0,0,0,4.89-4.89,7.07,7.07,0,0,0,0-3.73A7,7,0,0,0,9.86,1.27a7.07,7.07,0,0,0-3.73,0A7,7,0,0,0,1.25,6.15a7.07,7.07,0,0,0,0,3.73,7,7,0,0,0,4.89,4.89A6.88,6.88,0,0,0,8,15Zm3.46-9.76L8.71,8l2.75,2.76-.7.7L8,8.73,5.24,11.48l-.7-.7L7.29,8,4.54,5.26l.7-.7L8,7.31l2.76-2.75Z"/></svg>
		`@@ -1 +0,0 @@`
			`<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M7.065 13H15v2H2.056v-2h5.009zm3.661-12H7.385L8.44 2.061 7.505 3H15V1h-4.274zM3.237 9H2.056v2H15V9H3.237zm4.208-4l.995 1-.995 1H15V5H7.445z" fill="#424242"/><path d="M5.072 4.03L7.032 6 5.978 7.061l-1.96-1.97-1.961 1.97L1 6l1.96-1.97L1 2.061 2.056 1l1.96 1.97L5.977 1l1.057 1.061L5.072 4.03z" fill="#A1260D"/></svg>`