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

Update pop-up to be an error message instead of informational message (#16660) (#16715)

Browse Source 
* Update pop-up to be an error message

* Update message text

* Address comment

* Address comment

Co-authored-by: Sakshi Sharma <57200045+SakshiS-harma@users.noreply.github.com>
This commit is contained in:
Benjin Dubishar
2021-08-11 12:21:30 -07:00
committed by GitHub
parent 2fbfb2ad61
commit b0d3d06b5d
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
extensions/sql-database-projects/src/controllers/projectController.ts
View File

@@ -238,7 +238,10 @@ export class ProjectsController {
.withAdditionalMeasurements({ duration: timeToFailureBuild }) .withAdditionalMeasurements({ duration: timeToFailureBuild })
.send(); .send();
vscode.window.showErrorMessage(constants.projBuildFailed(utils.getErrorMessage(err))); const error = utils.getErrorMessage(err);
if (error !== (constants.NetCoreInstallationConfirmation || constants.NetCoreSupportedVersionInstallationConfirmation)) {
vscode.window.showErrorMessage(constants.projBuildFailed(error));
}
return ''; return '';
} }
} }

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

@@ -55,7 +55,7 @@ export class NetCoreTool {
public async findOrInstallNetCore(): Promise<boolean> { public async findOrInstallNetCore(): Promise<boolean> {
if ((!this.isNetCoreInstallationPresent || !await this.isNetCoreVersionSupported())) { if ((!this.isNetCoreInstallationPresent || !await this.isNetCoreVersionSupported())) {
if (vscode.workspace.getConfiguration(DBProjectConfigurationKey)[NetCoreDoNotAskAgainKey] !== true) { if (vscode.workspace.getConfiguration(DBProjectConfigurationKey)[NetCoreDoNotAskAgainKey] !== true) {
await this.showInstallDialog(); this.showInstallDialog(); // Removing await so that Build and extension load process doesn't wait on user input
} }
return false; return false;
} }
@@ -66,9 +66,9 @@ export class NetCoreTool {
public async showInstallDialog(): Promise<void> { public async showInstallDialog(): Promise<void> {
let result; let result;
if (this.netCoreInstallState === netCoreInstallState.netCoreNotPresent) { if (this.netCoreInstallState === netCoreInstallState.netCoreNotPresent) {
result = await vscode.window.showInformationMessage(NetCoreInstallationConfirmation, UpdateNetCoreLocation, InstallNetCore, DoNotAskAgain); result = await vscode.window.showErrorMessage(NetCoreInstallationConfirmation, UpdateNetCoreLocation, InstallNetCore, DoNotAskAgain);
} else { } else {
result = await vscode.window.showInformationMessage(NetCoreSupportedVersionInstallationConfirmation(this.netCoreSdkInstalledVersion!), UpdateNetCoreLocation, InstallNetCore, DoNotAskAgain); result = await vscode.window.showErrorMessage(NetCoreSupportedVersionInstallationConfirmation(this.netCoreSdkInstalledVersion!), UpdateNetCoreLocation, InstallNetCore, DoNotAskAgain);
} }
if (result === UpdateNetCoreLocation) { if (result === UpdateNetCoreLocation) {