ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix "unsupported version" error when adding sql binding package (#17721)

Browse Source
This commit is contained in:
Charles Gagnon
2021-11-22 10:44:46 -08:00
committed by GitHub
parent 172e349947
commit 0caa6390b9
2 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,18 +44,22 @@ export class NetCoreTool extends ShellExecutionHelper {
/** /**
* This method presents the installation dialog for .NET Core, if not already present/supported * This method presents the installation dialog for .NET Core, if not already present/supported
* @param skipVersionSupportedCheck If true then skip the check to determine whether the .NET version is supported (for commands that work on all versions)
* @returns True if .NET version was found and is supported * @returns True if .NET version was found and is supported
* False if .NET version isn't present or present but not supported * False if .NET version isn't present or present but not supported
*/ */
public async findOrInstallNetCore(): Promise<boolean> { public async findOrInstallNetCore(skipVersionSupportedCheck = false): Promise<boolean> {
if ((!this.isNetCoreInstallationPresent || !await this.isNetCoreVersionSupported())) { if (!this.isNetCoreInstallationPresent || (this.isNetCoreInstallationPresent && !skipVersionSupportedCheck)) {
if (this.netCoreInstallState === netCoreInstallState.netCoreVersionSupported && vscode.workspace.getConfiguration(DBProjectConfigurationKey)[NetCoreDoNotAskAgainKey] !== true) { if (!this.isNetCoreInstallationPresent || !await this.isNetCoreVersionSupported()) {
void this.showInstallDialog(); // Removing await so that Build and extension load process doesn't wait on user input if (this.netCoreInstallState === netCoreInstallState.netCoreVersionSupported && vscode.workspace.getConfiguration(DBProjectConfigurationKey)[NetCoreDoNotAskAgainKey] !== true) {
} else if (this.netCoreInstallState === netCoreInstallState.netCoreVersionTooHigh && vscode.workspace.getConfiguration(DBProjectConfigurationKey)[NetCoreDowngradeDoNotShowAgainKey] !== true) { void this.showInstallDialog(); // Removing await so that Build and extension load process doesn't wait on user input
void this.showDowngradeDialog(); } else if (this.netCoreInstallState === netCoreInstallState.netCoreVersionTooHigh && vscode.workspace.getConfiguration(DBProjectConfigurationKey)[NetCoreDowngradeDoNotShowAgainKey] !== true) {
void this.showDowngradeDialog();
}
return false;
} }
return false;
} }
this.netCoreInstallState = netCoreInstallState.netCoreVersionSupported; this.netCoreInstallState = netCoreInstallState.netCoreVersionSupported;
return true; return true;
} }
@@ -197,12 +201,18 @@ export class NetCoreTool extends ShellExecutionHelper {
} }
} }
public async runDotnetCommand(options: ShellCommandOptions): Promise<string> { /**
* Runs the specified dotnet command
* @param options The options to use when launching the process
* @param skipVersionSupportedCheck If true then skip the check to determine whether the .NET version is supported (for commands that work on all versions)
* @returns
*/
public async runDotnetCommand(options: ShellCommandOptions, skipVersionSupportedCheck = false): Promise<string> {
if (options && options.commandTitle !== undefined && options.commandTitle !== null) { if (options && options.commandTitle !== undefined && options.commandTitle !== null) {
this._outputChannel.appendLine(`\t[ ${options.commandTitle} ]`); this._outputChannel.appendLine(`\t[ ${options.commandTitle} ]`);
} }
if (!(await this.findOrInstallNetCore())) { if (!(await this.findOrInstallNetCore(skipVersionSupportedCheck))) {
if (this.netCoreInstallState === netCoreInstallState.netCoreNotPresent) { if (this.netCoreInstallState === netCoreInstallState.netCoreNotPresent) {
throw new DotNetError(NetCoreInstallationConfirmation); throw new DotNetError(NetCoreInstallationConfirmation);
} else if (this.netCoreInstallState === netCoreInstallState.netCoreVersionTooHigh && vscode.workspace.getConfiguration(DBProjectConfigurationKey)[NetCoreDowngradeDoNotShowAgainKey] === true) { } else if (this.netCoreInstallState === netCoreInstallState.netCoreVersionTooHigh && vscode.workspace.getConfiguration(DBProjectConfigurationKey)[NetCoreDowngradeDoNotShowAgainKey] === true) {

4
extensions/sql-database-projects/src/tools/packageHelper.ts
View File

@@ -47,8 +47,8 @@ export class PackageHelper {
commandTitle: constants.addPackage, commandTitle: constants.addPackage,
argument: this.constructAddPackageArguments(projectUri, packageName, packageVersion) argument: this.constructAddPackageArguments(projectUri, packageName, packageVersion)
}; };
// Add package can be done with any version of .NET so skip the supported version check
await this.netCoreTool.runDotnetCommand(addOptions); await this.netCoreTool.runDotnetCommand(addOptions, true);
} }
/** /**