diff --git a/extensions/data-workspace/src/common/constants.ts b/extensions/data-workspace/src/common/constants.ts index c524368379..9c54310b33 100644 --- a/extensions/data-workspace/src/common/constants.ts +++ b/extensions/data-workspace/src/common/constants.ts @@ -18,8 +18,8 @@ export const OpenWorkspace = localize('dataworkspace.openWorkspace', "Open Works export const CreateWorkspaceConfirmation = localize('dataworkspace.createWorkspaceConfirmation', "A workspace will be created and opened in order to open project. Azure Data Studio will restart and if there is a folder currently open, it will be closed."); export const EnterWorkspaceConfirmation = localize('dataworkspace.enterWorkspaceConfirmation', "To open this workspace, Azure Data Studio will restart. If there is a workspace or folder currently open, it will be closed."); export const WorkspaceContainsNotAddedProjects = localize('dataworkspace.workspaceContainsNotAddedProjects', "The current workspace contains one or more projects that have not been added to the workspace. Use the 'Open existing' dialog to add projects to the projects pane."); -export const LaunchOpenExisitingDialog = localize('dataworkspace.launchOpenExistingDialog', "Launch Open existing dialog"); -export const DoNotShowAgain = localize('dataworkspace.doNotShowAgain', "Do not show again"); +export const LaunchOpenExisitingDialog = localize('dataworkspace.launchOpenExistingDialog', "Launch 'Open Existing' Dialog"); +export const DoNotAskAgain = localize('dataworkspace.doNotAskAgain', "Don't Ask Again"); export const ProjectsFailedToLoad = localize('dataworkspace.projectsFailedToLoad', "Some projects failed to load. To view more details, [open the developer console](command:workbench.action.toggleDevTools)"); export const fileDoesNotExist = (name: string): string => { return localize('fileDoesNotExist', "File '{0}' doesn't exist", name); }; export const projectNameNull = localize('projectNameNull', "Project name is null"); diff --git a/extensions/data-workspace/src/services/workspaceService.ts b/extensions/data-workspace/src/services/workspaceService.ts index dc700e8213..c7859b3b5c 100644 --- a/extensions/data-workspace/src/services/workspaceService.ts +++ b/extensions/data-workspace/src/services/workspaceService.ts @@ -206,11 +206,11 @@ export class WorkspaceService implements IWorkspaceService { } if (containsNotAddedProject) { - const result = await vscode.window.showInformationMessage(constants.WorkspaceContainsNotAddedProjects, constants.LaunchOpenExisitingDialog, constants.DoNotShowAgain); + const result = await vscode.window.showInformationMessage(constants.WorkspaceContainsNotAddedProjects, constants.LaunchOpenExisitingDialog, constants.DoNotAskAgain); if (result === constants.LaunchOpenExisitingDialog) { // open settings await vscode.commands.executeCommand('projects.openExisting'); - } else if (result === constants.DoNotShowAgain) { + } else if (result === constants.DoNotAskAgain) { await config.update(constants.showNotAddedProjectsMessageKey, false, true); } diff --git a/extensions/data-workspace/src/test/workspaceService.test.ts b/extensions/data-workspace/src/test/workspaceService.test.ts index e4b7453d17..601e60f749 100644 --- a/extensions/data-workspace/src/test/workspaceService.test.ts +++ b/extensions/data-workspace/src/test/workspaceService.test.ts @@ -427,7 +427,7 @@ suite('WorkspaceService Tests', function (): void { description: '', icon: '' }]); - const infoMessageStub = sinon.stub(vscode.window, 'showInformationMessage').resolves(constants.DoNotShowAgain); + const infoMessageStub = sinon.stub(vscode.window, 'showInformationMessage').resolves(constants.DoNotAskAgain); const getProjectsInwWorkspaceFolderStub = sinon.stub(service, 'getAllProjectsInFolder').resolves([vscode.Uri.file('abc.sqlproj').fsPath, vscode.Uri.file('folder1/abc1.sqlproj').fsPath]); await service.checkForProjectsNotAddedToWorkspace(); diff --git a/extensions/sql-database-projects/package.json b/extensions/sql-database-projects/package.json index 6d95c20458..5f7071d310 100644 --- a/extensions/sql-database-projects/package.json +++ b/extensions/sql-database-projects/package.json @@ -39,6 +39,10 @@ "sqlDatabaseProjects.netCoreSDKLocation": { "type": "string", "description": "%sqlDatabaseProjects.netCoreInstallLocation%" + }, + "sqlDatabaseProjects.netCoreDoNotAsk": { + "type": "boolean", + "description": "%sqlDatabaseProjects.netCoreDoNotAsk%" } } } diff --git a/extensions/sql-database-projects/package.nls.json b/extensions/sql-database-projects/package.nls.json index 42698f47a4..7419ee4da2 100644 --- a/extensions/sql-database-projects/package.nls.json +++ b/extensions/sql-database-projects/package.nls.json @@ -32,6 +32,7 @@ "sqlDatabaseProjects.changeTargetPlatform": "Change Target Platform", "sqlDatabaseProjects.Settings": "Database Projects", - "sqlDatabaseProjects.netCoreInstallLocation": "Full path to .Net Core SDK on the machine.", + "sqlDatabaseProjects.netCoreInstallLocation": "Full path to .NET Core SDK on the machine.", + "sqlDatabaseProjects.netCoreDoNotAsk": "Whether to prompt the user to install .NET Core when not detected.", "sqlDatabaseProjects.welcome": "No database projects currently open.\n[New Project](command:sqlDatabaseProjects.new)\n[Open Project](command:sqlDatabaseProjects.open)\n[Create Project From Database](command:sqlDatabaseProjects.importDatabase)" } diff --git a/extensions/sql-database-projects/src/test/netCoreTool.test.ts b/extensions/sql-database-projects/src/test/netCoreTool.test.ts index c52a75e9ab..ed12ce3346 100644 --- a/extensions/sql-database-projects/src/test/netCoreTool.test.ts +++ b/extensions/sql-database-projects/src/test/netCoreTool.test.ts @@ -42,7 +42,7 @@ describe('NetCoreTool: Net core tests', function (): void { if (os.platform() === 'win32') { // check that path should start with c:\program files let result = isNullOrUndefined(netcoreTool.netcoreInstallLocation) || netcoreTool.netcoreInstallLocation.toLowerCase().startsWith('c:\\program files'); - should(result).true('dotnet is either not present or in pogramfiles by default'); + should(result).true('dotnet is either not present or in programfiles by default'); } if (os.platform() === 'linux' || os.platform() === 'darwin') { diff --git a/extensions/sql-database-projects/src/tools/netcoreTool.ts b/extensions/sql-database-projects/src/tools/netcoreTool.ts index 95fd06c8c9..0c5a06e5c6 100644 --- a/extensions/sql-database-projects/src/tools/netcoreTool.ts +++ b/extensions/sql-database-projects/src/tools/netcoreTool.ts @@ -15,10 +15,12 @@ const localize = nls.loadMessageBundle(); export const DBProjectConfigurationKey: string = 'sqlDatabaseProjects'; export const NetCoreInstallLocationKey: string = 'netCoreSDKLocation'; +export const NetCoreDoNotAskAgainKey: string = 'netCoreDoNotAsk'; export const NextCoreNonWindowsDefaultPath = '/usr/local/share'; export const NetCoreInstallationConfirmation: string = localize('sqlDatabaseProjects.NetCoreInstallationConfirmation', "The .NET Core SDK cannot be located. Project build will not work. Please install .NET Core SDK version 3.1 or update the .Net Core SDK location in settings if already installed."); -export const UpdateNetCoreLocation: string = localize('sqlDatabaseProjects.UpdateNetCoreLocation', "Update .Net Core location"); -export const InstallNetCore: string = localize('sqlDatabaseProjects.InstallNetCore', "Install .Net Core SDK"); +export const UpdateNetCoreLocation: string = localize('sqlDatabaseProjects.UpdateNetCoreLocation', "Update Location"); +export const InstallNetCore: string = localize('sqlDatabaseProjects.InstallNetCore', "Install"); +export const DoNotAskAgain: string = localize('sqlDatabaseProjects.doNotAskAgain', "Don't Ask Again"); const projectsOutputChannel = localize('sqlDatabaseProjects.outputChannel', "Database Projects"); const dotnet = os.platform() === 'win32' ? 'dotnet.exe' : 'dotnet'; @@ -35,7 +37,7 @@ export class NetCoreTool { private static _outputChannel: vscode.OutputChannel = vscode.window.createOutputChannel(projectsOutputChannel); public async findOrInstallNetCore(): Promise { - if (!this.isNetCoreInstallationPresent) { + if (!this.isNetCoreInstallationPresent && vscode.workspace.getConfiguration(DBProjectConfigurationKey)[NetCoreDoNotAskAgainKey] !== true) { await this.showInstallDialog(); return false; } @@ -43,15 +45,18 @@ export class NetCoreTool { } public async showInstallDialog(): Promise { - let result = await vscode.window.showInformationMessage(NetCoreInstallationConfirmation, UpdateNetCoreLocation, InstallNetCore); + let result = await vscode.window.showInformationMessage(NetCoreInstallationConfirmation, UpdateNetCoreLocation, InstallNetCore, DoNotAskAgain); + if (result === UpdateNetCoreLocation) { //open settings await vscode.commands.executeCommand('workbench.action.openGlobalSettings'); - } - else if (result === InstallNetCore) { + } else if (result === InstallNetCore) { //open install link const dotnetcoreURL = 'https://dotnet.microsoft.com/download/dotnet-core/3.1'; await vscode.env.openExternal(vscode.Uri.parse(dotnetcoreURL)); + } else if (result === DoNotAskAgain) { + const config = vscode.workspace.getConfiguration(DBProjectConfigurationKey); + await config.update(NetCoreDoNotAskAgainKey, true, vscode.ConfigurationTarget.Global); } }