Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions build/azure-pipelines/darwin/product-build-darwin-universal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand Down
2 changes: 0 additions & 2 deletions build/linux/libcxx-fetcher.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
9 changes: 0 additions & 9 deletions build/win32/code.iss
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/test-remote-integration.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Comment thread
deepak1556 marked this conversation as resolved.
for /f "delims=" %%i in ('node -p "require('fs').realpathSync.native(require('os').tmpdir())"') do set "TMP=%%i"
set "TEMP=%TMP%"

Expand Down
2 changes: 1 addition & 1 deletion scripts/test-web-integration.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Comment thread
deepak1556 marked this conversation as resolved.
for /f "delims=" %%i in ('node -p "require('fs').realpathSync.native(require('os').tmpdir())"') do set "TMP=%%i"
set "TEMP=%TMP%"

Expand Down
2 changes: 1 addition & 1 deletion src/vs/platform/windows/electron-main/windowImpl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 */) {
Expand Down
Loading