[10.0.1xx] Consolidate default verbosity of msbuild-based commands (#50531)

Author: jjonescz

src/Cli/Microsoft.DotNet.Cli.Utils/MSBuildArgs.cs

@@ -58,15 +58,14 @@ private MSBuildArgs(ReadOnlyDictionary<string, string>? properties, ReadOnlyDict
     /// processing of the SDK and returns a structured set of MSBuild arguments grouped by purpose.
     /// </summary>
     /// <param name="forwardedAndUserFacingArgs">the complete set of forwarded MSBuild arguments and un-parsed, potentially MSBuild-relevant arguments</param>
-    /// <returns></returns>
     public static MSBuildArgs AnalyzeMSBuildArguments(IEnumerable<string> forwardedAndUserFacingArgs, params Option[] options)
     {
         var fakeCommand = new System.CommandLine.Command("dotnet");
         foreach (var option in options)
         {
             fakeCommand.Options.Add(option);
         }
-;
+
         var parseResult = fakeCommand.Parse([.. forwardedAndUserFacingArgs], _analysisParsingConfiguration);
         var globalProperties = parseResult.GetResult("--property") is OptionResult propResult ? propResult.GetValueOrDefault<ReadOnlyDictionary<string, string>?>() : null;
         var restoreProperties = parseResult.GetResult("--restoreProperty") is OptionResult restoreResult ? restoreResult.GetValueOrDefault<ReadOnlyDictionary<string, string>?>() : null;

src/Cli/Microsoft.DotNet.Cli.Utils/MSBuildForwardingAppWithoutLogging.cs

@@ -5,11 +5,10 @@
 
 using System.Diagnostics;
 using Microsoft.DotNet.Cli.Utils.Extensions;
-using Microsoft.DotNet.Cli;
 
 namespace Microsoft.DotNet.Cli.Utils;
 
-internal class MSBuildForwardingAppWithoutLogging
+internal sealed class MSBuildForwardingAppWithoutLogging
 {
     private static readonly bool AlwaysExecuteMSBuildOutOfProc = Env.GetEnvironmentVariableAsBool("DOTNET_CLI_RUN_MSBUILD_OUTOFPROC");
     private static readonly bool UseMSBuildServer = Env.GetEnvironmentVariableAsBool("DOTNET_CLI_USE_MSBUILD_SERVER", false);
@@ -23,6 +22,8 @@ public static string MSBuildVersion
 
     private const string SdksDirectoryName = "Sdks";
 
+    internal const VerbosityOptions DefaultVerbosity = VerbosityOptions.m;
+
     // Null if we're running MSBuild in-proc.
     private ForwardingAppImplementation? _forwardingApp;
 
@@ -41,7 +42,7 @@ public static string MSBuildVersion
 
     private readonly Dictionary<string, string?> _msbuildRequiredEnvironmentVariables = GetMSBuildRequiredEnvironmentVariables();
 
-    private readonly List<string> _msbuildRequiredParameters = [ "-maxcpucount", "--verbosity:m" ];
+    private readonly List<string> _msbuildRequiredParameters = ["-maxcpucount", $"--verbosity:{DefaultVerbosity}"];
 
     public MSBuildForwardingAppWithoutLogging(MSBuildArgs msbuildArgs, string? msbuildPath = null, bool includeLogo = false, bool isRestoring = true)
     {
@@ -93,7 +94,7 @@ public ProcessStartInfo GetProcessStartInfo()
 
     public string[] GetAllArguments()
     {
-        return [.. _msbuildRequiredParameters, ..EmitMSBuildArgs(_msbuildArgs) ];
+        return [.. _msbuildRequiredParameters, .. EmitMSBuildArgs(_msbuildArgs)];
     }
 
     private string[] EmitMSBuildArgs(MSBuildArgs msbuildArgs) => [

src/Cli/dotnet/Commands/Run/VirtualProjectBuildingCommand.cs

@@ -105,7 +105,7 @@ public VirtualProjectBuildingCommand(
         Debug.Assert(Path.IsPathFullyQualified(entryPointFileFullPath));
 
         EntryPointFileFullPath = entryPointFileFullPath;
-        MSBuildArgs = msbuildArgs.CloneWithAdditionalProperties(new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+        MSBuildArgs = msbuildArgs.CloneWithAdditionalProperties(new Dictionary<string, string>(2, StringComparer.OrdinalIgnoreCase)
         {
             // See https://github.com/dotnet/msbuild/blob/main/documentation/specs/build-nonexistent-projects-by-default.md.
             { "_BuildNonexistentProjectsByDefault", bool.TrueString },
@@ -160,7 +160,7 @@ public ImmutableArray<CSharpDirective> Directives
 
     public override int Execute()
     {
-        var verbosity = MSBuildArgs.Verbosity ?? VerbosityOptions.quiet;
+        var verbosity = MSBuildArgs.Verbosity ?? MSBuildForwardingAppWithoutLogging.DefaultVerbosity;
         var consoleLogger = TerminalLogger.CreateTerminalOrConsoleLogger([$"--verbosity:{verbosity}", .. MSBuildArgs.OtherMSBuildArgs]);
         var binaryLogger = GetBinaryLogger(MSBuildArgs.OtherMSBuildArgs);
 

test/dotnet.Tests/CommandTests/Run/RunFileTests.cs

@@ -1164,6 +1164,69 @@ public void TerminalLogger(bool on)
         }
     }
 
+    [Fact]
+    public void Verbosity_Run()
+    {
+        var testInstance = _testAssetsManager.CreateTestDirectory();
+        var programFile = Path.Join(testInstance.Path, "Program.cs");
+        File.WriteAllText(programFile, s_program);
+
+        new DotnetCommand(Log, "run", "Program.cs", "--no-cache")
+            .WithWorkingDirectory(testInstance.Path)
+            .Execute()
+            .Should().Pass()
+            // no additional build messages
+            .And.HaveStdOut("Hello from Program")
+            .And.NotHaveStdOutContaining("Program.dll")
+            .And.NotHaveStdErr();
+    }
+
+    [Fact] // https://github.com/dotnet/sdk/issues/50227
+    public void Verbosity_Build()
+    {
+        var testInstance = _testAssetsManager.CreateTestDirectory();
+        var programFile = Path.Join(testInstance.Path, "Program.cs");
+        File.WriteAllText(programFile, s_program);
+
+        new DotnetCommand(Log, "build", "Program.cs")
+            .WithWorkingDirectory(testInstance.Path)
+            .Execute()
+            .Should().Pass()
+            // should print path to the built DLL
+            .And.HaveStdOutContaining("Program.dll");
+    }
+
+    [Fact]
+    public void Verbosity_CompilationDiagnostics()
+    {
+        var testInstance = _testAssetsManager.CreateTestDirectory();
+
+        File.WriteAllText(Path.Join(testInstance.Path, "Program.cs"), """
+            string x = null;
+            Console.WriteLine("ran" + x);
+            """);
+
+        new DotnetCommand(Log, "run", "Program.cs")
+            .WithWorkingDirectory(testInstance.Path)
+            .Execute()
+            .Should().Pass()
+            // warning CS8600: Converting null literal or possible null value to non-nullable type.
+            .And.HaveStdOutContaining("warning CS8600")
+            .And.HaveStdOutContaining("ran");
+
+        File.WriteAllText(Path.Join(testInstance.Path, "Program.cs"), """
+            Console.Write
+            """);
+
+        new DotnetCommand(Log, "run", "Program.cs")
+            .WithWorkingDirectory(testInstance.Path)
+            .Execute()
+            .Should().Fail()
+            // error CS1002: ; expected
+            .And.HaveStdOutContaining("error CS1002")
+            .And.HaveStdErrContaining(CliCommandStrings.RunCommandException);
+    }
+
     /// <summary>
     /// Default projects include embedded resources by default.
     /// </summary>