Merge remote-tracking branch 'upstream/release/1.96' into release/1.96

Author: mohankumarelec

build/.cachesalt

@@ -1 +1 @@
-2024-09-04T10:21:29.952Z
+2024-12-11T00:28:56.838Z

build/azure-pipelines/linux/product-build-linux-legacy-server.yml

@@ -42,7 +42,9 @@ steps:
         libxkbfile-dev \
         libkrb5-dev \
         libgbm1 \
-        rpm
+        rpm \
+        gcc-10 \
+        g++-10
       sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
       sudo chmod +x /etc/init.d/xvfb
       sudo update-rc.d xvfb defaults
@@ -83,28 +85,6 @@ steps:
         imageName: vscode-linux-build-agent:centos7-devtoolset8-$(VSCODE_ARCH)
         containerCommand: uname
 
-  - ${{ if or(eq(parameters.VSCODE_ARCH, 'arm64'), eq(parameters.VSCODE_ARCH, 'armhf')) }}:
-    - script: |
-        set -e
-        includes=$(cat << 'EOF'
-        {
-          "target_defaults": {
-            "conditions": [
-              ["OS=='linux'", {
-                'cflags_cc!': [ '-std=gnu++20' ],
-                'cflags_cc': [ '-std=gnu++2a' ],
-              }]
-            ]
-          }
-        }
-        EOF
-        )
-        if [ ! -d "$HOME/.gyp" ]; then
-          mkdir -p "$HOME/.gyp"
-        fi
-        echo "$includes" > "$HOME/.gyp/include.gypi"
-      displayName: Override gnu target for arm64 and arm
-
   - script: |
       set -e
 
@@ -123,6 +103,8 @@ steps:
       set -e
 
       export VSCODE_SYSROOT_PREFIX='-glibc-2.17'
+      export CC=$(which gcc-10)
+      export CXX=$(which g++-10)
       source ./build/azure-pipelines/linux/setup-env.sh --skip-sysroot
 
       for i in {1..5}; do # try 5 times

build/azure-pipelines/product-build.yml

@@ -178,6 +178,9 @@ extends:
   template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
   parameters:
     sdl:
+      binskim:
+        enabled: false
+        justificationForDisabling: "BinSkim rebaselining is failing"
       tsa:
         enabled: true
         configFile: $(Build.SourcesDirectory)/build/azure-pipelines/config/tsaoptions.json

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "flexpilot-dev",
-  "version": "1.96.0",
+  "version": "1.96.4",
   "distro": "c883c91dadf5f063b26c86ffe01851acee3747c6",
   "author": {
     "name": "Microsoft Corporation"

package.json

@@ -288,8 +288,9 @@ function configureCommandlineSwitchesSync(cliArgs: NativeParsedArgs) {
 
 	// Following features are disabled from the runtime:
 	// `CalculateNativeWinOcclusion` - Disable native window occlusion tracker (https://groups.google.com/a/chromium.org/g/embedder-dev/c/ZF3uHHyWLKw/m/VDN2hDXMAAAJ)
+	// `PlzDedicatedWorker` - Refs https://github.com/microsoft/vscode/issues/233060#issuecomment-2523212427
 	const featuresToDisable =
-		`CalculateNativeWinOcclusion,${app.commandLine.getSwitchValue('disable-features')}`;
+		`CalculateNativeWinOcclusion,PlzDedicatedWorker,${app.commandLine.getSwitchValue('disable-features')}`;
 	app.commandLine.appendSwitch('disable-features', featuresToDisable);
 
 	// Blink features to configure.

src/main.ts

@@ -582,7 +582,8 @@ export const codiconsLibrary = {
 	goToEditingSession: register('go-to-editing-session', 0xec35),
 	editSession: register('edit-session', 0xec36),
 	codeReview: register('code-review', 0xec37),
-	copilotWarning: register('copilot-warning', 0xea6c),
+	copilotWarning: register('copilot-warning', 0xef01),
 	python: register('python', 0xec39),
 	copilotLarge: register('copilot-large', 0xef01),
+	copilotWarningLarge: register('copilot-warning-large', 0xef01),
 } as const;

src/vs/base/browser/ui/codicons/codicon/codicon.ttf

@@ -45,6 +45,11 @@ export interface IRequestOptions {
 	data?: string;
 	followRedirects?: number;
 	proxyAuthorization?: string;
+	/**
+	 * A signal to not cache the response. This may not
+	 * be supported in all implementations.
+	 */
+	disableCache?: boolean;
 }
 
 export interface IRequestContext {

src/vs/base/common/codiconsLibrary.ts

@@ -21,12 +21,16 @@ export async function request(options: IRequestOptions, token: CancellationToken
 	]) : cancellation.signal;
 
 	try {
-		const res = await fetch(options.url || '', {
+		const fetchInit: RequestInit = {
 			method: options.type || 'GET',
 			headers: getRequestHeaders(options),
 			body: options.data,
-			signal,
-		});
+			signal
+		};
+		if (options.disableCache) {
+			fetchInit.cache = 'no-store';
+		}
+		const res = await fetch(options.url || '', fetchInit);
 		return {
 			res: {
 				statusCode: res.status,