Bump STS to 4.7.1.6 in release branch for connection pool issue (#23278 )

Add getOptionKeyIdNames to IConnectionProfile (#23262 ) (#23268 )
Remove debugService dependency from Open View (#23246 ) (#23255 )
2026-02-20 02:51:36 -05:00 · 2023-05-31 18:36:22 -07:00 · 2023-05-31 09:04:22 -07:00 · 2023-05-30 16:59:37 -07:00 · 2023-05-30 16:49:46 -07:00 · 2023-05-30 15:37:12 -07:00
15 changed files with 29 additions and 4 deletions
--- a/extensions/mssql/config.json
+++ b/extensions/mssql/config.json
@@ -1,6 +1,6 @@
 {
 	"downloadUrl": "https://github.com/Microsoft/sqltoolsservice/releases/download/{#version#}/microsoft.sqltools.servicelayer-{#fileName#}",
-	"version": "4.7.1.4",
+	"version": "4.7.1.6",
 	"downloadFileNames": {
 		"Windows_86": "win-x86-net7.0.zip",
 		"Windows_64": "win-x64-net7.0.zip",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "azuredatastudio",
-  "version": "1.44.0",
+  "version": "1.44.1",
  "distro": "0b0260ce742552bb22069e74d4bfc54e6b4bd29f",
  "author": {
    "name": "Microsoft Corporation"
--- a/src/sql/platform/connection/common/connectionProfile.ts
+++ b/src/sql/platform/connection/common/connectionProfile.ts
@@ -254,6 +254,7 @@ export class ConnectionProfile extends ProviderConnectionInfo implements interfa
 			databaseName: this.databaseName,
 			authenticationType: this.authenticationType,
 			getOptionsKey: this.getOptionsKey,
+			getOptionKeyIdNames: this.getOptionKeyIdNames,
 			matches: this.matches,
 			groupId: this.groupId,
 			groupFullName: this.groupFullName,
--- a/src/sql/platform/connection/common/interfaces.ts
+++ b/src/sql/platform/connection/common/interfaces.ts
@@ -10,6 +10,7 @@ export type ProfileMatcher = (a: IConnectionProfile, b: IConnectionProfile) => b

 export interface IConnectionProfile extends azdata.IConnectionProfile {
 	getOptionsKey(): string;
+	getOptionKeyIdNames(): string[];
 	matches(profile: azdata.IConnectionProfile): boolean;
 }

--- a/src/sql/platform/connection/test/common/connectionConfig.test.ts
+++ b/src/sql/platform/connection/test/common/connectionConfig.test.ts
@@ -277,6 +277,7 @@ suite('ConnectionConfig', () => {
 			groupFullName: undefined,
 			groupId: undefined,
 			getOptionsKey: undefined!,
+			getOptionKeyIdNames: undefined!,
 			matches: undefined!,
 			providerName: 'MSSQL',
 			options: {},
@@ -309,6 +310,7 @@ suite('ConnectionConfig', () => {
 			savePassword: true,
 			groupFullName: undefined,
 			getOptionsKey: undefined!,
+			getOptionKeyIdNames: undefined!,
 			matches: undefined!,
 			providerName: 'MSSQL',
 			options: {},
@@ -341,6 +343,7 @@ suite('ConnectionConfig', () => {
 			groupFullName: 'g2/g2-2',
 			groupId: undefined,
 			getOptionsKey: undefined!,
+			getOptionKeyIdNames: undefined!,
 			matches: undefined!,
 			providerName: 'MSSQL',
 			options: {},
@@ -484,6 +487,7 @@ suite('ConnectionConfig', () => {
 			groupFullName: 'g3',
 			groupId: 'g3',
 			getOptionsKey: undefined!,
+			getOptionKeyIdNames: undefined!,
 			matches: undefined!,
 			providerName: 'MSSQL',
 			options: {},
@@ -514,6 +518,7 @@ suite('ConnectionConfig', () => {
 			groupFullName: 'g3',
 			groupId: 'g3',
 			getOptionsKey: undefined!,
+			getOptionKeyIdNames: undefined!,
 			matches: undefined!,
 			providerName: 'MSSQL',
 			options: {},
@@ -551,6 +556,7 @@ suite('ConnectionConfig', () => {
 			groupFullName: 'g3',
 			groupId: 'newid',
 			getOptionsKey: undefined!,
+			getOptionKeyIdNames: undefined!,
 			matches: undefined!,
 			providerName: 'MSSQL',
 			options: {},
@@ -631,6 +637,7 @@ suite('ConnectionConfig', () => {
 			groupFullName: 'g3',
 			groupId: 'g3',
 			getOptionsKey: () => { return 'connectionId'; },
+			getOptionKeyIdNames: undefined!,
 			matches: undefined!,
 			providerName: 'MSSQL',
 			options: {},
@@ -648,6 +655,7 @@ suite('ConnectionConfig', () => {
 			groupFullName: 'test',
 			groupId: 'test',
 			getOptionsKey: () => { return 'connectionId'; },
+			getOptionKeyIdNames: undefined!,
 			matches: undefined!,
 			providerName: 'MSSQL',
 			options: {},
@@ -688,6 +696,7 @@ suite('ConnectionConfig', () => {
 			groupFullName: 'g3',
 			groupId: 'g3',
 			getOptionsKey: () => { return 'connectionId'; },
+			getOptionKeyIdNames: undefined!,
 			matches: undefined!,
 			providerName: 'MSSQL',
 			options: {},
--- a/src/sql/platform/connection/test/common/connectionProfile.test.ts
+++ b/src/sql/platform/connection/test/common/connectionProfile.test.ts
@@ -26,6 +26,7 @@ suite('SQL ConnectionProfileInfo tests', () => {
 		groupFullName: 'g2/g2-2',
 		groupId: 'group id',
 		getOptionsKey: undefined!,
+		getOptionKeyIdNames: undefined!,
 		matches: undefined!,
 		providerName: mssqlProviderName,
 		options: {},
--- a/src/sql/platform/connection/test/common/connectionStore.test.ts
+++ b/src/sql/platform/connection/test/common/connectionStore.test.ts
@@ -32,6 +32,7 @@ suite('ConnectionStore', () => {
 		groupId: '',
 		groupFullName: '',
 		getOptionsKey: undefined!,
+		getOptionKeyIdNames: undefined!,
 		matches: () => false,
 		providerName: mssqlProviderName,
 		options: {},
--- a/src/sql/platform/connection/test/common/providerConnectionInfo.test.ts
+++ b/src/sql/platform/connection/test/common/providerConnectionInfo.test.ts
@@ -25,6 +25,7 @@ suite('SQL ProviderConnectionInfo tests', () => {
 		groupFullName: 'g2/g2-2',
 		groupId: undefined,
 		getOptionsKey: undefined!,
+		getOptionKeyIdNames: undefined!,
 		matches: undefined!,
 		providerName: mssqlProviderName,
 		options: undefined!,
--- a/src/sql/platform/connection/test/node/connectionStatusManager.test.ts
+++ b/src/sql/platform/connection/test/node/connectionStatusManager.test.ts
@@ -27,6 +27,7 @@ let connectionProfile: IConnectionProfile = {
 	groupFullName: 'g2/g2-2',
 	groupId: 'group id',
 	getOptionsKey: () => 'connection1',
+	getOptionKeyIdNames: undefined!,
 	matches: undefined!,
 	providerName: mssqlProviderName,
 	options: {},
@@ -44,6 +45,7 @@ let editorConnectionProfile: IConnectionProfile = {
 	groupFullName: 'g2/g2-2',
 	groupId: 'group id',
 	getOptionsKey: () => 'connection2',
+	getOptionKeyIdNames: undefined!,
 	matches: undefined!,
 	providerName: mssqlProviderName,
 	options: {},
@@ -61,6 +63,7 @@ let connectionProfileWithoutDbName: IConnectionProfile = {
 	groupFullName: 'g2/g2-2',
 	groupId: 'group id',
 	getOptionsKey: () => 'connection1',
+	getOptionKeyIdNames: undefined!,
 	matches: undefined!,
 	providerName: mssqlProviderName,
 	options: {},
--- a/src/sql/workbench/services/connection/test/browser/connectionManagementService.test.ts
+++ b/src/sql/workbench/services/connection/test/browser/connectionManagementService.test.ts
@@ -68,6 +68,7 @@ suite('SQL ConnectionManagementService tests', () => {
 		groupFullName: 'g2/g2-2',
 		groupId: 'group id',
 		getOptionsKey: () => { return 'connectionId'; },
+		getOptionKeyIdNames: undefined!,
 		matches: undefined,
 		providerName: 'MSSQL',
 		options: {},
--- a/src/sql/workbench/services/insights/test/browser/insightsDialogController.test.ts
+++ b/src/sql/workbench/services/insights/test/browser/insightsDialogController.test.ts
@@ -75,6 +75,7 @@ suite('Insights Dialog Controller Tests', () => {
 			groupFullName: '',
 			groupId: '',
 			getOptionsKey: () => '',
+			getOptionKeyIdNames: undefined!,
 			matches: undefined,
 			providerName: '',
 			saveProfile: true,
--- a/src/sql/workbench/services/objectExplorer/test/browser/asyncServerTreeDragAndDrop.test.ts
+++ b/src/sql/workbench/services/objectExplorer/test/browser/asyncServerTreeDragAndDrop.test.ts
@@ -36,6 +36,7 @@ suite('AsyncServerTreeDragAndDrop', () => {
 		groupFullName: 'g2/g2-2',
 		groupId: 'group id',
 		getOptionsKey: undefined!,
+		getOptionKeyIdNames: undefined!,
 		matches: undefined!,
 		providerName: mssqlProviderName,
 		options: {},
--- a/src/sql/workbench/services/objectExplorer/test/browser/dragAndDropController.test.ts
+++ b/src/sql/workbench/services/objectExplorer/test/browser/dragAndDropController.test.ts
@@ -41,6 +41,7 @@ suite('SQL Drag And Drop Controller tests', () => {
 		groupFullName: 'g2/g2-2',
 		groupId: 'group id',
 		getOptionsKey: undefined!,
+		getOptionKeyIdNames: undefined!,
 		matches: undefined!,
 		providerName: mssqlProviderName,
 		options: {},
@@ -59,6 +60,7 @@ suite('SQL Drag And Drop Controller tests', () => {
 		groupFullName: 'g2/g2-2',
 		groupId: 'group id',
 		getOptionsKey: undefined!,
+		getOptionKeyIdNames: undefined!,
 		matches: undefined!,
 		providerName: pgsqlProviderName,
 		options: {},
--- a/src/sql/workbench/services/resourceProvider/test/browser/firewallRuleDialogController.test.ts
+++ b/src/sql/workbench/services/resourceProvider/test/browser/firewallRuleDialogController.test.ts
@@ -89,6 +89,7 @@ suite('Firewall rule dialog controller tests', () => {
 			groupFullName: 'g2/g2-2',
 			groupId: 'group id',
 			getOptionsKey: () => '',
+			getOptionKeyIdNames: undefined!,
 			matches: () => false,
 			providerName: mssqlProviderName,
 			options: {},
--- a/src/vs/workbench/contrib/quickaccess/browser/viewQuickAccess.ts
+++ b/src/vs/workbench/contrib/quickaccess/browser/viewQuickAccess.ts
@@ -21,7 +21,7 @@ import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { CATEGORIES } from 'vs/workbench/common/actions';
 import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
-import { IDebugService, REPL_VIEW_ID } from 'vs/workbench/contrib/debug/common/debug';
+// import { IDebugService, REPL_VIEW_ID } from 'vs/workbench/contrib/debug/common/debug'; // {{SQL CARBON EDIT}} - remove unused import

 interface IViewQuickPickItem extends IPickerQuickAccessItem {
 	containerLabel: string;
@@ -37,7 +37,7 @@ export class ViewQuickAccessProvider extends PickerQuickAccessProvider<IViewQuic
 		@IOutputService private readonly outputService: IOutputService,
 		@ITerminalService private readonly terminalService: ITerminalService,
 		@ITerminalGroupService private readonly terminalGroupService: ITerminalGroupService,
-		@IDebugService private readonly debugService: IDebugService,
+		// @IDebugService private readonly debugService: IDebugService, // {{SQL CARBON EDIT}} - Disable debug service
 		@IPaneCompositePartService private readonly paneCompositeService: IPaneCompositePartService,
 		@IContextKeyService private readonly contextKeyService: IContextKeyService
 	) {
@@ -184,6 +184,7 @@ export class ViewQuickAccessProvider extends PickerQuickAccessProvider<IViewQuic
 		});

 		// Debug Consoles
+		/* {{SQL CARBON EDIT}} - Disable debug service
 		this.debugService.getModel().getSessions(true).filter(s => s.hasSeparateRepl()).forEach((session, _) => {
 			const label = session.name;
 			viewEntries.push({
@@ -199,6 +200,7 @@ export class ViewQuickAccessProvider extends PickerQuickAccessProvider<IViewQuic
 			});

 		});
+		*/	// {{SQL CARBON EDIT}} - end Disable debug service comment block

 		// Output Channels
 		const channels = this.outputService.getChannelDescriptors();
Author	SHA1	Message	Date
Karl Burtram	8f53a316fa	Bump STS to 4.7.1.6 in release branch for connection pool issue (#23278 )	2023-05-31 18:36:22 -07:00
Karl Burtram	cdf76a91a6	Add getOptionKeyIdNames to IConnectionProfile (#23262 ) (#23268 )	2023-05-31 09:04:22 -07:00
Karl Burtram	a3fc0eb254	Remove debugService dependency from Open View (#23246 ) (#23255 )	2023-05-30 16:59:37 -07:00
Karl Burtram	5b5b0385de	Bump STS to 4.7.1.5 to pick up AAD email fix (#23259 )	2023-05-30 16:49:46 -07:00
Karl Burtram	b95603c203	Update package.json (#23258 ) Bump version for hotfix	2023-05-30 15:37:12 -07:00