add GITHUBTOKEN env for product installs (#8717 )

Add missing deps for linux image (#8958 )
* add missing deps for linux image * use docker versioning * add comment to linux docker container
2026-02-17 11:01:37 -05:00 · 2020-01-30 13:53:36 -08:00 · 2020-01-30 13:20:10 -08:00 · 2020-01-30 11:47:22 -08:00 · 2019-12-23 18:05:34 -08:00 · 2019-12-23 18:01:32 -08:00
36 changed files with 61 additions and 136 deletions
--- a/build/azure-pipelines/darwin/sql-product-build-darwin.yml
+++ b/build/azure-pipelines/darwin/sql-product-build-darwin.yml
@@ -64,6 +64,8 @@ steps:
      set -e
      CHILD_CONCURRENCY=1 yarn --frozen-lockfile
    displayName: Install dependencies
+    env:
+      GITHUB_TOKEN: $(github-distro-mixin-password)
    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))

  - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
--- a/build/azure-pipelines/linux/Dockerfile
+++ b/build/azure-pipelines/linux/Dockerfile
@@ -6,7 +6,7 @@ RUN apt-get update --fix-missing

 RUN apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb libgtk-3-0 \
 	libkrb5-dev git apt-transport-https ca-certificates curl gnupg-agent software-properties-common \
-	libnss3 libasound2 make gcc libx11-dev fakeroot rpm
+	libnss3 libasound2 make gcc libx11-dev fakeroot rpm libgconf-2-4 libunwind8 g++-4.8

 #docker
 RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
@@ -15,6 +15,8 @@ RUN add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubunt
 RUN apt-get update
 RUN apt-get -y install docker-ce docker-ce-cli containerd.io

+# This image needs to be built on a linux host; some weird stuff happens and the xvfb service won't start
+# if built on a windows host.
 ADD ./xvfb.init /etc/init.d/xvfb
 RUN chmod +x /etc/init.d/xvfb
 RUN update-rc.d xvfb defaults
--- a/build/azure-pipelines/linux/sql-product-build-linux.yml
+++ b/build/azure-pipelines/linux/sql-product-build-linux.yml
@@ -63,6 +63,8 @@ steps:
      set -e
      CHILD_CONCURRENCY=1 yarn --frozen-lockfile
    displayName: Install dependencies
+    env:
+      GITHUB_TOKEN: $(github-distro-mixin-password)
    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))

  - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
--- a/build/azure-pipelines/sql-product-build.yml
+++ b/build/azure-pipelines/sql-product-build.yml
@@ -1,7 +1,7 @@
 resources:
  containers:
  - container: linux-x64
-    image: sqltoolscontainers.azurecr.io/linux-build-agent:x64
+    image: sqltoolscontainers.azurecr.io/linux-build-agent:1
    endpoint: ContainerRegistry

 jobs:
--- a/build/azure-pipelines/win32/sql-product-build-win32.yml
+++ b/build/azure-pipelines/win32/sql-product-build-win32.yml
@@ -66,6 +66,8 @@ steps:
      $env:CHILD_CONCURRENCY="1"
      exec { yarn --frozen-lockfile }
    displayName: Install dependencies
+    env:
+      GITHUB_TOKEN: $(github-distro-mixin-password)
    condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))

  - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
--- a/extensions/admin-tool-ext-win/package.json
+++ b/extensions/admin-tool-ext-win/package.json
@@ -7,7 +7,7 @@
  "preview": true,
  "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/extensions/admin-tool-ext-win/license/Azure%20Data%20Studio%20Extension%20-%20Standalone%20(free)%20Use%20Terms.txt",
  "icon": "images/sqlserver.png",
-  "aiKey": "AIF-37eefaf0-8022-4671-a3fb-64752724682e",
+  "aiKey": "AIF-444c3af9-8e69-4462-ab49-4191e6ad1916",
  "engines": {
    "vscode": "^1.30.1",
    "azdata": ">=1.8.0"
--- a/extensions/agent/package.json
+++ b/extensions/agent/package.json
@@ -2,12 +2,12 @@
  "name": "agent",
  "displayName": "SQL Server Agent",
  "description": "Manage and troubleshoot SQL Server Agent jobs",
-  "version": "0.44.0",
+  "version": "0.45.0",
  "publisher": "Microsoft",
  "preview": true,
  "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt",
  "icon": "images/sqlserver.png",
-  "aiKey": "AIF-37eefaf0-8022-4671-a3fb-64752724682e",
+  "aiKey": "AIF-444c3af9-8e69-4462-ab49-4191e6ad1916",
  "engines": {
    "vscode": "^1.25.0"
  },
--- a/extensions/cms/package.json
+++ b/extensions/cms/package.json
@@ -2,7 +2,7 @@
  "name": "cms",
  "displayName": "%cms.displayName%",
  "description": "%cms.description%",
-  "version": "0.5.0",
+  "version": "0.6.0",
  "publisher": "Microsoft",
  "preview": true,
  "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt",
--- a/extensions/dacpac/package.json
+++ b/extensions/dacpac/package.json
@@ -2,7 +2,7 @@
  "name": "dacpac",
  "displayName": "SQL Server Dacpac",
  "description": "SQL Server Dacpac for Azure Data Studio.",
-  "version": "1.0.0",
+  "version": "1.1.0",
  "publisher": "Microsoft",
  "preview": false,
  "engines": {
@@ -11,7 +11,7 @@
  },
  "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt",
  "icon": "images/sqlserver.png",
-  "aiKey": "AIF-37eefaf0-8022-4671-a3fb-64752724682e",
+  "aiKey": "AIF-444c3af9-8e69-4462-ab49-4191e6ad1916",
  "activationEvents": [
    "*"
  ],
--- a/extensions/import/package.json
+++ b/extensions/import/package.json
@@ -11,7 +11,7 @@
 	},
 	"license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/extensions/import/Microsoft_SQL_Server_Import_Extension_and_Tools_Import_Flat_File_Preview.docx",
 	"icon": "images/sqlserver.png",
-	"aiKey": "AIF-37eefaf0-8022-4671-a3fb-64752724682e",
+	"aiKey": "AIF-444c3af9-8e69-4462-ab49-4191e6ad1916",
 	"activationEvents": [
 		"*"
 	],
--- a/extensions/liveshare/package.json
+++ b/extensions/liveshare/package.json
@@ -2,7 +2,7 @@
  "name": "liveshare",
  "version": "0.1.0",
  "publisher": "Microsoft",
-  "aiKey": "AIF-37eefaf0-8022-4671-a3fb-64752724682e",
+  "aiKey": "AIF-444c3af9-8e69-4462-ab49-4191e6ad1916",
  "activationEvents": [
    "*"
  ],
--- a/extensions/mssql/config.json
+++ b/extensions/mssql/config.json
@@ -1,6 +1,6 @@
 {
 	"downloadUrl": "https://github.com/Microsoft/sqltoolsservice/releases/download/v{#version#}/microsoft.sqltools.servicelayer-{#fileName#}",
-	"version": "2.0.0-release.39",
+	"version": "2.0.0-release.40",
 	"downloadFileNames": {
 		"Windows_86": "win-x86-netcoreapp2.2.zip",
 		"Windows_64": "win-x64-netcoreapp2.2.zip",
--- a/extensions/mssql/package.json
+++ b/extensions/mssql/package.json
@@ -2,7 +2,7 @@
  "name": "mssql",
  "version": "0.1.0",
  "publisher": "Microsoft",
-  "aiKey": "AIF-37eefaf0-8022-4671-a3fb-64752724682e",
+  "aiKey": "AIF-444c3af9-8e69-4462-ab49-4191e6ad1916",
  "activationEvents": [
    "*"
  ],
--- a/extensions/profiler/package.json
+++ b/extensions/profiler/package.json
@@ -2,12 +2,12 @@
 	"name": "profiler",
 	"displayName": "SQL Server Profiler",
 	"description": "SQL Server Profiler for Azure Data Studio",
-	"version": "0.10.0",
+	"version": "0.11.0",
 	"publisher": "Microsoft",
 	"preview": true,
 	"license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt",
 	"icon": "images/sqlserver.png",
-	"aiKey": "AIF-37eefaf0-8022-4671-a3fb-64752724682e",
+	"aiKey": "AIF-444c3af9-8e69-4462-ab49-4191e6ad1916",
 	"engines": {
 		"vscode": "0.10.x"
 	},
--- a/extensions/query-history/package.json
+++ b/extensions/query-history/package.json
@@ -7,7 +7,7 @@
 	"preview": true,
 	"license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt",
 	"icon": "images/sqlserver.png",
-	"aiKey": "AIF-37eefaf0-8022-4671-a3fb-64752724682e",
+	"aiKey": "AIF-444c3af9-8e69-4462-ab49-4191e6ad1916",
 	"engines": {
 		"vscode": "^1.30.1",
 		"azdata": ">=1.12.0"
--- a/extensions/resource-deployment/package.json
+++ b/extensions/resource-deployment/package.json
@@ -7,7 +7,7 @@
 	"preview": true,
 	"license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt",
 	"icon": "images/sqlserver.png",
-	"aiKey": "AIF-37eefaf0-8022-4671-a3fb-64752724682e",
+	"aiKey": "AIF-444c3af9-8e69-4462-ab49-4191e6ad1916",
 	"engines": {
 		"vscode": "*",
 		"azdata": ">=1.6.0"
@@ -339,7 +339,7 @@
 						"when": "version=sql2017"
 					},
 					{
-						"webPageUrl": "https://www.microsoft.com/evalcenter/evaluate-sql-server-2019-rc",
+						"downloadUrl": "https://go.microsoft.com/fwlink/?linkid=866662",
 						"requiredTools": [],
 						"when": "version=sql2019"
 					}
--- a/extensions/schema-compare/package.json
+++ b/extensions/schema-compare/package.json
@@ -2,7 +2,7 @@
  "name": "schema-compare",
  "displayName": "%displayName%",
  "description": "%description%",
-  "version": "1.0.0",
+  "version": "1.1.0",
  "publisher": "Microsoft",
  "preview": false,
  "engines": {
@@ -11,7 +11,7 @@
  },
  "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt",
  "icon": "images/sqlserver.png",
-  "aiKey": "AIF-37eefaf0-8022-4671-a3fb-64752724682e",
+  "aiKey": "AIF-444c3af9-8e69-4462-ab49-4191e6ad1916",
  "activationEvents": [
    "*"
  ],
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "azuredatastudio",
-  "version": "1.14.0",
+  "version": "1.14.2",
  "distro": "1ea70f8c965707516bf389622a3fc2aeb8a0321b",
  "author": {
    "name": "Microsoft Corporation"
--- a/product.json
+++ b/product.json
@@ -25,7 +25,7 @@
 	"urlProtocol": "azuredatastudio",
 	"enableTelemetry": true,
 	"aiConfig": {
-		"asimovKey": "AIF-37eefaf0-8022-4671-a3fb-64752724682e"
+		"asimovKey": "AIF-444c3af9-8e69-4462-ab49-4191e6ad1916"
 	},
 	"sendASmile": {
 		"reportIssueUrl": "https://github.com/Microsoft/azuredatastudio/issues/new?labels=customer%20reported%20issue",
--- a/samples/sample-resource-deployment/package.json
+++ b/samples/sample-resource-deployment/package.json
@@ -7,7 +7,7 @@
  "preview": true,
  "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/LICENSE.txt",
  "icon": "images/sqlserver.png",
-  "aiKey": "AIF-37eefaf0-8022-4671-a3fb-64752724682e",
+  "aiKey": "AIF-444c3af9-8e69-4462-ab49-4191e6ad1916",
  "engines": {
    "vscode": "*",
    "azdata": ">1.10.0"
--- a/src/sql/workbench/browser/modelComponents/queryTextEditor.ts
+++ b/src/sql/workbench/browser/modelComponents/queryTextEditor.ts
@@ -71,6 +71,9 @@ export class QueryTextEditor extends BaseTextEditor {
 			options.minimap = {
 				enabled: false
 			};
+			options.scrollbar = {
+				alwaysConsumeMouseWheel: false
+			};
 			options.overviewRulerLanes = 0;
 			options.overviewRulerBorder = false;
 			options.hideCursorInOverviewRuler = true;
--- a/src/sql/workbench/contrib/connection/browser/media/connected_active_server.svg
+++ b/src/sql/workbench/contrib/connection/browser/media/connected_active_server.svg
@@ -1 +1 @@
-<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:#212121;}.cls-2{fill:#3bb44a;}</style></defs><title>connected_active_server_16x16</title><path class="cls-1" d="M1.29.07V16h9.59a3.31,3.31,0,0,1-1.94-1H2.29V11h6a3.31,3.31,0,0,1,.54-.8A1.81,1.81,0,0,1,9,10H2.29v-9h8.53v8a3.68,3.68,0,0,1,.58,0l.39,0h0v-9Z"/><path class="cls-1" d="M3.3,1.8V4.25H5.75V1.8Zm2,2H3.8V2.3H5.25Z"/><circle class="cls-2" cx="11.24" cy="12.52" r="3.47"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="#212121" d="M1.29.07V16h9.59a3.31,3.31,0,0,1-1.94-1H2.29V11h6a3.31,3.31,0,0,1,.54-.8A1.81,1.81,0,0,1,9,10H2.29v-9h8.53v8a3.68,3.68,0,0,1,.58,0l.39,0h0v-9Z"/><path class="cls-1" fill="#212121" d="M3.3,1.8V4.25H5.75V1.8Zm2,2H3.8V2.3H5.25Z"/><circle fill="#3bb44a" cx="11.24" cy="12.52" r="3.47"/></svg>
--- a/src/sql/workbench/contrib/connection/browser/media/connected_active_server_inverse.svg
+++ b/src/sql/workbench/contrib/connection/browser/media/connected_active_server_inverse.svg
@@ -1 +1 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#fff;}.cls-2{fill:#3bb44a;}</style></defs><title>connected_active_server_inverse_16x16</title><path class="cls-1" d="M1.29.07V16h9.59a3.31,3.31,0,0,1-1.94-1H2.29V11h6a3.31,3.31,0,0,1,.54-.8A1.81,1.81,0,0,1,9,10H2.29v-9h8.53v8a3.68,3.68,0,0,1,.58,0l.39,0h0v-9Z"/><path class="cls-1" d="M3.3,1.8V4.25H5.75V1.8Zm2,2H3.8V2.3H5.25Z"/><circle class="cls-2" cx="11.24" cy="12.52" r="3.47"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="#fff" d="M1.29.07V16h9.59a3.31,3.31,0,0,1-1.94-1H2.29V11h6a3.31,3.31,0,0,1,.54-.8A1.81,1.81,0,0,1,9,10H2.29v-9h8.53v8a3.68,3.68,0,0,1,.58,0l.39,0h0v-9Z"/><path fill="#fff" d="M3.3,1.8V4.25H5.75V1.8Zm2,2H3.8V2.3H5.25Z"/><circle fill="#3bb44a" cx="11.24" cy="12.52" r="3.47"/></svg>
--- a/src/sql/workbench/contrib/connection/browser/media/disconnected_server.svg
+++ b/src/sql/workbench/contrib/connection/browser/media/disconnected_server.svg
@@ -1 +1 @@
-<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:#212121;}.cls-2{fill:#d02e00;}</style></defs><title>disconnected_server_16x16</title><path class="cls-1" d="M1.42.06V16H11a3.31,3.31,0,0,1-1.94-1H2.42V11h6a3.31,3.31,0,0,1,.54-.8,1.81,1.81,0,0,1,.19-.2H2.42v-9H11v8a3.68,3.68,0,0,1,.58,0l.39,0h0v-9Z"/><path class="cls-1" d="M3.43,1.79V4.24H5.89V1.79Zm2,2H3.93V2.29H5.39Z"/><path class="cls-2" d="M11.08,16a2.22,2.22,0,0,0,.45,0,2.59,2.59,0,0,0,.4,0Z"/><path class="cls-2" d="M12,9.08h0l-.39,0a3.68,3.68,0,0,0-.58,0A3.41,3.41,0,0,0,9.14,10a1.81,1.81,0,0,0-.19.2,3.46,3.46,0,0,0-.89,2.3,3.4,3.4,0,0,0,.85,2.26,1.29,1.29,0,0,0,.16.17A3.31,3.31,0,0,0,11,16H12a3.46,3.46,0,0,0,2.17-1.13,3.41,3.41,0,0,0,.88-2.3A3.47,3.47,0,0,0,12,9.08Zm0,5.72a1.72,1.72,0,0,1-.39,0,2.23,2.23,0,0,1-.77-.14,2.29,2.29,0,0,1-1.54-2.17A2.22,2.22,0,0,1,9.79,11a2.29,2.29,0,0,1,1-.67,2.23,2.23,0,0,1,.77-.14,1.72,1.72,0,0,1,.39,0h0a2.3,2.3,0,0,1,0,4.53Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="#212121" d="M1.42.06V16H11a3.31,3.31,0,0,1-1.94-1H2.42V11h6a3.31,3.31,0,0,1,.54-.8,1.81,1.81,0,0,1,.19-.2H2.42v-9H11v8a3.68,3.68,0,0,1,.58,0l.39,0h0v-9Z"/><path fill="#212121" d="M3.43,1.79V4.24H5.89V1.79Zm2,2H3.93V2.29H5.39Z"/><path fill="#d02e00" d="M11.08,16a2.22,2.22,0,0,0,.45,0,2.59,2.59,0,0,0,.4,0Z"/><path fill="#d02e00" d="M12,9.08h0l-.39,0a3.68,3.68,0,0,0-.58,0A3.41,3.41,0,0,0,9.14,10a1.81,1.81,0,0,0-.19.2,3.46,3.46,0,0,0-.89,2.3,3.4,3.4,0,0,0,.85,2.26,1.29,1.29,0,0,0,.16.17A3.31,3.31,0,0,0,11,16H12a3.46,3.46,0,0,0,2.17-1.13,3.41,3.41,0,0,0,.88-2.3A3.47,3.47,0,0,0,12,9.08Zm0,5.72a1.72,1.72,0,0,1-.39,0,2.23,2.23,0,0,1-.77-.14,2.29,2.29,0,0,1-1.54-2.17A2.22,2.22,0,0,1,9.79,11a2.29,2.29,0,0,1,1-.67,2.23,2.23,0,0,1,.77-.14,1.72,1.72,0,0,1,.39,0h0a2.3,2.3,0,0,1,0,4.53Z"/></svg>
--- a/src/sql/workbench/contrib/connection/browser/media/disconnected_server_inverse.svg
+++ b/src/sql/workbench/contrib/connection/browser/media/disconnected_server_inverse.svg
@@ -1 +1 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#fff;}.cls-2{fill:#d02e00;}</style></defs><title>disconnected_server_inverse_16x16</title><path class="cls-1" d="M1.42.06V16H11a3.31,3.31,0,0,1-1.94-1H2.42V11h6a3.31,3.31,0,0,1,.54-.8,1.81,1.81,0,0,1,.19-.2H2.42v-9H11v8a3.68,3.68,0,0,1,.58,0l.39,0h0v-9Z"/><path class="cls-1" d="M3.43,1.79V4.24H5.89V1.79Zm2,2H3.93V2.29H5.39Z"/><path class="cls-2" d="M11.08,16a2.22,2.22,0,0,0,.45,0,2.59,2.59,0,0,0,.4,0Z"/><path class="cls-2" d="M12,9.08h0l-.39,0a3.68,3.68,0,0,0-.58,0A3.41,3.41,0,0,0,9.14,10a1.81,1.81,0,0,0-.19.2,3.46,3.46,0,0,0-.89,2.3,3.4,3.4,0,0,0,.85,2.26,1.29,1.29,0,0,0,.16.17A3.31,3.31,0,0,0,11,16H12a3.46,3.46,0,0,0,2.17-1.13,3.41,3.41,0,0,0,.88-2.3A3.47,3.47,0,0,0,12,9.08Zm0,5.72a1.72,1.72,0,0,1-.39,0,2.23,2.23,0,0,1-.77-.14,2.29,2.29,0,0,1-1.54-2.17A2.22,2.22,0,0,1,9.79,11a2.29,2.29,0,0,1,1-.67,2.23,2.23,0,0,1,.77-.14,1.72,1.72,0,0,1,.39,0h0a2.3,2.3,0,0,1,0,4.53Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="#fff" d="M1.42.06V16H11a3.31,3.31,0,0,1-1.94-1H2.42V11h6a3.31,3.31,0,0,1,.54-.8,1.81,1.81,0,0,1,.19-.2H2.42v-9H11v8a3.68,3.68,0,0,1,.58,0l.39,0h0v-9Z"/><path fill="#fff" d="M3.43,1.79V4.24H5.89V1.79Zm2,2H3.93V2.29H5.39Z"/><path fill="#d02e00" d="M11.08,16a2.22,2.22,0,0,0,.45,0,2.59,2.59,0,0,0,.4,0Z"/><path fill="#d02e00" d="M12,9.08h0l-.39,0a3.68,3.68,0,0,0-.58,0A3.41,3.41,0,0,0,9.14,10a1.81,1.81,0,0,0-.19.2,3.46,3.46,0,0,0-.89,2.3,3.4,3.4,0,0,0,.85,2.26,1.29,1.29,0,0,0,.16.17A3.31,3.31,0,0,0,11,16H12a3.46,3.46,0,0,0,2.17-1.13,3.41,3.41,0,0,0,.88-2.3A3.47,3.47,0,0,0,12,9.08Zm0,5.72a1.72,1.72,0,0,1-.39,0,2.23,2.23,0,0,1-.77-.14,2.29,2.29,0,0,1-1.54-2.17A2.22,2.22,0,0,1,9.79,11a2.29,2.29,0,0,1,1-.67,2.23,2.23,0,0,1,.77-.14,1.72,1.72,0,0,1,.39,0h0a2.3,2.3,0,0,1,0,4.53Z"/></svg>
--- a/src/sql/workbench/contrib/dashboard/browser/pages/serverDashboardPage.contribution.ts
+++ b/src/sql/workbench/contrib/dashboard/browser/pages/serverDashboardPage.contribution.ts
@@ -2,10 +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 { generateDashboardTabSchema, generateDashboardWidgetSchema } from 'sql/workbench/contrib/dashboard/browser/pages/dashboardPageContribution';
 import { IJSONSchema } from 'vs/base/common/jsonSchema';
 import * as nls from 'vs/nls';
-import { generateDashboardWidgetSchema, generateDashboardTabSchema } from 'sql/workbench/contrib/dashboard/browser/pages/dashboardPageContribution';

 export interface IPropertiesConfig {
 	edition: number | Array<number>;
@@ -78,7 +77,7 @@ const defaultVal = [
 	{
 		name: 'Tasks',
 		widget: {
-			'tasks-widget': [{ name: 'restore', when: '!mssql:iscloud && mssql:engineedition != 11' }, 'configureDashboard', 'newQuery', 'mssqlCluster.task.newNotebook']
+			'tasks-widget': ['newQuery', 'mssqlCluster.task.newNotebook', { name: 'restore', when: '!mssql:iscloud && mssql:engineedition != 11' }, 'configureDashboard']
 		},
 		gridItemConfig: {
 			sizex: 1,
--- a/src/sql/workbench/contrib/dataExplorer/browser/media/connected_active_server.svg
+++ b/src/sql/workbench/contrib/dataExplorer/browser/media/connected_active_server.svg
@@ -1 +1 @@
-<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:#212121;}.cls-2{fill:#3bb44a;}</style></defs><title>connected_active_server_16x16</title><path class="cls-1" d="M1.29.07V16h9.59a3.31,3.31,0,0,1-1.94-1H2.29V11h6a3.31,3.31,0,0,1,.54-.8A1.81,1.81,0,0,1,9,10H2.29v-9h8.53v8a3.68,3.68,0,0,1,.58,0l.39,0h0v-9Z"/><path class="cls-1" d="M3.3,1.8V4.25H5.75V1.8Zm2,2H3.8V2.3H5.25Z"/><circle class="cls-2" cx="11.24" cy="12.52" r="3.47"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="#212121" d="M1.29.07V16h9.59a3.31,3.31,0,0,1-1.94-1H2.29V11h6a3.31,3.31,0,0,1,.54-.8A1.81,1.81,0,0,1,9,10H2.29v-9h8.53v8a3.68,3.68,0,0,1,.58,0l.39,0h0v-9Z"/><path fill="#212121" d="M3.3,1.8V4.25H5.75V1.8Zm2,2H3.8V2.3H5.25Z"/><circle fill="#3bb44a" cx="11.24" cy="12.52" r="3.47"/></svg>
--- a/src/sql/workbench/contrib/dataExplorer/browser/media/connected_active_server_inverse.svg
+++ b/src/sql/workbench/contrib/dataExplorer/browser/media/connected_active_server_inverse.svg
@@ -1 +1 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#fff;}.cls-2{fill:#3bb44a;}</style></defs><title>connected_active_server_inverse_16x16</title><path class="cls-1" d="M1.29.07V16h9.59a3.31,3.31,0,0,1-1.94-1H2.29V11h6a3.31,3.31,0,0,1,.54-.8A1.81,1.81,0,0,1,9,10H2.29v-9h8.53v8a3.68,3.68,0,0,1,.58,0l.39,0h0v-9Z"/><path class="cls-1" d="M3.3,1.8V4.25H5.75V1.8Zm2,2H3.8V2.3H5.25Z"/><circle class="cls-2" cx="11.24" cy="12.52" r="3.47"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="#fff" d="M1.29.07V16h9.59a3.31,3.31,0,0,1-1.94-1H2.29V11h6a3.31,3.31,0,0,1,.54-.8A1.81,1.81,0,0,1,9,10H2.29v-9h8.53v8a3.68,3.68,0,0,1,.58,0l.39,0h0v-9Z"/><path fill="#fff" d="M3.3,1.8V4.25H5.75V1.8Zm2,2H3.8V2.3H5.25Z"/><circle fill="#3bb44a" cx="11.24" cy="12.52" r="3.47"/></svg>
--- a/src/sql/workbench/contrib/dataExplorer/browser/media/default_server.svg
+++ b/src/sql/workbench/contrib/dataExplorer/browser/media/default_server.svg
@@ -1,41 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   viewBox="0 0 16 16"
-   data-name="Layer 1"
-   id="Layer_1">
-  <metadata
-     id="metadata15">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>server_16x16</dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs4">
-    <style
-       id="style2">.cls-1{fill:#212121;}.cls-2{fill:#231f20;}</style>
-  </defs>
-  <title
-     id="title6">server_16x16</title>
-  <path
-     style="fill:#212121"
-     id="path8"
-     d="m 2.735,0 v 16 h 10.53 V 0 Z m 1,1 h 8.53 v 9 h -8.53 z m 8.53,14 h -8.53 v -4 h 8.53 z"
-     class="cls-1" />
-  <path
-     style="fill:#231f20"
-     id="path10"
-     d="M 7.125,4.23 H 4.675 V 1.77 h 2.45 z m -2,-0.5 h 1.5 V 2.27 h -1.45 z"
-     class="cls-2" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="#212121" d="m 2.735,0 v 16 h 10.53 V 0 Z m 1,1 h 8.53 v 9 h -8.53 z m 8.53,14 h -8.53 v -4 h 8.53 z"/><path fill="#231f20" d="M 7.125,4.23 H 4.675 V 1.77 h 2.45 z m -2,-0.5 h 1.5 V 2.27 h -1.45 z"/></svg>
--- a/src/sql/workbench/contrib/dataExplorer/browser/media/default_server_inverse.svg
+++ b/src/sql/workbench/contrib/dataExplorer/browser/media/default_server_inverse.svg
@@ -1,41 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   viewBox="0 0 16 16"
-   data-name="Layer 1"
-   id="Layer_1">
-  <metadata
-     id="metadata15">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>server_16x16</dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs4">
-    <style
-       id="style2">.cls-1{fill:#212121;}.cls-2{fill:#231f20;}</style>
-  </defs>
-  <title
-     id="title6">server_16x16</title>
-  <path
-     style="fill:#ffffff"
-     id="path8"
-     d="m 2.735,0 v 16 h 10.53 V 0 Z m 1,1 h 8.53 v 9 h -8.53 z m 8.53,14 h -8.53 v -4 h 8.53 z"
-     class="cls-1" />
-  <path
-     style="fill:#ffffff"
-     id="path10"
-     d="M 7.125,4.23 H 4.675 V 1.77 h 2.45 z m -2,-0.5 h 1.5 V 2.27 h -1.45 z"
-     class="cls-2" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="#ffffff" d="m 2.735,0 v 16 h 10.53 V 0 Z m 1,1 h 8.53 v 9 h -8.53 z m 8.53,14 h -8.53 v -4 h 8.53 z"/><path fill="#ffffff" d="M 7.125,4.23 H 4.675 V 1.77 h 2.45 z m -2,-0.5 h 1.5 V 2.27 h -1.45 z"/></svg>
--- a/src/sql/workbench/contrib/dataExplorer/browser/media/disconnected_server_inverse.svg
+++ b/src/sql/workbench/contrib/dataExplorer/browser/media/disconnected_server_inverse.svg
@@ -1 +1 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#fff;}.cls-2{fill:#d02e00;}</style></defs><title>disconnected_server_inverse_16x16</title><path class="cls-1" d="M1.42.06V16H11a3.31,3.31,0,0,1-1.94-1H2.42V11h6a3.31,3.31,0,0,1,.54-.8,1.81,1.81,0,0,1,.19-.2H2.42v-9H11v8a3.68,3.68,0,0,1,.58,0l.39,0h0v-9Z"/><path class="cls-1" d="M3.43,1.79V4.24H5.89V1.79Zm2,2H3.93V2.29H5.39Z"/><path class="cls-2" d="M11.08,16a2.22,2.22,0,0,0,.45,0,2.59,2.59,0,0,0,.4,0Z"/><path class="cls-2" d="M12,9.08h0l-.39,0a3.68,3.68,0,0,0-.58,0A3.41,3.41,0,0,0,9.14,10a1.81,1.81,0,0,0-.19.2,3.46,3.46,0,0,0-.89,2.3,3.4,3.4,0,0,0,.85,2.26,1.29,1.29,0,0,0,.16.17A3.31,3.31,0,0,0,11,16H12a3.46,3.46,0,0,0,2.17-1.13,3.41,3.41,0,0,0,.88-2.3A3.47,3.47,0,0,0,12,9.08Zm0,5.72a1.72,1.72,0,0,1-.39,0,2.23,2.23,0,0,1-.77-.14,2.29,2.29,0,0,1-1.54-2.17A2.22,2.22,0,0,1,9.79,11a2.29,2.29,0,0,1,1-.67,2.23,2.23,0,0,1,.77-.14,1.72,1.72,0,0,1,.39,0h0a2.3,2.3,0,0,1,0,4.53Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="#fff" d="M1.42.06V16H11a3.31,3.31,0,0,1-1.94-1H2.42V11h6a3.31,3.31,0,0,1,.54-.8,1.81,1.81,0,0,1,.19-.2H2.42v-9H11v8a3.68,3.68,0,0,1,.58,0l.39,0h0v-9Z"/><path fill="#fff" d="M3.43,1.79V4.24H5.89V1.79Zm2,2H3.93V2.29H5.39Z"/><path fill="#d02e00" d="M11.08,16a2.22,2.22,0,0,0,.45,0,2.59,2.59,0,0,0,.4,0Z"/><path fill="#d02e00" d="M12,9.08h0l-.39,0a3.68,3.68,0,0,0-.58,0A3.41,3.41,0,0,0,9.14,10a1.81,1.81,0,0,0-.19.2,3.46,3.46,0,0,0-.89,2.3,3.4,3.4,0,0,0,.85,2.26,1.29,1.29,0,0,0,.16.17A3.31,3.31,0,0,0,11,16H12a3.46,3.46,0,0,0,2.17-1.13,3.41,3.41,0,0,0,.88-2.3A3.47,3.47,0,0,0,12,9.08Zm0,5.72a1.72,1.72,0,0,1-.39,0,2.23,2.23,0,0,1-.77-.14,2.29,2.29,0,0,1-1.54-2.17A2.22,2.22,0,0,1,9.79,11a2.29,2.29,0,0,1,1-.67,2.23,2.23,0,0,1,.77-.14,1.72,1.72,0,0,1,.39,0h0a2.3,2.3,0,0,1,0,4.53Z"/></svg>
--- a/src/sql/workbench/contrib/notebook/browser/models/notebookModel.ts
+++ b/src/sql/workbench/contrib/notebook/browser/models/notebookModel.ts
@@ -449,7 +449,9 @@ export class NotebookModel extends Disposable implements INotebookModel {
 			if (!this._activeClientSession) {
 				this.updateActiveClientSession(clientSession);
 			}
-			let profile = new ConnectionProfile(this._notebookOptions.capabilitiesService, this.connectionProfile);
+
+			// If a connection profile is passed in and _activeConnection isn't yet set, use that. Otherwise, use _activeConnection
+			let profile = this._activeConnection ? this._activeConnection : new ConnectionProfile(this._notebookOptions.capabilitiesService, this.connectionProfile);

 			if (this.isValidConnection(profile)) {
 				this._activeConnection = profile;
--- a/src/sql/workbench/contrib/notebook/browser/notebook.component.ts
+++ b/src/sql/workbench/contrib/notebook/browser/notebook.component.ts
@@ -33,8 +33,6 @@ import { Deferred } from 'sql/base/common/promise';
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
 import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar';
 import { KernelsDropdown, AttachToDropdown, AddCellAction, TrustedAction, RunAllCellsAction, ClearAllOutputsAction, CollapseCellsAction } from 'sql/workbench/contrib/notebook/browser/notebookActions';
-import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService';
-import * as TaskUtilities from 'sql/workbench/browser/taskUtilities';
 import { ISingleNotebookEditOperation } from 'sql/workbench/api/common/sqlExtHostTypes';
 import { IConnectionDialogService } from 'sql/workbench/services/connection/common/connectionDialogService';
 import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService';
@@ -87,7 +85,6 @@ export class NotebookComponent extends AngularDisposable implements OnInit, OnDe
 		@Inject(forwardRef(() => ChangeDetectorRef)) private _changeRef: ChangeDetectorRef,
 		@Inject(IWorkbenchThemeService) private themeService: IWorkbenchThemeService,
 		@Inject(IConnectionManagementService) private connectionManagementService: IConnectionManagementService,
-		@Inject(IObjectExplorerService) private objectExplorerService: IObjectExplorerService,
 		@Inject(IEditorService) private editorService: IEditorService,
 		@Inject(INotificationService) private notificationService: INotificationService,
 		@Inject(INotebookService) private notebookService: INotebookService,
@@ -112,21 +109,6 @@ export class NotebookComponent extends AngularDisposable implements OnInit, OnDe

 	private updateProfile(): void {
 		this.profile = this.notebookParams ? this.notebookParams.profile : undefined;
-		if (!this.profile) {
-			// Second use global connection if possible
-			let profile: IConnectionProfile = TaskUtilities.getCurrentGlobalConnection(this.objectExplorerService, this.connectionManagementService, this.editorService);
-
-			// TODO use generic method to match kernel with valid connection that's compatible. For now, we only have 1
-			if (profile && profile.providerName) {
-				this.profile = profile;
-			} else {
-				// if not, try 1st active connection that matches our filter
-				let activeProfiles = this.connectionManagementService.getActiveConnections();
-				if (activeProfiles && activeProfiles.length > 0) {
-					this.profile = activeProfiles[0];
-				}
-			}
-		}
 	}

 	ngOnInit() {
--- a/src/sql/workbench/contrib/query/browser/queryResultsView.ts
+++ b/src/sql/workbench/contrib/query/browser/queryResultsView.ts
@@ -24,6 +24,7 @@ import { attachTabbedPanelStyler } from 'sql/platform/theme/common/styler';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { Event } from 'vs/base/common/event';
 import { startsWith } from 'vs/base/common/strings';
+import { URI } from 'vs/base/common/uri';

 class MessagesView extends Disposable implements IPanelView {
 	private messagePanel: MessagePanel;
@@ -317,8 +318,8 @@ export class QueryResultsView extends Disposable {
 			this.setQueryRunner(info.queryRunner);
 		} else {
 			let disposable = this.queryModelService.onRunQueryStart(c => {
-				if (c === input.uri) {
-					let info = this.queryModelService._getQueryInfo(input.uri);
+				if (URI.parse(c).toString() === URI.parse(input.uri).toString()) {
+					let info = this.queryModelService._getQueryInfo(c);
 					this.setQueryRunner(info.queryRunner);
 					disposable.dispose();
 				}
--- a/src/sql/workbench/services/connection/browser/connectionManagementService.ts
+++ b/src/sql/workbench/services/connection/browser/connectionManagementService.ts
@@ -253,9 +253,16 @@ export class ConnectionManagementService extends Disposable implements IConnecti
 	 */
 	public getUniqueConnectionProvidersByNameMap(providerNameToDisplayNameMap: { [providerDisplayName: string]: string }): { [providerDisplayName: string]: string } {
 		let uniqueProvidersMap = {};
-		entries(providerNameToDisplayNameMap).forEach(p => {
+		let providerNames = entries(providerNameToDisplayNameMap);
+		providerNames.forEach(p => {
+			// Only add CMS provider if explicitly called from CMS extension
+			// otherwise avoid duplicate listing in dropdown
 			if (p[0] !== Constants.cmsProviderName) {
 				uniqueProvidersMap[p[0]] = p[1];
+			} else {
+				if (providerNames.length === 1) {
+					uniqueProvidersMap[p[0]] = p[1];
+				}
 			}
 		});

--- a/src/sql/workbench/services/connection/browser/connectionWidget.ts
+++ b/src/sql/workbench/services/connection/browser/connectionWidget.ts
@@ -915,6 +915,9 @@ export class ConnectionWidget extends lifecycle.Disposable {
 	}

 	private getMatchingAuthType(displayName: string): AuthenticationType {
+		if (!displayName) {
+			return undefined;
+		}
 		return find(ConnectionWidget._authTypes, authType => this.getAuthTypeDisplayName(authType) === displayName);
 	}
Author	SHA1	Message	Date
Anthony Dresser	f46e1471cb	add GITHUBTOKEN env for product installs (#8717 )	2020-01-30 13:53:36 -08:00
Anthony Dresser	6db7f727ee	Add missing deps for linux image (#8958 ) * add missing deps for linux image * use docker versioning * add comment to linux docker container	2020-01-30 13:20:10 -08:00
Karl Burtram	596d65b2e2	Bump to 1.14.2 for potential hotfix	2020-01-30 11:47:22 -08:00
Anthony Dresser	f9b968c1ae	use URI to equal (#8770 )	2019-12-23 18:05:34 -08:00
Karl Burtram	e3f6feb135	Revert "Bump SQL Tools to 2.0.0-release.41" This reverts commit `7b0be2e773`.	2019-12-23 18:01:32 -08:00
Karl Burtram	7b0be2e773	Bump SQL Tools to 2.0.0-release.41	2019-12-19 13:30:11 -08:00
Karl Burtram	9fec7edba7	Bump to 1.14.1 for Dec hotfix 1	2019-12-19 13:28:46 -08:00
swjain23	27468f75a5	Bug fix to return authType as undefined if displayName is not set (#8731 ) We noticed that if displayName is undefined this method would return the first auth type it found as getAuthTypeDisplayName() would return undefined. If the displayName is undefined, we would not have a matchingTYpe and it should be undefined.	2019-12-18 11:45:57 -08:00
Karl Burtram	79ad848216	Bump SQL Tools to 2.0.0-release.40 (#8719 ) To pick up DacFx vbump	2019-12-17 15:44:38 -08:00
Anthony Dresser	1a2c6f1578	remove unnecessary info from problem svgs (#8712 )	2019-12-17 10:24:44 -08:00
Aditya Bist	17e4d3bfa3	fix provider dropdown option for cms dialog (#8711 )	2019-12-16 19:09:39 -08:00
Alan Ren	2599fb1252	download 2019 developer edition (#8704 )	2019-12-16 14:56:14 -08:00
Charles Gagnon	26d59b528e	Bump extension versions (#8674 ) (#8697 ) * Bump agent version * Bump more extensions * Undo version change for BDC - is builtin (cherry picked from commit `9587edd867`)	2019-12-16 14:40:18 -08:00
Alan Ren	093f44a1e7	change order of tasks (#8703 )	2019-12-16 14:14:44 -08:00
Chris LaFreniere	290f43dbd7	Fix passing in connection profile (#8689 )	2019-12-16 14:14:13 -08:00
Chris LaFreniere	fb2486a54b	Fix Notebook Scrolling by Setting alwaysConsumeMouseWheel to False (#8686 ) * flip alwaysConsumeMouseWheel to false for nb * remove semicolon	2019-12-16 14:14:05 -08:00
Charles Gagnon	7e02c16fd7	Revert iKey (#8667 )	2019-12-13 09:54:12 -08:00