[pull] main from microsoft:main

build/azure-pipelines/product-copilot-recovery.yml

@@ -20,9 +20,10 @@ parameters:
     displayName: Publish Stable Recovery Extension
     type: boolean
     default: false
-  - name: confirm
-    displayName: This will publish a new recovery Copilot Chat version to the VS Marketplace. You need to run it from a 'release/X.Y' branch. The pipeline will figure out the exact version number based on the branch, eg. 'X.Y.1'. Do you want to continue? Type 'yes' to proceed.
-    type: string
+
+variables:
+  - name: VSCODE_QUALITY
+    value: stable
 
 extends:
   template: azure-pipelines/extension/stable.yml@templates
@@ -44,15 +45,8 @@ extends:
               echo "##vso[task.logissue type=error]publishExtension requires a release/* branch"
               exit 1
             displayName: Validate release branch
-        - ${{ if ne(parameters.confirm, 'yes') }}:
-          - script: |
-              echo "##vso[task.logissue type=error]publishExtension requires confirm to be 'yes'"
-              exit 1
-            displayName: Validate confirm parameter
 
       - template: copilot/setup-steps.yml
-      - script: node build/azure-pipelines/common/updateCopilotChatRecoveryVersion.ts
-        displayName: Update Copilot Chat recovery version
       - template: copilot/build-steps.yml
 
     uploadSourceMaps:

build/darwin/sign.ts

@@ -11,10 +11,6 @@ import { spawn } from '@malept/cross-spawn-promise';
 const root = path.dirname(path.dirname(import.meta.dirname));
 const baseDir = path.dirname(import.meta.dirname);
 const product = JSON.parse(fs.readFileSync(path.join(root, 'product.json'), 'utf8'));
-const helperAppBaseName = product.nameShort;
-const gpuHelperAppName = helperAppBaseName + ' Helper (GPU).app';
-const rendererHelperAppName = helperAppBaseName + ' Helper (Renderer).app';
-const pluginHelperAppName = helperAppBaseName + ' Helper (Plugin).app';
 
 function getElectronVersion(): string {
 	const npmrc = fs.readFileSync(path.join(root, '.npmrc'), 'utf8');
@@ -23,11 +19,11 @@ function getElectronVersion(): string {
 }
 
 function getEntitlementsForFile(filePath: string): string {
-	if (filePath.includes(gpuHelperAppName)) {
+	if (filePath.includes(' Helper (GPU).app')) {
 		return path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-gpu-entitlements.plist');
-	} else if (filePath.includes(rendererHelperAppName)) {
+	} else if (filePath.includes(' Helper (Renderer).app')) {
 		return path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-renderer-entitlements.plist');
-	} else if (filePath.includes(pluginHelperAppName)) {
+	} else if (filePath.includes(' Helper (Plugin).app')) {
 		return path.join(baseDir, 'azure-pipelines', 'darwin', 'helper-plugin-entitlements.plist');
 	}
 	return path.join(baseDir, 'azure-pipelines', 'darwin', 'app-entitlements.plist');
@@ -79,7 +75,7 @@ async function main(buildDir?: string): Promise<void> {
 	const appName = product.nameLong + '.app';
 	const infoPlistPath = path.resolve(appRoot, appName, 'Contents', 'Info.plist');
 	const embeddedInfoPlistPath = product.embedded
-		? path.resolve(appRoot, appName, 'Contents', 'Applications', `${product.embedded.nameShort}.app`, 'Contents', 'Info.plist')
+		? path.resolve(appRoot, appName, 'Contents', 'Applications', `${product.embedded.nameLong}.app`, 'Contents', 'Info.plist')
 		: undefined;
 
 	const appOpts: SignOptions = {
@@ -140,28 +136,28 @@ async function main(buildDir?: string): Promise<void> {
 				'-insert',
 				'NSAppleEventsUsageDescription',
 				'-string',
-				`An application in ${product.embedded.nameShort} wants to use AppleScript.`,
+				`An application in ${product.embedded.nameLong} wants to use AppleScript.`,
 				`${embeddedInfoPlistPath}`
 			]);
 			await spawn('plutil', [
 				'-replace',
 				'NSMicrophoneUsageDescription',
 				'-string',
-				`An application in ${product.embedded.nameShort} wants to use the Microphone.`,
+				`An application in ${product.embedded.nameLong} wants to use the Microphone.`,
 				`${embeddedInfoPlistPath}`
 			]);
 			await spawn('plutil', [
 				'-replace',
 				'NSCameraUsageDescription',
 				'-string',
-				`An application in ${product.embedded.nameShort} wants to use the Camera.`,
+				`An application in ${product.embedded.nameLong} wants to use the Camera.`,
 				`${embeddedInfoPlistPath}`
 			]);
 			await spawn('plutil', [
 				'-replace',
 				'NSAudioCaptureUsageDescription',
 				'-string',
-				`An application in ${product.embedded.nameShort} wants to use Audio Capture.`,
+				`An application in ${product.embedded.nameLong} wants to use Audio Capture.`,
 				`${embeddedInfoPlistPath}`
 			]);
 			await spawn('plutil', [

build/gulpfile.hygiene.ts

@@ -7,7 +7,7 @@ import es from 'event-stream';
 import path from 'path';
 import fs from 'fs';
 import * as task from './lib/task.ts';
-import { hygiene } from './hygiene.ts';
+import { checkCopilotEnginesVersion, hygiene } from './hygiene.ts';
 
 const dirName = path.dirname(new URL(import.meta.url).pathname);
 
@@ -41,6 +41,12 @@ const checkPackageJSONTask = task.define('check-package-json', () => {
 			checkPackageJSON.call(this, 'remote/package.json');
 			checkPackageJSON.call(this, 'remote/web/package.json');
 			checkPackageJSON.call(this, 'build/package.json');
+
+			const repoRoot = path.join(dirName, '..');
+			const copilotError = checkCopilotEnginesVersion(repoRoot);
+			if (copilotError) {
+				this.emit('error', copilotError);
+			}
 		})
 	);
 });

build/gulpfile.vscode.ts

@@ -393,7 +393,8 @@ function packageTask(platform: string, arch: string, sourceFolderName: string, d
 			}));
 
 
-		const embedded = quality
+		const isInsiderOrExploration = quality === 'insider' || quality === 'exploration';
+		const embedded = isInsiderOrExploration
 			? (product as typeof product & { embedded?: EmbeddedProductInfo }).embedded
 			: undefined;
 
@@ -539,6 +540,7 @@ function packageTask(platform: string, arch: string, sourceFolderName: string, d
 			ffmpegChromium: false,
 			...(embedded ? {
 				darwinMiniAppName: embedded.nameShort,
+				darwinMiniAppDisplayName: embedded.nameLong,
 				darwinMiniAppBundleIdentifier: embedded.darwinBundleIdentifier,
 				darwinMiniAppIcon: 'resources/darwin/agents.icns',
 				darwinMiniAppAssetsCar: 'resources/darwin/agents.car',
@@ -561,8 +563,8 @@ function packageTask(platform: string, arch: string, sourceFolderName: string, d
 				'**',
 				'!LICENSE',
 				'!version',
-				...(platform === 'darwin' && !quality ? ['!**/Contents/Applications', '!**/Contents/Applications/**'] : []),
-				...(platform === 'win32' && !quality ? ['!**/electron_proxy.exe'] : []),
+				...(platform === 'darwin' && !isInsiderOrExploration ? ['!**/Contents/Applications', '!**/Contents/Applications/**'] : []),
+				...(platform === 'win32' && !isInsiderOrExploration ? ['!**/electron_proxy.exe'] : []),
 			], { dot: true }));
 
 		if (platform === 'linux') {

build/gulpfile.vscode.win32.ts

@@ -112,7 +112,8 @@ function buildWin32Setup(arch: string, target: string): task.CallbackTask {
 			Quality: quality
 		};
 
-		const embedded = quality
+		const isInsiderOrExploration = quality === 'insider' || quality === 'exploration';
+		const embedded = isInsiderOrExploration
 			? (product as typeof product & { embedded?: EmbeddedProductInfo }).embedded
 			: undefined;
 

build/hygiene.ts

@@ -27,6 +27,21 @@ interface VinylFileWithLines extends VinylFile {
 	__lines: string[];
 }
 
+/**
+ * Checks that engines.vscode in extensions/copilot/package.json matches ^{version} from the root package.json.
+ * Returns an error message if mismatched, or undefined if OK.
+ */
+export function checkCopilotEnginesVersion(repoRoot: string): string | undefined {
+	const rootPkg = JSON.parse(fs.readFileSync(path.join(repoRoot, 'package.json'), 'utf8'));
+	const copilotPkg = JSON.parse(fs.readFileSync(path.join(repoRoot, 'extensions/copilot/package.json'), 'utf8'));
+	const expected = `^${rootPkg.version}`;
+	const actual = copilotPkg?.engines?.vscode;
+	if (actual !== expected) {
+		return `engines.vscode in 'extensions/copilot/package.json' must be "${expected}" (the version from the root package.json), but found "${actual ?? '<missing>'}"`;
+	}
+	return undefined;
+}
+
 /**
  * Main hygiene function that runs checks on files
  */
@@ -290,6 +305,15 @@ if (import.meta.main) {
 				const some = out.split(/\r?\n/).filter((l) => !!l);
 
 				if (some.length > 0) {
+					// Check copilot engines.vscode version if relevant files are staged
+					if (some.some(f => f === 'package.json' || f.startsWith('extensions/copilot/'))) {
+						const copilotError = checkCopilotEnginesVersion(process.cwd());
+						if (copilotError) {
+							console.error(copilotError);
+							process.exit(1);
+						}
+					}
+
 					// Run copilot pre-commit checks if copilot files are staged
 					if (some.some(f => f.startsWith('extensions/copilot/'))) {
 						console.log('Running copilot pre-commit checks...');

build/win32/code.iss

@@ -74,6 +74,10 @@ Type: filesandordirs; Name: "{app}\{#VersionedResourcesFolder}\resources\app\nod
 Type: filesandordirs; Name: "{app}\{#VersionedResourcesFolder}\resources\app\node_modules.asar.unpacked"; Check: IsNotBackgroundUpdate
 Type: files; Name: "{app}\{#VersionedResourcesFolder}\resources\app\node_modules.asar"; Check: IsNotBackgroundUpdate
 Type: files; Name: "{app}\{#VersionedResourcesFolder}\resources\app\Credits_45.0.2454.85.html"; Check: IsNotBackgroundUpdate
+#ifdef ProxyExeBasename
+; Clean up legacy Start Menu shortcut that used ProxyExeBasename instead of ProxyNameLong
+Type: files; Name: "{group}\{#ProxyExeBasename}.lnk"
+#endif
 
 [UninstallDelete]
 Type: filesandordirs; Name: "{app}\_"
@@ -117,7 +121,7 @@ Name: "{group}\{#NameLong}"; Filename: "{app}\{#ExeBasename}.exe"; AppUserModelI
 Name: "{autodesktop}\{#NameLong}"; Filename: "{app}\{#ExeBasename}.exe"; Tasks: desktopicon; AppUserModelID: "{#AppUserId}"; Check: ShouldUpdateShortcut(ExpandConstant('{autodesktop}\{#NameLong}.lnk'))
 Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#NameLong}"; Filename: "{app}\{#ExeBasename}.exe"; Tasks: quicklaunchicon; AppUserModelID: "{#AppUserId}"; Check: ShouldUpdateShortcut(ExpandConstant('{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#NameLong}.lnk'))
 #ifdef ProxyExeBasename
-Name: "{group}\{#ProxyExeBasename}"; Filename: "{app}\{#ProxyExeBasename}.exe"; AppUserModelID: "{#ProxyAppUserId}"; Check: ShouldUpdateShortcut(ExpandConstant('{group}\{#ProxyExeBasename}.lnk'))
+Name: "{group}\{#ProxyNameLong}"; Filename: "{app}\{#ProxyExeBasename}.exe"; AppUserModelID: "{#ProxyAppUserId}"; Check: ShouldUpdateShortcut(ExpandConstant('{group}\{#ProxyNameLong}.lnk'))
 Name: "{autodesktop}\{#ProxyNameLong}"; Filename: "{app}\{#ProxyExeBasename}.exe"; Tasks: desktopicon; AppUserModelID: "{#ProxyAppUserId}"; Check: ShouldUpdateShortcut(ExpandConstant('{autodesktop}\{#ProxyNameLong}.lnk'))
 Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#ProxyNameLong}"; Filename: "{app}\{#ProxyExeBasename}.exe"; Tasks: quicklaunchicon; AppUserModelID: "{#ProxyAppUserId}"; Check: ShouldUpdateShortcut(ExpandConstant('{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#ProxyNameLong}.lnk'))
 #endif