Allow multiple apps in a single command (#2861)

src/AppInstallerCLICore/AppInstallerCLICore.vcxproj

@@ -284,6 +284,7 @@
     <ClInclude Include="Workflows\ImportExportFlow.h" />
     <ClInclude Include="Workflows\MsiInstallFlow.h" />
     <ClInclude Include="Workflows\MSStoreInstallerHandler.h" />
+    <ClInclude Include="Workflows\MultiQueryFlow.h" />
     <ClInclude Include="Workflows\PinFlow.h" />
     <ClInclude Include="Workflows\PortableFlow.h" />
     <ClInclude Include="Workflows\PromptFlow.h" />
@@ -341,6 +342,7 @@
     <ClCompile Include="Workflows\ImportExportFlow.cpp" />
     <ClCompile Include="Workflows\MsiInstallFlow.cpp" />
     <ClCompile Include="Workflows\MSStoreInstallerHandler.cpp" />
+    <ClCompile Include="Workflows\MultiQueryFlow.cpp" />
     <ClCompile Include="Workflows\PinFlow.cpp" />
     <ClCompile Include="Workflows\PortableFlow.cpp" />
     <ClCompile Include="Workflows\PromptFlow.cpp" />

src/AppInstallerCLICore/AppInstallerCLICore.vcxproj.filters

@@ -194,6 +194,9 @@
     <ClInclude Include="Workflows\PinFlow.h">
       <Filter>Workflows</Filter>
     </ClInclude>
+    <ClInclude Include="Workflows\MultiQueryFlow.h">
+      <Filter>Workflows</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="pch.cpp">
@@ -355,6 +358,9 @@
     <ClCompile Include="Commands\PinCommand.cpp">
       <Filter>Commands</Filter>
     </ClCompile>
+    <ClCompile Include="Workflows\MultiQueryFlow.cpp">
+      <Filter>Workflows</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="PropertySheet.props" />

src/AppInstallerCLICore/Argument.cpp

@@ -29,6 +29,8 @@ namespace AppInstaller::CLI
         // Args to specify where to get app
         case Execution::Args::Type::Query:
             return { type, "query"_liv, 'q', ArgTypeCategory::PackageQuery | ArgTypeCategory::SinglePackageQuery };
+        case Execution::Args::Type::MultiQuery:
+            return { type, "query"_liv, 'q', ArgTypeCategory::PackageQuery };
         case Execution::Args::Type::Manifest:
             return { type, "manifest"_liv, 'm', ArgTypeCategory::Manifest };
 
@@ -215,6 +217,8 @@ namespace AppInstaller::CLI
         {
         case Args::Type::Query:
             return Argument{ type, Resource::String::QueryArgumentDescription, ArgumentType::Positional};
+        case Args::Type::MultiQuery:
+            return Argument{ type, Resource::String::MultiQueryArgumentDescription, ArgumentType::Positional }.SetCountLimit(128);
         case Args::Type::Manifest:
             return Argument{ type, Resource::String::ManifestArgumentDescription, ArgumentType::Standard, Argument::Visibility::Help, Settings::TogglePolicy::Policy::LocalManifestFiles, Settings::AdminSetting::LocalManifestFiles };
         case Args::Type::Id:

src/AppInstallerCLICore/Argument.h

@@ -206,6 +206,7 @@ namespace AppInstaller::CLI
         Settings::AdminSetting AdminSetting() const { return m_adminSetting; }
 
         Argument& SetRequired(bool required) { m_required = required; return *this; }
+        Argument& SetCountLimit(size_t countLimit) { m_countLimit = countLimit; return *this; }
 
     private:
         // Constructors that set a Feature or Policy are private to force callers to go through the ForType() function.

src/AppInstallerCLICore/Command.cpp

@@ -135,6 +135,11 @@ namespace AppInstaller::CLI
 
                 infoOut << "] <"_liv << arg.Name() << '>';
 
+                if (arg.Limit() > 1)
+                {
+                    infoOut << "..."_liv;
+                }
+
                 if (!arg.Required())
                 {
                     infoOut << ']';
@@ -405,14 +410,10 @@ namespace AppInstaller::CLI
     const CLI::Argument* ParseArgumentsStateMachine::NextPositional()
     {
         // Find the next appropriate positional arg if the current itr isn't one or has hit its limit.
-        if (m_positionalSearchItr != m_arguments.end() &&
+        while (m_positionalSearchItr != m_arguments.end() &&
             (m_positionalSearchItr->Type() != ArgumentType::Positional || m_executionArgs.GetCount(m_positionalSearchItr->ExecArgType()) == m_positionalSearchItr->Limit()))
         {
-            do
-            {
-                ++m_positionalSearchItr;
-            }
-            while (m_positionalSearchItr != m_arguments.end() && m_positionalSearchItr->Type() != ArgumentType::Positional);
+            ++m_positionalSearchItr;
         }
 
         if (m_positionalSearchItr == m_arguments.end())
@@ -600,6 +601,9 @@ namespace AppInstaller::CLI
         {
             stateMachine.ThrowIfError();
         }
+
+        // Special handling for multi-query arguments:
+        execArgs.MoveMultiQueryToSingleQueryIfNeeded();
     }
 
     void Command::ValidateArguments(Execution::Args& execArgs) const

src/AppInstallerCLICore/Commands/ImportCommand.cpp

@@ -4,6 +4,7 @@
 #include "ImportCommand.h"
 #include "Workflows/CompletionFlow.h"
 #include "Workflows/ImportExportFlow.h"
+#include "Workflows/MultiQueryFlow.h"
 #include "Workflows/WorkflowBase.h"
 #include "Resources.h"
 
@@ -46,7 +47,8 @@ namespace AppInstaller::CLI
             Workflow::ReadImportFile <<
             Workflow::OpenSourcesForImport <<
             Workflow::OpenPredefinedSource(Repository::PredefinedSource::Installed) <<
-            Workflow::SearchPackagesForImport <<
+            Workflow::GetSearchRequestsForImport <<
+            Workflow::SearchSubContextsForSingle() <<
             Workflow::ReportExecutionStage(Workflow::ExecutionStage::Execution) <<
             Workflow::InstallImportedPackages;
     }

src/AppInstallerCLICore/Commands/InstallCommand.cpp

@@ -5,6 +5,7 @@
 #include "Workflows/CompletionFlow.h"
 #include "Workflows/InstallFlow.h"
 #include "Workflows/UpdateFlow.h"
+#include "Workflows/MultiQueryFlow.h"
 #include "Workflows/WorkflowBase.h"
 #include "Resources.h"
 
@@ -18,7 +19,7 @@ namespace AppInstaller::CLI
     std::vector<Argument> InstallCommand::GetArguments() const
     {
         return {
-            Argument::ForType(Args::Type::Query),
+            Argument::ForType(Args::Type::MultiQuery),
             Argument::ForType(Args::Type::Manifest),
             Argument::ForType(Args::Type::Id),
             Argument::ForType(Args::Type::Name),
@@ -63,7 +64,7 @@ namespace AppInstaller::CLI
     {
         switch (valueType)
         {
-        case Args::Type::Query:
+        case Args::Type::MultiQuery:
         case Args::Type::Manifest:
         case Args::Type::Id:
         case Args::Type::Name:
@@ -123,7 +124,20 @@ namespace AppInstaller::CLI
                     Workflow::OpenCompositeSource(Repository::PredefinedSource::Installed, false, Repository::CompositeSearchBehavior::AvailablePackages);
             }
 
-            context << Workflow::InstallOrUpgradeSinglePackage(false);
+            if (context.Args.Contains(Execution::Args::Type::MultiQuery))
+            {
+                context <<
+                    Workflow::GetMultiSearchRequests <<
+                    Workflow::SearchSubContextsForSingle() <<
+                    Workflow::ReportExecutionStage(Workflow::ExecutionStage::Execution) <<
+                    Workflow::InstallMultiplePackages(
+                        Resource::String::InstallAndUpgradeCommandsReportDependencies,
+                        APPINSTALLER_CLI_ERROR_MULTIPLE_INSTALL_FAILED);
+            }
+            else
+            {
+                context << Workflow::InstallOrUpgradeSinglePackage(false);
+            }
         }
     }
 }

src/AppInstallerCLICore/Commands/UninstallCommand.cpp

@@ -5,6 +5,7 @@
 #include "Workflows/UninstallFlow.h"
 #include "Workflows/CompletionFlow.h"
 #include "Workflows/WorkflowBase.h"
+#include "Workflows/MultiQueryFlow.h"
 #include "Resources.h"
 
 using AppInstaller::CLI::Execution::Args;
@@ -16,7 +17,7 @@ namespace AppInstaller::CLI
     {
         return
         {
-            Argument::ForType(Args::Type::Query),
+            Argument::ForType(Args::Type::MultiQuery),
             Argument::ForType(Args::Type::Manifest),
             Argument::ForType(Args::Type::Id),
             Argument::ForType(Args::Type::Name),
@@ -63,7 +64,7 @@ namespace AppInstaller::CLI
 
         switch (valueType)
         {
-        case Execution::Args::Type::Query:
+        case Execution::Args::Type::MultiQuery:
             context <<
                 Workflow::RequireCompletionWordNonEmpty <<
                 Workflow::SearchSourceForManyCompletion <<
@@ -110,19 +111,28 @@ namespace AppInstaller::CLI
                 Workflow::GetManifestFromArg <<
                 Workflow::ReportManifestIdentity <<
                 Workflow::SearchSourceUsingManifest <<
-                Workflow::EnsureOneMatchFromSearchResult(true);
+                Workflow::EnsureOneMatchFromSearchResult(true) <<
+                Workflow::UninstallSinglePackage;
         }
         else
         {
-            // search for a single package to uninstall
-            context <<
-                Workflow::SearchSourceForSingle <<
-                Workflow::HandleSearchResultFailures <<
-                Workflow::EnsureOneMatchFromSearchResult(true) <<
-                Workflow::ReportPackageIdentity;
+            // search for specific packages to uninstall
+            if (!context.Args.Contains(Execution::Args::Type::MultiQuery))
+            {
+                context <<
+                    Workflow::SearchSourceForSingle <<
+                    Workflow::HandleSearchResultFailures <<
+                    Workflow::EnsureOneMatchFromSearchResult(true) <<
+                    Workflow::ReportPackageIdentity <<
+                    Workflow::UninstallSinglePackage;
+            }
+            else
+            {
+                context <<
+                    Workflow::GetMultiSearchRequests <<
+                    Workflow::SearchSubContextsForSingle(Workflow::SearchSubContextsForSingle::SearchPurpose::Uninstall) <<
+                    Workflow::UninstallMultiplePackages;
+            }
         }
-
-        context <<
-            Workflow::UninstallSinglePackage;
     }
 }

src/AppInstallerCLICore/Commands/UpgradeCommand.cpp

@@ -4,6 +4,7 @@
 #include "UpgradeCommand.h"
 #include "Workflows/CompletionFlow.h"
 #include "Workflows/InstallFlow.h"
+#include "Workflows/MultiQueryFlow.h"
 #include "Workflows/UpdateFlow.h"
 #include "Workflows/WorkflowBase.h"
 #include "Workflows/DependenciesFlow.h"
@@ -31,14 +32,14 @@ namespace AppInstaller::CLI
             // Valid arguments for list are only those related to the sources and which packages to include (e.g. --include-unknown).
             // Instead of checking for them, we check that there aren't any other arguments present.
             return !args.Contains(Args::Type::All) &&
-                WI_AreAllFlagsClear(argCategories, ArgTypeCategory::Manifest | ArgTypeCategory::SinglePackageQuery | ArgTypeCategory::InstallerBehavior);
+                WI_AreAllFlagsClear(argCategories, ArgTypeCategory::Manifest | ArgTypeCategory::PackageQuery | ArgTypeCategory::InstallerBehavior);
         }
     }
 
     std::vector<Argument> UpgradeCommand::GetArguments() const
     {
         return {
-            Argument::ForType(Args::Type::Query),           // -q
+            Argument::ForType(Args::Type::MultiQuery),      // -q
             Argument::ForType(Args::Type::Manifest),        // -m
             Argument::ForType(Args::Type::Id),
             Argument::ForType(Args::Type::Name),
@@ -96,7 +97,7 @@ namespace AppInstaller::CLI
 
         switch (valueType)
         {
-        case Execution::Args::Type::Query:
+        case Execution::Args::Type::MultiQuery:
             context <<
                 RequireCompletionWordNonEmpty <<
                 SearchSourceForManyCompletion <<
@@ -188,8 +189,21 @@ namespace AppInstaller::CLI
         }
         else
         {
-            // The remaining case: search for single installed package to update
-            context << InstallOrUpgradeSinglePackage(true);
+            // The remaining case: search for specific packages to update
+            if (!context.Args.Contains(Execution::Args::Type::MultiQuery))
+            {
+                context << Workflow::InstallOrUpgradeSinglePackage(/* isUpgrade */ true);
+            }
+            else
+            {
+                context <<
+                    Workflow::GetMultiSearchRequests <<
+                    Workflow::SearchSubContextsForSingle(Workflow::SearchSubContextsForSingle::SearchPurpose::Upgrade) <<
+                    Workflow::ReportExecutionStage(Workflow::ExecutionStage::Execution) <<
+                    Workflow::InstallMultiplePackages(
+                        Resource::String::InstallAndUpgradeCommandsReportDependencies,
+                        APPINSTALLER_CLI_ERROR_MULTIPLE_INSTALL_FAILED);
+            }
         }
     }
 }

src/AppInstallerCLICore/ExecutionArgs.h

@@ -14,6 +14,7 @@ namespace AppInstaller::CLI::Execution
         {
             // Args to specify where to get app
             Query, // Query to be performed against index
+            MultiQuery, // Like query, but can take multiple values
             Manifest, // Provide the app manifest directly
 
             // Query filtering criteria and query behavior
@@ -160,7 +161,7 @@ namespace AppInstaller::CLI::Execution
             m_parsedArgs[arg].emplace_back(value);
         }
 
-        bool Empty() const
+        bool Empty()
         {
             return m_parsedArgs.empty();
         }
@@ -182,6 +183,22 @@ namespace AppInstaller::CLI::Execution
             return types;
         }
 
+        // If we get a single value for multi-query, we remove the argument and add it back as a single query.
+        // This way the rest of the code can assume that if there is a MultiQuery we will always have multiple values,
+        // and if there is a single one it will be in the Query type.
+        // This is the only case where we modify the parsed args from user input.
+        void MoveMultiQueryToSingleQueryIfNeeded()
+        {
+            auto itr = m_parsedArgs.find(Type::MultiQuery);
+            if (itr != m_parsedArgs.end() && itr->second.size() == 1)
+            {
+                // A test ensures that commands don't have both Query and MultiQuery arguments,
+                // so if we had a MultiQuery value, we can be sure there is no Query value
+                m_parsedArgs[Type::Query].emplace_back(std::move(itr->second[0]));
+                m_parsedArgs.erase(itr);
+            }
+        }
+
     private:
         std::map<Type, std::vector<std::string>> m_parsedArgs;
     };

src/AppInstallerCLICore/ExecutionContextData.h

@@ -30,6 +30,7 @@ namespace AppInstaller::CLI::Execution
     enum class Data : size_t
     {
         Source,
+        SearchRequest, // Only set for multiple installs
         SearchResult,
         SourceList,
         Package,
@@ -49,8 +50,9 @@ namespace AppInstaller::CLI::Execution
         // On export: A collection of packages to be exported to a file
         // On import: A collection of packages read from a file
         PackageCollection,
-        // On import and upgrade all: A collection of specific package versions to install
-        PackagesToInstall,
+        // When installing multiple packages at once (upgrade all, import, install with multiple args, dependencies):
+        // A collection of sub-contexts, each of which handles the installation of a single package.
+        PackageSubContexts,
         // On import: Sources for the imported packages
         Sources,
         ARPCorrelationData,
@@ -81,6 +83,12 @@ namespace AppInstaller::CLI::Execution
             using value_t = Repository::Source;
         };
 
+        template <>
+        struct DataMapping<Data::SearchRequest>
+        {
+            using value_t = Repository::SearchRequest;
+        };
+
         template <>
         struct DataMapping<Data::SearchResult>
         {
@@ -184,7 +192,7 @@ namespace AppInstaller::CLI::Execution
         };
 
         template <>
-        struct DataMapping<Data::PackagesToInstall>
+        struct DataMapping<Data::PackageSubContexts>
         {
             using value_t = std::vector<std::unique_ptr<Context>>;
         };

src/AppInstallerCLICore/Resources.h

@@ -120,8 +120,6 @@ namespace AppInstaller::CLI::Resource
         WINGET_DEFINE_RESOURCE_STRINGID(ImportIgnorePackageVersionsArgumentDescription);
         WINGET_DEFINE_RESOURCE_STRINGID(ImportIgnoreUnavailableArgumentDescription);
         WINGET_DEFINE_RESOURCE_STRINGID(ImportInstallFailed);
-        WINGET_DEFINE_RESOURCE_STRINGID(ImportPackageAlreadyInstalled);
-        WINGET_DEFINE_RESOURCE_STRINGID(ImportSearchFailed);
         WINGET_DEFINE_RESOURCE_STRINGID(ImportSourceNotInstalled);
         WINGET_DEFINE_RESOURCE_STRINGID(IncludeUnknownArgumentDescription);
         WINGET_DEFINE_RESOURCE_STRINGID(IncompatibleArgumentsProvided);
@@ -215,6 +213,11 @@ namespace AppInstaller::CLI::Resource
         WINGET_DEFINE_RESOURCE_STRINGID(MultipleInstalledPackagesFound);
         WINGET_DEFINE_RESOURCE_STRINGID(MultipleNonPortableNestedInstallersSpecified);
         WINGET_DEFINE_RESOURCE_STRINGID(MultiplePackagesFound);
+        WINGET_DEFINE_RESOURCE_STRINGID(MultiQueryArgumentDescription);
+        WINGET_DEFINE_RESOURCE_STRINGID(MultiQueryPackageAlreadyInstalled);
+        WINGET_DEFINE_RESOURCE_STRINGID(MultiQueryPackageNotFound);
+        WINGET_DEFINE_RESOURCE_STRINGID(MultiQuerySearchFailed);
+        WINGET_DEFINE_RESOURCE_STRINGID(MultiQuerySearchFoundMultiple);
         WINGET_DEFINE_RESOURCE_STRINGID(NameArgumentDescription);
         WINGET_DEFINE_RESOURCE_STRINGID(NestedInstallerNotFound);
         WINGET_DEFINE_RESOURCE_STRINGID(NestedInstallerNotSpecified);