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

Fix incorrect .NET error (#16694)

Browse Source 
* Fix .NET Install state for error conditions

* Address comment- remove redundant constructor
This commit is contained in:
Sakshi Sharma
2021-08-11 11:29:48 -07:00
committed by GitHub
parent a4b1e8af96
commit 4250556023
2 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,7 +24,7 @@ import { IDeploySettings } from '../models/IDeploySettings';
import { BaseProjectTreeItem } from '../models/tree/baseTreeItem';
import { ProjectRootTreeItem } from '../models/tree/projectTreeItem';
import { ImportDataModel } from '../models/api/import';
import { NetCoreTool, DotNetCommandOptions } from '../tools/netcoreTool';
import { NetCoreTool, DotNetCommandOptions, DotNetError } from '../tools/netcoreTool';
import { BuildHelper } from '../tools/buildHelper';
import { readPublishProfile } from '../models/publishProfile/publishProfile';
import { AddDatabaseReferenceDialog } from '../dialogs/addDatabaseReferenceDialog';
@@ -241,9 +241,11 @@ export class ProjectsController {
.withAdditionalMeasurements({ duration: timeToFailureBuild })
.send();
const error = utils.getErrorMessage(err);
if (error !== (constants.NetCoreInstallationConfirmation || constants.NetCoreSupportedVersionInstallationConfirmation)) {
vscode.window.showErrorMessage(constants.projBuildFailed(error));
const message = utils.getErrorMessage(err);
if (err instanceof DotNetError) {
vscode.window.showErrorMessage(message);
} else {
vscode.window.showErrorMessage(constants.projBuildFailed(message));
}
return '';
}