If the users selects a language, let's have it actually choose the language they selected. (Yaml vs yaml) (#288153)

Fixes #287005

Author: dmitrivMS

build/azure-pipelines/darwin/codesign.ts

@@ -10,19 +10,44 @@ async function main() {
 	const arch = e('VSCODE_ARCH');
 	const esrpCliDLLPath = e('EsrpCliDllPath');
 	const pipelineWorkspace = e('PIPELINE_WORKSPACE');
+	const buildSourcesDirectory = e('BUILD_SOURCESDIRECTORY');
 
-	const folder = `${pipelineWorkspace}/vscode_client_darwin_${arch}_archive`;
-	const glob = `VSCode-darwin-${arch}.zip`;
+	const clientFolder = `${pipelineWorkspace}/vscode_client_darwin_${arch}_archive`;
+	const clientGlob = `VSCode-darwin-${arch}.zip`;
 
-	// Codesign
-	printBanner('Codesign');
-	const codeSignTask = spawnCodesignProcess(esrpCliDLLPath, 'sign-darwin', folder, glob);
-	await streamProcessOutputAndCheckResult('Codesign', codeSignTask);
+	const serverFolder = `${buildSourcesDirectory}/.build/darwin/server`;
+	const serverGlob = `vscode-server-darwin-${arch}.zip`;
+	const webGlob = `vscode-server-darwin-${arch}-web.zip`;
 
-	// Notarize
-	printBanner('Notarize');
-	const notarizeTask = spawnCodesignProcess(esrpCliDLLPath, 'notarize-darwin', folder, glob);
-	await streamProcessOutputAndCheckResult('Notarize', notarizeTask);
+	// Start codesign processes in parallel
+	const codeSignClientTask = spawnCodesignProcess(esrpCliDLLPath, 'sign-darwin', clientFolder, clientGlob);
+	const codeSignServerTask = spawnCodesignProcess(esrpCliDLLPath, 'sign-darwin', serverFolder, serverGlob);
+	const codeSignWebTask = spawnCodesignProcess(esrpCliDLLPath, 'sign-darwin', serverFolder, webGlob);
+
+	// Await codesign results
+	printBanner('Codesign client');
+	await streamProcessOutputAndCheckResult('Codesign client', codeSignClientTask);
+
+	printBanner('Codesign server');
+	await streamProcessOutputAndCheckResult('Codesign server', codeSignServerTask);
+
+	printBanner('Codesign web');
+	await streamProcessOutputAndCheckResult('Codesign web', codeSignWebTask);
+
+	// Start notarize processes in parallel (after codesigning is complete)
+	const notarizeClientTask = spawnCodesignProcess(esrpCliDLLPath, 'notarize-darwin', clientFolder, clientGlob);
+	const notarizeServerTask = spawnCodesignProcess(esrpCliDLLPath, 'notarize-darwin', serverFolder, serverGlob);
+	const notarizeWebTask = spawnCodesignProcess(esrpCliDLLPath, 'notarize-darwin', serverFolder, webGlob);
+
+	// Await notarize results
+	printBanner('Notarize client');
+	await streamProcessOutputAndCheckResult('Notarize client', notarizeClientTask);
+
+	printBanner('Notarize server');
+	await streamProcessOutputAndCheckResult('Notarize server', notarizeServerTask);
+
+	printBanner('Notarize web');
+	await streamProcessOutputAndCheckResult('Notarize web', notarizeWebTask);
 }
 
 main().then(() => {

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

@@ -57,14 +57,14 @@ jobs:
           sbomPackageVersion: $(Build.SourceVersion)
         - output: pipelineArtifact
           targetPath: $(Build.ArtifactStagingDirectory)/out/vscode_server_darwin_$(VSCODE_ARCH)_archive/vscode-server-darwin-$(VSCODE_ARCH).zip
-          artifactName: vscode_server_darwin_$(VSCODE_ARCH)_archive-unsigned
+          artifactName: vscode_server_darwin_$(VSCODE_ARCH)_archive
           displayName: Publish server archive
           sbomBuildDropPath: $(Agent.BuildDirectory)/vscode-server-darwin-$(VSCODE_ARCH)
           sbomPackageName: "VS Code macOS $(VSCODE_ARCH) Server"
           sbomPackageVersion: $(Build.SourceVersion)
         - output: pipelineArtifact
           targetPath: $(Build.ArtifactStagingDirectory)/out/vscode_web_darwin_$(VSCODE_ARCH)_archive/vscode-server-darwin-$(VSCODE_ARCH)-web.zip
-          artifactName: vscode_web_darwin_$(VSCODE_ARCH)_archive-unsigned
+          artifactName: vscode_web_darwin_$(VSCODE_ARCH)_archive
           displayName: Publish web server archive
           sbomBuildDropPath: $(Agent.BuildDirectory)/vscode-server-darwin-$(VSCODE_ARCH)-web
           sbomPackageName: "VS Code macOS $(VSCODE_ARCH) Web"

build/azure-pipelines/darwin/steps/product-build-darwin-compile.yml

@@ -261,6 +261,7 @@ steps:
       env:
         EsrpCliDllPath: $(EsrpCliDllPath)
         SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+        BUILD_SOURCESDIRECTORY: $(Build.SourcesDirectory)
       displayName: ✍️ Codesign & Notarize
 
   - ${{ if or(eq(parameters.VSCODE_RUN_ELECTRON_TESTS, true), eq(parameters.VSCODE_RUN_BROWSER_TESTS, true), eq(parameters.VSCODE_RUN_REMOTE_TESTS, true)) }}: