feat: prepare for 1.85

.github/workflows/insider-macos.yml

@@ -51,7 +51,7 @@ jobs:
           ref: ${{ env.GITHUB_BRANCH }}
 
       - name: Setup Node.js environment
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: '18.17'
 

.github/workflows/insider-spearhead.yml

@@ -23,7 +23,7 @@ jobs:
           ref: insider
 
       - name: Setup Node.js environment
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: '18'
 

.github/workflows/insider-windows.yml

@@ -44,7 +44,7 @@ jobs:
       matrix:
         vscode_arch:
           - x64
-          - ia32
+          # - ia32
           - arm64
     outputs:
       RELEASE_VERSION: ${{ env.RELEASE_VERSION }}
@@ -56,7 +56,7 @@ jobs:
           ref: ${{ env.GITHUB_BRANCH }}
 
       - name: Setup Node.js environment
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: '18.17'
 
@@ -66,7 +66,7 @@ jobs:
       - name: Setup Python 3
         uses: actions/setup-python@v4
         with:
-          python-version: '3.x'
+          python-version: '3.11'
 
       - name: Clone VSCode repo
         env:

.github/workflows/stable-macos.yml

@@ -48,7 +48,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Setup Node.js environment
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: '18.17'
 

.github/workflows/stable-windows.yml

@@ -44,7 +44,7 @@ jobs:
       matrix:
         vscode_arch:
           - x64
-          - ia32
+          # - ia32
           - arm64
     outputs:
       RELEASE_VERSION: ${{ env.RELEASE_VERSION }}
@@ -54,7 +54,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Setup Node.js environment
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: '18.17'
 
@@ -64,7 +64,7 @@ jobs:
       - name: Setup Python 3
         uses: actions/setup-python@v4
         with:
-          python-version: '3.x'
+          python-version: '3.11'
 
       - name: Clone VSCode repo
         run: ./get_repo.sh

insider.json

@@ -1,4 +1,4 @@
 {
   "tag": "1.84.0",
-  "commit": "55d1cfea45b665bb54e46d11bd3ccddf9e66108b"
+  "commit": "60182c7e1a666961ded4d0319c154f52d85daf30"
 }

patches/fix-eol-banner.patch

@@ -47,16 +47,6 @@ index b120c94..1bb2b88 100644
 +	}
 +
  	toJSON(): object {
-diff --git a/src/vs/workbench/electron-sandbox/window.ts b/src/vs/workbench/electron-sandbox/window.ts
-index 1efcf6b..b52830c 100644
---- a/src/vs/workbench/electron-sandbox/window.ts
-+++ b/src/vs/workbench/electron-sandbox/window.ts
-@@ -738,3 +738,4 @@ export class NativeWindow extends Disposable {
- 				actions,
--				icon: Codicon.warning
-+				icon: Codicon.warning,
-+				neverShowAgain: { id: 'windowseol', isSecondary: true, scope: NeverShowAgainScope.APPLICATION }
- 			});
 diff --git a/src/vs/workbench/services/banner/browser/bannerService.ts b/src/vs/workbench/services/banner/browser/bannerService.ts
 index 639b1b2..70e8847 100644
 --- a/src/vs/workbench/services/banner/browser/bannerService.ts

patches/insider/disable-windows-appx.patch

@@ -1,15 +1,15 @@
 diff --git a/build/gulpfile.vscode.win32.js b/build/gulpfile.vscode.win32.js
-index 0d3abda..9e5143a 100644
+index 5adfdfb..dfdb2af 100644
 --- a/build/gulpfile.vscode.win32.js
 +++ b/build/gulpfile.vscode.win32.js
-@@ -116,6 +116,6 @@ function buildWin32Setup(arch, target) {
+@@ -115,6 +115,6 @@ function buildWin32Setup(arch, target) {
 
 -		if (quality === 'insider') {
--			definitions['AppxPackage'] = `code_insiders_explorer_${arch === 'ia32' ? 'x86' : arch}.appx`;
+-			definitions['AppxPackage'] = `code_insiders_explorer_${arch}.appx`;
 -			definitions['AppxPackageFullname'] = `Microsoft.${product.win32RegValueName}_1.0.0.0_neutral__8wekyb3d8bbwe`;
 -		}
 +		// if (quality === 'insider') {
-+		// 	definitions['AppxPackage'] = `code_insiders_explorer_${arch === 'ia32' ? 'x86' : arch}.appx`;
++		// 	definitions['AppxPackage'] = `code_insiders_explorer_${arch}.appx`;
 +		// 	definitions['AppxPackageFullname'] = `Microsoft.${product.win32RegValueName}_1.0.0.0_neutral__8wekyb3d8bbwe`;
 +		// }
 

product.json

@@ -48,8 +48,7 @@
   ],
   "extensionEnabledApiProposals": {
     "ms-vscode.vscode-selfhost-test-provider": [
-      "testObserver",
-      "testMessageContextValue"
+      "testObserver"
     ],
     "VisualStudioExptTeam.vscodeintellicode-completions": [
       "inlineCompletionsAdditions"
@@ -169,6 +168,9 @@
     "ms-vscode.lsif-browser": [
       "documentFiltersExclusive"
     ],
+    "ms-vscode.vscode-speech": [
+      "speech"
+    ],
     "GitHub.vscode-pull-request-github": [
       "contribCommentThreadAdditionalMenu",
       "tokenInformation",
@@ -199,18 +201,22 @@
       "handleIssueUri",
       "interactive",
       "interactiveUserActions",
-      "terminalContextMenu",
       "terminalDataWriteEvent",
+      "terminalExecuteCommandEvent",
       "terminalSelection",
       "terminalQuickFixProvider",
       "chatProvider",
-      "chatSlashCommands",
       "chatVariables",
       "chatAgents",
+      "chatAgents2",
+      "chatAgents2Additions",
+      "defaultChatAgent",
       "readonlyMessage",
       "mappedEditsProvider",
       "aiRelatedInformation",
-      "codeActionAI"
+      "codeActionAI",
+      "findTextInFiles",
+      "textSearchProvider"
     ],
     "GitHub.remotehub": [
       "contribRemoteHelp",