mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-01-17 09:35:37 -05:00
@@ -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();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -34,26 +34,25 @@ export class NetCoreTool {
|
||||
|
||||
private _outputChannel: vscode.OutputChannel = vscode.window.createOutputChannel(projectsOutputChannel);
|
||||
|
||||
public findOrInstallNetCore(): boolean {
|
||||
public async findOrInstallNetCore(): Promise<boolean> {
|
||||
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<void> {
|
||||
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 {
|
||||
|
||||
Reference in New Issue
Block a user