fix: update patch

build/update_patches.sh

@@ -5,15 +5,16 @@ cd vscode || { echo "'vscode' dir not found"; exit 1; }
 git add .
 git reset -q --hard HEAD
 
-for file in ../patches/*.patch; do
+for FILE in ../patches/*.patch; do
-  if [ -f "${file}" ]; then
+  if [ -f "${FILE}" ]; then
-    echo applying patch: "${file}"
+    echo applying patch: "${FILE}"
-    git apply --ignore-whitespace "${file}"
+    git apply --ignore-whitespace "${FILE}"
     if [ $? -ne 0 ]; then
-      echo failed to apply patch "${file}"
+      echo failed to apply patch "${FILE}"
-      git apply --reject "${file}"
+      git apply --reject "${FILE}"
       read -p "Press any key when the conflict have been resolved..." -n1 -s
-      git diff -U1 > "${file}"
+      git add .
+      git diff --staged -U1 > "${FILE}"
     fi
     git add .
     git reset -q --hard HEAD

insider.json

@@ -1,4 +1,4 @@
 {
   "tag": "1.74.0",
-  "commit": "3fb8e8feb1c93a490feb2c2259713d4c8f0e0058"
+  "commit": "d9a70c4236a8bde4fe7435df3ecdd333c7bc939c"
 }

patches/build-version.patch

@@ -1,78 +1,78 @@
 diff --git a/.vscode/settings.json b/.vscode/settings.json
-index 3907bc7..1772769 100644
+index 3abb868..309c37f 100644
 --- a/.vscode/settings.json
 +++ b/.vscode/settings.json
-@@ -88,3 +88,3 @@
+@@ -90,3 +90,3 @@
  		"editor.defaultFormatter": "vscode.typescript-language-features",
 -		"editor.formatOnSave": true
 +		// "editor.formatOnSave": true
  	},
 diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
-index 980f647..959fb88 100644
+index 7475e04..d930611 100644
 --- a/build/gulpfile.reh.js
 +++ b/build/gulpfile.reh.js
-@@ -245,4 +245,5 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
+@@ -246,4 +246,5 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
  		const name = product.nameShort;
 +		const release = packageJson.release;
  		const packageJsonStream = gulp.src(['remote/package.json'], { base: 'remote' })
 -			.pipe(json({ name, version, dependencies: undefined, optionalDependencies: undefined }));
 +			.pipe(json({ name, version, release, dependencies: undefined, optionalDependencies: undefined }));
  
-@@ -251,3 +252,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
+@@ -252,3 +253,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
  		const productJsonStream = gulp.src(['product.json'], { base: '.' })
 -			.pipe(json({ commit, date, version }));
 +			.pipe(json({ commit, date, version, release }));
  
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index 6947d1e..80f358e 100644
+index d5b4db0..46ca809 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -224,3 +224,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -226,3 +226,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  
 -		let version = packageJson.version;
 +		let version = packageJson.version
  		const quality = product.quality;
-@@ -232,3 +232,4 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -234,3 +234,4 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  		const name = product.nameShort;
 -		const packageJsonUpdates = { name, version };
 +		const release = packageJson.release;
 +		const packageJsonUpdates = { name, version, release };
  
-@@ -243,3 +244,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -245,3 +246,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  		const date = new Date().toISOString();
 -		const productJsonUpdate = { commit, date, checksums, version };
 +		const productJsonUpdate = { commit, date, checksums, version, release };
  
 diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js
-index 4a25ca5..ca33d2e 100644
+index cdc8870..f6e4e09 100644
 --- a/build/gulpfile.vscode.linux.js
 +++ b/build/gulpfile.vscode.linux.js
-@@ -24,4 +24,2 @@ const commit = util.getVersion(root);
+@@ -25,4 +25,2 @@ const commit = getVersion(root);
  
 -const linuxPackageRevision = Math.floor(new Date().getTime() / 1000);
 -
  /**
-@@ -87,3 +85,3 @@ function prepareDebPackage(arch) {
+@@ -88,3 +86,3 @@ function prepareDebPackage(arch) {
  					.pipe(replace('@@NAME@@', product.applicationName))
 -					.pipe(replace('@@VERSION@@', packageJson.version + '-' + linuxPackageRevision))
 +					.pipe(replace('@@VERSION@@', `${packageJson.version}.${packageJson.release}`))
  					.pipe(replace('@@ARCHITECTURE@@', debArch))
-@@ -192,4 +190,3 @@ function prepareRpmPackage(arch) {
+@@ -193,4 +191,3 @@ function prepareRpmPackage(arch) {
  			.pipe(replace('@@ICON@@', product.linuxIconName))
 -			.pipe(replace('@@VERSION@@', packageJson.version))
 -			.pipe(replace('@@RELEASE@@', linuxPackageRevision))
 +			.pipe(replace('@@VERSION@@', `${packageJson.version}.${packageJson.release}`))
  			.pipe(replace('@@ARCHITECTURE@@', rpmArch))
-@@ -266,3 +263,3 @@ function prepareSnapPackage(arch) {
+@@ -267,3 +264,3 @@ function prepareSnapPackage(arch) {
  			.pipe(replace('@@NAME@@', product.applicationName))
 -			.pipe(replace('@@VERSION@@', commit.substr(0, 8)))
 +			.pipe(replace('@@VERSION@@', `${packageJson.version}.${packageJson.release}`))
  			// Possible run-on values https://snapcraft.io/docs/architectures
 diff --git a/build/gulpfile.vscode.win32.js b/build/gulpfile.vscode.win32.js
-index 81ba509..43f5377 100644
+index 0d3abda..2606af5 100644
 --- a/build/gulpfile.vscode.win32.js
 +++ b/build/gulpfile.vscode.win32.js
-@@ -93,4 +93,4 @@ function buildWin32Setup(arch, target) {
+@@ -94,4 +94,4 @@ function buildWin32Setup(arch, target) {
  			DirName: product.win32DirName,
 -			Version: pkg.version,
 -			RawVersion: pkg.version.replace(/-\w+$/, ''),
@@ -89,7 +89,7 @@ index 61659d2..5cafa06 100644
 +Release:  el7
  Summary:  Code editing. Redefined.
 diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts
-index e07695c..55ccc32 100644
+index 149c3b9..6d8dd99 100644
 --- a/src/vs/base/common/product.ts
 +++ b/src/vs/base/common/product.ts
 @@ -34,2 +34,3 @@ export interface IProductConfiguration {
@@ -97,16 +97,16 @@ index e07695c..55ccc32 100644
 +	readonly release: string;
  	readonly date?: string;
 diff --git a/src/vs/platform/diagnostics/node/diagnosticsService.ts b/src/vs/platform/diagnostics/node/diagnosticsService.ts
-index 66e35c8..087c055 100644
+index 561966b..30814a0 100644
 --- a/src/vs/platform/diagnostics/node/diagnosticsService.ts
 +++ b/src/vs/platform/diagnostics/node/diagnosticsService.ts
-@@ -238,3 +238,3 @@ export class DiagnosticsService implements IDiagnosticsService {
+@@ -236,3 +236,3 @@ export class DiagnosticsService implements IDiagnosticsService {
  		const output: string[] = [];
 -		output.push(`Version:          ${this.productService.nameShort} ${this.productService.version} (${this.productService.commit || 'Commit unknown'}, ${this.productService.date || 'Date unknown'})`);
 +		output.push(`Version:          ${this.productService.nameShort} ${this.productService.version} ${this.productService.release || 'Release unknown'} (${this.productService.commit || 'Commit unknown'}, ${this.productService.date || 'Date unknown'})`);
  		output.push(`OS Version:       ${osLib.type()} ${osLib.arch()} ${osLib.release()}`);
 diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
-index bceda01..4fe44e2 100644
+index 3f50bef..465ca43 100644
 --- a/src/vs/platform/product/common/product.ts
 +++ b/src/vs/platform/product/common/product.ts
 @@ -49,6 +49,7 @@ else if (typeof require?.__$__nodeRequire === 'function') {
@@ -120,19 +120,19 @@ index bceda01..4fe44e2 100644
 +			release: pkg.release
  		});
 diff --git a/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts b/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
-index ec4ff95..2ed2c03 100644
+index e7dc644..69a313b 100644
 --- a/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
 +++ b/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
-@@ -22,2 +22,3 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
+@@ -23,2 +23,3 @@ import { MarkdownRenderer } from 'vs/editor/contrib/markdownRenderer/browser/mar
- import { MarkdownRenderer } from 'vs/editor/contrib/markdownRenderer/browser/markdownRenderer';
+ import { defaultButtonStyles } from 'vs/platform/theme/browser/defaultStyles';
 +import { getReleaseString } from 'vs/workbench/common/release';
  
-@@ -145,2 +146,4 @@ export class BrowserDialogHandler implements IDialogHandler {
+@@ -147,2 +148,4 @@ export class BrowserDialogHandler implements IDialogHandler {
  		const detailString = (useAgo: boolean): string => {
 +			const releaseString = getReleaseString();
 +
  			return localize('aboutDetail',
-@@ -151,3 +154,3 @@ export class BrowserDialogHandler implements IDialogHandler {
+@@ -153,3 +156,3 @@ export class BrowserDialogHandler implements IDialogHandler {
  				navigator.userAgent
 -			);
 +			).replace('\n', `\n${releaseString} ${this.productService.release || 'Unknown'}\n`);

product.json

@@ -51,7 +51,6 @@
       "testObserver"
     ],
     "VisualStudioExptTeam.vscodeintellicode-completions": [
-      "inlineCompletionsNew",
       "inlineCompletionsAdditions"
     ],
     "ms-vsliveshare.vsliveshare": [
@@ -70,7 +69,6 @@
       "portsAttributes",
       "findTextInFiles",
       "workspaceTrust",
-      "resolvers",
       "tunnels"
     ],
     "ms-toolsai.vscode-ai-remote": [
@@ -78,7 +76,8 @@
     ],
     "ms-python.python": [
       "quickPickSortByLabel",
-      "testObserver"
+      "testObserver",
+      "telemetryLogger"
     ],
     "ms-dotnettools.dotnet-interactive-vscode": [
       "notebookMessaging"
@@ -96,6 +95,7 @@
     ],
     "ms-vscode.azure-repos": [
       "extensionRuntime",
+      "telemetryLogger",
       "fileSearchProvider",
       "textSearchProvider"
     ],
@@ -112,8 +112,10 @@
       "fileSearchProvider",
       "quickPickSortByLabel",
       "workspaceTrust",
+      "scmActionButton",
       "scmSelectedProvider",
       "scmValidation",
+      "telemetryLogger",
       "textSearchProvider",
       "timeline"
     ],
@@ -149,7 +151,6 @@
       "portsAttributes",
       "findTextInFiles",
       "workspaceTrust",
-      "resolvers",
       "tunnels"
     ],
     "ms-vscode.lsif-browser": [
@@ -163,11 +164,9 @@
       "treeItemCheckbox"
     ],
     "GitHub.copilot": [
-      "inlineCompletionsNew",
       "inlineCompletionsAdditions"
     ],
     "GitHub.copilot-nightly": [
-      "inlineCompletionsNew",
       "inlineCompletionsAdditions"
     ],
     "GitHub.remotehub": [
@@ -183,7 +182,8 @@
       "scmSelectedProvider",
       "scmValidation",
       "textSearchProvider",
-      "timeline"
+      "timeline",
+      "telemetryLogger"
     ],
     "ms-python.gather": [
       "notebookCellExecutionState"
@@ -211,7 +211,6 @@
       "notebookCellExecutionState"
     ],
     "ms-vscode.azure-sphere-tools-ui": [
-      "resolvers",
       "tunnels"
     ],
     "ms-azuretools.vscode-azureappservice": [