More cleanup

Author: sbomer

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>
 

src/Microsoft.Diagnostics.Monitoring.Options/Microsoft.Diagnostics.Monitoring.Options.csproj

@@ -39,5 +39,4 @@
       <Generator>PublicResXFileCodeGenerator</Generator>
     </EmbeddedResource>
   </ItemGroup>
-
 </Project>

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" />

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>

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);
 

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;
         }
     }
-}
+}