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

Merge from vscode 4d91d96e5e121b38d33508cdef17868bab255eae

Browse Source
This commit is contained in:
ADS Merger
2020-06-18 04:32:54 +00:00
committed by AzureDataStudio
parent a971aee5bd
commit 5e7071e466
1002 changed files with 24201 additions and 13193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/vs/workbench/electron-browser/desktop.main.ts
View File

@@ -178,7 +178,8 @@ class DesktopMain extends Disposable {
serviceCollection.set(IWorkbenchEnvironmentService, this.environmentService);
// Product
serviceCollection.set(IProductService, { _serviceBrand: undefined, ...product });
const productService: IProductService = { _serviceBrand: undefined, ...product };
serviceCollection.set(IProductService, productService);
// Log
const logService = this._register(new DesktopLogService(this.configuration.windowId, mainProcessService, this.environmentService));
@@ -193,7 +194,7 @@ class DesktopMain extends Disposable {
serviceCollection.set(ISignService, signService);
// Remote Agent
const remoteAgentService = this._register(new RemoteAgentService(this.environmentService, remoteAuthorityResolverService, signService, logService));
const remoteAgentService = this._register(new RemoteAgentService(this.environmentService, remoteAuthorityResolverService, signService, logService, productService));
serviceCollection.set(IRemoteAgentService, remoteAgentService);
// Electron