Only download during COM download

Author: JohnMcPMS

src/AppInstallerCLICore/Workflows/InstallFlow.cpp

@@ -609,7 +609,7 @@ namespace AppInstaller::CLI::Workflow
             Workflow::GetDependenciesFromInstaller <<
             Workflow::ReportDependencies(Resource::String::PackageRequiresDependencies) <<
             Workflow::CreateDependencySubContexts(Resource::String::PackageRequiresDependencies) <<
-            Workflow::ProcessMultiplePackages(Resource::String::PackageRequiresDependencies, APPINSTALLER_CLI_ERROR_DOWNLOAD_DEPENDENCIES, {}, true, true, true, false);
+            Workflow::ProcessMultiplePackages(Resource::String::PackageRequiresDependencies, APPINSTALLER_CLI_ERROR_DOWNLOAD_DEPENDENCIES, {}, true, true, true, false, true);
     }
 
     void InstallSinglePackage(Execution::Context& context)
@@ -682,7 +682,7 @@ namespace AppInstaller::CLI::Workflow
             return;
         }
 
-        bool downloadInstallerOnly = WI_IsFlagSet(context.GetFlags(), Execution::ContextFlag::InstallerDownloadOnly);
+        bool downloadInstallerOnly = m_downloadOnly ? true : WI_IsFlagSet(context.GetFlags(), Execution::ContextFlag::InstallerDownloadOnly);
 
         // Show all prompts needed for every package before installing anything
         context << Workflow::ShowPromptsForMultiplePackages(m_ensurePackageAgreements, downloadInstallerOnly);

src/AppInstallerCLICore/Workflows/InstallFlow.h

@@ -174,15 +174,17 @@ namespace AppInstaller::CLI::Workflow
             bool ensurePackageAgreements = true,
             bool ignoreDependencies = false,
             bool stopOnFailure = false,
-            bool refreshPathVariable = false):
+            bool refreshPathVariable = false,
+            bool downloadOnly = false):
             WorkflowTask("ProcessMultiplePackages"),
             m_dependenciesReportMessage(dependenciesReportMessage),
             m_resultOnFailure(resultOnFailure),
             m_ignorableInstallResults(std::move(ignorableInstallResults)),
             m_ignorePackageDependencies(ignoreDependencies),
             m_ensurePackageAgreements(ensurePackageAgreements),
             m_stopOnFailure(stopOnFailure),
-            m_refreshPathVariable(refreshPathVariable){}
+            m_refreshPathVariable(refreshPathVariable),
+            m_downloadOnly(downloadOnly){}
 
         void operator()(Execution::Context& context) const override;
 
@@ -194,6 +196,7 @@ namespace AppInstaller::CLI::Workflow
         bool m_ensurePackageAgreements;
         bool m_stopOnFailure;
         bool m_refreshPathVariable;
+        bool m_downloadOnly;
     };
 
     // Stores the existing set of packages in ARP.

src/AppInstallerCLITests/InstallDependenciesFlow.cpp

@@ -4,8 +4,10 @@
 #include "WorkflowCommon.h"
 #include "DependenciesTestSource.h"
 #include <Commands/InstallCommand.h>
+#include <Commands/COMCommand.h>
 #include <Workflows/DependenciesFlow.h>
 #include <Workflows/InstallFlow.h>
+#include <Workflows/ShellExecuteInstallerHandler.h>
 
 using namespace TestCommon;
 using namespace AppInstaller::CLI;
@@ -38,6 +40,14 @@ void OverrideForProcessMultiplePackages(TestContext& context)
     } });
 }
 
+void OverrideShellExecute(TestContext& context)
+{
+    context.Override({ ShellExecuteInstallImpl, [](TestContext& c)
+        {
+            c.Add< Execution::Data::OperationReturnCode>(0);
+        } });
+}
+
 TEST_CASE("DependencyGraph_SkipInstalled", "[InstallFlow][workflow][dependencyGraph][dependencies]")
 {
     TestCommon::TempFile installResultPath("TestExeInstalled.txt");
@@ -264,7 +274,26 @@ TEST_CASE("InstallFlow_Dependencies", "[InstallFlow][workflow][dependencies]")
     REQUIRE(installOutput.str().find("PreviewIIS") != std::string::npos);
 }
 
+TEST_CASE("InstallFlow_Dependencies_COM", "[InstallFlow][workflow][dependencies]")
+{
+    std::ostringstream installOutput;
+    TestContext context{ installOutput, std::cin };
+    auto previousThreadGlobals = context.SetForCurrentThread();
+    OverrideForShellExecute(context);
+    OverrideShellExecute(context);
+    OverrideOpenDependencySource(context);
+    OverrideEnableWindowsFeaturesDependencies(context);
+
+    context.Add<Execution::Data::Manifest>(YamlParser::CreateFromPath(TestDataFile("InstallFlowTest_MultipleDependencies.yaml")));
+
+    COMDownloadCommand download({});
+    download.Execute(context);
+
+    COMInstallCommand install({});
+    REQUIRE_NOTHROW(install.Execute(context));
+}
+
 // TODO:
 // add dependencies for installer tests to DependenciesTestSource (or a new one)
 // add tests for min version dependency solving
-// add tests that check for correct installation of dependencies (not only the order)
+// add tests that check for correct installation of dependencies (not only the order)