KingDEV95 · pull · May 7, 2026 · May 5, 2026 · May 5, 2026 · May 5, 2026
diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
@@ -150,3 +150,4 @@ function f(x: number, y: string): void { }
 
 ## Learnings
 - Minimize the amount of assertions in tests. Prefer one snapshot-style `assert.deepStrictEqual` over multiple precise assertions, as they are much more difficult to understand and to update.
+- Do not stub a global object (e.g. `(mainWindow as any).ResizeObserver = ...`) or use `any` casts to install fakes in tests. Instead, make the dependency injectable: add an optional constructor parameter on the production class that defaults to the real implementation (e.g. `targetWindow.ResizeObserver`), and have the test pass a fake that implements the real interface.
diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml
@@ -525,32 +525,32 @@ extends:
                   container: centos
                   arch: arm64
 
-            # Debian 10
+            # Debian 11
             - ${{ if eq(parameters.VSCODE_BUILD_LINUX, true) }}:
               - template: build/azure-pipelines/common/sanity-tests.yml@self
                 parameters:
-                  name: debian_10_amd64
-                  displayName: Debian 10 amd64
+                  name: debian_11_amd64
+                  displayName: Debian 11 amd64
                   poolName: 1es-ubuntu-22.04-x64
-                  container: debian-10
+                  container: debian-11
                   arch: amd64
 
             - ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true) }}:
               - template: build/azure-pipelines/common/sanity-tests.yml@self
                 parameters:
-                  name: debian_10_arm32
-                  displayName: Debian 10 arm32
+                  name: debian_11_arm32
+                  displayName: Debian 11 arm32
                   poolName: 1es-azure-linux-3-arm64
-                  container: debian-10
+                  container: debian-11
                   arch: arm
 
             - ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARM64, true) }}:
               - template: build/azure-pipelines/common/sanity-tests.yml@self
                 parameters:
-                  name: debian_10_arm64
-                  displayName: Debian 10 arm64
+                  name: debian_11_arm64
+                  displayName: Debian 11 arm64
                   poolName: 1es-azure-linux-3-arm64
-                  container: debian-10
+                  container: debian-11
                   arch: arm64
 
             # Debian 12
@@ -581,42 +581,42 @@ extends:
                   container: debian-12
                   arch: arm64
 
-            # Fedora 36
+            # Fedora 42
             - ${{ if eq(parameters.VSCODE_BUILD_LINUX, true) }}:
               - template: build/azure-pipelines/common/sanity-tests.yml@self
                 parameters:
-                  name: fedora_36_amd64
-                  displayName: Fedora 36 amd64
+                  name: fedora_42_amd64
+                  displayName: Fedora 42 amd64
                   poolName: 1es-ubuntu-22.04-x64
-                  container: fedora-36
+                  container: fedora-42
                   arch: amd64
 
             - ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARM64, true) }}:
               - template: build/azure-pipelines/common/sanity-tests.yml@self
                 parameters:
-                  name: fedora_36_arm64
-                  displayName: Fedora 36 arm64
+                  name: fedora_42_arm64
+                  displayName: Fedora 42 arm64
                   poolName: 1es-azure-linux-3-arm64
-                  container: fedora-36
+                  container: fedora-42
                   arch: arm64
 
-            # Fedora 40
+            # Fedora 43
             - ${{ if eq(parameters.VSCODE_BUILD_LINUX, true) }}:
               - template: build/azure-pipelines/common/sanity-tests.yml@self
                 parameters:
-                  name: fedora_40_amd64
-                  displayName: Fedora 40 amd64
+                  name: fedora_43_amd64
+                  displayName: Fedora 43 amd64
                   poolName: 1es-ubuntu-22.04-x64
-                  container: fedora-40
+                  container: fedora-43
                   arch: amd64
 
             - ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARM64, true) }}:
               - template: build/azure-pipelines/common/sanity-tests.yml@self
                 parameters:
-                  name: fedora_40_arm64
-                  displayName: Fedora 40 arm64
+                  name: fedora_43_arm64
+                  displayName: Fedora 43 arm64
                   poolName: 1es-azure-linux-3-arm64
-                  container: fedora-40
+                  container: fedora-43
                   arch: arm64
 
             # openSUSE Leap 16.0

diff --git a/build/azure-pipelines/product-sanity-tests.yml b/build/azure-pipelines/product-sanity-tests.yml
@@ -128,29 +128,29 @@ extends:
               container: centos
               arch: arm64
 
-          # Debian 10
+          # Debian 11
           - template: build/azure-pipelines/common/sanity-tests.yml@self
             parameters:
-              name: debian_10_amd64
-              displayName: Debian 10 amd64
+              name: debian_11_amd64
+              displayName: Debian 11 amd64
               poolName: 1es-ubuntu-22.04-x64
-              container: debian-10
+              container: debian-11
               arch: amd64
 
           - template: build/azure-pipelines/common/sanity-tests.yml@self
             parameters:
-              name: debian_10_arm32
-              displayName: Debian 10 arm32
+              name: debian_11_arm32
+              displayName: Debian 11 arm32
               poolName: 1es-azure-linux-3-arm64
-              container: debian-10
+              container: debian-11
               arch: arm
 
           - template: build/azure-pipelines/common/sanity-tests.yml@self
             parameters:
-              name: debian_10_arm64
-              displayName: Debian 10 arm64
+              name: debian_11_arm64
+              displayName: Debian 11 arm64
               poolName: 1es-azure-linux-3-arm64
-              container: debian-10
+              container: debian-11
               arch: arm64
 
           # Debian 12
@@ -178,38 +178,38 @@ extends:
               container: debian-12
               arch: arm64
 
-          # Fedora 36
+          # Fedora 42
           - template: build/azure-pipelines/common/sanity-tests.yml@self
             parameters:
-              name: fedora_36_amd64
-              displayName: Fedora 36 amd64
+              name: fedora_42_amd64
+              displayName: Fedora 42 amd64
               poolName: 1es-ubuntu-22.04-x64
-              container: fedora-36
+              container: fedora-42
               arch: amd64
 
           - template: build/azure-pipelines/common/sanity-tests.yml@self
             parameters:
-              name: fedora_36_arm64
-              displayName: Fedora 36 arm64
+              name: fedora_42_arm64
+              displayName: Fedora 42 arm64
               poolName: 1es-azure-linux-3-arm64
-              container: fedora-36
+              container: fedora-42
               arch: arm64
 
-          # Fedora 40
+          # Fedora 43
           - template: build/azure-pipelines/common/sanity-tests.yml@self
             parameters:
-              name: fedora_40_amd64
-              displayName: Fedora 40 amd64
+              name: fedora_43_amd64
+              displayName: Fedora 43 amd64
               poolName: 1es-ubuntu-22.04-x64
-              container: fedora-40
+              container: fedora-43
               arch: amd64
 
           - template: build/azure-pipelines/common/sanity-tests.yml@self
             parameters:
-              name: fedora_40_arm64
-              displayName: Fedora 40 arm64
+              name: fedora_43_arm64
+              displayName: Fedora 43 arm64
               poolName: 1es-azure-linux-3-arm64
-              container: fedora-40
+              container: fedora-43
               arch: arm64
 
           # openSUSE Leap 16.0

diff --git a/build/gulpfile.vscode.ts b/build/gulpfile.vscode.ts
@@ -714,21 +714,6 @@ BUILD_TARGETS.forEach(buildTarget => {
 
 // #region nls
 
-const innoSetupConfig: Record<string, { codePage: string; defaultInfo?: { name: string; id: string } }> = {
-	'zh-cn': { codePage: 'CP936', defaultInfo: { name: 'Simplified Chinese', id: '$0804', } },
-	'zh-tw': { codePage: 'CP950', defaultInfo: { name: 'Traditional Chinese', id: '$0404' } },
-	'ko': { codePage: 'CP949', defaultInfo: { name: 'Korean', id: '$0412' } },
-	'ja': { codePage: 'CP932' },
-	'de': { codePage: 'CP1252' },
-	'fr': { codePage: 'CP1252' },
-	'es': { codePage: 'CP1252' },
-	'ru': { codePage: 'CP1251' },
-	'it': { codePage: 'CP1252' },
-	'pt-br': { codePage: 'CP1252' },
-	'hu': { codePage: 'CP1250' },
-	'tr': { codePage: 'CP1254' }
-};
-
 gulp.task(task.define(
 	'vscode-translations-export',
 	task.series(
@@ -758,7 +743,7 @@ gulp.task('vscode-translations-import', function () {
 	return es.merge([...i18n.defaultLanguages, ...i18n.extraLanguages].map(language => {
 		const id = language.id;
 		return gulp.src(`${options.location}/${id}/vscode-setup/messages.xlf`)
-			.pipe(i18n.prepareIslFiles(language, innoSetupConfig[language.id]))
+			.pipe(i18n.prepareIslFiles(language))
 			.pipe(vfs.dest(`./build/win32/i18n`));
 	}));
 });

diff --git a/build/gulpfile.vscode.win32.ts b/build/gulpfile.vscode.win32.ts
@@ -135,6 +135,10 @@ function buildWin32Setup(arch: string, target: string): task.CallbackTask {
 			definitions['AppxPackage'] = `${quality === 'stable' ? 'code' : 'code_insider'}_${arch}.appx`;
 			definitions['AppxPackageDll'] = `${quality === 'stable' ? 'code' : 'code_insider'}_explorer_command_${arch}.dll`;
 			definitions['AppxPackageName'] = `${product.win32AppUserModelId}`;
+			const ctxMenu = (product as { win32ContextMenu?: Record<string, { clsid: string }> }).win32ContextMenu;
+			if (ctxMenu && ctxMenu[arch]) {
+				definitions['FileExplorerContextMenuCLSID'] = ctxMenu[arch].clsid;
+			}
 		}
 
 		fs.writeFileSync(productJsonPath, JSON.stringify(productJson, undefined, '\t'));

diff --git a/build/lib/i18n.ts b/build/lib/i18n.ts
@@ -12,7 +12,6 @@ import xml2js from 'xml2js';
 import gulp from 'gulp';
 import fancyLog from 'fancy-log';
 import ansiColors from 'ansi-colors';
-import iconv from '@vscode/iconv-lite-umd';
 import { type l10nJsonFormat, getL10nXlf, type l10nJsonDetails, getL10nFilesFromXlf, getL10nJson } from '@vscode/l10n-dev';
 
 const REPO_ROOT_PATH = path.join(import.meta.dirname, '../..');
@@ -27,10 +26,6 @@ export interface Language {
 	folderName?: string; // language specific folder name, e.g. cht, deu  (optional, if not set, the id is used)
 }
 
-export interface InnoSetup {
-	codePage: string; //code page for encoding (http://www.jrsoftware.org/ishelp/index.php?topic=langoptionssection)
-}
-
 export const defaultLanguages: Language[] = [
 	{ id: 'zh-tw', folderName: 'cht', translationId: 'zh-hant' },
 	{ id: 'zh-cn', folderName: 'chs', translationId: 'zh-hans' },
@@ -128,6 +123,11 @@ class TextModel {
 	private _lines: string[];
 
 	constructor(contents: string) {
+		// Strip a leading UTF-8 BOM (U+FEFF) so callers can match on the
+		// first character of the first line without having to special-case it.
+		if (contents.charCodeAt(0) === 0xFEFF) {
+			contents = contents.slice(1);
+		}
 		this._lines = contents.split(/\r\n|\r|\n/);
 	}
 
@@ -798,7 +798,7 @@ export function prepareI18nPackFiles(resultingTranslationPaths: TranslationPath[
 	});
 }
 
-export function prepareIslFiles(language: Language, innoSetupConfig: InnoSetup): eventStream.ThroughStream {
+export function prepareIslFiles(language: Language): eventStream.ThroughStream {
 	const parsePromises: Promise<l10nJsonDetails[]>[] = [];
 
 	return eventStream.through(function (this: eventStream.ThroughStream, xlf: File) {
@@ -808,7 +808,7 @@ export function prepareIslFiles(language: Language, innoSetupConfig: InnoSetup):
 		parsePromise.then(
 			resolvedFiles => {
 				resolvedFiles.forEach(file => {
-					const translatedFile = createIslFile(file.name, file.messages, language, innoSetupConfig);
+					const translatedFile = createIslFile(file.name, file.messages, language);
 					stream.queue(translatedFile);
 				});
 			}
@@ -824,7 +824,7 @@ export function prepareIslFiles(language: Language, innoSetupConfig: InnoSetup):
 	});
 }
 
-function createIslFile(name: string, messages: l10nJsonFormat, language: Language, innoSetup: InnoSetup): File {
+function createIslFile(name: string, messages: l10nJsonFormat, language: Language): File {
 	const content: string[] = [];
 	let originalContent: TextModel;
 	if (path.basename(name) === 'Default') {
@@ -855,11 +855,13 @@ function createIslFile(name: string, messages: l10nJsonFormat, language: Languag
 
 	const basename = path.basename(name);
 	const filePath = `${basename}.${language.id}.isl`;
-	const encoded = iconv.encode(Buffer.from(content.join('\r\n'), 'utf8').toString(), innoSetup.codePage);
+	const utf8BOM = Buffer.from([0xEF, 0xBB, 0xBF]);
+	const contentBuffer = Buffer.from(content.join('\r\n'), 'utf8');
+	const encoded = Buffer.concat([utf8BOM, contentBuffer]);
 
 	return new File({
 		path: filePath,
-		contents: Buffer.from(encoded),
+		contents: encoded,
 	});
 }
 

diff --git a/build/win32/code.iss b/build/win32/code.iss
@@ -1718,6 +1718,32 @@ begin
     Result := False;
 end;
 
+// Unblock inno_updater --gc when our context-menu COM surrogate keeps a
+// handle on the orphan commit folder. See https://github.com/microsoft/vscode/issues/294546.
+// No-op when FileExplorerContextMenuCLSID is not defined (e.g. OSS builds).
+procedure KillContextMenuComSurrogate();
+var
+  KillErrorCode: Integer;
+  Command: String;
+begin
+#ifdef FileExplorerContextMenuCLSID
+  Log('KillContextMenuComSurrogate: stopping COM surrogate(s) hosting context-menu DLL ({#FileExplorerContextMenuCLSID})');
+
+  Command :=
+    '-NoLogo -NoProfile -NonInteractive -WindowStyle Hidden -ExecutionPolicy Bypass -Command "' +
+    'Get-CimInstance Win32_Process -Filter ""Name = ''dllhost.exe''"" | ' +
+    'Where-Object { $_.CommandLine -like ''*/Processid:{#FileExplorerContextMenuCLSID}*'' } | ' +
+    'ForEach-Object { try { Stop-Process -Id $_.ProcessId -Force -ErrorAction Stop } catch {} }"';
+
+  if not ShellExec('', 'powershell.exe', Command, '', SW_HIDE, ewWaitUntilTerminated, KillErrorCode) then
+    Log('KillContextMenuComSurrogate: ShellExec failed with error code ' + IntToStr(KillErrorCode))
+  else if KillErrorCode <> 0 then
+    Log('KillContextMenuComSurrogate: PowerShell exited with non-zero code ' + IntToStr(KillErrorCode))
+  else
+    Log('KillContextMenuComSurrogate: complete');
+#endif
+end;
+
 #ifdef AppxPackageName
 var
   AppxPackageFullname: String;
@@ -1776,6 +1802,7 @@ procedure RemoveAppxPackage();
 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
@@ -1860,6 +1887,7 @@ begin
         Log('inno_updater completed successfully');
         #if "system" == InstallTarget
           if IsVersionedUpdate() then begin
+            KillContextMenuComSurrogate();
             Log('Invoking inno_updater to remove previous installation folder');
             Exec(ExpandConstant('{app}\{#VersionedResourcesFolder}\tools\inno_updater.exe'), ExpandConstant('"--gc" "{app}\{#ExeBasename}.exe" "{#VersionedResourcesFolder}" "{#ExeBasename}.exe"' {#ifdef ProxyExeBasename} + ' "{#ProxyExeBasename}.exe"' {#endif}), '', SW_SHOW, ewWaitUntilTerminated, UpdateResultCode);
             Log('inno_updater completed gc successfully');
@@ -1870,6 +1898,7 @@ begin
       end;
     end else begin
       if IsVersionedUpdate() then begin
+        KillContextMenuComSurrogate();
         Log('Invoking inno_updater to remove previous installation folder');
         Exec(ExpandConstant('{app}\{#VersionedResourcesFolder}\tools\inno_updater.exe'), ExpandConstant('"--gc" "{app}\{#ExeBasename}.exe" "{#VersionedResourcesFolder}" "{#ExeBasename}.exe"' {#ifdef ProxyExeBasename} + ' "{#ProxyExeBasename}.exe"' {#endif}), '', SW_SHOW, ewWaitUntilTerminated, UpdateResultCode);
         Log('inno_updater completed gc successfully');
Original file line number	Diff line number	Diff line change
Expand Up		@@ -150,3 +150,4 @@ function f(x: number, y: string): void { }

		## Learnings
		- Minimize the amount of assertions in tests. Prefer one snapshot-style `assert.deepStrictEqual` over multiple precise assertions, as they are much more difficult to understand and to update.
		- Do not stub a global object (e.g. `(mainWindow as any).ResizeObserver = ...`) or use `any` casts to install fakes in tests. Instead, make the dependency injectable: add an optional constructor parameter on the production class that defaults to the real implementation (e.g. `targetWindow.ResizeObserver`), and have the test pass a fake that implements the real interface.