Skip to content

Commit 62c3ab5

Browse files
authored
SqlProjects: Checking mssql.enableExperimentalFeatures for whether to use new dialog (#26454)
* check for shared MSSQL preview config flag * package.json flags
1 parent d9727bb commit 62c3ab5

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

extensions/sql-database-projects/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -386,12 +386,12 @@
386386
},
387387
{
388388
"command": "sqlDatabaseProjects.publish",
389-
"when": "view == dataworkspace.views.main && viewItem =~ /^(databaseProject.itemType.project|databaseProject.itemType.legacyProject)$/ && (azdataAvailable || !config.sqlDatabaseProjects.enablePreviewFeatures)",
389+
"when": "view == dataworkspace.views.main && viewItem =~ /^(databaseProject.itemType.project|databaseProject.itemType.legacyProject)$/ && (azdataAvailable || !(config.sqlDatabaseProjects.enablePreviewFeatures || config.mssql.enableExperimentalFeatures))",
390390
"group": "1_dbProjectsFirst@3"
391391
},
392392
{
393393
"command": "sqlDatabaseProjects.publishDialog",
394-
"when": "!azdataAvailable && view == dataworkspace.views.main && viewItem =~ /^(databaseProject.itemType.project|databaseProject.itemType.legacyProject)$/ && config.sqlDatabaseProjects.enablePreviewFeatures",
394+
"when": "!azdataAvailable && view == dataworkspace.views.main && viewItem =~ /^(databaseProject.itemType.project|databaseProject.itemType.legacyProject)$/ && (config.sqlDatabaseProjects.enablePreviewFeatures || config.mssql.enableExperimentalFeatures)",
395395
"group": "1_dbProjectsFirst@3"
396396
},
397397
{
@@ -633,4 +633,4 @@
633633
"publisherDisplayName": "Microsoft",
634634
"publisherId": "Microsoft"
635635
}
636-
}
636+
}

extensions/sql-database-projects/src/common/constants.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -680,6 +680,8 @@ export enum PublishTargetType {
680680
export const CollapseProjectNodesKey = 'collapseProjectNodes';
681681
export const microsoftBuildSqlVersionKey = 'microsoftBuildSqlVersion';
682682
export const enablePreviewFeaturesKey = 'enablePreviewFeatures';
683+
export const mssqlConfigSectionKey = 'mssql';
684+
export const mssqlEnableExperimentalFeaturesKey = 'enableExperimentalFeatures';
683685

684686
//#endregion
685687

extensions/sql-database-projects/src/controllers/projectController.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,10 @@ export class ProjectsController {
542542
return publishDatabaseDialog.waitForClose();
543543
} else {
544544
// If preview feature is enabled, use preview flow
545-
const shouldUsePreview = vscode.workspace.getConfiguration(DBProjectConfigurationKey).get(constants.enablePreviewFeaturesKey);
545+
const shouldUsePreview =
546+
vscode.workspace.getConfiguration(DBProjectConfigurationKey).get<boolean>(constants.enablePreviewFeaturesKey) ||
547+
vscode.workspace.getConfiguration(constants.mssqlConfigSectionKey).get<boolean>(constants.mssqlEnableExperimentalFeaturesKey);
548+
546549
if (shouldUsePreview) {
547550
return await vscode.commands.executeCommand(constants.mssqlPublishProjectCommand, project.projectFilePath);
548551
} else {

0 commit comments

Comments
 (0)