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

Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898 (#15681)

Browse Source 
* Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898

* Fixes and cleanup

* Distro

* Fix hygiene yarn

* delete no yarn lock changes file

* Fix hygiene

* Fix layer check

* Fix CI

* Skip lib checks

* Remove tests deleted in vs code

* Fix tests

* Distro

* Fix tests and add removed extension point

* Skip failing notebook tests for now

* Disable broken tests and cleanup build folder

* Update yarn.lock and fix smoke tests

* Bump sqlite

* fix contributed actions and file spacing

* Fix user data path

* Update yarn.locks

Co-authored-by: ADS Merger <karlb@microsoft.com>
This commit is contained in:
Charles Gagnon
2021-06-17 08:17:11 -07:00
committed by GitHub
parent fdcb97c7f7
commit 3cb2f552a6
2582 changed files with 124827 additions and 87099 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
extensions/sql-database-projects/src/models/project.ts
View File

@@ -1131,7 +1131,7 @@ export class FileProjectEntry extends ProjectEntry implements IFileProjectEntry
this.sqlObjectType = sqlObjectType;
}
public toString(): string {
public override toString(): string {
return this.fsUri.path;
}
@@ -1173,7 +1173,7 @@ export class DacpacReferenceProjectEntry extends FileProjectEntry implements IDa
return path.parse(utils.getPlatformSafeFileEntryPath(this.fsUri.fsPath)).name;
}
public pathForSqlProj(): string {
public override pathForSqlProj(): string {
// need to remove the leading slash from path for build to work
return utils.convertSlashesForSqlProj(this.fsUri.path.substring(1));
}
@@ -1191,7 +1191,7 @@ export class SystemDatabaseReferenceProjectEntry extends FileProjectEntry implem
return path.parse(utils.getPlatformSafeFileEntryPath(this.fsUri.fsPath)).name;
}
public pathForSqlProj(): string {
public override pathForSqlProj(): string {
// need to remove the leading slash for system database path for build to work on Windows
return utils.convertSlashesForSqlProj(this.fsUri.path.substring(1));
}
@@ -1226,7 +1226,7 @@ export class SqlProjectReferenceProjectEntry extends FileProjectEntry implements
return this.projectName;
}
public pathForSqlProj(): string {
public override pathForSqlProj(): string {
// need to remove the leading slash from path for build to work on Windows
return utils.convertSlashesForSqlProj(this.fsUri.path.substring(1));
}

2
extensions/sql-database-projects/src/models/tree/fileFolderTreeItem.ts
View File

@@ -72,7 +72,7 @@ export class FileNode extends BaseProjectTreeItem {
}
export class ExternalStreamingJobFileNode extends FileNode {
public get treeItem(): vscode.TreeItem {
public override get treeItem(): vscode.TreeItem {
const treeItem = super.treeItem;
treeItem.contextValue = DatabaseProjectItemType.externalStreamingJob;

3
extensions/sql-database-projects/src/test/testContext.ts
View File

@@ -144,7 +144,8 @@ export function createContext(): TestContext {
globalStorageUri: vscode.Uri.parse('test://'),
logUri: vscode.Uri.parse('test://'),
storageUri: vscode.Uri.parse('test://'),
secrets: undefined as any
secrets: undefined as any,
extension: undefined as any
},
dacFxService: TypeMoq.Mock.ofType(MockDacFxService)
};