From 50ce0dfc8bcdc0e4e47a51f10c9f6fa9cbe53ff9 Mon Sep 17 00:00:00 2001 From: Josh Spicer <23246594+joshspicer@users.noreply.github.com> Date: Sat, 31 May 2025 09:42:59 -0700 Subject: [PATCH] Ensure no repeat categories in ADMX/ADML (#250143) Ensure no repeat categories in ADMX/ADML (fix: https://github.com/microsoft/vscode/issues/248917) --- build/lib/policies.js | 2 +- build/lib/policies.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/lib/policies.js b/build/lib/policies.js index ac697629883..b6b520098d1 100644 --- a/build/lib/policies.js +++ b/build/lib/policies.js @@ -720,7 +720,7 @@ function renderGP(policies, translations) { const appName = product.nameLong; 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 }), {}))]; return { admx: renderADMX(regKey, versions, categories, policies), adml: [ diff --git a/build/lib/policies.ts b/build/lib/policies.ts index 34d20e93dc6..381d2f4c1ac 100644 --- a/build/lib/policies.ts +++ b/build/lib/policies.ts @@ -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),