diff --git a/src/sql/parts/disasterRecovery/backup/backup.module.ts b/src/sql/parts/disasterRecovery/backup/backup.module.ts index 60da2c9647..c8416de958 100644 --- a/src/sql/parts/disasterRecovery/backup/backup.module.ts +++ b/src/sql/parts/disasterRecovery/backup/backup.module.ts @@ -11,7 +11,7 @@ import { APP_BASE_HREF, CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import { BrowserModule } from '@angular/platform-browser'; -import { IBootstrapParams, ISelector, providerIterator } from 'sql/services/bootstrap/bootstrapService'; +import { IBootstrapParams, ISelector, providerIterator } from 'sql/platform/bootstrap/node/bootstrapService'; import { BackupComponent } from 'sql/parts/disasterRecovery/backup/backup.component'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; diff --git a/src/sql/parts/disasterRecovery/backup/backupDialog.ts b/src/sql/parts/disasterRecovery/backup/backupDialog.ts index e0693deed9..01578726db 100644 --- a/src/sql/parts/disasterRecovery/backup/backupDialog.ts +++ b/src/sql/parts/disasterRecovery/backup/backupDialog.ts @@ -14,7 +14,7 @@ import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { IThemeService } from 'vs/platform/theme/common/themeService'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { bootstrapAngular } from 'sql/services/bootstrap/bootstrapService'; +import { bootstrapAngular } from 'sql/platform/bootstrap/node/bootstrapService'; import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService'; import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService'; import { append, $ } from 'vs/base/browser/dom'; diff --git a/src/sql/parts/editData/editor/editDataResultsEditor.ts b/src/sql/parts/editData/editor/editDataResultsEditor.ts index 34625bc900..1d19ad6692 100644 --- a/src/sql/parts/editData/editor/editDataResultsEditor.ts +++ b/src/sql/parts/editData/editor/editDataResultsEditor.ts @@ -15,9 +15,9 @@ import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor'; import * as types from 'vs/base/common/types'; import { IQueryModelService } from 'sql/platform/query/common/queryModel'; -import { bootstrapAngular } from 'sql/services/bootstrap/bootstrapService'; +import { bootstrapAngular } from 'sql/platform/bootstrap/node/bootstrapService'; import { BareResultsGridInfo } from 'sql/parts/query/editor/queryResultsEditor'; -import { IEditDataComponentParams } from 'sql/services/bootstrap/bootstrapParams'; +import { IEditDataComponentParams } from 'sql/platform/bootstrap/node/bootstrapParams'; import { EditDataModule } from 'sql/parts/grid/views/editData/editData.module'; import { EDITDATA_SELECTOR } from 'sql/parts/grid/views/editData/editData.component'; import { EditDataResultsInput } from 'sql/parts/editData/common/editDataResultsInput'; diff --git a/src/sql/parts/grid/views/editData/editData.component.ts b/src/sql/parts/grid/views/editData/editData.component.ts index e77bcf53f3..3d5c2fd453 100644 --- a/src/sql/parts/grid/views/editData/editData.component.ts +++ b/src/sql/parts/grid/views/editData/editData.component.ts @@ -17,13 +17,13 @@ import { VirtualizedCollection, OnRangeRenderCompletedEventArgs } from 'angular2 import { IGridDataSet } from 'sql/parts/grid/common/interfaces'; import * as Services from 'sql/parts/grid/services/sharedServices'; -import { IEditDataComponentParams } from 'sql/services/bootstrap/bootstrapParams'; +import { IEditDataComponentParams } from 'sql/platform/bootstrap/node/bootstrapParams'; import { GridParentComponent } from 'sql/parts/grid/views/gridParentComponent'; import { EditDataGridActionProvider } from 'sql/parts/grid/views/editData/editDataGridActions'; import { error } from 'sql/base/common/log'; import { clone, mixin } from 'sql/base/common/objects'; import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; -import { IBootstrapParams } from 'sql/services/bootstrap/bootstrapService'; +import { IBootstrapParams } from 'sql/platform/bootstrap/node/bootstrapService'; import { RowNumberColumn } from 'sql/base/browser/ui/table/plugins/rowNumberColumn.plugin'; import { AutoColumnSize } from 'sql/base/browser/ui/table/plugins/autoSizeColumns.plugin'; import { AdditionalKeyBindings } from 'sql/base/browser/ui/table/plugins/additionalKeyBindings.plugin'; diff --git a/src/sql/parts/grid/views/editData/editData.module.ts b/src/sql/parts/grid/views/editData/editData.module.ts index 76227e0382..bb705d185f 100644 --- a/src/sql/parts/grid/views/editData/editData.module.ts +++ b/src/sql/parts/grid/views/editData/editData.module.ts @@ -10,7 +10,7 @@ import { BrowserModule } from '@angular/platform-browser'; import { SlickGrid } from 'angular2-slickgrid'; import { EditDataComponent } from 'sql/parts/grid/views/editData/editData.component'; -import { IBootstrapParams, ISelector, providerIterator } from 'sql/services/bootstrap/bootstrapService'; +import { IBootstrapParams, ISelector, providerIterator } from 'sql/platform/bootstrap/node/bootstrapService'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; diff --git a/src/sql/parts/jobManagement/views/alertsView.component.ts b/src/sql/parts/jobManagement/views/alertsView.component.ts index 5d1848490f..7abfd48795 100644 --- a/src/sql/parts/jobManagement/views/alertsView.component.ts +++ b/src/sql/parts/jobManagement/views/alertsView.component.ts @@ -22,7 +22,7 @@ import { AgentViewComponent } from 'sql/parts/jobManagement/agent/agentView.comp import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces'; import { EditAlertAction, DeleteAlertAction, NewAlertAction } from 'sql/platform/jobManagement/common/jobActions'; import { JobManagementView } from 'sql/parts/jobManagement/views/jobManagementView'; -import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import { ICommandService } from 'vs/platform/commands/common/commands'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { IAction } from 'vs/base/common/actions'; diff --git a/src/sql/parts/jobManagement/views/jobHistory.component.ts b/src/sql/parts/jobManagement/views/jobHistory.component.ts index 4d421e4247..19ff49e1f1 100644 --- a/src/sql/parts/jobManagement/views/jobHistory.component.ts +++ b/src/sql/parts/jobManagement/views/jobHistory.component.ts @@ -12,7 +12,7 @@ import * as dom from 'vs/base/browser/dom'; import { OnInit, Component, Inject, Input, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, ChangeDetectionStrategy, Injectable } from '@angular/core'; import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar'; import { AgentViewComponent } from 'sql/parts/jobManagement/agent/agentView.component'; -import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import { RunJobAction, StopJobAction, EditJobAction, JobsRefreshAction } from 'sql/platform/jobManagement/common/jobActions'; import { JobCacheObject } from 'sql/platform/jobManagement/common/jobManagementService'; import { JobManagementUtilities } from 'sql/platform/jobManagement/common/jobManagementUtilities'; diff --git a/src/sql/parts/jobManagement/views/jobManagementView.ts b/src/sql/parts/jobManagement/views/jobManagementView.ts index 8788800890..9f5ef428c6 100644 --- a/src/sql/parts/jobManagement/views/jobManagementView.ts +++ b/src/sql/parts/jobManagement/views/jobManagementView.ts @@ -7,7 +7,7 @@ import * as azdata from 'azdata'; import { ElementRef, AfterContentChecked, ViewChild } from '@angular/core'; import { Table } from 'sql/base/browser/ui/table/table'; import { AgentViewComponent } from 'sql/parts/jobManagement/agent/agentView.component'; -import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import { IAction, Action } from 'vs/base/common/actions'; import { ResolvedKeybinding } from 'vs/base/common/keyCodes'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; diff --git a/src/sql/parts/jobManagement/views/jobStepsView.component.ts b/src/sql/parts/jobManagement/views/jobStepsView.component.ts index 2a12541a37..2c48a418a9 100644 --- a/src/sql/parts/jobManagement/views/jobStepsView.component.ts +++ b/src/sql/parts/jobManagement/views/jobStepsView.component.ts @@ -11,7 +11,7 @@ import { attachListStyler } from 'vs/platform/theme/common/styler'; import { Tree } from 'vs/base/parts/tree/browser/treeImpl'; import { ScrollbarVisibility } from 'vs/base/common/scrollable'; import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; -import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import { JobStepsViewController, JobStepsViewDataSource, JobStepsViewFilter, JobStepsViewRenderer, JobStepsViewModel diff --git a/src/sql/parts/jobManagement/views/jobsView.component.ts b/src/sql/parts/jobManagement/views/jobsView.component.ts index 24507a1284..54a3cf19ed 100644 --- a/src/sql/parts/jobManagement/views/jobsView.component.ts +++ b/src/sql/parts/jobManagement/views/jobsView.component.ts @@ -26,7 +26,7 @@ import { JobManagementUtilities } from 'sql/platform/jobManagement/common/jobMan import { HeaderFilter } from 'sql/base/browser/ui/table/plugins/headerFilter.plugin'; import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces'; import { JobManagementView, JobActionContext } from 'sql/parts/jobManagement/views/jobManagementView'; -import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import { ICommandService } from 'vs/platform/commands/common/commands'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; diff --git a/src/sql/parts/jobManagement/views/operatorsView.component.ts b/src/sql/parts/jobManagement/views/operatorsView.component.ts index d22c87a05e..2c75cf2586 100644 --- a/src/sql/parts/jobManagement/views/operatorsView.component.ts +++ b/src/sql/parts/jobManagement/views/operatorsView.component.ts @@ -21,7 +21,7 @@ import { AgentViewComponent } from 'sql/parts/jobManagement/agent/agentView.comp import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces'; import { EditOperatorAction, DeleteOperatorAction, NewOperatorAction } from 'sql/platform/jobManagement/common/jobActions'; import { JobManagementView } from 'sql/parts/jobManagement/views/jobManagementView'; -import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; import { ICommandService } from 'vs/platform/commands/common/commands'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; diff --git a/src/sql/parts/jobManagement/views/proxiesView.component.ts b/src/sql/parts/jobManagement/views/proxiesView.component.ts index 9318832e83..e967078459 100644 --- a/src/sql/parts/jobManagement/views/proxiesView.component.ts +++ b/src/sql/parts/jobManagement/views/proxiesView.component.ts @@ -20,7 +20,7 @@ import { Table } from 'sql/base/browser/ui/table/table'; import { AgentViewComponent } from 'sql/parts/jobManagement/agent/agentView.component'; import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces'; import { EditProxyAction, DeleteProxyAction, NewProxyAction } from 'sql/platform/jobManagement/common/jobActions'; -import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; import { JobManagementView } from 'sql/parts/jobManagement/views/jobManagementView'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; diff --git a/src/sql/parts/modelComponents/checkbox.component.ts b/src/sql/parts/modelComponents/checkbox.component.ts index 1b51a53ebf..9a110df5d5 100644 --- a/src/sql/parts/modelComponents/checkbox.component.ts +++ b/src/sql/parts/modelComponents/checkbox.component.ts @@ -13,7 +13,7 @@ import * as azdata from 'azdata'; import { ComponentBase } from 'sql/parts/modelComponents/componentBase'; import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; import { Checkbox, ICheckboxOptions } from 'sql/base/browser/ui/checkbox/checkbox'; -import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import { attachCheckboxStyler } from 'sql/platform/theme/common/styler'; import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; diff --git a/src/sql/parts/modelComponents/formContainer.component.ts b/src/sql/parts/modelComponents/formContainer.component.ts index 7fac83386d..35d510b721 100644 --- a/src/sql/parts/modelComponents/formContainer.component.ts +++ b/src/sql/parts/modelComponents/formContainer.component.ts @@ -16,7 +16,7 @@ import { FormLayout, FormItemLayout } from 'azdata'; import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/services/dashboardServiceInterface.service'; import { ContainerBase } from 'sql/parts/modelComponents/componentBase'; import { ModelComponentWrapper } from 'sql/parts/modelComponents/modelComponentWrapper.component'; -import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import { getContentHeight, getContentWidth, Dimension } from 'vs/base/browser/dom'; export interface TitledFormItemLayout { diff --git a/src/sql/parts/modelComponents/groupContainer.component.ts b/src/sql/parts/modelComponents/groupContainer.component.ts index 0808425223..d3571b406f 100644 --- a/src/sql/parts/modelComponents/groupContainer.component.ts +++ b/src/sql/parts/modelComponents/groupContainer.component.ts @@ -15,7 +15,7 @@ import { GroupLayout, GroupItemLayout } from 'azdata'; import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/services/dashboardServiceInterface.service'; import { ContainerBase } from 'sql/parts/modelComponents/componentBase'; import { ModelComponentWrapper } from 'sql/parts/modelComponents/modelComponentWrapper.component'; -import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; @Component({ selector: 'modelview-groupContainer', diff --git a/src/sql/parts/modelComponents/hyperlink.component.ts b/src/sql/parts/modelComponents/hyperlink.component.ts index f705c26236..dac5829017 100644 --- a/src/sql/parts/modelComponents/hyperlink.component.ts +++ b/src/sql/parts/modelComponents/hyperlink.component.ts @@ -12,7 +12,7 @@ import * as azdata from 'azdata'; import { ComponentBase } from 'sql/parts/modelComponents/componentBase'; import { IComponent, IComponentDescriptor, IModelStore } from 'sql/parts/modelComponents/interfaces'; -import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; @Component({ selector: 'modelview-hyperlink', diff --git a/src/sql/parts/modelComponents/modelComponentWrapper.component.ts b/src/sql/parts/modelComponents/modelComponentWrapper.component.ts index ddc8825f32..f758d25575 100644 --- a/src/sql/parts/modelComponents/modelComponentWrapper.component.ts +++ b/src/sql/parts/modelComponents/modelComponentWrapper.component.ts @@ -21,7 +21,7 @@ import * as themeColors from 'vs/workbench/common/theme'; import { Registry } from 'vs/platform/registry/common/platform'; import { memoize } from 'vs/base/common/decorators'; import { generateUuid } from 'vs/base/common/uuid'; -import { IBootstrapParams } from 'sql/services/bootstrap/bootstrapService'; +import { IBootstrapParams } from 'sql/platform/bootstrap/node/bootstrapService'; import { Event } from 'vs/base/common/event'; import { LayoutRequestParams } from 'sql/platform/dialog/dialogContainer.component'; diff --git a/src/sql/parts/modelComponents/modelViewContent.component.ts b/src/sql/parts/modelComponents/modelViewContent.component.ts index 2155c21160..c02c42ad60 100644 --- a/src/sql/parts/modelComponents/modelViewContent.component.ts +++ b/src/sql/parts/modelComponents/modelViewContent.component.ts @@ -11,7 +11,7 @@ import { IDisposable } from 'vs/base/common/lifecycle'; import { addDisposableListener, EventType } from 'vs/base/browser/dom'; import { memoize } from 'vs/base/common/decorators'; -import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import { IModelView } from 'sql/platform/model/common/modelViewService'; import { ViewBase } from 'sql/parts/modelComponents/viewBase'; import { IModelViewService } from 'sql/platform/modelComponents/common/modelViewService'; diff --git a/src/sql/parts/modelComponents/radioButton.component.ts b/src/sql/parts/modelComponents/radioButton.component.ts index 3e7c6d4ea8..afedc1da99 100644 --- a/src/sql/parts/modelComponents/radioButton.component.ts +++ b/src/sql/parts/modelComponents/radioButton.component.ts @@ -15,7 +15,7 @@ import { Event, Emitter } from 'vs/base/common/event'; import { ComponentBase } from 'sql/parts/modelComponents/componentBase'; import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; import { RadioButton } from 'sql/base/browser/ui/radioButton/radioButton'; -import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; @Component({ selector: 'modelview-radioButton', diff --git a/src/sql/parts/modelComponents/text.component.ts b/src/sql/parts/modelComponents/text.component.ts index 724d774a71..14d6ecc441 100644 --- a/src/sql/parts/modelComponents/text.component.ts +++ b/src/sql/parts/modelComponents/text.component.ts @@ -13,7 +13,7 @@ import * as azdata from 'azdata'; import { ComponentBase } from 'sql/parts/modelComponents/componentBase'; import { IComponent, IComponentDescriptor, IModelStore } from 'sql/parts/modelComponents/interfaces'; -import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import { SafeHtml, DomSanitizer } from '@angular/platform-browser'; @Component({ diff --git a/src/sql/parts/modelComponents/toolbarContainer.component.ts b/src/sql/parts/modelComponents/toolbarContainer.component.ts index 9502492677..f3fd8830dd 100644 --- a/src/sql/parts/modelComponents/toolbarContainer.component.ts +++ b/src/sql/parts/modelComponents/toolbarContainer.component.ts @@ -15,7 +15,7 @@ import { Orientation, ToolbarLayout } from 'sql/workbench/api/common/sqlExtHostT import { IComponent, IComponentDescriptor, IModelStore } from 'sql/parts/modelComponents/interfaces'; import { ContainerBase } from 'sql/parts/modelComponents/componentBase'; -import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; export interface ToolbarItemConfig { title?: string; diff --git a/src/sql/parts/modelComponents/tree/tree.component.ts b/src/sql/parts/modelComponents/tree/tree.component.ts index bc468657b4..9120ed8fac 100644 --- a/src/sql/parts/modelComponents/tree/tree.component.ts +++ b/src/sql/parts/modelComponents/tree/tree.component.ts @@ -15,7 +15,7 @@ import * as azdata from 'azdata'; import { ComponentBase } from 'sql/parts/modelComponents/componentBase'; import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; import { Tree } from 'vs/base/parts/tree/browser/treeImpl'; -import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import { TreeComponentRenderer } from 'sql/parts/modelComponents/tree/treeComponentRenderer'; import { TreeComponentDataSource } from 'sql/parts/modelComponents/tree/treeDataSource'; import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; diff --git a/src/sql/parts/modelComponents/webview.component.ts b/src/sql/parts/modelComponents/webview.component.ts index c346f870a6..523f2e8da0 100644 --- a/src/sql/parts/modelComponents/webview.component.ts +++ b/src/sql/parts/modelComponents/webview.component.ts @@ -11,7 +11,7 @@ import { import * as azdata from 'azdata'; import * as vscode from 'vscode'; import { addDisposableListener, EventType } from 'vs/base/browser/dom'; -import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import { IEnvironmentService } from 'vs/platform/environment/common/environment'; import { IContextViewService } from 'vs/platform/contextview/browser/contextView'; import { IThemeService } from 'vs/platform/theme/common/themeService'; diff --git a/src/sql/parts/query/modelViewTab/queryModelViewTab.module.ts b/src/sql/parts/query/modelViewTab/queryModelViewTab.module.ts index d88295dc93..e0d2ec56dc 100644 --- a/src/sql/parts/query/modelViewTab/queryModelViewTab.module.ts +++ b/src/sql/parts/query/modelViewTab/queryModelViewTab.module.ts @@ -16,8 +16,8 @@ import { Extensions, IComponentRegistry } from 'sql/platform/dashboard/common/mo import { ModelViewContent } from 'sql/parts/modelComponents/modelViewContent.component'; import { ModelComponentWrapper } from 'sql/parts/modelComponents/modelComponentWrapper.component'; import { ComponentHostDirective } from 'sql/workbench/parts/dashboard/common/componentHost.directive'; -import { IBootstrapParams, ISelector, providerIterator } from 'sql/services/bootstrap/bootstrapService'; -import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; +import { IBootstrapParams, ISelector, providerIterator } from 'sql/platform/bootstrap/node/bootstrapService'; +import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox.component'; import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox.component'; import { EditableDropDown } from 'sql/base/browser/ui/editableDropdown/editableDropdown.component'; diff --git a/src/sql/parts/query/modelViewTab/queryModelViewTab.ts b/src/sql/parts/query/modelViewTab/queryModelViewTab.ts index abfaf653c9..4470d9581b 100644 --- a/src/sql/parts/query/modelViewTab/queryModelViewTab.ts +++ b/src/sql/parts/query/modelViewTab/queryModelViewTab.ts @@ -8,7 +8,7 @@ import { Dimension } from 'vs/base/browser/dom'; import { dispose, IDisposable } from 'vs/base/common/lifecycle'; import { IPanelView, IPanelTab } from 'sql/base/browser/ui/panel/panel'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { bootstrapAngular } from 'sql/services/bootstrap/bootstrapService'; +import { bootstrapAngular } from 'sql/platform/bootstrap/node/bootstrapService'; import { QueryModelViewTabModule } from 'sql/parts/query/modelViewTab/queryModelViewTab.module'; export class QueryModelViewTab implements IPanelTab { @@ -64,4 +64,4 @@ export class QueryModelViewTabView implements IPanelView { { modelViewId: this._componentId }); return uniqueSelector; } -} \ No newline at end of file +} diff --git a/src/sql/parts/query/modelViewTab/queryModelViewTabContainer.component.ts b/src/sql/parts/query/modelViewTab/queryModelViewTabContainer.component.ts index 58f65e4c83..6affba46eb 100644 --- a/src/sql/parts/query/modelViewTab/queryModelViewTabContainer.component.ts +++ b/src/sql/parts/query/modelViewTab/queryModelViewTabContainer.component.ts @@ -8,7 +8,7 @@ import 'vs/css!./media/dialogModal'; import { Component, ViewChild, Inject, forwardRef, ElementRef, AfterViewInit } from '@angular/core'; import { ModelViewContent } from 'sql/parts/modelComponents/modelViewContent.component'; -import { IBootstrapParams } from 'sql/services/bootstrap/bootstrapService'; +import { IBootstrapParams } from 'sql/platform/bootstrap/node/bootstrapService'; import { DialogPane } from 'sql/platform/dialog/dialogPane'; import { ComponentEventType } from 'sql/parts/modelComponents/interfaces'; import { Event, Emitter } from 'vs/base/common/event'; diff --git a/src/sql/parts/queryPlan/queryPlan.component.ts b/src/sql/parts/queryPlan/queryPlan.component.ts index fb6838c75b..1f4bf0e15d 100644 --- a/src/sql/parts/queryPlan/queryPlan.component.ts +++ b/src/sql/parts/queryPlan/queryPlan.component.ts @@ -8,8 +8,8 @@ import 'vs/css!sql/parts/grid/load/css/qp'; import { ElementRef, Component, Inject, forwardRef, OnDestroy, OnInit, ViewChild } from '@angular/core'; import * as QP from 'html-query-plan'; -import { IBootstrapParams } from 'sql/services/bootstrap/bootstrapService'; -import { IQueryPlanParams } from 'sql/services/bootstrap/bootstrapParams'; +import { IBootstrapParams } from 'sql/platform/bootstrap/node/bootstrapService'; +import { IQueryPlanParams } from 'sql/platform/bootstrap/node/bootstrapParams'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { registerThemingParticipant, ICssStyleCollector, ITheme } from 'vs/platform/theme/common/themeService'; diff --git a/src/sql/parts/queryPlan/queryPlan.module.ts b/src/sql/parts/queryPlan/queryPlan.module.ts index b7f603258f..e555122bbf 100644 --- a/src/sql/parts/queryPlan/queryPlan.module.ts +++ b/src/sql/parts/queryPlan/queryPlan.module.ts @@ -7,7 +7,7 @@ import { NgModule, Inject, forwardRef, ApplicationRef, ComponentFactoryResolver, import { APP_BASE_HREF, CommonModule } from '@angular/common'; import { BrowserModule } from '@angular/platform-browser'; -import { IBootstrapParams, ISelector, providerIterator } from 'sql/services/bootstrap/bootstrapService'; +import { IBootstrapParams, ISelector, providerIterator } from 'sql/platform/bootstrap/node/bootstrapService'; import { QueryPlanComponent } from 'sql/parts/queryPlan/queryPlan.component'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; @@ -47,4 +47,4 @@ export const QueryPlanModule = (params: IBootstrapParams, selector: string, inst } return ModuleClass; -}; \ No newline at end of file +}; diff --git a/src/sql/parts/queryPlan/queryPlanEditor.ts b/src/sql/parts/queryPlan/queryPlanEditor.ts index a21711db8a..55084317c0 100644 --- a/src/sql/parts/queryPlan/queryPlanEditor.ts +++ b/src/sql/parts/queryPlan/queryPlanEditor.ts @@ -16,8 +16,8 @@ import { IConnectionManagementService } from 'sql/platform/connection/common/con import { IMetadataService } from 'sql/platform/metadata/common/metadataService'; import { IScriptingService } from 'sql/platform/scripting/common/scriptingService'; import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; -import { bootstrapAngular } from 'sql/services/bootstrap/bootstrapService'; -import { IQueryPlanParams } from 'sql/services/bootstrap/bootstrapParams'; +import { bootstrapAngular } from 'sql/platform/bootstrap/node/bootstrapService'; +import { IQueryPlanParams } from 'sql/platform/bootstrap/node/bootstrapParams'; import { QUERYPLAN_SELECTOR } from 'sql/parts/queryPlan/queryPlan.component'; import { CancellationToken } from 'vs/base/common/cancellation'; import { IStorageService } from 'vs/platform/storage/common/storage'; diff --git a/src/sql/parts/queryPlan/topOperations.component.ts b/src/sql/parts/queryPlan/topOperations.component.ts index 8c74eaccf0..66b03ee8bb 100644 --- a/src/sql/parts/queryPlan/topOperations.component.ts +++ b/src/sql/parts/queryPlan/topOperations.component.ts @@ -10,7 +10,7 @@ import { PlanXmlParser, PlanNode } from 'sql/parts/queryPlan/planXmlParser'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; import { Table } from 'sql/base/browser/ui/table/table'; import { attachTableStyler } from 'sql/platform/theme/common/styler'; -import { IQueryComponentParams } from 'sql/services/bootstrap/bootstrapParams'; +import { IQueryComponentParams } from 'sql/platform/bootstrap/node/bootstrapParams'; import * as GridContentEvents from 'sql/parts/grid/common/gridContentEvents'; import { DataService } from 'sql/parts/grid/services/dataService'; import { toDisposableSubscription } from 'sql/base/node/rxjsUtils'; diff --git a/src/sql/services/bootstrap/bootstrapParams.ts b/src/sql/platform/bootstrap/node/bootstrapParams.ts similarity index 89% rename from src/sql/services/bootstrap/bootstrapParams.ts rename to src/sql/platform/bootstrap/node/bootstrapParams.ts index 72f24c446c..6554d44f29 100644 --- a/src/sql/services/bootstrap/bootstrapParams.ts +++ b/src/sql/platform/bootstrap/node/bootstrapParams.ts @@ -5,9 +5,9 @@ import { DataService } from 'sql/parts/grid/services/dataService'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; -import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey'; +import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { ConnectionContextKey } from 'sql/parts/connection/common/connectionContextKey'; -import { IBootstrapParams } from './bootstrapService'; +import { IBootstrapParams } from 'sql/platform/bootstrap/node/bootstrapService'; import { Event } from 'vs/base/common/event'; export interface IQueryComponentParams extends IBootstrapParams { diff --git a/src/sql/services/bootstrap/bootstrapService.ts b/src/sql/platform/bootstrap/node/bootstrapService.ts similarity index 100% rename from src/sql/services/bootstrap/bootstrapService.ts rename to src/sql/platform/bootstrap/node/bootstrapService.ts diff --git a/src/sql/services/common/commonServiceInterface.service.ts b/src/sql/platform/bootstrap/node/commonServiceInterface.service.ts similarity index 97% rename from src/sql/services/common/commonServiceInterface.service.ts rename to src/sql/platform/bootstrap/node/commonServiceInterface.service.ts index ec75ebf28b..547a504746 100644 --- a/src/sql/services/common/commonServiceInterface.service.ts +++ b/src/sql/platform/bootstrap/node/commonServiceInterface.service.ts @@ -8,8 +8,8 @@ import { Injectable, Inject } from '@angular/core'; import { Observable } from 'rxjs/Observable'; /* SQL imports */ -import { IDefaultComponentParams } from 'sql/services/bootstrap/bootstrapParams'; -import { IBootstrapParams } from 'sql/services/bootstrap/bootstrapService'; +import { IDefaultComponentParams } from 'sql/platform/bootstrap/node/bootstrapParams'; +import { IBootstrapParams } from 'sql/platform/bootstrap/node/bootstrapService'; import { IMetadataService } from 'sql/platform/metadata/common/metadataService'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { ConnectionManagementInfo } from 'sql/platform/connection/common/connectionManagementInfo'; diff --git a/src/sql/platform/dialog/dialog.module.ts b/src/sql/platform/dialog/dialog.module.ts index ade913d5f8..c31a824bdf 100644 --- a/src/sql/platform/dialog/dialog.module.ts +++ b/src/sql/platform/dialog/dialog.module.ts @@ -18,8 +18,8 @@ import { Extensions, IComponentRegistry } from 'sql/platform/dashboard/common/mo import { ModelViewContent } from 'sql/parts/modelComponents/modelViewContent.component'; import { ModelComponentWrapper } from 'sql/parts/modelComponents/modelComponentWrapper.component'; import { ComponentHostDirective } from 'sql/workbench/parts/dashboard/common/componentHost.directive'; -import { IBootstrapParams, ISelector, providerIterator } from 'sql/services/bootstrap/bootstrapService'; -import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; +import { IBootstrapParams, ISelector, providerIterator } from 'sql/platform/bootstrap/node/bootstrapService'; +import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox.component'; import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox.component'; import { EditableDropDown } from 'sql/base/browser/ui/editableDropdown/editableDropdown.component'; diff --git a/src/sql/platform/dialog/dialogContainer.component.ts b/src/sql/platform/dialog/dialogContainer.component.ts index daf2f543e3..33b5b0a3b4 100644 --- a/src/sql/platform/dialog/dialogContainer.component.ts +++ b/src/sql/platform/dialog/dialogContainer.component.ts @@ -8,7 +8,7 @@ import 'vs/css!./media/dialogModal'; import { Component, ViewChild, Inject, forwardRef, ElementRef, AfterViewInit } from '@angular/core'; import { ModelViewContent } from 'sql/parts/modelComponents/modelViewContent.component'; -import { IBootstrapParams } from 'sql/services/bootstrap/bootstrapService'; +import { IBootstrapParams } from 'sql/platform/bootstrap/node/bootstrapService'; import { DialogPane } from 'sql/platform/dialog/dialogPane'; import { ComponentEventType } from 'sql/parts/modelComponents/interfaces'; import { Event, Emitter } from 'vs/base/common/event'; diff --git a/src/sql/platform/dialog/dialogPane.ts b/src/sql/platform/dialog/dialogPane.ts index dac6968484..2888448e9b 100644 --- a/src/sql/platform/dialog/dialogPane.ts +++ b/src/sql/platform/dialog/dialogPane.ts @@ -12,7 +12,7 @@ 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/services/bootstrap/bootstrapService'; +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'; diff --git a/src/sql/platform/dialog/wizardModal.ts b/src/sql/platform/dialog/wizardModal.ts index b79e406afa..1ee9c0441b 100644 --- a/src/sql/platform/dialog/wizardModal.ts +++ b/src/sql/platform/dialog/wizardModal.ts @@ -10,7 +10,7 @@ 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/services/bootstrap/bootstrapService'; +import { bootstrapAngular } from 'sql/platform/bootstrap/node/bootstrapService'; import { DialogMessage } from 'sql/workbench/api/common/sqlExtHostTypes'; import { DialogModule } from 'sql/platform/dialog/dialog.module'; import { Button } from 'vs/base/browser/ui/button/button'; diff --git a/src/sql/platform/dialog/wizardNavigation.component.ts b/src/sql/platform/dialog/wizardNavigation.component.ts index 8303843597..b319d319f7 100644 --- a/src/sql/platform/dialog/wizardNavigation.component.ts +++ b/src/sql/platform/dialog/wizardNavigation.component.ts @@ -7,7 +7,7 @@ import 'vs/css!./media/wizardNavigation'; import { Component, Inject, forwardRef, ElementRef, AfterViewInit, ChangeDetectorRef, ViewChild } from '@angular/core'; -import { IBootstrapParams } from 'sql/services/bootstrap/bootstrapService'; +import { IBootstrapParams } from 'sql/platform/bootstrap/node/bootstrapService'; import { Event, Emitter } from 'vs/base/common/event'; import { Wizard } from './dialogTypes'; import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; diff --git a/src/sql/workbench/parts/dashboard/common/dashboardHelper.ts b/src/sql/workbench/parts/dashboard/common/dashboardHelper.ts index 8cd048e3bf..436f9bc747 100644 --- a/src/sql/workbench/parts/dashboard/common/dashboardHelper.ts +++ b/src/sql/workbench/parts/dashboard/common/dashboardHelper.ts @@ -21,7 +21,7 @@ import { MODELVIEW_CONTAINER } from 'sql/workbench/parts/dashboard/containers/da import { CONTROLHOST_CONTAINER } from 'sql/workbench/parts/dashboard/containers/dashboardControlHostContainer.contribution'; import { NAV_SECTION } from 'sql/workbench/parts/dashboard/containers/dashboardNavSection.contribution'; import { IDashboardContainerRegistry, Extensions as DashboardContainerExtensions } from 'sql/platform/dashboard/common/dashboardContainerRegistry'; -import { SingleConnectionManagementService } from 'sql/services/common/commonServiceInterface.service'; +import { SingleConnectionManagementService } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import * as Constants from 'sql/platform/connection/common/constants'; const dashboardcontainerRegistry = Registry.as(DashboardContainerExtensions.dashboardContainerContributions); diff --git a/src/sql/workbench/parts/dashboard/common/dashboardPage.component.ts b/src/sql/workbench/parts/dashboard/common/dashboardPage.component.ts index 93ca0f1c1d..2b76847c1e 100644 --- a/src/sql/workbench/parts/dashboard/common/dashboardPage.component.ts +++ b/src/sql/workbench/parts/dashboard/common/dashboardPage.component.ts @@ -9,7 +9,7 @@ import 'sql/workbench/parts/dashboard/common/dashboardPanelStyles'; import { Component, Inject, forwardRef, ViewChild, ElementRef, ViewChildren, QueryList, ChangeDetectorRef } from '@angular/core'; import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/services/dashboardServiceInterface.service'; -import { CommonServiceInterface, SingleConnectionManagementService } from 'sql/services/common/commonServiceInterface.service'; +import { CommonServiceInterface, SingleConnectionManagementService } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import { WidgetConfig, TabConfig, TabSettingConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; import { IPropertiesConfig } from 'sql/workbench/parts/dashboard/pages/serverDashboardPage.contribution'; import { PanelComponent } from 'sql/base/browser/ui/panel/panel.component'; diff --git a/src/sql/workbench/parts/dashboard/common/interfaces.ts b/src/sql/workbench/parts/dashboard/common/interfaces.ts index 6964892807..8b02d2d4fc 100644 --- a/src/sql/workbench/parts/dashboard/common/interfaces.ts +++ b/src/sql/workbench/parts/dashboard/common/interfaces.ts @@ -9,7 +9,7 @@ import { Event } from 'vs/base/common/event'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; -import { SingleConnectionManagementService } from 'sql/services/common/commonServiceInterface.service'; +import { SingleConnectionManagementService } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; export enum Conditional { 'equals', diff --git a/src/sql/workbench/parts/dashboard/containers/dashboardGridContainer.component.ts b/src/sql/workbench/parts/dashboard/containers/dashboardGridContainer.component.ts index 2ee415f0d6..bcdf30ed41 100644 --- a/src/sql/workbench/parts/dashboard/containers/dashboardGridContainer.component.ts +++ b/src/sql/workbench/parts/dashboard/containers/dashboardGridContainer.component.ts @@ -7,7 +7,7 @@ import 'vs/css!./dashboardGridContainer'; import { Component, Inject, Input, forwardRef, ElementRef, ViewChildren, QueryList, OnDestroy, ChangeDetectorRef } from '@angular/core'; -import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import { TabConfig, WidgetConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; import { DashboardWidgetWrapper } from 'sql/workbench/parts/dashboard/contents/dashboardWidgetWrapper.component'; import { DashboardTab } from 'sql/workbench/parts/dashboard/common/interfaces'; diff --git a/src/sql/workbench/parts/dashboard/containers/dashboardHomeContainer.component.ts b/src/sql/workbench/parts/dashboard/containers/dashboardHomeContainer.component.ts index 7e5e9029c1..39ecd2b58c 100644 --- a/src/sql/workbench/parts/dashboard/containers/dashboardHomeContainer.component.ts +++ b/src/sql/workbench/parts/dashboard/containers/dashboardHomeContainer.component.ts @@ -10,7 +10,7 @@ import { Component, forwardRef, Input, ChangeDetectorRef, Inject, ViewChild, Con import { DashboardWidgetContainer } from 'sql/workbench/parts/dashboard/containers/dashboardWidgetContainer.component'; import { WidgetConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/services/dashboardServiceInterface.service'; -import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import { AngularEventType, IAngularEventingService } from 'sql/platform/angularEventing/common/angularEventingService'; import { DashboardWidgetWrapper } from 'sql/workbench/parts/dashboard/contents/dashboardWidgetWrapper.component'; import { ScrollableDirective } from 'sql/base/browser/ui/scrollable/scrollable.directive'; diff --git a/src/sql/workbench/parts/dashboard/containers/dashboardNavSection.component.ts b/src/sql/workbench/parts/dashboard/containers/dashboardNavSection.component.ts index ab337097c9..ad84bca93e 100644 --- a/src/sql/workbench/parts/dashboard/containers/dashboardNavSection.component.ts +++ b/src/sql/workbench/parts/dashboard/containers/dashboardNavSection.component.ts @@ -7,7 +7,7 @@ import 'vs/css!./dashboardNavSection'; import { Component, Inject, Input, forwardRef, ViewChild, ElementRef, ViewChildren, QueryList, OnDestroy, ChangeDetectorRef, OnChanges, AfterContentInit } from '@angular/core'; -import { CommonServiceInterface, SingleConnectionManagementService } from 'sql/services/common/commonServiceInterface.service'; +import { CommonServiceInterface, SingleConnectionManagementService } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import { WidgetConfig, TabConfig, NavSectionConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; import { PanelComponent, IPanelOptions, NavigationBarLayout } from 'sql/base/browser/ui/panel/panel.component'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; diff --git a/src/sql/workbench/parts/dashboard/contents/controlHostContent.component.ts b/src/sql/workbench/parts/dashboard/contents/controlHostContent.component.ts index 6900b30059..80a889e3c8 100644 --- a/src/sql/workbench/parts/dashboard/contents/controlHostContent.component.ts +++ b/src/sql/workbench/parts/dashboard/contents/controlHostContent.component.ts @@ -9,7 +9,7 @@ import { Component, forwardRef, Input, OnInit, Inject, ChangeDetectorRef, Elemen import { Event, Emitter } from 'vs/base/common/event'; import { IDisposable } from 'vs/base/common/lifecycle'; -import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import * as azdata from 'azdata'; import { memoize } from 'vs/base/common/decorators'; diff --git a/src/sql/workbench/parts/dashboard/contents/dashboardWidgetWrapper.component.ts b/src/sql/workbench/parts/dashboard/contents/dashboardWidgetWrapper.component.ts index 8b2da5f525..690637ae42 100644 --- a/src/sql/workbench/parts/dashboard/contents/dashboardWidgetWrapper.component.ts +++ b/src/sql/workbench/parts/dashboard/contents/dashboardWidgetWrapper.component.ts @@ -25,7 +25,7 @@ import { TasksWidget } from 'sql/workbench/parts/dashboard/widgets/tasks/tasksWi import { InsightsWidget } from 'sql/workbench/parts/dashboard/widgets/insights/insightsWidget.component'; import { WebviewWidget } from 'sql/workbench/parts/dashboard/widgets/webview/webviewWidget.component'; -import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import { IColorTheme, IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; import * as colors from 'vs/platform/theme/common/colorRegistry'; diff --git a/src/sql/workbench/parts/dashboard/contents/webviewContent.component.ts b/src/sql/workbench/parts/dashboard/contents/webviewContent.component.ts index 57a305c759..bc8322e1af 100644 --- a/src/sql/workbench/parts/dashboard/contents/webviewContent.component.ts +++ b/src/sql/workbench/parts/dashboard/contents/webviewContent.component.ts @@ -13,7 +13,7 @@ import { addDisposableListener, EventType } from 'vs/base/browser/dom'; import { memoize } from 'vs/base/common/decorators'; import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/services/dashboardServiceInterface.service'; -import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import { IDashboardWebview, IDashboardViewService } from 'sql/platform/dashboard/common/dashboardViewService'; import { AngularDisposable } from 'sql/base/node/lifecycle'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; diff --git a/src/sql/workbench/parts/dashboard/contents/widgetContent.component.ts b/src/sql/workbench/parts/dashboard/contents/widgetContent.component.ts index 02e7984fc7..82c8c68f75 100644 --- a/src/sql/workbench/parts/dashboard/contents/widgetContent.component.ts +++ b/src/sql/workbench/parts/dashboard/contents/widgetContent.component.ts @@ -9,7 +9,7 @@ import { Component, Inject, Input, forwardRef, ViewChild, ViewChildren, QueryLis import { NgGridConfig, NgGrid, NgGridItem } from 'angular2-grid'; import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/services/dashboardServiceInterface.service'; -import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import { WidgetConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; import { DashboardWidgetWrapper } from 'sql/workbench/parts/dashboard/contents/dashboardWidgetWrapper.component'; import { subscriptionToDisposable, AngularDisposable } from 'sql/base/node/lifecycle'; diff --git a/src/sql/workbench/parts/dashboard/dashboard.component.ts b/src/sql/workbench/parts/dashboard/dashboard.component.ts index 40058d5066..ce3bebb4e2 100644 --- a/src/sql/workbench/parts/dashboard/dashboard.component.ts +++ b/src/sql/workbench/parts/dashboard/dashboard.component.ts @@ -8,7 +8,7 @@ import 'vs/css!./dashboard'; import { OnInit, Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; -import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import * as Utils from 'sql/platform/connection/common/utils'; import { RefreshWidgetAction, EditDashboardAction } from 'sql/workbench/parts/dashboard/common/actions'; diff --git a/src/sql/workbench/parts/dashboard/dashboard.module.ts b/src/sql/workbench/parts/dashboard/dashboard.module.ts index 8fa5c1c889..95ee3998c0 100644 --- a/src/sql/workbench/parts/dashboard/dashboard.module.ts +++ b/src/sql/workbench/parts/dashboard/dashboard.module.ts @@ -14,7 +14,7 @@ import { ChartsModule } from 'ng2-charts'; import CustomUrlSerializer from 'sql/base/node/urlSerializer'; import { Extensions, IInsightRegistry } from 'sql/platform/dashboard/common/insightRegistry'; import { Extensions as ComponentExtensions, IComponentRegistry } from 'sql/platform/dashboard/common/modelComponentRegistry'; -import { IBootstrapParams, ISelector, providerIterator } from 'sql/services/bootstrap/bootstrapService'; +import { IBootstrapParams, ISelector, providerIterator } from 'sql/platform/bootstrap/node/bootstrapService'; import { Registry } from 'vs/platform/registry/common/platform'; @@ -26,7 +26,7 @@ import * as TelemetryKeys from 'sql/platform/telemetry/telemetryKeys'; /* Services */ import { BreadcrumbService } from 'sql/workbench/parts/dashboard/services/breadcrumb.service'; import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/services/dashboardServiceInterface.service'; -import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; /* Directives */ import { ComponentHostDirective } from 'sql/workbench/parts/dashboard/common/componentHost.directive'; diff --git a/src/sql/workbench/parts/dashboard/dashboardEditor.ts b/src/sql/workbench/parts/dashboard/dashboardEditor.ts index 1d6c05e009..3c4fde73b0 100644 --- a/src/sql/workbench/parts/dashboard/dashboardEditor.ts +++ b/src/sql/workbench/parts/dashboard/dashboardEditor.ts @@ -13,8 +13,8 @@ import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { DashboardInput } from './dashboardInput'; import { DashboardModule } from './dashboard.module'; -import { bootstrapAngular } from 'sql/services/bootstrap/bootstrapService'; -import { IDashboardComponentParams } from 'sql/services/bootstrap/bootstrapParams'; +import { bootstrapAngular } from 'sql/platform/bootstrap/node/bootstrapService'; +import { IDashboardComponentParams } from 'sql/platform/bootstrap/node/bootstrapParams'; import { DASHBOARD_SELECTOR } from 'sql/workbench/parts/dashboard/dashboard.component'; import { ConnectionContextKey } from 'sql/parts/connection/common/connectionContextKey'; import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService'; diff --git a/src/sql/workbench/parts/dashboard/pages/databaseDashboardPage.component.ts b/src/sql/workbench/parts/dashboard/pages/databaseDashboardPage.component.ts index 6ad3be8985..16b1b06052 100644 --- a/src/sql/workbench/parts/dashboard/pages/databaseDashboardPage.component.ts +++ b/src/sql/workbench/parts/dashboard/pages/databaseDashboardPage.component.ts @@ -10,7 +10,7 @@ import { BreadcrumbClass } from 'sql/workbench/parts/dashboard/services/breadcru import { IBreadcrumbService } from 'sql/base/browser/ui/breadcrumb/interfaces'; import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/services/dashboardServiceInterface.service'; import { WidgetConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; -import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import { IAngularEventingService } from 'sql/platform/angularEventing/common/angularEventingService'; import * as colors from 'vs/platform/theme/common/colorRegistry'; diff --git a/src/sql/workbench/parts/dashboard/pages/serverDashboardPage.component.ts b/src/sql/workbench/parts/dashboard/pages/serverDashboardPage.component.ts index daef802885..f9e2b2fd2d 100644 --- a/src/sql/workbench/parts/dashboard/pages/serverDashboardPage.component.ts +++ b/src/sql/workbench/parts/dashboard/pages/serverDashboardPage.component.ts @@ -10,7 +10,7 @@ import { BreadcrumbClass } from 'sql/workbench/parts/dashboard/services/breadcru import { IBreadcrumbService } from 'sql/base/browser/ui/breadcrumb/interfaces'; import { WidgetConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/services/dashboardServiceInterface.service'; -import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import { IAngularEventingService } from 'sql/platform/angularEventing/common/angularEventingService'; import * as colors from 'vs/platform/theme/common/colorRegistry'; diff --git a/src/sql/workbench/parts/dashboard/services/breadcrumb.service.ts b/src/sql/workbench/parts/dashboard/services/breadcrumb.service.ts index b571d65d58..b4c3d94d76 100644 --- a/src/sql/workbench/parts/dashboard/services/breadcrumb.service.ts +++ b/src/sql/workbench/parts/dashboard/services/breadcrumb.service.ts @@ -7,7 +7,7 @@ import { Injectable, forwardRef, Inject } from '@angular/core'; import { Subject } from 'rxjs/Subject'; import { DashboardServiceInterface } from './dashboardServiceInterface.service'; -import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import { MenuItem, IBreadcrumbService } from 'sql/base/browser/ui/breadcrumb/interfaces'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; @@ -66,4 +66,4 @@ export class BreadcrumbService implements IBreadcrumbService { routerLink: ['database-dashboard'] }; } -} \ No newline at end of file +} diff --git a/src/sql/workbench/parts/dashboard/services/dashboardServiceInterface.service.ts b/src/sql/workbench/parts/dashboard/services/dashboardServiceInterface.service.ts index 90ea6405fe..8538a9a1e1 100644 --- a/src/sql/workbench/parts/dashboard/services/dashboardServiceInterface.service.ts +++ b/src/sql/workbench/parts/dashboard/services/dashboardServiceInterface.service.ts @@ -8,8 +8,8 @@ import { Injectable, Inject, forwardRef } from '@angular/core'; import { Router } from '@angular/router'; /* SQL imports */ -import { IDashboardComponentParams } from 'sql/services/bootstrap/bootstrapParams'; -import { IBootstrapParams } from 'sql/services/bootstrap/bootstrapService'; +import { IDashboardComponentParams } from 'sql/platform/bootstrap/node/bootstrapParams'; +import { IBootstrapParams } from 'sql/platform/bootstrap/node/bootstrapService'; import { IMetadataService } from 'sql/platform/metadata/common/metadataService'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { IAdminService } from 'sql/workbench/services/admin/common/adminService'; @@ -18,7 +18,7 @@ import { toDisposableSubscription } from 'sql/base/node/rxjsUtils'; import { AngularEventType, IAngularEvent, IAngularEventingService } from 'sql/platform/angularEventing/common/angularEventingService'; import { IDashboardTab } from 'sql/platform/dashboard/common/dashboardRegistry'; import { TabSettingConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; -import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; /* VS imports */ import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration'; diff --git a/src/sql/workbench/parts/dashboard/widgets/explorer/explorerTree.ts b/src/sql/workbench/parts/dashboard/widgets/explorer/explorerTree.ts index 26aba36397..f7bb8fcb5b 100644 --- a/src/sql/workbench/parts/dashboard/widgets/explorer/explorerTree.ts +++ b/src/sql/workbench/parts/dashboard/widgets/explorer/explorerTree.ts @@ -7,7 +7,7 @@ import { Router } from '@angular/router'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { MetadataType, IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; -import { SingleConnectionManagementService } from 'sql/services/common/commonServiceInterface.service'; +import { SingleConnectionManagementService } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import { NewQueryAction, ScriptSelectAction, EditDataAction, ScriptCreateAction, ScriptExecuteAction, ScriptAlterAction, BackupAction, ManageActionContext, BaseActionContext, ManageAction, RestoreAction diff --git a/src/sql/workbench/parts/dashboard/widgets/explorer/explorerWidget.component.ts b/src/sql/workbench/parts/dashboard/widgets/explorer/explorerWidget.component.ts index aa677824eb..ff2c11dcca 100644 --- a/src/sql/workbench/parts/dashboard/widgets/explorer/explorerWidget.component.ts +++ b/src/sql/workbench/parts/dashboard/widgets/explorer/explorerWidget.component.ts @@ -11,7 +11,7 @@ import { Component, Inject, forwardRef, ChangeDetectorRef, OnInit, ViewChild, El import { Router } from '@angular/router'; import { DashboardWidget, IDashboardWidget, WidgetConfig, WIDGET_CONFIG } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; -import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import { toDisposableSubscription } from 'sql/base/node/rxjsUtils'; import { ExplorerFilter, ExplorerRenderer, ExplorerDataSource, ExplorerController, ObjectMetadataWrapper, ExplorerModel } from './explorerTree'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; diff --git a/src/sql/workbench/parts/dashboard/widgets/insights/insightsWidget.component.ts b/src/sql/workbench/parts/dashboard/widgets/insights/insightsWidget.component.ts index 99ab98e20e..bf558da5ee 100644 --- a/src/sql/workbench/parts/dashboard/widgets/insights/insightsWidget.component.ts +++ b/src/sql/workbench/parts/dashboard/widgets/insights/insightsWidget.component.ts @@ -10,7 +10,7 @@ import { import { Observable } from 'rxjs/Observable'; import { DashboardWidget, IDashboardWidget, WIDGET_CONFIG, WidgetConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; -import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import { ComponentHostDirective } from 'sql/workbench/parts/dashboard/common/componentHost.directive'; import { InsightAction, InsightActionContext } from 'sql/workbench/common/actions'; import { toDisposableSubscription } from 'sql/base/node/rxjsUtils'; diff --git a/src/sql/workbench/parts/dashboard/widgets/properties/propertiesWidget.component.ts b/src/sql/workbench/parts/dashboard/widgets/properties/propertiesWidget.component.ts index 1c8b0169b3..427743f1a1 100644 --- a/src/sql/workbench/parts/dashboard/widgets/properties/propertiesWidget.component.ts +++ b/src/sql/workbench/parts/dashboard/widgets/properties/propertiesWidget.component.ts @@ -6,7 +6,7 @@ import { Component, Inject, forwardRef, ChangeDetectorRef, OnInit, ElementRef, ViewChild } from '@angular/core'; import { DashboardWidget, IDashboardWidget, WidgetConfig, WIDGET_CONFIG } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; -import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import { ConnectionManagementInfo } from 'sql/platform/connection/common/connectionManagementInfo'; import { toDisposableSubscription } from 'sql/base/node/rxjsUtils'; import { error } from 'sql/base/common/log'; diff --git a/src/sql/workbench/parts/dashboard/widgets/tasks/tasksWidget.component.ts b/src/sql/workbench/parts/dashboard/widgets/tasks/tasksWidget.component.ts index 3131a16cf5..7cd07fbdcf 100644 --- a/src/sql/workbench/parts/dashboard/widgets/tasks/tasksWidget.component.ts +++ b/src/sql/workbench/parts/dashboard/widgets/tasks/tasksWidget.component.ts @@ -11,7 +11,7 @@ import { Component, Inject, forwardRef, ViewChild, OnInit, ElementRef } from '@a /* SQL imports */ import { DashboardWidget, IDashboardWidget, WidgetConfig, WIDGET_CONFIG } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; -import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import { TaskRegistry } from 'sql/platform/tasks/common/tasks'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; diff --git a/src/sql/workbench/parts/dashboard/widgets/webview/webviewWidget.component.ts b/src/sql/workbench/parts/dashboard/widgets/webview/webviewWidget.component.ts index bb7fc24d25..4cf814877d 100644 --- a/src/sql/workbench/parts/dashboard/widgets/webview/webviewWidget.component.ts +++ b/src/sql/workbench/parts/dashboard/widgets/webview/webviewWidget.component.ts @@ -11,7 +11,7 @@ import { memoize } from 'vs/base/common/decorators'; import { DashboardWidget, IDashboardWidget, WidgetConfig, WIDGET_CONFIG } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/services/dashboardServiceInterface.service'; -import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import { IDashboardWebview, IDashboardViewService } from 'sql/platform/dashboard/common/dashboardViewService'; import * as azdata from 'azdata'; diff --git a/src/sql/workbench/parts/notebook/cellViews/textCell.component.ts b/src/sql/workbench/parts/notebook/cellViews/textCell.component.ts index 8c73a97b2f..8e54f9e24c 100644 --- a/src/sql/workbench/parts/notebook/cellViews/textCell.component.ts +++ b/src/sql/workbench/parts/notebook/cellViews/textCell.component.ts @@ -17,7 +17,7 @@ import { URI } from 'vs/base/common/uri'; import { IOpenerService } from 'vs/platform/opener/common/opener'; import * as DOM from 'vs/base/browser/dom'; -import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import { CellView } from 'sql/workbench/parts/notebook/cellViews/interfaces'; import { ICellModel } from 'sql/workbench/parts/notebook/models/modelInterfaces'; import { ISanitizer, defaultSanitizer } from 'sql/workbench/parts/notebook/outputs/sanitizer'; diff --git a/src/sql/workbench/parts/notebook/notebook.component.ts b/src/sql/workbench/parts/notebook/notebook.component.ts index e941d015b0..28726e18c3 100644 --- a/src/sql/workbench/parts/notebook/notebook.component.ts +++ b/src/sql/workbench/parts/notebook/notebook.component.ts @@ -25,7 +25,7 @@ import { CellTypes, CellType } from 'sql/workbench/parts/notebook/models/contrac import { ICellModel, IModelFactory, INotebookModel, NotebookContentChange } from 'sql/workbench/parts/notebook/models/modelInterfaces'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { INotebookService, INotebookParams, INotebookManager, INotebookEditor, DEFAULT_NOTEBOOK_PROVIDER, SQL_NOTEBOOK_PROVIDER } from 'sql/workbench/services/notebook/common/notebookService'; -import { IBootstrapParams } from 'sql/services/bootstrap/bootstrapService'; +import { IBootstrapParams } from 'sql/platform/bootstrap/node/bootstrapService'; import { NotebookModel } from 'sql/workbench/parts/notebook/models/notebookModel'; import { ModelFactory } from 'sql/workbench/parts/notebook/models/modelFactory'; import * as notebookUtils from 'sql/workbench/parts/notebook/notebookUtils'; diff --git a/src/sql/workbench/parts/notebook/notebook.module.ts b/src/sql/workbench/parts/notebook/notebook.module.ts index c0d5e72a70..4b09359238 100644 --- a/src/sql/workbench/parts/notebook/notebook.module.ts +++ b/src/sql/workbench/parts/notebook/notebook.module.ts @@ -12,8 +12,8 @@ import { BrowserModule } from '@angular/platform-browser'; import { ComponentHostDirective } from 'sql/workbench/parts/dashboard/common/componentHost.directive'; -import { IBootstrapParams, ISelector, providerIterator } from 'sql/services/bootstrap/bootstrapService'; -import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; +import { IBootstrapParams, ISelector, providerIterator } from 'sql/platform/bootstrap/node/bootstrapService'; +import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox.component'; import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox.component'; import { EditableDropDown } from 'sql/base/browser/ui/editableDropdown/editableDropdown.component'; diff --git a/src/sql/workbench/parts/notebook/notebookEditor.ts b/src/sql/workbench/parts/notebook/notebookEditor.ts index c890b28e5a..77a0266148 100644 --- a/src/sql/workbench/parts/notebook/notebookEditor.ts +++ b/src/sql/workbench/parts/notebook/notebookEditor.ts @@ -7,7 +7,7 @@ import { IThemeService } from 'vs/platform/theme/common/themeService'; import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor'; import { EditorOptions } from 'vs/workbench/common/editor'; import * as DOM from 'vs/base/browser/dom'; -import { bootstrapAngular } from 'sql/services/bootstrap/bootstrapService'; +import { bootstrapAngular } from 'sql/platform/bootstrap/node/bootstrapService'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { CancellationToken } from 'vs/base/common/cancellation'; diff --git a/src/sql/workbench/services/notebook/common/notebookService.ts b/src/sql/workbench/services/notebook/common/notebookService.ts index c94f157dae..9fe314f6fb 100644 --- a/src/sql/workbench/services/notebook/common/notebookService.ts +++ b/src/sql/workbench/services/notebook/common/notebookService.ts @@ -10,7 +10,7 @@ import * as azdata from 'azdata'; import { Event } from 'vs/base/common/event'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; import { URI } from 'vs/base/common/uri'; -import { IBootstrapParams } from 'sql/services/bootstrap/bootstrapService'; +import { IBootstrapParams } from 'sql/platform/bootstrap/node/bootstrapService'; import { RenderMimeRegistry } from 'sql/workbench/parts/notebook/outputs/registry'; import { ModelFactory } from 'sql/workbench/parts/notebook/models/modelFactory'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; diff --git a/src/sqltest/parts/dashboard/widgets/propertiesWidget.component.test.ts b/src/sqltest/parts/dashboard/widgets/propertiesWidget.component.test.ts index 43cbbd5ddb..34806e4f7c 100644 --- a/src/sqltest/parts/dashboard/widgets/propertiesWidget.component.test.ts +++ b/src/sqltest/parts/dashboard/widgets/propertiesWidget.component.test.ts @@ -9,7 +9,7 @@ import 'rxjs/add/observable/of'; import { WidgetConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/services/dashboardServiceInterface.service'; -import { SingleAdminService, SingleConnectionManagementService } from 'sql/services/common/commonServiceInterface.service'; +import { SingleAdminService, SingleConnectionManagementService } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import { PropertiesWidgetComponent } from 'sql/workbench/parts/dashboard/widgets/properties/propertiesWidget.component'; import { ConnectionManagementInfo } from 'sql/platform/connection/common/connectionManagementInfo'; diff --git a/src/sqltest/platform/dialog/dialogPane.test.ts b/src/sqltest/platform/dialog/dialogPane.test.ts index 60b29de6e3..ae9def96d8 100644 --- a/src/sqltest/platform/dialog/dialogPane.test.ts +++ b/src/sqltest/platform/dialog/dialogPane.test.ts @@ -9,7 +9,7 @@ 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/services/bootstrap/bootstrapService'; +import { bootstrapAngular } from 'sql/platform/bootstrap/node/bootstrapService'; interface BootstrapAngular {