ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add setting to hide netcore installation prompt (#15470)

Browse Source 
* Add setting to hide netcore installation prompt

* Shortened strings to fit toast

* Updating data workspace string for consistency
This commit is contained in:
Benjin Dubishar
2021-05-17 09:59:08 -07:00
committed by GitHub
parent faf4c9232b
commit 7e8dccec82
7 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/data-workspace/src/common/constants.ts
View File

@@ -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 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 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 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 LaunchOpenExisitingDialog = localize('dataworkspace.launchOpenExistingDialog', "Launch 'Open Existing' Dialog");
export const DoNotShowAgain = localize('dataworkspace.doNotShowAgain', "Do not show again"); 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 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 fileDoesNotExist = (name: string): string => { return localize('fileDoesNotExist', "File '{0}' doesn't exist", name); };
export const projectNameNull = localize('projectNameNull', "Project name is null"); export const projectNameNull = localize('projectNameNull', "Project name is null");

4
extensions/data-workspace/src/services/workspaceService.ts
View File

@@ -206,11 +206,11 @@ export class WorkspaceService implements IWorkspaceService {
} }
if (containsNotAddedProject) { 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) { if (result === constants.LaunchOpenExisitingDialog) {
// open settings // open settings
await vscode.commands.executeCommand('projects.openExisting'); await vscode.commands.executeCommand('projects.openExisting');
} else if (result === constants.DoNotShowAgain) { } else if (result === constants.DoNotAskAgain) {
await config.update(constants.showNotAddedProjectsMessageKey, false, true); await config.update(constants.showNotAddedProjectsMessageKey, false, true);
} }

2
extensions/data-workspace/src/test/workspaceService.test.ts
View File

@@ -427,7 +427,7 @@ suite('WorkspaceService Tests', function (): void {
description: '', description: '',
icon: '' icon: ''
}]); }]);
const infoMessageStub = sinon.stub(vscode.window, 'showInformationMessage').resolves(<any>constants.DoNotShowAgain); const infoMessageStub = sinon.stub(vscode.window, 'showInformationMessage').resolves(<any>constants.DoNotAskAgain);
const getProjectsInwWorkspaceFolderStub = sinon.stub(service, 'getAllProjectsInFolder').resolves([vscode.Uri.file('abc.sqlproj').fsPath, vscode.Uri.file('folder1/abc1.sqlproj').fsPath]); const getProjectsInwWorkspaceFolderStub = sinon.stub(service, 'getAllProjectsInFolder').resolves([vscode.Uri.file('abc.sqlproj').fsPath, vscode.Uri.file('folder1/abc1.sqlproj').fsPath]);
await service.checkForProjectsNotAddedToWorkspace(); await service.checkForProjectsNotAddedToWorkspace();

4
extensions/sql-database-projects/package.json
View File

@@ -39,6 +39,10 @@
"sqlDatabaseProjects.netCoreSDKLocation": { "sqlDatabaseProjects.netCoreSDKLocation": {
"type": "string", "type": "string",
"description": "%sqlDatabaseProjects.netCoreInstallLocation%" "description": "%sqlDatabaseProjects.netCoreInstallLocation%"
},
"sqlDatabaseProjects.netCoreDoNotAsk": {
"type": "boolean",
"description": "%sqlDatabaseProjects.netCoreDoNotAsk%"
} }
} }
} }

3
extensions/sql-database-projects/package.nls.json
View File

@@ -32,6 +32,7 @@
"sqlDatabaseProjects.changeTargetPlatform": "Change Target Platform", "sqlDatabaseProjects.changeTargetPlatform": "Change Target Platform",
"sqlDatabaseProjects.Settings": "Database Projects", "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)" "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)"
} }

2
extensions/sql-database-projects/src/test/netCoreTool.test.ts
View File

@@ -42,7 +42,7 @@ describe('NetCoreTool: Net core tests', function (): void {
if (os.platform() === 'win32') { if (os.platform() === 'win32') {
// check that path should start with c:\program files // check that path should start with c:\program files
let result = isNullOrUndefined(netcoreTool.netcoreInstallLocation) || netcoreTool.netcoreInstallLocation.toLowerCase().startsWith('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') { if (os.platform() === 'linux' || os.platform() === 'darwin') {

17
extensions/sql-database-projects/src/tools/netcoreTool.ts
View File

@@ -15,10 +15,12 @@ const localize = nls.loadMessageBundle();
export const DBProjectConfigurationKey: string = 'sqlDatabaseProjects'; export const DBProjectConfigurationKey: string = 'sqlDatabaseProjects';
export const NetCoreInstallLocationKey: string = 'netCoreSDKLocation'; export const NetCoreInstallLocationKey: string = 'netCoreSDKLocation';
export const NetCoreDoNotAskAgainKey: string = 'netCoreDoNotAsk';
export const NextCoreNonWindowsDefaultPath = '/usr/local/share'; 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 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 UpdateNetCoreLocation: string = localize('sqlDatabaseProjects.UpdateNetCoreLocation', "Update Location");
export const InstallNetCore: string = localize('sqlDatabaseProjects.InstallNetCore', "Install .Net Core SDK"); 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 projectsOutputChannel = localize('sqlDatabaseProjects.outputChannel', "Database Projects");
const dotnet = os.platform() === 'win32' ? 'dotnet.exe' : 'dotnet'; const dotnet = os.platform() === 'win32' ? 'dotnet.exe' : 'dotnet';
@@ -35,7 +37,7 @@ export class NetCoreTool {
private static _outputChannel: vscode.OutputChannel = vscode.window.createOutputChannel(projectsOutputChannel); private static _outputChannel: vscode.OutputChannel = vscode.window.createOutputChannel(projectsOutputChannel);
public async findOrInstallNetCore(): Promise<boolean> { public async findOrInstallNetCore(): Promise<boolean> {
if (!this.isNetCoreInstallationPresent) { if (!this.isNetCoreInstallationPresent && vscode.workspace.getConfiguration(DBProjectConfigurationKey)[NetCoreDoNotAskAgainKey] !== true) {
await this.showInstallDialog(); await this.showInstallDialog();
return false; return false;
} }
@@ -43,15 +45,18 @@ export class NetCoreTool {
} }
public async showInstallDialog(): Promise<void> { public async showInstallDialog(): Promise<void> {
let result = await vscode.window.showInformationMessage(NetCoreInstallationConfirmation, UpdateNetCoreLocation, InstallNetCore); let result = await vscode.window.showInformationMessage(NetCoreInstallationConfirmation, UpdateNetCoreLocation, InstallNetCore, DoNotAskAgain);
if (result === UpdateNetCoreLocation) { if (result === UpdateNetCoreLocation) {
//open settings //open settings
await vscode.commands.executeCommand('workbench.action.openGlobalSettings'); await vscode.commands.executeCommand('workbench.action.openGlobalSettings');
} } else if (result === InstallNetCore) {
else if (result === InstallNetCore) {
//open install link //open install link
const dotnetcoreURL = 'https://dotnet.microsoft.com/download/dotnet-core/3.1'; const dotnetcoreURL = 'https://dotnet.microsoft.com/download/dotnet-core/3.1';
await vscode.env.openExternal(vscode.Uri.parse(dotnetcoreURL)); 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);
} }
} }