Merge remote-tracking branch 'upstream/main'

THIS-IS-NOT-A-BACKUP · Oct 27, 2023 · 0726120 · 0726120
2 parents 54ba433 + c82bf84
commit 0726120
Show file tree

Hide file tree

Showing 72 changed files with 1,894 additions and 1,051 deletions.
diff --git a/.git-blame-ignore → .git-blame-ignore-revs b/.git-blame-ignore → .git-blame-ignore-revs
@@ -1,4 +1,5 @@
 # https://git-scm.com/docs/git-blame#Documentation/git-blame.txt---ignore-revs-fileltfilegt
+# https://docs.github.com/en/repositories/working-with-files/using-files/viewing-a-file#ignore-commits-in-the-blame-view
 
 # mjbvz: Fix spacing
 13f4f052582bcec3d6c6c6a70d995c9dee2cac13
@@ -23,6 +24,5 @@ ae1452eea678f5266ef513f22dacebb90955d6c9
 a3cb14be7f2cceadb17adf843675b1a59537dbbd
 ee1655a82ebdfd38bf8792088a6602c69f7bbd94
 
-
 # jrieken: new eslint-rule
 4a130c40ed876644ed8af2943809d08221375408
diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
@@ -64,7 +64,7 @@ const vscodeResources = [
 	'out-build/vs/base/node/{stdForkStart.js,terminateProcess.sh,cpuUsage.sh,ps.sh}',
 	'out-build/vs/base/browser/ui/codicons/codicon/**',
 	'out-build/vs/base/parts/sandbox/electron-sandbox/preload.js',
-	'out-build/vs/base/parts/sandbox/electron-sandbox/preload-slim.js',
+	'out-build/vs/base/parts/sandbox/electron-sandbox/preload-aux.js',
 	'out-build/vs/workbench/browser/media/*-theme.css',
 	'out-build/vs/workbench/contrib/debug/**/*.json',
 	'out-build/vs/workbench/contrib/externalTerminal/**/*.scpt',

diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
@@ -112,4 +112,4 @@ for (let dir of dirs) {
 }
 
 cp.execSync('git config pull.rebase merges');
-cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore');
+cp.execSync('git config blame.ignoreRevsFile .git-blame-ignore-revs');
diff --git a/extensions/csharp/cgmanifest.json b/extensions/csharp/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "dotnet/csharp-tmLanguage",
 					"repositoryUrl": "https://github.com/dotnet/csharp-tmLanguage",
-					"commitHash": "772323937fedd65c6dc1c8ce6ea41d97415ed7d1"
+					"commitHash": "6666eb1d5e6fb565a4110d6db645cc534fb3c6d2"
 				}
 			},
 			"license": "MIT",
@@ -15,4 +15,4 @@
 		}
 	],
 	"version": 1
-}
+}