Skip to content

Commit a53cd33

Browse files
committed
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.
1 parent f8506f4 commit a53cd33

File tree

2 files changed

+10
-37
lines changed

2 files changed

+10
-37
lines changed

src/features.xml

Lines changed: 8 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -99,24 +99,16 @@
9999
<name>Feature_DynamicSSHProfiles</name>
100100
<description>Enables the dynamic profile generator for OpenSSH config files</description>
101101
<id>9031</id>
102-
<stage>AlwaysDisabled</stage>
103-
<alwaysEnabledBrandingTokens>
104-
<brandingToken>Dev</brandingToken>
105-
<brandingToken>Canary</brandingToken>
106-
<brandingToken>Preview</brandingToken>
107-
</alwaysEnabledBrandingTokens>
102+
<stage>AlwaysEnabled</stage>
103+
<alwaysDisabledReleaseTokens/>
108104
</feature>
109105

110106
<feature>
111107
<name>Feature_ShellCompletions</name>
112108
<description>An experimental escape sequence for client applications to request the Terminal display a list of suggestions.</description>
113109
<id>3121</id>
114-
<stage>AlwaysDisabled</stage>
115-
<alwaysEnabledBrandingTokens>
116-
<brandingToken>Dev</brandingToken>
117-
<brandingToken>Canary</brandingToken>
118-
<brandingToken>Preview</brandingToken>
119-
</alwaysEnabledBrandingTokens>
110+
<stage>AlwaysEnabled</stage>
111+
<alwaysDisabledReleaseTokens/>
120112
</feature>
121113

122114
<feature>
@@ -165,24 +157,16 @@
165157
<name>Feature_SaveSnippet</name>
166158
<description>Save Snippet</description>
167159
<id>9971</id>
168-
<stage>AlwaysDisabled</stage>
169-
<alwaysEnabledBrandingTokens>
170-
<brandingToken>Dev</brandingToken>
171-
<brandingToken>Canary</brandingToken>
172-
<brandingToken>Preview</brandingToken>
173-
</alwaysEnabledBrandingTokens>
160+
<stage>AlwaysEnabled</stage>
161+
<alwaysDisabledReleaseTokens/>
174162
</feature>
175163

176164
<feature>
177165
<name>Feature_QuickFix</name>
178166
<description>Enables the Quick Fix menu</description>
179167
<id>16599</id>
180-
<stage>AlwaysDisabled</stage>
181-
<alwaysEnabledBrandingTokens>
182-
<brandingToken>Dev</brandingToken>
183-
<brandingToken>Canary</brandingToken>
184-
<brandingToken>Preview</brandingToken>
185-
</alwaysEnabledBrandingTokens>
168+
<stage>AlwaysEnabled</stage>
169+
<alwaysDisabledReleaseTokens/>
186170
</feature>
187171

188172
<feature>
@@ -192,15 +176,4 @@
192176
<alwaysDisabledReleaseTokens/>
193177
</feature>
194178

195-
<feature>
196-
<name>Feature_DisableWebSourceIcons</name>
197-
<description>Disables icon paths that make web requests</description>
198-
<id>19075</id>
199-
<stage>AlwaysDisabled</stage>
200-
<alwaysEnabledBrandingTokens>
201-
<brandingToken>Dev</brandingToken>
202-
<brandingToken>Canary</brandingToken>
203-
</alwaysEnabledBrandingTokens>
204-
</feature>
205-
206179
</featureStaging>

tools/Generate-FeatureStagingHeader.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,11 @@ Function Resolve-FinalFeatureStage {
8989
[string]$Branding
9090
)
9191

92-
# RELEASE=DISABLED wins all checks
92+
# RELEASE=DISABLED wins all checks (WindowsInbox counts as a type of Release)
9393
# Then, branch match by most-specific branch
9494
# Then, branding type (if no overriding branch match)
9595

96-
If ($Branding -Eq "Release" -And $Feature.DisabledReleaseToken) {
96+
If ($Branding -In @("Release", "WindowsInbox") -And $Feature.DisabledReleaseToken) {
9797
[Stage]::AlwaysDisabled
9898
Return
9999
}

0 commit comments

Comments
 (0)