Init experiment

doc/admx/DesktopAppInstaller.admx

@@ -43,6 +43,16 @@
         <decimal value="0" />
       </disabledValue>
     </policy>
+    <policy name="EnableExperiments" class="Machine" displayName="$(string.EnableExperiments)" explainText="$(string.EnableExperimentsExplanation)" key="Software\Policies\Microsoft\Windows\AppInstaller" valueName="EnableExperiments">
+      <parentCategory ref="AppInstaller" />
+      <supportedOn ref="windows:SUPPORTED_Windows_10_0_RS5" />
+      <enabledValue>
+        <decimal value="1" />
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0" />
+      </disabledValue>
+    </policy>
     <policy name="EnableLocalManifestFiles" class="Machine" displayName="$(string.EnableLocalManifestFiles)" explainText="$(string.EnableLocalManifestFilesExplanation)" key="Software\Policies\Microsoft\Windows\AppInstaller" valueName="EnableLocalManifestFiles">
       <parentCategory ref="AppInstaller" />
       <supportedOn ref="windows:SUPPORTED_Windows_10_0_RS5" />

doc/admx/en-US/DesktopAppInstaller.adml

@@ -25,6 +25,12 @@ If you disable this setting, users will not be able to change settings for the W
 If you enable or do not configure this setting, users will be able to enable experimental features for the Windows Package Manager.
 
 If you disable this setting, users will not be able to enable experimental features for the Windows Package Manager.</string>
+      <string id="EnableExperiments">Enable Windows Package Manager Experiments</string>
+      <string id="EnableExperimentsExplanation">This policy controls whether users can enable experiments in the Windows Package Manager.
+
+If you enable or do not configure this setting, users will be able to enable experiments for the Windows Package Manager.
+
+If you disable this setting, users will not be able to enable experiments for the Windows Package Manager.</string>
       <string id="EnableLocalManifestFiles">Enable Windows Package Manager Local Manifest Files</string>
       <string id="EnableLocalManifestFilesExplanation">This policy controls whether users can install packages with local manifest files.
 

src/AppInstallerCLIPackage/Shared/Strings/en-us/winget.resw

@@ -897,6 +897,9 @@ They can be configured through the settings file 'winget settings'.</value>
   <data name="PolicyEnableExperimentalFeatures" xml:space="preserve">
     <value>Enable Windows App Installer Experimental Features</value>
   </data>
+  <data name="PolicyEnableExperiments" xml:space="preserve">
+    <value>Enable Windows App Installer Experiments</value>
+  </data>
   <data name="PolicyEnableMSStoreSource" xml:space="preserve">
     <value>Enable Windows App Installer Microsoft Store Source</value>
   </data>

src/AppInstallerCommonCore/AppInstallerCommonCore.vcxproj.filters

@@ -207,6 +207,9 @@
     <ClInclude Include="Public\winget\Fonts.h">
       <Filter>Public\winget</Filter>
     </ClInclude>
+    <ClInclude Include="Public\winget\Experiment.h">
+      <Filter>Public\winget</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="pch.cpp">
@@ -374,6 +377,9 @@
     <ClCompile Include="Fonts.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="Experiment.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="PropertySheet.props" />

src/AppInstallerCommonCore/Experiment.cpp

@@ -0,0 +1,68 @@
+
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+#include "pch.h"
+#include "winget/Experiment.h"
+#include "winget/UserSettings.h"
+#include "Experiment/Experiment.h"
+
+namespace AppInstaller::Settings
+{
+    namespace
+    {
+        bool IsEnabledInternal(Experiment::Key key, const UserSettings& userSettings)
+        {
+            if (key == Experiment::Key::None)
+            {
+                return true;
+            }
+
+            if (!GroupPolicies().IsEnabled(TogglePolicy::Policy::Experiments))
+            {
+                AICLI_LOG(Core, Info, <<
+                    "Experiments '" << Experiment::GetExperiment(key).Name() <<
+                    "' is disabled due to group policy: " << TogglePolicy::GetPolicy(TogglePolicy::Policy::Experiments).RegValueName());
+                return false;
+            }
+
+            auto experiments = userSettings.Get<Setting::Experiments>();
+            auto experiment = Experiment::GetExperiment(key);
+            auto jsonName = std::string(experiment.JsonName());
+            if (experiments.find(jsonName) != experiments.end())
+            {
+                return experiments[jsonName];
+            }
+
+            return AppInstaller::Experiment::IsEnabled(experiment.GetKey());
+        }
+    }
+
+    bool Experiment::IsEnabled(Key key)
+    {
+        return IsEnabledInternal(key, User());
+    }
+
+    Experiment Experiment::GetExperiment(Key key)
+    {
+        switch (key)
+        {
+        case Key::CDN:
+            return Experiment{ "CDN experiment", "CDN", "https://aka.ms/winget-settings", "CDN"};
+
+        default:
+            THROW_HR(E_UNEXPECTED);
+        }
+    }
+
+    std::vector<Experiment> Experiment::GetAllExperiments()
+    {
+        std::vector<Experiment> result;
+
+        for (Key_t i = 0x1; i < static_cast<Key_t>(Key::Max); i = i << 1)
+        {
+            result.emplace_back(GetExperiment(static_cast<Key>(i)));
+        }
+
+        return result;
+    }
+}

src/AppInstallerCommonCore/Public/winget/Experiment.h

@@ -0,0 +1,40 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+#pragma once
+#include <string>
+#include <type_traits>
+#include "AppInstallerStrings.h"
+
+namespace AppInstaller::Settings
+{
+    struct Experiment
+    {
+        enum class Key : unsigned
+        {
+            None = 0x0,
+            CDN = 0x1,
+            Max,
+        };
+
+        using Key_t = std::underlying_type_t<Key>;
+
+        Experiment(std::string_view name, std::string_view jsonName, std::string_view link, std::string key) :
+            m_name(name), m_jsonName(jsonName), m_link(link), m_key(key) {}
+
+        static bool IsEnabled(Key feature);
+
+        static Experiment GetExperiment(Experiment::Key key);
+        static std::vector<Experiment> GetAllExperiments();
+
+        std::string_view Name() const { return m_name; }
+        Utility::LocIndView JsonName() const { return m_jsonName; }
+        std::string_view Link() const { return m_link; }
+        std::string GetKey() const { return m_key; }
+
+    private:
+        std::string_view m_name;
+        Utility::LocIndView m_jsonName;
+        std::string_view m_link;
+        std::string m_key;
+    };
+}

src/AppInstallerCommonCore/Public/winget/UserSettings.h

@@ -110,6 +110,8 @@ namespace AppInstaller::Settings
         DownloadDefaultDirectory,
         // Interactivity
         InteractivityDisable,
+        // Experiments
+        Experiments,
 #ifndef AICLI_DISABLE_TEST_HOOKS
         // Debug
         EnableSelfInitiatedMinidump,
@@ -200,7 +202,11 @@ namespace AppInstaller::Settings
         SETTINGMAPPING_SPECIALIZATION(Setting::LoggingChannelPreference, std::vector<std::string>, Logging::Channel, Logging::Channel::Defaults, ".logging.channels"sv);
         // Interactivity
         SETTINGMAPPING_SPECIALIZATION(Setting::InteractivityDisable, bool, bool, false, ".interactivity.disable"sv);
-
+
+        // Experiments
+        using Experiments_t = std::map<std::string, bool>;
+        SETTINGMAPPING_SPECIALIZATION(Setting::Experiments, std::string, Experiments_t, {}, ".experiments"sv);
+
         // Used to deduce the SettingVariant type; making a variant that includes std::monostate and all SettingMapping types.
         template <size_t... I>
         inline auto Deduce(std::index_sequence<I...>) { return std::variant<std::monostate, typename SettingMapping<static_cast<Setting>(I)>::value_t...>{}; }

src/AppInstallerSharedLib/GroupPolicy.cpp

@@ -326,6 +326,8 @@ namespace AppInstaller::Settings
             return TogglePolicy(policy, "EnableWindowsPackageManagerConfiguration"sv, String::PolicyEnableWinGetConfiguration);
         case TogglePolicy::Policy::ProxyCommandLineOptions:
             return TogglePolicy(policy, "EnableWindowsPackageManagerProxyCommandLineOptions"sv, String::PolicyEnableProxyCommandLineOptions);
+        case TogglePolicy::Policy::Experiments:
+            return TogglePolicy(policy, "EnableExperiments"sv, String::PolicyEnableExperiments);
         default:
             THROW_HR(E_UNEXPECTED);
         }

src/AppInstallerSharedLib/Public/winget/GroupPolicy.h

@@ -47,6 +47,7 @@ namespace AppInstaller::Settings
             WinGetCommandLineInterfaces,
             Configuration,
             ProxyCommandLineOptions,
+            Experiments,
             Max,
         };
 

src/AppInstallerSharedLib/Public/winget/Resources.h

@@ -60,6 +60,7 @@ namespace AppInstaller
             WINGET_DEFINE_RESOURCE_STRINGID(PolicyEnableWindowsPackageManagerCommandLineInterfaces);
             WINGET_DEFINE_RESOURCE_STRINGID(PolicyEnableWinGetConfiguration);
             WINGET_DEFINE_RESOURCE_STRINGID(PolicyEnableProxyCommandLineOptions);
+            WINGET_DEFINE_RESOURCE_STRINGID(PolicyEnableExperiments);
 
             WINGET_DEFINE_RESOURCE_STRINGID(SettingsWarningInvalidFieldFormat);
             WINGET_DEFINE_RESOURCE_STRINGID(SettingsWarningInvalidFieldValue);

src/Internal/Experiment/Experiment.cpp

@@ -5,8 +5,8 @@
 
 namespace AppInstaller::Experiment
 {
-    bool IsEnabled(const std::string&, bool overrideResult)
+    bool IsEnabled(const std::string&)
     {
-        return overrideResult;
+        return true;
     }
 }

src/Internal/Experiment/Experiment.h

@@ -6,5 +6,5 @@
 
 namespace AppInstaller::Experiment
 {
-    bool IsEnabled(const std::string& experimentKey, bool overrideResult = false);
+    bool IsEnabled(const std::string& experimentKey);
 }

src/PowerShell/Microsoft.WinGet.SharedLib/Extensions/EnumPolicyExtension.cs

@@ -1,4 +1,4 @@
-// -----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // <copyright file="EnumPolicyExtension.cs" company="Microsoft Corporation">
 //     Copyright (c) Microsoft Corporation. Licensed under the MIT License.
 // </copyright>
@@ -50,6 +50,8 @@ public static string GetResourceString(this Policy policy)
                     return GroupPolicyResource.PolicyEnableWindowsPackageManagerCommandLineInterfaces;
                 case Policy.Configuration:
                     return GroupPolicyResource.PolicyEnableWinGetConfiguration;
+                case Policy.Experiments:
+                    return GroupPolicyResource.PolicyEnableExperiments;
                 default:
                     return string.Empty;
             }

src/PowerShell/Microsoft.WinGet.SharedLib/PolicySettings/Enums.cs

@@ -1,4 +1,4 @@
-// -----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // <copyright file="Enums.cs" company="Microsoft Corporation">
 //     Copyright (c) Microsoft Corporation. Licensed under the MIT License.
 // </copyright>
@@ -96,6 +96,11 @@ public enum Policy
         /// Enabled configuration.
         /// </summary>
         Configuration,
+
+        /// <summary>
+        /// Enabled experiments.
+        /// </summary>
+        Experiments,
     }
 
     /// <summary>

src/PowerShell/Microsoft.WinGet.SharedLib/PolicySettings/TogglePolicy.cs

@@ -1,4 +1,4 @@
-// -----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // <copyright file="TogglePolicy.cs" company="Microsoft Corporation">
 //     Copyright (c) Microsoft Corporation. Licensed under the MIT License.
 // </copyright>
@@ -125,6 +125,8 @@ internal static TogglePolicy Create(Policy policy)
                     return new TogglePolicy(policy, "EnableWindowsPackageManagerCommandLineInterfaces", GroupPolicyResource.PolicyEnableWindowsPackageManagerCommandLineInterfaces);
                 case Policy.Configuration:
                     return new TogglePolicy(policy, "EnableWindowsPackageManagerConfiguration", GroupPolicyResource.PolicyEnableWinGetConfiguration);
+                case Policy.Experiments:
+                    return new TogglePolicy(policy, "EnableExperiments", GroupPolicyResource.PolicyEnableExperiments);
                 default:
                     throw new ArgumentException(null, nameof(policy));
             }

src/PowerShell/Microsoft.WinGet.SharedLib/Resources/GroupPolicyResource.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -135,6 +135,9 @@
   <data name="PolicyEnableExperimentalFeatures" xml:space="preserve">
     <value>Enable Windows App Installer Experimental Features</value>
   </data>
+  <data name="PolicyEnableExperiments" xml:space="preserve">
+    <value>Enable Windows App Installer Experiments</value>
+  </data>
   <data name="PolicyEnableHashOverride" xml:space="preserve">
     <value>Enable Windows App Installer Hash Override</value>
   </data>
@@ -168,4 +171,4 @@
   <data name="PolicyNotFound" xml:space="preserve">
     <value>Error occurred when retrieving policy settings for the Group Policy : {0}</value>
   </data>
-</root>
+</root>