Inital platform relayering (#6385)

* moving test files and inital refactoring

* relayer extension host code

* fix imports

* make insights work

* relayer dashboard

* relayer notebooks

* moveing more code around

* formatting

* accept angular as browser

* fix serializer

* add missing files

* remove declarations from extensions

* fix build errors

* more relayering

* change urls to relative to help code relayering

* remove layering to prep for merge

* fix hygiene errors

* fix hygiene errors

* fix tests

src/bootstrap-window.js

@@ -113,16 +113,9 @@ exports.load = function (modulePaths, resultCallback, options) {
 		'@angular/platform-browser',
 		'@angular/platform-browser-dynamic',
 		'@angular/router',
-		'angular2-grid',
-		'ansi_up',
-		'html-query-plan',
-		'ng2-charts',
 		'rxjs/Observable',
 		'rxjs/Subject',
-		'rxjs/Observer',
-		'htmlparser2',
-		'sanitize',
-		'plotly.js-dist'
+		'rxjs/Observer'
 	]);
 	// {{SQL CARBON EDIT}} - End
 

src/sql/base/browser/ui/breadcrumb/breadcrumb.component.ts

@@ -8,10 +8,10 @@ import 'vs/css!./media/breadcrumb';
 import { Component, Inject, forwardRef, OnInit, OnDestroy, ChangeDetectorRef } from '@angular/core';
 import { Router } from '@angular/router';
 
-import { toDisposableSubscription } from 'sql/base/node/rxjsUtils';
 import { IBreadcrumbService, MenuItem } from './interfaces';
 
 import { IDisposable } from 'vs/base/common/lifecycle';
+import { subscriptionToDisposable } from 'sql/base/browser/lifecycle';
 
 @Component({
 	selector: 'breadcrumb',
@@ -40,7 +40,7 @@ export class BreadcrumbComponent implements OnInit, OnDestroy {
 	) { }
 
 	ngOnInit() {
-		this.disposables.push(toDisposableSubscription(this._breadcrumbService.breadcrumbItem.subscribe((item) => this.updateCrumb(item))));
+		this.disposables.push(subscriptionToDisposable(this._breadcrumbService.breadcrumbItem.subscribe((item) => this.updateCrumb(item))));
 	}
 
 	ngOnDestroy() {

src/sql/base/browser/ui/panel/panel.component.ts

@@ -8,9 +8,9 @@ import {
 	Input, EventEmitter, Output, ViewChild, ElementRef
 } from '@angular/core';
 
-import { TabComponent } from 'sql/base/electron-browser/ui/panel/tab.component';
-import { ScrollableDirective } from 'sql/base/electron-browser/ui/scrollable/scrollable.directive';
-import { subscriptionToDisposable } from 'sql/base/node/lifecycle';
+import { TabComponent } from 'sql/base/browser/ui/panel/tab.component';
+import { ScrollableDirective } from 'sql/base/browser/ui/scrollable/scrollable.directive';
+import { subscriptionToDisposable } from 'sql/base/browser/lifecycle';
 
 import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
 import { Action } from 'vs/base/common/actions';

src/sql/base/browser/ui/panel/panel.module.ts

@@ -10,7 +10,7 @@ import { TabComponent } from './tab.component';
 import { TabHeaderComponent } from './tabHeader.component';
 import { PanelComponent } from './panel.component';
 
-import { ScrollableModule } from 'sql/base/electron-browser/ui/scrollable/scrollable.module';
+import { ScrollableModule } from 'sql/base/browser/ui/scrollable/scrollable.module';
 
 @NgModule({
 	imports: [CommonModule, ScrollableModule],

src/sql/base/browser/ui/scrollable/scrollable.directive.ts

@@ -8,7 +8,7 @@ import { Directive, Inject, forwardRef, ElementRef, Input } from '@angular/core'
 import { ScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
 import { ScrollbarVisibility } from 'vs/base/common/scrollable';
 import { getContentHeight, addDisposableListener, EventType, getContentWidth } from 'vs/base/browser/dom';
-import { AngularDisposable } from 'sql/base/node/lifecycle';
+import { AngularDisposable } from 'sql/base/browser/lifecycle';
 
 @Directive({
 	selector: '[scrollable]'

src/sql/platform/accounts/browser/accountDialog.ts

@@ -32,7 +32,7 @@ import { AddAccountAction } from 'sql/platform/accounts/common/accountActions';
 import { AccountListRenderer, AccountListDelegate } from 'sql/platform/accounts/browser/accountListRenderer';
 import { AccountProviderAddedEventParams, UpdateAccountListEventParams } from 'sql/platform/accounts/common/eventTypes';
 import { IClipboardService } from 'sql/platform/clipboard/common/clipboardService';
-import * as TelemetryKeys from 'sql/platform/telemetry/telemetryKeys';
+import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys';
 import { ILogService } from 'vs/platform/log/common/log';
 import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
 

src/sql/platform/accounts/browser/autoOAuthDialog.ts

@@ -19,7 +19,7 @@ import { Modal } from 'sql/workbench/browser/modal/modal';
 import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox';
 import { attachModalDialogStyler, attachButtonStyler } from 'sql/platform/theme/common/styler';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import * as TelemetryKeys from 'sql/platform/telemetry/telemetryKeys';
+import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { ILogService } from 'vs/platform/log/common/log';
 import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';

src/sql/platform/accounts/browser/firewallRuleDialog.ts

@@ -26,7 +26,7 @@ import { FirewallRuleViewModel } from 'sql/platform/accounts/common/firewallRule
 import { attachModalDialogStyler, attachButtonStyler } from 'sql/platform/theme/common/styler';
 import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox';
 import { IAccountPickerService } from 'sql/platform/accounts/common/accountPicker';
-import * as TelemetryKeys from 'sql/platform/telemetry/telemetryKeys';
+import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys';
 import { ILogService } from 'vs/platform/log/common/log';
 import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
 

src/sql/platform/accounts/test/browser/accountDialogController.test.ts

@@ -9,11 +9,11 @@ import { Emitter } from 'vs/base/common/event';
 import { AccountDialog } from 'sql/platform/accounts/browser/accountDialog';
 import { AccountDialogController } from 'sql/platform/accounts/browser/accountDialogController';
 import { AccountViewModel } from 'sql/platform/accounts/common/accountViewModel';
-import { AccountManagementTestService } from 'sqltest/stubs/accountManagementStubs';
-import { ErrorMessageServiceStub } from 'sqltest/stubs/errorMessageServiceStub';
+import { TestAccountManagementService } from 'sql/platform/accounts/test/common/testAccountManagementService';
+import { TestErrorMessageService } from 'sql/platform/errorMessage/test/common/testErrorMessageService';
 import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
 import { AccountListRenderer } from 'sql/platform/accounts/browser/accountListRenderer';
-import { ContextKeyServiceStub } from 'sqltest/stubs/contextKeyServiceStub';
+import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
 
 // TESTS ///////////////////////////////////////////////////////////////////
 suite('Account Management Dialog Controller Tests', () => {
@@ -52,7 +52,7 @@ suite('Account Management Dialog Controller Tests', () => {
 		let instantiationService = createInstantiationService(mockEventEmitter);
 
 		// ... Create a mock instance of the error message service
-		let errorMessageServiceStub = new ErrorMessageServiceStub();
+		let errorMessageServiceStub = new TestErrorMessageService();
 		let mockErrorMessageService = TypeMoq.Mock.ofInstance(errorMessageServiceStub);
 		mockErrorMessageService.setup(x => x.showDialog(TypeMoq.It.isAny(), TypeMoq.It.isAny(), TypeMoq.It.isAny()));
 
@@ -70,7 +70,7 @@ suite('Account Management Dialog Controller Tests', () => {
 
 function createInstantiationService(addAccountFailureEmitter?: Emitter<string>): InstantiationService {
 	// Create a mock account dialog view model
-	let accountViewModel = new AccountViewModel(new AccountManagementTestService());
+	let accountViewModel = new AccountViewModel(new TestAccountManagementService());
 	let mockAccountViewModel = TypeMoq.Mock.ofInstance(accountViewModel);
 	let mockEvent = new Emitter<any>();
 	mockAccountViewModel.setup(x => x.addProviderEvent).returns(() => mockEvent.event);
@@ -86,7 +86,7 @@ function createInstantiationService(addAccountFailureEmitter?: Emitter<string>):
 		.returns(() => undefined);
 
 	// Create a mock account dialog
-	let accountDialog = new AccountDialog(null, null, instantiationService.object, null, null, null, null, new ContextKeyServiceStub(), null, undefined);
+	let accountDialog = new AccountDialog(null, null, instantiationService.object, null, null, null, null, new MockContextKeyService(), null, undefined);
 	let mockAccountDialog = TypeMoq.Mock.ofInstance(accountDialog);
 	mockAccountDialog.setup(x => x.onAddAccountErrorEvent)
 		.returns(() => { return addAccountFailureEmitter ? addAccountFailureEmitter.event : mockEvent.event; });

src/sql/platform/accounts/test/browser/accountPickerService.test.ts

@@ -11,7 +11,7 @@ import { Emitter } from 'vs/base/common/event';
 import { AccountPicker } from 'sql/platform/accounts/browser/accountPicker';
 import { AccountPickerService } from 'sql/platform/accounts/browser/accountPickerService';
 import { AccountPickerViewModel } from 'sql/platform/accounts/common/accountPickerViewModel';
-import { AccountManagementTestService } from 'sqltest/stubs/accountManagementStubs';
+import { TestAccountManagementService } from 'sql/platform/accounts/test/common/testAccountManagementService';
 import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
 
 // SUITE STATE /////////////////////////////////////////////////////////////
@@ -87,7 +87,7 @@ suite('Account picker service tests', () => {
 function createInstantiationService(): InstantiationService {
 	// Create a mock account picker view model
 	let providerId = 'azure';
-	let accountPickerViewModel = new AccountPickerViewModel(providerId, new AccountManagementTestService());
+	let accountPickerViewModel = new AccountPickerViewModel(providerId, new TestAccountManagementService());
 	let mockAccountViewModel = TypeMoq.Mock.ofInstance(accountPickerViewModel);
 	let mockEvent = new Emitter<any>();
 	mockAccountViewModel.setup(x => x.updateAccountListEvent).returns(() => mockEvent.event);

src/sql/platform/accounts/test/browser/autoOAuthDialogController.test.ts

@@ -9,16 +9,16 @@ import { InstantiationService } from 'vs/platform/instantiation/common/instantia
 
 import { AutoOAuthDialog } from 'sql/platform/accounts/browser/autoOAuthDialog';
 import { AutoOAuthDialogController } from 'sql/platform/accounts/browser/autoOAuthDialogController';
-import { AccountManagementTestService } from 'sqltest/stubs/accountManagementStubs';
-import { ErrorMessageServiceStub } from 'sqltest/stubs/errorMessageServiceStub';
-import { ContextKeyServiceStub } from 'sqltest/stubs/contextKeyServiceStub';
+import { TestAccountManagementService } from 'sql/platform/accounts/test/common/testAccountManagementService';
+import { TestErrorMessageService } from 'sql/platform/errorMessage/test/common/testErrorMessageService';
+import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
 
 // TESTS ///////////////////////////////////////////////////////////////////
 suite('auto OAuth dialog controller tests', () => {
 	let instantiationService: TypeMoq.Mock<InstantiationService>;
 	let mockAutoOAuthDialog: TypeMoq.Mock<AutoOAuthDialog>;
-	let mockAccountManagementService: TypeMoq.Mock<AccountManagementTestService>;
-	let mockErrorMessageService: TypeMoq.Mock<ErrorMessageServiceStub>;
+	let mockAccountManagementService: TypeMoq.Mock<TestAccountManagementService>;
+	let mockErrorMessageService: TypeMoq.Mock<TestErrorMessageService>;
 	let autoOAuthDialogController: AutoOAuthDialogController;
 
 	let mockOnCancelEvent: Emitter<void>;
@@ -37,7 +37,7 @@ suite('auto OAuth dialog controller tests', () => {
 		mockOnCloseEvent = new Emitter<void>();
 
 		// Create a mock auto OAuth dialog
-		let autoOAuthDialog = new AutoOAuthDialog(null, null, null, null, new ContextKeyServiceStub(), null, undefined);
+		let autoOAuthDialog = new AutoOAuthDialog(null, null, null, null, new MockContextKeyService(), null, undefined);
 		mockAutoOAuthDialog = TypeMoq.Mock.ofInstance(autoOAuthDialog);
 
 		mockAutoOAuthDialog.setup(x => x.onCancel).returns(() => mockOnCancelEvent.event);
@@ -56,12 +56,12 @@ suite('auto OAuth dialog controller tests', () => {
 
 
 		// Create a mocked account management service
-		let accountManagementTestService = new AccountManagementTestService();
+		let accountManagementTestService = new TestAccountManagementService();
 		mockAccountManagementService = TypeMoq.Mock.ofInstance(accountManagementTestService);
 		mockAccountManagementService.setup(x => x.copyUserCodeAndOpenBrowser(TypeMoq.It.isAny(), TypeMoq.It.isAny()));
 
 		// Create a mocked error message service
-		let errorMessageServiceStub = new ErrorMessageServiceStub();
+		let errorMessageServiceStub = new TestErrorMessageService();
 		mockErrorMessageService = TypeMoq.Mock.ofInstance(errorMessageServiceStub);
 		mockErrorMessageService.setup(x => x.showDialog(TypeMoq.It.isAny(), TypeMoq.It.isAny(), TypeMoq.It.isAny()));
 

src/sql/platform/accounts/test/browser/firewallRuleDialogController.test.ts

@@ -10,13 +10,13 @@ import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
 import { FirewallRuleDialog } from 'sql/platform/accounts/browser/firewallRuleDialog';
 import { FirewallRuleViewModel } from 'sql/platform/accounts/common/firewallRuleViewModel';
 import { FirewallRuleDialogController } from 'sql/platform/accounts/browser/firewallRuleDialogController';
-import { AccountManagementTestService } from 'sqltest/stubs/accountManagementStubs';
-import { ResourceProviderStub } from 'sqltest/stubs/resourceProviderServiceStub';
-import { ErrorMessageServiceStub } from 'sqltest/stubs/errorMessageServiceStub';
+import { TestAccountManagementService } from 'sql/platform/accounts/test/common/testAccountManagementService';
+import { TestResourceProvider } from 'sql/workbench/services/resourceProvider/test/common/testResourceProviderService';
+import { TestErrorMessageService } from 'sql/platform/errorMessage/test/common/testErrorMessageService';
 import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
-import { ContextKeyServiceStub } from 'sqltest/stubs/contextKeyServiceStub';
 import { Deferred } from 'sql/base/common/promise';
 import { mssqlProviderName } from 'sql/platform/connection/common/constants';
+import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
 
 // TESTS ///////////////////////////////////////////////////////////////////
 suite('Firewall rule dialog controller tests', () => {
@@ -60,7 +60,7 @@ suite('Firewall rule dialog controller tests', () => {
 			.returns(() => mockFirewallRuleViewModel.object);
 
 		// Create a mock account picker
-		let firewallRuleDialog = new FirewallRuleDialog(null, null, null, instantiationService.object, null, null, new ContextKeyServiceStub(), null, null, undefined);
+		let firewallRuleDialog = new FirewallRuleDialog(null, null, null, instantiationService.object, null, null, new MockContextKeyService(), null, null, undefined);
 		mockFirewallRuleDialog = TypeMoq.Mock.ofInstance(firewallRuleDialog);
 
 		let mockEvent = new Emitter<any>();
@@ -98,7 +98,7 @@ suite('Firewall rule dialog controller tests', () => {
 
 	test('Add Account Failure - Error Message Shown', () => {
 		// ... Create a mock instance of the error message service
-		let errorMessageServiceStub = new ErrorMessageServiceStub();
+		let errorMessageServiceStub = new TestErrorMessageService();
 		let mockErrorMessageService = TypeMoq.Mock.ofInstance(errorMessageServiceStub);
 		mockErrorMessageService.setup(x => x.showDialog(TypeMoq.It.isAny(), TypeMoq.It.isAny(), TypeMoq.It.isAny()));
 
@@ -230,24 +230,24 @@ suite('Firewall rule dialog controller tests', () => {
 	});
 });
 
-function getMockAccountManagementService(resolveSecurityToken: boolean): TypeMoq.Mock<AccountManagementTestService> {
-	let accountManagementTestService = new AccountManagementTestService();
+function getMockAccountManagementService(resolveSecurityToken: boolean): TypeMoq.Mock<TestAccountManagementService> {
+	let accountManagementTestService = new TestAccountManagementService();
 	let mockAccountManagementService = TypeMoq.Mock.ofInstance(accountManagementTestService);
 	mockAccountManagementService.setup(x => x.getSecurityToken(TypeMoq.It.isAny(), TypeMoq.It.isAny()))
 		.returns(() => resolveSecurityToken ? Promise.resolve({}) : Promise.reject(null).then());
 	return mockAccountManagementService;
 }
 
-function getMockResourceProvider(resolveCreateFirewallRule: boolean, response?: azdata.CreateFirewallRuleResponse): TypeMoq.Mock<ResourceProviderStub> {
-	let resourceProviderStub = new ResourceProviderStub();
+function getMockResourceProvider(resolveCreateFirewallRule: boolean, response?: azdata.CreateFirewallRuleResponse): TypeMoq.Mock<TestResourceProvider> {
+	let resourceProviderStub = new TestResourceProvider();
 	let mockResourceProvider = TypeMoq.Mock.ofInstance(resourceProviderStub);
 	mockResourceProvider.setup(x => x.createFirewallRule(TypeMoq.It.isAny(), TypeMoq.It.isAny(), TypeMoq.It.isAny()))
 		.returns(() => resolveCreateFirewallRule ? Promise.resolve(response) : Promise.reject(null).then());
 	return mockResourceProvider;
 }
 
-function getMockErrorMessageService(deferredPromise: Deferred<{}>): TypeMoq.Mock<ErrorMessageServiceStub> {
-	let errorMessageServiceStub = new ErrorMessageServiceStub();
+function getMockErrorMessageService(deferredPromise: Deferred<{}>): TypeMoq.Mock<TestErrorMessageService> {
+	let errorMessageServiceStub = new TestErrorMessageService();
 	let mockErrorMessageService = TypeMoq.Mock.ofInstance(errorMessageServiceStub);
 	mockErrorMessageService.setup(x => x.showDialog(TypeMoq.It.isAny(), TypeMoq.It.isAny(), TypeMoq.It.isAny())).callback(() => {
 		deferredPromise.resolve(true);

src/sql/platform/accounts/test/common/accountActions.test.ts

@@ -7,9 +7,9 @@ import * as assert from 'assert';
 import * as azdata from 'azdata';
 import * as TypeMoq from 'typemoq';
 import { AddAccountAction, RemoveAccountAction } from 'sql/platform/accounts/common/accountActions';
-import { AccountManagementTestService } from 'sqltest/stubs/accountManagementStubs';
+import { TestAccountManagementService } from 'sql/platform/accounts/test/common/testAccountManagementService';
 // import { MessageServiceStub } from 'sqltest/stubs/messageServiceStub';
-import { ErrorMessageServiceStub } from 'sqltest/stubs/errorMessageServiceStub';
+import { TestErrorMessageService } from 'sql/platform/errorMessage/test/common/testErrorMessageService';
 
 let testAccount = <azdata.Account>{
 	key: {

src/sql/platform/accounts/test/common/accountPickerViewModel.test.ts

@@ -10,7 +10,7 @@ import { EventVerifierSingle } from 'sqltest/utils/eventVerifier';
 import { Emitter } from 'vs/base/common/event';
 import { AccountPickerViewModel } from 'sql/platform/accounts/common/accountPickerViewModel';
 import { UpdateAccountListEventParams } from 'sql/platform/accounts/common/eventTypes';
-import { AccountManagementTestService } from 'sqltest/stubs/accountManagementStubs';
+import { TestAccountManagementService } from 'sql/platform/accounts/test/common/testAccountManagementService';
 
 // SUITE STATE /////////////////////////////////////////////////////////////
 let mockUpdateAccountEmitter: Emitter<UpdateAccountListEventParams>;
@@ -124,8 +124,8 @@ suite('Account picker view model tests', () => {
 	});
 });
 
-function getMockAccountManagementService(resolveProviders: boolean, resolveAccounts: boolean): TypeMoq.Mock<AccountManagementTestService> {
-	let mockAccountManagementService = TypeMoq.Mock.ofType(AccountManagementTestService);
+function getMockAccountManagementService(resolveProviders: boolean, resolveAccounts: boolean): TypeMoq.Mock<TestAccountManagementService> {
+	let mockAccountManagementService = TypeMoq.Mock.ofType(TestAccountManagementService);
 
 	mockAccountManagementService.setup(x => x.getAccountProviderMetadata())
 		.returns(() => resolveProviders ? Promise.resolve(providers) : Promise.reject(null).then());
@@ -139,7 +139,7 @@ function getMockAccountManagementService(resolveProviders: boolean, resolveAccou
 }
 
 function getViewModel(
-	ams: AccountManagementTestService,
+	ams: TestAccountManagementService,
 	evUpdate: EventVerifierSingle<UpdateAccountListEventParams>
 ): AccountPickerViewModel {
 	let vm = new AccountPickerViewModel('azure', ams);

src/sql/platform/accounts/test/common/accountViewModel.test.ts

@@ -10,7 +10,7 @@ import { EventVerifierSingle } from 'sqltest/utils/eventVerifier';
 import { Emitter } from 'vs/base/common/event';
 import { AccountViewModel } from 'sql/platform/accounts/common/accountViewModel';
 import { AccountProviderAddedEventParams, UpdateAccountListEventParams } from 'sql/platform/accounts/common/eventTypes';
-import { AccountManagementTestService } from 'sqltest/stubs/accountManagementStubs';
+import { TestAccountManagementService } from 'sql/platform/accounts/test/common/testAccountManagementService';
 
 // SUITE STATE /////////////////////////////////////////////////////////////
 let mockAddProviderEmitter: Emitter<AccountProviderAddedEventParams>;
@@ -181,8 +181,8 @@ suite('Account Management Dialog ViewModel Tests', () => {
 	});
 });
 
-function getMockAccountManagementService(resolveProviders: boolean, resolveAccounts: boolean): TypeMoq.Mock<AccountManagementTestService> {
-	let mockAccountManagementService = TypeMoq.Mock.ofType(AccountManagementTestService);
+function getMockAccountManagementService(resolveProviders: boolean, resolveAccounts: boolean): TypeMoq.Mock<TestAccountManagementService> {
+	let mockAccountManagementService = TypeMoq.Mock.ofType(TestAccountManagementService);
 
 	mockAccountManagementService.setup(x => x.getAccountProviderMetadata())
 		.returns(() => resolveProviders ? Promise.resolve(providers) : Promise.reject(null).then());
@@ -200,7 +200,7 @@ function getMockAccountManagementService(resolveProviders: boolean, resolveAccou
 }
 
 function getViewModel(
-	ams: AccountManagementTestService,
+	ams: TestAccountManagementService,
 	evAdd: EventVerifierSingle<AccountProviderAddedEventParams>,
 	evRemove: EventVerifierSingle<azdata.AccountProviderMetadata>,
 	evUpdate: EventVerifierSingle<UpdateAccountListEventParams>

src/sql/platform/accounts/test/common/testAccountManagementService.ts

@@ -8,7 +8,7 @@ import { Event } from 'vs/base/common/event';
 import { IAccountManagementService } from 'sql/platform/accounts/common/interfaces';
 import { AccountProviderAddedEventParams, UpdateAccountListEventParams } from 'sql/platform/accounts/common/eventTypes';
 
-export class AccountManagementTestService implements IAccountManagementService {
+export class TestAccountManagementService implements IAccountManagementService {
 	_serviceBrand: any;
 
 	public get addAccountProviderEvent(): Event<AccountProviderAddedEventParams> { return () => { return undefined; }; }

src/sql/platform/backup/common/backupServiceImp.ts

@@ -5,8 +5,8 @@
 
 import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
 import * as azdata from 'azdata';
-import * as TelemetryKeys from 'sql/platform/telemetry/telemetryKeys';
-import * as TelemetryUtils from 'sql/platform/telemetry/telemetryUtilities';
+import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys';
+import * as TelemetryUtils from 'sql/platform/telemetry/common/telemetryUtilities';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IBackupService, TaskExecutionMode } from 'sql/platform/backup/common/backupService';
 import { invalidProvider } from 'sql/base/common/errors';

src/sql/platform/bootstrap/browser/bootstrapService.ts

@@ -3,12 +3,13 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { NgModuleRef, enableProdMode, InjectionToken, Type, PlatformRef, Provider } from '@angular/core';
+import { NgModuleRef, enableProdMode, PlatformRef, Provider } from '@angular/core';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 import { IInstantiationService, _util } from 'vs/platform/instantiation/common/instantiation';
 import { IEditorInput } from 'vs/workbench/common/editor';
 import { Trace } from 'vs/platform/instantiation/common/instantiationService';
 import { values } from 'vs/base/common/map';
+import { IModuleFactory, IBootstrapParams } from 'sql/platform/bootstrap/common/bootstrapParams';
 
 const selectorCounter = new Map<string, number>();
 
@@ -24,14 +25,6 @@ export function providerIterator(service: IInstantiationService): Provider[] {
 	});
 }
 
-export const ISelector = new InjectionToken<string>('selector');
-
-export const IBootstrapParams = new InjectionToken<IBootstrapParams>('bootstrap_params');
-export interface IBootstrapParams {
-}
-
-export type IModuleFactory<T> = (params: IBootstrapParams, selector: string, service: IInstantiationService) => Type<T>;
-
 function createUniqueSelector(selector: string): string {
 	let num: number;
 	if (selectorCounter.has(selector)) {

src/sql/platform/bootstrap/browser/commonServiceInterface.service.ts

@@ -8,15 +8,14 @@ import { Injectable, Inject } from '@angular/core';
 import { Observable } from 'rxjs/Observable';
 
 /* SQL imports */
-import { IDefaultComponentParams } from 'sql/platform/bootstrap/node/bootstrapParams';
-import { IBootstrapParams } from 'sql/platform/bootstrap/node/bootstrapService';
+import { IDefaultComponentParams, IBootstrapParams } from 'sql/platform/bootstrap/common/bootstrapParams';
 import { IMetadataService } from 'sql/platform/metadata/common/metadataService';
 import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
 import { ConnectionManagementInfo } from 'sql/platform/connection/common/connectionManagementInfo';
 import { IAdminService } from 'sql/workbench/services/admin/common/adminService';
 import { IQueryManagementService } from 'sql/platform/query/common/queryManagement';
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
-import { AngularDisposable } from 'sql/base/node/lifecycle';
+import { AngularDisposable } from 'sql/base/browser/lifecycle';
 import { ConnectionContextKey } from 'sql/workbench/parts/connection/common/connectionContextKey';
 
 import { ProviderMetadata, DatabaseInfo, SimpleExecuteResult } from 'azdata';

src/sql/platform/bootstrap/common/bootstrapParams.ts

@@ -7,8 +7,8 @@ import { DataService } from 'sql/workbench/parts/grid/services/dataService';
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { ConnectionContextKey } from 'sql/workbench/parts/connection/common/connectionContextKey';
-import { IBootstrapParams } from 'sql/platform/bootstrap/node/bootstrapService';
 import { Event } from 'vs/base/common/event';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 
 export interface IQueryComponentParams extends IBootstrapParams {
 	dataService: DataService;
@@ -39,3 +39,15 @@ export interface ITaskDialogComponentParams extends IBootstrapParams {
 export interface IQueryPlanParams extends IBootstrapParams {
 	planXml: string;
 }
+
+export const ISelector = 'selector';
+
+export const IBootstrapParams = 'bootstrap_params';
+export interface IBootstrapParams {
+}
+
+export interface Type<T> {
+	new(...args: any[]): T;
+}
+
+export type IModuleFactory<T> = (params: IBootstrapParams, selector: string, service: IInstantiationService) => Type<T>;

src/sql/platform/browser/editableDropdown/editableDropdown.component.ts

@@ -9,7 +9,7 @@ import {
 } from '@angular/core';
 
 import { Dropdown, IDropdownOptions } from 'sql/base/parts/editableDropdown/browser/dropdown';
-import { AngularDisposable } from 'sql/base/node/lifecycle';
+import { AngularDisposable } from 'sql/base/browser/lifecycle';
 import { attachEditableDropdownStyler } from 'sql/platform/theme/common/styler';
 
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';

src/sql/platform/browser/inputbox/inputBox.component.ts

@@ -9,7 +9,7 @@ import {
 } from '@angular/core';
 
 import { InputBox as vsInputBox } from 'sql/base/browser/ui/inputBox/inputBox';
-import { AngularDisposable } from 'sql/base/node/lifecycle';
+import { AngularDisposable } from 'sql/base/browser/lifecycle';
 
 import { attachInputBoxStyler } from 'vs/platform/theme/common/styler';
 import { IThemeService } from 'vs/platform/theme/common/themeService';

src/sql/platform/browser/selectBox/selectBox.component.ts

@@ -9,7 +9,7 @@ import {
 } from '@angular/core';
 
 import { SelectBox as vsSelectBox } from 'sql/base/browser/ui/selectBox/selectBox';
-import { AngularDisposable } from 'sql/base/node/lifecycle';
+import { AngularDisposable } from 'sql/base/browser/lifecycle';
 
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { ISelectData } from 'vs/base/browser/ui/selectBox/selectBox';

src/sql/platform/capabilities/test/common/testCapabilitiesService.ts

@@ -12,7 +12,7 @@ import { Event, Emitter } from 'vs/base/common/event';
 import { Action } from 'vs/base/common/actions';
 import { mssqlProviderName } from 'sql/platform/connection/common/constants';
 
-export class CapabilitiesTestService implements ICapabilitiesService {
+export class TestCapabilitiesService implements ICapabilitiesService {
 
 	public _serviceBrand: any;
 

src/sql/platform/connection/common/connectionManagementService.ts

@@ -18,10 +18,10 @@ import * as Constants from 'sql/platform/connection/common/constants';
 import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService';
 import * as ConnectionContracts from 'sql/workbench/parts/connection/common/connection';
 import { ConnectionStatusManager } from 'sql/platform/connection/common/connectionStatusManager';
-import { DashboardInput } from 'sql/workbench/parts/dashboard/dashboardInput';
+import { DashboardInput } from 'sql/workbench/parts/dashboard/common/dashboardInput';
 import { ConnectionGlobalStatus } from 'sql/workbench/parts/connection/common/connectionGlobalStatus';
-import * as TelemetryKeys from 'sql/platform/telemetry/telemetryKeys';
-import * as TelemetryUtils from 'sql/platform/telemetry/telemetryUtilities';
+import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys';
+import * as TelemetryUtils from 'sql/platform/telemetry/common/telemetryUtilities';
 import { IResourceProviderService } from 'sql/workbench/services/resourceProvider/common/resourceProviderService';
 import { IAngularEventingService, AngularEventType } from 'sql/platform/angularEventing/common/angularEventingService';
 import * as QueryConstants from 'sql/workbench/parts/query/common/constants';

src/sql/platform/connection/test/common/connectionConfig.test.ts

@@ -12,7 +12,7 @@ import { ConnectionProfileGroup, IConnectionProfileGroup } from 'sql/platform/co
 import { IConnectionProfile, IConnectionProfileStore } from 'sql/platform/connection/common/interfaces';
 import { TestConfigurationService } from 'sql/platform/connection/test/common/testConfigurationService';
 import { ConnectionOptionSpecialType, ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes';
-import { CapabilitiesTestService } from 'sqltest/stubs/capabilitiesTestService';
+import { TestCapabilitiesService } from 'sql/platform/capabilities/test/common/testCapabilitiesService';
 import * as TypeMoq from 'typemoq';
 import { Emitter } from 'vs/base/common/event';
 import { deepClone, deepFreeze } from 'vs/base/common/objects';
@@ -119,7 +119,7 @@ suite('ConnectionConfig', () => {
 	]);
 
 	setup(() => {
-		capabilitiesService = TypeMoq.Mock.ofType(CapabilitiesTestService);
+		capabilitiesService = TypeMoq.Mock.ofType(TestCapabilitiesService);
 		capabilities = [];
 		let connectionProvider: azdata.ConnectionProviderOptions = {
 			options: [

src/sql/platform/connection/test/common/connectionManagementService.test.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ConnectionDialogTestService } from 'sqltest/stubs/connectionDialogTestService';
+import { TestConnectionDialogService } from 'sql/workbench/services/connection/test/common/testConnectionDialogService';
 import { ConnectionManagementService } from 'sql/platform/connection/common/connectionManagementService';
 import { ConnectionStatusManager } from 'sql/platform/connection/common/connectionStatusManager';
 import { ConnectionStore } from 'sql/platform/connection/common/connectionStore';
@@ -16,38 +16,34 @@ import * as Constants from 'sql/platform/connection/common/constants';
 import * as Utils from 'sql/platform/connection/common/utils';
 import { IHandleFirewallRuleResult } from 'sql/workbench/services/resourceProvider/common/resourceProviderService';
 
-import { WorkbenchEditorTestService } from 'sqltest/stubs/workbenchEditorTestService';
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
-import { EditorGroupTestService } from 'sqltest/stubs/editorGroupService';
-import { CapabilitiesTestService } from 'sqltest/stubs/capabilitiesTestService';
-import { ConnectionProviderStub } from 'sqltest/stubs/connectionProviderStub';
-import { ResourceProviderStub } from 'sqltest/stubs/resourceProviderServiceStub';
+import { TestCapabilitiesService } from 'sql/platform/capabilities/test/common/testCapabilitiesService';
+import { TestConnectionProvider } from 'sql/platform/connection/test/common/testConnectionProvider';
+import { TestResourceProvider } from 'sql/workbench/services/resourceProvider/test/common/testResourceProviderService';
 
 import * as azdata from 'azdata';
 
-import { WorkspaceConfigurationTestService } from 'sqltest/stubs/workspaceConfigurationTestService';
-
 import * as assert from 'assert';
 import * as TypeMoq from 'typemoq';
 import { IConnectionProfileGroup, ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup';
 import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';
-import { AccountManagementTestService } from 'sqltest/stubs/accountManagementStubs';
-import { TestStorageService, TestEnvironmentService } from 'vs/workbench/test/workbenchTestServices';
+import { TestAccountManagementService } from 'sql/platform/accounts/test/common/testAccountManagementService';
+import { TestStorageService, TestEnvironmentService, TestEditorService } from 'vs/workbench/test/workbenchTestServices';
 import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
+import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
 import { NullLogService } from 'vs/platform/log/common/log';
 
 suite('SQL ConnectionManagementService tests', () => {
 
-	let capabilitiesService: CapabilitiesTestService;
-	let connectionDialogService: TypeMoq.Mock<ConnectionDialogTestService>;
+	let capabilitiesService: TestCapabilitiesService;
+	let connectionDialogService: TypeMoq.Mock<TestConnectionDialogService>;
 	let connectionStore: TypeMoq.Mock<ConnectionStore>;
-	let workbenchEditorService: TypeMoq.Mock<WorkbenchEditorTestService>;
-	let editorGroupService: TypeMoq.Mock<EditorGroupTestService>;
+	let workbenchEditorService: TypeMoq.Mock<TestEditorService>;
 	let connectionStatusManager: ConnectionStatusManager;
-	let mssqlConnectionProvider: TypeMoq.Mock<ConnectionProviderStub>;
-	let workspaceConfigurationServiceMock: TypeMoq.Mock<WorkspaceConfigurationTestService>;
-	let resourceProviderStubMock: TypeMoq.Mock<ResourceProviderStub>;
-	let accountManagementService: TypeMoq.Mock<AccountManagementTestService>;
+	let mssqlConnectionProvider: TypeMoq.Mock<TestConnectionProvider>;
+	let workspaceConfigurationServiceMock: TypeMoq.Mock<TestConfigurationService>;
+	let resourceProviderStubMock: TypeMoq.Mock<TestResourceProvider>;
+	let accountManagementService: TypeMoq.Mock<TestAccountManagementService>;
 
 	let none: void;
 
@@ -82,16 +78,15 @@ suite('SQL ConnectionManagementService tests', () => {
 
 	setup(() => {
 
-		capabilitiesService = new CapabilitiesTestService();
-		connectionDialogService = TypeMoq.Mock.ofType(ConnectionDialogTestService);
+		capabilitiesService = new TestCapabilitiesService();
+		connectionDialogService = TypeMoq.Mock.ofType(TestConnectionDialogService);
 		connectionStore = TypeMoq.Mock.ofType(ConnectionStore, TypeMoq.MockBehavior.Loose, new TestStorageService());
-		workbenchEditorService = TypeMoq.Mock.ofType(WorkbenchEditorTestService);
-		editorGroupService = TypeMoq.Mock.ofType(EditorGroupTestService);
+		workbenchEditorService = TypeMoq.Mock.ofType(TestEditorService);
 		connectionStatusManager = new ConnectionStatusManager(capabilitiesService, new NullLogService(), TestEnvironmentService, new TestNotificationService());
-		mssqlConnectionProvider = TypeMoq.Mock.ofType(ConnectionProviderStub);
-		let resourceProviderStub = new ResourceProviderStub();
+		mssqlConnectionProvider = TypeMoq.Mock.ofType(TestConnectionProvider);
+		let resourceProviderStub = new TestResourceProvider();
 		resourceProviderStubMock = TypeMoq.Mock.ofInstance(resourceProviderStub);
-		accountManagementService = TypeMoq.Mock.ofType(AccountManagementTestService);
+		accountManagementService = TypeMoq.Mock.ofType(TestAccountManagementService);
 		let root = new ConnectionProfileGroup(ConnectionProfileGroup.RootGroupName, undefined, ConnectionProfileGroup.RootGroupName, undefined, undefined);
 		root.connections = [ConnectionProfile.fromIConnectionProfile(capabilitiesService, connectionProfile)];
 
@@ -140,7 +135,7 @@ suite('SQL ConnectionManagementService tests', () => {
 			});
 
 		// Setup configuration to return a config that can be modified later.
-		workspaceConfigurationServiceMock = TypeMoq.Mock.ofType(WorkspaceConfigurationTestService);
+		workspaceConfigurationServiceMock = TypeMoq.Mock.ofType(TestConfigurationService);
 		workspaceConfigurationServiceMock.setup(x => x.getValue(Constants.sqlConfigSectionName))
 			.returns(() => configResult);
 
@@ -931,4 +926,69 @@ suite('SQL ConnectionManagementService tests', () => {
 		assert.equal(profileWithCredentials.userName, username);
 		assert.equal(profileWithCredentials.options['azureAccountToken'], testToken);
 	});
+
+	test('getConnections test', () => {
+		const connectionStatusManagerMock = TypeMoq.Mock.ofType(ConnectionStatusManager, TypeMoq.MockBehavior.Loose);
+		const connectionStoreMock = TypeMoq.Mock.ofType(ConnectionStore, TypeMoq.MockBehavior.Loose, new TestStorageService());
+
+		connectionStatusManagerMock.setup(x => x.getActiveConnectionProfiles(undefined)).returns(() => {
+			return [createConnectionProfile('1'), createConnectionProfile('2')];
+		});
+		connectionStoreMock.setup(x => x.getRecentlyUsedConnections(undefined)).returns(() => {
+			return [createConnectionProfile('1'), createConnectionProfile('3')];
+		});
+
+		const group1 = createConnectionGroup('group1');
+		const group2 = createConnectionGroup('group2');
+		group1.connections = [createConnectionProfile('1'), createConnectionProfile('4')];
+		group1.children = [group2];
+		group2.connections = [createConnectionProfile('5'), createConnectionProfile('6')];
+		connectionStoreMock.setup(x => x.getConnectionProfileGroups(TypeMoq.It.isAny(), undefined)).returns(() => {
+			return [group1];
+		});
+		const connectionManagementService = new ConnectionManagementService(connectionStoreMock.object, connectionStatusManagerMock.object, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined);
+
+		// dupe connections have been seeded the numbers below already reflected the de-duped results
+
+		const verifyConnections = (actualConnections: ConnectionProfile[], expectedConnectionIds: string[], scenario: string) => {
+			assert.equal(actualConnections.length, expectedConnectionIds.length, 'incorrect number of connections returned, ' + scenario);
+			assert.deepEqual(actualConnections.map(conn => conn.id).sort(), expectedConnectionIds.sort(), 'connections do not match expectation, ' + scenario);
+		};
+
+		// no parameter - default to false
+		let connections = connectionManagementService.getConnections();
+		verifyConnections(connections, ['1', '2', '3', '4', '5', '6'], 'no parameter provided');
+
+		// explicitly set to false
+		connections = connectionManagementService.getConnections(false);
+		verifyConnections(connections, ['1', '2', '3', '4', '5', '6'], 'parameter is false');
+
+		// active connections only
+		connections = connectionManagementService.getConnections(true);
+		verifyConnections(connections, ['1', '2'], 'parameter is true');
+	});
 });
+
+function createConnectionProfile(id: string): ConnectionProfile {
+
+	const capabilitiesService = new TestCapabilitiesService();
+	return new ConnectionProfile(capabilitiesService, {
+		connectionName: 'newName',
+		savePassword: false,
+		groupFullName: 'testGroup',
+		serverName: 'testServerName',
+		databaseName: 'testDatabaseName',
+		authenticationType: Constants.integrated,
+		password: 'test',
+		userName: 'testUsername',
+		groupId: undefined,
+		providerName: Constants.mssqlProviderName,
+		options: {},
+		saveProfile: true,
+		id: id
+	});
+}
+
+function createConnectionGroup(id: string): ConnectionProfileGroup {
+	return new ConnectionProfileGroup(id, undefined, id, undefined, undefined);
+}

src/sql/platform/connection/test/common/connectionProfile.test.ts

@@ -8,13 +8,13 @@ import { IConnectionProfile, IConnectionProfileStore } from 'sql/platform/connec
 import * as azdata from 'azdata';
 import * as assert from 'assert';
 import { ConnectionOptionSpecialType, ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes';
-import { CapabilitiesTestService } from 'sqltest/stubs/capabilitiesTestService';
+import { TestCapabilitiesService } from 'sql/platform/capabilities/test/common/testCapabilitiesService';
 import { ConnectionProviderProperties } from 'sql/workbench/parts/connection/common/connectionProviderExtension';
 import { mssqlProviderName } from 'sql/platform/connection/common/constants';
 
 suite('SQL ConnectionProfileInfo tests', () => {
 	let msSQLCapabilities: ConnectionProviderProperties;
-	let capabilitiesService: CapabilitiesTestService;
+	let capabilitiesService: TestCapabilitiesService;
 
 	let connectionProfile: IConnectionProfile = {
 		connectionName: 'new name',
@@ -129,7 +129,7 @@ suite('SQL ConnectionProfileInfo tests', () => {
 			displayName: 'MSSQL',
 			connectionOptions: connectionProvider
 		};
-		capabilitiesService = new CapabilitiesTestService();
+		capabilitiesService = new TestCapabilitiesService();
 		capabilitiesService.capabilities[mssqlProviderName] = { connection: msSQLCapabilities };
 	});
 

src/sql/platform/connection/test/common/connectionStatusManager.test.ts

@@ -8,7 +8,7 @@ import * as azdata from 'azdata';
 import { ConnectionStatusManager } from 'sql/platform/connection/common/connectionStatusManager';
 import * as Utils from 'sql/platform/connection/common/utils';
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
-import { CapabilitiesTestService } from 'sqltest/stubs/capabilitiesTestService';
+import { TestCapabilitiesService } from 'sql/platform/capabilities/test/common/testCapabilitiesService';
 import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';
 import { TestEnvironmentService } from 'vs/workbench/test/workbenchTestServices';
 import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
@@ -16,7 +16,7 @@ import { mssqlProviderName } from 'sql/platform/connection/common/constants';
 import { NullLogService } from 'vs/platform/log/common/log';
 
 let connections: ConnectionStatusManager;
-let capabilitiesService: CapabilitiesTestService;
+let capabilitiesService: TestCapabilitiesService;
 let connectionProfileObject: ConnectionProfile;
 let connectionProfile: IConnectionProfile = {
 	connectionName: 'new name',
@@ -76,7 +76,7 @@ let connection3Id: string;
 
 suite('SQL ConnectionStatusManager tests', () => {
 	setup(() => {
-		capabilitiesService = new CapabilitiesTestService();
+		capabilitiesService = new TestCapabilitiesService();
 		connectionProfileObject = new ConnectionProfile(capabilitiesService, connectionProfile);
 		connections = new ConnectionStatusManager(capabilitiesService, new NullLogService(), TestEnvironmentService, new TestNotificationService());
 		connection1Id = Utils.generateUri(connectionProfile);

src/sql/platform/connection/test/common/connectionStore.test.ts

@@ -13,7 +13,7 @@ import { TestConfigurationService } from 'sql/platform/connection/test/common/te
 import { TestCredentialsService } from 'sql/platform/credentials/test/common/testCredentialsService';
 import { ConnectionOptionSpecialType, ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes';
 import { ConnectionProviderProperties } from 'sql/workbench/parts/connection/common/connectionProviderExtension';
-import { CapabilitiesTestService } from 'sqltest/stubs/capabilitiesTestService';
+import { TestCapabilitiesService } from 'sql/platform/capabilities/test/common/testCapabilitiesService';
 import { deepClone, deepFreeze } from 'vs/base/common/objects';
 import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
 import { TestStorageService } from 'vs/workbench/test/workbenchTestServices';
@@ -37,7 +37,7 @@ suite('ConnectionStore', () => {
 		saveProfile: true,
 		id: undefined
 	});
-	let capabilitiesService: CapabilitiesTestService;
+	let capabilitiesService: TestCapabilitiesService;
 	let maxRecent = 5;
 	let msSQLCapabilities: ConnectionProviderProperties;
 	let provider2Capabilities: ConnectionProviderProperties;
@@ -46,7 +46,7 @@ suite('ConnectionStore', () => {
 	setup(() => {
 		// setup configuration to return maxRecent for the #MRU items
 
-		capabilitiesService = new CapabilitiesTestService();
+		capabilitiesService = new TestCapabilitiesService();
 		let connectionProvider: azdata.ConnectionOption[] = [
 			{
 				name: 'connectionName',

src/sql/platform/connection/test/common/providerConnectionInfo.test.ts

@@ -8,12 +8,12 @@ import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
 import * as azdata from 'azdata';
 import * as assert from 'assert';
 import { ConnectionOptionSpecialType, ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes';
-import { CapabilitiesTestService } from 'sqltest/stubs/capabilitiesTestService';
+import { TestCapabilitiesService } from 'sql/platform/capabilities/test/common/testCapabilitiesService';
 import { mssqlProviderName } from 'sql/platform/connection/common/constants';
 
 suite('SQL ProviderConnectionInfo tests', () => {
 	let msSQLCapabilities: any;
-	let capabilitiesService: CapabilitiesTestService;
+	let capabilitiesService: TestCapabilitiesService;
 
 	let connectionProfile: IConnectionProfile = {
 		connectionName: 'name',
@@ -127,7 +127,7 @@ suite('SQL ProviderConnectionInfo tests', () => {
 			connectionOptions: connectionProvider,
 		};
 		capabilities.push(msSQLCapabilities);
-		capabilitiesService = new CapabilitiesTestService();
+		capabilitiesService = new TestCapabilitiesService();
 		capabilitiesService.capabilities[mssqlProviderName] = { connection: msSQLCapabilities };
 	});
 

src/sql/platform/connection/test/common/testConnectionManagementService.ts

@@ -11,7 +11,6 @@ import { ConnectionProfile } from 'sql/platform/connection/common/connectionProf
 import { ConnectionManagementInfo } from 'sql/platform/connection/common/connectionManagementInfo';
 import * as azdata from 'azdata';
 import { Event, Emitter } from 'vs/base/common/event';
-import { isUndefinedOrNull } from 'vs/base/common/types';
 import { ConnectionProviderProperties } from 'sql/workbench/parts/connection/common/connectionProviderExtension';
 
 // Test stubs for commonly used objects

src/sql/platform/connection/test/common/testConnectionProvider.ts

@@ -6,7 +6,7 @@
 import * as azdata from 'azdata';
 import { mssqlProviderName } from 'sql/platform/connection/common/constants';
 
-export class ConnectionProviderStub implements azdata.ConnectionProvider {
+export class TestConnectionProvider implements azdata.ConnectionProvider {
 	public readonly providerId = mssqlProviderName;
 
 	connect(connectionUri: string, connectionInfo: azdata.ConnectionInfo): Thenable<boolean> {

src/sql/platform/credentials/test/common/testCredentialsService.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { ICredentialsService, CredentialManagementEvents } from 'sql/platform/credentials/common/credentialsService';
-import { Credential } from 'azdata';
+import { Credential, CredentialProvider } from 'azdata';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { Emitter } from 'vs/base/common/event';
 
@@ -40,3 +40,27 @@ export class TestCredentialsService implements ICredentialsService {
 		throw new Error('Method not implemented.');
 	}
 }
+
+export class TestCredentialsProvider implements CredentialProvider {
+	handle: number;
+
+	public storedCredentials: { [K: string]: Credential } = {};
+
+	saveCredential(credentialId: string, password: string): Thenable<boolean> {
+		this.storedCredentials[credentialId] = {
+			credentialId: credentialId,
+			password: password
+		};
+		return Promise.resolve(true);
+	}
+
+	readCredential(credentialId: string): Thenable<Credential> {
+		return Promise.resolve(this.storedCredentials[credentialId]);
+	}
+
+	deleteCredential(credentialId: string): Thenable<boolean> {
+		let exists = this.storedCredentials[credentialId] !== undefined;
+		delete this.storedCredentials[credentialId];
+		return Promise.resolve(exists);
+	}
+}

src/sql/platform/dashboard/browser/dashboardRegistry.ts

@@ -9,10 +9,10 @@ import { IJSONSchema, IJSONSchemaMap } from 'vs/base/common/jsonSchema';
 import * as nls from 'vs/nls';
 import { IExtensionPointUser, ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry';
 
-import { ProviderProperties } from 'sql/workbench/parts/dashboard/widgets/properties/propertiesWidget.component';
-import { DATABASE_DASHBOARD_TABS } from 'sql/workbench/parts/dashboard/pages/databaseDashboardPage.contribution';
-import { SERVER_DASHBOARD_TABS, SERVER_DASHBOARD_PROPERTIES } from 'sql/workbench/parts/dashboard/pages/serverDashboardPage.contribution';
-import { DASHBOARD_CONFIG_ID, DASHBOARD_TABS_KEY_PROPERTY } from 'sql/workbench/parts/dashboard/pages/dashboardPageContribution';
+import { ProviderProperties } from 'sql/workbench/parts/dashboard/browser/widgets/properties/propertiesWidget.component';
+import { DATABASE_DASHBOARD_TABS } from 'sql/workbench/parts/dashboard/browser/pages/databaseDashboardPage.contribution';
+import { SERVER_DASHBOARD_TABS } from 'sql/workbench/parts/dashboard/browser/pages/serverDashboardPage.contribution';
+import { DASHBOARD_CONFIG_ID, DASHBOARD_TABS_KEY_PROPERTY } from 'sql/workbench/parts/dashboard/browser/pages/dashboardPageContribution';
 
 export const Extensions = {
 	DashboardContributions: 'dashboard.contributions'

src/sql/platform/dashboard/browser/insightRegistry.ts

@@ -3,11 +3,11 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import { Type } from '@angular/core';
-import { IInsightsConfig, IInsightsView } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces';
 
 import * as platform from 'vs/platform/registry/common/platform';
 import { IJSONSchema } from 'vs/base/common/jsonSchema';
 import * as nls from 'vs/nls';
+import { IInsightData } from 'sql/workbench/parts/charts/browser/interfaces';
 
 export type InsightIdentifier = string;
 
@@ -15,6 +15,57 @@ export const Extensions = {
 	InsightContribution: 'dashboard.contributions.insights'
 };
 
+export interface IInsightsConfig {
+	cacheId?: string;
+	type: any;
+	name?: string;
+	when?: string;
+	gridItemConfig?: ISize;
+	query?: string | Array<string>;
+	queryFile?: string;
+	details?: IInsightsConfigDetails;
+	autoRefreshInterval?: number;
+}
+
+export interface IInsightsLabel {
+	column: string;
+	icon?: string;
+	state?: Array<IStateCondition>;
+}
+
+export interface IStateCondition {
+	condition: {
+		if: string,
+		equals?: string
+	};
+	color?: string;
+	icon?: string;
+}
+
+export interface IInsightsConfigDetails {
+	query?: string | Array<string>;
+	queryFile?: string;
+	label?: string | IInsightsLabel;
+	value?: string;
+	actions?: {
+		types: Array<string>;
+		database?: string;
+		server?: string;
+		user?: string;
+	};
+}
+
+export interface ISize {
+	x: number;
+	y: number;
+}
+
+export interface IInsightsView {
+	data: IInsightData;
+	setConfig?: (config: { [key: string]: any }) => void;
+	init?: () => void;
+}
+
 export interface IInsightRegistry {
 	insightSchema: IJSONSchema;
 	registerInsight(id: string, description: string, schema: IJSONSchema, ctor: Type<IInsightsView>): InsightIdentifier;

src/sql/platform/dashboard/browser/modelComponentRegistry.ts

@@ -6,7 +6,7 @@ import { Type } from '@angular/core';
 import { ModelComponentTypes } from 'sql/workbench/api/common/sqlExtHostTypes';
 
 import * as platform from 'vs/platform/registry/common/platform';
-import { IComponent } from 'sql/workbench/electron-browser/modelComponents/interfaces';
+import { IComponent } from 'sql/workbench/browser/modelComponents/interfaces';
 
 export type ComponentIdentifier = string;
 

src/sql/platform/dashboard/browser/widgetRegistry.ts

@@ -2,14 +2,11 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { IInsightsConfig } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces';
 
 import * as platform from 'vs/platform/registry/common/platform';
 import { IJSONSchema, IJSONSchemaMap } from 'vs/base/common/jsonSchema';
-import { IJSONContributionRegistry, Extensions as JSONExtensions } from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
 import * as nls from 'vs/nls';
-
-const contributionRegistry = platform.Registry.as<IJSONContributionRegistry>(JSONExtensions.JSONContribution);
+import { IInsightsConfig } from 'sql/platform/dashboard/browser/insightRegistry';
 
 export type WidgetIdentifier = string;
 

src/sql/platform/dashboard/common/dashboardContainerRegistry.ts

@@ -5,10 +5,6 @@
 
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IJSONSchema, IJSONSchemaMap } from 'vs/base/common/jsonSchema';
-import { Extensions as ConfigurationExtension } from 'vs/platform/configuration/common/configurationRegistry';
-import { deepClone } from 'vs/base/common/objects';
-
-import { WidgetConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget';
 
 export const Extensions = {
 	dashboardContainerContributions: 'dashboard.contributions.container'

src/sql/platform/dialog/browser/customDialogService.ts

@@ -3,9 +3,9 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DialogModal } from 'sql/platform/dialog/dialogModal';
-import { WizardModal } from 'sql/platform/dialog/wizardModal';
-import { Dialog, Wizard } from 'sql/platform/dialog/dialogTypes';
+import { DialogModal } from 'sql/platform/dialog/browser/dialogModal';
+import { WizardModal } from 'sql/platform/dialog/browser/wizardModal';
+import { Dialog, Wizard } from 'sql/platform/dialog/common/dialogTypes';
 import { IModalOptions } from 'sql/workbench/browser/modal/modal';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 

src/sql/platform/dialog/browser/dialog.module.ts

@@ -10,21 +10,22 @@ import { FormsModule } from '@angular/forms';
 import { CommonModule, APP_BASE_HREF } from '@angular/common';
 import { BrowserModule } from '@angular/platform-browser';
 
-import { DialogContainer } from 'sql/platform/dialog/dialogContainer.component';
-import { WizardNavigation } from 'sql/platform/dialog/wizardNavigation.component';
-import { Extensions, IComponentRegistry } from 'sql/platform/dashboard/common/modelComponentRegistry';
-import { ModelViewContent } from 'sql/workbench/electron-browser/modelComponents/modelViewContent.component';
-import { ModelComponentWrapper } from 'sql/workbench/electron-browser/modelComponents/modelComponentWrapper.component';
-import { ComponentHostDirective } from 'sql/workbench/parts/dashboard/common/componentHost.directive';
-import { IBootstrapParams, ISelector, providerIterator } from 'sql/platform/bootstrap/node/bootstrapService';
-import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service';
-import { EditableDropDown } from 'sql/platform/electron-browser/editableDropdown/editableDropdown.component';
-import { Checkbox } from 'sql/base/electron-browser/ui/checkbox/checkbox.component';
-import { SelectBox } from 'sql/platform/ui/electron-browser/selectBox/selectBox.component';
-import { InputBox } from 'sql/base/electron-browser/ui/inputBox/inputBox.component';
+import { DialogContainer } from 'sql/platform/dialog/browser/dialogContainer.component';
+import { WizardNavigation } from 'sql/platform/dialog/browser/wizardNavigation.component';
+import { Extensions, IComponentRegistry } from 'sql/platform/dashboard/browser/modelComponentRegistry';
+import { ModelViewContent } from 'sql/workbench/browser/modelComponents/modelViewContent.component';
+import { ModelComponentWrapper } from 'sql/workbench/browser/modelComponents/modelComponentWrapper.component';
+import { ComponentHostDirective } from 'sql/workbench/parts/dashboard/browser/core/componentHost.directive';
+import { providerIterator } from 'sql/platform/bootstrap/browser/bootstrapService';
+import { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service';
+import { EditableDropDown } from 'sql/platform/browser/editableDropdown/editableDropdown.component';
+import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox.component';
+import { SelectBox } from 'sql/platform/browser/selectBox/selectBox.component';
+import { InputBox } from 'sql/platform/browser/inputbox/inputBox.component';
 
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { Registry } from 'vs/platform/registry/common/platform';
+import { IBootstrapParams, ISelector } from 'sql/platform/bootstrap/common/bootstrapParams';
 
 export const DialogModule = (params, selector: string, instantiationService: IInstantiationService): any => {
 

src/sql/platform/dialog/browser/dialogContainer.component.ts

@@ -5,11 +5,11 @@
 
 import 'vs/css!./media/dialogModal';
 import { Component, ViewChild, Inject, forwardRef, ElementRef, AfterViewInit } from '@angular/core';
-import { ModelViewContent } from 'sql/workbench/electron-browser/modelComponents/modelViewContent.component';
-import { IBootstrapParams } from 'sql/platform/bootstrap/node/bootstrapService';
-import { DialogPane } from 'sql/platform/dialog/dialogPane';
-import { ComponentEventType } from 'sql/workbench/electron-browser/modelComponents/interfaces';
+import { ModelViewContent } from 'sql/workbench/browser/modelComponents/modelViewContent.component';
+import { DialogPane } from 'sql/platform/dialog/browser/dialogPane';
+import { ComponentEventType } from 'sql/workbench/browser/modelComponents/interfaces';
 import { Event, Emitter } from 'vs/base/common/event';
+import { IBootstrapParams } from 'sql/platform/bootstrap/common/bootstrapParams';
 
 export interface LayoutRequestParams {
 	modelViewId?: string;

src/sql/platform/dialog/browser/dialogModal.ts

@@ -6,8 +6,8 @@
 import 'vs/css!./media/dialogModal';
 import { Modal, IModalOptions } from 'sql/workbench/browser/modal/modal';
 import { attachModalDialogStyler } from 'sql/platform/theme/common/styler';
-import { Dialog, DialogButton } from 'sql/platform/dialog/dialogTypes';
-import { DialogPane } from 'sql/platform/dialog/dialogPane';
+import { Dialog, DialogButton } from 'sql/platform/dialog/common/dialogTypes';
+import { DialogPane } from 'sql/platform/dialog/browser/dialogPane';
 
 import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
@@ -18,7 +18,7 @@ import { SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme';
 import { Emitter } from 'vs/base/common/event';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { DialogMessage } from '../../workbench/api/common/sqlExtHostTypes';
+import { DialogMessage } from 'sql/workbench/api/common/sqlExtHostTypes';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
 import { append, $ } from 'vs/base/browser/dom';

src/sql/platform/dialog/browser/dialogPane.ts

@@ -8,11 +8,11 @@ import 'vs/css!./media/dialogModal';
 import { NgModuleRef } from '@angular/core';
 
 import { IModalDialogStyles } from 'sql/workbench/browser/modal/modal';
-import { DialogTab } from 'sql/platform/dialog/dialogTypes';
-import { TabbedPanel, IPanelTab, IPanelView } from 'sql/base/browser/ui/panel/panel';
-import { bootstrapAngular } from 'sql/platform/bootstrap/node/bootstrapService';
-import { DialogModule } from 'sql/platform/dialog/dialog.module';
-import { DialogComponentParams, LayoutRequestParams } from 'sql/platform/dialog/dialogContainer.component';
+import { DialogTab } from 'sql/platform/dialog/common/dialogTypes';
+import { TabbedPanel } from 'sql/base/browser/ui/panel/panel';
+import { bootstrapAngular } from 'sql/platform/bootstrap/browser/bootstrapService';
+import { DialogModule } from 'sql/platform/dialog/browser/dialog.module';
+import { DialogComponentParams, LayoutRequestParams } from 'sql/platform/dialog/browser/dialogContainer.component';
 
 import * as DOM from 'vs/base/browser/dom';
 import { IThemable } from 'vs/platform/theme/common/styler';

src/sql/platform/dialog/browser/wizardModal.ts

@@ -6,11 +6,11 @@
 import 'vs/css!./media/dialogModal';
 import { Modal, IModalOptions } from 'sql/workbench/browser/modal/modal';
 import { attachModalDialogStyler } from 'sql/platform/theme/common/styler';
-import { Wizard, DialogButton, WizardPage } from 'sql/platform/dialog/dialogTypes';
-import { DialogPane } from 'sql/platform/dialog/dialogPane';
-import { bootstrapAngular } from 'sql/platform/bootstrap/node/bootstrapService';
+import { Wizard, DialogButton, WizardPage } from 'sql/platform/dialog/common/dialogTypes';
+import { DialogPane } from 'sql/platform/dialog/browser/dialogPane';
+import { bootstrapAngular } from 'sql/platform/bootstrap/browser/bootstrapService';
 import { DialogMessage } from 'sql/workbench/api/common/sqlExtHostTypes';
-import { DialogModule } from 'sql/platform/dialog/dialog.module';
+import { DialogModule } from 'sql/platform/dialog/browser/dialog.module';
 import { Button } from 'vs/base/browser/ui/button/button';
 import { SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';

src/sql/platform/dialog/browser/wizardNavigation.component.ts

@@ -5,11 +5,11 @@
 
 import 'vs/css!./media/wizardNavigation';
 import { Component, Inject, forwardRef, ElementRef, AfterViewInit, ChangeDetectorRef, ViewChild } from '@angular/core';
-import { IBootstrapParams } from 'sql/platform/bootstrap/node/bootstrapService';
 import { Event, Emitter } from 'vs/base/common/event';
-import { Wizard } from './dialogTypes';
+import { Wizard } from '../common/dialogTypes';
 import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
 import { SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme';
+import { IBootstrapParams } from 'sql/platform/bootstrap/common/bootstrapParams';
 
 export class WizardNavigationParams implements IBootstrapParams {
 	wizard: Wizard;

src/sql/platform/dialog/test/electron-browser/dialogPane.test.ts

@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import { Dialog, DialogTab } from 'sql/platform/dialog/dialogTypes';
-import { DialogPane } from 'sql/platform/dialog/dialogPane';
-import { DialogComponentParams } from 'sql/platform/dialog/dialogContainer.component';
-import { bootstrapAngular } from 'sql/platform/bootstrap/node/bootstrapService';
+import { Dialog, DialogTab } from 'sql/platform/dialog/common/dialogTypes';
+import { DialogPane } from 'sql/platform/dialog/browser/dialogPane';
+import { DialogComponentParams } from 'sql/platform/dialog/browser/dialogContainer.component';
+import { bootstrapAngular } from 'sql/platform/bootstrap/browser/bootstrapService';
 import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
 
 

src/sql/platform/errorMessage/test/common/testErrorMessageService.ts

@@ -6,7 +6,7 @@
 import Severity from 'vs/base/common/severity';
 import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService';
 
-export class ErrorMessageServiceStub implements IErrorMessageService {
+export class TestErrorMessageService implements IErrorMessageService {
 	_serviceBrand: any;
 	showDialog(severity: Severity, headerTitle: string, message: string): void {
 	}

src/sql/platform/jobManagement/browser/jobActions.ts

@@ -8,18 +8,18 @@ import * as nls from 'vs/nls';
 import * as azdata from 'azdata';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import Severity from 'vs/base/common/severity';
-import { JobHistoryComponent } from 'sql/workbench/parts/jobManagement/electron-browser/jobHistory.component';
+import { JobHistoryComponent } from 'sql/workbench/parts/jobManagement/browser/jobHistory.component';
 import { IJobManagementService } from '../common/interfaces';
 import { ICommandService } from 'vs/platform/commands/common/commands';
-import { JobsViewComponent } from 'sql/workbench/parts/jobManagement/electron-browser/jobsView.component';
-import { AlertsViewComponent } from 'sql/workbench/parts/jobManagement/electron-browser/alertsView.component';
-import { OperatorsViewComponent } from 'sql/workbench/parts/jobManagement/electron-browser/operatorsView.component';
-import { ProxiesViewComponent } from 'sql/workbench/parts/jobManagement/electron-browser/proxiesView.component';
+import { JobsViewComponent } from 'sql/workbench/parts/jobManagement/browser/jobsView.component';
+import { AlertsViewComponent } from 'sql/workbench/parts/jobManagement/browser/alertsView.component';
+import { OperatorsViewComponent } from 'sql/workbench/parts/jobManagement/browser/operatorsView.component';
+import { ProxiesViewComponent } from 'sql/workbench/parts/jobManagement/browser/proxiesView.component';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import * as TelemetryKeys from 'sql/platform/telemetry/telemetryKeys';
+import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys';
 import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService';
-import { JobManagementView } from 'sql/workbench/parts/jobManagement/electron-browser/jobManagementView';
+import { JobManagementView } from 'sql/workbench/parts/jobManagement/browser/jobManagementView';
 
 export const successLabel: string = nls.localize('jobaction.successLabel', 'Success');
 export const errorLabel: string = nls.localize('jobaction.faillabel', 'Error');

src/sql/platform/jobManagement/test/electron-browser/jobActions.test.ts

@@ -5,8 +5,7 @@
 
 import * as azdata from 'azdata';
 import * as TypeMoq from 'typemoq';
-import { JobsRefreshAction, NewJobAction, EditJobAction, RunJobAction, StopJobAction, DeleteJobAction, NewStepAction, DeleteStepAction, NewAlertAction, EditAlertAction, DeleteAlertAction, NewOperatorAction, EditOperatorAction, DeleteOperatorAction, NewProxyAction, EditProxyAction, DeleteProxyAction } from 'sql/platform/jobManagement/common/jobActions';
-import { TestJobManagementView } from 'sqltest/stubs/jobsManagementViewStub';
+import { JobsRefreshAction, NewJobAction, EditJobAction, RunJobAction, StopJobAction, DeleteJobAction, NewStepAction, DeleteStepAction, NewAlertAction, EditAlertAction, DeleteAlertAction, NewOperatorAction, EditOperatorAction, DeleteOperatorAction, NewProxyAction, EditProxyAction, DeleteProxyAction } from 'sql/platform/jobManagement/browser/jobActions';
 import { JobManagementService } from 'sql/platform/jobManagement/common/jobManagementService';
 
 // Mock View Components
@@ -43,6 +42,22 @@ let mockNewProxyAction: TypeMoq.Mock<NewProxyAction>;
 let mockEditProxyAction: TypeMoq.Mock<EditProxyAction>;
 let mockDeleteProxyAction: TypeMoq.Mock<DeleteProxyAction>;
 
+/**
+ * Class to test Job Management Views
+ */
+class TestJobManagementView {
+
+	refreshJobs() { return undefined; }
+
+	openCreateJobDialog() { return undefined; }
+
+	openCreateAlertDialog() { return undefined; }
+
+	openCreateOperatorDialog() { return undefined; }
+
+	openCreateProxyDialog() { return undefined; }
+}
+
 // Tests
 suite('Job Management Actions', () => {
 

src/sql/platform/model/common/modelViewService.ts

@@ -5,7 +5,7 @@
 
 import * as azdata from 'azdata';
 import { IItemConfig, IComponentShape } from 'sql/workbench/api/common/sqlExtHostTypes';
-import { IComponentEventArgs } from 'sql/workbench/electron-browser/modelComponents/interfaces';
+import { IComponentEventArgs } from 'sql/workbench/browser/modelComponents/interfaces';
 import { Event } from 'vs/base/common/event';
 
 export interface IView {

src/sql/platform/query/common/queryManagement.ts

@@ -8,8 +8,8 @@ import { IConnectionManagementService } from 'sql/platform/connection/common/con
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import * as azdata from 'azdata';
-import * as TelemetryKeys from 'sql/platform/telemetry/telemetryKeys';
-import * as TelemetryUtils from 'sql/platform/telemetry/telemetryUtilities';
+import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys';
+import * as TelemetryUtils from 'sql/platform/telemetry/common/telemetryUtilities';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { Event, Emitter } from 'vs/base/common/event';
 import { keys } from 'vs/base/common/map';

src/sql/platform/query/common/queryModelService.ts

@@ -9,19 +9,16 @@ import QueryRunner from 'sql/platform/query/common/queryRunner';
 import { DataService } from 'sql/workbench/parts/grid/services/dataService';
 import { IQueryModelService, IQueryEvent } from 'sql/platform/query/common/queryModel';
 import { QueryInput } from 'sql/workbench/parts/query/common/queryInput';
-import { SqlFlavorStatusbarItem } from 'sql/workbench/parts/query/browser/flavorStatus';
 
 import * as azdata from 'azdata';
 
 import * as nls from 'vs/nls';
-import * as platform from 'vs/platform/registry/common/platform';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { Event, Emitter } from 'vs/base/common/event';
 import * as strings from 'vs/base/common/strings';
 import * as types from 'vs/base/common/types';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import Severity from 'vs/base/common/severity';
-import { StatusbarAlignment } from 'vs/platform/statusbar/common/statusbar';
 
 const selectionSnippetMaxLen = 100;
 

src/sql/platform/query/common/queryRunner.ts

@@ -27,7 +27,7 @@ import { ITextResourcePropertiesService } from 'vs/editor/common/services/resour
 import { URI } from 'vs/base/common/uri';
 import { mssqlProviderName } from 'sql/platform/connection/common/constants';
 import { IGridDataProvider, getResultsString } from 'sql/platform/query/common/gridDataProvider';
-import { getErrorMessage } from 'sql/workbench/parts/notebook/notebookUtils';
+import { getErrorMessage } from 'vs/base/common/errors';
 
 export interface IEditSessionReadyEvent {
 	ownerUri: string;

src/sql/platform/restore/common/restoreServiceImpl.ts

@@ -21,8 +21,8 @@ import * as Utils from 'sql/platform/connection/common/utils';
 import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService';
 import { ITaskService } from 'sql/platform/tasks/common/tasksService';
 import { TaskStatus, TaskNode } from 'sql/platform/tasks/common/tasksNode';
-import * as TelemetryKeys from 'sql/platform/telemetry/telemetryKeys';
-import * as TelemetryUtils from 'sql/platform/telemetry/telemetryUtilities';
+import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys';
+import * as TelemetryUtils from 'sql/platform/telemetry/common/telemetryUtilities';
 import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
 import { invalidProvider } from 'sql/base/common/errors';
 import { ILogService } from 'vs/platform/log/common/log';

src/sql/platform/tasks/browser/tasksRegistry.ts

@@ -0,0 +1,115 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { MenuRegistry, ICommandAction } from 'vs/platform/actions/common/actions';
+import { IDisposable } from 'vs/base/common/lifecycle';
+import { ITaskRegistry, ITaskHandler, ITask, ITaskHandlerDescription, ITaskOptions } from 'sql/platform/tasks/common/tasks';
+import * as types from 'vs/base/common/types';
+import { Event, Emitter } from 'vs/base/common/event';
+import { URI } from 'vs/base/common/uri';
+import { CommandsRegistry } from 'vs/platform/commands/common/commands';
+import { createCSSRule } from 'vs/base/browser/dom';
+import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
+import { IdGenerator } from 'vs/base/common/idGenerator';
+
+const ids = new IdGenerator('task-icon-');
+
+export const TaskRegistry: ITaskRegistry = new class implements ITaskRegistry {
+
+	private _tasks = new Array<string>();
+	private _onTaskRegistered = new Emitter<string>();
+	public readonly onTaskRegistered: Event<string> = this._onTaskRegistered.event;
+	private taskIdToIconClassNameMap: Map<string /* task id */, string /* CSS rule */> = new Map<string, string>();
+
+	registerTask(idOrTask: string | ITask, handler?: ITaskHandler): IDisposable {
+		let disposable: IDisposable;
+		let id: string;
+		if (types.isString(idOrTask)) {
+			disposable = CommandsRegistry.registerCommand(idOrTask, handler);
+			id = idOrTask;
+		} else {
+			if (idOrTask.iconClass) {
+				this.taskIdToIconClassNameMap.set(idOrTask.id, idOrTask.iconClass);
+			}
+			disposable = CommandsRegistry.registerCommand(idOrTask);
+			id = idOrTask.id;
+		}
+
+		this._tasks.push(id);
+		this._onTaskRegistered.fire(id);
+
+		return {
+			dispose: () => {
+				let index = this._tasks.indexOf(id);
+				if (index >= 0) {
+					this._tasks = this._tasks.splice(index, 1);
+				}
+				disposable.dispose();
+			}
+		};
+	}
+
+	getOrCreateTaskIconClassName(item: ICommandAction): string {
+		let iconClass = null;
+		if (this.taskIdToIconClassNameMap.has(item.id)) {
+			iconClass = this.taskIdToIconClassNameMap.get(item.id);
+		} else if (item.iconLocation) {
+			iconClass = ids.nextId();
+			createCSSRule(`.icon.${iconClass}`, `background-image: url("${(item.iconLocation.light || item.iconLocation.dark).toString()}")`);
+			createCSSRule(`.vs-dark .icon.${iconClass}, .hc-black .icon.${iconClass}`, `background-image: url("${(item.iconLocation.dark).toString()}")`);
+			this.taskIdToIconClassNameMap.set(item.id, iconClass);
+		}
+		return iconClass;
+	}
+
+	getTasks(): string[] {
+		return this._tasks.slice(0);
+	}
+};
+
+export abstract class Task {
+	public readonly id: string;
+	public readonly title: string;
+	public readonly iconPathDark: string;
+	public readonly iconPath: { dark: URI; light?: URI; };
+	private readonly _iconClass: string;
+	private readonly _description: ITaskHandlerDescription;
+
+	constructor(private opts: ITaskOptions) {
+		this.id = opts.id;
+		this.title = opts.title;
+		this.iconPath = {
+			dark: opts.iconPath ? URI.parse(opts.iconPath.dark) : undefined,
+			light: opts.iconPath ? URI.parse(opts.iconPath.light) : undefined,
+		};
+		this._iconClass = opts.iconClass;
+		this._description = opts.description;
+	}
+
+	private toITask(): ITask {
+		return {
+			id: this.id,
+			handler: (accessor, profile, args) => this.runTask(accessor, profile, args),
+			description: this._description,
+			iconClass: this._iconClass
+		};
+	}
+
+	private toCommandAction(): ICommandAction {
+		return {
+			iconLocation: this.iconPath,
+			id: this.id,
+			title: this.title
+		};
+	}
+
+	public registerTask(): IDisposable {
+		MenuRegistry.addCommand(this.toCommandAction());
+		return TaskRegistry.registerTask(this.toITask());
+	}
+
+	public abstract runTask(accessor: ServicesAccessor, profile: IConnectionProfile, args: any): void | Promise<void>;
+}

src/sql/platform/tasks/common/tasks.ts

@@ -6,14 +6,11 @@
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
 
 import * as types from 'vs/base/common/types';
-import { ILocalizedString, MenuRegistry, ICommandAction } from 'vs/platform/actions/common/actions';
-import { Event, Emitter } from 'vs/base/common/event';
+import { ILocalizedString, ICommandAction } from 'vs/platform/actions/common/actions';
+import { Event } from 'vs/base/common/event';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { IdGenerator } from 'vs/base/common/idGenerator';
-import { createCSSRule } from 'vs/base/browser/dom';
-import { URI } from 'vs/base/common/uri';
-import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 
 export interface ITaskOptions {
@@ -24,50 +21,6 @@ export interface ITaskOptions {
 	iconClass?: string;
 }
 
-export abstract class Task {
-	public readonly id: string;
-	public readonly title: string;
-	public readonly iconPathDark: string;
-	public readonly iconPath: { dark: URI; light?: URI; };
-	private readonly _iconClass: string;
-	private readonly _description: ITaskHandlerDescription;
-
-	constructor(private opts: ITaskOptions) {
-		this.id = opts.id;
-		this.title = opts.title;
-		this.iconPath = {
-			dark: opts.iconPath ? URI.parse(opts.iconPath.dark) : undefined,
-			light: opts.iconPath ? URI.parse(opts.iconPath.light) : undefined,
-		};
-		this._iconClass = opts.iconClass;
-		this._description = opts.description;
-	}
-
-	private toITask(): ITask {
-		return {
-			id: this.id,
-			handler: (accessor, profile, args) => this.runTask(accessor, profile, args),
-			description: this._description,
-			iconClass: this._iconClass
-		};
-	}
-
-	private toCommandAction(): ICommandAction {
-		return {
-			iconLocation: this.iconPath,
-			id: this.id,
-			title: this.title
-		};
-	}
-
-	public registerTask(): IDisposable {
-		MenuRegistry.addCommand(this.toCommandAction());
-		return TaskRegistry.registerTask(this.toITask());
-	}
-
-	public abstract runTask(accessor: ServicesAccessor, profile: IConnectionProfile, args: any): void | Promise<void>;
-}
-
 export interface ITaskHandlerDescription {
 	description: string;
 	args: { name: string; description?: string; constraint?: types.TypeConstraint; }[];
@@ -105,58 +58,3 @@ export interface ITaskRegistry {
 	getOrCreateTaskIconClassName(item: ICommandAction): string;
 	onTaskRegistered: Event<string>;
 }
-
-const ids = new IdGenerator('task-icon-');
-
-export const TaskRegistry: ITaskRegistry = new class implements ITaskRegistry {
-
-	private _tasks = new Array<string>();
-	private _onTaskRegistered = new Emitter<string>();
-	public readonly onTaskRegistered: Event<string> = this._onTaskRegistered.event;
-	private taskIdToIconClassNameMap: Map<string /* task id */, string /* CSS rule */> = new Map<string, string>();
-
-	registerTask(idOrTask: string | ITask, handler?: ITaskHandler): IDisposable {
-		let disposable: IDisposable;
-		let id: string;
-		if (types.isString(idOrTask)) {
-			disposable = CommandsRegistry.registerCommand(idOrTask, handler);
-			id = idOrTask;
-		} else {
-			if (idOrTask.iconClass) {
-				this.taskIdToIconClassNameMap.set(idOrTask.id, idOrTask.iconClass);
-			}
-			disposable = CommandsRegistry.registerCommand(idOrTask);
-			id = idOrTask.id;
-		}
-
-		this._tasks.push(id);
-		this._onTaskRegistered.fire(id);
-
-		return {
-			dispose: () => {
-				let index = this._tasks.indexOf(id);
-				if (index >= 0) {
-					this._tasks = this._tasks.splice(index, 1);
-				}
-				disposable.dispose();
-			}
-		};
-	}
-
-	getOrCreateTaskIconClassName(item: ICommandAction): string {
-		let iconClass = null;
-		if (this.taskIdToIconClassNameMap.has(item.id)) {
-			iconClass = this.taskIdToIconClassNameMap.get(item.id);
-		} else if (item.iconLocation) {
-			iconClass = ids.nextId();
-			createCSSRule(`.icon.${iconClass}`, `background-image: url("${(item.iconLocation.light || item.iconLocation.dark).toString()}")`);
-			createCSSRule(`.vs-dark .icon.${iconClass}, .hc-black .icon.${iconClass}`, `background-image: url("${(item.iconLocation.dark).toString()}")`);
-			this.taskIdToIconClassNameMap.set(item.id, iconClass);
-		}
-		return iconClass;
-	}
-
-	getTasks(): string[] {
-		return this._tasks.slice(0);
-	}
-};

src/sql/platform/telemetry/test/common/telemetryUtilities.test.ts

@@ -3,12 +3,12 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as TelemetryUtils from 'sql/platform/telemetry/telemetryUtilities';
+import * as TelemetryUtils from 'sql/platform/telemetry/common/telemetryUtilities';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { TelemetryServiceStub } from 'sqltest/stubs/telemetryServiceStub';
 import * as TypeMoq from 'typemoq';
 import * as assert from 'assert';
 import { NullLogService } from 'vs/platform/log/common/log';
+import { SimpleTelemetryService } from 'vs/workbench/browser/web.simpleservices';
 
 suite('SQL Telemetry Utilities tests', () => {
 	let telemetryService: TypeMoq.Mock<ITelemetryService>;
@@ -35,7 +35,7 @@ suite('SQL Telemetry Utilities tests', () => {
 	};
 
 	setup(() => {
-		telemetryService = TypeMoq.Mock.ofType(TelemetryServiceStub, TypeMoq.MockBehavior.Strict);
+		telemetryService = TypeMoq.Mock.ofType(SimpleTelemetryService, TypeMoq.MockBehavior.Strict);
 		telemetryService.setup(x => x.publicLog(TypeMoq.It.isAny(), TypeMoq.It.isAny())).returns(x => Promise.resolve(none));
 	});
 

src/sql/platform/theme/common/styler.ts

@@ -10,7 +10,6 @@ import * as cr from 'vs/platform/theme/common/colorRegistry';
 import { IThemable, attachStyler } from 'vs/platform/theme/common/styler';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { SIDE_BAR_BACKGROUND, SIDE_BAR_SECTION_HEADER_FOREGROUND, SIDE_BAR_SECTION_HEADER_BACKGROUND, SIDE_BAR_DRAG_AND_DROP_BACKGROUND, PANEL_INACTIVE_TITLE_FOREGROUND, PANEL_ACTIVE_TITLE_BORDER, PANEL_ACTIVE_TITLE_FOREGROUND } from 'vs/workbench/common/theme';
-import { IPanelColors } from 'vs/workbench/browser/parts/views/panelViewlet';
 
 export function attachModalDialogStyler(widget: IThemable, themeService: IThemeService, style?:
 	{
@@ -272,7 +271,7 @@ export function attachCheckboxStyler(widget: IThemable, themeService: IThemeServ
 }
 
 export function attachPanelStyler(widget: IThemable, themeService: IThemeService) {
-	return attachStyler<IPanelColors>(themeService, {
+	return attachStyler(themeService, {
 		headerForeground: SIDE_BAR_SECTION_HEADER_FOREGROUND,
 		headerBackground: SIDE_BAR_SECTION_HEADER_BACKGROUND,
 		// headerHighContrastBorder: index === 0 ? null : contrastBorder,

src/sql/workbench/api/browser/mainThreadAccountManagement.ts

@@ -11,7 +11,7 @@ import {
 	MainThreadAccountManagementShape,
 	SqlExtHostContext,
 	SqlMainContext
-} from 'sql/workbench/api/node/sqlExtHost.protocol';
+} from 'sql/workbench/api/common/sqlExtHost.protocol';
 import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
 import { UpdateAccountListEventParams } from 'sql/platform/accounts/common/eventTypes';

src/sql/workbench/api/browser/mainThreadBackgroundTaskManagement.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { ITaskService } from 'sql/platform/tasks/common/tasksService';
-import { MainThreadBackgroundTaskManagementShape, SqlMainContext, ExtHostBackgroundTaskManagementShape, SqlExtHostContext } from 'sql/workbench/api/node/sqlExtHost.protocol';
+import { MainThreadBackgroundTaskManagementShape, SqlMainContext, ExtHostBackgroundTaskManagementShape, SqlExtHostContext } from 'sql/workbench/api/common/sqlExtHost.protocol';
 
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
 import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';

src/sql/workbench/api/browser/mainThreadConnectionManagement.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { SqlExtHostContext, SqlMainContext, ExtHostConnectionManagementShape, MainThreadConnectionManagementShape } from 'sql/workbench/api/node/sqlExtHost.protocol';
+import { SqlExtHostContext, SqlMainContext, ExtHostConnectionManagementShape, MainThreadConnectionManagementShape } from 'sql/workbench/api/common/sqlExtHost.protocol';
 import * as azdata from 'azdata';
 import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';

src/sql/workbench/api/browser/mainThreadCredentialManagement.ts

@@ -7,7 +7,7 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import {
 	SqlExtHostContext, ExtHostCredentialManagementShape,
 	MainThreadCredentialManagementShape, SqlMainContext
-} from 'sql/workbench/api/node/sqlExtHost.protocol';
+} from 'sql/workbench/api/common/sqlExtHost.protocol';
 import { ICredentialsService } from 'sql/platform/credentials/common/credentialsService';
 import * as azdata from 'azdata';
 import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';

src/sql/workbench/api/browser/mainThreadDashboard.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
-import { SqlMainContext, MainThreadDashboardShape, ExtHostDashboardShape, SqlExtHostContext } from 'sql/workbench/api/node/sqlExtHost.protocol';
+import { SqlMainContext, MainThreadDashboardShape, ExtHostDashboardShape, SqlExtHostContext } from 'sql/workbench/api/common/sqlExtHost.protocol';
 import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
 import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService';
 

src/sql/workbench/api/browser/mainThreadDashboardWebview.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { MainThreadDashboardWebviewShape, SqlMainContext, ExtHostDashboardWebviewsShape, SqlExtHostContext } from 'sql/workbench/api/node/sqlExtHost.protocol';
+import { MainThreadDashboardWebviewShape, SqlMainContext, ExtHostDashboardWebviewsShape, SqlExtHostContext } from 'sql/workbench/api/common/sqlExtHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
 import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
 import { IDashboardViewService, IDashboardWebview } from 'sql/platform/dashboard/common/dashboardViewService';

src/sql/workbench/api/browser/mainThreadDataProtocol.ts

@@ -7,7 +7,7 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import {
 	SqlExtHostContext, ExtHostDataProtocolShape,
 	MainThreadDataProtocolShape, SqlMainContext
-} from 'sql/workbench/api/node/sqlExtHost.protocol';
+} from 'sql/workbench/api/common/sqlExtHost.protocol';
 import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
 import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService';
 import { IQueryManagementService } from 'sql/platform/query/common/queryManagement';

src/sql/workbench/api/browser/mainThreadExtensionManagement.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { SqlMainContext, MainThreadExtensionManagementShape } from 'sql/workbench/api/node/sqlExtHost.protocol';
+import { SqlMainContext, MainThreadExtensionManagementShape } from 'sql/workbench/api/common/sqlExtHost.protocol';
 import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';

src/sql/workbench/api/browser/mainThreadModalDialog.ts

@@ -6,7 +6,7 @@
 import 'vs/css!sql/media/icons/common-icons';
 
 import { WebViewDialog } from 'sql/workbench/parts/webview/electron-browser/webViewDialog';
-import { MainThreadModalDialogShape, SqlMainContext, SqlExtHostContext, ExtHostModalDialogsShape } from 'sql/workbench/api/node/sqlExtHost.protocol';
+import { MainThreadModalDialogShape, SqlMainContext, SqlExtHostContext, ExtHostModalDialogsShape } from 'sql/workbench/api/common/sqlExtHost.protocol';
 
 import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';

src/sql/workbench/api/browser/mainThreadModelView.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { MainThreadModelViewShape, SqlMainContext, ExtHostModelViewShape, SqlExtHostContext } from 'sql/workbench/api/node/sqlExtHost.protocol';
+import { MainThreadModelViewShape, SqlMainContext, ExtHostModelViewShape, SqlExtHostContext } from 'sql/workbench/api/common/sqlExtHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
 import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
 import { Disposable } from 'vs/base/common/lifecycle';

src/sql/workbench/api/browser/mainThreadNotebook.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as azdata from 'azdata';
-import { SqlExtHostContext, SqlMainContext, ExtHostNotebookShape, MainThreadNotebookShape } from 'sql/workbench/api/node/sqlExtHost.protocol';
+import { SqlExtHostContext, SqlMainContext, ExtHostNotebookShape, MainThreadNotebookShape } from 'sql/workbench/api/common/sqlExtHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
@@ -15,7 +15,7 @@ import { INotebookService, INotebookProvider, INotebookManager } from 'sql/workb
 import { INotebookManagerDetails, INotebookSessionDetails, INotebookKernelDetails, FutureMessageType, INotebookFutureDetails, INotebookFutureDone } from 'sql/workbench/api/common/sqlExtHostTypes';
 import { LocalContentManager } from 'sql/workbench/services/notebook/node/localContentManager';
 import { Deferred } from 'sql/base/common/promise';
-import { FutureInternal } from 'sql/workbench/parts/notebook/models/modelInterfaces';
+import { FutureInternal } from 'sql/workbench/parts/notebook/node/models/modelInterfaces';
 
 @extHostNamedCustomer(SqlMainContext.MainThreadNotebook)
 export class MainThreadNotebook extends Disposable implements MainThreadNotebookShape {

src/sql/workbench/api/browser/mainThreadNotebookDocumentsAndEditors.ts

@@ -20,13 +20,13 @@ import * as types from 'vs/base/common/types';
 import {
 	SqlMainContext, MainThreadNotebookDocumentsAndEditorsShape, SqlExtHostContext, ExtHostNotebookDocumentsAndEditorsShape,
 	INotebookDocumentsAndEditorsDelta, INotebookEditorAddData, INotebookShowOptions, INotebookModelAddedData, INotebookModelChangedData
-} from 'sql/workbench/api/node/sqlExtHost.protocol';
-import { NotebookInput } from 'sql/workbench/parts/notebook/notebookInput';
+} from 'sql/workbench/api/common/sqlExtHost.protocol';
+import { NotebookInput } from 'sql/workbench/parts/notebook/node/notebookInput';
 import { INotebookService, INotebookEditor, IProviderInfo } from 'sql/workbench/services/notebook/common/notebookService';
 import { ISingleNotebookEditOperation, NotebookChangeKind } from 'sql/workbench/api/common/sqlExtHostTypes';
 import { disposed } from 'vs/base/common/errors';
-import { ICellModel, NotebookContentChange, INotebookModel } from 'sql/workbench/parts/notebook/models/modelInterfaces';
-import { NotebookChangeType, CellTypes } from 'sql/workbench/parts/notebook/models/contracts';
+import { ICellModel, NotebookContentChange, INotebookModel } from 'sql/workbench/parts/notebook/node/models/modelInterfaces';
+import { NotebookChangeType, CellTypes } from 'sql/workbench/parts/notebook/common/models/contracts';
 import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService';
 import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
 import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';

src/sql/workbench/api/browser/mainThreadObjectExplorer.ts

@@ -3,18 +3,13 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { SqlExtHostContext, SqlMainContext, ExtHostObjectExplorerShape, MainThreadObjectExplorerShape } from 'sql/workbench/api/node/sqlExtHost.protocol';
+import { SqlExtHostContext, SqlMainContext, ExtHostObjectExplorerShape, MainThreadObjectExplorerShape } from 'sql/workbench/api/common/sqlExtHost.protocol';
 import * as azdata from 'azdata';
 import * as vscode from 'vscode';
 import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
-import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
 import { IObjectExplorerService, NodeInfoWithConnection } from 'sql/workbench/services/objectExplorer/common/objectExplorerService';
-import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import * as TaskUtilities from 'sql/workbench/common/taskUtilities';
-import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';
-import { TreeItemCollapsibleState } from 'sql/workbench/parts/objectExplorer/common/treeNode';
 
 @extHostNamedCustomer(SqlMainContext.MainThreadObjectExplorer)
 export class MainThreadObjectExplorer implements MainThreadObjectExplorerShape {
@@ -24,9 +19,7 @@ export class MainThreadObjectExplorer implements MainThreadObjectExplorerShape {
 
 	constructor(
 		extHostContext: IExtHostContext,
-		@IConnectionManagementService private _connectionManagementService: IConnectionManagementService,
 		@IObjectExplorerService private _objectExplorerService: IObjectExplorerService,
-		@IEditorService private _workbenchEditorService: IEditorService
 	) {
 		if (extHostContext) {
 			this._proxy = extHostContext.getProxy(SqlExtHostContext.ExtHostObjectExplorer);

src/sql/workbench/api/browser/mainThreadQueryEditor.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { SqlExtHostContext, SqlMainContext, ExtHostQueryEditorShape, MainThreadQueryEditorShape } from 'sql/workbench/api/node/sqlExtHost.protocol';
+import { SqlExtHostContext, SqlMainContext, ExtHostQueryEditorShape, MainThreadQueryEditorShape } from 'sql/workbench/api/common/sqlExtHost.protocol';
 import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
 import { IConnectionManagementService, IConnectionCompletionOptions, ConnectionType, RunQueryOnConnectionMode } from 'sql/platform/connection/common/connectionManagement';

src/sql/workbench/api/browser/mainThreadResourceProvider.ts

@@ -11,7 +11,7 @@ import {
 	MainThreadResourceProviderShape,
 	SqlExtHostContext,
 	SqlMainContext
-} from 'sql/workbench/api/node/sqlExtHost.protocol';
+} from 'sql/workbench/api/common/sqlExtHost.protocol';
 import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
 

src/sql/workbench/api/browser/mainThreadSerializationProvider.ts

@@ -7,7 +7,7 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import {
 	SqlExtHostContext, ExtHostSerializationProviderShape,
 	MainThreadSerializationProviderShape, SqlMainContext
-} from 'sql/workbench/api/node/sqlExtHost.protocol';
+} from 'sql/workbench/api/common/sqlExtHost.protocol';
 import { ISerializationService } from 'sql/platform/serialization/common/serializationService';
 import * as azdata from 'azdata';
 import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';

src/sql/workbench/api/browser/mainThreadTasks.ts

@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
-import { TaskRegistry, ITaskHandlerDescription } from 'sql/platform/tasks/common/tasks';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
 
@@ -13,11 +12,12 @@ import {
 	SqlMainContext,
 	ExtHostTasksShape,
 	MainThreadTasksShape
-} from 'sql/workbench/api/node/sqlExtHost.protocol';
+} from 'sql/workbench/api/common/sqlExtHost.protocol';
 
 import { IConnectionProfile } from 'azdata';
 
 import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';
+import { TaskRegistry } from 'sql/platform/tasks/browser/tasksRegistry';
 
 @extHostNamedCustomer(SqlMainContext.MainThreadTasks)
 export class MainThreadTasks implements MainThreadTasksShape {

src/sql/workbench/api/common/extHostAccountManagement.ts

@@ -9,7 +9,7 @@ import {
 	ExtHostAccountManagementShape,
 	MainThreadAccountManagementShape,
 	SqlMainContext,
-} from 'sql/workbench/api/node/sqlExtHost.protocol';
+} from 'sql/workbench/api/common/sqlExtHost.protocol';
 import { AzureResource } from 'sql/workbench/api/common/sqlExtHostTypes';
 import { IMainContext } from 'vs/workbench/api/common/extHost.protocol';
 import { Event, Emitter } from 'vs/base/common/event';