Merge remote-tracking branch 'upstream/main'

THIS-IS-NOT-A-BACKUP · Sep 11, 2023 · 76b5f0e · 76b5f0e
2 parents 09fa765 + ba3978f
commit 76b5f0e
Show file tree

Hide file tree

Showing 104 changed files with 3,011 additions and 2,440 deletions.
diff --git a/build/lib/stylelint/vscode-known-variables.json b/build/lib/stylelint/vscode-known-variables.json
@@ -734,7 +734,7 @@
 		"--tab-sizing-current-width",
 		"--tab-sizing-fixed-min-width",
 		"--tab-sizing-fixed-max-width",
-		"--editor-group-title-height",
+		"--editor-group-tab-height",
 		"--testMessageDecorationFontFamily",
 		"--testMessageDecorationFontSize",
 		"--title-border-bottom-color",

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": "525e628edad54c0f7aa15b015310df240803ea66"
 				}
 			},
 			"license": "MIT",