Skip dependency evaluation with --skip-dependencies (#3784)

microsoft · Oct 19, 2023 · b357fe8 · b357fe8
1 parent b96dbdb
commit b357fe8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/AppInstallerCLICore/Workflows/DependenciesFlow.cpp b/src/AppInstallerCLICore/Workflows/DependenciesFlow.cpp
@@ -240,6 +240,11 @@ namespace AppInstaller::CLI::Workflow
 
     void CreateDependencySubContexts::operator()(Execution::Context& context) const
     {
+        if (Settings::User().Get<Settings::Setting::InstallSkipDependencies>() || context.Args.Contains(Execution::Args::Type::SkipDependencies))
+        {
+            return;
+        }
+
         auto info = context.Reporter.Info();
         auto error = context.Reporter.Error();
         const auto& rootManifest = context.Get<Execution::Data::Manifest>();
@@ -344,4 +349,4 @@ namespace AppInstaller::CLI::Workflow
 
         context.Add<Execution::Data::PackageSubContexts>(std::move(dependencyPackageContexts));
     }
-}
+}
diff --git a/src/AppInstallerCLITests/InstallDependenciesFlow.cpp b/src/AppInstallerCLITests/InstallDependenciesFlow.cpp
@@ -188,7 +188,6 @@ TEST_CASE("InstallerWithDependencies_SkipDependencies", "[dependencies]")
     TestContext context{ installOutput, std::cin };
     auto previousThreadGlobals = context.SetForCurrentThread();
     OverrideForShellExecute(context);
-    OverrideOpenDependencySource(context);
 
     context.Args.AddArg(Execution::Args::Type::Manifest, TestDataFile("Installer_Exe_Dependencies.yaml").GetPath().u8string());
     context.Args.AddArg(Execution::Args::Type::SkipDependencies);
@@ -208,7 +207,6 @@ TEST_CASE("InstallerWithDependencies_IgnoreDependenciesSetting", "[dependencies]
     TestContext context{ installOutput, std::cin };
     auto previousThreadGlobals = context.SetForCurrentThread();
     OverrideForShellExecute(context);
-    OverrideOpenDependencySource(context);
 
     context.Args.AddArg(Execution::Args::Type::Manifest, TestDataFile("Installer_Exe_Dependencies.yaml").GetPath().u8string());