More layering movement (#24023)

* finish layering

* undo eslint changes

* undo

* restore -> backup

* fix paths

* Skip commandLine layers check

* fix path

* fix tsec path
This commit is contained in:
Charles Gagnon
2023-07-31 10:17:43 -07:00
committed by GitHub
parent 9043998bfd
commit 5b70fd1afe
72 changed files with 178 additions and 190 deletions

View File

@@ -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';

View File

@@ -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';

View File

@@ -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