diff --git a/extensions/vscode-test-resolver/src/extension.browser.ts b/extensions/vscode-test-resolver/src/extension.browser.ts index e95db8d30ad..93703fde4df 100644 --- a/extensions/vscode-test-resolver/src/extension.browser.ts +++ b/extensions/vscode-test-resolver/src/extension.browser.ts @@ -9,6 +9,8 @@ export function activate(_context: vscode.ExtensionContext) { vscode.workspace.registerRemoteAuthorityResolver('test', { async resolve(_authority: string): Promise { console.log(`Resolving ${_authority}`); + console.log(`Activating vscode.github-authentication to simulate auth`); + await vscode.extensions.getExtension('vscode.github-authentication')?.activate(); return new vscode.ManagedResolvedAuthority(async () => { return new InitialManagedMessagePassing(); }); diff --git a/src/vs/server/node/webClientServer.ts b/src/vs/server/node/webClientServer.ts index 703b43c8617..f734e11411c 100644 --- a/src/vs/server/node/webClientServer.ts +++ b/src/vs/server/node/webClientServer.ts @@ -28,6 +28,7 @@ import { IProductConfiguration } from 'vs/base/common/product'; import { isString } from 'vs/base/common/types'; import { CharCode } from 'vs/base/common/charCode'; import { getRemoteServerRootPath } from 'vs/platform/remote/common/remoteHosts'; +import { IExtensionManifest } from 'vs/platform/extensions/common/extensions'; const textMimeType = { '.html': 'text/html', @@ -343,9 +344,12 @@ export class WebClientServer { }; if (useTestResolver) { - const filePath = FileAccess.asFileUri(`${builtinExtensionsPath}/vscode-test-resolver/package.json`).fsPath; - const packageJSON = JSON.parse((await fsp.readFile(filePath)).toString()); - values['WORKBENCH_BUILTIN_EXTENSIONS'] = asJSON([{ extensionPath: 'vscode-test-resolver', packageJSON }]); + const bundledExtensions: { extensionPath: string; packageJSON: IExtensionManifest }[] = []; + for (const extensionPath of ['vscode-test-resolver', 'github-authentication']) { + const packageJSON = JSON.parse((await fsp.readFile(FileAccess.asFileUri(`${builtinExtensionsPath}/${extensionPath}/package.json`).fsPath)).toString()); + bundledExtensions.push({ extensionPath, packageJSON }); + } + values['WORKBENCH_BUILTIN_EXTENSIONS'] = asJSON(bundledExtensions); } let data;