1

tmat · tmat · commit 0a0d37afdb57 · 2025-10-16T09:07:17.000-07:00
diff --git a/src/BuiltInTools/dotnet-watch/CommandLine/EnvironmentOptions.cs b/src/BuiltInTools/dotnet-watch/CommandLine/EnvironmentOptions.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Diagnostics;
+using Microsoft.Extensions.Logging;
 
 namespace Microsoft.DotNet.Watch
 {
@@ -12,16 +13,21 @@ internal enum TestFlags
         RunningAsTest = 1 << 0,
         MockBrowser = 1 << 1,
 
+        /// <summary>
+        /// Elevates the logging level 
+        /// </summary>
+        TraceLogging = 1 << 2,
+
         /// <summary>
         /// Instead of using <see cref="Console.ReadKey()"/> to watch for Ctrl+C, Ctlr+R, and other keys, read from standard input.
         /// This allows tests to trigger key based events.
         /// </summary>
-        ReadKeyFromStdin = 1 << 2,
+        ReadKeyFromStdin = 1 << 3,
 
         /// <summary>
         /// Redirects the output of the launched browser process to watch output.
         /// </summary>
-        RedirectBrowserOutput = 1 << 3,
+        RedirectBrowserOutput = 1 << 4,
     }
 
     internal sealed record EnvironmentOptions(
@@ -35,6 +41,7 @@ internal sealed record EnvironmentOptions(
         bool SuppressBrowserRefresh = false,
         bool SuppressEmojis = false,
         bool RestartOnRudeEdit = false,
+        LogLevel? CliLogLevel = null,
         string? AutoReloadWebSocketHostName = null,
         int? AutoReloadWebSocketPort = null,
         string? BrowserPath = null,
@@ -53,6 +60,7 @@ internal sealed record EnvironmentOptions(
             SuppressBrowserRefresh: EnvironmentVariables.SuppressBrowserRefresh,
             SuppressEmojis: EnvironmentVariables.SuppressEmojis,
             RestartOnRudeEdit: EnvironmentVariables.RestartOnRudeEdit,
+            CliLogLevel: EnvironmentVariables.CliLogLevel,
             AutoReloadWebSocketHostName: EnvironmentVariables.AutoReloadWSHostName,
             AutoReloadWebSocketPort: EnvironmentVariables.AutoReloadWSPort,
             BrowserPath: EnvironmentVariables.BrowserPath,
diff --git a/src/BuiltInTools/dotnet-watch/CommandLine/EnvironmentVariables.cs b/src/BuiltInTools/dotnet-watch/CommandLine/EnvironmentVariables.cs
@@ -1,6 +1,8 @@
 ﻿// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.Extensions.Logging;
+
 namespace Microsoft.DotNet.Watch;
 
 internal static class EnvironmentVariables
@@ -20,7 +22,19 @@ public static class Names
         public const string SuppressBrowserRefresh = "DOTNET_WATCH_SUPPRESS_BROWSER_REFRESH";
     }
 
-    public static bool VerboseCliOutput => ReadBool("DOTNET_CLI_CONTEXT_VERBOSE");
+    public static LogLevel? CliLogLevel
+    {
+        get
+        {
+            var value = Environment.GetEnvironmentVariable("DOTNET_CLI_CONTEXT_VERBOSE");
+            return string.Equals(value, "trace", StringComparison.OrdinalIgnoreCase)
+                ? LogLevel.Trace
+                : ParseBool(value)
+                ? LogLevel.Debug
+                : null;
+        }
+    }
+
     public static bool IsPollingEnabled => ReadBool("DOTNET_USE_POLLING_FILE_WATCHER");
     public static bool SuppressEmojis => ReadBool("DOTNET_WATCH_SUPPRESS_EMOJIS");
     public static bool RestartOnRudeEdit => ReadBool("DOTNET_WATCH_RESTART_ON_RUDE_EDIT");
@@ -46,11 +60,14 @@ public static class Names
     public static string? BrowserPath => Environment.GetEnvironmentVariable("DOTNET_WATCH_BROWSER_PATH");
 
     private static bool ReadBool(string variableName)
-        => Environment.GetEnvironmentVariable(variableName) is var value && (value == "1" || bool.TryParse(value, out var boolValue) && boolValue);
+        => ParseBool(Environment.GetEnvironmentVariable(variableName));
 
     private static TimeSpan? ReadTimeSpan(string variableName)
         => Environment.GetEnvironmentVariable(variableName) is var value && long.TryParse(value, out var intValue) && intValue >= 0 ? TimeSpan.FromMilliseconds(intValue) : null;
 
     private static int? ReadInt(string variableName)
         => Environment.GetEnvironmentVariable(variableName) is var value && int.TryParse(value, out var intValue) ? intValue : null;
+
+    private static bool ParseBool(string? value)
+        => value == "1" || bool.TryParse(value, out var boolValue) && boolValue;
 }
diff --git a/src/BuiltInTools/dotnet-watch/HotReload/HotReloadDotNetWatcher.cs b/src/BuiltInTools/dotnet-watch/HotReload/HotReloadDotNetWatcher.cs
@@ -107,7 +107,7 @@ public async Task WatchAsync(CancellationToken shutdownCancellationToken)
                     }
 
                     var projectMap = new ProjectNodeMap(evaluationResult.ProjectGraph, _context.Logger);
-                    compilationHandler = new CompilationHandler(_context.Logger, _context.ProcessRunner);
+                    compilationHandler = new CompilationHandler(_context.Logger, _context.ProcessRunner, _context.EnvironmentOptions);
                     var scopedCssFileHandler = new ScopedCssFileHandler(_context.Logger, _context.BuildLogger, projectMap, _context.BrowserRefreshServerFactory, _context.Options, _context.EnvironmentOptions);
                     var projectLauncher = new ProjectLauncher(_context, projectMap, compilationHandler, iteration);
                     evaluationResult.ItemExclusions.Report(_context.Logger);
diff --git a/src/BuiltInTools/dotnet-watch/HotReload/IncrementalMSBuildWorkspace.cs b/src/BuiltInTools/dotnet-watch/HotReload/IncrementalMSBuildWorkspace.cs
@@ -9,6 +9,7 @@
 using Microsoft.CodeAnalysis.MSBuild;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.Extensions.Logging;
+using Windows.Win32.Security.Cryptography;
 
 namespace Microsoft.DotNet.Watch;
 
@@ -32,6 +33,7 @@ public IncrementalMSBuildWorkspace(ILogger logger)
 #pragma warning restore CS0618
 
         _logger = logger;
+        _environmentOptions = environmentOptions;
     }
 
     public async Task UpdateProjectConeAsync(string rootProjectPath, CancellationToken cancellationToken)
@@ -230,16 +232,13 @@ private Task UpdateSolutionAsync(Solution newSolution, string operationDisplayNa
 
     private async Task ReportSolutionFilesAsync(Solution solution, int updateId, string operationDisplayName, CancellationToken cancellationToken)
     {
-#if DEBUG
-        _logger.LogDebug("Solution: {Path}", solution.FilePath);
+        _logger.LogDebug("Solution after {Operation}: v{Version}", operationDisplayName, updateId);
 
-        if (!_logger.IsEnabled(LogLevel.Debug))
+        if (!_logger.IsEnabled(LogLevel.Trace))
         {
             return;
         }
 
-        _logger.LogDebug("Solution after {Operation}: v{Version}", operationDisplayName, updateId);
-
         foreach (var project in solution.Projects)
         {
             _logger.LogDebug("  Project: {Path}", project.FilePath);
@@ -265,8 +264,5 @@ async ValueTask InspectDocumentAsync(TextDocument document, string kind)
             var text = await document.GetTextAsync(cancellationToken);
             _logger.LogDebug("    {Kind}: {FilePath} [{Checksum}]", kind, document.FilePath, Convert.ToBase64String(text.GetChecksum().ToArray()));
         }
-#else
-        await Task.CompletedTask;
-#endif
     }
 }
diff --git a/src/BuiltInTools/dotnet-watch/Program.cs b/src/BuiltInTools/dotnet-watch/Program.cs
@@ -46,7 +46,6 @@ public static async Task<int> Main(string[] args)
                     args,
                     new PhysicalConsole(environmentOptions.TestFlags),
                     environmentOptions,
-                    EnvironmentVariables.VerboseCliOutput,
                     out var exitCode);
 
                 if (program == null)
@@ -64,18 +63,25 @@ public static async Task<int> Main(string[] args)
             }
         }
 
-        private static Program? TryCreate(IReadOnlyList<string> args, IConsole console, EnvironmentOptions environmentOptions, bool verbose, out int errorCode)
+        private static Program? TryCreate(IReadOnlyList<string> args, IConsole console, EnvironmentOptions environmentOptions, out int errorCode)
         {
-            var parsingLoggerFactory = new LoggerFactory(new ConsoleReporter(console, verbose, quiet: false, environmentOptions.SuppressEmojis));
+            var parsingLoggerFactory = new LoggerFactory(new ConsoleReporter(console, environmentOptions.SuppressEmojis), LogLevel: environmentOptions.CliLogLevel ?? LogLevel.Information);
             var options = CommandLineOptions.Parse(args, parsingLoggerFactory.CreateLogger(LogComponentName), console.Out, out errorCode);
             if (options == null)
             {
                 // an error reported or help printed:
                 return null;
             }
 
-            var reporter = new ConsoleReporter(console, verbose || options.GlobalOptions.Verbose, options.GlobalOptions.Quiet, environmentOptions.SuppressEmojis);
-            var loggerFactory = new LoggerFactory(reporter);
+            var logLevel = environmentOptions.CliLogLevel ??
+                (options.GlobalOptions.Verbose
+                    ? LogLevel.Debug
+                    : options.GlobalOptions.Quiet
+                    ? LogLevel.Warning
+                    : LogLevel.Information);
+
+            var reporter = new ConsoleReporter(console, environmentOptions.SuppressEmojis);
+            var loggerFactory = new LoggerFactory(reporter, logLevel);
             return TryCreate(options, console, environmentOptions, loggerFactory, reporter, out errorCode);
         }
 
diff --git a/src/BuiltInTools/dotnet-watch/UI/ConsoleReporter.cs b/src/BuiltInTools/dotnet-watch/UI/ConsoleReporter.cs
@@ -9,10 +9,8 @@ namespace Microsoft.DotNet.Watch
     /// This API supports infrastructure and is not intended to be used
     /// directly from your code. This API may change or be removed in future releases.
     /// </summary>
-    internal sealed class ConsoleReporter(IConsole console, bool verbose, bool quiet, bool suppressEmojis) : IReporter, IProcessOutputReporter
+    internal sealed class ConsoleReporter(IConsole console, bool suppressEmojis) : IReporter, IProcessOutputReporter
     {
-        public bool IsVerbose { get; } = verbose;
-        public bool IsQuiet { get; } = quiet;
         public bool SuppressEmojis { get; } = suppressEmojis;
 
         private readonly Lock _writeLock = new();
@@ -50,33 +48,18 @@ private void WriteLine(TextWriter writer, string message, ConsoleColor? color, E
             }
         }
 
-        public void Report(EventId id, Emoji emoji, MessageSeverity severity, string message)
+        public void Report(EventId id, Emoji emoji, LogLevel level, string message)
         {
-            switch (severity)
+            var color = level switch
             {
-                case MessageSeverity.Error:
-                    // Use stdout for error messages to preserve ordering with respect to other output.
-                    WriteLine(console.Error, message, ConsoleColor.Red, emoji);
-                    break;
+                LogLevel.Critical or LogLevel.Error => ConsoleColor.Red,
+                LogLevel.Warning => ConsoleColor.Yellow,
+                LogLevel.Information => (ConsoleColor?)null,
+                _ => ConsoleColor.DarkGray,
+            };
 
-                case MessageSeverity.Warning:
-                    WriteLine(console.Error, message, ConsoleColor.Yellow, emoji);
-                    break;
-
-                case MessageSeverity.Output:
-                    if (!IsQuiet)
-                    {
-                        WriteLine(console.Error, message, color: null, emoji);
-                    }
-                    break;
-
-                case MessageSeverity.Verbose:
-                    if (IsVerbose)
-                    {
-                        WriteLine(console.Error, message, ConsoleColor.DarkGray, emoji);
-                    }
-                    break;
-            }
+            // Use stdout for error messages to preserve ordering with respect to other output.
+            WriteLine(console.Error, message, color, emoji);
         }
     }
 }
diff --git a/src/BuiltInTools/dotnet-watch/UI/IReporter.cs b/src/BuiltInTools/dotnet-watch/UI/IReporter.cs
@@ -96,31 +96,35 @@ public static MessageSeverity ToSeverity(this LogLevel level)
             };
     }
 
-    internal sealed class LoggerFactory(IReporter reporter) : ILoggerFactory
+    internal sealed class LoggerFactory(IReporter reporter, LogLevel level) : ILoggerFactory
     {
-        private sealed class Logger(IReporter reporter, string categoryName) : ILogger
+        private sealed class Logger(IReporter reporter, LogLevel level, string categoryName) : ILogger
         {
             public bool IsEnabled(LogLevel logLevel)
-                => reporter.IsVerbose || logLevel > LogLevel.Debug;
+                => logLevel >= level;
 
             public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func<TState, Exception?, string> formatter)
             {
+                if (!IsEnabled(logLevel))
+                {
+                    return;
+                }
+
                 var (name, display) = LoggingUtilities.ParseCategoryName(categoryName);
                 var prefix = display != null ? $"[{display}] " : "";
 
-                var severity = logLevel.ToSeverity();
                 var descriptor = eventId.Id != 0 ? MessageDescriptor.GetDescriptor(eventId) : default;
 
-                var emoji = severity switch
+                var emoji = logLevel switch
                 {
                     _ when descriptor.Emoji != Emoji.Default => descriptor.Emoji,
-                    MessageSeverity.Error => Emoji.Error,
-                    MessageSeverity.Warning => Emoji.Warning,
+                    LogLevel.Error => Emoji.Error,
+                    LogLevel.Warning => Emoji.Warning,
                     _ when MessageDescriptor.ComponentEmojis.TryGetValue(name, out var componentEmoji) => componentEmoji,
                     _ => Emoji.Watch
                 };
 
-                reporter.Report(eventId, emoji, severity, prefix + formatter(state, exception));
+                reporter.Report(eventId, emoji, logLevel, prefix + formatter(state, exception));
             }
 
             public IDisposable? BeginScope<TState>(TState state) where TState : notnull
@@ -132,7 +136,7 @@ public void Dispose()
         }
 
         public ILogger CreateLogger(string categoryName)
-            => new Logger(reporter, categoryName);
+            => new Logger(reporter, level, categoryName);
 
         public void AddProvider(ILoggerProvider provider)
             => throw new NotImplementedException();
@@ -256,7 +260,6 @@ public MessageDescriptor WithSeverityWhen(MessageSeverity severity, bool conditi
         public static readonly MessageDescriptor Building = Create("Building {0} ...", Emoji.Default, MessageSeverity.Output);
         public static readonly MessageDescriptor BuildSucceeded = Create("Build succeeded: {0}", Emoji.Default, MessageSeverity.Output);
         public static readonly MessageDescriptor BuildFailed = Create("Build failed: {0}", Emoji.Default, MessageSeverity.Output);
-        
     }
 
     internal interface IProcessOutputReporter
@@ -278,9 +281,6 @@ internal interface IProcessOutputReporter
 
     internal interface IReporter
     {
-        void Report(EventId id, Emoji emoji, MessageSeverity severity, string message);
-
-        public bool IsVerbose
-            => false;
+        void Report(EventId id, Emoji emoji, LogLevel level, string message);
     }
 }
diff --git a/test/dotnet-watch.Tests/CommandLine/ProgramTests.cs b/test/dotnet-watch.Tests/CommandLine/ProgramTests.cs
@@ -3,6 +3,8 @@
 
 #nullable disable
 
+using Microsoft.Extensions.Logging;
+
 namespace Microsoft.DotNet.Watch.UnitTests
 {
     public class ProgramTests(ITestOutputHelper logger) : DotNetWatchTestBase(logger)
@@ -15,7 +17,7 @@ public async Task ConsoleCancelKey()
 
             var console = new TestConsole(Logger);
             var reporter = new TestReporter(Logger);
-            var loggerFactory = new LoggerFactory(reporter);
+            var loggerFactory = new LoggerFactory(reporter, LogLevel.Debug);
 
             var watching = reporter.RegisterSemaphore(MessageDescriptor.WatchingWithHotReload);
             var shutdownRequested = reporter.RegisterSemaphore(MessageDescriptor.ShutdownRequested);
diff --git a/test/dotnet-watch.Tests/ConsoleReporterTests.cs b/test/dotnet-watch.Tests/ConsoleReporterTests.cs
@@ -3,6 +3,8 @@
 
 #nullable disable
 
+using Microsoft.Extensions.Logging;
+
 namespace Microsoft.DotNet.Watch.UnitTests
 {
     public class ConsoleReporterTests
@@ -15,23 +17,31 @@ public class ConsoleReporterTests
         public void WritesToStandardStreams(bool suppressEmojis)
         {
             var testConsole = new TestConsole();
-            var reporter = new ConsoleReporter(testConsole, verbose: true, quiet: false, suppressEmojis: suppressEmojis);
+            var reporter = new ConsoleReporter(testConsole, LogLevel.Debug, suppressEmojis: suppressEmojis);
+
+            reporter.Report(id: default, Emoji.Watch, LogLevel.Trace, "trace {0}");
+            Assert.Empty(testConsole.GetError());
+            testConsole.Clear();
 
-            reporter.Report(id: default, Emoji.Watch, MessageSeverity.Verbose, "verbose {0}");
+            reporter.Report(id: default, Emoji.Watch, LogLevel.Debug, "verbose {0}");
             Assert.Equal($"dotnet watch {(suppressEmojis ? ":" : "⌚")} verbose {{0}}" + EOL, testConsole.GetError());
             testConsole.Clear();
 
-            reporter.Report(id: default, Emoji.Watch, MessageSeverity.Output, "out");
+            reporter.Report(id: default, Emoji.Watch, LogLevel.Information, "out");
             Assert.Equal($"dotnet watch {(suppressEmojis ? ":" : "⌚")} out" + EOL, testConsole.GetError());
             testConsole.Clear();
 
-            reporter.Report(id: default, Emoji.Warning, MessageSeverity.Warning, "warn");
+            reporter.Report(id: default, Emoji.Warning, LogLevel.Warning, "warn");
             Assert.Equal($"dotnet watch {(suppressEmojis ? ":" : "⚠")} warn" + EOL, testConsole.GetError());
             testConsole.Clear();
 
-            reporter.Report(id: default, Emoji.Error, MessageSeverity.Error, "error");
+            reporter.Report(id: default, Emoji.Error, LogLevel.Error, "error");
             Assert.Equal($"dotnet watch {(suppressEmojis ? ":" : "❌")} error" + EOL, testConsole.GetError());
             testConsole.Clear();
+
+            reporter.Report(id: default, Emoji.Error, LogLevel.Critical, "critical");
+            Assert.Equal($"dotnet watch {(suppressEmojis ? ":" : "❌")} critical" + EOL, testConsole.GetError());
+            testConsole.Clear();
         }
 
         private class TestConsole : IConsole
diff --git a/test/dotnet-watch.Tests/HotReload/CompilationHandlerTests.cs b/test/dotnet-watch.Tests/HotReload/CompilationHandlerTests.cs
@@ -1,6 +1,8 @@
 ﻿// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.Extensions.Logging;
+
 namespace Microsoft.DotNet.Watch.UnitTests;
 
 public class CompilationHandlerTests(ITestOutputHelper output) : DotNetWatchTestBase(output)
@@ -22,7 +24,7 @@ public async Task ReferenceOutputAssembly_False()
         var processRunner = new ProcessRunner(processCleanupTimeout: TimeSpan.Zero);
 
         var reporter = new TestReporter(Logger);
-        var loggerFactory = new LoggerFactory(reporter);
+        var loggerFactory = new LoggerFactory(reporter, LogLevel.Debug);
         var logger = loggerFactory.CreateLogger("Test");
         var projectGraph = ProjectGraphUtilities.TryLoadProjectGraph(options.ProjectPath, globalOptions: [], logger, projectGraphRequired: false, CancellationToken.None);
         var handler = new CompilationHandler(logger, processRunner);
diff --git a/test/dotnet-watch.Tests/HotReload/RuntimeProcessLauncherTests.cs b/test/dotnet-watch.Tests/HotReload/RuntimeProcessLauncherTests.cs

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ public async Task WatchAsync(CancellationToken shutdownCancellationToken)`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`var projectMap = new ProjectNodeMap(evaluationResult.ProjectGraph, _context.Logger);`
`110`		`- compilationHandler = new CompilationHandler(_context.Logger, _context.ProcessRunner);`
	`110`	`+ compilationHandler = new CompilationHandler(_context.Logger, _context.ProcessRunner, _context.EnvironmentOptions);`
`111`	`111`	`var scopedCssFileHandler = new ScopedCssFileHandler(_context.Logger, _context.BuildLogger, projectMap, _context.BrowserRefreshServerFactory, _context.Options, _context.EnvironmentOptions);`
`112`	`112`	`var projectLauncher = new ProjectLauncher(_context, projectMap, compilationHandler, iteration);`
`113`	`113`	`evaluationResult.ItemExclusions.Report(_context.Logger);`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`using Microsoft.CodeAnalysis.MSBuild;`
`10`	`10`	`using Microsoft.CodeAnalysis.Text;`
`11`	`11`	`using Microsoft.Extensions.Logging;`
	`12`	`+using Windows.Win32.Security.Cryptography;`
`12`	`13`
`13`	`14`	`namespace Microsoft.DotNet.Watch;`
`14`	`15`
`@@ -32,6 +33,7 @@ public IncrementalMSBuildWorkspace(ILogger logger)`
`32`	`33`	`#pragma warning restore CS0618`
`33`	`34`
`34`	`35`	`_logger = logger;`
	`36`	`+ _environmentOptions = environmentOptions;`
`35`	`37`	`}`
`36`	`38`
`37`	`39`	`public async Task UpdateProjectConeAsync(string rootProjectPath, CancellationToken cancellationToken)`
`@@ -230,16 +232,13 @@ private Task UpdateSolutionAsync(Solution newSolution, string operationDisplayNa`
`230`	`232`
`231`	`233`	`private async Task ReportSolutionFilesAsync(Solution solution, int updateId, string operationDisplayName, CancellationToken cancellationToken)`
`232`	`234`	`{`
`233`		`-#if DEBUG`
`234`		`- _logger.LogDebug("Solution: {Path}", solution.FilePath);`
	`235`	`+ _logger.LogDebug("Solution after {Operation}: v{Version}", operationDisplayName, updateId);`
`235`	`236`
`236`		`- if (!_logger.IsEnabled(LogLevel.Debug))`
	`237`	`+ if (!_logger.IsEnabled(LogLevel.Trace))`
`237`	`238`	`{`
`238`	`239`	`return;`
`239`	`240`	`}`
`240`	`241`
`241`		`- _logger.LogDebug("Solution after {Operation}: v{Version}", operationDisplayName, updateId);`
`242`		`-`
`243`	`242`	`foreach (var project in solution.Projects)`
`244`	`243`	`{`
`245`	`244`	`_logger.LogDebug(" Project: {Path}", project.FilePath);`
`@@ -265,8 +264,5 @@ async ValueTask InspectDocumentAsync(TextDocument document, string kind)`
`265`	`264`	`var text = await document.GetTextAsync(cancellationToken);`
`266`	`265`	`_logger.LogDebug(" {Kind}: {FilePath} [{Checksum}]", kind, document.FilePath, Convert.ToBase64String(text.GetChecksum().ToArray()));`
`267`	`266`	`}`
`268`		`-#else`
`269`		`- await Task.CompletedTask;`
`270`		`-#endif`
`271`	`267`	`}`
`272`	`268`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,6 @@ public static async Task<int> Main(string[] args)`
`46`	`46`	`args,`
`47`	`47`	`new PhysicalConsole(environmentOptions.TestFlags),`
`48`	`48`	`environmentOptions,`
`49`		`- EnvironmentVariables.VerboseCliOutput,`
`50`	`49`	`out var exitCode);`
`51`	`50`
`52`	`51`	`if (program == null)`
`@@ -64,18 +63,25 @@ public static async Task<int> Main(string[] args)`
`64`	`63`	`}`
`65`	`64`	`}`
`66`	`65`
`67`		`- private static Program? TryCreate(IReadOnlyList<string> args, IConsole console, EnvironmentOptions environmentOptions, bool verbose, out int errorCode)`
	`66`	`+ private static Program? TryCreate(IReadOnlyList<string> args, IConsole console, EnvironmentOptions environmentOptions, out int errorCode)`
`68`	`67`	`{`
`69`		`- var parsingLoggerFactory = new LoggerFactory(new ConsoleReporter(console, verbose, quiet: false, environmentOptions.SuppressEmojis));`
	`68`	`+ var parsingLoggerFactory = new LoggerFactory(new ConsoleReporter(console, environmentOptions.SuppressEmojis), LogLevel: environmentOptions.CliLogLevel ?? LogLevel.Information);`
`70`	`69`	`var options = CommandLineOptions.Parse(args, parsingLoggerFactory.CreateLogger(LogComponentName), console.Out, out errorCode);`
`71`	`70`	`if (options == null)`
`72`	`71`	`{`
`73`	`72`	`// an error reported or help printed:`
`74`	`73`	`return null;`
`75`	`74`	`}`
`76`	`75`
`77`		`- var reporter = new ConsoleReporter(console, verbose \|\| options.GlobalOptions.Verbose, options.GlobalOptions.Quiet, environmentOptions.SuppressEmojis);`
`78`		`- var loggerFactory = new LoggerFactory(reporter);`
	`76`	`+ var logLevel = environmentOptions.CliLogLevel ??`
	`77`	`+ (options.GlobalOptions.Verbose`
	`78`	`+ ? LogLevel.Debug`
	`79`	`+ : options.GlobalOptions.Quiet`
	`80`	`+ ? LogLevel.Warning`
	`81`	`+ : LogLevel.Information);`
	`82`	`+`
	`83`	`+ var reporter = new ConsoleReporter(console, environmentOptions.SuppressEmojis);`
	`84`	`+ var loggerFactory = new LoggerFactory(reporter, logLevel);`
`79`	`85`	`return TryCreate(options, console, environmentOptions, loggerFactory, reporter, out errorCode);`
`80`	`86`	`}`
`81`	`87`
Original file line number	Diff line number	Diff line change
`@@ -96,31 +96,35 @@ public static MessageSeverity ToSeverity(this LogLevel level)`
`96`	`96`	`};`
`97`	`97`	`}`
`98`	`98`
`99`		`- internal sealed class LoggerFactory(IReporter reporter) : ILoggerFactory`
	`99`	`+ internal sealed class LoggerFactory(IReporter reporter, LogLevel level) : ILoggerFactory`
`100`	`100`	`{`
`101`		`- private sealed class Logger(IReporter reporter, string categoryName) : ILogger`
	`101`	`+ private sealed class Logger(IReporter reporter, LogLevel level, string categoryName) : ILogger`
`102`	`102`	`{`
`103`	`103`	`public bool IsEnabled(LogLevel logLevel)`
`104`		`- => reporter.IsVerbose \|\| logLevel > LogLevel.Debug;`
	`104`	`+ => logLevel >= level;`
`105`	`105`
`106`	`106`	`public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func<TState, Exception?, string> formatter)`
`107`	`107`	`{`
	`108`	`+ if (!IsEnabled(logLevel))`
	`109`	`+ {`
	`110`	`+ return;`
	`111`	`+ }`
	`112`	`+`
`108`	`113`	`var (name, display) = LoggingUtilities.ParseCategoryName(categoryName);`
`109`	`114`	`var prefix = display != null ? $"[{display}] " : "";`
`110`	`115`
`111`		`- var severity = logLevel.ToSeverity();`
`112`	`116`	`var descriptor = eventId.Id != 0 ? MessageDescriptor.GetDescriptor(eventId) : default;`
`113`	`117`
`114`		`- var emoji = severity switch`
	`118`	`+ var emoji = logLevel switch`
`115`	`119`	`{`
`116`	`120`	`_ when descriptor.Emoji != Emoji.Default => descriptor.Emoji,`
`117`		`- MessageSeverity.Error => Emoji.Error,`
`118`		`- MessageSeverity.Warning => Emoji.Warning,`
	`121`	`+ LogLevel.Error => Emoji.Error,`
	`122`	`+ LogLevel.Warning => Emoji.Warning,`
`119`	`123`	`_ when MessageDescriptor.ComponentEmojis.TryGetValue(name, out var componentEmoji) => componentEmoji,`
`120`	`124`	`_ => Emoji.Watch`
`121`	`125`	`};`
`122`	`126`
`123`		`- reporter.Report(eventId, emoji, severity, prefix + formatter(state, exception));`
	`127`	`+ reporter.Report(eventId, emoji, logLevel, prefix + formatter(state, exception));`
`124`	`128`	`}`
`125`	`129`
`126`	`130`	`public IDisposable? BeginScope<TState>(TState state) where TState : notnull`
`@@ -132,7 +136,7 @@ public void Dispose()`
`132`	`136`	`}`
`133`	`137`
`134`	`138`	`public ILogger CreateLogger(string categoryName)`
`135`		`- => new Logger(reporter, categoryName);`
	`139`	`+ => new Logger(reporter, level, categoryName);`
`136`	`140`
`137`	`141`	`public void AddProvider(ILoggerProvider provider)`
`138`	`142`	`=> throw new NotImplementedException();`
`@@ -256,7 +260,6 @@ public MessageDescriptor WithSeverityWhen(MessageSeverity severity, bool conditi`
`256`	`260`	`public static readonly MessageDescriptor Building = Create("Building {0} ...", Emoji.Default, MessageSeverity.Output);`
`257`	`261`	`public static readonly MessageDescriptor BuildSucceeded = Create("Build succeeded: {0}", Emoji.Default, MessageSeverity.Output);`
`258`	`262`	`public static readonly MessageDescriptor BuildFailed = Create("Build failed: {0}", Emoji.Default, MessageSeverity.Output);`
`259`		`-`
`260`	`263`	`}`
`261`	`264`
`262`	`265`	`internal interface IProcessOutputReporter`
`@@ -278,9 +281,6 @@ internal interface IProcessOutputReporter`
`278`	`281`
`279`	`282`	`internal interface IReporter`
`280`	`283`	`{`
`281`		`- void Report(EventId id, Emoji emoji, MessageSeverity severity, string message);`
`282`		`-`
`283`		`- public bool IsVerbose`
`284`		`- => false;`
	`284`	`+ void Report(EventId id, Emoji emoji, LogLevel level, string message);`
`285`	`285`	`}`
`286`	`286`	`}`