More layering movement (#24023)

* finish layering

* undo eslint changes

* undo

* restore -> backup

* fix paths

* Skip commandLine layers check

* fix path

* fix tsec path

.eslintrc.json

@@ -1599,4 +1599,3 @@
 		}
 	]
 }
-

build/lib/layersChecker.ts

@@ -197,13 +197,22 @@ const RULES: IRule[] = [
 
 	// Electron (sandbox)
 	{
-		target: '**/{vs,sql}/**/electron-sandbox/**',
+		target: '**/{vs,sql}/**/electron-sandbox/**/!(commandLine.ts)', // {{SQL CARBON EDIT}} commandLine currently uses querystring, so skip that one for now
 		allowedTypes: CORE_TYPES,
 		disallowedDefinitions: [
 			'@types/node'	// no node.js
 		]
 	},
 
+	// {{SQL CARBON TODO}} chgagnon investigate the use of querystring
+	{
+		target: '**/{vs,sql}/**/electron-sandbox/commandLine.ts',
+		allowedTypes: [
+			...CORE_TYPES,
+			'@types/node'
+		]
+	},
+
 	// Electron (renderer): skip
 	{
 		target: '**/{vs,sql}/**/electron-browser/**',

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

@@ -5,14 +5,9 @@
 
 import Severity from 'vs/base/common/severity';
 import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService';
-import { IErrorDialogOptions } from 'sql/workbench/api/common/sqlExtHostTypes';
-import { TelemetryView } from 'sql/platform/telemetry/common/telemetryKeys';
 
 export class TestErrorMessageService implements IErrorMessageService {
 	_serviceBrand: undefined;
 	showDialog(severity: Severity, headerTitle: string, message: string): void {
 	}
-	showDialogAsync(options: IErrorDialogOptions, telemetryView: TelemetryView): Promise<string | undefined> {
-		return Promise.resolve(undefined);
-	}
 }

src/sql/workbench/contrib/backup/browser/backup.component.ts

@@ -12,7 +12,7 @@ import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox';
 import { ListBox } from 'sql/base/browser/ui/listBox/listBox';
 import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox';
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
-import * as BackupConstants from 'sql/workbench/contrib/backup/common/constants';
+import * as BackupConstants from 'sql/workbench/common/backup/constants';
 import { IBackupService, TaskExecutionMode } from 'sql/platform/backup/common/backupService';
 import * as FileValidationConstants from 'sql/workbench/services/fileBrowser/common/fileValidationServiceConstants';
 import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';

src/sql/workbench/contrib/charts/browser/actions.ts

@@ -12,7 +12,7 @@ import { Action } from 'vs/base/common/actions';
 import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
 import { URI } from 'vs/base/common/uri';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IInsightOptions } from 'sql/workbench/contrib/charts/common/interfaces';
+import { IInsightOptions } from 'sql/workbench/contrib/charts/browser/interfaces';
 import { QueryEditorInput } from 'sql/workbench/common/editor/query/queryEditorInput';
 import { IFileService } from 'vs/platform/files/common/files';
 import { IFileDialogService, FileFilter } from 'vs/platform/dialogs/common/dialogs';

src/sql/workbench/contrib/charts/browser/chartOptions.ts

@@ -7,7 +7,7 @@ import { localize } from 'vs/nls';
 import { Registry } from 'vs/platform/registry/common/platform';
 
 import { Extensions, IInsightRegistry } from 'sql/platform/dashboard/browser/insightRegistry';
-import { IInsightOptions, DataDirection, DataType, LegendPosition, ChartType, InsightType } from 'sql/workbench/contrib/charts/common/interfaces';
+import { IInsightOptions, DataDirection, DataType, LegendPosition, ChartType, InsightType } from 'sql/workbench/contrib/charts/browser/interfaces';
 import { values } from 'vs/base/common/collections';
 
 const insightRegistry = Registry.as<IInsightRegistry>(Extensions.InsightContribution);

src/sql/workbench/contrib/charts/browser/chartView.ts

@@ -11,7 +11,7 @@ import { Extensions, IInsightData, IInsightRegistry } from 'sql/platform/dashboa
 import { ChartState } from 'sql/workbench/common/editor/query/chartState';
 import { ConfigureChartAction, CopyAction, CreateInsightAction, IChartActionContext, SaveImageAction } from 'sql/workbench/contrib/charts/browser/actions';
 import { getChartMaxRowCount } from 'sql/workbench/contrib/charts/browser/utils';
-import { ChartType, IInsightOptions, InsightType } from 'sql/workbench/contrib/charts/common/interfaces';
+import { ChartType, IInsightOptions, InsightType } from 'sql/workbench/contrib/charts/browser/interfaces';
 import { ICellValue, VisualizationOptions } from 'sql/workbench/services/query/common/query';
 import QueryRunner from 'sql/workbench/services/query/common/queryRunner';
 import * as DOM from 'vs/base/browser/dom';

src/sql/workbench/contrib/charts/browser/countInsight.ts

@@ -8,7 +8,7 @@ import 'vs/css!./media/countInsight';
 import { IInsight } from './interfaces';
 
 import { $, clearNode } from 'vs/base/browser/dom';
-import { IInsightOptions, InsightType } from 'sql/workbench/contrib/charts/common/interfaces';
+import { IInsightOptions, InsightType } from 'sql/workbench/contrib/charts/browser/interfaces';
 import { IInsightData } from 'sql/platform/dashboard/browser/insightRegistry';
 
 export class CountInsight implements IInsight {

src/sql/workbench/contrib/charts/browser/graphInsight.ts

@@ -13,7 +13,7 @@ import { editorLineNumbers } from 'vs/editor/common/core/editorColorRegistry';
 import { IThemeService, IColorTheme } from 'vs/platform/theme/common/themeService';
 
 import { IInsight, customMixin } from './interfaces';
-import { IInsightOptions, DataDirection, ChartType, LegendPosition, DataType, ChartTypeToChartJsType, LegendPositionToChartJsPosition } from 'sql/workbench/contrib/charts/common/interfaces';
+import { IInsightOptions, DataDirection, ChartType, LegendPosition, DataType, ChartTypeToChartJsType, LegendPositionToChartJsPosition } from 'sql/workbench/contrib/charts/browser/interfaces';
 import { values } from 'vs/base/common/collections';
 import { IInsightData } from 'sql/platform/dashboard/browser/insightRegistry';
 

src/sql/workbench/contrib/charts/browser/imageInsight.ts

@@ -7,7 +7,7 @@ import { IInsight } from './interfaces';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { $ } from 'vs/base/browser/dom';
 import { mixin } from 'vs/base/common/objects';
-import { IInsightOptions, InsightType } from 'sql/workbench/contrib/charts/common/interfaces';
+import { IInsightOptions, InsightType } from 'sql/workbench/contrib/charts/browser/interfaces';
 import * as nls from 'vs/nls';
 import { IInsightData } from 'sql/platform/dashboard/browser/insightRegistry';
 

src/sql/workbench/contrib/charts/browser/insight.ts

@@ -12,7 +12,7 @@ import { CountInsight } from './countInsight';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { Dimension, clearNode } from 'vs/base/browser/dom';
 import { deepClone } from 'vs/base/common/objects';
-import { IInsightOptions, ChartType, DataDirection, InsightType } from 'sql/workbench/contrib/charts/common/interfaces';
+import { IInsightOptions, ChartType, DataDirection, InsightType } from 'sql/workbench/contrib/charts/browser/interfaces';
 import { IInsightData } from 'sql/platform/dashboard/browser/insightRegistry';
 
 const defaultOptions: IInsightOptions = {

src/sql/workbench/contrib/charts/browser/interfaces.ts

@@ -6,9 +6,9 @@
 import { Dimension } from 'vs/base/browser/dom';
 import { mixin } from 'sql/base/common/objects';
 import * as types from 'vs/base/common/types';
-import { IInsightOptions, InsightType, ChartType } from 'sql/workbench/contrib/charts/common/interfaces';
 import { IInsightData } from 'sql/platform/dashboard/browser/insightRegistry';
 import { BrandedService } from 'vs/platform/instantiation/common/instantiation';
+import * as chartjs from 'chart.js';
 
 export interface IPointDataSet {
 	data: Array<{ x: number | string, y: number }>;
@@ -50,3 +50,73 @@ export interface IInsightCtor {
 export interface IChartsConfiguration {
 	readonly maxRowCount: number;
 }
+
+export interface IInsightOptions {
+	type: InsightType | ChartType;
+	dataDirection?: DataDirection;
+	dataType?: DataType;
+	labelFirstColumn?: boolean;
+	columnsAsLabels?: boolean;
+	legendPosition?: LegendPosition;
+	yAxisLabel?: string;
+	yAxisMin?: number;
+	yAxisMax?: number;
+	xAxisLabel?: string;
+	xAxisMin?: number;
+	xAxisMax?: number;
+	encoding?: string;
+	imageFormat?: string;
+	indexAxis?: string;
+}
+
+export enum InsightType {
+	Image = 'image',
+	Table = 'table',
+	Count = 'count'
+}
+
+export enum ChartType {
+	Bar = 'bar',
+	Doughnut = 'doughnut',
+	HorizontalBar = 'horizontalBar',
+	Line = 'line',
+	Pie = 'pie',
+	TimeSeries = 'timeSeries',
+	Scatter = 'scatter'
+}
+
+export const ChartTypeToChartJsType: { [key in ChartType]: chartjs.ChartType } = {
+	'bar': 'bar',
+	'doughnut': 'doughnut',
+	'horizontalBar': 'bar',
+	'line': 'line',
+	'pie': 'pie',
+	'timeSeries': 'line',
+	'scatter': 'scatter'
+}
+
+export enum LegendPosition {
+	Top = 'top',
+	Bottom = 'bottom',
+	Left = 'left',
+	Right = 'right',
+	None = 'none'
+}
+
+export const LegendPositionToChartJsPosition: { [key in LegendPosition]: chartjs.LayoutPosition } = {
+	'top': 'top',
+	'bottom': 'bottom',
+	'left': 'left',
+	'right': 'right',
+	'none': 'left' // chart.js doesn't have a 'none' option, so we use 'left' and then hide the legend
+}
+
+export enum DataType {
+	Number = 'number',
+	Point = 'point'
+}
+
+export enum DataDirection {
+	Vertical = 'vertical',
+	Horizontal = 'horizontal'
+}

src/sql/workbench/contrib/charts/browser/tableInsight.ts

@@ -10,7 +10,7 @@ import { CellSelectionModel } from 'sql/base/browser/ui/table/plugins/cellSelect
 
 import { $, Dimension } from 'vs/base/browser/dom';
 import { Disposable } from 'vs/base/common/lifecycle';
-import { IInsightOptions, InsightType } from 'sql/workbench/contrib/charts/common/interfaces';
+import { IInsightOptions, InsightType } from 'sql/workbench/contrib/charts/browser/interfaces';
 import { IInsightData } from 'sql/platform/dashboard/browser/insightRegistry';
 import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
 import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';

src/sql/workbench/contrib/charts/common/interfaces.ts

@@ -1,76 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as chartjs from 'chart.js';
-
-export interface IInsightOptions {
-	type: InsightType | ChartType;
-	dataDirection?: DataDirection;
-	dataType?: DataType;
-	labelFirstColumn?: boolean;
-	columnsAsLabels?: boolean;
-	legendPosition?: LegendPosition;
-	yAxisLabel?: string;
-	yAxisMin?: number;
-	yAxisMax?: number;
-	xAxisLabel?: string;
-	xAxisMin?: number;
-	xAxisMax?: number;
-	encoding?: string;
-	imageFormat?: string;
-	indexAxis?: string;
-}
-
-export enum InsightType {
-	Image = 'image',
-	Table = 'table',
-	Count = 'count'
-}
-
-export enum ChartType {
-	Bar = 'bar',
-	Doughnut = 'doughnut',
-	HorizontalBar = 'horizontalBar',
-	Line = 'line',
-	Pie = 'pie',
-	TimeSeries = 'timeSeries',
-	Scatter = 'scatter'
-}
-
-export const ChartTypeToChartJsType: { [key in ChartType]: chartjs.ChartType } = {
-	'bar': 'bar',
-	'doughnut': 'doughnut',
-	'horizontalBar': 'bar',
-	'line': 'line',
-	'pie': 'pie',
-	'timeSeries': 'line',
-	'scatter': 'scatter'
-}
-
-export enum LegendPosition {
-	Top = 'top',
-	Bottom = 'bottom',
-	Left = 'left',
-	Right = 'right',
-	None = 'none'
-}
-
-export const LegendPositionToChartJsPosition: { [key in LegendPosition]: chartjs.LayoutPosition } = {
-	'top': 'top',
-	'bottom': 'bottom',
-	'left': 'left',
-	'right': 'right',
-	'none': 'left' // chart.js doesn't have a 'none' option, so we use 'left' and then hide the legend
-}
-
-export enum DataType {
-	Number = 'number',
-	Point = 'point'
-}
-
-export enum DataDirection {
-	Vertical = 'vertical',
-	Horizontal = 'horizontal'
-}

src/sql/workbench/contrib/commandLine/electron-sandbox/commandLine.contribution.ts

@@ -6,6 +6,6 @@
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
 import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { CommandLineWorkbenchContribution } from 'sql/workbench/contrib/commandLine/electron-browser/commandLine';
+import { CommandLineWorkbenchContribution } from 'sql/workbench/contrib/commandLine/electron-sandbox/commandLine';
 
 Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(CommandLineWorkbenchContribution, LifecyclePhase.Restored);

src/sql/workbench/contrib/commandLine/test/electron-browser/commandLine.test.ts

@@ -8,7 +8,7 @@ import * as TypeMoq from 'typemoq';
 import * as azdata from 'azdata';
 import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';
 import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup';
-import { CommandLineWorkbenchContribution } from 'sql/workbench/contrib/commandLine/electron-browser/commandLine';
+import { CommandLineWorkbenchContribution } from 'sql/workbench/contrib/commandLine/electron-sandbox/commandLine';
 import * as Constants from 'sql/platform/connection/common/constants';
 import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService';
 import { TestCapabilitiesService } from 'sql/platform/capabilities/test/common/testCapabilitiesService';

src/sql/workbench/contrib/dashboard/browser/dashboard.module.ts

@@ -56,9 +56,9 @@ import { ProxiesViewComponent } from 'sql/workbench/contrib/jobManagement/browse
 import { NotebooksViewComponent } from 'sql/workbench/contrib/jobManagement/browser/notebooksView.component';
 import { NotebookHistoryComponent } from 'sql/workbench/contrib/jobManagement/browser/notebookHistory.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 { EditableDropDown } from 'sql/platform/browser/editableDropdown/editableDropdown.component';
+import { SelectBox } from 'sql/platform/selectBox/browser/selectBox.component';
+import { InputBox } from 'sql/platform/inputBox/browser/inputBox.component';
+import { EditableDropDown } from 'sql/platform/editableDropdown/browser/editableDropdown.component';
 import { AsmtViewComponent } from 'sql/workbench/contrib/assessment/browser/asmtView.component';
 import { AsmtResultsViewComponent } from 'sql/workbench/contrib/assessment/browser/asmtResultsView.component';
 

src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/chartInsight.component.ts

@@ -17,7 +17,7 @@ import { Disposable } from 'vs/base/common/lifecycle';
 import * as nls from 'vs/nls';
 import { IThemeService, IColorTheme } from 'vs/platform/theme/common/themeService';
 import { IInsightsView, IInsightData } from 'sql/platform/dashboard/browser/insightRegistry';
-import { ChartType, ChartTypeToChartJsType, LegendPosition } from 'sql/workbench/contrib/charts/common/interfaces';
+import { ChartType, ChartTypeToChartJsType, LegendPosition } from 'sql/workbench/contrib/charts/browser/interfaces';
 import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry';
 
 @Component({

src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/interfaces.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { LegendPosition, DataDirection } from 'sql/workbench/contrib/charts/common/interfaces';
+import { LegendPosition, DataDirection } from 'sql/workbench/contrib/charts/browser/interfaces';
 
 export interface IDataSet {
 	data: Array<number>;

src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/barChart.component.ts

@@ -14,7 +14,7 @@ import { ChangeDetectorRef, Inject, forwardRef } from '@angular/core';
 import { IThemeService, IColorTheme } from 'vs/platform/theme/common/themeService';
 import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry';
 import { customMixin } from 'sql/workbench/contrib/charts/browser/interfaces';
-import { ChartType } from 'sql/workbench/contrib/charts/common/interfaces';
+import { ChartType } from 'sql/workbench/contrib/charts/browser/interfaces';
 
 export interface IBarChartConfig extends IChartConfig {
 	yAxisMin: number;

src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/doughnutChart.component.ts

@@ -6,7 +6,7 @@
 import PieChart from './pieChart.component';
 import { ChangeDetectorRef, Inject, forwardRef } from '@angular/core';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ChartType } from 'sql/workbench/contrib/charts/common/interfaces';
+import { ChartType } from 'sql/workbench/contrib/charts/browser/interfaces';
 import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry';
 
 export default class DoughnutChart extends PieChart {

src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/horizontalBarChart.component.ts

@@ -7,7 +7,7 @@ import BarChart, { IBarChartConfig } from './barChart.component';
 import { forwardRef, Inject, ChangeDetectorRef } from '@angular/core';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry';
-import { ChartType } from 'sql/workbench/contrib/charts/common/interfaces';
+import { ChartType } from 'sql/workbench/contrib/charts/browser/interfaces';
 import * as chartjs from 'chart.js';
 import { mixin } from 'sql/base/common/objects';
 import { customMixin } from 'sql/workbench/contrib/charts/browser/interfaces';

src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/lineChart.component.ts

@@ -10,7 +10,7 @@ import BarChart, { IBarChartConfig } from './barChart.component';
 import { defaultChartConfig } from 'sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/interfaces';
 import { ChangeDetectorRef, Inject, forwardRef } from '@angular/core';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { DataType, ChartType } from 'sql/workbench/contrib/charts/common/interfaces';
+import { DataType, ChartType } from 'sql/workbench/contrib/charts/browser/interfaces';
 import { values } from 'vs/base/common/collections';
 import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry';
 

src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/pieChart.component.ts

@@ -7,7 +7,7 @@ import { ChartInsight } from 'sql/workbench/contrib/dashboard/browser/widgets/in
 import { ChangeDetectorRef, Inject, forwardRef } from '@angular/core';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry';
-import { ChartType } from 'sql/workbench/contrib/charts/common/interfaces';
+import { ChartType } from 'sql/workbench/contrib/charts/browser/interfaces';
 
 export default class PieChart extends ChartInsight {
 	protected readonly chartType: ChartType = ChartType.Pie;

src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/scatterChart.component.ts

@@ -10,7 +10,7 @@ import { mixin, deepClone } from 'vs/base/common/objects';
 import { ChangeDetectorRef, Inject, forwardRef } from '@angular/core';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry';
-import { ChartType } from 'sql/workbench/contrib/charts/common/interfaces';
+import { ChartType } from 'sql/workbench/contrib/charts/browser/interfaces';
 
 const defaultScatterConfig = mixin(deepClone(defaultChartConfig), { dataType: 'point', dataDirection: 'horizontal' }) as ILineConfig;
 

src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/timeSeriesChart.component.ts

@@ -11,7 +11,7 @@ import { mixin, deepClone } from 'vs/base/common/objects';
 import { Color } from 'vs/base/common/color';
 import { ChangeDetectorRef, Inject, forwardRef } from '@angular/core';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { ChartType } from 'sql/workbench/contrib/charts/common/interfaces';
+import { ChartType } from 'sql/workbench/contrib/charts/browser/interfaces';
 import { values } from 'vs/base/common/collections';
 import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry';
 

src/sql/workbench/contrib/notebook/browser/notebook.module.ts

@@ -11,7 +11,7 @@ import { BrowserModule } from '@angular/platform-browser';
 import { ComponentHostDirective } from 'sql/base/browser/componentHost.directive';
 import { providerIterator } from 'sql/workbench/services/bootstrap/browser/bootstrapService';
 import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service';
-import { EditableDropDown } from 'sql/platform/browser/editableDropdown/editableDropdown.component';
+import { EditableDropDown } from 'sql/platform/editableDropdown/browser/editableDropdown.component';
 import { NotebookComponent } from 'sql/workbench/contrib/notebook/browser/notebook.component';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { CodeComponent } from 'sql/workbench/contrib/notebook/browser/cellViews/code.component';
@@ -22,8 +22,8 @@ import { StdInComponent } from 'sql/workbench/contrib/notebook/browser/cellViews
 import { PlaceholderCellComponent } from 'sql/workbench/contrib/notebook/browser/cellViews/placeholderCell.component';
 import LoadingSpinner from 'sql/base/browser/ui/loadingSpinner/loadingSpinner.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 { SelectBox } from 'sql/platform/selectBox/browser/selectBox.component';
+import { InputBox } from 'sql/platform/inputBox/browser/inputBox.component';
 import { IMimeComponentRegistry, Extensions } from 'sql/workbench/contrib/notebook/browser/outputs/mimeRegistry';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { LinkHandlerDirective } from 'sql/workbench/contrib/notebook/browser/cellViews/linkHandler.directive';

src/sql/workbench/contrib/query/browser/modelViewTab/queryModelViewTab.module.ts

@@ -16,11 +16,11 @@ import { ModelComponentWrapper } from 'sql/workbench/browser/modelComponents/mod
 import { ComponentHostDirective } from 'sql/base/browser/componentHost.directive';
 import { providerIterator } from 'sql/workbench/services/bootstrap/browser/bootstrapService';
 import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service';
-import { EditableDropDown } from 'sql/platform/browser/editableDropdown/editableDropdown.component';
+import { EditableDropDown } from 'sql/platform/editableDropdown/browser/editableDropdown.component';
 import { QueryModelViewTabContainer } from 'sql/workbench/contrib/query/browser/modelViewTab/queryModelViewTabContainer.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 { SelectBox } from 'sql/platform/selectBox/browser/selectBox.component';
+import { InputBox } from 'sql/platform/inputBox/browser/inputBox.component';
 
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { Registry } from 'vs/platform/registry/common/platform';

src/sql/workbench/contrib/telemetry/browser/telemetryOptOut.contribution.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Registry } from 'vs/platform/registry/common/platform';
-import { BrowserTelemetryOptOut } from 'sql/workbench/contrib/welcome/telemetryOptOut/browser/telemetryOptOut';
+import { BrowserTelemetryOptOut } from 'sql/workbench/contrib/telemetry/browser/telemetryOptOut';
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
 import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
 

src/sql/workbench/contrib/telemetry/electron-sandbox/telemetryOptOut.contribution.ts

@@ -6,6 +6,6 @@
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
 import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { NativeTelemetryOptOut } from 'sql/workbench/contrib/welcome/telemetryOptOut/electron-sandbox/telemetryOptOut';
+import { NativeTelemetryOptOut } from 'sql/workbench/contrib/telemetry/electron-sandbox/telemetryOptOut';
 
 Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(NativeTelemetryOptOut, LifecyclePhase.Eventually);

src/sql/workbench/contrib/telemetry/electron-sandbox/telemetryOptOut.ts

@@ -9,7 +9,7 @@ import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { IProductService } from 'vs/platform/product/common/productService';
 import { IHostService } from 'vs/workbench/services/host/browser/host';
-import { AbstractTelemetryOptOut } from 'sql/workbench/contrib/welcome/telemetryOptOut/browser/telemetryOptOut';
+import { AbstractTelemetryOptOut } from 'sql/workbench/contrib/telemetry/browser/telemetryOptOut';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { INativeHostService } from 'vs/platform/native/common/native';
 

src/sql/workbench/contrib/welcome/browser/az_data_welcome_page.ts

@@ -127,13 +127,13 @@ export default () => `
 							<div class="flex flex-container-video">
 								<div class="videos-container-video">
 									<a href="https://www.youtube.com/watch?v=Orv7fptVoUA" class="video overview ads-welcome-page-link">
-										<img src="${require.toUrl('./../../media/video_overview.png')}" class="video-overview" id="video-overview" />
+										<img src="${require.toUrl('./../media/video_overview.png')}" class="video-overview" id="video-overview" />
 										<h4>${escape(localize('welcomePage.videoDescriptionOverview', "Overview of Azure Data Studio"))}</h4>
 									</a>
 								</div>
 								<div class="videos-container-video">
 									<a href="https://www.youtube.com/watch?v=Nt4kIHQ0IOc" class="video overview ads-welcome-page-link">
-										<img src="${require.toUrl('./../../media/video_introduction.png')}" class="video-introduction" id="video-introduction" />
+										<img src="${require.toUrl('./../media/video_introduction.png')}" class="video-introduction" id="video-introduction" />
 										<h4>${escape(localize('welcomePage.videoDescriptionIntroduction', "Introduction to Azure Data Studio Notebooks | Data Exposed"))}</h4>
 									</a>
 								</div>

src/sql/workbench/contrib/welcome/browser/enablePreviewFeatures.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { AbstractEnablePreviewFeatures } from 'sql/workbench/contrib/welcome/gettingStarted/browser/abstractEnablePreviewFeatures';
+import { AbstractEnablePreviewFeatures } from 'sql/workbench/contrib/welcome/browser/abstractEnablePreviewFeatures';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { IHostService } from 'vs/workbench/services/host/browser/host';

src/sql/workbench/contrib/welcome/browser/gettingStarted.contribution.ts

@@ -6,7 +6,7 @@
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
 import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { BrowserEnablePreviewFeatures } from 'sql/workbench/contrib/welcome/gettingStarted/browser/enablePreviewFeatures';
+import { BrowserEnablePreviewFeatures } from 'sql/workbench/contrib/welcome/browser/enablePreviewFeatures';
 
 Registry
 	.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench)

src/sql/workbench/contrib/welcome/browser/welcomePage.contribution.ts

@@ -6,7 +6,7 @@
 import { localize } from 'vs/nls';
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { WelcomePageContribution, WelcomePageAction, WelcomeInputSerializer } from 'sql/workbench/contrib/welcome/page/browser/welcomePage';
+import { WelcomePageContribution, WelcomePageAction, WelcomeInputSerializer } from 'sql/workbench/contrib/welcome/browser/welcomePage';
 import { MenuId, MenuRegistry, registerAction2 } from 'vs/platform/actions/common/actions';
 import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
 import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';

src/sql/workbench/contrib/welcome/browser/welcomePage.css

@@ -405,9 +405,9 @@
 	height: 12px;
 	margin-left: 6px;
 	margin-top: 3px;
-	-webkit-mask: url(../../media/info.svg) no-repeat;
+	-webkit-mask: url(../media/info.svg) no-repeat;
 	-webkit-mask-size: 12px 12px;
-	mask: url(../../media/info.svg) no-repeat;
+	mask: url(../media/info.svg) no-repeat;
 	mask-size: 12px 12px
 }
 
@@ -455,9 +455,9 @@
 	display: inline-block;
 	width: 11px;
 	margin-left: 4px;
-	-webkit-mask: url(../../media/link_icon.svg) no-repeat;
+	-webkit-mask: url(../media/link_icon.svg) no-repeat;
 	-webkit-mask-size: 11px 11px;
-	mask: url(../../media/link_icon.svg) no-repeat;
+	mask: url(../media/link_icon.svg) no-repeat;
 	mask-size: 11px 11px;
 	height: 11px;
 }
@@ -610,7 +610,7 @@
 .ads-homepage-section.hero {
 	background-size: 1128px 467px;
 	background-repeat: no-repeat;
-	background-image: url(../../media/homeBanner_icon.svg);
+	background-image: url(../media/homeBanner_icon.svg);
 	padding: 0 16px 40px;
 }
 
@@ -636,7 +636,7 @@
 
 .hc-black .ads-homepage-section.hero, .vs-dark .ads-homepage-section.hero {
 	background-size: 1128px 467px;
-	background-image: url(../../media/homeBanner_icon_dark.svg);
+	background-image: url(../media/homeBanner_icon_dark.svg);
 	background-repeat: no-repeat
 }
 
@@ -703,7 +703,7 @@
 .ads-homepage .header-top-nav .icon {
 	min-width: 92px;
 	min-height: 92px;
-	background-image: url(../../media/dataStudioIcon.svg);
+	background-image: url(../media/dataStudioIcon.svg);
 	background-size: contain;
 	margin-right: 20px;
 	background-repeat: no-repeat
@@ -805,25 +805,25 @@
 }
 
 .ads-homepage .header-bottom-nav-tile .icon.connection {
-	background-image: url(../../media/createConnectionIcon.svg);
+	background-image: url(../media/createConnectionIcon.svg);
 	background-size: contain;
 	background-repeat: no-repeat
 }
 
 .ads-homepage .header-bottom-nav-tile .icon.query {
-	background-image: url(../../media/databaseIcon.svg);
+	background-image: url(../media/databaseIcon.svg);
 	background-size: contain;
 	background-repeat: no-repeat
 }
 
 .ads-homepage .header-bottom-nav-tile .icon.notebook {
-	background-image: url(../../media/notebookIcon.svg);
+	background-image: url(../media/notebookIcon.svg);
 	background-size: contain;
 	background-repeat: no-repeat
 }
 
 .ads-homepage .header-bottom-nav-tile .icon.server {
-	background-image: url(../../media/serverIcon.svg);
+	background-image: url(../media/serverIcon.svg);
 	background-size: contain;
 	background-repeat: no-repeat
 }
@@ -923,36 +923,36 @@
 }
 
 .ads-homepage .ads-homepage-section .history .list li:not(.moreRecent) i, .ads-homepage .ads-homepage-section .pinned .list li i, .ads-homepage .icon-document {
-	-webkit-mask: url(../../media/icon_file_document.svg) no-repeat;
+	-webkit-mask: url(../media/icon_file_document.svg) no-repeat;
 	-webkit-mask-size: 13px 16px;
-	mask: url(../../media/icon_file_document.svg) no-repeat;
+	mask: url(../media/icon_file_document.svg) no-repeat;
 	mask-size: 13px 16px;
 	height: 16px;
 	width: 16px
 }
 
 .ads-homepage .ads-homepage-section .history .list li:not(.moreRecent) i[title$=".ipynb"], .ads-homepage .ads-homepage-section .pinned .list li:not(.moreRecent) i[title$=".ipynb"] {
-	-webkit-mask: url(../../media/icon_file_ipynb.svg) no-repeat;
+	-webkit-mask: url(../media/icon_file_ipynb.svg) no-repeat;
 	-webkit-mask-size: 13px 16px;
-	mask: url(../../media/icon_file_ipynb.svg) no-repeat;
+	mask: url(../media/icon_file_ipynb.svg) no-repeat;
 	mask-size: 13px 16px;
 	height: 16px;
 	width: 16px
 }
 
 .ads-homepage .ads-homepage-section .history .list li:not(.moreRecent) i[title$=".sql"], .ads-homepage .ads-homepage-section .pinned .list li:not(.moreRecent) i[title$=".sql"] {
-	-webkit-mask: url(../../media/icon_file_sql.svg) no-repeat;
+	-webkit-mask: url(../media/icon_file_sql.svg) no-repeat;
 	-webkit-mask-size: 13px 16px;
-	mask: url(../../media/icon_file_sql.svg) no-repeat;
+	mask: url(../media/icon_file_sql.svg) no-repeat;
 	mask-size: 13px 16px;
 	height: 16px;
 	width: 16px
 }
 
 .ads-homepage .ads-homepage-section .history .list li:not(.moreRecent) i[title$=".csv"], .ads-homepage .ads-homepage-section .pinned .list li:not(.moreRecent) a[title$=".csv"] {
-	-webkit-mask: url(../../media/icon_file_csv.svg) no-repeat;
+	-webkit-mask: url(../media/icon_file_csv.svg) no-repeat;
 	-webkit-mask-size: 13px 16px;
-	mask: url(../../media/icon_file_csv.svg) no-repeat;
+	mask: url(../media/icon_file_csv.svg) no-repeat;
 	mask-size: 13px 16px;
 	height: 16px;
 	width: 16px
@@ -1060,7 +1060,7 @@
 }
 
 .ads-homepage .extension-pack-description {
-	background: url(../../media/extension_pack_img.svg);
+	background: url(../media/extension_pack_img.svg);
 	background-position: center;
 	position: relative;
 	background-size: cover;
@@ -1257,7 +1257,7 @@
 
 .file-icons-enabled .show-file-icons .az-data-welcome-page-name-file-icon.file-icon::before {
 	content: " ";
-	background-image: url('../../../../../../vs/workbench/browser/media/code-icon.svg');
+	background-image: url('../../../../../vs/workbench/browser/media/code-icon.svg');
 }
 
 .monaco-workbench .part.editor>.content .welcomePage .linux-only, .monaco-workbench .part.editor>.content .welcomePage .mac-only, .monaco-workbench .part.editor>.content .welcomePage .windows-only {

src/sql/workbench/contrib/welcome/browser/welcomePage.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import 'vs/css!./welcomePage';
-import 'sql/workbench/contrib/welcome/page/browser/az_data_welcome_page';
+import 'sql/workbench/contrib/welcome/browser/az_data_welcome_page';
 import { URI } from 'vs/base/common/uri';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import * as arrays from 'vs/base/common/arrays';
@@ -41,7 +41,7 @@ import { IHostService } from 'vs/workbench/services/host/browser/host';
 import { IProductService } from 'vs/platform/product/common/productService';
 import { joinPath } from 'vs/base/common/resources';
 import { clearNode } from 'vs/base/browser/dom';
-import { GuidedTour } from 'sql/workbench/contrib/welcome/page/browser/gettingStartedTour';
+import { GuidedTour } from 'sql/workbench/contrib/welcome/browser/gettingStartedTour';
 import { IWorkbenchLayoutService, Parts } from 'vs/workbench/services/layout/browser/layoutService';
 import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
 import { Button } from 'sql/base/browser/ui/button/button';
@@ -191,16 +191,16 @@ const extensionPacks: ExtensionSuggestion[] = [
 ];
 
 const extensionPackExtensions: ExtensionPackExtensions[] = [
-	{ name: localize('welcomePage.sqlServerAgent', "SQL Server Agent"), icon: require.toUrl('./../../media/agentExtensionIcon.png'), link: `command:azdata.extension.open?{"id":"microsoft.agent"}` },
-	{ name: localize('welcomePage.sqlServerProfiler', "SQL Server Profiler"), icon: require.toUrl('./../../media/defaultExtensionIcon.svg'), link: `command:azdata.extension.open?{"id":"microsoft.profiler"}` },
-	{ name: localize('welcomePage.sqlServerImport', "SQL Server Import"), icon: require.toUrl('./../../media/defaultExtensionIcon.svg'), link: `command:azdata.extension.open?{"id":"microsoft.import"}` },
-	{ name: localize('welcomePage.sqlServerDacpac', "SQL Server Dacpac"), icon: require.toUrl('./../../media/defaultExtensionIcon.svg'), link: `command:azdata.extension.open?{"id":"microsoft.dacpac"}` }
+	{ name: localize('welcomePage.sqlServerAgent', "SQL Server Agent"), icon: require.toUrl('./../media/agentExtensionIcon.png'), link: `command:azdata.extension.open?{"id":"microsoft.agent"}` },
+	{ name: localize('welcomePage.sqlServerProfiler', "SQL Server Profiler"), icon: require.toUrl('./../media/defaultExtensionIcon.svg'), link: `command:azdata.extension.open?{"id":"microsoft.profiler"}` },
+	{ name: localize('welcomePage.sqlServerImport', "SQL Server Import"), icon: require.toUrl('./../media/defaultExtensionIcon.svg'), link: `command:azdata.extension.open?{"id":"microsoft.import"}` },
+	{ name: localize('welcomePage.sqlServerDacpac', "SQL Server Dacpac"), icon: require.toUrl('./../media/defaultExtensionIcon.svg'), link: `command:azdata.extension.open?{"id":"microsoft.dacpac"}` }
 ];
 
 const extensions: ExtensionSuggestion[] = [
-	{ name: localize('welcomePage.powershell', "Powershell"), id: 'microsoft.powershell', description: localize('welcomePage.powershellDescription', "Write and execute PowerShell scripts using Azure Data Studio's rich query editor"), icon: require.toUrl('./../../media/icon_powershell.png'), link: `command:azdata.extension.open?{"id":"microsoft.powershell"}` },
-	{ name: localize('welcomePage.dataVirtualization', "Data Virtualization"), id: 'microsoft.datavirtualization', description: localize('welcomePage.dataVirtualizationDescription', "Virtualize data with SQL Server 2019 and create external tables using interactive wizards"), icon: require.toUrl('./../../media/defaultExtensionIcon.svg'), link: `command:azdata.extension.open?{"id":"microsoft.datavirtualization"}` },
-	{ name: localize('welcomePage.PostgreSQL', "PostgreSQL"), id: 'microsoft.azuredatastudio-postgresql', description: localize('welcomePage.PostgreSQLDescription', "Connect, query, and manage Postgres databases with Azure Data Studio"), icon: require.toUrl('./../../media/icon_postgre_sql.png'), link: `command:azdata.extension.open?{"id":"microsoft.azuredatastudio-postgresql"}` },
+	{ name: localize('welcomePage.powershell', "Powershell"), id: 'microsoft.powershell', description: localize('welcomePage.powershellDescription', "Write and execute PowerShell scripts using Azure Data Studio's rich query editor"), icon: require.toUrl('./../media/icon_powershell.png'), link: `command:azdata.extension.open?{"id":"microsoft.powershell"}` },
+	{ name: localize('welcomePage.dataVirtualization', "Data Virtualization"), id: 'microsoft.datavirtualization', description: localize('welcomePage.dataVirtualizationDescription', "Virtualize data with SQL Server 2019 and create external tables using interactive wizards"), icon: require.toUrl('./../media/defaultExtensionIcon.svg'), link: `command:azdata.extension.open?{"id":"microsoft.datavirtualization"}` },
+	{ name: localize('welcomePage.PostgreSQL', "PostgreSQL"), id: 'microsoft.azuredatastudio-postgresql', description: localize('welcomePage.PostgreSQLDescription', "Connect, query, and manage Postgres databases with Azure Data Studio"), icon: require.toUrl('./../media/icon_postgre_sql.png'), link: `command:azdata.extension.open?{"id":"microsoft.azuredatastudio-postgresql"}` },
 ];
 
 const extensionPackStrings = {
@@ -262,7 +262,7 @@ class WelcomePage extends Disposable {
 		const resource = URI.parse(require.toUrl('./az_data_welcome_page'))
 			.with({
 				scheme: Schemas.walkThrough,
-				query: JSON.stringify({ moduleId: 'sql/workbench/contrib/welcome/page/browser/az_data_welcome_page' })
+				query: JSON.stringify({ moduleId: 'sql/workbench/contrib/welcome/browser/az_data_welcome_page' })
 			});
 		this.editorInput = this.instantiationService.createInstance(WalkThroughInput, {
 			typeId: welcomeInputTypeId,

src/sql/workbench/contrib/welcome/constants.ts

@@ -1,7 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-// Link is regularly updated with new information from release.
-export const NOTIFY_READMORE_LINK = 'https://aka.ms/azuredatastudio-connection';

src/sql/workbench/contrib/welcome/electron-sandbox/enablePreviewFeatures.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { AbstractEnablePreviewFeatures } from 'sql/workbench/contrib/welcome/gettingStarted/browser/abstractEnablePreviewFeatures';
+import { AbstractEnablePreviewFeatures } from 'sql/workbench/contrib/welcome/browser/abstractEnablePreviewFeatures';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { IHostService } from 'vs/workbench/services/host/browser/host';

src/sql/workbench/contrib/welcome/electron-sandbox/gettingStarted.contribution.ts

@@ -6,8 +6,8 @@
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
 import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
-import { NativeEnablePreviewFeatures } from 'sql/workbench/contrib/welcome/gettingStarted/electron-browser/enablePreviewFeatures';
-import { ShowGettingStartedAction } from 'sql/workbench/contrib/welcome/gettingStarted/electron-browser/gettingStarted';
+import { NativeEnablePreviewFeatures } from 'sql/workbench/contrib/welcome/electron-sandbox/enablePreviewFeatures';
+import { ShowGettingStartedAction } from 'sql/workbench/contrib/welcome/electron-sandbox/gettingStarted';
 import { registerAction2 } from 'vs/platform/actions/common/actions';
 
 Registry

src/sql/workbench/contrib/welcome/gettingStarted/media/serverIcon.svg

@@ -1,10 +0,0 @@
-<svg width="65" height="65" viewBox="0 0 65 65" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path opacity="0.2" d="M51.4626 50.948L34.9701 42.2208L12.7969 55.7359L28.8007 64.7662L51.4626 50.948Z" fill="#1F1D21"/>
-<path d="M28.2509 23.3723L28.6174 63.0087L13.1634 54.4026L12.7969 14.7662L28.2509 23.3723Z" fill="#137AD1"/>
-<path d="M28.251 23.3723L51.5848 9.37229V49.0693L28.6175 63.0087L28.251 23.3723Z" fill="#1D4A79"/>
-<path d="M12.7969 14.7662L35.7642 0.76622L51.5848 9.37228L28.2509 23.3723L12.7969 14.7662Z" fill="#2195DC"/>
-<path d="M22.7534 26.1602V27.6147L15.9121 23.7965V22.342L22.7534 26.1602Z" fill="#CDCDD0"/>
-<path d="M24.5248 27.1905V28.5844L23.3643 27.9177V26.5238L24.5248 27.1905Z" fill="#EBEBEB"/>
-<path d="M22.8145 29.0693V30.4632L15.9731 26.645V25.2511L22.8145 29.0693Z" fill="#CDCDD0"/>
-<path d="M24.5248 30.039L24.5859 31.4935L23.4253 30.8268L23.3643 29.3723L24.5248 30.039Z" fill="#EBEBEB"/>
-</svg>

src/sql/workbench/services/dialog/browser/dialog.module.ts

@@ -18,10 +18,10 @@ import { ModelComponentWrapper } from 'sql/workbench/browser/modelComponents/mod
 import { ComponentHostDirective } from 'sql/base/browser/componentHost.directive';
 import { providerIterator } from 'sql/workbench/services/bootstrap/browser/bootstrapService';
 import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service';
-import { EditableDropDown } from 'sql/platform/browser/editableDropdown/editableDropdown.component';
+import { EditableDropDown } from 'sql/platform/editableDropdown/browser/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 { SelectBox } from 'sql/platform/selectBox/browser/selectBox.component';
+import { InputBox } from 'sql/platform/inputBox/browser/inputBox.component';
 
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { Registry } from 'vs/platform/registry/common/platform';

src/sql/workbench/services/query/common/resultSerializer.ts

@@ -14,7 +14,7 @@ import * as nls from 'vs/nls';
 import Severity from 'vs/base/common/severity';
 import { INotificationService, INotification } from 'vs/platform/notification/common/notification';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { getRootPath, resolveCurrentDirectory } from 'sql/platform/common/pathUtilities';
+import { getRootPath, resolveCurrentDirectory } from 'sql/platform/workspace/common/pathUtilities';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IFileDialogService, FileFilter } from 'vs/platform/dialogs/common/dialogs';
 import { IOpenerService } from 'vs/platform/opener/common/opener';

src/sql/workbench/services/restore/browser/restoreDialog.ts

@@ -43,7 +43,7 @@ import { fileFiltersSet } from 'sql/workbench/services/restore/common/constants'
 import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
 import { Dropdown } from 'sql/base/browser/ui/editableDropdown/browser/dropdown';
 import { IBackupRestoreUrlBrowserDialogService } from 'sql/workbench/services/backupRestoreUrlBrowser/common/urlBrowserDialogService';
-import { MediaDeviceType } from 'sql/workbench/contrib/backup/common/constants';
+import { MediaDeviceType } from 'sql/workbench/common/backup/constants';
 import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfiguration';
 import { IAccessibilityService } from 'vs/platform/accessibility/common/accessibility';
 import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';

src/sql/workbench/services/restore/browser/restoreViewModel.ts

@@ -10,7 +10,7 @@ import * as types from 'vs/base/common/types';
 import { Event, Emitter } from 'vs/base/common/event';
 import { ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes';
 import { coalesce } from 'vs/base/common/arrays';
-import { MediaDeviceType } from 'sql/workbench/contrib/backup/common/constants';
+import { MediaDeviceType } from 'sql/workbench/common/backup/constants';
 
 export interface RestoreOptionsElement {
 	optionMetadata: azdata.ServiceOption;

src/sql/workbench/services/restore/common/mssqlRestoreInfo.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as azdata from 'azdata';
-import { MediaDeviceType } from 'sql/workbench/contrib/backup/common/constants';
+import { MediaDeviceType } from 'sql/workbench/common/backup/constants';
 
 export class MssqlRestoreInfo implements azdata.RestoreInfo {
 

src/tsec.exemptions.json

@@ -60,7 +60,7 @@
 		"sql/workbench/services/objectExplorer/browser/iconRenderer.ts",
 		"sql/workbench/services/resourceProvider/browser/firewallRuleDialog.ts",
 		"sql/workbench/services/notebook/browser/outputs/renderers.ts",
-		"sql/workbench/contrib/welcome/page/browser/welcomePage.ts",
+		"sql/workbench/contrib/welcome/browser/welcomePage.ts",
 		"sql/workbench/contrib/editData/browser/editDataResultsEditor.ts",
 		"sql/workbench/contrib/jobManagement/browser/jobHistoryTree.ts",
 		"sql/workbench/contrib/notebook/browser/outputs/mimeRenderer.component.ts",

src/vs/workbench/workbench.common.main.ts

@@ -431,7 +431,7 @@ import 'vs/workbench/contrib/surveys/browser/ces.contribution';
 import 'vs/workbench/contrib/surveys/browser/languageSurveys.contribution';
 
 // Welcome
-import 'sql/workbench/contrib/welcome/page/browser/welcomePage.contribution'; // {{SQL CARBON EDIT}} - add welcome page contribution
+import 'sql/workbench/contrib/welcome/browser/welcomePage.contribution'; // {{SQL CARBON EDIT}} - add welcome page contribution
 // import 'vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution'; // {{SQL CARBON EDIT}} - remove vscode getting started
 import 'vs/workbench/contrib/welcomeWalkthrough/browser/walkThrough.contribution';
 import 'vs/workbench/contrib/welcomeViews/common/viewsWelcome.contribution';

src/vs/workbench/workbench.desktop.main.ts

@@ -170,7 +170,7 @@ import 'vs/workbench/contrib/remoteTunnel/electron-sandbox/remoteTunnel.contribu
 
 // {{SQL CARBON EDIT}} - SQL added contributions
 // Telemetry Opt Out
-import 'sql/workbench/contrib/welcome/telemetryOptOut/electron-sandbox/telemetryOptOut.contribution';
+import 'sql/workbench/contrib/telemetry/electron-sandbox/telemetryOptOut.contribution';
 
 //#endregion
 
@@ -178,9 +178,9 @@ export { main } from 'vs/workbench/electron-sandbox/desktop.main';
 
 // {{SQL CARBON EDIT}} - SQL-specific services
 import { ISqlOAuthService } from 'sql/platform/oAuth/common/sqlOAuthService';
-import { SqlOAuthService } from 'sql/platform/oAuth/electron-browser/sqlOAuthServiceImpl';
+import { SqlOAuthService } from 'sql/platform/oAuth/electron-sandbox/sqlOAuthServiceImpl';
 import { IClipboardService as sqlIClipboardService } from 'sql/platform/clipboard/common/clipboardService';
-import { ClipboardService as sqlClipboardService } from 'sql/platform/clipboard/electron-browser/clipboardService';
+import { ClipboardService as sqlClipboardService } from 'sql/platform/clipboard/electron-sandbox/clipboardService';
 import { IAzureBlobService } from 'sql/platform/azureBlob/common/azureBlobService';
 import { AzureBlobService } from 'sql/workbench/services/azureBlob/browser/azureBlobService';
 import { IAzureAccountService } from 'sql/platform/azureAccount/common/azureAccountService';
@@ -196,7 +196,7 @@ registerSingleton(IAzureAccountService, AzureAccountService, InstantiationType.D
 // getting started
 
 // CLI
-import 'sql/workbench/contrib/commandLine/electron-browser/commandLine.contribution';
+import 'sql/workbench/contrib/commandLine/electron-sandbox/commandLine.contribution';
 
 //getting started
-import 'sql/workbench/contrib/welcome/gettingStarted/electron-browser/gettingStarted.contribution';
+import 'sql/workbench/contrib/welcome/electron-sandbox/gettingStarted.contribution';

src/vs/workbench/workbench.web.main.ts

@@ -216,9 +216,9 @@ export {
 //#region {{SQL CARBON EDIT}} - SQL added contributions
 
 // Getting Started
-import 'sql/workbench/contrib/welcome/gettingStarted/browser/gettingStarted.contribution';
+import 'sql/workbench/contrib/welcome/browser/gettingStarted.contribution';
 
 // Telemetry Opt Out
-import 'sql/workbench/contrib/welcome/telemetryOptOut/browser/telemetryOptOut.contribution';
+import 'sql/workbench/contrib/telemetry/browser/telemetryOptOut.contribution';
 
 //#endregion