Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-21 17:19:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into aeschli/testsInWebEH

Browse Source
This commit is contained in:
Martin Aeschlimann
2021-04-20 14:10:09 +02:00
parent 200d4c7761 064ead5012
commit d4a6400596
381 changed files with 8174 additions and 5404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/vs/workbench/api/common/extHostExtensionService.ts
View File

@@ -667,7 +667,8 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
connectionToken: result.connectionToken
};
const options: ResolvedOptions = {
extensionHostEnv: result.extensionHostEnv
extensionHostEnv: result.extensionHostEnv,
trust: result.trust
};
return {