More cleanup

sbomer · sbomer · commit 92b9104a1dd9 · 2025-04-28T23:29:38.000Z
diff --git a/src/Microsoft.Diagnostics.Monitoring.Extension.Common/Microsoft.Diagnostics.Monitoring.Extension.Common.csproj b/src/Microsoft.Diagnostics.Monitoring.Extension.Common/Microsoft.Diagnostics.Monitoring.Extension.Common.csproj
@@ -21,6 +21,8 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Logging" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" />
     <PackageReference Include="System.CommandLine" />
   </ItemGroup>
 
diff --git a/src/Microsoft.Diagnostics.Monitoring.Options/Microsoft.Diagnostics.Monitoring.Options.csproj b/src/Microsoft.Diagnostics.Monitoring.Options/Microsoft.Diagnostics.Monitoring.Options.csproj
@@ -39,5 +39,4 @@
       <Generator>PublicResXFileCodeGenerator</Generator>
     </EmbeddedResource>
   </ItemGroup>
-
 </Project>
diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.ConfigurationSchema/Microsoft.Diagnostics.Monitoring.ConfigurationSchema.csproj b/src/Tests/Microsoft.Diagnostics.Monitoring.ConfigurationSchema/Microsoft.Diagnostics.Monitoring.ConfigurationSchema.csproj
@@ -76,6 +76,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" />
     <PackageReference Include="NJsonSchema" />
     <PackageReference Include="NJsonSchema.NewtonsoftJson" />
diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTestCommon/TestValidatableType.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTestCommon/TestValidatableType.cs
@@ -7,10 +7,6 @@
 
 namespace Microsoft.Diagnostics.Monitoring.TestCommon
 {
-    // The Validation source generator doesn't run for libraries that don't call AddValidation,
-    // so we can't generate IValidatableInfo by using [ValidatableType] directly on types defined
-    // in ProjectReferences. This is a workaround to force the generator running in this project to
-    // generate IValidatableInfo for the referenced types. The containing class is not used otherwise.
     [ValidatableType]
     internal sealed class TestValidatableTypes
     {
diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/CollectionRuleDescriptionPipelineTests.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/CollectionRuleDescriptionPipelineTests.cs
@@ -7,7 +7,6 @@
 using Microsoft.Diagnostics.Monitoring.Tool.UnitTests.CollectionRules.Triggers;
 using Microsoft.Diagnostics.Monitoring.WebApi;
 using Microsoft.Diagnostics.Monitoring.WebApi.Models;
-using Strings = Microsoft.Diagnostics.Monitoring.WebApi.Strings;
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules;
 using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/ExtensionManifestTests.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/ExtensionManifestTests.cs
@@ -179,7 +179,6 @@ public void ExtensionManifest_NameAndAssembly_Valid()
             Assert.Equal(ExpectedAssemblyName, manifest.AssemblyFileName);
             Assert.Null(manifest.ExecutableFileName);
 
-    
             var validationOptions = _fixture.Services.GetRequiredService<IOptions<ValidationOptions>>().Value;
             manifest.Validate(_fixture.Services, validationOptions);
         }
diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTestsSample/Microsoft.Diagnostics.Monitoring.Tool.UnitTestsSample.csproj b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTestsSample/Microsoft.Diagnostics.Monitoring.Tool.UnitTestsSample.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
+    <TargetFrameworks>$(ToolTargetFrameworks)</TargetFrameworks>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
diff --git a/src/Tools/dotnet-monitor/Auth/ApiKey/MonitorApiKeyPostConfigure.cs b/src/Tools/dotnet-monitor/Auth/ApiKey/MonitorApiKeyPostConfigure.cs
@@ -56,7 +56,12 @@ public void PostConfigure(string? name, MonitorApiKeyConfiguration options)
             // Some options are configured (but may not be valid)
             options.Configured = true;
 
-            ValidationHelper.TryValidateObject(sourceOptions, typeof(MonitorApiKeyOptions), _validationOptions, _serviceProvider, errors);
+            ValidationHelper.TryValidateObject(
+                sourceOptions,
+                typeof(MonitorApiKeyOptions),
+                _validationOptions,
+                _serviceProvider,
+                errors);
 
             string? jwkJson = null;
             try
diff --git a/src/Tools/dotnet-monitor/CollectionRules/Actions/CollectExceptionsAction.cs b/src/Tools/dotnet-monitor/CollectionRules/Actions/CollectExceptionsAction.cs
@@ -10,8 +10,6 @@
 using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Configuration;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
 using Utils = Microsoft.Diagnostics.Monitoring.WebApi.Utilities;
 
 namespace Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Actions
@@ -34,12 +32,7 @@ public ICollectionRuleAction Create(IProcessInfo processInfo, CollectExceptionsO
                 throw new ArgumentNullException(nameof(options));
             }
 
-            List<ValidationResult> result = new();
-            if (!ValidationHelper.TryValidateObject(options, typeof(CollectExceptionsOptions), _validationOptions, _serviceProvider, result))
-            {
-                throw new ValidationException(
-                    string.Join(Environment.NewLine, result.ConvertAll(r => r.ErrorMessage)));
-            }
+            ValidationHelper.ValidateObject(options, typeof(CollectExceptionsOptions), _validationOptions, _serviceProvider);
 
             return new CollectExceptionsAction(processInfo, options);
         }
diff --git a/src/Tools/dotnet-monitor/CollectionRules/Configuration/CollectionRuleBindingHelper.cs b/src/Tools/dotnet-monitor/CollectionRules/Configuration/CollectionRuleBindingHelper.cs
@@ -10,33 +10,6 @@ namespace Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Configuration
 {
     internal static class CollectionRuleBindingHelper
     {
-        // public static object CreateActionSettings(
-        //     string actionType,
-        //     Func<CollectDumpOptions> collectDump,
-        //     Func<CollectExceptionsOptions> collectExceptions
-        // ) => actionType switch {
-        //         KnownCollectionRuleActions.CollectDump => collectDump(),
-        //         KnownCollectionRuleActions.CollectExceptions => collectExceptions(),
-        //         _ => throw new ArgumentException($"Unknown action type: {actionType}", nameof(actionType))
-        // };
-
-        // public static object NewActionSettings(string actionType) => 
-        //     actionType switch {
-        //         KnownCollectionRuleActions.CollectDump => new CollectDumpOptions(),
-        //         KnownCollectionRuleActions.CollectExceptions => new CollectExceptionsOptions(),
-        //         _ => null
-        //     };
-
-        // public static Action SelectAction(
-        //     string actionType,
-        //     Action<CollectDumpOptions> collectDump,
-        //     Action<CollectExceptionsOptions> collectExceptions
-        // ) => actionType switch {
-        //         KnownCollectionRuleActions.CollectDump => collectDump,
-        //         KnownCollectionRuleActions.CollectExceptions => collectExceptions,
-        // };
-
-
         public static void BindActionSettings(IConfigurationSection actionSection, CollectionRuleActionOptions actionOptions, ICollectionRuleActionOperations actionOperations)
         {
             if (null != actionOptions &&
diff --git a/src/Tools/dotnet-monitor/CollectionRules/Options/Actions/CollectExceptionsOptions.cs b/src/Tools/dotnet-monitor/CollectionRules/Options/Actions/CollectExceptionsOptions.cs
@@ -16,7 +16,6 @@ namespace Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Actions
 #if SCHEMAGEN
     [NJsonSchema.Annotations.JsonSchemaFlatten]
 #endif
-
     internal sealed partial record class CollectExceptionsOptions : BaseRecordOptions, IEgressProviderProperties
     {
         [Display(
diff --git a/src/Tools/dotnet-monitor/CollectionRules/Options/Actions/CollectTraceOptions.Validate.cs b/src/Tools/dotnet-monitor/CollectionRules/Options/Actions/CollectTraceOptions.Validate.cs
@@ -91,8 +91,6 @@ IEnumerable<ValidationResult> IValidatableObject.Validate(ValidationContext vali
                     ValidationContext providerContext = new(provider, nameof(Providers), validationContext, validationContext.Items);
                     providerContext.MemberName = nameof(Providers) + "[" + index.ToString(CultureInfo.InvariantCulture) + "]";
 
-                    // Note: generated validation logic doesn't recurse into members of T for List<T>, when List<T> is not required.
-                    // Need to do the recursion ourselves.
                     var validationOptions = validationContext.GetRequiredService<IOptions<ValidationOptions>>().Value;
                     ValidationHelper.TryValidateObject(provider, typeof(EventPipeProvider), validationOptions, providerContext, results);
 
diff --git a/src/Tools/dotnet-monitor/CollectionRules/Options/CollectionRuleOptions.Validate.cs b/src/Tools/dotnet-monitor/CollectionRules/Options/CollectionRuleOptions.Validate.cs
@@ -24,21 +24,6 @@ IEnumerable<ValidationResult> IValidatableObject.Validate(ValidationContext vali
                 return results;
             }
 
-            // ValidationContext filtersContext = new(Filters, validationContext, validationContext.Items);
-            // filtersContext.MemberName = nameof(Filters);
-            // ValidationHelper.TryValidateItems(Filters, filtersContext, results);
-
-            // if (null != Trigger)
-            // {
-            //     ValidationContext triggerContext = new(Trigger, validationContext, validationContext.Items);
-            //     triggerContext.MemberName = nameof(Trigger);
-            //     Validator.TryValidateObject(Trigger, triggerContext, results);
-            // }
-
-            // ValidationContext actionsContext = new(Actions, validationContext, validationContext.Items);
-            // actionsContext.MemberName = nameof(Actions);
-            // ValidationHelper.TryValidateItems(Actions, actionsContext, results);
-
             var actionNames = new HashSet<string>(StringComparer.Ordinal);
             foreach (CollectionRuleActionOptions option in Actions)
             {
@@ -53,4 +38,4 @@ IEnumerable<ValidationResult> IValidatableObject.Validate(ValidationContext vali
             return results;
         }
     }
-}
+}
diff --git a/src/Tools/dotnet-monitor/CollectionRules/Options/ValidationHelper.cs b/src/Tools/dotnet-monitor/CollectionRules/Options/ValidationHelper.cs
@@ -98,9 +98,10 @@ public static bool TryValidateObject(object options, Type type, ValidationOption
 
         public static void ValidateObject(object options, Type type, ValidationOptions validationOptions, IServiceProvider serviceProvider)
         {
-            if (!TryValidateObject(options, type, validationOptions, serviceProvider, new List<ValidationResult>()))
+            List<ValidationResult> results = new();
+            if (!TryValidateObject(options, type, validationOptions, serviceProvider, results))
             {
-                throw new ValidationException("Validation failed for " + type.FullName);
+                throw new ValidationException(string.Join(Environment.NewLine, results.ConvertAll(r => r.ErrorMessage)));
             }
         }
     }
diff --git a/src/Tools/dotnet-monitor/CommonOptionsExtensions.cs b/src/Tools/dotnet-monitor/CommonOptionsExtensions.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+﻿// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 #nullable enable
@@ -153,4 +153,4 @@ private static string ToHexString(byte[] data)
             return builder.ToString();
         }
     }
-}
+}
diff --git a/src/Tools/dotnet-monitor/ConfigurationTokenParser.cs b/src/Tools/dotnet-monitor/ConfigurationTokenParser.cs
@@ -64,7 +64,6 @@ public ConfigurationTokenParser(ILogger logger)
         {
             object? settings = originalSettings;
 
-
             foreach (PropertyInfo propertyInfo in GetPropertiesFromSettings(settings))
             {
                 string? originalPropertyValue = (string?)propertyInfo.GetValue(settings);
diff --git a/src/Tools/dotnet-monitor/DataAnnotationValidateOptions.cs b/src/Tools/dotnet-monitor/DataAnnotationValidateOptions.cs
@@ -35,11 +35,7 @@ public DataAnnotationValidateOptions(IServiceProvider serviceProvider)
         public ValidateOptionsResult Validate(string? name, TOptions options)
         {
             var results = new List<ValidationResult>();
-            var typeName = typeof(TOptions).Name;
-            var validationContext = new ValidationContext(options, typeName, _serviceProvider, items: null) {
-                MemberName = typeName
-            };
-            if (!ValidationHelper.TryValidateObject(options, typeof(TOptions), _validationOptions, validationContext, results))
+            if (!ValidationHelper.TryValidateObject(options, typeof(TOptions), _validationOptions, _serviceProvider, results))
             {
                 IList<string> failures = new List<string>();
                 foreach (ValidationResult result in results)
diff --git a/src/Tools/dotnet-monitor/DynamicNamedOptionsCache.cs b/src/Tools/dotnet-monitor/DynamicNamedOptionsCache.cs
@@ -20,7 +20,7 @@ namespace Microsoft.Diagnostics.Tools.Monitor
     /// </remarks>
     internal sealed class DynamicNamedOptionsCache<TOptions> :
         OptionsCache<TOptions>
-        where TOptions : class, new()
+        where TOptions : class
     {
         public override TOptions GetOrAdd(string name, Func<TOptions> createOptions)
         {
diff --git a/src/Tools/dotnet-monitor/Egress/Extension/ExtensionEgressPayload.cs b/src/Tools/dotnet-monitor/Egress/Extension/ExtensionEgressPayload.cs
@@ -1,4 +1,4 @@
- // Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 #nullable disable
diff --git a/src/Tools/dotnet-monitor/EndpointInfo/ServerEndpointInfoSource.cs b/src/Tools/dotnet-monitor/EndpointInfo/ServerEndpointInfoSource.cs
@@ -184,6 +184,7 @@ private async Task ListenAsync(ReversedDiagnosticsServer server, CancellationTok
                 try
                 {
                     IpcEndpointInfo info = await server.AcceptAsync(token).ConfigureAwait(false);
+
                     _ = Task.Run(async () =>
                     {
                         try
diff --git a/src/Tools/dotnet-monitor/OpenApi/OpenApiOptionsExtensions.cs b/src/Tools/dotnet-monitor/OpenApi/OpenApiOptionsExtensions.cs
@@ -119,6 +119,7 @@ public static void ConfigureMonitorOpenApiGen(this OpenApiOptions options)
                     {
                         includeSchema.Type |= JsonSchemaType.Null;
                     }
+
                     if (schema.Properties["exclude"] is OpenApiSchema excludeSchema)
                     {
                         excludeSchema.Type |= JsonSchemaType.Null;
diff --git a/src/Tools/dotnet-monitor/OpenApi/Transformers/RemoveFailureContentTypesOperationTransformer.cs b/src/Tools/dotnet-monitor/OpenApi/Transformers/RemoveFailureContentTypesOperationTransformer.cs
@@ -28,6 +28,7 @@ public Task TransformAsync(OpenApiOperation operation, OpenApiOperationTransform
                     }
                 }
             }
+
             return Task.CompletedTask;
         }
     }
diff --git a/src/Tools/dotnet-monitor/RootOptions.cs b/src/Tools/dotnet-monitor/RootOptions.cs
@@ -38,5 +38,6 @@ internal sealed partial class RootOptions
         public TemplateOptions? Templates { get; set; }
 
         public DotnetMonitorDebugOptions? DotnetMonitorDebug { get; set; }
+
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -7,10 +7,6 @@`
`7`	`7`
`8`	`8`	`namespace Microsoft.Diagnostics.Monitoring.TestCommon`
`9`	`9`	`{`
`10`		`- // The Validation source generator doesn't run for libraries that don't call AddValidation,`
`11`		`- // so we can't generate IValidatableInfo by using [ValidatableType] directly on types defined`
`12`		`- // in ProjectReferences. This is a workaround to force the generator running in this project to`
`13`		`- // generate IValidatableInfo for the referenced types. The containing class is not used otherwise.`
`14`	`10`	`[ValidatableType]`
`15`	`11`	`internal sealed class TestValidatableTypes`
`16`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,6 @@ public void ExtensionManifest_NameAndAssembly_Valid()`
`179`	`179`	`Assert.Equal(ExpectedAssemblyName, manifest.AssemblyFileName);`
`180`	`180`	`Assert.Null(manifest.ExecutableFileName);`
`181`	`181`
`182`		`-`
`183`	`182`	`var validationOptions = _fixture.Services.GetRequiredService<IOptions<ValidationOptions>>().Value;`
`184`	`183`	`manifest.Validate(_fixture.Services, validationOptions);`
`185`	`184`	`}`