Share validation type info

Author: sbomer

src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTestCommon/TestHostHelper.cs

@@ -127,6 +127,7 @@ public static IHost CreateHost(
                     services.AddSingleton<IMetricsOperationFactory, MetricsOperationFactory>();
                     services.AddSingleton<ITraceOperationFactory, TraceOperationFactory>();
                     services.AddSingleton<IGCDumpOperationFactory, GCDumpOperationFactory>();
+                    ValidatableTypes.AddValidation(services);
                     TestValidatableTypes.AddValidation(services);
                     servicesCallback?.Invoke(services);
                 })

src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTestCommon/TestValidatableType.cs

@@ -4,14 +4,6 @@
 using Microsoft.AspNetCore.Http.Validation;
 using Microsoft.AspNetCore.Http.Validation.Generated;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Diagnostics.Tools.Monitor;
-using Microsoft.Diagnostics.Monitoring.WebApi.Models;
-using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options;
-using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Actions;
-using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Triggers.EventCounterShortcuts;
-using Microsoft.Diagnostics.Monitoring.WebApi;
-using Microsoft.Diagnostics.Tools.Monitor.Egress.FileSystem;
-using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Triggers;
 
 namespace Microsoft.Diagnostics.Monitoring.TestCommon
 {
@@ -22,56 +14,11 @@ namespace Microsoft.Diagnostics.Monitoring.TestCommon
     [ValidatableType]
     internal sealed class TestValidatableTypes
     {
-        public required CollectionRuleOptions CollectionRuleOptions { get; init; }
-
-        public required ExecuteOptions ExecuteOptions { get; init; }
-
-        public required SetEnvironmentVariableOptions SetEnvironmentVariableOptions { get; init; }
-
-        public required GetEnvironmentVariableOptions GetEnvironmentVariableOptions { get; init; }
-
-        public required CollectTraceOptions CollectTraceOptions { get; init; }
-        
-        public required GlobalCounterOptions GlobalCounterOptions { get; init; }
-
-        public required CollectGCDumpOptions CollectGCDumpOptions { get; init; }
-
-        public required CollectLiveMetricsOptions CollectLiveMetricsOptions { get; init; }
-
-        public required CollectStacksOptions CollectStacksOptions { get; init; }
-
-        public required CollectLogsOptions CollectLogsOptions { get; init; }
-
-        public required RootOptions RootOptions { get; init; }
-
-        public required FileSystemEgressProviderOptions FileSystemEgressProviderOptions { get; init; }
-
-        public required CollectDumpOptions CollectDumpOptions { get; init; }
-
-        public required LoadProfilerOptions LoadProfilerOptions { get; init; }
-
-        public required CollectExceptionsOptions CollectExceptionsOptions { get; init; }
-
-        // Triggers...
-        public required AspNetRequestCountOptions AspNetRequestCountOptions { get; init; }
-        public required AspNetRequestDurationOptions AspNetRequestDurationOptions { get; init; }
-        public required AspNetResponseStatusOptions AspNetResponseStatusOptions { get; init; }
-        public required EventCounterOptions EventCounterOptions { get; init; }
-        public required CPUUsageOptions CPUUsageOptions { get; init; }
-        public required GCHeapSizeOptions GCHeapSizeOptions { get; init; }
-        public required ThreadpoolQueueLengthOptions ThreadpoolQueueLengthOptions { get; init; }
-        public required EventMeterOptions EventMeterOptions { get; init; }
-
-        // Nested member
-        public required EventPipeProvider EventPipeProvider { get; init; }
-
-        // TODO: only one resolver per project? Generate this for tests, for now. Maybe want to separate this one out
-        // by test later.
         public required PassThroughOptions PassThroughOptions { get; init; }
 
         public static void AddValidation(IServiceCollection services)
         {
-            GeneratedServiceCollectionExtensions.AddValidation(services);
+            TestGeneratedServiceCollectionExtensions.AddValidation(services);
         }
     }
 }

src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTestCommon/ValidatableInfoResolver.cs

@@ -4,8 +4,6 @@
     <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <InterceptorsNamespaces>$(InterceptorsNamespaces);Microsoft.AspNetCore.Http.Validation.Generated</InterceptorsNamespaces>
-    <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
   </PropertyGroup>
 
   <ItemGroup>
@@ -31,10 +29,4 @@
       LatestRuntimeFrameworkVersion="$(AspNetCoreAppVersion)" />
   </ItemGroup>
 
-  <Target Name="RemoveAnalyzer" BeforeTargets="CoreCompile">
-    <ItemGroup>
-      <Analyzer Remove="@(Analyzer)" Condition="'%(Analyzer.FileName)' == 'Microsoft.AspNetCore.Http.ValidationsGenerator'" />
-    </ItemGroup>
-  </Target>
-
 </Project>

src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTestsSample/Microsoft.Diagnostics.Monitoring.Tool.UnitTestsSample.csproj

@@ -1,32 +1,14 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using Microsoft.Diagnostics.Tools.Monitor;
-using Microsoft.AspNetCore.Http.Validation;
-using Microsoft.Diagnostics.Tools.Monitor.CollectionRules.Options.Actions;
-using Microsoft.Diagnostics.Tools.Monitor.Extensibility;
-using Microsoft.Diagnostics.Tools.Monitor.Egress.FileSystem;
+using Microsoft.AspNetCore.Http.Validation.Generated;
 
 var builder = WebApplication.CreateBuilder(new WebApplicationOptions
 {
     ContentRootPath = AppContext.BaseDirectory
 });
 
-Microsoft.AspNetCore.Http.Validation.Generated.GeneratedServiceCollectionExtensions.AddValidation(builder.Services);
+GeneratedServiceCollectionExtensions.AddValidation(builder.Services);
 builder.Build();
 
 public partial class Program {}
-
-[ValidatableType]
-sealed class TestValidatableType
-{
-    public required ExtensionManifest ExtensionManifest { get; init; }
-
-    // public RootOptions RootOptions { get; init; } // TODO: this hits bad generated code.
-    // Take a more granular approach for now.
-    public required FileSystemEgressProviderOptions FileSystemEgressProviderOptions { get; init; }
-
-    public required ExecuteOptions ExecuteOptions { get; init; }
-
-    public required AzureAdOptions AzureAdOptions { get; init; }
-}