Improve logic, fix tests

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 => FlagsToExcludeFromRestore.All(f => !arg.Contains(f, StringComparison.OrdinalIgnoreCase)));
+            AdvertiseWorkloadUpdates = advertiseWorkloadUpdates ?? msbuildArgs.All(arg => FlagsThatTriggerSilentRestore.All(f => !arg.Contains(f, StringComparison.OrdinalIgnoreCase)));
 
             if (!noRestore)
             {
@@ -44,7 +44,7 @@ private static IEnumerable<string> GetCommandArguments(
 
             if (HasArgumentToExcludeFromRestore(arguments))
             {
-                return Prepend("-nologo", Prepend("-verbosity:quiet", arguments));
+                return Prepend("-nologo", arguments);
             }
 
             return Prepend("-restore", arguments);
@@ -84,13 +84,19 @@ private static bool HasArgumentToExcludeFromRestore(IEnumerable<string> argument
             "TargetFramework"
         ];
 
+        //  These arguments should lead to absolutely no output from the restore command
+        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 =
         [
-            "getProperty",
-            "getItem",
-            "getTargetResult",
+            ..FlagsThatTriggerSilentRestore,
             "t",
             "target",
             "consoleloggerparameters",
@@ -108,7 +114,7 @@ private static bool HasArgumentToExcludeFromRestore(IEnumerable<string> argument
         // that we need to compensate for, so we might yield new arguments that should be included in the overall restore call.
         private static (string[] newArgumentsToAdd, string[] existingArgumentsToForward) ProcessForwardedArgumentsForSeparateRestore(IEnumerable<string> forwardedArguments)
         {
-            HashSet<string> newArgumentsToAdd = new();
+            HashSet<string> newArgumentsToAdd = new() { "-nologo", "-verbosity:quiet" };
             List<string> existingArgumentsToForward = new();
 
             foreach (var argument in forwardedArguments)

test/dotnet.Tests/dotnet-msbuild/GivenDotnetBuildInvocation.cs

@@ -56,13 +56,13 @@ public void MsbuildInvocationIsCorrect(string[] args, string expectedAdditionalA
         }
 
         [Theory]
-        [InlineData(new string[] { "-f", "tfm" }, "-target:Restore", "-property:TargetFramework=tfm")]
-        [InlineData(new string[] { "-p:TargetFramework=tfm" }, "-target:Restore", "--property:TargetFramework=tfm")]
-        [InlineData(new string[] { "/p:TargetFramework=tfm" }, "-target:Restore", "--property:TargetFramework=tfm")]
-        [InlineData(new string[] { "-t:Run", "-f", "tfm" }, "-target:Restore", "-property:TargetFramework=tfm -t:Run")]
-        [InlineData(new string[] { "/t:Run", "-f", "tfm" }, "-target:Restore", "-property:TargetFramework=tfm /t:Run")]
+        [InlineData(new string[] { "-f", "tfm" }, "-target:Restore -nologo -verbosity:quiet", "-property:TargetFramework=tfm")]
+        [InlineData(new string[] { "-p:TargetFramework=tfm" }, "-target:Restore -nologo -verbosity:quiet", "--property:TargetFramework=tfm")]
+        [InlineData(new string[] { "/p:TargetFramework=tfm" }, "-target:Restore -nologo -verbosity:quiet", "--property:TargetFramework=tfm")]
+        [InlineData(new string[] { "-t:Run", "-f", "tfm" }, "-target:Restore -nologo -verbosity:quiet", "-property:TargetFramework=tfm -t:Run")]
+        [InlineData(new string[] { "/t:Run", "-f", "tfm" }, "-target:Restore -nologo -verbosity:quiet", "-property:TargetFramework=tfm /t:Run")]
         [InlineData(new string[] { "-o", "myoutput", "-f", "tfm", "-v", "diag", "/ArbitrarySwitchForMSBuild" },
-                                  "-target:Restore -verbosity:diag -property:OutputPath=<cwd>myoutput -property:_CommandLineDefinedOutputPath=true /ArbitrarySwitchForMSBuild",
+                                  "-target:Restore -nologo -verbosity:quiet -verbosity:diag -property:OutputPath=<cwd>myoutput -property:_CommandLineDefinedOutputPath=true /ArbitrarySwitchForMSBuild",
                                   "-property:TargetFramework=tfm -verbosity:diag -property:OutputPath=<cwd>myoutput -property:_CommandLineDefinedOutputPath=true /ArbitrarySwitchForMSBuild")]
         [InlineData(new string[] { "-f", "tfm", "-getItem:Compile", "-getProperty:TargetFramework", "-getTargetResult:Build" }, "-target:Restore -nologo -verbosity:quiet", "-property:TargetFramework=tfm -getItem:Compile -getProperty:TargetFramework -getTargetResult:Build")]
         public void MsbuildInvocationIsCorrectForSeparateRestore(

test/dotnet.Tests/dotnet-msbuild/GivenDotnetPublishInvocation.cs

@@ -73,7 +73,7 @@ public void MsbuildInvocationIsCorrectForSeparateRestore(string[] args, string e
             command.SeparateRestoreCommand
                    .GetArgumentsToMSBuild()
                    .Should()
-                   .Be($"{ExpectedPrefix} -target:Restore {ExpectedProperties}");
+                   .Be($"{ExpectedPrefix} -target:Restore -nologo -verbosity:quiet {ExpectedProperties}");
 
             command.GetArgumentsToMSBuild()
                    .Should()