Request silent restore for all separate restore steps

Author: JanKrivanek

src/Cli/dotnet/commands/RestoringCommand.cs

@@ -25,7 +25,7 @@ public RestoringCommand(
             userProfileDir = CliFolderPathCalculator.DotnetUserProfileFolderPath;
             Task.Run(() => WorkloadManifestUpdater.BackgroundUpdateAdvertisingManifestsAsync(userProfileDir));
             SeparateRestoreCommand = GetSeparateRestoreCommand(msbuildArgs, noRestore, msbuildPath);
-            AdvertiseWorkloadUpdates = advertiseWorkloadUpdates ?? msbuildArgs.All(arg => FlagsThatTriggerSilentRestore.All(f => !arg.Contains(f, StringComparison.OrdinalIgnoreCase)));
+            AdvertiseWorkloadUpdates = advertiseWorkloadUpdates ?? msbuildArgs.All(arg => FlagsToExcludeFromRestore.All(f => !arg.Contains(f, StringComparison.OrdinalIgnoreCase)));
 
             if (!noRestore)
             {
@@ -44,7 +44,7 @@ private static IEnumerable<string> GetCommandArguments(
 
             if (HasArgumentToExcludeFromRestore(arguments))
             {
-                return Prepend("-nologo", arguments);
+                return Prepend("-nologo", Prepend("-verbosity:quiet", arguments));
             }
 
             return Prepend("-restore", arguments);
@@ -84,18 +84,13 @@ private static bool HasArgumentToExcludeFromRestore(IEnumerable<string> argument
             "TargetFramework"
         ];
 
-        private static readonly string[] FlagsThatTriggerSilentRestore =
-            [
-                "getProperty",
-                "getItem",
-                "getTargetResult"
-            ];
-
         //  These arguments don't by themselves require that restore be run in a separate process,
         //  but if there is a separate restore process they shouldn't be passed to it
         private static readonly string[] FlagsToExcludeFromRestore =
         [
-            ..FlagsThatTriggerSilentRestore,
+            "getProperty",
+            "getItem",
+            "getTargetResult"
             "t",
             "target",
             "consoleloggerparameters",
@@ -105,9 +100,6 @@ private static bool HasArgumentToExcludeFromRestore(IEnumerable<string> argument
         private static List<string> FlagsToExcludeFromSeparateRestore =
             ComputeFlags(FlagsToExcludeFromRestore).ToList();
 
-        private static List<string> FlagsThatTriggerSilentSeparateRestore =
-            ComputeFlags(FlagsThatTriggerSilentRestore).ToList();
-
         private static List<string> PropertiesToExcludeFromSeparateRestore =
             ComputePropertySwitches(PropertiesToExcludeFromRestore).ToList();
 
@@ -126,12 +118,6 @@ private static (string[] newArgumentsToAdd, string[] existingArgumentsToForward)
                 {
                     existingArgumentsToForward.Add(argument);
                 }
-
-                if (TriggersSilentSeparateRestore(argument))
-                {
-                    newArgumentsToAdd.Add("-nologo");
-                    newArgumentsToAdd.Add("-verbosity:quiet");
-                }
             }
             return (newArgumentsToAdd.ToArray(), existingArgumentsToForward.ToArray());
         }
@@ -165,9 +151,6 @@ private static bool IsExcludedFromRestore(string argument)
         private static bool IsExcludedFromSeparateRestore(string argument)
             => FlagsToExcludeFromSeparateRestore.Any(p => argument.StartsWith(p, StringComparison.OrdinalIgnoreCase));
 
-        private static bool TriggersSilentSeparateRestore(string argument)
-            => FlagsThatTriggerSilentSeparateRestore.Any(p => argument.StartsWith(p, StringComparison.OrdinalIgnoreCase));
-
         public override int Execute()
         {
             int exitCode;