Swap to v3 user settings, don't use statics (or strings) when cheaper things will do

Author: JohnMcPMS

src/AppInstallerCLICore/Workflows/ConfigurationFlow.cpp

@@ -66,19 +66,32 @@ namespace AppInstaller::CLI::Workflow
         struct PredefinedResource
         {
             // RequiredModule could be empty, meaning no required modules needed.
-            std::wstring RequiredModule;
+            std::wstring_view RequiredModule;
 
-            std::vector<std::wstring> UnitTypes;
+            std::vector<std::wstring_view> UnitTypes;
         };
 
-        static const PredefinedResource s_PredefinedResourcesForExport[] = {
-            { std::wstring{ s_Module_WinGetClient }, { L"Microsoft.WinGet.DSC/WinGetUserSettings" } },
-            { L"Microsoft.Windows.Developer", { L"Microsoft.Windows.Developer/DeveloperMode", L"Microsoft.Windows.Developer/EnableDarkMode", L"Microsoft.Windows.Developer/ShowSecondsInClock", L"Microsoft.Windows.Developer/Taskbar", L"Microsoft.Windows.Developer/WindowsExplorer" }},
-        };
+        std::vector<PredefinedResource> PredefinedResourcesForExport()
+        {
+            return {
+                { {}, { L"Microsoft.WinGet/UserSettingsFile" } },
+                { L"Microsoft.Windows.Developer", { L"Microsoft.Windows.Developer/DeveloperMode", L"Microsoft.Windows.Developer/EnableDarkMode", L"Microsoft.Windows.Developer/ShowSecondsInClock", L"Microsoft.Windows.Developer/Taskbar", L"Microsoft.Windows.Developer/WindowsExplorer" } },
+            };
+        }
 
-        static const std::wstring s_PackageSettingsExclusionList[] = {
-            L"Microsoft.WinGet/", L"Microsoft.DSC.Debug/", L"Microsoft.DSC/", L"Microsoft.DSC.Transitional/", L"Microsoft.Windows/RebootPending",
-            L"Microsoft.Windows/Registry", L"Microsoft.Windows/WMI", L"Microsoft.Windows/WindowsPowerShell", L"Microsoft/OSInfo"
+        std::vector<std::wstring_view> PackageSettingsExclusionList()
+        {
+            return {
+                L"Microsoft.WinGet/",
+                L"Microsoft.DSC.Debug/",
+                L"Microsoft.DSC/",
+                L"Microsoft.DSC.Transitional/",
+                L"Microsoft.Windows/RebootPending",
+                L"Microsoft.Windows/Registry",
+                L"Microsoft.Windows/WMI",
+                L"Microsoft.Windows/WindowsPowerShell",
+                L"Microsoft/OSInfo"
+            };
         };
 
         Logging::Level ConvertLevel(DiagnosticLevel level)
@@ -1475,7 +1488,7 @@ namespace AppInstaller::CLI::Workflow
         {
             ConfigurationContext& configContext = context.Get<Data::ConfigurationContext>();
 
-            for (const auto& resources : s_PredefinedResourcesForExport)
+            for (const auto& resources : PredefinedResourcesForExport())
             {
                 std::optional<ConfigurationUnit> requiredModuleUnit;
 
@@ -1538,11 +1551,13 @@ namespace AppInstaller::CLI::Workflow
                 context.Reporter.Warn() << Resource::String::ConfigurationExportFailedToGetUnitProcessors << std::endl;
             }
 
+            auto exclusionList = PackageSettingsExclusionList();
+
             // Filter out processors in exclusion list.
             for (auto itr = unitProcessors.begin(); itr != unitProcessors.end(); /* itr incremented in the logic */)
             {
                 bool processorRemoved = false;
-                for (const auto& exclusionItem : anon::s_PackageSettingsExclusionList)
+                for (const auto& exclusionItem : exclusionList)
                 {
                     if (Utility::CaseInsensitiveStartsWith(itr->UnitType(), exclusionItem))
                     {