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

Update dacpac and schema compare extensions to not use deprecated workspace.rootPath (#7125)

Browse Source
This commit is contained in:
Kim Santiago
2019-09-09 13:21:35 -07:00
committed by GitHub
parent b1eef13bb0
commit 3e9b694e6f
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/dacpac/src/wizard/api/dacFxConfigPage.ts
View File

@@ -182,7 +182,7 @@ export abstract class DacFxConfigPage extends BasePage {
if (this.fileTextBox.value && path.dirname(this.fileTextBox.value)) { if (this.fileTextBox.value && path.dirname(this.fileTextBox.value)) {
return path.dirname(this.fileTextBox.value); return path.dirname(this.fileTextBox.value);
} else { // otherwise use the folder open in the Explorer or the home directory } else { // otherwise use the folder open in the Explorer or the home directory
return vscode.workspace.rootPath ? vscode.workspace.rootPath : os.homedir(); return vscode.workspace.workspaceFolders ? vscode.workspace.workspaceFolders[0].name : os.homedir();
} }
} }

2
extensions/schema-compare/src/dialogs/schemaCompareDialog.ts
View File

@@ -306,7 +306,7 @@ export class SchemaCompareDialog {
currentButton.onDidClick(async (click) => { currentButton.onDidClick(async (click) => {
// file browser should open where the current dacpac is or the appropriate default folder // file browser should open where the current dacpac is or the appropriate default folder
let rootPath = vscode.workspace.rootPath ? vscode.workspace.rootPath : os.homedir(); let rootPath = vscode.workspace.workspaceFolders ? vscode.workspace.workspaceFolders[0].name : os.homedir();
let defaultUri = endpoint && endpoint.packageFilePath && existsSync(endpoint.packageFilePath) ? endpoint.packageFilePath : rootPath; let defaultUri = endpoint && endpoint.packageFilePath && existsSync(endpoint.packageFilePath) ? endpoint.packageFilePath : rootPath;
let fileUris = await vscode.window.showOpenDialog( let fileUris = await vscode.window.showOpenDialog(

4
extensions/schema-compare/src/schemaCompareMainWindow.ts
View File

@@ -845,7 +845,7 @@ export class SchemaCompareMainWindow {
this.openScmpButton.onDidClick(async (click) => { this.openScmpButton.onDidClick(async (click) => {
Telemetry.sendTelemetryEvent('SchemaCompareOpenScmpStarted'); Telemetry.sendTelemetryEvent('SchemaCompareOpenScmpStarted');
const rootPath = vscode.workspace.rootPath ? vscode.workspace.rootPath : os.homedir(); const rootPath = vscode.workspace.workspaceFolders ? vscode.workspace.workspaceFolders[0].name : os.homedir();
let fileUris = await vscode.window.showOpenDialog( let fileUris = await vscode.window.showOpenDialog(
{ {
canSelectFiles: true, canSelectFiles: true,
@@ -942,7 +942,7 @@ export class SchemaCompareMainWindow {
}).component(); }).component();
this.saveScmpButton.onDidClick(async (click) => { this.saveScmpButton.onDidClick(async (click) => {
const rootPath = vscode.workspace.rootPath ? vscode.workspace.rootPath : os.homedir(); const rootPath = vscode.workspace.workspaceFolders ? vscode.workspace.workspaceFolders[0].name : os.homedir();
const filePath = await vscode.window.showSaveDialog( const filePath = await vscode.window.showSaveDialog(
{ {
defaultUri: vscode.Uri.file(rootPath), defaultUri: vscode.Uri.file(rootPath),