[automated] Merge branch 'release/10.0.3xx' => 'main'

.vsts-ci.yml

@@ -104,7 +104,7 @@ extends:
             publishTaskPrefix: 1ES.
           populateInternalRuntimeVariables: true
           runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
-          locBranch: release/10.0.1xx
+          locBranch: release/10.0.2xx
           # WORKAROUND: BinSkim requires the folder exist prior to scanning.
           preSteps:
           - powershell: New-Item -ItemType Directory -Path $(Build.SourcesDirectory)/artifacts/bin -Force

Directory.Build.props

@@ -12,7 +12,6 @@
   </PropertyGroup>
 
   <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
-  <Import Project="$(RepositoryEngineeringDir)Analyzers.props" />
 
   <PropertyGroup>
     <IsLinux Condition="$([MSBuild]::IsOSPlatform('LINUX'))">true</IsLinux>
@@ -75,9 +74,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(IsTestProject)' == 'true'">
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <GenerateProgramFile>false</GenerateProgramFile>
-    <!-- <TestRunnerAdditionalArguments>-parallel none</TestRunnerAdditionalArguments> -->
   </PropertyGroup>
 
   <PropertyGroup>

documentation/general/analyzer-redirecting.md

@@ -48,11 +48,31 @@ And metadata at `metadata.json`:
 
 ```json
 {
-  "AspNetCoreAnalyzers": "9.0.0-preview.5.24306.11",
-  "NetCoreAnalyzers": "9.0.0-preview.5.24306.7",
-  "WindowsDesktopAnalyzers": "9.0.0-preview.5.24306.8",
-  "SDKAnalyzers": "9.0.100-dev",
-  "WebSDKAnalyzers": "9.0.100-dev",
+  "AspNetCoreAnalyzers":
+  {
+    "Version": "9.0.0-preview.5.24306.11",
+    "Files": ["analyzers\\dotnet\\cs\\Microsoft.AspNetCore.App.Analyzers.dll"]
+  },
+  "NetCoreAnalyzers":
+  {
+    "Version": "9.0.0-preview.5.24306.7",
+    "Files": ["analyzers\\dotnet\\cs\\System.Text.RegularExpressions.Generator.dll"]
+  },
+  "WindowsDesktopAnalyzers":
+  {
+    "Version": "9.0.0-preview.5.24306.8",
+    "Files": ["analyzers\\dotnet\\System.Windows.Forms.Analyzers.dll"]
+  },
+  "SDKAnalyzers":
+  {
+    "Version": "9.0.100-dev",
+    "Files": ["Sdks\\Microsoft.NET.Sdk\\analyzers\\Microsoft.CodeAnalysis.NetAnalyzers.dll"]
+  },
+  "WebSDKAnalyzers":
+  {
+    "Version": "9.0.100-dev",
+    "Files": ["Sdks\\Microsoft.NET.Sdk.Web\\analyzers\\cs\\Microsoft.AspNetCore.Analyzers.dll"]
+  },
 }
 ```
 
@@ -73,7 +93,7 @@ will be redirected to
 {InstallDir}\SDKAnalyzers\Sdks\Microsoft.NET.Sdk\analyzers\Microsoft.CodeAnalysis.NetAnalyzers.dll
 ```
 
-where `metadata.json` has `"SDKAnalyzers": "9.0.100-dev"`, because
+where `metadata.json` has `"SDKAnalyzers": { "Version": "9.0.100-dev" }`, because
 1. the suffix `Sdks\Microsoft.NET.Sdk\analyzers\Microsoft.CodeAnalysis.NetAnalyzers.dll` matches, and
 2. the version `9.0.100-preview.5.24307.3` has the same major and minor component (`9.0`) as the version `9.0.100-dev`
    (both versions are read from the paths, not DLL metadata).

eng/Versions.props

@@ -58,7 +58,6 @@
     <NETStandardLibraryVersion>2.0.3</NETStandardLibraryVersion>
     <NewtonsoftJsonPackageVersion>13.0.3</NewtonsoftJsonPackageVersion>
     <SystemDataSqlClientPackageVersion>4.8.6</SystemDataSqlClientPackageVersion>
-    <StyleCopAnalyzersPackageVersion>1.2.0-beta.435</StyleCopAnalyzersPackageVersion>
     <WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
     <SystemCommandLineNamingConventionBinderVersion>2.0.0-beta5.25279.2</SystemCommandLineNamingConventionBinderVersion>
     <MicrosoftCodeAnalysisAnalyzerTestingVersion>1.1.2</MicrosoftCodeAnalysisAnalyzerTestingVersion>

src/BuiltInTools/HotReloadAgent/HotReloadAgent.cs

@@ -297,8 +297,12 @@ public void ApplyStaticAssetUpdate(RuntimeStaticAssetUpdate update)
     /// </summary>
     public static void ClearHotReloadEnvironmentVariables(Type startupHookType)
     {
-        Environment.SetEnvironmentVariable(AgentEnvironmentVariables.DotNetStartupHooks,
-            RemoveCurrentAssembly(startupHookType, Environment.GetEnvironmentVariable(AgentEnvironmentVariables.DotNetStartupHooks)!));
+        var startupHooks = Environment.GetEnvironmentVariable(AgentEnvironmentVariables.DotNetStartupHooks);
+        if (!string.IsNullOrEmpty(startupHooks))
+        {
+            Environment.SetEnvironmentVariable(AgentEnvironmentVariables.DotNetStartupHooks,
+                RemoveCurrentAssembly(startupHookType, startupHooks));
+        }
 
         Environment.SetEnvironmentVariable(AgentEnvironmentVariables.DotNetWatchHotReloadNamedPipeName, null);
         Environment.SetEnvironmentVariable(AgentEnvironmentVariables.HotReloadDeltaClientLogMessages, null);
@@ -307,10 +311,7 @@ public static void ClearHotReloadEnvironmentVariables(Type startupHookType)
     // internal for testing
     internal static string RemoveCurrentAssembly(Type startupHookType, string environment)
     {
-        if (environment is "")
-        {
-            return environment;
-        }
+        Debug.Assert(!string.IsNullOrEmpty(environment), $"{nameof(environment)} must be set");
 
         var comparison = Path.DirectorySeparatorChar == '\\' ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal;
 

src/BuiltInTools/Watch.Aspire/DotNetWatchLauncher.cs

@@ -11,8 +11,7 @@ public static async Task<bool> RunAsync(string workingDirectory, DotNetWatchOpti
     {
         var globalOptions = new GlobalOptions()
         {
-            Quiet = options.IsQuiet,
-            Verbose = options.IsVerbose,
+            LogLevel = options.LogLevel,
             NoHotReload = false,
             NonInteractive = true,
         };
@@ -42,10 +41,10 @@ public static async Task<bool> RunAsync(string workingDirectory, DotNetWatchOpti
         var muxerPath = Path.GetFullPath(Path.Combine(options.SdkDirectory, "..", "..", "dotnet" + PathUtilities.ExecutableExtension));
 
         var console = new PhysicalConsole(TestFlags.None);
-        var reporter = new ConsoleReporter(console, globalOptions.Verbose, globalOptions.Quiet, suppressEmojis: false);
+        var reporter = new ConsoleReporter(console, suppressEmojis: false);
         var environmentOptions = EnvironmentOptions.FromEnvironment(muxerPath);
         var processRunner = new ProcessRunner(environmentOptions.GetProcessCleanupTimeout(isHotReloadEnabled: true));
-        var loggerFactory = new LoggerFactory(reporter);
+        var loggerFactory = new LoggerFactory(reporter, globalOptions.LogLevel);
         var logger = loggerFactory.CreateLogger(DotNetWatchContext.DefaultLogComponentName);
 
         using var context = new DotNetWatchContext()

src/BuiltInTools/Watch.Aspire/DotNetWatchOptions.cs

@@ -4,6 +4,7 @@
 using System.Collections.Immutable;
 using System.CommandLine;
 using System.Diagnostics.CodeAnalysis;
+using Microsoft.Extensions.Logging;
 
 namespace Microsoft.DotNet.Watch;
 
@@ -17,8 +18,7 @@ internal sealed class DotNetWatchOptions
 
     public required string ProjectPath { get; init; }
     public required ImmutableArray<string> ApplicationArguments { get; init; }
-    public bool IsVerbose { get; init; }
-    public bool IsQuiet { get; init; }
+    public LogLevel LogLevel { get; init; }
     public bool NoLaunchProfile { get; init; }
 
     public static bool TryParse(string[] args, [NotNullWhen(true)] out DotNetWatchOptions? options)
@@ -71,8 +71,7 @@ public static bool TryParse(string[] args, [NotNullWhen(true)] out DotNetWatchOp
         {
             SdkDirectory = parseResult.GetRequiredValue(sdkOption),
             ProjectPath = parseResult.GetRequiredValue(projectOption),
-            IsQuiet = parseResult.GetValue(quietOption),
-            IsVerbose = parseResult.GetValue(verboseOption),
+            LogLevel = parseResult.GetValue(quietOption) ? LogLevel.Warning : parseResult.GetValue(verboseOption) ? LogLevel.Debug : LogLevel.Information,
             ApplicationArguments = [.. parseResult.GetValue(applicationArguments) ?? []],
             NoLaunchProfile = parseResult.GetValue(noLaunchProfileOption),
         };

src/BuiltInTools/Watch/AppModels/WebApplicationAppModel.cs

@@ -71,13 +71,13 @@ public bool IsServerSupported(ProjectGraphNode projectNode, ILogger logger)
     {
         if (context.EnvironmentOptions.SuppressBrowserRefresh)
         {
-            logger.Log(MessageDescriptor.SkippingConfiguringBrowserRefresh_SuppressedViaEnvironmentVariable.WithSeverityWhen(MessageSeverity.Error, RequiresBrowserRefresh), EnvironmentVariables.Names.SuppressBrowserRefresh);
+            logger.Log(MessageDescriptor.SkippingConfiguringBrowserRefresh_SuppressedViaEnvironmentVariable.WithLevelWhen(LogLevel.Error, RequiresBrowserRefresh), EnvironmentVariables.Names.SuppressBrowserRefresh);
             return false;
         }
 
         if (!projectNode.IsNetCoreApp(minVersion: s_minimumSupportedVersion))
         {
-            logger.Log(MessageDescriptor.SkippingConfiguringBrowserRefresh_TargetFrameworkNotSupported.WithSeverityWhen(MessageSeverity.Error, RequiresBrowserRefresh));
+            logger.Log(MessageDescriptor.SkippingConfiguringBrowserRefresh_TargetFrameworkNotSupported.WithLevelWhen(LogLevel.Error, RequiresBrowserRefresh));
             return false;
         }
 

src/BuiltInTools/Watch/Context/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
 {
@@ -35,6 +36,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 +55,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,

src/BuiltInTools/Watch/Context/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;
 }

src/BuiltInTools/Watch/Context/GlobalOptions.cs

@@ -1,12 +1,13 @@
 // 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 sealed class GlobalOptions
 {
-    public bool Quiet { get; init; }
-    public bool Verbose { get; init; }
+    public LogLevel LogLevel { get; init; }
     public bool NoHotReload { get; init; }
     public bool NonInteractive { get; init; }
 

src/BuiltInTools/Watch/HotReload/CompilationHandler.cs

@@ -521,7 +521,7 @@ void ReportDiagnostic(Diagnostic diagnostic, MessageDescriptor descriptor, strin
                 {
                     errorsToDisplayInApp.Add(MessageDescriptor.RestartingApplicationToApplyChanges.GetMessage());
                 }
-                else if (descriptor.Severity != MessageSeverity.None)
+                else if (descriptor.Level != LogLevel.None)
                 {
                     errorsToDisplayInApp.Add(descriptor.GetMessage(args));
                 }

src/BuiltInTools/Watch/HotReload/HotReloadDotNetWatcher.cs

@@ -31,7 +31,7 @@ public HotReloadDotNetWatcher(DotNetWatchContext context, IConsole console, IRun
             _runtimeProcessLauncherFactory = runtimeProcessLauncherFactory;
             if (!context.Options.NonInteractive)
             {
-                var consoleInput = new ConsoleInputReader(_console, context.Options.Quiet, context.EnvironmentOptions.SuppressEmojis);
+                var consoleInput = new ConsoleInputReader(_console, context.Options.LogLevel, context.EnvironmentOptions.SuppressEmojis);
 
                 var noPrompt = context.EnvironmentOptions.RestartOnRudeEdit;
                 if (noPrompt)

src/BuiltInTools/Watch/HotReload/IncrementalMSBuildWorkspace.cs

@@ -230,16 +230,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 +262,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
     }
 }

src/BuiltInTools/Watch/UI/ConsoleInputReader.cs

@@ -1,15 +1,17 @@
 // 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 sealed class ConsoleInputReader(IConsole console, bool quiet, bool suppressEmojis)
+    internal sealed class ConsoleInputReader(IConsole console, LogLevel logLevel, bool suppressEmojis)
     {
         private readonly object _writeLock = new();
 
         public async Task<ConsoleKey> GetKeyAsync(string prompt, Func<ConsoleKeyInfo, bool> validateInput, CancellationToken cancellationToken)
         {
-            if (quiet)
+            if (logLevel > LogLevel.Information)
             {
                 return ConsoleKey.Escape;
             }

src/BuiltInTools/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);
         }
     }
 }