Add terminal logger quiet verbosity even if there are no restore arguments

JanKrivanek · JanKrivanek · commit f26edf771cb5 · 2024-04-18T15:23:23.000+02:00
diff --git a/src/Cli/dotnet/commands/RestoringCommand.cs b/src/Cli/dotnet/commands/RestoringCommand.cs
@@ -61,11 +61,8 @@ private static RestoreCommand GetSeparateRestoreCommand(
             }
 
             IEnumerable<string> restoreArguments = ["-target:Restore"];
-            if (arguments != null)
-            {
-                (var newArgumentsToAdd, var existingArgumentsToForward) = ProcessForwardedArgumentsForSeparateRestore(arguments);
-                restoreArguments = [.. restoreArguments, .. newArgumentsToAdd, .. existingArgumentsToForward];
-            }
+            (var newArgumentsToAdd, var existingArgumentsToForward) = ProcessForwardedArgumentsForSeparateRestore(arguments);
+            restoreArguments = [.. restoreArguments, .. newArgumentsToAdd, .. existingArgumentsToForward];
 
             return new RestoreCommand(restoreArguments, msbuildPath);
         }
@@ -121,7 +118,7 @@ private static (string[] newArgumentsToAdd, string[] existingArgumentsToForward)
             HashSet<string> newArgumentsToAdd = new() { "-tlp:verbosity=quiet" };
             List<string> existingArgumentsToForward = new();
 
-            foreach (var argument in forwardedArguments)
+            foreach (var argument in forwardedArguments ?? Enumerable.Empty<string>)
             {
                 if (!IsExcludedFromSeparateRestore(argument) && !IsExcludedFromRestore(argument))
                 {

Original file line number	Diff line number	Diff line change
`@@ -61,11 +61,8 @@ private static RestoreCommand GetSeparateRestoreCommand(`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`IEnumerable<string> restoreArguments = ["-target:Restore"];`
`64`		`- if (arguments != null)`
`65`		`- {`
`66`		`- (var newArgumentsToAdd, var existingArgumentsToForward) = ProcessForwardedArgumentsForSeparateRestore(arguments);`
`67`		`- restoreArguments = [.. restoreArguments, .. newArgumentsToAdd, .. existingArgumentsToForward];`
`68`		`- }`
	`64`	`+ (var newArgumentsToAdd, var existingArgumentsToForward) = ProcessForwardedArgumentsForSeparateRestore(arguments);`
	`65`	`+ restoreArguments = [.. restoreArguments, .. newArgumentsToAdd, .. existingArgumentsToForward];`
`69`	`66`
`70`	`67`	`return new RestoreCommand(restoreArguments, msbuildPath);`
`71`	`68`	`}`
`@@ -121,7 +118,7 @@ private static (string[] newArgumentsToAdd, string[] existingArgumentsToForward)`
`121`	`118`	`HashSet<string> newArgumentsToAdd = new() { "-tlp:verbosity=quiet" };`
`122`	`119`	`List<string> existingArgumentsToForward = new();`
`123`	`120`
`124`		`- foreach (var argument in forwardedArguments)`
	`121`	`+ foreach (var argument in forwardedArguments ?? Enumerable.Empty<string>)`
`125`	`122`	`{`
`126`	`123`	`if (!IsExcludedFromSeparateRestore(argument) && !IsExcludedFromRestore(argument))`
`127`	`124`	`{`