diff --git a/extensions/sql-database-projects/src/controllers/mainController.ts b/extensions/sql-database-projects/src/controllers/mainController.ts index 664808f2f4..e28cf7ff96 100644 --- a/extensions/sql-database-projects/src/controllers/mainController.ts +++ b/extensions/sql-database-projects/src/controllers/mainController.ts @@ -77,7 +77,7 @@ export default class MainController implements Disposable { await templates.loadTemplates(path.join(this.context.extensionPath, 'resources', 'templates')); // ensure .net core is installed - this.netcoreTool.findOrInstallNetCore(); + await this.netcoreTool.findOrInstallNetCore(); } /** diff --git a/extensions/sql-database-projects/src/controllers/projectController.ts b/extensions/sql-database-projects/src/controllers/projectController.ts index 737488192b..894866f0c6 100644 --- a/extensions/sql-database-projects/src/controllers/projectController.ts +++ b/extensions/sql-database-projects/src/controllers/projectController.ts @@ -261,7 +261,7 @@ export class ProjectsController { // check that dacpac exists if (await utils.exists(dacpacPath)) { - this.apiWrapper.executeCommand(constants.schemaCompareStartCommand, dacpacPath); + await this.apiWrapper.executeCommand(constants.schemaCompareStartCommand, dacpacPath); } else { this.apiWrapper.showErrorMessage(constants.buildDacpacNotFound); } @@ -346,7 +346,7 @@ export class ProjectsController { const newEntry = await project.addScriptItem(relativeFilePath, newFileText); - this.apiWrapper.executeCommand(constants.vscodeOpenCommand, newEntry.fsUri); + await this.apiWrapper.executeCommand(constants.vscodeOpenCommand, newEntry.fsUri); this.refreshProjectsTree(); } catch (err) { diff --git a/extensions/sql-database-projects/src/tools/netcoreTool.ts b/extensions/sql-database-projects/src/tools/netcoreTool.ts index 265634b6a1..ba9ea4c9ec 100644 --- a/extensions/sql-database-projects/src/tools/netcoreTool.ts +++ b/extensions/sql-database-projects/src/tools/netcoreTool.ts @@ -34,26 +34,25 @@ export class NetCoreTool { private _outputChannel: vscode.OutputChannel = vscode.window.createOutputChannel(projectsOutputChannel); - public findOrInstallNetCore(): boolean { + public async findOrInstallNetCore(): Promise { if (!this.isNetCoreInstallationPresent) { - this.showInstallDialog(); + await this.showInstallDialog(); return false; } return true; } - private showInstallDialog(): void { - vscode.window.showInformationMessage(NetCoreInstallationConfirmation, UpdateNetCoreLocation, InstallNetCore).then(async (result) => { - if (result === UpdateNetCoreLocation) { - //open settings - vscode.commands.executeCommand('workbench.action.openGlobalSettings'); - } - else if (result === InstallNetCore) { - //open install link - const dotnetcoreURL = 'https://dotnet.microsoft.com/download/dotnet-core/3.1'; - vscode.env.openExternal(vscode.Uri.parse(dotnetcoreURL)); - } - }); + private async showInstallDialog(): Promise { + let result = await vscode.window.showInformationMessage(NetCoreInstallationConfirmation, UpdateNetCoreLocation, InstallNetCore); + if (result === UpdateNetCoreLocation) { + //open settings + await vscode.commands.executeCommand('workbench.action.openGlobalSettings'); + } + 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)); + } } private get isNetCoreInstallationPresent(): Boolean {