Merge remote-tracking branch 'yao/exportall' into testmerge

Author: florelis

.github/actions/spelling/expect.txt

@@ -595,6 +595,7 @@ wingetutil
 winreg
 winrtact
 winstring
+WMI
 Wnd
 WNDCLASS
 WNDCLASSEX

azure-pipelines.yml

@@ -379,6 +379,13 @@ jobs:
     displayName: Install DSC v3
     condition: succeededOrFailed()
 
+    # Install required DSC modules until export all command can handle auto acquisition
+  - pwsh: |
+      Install-Module -Name Microsoft.WinGet.DSC -Force
+      Install-Module -Name Microsoft.Windows.Developer -AllowPrerelease -Force
+    displayName: Install Required DSC Modules for Tests
+    condition: succeededOrFailed()
+
   - task: PowerShell@2
     displayName: Run Unit Tests Packaged
     inputs:

src/AppInstallerCLICore/Commands/DebugCommand.cpp

@@ -106,6 +106,7 @@ namespace AppInstaller::CLI
         OutputProxyStubInterfaceRegistration<winrt::Windows::Foundation::Collections::IIterable<winrt::Microsoft::Management::Configuration::ConfigurationEnvironment>>(context);
         OutputProxyStubInterfaceRegistration<winrt::Windows::Foundation::Collections::IIterable<winrt::Microsoft::Management::Configuration::IConfigurationUnitProcessorDetails>>(context);
         OutputProxyStubInterfaceRegistration<winrt::Microsoft::Management::Configuration::IConfigurationUnitProcessorDetails2>(context);
+        OutputProxyStubInterfaceRegistration<winrt::Microsoft::Management::Configuration::IConfigurationUnitProcessorDetails3>(context);
         OutputProxyStubInterfaceRegistration<winrt::Microsoft::Management::Configuration::IGetAllSettingsConfigurationUnitProcessor>(context);
         OutputProxyStubInterfaceRegistration<winrt::Microsoft::Management::Configuration::IGetAllUnitsConfigurationUnitProcessor>(context);
         OutputProxyStubInterfaceRegistration<winrt::Microsoft::Management::Configuration::IFindUnitProcessorsSetProcessor>(context);

src/AppInstallerCLICore/ConfigurationSetProcessorFactoryRemoting.cpp

@@ -28,19 +28,6 @@ namespace AppInstaller::CLI::ConfigurationRemoting
         // The string used to divide the arguments sent to the remote server
         constexpr std::wstring_view s_ArgumentsDivider = L"\n~~~~~~\n"sv;
 
-        std::wstring_view ToString(ProcessorEngine value)
-        {
-            switch (value)
-            {
-            case ProcessorEngine::PowerShell:
-                return s_ProcessorEngine_PowerShell;
-            case ProcessorEngine::DSCv3:
-                return s_ProcessorEngine_DSCv3;
-            default:
-                THROW_HR(E_UNEXPECTED);
-            }
-        }
-
         // A helper with a convenient function that we use to receive the remote factory object.
         struct RemoteFactoryCallback : winrt::implements<RemoteFactoryCallback, IConfigurationStatics>
         {
@@ -373,6 +360,19 @@ namespace AppInstaller::CLI::ConfigurationRemoting
         }
     }
 
+    std::wstring_view ToString(ProcessorEngine value)
+    {
+        switch (value)
+        {
+        case ProcessorEngine::PowerShell:
+            return s_ProcessorEngine_PowerShell;
+        case ProcessorEngine::DSCv3:
+            return s_ProcessorEngine_DSCv3;
+        default:
+            THROW_HR(E_UNEXPECTED);
+        }
+    }
+
     winrt::hstring ToHString(PropertyName name)
     {
         switch (name)

src/AppInstallerCLICore/ConfigureExportCommand.cpp

@@ -44,9 +44,8 @@ namespace AppInstaller::CLI
     {
         context <<
             VerifyIsFullPackage <<
-            SearchSourceForPackageExport <<
             CreateConfigurationProcessorWithoutFactory <<
-            CreateOrOpenConfigurationSet{} <<
+            CreateOrOpenConfigurationSet{ "0.3", context.Args.Contains(Execution::Args::Type::ConfigurationExportAll) } <<
             CreateConfigurationProcessor <<
             PopulateConfigurationSetForExport <<
             WriteConfigFile;

src/AppInstallerCLICore/PackageCollection.h

@@ -28,7 +28,8 @@ namespace AppInstaller::CLI
 
             Utility::LocIndString Id;
             Utility::VersionAndChannel VersionAndChannel;
-            Manifest::ScopeEnum Scope = Manifest::ScopeEnum::Unknown;
+            Manifest::ScopeEnum Scope = Manifest::ScopeEnum::Unknown;
+            std::filesystem::path InstalledLocation;
         };
 
         // A source along with a set of packages available from it.
@@ -76,4 +77,4 @@ namespace AppInstaller::CLI
         // Tries to parse a JSON into a collection of packages.
         ParseResult TryParseJson(const Json::Value& root);
     }
-}
+}

src/AppInstallerCLICore/Public/ConfigurationSetProcessorFactoryRemoting.h

@@ -17,6 +17,8 @@ namespace AppInstaller::CLI::ConfigurationRemoting
         DSCv3,
     };
 
+    std::wstring_view ToString(ProcessorEngine value);
+
     // Determines the appropriate processor engine to use for the given configuration set.
     ProcessorEngine DetermineProcessorEngine(winrt::Microsoft::Management::Configuration::ConfigurationSet set);
 

src/AppInstallerCLICore/Resources.h

@@ -57,6 +57,7 @@ namespace AppInstaller::CLI::Resource
         WINGET_DEFINE_RESOURCE_STRINGID(ConfigurationAcceptWarningArgumentDescription);
         WINGET_DEFINE_RESOURCE_STRINGID(ConfigurationAllUsersElevated);
         WINGET_DEFINE_RESOURCE_STRINGID(ConfigurationApply);
+        WINGET_DEFINE_RESOURCE_STRINGID(ConfigurationApplyingUnit);
         WINGET_DEFINE_RESOURCE_STRINGID(ConfigurationAssert);
         WINGET_DEFINE_RESOURCE_STRINGID(ConfigurationDependencies);
         WINGET_DEFINE_RESOURCE_STRINGID(ConfigurationDescriptionWasTruncated);
@@ -69,7 +70,13 @@ namespace AppInstaller::CLI::Resource
         WINGET_DEFINE_RESOURCE_STRINGID(ConfigurationEnablingMessage);
         WINGET_DEFINE_RESOURCE_STRINGID(ConfigurationExportAddingToFile);
         WINGET_DEFINE_RESOURCE_STRINGID(ConfigurationExportFailed);
+        WINGET_DEFINE_RESOURCE_STRINGID(ConfigurationExportFailedToGetUnitProcessors);
+        WINGET_DEFINE_RESOURCE_STRINGID(ConfigurationExportingUnit);
+        WINGET_DEFINE_RESOURCE_STRINGID(ConfigurationExportInstallRequiredModule);
+        WINGET_DEFINE_RESOURCE_STRINGID(ConfigurationExportInstallRequiredModuleFailed);
         WINGET_DEFINE_RESOURCE_STRINGID(ConfigurationExportSuccessful);
+        WINGET_DEFINE_RESOURCE_STRINGID(ConfigurationExportUnitStart);
+        WINGET_DEFINE_RESOURCE_STRINGID(ConfigurationExportUnitFailed);
         WINGET_DEFINE_RESOURCE_STRINGID(ConfigurationFailedToApply);
         WINGET_DEFINE_RESOURCE_STRINGID(ConfigurationFailedToGetDetails);
         WINGET_DEFINE_RESOURCE_STRINGID(ConfigurationFailedToTest);
@@ -83,6 +90,7 @@ namespace AppInstaller::CLI::Resource
         WINGET_DEFINE_RESOURCE_STRINGID(ConfigurationFileVersionUnknown);
         WINGET_DEFINE_RESOURCE_STRINGID(ConfigurationGettingDetails);
         WINGET_DEFINE_RESOURCE_STRINGID(ConfigurationGettingResourceSettings);
+        WINGET_DEFINE_RESOURCE_STRINGID(ConfigurationGettingUnitProcessors);
         WINGET_DEFINE_RESOURCE_STRINGID(ConfigurationHistoryEmpty);
         WINGET_DEFINE_RESOURCE_STRINGID(ConfigurationHistoryItemArgumentDescription);
         WINGET_DEFINE_RESOURCE_STRINGID(ConfigurationHistoryItemNotFound);