Merge branch 'main' into dev/fix-test-exporer-filter-ui-margin

Author: jhunt-scottlogic

.yarnrc

@@ -1,4 +1,4 @@
 disturl "https://electronjs.org/headers"
-target "22.3.5"
+target "22.3.10"
 runtime "electron"
 build_from_source "true"

build/lib/electron.js

@@ -91,7 +91,7 @@ function darwinBundleDocumentTypes(types: { [name: string]: string | string[] },
 }
 
 export const config = {
-	version: product.electronRepository ? '22.5.2' : util.getElectronVersion(),
+	version: product.electronRepository ? '22.5.3' : util.getElectronVersion(),
 	productAppName: product.nameLong,
 	companyName: 'Microsoft Corporation',
 	copyright: 'Copyright (C) 2023 Microsoft. All rights reserved',
@@ -212,7 +212,7 @@ function getElectron(arch: string): () => NodeJS.ReadWriteStream {
 }
 
 async function main(arch = process.arch): Promise<void> {
-	const version = product.electronRepository ? '22.5.2' : util.getElectronVersion();
+	const version = product.electronRepository ? '22.5.3' : util.getElectronVersion();
 	const electronPath = path.join(root, '.build', 'electron');
 	const versionFile = path.join(electronPath, 'version');
 	const isUpToDate = fs.existsSync(versionFile) && fs.readFileSync(versionFile, 'utf8') === `${version}`;

build/lib/electron.ts

@@ -322,10 +322,6 @@
 			"name": "vs/workbench/contrib/bracketPairColorizer2Telemetry",
 			"project": "vscode-workbench"
 		},
-		{
-			"name": "vs/workbench/contrib/offline",
-			"project": "vscode-workbench"
-		},
 		{
 			"name": "vs/workbench/contrib/remoteTunnel",
 			"project": "vscode-workbench"

build/lib/i18n.resources.json

@@ -692,6 +692,8 @@
 		"--tab-border-top-color",
 		"--tab-dirty-border-top-color",
 		"--tabs-border-bottom-color",
+		"--tab-sizing-current-width",
+		"--tab-sizing-fixed-max-width",
 		"--testMessageDecorationFontFamily",
 		"--testMessageDecorationFontSize",
 		"--title-border-bottom-color",

build/lib/stylelint/vscode-known-variables.json

@@ -528,12 +528,12 @@
 				"git": {
 					"name": "electron",
 					"repositoryUrl": "https://github.com/electron/electron",
-					"commitHash": "0b17a201195ae6445e11cee50e436a3511717600"
+					"commitHash": "b07f2f0f42a1483cd2e5ec8fa3c77ebaa0507069"
 				}
 			},
 			"isOnlyProductionDependency": true,
 			"license": "MIT",
-			"version": "22.3.5"
+			"version": "22.3.10"
 		},
 		{
 			"component": {

cgmanifest.json

@@ -21,9 +21,9 @@
       },
       {
         "id": "Default Dark Modern",
-        "label": "%darkPlusExperimentalColorThemeLabel%",
+        "label": "%darkModernThemeLabel%",
         "uiTheme": "vs-dark",
-        "path": "./themes/dark_plus_experimental.json"
+        "path": "./themes/dark_modern.json"
       },
       {
         "id": "Default Light+",
@@ -33,9 +33,9 @@
       },
       {
         "id": "Default Light Modern",
-        "label": "%lightPlusExperimentalColorThemeLabel%",
+        "label": "%lightModernThemeLabel%",
         "uiTheme": "vs",
-        "path": "./themes/light_plus_experimental.json"
+        "path": "./themes/light_modern.json"
       },
       {
         "id": "Visual Studio Dark",

extensions/theme-defaults/package.json

@@ -2,9 +2,9 @@
 	"displayName": "Default Themes",
 	"description": "The default Visual Studio light and dark themes",
 	"darkPlusColorThemeLabel": "Dark+",
-	"darkPlusExperimentalColorThemeLabel": "Dark Modern",
+	"darkModernThemeLabel": "Dark Modern",
 	"lightPlusColorThemeLabel": "Light+",
-	"lightPlusExperimentalColorThemeLabel": "Light Modern",
+	"lightModernThemeLabel": "Light Modern",
 	"darkColorThemeLabel": "Dark (Visual Studio)",
 	"lightColorThemeLabel": "Light (Visual Studio)",
 	"hcColorThemeLabel": "Dark High Contrast",