Merge branch 'main' into copilot/fix-d26c41ec-2939-4f32-a432-2e2763bd6de8

Author: osortega

.github/CODEOWNERS

@@ -1,10 +1,14 @@
-# Ensure that Lad and Joao review changes to the Code OSS actions
+# GitHub actions required reviewers
+.github/workflows/monaco-editor.yml @hediet @alexdima @lszomoru @joaomoreno
+.github/workflows/no-package-lock-changes.yml @lszomoru @joaomoreno
+.github/workflows/no-yarn-lock-changes.yml @lszomoru @joaomoreno
 .github/workflows/pr-darwin-test.yml @lszomoru @joaomoreno
 .github/workflows/pr-linux-cli-test.yml @lszomoru @joaomoreno
 .github/workflows/pr-linux-test.yml @lszomoru @joaomoreno
 .github/workflows/pr-node-modules.yml @lszomoru @joaomoreno
 .github/workflows/pr-win32-test.yml @lszomoru @joaomoreno
 .github/workflows/pr.yml @lszomoru @joaomoreno
+.github/workflows/telemetry.yml @lramos15 @lszomoru @joaomoreno
 
 # ensure the API police is aware of changes to the vscode-dts file
 # this is only about the final API, not about proposed API changes

.vscode/notebooks/my-work.github-issues

@@ -82,7 +82,7 @@
   {
     "kind": 2,
     "language": "github-issues",
-    "value": "$REPOS is:open assignee:@me label:triage-needed,copilot-triage-needed\n"
+    "value": "$REPOS is:open assignee:@me label:triage-needed\n"
   },
   {
     "kind": 1,

ThirdPartyNotices.txt

@@ -1230,7 +1230,7 @@ more details.
 
 ---------------------------------------------------------
 
-go-syntax 0.8.1 - MIT
+go-syntax 0.8.4 - MIT
 https://github.com/worlpaker/go-syntax
 
 MIT License
@@ -1546,7 +1546,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-jlelong/vscode-latex-basics 1.13.0 - MIT
+jlelong/vscode-latex-basics 1.14.0 - MIT
 https://github.com/jlelong/vscode-latex-basics
 
 Copyright (c) vscode-latex-basics authors
@@ -2128,7 +2128,7 @@ SOFTWARE.
 
 ---------------------------------------------------------
 
-microsoft/vscode-mssql 1.31.0 - MIT
+microsoft/vscode-mssql 1.34.0 - MIT
 https://github.com/microsoft/vscode-mssql
 
 ------------------------------------------ START OF LICENSE -----------------------------------------
@@ -2275,7 +2275,7 @@ suitability for any purpose.
 
 ---------------------------------------------------------
 
-REditorSupport/vscode-R 0.1.0 - MIT
+REditorSupport/vscode-R 0.1.1 - MIT
 https://github.com/REditorSupport/vscode-R-syntax
 
 MIT License

build/azure-pipelines/darwin/product-build-darwin-universal.yml

@@ -68,8 +68,9 @@ steps:
 
   - script: |
       set -e
-      unzip $(Pipeline.Workspace)/unsigned_vscode_client_darwin_x64_archive/VSCode-darwin-x64.zip -d $(agent.builddirectory)/VSCode-darwin-x64
-      unzip $(Pipeline.Workspace)/unsigned_vscode_client_darwin_arm64_archive/VSCode-darwin-arm64.zip -d $(agent.builddirectory)/VSCode-darwin-arm64
+      unzip $(Pipeline.Workspace)/unsigned_vscode_client_darwin_x64_archive/VSCode-darwin-x64.zip -d $(agent.builddirectory)/VSCode-darwin-x64 &
+      unzip $(Pipeline.Workspace)/unsigned_vscode_client_darwin_arm64_archive/VSCode-darwin-arm64.zip -d $(agent.builddirectory)/VSCode-darwin-arm64 &
+      wait
       DEBUG=* node build/darwin/create-universal-app.js $(agent.builddirectory)
     displayName: Create Universal App
 

build/azure-pipelines/win32/product-build-win32.yml

@@ -175,9 +175,9 @@ steps:
       displayName: Transpile client and extensions
 
   - ${{ else }}:
-    - ${{ if and(ne(parameters.VSCODE_CIBUILD, true), eq(parameters.VSCODE_QUALITY, 'insider')) }}:
-      - powershell: node build/win32/explorer-appx-fetcher .build/win32/appx
-        displayName: Download Explorer Sparse Package
+    - ${{ if and(ne(parameters.VSCODE_CIBUILD, true), ne(parameters.VSCODE_QUALITY, 'exploration')) }}:
+      - powershell: node build/win32/explorer-dll-fetcher .build/win32/appx
+        displayName: Download Explorer dll
 
     - powershell: |
         . build/azure-pipelines/win32/exec.ps1
@@ -190,6 +190,23 @@ steps:
         GITHUB_TOKEN: "$(github-distro-mixin-password)"
       displayName: Build client
 
+    # Note: the appx prepare step has to follow Build client step since build step replaces the template
+    # strings in the raw manifest file at resources/win32/appx/AppxManifest.xml and places it under
+    # <build-out-dir>/appx/manifest, we need a separate step to prepare the appx package with the
+    # final contents. In our case only the manifest file is bundled into the appx package.
+    - ${{ if and(ne(parameters.VSCODE_CIBUILD, true), ne(parameters.VSCODE_QUALITY, 'exploration')) }}:
+      - powershell: |
+          . build/azure-pipelines/win32/exec.ps1
+          $ErrorActionPreference = "Stop"
+          # Add Windows SDK to path
+          $sdk = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x64"
+          $env:PATH = "$sdk;$env:PATH"
+          $AppxName = if ('$(VSCODE_QUALITY)' -eq 'stable') { 'code' } else { 'code_insider' }
+          makeappx pack /d "$(Agent.BuildDirectory)/VSCode-win32-$(VSCODE_ARCH)/appx/manifest" /p "$(Agent.BuildDirectory)/VSCode-win32-$(VSCODE_ARCH)/appx/${AppxName}_$(VSCODE_ARCH).appx" /nv
+          # Remove the raw manifest folder
+          Remove-Item -Path "$(Agent.BuildDirectory)/VSCode-win32-$(VSCODE_ARCH)/appx/manifest" -Recurse -Force
+        displayName: Prepare appx package
+
     - powershell: |
         . build/azure-pipelines/win32/exec.ps1
         $ErrorActionPreference = "Stop"

build/checksums/explorer-dll.txt

@@ -0,0 +1,4 @@
+11b36db4f244693381e52316261ce61678286f6bdfe2614c6352f6fecf3f060d  code_explorer_command_arm64.dll
+bfab3719038ca46bcd8afb9249a00f851dd08aa3cc8d13d01a917111a2a6d7c2  code_explorer_command_x64.dll
+b5cd79c1e91390bdeefaf35cc5c62a6022220832e145781e5609913fac706ad9  code_insider_explorer_command_arm64.dll
+f04335cc6fbe8425bd5516e6acbfa05ca706fd7566799a1e22fca1344c25351f  code_insider_explorer_command_x64.dll

build/darwin/sign.js

@@ -120,11 +120,11 @@ async function main(buildDir?: string): Promise<void> {
 if (require.main === module) {
 	main(process.argv[2]).catch(async err => {
 		console.error(err);
-		const identities = await spawn('security', ['find-identity', '-p', 'codesigning', '-v']);
-		console.error(`Available identities:\n${identities}`);
 		const tempDir = process.env['AGENT_TEMPDIRECTORY'];
 		if (tempDir) {
 			const keychain = path.join(tempDir, 'buildagent.keychain');
+			const identities = await spawn('security', ['find-identity', '-p', 'codesigning', '-v', keychain]);
+			console.error(`Available identities:\n${identities}`);
 			const dump = await spawn('security', ['dump-keychain', keychain]);
 			console.error(`Keychain dump:\n${dump}`);
 		}

build/darwin/sign.ts

@@ -404,8 +404,21 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 			result = es.merge(result, gulp.src('.build/policies/win32/**', { base: '.build/policies/win32' })
 				.pipe(rename(f => f.dirname = `policies/${f.dirname}`)));
 
-			if (quality === 'insider') {
+			if (quality !== 'exploration') {
 				result = es.merge(result, gulp.src('.build/win32/appx/**', { base: '.build/win32' }));
+				const rawVersion = version.replace(/-\w+$/, '').split('.');
+				const appxVersion = `${rawVersion[0]}.0.${rawVersion[1]}.${rawVersion[2]}`;
+				result = es.merge(result, gulp.src('resources/win32/appx/AppxManifest.xml', { base: '.' })
+					.pipe(replace('@@AppxPackageName@@', product.win32AppUserModelId))
+					.pipe(replace('@@AppxPackageVersion@@', appxVersion))
+					.pipe(replace('@@AppxPackageDisplayName@@', product.nameLong))
+					.pipe(replace('@@AppxPackageDescription@@', product.win32NameVersion))
+					.pipe(replace('@@ApplicationIdShort@@', product.win32RegValueName))
+					.pipe(replace('@@ApplicationExe@@', product.nameShort + '.exe'))
+					.pipe(replace('@@FileExplorerContextMenuID@@', quality === 'stable' ? 'OpenWithCode' : 'OpenWithCodeInsiders'))
+					.pipe(replace('@@FileExplorerContextMenuCLSID@@', product.win32ContextMenu[arch].clsid))
+					.pipe(replace('@@FileExplorerContextMenuDLL@@', `${quality === 'stable' ? 'code' : 'code_insider'}_explorer_command_${arch}.dll`))
+					.pipe(rename(f => f.dirname = `appx/manifest`)));
 			}
 		} else if (platform === 'linux') {
 			result = es.merge(result, gulp.src('resources/linux/bin/code.sh', { base: '.' })

build/gulpfile.vscode.js

@@ -112,10 +112,9 @@ function buildWin32Setup(arch, target) {
 			Quality: quality
 		};
 
-		if (quality === 'insider') {
-			definitions['AppxPackage'] = `code_insiders_explorer_${arch}.appx`;
-			definitions['AppxPackageFullname'] = `Microsoft.${product.win32RegValueName}_1.0.0.0_neutral__8wekyb3d8bbwe`;
-			definitions['AppxPackageName'] = `Microsoft.${product.win32RegValueName}`;
+		if (quality !== 'exploration') {
+			definitions['AppxPackage'] = `${quality === 'stable' ? 'code' : 'code_insider'}_${arch}.appx`;
+			definitions['AppxPackageName'] = `${product.win32AppUserModelId}`;
 		}
 
 		packageInnoSetup(issPath, { definitions }, cb);