ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 2c306f762bf9c3db82dc06c7afaa56ef46d72f79 (#14050)

Browse Source 
* Merge from vscode 2c306f762bf9c3db82dc06c7afaa56ef46d72f79

* Fix breaks

* Extension management fixes

* Fix breaks in windows bundling

* Fix/skip failing tests

* Update distro

* Add clear to nuget.config

* Add hygiene task

* Bump distro

* Fix hygiene issue

* Add build to hygiene exclusion

* Update distro

* Update hygiene

* Hygiene exclusions

* Update tsconfig

* Bump distro for server breaks

* Update build config

* Update darwin path

* Add done calls to notebook tests

* Skip failing tests

* Disable smoke tests
This commit is contained in:
Karl Burtram
2021-02-09 16:15:05 -08:00
committed by GitHub
parent 6f192f9af5
commit ce612a3d96
1929 changed files with 68012 additions and 34564 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sql/workbench/contrib/dashboard/browser/core/dashboardPage.component.ts
View File

@@ -45,7 +45,6 @@ import { TaskRegistry } from 'sql/workbench/services/tasks/browser/tasksRegistry
import { MenuRegistry, IMenuService, MenuId, MenuItemAction } from 'vs/platform/actions/common/actions';
import { fillInActions, LabeledMenuItemActionItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
import { NAV_SECTION } from 'sql/workbench/contrib/dashboard/browser/containers/dashboardNavSection.contribution';
import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
import { DASHBOARD_BORDER, EDITOR_PANE_BACKGROUND, TOOLBAR_OVERFLOW_SHADOW } from 'vs/workbench/common/theme';
@@ -125,7 +124,6 @@ export abstract class DashboardPage extends AngularDisposable implements IConfig
@Inject(IContextKeyService) contextKeyService: IContextKeyService,
@Inject(IMenuService) private menuService: IMenuService,
@Inject(IKeybindingService) private keybindingService: IKeybindingService,
@Inject(IContextMenuService) private contextMenuService: IContextMenuService,
@Inject(IWorkbenchThemeService) private themeService: IWorkbenchThemeService
) {
super();
@@ -280,7 +278,7 @@ export abstract class DashboardPage extends AngularDisposable implements IConfig
private createActionItemProvider(action: Action): IActionViewItem {
// Create ActionItem for actions contributed by extensions
if (action instanceof MenuItemAction) {
return new LabeledMenuItemActionItem(action, this.keybindingService, this.contextMenuService, this.notificationService);
return new LabeledMenuItemActionItem(action, this.keybindingService, this.notificationService);
}
return undefined;
}

4
src/sql/workbench/contrib/dashboard/browser/pages/databaseDashboardPage.component.ts
View File

@@ -22,7 +22,6 @@ import { ICommandService } from 'vs/platform/commands/common/commands';
import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
import { IMenuService } from 'vs/platform/actions/common/actions';
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
export class DatabaseDashboardPage extends DashboardPage implements OnInit {
@@ -55,10 +54,9 @@ export class DatabaseDashboardPage extends DashboardPage implements OnInit {
@Inject(IContextKeyService) contextKeyService: IContextKeyService,
@Inject(IMenuService) menuService: IMenuService,
@Inject(IKeybindingService) keybindingService: IKeybindingService,
@Inject(IContextMenuService) contextMenuService: IContextMenuService,
@Inject(IWorkbenchThemeService) themeService: IWorkbenchThemeService
) {
super(dashboardService, el, _cd, notificationService, angularEventingService, configurationService, logService, commandService, contextKeyService, menuService, keybindingService, contextMenuService, themeService);
super(dashboardService, el, _cd, notificationService, angularEventingService, configurationService, logService, commandService, contextKeyService, menuService, keybindingService, themeService);
this._register(dashboardService.onUpdatePage(() => {
this.refresh(true);
this._cd.detectChanges();

2
src/sql/workbench/contrib/dashboard/browser/pages/serverDashboardPage.component.ts
View File

@@ -61,7 +61,7 @@ export class ServerDashboardPage extends DashboardPage implements OnInit {
@Inject(IContextMenuService) contextMenuService: IContextMenuService,
@Inject(IWorkbenchThemeService) themeService: IWorkbenchThemeService
) {
super(dashboardService, el, _cd, notificationService, angularEventingService, configurationService, logService, commandService, contextKeyService, menuService, keybindingService, contextMenuService, themeService);
super(dashboardService, el, _cd, notificationService, angularEventingService, configurationService, logService, commandService, contextKeyService, menuService, keybindingService, themeService);
// special-case handling for MSSQL data provider
const connInfo = this.dashboardService.connectionManagementService.connectionInfo;

2
src/sql/workbench/contrib/dashboard/browser/widgets/explorer/explorerTable.ts
View File

@@ -127,7 +127,7 @@ export class ExplorerTable extends Disposable {
const primary: IAction[] = [];
const secondary: IAction[] = [];
const result = { primary, secondary };
createAndFillInContextMenuActions(menu, { shouldForwardArgs: true }, result, this.contextMenuService, g => g === 'inline');
createAndFillInContextMenuActions(menu, { shouldForwardArgs: true }, result, g => g === 'inline');
this.contextMenuService.showContextMenu({
getAnchor: () => anchor,

4
src/sql/workbench/contrib/dashboard/browser/widgets/insights/insightsWidget.component.ts
View File

@@ -28,7 +28,7 @@ import * as nls from 'vs/nls';
import { Registry } from 'vs/platform/registry/common/platform';
import { IntervalTimer, createCancelablePromise } from 'vs/base/common/async';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
import { toDisposable } from 'vs/base/common/lifecycle';
import { isPromiseCanceledError } from 'vs/base/common/errors';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -189,7 +189,7 @@ export class InsightsWidget extends DashboardWidget implements IDashboardWidget,
};
this.lastUpdated = nls.localize('insights.lastUpdated', "Last Updated: {0} {1}", currentTime.toLocaleTimeString(), currentTime.toLocaleDateString());
this._changeRef.detectChanges();
this.storageService.store(this._getStorageKey(), JSON.stringify(store), StorageScope.GLOBAL);
this.storageService.store(this._getStorageKey(), JSON.stringify(store), StorageScope.GLOBAL, StorageTarget.MACHINE);
}
return result;
}

2
src/sql/workbench/contrib/dashboard/test/electron-browser/propertiesWidget.component.test.ts
View File

@@ -101,7 +101,7 @@ suite('Dashboard Properties Widget Tests', () => {
let testComponent = new PropertiesWidgetComponent(dashboardService.object, new TestChangeDetectorRef(), undefined, widgetConfig, testLogService);
return new Promise(resolve => {
return new Promise<void>(resolve => {
// because config parsing is done async we need to put our asserts on the thread stack
setImmediate(() => {
const propertyItems: PropertyItem[] = (testComponent as any).parseProperties(databaseInfo);