From 7afe6494e6eaf84352827bcad92090c15c45035d Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Sun, 19 Jul 2026 11:40:11 +0900 Subject: [PATCH 1/5] chore: remove old context menu code from code.iss --- build/win32/code.iss | 9 --------- 1 file changed, 9 deletions(-) diff --git a/build/win32/code.iss b/build/win32/code.iss index 918f6281408c3c..c3d8e092d70f14 100644 --- a/build/win32/code.iss +++ b/build/win32/code.iss @@ -1742,15 +1742,6 @@ var RemoveAppxPackageResultCode: Integer; begin KillContextMenuComSurrogate(); - // Remove the old context menu package - // Following condition can be removed in v1.111. - if QualityIsInsiders() and not SessionEndFileExists() and AppxPackageInstalled('Microsoft.VSCodeInsiders', RemoveAppxPackageResultCode) then begin - Log('Deleting old appx ' + AppxPackageFullname + ' installation...'); - ShellExec('', 'powershell.exe', '-NoLogo -NoProfile -NonInteractive -WindowStyle Hidden -ExecutionPolicy Bypass -Command ' + AddQuotes('Remove-AppxPackage -Package ''' + AppxPackageFullname + ''''), '', SW_HIDE, ewWaitUntilTerminated, RemoveAppxPackageResultCode); - Log('Remove-AppxPackage for old appx completed with result code ' + IntToStr(RemoveAppxPackageResultCode) + '.'); - DeleteFile(ExpandConstant('{app}\appx\code_insiders_explorer_{#Arch}.appx')); - DeleteFile(ExpandConstant('{app}\appx\code_insiders_explorer_command.dll')); - end; if not SessionEndFileExists() and AppxPackageInstalled(ExpandConstant('{#AppxPackageName}'), RemoveAppxPackageResultCode) then begin Log('Removing current ' + AppxPackageFullname + ' appx installation...'); #if "user" == InstallTarget From e3bab74708bd28f18d051e94b81d9baad47d9493 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Sun, 19 Jul 2026 11:44:22 +0900 Subject: [PATCH 2/5] chore: remove old app name symlink on macOS --- .../darwin/product-build-darwin-universal.yml | 14 -------------- .../darwin/steps/product-build-darwin-compile.yml | 15 --------------- 2 files changed, 29 deletions(-) diff --git a/build/azure-pipelines/darwin/product-build-darwin-universal.yml b/build/azure-pipelines/darwin/product-build-darwin-universal.yml index 9cde086a70e9e3..293c87f0d58644 100644 --- a/build/azure-pipelines/darwin/product-build-darwin-universal.yml +++ b/build/azure-pipelines/darwin/product-build-darwin-universal.yml @@ -105,20 +105,6 @@ jobs: DEBUG=* node build/darwin/create-universal-app.ts $(agent.builddirectory) displayName: Create Universal App - - script: | - set -e - APP_ROOT="$(Agent.BuildDirectory)/VSCode-darwin-$(VSCODE_ARCH)" - APP_NAME="`ls $APP_ROOT | head -n 1`" - APP_PATH="$APP_ROOT/$APP_NAME" - EXEC_NAME=$(node -p "require(\"$APP_PATH/Contents/Resources/app/product.json\").nameShort") - # Create a symlink from 'Electron' to the actual executable for backward compatibility - # This ensures apps that relied on the hardcoded path 'Contents/MacOS/Electron' continue to work - # Remove this step once main branch is on 1.112 release. - if [ "$EXEC_NAME" != "Electron" ] && [ ! -L "$APP_PATH/Contents/MacOS/Electron" ]; then - ln -s "$EXEC_NAME" "$APP_PATH/Contents/MacOS/Electron" - fi - displayName: Create Electron symlink for backward compatibility - - script: | set -e APP_ROOT="$(Agent.BuildDirectory)/VSCode-darwin-$(VSCODE_ARCH)" diff --git a/build/azure-pipelines/darwin/steps/product-build-darwin-compile.yml b/build/azure-pipelines/darwin/steps/product-build-darwin-compile.yml index 4450a702e05085..14f3a0573303a9 100644 --- a/build/azure-pipelines/darwin/steps/product-build-darwin-compile.yml +++ b/build/azure-pipelines/darwin/steps/product-build-darwin-compile.yml @@ -243,21 +243,6 @@ steps: chmod +x "$APP_PATH/Contents/Resources/app/bin/$CLI_APP_NAME" displayName: Make CLI executable - - script: | - set -e - APP_ROOT="$(Agent.BuildDirectory)/VSCode-darwin-$(VSCODE_ARCH)" - APP_NAME="`ls $APP_ROOT | head -n 1`" - APP_PATH="$APP_ROOT/$APP_NAME" - EXEC_NAME=$(node -p "require(\"$APP_PATH/Contents/Resources/app/product.json\").nameShort") - # Create a symlink from 'Electron' to the actual executable for backward compatibility - # This ensures apps that relied on the hardcoded path 'Contents/MacOS/Electron' continue to work - # Remove this step once main branch is on 1.112 release. - if [ "$EXEC_NAME" != "Electron" ] && [ ! -L "$APP_PATH/Contents/MacOS/Electron" ]; then - ln -s "$EXEC_NAME" "$APP_PATH/Contents/MacOS/Electron" - fi - condition: eq(variables['BUILT_CLIENT'], 'true') - displayName: Create Electron symlink for backward compatibility - - script: | set -e APP_ROOT="$(Agent.BuildDirectory)/VSCode-darwin-$(VSCODE_ARCH)" From d9b6528cd9f235f712ac1ca0f8ee7fedba4a20d0 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Sun, 19 Jul 2026 11:45:56 +0900 Subject: [PATCH 3/5] chore: update comment for windows fs workaround --- scripts/test-remote-integration.bat | 2 +- scripts/test-web-integration.bat | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/test-remote-integration.bat b/scripts/test-remote-integration.bat index 5e2c8864c2c215..c5b687e5d96f5b 100644 --- a/scripts/test-remote-integration.bat +++ b/scripts/test-remote-integration.bat @@ -3,7 +3,7 @@ setlocal pushd %~dp0\.. -:: TODO(deepak1556): Remove this once bumped > 24.16.0, refs https://github.com/nodejs/node/issues/63638 +:: TODO(deepak1556): Remove this once we bump to node containing fix for https://github.com/nodejs/node/issues/63638. for /f "delims=" %%i in ('node -p "require('fs').realpathSync.native(require('os').tmpdir())"') do set "TMP=%%i" set "TEMP=%TMP%" diff --git a/scripts/test-web-integration.bat b/scripts/test-web-integration.bat index 2f6c320e5878a0..031459ccf7e6f6 100644 --- a/scripts/test-web-integration.bat +++ b/scripts/test-web-integration.bat @@ -3,7 +3,7 @@ setlocal pushd %~dp0\.. -:: TODO(deepak1556): Remove this once bumped > 24.16.0, refs https://github.com/nodejs/node/issues/63638 +:: TODO(deepak1556): Remove this once we bump to node containing fix for https://github.com/nodejs/node/issues/63638. for /f "delims=" %%i in ('node -p "require('fs').realpathSync.native(require('os').tmpdir())"') do set "TMP=%%i" set "TEMP=%TMP%" From db421627b0892981c48c5700b9c63a09e89dade7 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Sun, 19 Jul 2026 11:49:01 +0900 Subject: [PATCH 4/5] chore: update issue link for context menu workaround --- src/vs/platform/windows/electron-main/windowImpl.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/platform/windows/electron-main/windowImpl.ts b/src/vs/platform/windows/electron-main/windowImpl.ts index 5dedaecb00b5c1..4a51cc55ba09b9 100644 --- a/src/vs/platform/windows/electron-main/windowImpl.ts +++ b/src/vs/platform/windows/electron-main/windowImpl.ts @@ -207,7 +207,7 @@ export abstract class BaseWindow extends Disposable implements IBaseWindow { const cx = Math.floor(cursorPos.x) - x; const cy = Math.floor(cursorPos.y) - y; - // TODO@deepak1556 workaround for https://github.com/microsoft/vscode/issues/250626 + // TODO@deepak1556 workaround for https://github.com/microsoft/vscode/issues/250632 // where showing the custom menu seems broken on Windows if (isLinux) { if (cx > 35 /* Cursor is beyond app icon in title bar */) { From 31b07879b22d8049930e9d513d0e7b65f80a775f Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Sun, 19 Jul 2026 11:51:58 +0900 Subject: [PATCH 5/5] chore: remove stale comment from libcxx-fetcher --- build/linux/libcxx-fetcher.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/build/linux/libcxx-fetcher.ts b/build/linux/libcxx-fetcher.ts index 981fbd3392e0c6..2e2ce1c31c6710 100644 --- a/build/linux/libcxx-fetcher.ts +++ b/build/linux/libcxx-fetcher.ts @@ -3,8 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -// Can be removed once https://github.com/electron/electron-rebuild/pull/703 is available. - import fs from 'fs'; import path from 'path'; import debug from 'debug';