From 0b48e40898be3b52e8b23541a0c79875dc37aaec Mon Sep 17 00:00:00 2001
From: TheCakeIsNaOH <TheCakeIsNaOH@gmail.com>
Date: Fri, 27 Jan 2023 21:54:50 -0600
Subject: [PATCH] (#2761) Allow overriding remembered params and args

This allows overriding of remembered package parameters and install
arguments during upgrade. So a user can pass in different package
parameters or arguments without having to completely reinstall the
package or turn of remembered arguments.

At this point in the remembered arguments, the CacheLocation and
CommandExecutionTimeout are already set even if not passed in
explicitly, so there is no way to check if they are being overridden
by the user.

And the switch also cannot be checked, because the lack of a switch
normally would mean that they are just relying on the remembered args
to remember it.
---
 src/chocolatey/infrastructure.app/services/NugetService.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/chocolatey/infrastructure.app/services/NugetService.cs b/src/chocolatey/infrastructure.app/services/NugetService.cs
index def14e0766..ddb14a082e 100644
--- a/src/chocolatey/infrastructure.app/services/NugetService.cs
+++ b/src/chocolatey/infrastructure.app/services/NugetService.cs
@@ -1618,6 +1618,8 @@ protected virtual ChocolateyConfiguration SetConfigFromRememberedArguments(Choco
             ConfigurationOptions.OptionSet.Parse(packageArguments);
 
             // there may be overrides from the user running upgrade
+            if (!string.IsNullOrWhiteSpace(originalConfig.PackageParameters)) config.PackageParameters = originalConfig.PackageParameters;
+            if (!string.IsNullOrWhiteSpace(originalConfig.InstallArguments)) config.InstallArguments = originalConfig.InstallArguments;
             if (!string.IsNullOrWhiteSpace(originalConfig.SourceCommand.Username)) config.SourceCommand.Username = originalConfig.SourceCommand.Username;
             if (!string.IsNullOrWhiteSpace(originalConfig.SourceCommand.Password)) config.SourceCommand.Password = originalConfig.SourceCommand.Password;
             if (!string.IsNullOrWhiteSpace(originalConfig.SourceCommand.Certificate)) config.SourceCommand.Certificate = originalConfig.SourceCommand.Certificate;