Add Font source group policy support (microsoft#5646)

dkbennett · web-flow · commit 15232a729515 · 2025-10-09T12:19:39.000-07:00
This is for issue [5644](microsoft#5644) * microsoft#5644 The purpose of this is to create a group policy definition in anticipation of the upcoming font support so IT administrators can be prepared for its inclusion and lead time. It is not the intent of this checkin to actually implement the font source, but to create the policy so enterprises can be better prepared for it and have more lead time to adjust. Changes: * Added the Font Source group policy and associated tests and strings. Verified build and groupPolicy tests. - [x] I have signed the [Contributor License Agreement](https://cla.opensource.microsoft.com/microsoft/winget-pkgs). - [x] I have updated the [Release Notes](../doc/ReleaseNotes.md). - [x] This pull request is related to an issue. ----- ###### Microsoft Reviewers: [Open in CodeFlow](https://microsoft.github.io/open-pr/?codeflow=https://github.com/microsoft/winget-cli/pull/5646)
diff --git a/doc/ReleaseNotes.md b/doc/ReleaseNotes.md
@@ -6,6 +6,7 @@
 ## Bug Fixes
 * Manifest validation no longer fails using `UTF-8 BOM` encoding when the schema header is on the first line
 * Upgrading a portable package with dev mode disabled will no longer remove the package from the PATH variable.
+* Fixed source open failure when there were multiple sources but less than two non-explicit sources.
 
 ## Experimental Features
 * Experimental support for Fonts
diff --git a/doc/admx/DesktopAppInstaller.admx b/doc/admx/DesktopAppInstaller.admx
@@ -103,6 +103,16 @@
         <decimal value="0" />
       </disabledValue>
     </policy>
+    <policy name="EnableFontSource" class="Machine" displayName="$(string.EnableFontSource)" explainText="$(string.EnableFontSourceExplanation)" key="Software\Policies\Microsoft\Windows\AppInstaller" valueName="EnableFontSource">
+      <parentCategory ref="AppInstaller" />
+      <supportedOn ref="windows:SUPPORTED_Windows_10_0_RS5" />
+      <enabledValue>
+        <decimal value="1" />
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0" />
+      </disabledValue>
+    </policy>
     <policy name="SourceAutoUpdateInterval" class="Machine" displayName="$(string.SourceAutoUpdateInterval)" explainText="$(string.SourceAutoUpdateIntervalExplanation)" presentation="$(presentation.SourceAutoUpdateInterval)" key="Software\Policies\Microsoft\Windows\AppInstaller">
       <parentCategory ref="AppInstaller" />
       <supportedOn ref="windows:SUPPORTED_Windows_10_0_RS5" />
diff --git a/doc/admx/en-US/DesktopAppInstaller.adml b/doc/admx/en-US/DesktopAppInstaller.adml
@@ -67,6 +67,16 @@ If you do not configure this setting, the Microsoft Store source for the Windows
 If you enable this setting, the Microsoft Store source for the Windows Package Manager will be available and cannot be removed.
 
 If you disable this setting the Microsoft Store source for the Windows Package Manager will not be available.</string>
+      <string id="EnableFontSource">Enable Windows Package Manager Font Source</string>
+      <string id="EnableFontSourceExplanation">
+        This policy controls the Font source included with the Windows Package Manager.
+
+        If you do not configure this setting, the Font source for the Windows Package manager will be available and can be removed.
+
+        If you enable this setting, the Font source for the Windows Package Manager will be available and cannot be removed.
+
+        If you disable this setting the Font source for the Windows Package Manager will not be available.
+      </string>
       <string id="SourceAutoUpdateInterval">Set Windows Package Manager Source Auto Update Interval In Minutes</string>
       <string id="SourceAutoUpdateIntervalExplanation">This policy controls the auto-update interval for package-based sources. The default source for Windows Package Manager is configured such that an index of the packages is cached on the local machine. The index is downloaded when a user invokes a command, and the interval has passed.
 
diff --git a/src/AppInstallerCLICore/ConfigurationWingetDscModuleUnitValidation.cpp b/src/AppInstallerCLICore/ConfigurationWingetDscModuleUnitValidation.cpp
@@ -19,6 +19,7 @@ namespace AppInstaller::CLI::Configuration
 
         constexpr static std::string_view WellKnownSourceName_WinGet = "winget"sv;
         constexpr static std::string_view WellKnownSourceName_MSStore = "msstore"sv;
+        constexpr static std::string_view WellKnownSourceName_WinGetFont = "winget-font"sv;
 
         constexpr static std::string_view ValueSetKey_TreatAsArray = "treatAsArray"sv;
 
@@ -101,7 +102,8 @@ namespace AppInstaller::CLI::Configuration
         bool IsWellKnownSourceName(std::string_view sourceName)
         {
             return Utility::CaseInsensitiveEquals(WellKnownSourceName_WinGet, sourceName) ||
-                Utility::CaseInsensitiveEquals(WellKnownSourceName_MSStore, sourceName);
+                Utility::CaseInsensitiveEquals(WellKnownSourceName_MSStore, sourceName) ||
+                Utility::CaseInsensitiveEquals(WellKnownSourceName_WinGetFont, sourceName);
         }
 
         bool ValidateWellKnownSource(const WinGetSource& source)
@@ -110,6 +112,7 @@ namespace AppInstaller::CLI::Configuration
             {
                 Repository::Source{ Repository::WellKnownSource::WinGet }.GetDetails(),
                 Repository::Source{ Repository::WellKnownSource::MicrosoftStore }.GetDetails(),
+                Repository::Source{ Repository::WellKnownSource::WinGetFont }.GetDetails(),
             };
 
             for (auto const& wellKnownSource : wellKnownSourceDetails)
diff --git a/src/AppInstallerCLIE2ETests/FeaturesCommand.cs b/src/AppInstallerCLIE2ETests/FeaturesCommand.cs
@@ -53,6 +53,7 @@ public void EnableExperimentalFeatures()
             WinGetSettingsHelper.ConfigureFeature("experimentalCmd", true);
             WinGetSettingsHelper.ConfigureFeature("directMSI", true);
             WinGetSettingsHelper.ConfigureFeature("resume", true);
+            WinGetSettingsHelper.ConfigureFeature("fonts", true);
             var result = TestCommon.RunAICLICommand("features", string.Empty);
             Assert.True(result.StdOut.Contains("Enabled"));
         }
diff --git a/src/AppInstallerCLIE2ETests/GroupPolicy.cs b/src/AppInstallerCLIE2ETests/GroupPolicy.cs
@@ -160,6 +160,23 @@ public void EnableMicrosoftStoreSource()
             Assert.AreEqual(Constants.ErrorCode.S_OK, result.ExitCode);
         }
 
+        /// <summary>
+        /// Test font source is enabled by policy.
+        /// </summary>
+        [Test]
+        public void EnableFontSource()
+        {
+            WinGetSettingsHelper.ConfigureFeature("fonts", true);
+            GroupPolicyHelper.EnableFontSource.Disable();
+
+            var result = TestCommon.RunAICLICommand("source list", "winget-font");
+            Assert.AreEqual(Constants.ErrorCode.ERROR_SOURCE_NAME_DOES_NOT_EXIST, result.ExitCode);
+
+            GroupPolicyHelper.EnableFontSource.Enable();
+            result = TestCommon.RunAICLICommand("source list", "winget-font");
+            Assert.AreEqual(Constants.ErrorCode.S_OK, result.ExitCode);
+        }
+
         /// <summary>
         /// Test additional sources are enabled by policy.
         /// </summary>
diff --git a/src/AppInstallerCLIE2ETests/GroupPolicyHelper.cs b/src/AppInstallerCLIE2ETests/GroupPolicyHelper.cs
@@ -103,6 +103,11 @@ private GroupPolicyHelper(string name, string elementId)
         /// </summary>
         public static GroupPolicyHelper EnableMicrosoftStoreSource { get; private set; } = new GroupPolicyHelper("EnableMicrosoftStoreSource");
 
+        /// <summary>
+        /// Gets the Enable font source policy.
+        /// </summary>
+        public static GroupPolicyHelper EnableFontSource { get; private set; } = new GroupPolicyHelper("EnableFontSource");
+
         /// <summary>
         /// Gets the Enable additional sources policy.
         /// </summary>
@@ -138,6 +143,7 @@ private GroupPolicyHelper(string name, string elementId)
             EnableLocalArchiveMalwareScanOverride,
             EnableDefaultSource,
             EnableMicrosoftStoreSource,
+            EnableFontSource,
             EnableAdditionalSources,
             EnableAllowedSources,
             SourceAutoUpdateInterval,
diff --git a/src/AppInstallerCLIE2ETests/Helpers/WinGetSettingsHelper.cs b/src/AppInstallerCLIE2ETests/Helpers/WinGetSettingsHelper.cs
@@ -226,6 +226,7 @@ public static void InitializeAllFeatures(bool status)
             ConfigureFeature(settingsJson, "windowsFeature", status);
             ConfigureFeature(settingsJson, "resume", status);
             ConfigureFeature(settingsJson, "reboot", status);
+            ConfigureFeature(settingsJson, "fonts", status);
 
             SetWingetSettings(settingsJson);
         }
diff --git a/src/AppInstallerCLIPackage/Shared/Strings/en-us/winget.resw b/src/AppInstallerCLIPackage/Shared/Strings/en-us/winget.resw
@@ -900,6 +900,9 @@ They can be configured through the settings file 'winget settings'.</value>
   <data name="PolicyEnableMSStoreSource" xml:space="preserve">
     <value>Enable Windows App Installer Microsoft Store Source</value>
   </data>
+  <data name="PolicyEnableFontSource" xml:space="preserve">
+    <value>Enable Windows App Installer Font Source</value>
+  </data>
   <data name="PolicyEnableWinGetSettings" xml:space="preserve">
     <value>Enable Windows Package Manager Settings</value>
   </data>
diff --git a/src/AppInstallerCLITests/GroupPolicy.cpp b/src/AppInstallerCLITests/GroupPolicy.cpp
@@ -395,7 +395,8 @@ TEST_CASE("GroupPolicy_AllEnabled", "[groupPolicy]")
     SetRegistryValue(policiesKey.get(), EnableHashOverridePolicyValueName, 1);
     SetRegistryValue(policiesKey.get(), EnableLocalArchiveMalwareScanOverridePolicyValueName, 1);
     SetRegistryValue(policiesKey.get(), DefaultSourcePolicyValueName, 1);
-    SetRegistryValue(policiesKey.get(), MSStoreSourcePolicyValueName, 1);;
+    SetRegistryValue(policiesKey.get(), MSStoreSourcePolicyValueName, 1);
+    SetRegistryValue(policiesKey.get(), FontSourcePolicyValueName, 1);
     SetRegistryValue(policiesKey.get(), AdditionalSourcesPolicyValueName, 1);
     SetRegistryValue(policiesKey.get(), AllowedSourcesPolicyValueName, 1);
     SetRegistryValue(policiesKey.get(), BypassCertificatePinningForMicrosoftStoreValueName, 1);
diff --git a/src/AppInstallerCLITests/TestSettings.h b/src/AppInstallerCLITests/TestSettings.h
@@ -17,6 +17,7 @@ namespace TestCommon
     const std::wstring EnableLocalArchiveMalwareScanOverridePolicyValueName = L"EnableLocalArchiveMalwareScanOverride";
     const std::wstring DefaultSourcePolicyValueName = L"EnableDefaultSource";
     const std::wstring MSStoreSourcePolicyValueName = L"EnableMicrosoftStoreSource";
+    const std::wstring FontSourcePolicyValueName = L"EnableFontSource";
     const std::wstring AdditionalSourcesPolicyValueName = L"EnableAdditionalSources";
     const std::wstring AllowedSourcesPolicyValueName = L"EnableAllowedSources";
     const std::wstring BypassCertificatePinningForMicrosoftStoreValueName = L"EnableBypassCertificatePinningForMicrosoftStore";
diff --git a/src/AppInstallerRepositoryCore/Public/winget/RepositorySource.h b/src/AppInstallerRepositoryCore/Public/winget/RepositorySource.h
@@ -96,6 +96,7 @@ namespace AppInstaller::Repository
         WinGet,
         MicrosoftStore,
         DesktopFrameworks,
+        WinGetFont,
     };
 
     // Search behavior for composite sources.
diff --git a/src/AppInstallerRepositoryCore/RepositorySource.cpp b/src/AppInstallerRepositoryCore/RepositorySource.cpp
@@ -564,7 +564,10 @@ namespace AppInstaller::Repository
                     }
                 }
 
-                m_isComposite = true;
+                if (m_sourceReferences.size() > 1)
+                {
+                    m_isComposite = true;
+                }
             }
         }
         else
diff --git a/src/AppInstallerRepositoryCore/SourceList.cpp b/src/AppInstallerRepositoryCore/SourceList.cpp
@@ -48,6 +48,11 @@ namespace AppInstaller::Repository
         constexpr std::string_view s_Source_DesktopFrameworks_Data = "Microsoft.Winget.Platform.Source_8wekyb3d8bbwe"sv;
         constexpr std::string_view s_Source_DesktopFrameworks_Identifier = "Microsoft.Winget.Platform.Source_8wekyb3d8bbwe"sv;
 
+        constexpr std::string_view s_Source_WingetCommunityFont_Name = "winget-font"sv;
+        constexpr std::string_view s_Source_WingetCommunityFont_Arg = "https://cdn.winget.microsoft.com/fonts"sv;
+        constexpr std::string_view s_Source_WingetCommunityFont_Data = "Microsoft.Winget.Fonts.Source_8wekyb3d8bbwe"sv;
+        constexpr std::string_view s_Source_WingetCommunityFont_Identifier = "Microsoft.Winget.Fonts.Source_8wekyb3d8bbwe"sv;
+
         // Attempts to read a single scalar value from the node.
         template<typename Value>
         bool TryReadScalar(std::string_view settingName, const std::string& settingValue, const YAML::Node& sourceNode, std::string_view name, Value& value, bool required = true)
@@ -241,6 +246,8 @@ namespace AppInstaller::Repository
             return s_Source_MSStoreDefault_Name;
         case WellKnownSource::DesktopFrameworks:
             return s_Source_DesktopFrameworks_Name;
+        case WellKnownSource::WinGetFont:
+            return s_Source_WingetCommunityFont_Name;
         }
 
         return {};
@@ -256,6 +263,8 @@ namespace AppInstaller::Repository
             return s_Source_MSStoreDefault_Arg;
         case WellKnownSource::DesktopFrameworks:
             return s_Source_DesktopFrameworks_Arg;
+        case WellKnownSource::WinGetFont:
+            return s_Source_WingetCommunityFont_Arg;
         }
 
         return {};
@@ -271,6 +280,8 @@ namespace AppInstaller::Repository
             return s_Source_MSStoreDefault_Identifier;
         case WellKnownSource::DesktopFrameworks:
             return s_Source_DesktopFrameworks_Identifier;
+        case WellKnownSource::WinGetFont:
+            return s_Source_WingetCommunityFont_Identifier;
         }
 
         return {};
@@ -293,6 +304,11 @@ namespace AppInstaller::Repository
             return WellKnownSource::DesktopFrameworks;
         }
 
+        if (name == s_Source_WingetCommunityFont_Name && arg == s_Source_WingetCommunityFont_Arg && type == Rest::RestSourceFactory::Type())
+        {
+            return WellKnownSource::WinGetFont;
+        }
+
         return {};
     }
 
@@ -376,6 +392,19 @@ namespace AppInstaller::Repository
             details.IsVisible = false;
             return details;
         }
+        case WellKnownSource::WinGetFont:
+        {
+            SourceDetailsInternal details;
+            details.Origin = SourceOrigin::Default;
+            details.Name = s_Source_WingetCommunityFont_Name;
+            details.Type = Microsoft::PreIndexedPackageSourceFactory::Type();
+            details.Arg = s_Source_WingetCommunityFont_Arg;
+            details.Data = s_Source_WingetCommunityFont_Data;
+            details.Identifier = s_Source_WingetCommunityFont_Identifier;
+            details.TrustLevel = SourceTrustLevel::Trusted | SourceTrustLevel::StoreOrigin;
+            details.Explicit = true;
+            return details;
+        }
         }
 
         THROW_HR(E_UNEXPECTED);
@@ -635,6 +664,11 @@ namespace AppInstaller::Repository
                 result.emplace_back(GetWellKnownSourceDetailsInternal(WellKnownSource::WinGet));
             }
 
+            if (IsWellKnownSourceEnabled(WellKnownSource::WinGetFont))
+            {
+                result.emplace_back(GetWellKnownSourceDetailsInternal(WellKnownSource::WinGetFont));
+            }
+
             // Since the source is not visible outside, this is added just to have the source in the internal
             // list for tracking updates.  Thus there is no need to check a policy.
             result.emplace_back(GetWellKnownSourceDetailsInternal(WellKnownSource::DesktopFrameworks));
diff --git a/src/AppInstallerRepositoryCore/SourcePolicy.cpp b/src/AppInstallerRepositoryCore/SourcePolicy.cpp
@@ -101,6 +101,11 @@ namespace AppInstaller::Repository
                 return TogglePolicy::Policy::MSStoreSource;
             }
 
+            if (name == GetWellKnownSourceName(WellKnownSource::WinGetFont) && IsWellKnownSourceEnabled(WellKnownSource::WinGetFont, true))
+            {
+                return TogglePolicy::Policy::FontSource;
+            }
+
             // Any other tombstone is allowed
             return TogglePolicy::Policy::None;
         }
@@ -122,6 +127,12 @@ namespace AppInstaller::Repository
             return IsWellKnownSourceEnabled(WellKnownSource::MicrosoftStore) ? TogglePolicy::Policy::None : TogglePolicy::Policy::MSStoreSource;
         }
 
+        if (Utility::CaseInsensitiveEquals(arg, GetWellKnownSourceArg(WellKnownSource::WinGetFont)) &&
+            Utility::CaseInsensitiveEquals(type, Microsoft::PreIndexedPackageSourceFactory::Type()))
+        {
+            return IsWellKnownSourceEnabled(WellKnownSource::WinGetFont) ? TogglePolicy::Policy::None : TogglePolicy::Policy::FontSource;
+        }
+
         // Case 3:
         // If the source has the same name as a default source, it is shadowing with a different argument
         // (as it didn't match above). We only care if Group Policy requires the default source.
@@ -137,6 +148,12 @@ namespace AppInstaller::Repository
             return TogglePolicy::Policy::MSStoreSource;
         }
 
+        if (name == GetWellKnownSourceName(WellKnownSource::WinGetFont) && IsWellKnownSourceEnabled(WellKnownSource::WinGetFont, true))
+        {
+            AICLI_LOG(Repo, Warning, << "User source is not allowed as it shadows a default font source. Name [" << name << "]. Arg [" << arg << "] Type [" << type << ']');
+            return TogglePolicy::Policy::FontSource;
+        }
+
         // Case 4:
         // The guard in the source add command should already block adding.
         // This check drops existing user sources.
@@ -173,6 +190,8 @@ namespace AppInstaller::Repository
             return IsDefaultSourceEnabled(source, ExperimentalFeature::Feature::None, onlyExplicit, TogglePolicy::Policy::DefaultSource);
         case AppInstaller::Repository::WellKnownSource::MicrosoftStore:
             return IsDefaultSourceEnabled(source, ExperimentalFeature::Feature::None, onlyExplicit, TogglePolicy::Policy::MSStoreSource);
+        case AppInstaller::Repository::WellKnownSource::WinGetFont:
+            return IsDefaultSourceEnabled(source, ExperimentalFeature::Feature::Font, onlyExplicit, TogglePolicy::Policy::FontSource);
         case AppInstaller::Repository::WellKnownSource::DesktopFrameworks:
             // No corresponding policy available for this source.
             return true;
@@ -204,6 +223,12 @@ namespace AppInstaller::Repository
             {
                 throw GroupPolicyException(TogglePolicy::Policy::MSStoreSource);
             }
+
+            if (GroupPolicies().GetState(TogglePolicy::Policy::FontSource) == PolicyState::Enabled &&
+                source.Identifier == GetWellKnownSourceIdentifier(WellKnownSource::WinGetFont))
+            {
+                throw GroupPolicyException(TogglePolicy::Policy::FontSource);
+            }
         }
     }
 }
diff --git a/src/AppInstallerSharedLib/GroupPolicy.cpp b/src/AppInstallerSharedLib/GroupPolicy.cpp
@@ -314,6 +314,8 @@ namespace AppInstaller::Settings
             return TogglePolicy(policy, "EnableDefaultSource"sv, String::PolicyEnableDefaultSource);
         case TogglePolicy::Policy::MSStoreSource:
             return TogglePolicy(policy, "EnableMicrosoftStoreSource"sv, String::PolicyEnableMSStoreSource);
+        case TogglePolicy::Policy::FontSource:
+            return TogglePolicy(policy, "EnableFontSource"sv, String::PolicyEnableFontSource);
         case TogglePolicy::Policy::AdditionalSources:
             return TogglePolicy(policy, "EnableAdditionalSources"sv, String::PolicyAdditionalSources);
         case TogglePolicy::Policy::AllowedSources:
diff --git a/src/AppInstallerSharedLib/Public/winget/GroupPolicy.h b/src/AppInstallerSharedLib/Public/winget/GroupPolicy.h
@@ -41,6 +41,7 @@ namespace AppInstaller::Settings
             LocalArchiveMalwareScanOverride,
             DefaultSource,
             MSStoreSource,
+            FontSource,
             AdditionalSources,
             AllowedSources,
             BypassCertificatePinningForMicrosoftStore,
diff --git a/src/AppInstallerSharedLib/Public/winget/Resources.h b/src/AppInstallerSharedLib/Public/winget/Resources.h
@@ -53,6 +53,7 @@ namespace AppInstaller
             WINGET_DEFINE_RESOURCE_STRINGID(PolicyEnableLocalArchiveMalwareScanOverride);
             WINGET_DEFINE_RESOURCE_STRINGID(PolicyEnableDefaultSource);
             WINGET_DEFINE_RESOURCE_STRINGID(PolicyEnableMSStoreSource);
+            WINGET_DEFINE_RESOURCE_STRINGID(PolicyEnableFontSource);
             WINGET_DEFINE_RESOURCE_STRINGID(PolicyAdditionalSources);
             WINGET_DEFINE_RESOURCE_STRINGID(PolicyAllowedSources);
             WINGET_DEFINE_RESOURCE_STRINGID(PolicySourceAutoUpdateInterval);
diff --git a/src/Microsoft.Management.Deployment/PackageCatalogReference.cpp b/src/Microsoft.Management.Deployment/PackageCatalogReference.cpp
@@ -53,7 +53,8 @@ namespace winrt::Microsoft::Management::Deployment::implementation
             m_packageCatalogBackgroundUpdateInterval = s_PackageCatalogUpdateIntervalDelay_Base + std::chrono::seconds(distribution(randomEngine));
 
             // Prevent any update / data processing by default for these background processes for now
-            m_installedPackageInformationOnly = m_sourceReference.IsWellKnownSource(AppInstaller::Repository::WellKnownSource::WinGet);
+            m_installedPackageInformationOnly = m_sourceReference.IsWellKnownSource(AppInstaller::Repository::WellKnownSource::WinGet) ||
+                                                m_sourceReference.IsWellKnownSource(AppInstaller::Repository::WellKnownSource::WinGetFont);
         }
     }
 
diff --git a/src/Microsoft.Management.Deployment/PackageManager.cpp b/src/Microsoft.Management.Deployment/PackageManager.cpp
@@ -186,6 +186,9 @@ namespace winrt::Microsoft::Management::Deployment::implementation
         case winrt::Microsoft::Management::Deployment::PredefinedPackageCatalog::DesktopFrameworks:
             source = ::AppInstaller::Repository::Source{ ::AppInstaller::Repository::WellKnownSource::DesktopFrameworks };
             break;
+        case winrt::Microsoft::Management::Deployment::PredefinedPackageCatalog::OpenWindowsCatalogFont:
+            source = ::AppInstaller::Repository::Source{ ::AppInstaller::Repository::WellKnownSource::WinGetFont };
+            break;
         default:
             throw hresult_invalid_argument();
         }
diff --git a/src/Microsoft.Management.Deployment/PackageManager.idl b/src/Microsoft.Management.Deployment/PackageManager.idl
@@ -967,6 +967,10 @@ namespace Microsoft.Management.Deployment
         OpenWindowsCatalog,
         MicrosoftStore,
         DesktopFrameworks,
+        [contract(Microsoft.Management.Deployment.WindowsPackageManagerContract, 13)]
+        {
+            OpenWindowsCatalogFont,
+        },
     };
 
     /// Local Catalogs with PackageCatalogOrigin Predefined
diff --git a/src/PowerShell/Microsoft.WinGet.SharedLib/Extensions/EnumPolicyExtension.cs b/src/PowerShell/Microsoft.WinGet.SharedLib/Extensions/EnumPolicyExtension.cs
diff --git a/src/PowerShell/Microsoft.WinGet.SharedLib/PolicySettings/Enums.cs b/src/PowerShell/Microsoft.WinGet.SharedLib/PolicySettings/Enums.cs
diff --git a/src/PowerShell/Microsoft.WinGet.SharedLib/PolicySettings/TogglePolicy.cs b/src/PowerShell/Microsoft.WinGet.SharedLib/PolicySettings/TogglePolicy.cs
diff --git a/src/PowerShell/Microsoft.WinGet.SharedLib/Resources/GroupPolicyResource.Designer.cs b/src/PowerShell/Microsoft.WinGet.SharedLib/Resources/GroupPolicyResource.Designer.cs
diff --git a/src/PowerShell/Microsoft.WinGet.SharedLib/Resources/GroupPolicyResource.resx b/src/PowerShell/Microsoft.WinGet.SharedLib/Resources/GroupPolicyResource.resx

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ namespace AppInstaller::CLI::Configuration`
`19`	`19`
`20`	`20`	`constexpr static std::string_view WellKnownSourceName_WinGet = "winget"sv;`
`21`	`21`	`constexpr static std::string_view WellKnownSourceName_MSStore = "msstore"sv;`
	`22`	`+ constexpr static std::string_view WellKnownSourceName_WinGetFont = "winget-font"sv;`
`22`	`23`
`23`	`24`	`constexpr static std::string_view ValueSetKey_TreatAsArray = "treatAsArray"sv;`
`24`	`25`
`@@ -101,7 +102,8 @@ namespace AppInstaller::CLI::Configuration`
`101`	`102`	`bool IsWellKnownSourceName(std::string_view sourceName)`
`102`	`103`	`{`
`103`	`104`	`return Utility::CaseInsensitiveEquals(WellKnownSourceName_WinGet, sourceName) \|\|`
`104`		`- Utility::CaseInsensitiveEquals(WellKnownSourceName_MSStore, sourceName);`
	`105`	`+ Utility::CaseInsensitiveEquals(WellKnownSourceName_MSStore, sourceName) \|\|`
	`106`	`+ Utility::CaseInsensitiveEquals(WellKnownSourceName_WinGetFont, sourceName);`
`105`	`107`	`}`
`106`	`108`
`107`	`109`	`bool ValidateWellKnownSource(const WinGetSource& source)`
`@@ -110,6 +112,7 @@ namespace AppInstaller::CLI::Configuration`
`110`	`112`	`{`
`111`	`113`	`Repository::Source{ Repository::WellKnownSource::WinGet }.GetDetails(),`
`112`	`114`	`Repository::Source{ Repository::WellKnownSource::MicrosoftStore }.GetDetails(),`
	`115`	`+ Repository::Source{ Repository::WellKnownSource::WinGetFont }.GetDetails(),`
`113`	`116`	`};`
`114`	`117`
`115`	`118`	`for (auto const& wellKnownSource : wellKnownSourceDetails)`
Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@ public void EnableExperimentalFeatures()`
`53`	`53`	`WinGetSettingsHelper.ConfigureFeature("experimentalCmd", true);`
`54`	`54`	`WinGetSettingsHelper.ConfigureFeature("directMSI", true);`
`55`	`55`	`WinGetSettingsHelper.ConfigureFeature("resume", true);`
	`56`	`+ WinGetSettingsHelper.ConfigureFeature("fonts", true);`
`56`	`57`	`var result = TestCommon.RunAICLICommand("features", string.Empty);`
`57`	`58`	`Assert.True(result.StdOut.Contains("Enabled"));`
`58`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -226,6 +226,7 @@ public static void InitializeAllFeatures(bool status)`
`226`	`226`	`ConfigureFeature(settingsJson, "windowsFeature", status);`
`227`	`227`	`ConfigureFeature(settingsJson, "resume", status);`
`228`	`228`	`ConfigureFeature(settingsJson, "reboot", status);`
	`229`	`+ ConfigureFeature(settingsJson, "fonts", status);`
`229`	`230`
`230`	`231`	`SetWingetSettings(settingsJson);`
`231`	`232`	`}`