Skip to content

Commit bf9252a

Browse files
authored
Fix ADMX generation to use underscores instead of . (#279406) (#279461)
1 parent 43a9713 commit bf9252a

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

build/lib/policies/stringEnumPolicy.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/lib/policies/stringEnumPolicy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ export class StringEnumPolicy extends BasePolicy {
5353
protected renderADMXElements(): string[] {
5454
return [
5555
`<enum id="${this.name}" valueName="${this.name}">`,
56-
...this.enum_.map((value, index) => ` <item displayName="$(string.${this.name}_${this.enumDescriptions[index].nlsKey})"><value><string>${value}</string></value></item>`),
56+
...this.enum_.map((value, index) => ` <item displayName="$(string.${this.name}_${this.enumDescriptions[index].nlsKey.replace(/\./g, '_')})"><value><string>${value}</string></value></item>`),
5757
`</enum>`
5858
];
5959
}

build/lib/test/fixtures/policies/win32/CodeOSS.admx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@
4545
<supportedOn ref="Supported_1_99" />
4646
<elements>
4747
<enum id="ChatMCP" valueName="ChatMCP">
48-
<item displayName="$(string.ChatMCP_chat.mcp.access.none)"><value><string>none</string></value></item>
49-
<item displayName="$(string.ChatMCP_chat.mcp.access.registry)"><value><string>registry</string></value></item>
50-
<item displayName="$(string.ChatMCP_chat.mcp.access.any)"><value><string>all</string></value></item>
48+
<item displayName="$(string.ChatMCP_chat_mcp_access_none)"><value><string>none</string></value></item>
49+
<item displayName="$(string.ChatMCP_chat_mcp_access_registry)"><value><string>registry</string></value></item>
50+
<item displayName="$(string.ChatMCP_chat_mcp_access_any)"><value><string>all</string></value></item>
5151
</enum>
5252
</elements>
5353
</policy>
@@ -113,10 +113,10 @@
113113
<supportedOn ref="Supported_1_99" />
114114
<elements>
115115
<enum id="TelemetryLevel" valueName="TelemetryLevel">
116-
<item displayName="$(string.TelemetryLevel_telemetry.telemetryLevel.default)"><value><string>all</string></value></item>
117-
<item displayName="$(string.TelemetryLevel_telemetry.telemetryLevel.error)"><value><string>error</string></value></item>
118-
<item displayName="$(string.TelemetryLevel_telemetry.telemetryLevel.crash)"><value><string>crash</string></value></item>
119-
<item displayName="$(string.TelemetryLevel_telemetry.telemetryLevel.off)"><value><string>off</string></value></item>
116+
<item displayName="$(string.TelemetryLevel_telemetry_telemetryLevel_default)"><value><string>all</string></value></item>
117+
<item displayName="$(string.TelemetryLevel_telemetry_telemetryLevel_error)"><value><string>error</string></value></item>
118+
<item displayName="$(string.TelemetryLevel_telemetry_telemetryLevel_crash)"><value><string>crash</string></value></item>
119+
<item displayName="$(string.TelemetryLevel_telemetry_telemetryLevel_off)"><value><string>off</string></value></item>
120120
</enum>
121121
</elements>
122122
</policy>

build/lib/test/stringEnumPolicy.test.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/lib/test/stringEnumPolicy.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ suite('StringEnumPolicy', () => {
5555
'\t<supportedOn ref="Supported_1_0" />',
5656
'\t<elements>',
5757
'<enum id="TestStringEnumPolicy" valueName="TestStringEnumPolicy">',
58-
'\t<item displayName="$(string.TestStringEnumPolicy_test.option.one)"><value><string>auto</string></value></item>',
59-
'\t<item displayName="$(string.TestStringEnumPolicy_test.option.two)"><value><string>manual</string></value></item>',
60-
'\t<item displayName="$(string.TestStringEnumPolicy_test.option.three)"><value><string>disabled</string></value></item>',
58+
'\t<item displayName="$(string.TestStringEnumPolicy_test_option_one)"><value><string>auto</string></value></item>',
59+
'\t<item displayName="$(string.TestStringEnumPolicy_test_option_two)"><value><string>manual</string></value></item>',
60+
'\t<item displayName="$(string.TestStringEnumPolicy_test_option_three)"><value><string>disabled</string></value></item>',
6161
'</enum>',
6262
'\t</elements>',
6363
'</policy>'

0 commit comments

Comments
 (0)