Merge branch 'main' into main

Author: matthew-godin

build/lib/policies.js

@@ -936,7 +936,7 @@ function renderGP(policies: Policy[], translations: Translations) {
 	const regKey = product.win32RegValueName;
 
 	const versions = [...new Set(policies.map(p => p.minimumVersion)).values()].sort();
-	const categories = [...new Set(policies.map(p => p.category))];
+	const categories = [...Object.values(policies.reduce((acc, p) => ({ ...acc, [p.category.name.nlsKey]: p.category }), {}))] as Category[];
 
 	return {
 		admx: renderADMX(regKey, versions, categories, policies),

build/lib/policies.ts

@@ -994,7 +994,7 @@
     ]
   },
   "dependencies": {
-    "vscode-languageclient": "^10.0.0-next.14",
+    "vscode-languageclient": "^10.0.0-next.15",
     "vscode-uri": "^3.1.0"
   },
   "devDependencies": {

extensions/css-language-features/package-lock.json

@@ -11,8 +11,8 @@
   "browser": "./dist/browser/cssServerMain",
   "dependencies": {
     "@vscode/l10n": "^0.0.18",
-    "vscode-css-languageservice": "^6.3.5",
-    "vscode-languageserver": "^10.0.0-next.11",
+    "vscode-css-languageservice": "^6.3.6",
+    "vscode-languageserver": "^10.0.0-next.13",
     "vscode-uri": "^3.1.0"
   },
   "devDependencies": {

extensions/css-language-features/package.json

@@ -259,7 +259,7 @@
   },
   "dependencies": {
     "@vscode/extension-telemetry": "^0.9.8",
-    "vscode-languageclient": "^10.0.0-next.14",
+    "vscode-languageclient": "^10.0.0-next.15",
     "vscode-uri": "^3.1.0"
   },
   "devDependencies": {

extensions/css-language-features/server/package-lock.json

@@ -10,9 +10,9 @@
   "main": "./out/node/htmlServerMain",
   "dependencies": {
     "@vscode/l10n": "^0.0.18",
-    "vscode-css-languageservice": "^6.3.5",
-    "vscode-html-languageservice": "^5.4.0",
-    "vscode-languageserver": "^10.0.0-next.12",
+    "vscode-css-languageservice": "^6.3.6",
+    "vscode-html-languageservice": "^5.5.0",
+    "vscode-languageserver": "^10.0.0-next.13",
     "vscode-languageserver-textdocument": "^1.0.12",
     "vscode-uri": "^3.1.0"
   },