Print the upgrade table during upgrade --all (microsoft#1866)

sba923 · Jan 22, 2022 · dc809d6 · dc809d6
1 parent 808e59b
commit dc809d6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/AppInstallerCLICore/Commands/UpgradeCommand.cpp b/src/AppInstallerCLICore/Commands/UpgradeCommand.cpp
@@ -155,6 +155,7 @@ namespace AppInstaller::CLI
                 SearchSourceForMany <<
                 HandleSearchResultFailures <<
                 EnsureMatchesFromSearchResult(true) <<
+                ReportListResult(true) <<
                 UpdateAllApplicable;
         }
         else if (context.Args.Contains(Execution::Args::Type::Manifest))

diff --git a/src/AppInstallerCLICore/Workflows/InstallFlow.cpp b/src/AppInstallerCLICore/Workflows/InstallFlow.cpp
@@ -191,7 +191,12 @@ namespace AppInstaller::CLI::Workflow
         bool hasPackageAgreements = false;
         for (auto& packageContext : context.Get<Execution::Data::PackagesToInstall>())
         {
-            // Show agreements for each package
+            // Show agreements for each package that has one
+            auto agreements = packageContext->Get<Execution::Data::Manifest>().CurrentLocalization.Get<AppInstaller::Manifest::Localization::Agreements>();
+            if (agreements.empty())
+            {
+                continue;
+            }
             Execution::Context& showContext = *packageContext;
             auto previousThreadGlobals = showContext.SetForCurrentThread();
 
@@ -203,7 +208,7 @@ namespace AppInstaller::CLI::Workflow
                 AICLI_TERMINATE_CONTEXT(showContext.GetTerminationHR());
             }
 
-            hasPackageAgreements |= !showContext.Get<Execution::Data::Manifest>().CurrentLocalization.Get<AppInstaller::Manifest::Localization::Agreements>().empty();
+            hasPackageAgreements |= true;
         }
 
         // If any package has agreements, ensure they are accepted

diff --git a/src/AppInstallerCLICore/Workflows/UpdateFlow.cpp b/src/AppInstallerCLICore/Workflows/UpdateFlow.cpp
@@ -188,6 +188,7 @@ namespace AppInstaller::CLI::Workflow
         else
         {
             context.Add<Execution::Data::PackagesToInstall>(std::move(packagesToInstall));
+            context.Reporter.Info() << std::endl;
             context <<
                 InstallMultiplePackages(
                     Resource::String::InstallAndUpgradeCommandsReportDependencies,