diff --git a/extensions/github-authentication/package.json b/extensions/github-authentication/package.json index b9beaccfe2e..91f2d1b57db 100644 --- a/extensions/github-authentication/package.json +++ b/extensions/github-authentication/package.json @@ -19,8 +19,7 @@ ], "enabledApiProposals": [ "authIssuers", - "authProviderSpecific", - "envIsAppPortable" + "authProviderSpecific" ], "activationEvents": [], "capabilities": { diff --git a/extensions/github-authentication/tsconfig.json b/extensions/github-authentication/tsconfig.json index faf5d5a39a3..df8791cdebc 100644 --- a/extensions/github-authentication/tsconfig.json +++ b/extensions/github-authentication/tsconfig.json @@ -14,7 +14,6 @@ "src/**/*", "../../src/vscode-dts/vscode.d.ts", "../../src/vscode-dts/vscode.proposed.authIssuers.d.ts", - "../../src/vscode-dts/vscode.proposed.authProviderSpecific.d.ts", - "../../src/vscode-dts/vscode.proposed.envIsAppPortable.d.ts" + "../../src/vscode-dts/vscode.proposed.authProviderSpecific.d.ts" ] } diff --git a/extensions/microsoft-authentication/package.json b/extensions/microsoft-authentication/package.json index 6e80b8927be..e30ddcd319c 100644 --- a/extensions/microsoft-authentication/package.json +++ b/extensions/microsoft-authentication/package.json @@ -16,8 +16,7 @@ "enabledApiProposals": [ "nativeWindowHandle", "authIssuers", - "authenticationChallenges", - "envIsAppPortable" + "authenticationChallenges" ], "capabilities": { "virtualWorkspaces": true, diff --git a/extensions/microsoft-authentication/tsconfig.json b/extensions/microsoft-authentication/tsconfig.json index 47df27d5bdb..942183279d0 100644 --- a/extensions/microsoft-authentication/tsconfig.json +++ b/extensions/microsoft-authentication/tsconfig.json @@ -12,7 +12,6 @@ "../../src/vscode-dts/vscode.d.ts", "../../src/vscode-dts/vscode.proposed.nativeWindowHandle.d.ts", "../../src/vscode-dts/vscode.proposed.authIssuers.d.ts", - "../../src/vscode-dts/vscode.proposed.authenticationChallenges.d.ts", - "../../src/vscode-dts/vscode.proposed.envIsAppPortable.d.ts" + "../../src/vscode-dts/vscode.proposed.authenticationChallenges.d.ts" ] } diff --git a/extensions/vscode-api-tests/package.json b/extensions/vscode-api-tests/package.json index cf2386763ba..58ec85b1450 100644 --- a/extensions/vscode-api-tests/package.json +++ b/extensions/vscode-api-tests/package.json @@ -18,7 +18,6 @@ "documentFiltersExclusive", "editorInsets", "embeddings", - "envIsAppPortable", "envIsConnectionMetered", "extensionRuntime", "extensionsAny", diff --git a/src/vs/platform/extensions/common/extensionsApiProposals.ts b/src/vs/platform/extensions/common/extensionsApiProposals.ts index d58340091df..db714398cda 100644 --- a/src/vs/platform/extensions/common/extensionsApiProposals.ts +++ b/src/vs/platform/extensions/common/extensionsApiProposals.ts @@ -234,9 +234,6 @@ const _allApiProposals = { embeddings: { proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.embeddings.d.ts', }, - envIsAppPortable: { - proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.envIsAppPortable.d.ts', - }, envIsConnectionMetered: { proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.envIsConnectionMetered.d.ts', }, diff --git a/src/vs/workbench/api/common/extHost.api.impl.ts b/src/vs/workbench/api/common/extHost.api.impl.ts index 4d3c602d6a2..b1b56427b5b 100644 --- a/src/vs/workbench/api/common/extHost.api.impl.ts +++ b/src/vs/workbench/api/common/extHost.api.impl.ts @@ -402,10 +402,7 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I checkProposedApiEnabled(extension, 'devDeviceId'); return initData.telemetryInfo.devDeviceId ?? initData.telemetryInfo.machineId; }, - get isAppPortable() { - checkProposedApiEnabled(extension, 'envIsAppPortable'); - return initData.environment.isPortable ?? false; - }, + get isAppPortable() { return initData.environment.isPortable ?? false; }, get sessionId() { return initData.telemetryInfo.sessionId; }, get language() { return initData.environment.appLanguage; }, get appName() { return initData.environment.appName; }, diff --git a/src/vscode-dts/vscode.d.ts b/src/vscode-dts/vscode.d.ts index e2e13e4ab1d..329826a2894 100644 --- a/src/vscode-dts/vscode.d.ts +++ b/src/vscode-dts/vscode.d.ts @@ -10791,6 +10791,16 @@ declare module 'vscode' { */ export const isNewAppInstall: boolean; + /** + * Indicates whether the application is running in portable mode. + * + * Portable mode is enabled when the application is run from a folder that contains + * a `data` directory, allowing for self-contained installations. + * + * Learn more about [Portable Mode](https://code.visualstudio.com/docs/editor/portable). + */ + export const isAppPortable: boolean; + /** * Indicates whether the users has telemetry enabled. * Can be observed to determine if the extension should send telemetry. diff --git a/src/vscode-dts/vscode.proposed.envIsAppPortable.d.ts b/src/vscode-dts/vscode.proposed.envIsAppPortable.d.ts deleted file mode 100644 index aa3bc5bb525..00000000000 --- a/src/vscode-dts/vscode.proposed.envIsAppPortable.d.ts +++ /dev/null @@ -1,20 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -declare module 'vscode' { - - export namespace env { - - /** - * Indicates whether the application is running in portable mode. - * - * Portable mode is enabled when the application is run from a folder that contains - * a `data` directory, allowing for self-contained installations. - * - * Learn more about [Portable Mode](https://code.visualstudio.com/docs/editor/portable). - */ - export const isAppPortable: boolean; - } -}