Make separate restore quiet only for terminal logger or getX commands

JanKrivanek · JanKrivanek · commit 913afc26173b · 2024-04-16T20:22:18.000+02:00
diff --git a/src/Cli/dotnet/commands/RestoringCommand.cs b/src/Cli/dotnet/commands/RestoringCommand.cs
@@ -106,6 +106,9 @@ 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();
 
@@ -114,16 +117,21 @@ 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() { "-nologo", "-verbosity:quiet" };
+            // Separate restore should be silent in terminal logger - regardless of actual scenario
+            HashSet<string> newArgumentsToAdd = new() { "-nologo", "-tlp:verbosity=quiet" };
             List<string> existingArgumentsToForward = new();
 
             foreach (var argument in forwardedArguments)
             {
-
                 if (!IsExcludedFromSeparateRestore(argument) && !IsExcludedFromRestore(argument))
                 {
                     existingArgumentsToForward.Add(argument);
                 }
+
+                if (TriggersSilentSeparateRestore(argument))
+                {
+                    newArgumentsToAdd.Add("-verbosity:quiet");
+                }
             }
             return (newArgumentsToAdd.ToArray(), existingArgumentsToForward.ToArray());
         }
@@ -157,6 +165,10 @@ private static bool IsExcludedFromRestore(string argument)
         private static bool IsExcludedFromSeparateRestore(string argument)
             => FlagsToExcludeFromSeparateRestore.Any(p => argument.StartsWith(p, StringComparison.OrdinalIgnoreCase));
 
+        // These arguments should lead to absolutely no output from the restore command - regardless of loggers
+        private static bool TriggersSilentSeparateRestore(string argument)
+            => FlagsThatTriggerSilentSeparateRestore.Any(p => argument.StartsWith(p, StringComparison.OrdinalIgnoreCase));
+
         public override int Execute()
         {
             int exitCode;
diff --git a/test/dotnet.Tests/dotnet-msbuild/GivenDotnetBuildInvocation.cs b/test/dotnet.Tests/dotnet-msbuild/GivenDotnetBuildInvocation.cs
@@ -56,15 +56,15 @@ public void MsbuildInvocationIsCorrect(string[] args, string expectedAdditionalA
         }
 
         [Theory]
-        [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[] { "-f", "tfm" }, "-target:Restore -nologo -tlp:verbosity=quiet", "-property:TargetFramework=tfm")]
+        [InlineData(new string[] { "-p:TargetFramework=tfm" }, "-target:Restore -nologo -tlp:verbosity=quiet", "--property:TargetFramework=tfm")]
+        [InlineData(new string[] { "/p:TargetFramework=tfm" }, "-target:Restore -nologo -tlp:verbosity=quiet", "--property:TargetFramework=tfm")]
+        [InlineData(new string[] { "-t:Run", "-f", "tfm" }, "-target:Restore -nologo -tlp:verbosity=quiet", "-property:TargetFramework=tfm -t:Run")]
+        [InlineData(new string[] { "/t:Run", "-f", "tfm" }, "-target:Restore -nologo -tlp:verbosity=quiet", "-property:TargetFramework=tfm /t:Run")]
         [InlineData(new string[] { "-o", "myoutput", "-f", "tfm", "-v", "diag", "/ArbitrarySwitchForMSBuild" },
-                                  "-target:Restore -nologo -verbosity:quiet -verbosity:diag -property:OutputPath=<cwd>myoutput -property:_CommandLineDefinedOutputPath=true /ArbitrarySwitchForMSBuild",
+                                  "-target:Restore -nologo -tlp: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")]
+        [InlineData(new string[] { "-f", "tfm", "-getItem:Compile", "-getProperty:TargetFramework", "-getTargetResult:Build" }, "-target:Restore -nologo -tlp:verbosity=quiet -verbosity:quiet", "-property:TargetFramework=tfm -getItem:Compile -getProperty:TargetFramework -getTargetResult:Build")]
         public void MsbuildInvocationIsCorrectForSeparateRestore(
             string[] args,
             string expectedAdditionalArgsForRestore,
diff --git a/test/dotnet.Tests/dotnet-msbuild/GivenDotnetPublishInvocation.cs b/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 -nologo -verbosity:quiet {ExpectedProperties}");
+                   .Be($"{ExpectedPrefix} -target:Restore -nologo -tlp:verbosity=quiet {ExpectedProperties}");
 
             command.GetArgumentsToMSBuild()
                    .Should()

Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,9 @@ private static bool HasArgumentToExcludeFromRestore(IEnumerable<string> argument`
`106`	`106`	`private static List<string> FlagsToExcludeFromSeparateRestore =`
`107`	`107`	`ComputeFlags(FlagsToExcludeFromRestore).ToList();`
`108`	`108`
	`109`	`+ private static List<string> FlagsThatTriggerSilentSeparateRestore =`
	`110`	`+ ComputeFlags(FlagsThatTriggerSilentRestore).ToList();`
	`111`	`+`
`109`	`112`	`private static List<string> PropertiesToExcludeFromSeparateRestore =`
`110`	`113`	`ComputePropertySwitches(PropertiesToExcludeFromRestore).ToList();`
`111`	`114`
`@@ -114,16 +117,21 @@ private static bool HasArgumentToExcludeFromRestore(IEnumerable<string> argument`
`114`	`117`	`// that we need to compensate for, so we might yield new arguments that should be included in the overall restore call.`
`115`	`118`	`private static (string[] newArgumentsToAdd, string[] existingArgumentsToForward) ProcessForwardedArgumentsForSeparateRestore(IEnumerable<string> forwardedArguments)`
`116`	`119`	`{`
`117`		`- HashSet<string> newArgumentsToAdd = new() { "-nologo", "-verbosity:quiet" };`
	`120`	`+ // Separate restore should be silent in terminal logger - regardless of actual scenario`
	`121`	`+ HashSet<string> newArgumentsToAdd = new() { "-nologo", "-tlp:verbosity=quiet" };`
`118`	`122`	`List<string> existingArgumentsToForward = new();`
`119`	`123`
`120`	`124`	`foreach (var argument in forwardedArguments)`
`121`	`125`	`{`
`122`		`-`
`123`	`126`	`if (!IsExcludedFromSeparateRestore(argument) && !IsExcludedFromRestore(argument))`
`124`	`127`	`{`
`125`	`128`	`existingArgumentsToForward.Add(argument);`
`126`	`129`	`}`
	`130`	`+`
	`131`	`+ if (TriggersSilentSeparateRestore(argument))`
	`132`	`+ {`
	`133`	`+ newArgumentsToAdd.Add("-verbosity:quiet");`
	`134`	`+ }`
`127`	`135`	`}`
`128`	`136`	`return (newArgumentsToAdd.ToArray(), existingArgumentsToForward.ToArray());`
`129`	`137`	`}`
`@@ -157,6 +165,10 @@ private static bool IsExcludedFromRestore(string argument)`
`157`	`165`	`private static bool IsExcludedFromSeparateRestore(string argument)`
`158`	`166`	`=> FlagsToExcludeFromSeparateRestore.Any(p => argument.StartsWith(p, StringComparison.OrdinalIgnoreCase));`
`159`	`167`
	`168`	`+ // These arguments should lead to absolutely no output from the restore command - regardless of loggers`
	`169`	`+ private static bool TriggersSilentSeparateRestore(string argument)`
	`170`	`+ => FlagsThatTriggerSilentSeparateRestore.Any(p => argument.StartsWith(p, StringComparison.OrdinalIgnoreCase));`
	`171`	`+`
`160`	`172`	`public override int Execute()`
`161`	`173`	`{`
`162`	`174`	`int exitCode;`