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

Small fixes for output window and test (#11533)

Browse Source 
* Small fixes for output window and test

* removing some parts of recent tests that might cause issues
This commit is contained in:
Udeesha Gautam
2020-07-27 13:28:18 -07:00
committed by GitHub
parent c275f367da
commit 6928904a26
4 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,7 +32,7 @@ export interface DotNetCommandOptions {
export class NetCoreTool {
private _outputChannel: vscode.OutputChannel = vscode.window.createOutputChannel(projectsOutputChannel);
private static _outputChannel: vscode.OutputChannel = vscode.window.createOutputChannel(projectsOutputChannel);
public async findOrInstallNetCore(): Promise<boolean> {
if (!this.isNetCoreInstallationPresent) {
@@ -93,7 +93,7 @@ export class NetCoreTool {
public async runDotnetCommand(options: DotNetCommandOptions): Promise<string> {
if (options && options.commandTitle !== undefined && options.commandTitle !== null) {
this._outputChannel.appendLine(`\t[ ${options.commandTitle} ]`);
NetCoreTool._outputChannel.appendLine(`\t[ ${options.commandTitle} ]`);
}
if (!this.findOrInstallNetCore()) {
@@ -104,9 +104,9 @@ export class NetCoreTool {
const command = dotnetPath + ' ' + options.argument;
try {
return await this.runStreamedCommand(command, this._outputChannel, options);
return await this.runStreamedCommand(command, NetCoreTool._outputChannel, options);
} catch (error) {
this._outputChannel.append(localize('sqlDatabaseProject.RunCommand.ErroredOut', "\t>>> {0} … errored out: {1}", command, utils.getErrorMessage(error))); //errors are localized in our code where emitted, other errors are pass through from external components that are not easily localized
NetCoreTool._outputChannel.append(localize('sqlDatabaseProject.RunCommand.ErroredOut', "\t>>> {0} … errored out: {1}", command, utils.getErrorMessage(error))); //errors are localized in our code where emitted, other errors are pass through from external components that are not easily localized
throw error;
}
}