Tidy up some of our Velocity features

A few features were marked "always disabled" and then enabled in dev,
canary and preview. I simplified those to "always enabled" and disabled
in release instead. This required changes to Generate-FeatureStaging
to make it consider `WindowsInbox` a Release branding (which, honestly,
it always should have been.)

- Feature_DynamicSSHProfiles
- Feature_ShellCompletions
- Feature_SaveSnippet
- Feature_QuickFix

Feature_DisableWebSourceIcons was deprecated in #19143, but the XML file
never got the memo.
This commit is contained in:
Dustin L. Howett 2025-12-02 10:53:09 -06:00
parent f8506f4779
commit a53cd33058
2 changed files with 10 additions and 37 deletions

View File

@ -99,24 +99,16 @@
<name>Feature_DynamicSSHProfiles</name> <name>Feature_DynamicSSHProfiles</name>
<description>Enables the dynamic profile generator for OpenSSH config files</description> <description>Enables the dynamic profile generator for OpenSSH config files</description>
<id>9031</id> <id>9031</id>
<stage>AlwaysDisabled</stage> <stage>AlwaysEnabled</stage>
<alwaysEnabledBrandingTokens> <alwaysDisabledReleaseTokens/>
<brandingToken>Dev</brandingToken>
<brandingToken>Canary</brandingToken>
<brandingToken>Preview</brandingToken>
</alwaysEnabledBrandingTokens>
</feature> </feature>
<feature> <feature>
<name>Feature_ShellCompletions</name> <name>Feature_ShellCompletions</name>
<description>An experimental escape sequence for client applications to request the Terminal display a list of suggestions.</description> <description>An experimental escape sequence for client applications to request the Terminal display a list of suggestions.</description>
<id>3121</id> <id>3121</id>
<stage>AlwaysDisabled</stage> <stage>AlwaysEnabled</stage>
<alwaysEnabledBrandingTokens> <alwaysDisabledReleaseTokens/>
<brandingToken>Dev</brandingToken>
<brandingToken>Canary</brandingToken>
<brandingToken>Preview</brandingToken>
</alwaysEnabledBrandingTokens>
</feature> </feature>
<feature> <feature>
@ -165,24 +157,16 @@
<name>Feature_SaveSnippet</name> <name>Feature_SaveSnippet</name>
<description>Save Snippet</description> <description>Save Snippet</description>
<id>9971</id> <id>9971</id>
<stage>AlwaysDisabled</stage> <stage>AlwaysEnabled</stage>
<alwaysEnabledBrandingTokens> <alwaysDisabledReleaseTokens/>
<brandingToken>Dev</brandingToken>
<brandingToken>Canary</brandingToken>
<brandingToken>Preview</brandingToken>
</alwaysEnabledBrandingTokens>
</feature> </feature>
<feature> <feature>
<name>Feature_QuickFix</name> <name>Feature_QuickFix</name>
<description>Enables the Quick Fix menu</description> <description>Enables the Quick Fix menu</description>
<id>16599</id> <id>16599</id>
<stage>AlwaysDisabled</stage> <stage>AlwaysEnabled</stage>
<alwaysEnabledBrandingTokens> <alwaysDisabledReleaseTokens/>
<brandingToken>Dev</brandingToken>
<brandingToken>Canary</brandingToken>
<brandingToken>Preview</brandingToken>
</alwaysEnabledBrandingTokens>
</feature> </feature>
<feature> <feature>
@ -192,15 +176,4 @@
<alwaysDisabledReleaseTokens/> <alwaysDisabledReleaseTokens/>
</feature> </feature>
<feature>
<name>Feature_DisableWebSourceIcons</name>
<description>Disables icon paths that make web requests</description>
<id>19075</id>
<stage>AlwaysDisabled</stage>
<alwaysEnabledBrandingTokens>
<brandingToken>Dev</brandingToken>
<brandingToken>Canary</brandingToken>
</alwaysEnabledBrandingTokens>
</feature>
</featureStaging> </featureStaging>

View File

@ -89,11 +89,11 @@ Function Resolve-FinalFeatureStage {
[string]$Branding [string]$Branding
) )
# RELEASE=DISABLED wins all checks # RELEASE=DISABLED wins all checks (WindowsInbox counts as a type of Release)
# Then, branch match by most-specific branch # Then, branch match by most-specific branch
# Then, branding type (if no overriding branch match) # Then, branding type (if no overriding branch match)
If ($Branding -Eq "Release" -And $Feature.DisabledReleaseToken) { If ($Branding -In @("Release", "WindowsInbox") -And $Feature.DisabledReleaseToken) {
[Stage]::AlwaysDisabled [Stage]::AlwaysDisabled
Return Return
} }