From a53cd33058d5db5d454d4e6bc19f867926befbb9 Mon Sep 17 00:00:00 2001
From: "Dustin L. Howett" <dustin@howett.net>
Date: Tue, 2 Dec 2025 10:53:09 -0600
Subject: [PATCH] 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.
---
 src/features.xml                        | 43 +++++--------------------
 tools/Generate-FeatureStagingHeader.ps1 |  4 +--
 2 files changed, 10 insertions(+), 37 deletions(-)

diff --git a/src/features.xml b/src/features.xml
index 9b115a0c06..7269ccec0a 100644
--- a/src/features.xml
+++ b/src/features.xml
@@ -99,24 +99,16 @@
         <name>Feature_DynamicSSHProfiles</name>
         <description>Enables the dynamic profile generator for OpenSSH config files</description>
         <id>9031</id>
-        <stage>AlwaysDisabled</stage>
-        <alwaysEnabledBrandingTokens>
-            <brandingToken>Dev</brandingToken>
-            <brandingToken>Canary</brandingToken>
-            <brandingToken>Preview</brandingToken>
-        </alwaysEnabledBrandingTokens>
+        <stage>AlwaysEnabled</stage>
+        <alwaysDisabledReleaseTokens/>
     </feature>
 
     <feature>
         <name>Feature_ShellCompletions</name>
         <description>An experimental escape sequence for client applications to request the Terminal display a list of suggestions.</description>
         <id>3121</id>
-        <stage>AlwaysDisabled</stage>
-        <alwaysEnabledBrandingTokens>
-            <brandingToken>Dev</brandingToken>
-            <brandingToken>Canary</brandingToken>
-            <brandingToken>Preview</brandingToken>
-        </alwaysEnabledBrandingTokens>
+        <stage>AlwaysEnabled</stage>
+        <alwaysDisabledReleaseTokens/>
     </feature>
 
     <feature>
@@ -165,24 +157,16 @@
         <name>Feature_SaveSnippet</name>
         <description>Save Snippet</description>
         <id>9971</id>
-        <stage>AlwaysDisabled</stage>
-        <alwaysEnabledBrandingTokens>
-            <brandingToken>Dev</brandingToken>
-            <brandingToken>Canary</brandingToken>
-            <brandingToken>Preview</brandingToken>
-        </alwaysEnabledBrandingTokens>
+        <stage>AlwaysEnabled</stage>
+        <alwaysDisabledReleaseTokens/>
     </feature>
 
     <feature>
         <name>Feature_QuickFix</name>
         <description>Enables the Quick Fix menu</description>
         <id>16599</id>
-        <stage>AlwaysDisabled</stage>
-        <alwaysEnabledBrandingTokens>
-            <brandingToken>Dev</brandingToken>
-            <brandingToken>Canary</brandingToken>
-            <brandingToken>Preview</brandingToken>
-        </alwaysEnabledBrandingTokens>
+        <stage>AlwaysEnabled</stage>
+        <alwaysDisabledReleaseTokens/>
     </feature>
 
     <feature>
@@ -192,15 +176,4 @@
         <alwaysDisabledReleaseTokens/>
     </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>
diff --git a/tools/Generate-FeatureStagingHeader.ps1 b/tools/Generate-FeatureStagingHeader.ps1
index cc78685b8b..527d20fcb2 100644
--- a/tools/Generate-FeatureStagingHeader.ps1
+++ b/tools/Generate-FeatureStagingHeader.ps1
@@ -89,11 +89,11 @@ Function Resolve-FinalFeatureStage {
         [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, branding type (if no overriding branch match)
 
-    If ($Branding -Eq "Release" -And $Feature.DisabledReleaseToken) {
+    If ($Branding -In @("Release", "WindowsInbox") -And $Feature.DisabledReleaseToken) {
         [Stage]::AlwaysDisabled
         Return
     }