From 8d33ba65e41f107ecd3a081b50d9aa4718d9dac6 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 28 Jun 2023 06:11:36 +0000
Subject: [PATCH] [main] Update dependencies from dotnet/aspnetcore (#4129)

[main] Update dependencies from dotnet/aspnetcore
- Coherency Updates:
  - Microsoft.Bcl.TimeProvider: from 8.0.0-preview.6.23314.15 to 8.0.0-preview.7.23325.2 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Caching.Abstractions: from 8.0.0-preview.6.23314.15 to 8.0.0-preview.7.23325.2 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Caching.Memory: from 8.0.0-preview.6.23314.15 to 8.0.0-preview.7.23325.2 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Configuration.Abstractions: from 8.0.0-preview.6.23314.15 to 8.0.0-preview.7.23325.2 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Configuration.Binder: from 8.0.0-preview.6.23314.15 to 8.0.0-preview.7.23325.2 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Configuration.CommandLine: from 8.0.0-preview.6.23314.15 to 8.0.0-preview.7.23325.2 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Configuration.Json: from 8.0.0-preview.6.23314.15 to 8.0.0-preview.7.23325.2 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Configuration: from 8.0.0-preview.6.23314.15 to 8.0.0-preview.7.23325.2 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.DependencyInjection.Abstractions: from 8.0.0-preview.6.23314.15 to 8.0.0-preview.7.23325.2 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.DependencyInjection: from 8.0.0-preview.6.23314.15 to 8.0.0-preview.7.23325.2 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Hosting.Abstractions: from 8.0.0-preview.6.23314.15 to 8.0.0-preview.7.23325.2 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Hosting: from 8.0.0-preview.6.23314.15 to 8.0.0-preview.7.23325.2 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Http: from 8.0.0-preview.6.23314.15 to 8.0.0-preview.7.23325.2 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Logging.Abstractions: from 8.0.0-preview.6.23314.15 to 8.0.0-preview.7.23325.2 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Logging.Configuration: from 8.0.0-preview.6.23314.15 to 8.0.0-preview.7.23325.2 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Logging.Console: from 8.0.0-preview.6.23314.15 to 8.0.0-preview.7.23325.2 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Logging: from 8.0.0-preview.6.23314.15 to 8.0.0-preview.7.23325.2 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Options.ConfigurationExtensions: from 8.0.0-preview.6.23314.15 to 8.0.0-preview.7.23325.2 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Options.DataAnnotations: from 8.0.0-preview.6.23314.15 to 8.0.0-preview.7.23325.2 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Options: from 8.0.0-preview.6.23314.15 to 8.0.0-preview.7.23325.2 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.Extensions.Primitives: from 8.0.0-preview.6.23314.15 to 8.0.0-preview.7.23325.2 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Collections.Immutable: from 8.0.0-preview.6.23314.15 to 8.0.0-preview.7.23325.2 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Configuration.ConfigurationManager: from 8.0.0-preview.6.23314.15 to 8.0.0-preview.7.23325.2 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Diagnostics.DiagnosticSource: from 8.0.0-preview.6.23314.15 to 8.0.0-preview.7.23325.2 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Diagnostics.PerformanceCounter: from 8.0.0-preview.6.23314.15 to 8.0.0-preview.7.23325.2 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.IO.Hashing: from 8.0.0-preview.6.23314.15 to 8.0.0-preview.7.23325.2 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Net.Http.Json: from 8.0.0-preview.6.23314.15 to 8.0.0-preview.7.23325.2 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Security.Cryptography.Pkcs: from 8.0.0-preview.6.23314.15 to 8.0.0-preview.7.23325.2 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Security.Cryptography.Xml: from 8.0.0-preview.6.23314.15 to 8.0.0-preview.7.23325.2 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Text.Encodings.Web: from 8.0.0-preview.6.23314.15 to 8.0.0-preview.7.23325.2 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Text.Json: from 8.0.0-preview.6.23314.15 to 8.0.0-preview.7.23325.2 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - System.Runtime.Caching: from 8.0.0-preview.6.23314.15 to 8.0.0-preview.7.23325.2 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)

 - Build fixes

* Update local copy of ExperimentalAttribute per https://github.com/dotnet/runtime/pull/85444

* Deprecate this repo's option validator code gen in favor of the runtime'src

- This removes traces of the option code generator in this repo, now
that the code has moved to dotnet/runtime. Unfortunately, the generator
in dotnet/runtime has currently dropped the use of the 'file' visibility
accessor in generated code, which leads to some conflicting type
definitions in this code base due to the use of IntervalsVisibleTo.
This surfaces as build warnings which are safe to ignore, since the
C# compiler ends up binding to the right thing. Fixing these warnings
will require a new drop of the runtime's generator.

* Suppress CS0436

 - Bump SDK

 - fixup! Build fixes
---
 Directory.Build.targets                       |  20 +-
 eng/MSBuild/Generators.props                  |   4 -
 eng/Version.Details.xml                       | 164 +--
 eng/Versions.props                            |  82 +-
 global.json                                   |   4 +-
 .../Common/DiagDescriptors.cs                 |  98 --
 .../Common/Emitter.cs                         | 368 -------
 .../Common/Generator.cs                       | 100 --
 .../Common/Model/ValidatedMember.cs           |  19 -
 .../Common/Model/ValidatedModel.cs            |  12 -
 .../Common/Model/ValidationAttributeInfo.cs   |  12 -
 .../Common/Model/ValidatorType.cs             |  15 -
 .../Common/Parser.cs                          | 696 -------------
 .../Common/Resources.Designer.cs              | 297 ------
 .../Common/Resources.resx                     | 198 ----
 .../Common/SymbolHolder.cs                    |  20 -
 .../Common/SymbolLoader.cs                    |  69 --
 .../Directory.Build.props                     |  33 -
 ...oft.Gen.OptionsValidation.Roslyn3.8.csproj |  28 -
 ...oft.Gen.OptionsValidation.Roslyn4.0.csproj |  29 -
 .../ExperimentalAttribute.cs                  |  39 +-
 ...rosoft.AspNetCore.ConnectionTimeout.csproj |   1 -
 .../HeaderParsingOptionsValidator.cs          |   1 -
 .../Microsoft.AspNetCore.HeaderParsing.csproj |   2 -
 ...RequestLatencyTelemetryOptionsValidator.cs |   1 -
 .../Internal/LoggingOptionsValidator.cs       |   1 -
 .../Logging/LoggingOptions.cs                 |   4 +-
 ...oft.AspNetCore.Telemetry.Middleware.csproj |   2 -
 .../RequestHeadersEnricherExtensions.cs       |   1 +
 .../RequestHeadersLogEnricherOptions.cs       |   2 +-
 ...questHeadersLogEnricherOptionsValidator.cs |   1 -
 .../Microsoft.AspNetCore.Telemetry.csproj     |   1 -
 .../Tracing/HttpTracingExtensions.cs          |   4 +-
 .../Tracing/HttpTracingOptions.cs             |   2 +-
 .../Internal/HttpTracingOptionsValidator.cs   |   1 -
 .../ApplicationMetadataValidator.cs           |   1 -
 ...ensions.AmbientMetadata.Application.csproj |   5 -
 .../IAsyncLocalContext.cs                     |   2 +-
 ...oft.Extensions.Compliance.Redaction.csproj |   1 -
 .../FakeRedactorOptionsAutoValidator.cs       |   1 -
 ...osoft.Extensions.Compliance.Testing.csproj |   2 -
 ...althChecksExtensions.TelemetryPublisher.cs |   4 +-
 .../TelemetryHealthCheckPublisherOptions.cs   |   2 +-
 ...cs.HealthChecks.ResourceUtilization.csproj |   1 -
 .../ResourceUtilizationHealthCheckOptions.cs  |   2 +-
 ...eUtilizationHealthCheckOptionsValidator.cs |   1 -
 .../TcpEndpointHealthCheckOptionsValidator.cs |   1 -
 ...osoft.Extensions.Diagnostics.Probes.csproj |   2 -
 ...ourceUtilizationTrackerOptionsValidator.cs |   1 -
 ...urceUtilizationProviderOptionsValidator.cs |   1 -
 .../Linux/LinuxUtilizationExtensions.cs       |   1 +
 ...ions.Diagnostics.ResourceMonitoring.csproj |   2 -
 .../ResourceMonitoringOptions.cs              |   2 +-
 .../WindowsCountersOptionsValidator.cs        |   1 -
 .../Windows/WindowsCountersOptions.cs         |   4 +-
 .../Windows/WindowsUtilizationExtensions.cs   |   6 +-
 .../HostingFakesExtensions.cs                 |   2 +-
 .../AutoClientAttribute.cs                    |   2 +-
 .../AutoClientException.cs                    |   2 +-
 .../AutoClientHttpError.cs                    |   2 +-
 .../AutoClientOptions.cs                      |   2 +-
 .../BodyAttribute.cs                          |   2 +-
 .../BodyContentType.cs                        |   2 +-
 .../HeaderAttribute.cs                        |   2 +-
 .../Methods/DeleteAttribute.cs                |   2 +-
 .../Methods/GetAttribute.cs                   |   2 +-
 .../Methods/HeadAttribute.cs                  |   2 +-
 .../Methods/OptionsAttribute.cs               |   2 +-
 .../Methods/PatchAttribute.cs                 |   2 +-
 .../Methods/PostAttribute.cs                  |   2 +-
 .../Methods/PutAttribute.cs                   |   2 +-
 ...icrosoft.Extensions.Http.AutoClient.csproj |   5 -
 .../QueryAttribute.cs                         |   2 +-
 .../RequestNameAttribute.cs                   |   2 +-
 .../StaticHeaderAttribute.cs                  |   2 +-
 .../FaultInjection/ContextExtensions.cs       |   4 +-
 .../HttpClientFaultInjectionExtensions.cs     |   4 +-
 .../Hedging/HedgingEndpointOptions.cs         |   4 +-
 .../HttpStandardHedgingResilienceOptions.cs   |   4 +-
 ...andardHedgingResilienceOptionsValidator.cs |   1 -
 ...StandardHedgingHandlerBuilderExtensions.cs |   4 +-
 ...icrosoft.Extensions.Http.Resilience.csproj |   2 -
 ...ndardResilienceBuilderBuilderExtensions.cs |   4 +-
 .../HttpStandardResilienceOptions.cs          |   4 +-
 .../HttpStandardResilienceOptionsValidator.cs |   1 -
 .../Routing/EndpointGroup.cs                  |   2 +-
 .../OrderedGroupsRoutingOptionsValidator.cs   |   1 -
 .../WeightedGroupsRoutingOptionsValidator.cs  |   1 -
 .../Routing/OrderedGroupsRoutingOptions.cs    |   2 +-
 .../RoutingStrategyBuilderExtensions.cs       |   4 +-
 .../Routing/WeightedGroupsRoutingOptions.cs   |   2 +-
 .../Internal/LoggingOptionsValidator.cs       |   1 -
 .../Logging/LoggingOptions.cs                 |   2 +-
 .../Metering/HttpClientMeteringExtensions.cs  |   2 +-
 .../Metering/HttpMeteringHandler.cs           |   2 +-
 .../Metering/HttpRequestResultType.cs         |   2 +-
 ...Microsoft.Extensions.Http.Telemetry.csproj |   2 -
 .../Tracing/HttpClientTracingExtensions.cs    |   4 +-
 .../Tracing/HttpClientTracingOptions.cs       |   2 +-
 .../Tracing/IHttpClientTraceEnricher.netfx.cs |   2 +-
 .../Tracing/IHttpPathRedactor.cs              |   2 +-
 .../HttpClientTracingOptionsValidator.cs      |   1 -
 .../DependencyInjectionPoolOptions.cs         |   2 +-
 .../ObjectPoolServiceCollectionExtensions.cs  |   2 +-
 ...osoft.Extensions.Options.Validation.csproj |  38 -
 ...crosoft.Extensions.Options.Validation.json |  55 --
 .../OptionsValidatorAttribute.cs              |  16 -
 .../ValidateEnumeratedItemsAttribute.cs       |  45 -
 .../ValidateObjectMembersAttribute.cs         |  43 -
 ...rosoft.Extensions.Options.Validation.props |   2 -
 ...soft.Extensions.Options.Validation.targets |   3 -
 .../FaultInjectionExtensions.cs               |   2 +-
 .../FaultInjectionOptionsBuilder.cs           |   2 +-
 .../FaultInjection/IChaosPolicyFactory.cs     |   2 +-
 .../Options/ChaosPolicyOptionsGroup.cs        |   4 +-
 .../Options/CustomResultPolicyOptions.cs      |   4 +-
 .../FaultPolicyWeightAssignmentsOptions.cs    |   2 +-
 .../Microsoft.Extensions.Resilience.csproj    |   2 -
 .../Polly/Internals/PipelineId.cs             |   6 +-
 .../BulkheadPolicyOptionsValidator.cs         |   1 -
 .../CircuitBreakerPolicyOptionsValidator.cs   |   1 -
 .../CircuitBreakerPolicyOptionsValidatorT.cs  |   1 -
 .../HedgingPolicyOptionsValidator.cs          |   1 -
 .../HedgingPolicyOptionsValidatorT.cs         |   1 -
 .../Generated/RetryPolicyOptionsValidator.cs  |   1 -
 .../Generated/RetryPolicyOptionsValidatorT.cs |   1 -
 .../TimeoutPolicyOptionsValidator.cs          |   1 -
 .../Polly/ResilienceDimensions.cs             |  24 +-
 .../Internal/OptionsBuilderExtensions.cs      |   2 +-
 .../ResiliencePipelineBuilderExtensions.cs    |   2 +-
 ...iliencePipelineFactoryOptionsValidatorT.cs |   1 -
 .../Http/TelemetryConstants.cs                |   4 +-
 .../Logging/LogMethodAttribute.cs             |   2 +-
 .../Metering/MeterT.cs                        |   4 +-
 .../Metering/MeteringExtensions.cs            |   2 +-
 .../Metering/CollectedMeasurement.cs          |   2 +-
 .../Metering/MeasurementExtensions.cs         |   2 +-
 .../Metering/MetricCollector.cs               |   4 +-
 .../Logging/LoggerProvider.cs                 |   2 +-
 .../Logging/LoggingOptions.cs                 |   2 +-
 .../Logging/LoggingOptionsValidator.cs        |   1 -
 .../EventCountersCollectorOptions.cs          |   2 +-
 .../EventCountersCollectorOptionsValidator.cs |   1 -
 .../Metering/MeteringOptions.cs               |   2 +-
 .../Metering/OTelMeteringExtensions.cs        |   8 +-
 .../Microsoft.Extensions.Telemetry.csproj     |   3 +-
 .../Telemetry.Internal/IHttpRouteFormatter.cs |   4 +-
 .../Telemetry/TelemetryExtensions.cs          |   4 +-
 .../Internal/SamplingOptionsAutoValidator.cs  |   1 -
 .../ParentBasedSamplerOptions.cs              |   2 +-
 .../Tracing.Sampling/SamplingOptions.cs       |   2 +-
 .../Tracing/TracingEnricherExtensions.cs      |   4 +-
 .../FakeTimeProvider.cs                       |  16 +-
 .../Hosting.StartupInitialization.csproj      |   2 -
 .../Internal/StartupInitializationBuilder.cs  |   1 -
 .../StartupInitializationOptionsValidator.cs  |   1 -
 .../StartupInitializationExtensions.cs        |   1 +
 .../HttpClient.SocketHandling.csproj          |   2 -
 .../SocketsHttpHandlerOptionsValidator.cs     |   1 -
 .../UsingExperimentalApiAnalyzerTest.cs       |  11 +-
 .../ApiLifecycle/ApiLifecycleAnalyzerTest.cs  |  18 +-
 .../Generated/Common/CustomAttrTests.cs       |  39 -
 .../Generated/Common/EnumerationTests.cs      |  93 --
 .../Generated/Common/FieldTests.cs            |  62 --
 .../Generated/Common/FunnyStringsTests.cs     |  37 -
 .../Generated/Common/GenericsTests.cs         |  49 -
 .../Common/MultiModelValidatorTests.cs        |  49 -
 .../Generated/Common/NestedTests.cs           |  67 --
 .../Generated/Common/NoNamespaceTests.cs      |  60 --
 .../Common/OptionsValidationTests.cs          | 442 ---------
 .../Generated/Common/RandomMembersTests.cs    |  37 -
 .../Generated/Common/RecordTypesTests.cs      |  67 --
 .../Generated/Common/RepeatedTypesTests.cs    |  61 --
 .../Generated/Common/SelfValidationTests.cs   |  37 -
 .../Generated/Common/TestResource.Designer.cs |  72 --
 .../Generated/Common/TestResource.resx        | 123 ---
 .../Generated/Common/Utils.cs                 |  31 -
 .../Generated/Common/ValueTypesTests.cs       |  53 -
 .../Generated/Directory.Build.props           |  33 -
 ...alidation.Roslyn3.8.Generated.Tests.csproj |  13 -
 ...alidation.Roslyn4.0.Generated.Tests.csproj |  14 -
 .../TestClasses/CustomAttr.cs                 |  69 --
 .../TestClasses/Enumeration.cs                |  94 --
 .../TestClasses/Fields.cs                     |  72 --
 .../TestClasses/FileScopedNamespace.cs        |  22 -
 .../TestClasses/FunnyStrings.cs               |  23 -
 .../TestClasses/Generics.cs                   |  36 -
 .../TestClasses/Models.cs                     | 252 -----
 .../TestClasses/MultiModelValidator.cs        |  34 -
 .../TestClasses/Nested.cs                     | 106 --
 .../TestClasses/NoNamespace.cs                |  46 -
 .../TestClasses/RandomMembers.cs              |  35 -
 .../TestClasses/RecordTypes.cs                |  68 --
 .../TestClasses/RepeatedTypes.cs              |  47 -
 .../TestClasses/SelfValidation.cs             |  34 -
 .../TestClasses/ValueTypes.cs                 |  46 -
 .../Unit/Common/EmitterTests.cs               |  58 --
 .../Unit/Common/ParserTests.Enumeration.cs    | 212 ----
 .../Unit/Common/ParserTests.cs                | 930 ------------------
 .../Unit/Common/SymbolLoaderTests.cs          |  80 --
 .../Unit/Directory.Build.props                |  31 -
 ...ionsValidation.Roslyn3.8.Unit.Tests.csproj |   5 -
 ...ionsValidation.Roslyn4.0.Unit.Tests.csproj |   6 -
 ...Extensions.Options.Validation.Tests.csproj |  22 -
 .../ValidateEnumeratedItemsAttributeTests.cs  |  20 -
 .../ValidateObjectMembersAttributeTest.cs     |  20 -
 .../Helpers/OptionsValidationModels.cs        |   4 +-
 .../Options.ValidateOnStart.Tests.csproj      |   2 -
 208 files changed, 303 insertions(+), 6369 deletions(-)
 delete mode 100644 src/Generators/Microsoft.Gen.OptionsValidation/Common/DiagDescriptors.cs
 delete mode 100644 src/Generators/Microsoft.Gen.OptionsValidation/Common/Emitter.cs
 delete mode 100644 src/Generators/Microsoft.Gen.OptionsValidation/Common/Generator.cs
 delete mode 100644 src/Generators/Microsoft.Gen.OptionsValidation/Common/Model/ValidatedMember.cs
 delete mode 100644 src/Generators/Microsoft.Gen.OptionsValidation/Common/Model/ValidatedModel.cs
 delete mode 100644 src/Generators/Microsoft.Gen.OptionsValidation/Common/Model/ValidationAttributeInfo.cs
 delete mode 100644 src/Generators/Microsoft.Gen.OptionsValidation/Common/Model/ValidatorType.cs
 delete mode 100644 src/Generators/Microsoft.Gen.OptionsValidation/Common/Parser.cs
 delete mode 100644 src/Generators/Microsoft.Gen.OptionsValidation/Common/Resources.Designer.cs
 delete mode 100644 src/Generators/Microsoft.Gen.OptionsValidation/Common/Resources.resx
 delete mode 100644 src/Generators/Microsoft.Gen.OptionsValidation/Common/SymbolHolder.cs
 delete mode 100644 src/Generators/Microsoft.Gen.OptionsValidation/Common/SymbolLoader.cs
 delete mode 100644 src/Generators/Microsoft.Gen.OptionsValidation/Directory.Build.props
 delete mode 100644 src/Generators/Microsoft.Gen.OptionsValidation/Roslyn3.8/Microsoft.Gen.OptionsValidation.Roslyn3.8.csproj
 delete mode 100644 src/Generators/Microsoft.Gen.OptionsValidation/Roslyn4.0/Microsoft.Gen.OptionsValidation.Roslyn4.0.csproj
 delete mode 100644 src/Libraries/Microsoft.Extensions.Options.Validation/Microsoft.Extensions.Options.Validation.csproj
 delete mode 100644 src/Libraries/Microsoft.Extensions.Options.Validation/Microsoft.Extensions.Options.Validation.json
 delete mode 100644 src/Libraries/Microsoft.Extensions.Options.Validation/OptionsValidatorAttribute.cs
 delete mode 100644 src/Libraries/Microsoft.Extensions.Options.Validation/ValidateEnumeratedItemsAttribute.cs
 delete mode 100644 src/Libraries/Microsoft.Extensions.Options.Validation/ValidateObjectMembersAttribute.cs
 delete mode 100644 src/Libraries/Microsoft.Extensions.Options.Validation/buildTransitive/Microsoft.Extensions.Options.Validation.props
 delete mode 100644 src/Libraries/Microsoft.Extensions.Options.Validation/buildTransitive/Microsoft.Extensions.Options.Validation.targets
 delete mode 100644 test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/CustomAttrTests.cs
 delete mode 100644 test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/EnumerationTests.cs
 delete mode 100644 test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/FieldTests.cs
 delete mode 100644 test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/FunnyStringsTests.cs
 delete mode 100644 test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/GenericsTests.cs
 delete mode 100644 test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/MultiModelValidatorTests.cs
 delete mode 100644 test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/NestedTests.cs
 delete mode 100644 test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/NoNamespaceTests.cs
 delete mode 100644 test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/OptionsValidationTests.cs
 delete mode 100644 test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/RandomMembersTests.cs
 delete mode 100644 test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/RecordTypesTests.cs
 delete mode 100644 test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/RepeatedTypesTests.cs
 delete mode 100644 test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/SelfValidationTests.cs
 delete mode 100644 test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/TestResource.Designer.cs
 delete mode 100644 test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/TestResource.resx
 delete mode 100644 test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/Utils.cs
 delete mode 100644 test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/ValueTypesTests.cs
 delete mode 100644 test/Generators/Microsoft.Gen.OptionsValidation/Generated/Directory.Build.props
 delete mode 100644 test/Generators/Microsoft.Gen.OptionsValidation/Generated/Roslyn3.8/Microsoft.Gen.OptionsValidation.Roslyn3.8.Generated.Tests.csproj
 delete mode 100644 test/Generators/Microsoft.Gen.OptionsValidation/Generated/Roslyn4.0/Microsoft.Gen.OptionsValidation.Roslyn4.0.Generated.Tests.csproj
 delete mode 100644 test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/CustomAttr.cs
 delete mode 100644 test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/Enumeration.cs
 delete mode 100644 test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/Fields.cs
 delete mode 100644 test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/FileScopedNamespace.cs
 delete mode 100644 test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/FunnyStrings.cs
 delete mode 100644 test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/Generics.cs
 delete mode 100644 test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/Models.cs
 delete mode 100644 test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/MultiModelValidator.cs
 delete mode 100644 test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/Nested.cs
 delete mode 100644 test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/NoNamespace.cs
 delete mode 100644 test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/RandomMembers.cs
 delete mode 100644 test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/RecordTypes.cs
 delete mode 100644 test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/RepeatedTypes.cs
 delete mode 100644 test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/SelfValidation.cs
 delete mode 100644 test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/ValueTypes.cs
 delete mode 100644 test/Generators/Microsoft.Gen.OptionsValidation/Unit/Common/EmitterTests.cs
 delete mode 100644 test/Generators/Microsoft.Gen.OptionsValidation/Unit/Common/ParserTests.Enumeration.cs
 delete mode 100644 test/Generators/Microsoft.Gen.OptionsValidation/Unit/Common/ParserTests.cs
 delete mode 100644 test/Generators/Microsoft.Gen.OptionsValidation/Unit/Common/SymbolLoaderTests.cs
 delete mode 100644 test/Generators/Microsoft.Gen.OptionsValidation/Unit/Directory.Build.props
 delete mode 100644 test/Generators/Microsoft.Gen.OptionsValidation/Unit/Roslyn3.8/Microsoft.Gen.OptionsValidation.Roslyn3.8.Unit.Tests.csproj
 delete mode 100644 test/Generators/Microsoft.Gen.OptionsValidation/Unit/Roslyn4.0/Microsoft.Gen.OptionsValidation.Roslyn4.0.Unit.Tests.csproj
 delete mode 100644 test/Libraries/Microsoft.Extensions.Options.Validation.Tests/Microsoft.Extensions.Options.Validation.Tests.csproj
 delete mode 100644 test/Libraries/Microsoft.Extensions.Options.Validation.Tests/ValidateEnumeratedItemsAttributeTests.cs
 delete mode 100644 test/Libraries/Microsoft.Extensions.Options.Validation.Tests/ValidateObjectMembersAttributeTest.cs

diff --git a/Directory.Build.targets b/Directory.Build.targets
index c96d110b2dd..ff17457a836 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -16,7 +16,17 @@
     <!-- This is false for local development, but set to true in the CI system -->
     <TreatWarningsAsErrors Condition=" '$(TreatWarningsAsErrors)' == '' ">false</TreatWarningsAsErrors>
 
-    <!-- TODO: to be reenabled and all warnings fixed (https://github.com/dotnet/r9/issues/177) -->
+    <!--
+      TODO: to be resolved (https://github.com/dotnet/extensions/issues/4128)
+
+      warning CS0436: (NETCORE_ENGINEERING_TELEMETRY=Build) The type '__Attributes' in
+      'Microsoft.Extensions.Options.SourceGeneration/Microsoft.Extensions.Options.Generators.Generator/Validators.g.cs' conflicts with the imported type
+      '__Attributes' in 'Microsoft.Extensions.Telemetry, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35'.
+      Using the type defined in 'Microsoft.Extensions.Options.SourceGeneration/Microsoft.Extensions.Options.Generators.Generator/Validators.g.cs'.
+     -->
+    <NoWarn>$(NoWarn);CS0436</NoWarn>
+
+    <!-- TODO: to be re-enabled and all warnings fixed (https://github.com/dotnet/extensions/issues/4002) -->
     <NoWarn>$(NoWarn);IL2026;IL2087;IL2067;IL2075;IL2091;IL2072;IL2090;CA1825;IL2070;IL2098;IL2057</NoWarn>
 
     <!-- Prevent analyzer crashes from stopping things -->
@@ -35,14 +45,14 @@
     <NoWarn Condition="'$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'net472' or '$(TargetFramework)' == 'netstandard2.0'">$(NoWarn);CA1062</NoWarn>
   </PropertyGroup>
 
-  <!-- .NET 8 specific configurations (https://github.com/dotnet/r9/issues/177) -->
+  <!-- .NET 8 specific configurations (https://github.com/dotnet/extensions/issues/4126) -->
   <PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
     <!-- Ignore ASP0019: Use IHeaderDictionary.Append or the indexer to append or set headers. IDictionary.Add will throw an ArgumentException when attempting to add a duplicate key  -->
     <NoWarn>$(NoWarn);ASP0019</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup>
-    <!-- Ignore RS1024: Compare symbols correctly (https://github.com/dotnet/r9/issues/177) -->
+    <!-- Ignore RS1024: Compare symbols correctly (https://github.com/dotnet/extensions/issues/4127) -->
     <NoWarn>$(NoWarn);RS1024</NoWarn>
   </PropertyGroup>
 
@@ -66,7 +76,9 @@
   </Target>
 
   <ItemGroup Condition="'$(Stage)' == 'dev' AND '$(OutputType)' != 'Exe' AND '$(Api)' != 'false'">
-    <AssemblyAttribute Include="System.Diagnostics.CodeAnalysis.ExperimentalAttribute" />
+    <AssemblyAttribute Include="System.Diagnostics.CodeAnalysis.ExperimentalAttribute">
+      <_Parameter1>TBD</_Parameter1>
+    </AssemblyAttribute>
   </ItemGroup>
 
   <Target Name="AddInternalsVisibleToDynamicProxyGenAssembly2" BeforeTargets="BeforeCompile">
diff --git a/eng/MSBuild/Generators.props b/eng/MSBuild/Generators.props
index 580c36c5592..52f47521cfe 100644
--- a/eng/MSBuild/Generators.props
+++ b/eng/MSBuild/Generators.props
@@ -7,10 +7,6 @@
     <ProjectReference Include="$(MSBuildThisFileDirectory)\..\..\src\Generators\Microsoft.Gen.EnumStrings\Roslyn4.0\Microsoft.Gen.EnumStrings.Roslyn4.0.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" Private="false" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(UseOptionsValidationGenerator)' == 'true' and '$(BuildingSlnForDocs)' != 'true'">
-    <ProjectReference Include="$(MSBuildThisFileDirectory)\..\..\src\Generators\Microsoft.Gen.OptionsValidation\Roslyn4.0\Microsoft.Gen.OptionsValidation.Roslyn4.0.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" Private="false" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
-  </ItemGroup>
-
   <ItemGroup Condition="'$(UseMeteringGenerator)' == 'true' and '$(BuildingSlnForDocs)' != 'true'">
     <ProjectReference Include="$(MSBuildThisFileDirectory)\..\..\src\Generators\Microsoft.Gen.Metering\Roslyn4.0\Microsoft.Gen.Metering.Roslyn4.0.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" Private="false" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
   </ItemGroup>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index f7e546395fc..cd7146dc124 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,168 +1,168 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Bcl.TimeProvider" Version="8.0.0-preview.6.23314.15" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Bcl.TimeProvider" Version="8.0.0-preview.7.23325.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>171a525880315369e48c6adf6c181f98357352a5</Sha>
+      <Sha>eaa9717d90115cea43b4cdd7a2a49e6d3c3d780e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0-preview.6.23314.15" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0-preview.7.23325.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>171a525880315369e48c6adf6c181f98357352a5</Sha>
+      <Sha>eaa9717d90115cea43b4cdd7a2a49e6d3c3d780e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="8.0.0-preview.6.23314.15" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="8.0.0-preview.7.23325.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>171a525880315369e48c6adf6c181f98357352a5</Sha>
+      <Sha>eaa9717d90115cea43b4cdd7a2a49e6d3c3d780e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0-preview.6.23314.15" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0-preview.7.23325.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>171a525880315369e48c6adf6c181f98357352a5</Sha>
+      <Sha>eaa9717d90115cea43b4cdd7a2a49e6d3c3d780e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="8.0.0-preview.6.23314.15" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="8.0.0-preview.7.23325.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>171a525880315369e48c6adf6c181f98357352a5</Sha>
+      <Sha>eaa9717d90115cea43b4cdd7a2a49e6d3c3d780e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.CommandLine" Version="8.0.0-preview.6.23314.15" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Configuration.CommandLine" Version="8.0.0-preview.7.23325.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>171a525880315369e48c6adf6c181f98357352a5</Sha>
+      <Sha>eaa9717d90115cea43b4cdd7a2a49e6d3c3d780e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="8.0.0-preview.6.23314.15" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="8.0.0-preview.7.23325.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>171a525880315369e48c6adf6c181f98357352a5</Sha>
+      <Sha>eaa9717d90115cea43b4cdd7a2a49e6d3c3d780e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration" Version="8.0.0-preview.6.23314.15" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Configuration" Version="8.0.0-preview.7.23325.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>171a525880315369e48c6adf6c181f98357352a5</Sha>
+      <Sha>eaa9717d90115cea43b4cdd7a2a49e6d3c3d780e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0-preview.6.23314.15" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0-preview.7.23325.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>171a525880315369e48c6adf6c181f98357352a5</Sha>
+      <Sha>eaa9717d90115cea43b4cdd7a2a49e6d3c3d780e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="8.0.0-preview.6.23314.15" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="8.0.0-preview.7.23325.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>171a525880315369e48c6adf6c181f98357352a5</Sha>
+      <Sha>eaa9717d90115cea43b4cdd7a2a49e6d3c3d780e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0-preview.6.23314.15" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0-preview.7.23325.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>171a525880315369e48c6adf6c181f98357352a5</Sha>
+      <Sha>eaa9717d90115cea43b4cdd7a2a49e6d3c3d780e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Hosting" Version="8.0.0-preview.6.23314.15" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Hosting" Version="8.0.0-preview.7.23325.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>171a525880315369e48c6adf6c181f98357352a5</Sha>
+      <Sha>eaa9717d90115cea43b4cdd7a2a49e6d3c3d780e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Http" Version="8.0.0-preview.6.23314.15" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Http" Version="8.0.0-preview.7.23325.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>171a525880315369e48c6adf6c181f98357352a5</Sha>
+      <Sha>eaa9717d90115cea43b4cdd7a2a49e6d3c3d780e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0-preview.6.23314.15" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0-preview.7.23325.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>171a525880315369e48c6adf6c181f98357352a5</Sha>
+      <Sha>eaa9717d90115cea43b4cdd7a2a49e6d3c3d780e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="8.0.0-preview.6.23314.15" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="8.0.0-preview.7.23325.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>171a525880315369e48c6adf6c181f98357352a5</Sha>
+      <Sha>eaa9717d90115cea43b4cdd7a2a49e6d3c3d780e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0-preview.6.23314.15" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0-preview.7.23325.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>171a525880315369e48c6adf6c181f98357352a5</Sha>
+      <Sha>eaa9717d90115cea43b4cdd7a2a49e6d3c3d780e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging" Version="8.0.0-preview.6.23314.15" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Logging" Version="8.0.0-preview.7.23325.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>171a525880315369e48c6adf6c181f98357352a5</Sha>
+      <Sha>eaa9717d90115cea43b4cdd7a2a49e6d3c3d780e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0-preview.6.23314.15" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0-preview.7.23325.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>171a525880315369e48c6adf6c181f98357352a5</Sha>
+      <Sha>eaa9717d90115cea43b4cdd7a2a49e6d3c3d780e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options.DataAnnotations" Version="8.0.0-preview.6.23314.15" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Options.DataAnnotations" Version="8.0.0-preview.7.23325.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>171a525880315369e48c6adf6c181f98357352a5</Sha>
+      <Sha>eaa9717d90115cea43b4cdd7a2a49e6d3c3d780e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options" Version="8.0.0-preview.6.23314.15" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Options" Version="8.0.0-preview.7.23325.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>171a525880315369e48c6adf6c181f98357352a5</Sha>
+      <Sha>eaa9717d90115cea43b4cdd7a2a49e6d3c3d780e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Primitives" Version="8.0.0-preview.6.23314.15" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="Microsoft.Extensions.Primitives" Version="8.0.0-preview.7.23325.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>171a525880315369e48c6adf6c181f98357352a5</Sha>
+      <Sha>eaa9717d90115cea43b4cdd7a2a49e6d3c3d780e</Sha>
     </Dependency>
-    <Dependency Name="System.Collections.Immutable" Version="8.0.0-preview.6.23314.15" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Collections.Immutable" Version="8.0.0-preview.7.23325.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>171a525880315369e48c6adf6c181f98357352a5</Sha>
+      <Sha>eaa9717d90115cea43b4cdd7a2a49e6d3c3d780e</Sha>
     </Dependency>
-    <Dependency Name="System.Configuration.ConfigurationManager" Version="8.0.0-preview.6.23314.15" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Configuration.ConfigurationManager" Version="8.0.0-preview.7.23325.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>171a525880315369e48c6adf6c181f98357352a5</Sha>
+      <Sha>eaa9717d90115cea43b4cdd7a2a49e6d3c3d780e</Sha>
     </Dependency>
-    <Dependency Name="System.Diagnostics.DiagnosticSource" Version="8.0.0-preview.6.23314.15" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Diagnostics.DiagnosticSource" Version="8.0.0-preview.7.23325.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>171a525880315369e48c6adf6c181f98357352a5</Sha>
+      <Sha>eaa9717d90115cea43b4cdd7a2a49e6d3c3d780e</Sha>
     </Dependency>
-    <Dependency Name="System.Diagnostics.PerformanceCounter" Version="8.0.0-preview.6.23314.15" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Diagnostics.PerformanceCounter" Version="8.0.0-preview.7.23325.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>171a525880315369e48c6adf6c181f98357352a5</Sha>
+      <Sha>eaa9717d90115cea43b4cdd7a2a49e6d3c3d780e</Sha>
     </Dependency>
-    <Dependency Name="System.IO.Hashing" Version="8.0.0-preview.6.23314.15" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.IO.Hashing" Version="8.0.0-preview.7.23325.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>171a525880315369e48c6adf6c181f98357352a5</Sha>
+      <Sha>eaa9717d90115cea43b4cdd7a2a49e6d3c3d780e</Sha>
     </Dependency>
-    <Dependency Name="System.Net.Http.Json" Version="8.0.0-preview.6.23314.15" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Net.Http.Json" Version="8.0.0-preview.7.23325.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>171a525880315369e48c6adf6c181f98357352a5</Sha>
+      <Sha>eaa9717d90115cea43b4cdd7a2a49e6d3c3d780e</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Pkcs" Version="8.0.0-preview.6.23314.15" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Security.Cryptography.Pkcs" Version="8.0.0-preview.7.23325.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>171a525880315369e48c6adf6c181f98357352a5</Sha>
+      <Sha>eaa9717d90115cea43b4cdd7a2a49e6d3c3d780e</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Xml" Version="8.0.0-preview.6.23314.15" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Security.Cryptography.Xml" Version="8.0.0-preview.7.23325.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>171a525880315369e48c6adf6c181f98357352a5</Sha>
+      <Sha>eaa9717d90115cea43b4cdd7a2a49e6d3c3d780e</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Encodings.Web" Version="8.0.0-preview.6.23314.15" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Text.Encodings.Web" Version="8.0.0-preview.7.23325.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>171a525880315369e48c6adf6c181f98357352a5</Sha>
+      <Sha>eaa9717d90115cea43b4cdd7a2a49e6d3c3d780e</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Json" Version="8.0.0-preview.6.23314.15" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Text.Json" Version="8.0.0-preview.7.23325.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>171a525880315369e48c6adf6c181f98357352a5</Sha>
+      <Sha>eaa9717d90115cea43b4cdd7a2a49e6d3c3d780e</Sha>
     </Dependency>
-    <Dependency Name="System.Runtime.Caching" Version="8.0.0-preview.6.23314.15" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+    <Dependency Name="System.Runtime.Caching" Version="8.0.0-preview.7.23325.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>171a525880315369e48c6adf6c181f98357352a5</Sha>
+      <Sha>eaa9717d90115cea43b4cdd7a2a49e6d3c3d780e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.0-preview.6.23315.13">
+    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.0-preview.7.23327.18">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>d1f00b02ef24762bca23653fd963629749743334</Sha>
+      <Sha>9c664bc65a52bc959138ec76c0250874fb38174d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0-preview.6.23315.13">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0-preview.7.23327.18">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>d1f00b02ef24762bca23653fd963629749743334</Sha>
+      <Sha>9c664bc65a52bc959138ec76c0250874fb38174d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.TestHost" Version="8.0.0-preview.6.23315.13">
+    <Dependency Name="Microsoft.AspNetCore.TestHost" Version="8.0.0-preview.7.23327.18">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>d1f00b02ef24762bca23653fd963629749743334</Sha>
+      <Sha>9c664bc65a52bc959138ec76c0250874fb38174d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.0-preview.6.23315.13">
+    <Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.0-preview.7.23327.18">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>d1f00b02ef24762bca23653fd963629749743334</Sha>
+      <Sha>9c664bc65a52bc959138ec76c0250874fb38174d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="8.0.0-preview.6.23315.13">
+    <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="8.0.0-preview.7.23327.18">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>d1f00b02ef24762bca23653fd963629749743334</Sha>
+      <Sha>9c664bc65a52bc959138ec76c0250874fb38174d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.0-preview.6.23315.13">
+    <Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.0-preview.7.23327.18">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>d1f00b02ef24762bca23653fd963629749743334</Sha>
+      <Sha>9c664bc65a52bc959138ec76c0250874fb38174d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Features" Version="8.0.0-preview.6.23315.13">
+    <Dependency Name="Microsoft.Extensions.Features" Version="8.0.0-preview.7.23327.18">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>d1f00b02ef24762bca23653fd963629749743334</Sha>
+      <Sha>9c664bc65a52bc959138ec76c0250874fb38174d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Http.Polly" Version="8.0.0-preview.6.23315.13">
+    <Dependency Name="Microsoft.Extensions.Http.Polly" Version="8.0.0-preview.7.23327.18">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>d1f00b02ef24762bca23653fd963629749743334</Sha>
+      <Sha>9c664bc65a52bc959138ec76c0250874fb38174d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.ObjectPool" Version="8.0.0-preview.6.23315.13">
+    <Dependency Name="Microsoft.Extensions.ObjectPool" Version="8.0.0-preview.7.23327.18">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>d1f00b02ef24762bca23653fd963629749743334</Sha>
+      <Sha>9c664bc65a52bc959138ec76c0250874fb38174d</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 63e0fcf7882..446c97afa52 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -25,48 +25,48 @@
   -->
   <PropertyGroup Label="Automated">
     <!-- Packages from dotnet/runtime -->
-    <MicrosoftBclTimeProviderVersion>8.0.0-preview.6.23314.15</MicrosoftBclTimeProviderVersion>
-    <MicrosoftExtensionsCachingAbstractionsVersion>8.0.0-preview.6.23314.15</MicrosoftExtensionsCachingAbstractionsVersion>
-    <MicrosoftExtensionsCachingMemoryVersion>8.0.0-preview.6.23314.15</MicrosoftExtensionsCachingMemoryVersion>
-    <MicrosoftExtensionsConfigurationAbstractionsVersion>8.0.0-preview.6.23314.15</MicrosoftExtensionsConfigurationAbstractionsVersion>
-    <MicrosoftExtensionsConfigurationBinderVersion>8.0.0-preview.6.23314.15</MicrosoftExtensionsConfigurationBinderVersion>
-    <MicrosoftExtensionsConfigurationCommandLineVersion>8.0.0-preview.6.23314.15</MicrosoftExtensionsConfigurationCommandLineVersion>
-    <MicrosoftExtensionsConfigurationJsonVersion>8.0.0-preview.6.23314.15</MicrosoftExtensionsConfigurationJsonVersion>
-    <MicrosoftExtensionsConfigurationVersion>8.0.0-preview.6.23314.15</MicrosoftExtensionsConfigurationVersion>
-    <MicrosoftExtensionsDependencyInjectionAbstractionsVersion>8.0.0-preview.6.23314.15</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
-    <MicrosoftExtensionsDependencyInjectionVersion>8.0.0-preview.6.23314.15</MicrosoftExtensionsDependencyInjectionVersion>
-    <MicrosoftExtensionsHostingAbstractionsVersion>8.0.0-preview.6.23314.15</MicrosoftExtensionsHostingAbstractionsVersion>
-    <MicrosoftExtensionsHostingVersion>8.0.0-preview.6.23314.15</MicrosoftExtensionsHostingVersion>
-    <MicrosoftExtensionsHttpVersion>8.0.0-preview.6.23314.15</MicrosoftExtensionsHttpVersion>
-    <MicrosoftExtensionsLoggingAbstractionsVersion>8.0.0-preview.6.23314.15</MicrosoftExtensionsLoggingAbstractionsVersion>
-    <MicrosoftExtensionsLoggingConfigurationVersion>8.0.0-preview.6.23314.15</MicrosoftExtensionsLoggingConfigurationVersion>
-    <MicrosoftExtensionsLoggingConsoleVersion>8.0.0-preview.6.23314.15</MicrosoftExtensionsLoggingConsoleVersion>
-    <MicrosoftExtensionsLoggingVersion>8.0.0-preview.6.23314.15</MicrosoftExtensionsLoggingVersion>
-    <MicrosoftExtensionsOptionsConfigurationExtensionsVersion>8.0.0-preview.6.23314.15</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
-    <MicrosoftExtensionsOptionsDataAnnotationsVersion>8.0.0-preview.6.23314.15</MicrosoftExtensionsOptionsDataAnnotationsVersion>
-    <MicrosoftExtensionsOptionsVersion>8.0.0-preview.6.23314.15</MicrosoftExtensionsOptionsVersion>
-    <MicrosoftExtensionsPrimitivesVersion>8.0.0-preview.6.23314.15</MicrosoftExtensionsPrimitivesVersion>
-    <SystemCollectionsImmutableVersion>8.0.0-preview.6.23314.15</SystemCollectionsImmutableVersion>
-    <SystemConfigurationConfigurationManagerVersion>8.0.0-preview.6.23314.15</SystemConfigurationConfigurationManagerVersion>
-    <SystemDiagnosticsDiagnosticSourceVersion>8.0.0-preview.6.23314.15</SystemDiagnosticsDiagnosticSourceVersion>
-    <SystemDiagnosticsPerformanceCounterVersion>8.0.0-preview.6.23314.15</SystemDiagnosticsPerformanceCounterVersion>
-    <SystemIOHashingVersion>8.0.0-preview.6.23314.15</SystemIOHashingVersion>
-    <SystemNetHttpJsonVersion>8.0.0-preview.6.23314.15</SystemNetHttpJsonVersion>
-    <SystemSecurityCryptographyPkcsVersion>8.0.0-preview.6.23314.15</SystemSecurityCryptographyPkcsVersion>
-    <SystemSecurityCryptographyXmlVersion>8.0.0-preview.6.23314.15</SystemSecurityCryptographyXmlVersion>
-    <SystemTextEncodingsWebVersion>8.0.0-preview.6.23314.15</SystemTextEncodingsWebVersion>
-    <SystemTextJsonVersion>8.0.0-preview.6.23314.15</SystemTextJsonVersion>
-    <SystemRuntimeCachingVersion>8.0.0-preview.6.23314.15</SystemRuntimeCachingVersion>
+    <MicrosoftBclTimeProviderVersion>8.0.0-preview.7.23325.2</MicrosoftBclTimeProviderVersion>
+    <MicrosoftExtensionsCachingAbstractionsVersion>8.0.0-preview.7.23325.2</MicrosoftExtensionsCachingAbstractionsVersion>
+    <MicrosoftExtensionsCachingMemoryVersion>8.0.0-preview.7.23325.2</MicrosoftExtensionsCachingMemoryVersion>
+    <MicrosoftExtensionsConfigurationAbstractionsVersion>8.0.0-preview.7.23325.2</MicrosoftExtensionsConfigurationAbstractionsVersion>
+    <MicrosoftExtensionsConfigurationBinderVersion>8.0.0-preview.7.23325.2</MicrosoftExtensionsConfigurationBinderVersion>
+    <MicrosoftExtensionsConfigurationCommandLineVersion>8.0.0-preview.7.23325.2</MicrosoftExtensionsConfigurationCommandLineVersion>
+    <MicrosoftExtensionsConfigurationJsonVersion>8.0.0-preview.7.23325.2</MicrosoftExtensionsConfigurationJsonVersion>
+    <MicrosoftExtensionsConfigurationVersion>8.0.0-preview.7.23325.2</MicrosoftExtensionsConfigurationVersion>
+    <MicrosoftExtensionsDependencyInjectionAbstractionsVersion>8.0.0-preview.7.23325.2</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
+    <MicrosoftExtensionsDependencyInjectionVersion>8.0.0-preview.7.23325.2</MicrosoftExtensionsDependencyInjectionVersion>
+    <MicrosoftExtensionsHostingAbstractionsVersion>8.0.0-preview.7.23325.2</MicrosoftExtensionsHostingAbstractionsVersion>
+    <MicrosoftExtensionsHostingVersion>8.0.0-preview.7.23325.2</MicrosoftExtensionsHostingVersion>
+    <MicrosoftExtensionsHttpVersion>8.0.0-preview.7.23325.2</MicrosoftExtensionsHttpVersion>
+    <MicrosoftExtensionsLoggingAbstractionsVersion>8.0.0-preview.7.23325.2</MicrosoftExtensionsLoggingAbstractionsVersion>
+    <MicrosoftExtensionsLoggingConfigurationVersion>8.0.0-preview.7.23325.2</MicrosoftExtensionsLoggingConfigurationVersion>
+    <MicrosoftExtensionsLoggingConsoleVersion>8.0.0-preview.7.23325.2</MicrosoftExtensionsLoggingConsoleVersion>
+    <MicrosoftExtensionsLoggingVersion>8.0.0-preview.7.23325.2</MicrosoftExtensionsLoggingVersion>
+    <MicrosoftExtensionsOptionsConfigurationExtensionsVersion>8.0.0-preview.7.23325.2</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
+    <MicrosoftExtensionsOptionsDataAnnotationsVersion>8.0.0-preview.7.23325.2</MicrosoftExtensionsOptionsDataAnnotationsVersion>
+    <MicrosoftExtensionsOptionsVersion>8.0.0-preview.7.23325.2</MicrosoftExtensionsOptionsVersion>
+    <MicrosoftExtensionsPrimitivesVersion>8.0.0-preview.7.23325.2</MicrosoftExtensionsPrimitivesVersion>
+    <SystemCollectionsImmutableVersion>8.0.0-preview.7.23325.2</SystemCollectionsImmutableVersion>
+    <SystemConfigurationConfigurationManagerVersion>8.0.0-preview.7.23325.2</SystemConfigurationConfigurationManagerVersion>
+    <SystemDiagnosticsDiagnosticSourceVersion>8.0.0-preview.7.23325.2</SystemDiagnosticsDiagnosticSourceVersion>
+    <SystemDiagnosticsPerformanceCounterVersion>8.0.0-preview.7.23325.2</SystemDiagnosticsPerformanceCounterVersion>
+    <SystemIOHashingVersion>8.0.0-preview.7.23325.2</SystemIOHashingVersion>
+    <SystemNetHttpJsonVersion>8.0.0-preview.7.23325.2</SystemNetHttpJsonVersion>
+    <SystemSecurityCryptographyPkcsVersion>8.0.0-preview.7.23325.2</SystemSecurityCryptographyPkcsVersion>
+    <SystemSecurityCryptographyXmlVersion>8.0.0-preview.7.23325.2</SystemSecurityCryptographyXmlVersion>
+    <SystemTextEncodingsWebVersion>8.0.0-preview.7.23325.2</SystemTextEncodingsWebVersion>
+    <SystemTextJsonVersion>8.0.0-preview.7.23325.2</SystemTextJsonVersion>
+    <SystemRuntimeCachingVersion>8.0.0-preview.7.23325.2</SystemRuntimeCachingVersion>
     <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
-    <MicrosoftAspNetCoreAppRuntimewinx64Version>8.0.0-preview.6.23315.13</MicrosoftAspNetCoreAppRuntimewinx64Version>
-    <MicrosoftAspNetCoreMvcTestingVersion>8.0.0-preview.6.23315.13</MicrosoftAspNetCoreMvcTestingVersion>
-    <MicrosoftAspNetCoreTestHostVersion>8.0.0-preview.6.23315.13</MicrosoftAspNetCoreTestHostVersion>
-    <MicrosoftExtensionsCachingStackExchangeRedisVersion>8.0.0-preview.6.23315.13</MicrosoftExtensionsCachingStackExchangeRedisVersion>
-    <MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsVersion>8.0.0-preview.6.23315.13</MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsVersion>
-    <MicrosoftExtensionsDiagnosticsHealthChecksVersion>8.0.0-preview.6.23315.13</MicrosoftExtensionsDiagnosticsHealthChecksVersion>
-    <MicrosoftExtensionsFeaturesVersion>8.0.0-preview.6.23315.13</MicrosoftExtensionsFeaturesVersion>
-    <MicrosoftExtensionsHttpPollyVersion>8.0.0-preview.6.23315.13</MicrosoftExtensionsHttpPollyVersion>
-    <MicrosoftExtensionsObjectPoolVersion>8.0.0-preview.6.23315.13</MicrosoftExtensionsObjectPoolVersion>
+    <MicrosoftAspNetCoreAppRuntimewinx64Version>8.0.0-preview.7.23327.18</MicrosoftAspNetCoreAppRuntimewinx64Version>
+    <MicrosoftAspNetCoreMvcTestingVersion>8.0.0-preview.7.23327.18</MicrosoftAspNetCoreMvcTestingVersion>
+    <MicrosoftAspNetCoreTestHostVersion>8.0.0-preview.7.23327.18</MicrosoftAspNetCoreTestHostVersion>
+    <MicrosoftExtensionsCachingStackExchangeRedisVersion>8.0.0-preview.7.23327.18</MicrosoftExtensionsCachingStackExchangeRedisVersion>
+    <MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsVersion>8.0.0-preview.7.23327.18</MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsVersion>
+    <MicrosoftExtensionsDiagnosticsHealthChecksVersion>8.0.0-preview.7.23327.18</MicrosoftExtensionsDiagnosticsHealthChecksVersion>
+    <MicrosoftExtensionsFeaturesVersion>8.0.0-preview.7.23327.18</MicrosoftExtensionsFeaturesVersion>
+    <MicrosoftExtensionsHttpPollyVersion>8.0.0-preview.7.23327.18</MicrosoftExtensionsHttpPollyVersion>
+    <MicrosoftExtensionsObjectPoolVersion>8.0.0-preview.7.23327.18</MicrosoftExtensionsObjectPoolVersion>
   </PropertyGroup>
   <!--
 
diff --git a/global.json b/global.json
index de22ccccd41..1c244454d6e 100644
--- a/global.json
+++ b/global.json
@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "8.0.100-preview.6.23309.5"
+    "version": "8.0.100-preview.7.23327.3"
   },
   "tools": {
-    "dotnet": "8.0.100-preview.6.23309.5",
+    "dotnet": "8.0.100-preview.7.23327.3",
     "runtimes": {
       "dotnet/x64": [
         "3.1.32",
diff --git a/src/Generators/Microsoft.Gen.OptionsValidation/Common/DiagDescriptors.cs b/src/Generators/Microsoft.Gen.OptionsValidation/Common/DiagDescriptors.cs
deleted file mode 100644
index 25a4bbe69c4..00000000000
--- a/src/Generators/Microsoft.Gen.OptionsValidation/Common/DiagDescriptors.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Microsoft.CodeAnalysis;
-using Microsoft.Gen.Shared;
-
-namespace Microsoft.Gen.OptionsValidation;
-
-internal sealed class DiagDescriptors : DiagDescriptorsBase
-{
-    private const string Category = "OptionsValidation";
-
-    // Skipping R9G100
-
-    public static DiagnosticDescriptor CantUseWithGenericTypes { get; } = Make(
-        id: "R9G101",
-        title: Resources.CantUseWithGenericTypesTitle,
-        messageFormat: Resources.CantUseWithGenericTypesMessage,
-        category: Category);
-
-    public static DiagnosticDescriptor NoEligibleMember { get; } = Make(
-        id: "R9G102",
-        title: Resources.NoEligibleMemberTitle,
-        messageFormat: Resources.NoEligibleMemberMessage,
-        category: Category,
-        defaultSeverity: DiagnosticSeverity.Warning);
-
-    public static DiagnosticDescriptor NoEligibleMembersFromValidator { get; } = Make(
-        id: "R9G103",
-        title: Resources.NoEligibleMembersFromValidatorTitle,
-        messageFormat: Resources.NoEligibleMembersFromValidatorMessage,
-        category: Category,
-        defaultSeverity: DiagnosticSeverity.Warning);
-
-    public static DiagnosticDescriptor DoesntImplementIValidateOptions { get; } = Make(
-        id: "R9G104",
-        title: Resources.DoesntImplementIValidateOptionsTitle,
-        messageFormat: Resources.DoesntImplementIValidateOptionsMessage,
-        category: Category);
-
-    public static DiagnosticDescriptor AlreadyImplementsValidateMethod { get; } = Make(
-        id: "R9G105",
-        title: Resources.AlreadyImplementsValidateMethodTitle,
-        messageFormat: Resources.AlreadyImplementsValidateMethodMessage,
-        category: Category);
-
-    public static DiagnosticDescriptor MemberIsInaccessible { get; } = Make(
-        id: "R9G106",
-        title: Resources.MemberIsInaccessibleTitle,
-        messageFormat: Resources.MemberIsInaccessibleMessage,
-        category: Category);
-
-    public static DiagnosticDescriptor NotEnumerableType { get; } = Make(
-        id: "R9G107",
-        title: Resources.NotEnumerableTypeTitle,
-        messageFormat: Resources.NotEnumerableTypeMessage,
-        category: Category);
-
-    public static DiagnosticDescriptor ValidatorsNeedSimpleConstructor { get; } = Make(
-        id: "R9G108",
-        title: Resources.ValidatorsNeedSimpleConstructorTitle,
-        messageFormat: Resources.ValidatorsNeedSimpleConstructorMessage,
-        category: Category);
-
-    public static DiagnosticDescriptor CantBeStaticClass { get; } = Make(
-        id: "R9G109",
-        title: Resources.CantBeStaticClassTitle,
-        messageFormat: Resources.CantBeStaticClassMessage,
-        category: Category);
-
-    public static DiagnosticDescriptor NullValidatorType { get; } = Make(
-        id: "R9G110",
-        title: Resources.NullValidatorTypeTitle,
-        messageFormat: Resources.NullValidatorTypeMessage,
-        category: Category);
-
-    public static DiagnosticDescriptor CircularTypeReferences { get; } = Make(
-        id: "R9G111",
-        title: Resources.CircularTypeReferencesTitle,
-        messageFormat: Resources.CircularTypeReferencesMessage,
-        category: Category);
-
-    // 112 is available for reuse
-
-    public static DiagnosticDescriptor PotentiallyMissingTransitiveValidation { get; } = Make(
-        id: "R9G113",
-        title: Resources.PotentiallyMissingTransitiveValidationTitle,
-        messageFormat: Resources.PotentiallyMissingTransitiveValidationMessage,
-        category: Category,
-        defaultSeverity: DiagnosticSeverity.Warning);
-
-    public static DiagnosticDescriptor PotentiallyMissingEnumerableValidation { get; } = Make(
-        id: "R9G114",
-        title: Resources.PotentiallyMissingEnumerableValidationTitle,
-        messageFormat: Resources.PotentiallyMissingEnumerableValidationMessage,
-        category: Category,
-        defaultSeverity: DiagnosticSeverity.Warning);
-}
diff --git a/src/Generators/Microsoft.Gen.OptionsValidation/Common/Emitter.cs b/src/Generators/Microsoft.Gen.OptionsValidation/Common/Emitter.cs
deleted file mode 100644
index c7103aec951..00000000000
--- a/src/Generators/Microsoft.Gen.OptionsValidation/Common/Emitter.cs
+++ /dev/null
@@ -1,368 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using Microsoft.Gen.OptionsValidation.Model;
-using Microsoft.Gen.Shared;
-
-namespace Microsoft.Gen.OptionsValidation;
-
-// Stryker disable all
-
-/// <summary>
-/// Emits option validation.
-/// </summary>
-internal sealed class Emitter : EmitterBase
-{
-    private const string StaticValidationAttributeHolderClassName = "__Attributes";
-    private const string StaticValidatorHolderClassName = "__Validators";
-    private const string StaticFieldHolderClassesNamespace = "__OptionValidationStaticInstances";
-    private const string StaticValidationAttributeHolderClassFQN = $"global::{StaticFieldHolderClassesNamespace}.{StaticValidationAttributeHolderClassName}";
-    private const string StaticValidatorHolderClassFQN = $"global::{StaticFieldHolderClassesNamespace}.{StaticValidatorHolderClassName}";
-    private sealed record StaticFieldInfo(string FieldTypeFQN, int FieldOrder, string FieldName, IList<string> InstantiationLines);
-
-    public string Emit(
-        IEnumerable<ValidatorType> validatorTypes,
-        CancellationToken cancellationToken)
-    {
-        var staticValidationAttributesDict = new Dictionary<string, StaticFieldInfo>();
-        var staticValidatorsDict = new Dictionary<string, StaticFieldInfo>();
-
-        foreach (var vt in validatorTypes.OrderBy(static lt => lt.Namespace + "." + lt.Name))
-        {
-            cancellationToken.ThrowIfCancellationRequested();
-            GenValidatorType(vt, ref staticValidationAttributesDict, ref staticValidatorsDict);
-        }
-
-        GenStaticClassWithStaticReadonlyFields(staticValidationAttributesDict.Values, StaticFieldHolderClassesNamespace, StaticValidationAttributeHolderClassName);
-        GenStaticClassWithStaticReadonlyFields(staticValidatorsDict.Values, StaticFieldHolderClassesNamespace, StaticValidatorHolderClassName);
-
-        return Capture();
-    }
-
-    private void GenValidatorType(ValidatorType vt, ref Dictionary<string, StaticFieldInfo> staticValidationAttributesDict, ref Dictionary<string, StaticFieldInfo> staticValidatorsDict)
-    {
-        OutLn("#pragma warning disable CS0618 // Type or member is obsolete");
-
-        if (vt.Namespace.Length > 0)
-        {
-            OutLn($"namespace {vt.Namespace}");
-            OutOpenBrace();
-        }
-
-        foreach (var p in vt.ParentTypes)
-        {
-            OutLn(p);
-            OutOpenBrace();
-        }
-
-        if (vt.IsSynthetic)
-        {
-            OutGeneratedCodeAttribute();
-            OutLn($"internal sealed partial {vt.DeclarationKeyword} {vt.Name}");
-        }
-        else
-        {
-            OutLn($"partial {vt.DeclarationKeyword} {vt.Name}");
-        }
-
-        OutOpenBrace();
-
-        for (var i = 0; i < vt.ModelsToValidate.Count; i++)
-        {
-            var modelToValidate = vt.ModelsToValidate[i];
-
-            GenModelValidationMethod(modelToValidate, vt.IsSynthetic, ref staticValidationAttributesDict, ref staticValidatorsDict);
-        }
-
-        OutCloseBrace();
-
-        foreach (var _ in vt.ParentTypes)
-        {
-            OutCloseBrace();
-        }
-
-        if (vt.Namespace.Length > 0)
-        {
-            OutCloseBrace();
-        }
-    }
-
-    private void GenStaticClassWithStaticReadonlyFields(IEnumerable<StaticFieldInfo> staticFields, string classNamespace, string className)
-    {
-        OutLn($"namespace {classNamespace}");
-        OutOpenBrace();
-
-        OutGeneratedCodeAttribute();
-        OutLn($"file static class {className}");
-        OutOpenBrace();
-
-        var staticValidationAttributes = staticFields
-            .OrderBy(x => x.FieldOrder)
-            .ToArray();
-
-        for (var i = 0; i < staticValidationAttributes.Length; i++)
-        {
-            var attributeInstance = staticValidationAttributes[i];
-            OutIndent();
-            Out($"internal static readonly {attributeInstance.FieldTypeFQN} {attributeInstance.FieldName} = ");
-            for (var j = 0; j < attributeInstance.InstantiationLines.Count; j++)
-            {
-                var line = attributeInstance.InstantiationLines[j];
-                Out(line);
-                if (j != attributeInstance.InstantiationLines.Count - 1)
-                {
-                    OutLn();
-                    OutIndent();
-                }
-                else
-                {
-                    Out(';');
-                }
-            }
-
-            OutLn();
-
-            if (i != staticValidationAttributes.Length - 1)
-            {
-                OutLn();
-            }
-        }
-
-        OutCloseBrace();
-
-        OutCloseBrace();
-    }
-
-    private void GenModelSelfValidationIfNecessary(ValidatedModel modelToValidate)
-    {
-        if (modelToValidate.SelfValidates)
-        {
-            OutLn($"builder.AddResults(((global::System.ComponentModel.DataAnnotations.IValidatableObject)options).Validate(context));");
-            OutLn();
-        }
-    }
-
-    private void GenModelValidationMethod(
-        ValidatedModel modelToValidate,
-        bool makeStatic,
-        ref Dictionary<string, StaticFieldInfo> staticValidationAttributesDict,
-        ref Dictionary<string, StaticFieldInfo> staticValidatorsDict)
-    {
-        OutLn($"/// <summary>");
-        OutLn($"/// Validates a specific named options instance (or all when <paramref name=\"name\"/> is <see langword=\"null\" />).");
-        OutLn($"/// </summary>");
-        OutLn($"/// <param name=\"name\">The name of the options instance being validated.</param>");
-        OutLn($"/// <param name=\"options\">The options instance.</param>");
-        OutLn($"/// <returns>Validation result.</returns>");
-        OutGeneratedCodeAttribute();
-
-        OutLn($"public {(makeStatic ? "static " : string.Empty)}global::Microsoft.Extensions.Options.ValidateOptionsResult Validate(string? name, {modelToValidate.Name} options)");
-        OutOpenBrace();
-        OutLn($"var baseName = (string.IsNullOrEmpty(name) ? \"{modelToValidate.SimpleName}\" : name) + \".\";");
-        OutLn($"var builder = new global::Microsoft.Extensions.Options.ValidateOptionsResultBuilder();");
-        OutLn($"var context = new global::System.ComponentModel.DataAnnotations.ValidationContext(options);");
-        OutLn();
-
-        foreach (var vm in modelToValidate.MembersToValidate)
-        {
-            if (vm.ValidationAttributes.Count > 0)
-            {
-                GenMemberValidation(vm, ref staticValidationAttributesDict);
-                OutLn();
-            }
-
-            if (vm.TransValidatorType != null)
-            {
-                GenTransitiveValidation(vm, ref staticValidatorsDict);
-                OutLn();
-            }
-
-            if (vm.EnumerationValidatorType != null)
-            {
-                GenEnumerationValidation(vm, ref staticValidatorsDict);
-                OutLn();
-            }
-        }
-
-        GenModelSelfValidationIfNecessary(modelToValidate);
-        OutLn($"return builder.Build();");
-        OutCloseBrace();
-    }
-
-    private void GenMemberValidation(ValidatedMember vm,
-        ref Dictionary<string, StaticFieldInfo> staticValidationAttributesDict)
-    {
-        OutLn($"context.MemberName = \"{vm.Name}\";");
-        OutLn($"context.DisplayName = baseName + \"{vm.Name}\";");
-
-        foreach (var attr in vm.ValidationAttributes)
-        {
-            var staticValidationAttributeInstance = GetOrAddStaticValidationAttribute(ref staticValidationAttributesDict, attr);
-
-            OutLn($"builder.AddResult({StaticValidationAttributeHolderClassFQN}.{staticValidationAttributeInstance.FieldName}.GetValidationResult(options.{vm.Name}, context));");
-        }
-    }
-
-    private StaticFieldInfo GetOrAddStaticValidationAttribute(ref Dictionary<string, StaticFieldInfo> staticValidationAttributesDict, ValidationAttributeInfo attr)
-    {
-        var attrInstantiationStatementLines = new List<string>();
-
-        if (attr.ConstructorArguments.Count > 0)
-        {
-            attrInstantiationStatementLines.Add($"new {attr.AttributeName}(");
-
-            for (var i = 0; i < attr.ConstructorArguments.Count; i++)
-            {
-                if (i != attr.ConstructorArguments.Count - 1)
-                {
-                    attrInstantiationStatementLines.Add($"{GetPaddingString(1)}{attr.ConstructorArguments[i]},");
-                }
-                else
-                {
-                    attrInstantiationStatementLines.Add($"{GetPaddingString(1)}{attr.ConstructorArguments[i]})");
-                }
-            }
-        }
-        else
-        {
-            attrInstantiationStatementLines.Add($"new {attr.AttributeName}()");
-        }
-
-        if (attr.Properties.Count > 0)
-        {
-            attrInstantiationStatementLines.Add("{");
-
-            var propertiesOrderedByKey = attr.Properties
-                .OrderBy(p => p.Key)
-                .ToArray();
-
-            for (var i = 0; i < propertiesOrderedByKey.Length; i++)
-            {
-                var prop = propertiesOrderedByKey[i];
-                var notLast = i != propertiesOrderedByKey.Length - 1;
-                attrInstantiationStatementLines.Add($"{GetPaddingString(1)}{prop.Key} = {prop.Value}{(notLast ? "," : string.Empty)}");
-            }
-
-            attrInstantiationStatementLines.Add("}");
-        }
-
-        var instantiationStatement = string.Join(Environment.NewLine, attrInstantiationStatementLines);
-
-        if (!staticValidationAttributesDict.TryGetValue(instantiationStatement, out var staticValidationAttributeInstance))
-        {
-            var fieldNumber = staticValidationAttributesDict.Count + 1;
-            staticValidationAttributeInstance = new StaticFieldInfo(
-                FieldTypeFQN: attr.AttributeName,
-                FieldOrder: fieldNumber,
-                FieldName: $"A{fieldNumber}",
-                InstantiationLines: attrInstantiationStatementLines);
-
-            staticValidationAttributesDict.Add(instantiationStatement, staticValidationAttributeInstance);
-        }
-
-        return staticValidationAttributeInstance;
-    }
-
-    private void GenTransitiveValidation(ValidatedMember vm, ref Dictionary<string, StaticFieldInfo> staticValidatorsDict)
-    {
-        string callSequence;
-        if (vm.TransValidateTypeIsSynthetic)
-        {
-            callSequence = vm.TransValidatorType!;
-        }
-        else
-        {
-            var staticValidatorInstance = GetOrAddStaticValidator(ref staticValidatorsDict, vm.TransValidatorType!);
-
-            callSequence = $"{StaticValidatorHolderClassFQN}.{staticValidatorInstance.FieldName}";
-        }
-
-        var valueAccess = (vm.IsNullable && vm.IsValueType) ? ".Value" : string.Empty;
-
-        if (vm.IsNullable)
-        {
-            OutLn($"if (options.{vm.Name} != null)");
-            OutLn($"{{");
-            OutLn($"    builder.AddResult({callSequence}.Validate(baseName + \"{vm.Name}\", options.{vm.Name}{valueAccess}));");
-            OutLn($"}}");
-        }
-        else
-        {
-            OutLn($"builder.AddResult({callSequence}.Validate(baseName + \"{vm.Name}\", options.{vm.Name}{valueAccess}));");
-        }
-    }
-
-    private void GenEnumerationValidation(ValidatedMember vm, ref Dictionary<string, StaticFieldInfo> staticValidatorsDict)
-    {
-        var valueAccess = (vm.IsValueType && vm.IsNullable) ? ".Value" : string.Empty;
-        var enumeratedValueAccess = (vm.EnumeratedIsNullable && vm.EnumeratedIsValueType) ? ".Value" : string.Empty;
-        string callSequence;
-        if (vm.EnumerationValidatorTypeIsSynthetic)
-        {
-            callSequence = vm.EnumerationValidatorType!;
-        }
-        else
-        {
-            var staticValidatorInstance = GetOrAddStaticValidator(ref staticValidatorsDict, vm.EnumerationValidatorType!);
-
-            callSequence = $"{StaticValidatorHolderClassFQN}.{staticValidatorInstance.FieldName}";
-        }
-
-        if (vm.IsNullable)
-        {
-            OutLn($"if (options.{vm.Name} != null)");
-        }
-
-        OutOpenBrace();
-
-        OutLn($"var count = 0;");
-        OutLn($"foreach (var o in options.{vm.Name}{valueAccess})");
-        OutOpenBrace();
-
-        if (vm.EnumeratedIsNullable)
-        {
-            OutLn($"if (o is not null)");
-            OutLn($"{{");
-            OutLn($"    builder.AddResult({callSequence}.Validate(baseName + $\"{vm.Name}[{{count++}}]\", o{enumeratedValueAccess}));");
-            OutLn($"}}");
-
-            if (!vm.EnumeratedMayBeNull)
-            {
-                OutLn($"else");
-                OutLn($"{{");
-                OutLn($"    builder.AddError(baseName + $\"{vm.Name}[{{count++}}] is null\");");
-                OutLn($"}}");
-            }
-        }
-        else
-        {
-            OutLn($"builder.AddResult({callSequence}.Validate(baseName + $\"{vm.Name}[{{count++}}]\", o{enumeratedValueAccess}));");
-        }
-
-        OutCloseBrace();
-        OutCloseBrace();
-    }
-
-#pragma warning disable CA1822 // Mark members as static: static should come before non-static, but we want the method to be here
-    private StaticFieldInfo GetOrAddStaticValidator(ref Dictionary<string, StaticFieldInfo> staticValidatorsDict, string validatorTypeFQN)
-#pragma warning restore CA1822
-    {
-        if (!staticValidatorsDict.TryGetValue(validatorTypeFQN, out var staticValidatorInstance))
-        {
-            var fieldNumber = staticValidatorsDict.Count + 1;
-            staticValidatorInstance = new StaticFieldInfo(
-                FieldTypeFQN: validatorTypeFQN,
-                FieldOrder: fieldNumber,
-                FieldName: $"V{fieldNumber}",
-                InstantiationLines: new[] { $"new {validatorTypeFQN}()" });
-
-            staticValidatorsDict.Add(validatorTypeFQN, staticValidatorInstance);
-        }
-
-        return staticValidatorInstance;
-    }
-}
diff --git a/src/Generators/Microsoft.Gen.OptionsValidation/Common/Generator.cs b/src/Generators/Microsoft.Gen.OptionsValidation/Common/Generator.cs
deleted file mode 100644
index 3f0a49c5a3d..00000000000
--- a/src/Generators/Microsoft.Gen.OptionsValidation/Common/Generator.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-#if ROSLYN_4_0_OR_GREATER
-
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Text;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.Text;
-using Microsoft.Gen.Shared;
-
-namespace Microsoft.Gen.OptionsValidation;
-
-[Generator]
-[ExcludeFromCodeCoverage]
-public class Generator : IIncrementalGenerator
-{
-    private static readonly HashSet<string> _attributeNames = new()
-    {
-        SymbolLoader.OptionsValidatorAttribute,
-    };
-
-    public void Initialize(IncrementalGeneratorInitializationContext context)
-    {
-        GeneratorUtilities.Initialize(context, _attributeNames, HandleAnnotatedTypes);
-    }
-
-    private static void HandleAnnotatedTypes(Compilation compilation, IEnumerable<SyntaxNode> nodes, SourceProductionContext context)
-    {
-        if (!SymbolLoader.TryLoad(compilation, out var symbolHolder))
-        {
-            // Not eligible compilation
-            return;
-        }
-
-        var parser = new Parser(compilation, context.ReportDiagnostic, symbolHolder!, context.CancellationToken);
-
-        var validatorTypes = parser.GetValidatorTypes(nodes.OfType<TypeDeclarationSyntax>());
-        if (validatorTypes.Count > 0)
-        {
-            var emitter = new Emitter();
-            var result = emitter.Emit(validatorTypes, context.CancellationToken);
-
-            context.AddSource("Validators.g.cs", SourceText.From(result, Encoding.UTF8));
-        }
-    }
-}
-
-#else
-
-using System.Diagnostics.CodeAnalysis;
-using System.Text;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Text;
-using Microsoft.Gen.Shared;
-
-namespace Microsoft.Gen.OptionsValidation;
-
-/// <summary>
-/// Generates <see cref="Extensions.Options.IValidateOptions{T}" /> for classes that are marked with <see cref="R9.Extensions.Options.OptionsValidatorAttribute" />.
-/// </summary>
-[Generator]
-[ExcludeFromCodeCoverage]
-public class Generator : ISourceGenerator
-{
-    public void Initialize(GeneratorInitializationContext context)
-    {
-        context.RegisterForSyntaxNotifications(TypeDeclarationSyntaxReceiver.Create);
-    }
-
-    public void Execute(GeneratorExecutionContext context)
-    {
-        var receiver = context.SyntaxReceiver as TypeDeclarationSyntaxReceiver;
-        if (receiver == null || receiver.TypeDeclarations.Count == 0)
-        {
-            // nothing to do yet
-            return;
-        }
-
-        if (!SymbolLoader.TryLoad(context.Compilation, out var symbolHolder))
-        {
-            // Not eligible compilation
-            return;
-        }
-
-        var parser = new Parser(context.Compilation, context.ReportDiagnostic, symbolHolder!, context.CancellationToken);
-        var validatorTypes = parser.GetValidatorTypes(receiver.TypeDeclarations);
-        if (validatorTypes.Count > 0)
-        {
-            var emitter = new Emitter();
-            var result = emitter.Emit(validatorTypes, context.CancellationToken);
-            context.AddSource("Validators.g.cs", SourceText.From(result, Encoding.UTF8));
-        }
-    }
-}
-
-#endif
diff --git a/src/Generators/Microsoft.Gen.OptionsValidation/Common/Model/ValidatedMember.cs b/src/Generators/Microsoft.Gen.OptionsValidation/Common/Model/ValidatedMember.cs
deleted file mode 100644
index 0ffe9385e8f..00000000000
--- a/src/Generators/Microsoft.Gen.OptionsValidation/Common/Model/ValidatedMember.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.Collections.Generic;
-
-namespace Microsoft.Gen.OptionsValidation.Model;
-
-internal sealed record class ValidatedMember(
-    string Name,
-    List<ValidationAttributeInfo> ValidationAttributes,
-    string? TransValidatorType,
-    bool TransValidateTypeIsSynthetic,
-    string? EnumerationValidatorType,
-    bool EnumerationValidatorTypeIsSynthetic,
-    bool IsNullable,
-    bool IsValueType,
-    bool EnumeratedIsNullable,
-    bool EnumeratedIsValueType,
-    bool EnumeratedMayBeNull);
diff --git a/src/Generators/Microsoft.Gen.OptionsValidation/Common/Model/ValidatedModel.cs b/src/Generators/Microsoft.Gen.OptionsValidation/Common/Model/ValidatedModel.cs
deleted file mode 100644
index 8b354f5d235..00000000000
--- a/src/Generators/Microsoft.Gen.OptionsValidation/Common/Model/ValidatedModel.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.Collections.Generic;
-
-namespace Microsoft.Gen.OptionsValidation.Model;
-
-internal sealed record class ValidatedModel(
-    string Name,
-    string SimpleName,
-    bool SelfValidates,
-    List<ValidatedMember> MembersToValidate);
diff --git a/src/Generators/Microsoft.Gen.OptionsValidation/Common/Model/ValidationAttributeInfo.cs b/src/Generators/Microsoft.Gen.OptionsValidation/Common/Model/ValidationAttributeInfo.cs
deleted file mode 100644
index 111073d1aa3..00000000000
--- a/src/Generators/Microsoft.Gen.OptionsValidation/Common/Model/ValidationAttributeInfo.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.Collections.Generic;
-
-namespace Microsoft.Gen.OptionsValidation.Model;
-
-internal sealed record class ValidationAttributeInfo(string AttributeName)
-{
-    public List<string> ConstructorArguments { get; } = new();
-    public Dictionary<string, string> Properties { get; } = new();
-}
diff --git a/src/Generators/Microsoft.Gen.OptionsValidation/Common/Model/ValidatorType.cs b/src/Generators/Microsoft.Gen.OptionsValidation/Common/Model/ValidatorType.cs
deleted file mode 100644
index 27c5caaa634..00000000000
--- a/src/Generators/Microsoft.Gen.OptionsValidation/Common/Model/ValidatorType.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.Collections.Generic;
-
-namespace Microsoft.Gen.OptionsValidation.Model;
-
-internal sealed record class ValidatorType(
-    string Namespace,
-    string Name,
-    string NameWithoutGenerics,
-    string DeclarationKeyword,
-    List<string> ParentTypes,
-    bool IsSynthetic,
-    IList<ValidatedModel> ModelsToValidate);
diff --git a/src/Generators/Microsoft.Gen.OptionsValidation/Common/Parser.cs b/src/Generators/Microsoft.Gen.OptionsValidation/Common/Parser.cs
deleted file mode 100644
index 4b27c09597a..00000000000
--- a/src/Generators/Microsoft.Gen.OptionsValidation/Common/Parser.cs
+++ /dev/null
@@ -1,696 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.Gen.OptionsValidation.Model;
-using Microsoft.Gen.Shared;
-
-namespace Microsoft.Gen.OptionsValidation;
-
-/// <summary>
-/// Holds an internal parser class that extracts necessary information for generating IValidateOptions.
-/// </summary>
-internal sealed class Parser
-{
-    private const int NumValidationMethodArgs = 2;
-
-    private readonly CancellationToken _cancellationToken;
-    private readonly Compilation _compilation;
-    private readonly Action<Diagnostic> _reportDiagnostic;
-    private readonly SymbolHolder _symbolHolder;
-    private readonly Dictionary<ITypeSymbol, ValidatorType> _synthesizedValidators = new(SymbolEqualityComparer.Default);
-    private readonly HashSet<ITypeSymbol> _visitedModelTypes = new(SymbolEqualityComparer.Default);
-
-    public Parser(
-        Compilation compilation,
-        Action<Diagnostic> reportDiagnostic,
-        SymbolHolder symbolHolder,
-        CancellationToken cancellationToken)
-    {
-        _compilation = compilation;
-        _cancellationToken = cancellationToken;
-        _reportDiagnostic = reportDiagnostic;
-        _symbolHolder = symbolHolder;
-    }
-
-    public IReadOnlyList<ValidatorType> GetValidatorTypes(IEnumerable<TypeDeclarationSyntax> classes)
-    {
-        var results = new List<ValidatorType>();
-
-        foreach (var group in classes.GroupBy(x => x.SyntaxTree))
-        {
-            SemanticModel? sm = null;
-            foreach (var typeDec in group)
-            {
-                _cancellationToken.ThrowIfCancellationRequested();
-                sm ??= _compilation.GetSemanticModel(typeDec.SyntaxTree);
-
-                var validatorType = sm.GetDeclaredSymbol(typeDec) as ITypeSymbol;
-                if (validatorType != null)
-                {
-#if !ROSLYN_4_0_OR_GREATER
-                    if (!IsAnnotated(validatorType))
-                    {
-                        continue;
-                    }
-#endif
-                    if (validatorType.IsStatic)
-                    {
-                        Diag(DiagDescriptors.CantBeStaticClass, typeDec.GetLocation());
-                        continue;
-                    }
-
-                    _visitedModelTypes.Clear();
-
-                    var modelTypes = GetModelTypes(validatorType);
-                    if (modelTypes.Count == 0)
-                    {
-                        // validator doesn't implement IValidateOptions
-                        Diag(DiagDescriptors.DoesntImplementIValidateOptions, typeDec.GetLocation(), validatorType.Name);
-                        continue;
-                    }
-
-                    var modelsValidatorTypeValidates = new List<ValidatedModel>(modelTypes.Count);
-
-                    foreach (var modelType in modelTypes)
-                    {
-                        if (modelType.Kind == SymbolKind.ErrorType)
-                        {
-                            // the compiler will report this error for us
-                            continue;
-                        }
-                        else
-                        {
-                            // keep track of the models we look at, to detect loops
-                            _ = _visitedModelTypes.Add(modelType.WithNullableAnnotation(NullableAnnotation.None));
-                        }
-
-                        if (AlreadyImplementsValidateMethod(validatorType, modelType))
-                        {
-                            // this type already implements a validation function, we can't auto-generate a new one
-                            Diag(DiagDescriptors.AlreadyImplementsValidateMethod, typeDec.GetLocation(), validatorType.Name);
-                            continue;
-                        }
-
-                        var membersToValidate = GetMembersToValidate(modelType, true);
-                        if (membersToValidate.Count == 0)
-                        {
-                            // this type lacks any eligible members
-                            Diag(DiagDescriptors.NoEligibleMembersFromValidator, typeDec.GetLocation(), modelType.ToString(), validatorType.ToString());
-                            continue;
-                        }
-
-                        modelsValidatorTypeValidates.Add(new ValidatedModel(
-                            GetFQN(modelType),
-                            modelType.Name,
-                            ModelSelfValidates(modelType),
-                            membersToValidate));
-                    }
-
-                    string keyword = GetTypeKeyword(validatorType);
-
-                    // following code establishes the containment hierarchy for the generated type in terms of nested types
-
-                    var parents = new List<string>();
-                    var parent = typeDec.Parent as TypeDeclarationSyntax;
-
-                    while (parent != null && IsAllowedKind(parent.Kind()))
-                    {
-                        parents.Add($"partial {GetTypeKeyword(parent)} {parent.Identifier}{parent.TypeParameterList} {parent.ConstraintClauses}");
-                        parent = parent.Parent as TypeDeclarationSyntax;
-                    }
-
-                    parents.Reverse();
-
-                    results.Add(new ValidatorType(
-                        validatorType.ContainingNamespace.IsGlobalNamespace ? string.Empty : validatorType.ContainingNamespace.ToString(),
-                        GetMinimalFQN(validatorType),
-                        GetMinimalFQNWithoutGenerics(validatorType),
-                        keyword,
-                        parents,
-                        false,
-                        modelsValidatorTypeValidates));
-                }
-            }
-        }
-
-        results.AddRange(_synthesizedValidators.Values);
-        _synthesizedValidators.Clear();
-
-        return results;
-    }
-
-    private static bool IsAllowedKind(SyntaxKind kind) =>
-        kind == SyntaxKind.ClassDeclaration ||
-        kind == SyntaxKind.StructDeclaration ||
-#if ROSLYN_4_0_OR_GREATER
-        kind == SyntaxKind.RecordStructDeclaration ||
-#endif
-        kind == SyntaxKind.RecordDeclaration;
-
-    private static string GetTypeKeyword(ITypeSymbol type)
-    {
-#if ROSLYN_4_0_OR_GREATER
-        if (type.IsReferenceType)
-        {
-            return type.IsRecord ? "record class" : "class";
-        }
-
-        return type.IsRecord ? "record struct" : "struct";
-#else
-        return type.IsReferenceType ? "class" : "struct";
-#endif
-    }
-
-    private static string GetTypeKeyword(TypeDeclarationSyntax type) =>
-        type.Kind() switch
-        {
-            SyntaxKind.ClassDeclaration => "class",
-            SyntaxKind.RecordDeclaration => "record class",
-#if ROSLYN_4_0_OR_GREATER
-            SyntaxKind.RecordStructDeclaration => "record struct",
-#endif
-            _ => type.Keyword.ValueText,
-        };
-
-    private static string GetFQN(ISymbol type)
-        => type.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat.WithMiscellaneousOptions(SymbolDisplayMiscellaneousOptions.IncludeNullableReferenceTypeModifier));
-
-    private static string GetMinimalFQN(ISymbol type)
-        => type.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat.AddGenericsOptions(SymbolDisplayGenericsOptions.IncludeTypeParameters));
-
-    private static string GetMinimalFQNWithoutGenerics(ISymbol type)
-        => type.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat.WithGenericsOptions(SymbolDisplayGenericsOptions.None));
-
-    /// <summary>
-    /// Checks whether the given validator already implement the IValidationOptions&gt;T&lt; interface.
-    /// </summary>
-    private static bool AlreadyImplementsValidateMethod(INamespaceOrTypeSymbol validatorType, ISymbol modelType)
-        => validatorType
-            .GetMembers("Validate")
-            .Where(m => m.Kind == SymbolKind.Method)
-            .Select(m => (IMethodSymbol)m)
-            .Any(m => m.Parameters.Length == NumValidationMethodArgs
-                && m.Parameters[0].Type.SpecialType == SpecialType.System_String
-                && SymbolEqualityComparer.Default.Equals(m.Parameters[1].Type, modelType));
-
-    /// <summary>
-    /// Checks whether the given type contain any unbound generic type arguments.
-    /// </summary>
-    private static bool HasOpenGenerics(ITypeSymbol type, out string genericType)
-    {
-        if (type is INamedTypeSymbol mt)
-        {
-            if (mt.IsGenericType)
-            {
-                foreach (var ta in mt.TypeArguments)
-                {
-                    if (ta.TypeKind == TypeKind.TypeParameter)
-                    {
-                        genericType = ta.Name;
-                        return true;
-                    }
-                }
-            }
-        }
-        else if (type is ITypeParameterSymbol)
-        {
-            genericType = type.Name;
-            return true;
-        }
-        else if (type is IArrayTypeSymbol ats)
-        {
-            return HasOpenGenerics(ats.ElementType, out genericType);
-        }
-
-        genericType = string.Empty;
-        return false;
-    }
-
-#if !ROSLYN_4_0_OR_GREATER
-    private bool IsAnnotated(ISymbol type)
-    {
-        foreach (var attribute in type.GetAttributes().Where(a => a.AttributeClass != null))
-        {
-            var attributeType = attribute.AttributeClass!;
-
-            if (SymbolEqualityComparer.Default.Equals(attributeType, _symbolHolder.OptionsValidatorSymbol))
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-#endif
-
-    private ITypeSymbol? GetEnumeratedType(ITypeSymbol type)
-    {
-        if (type.OriginalDefinition.SpecialType == SpecialType.System_Nullable_T)
-        {
-            // extract the T from a Nullable<T>
-            type = ((INamedTypeSymbol)type).TypeArguments[0];
-        }
-
-        foreach (var implementingInterface in type.AllInterfaces)
-        {
-            if (SymbolEqualityComparer.Default.Equals(implementingInterface.OriginalDefinition, _compilation.GetSpecialType(SpecialType.System_Collections_Generic_IEnumerable_T)))
-            {
-                return implementingInterface.TypeArguments.First();
-            }
-        }
-
-        return null;
-    }
-
-    private List<ValidatedMember> GetMembersToValidate(ITypeSymbol modelType, bool speculate)
-    {
-        // make a list of the most derived members in the model type
-
-        if (modelType.OriginalDefinition.SpecialType == SpecialType.System_Nullable_T)
-        {
-            // extract the T from a Nullable<T>
-            modelType = ((INamedTypeSymbol)modelType).TypeArguments[0];
-        }
-
-        var members = modelType.GetMembers().ToList();
-        var addedMembers = new HashSet<string>(members.Select(m => m.Name));
-        var baseType = modelType.BaseType;
-        while (baseType is not null && baseType.SpecialType != SpecialType.System_Object)
-        {
-            var baseMembers = baseType.GetMembers().Where(m => !addedMembers.Contains(m.Name));
-            members.AddRange(baseMembers);
-            addedMembers.UnionWith(baseMembers.Select(m => m.Name));
-            baseType = baseType.BaseType;
-        }
-
-        var membersToValidate = new List<ValidatedMember>();
-        foreach (var member in members)
-        {
-            var memberInfo = GetMemberInfo(member, speculate);
-            if (memberInfo != null)
-            {
-                if (member.DeclaredAccessibility != Accessibility.Public && member.DeclaredAccessibility != Accessibility.Internal)
-                {
-                    Diag(DiagDescriptors.MemberIsInaccessible, member.Locations.First(), member.Name);
-                    continue;
-                }
-
-                membersToValidate.Add(memberInfo);
-            }
-        }
-
-        return membersToValidate;
-    }
-
-    private ValidatedMember? GetMemberInfo(ISymbol member, bool speculate)
-    {
-        ITypeSymbol memberType;
-        switch (member)
-        {
-            case IPropertySymbol prop:
-                memberType = prop.Type;
-                break;
-            case IFieldSymbol field:
-                if (field.AssociatedSymbol != null)
-                {
-                    // a backing field for a property, don't need those
-                    return null;
-                }
-
-                memberType = field.Type;
-                break;
-            default:
-                // we only care about properties and fields
-                return null;
-        }
-
-        var validationAttrs = new List<ValidationAttributeInfo>();
-        string? transValidatorTypeName = null;
-        string? enumerationValidatorTypeName = null;
-        var enumeratedIsNullable = false;
-        var enumeratedIsValueType = false;
-        var enumeratedMayBeNull = false;
-        var transValidatorIsSynthetic = false;
-        var enumerationValidatorIsSynthetic = false;
-
-        foreach (var attribute in member.GetAttributes().Where(a => a.AttributeClass != null))
-        {
-            var attributeType = attribute.AttributeClass!;
-            var attrLoc = attribute.ApplicationSyntaxReference?.GetSyntax().GetLocation();
-
-            if (SymbolEqualityComparer.Default.Equals(attributeType, _symbolHolder.ValidateObjectMembersAttributeSymbol)
-               || SymbolEqualityComparer.Default.Equals(attributeType, _symbolHolder.LegacyValidateTransitivelyAttributeSymbol))
-            {
-                if (HasOpenGenerics(memberType, out var genericType))
-                {
-                    Diag(DiagDescriptors.CantUseWithGenericTypes, attrLoc, genericType);
-#pragma warning disable S1226 // Method parameters, caught exceptions and foreach variables' initial values should not be ignored
-                    speculate = false;
-#pragma warning restore S1226 // Method parameters, caught exceptions and foreach variables' initial values should not be ignored
-                    continue;
-                }
-
-                if (attribute.ConstructorArguments.Length == 1)
-                {
-                    var transValidatorType = attribute.ConstructorArguments[0].Value as INamedTypeSymbol;
-                    if (transValidatorType != null)
-                    {
-                        if (CanValidate(transValidatorType, memberType))
-                        {
-                            if (transValidatorType.Constructors.Where(c => !c.Parameters.Any()).Any())
-                            {
-                                transValidatorTypeName = transValidatorType.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat);
-                            }
-                            else
-                            {
-                                Diag(DiagDescriptors.ValidatorsNeedSimpleConstructor, attrLoc, transValidatorType.Name);
-                            }
-                        }
-                        else
-                        {
-                            Diag(DiagDescriptors.DoesntImplementIValidateOptions, attrLoc, transValidatorType.Name, memberType.Name);
-                        }
-                    }
-                    else
-                    {
-                        Diag(DiagDescriptors.NullValidatorType, attrLoc);
-                    }
-                }
-                else if (!_visitedModelTypes.Add(memberType.WithNullableAnnotation(NullableAnnotation.None)))
-                {
-                    Diag(DiagDescriptors.CircularTypeReferences, attrLoc, memberType.ToString());
-                    speculate = false;
-                    continue;
-                }
-
-                if (transValidatorTypeName == null)
-                {
-                    transValidatorIsSynthetic = true;
-                    transValidatorTypeName = AddSynthesizedValidator(memberType, member);
-                }
-
-                // pop the stack
-                _ = _visitedModelTypes.Remove(memberType.WithNullableAnnotation(NullableAnnotation.None));
-            }
-            else if (SymbolEqualityComparer.Default.Equals(attributeType, _symbolHolder.ValidateEnumeratedItemsAttributeSymbol))
-            {
-                var enumeratedType = GetEnumeratedType(memberType);
-                if (enumeratedType == null)
-                {
-                    Diag(DiagDescriptors.NotEnumerableType, attrLoc, memberType);
-                    speculate = false;
-                    continue;
-                }
-
-                enumeratedIsNullable = enumeratedType.IsReferenceType || enumeratedType.NullableAnnotation == NullableAnnotation.Annotated;
-                enumeratedIsValueType = enumeratedType.IsValueType;
-                enumeratedMayBeNull = enumeratedType.NullableAnnotation == NullableAnnotation.Annotated;
-
-                if (HasOpenGenerics(enumeratedType, out var genericType))
-                {
-                    Diag(DiagDescriptors.CantUseWithGenericTypes, attrLoc, genericType);
-                    speculate = false;
-                    continue;
-                }
-
-                if (attribute.ConstructorArguments.Length == 1)
-                {
-                    var enumerationValidatorType = attribute.ConstructorArguments[0].Value as INamedTypeSymbol;
-                    if (enumerationValidatorType != null)
-                    {
-                        if (CanValidate(enumerationValidatorType, enumeratedType))
-                        {
-                            if (enumerationValidatorType.Constructors.Where(c => c.Parameters.Length == 0).Any())
-                            {
-                                enumerationValidatorTypeName = enumerationValidatorType.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat);
-                            }
-                            else
-                            {
-                                Diag(DiagDescriptors.ValidatorsNeedSimpleConstructor, attrLoc, enumerationValidatorType.Name);
-                            }
-                        }
-                        else
-                        {
-                            Diag(DiagDescriptors.DoesntImplementIValidateOptions, attrLoc, enumerationValidatorType.Name, enumeratedType.Name);
-                        }
-                    }
-                    else
-                    {
-                        Diag(DiagDescriptors.NullValidatorType, attrLoc);
-                    }
-                }
-                else if (!_visitedModelTypes.Add(enumeratedType.WithNullableAnnotation(NullableAnnotation.None)))
-                {
-                    Diag(DiagDescriptors.CircularTypeReferences, attrLoc, enumeratedType.ToString());
-                    speculate = false;
-                    continue;
-                }
-
-                if (enumerationValidatorTypeName == null)
-                {
-                    enumerationValidatorIsSynthetic = true;
-                    enumerationValidatorTypeName = AddSynthesizedValidator(enumeratedType, member);
-                }
-
-                // pop the stack
-                _ = _visitedModelTypes.Remove(enumeratedType.WithNullableAnnotation(NullableAnnotation.None));
-            }
-            else if (DerivesFrom(attributeType, _symbolHolder.ValidationAttributeSymbol))
-            {
-                var validationAttr = new ValidationAttributeInfo(attributeType.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat));
-                validationAttrs.Add(validationAttr);
-
-                foreach (var constructorArgument in attribute.ConstructorArguments)
-                {
-                    validationAttr.ConstructorArguments.Add(GetArgumentExpression(constructorArgument.Type!, constructorArgument.Value));
-                }
-
-                foreach (var namedArgument in attribute.NamedArguments)
-                {
-                    validationAttr.Properties.Add(namedArgument.Key, GetArgumentExpression(namedArgument.Value.Type!, namedArgument.Value.Value));
-                }
-            }
-        }
-
-        // generate a warning if the field/property seems like it should be transitively validated
-        if (transValidatorTypeName == null && speculate && memberType.SpecialType == SpecialType.None)
-        {
-            if (!HasOpenGenerics(memberType, out var genericType))
-            {
-                var membersToValidate = GetMembersToValidate(memberType, false);
-                if (membersToValidate.Count > 0)
-                {
-                    Diag(DiagDescriptors.PotentiallyMissingTransitiveValidation, member.GetLocation(), memberType.Name, member.Name);
-                }
-            }
-        }
-
-        // generate a warning if the field/property seems like it should be enumerated
-        if (enumerationValidatorTypeName == null && speculate)
-        {
-            var enumeratedType = GetEnumeratedType(memberType);
-            if (enumeratedType != null)
-            {
-                if (!HasOpenGenerics(enumeratedType, out var genericType))
-                {
-                    var membersToValidate = GetMembersToValidate(enumeratedType, false);
-                    if (membersToValidate.Count > 0)
-                    {
-                        Diag(DiagDescriptors.PotentiallyMissingEnumerableValidation, member.GetLocation(), enumeratedType.Name, member.Name);
-                    }
-                }
-            }
-        }
-
-        if (validationAttrs.Count > 0 || transValidatorTypeName != null || enumerationValidatorTypeName != null)
-        {
-            return new(
-                member.Name,
-                validationAttrs,
-                transValidatorTypeName,
-                transValidatorIsSynthetic,
-                enumerationValidatorTypeName,
-                enumerationValidatorIsSynthetic,
-                memberType.IsReferenceType || memberType.NullableAnnotation == NullableAnnotation.Annotated,
-                memberType.IsValueType,
-                enumeratedIsNullable,
-                enumeratedIsValueType,
-                enumeratedMayBeNull);
-        }
-
-        return null;
-    }
-
-    private string? AddSynthesizedValidator(ITypeSymbol modelType, ISymbol member)
-    {
-        var mt = modelType.WithNullableAnnotation(NullableAnnotation.None);
-        if (mt.OriginalDefinition.SpecialType == SpecialType.System_Nullable_T)
-        {
-            // extract the T from a Nullable<T>
-            mt = ((INamedTypeSymbol)mt).TypeArguments[0];
-        }
-
-        if (_synthesizedValidators.TryGetValue(mt, out var validator))
-        {
-            return "global::" + validator.Namespace + "." + validator.Name;
-        }
-
-        var membersToValidate = GetMembersToValidate(mt, true);
-        if (membersToValidate.Count == 0)
-        {
-            // this type lacks any eligible members
-            Diag(DiagDescriptors.NoEligibleMember, member.GetLocation(), mt.ToString(), member.ToString());
-            return null;
-        }
-
-        var model = new ValidatedModel(
-            GetFQN(mt),
-            mt.Name,
-            false,
-            membersToValidate);
-
-        var validatorTypeName = "__" + mt.Name + "Validator__";
-
-        var result = new ValidatorType(
-            mt.ContainingNamespace.IsGlobalNamespace ? string.Empty : mt.ContainingNamespace.ToString(),
-            validatorTypeName,
-            validatorTypeName,
-            "class",
-            new List<string>(),
-            true,
-            new[] { model });
-
-        _synthesizedValidators[mt] = result;
-        return "global::" + (result.Namespace.Length > 0 ? result.Namespace + "." + result.Name : result.Name);
-    }
-
-    private bool DerivesFrom(ITypeSymbol source, ITypeSymbol dest)
-    {
-        var conversion = _compilation.ClassifyConversion(source, dest);
-        return conversion.IsReference && conversion.IsImplicit;
-    }
-
-    private bool ModelSelfValidates(ITypeSymbol modelType)
-    {
-        foreach (var implementingInterface in modelType.AllInterfaces)
-        {
-            if (SymbolEqualityComparer.Default.Equals(implementingInterface.OriginalDefinition, _symbolHolder.IValidatableObjectSymbol))
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    private List<ITypeSymbol> GetModelTypes(ITypeSymbol validatorType)
-    {
-        var result = new List<ITypeSymbol>();
-        foreach (var implementingInterface in validatorType.AllInterfaces)
-        {
-            if (SymbolEqualityComparer.Default.Equals(implementingInterface.OriginalDefinition, _symbolHolder.ValidateOptionsSymbol))
-            {
-                result.Add(implementingInterface.TypeArguments.First());
-            }
-        }
-
-        return result;
-    }
-
-    private bool CanValidate(ITypeSymbol validatorType, ISymbol modelType)
-    {
-        foreach (var implementingInterface in validatorType.AllInterfaces)
-        {
-            if (SymbolEqualityComparer.Default.Equals(implementingInterface.OriginalDefinition, _symbolHolder.ValidateOptionsSymbol))
-            {
-                var t = implementingInterface.TypeArguments.First();
-                if (SymbolEqualityComparer.Default.Equals(modelType, t))
-                {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    private string GetArgumentExpression(ITypeSymbol type, object? value)
-    {
-        if (value == null)
-        {
-            return "null";
-        }
-
-        if (type.SpecialType == SpecialType.System_Boolean)
-        {
-            return (bool)value ? "true" : "false";
-        }
-
-        if (SymbolEqualityComparer.Default.Equals(type, _symbolHolder.TypeSymbol) &&
-            value is INamedTypeSymbol sym)
-        {
-            return $"typeof({sym.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)})";
-        }
-
-        if (type.SpecialType == SpecialType.System_String)
-        {
-            return $@"""{EscapeString(value.ToString())}""";
-        }
-
-        if (type.SpecialType == SpecialType.System_Char)
-        {
-            return $@"'{EscapeString(value.ToString())}'";
-        }
-
-        return $"({type.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)}){Convert.ToString(value, CultureInfo.InvariantCulture)}";
-    }
-
-    private static readonly char[] _specialChars = { '\n', '\r', '"', '\\' };
-
-    private static string EscapeString(string s)
-    {
-        int index = s.IndexOfAny(_specialChars);
-        if (index < 0)
-        {
-            return s;
-        }
-
-        var sb = new StringBuilder(s.Length);
-        _ = sb.Append(s, 0, index);
-
-        while (index < s.Length)
-        {
-            _ = s[index] switch
-            {
-                '\n' => sb.Append("\\n"),
-                '\r' => sb.Append("\\r"),
-                '"' => sb.Append("\\\""),
-                '\\' => sb.Append("\\\\"),
-                var other => sb.Append(other),
-            };
-
-            index++;
-        }
-
-        return sb.ToString();
-    }
-
-    private void Diag(DiagnosticDescriptor desc, Location? location)
-    {
-        _reportDiagnostic(Diagnostic.Create(desc, location, Array.Empty<object?>()));
-    }
-
-    private void Diag(DiagnosticDescriptor desc, Location? location, params object?[]? messageArgs)
-    {
-        _reportDiagnostic(Diagnostic.Create(desc, location, messageArgs));
-    }
-}
diff --git a/src/Generators/Microsoft.Gen.OptionsValidation/Common/Resources.Designer.cs b/src/Generators/Microsoft.Gen.OptionsValidation/Common/Resources.Designer.cs
deleted file mode 100644
index 0ec5247cbb3..00000000000
--- a/src/Generators/Microsoft.Gen.OptionsValidation/Common/Resources.Designer.cs
+++ /dev/null
@@ -1,297 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Microsoft.Gen.OptionsValidation {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Gen.OptionsValidation.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Type {0} already implements the Validate method.
-        /// </summary>
-        internal static string AlreadyImplementsValidateMethodMessage {
-            get {
-                return ResourceManager.GetString("AlreadyImplementsValidateMethodMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to A type already includes an implementation of the `Validate` method.
-        /// </summary>
-        internal static string AlreadyImplementsValidateMethodTitle {
-            get {
-                return ResourceManager.GetString("AlreadyImplementsValidateMethodTitle", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to [OptionsValidator] cannot be applied to static class {0}.
-        /// </summary>
-        internal static string CantBeStaticClassMessage {
-            get {
-                return ResourceManager.GetString("CantBeStaticClassMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to `OptionsValidatorAttribute` can&apos;t be applied to a static class.
-        /// </summary>
-        internal static string CantBeStaticClassTitle {
-            get {
-                return ResourceManager.GetString("CantBeStaticClassTitle", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Can&apos;t use [ValidateObjectMembers] or [ValidateEnumeratedItems] on fields or properties with open generic type {0}.
-        /// </summary>
-        internal static string CantUseWithGenericTypesMessage {
-            get {
-                return ResourceManager.GetString("CantUseWithGenericTypesMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Can&apos;t use `ValidateObjectMembersAttribute` or `ValidateEnumeratedItemsAttribute` on fields or properties with open generic types.
-        /// </summary>
-        internal static string CantUseWithGenericTypesTitle {
-            get {
-                return ResourceManager.GetString("CantUseWithGenericTypesTitle", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to There is a circular type reference involving type {0} preventing it from being used for static validation.
-        /// </summary>
-        internal static string CircularTypeReferencesMessage {
-            get {
-                return ResourceManager.GetString("CircularTypeReferencesMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Unsupported circular references in model types.
-        /// </summary>
-        internal static string CircularTypeReferencesTitle {
-            get {
-                return ResourceManager.GetString("CircularTypeReferencesTitle", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Type {0} does not implement the required IValidateOptions&lt;{1}&gt; interface.
-        /// </summary>
-        internal static string DoesntImplementIValidateOptionsMessage {
-            get {
-                return ResourceManager.GetString("DoesntImplementIValidateOptionsMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to A type annotated with `OptionsValidatorAttribute` doesn&apos;t implement the necessary interface.
-        /// </summary>
-        internal static string DoesntImplementIValidateOptionsTitle {
-            get {
-                return ResourceManager.GetString("DoesntImplementIValidateOptionsTitle", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Can&apos;t apply validation attributes to private field or property {0}.
-        /// </summary>
-        internal static string MemberIsInaccessibleMessage {
-            get {
-                return ResourceManager.GetString("MemberIsInaccessibleMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Can&apos;t validate private fields or properties.
-        /// </summary>
-        internal static string MemberIsInaccessibleTitle {
-            get {
-                return ResourceManager.GetString("MemberIsInaccessibleTitle", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Type {0} has no fields or properties to validate, referenced from member {1}.
-        /// </summary>
-        internal static string NoEligibleMemberMessage {
-            get {
-                return ResourceManager.GetString("NoEligibleMemberMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Type {0} has no fields or properties to validate, referenced by type {1}.
-        /// </summary>
-        internal static string NoEligibleMembersFromValidatorMessage {
-            get {
-                return ResourceManager.GetString("NoEligibleMembersFromValidatorMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to A type has no fields or properties to validate.
-        /// </summary>
-        internal static string NoEligibleMembersFromValidatorTitle {
-            get {
-                return ResourceManager.GetString("NoEligibleMembersFromValidatorTitle", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to A member type has no fields or properties to validate.
-        /// </summary>
-        internal static string NoEligibleMemberTitle {
-            get {
-                return ResourceManager.GetString("NoEligibleMemberTitle", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to [ValidateEnumeratedItems] cannot be used on members of type {0} as it doesn&apos;t implement IEnumerable&lt;T&gt;.
-        /// </summary>
-        internal static string NotEnumerableTypeMessage {
-            get {
-                return ResourceManager.GetString("NotEnumerableTypeMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Member type is not enumerable.
-        /// </summary>
-        internal static string NotEnumerableTypeTitle {
-            get {
-                return ResourceManager.GetString("NotEnumerableTypeTitle", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Null validator type specified in [ValidateObjectMembers] or [ValidateEnumeratedItems] attributes.
-        /// </summary>
-        internal static string NullValidatorTypeMessage {
-            get {
-                return ResourceManager.GetString("NullValidatorTypeMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Null validator type specified for the `ValidateObjectMembersAttribute` or `ValidateEnumeratedItemsAttribute` attributes.
-        /// </summary>
-        internal static string NullValidatorTypeTitle {
-            get {
-                return ResourceManager.GetString("NullValidatorTypeTitle", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Type {0} has validation annotations, but member {1} doesn&apos;t specify [ValidateEnumeratedItems] which could be an oversight.
-        /// </summary>
-        internal static string PotentiallyMissingEnumerableValidationMessage {
-            get {
-                return ResourceManager.GetString("PotentiallyMissingEnumerableValidationMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Member potentially missing enumerable validation.
-        /// </summary>
-        internal static string PotentiallyMissingEnumerableValidationTitle {
-            get {
-                return ResourceManager.GetString("PotentiallyMissingEnumerableValidationTitle", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Type {0} has validation annotations, but member {1} doesn&apos;t specify [ValidateObjectMembers] which could be an oversight.
-        /// </summary>
-        internal static string PotentiallyMissingTransitiveValidationMessage {
-            get {
-                return ResourceManager.GetString("PotentiallyMissingTransitiveValidationMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Member potentially missing transitive validation.
-        /// </summary>
-        internal static string PotentiallyMissingTransitiveValidationTitle {
-            get {
-                return ResourceManager.GetString("PotentiallyMissingTransitiveValidationTitle", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Validator type {0} doesn&apos;t have a parameterless constructor.
-        /// </summary>
-        internal static string ValidatorsNeedSimpleConstructorMessage {
-            get {
-                return ResourceManager.GetString("ValidatorsNeedSimpleConstructorMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Validators used for transitive or enumerable validation must have a constructor with no parameters.
-        /// </summary>
-        internal static string ValidatorsNeedSimpleConstructorTitle {
-            get {
-                return ResourceManager.GetString("ValidatorsNeedSimpleConstructorTitle", resourceCulture);
-            }
-        }
-    }
-}
diff --git a/src/Generators/Microsoft.Gen.OptionsValidation/Common/Resources.resx b/src/Generators/Microsoft.Gen.OptionsValidation/Common/Resources.resx
deleted file mode 100644
index d9bae1523ae..00000000000
--- a/src/Generators/Microsoft.Gen.OptionsValidation/Common/Resources.resx
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="AlreadyImplementsValidateMethodMessage" xml:space="preserve">
-    <value>Type {0} already implements the Validate method</value>
-  </data>
-  <data name="AlreadyImplementsValidateMethodTitle" xml:space="preserve">
-    <value>A type already includes an implementation of the `Validate` method</value>
-  </data>
-  <data name="CantBeStaticClassMessage" xml:space="preserve">
-    <value>[OptionsValidator] cannot be applied to static class {0}</value>
-  </data>
-  <data name="CantBeStaticClassTitle" xml:space="preserve">
-    <value>`OptionsValidatorAttribute` can't be applied to a static class</value>
-  </data>
-  <data name="CantUseWithGenericTypesMessage" xml:space="preserve">
-    <value>Can't use [ValidateObjectMembers] or [ValidateEnumeratedItems] on fields or properties with open generic type {0}</value>
-  </data>
-  <data name="CantUseWithGenericTypesTitle" xml:space="preserve">
-    <value>Can't use `ValidateObjectMembersAttribute` or `ValidateEnumeratedItemsAttribute` on fields or properties with open generic types</value>
-  </data>
-  <data name="CircularTypeReferencesMessage" xml:space="preserve">
-    <value>There is a circular type reference involving type {0} preventing it from being used for static validation</value>
-  </data>
-  <data name="CircularTypeReferencesTitle" xml:space="preserve">
-    <value>Unsupported circular references in model types</value>
-  </data>
-  <data name="DoesntImplementIValidateOptionsMessage" xml:space="preserve">
-    <value>Type {0} does not implement the required IValidateOptions&lt;{1}&gt; interface</value>
-  </data>
-  <data name="DoesntImplementIValidateOptionsTitle" xml:space="preserve">
-    <value>A type annotated with `OptionsValidatorAttribute` doesn't implement the necessary interface</value>
-  </data>
-  <data name="MemberIsInaccessibleMessage" xml:space="preserve">
-    <value>Can't apply validation attributes to private field or property {0}</value>
-  </data>
-  <data name="MemberIsInaccessibleTitle" xml:space="preserve">
-    <value>Can't validate private fields or properties</value>
-  </data>
-  <data name="NoEligibleMemberMessage" xml:space="preserve">
-    <value>Type {0} has no fields or properties to validate, referenced from member {1}</value>
-  </data>
-  <data name="NoEligibleMembersFromValidatorMessage" xml:space="preserve">
-    <value>Type {0} has no fields or properties to validate, referenced by type {1}</value>
-  </data>
-  <data name="NoEligibleMembersFromValidatorTitle" xml:space="preserve">
-    <value>A type has no fields or properties to validate</value>
-  </data>
-  <data name="NoEligibleMemberTitle" xml:space="preserve">
-    <value>A member type has no fields or properties to validate</value>
-  </data>
-  <data name="NotEnumerableTypeMessage" xml:space="preserve">
-    <value>[ValidateEnumeratedItems] cannot be used on members of type {0} as it doesn't implement IEnumerable&lt;T&gt;</value>
-  </data>
-  <data name="NotEnumerableTypeTitle" xml:space="preserve">
-    <value>Member type is not enumerable</value>
-  </data>
-  <data name="NullValidatorTypeMessage" xml:space="preserve">
-    <value>Null validator type specified in [ValidateObjectMembers] or [ValidateEnumeratedItems] attributes</value>
-  </data>
-  <data name="NullValidatorTypeTitle" xml:space="preserve">
-    <value>Null validator type specified for the `ValidateObjectMembersAttribute` or `ValidateEnumeratedItemsAttribute` attributes</value>
-  </data>
-  <data name="PotentiallyMissingEnumerableValidationMessage" xml:space="preserve">
-    <value>Type {0} has validation annotations, but member {1} doesn't specify [ValidateEnumeratedItems] which could be an oversight</value>
-  </data>
-  <data name="PotentiallyMissingEnumerableValidationTitle" xml:space="preserve">
-    <value>Member potentially missing enumerable validation</value>
-  </data>
-  <data name="PotentiallyMissingTransitiveValidationMessage" xml:space="preserve">
-    <value>Type {0} has validation annotations, but member {1} doesn't specify [ValidateObjectMembers] which could be an oversight</value>
-  </data>
-  <data name="PotentiallyMissingTransitiveValidationTitle" xml:space="preserve">
-    <value>Member potentially missing transitive validation</value>
-  </data>
-  <data name="ValidatorsNeedSimpleConstructorMessage" xml:space="preserve">
-    <value>Validator type {0} doesn't have a parameterless constructor</value>
-  </data>
-  <data name="ValidatorsNeedSimpleConstructorTitle" xml:space="preserve">
-    <value>Validators used for transitive or enumerable validation must have a constructor with no parameters</value>
-  </data>
-</root>
diff --git a/src/Generators/Microsoft.Gen.OptionsValidation/Common/SymbolHolder.cs b/src/Generators/Microsoft.Gen.OptionsValidation/Common/SymbolHolder.cs
deleted file mode 100644
index 02d8deb9cd4..00000000000
--- a/src/Generators/Microsoft.Gen.OptionsValidation/Common/SymbolHolder.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Microsoft.CodeAnalysis;
-
-namespace Microsoft.Gen.OptionsValidation;
-
-/// <summary>
-/// Holds required symbols for the <see cref="Generator"/>.
-/// </summary>
-internal sealed record class SymbolHolder(
-    INamedTypeSymbol OptionsValidatorSymbol,
-    INamedTypeSymbol ValidationAttributeSymbol,
-    INamedTypeSymbol DataTypeAttributeSymbol,
-    INamedTypeSymbol ValidateOptionsSymbol,
-    INamedTypeSymbol IValidatableObjectSymbol,
-    INamedTypeSymbol TypeSymbol,
-    INamedTypeSymbol? LegacyValidateTransitivelyAttributeSymbol,
-    INamedTypeSymbol? ValidateObjectMembersAttributeSymbol,
-    INamedTypeSymbol? ValidateEnumeratedItemsAttributeSymbol);
diff --git a/src/Generators/Microsoft.Gen.OptionsValidation/Common/SymbolLoader.cs b/src/Generators/Microsoft.Gen.OptionsValidation/Common/SymbolLoader.cs
deleted file mode 100644
index 8b365c7f68a..00000000000
--- a/src/Generators/Microsoft.Gen.OptionsValidation/Common/SymbolLoader.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Microsoft.CodeAnalysis;
-
-namespace Microsoft.Gen.OptionsValidation;
-
-internal static class SymbolLoader
-{
-    public const string OptionsValidatorAttribute = "Microsoft.Extensions.Options.Validation.OptionsValidatorAttribute";
-    internal const string ValidationAttribute = "System.ComponentModel.DataAnnotations.ValidationAttribute";
-    internal const string DataTypeAttribute = "System.ComponentModel.DataAnnotations.DataTypeAttribute";
-    internal const string IValidatableObjectType = "System.ComponentModel.DataAnnotations.IValidatableObject";
-    internal const string IValidateOptionsType = "Microsoft.Extensions.Options.IValidateOptions`1";
-    internal const string TypeOfType = "System.Type";
-    internal const string LegacyValidateTransitivelyAttribute = "Microsoft.Extensions.Data.Validation.ValidateTransitivelyObjectMembersAttribute";
-    internal const string ValidateObjectMembersAttribute = "Microsoft.Extensions.Options.Validation.ValidateObjectMembersAttribute";
-    internal const string ValidateEnumeratedItemsAttribute = "Microsoft.Extensions.Options.Validation.ValidateEnumeratedItemsAttribute";
-
-    public static bool TryLoad(Compilation compilation, out SymbolHolder? symbolHolder)
-    {
-        INamedTypeSymbol? GetSymbol(string metadataName, bool optional = false)
-        {
-            var symbol = compilation.GetTypeByMetadataName(metadataName);
-            if (symbol == null && !optional)
-            {
-                return null;
-            }
-
-            return symbol;
-        }
-
-        // required
-        var optionsValidatorSymbol = GetSymbol(OptionsValidatorAttribute);
-        var validationAttributeSymbol = GetSymbol(ValidationAttribute);
-        var dataTypeAttributeSymbol = GetSymbol(DataTypeAttribute);
-        var ivalidatableObjectSymbol = GetSymbol(IValidatableObjectType);
-        var validateOptionsSymbol = GetSymbol(IValidateOptionsType);
-        var typeSymbol = GetSymbol(TypeOfType);
-
-#pragma warning disable S1067 // Expressions should not be too complex
-        if (optionsValidatorSymbol == null ||
-            validationAttributeSymbol == null ||
-            dataTypeAttributeSymbol == null ||
-            ivalidatableObjectSymbol == null ||
-            validateOptionsSymbol == null ||
-            typeSymbol == null)
-        {
-            symbolHolder = default;
-            return false;
-        }
-#pragma warning restore S1067 // Expressions should not be too complex
-
-        symbolHolder = new(
-            optionsValidatorSymbol,
-            validationAttributeSymbol,
-            dataTypeAttributeSymbol,
-            validateOptionsSymbol,
-            ivalidatableObjectSymbol,
-            typeSymbol,
-
-            // optional
-            GetSymbol(LegacyValidateTransitivelyAttribute, optional: true),
-            GetSymbol(ValidateObjectMembersAttribute, optional: true),
-            GetSymbol(ValidateEnumeratedItemsAttribute, optional: true));
-
-        return true;
-    }
-}
diff --git a/src/Generators/Microsoft.Gen.OptionsValidation/Directory.Build.props b/src/Generators/Microsoft.Gen.OptionsValidation/Directory.Build.props
deleted file mode 100644
index 882655d5161..00000000000
--- a/src/Generators/Microsoft.Gen.OptionsValidation/Directory.Build.props
+++ /dev/null
@@ -1,33 +0,0 @@
-<Project>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
-
-  <PropertyGroup>
-    <RootNamespace>Microsoft.Gen.OptionsValidation</RootNamespace>
-    <Description>Code generator to support Microsoft.Extensions.Options.Validation.</Description>
-    <Workstream>Fundamentals</Workstream>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <AnalyzerLanguage>cs</AnalyzerLanguage>
-    <InjectIsExternalInitOnLegacy>true</InjectIsExternalInitOnLegacy>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="..\Common\**\*.cs" />
-    <Compile Include="..\..\Shared\*.cs" LinkBase="Shared" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="..\Common\Resources.resx" Link="Resources.resx" Generator="ResXFileCodeGenerator" LastGenOutput="Resources.Designer.cs" CustomToolNamespace="Microsoft.Gen.OptionsValidation" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <InternalsVisibleToTest Include="Microsoft.Gen.OptionsValidation.Roslyn$(AnalyzerRoslynVersion).Unit.Tests" />
-    <InternalsVisibleToTest Include="Microsoft.Gen.OptionsValidation.Roslyn$(AnalyzerRoslynVersion).Generated.Tests" />
-  </ItemGroup>
-</Project>
diff --git a/src/Generators/Microsoft.Gen.OptionsValidation/Roslyn3.8/Microsoft.Gen.OptionsValidation.Roslyn3.8.csproj b/src/Generators/Microsoft.Gen.OptionsValidation/Roslyn3.8/Microsoft.Gen.OptionsValidation.Roslyn3.8.csproj
deleted file mode 100644
index e1ef356a7da..00000000000
--- a/src/Generators/Microsoft.Gen.OptionsValidation/Roslyn3.8/Microsoft.Gen.OptionsValidation.Roslyn3.8.csproj
+++ /dev/null
@@ -1,28 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <AssemblyName>Microsoft.Gen.OptionsValidation</AssemblyName>
-    <AnalyzerRoslynVersion>3.8</AnalyzerRoslynVersion>
-    <RoslynApiVersion>$(MicrosoftCodeAnalysisVersion_3_8)</RoslynApiVersion>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <Stage>normal</Stage>
-    <MinCodeCoverage>94</MinCodeCoverage>
-    <TempMinCodeCoverage>85</TempMinCodeCoverage>
-    <MinMutationScore>85</MinMutationScore>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Update="..\Common\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageVersion Update="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.8.0" />
-    <PackageVersion Update="Microsoft.CodeAnalysis.CSharp" Version="3.8.0" />
-    <PackageVersion Update="Microsoft.CodeAnalysis" Version="3.8.0" />
-  </ItemGroup>
-</Project>
diff --git a/src/Generators/Microsoft.Gen.OptionsValidation/Roslyn4.0/Microsoft.Gen.OptionsValidation.Roslyn4.0.csproj b/src/Generators/Microsoft.Gen.OptionsValidation/Roslyn4.0/Microsoft.Gen.OptionsValidation.Roslyn4.0.csproj
deleted file mode 100644
index 69d0da6a100..00000000000
--- a/src/Generators/Microsoft.Gen.OptionsValidation/Roslyn4.0/Microsoft.Gen.OptionsValidation.Roslyn4.0.csproj
+++ /dev/null
@@ -1,29 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <AssemblyName>Microsoft.Gen.OptionsValidation</AssemblyName>
-    <AnalyzerRoslynVersion>4.0</AnalyzerRoslynVersion>
-    <RoslynApiVersion>$(MicrosoftCodeAnalysisVersion_4_0)</RoslynApiVersion>
-    <DefineConstants>$(DefineConstants);ROSLYN_4_0_OR_GREATER</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <Stage>normal</Stage>
-    <MinCodeCoverage>94</MinCodeCoverage>
-    <TempMinCodeCoverage>85</TempMinCodeCoverage>
-    <MinMutationScore>50</MinMutationScore>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Update="..\Common\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageVersion Update="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.1" />
-    <PackageVersion Update="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" />
-    <PackageVersion Update="Microsoft.CodeAnalysis" Version="4.0.1" />
-  </ItemGroup>
-</Project>
diff --git a/src/LegacySupport/ExperimentalAttribute/ExperimentalAttribute.cs b/src/LegacySupport/ExperimentalAttribute/ExperimentalAttribute.cs
index 6d7d44a95f8..af31c0f8151 100644
--- a/src/LegacySupport/ExperimentalAttribute/ExperimentalAttribute.cs
+++ b/src/LegacySupport/ExperimentalAttribute/ExperimentalAttribute.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.
 
+#if !NET8_0_OR_GREATER
+
 namespace System.Diagnostics.CodeAnalysis;
 
 /// <summary>
@@ -24,30 +26,31 @@ internal sealed class ExperimentalAttribute : Attribute
     /// <summary>
     /// Initializes a new instance of the <see cref="ExperimentalAttribute"/> class.
     /// </summary>
-    public ExperimentalAttribute()
+    /// <param name="diagnosticId">Human readable explanation for marking experimental API.</param>
+    public ExperimentalAttribute(string diagnosticId)
     {
-        // Intentionally left empty.
+        DiagnosticId = diagnosticId;
     }
 
     /// <summary>
-    /// Initializes a new instance of the <see cref="ExperimentalAttribute"/> class.
+    ///  Gets the ID that the compiler will use when reporting a use of the API the attribute applies to.
     /// </summary>
-    /// <param name="message">Human readable explanation for marking experimental API.</param>
-    public ExperimentalAttribute(string message)
-    {
-#pragma warning disable R9A014 // Use the 'Microsoft.Extensions.Diagnostics.Throws' class instead of explicitly throwing exception for improved performance
-#pragma warning disable R9A039 // Remove superfluous null check when compiling in a nullable context
-#pragma warning disable R9A060 // Consider removing unnecessary null coalescing (??) since the left-hand value is statically known not to be null
-#pragma warning disable SA1101 // Prefix local calls with this
-        Message = message ?? throw new ArgumentNullException(nameof(message));
-#pragma warning restore SA1101 // Prefix local calls with this
-#pragma warning restore R9A060 // Consider removing unnecessary null coalescing (??) since the left-hand value is statically known not to be null
-#pragma warning restore R9A039 // Remove superfluous null check when compiling in a nullable context
-#pragma warning restore R9A014 // Use the 'Microsoft.Extensions.Diagnostics.Throws' class instead of explicitly throwing exception for improved performance
-    }
+    /// <value>The unique diagnostic ID.</value>
+    /// <remarks>
+    ///  The diagnostic ID is shown in build output for warnings and errors.
+    ///  <para>This property represents the unique ID that can be used to suppress the warnings or errors, if needed.</para>
+    /// </remarks>
+    public string DiagnosticId { get; }
 
     /// <summary>
-    /// Gets a human readable explanation for marking API as experimental.
+    ///  Gets or sets the URL for corresponding documentation.
+    ///  The API accepts a format string instead of an actual URL, creating a generic URL that includes the diagnostic ID.
     /// </summary>
-    public string? Message { get; }
+    /// <value>The format string that represents a URL to corresponding documentation.</value>
+    /// <remarks>An example format string is <c>https://contoso.com/obsoletion-warnings/{0}</c>.</remarks>
+#pragma warning disable S3996 // URI properties should not be strings
+    public string? UrlFormat { get; set; }
+#pragma warning restore S3996 // URI properties should not be strings
 }
+
+#endif
diff --git a/src/Libraries/Microsoft.AspNetCore.ConnectionTimeout/Microsoft.AspNetCore.ConnectionTimeout.csproj b/src/Libraries/Microsoft.AspNetCore.ConnectionTimeout/Microsoft.AspNetCore.ConnectionTimeout.csproj
index e9d691fe350..56c24014a2c 100644
--- a/src/Libraries/Microsoft.AspNetCore.ConnectionTimeout/Microsoft.AspNetCore.ConnectionTimeout.csproj
+++ b/src/Libraries/Microsoft.AspNetCore.ConnectionTimeout/Microsoft.AspNetCore.ConnectionTimeout.csproj
@@ -23,7 +23,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.Extensions.Options.Validation\Microsoft.Extensions.Options.Validation.csproj" />
     <ProjectReference Include="..\..\ToBeRemoved\Options.ValidateOnStart\Options.ValidateOnStart.csproj" />
   </ItemGroup>
 
diff --git a/src/Libraries/Microsoft.AspNetCore.HeaderParsing/HeaderParsingOptionsValidator.cs b/src/Libraries/Microsoft.AspNetCore.HeaderParsing/HeaderParsingOptionsValidator.cs
index 0e46ce7a346..772c1d7061d 100644
--- a/src/Libraries/Microsoft.AspNetCore.HeaderParsing/HeaderParsingOptionsValidator.cs
+++ b/src/Libraries/Microsoft.AspNetCore.HeaderParsing/HeaderParsingOptionsValidator.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
 
 namespace Microsoft.AspNetCore.HeaderParsing;
 
diff --git a/src/Libraries/Microsoft.AspNetCore.HeaderParsing/Microsoft.AspNetCore.HeaderParsing.csproj b/src/Libraries/Microsoft.AspNetCore.HeaderParsing/Microsoft.AspNetCore.HeaderParsing.csproj
index 80a4d8bb74e..af2b631d905 100644
--- a/src/Libraries/Microsoft.AspNetCore.HeaderParsing/Microsoft.AspNetCore.HeaderParsing.csproj
+++ b/src/Libraries/Microsoft.AspNetCore.HeaderParsing/Microsoft.AspNetCore.HeaderParsing.csproj
@@ -8,7 +8,6 @@
 
   <PropertyGroup>
     <UseLoggingGenerator>true</UseLoggingGenerator>
-    <UseOptionsValidationGenerator>true</UseOptionsValidationGenerator>
     <UseMeteringGenerator>true</UseMeteringGenerator>
     <InjectExperimentalAttributeOnLegacy>true</InjectExperimentalAttributeOnLegacy>
     <InjectGetOrAddOnLegacy>true</InjectGetOrAddOnLegacy>
@@ -23,7 +22,6 @@
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.Extensions.Telemetry.Abstractions\Microsoft.Extensions.Telemetry.Abstractions.csproj" />
     <ProjectReference Include="..\Microsoft.Extensions.ObjectPool.DependencyInjection\Microsoft.Extensions.ObjectPool.DependencyInjection.csproj" />
-    <ProjectReference Include="..\Microsoft.Extensions.Options.Validation\Microsoft.Extensions.Options.Validation.csproj" />
     <ProjectReference Include="..\..\ToBeRemoved\Options.ValidateOnStart\Options.ValidateOnStart.csproj" />
   </ItemGroup>
 
diff --git a/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/Internal/RequestLatencyTelemetryOptionsValidator.cs b/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/Internal/RequestLatencyTelemetryOptionsValidator.cs
index 02665354649..ddfe44114dd 100644
--- a/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/Internal/RequestLatencyTelemetryOptionsValidator.cs
+++ b/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Latency/Internal/RequestLatencyTelemetryOptionsValidator.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
 
 namespace Microsoft.AspNetCore.Telemetry.Internal;
 
diff --git a/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/Internal/LoggingOptionsValidator.cs b/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/Internal/LoggingOptionsValidator.cs
index 851a41a3c8e..2cb7f021047 100644
--- a/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/Internal/LoggingOptionsValidator.cs
+++ b/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/Internal/LoggingOptionsValidator.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
 
 namespace Microsoft.AspNetCore.Telemetry.Http.Logging;
 
diff --git a/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/LoggingOptions.cs b/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/LoggingOptions.cs
index 9eb5339d5c9..5085a820bad 100644
--- a/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/LoggingOptions.cs
+++ b/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Logging/LoggingOptions.cs
@@ -67,7 +67,7 @@ public class LoggingOptions
     /// <value>
     /// The default value is <see cref="HttpRouteParameterRedactionMode.Strict"/>.
     /// </value>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public HttpRouteParameterRedactionMode RequestPathParameterRedactionMode { get; set; } = DefaultPathParameterRedactionMode;
 
     /// <summary>
@@ -208,7 +208,7 @@ public class LoggingOptions
     /// };
     /// </code>
     /// </example>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     [Required]
     [SuppressMessage("Usage", "CA2227:Collection properties should be read only",
         Justification = "Options pattern.")]
diff --git a/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Microsoft.AspNetCore.Telemetry.Middleware.csproj b/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Microsoft.AspNetCore.Telemetry.Middleware.csproj
index 94d8909aa14..97bb0654713 100644
--- a/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Microsoft.AspNetCore.Telemetry.Middleware.csproj
+++ b/src/Libraries/Microsoft.AspNetCore.Telemetry.Middleware/Microsoft.AspNetCore.Telemetry.Middleware.csproj
@@ -8,7 +8,6 @@
 
   <PropertyGroup>
     <TargetFrameworks>$(NetCoreTargetFrameworks)</TargetFrameworks>
-    <UseOptionsValidationGenerator>true</UseOptionsValidationGenerator>
     <UseLoggingGenerator>true</UseLoggingGenerator>
     <UseMeteringGenerator>true</UseMeteringGenerator>
     <InjectSharedThrow>false</InjectSharedThrow>
@@ -29,7 +28,6 @@
   <ItemGroup>
     <ProjectReference Include="..\..\ToBeMoved\DependencyInjection.AutoActivation\DependencyInjection.AutoActivation.csproj" />
     <ProjectReference Include="..\Microsoft.Extensions.Compliance.Abstractions\Microsoft.Extensions.Compliance.Abstractions.csproj" />
-    <ProjectReference Include="..\Microsoft.Extensions.Options.Validation\Microsoft.Extensions.Options.Validation.csproj" />
     <ProjectReference Include="..\Microsoft.Extensions.Telemetry.Abstractions\Microsoft.Extensions.Telemetry.Abstractions.csproj" />
     <ProjectReference Include="..\Microsoft.AspNetCore.Telemetry\Microsoft.AspNetCore.Telemetry.csproj" />
   </ItemGroup>
diff --git a/src/Libraries/Microsoft.AspNetCore.Telemetry/Enrichment.RequestHeaders/RequestHeadersEnricherExtensions.cs b/src/Libraries/Microsoft.AspNetCore.Telemetry/Enrichment.RequestHeaders/RequestHeadersEnricherExtensions.cs
index 5e55a98f1c7..fb01da4fba3 100644
--- a/src/Libraries/Microsoft.AspNetCore.Telemetry/Enrichment.RequestHeaders/RequestHeadersEnricherExtensions.cs
+++ b/src/Libraries/Microsoft.AspNetCore.Telemetry/Enrichment.RequestHeaders/RequestHeadersEnricherExtensions.cs
@@ -5,6 +5,7 @@
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Options.Validation;
 using Microsoft.Extensions.Telemetry.Enrichment;
 using Microsoft.Shared.Diagnostics;
diff --git a/src/Libraries/Microsoft.AspNetCore.Telemetry/Enrichment.RequestHeaders/RequestHeadersLogEnricherOptions.cs b/src/Libraries/Microsoft.AspNetCore.Telemetry/Enrichment.RequestHeaders/RequestHeadersLogEnricherOptions.cs
index 1f46f1d898a..eaf16a28132 100644
--- a/src/Libraries/Microsoft.AspNetCore.Telemetry/Enrichment.RequestHeaders/RequestHeadersLogEnricherOptions.cs
+++ b/src/Libraries/Microsoft.AspNetCore.Telemetry/Enrichment.RequestHeaders/RequestHeadersLogEnricherOptions.cs
@@ -20,7 +20,7 @@ public class RequestHeadersLogEnricherOptions
     /// Default value is an empty dictionary.
     /// </remarks>
     [Required]
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
 #pragma warning disable CA2227 // Collection properties should be read only
     public IDictionary<string, DataClassification> HeadersDataClasses { get; set; } = new Dictionary<string, DataClassification>();
 #pragma warning restore CA2227 // Collection properties should be read only
diff --git a/src/Libraries/Microsoft.AspNetCore.Telemetry/Enrichment.RequestHeaders/RequestHeadersLogEnricherOptionsValidator.cs b/src/Libraries/Microsoft.AspNetCore.Telemetry/Enrichment.RequestHeaders/RequestHeadersLogEnricherOptionsValidator.cs
index 43213594e43..86e322270ac 100644
--- a/src/Libraries/Microsoft.AspNetCore.Telemetry/Enrichment.RequestHeaders/RequestHeadersLogEnricherOptionsValidator.cs
+++ b/src/Libraries/Microsoft.AspNetCore.Telemetry/Enrichment.RequestHeaders/RequestHeadersLogEnricherOptionsValidator.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
 
 namespace Microsoft.AspNetCore.Telemetry;
 
diff --git a/src/Libraries/Microsoft.AspNetCore.Telemetry/Microsoft.AspNetCore.Telemetry.csproj b/src/Libraries/Microsoft.AspNetCore.Telemetry/Microsoft.AspNetCore.Telemetry.csproj
index 94f50e5b3a5..ab52ba161bf 100644
--- a/src/Libraries/Microsoft.AspNetCore.Telemetry/Microsoft.AspNetCore.Telemetry.csproj
+++ b/src/Libraries/Microsoft.AspNetCore.Telemetry/Microsoft.AspNetCore.Telemetry.csproj
@@ -8,7 +8,6 @@
 
   <PropertyGroup>
     <UseLoggingGenerator>true</UseLoggingGenerator>
-    <UseOptionsValidationGenerator>true</UseOptionsValidationGenerator>
     <InjectExperimentalAttributeOnLegacy>false</InjectExperimentalAttributeOnLegacy>
     <InjectTrimAttributesOnLegacy>false</InjectTrimAttributesOnLegacy>
     <InjectDiagnosticAttributesOnLegacy>false</InjectDiagnosticAttributesOnLegacy>
diff --git a/src/Libraries/Microsoft.AspNetCore.Telemetry/Tracing/HttpTracingExtensions.cs b/src/Libraries/Microsoft.AspNetCore.Telemetry/Tracing/HttpTracingExtensions.cs
index 0a2eaef5181..24f72a1ef9b 100644
--- a/src/Libraries/Microsoft.AspNetCore.Telemetry/Tracing/HttpTracingExtensions.cs
+++ b/src/Libraries/Microsoft.AspNetCore.Telemetry/Tracing/HttpTracingExtensions.cs
@@ -116,7 +116,7 @@ public static TracerProviderBuilder AddHttpTraceEnricher(this TracerProviderBuil
     /// <param name="services">The <see cref="IServiceCollection"/> to add this enricher.</param>
     /// <returns><see cref="IServiceCollection"/> for chaining.</returns>
     /// <exception cref="ArgumentNullException">The argument <paramref name="services"/> is <see langword="null"/>.</exception>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public static IServiceCollection AddHttpTraceEnricher<T>(this IServiceCollection services)
         where T : class, IHttpTraceEnricher
     {
@@ -132,7 +132,7 @@ public static IServiceCollection AddHttpTraceEnricher<T>(this IServiceCollection
     /// <param name="enricher">Enricher to be added.</param>
     /// <returns><see cref="TracerProviderBuilder"/> for chaining.</returns>
     /// <exception cref="ArgumentNullException">The argument <paramref name="services"/> or <paramref name="enricher"/> is <see langword="null" />.</exception>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public static IServiceCollection AddHttpTraceEnricher(this IServiceCollection services, IHttpTraceEnricher enricher)
     {
         _ = Throw.IfNull(services);
diff --git a/src/Libraries/Microsoft.AspNetCore.Telemetry/Tracing/HttpTracingOptions.cs b/src/Libraries/Microsoft.AspNetCore.Telemetry/Tracing/HttpTracingOptions.cs
index baf648ebaf6..1b4f1d8a5a6 100644
--- a/src/Libraries/Microsoft.AspNetCore.Telemetry/Tracing/HttpTracingOptions.cs
+++ b/src/Libraries/Microsoft.AspNetCore.Telemetry/Tracing/HttpTracingOptions.cs
@@ -51,7 +51,7 @@ public class HttpTracingOptions
     /// <remarks>
     /// This property is applicable when the <see cref="IncludePath"/> option is enabled.
     /// </remarks>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public HttpRouteParameterRedactionMode RequestPathParameterRedactionMode { get; set; } = DefaultPathParameterRedactionMode;
 
     /// <summary>
diff --git a/src/Libraries/Microsoft.AspNetCore.Telemetry/Tracing/Internal/HttpTracingOptionsValidator.cs b/src/Libraries/Microsoft.AspNetCore.Telemetry/Tracing/Internal/HttpTracingOptionsValidator.cs
index 5a7146850a4..69bb8139805 100644
--- a/src/Libraries/Microsoft.AspNetCore.Telemetry/Tracing/Internal/HttpTracingOptionsValidator.cs
+++ b/src/Libraries/Microsoft.AspNetCore.Telemetry/Tracing/Internal/HttpTracingOptionsValidator.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
 
 namespace Microsoft.AspNetCore.Telemetry.Internal;
 
diff --git a/src/Libraries/Microsoft.Extensions.AmbientMetadata.Application/ApplicationMetadataValidator.cs b/src/Libraries/Microsoft.Extensions.AmbientMetadata.Application/ApplicationMetadataValidator.cs
index cf8e27ded88..8a129d03b8a 100644
--- a/src/Libraries/Microsoft.Extensions.AmbientMetadata.Application/ApplicationMetadataValidator.cs
+++ b/src/Libraries/Microsoft.Extensions.AmbientMetadata.Application/ApplicationMetadataValidator.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
 
 namespace Microsoft.Extensions.AmbientMetadata;
 
diff --git a/src/Libraries/Microsoft.Extensions.AmbientMetadata.Application/Microsoft.Extensions.AmbientMetadata.Application.csproj b/src/Libraries/Microsoft.Extensions.AmbientMetadata.Application/Microsoft.Extensions.AmbientMetadata.Application.csproj
index 0aaa9620fba..7d860c650ba 100644
--- a/src/Libraries/Microsoft.Extensions.AmbientMetadata.Application/Microsoft.Extensions.AmbientMetadata.Application.csproj
+++ b/src/Libraries/Microsoft.Extensions.AmbientMetadata.Application/Microsoft.Extensions.AmbientMetadata.Application.csproj
@@ -5,10 +5,6 @@
     <Workstream>Fundamentals</Workstream>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <UseOptionsValidationGenerator>true</UseOptionsValidationGenerator>
-  </PropertyGroup>
-
   <PropertyGroup>
     <Stage>normal</Stage>
     <MinCodeCoverage>100</MinCodeCoverage>
@@ -16,7 +12,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.Extensions.Options.Validation\Microsoft.Extensions.Options.Validation.csproj" />
     <ProjectReference Include="..\..\ToBeRemoved\Options.ValidateOnStart\Options.ValidateOnStart.csproj" />
   </ItemGroup>
 
diff --git a/src/Libraries/Microsoft.Extensions.AsyncState/IAsyncLocalContext.cs b/src/Libraries/Microsoft.Extensions.AsyncState/IAsyncLocalContext.cs
index a180eb275fb..be5e9025591 100644
--- a/src/Libraries/Microsoft.Extensions.AsyncState/IAsyncLocalContext.cs
+++ b/src/Libraries/Microsoft.Extensions.AsyncState/IAsyncLocalContext.cs
@@ -11,7 +11,7 @@ namespace Microsoft.Extensions.AsyncState;
 /// </summary>
 /// <typeparam name="T">The type of the asynchronous state.</typeparam>
 /// <remarks>This type is intended for internal use. Use <see cref="IAsyncContext{T}"/> instead.</remarks>
-[Experimental]
+[Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
 [EditorBrowsable(EditorBrowsableState.Never)]
 #pragma warning disable S4023 // Interfaces should not be empty
 public interface IAsyncLocalContext<T> : IAsyncContext<T>
diff --git a/src/Libraries/Microsoft.Extensions.Compliance.Redaction/Microsoft.Extensions.Compliance.Redaction.csproj b/src/Libraries/Microsoft.Extensions.Compliance.Redaction/Microsoft.Extensions.Compliance.Redaction.csproj
index d88e014f05a..15442d1a835 100644
--- a/src/Libraries/Microsoft.Extensions.Compliance.Redaction/Microsoft.Extensions.Compliance.Redaction.csproj
+++ b/src/Libraries/Microsoft.Extensions.Compliance.Redaction/Microsoft.Extensions.Compliance.Redaction.csproj
@@ -6,7 +6,6 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <UseOptionsValidationGenerator>true</UseOptionsValidationGenerator>
     <InjectxxH3OnLegacy>true</InjectxxH3OnLegacy>
   </PropertyGroup>
 
diff --git a/src/Libraries/Microsoft.Extensions.Compliance.Testing/FakeRedactorOptionsAutoValidator.cs b/src/Libraries/Microsoft.Extensions.Compliance.Testing/FakeRedactorOptionsAutoValidator.cs
index 848234268c9..91ea505e36c 100644
--- a/src/Libraries/Microsoft.Extensions.Compliance.Testing/FakeRedactorOptionsAutoValidator.cs
+++ b/src/Libraries/Microsoft.Extensions.Compliance.Testing/FakeRedactorOptionsAutoValidator.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
 
 namespace Microsoft.Extensions.Compliance.Testing;
 
diff --git a/src/Libraries/Microsoft.Extensions.Compliance.Testing/Microsoft.Extensions.Compliance.Testing.csproj b/src/Libraries/Microsoft.Extensions.Compliance.Testing/Microsoft.Extensions.Compliance.Testing.csproj
index a09c5578f9b..10f6491f9df 100644
--- a/src/Libraries/Microsoft.Extensions.Compliance.Testing/Microsoft.Extensions.Compliance.Testing.csproj
+++ b/src/Libraries/Microsoft.Extensions.Compliance.Testing/Microsoft.Extensions.Compliance.Testing.csproj
@@ -7,7 +7,6 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <UseOptionsValidationGenerator>true</UseOptionsValidationGenerator>
     <UseLoggingGenerator>true</UseLoggingGenerator>
     <InjectSharedTextFormatting>true</InjectSharedTextFormatting>
     <InjectExperimentalAttributeOnLegacy>true</InjectExperimentalAttributeOnLegacy>
@@ -23,7 +22,6 @@
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.Extensions.Compliance.Abstractions\Microsoft.Extensions.Compliance.Abstractions.csproj" />
     <ProjectReference Include="..\Microsoft.Extensions.Telemetry.Abstractions\Microsoft.Extensions.Telemetry.Abstractions.csproj" />
-    <ProjectReference Include="..\Microsoft.Extensions.Options.Validation\Microsoft.Extensions.Options.Validation.csproj" />
     <ProjectReference Include="..\..\ToBeRemoved\Options.ValidateOnStart\Options.ValidateOnStart.csproj" />
   </ItemGroup>
 
diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.Common/CommonHealthChecksExtensions.TelemetryPublisher.cs b/src/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.Common/CommonHealthChecksExtensions.TelemetryPublisher.cs
index ac7cbf8edee..9034b7b9884 100644
--- a/src/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.Common/CommonHealthChecksExtensions.TelemetryPublisher.cs
+++ b/src/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.Common/CommonHealthChecksExtensions.TelemetryPublisher.cs
@@ -30,7 +30,7 @@ public static IServiceCollection AddTelemetryHealthCheckPublisher(this IServiceC
     /// <param name="section">Configuration for <see cref="TelemetryHealthCheckPublisherOptions"/>.</param>
     /// <returns>The value of <paramref name="services"/>.</returns>
     /// <exception cref="ArgumentNullException"><paramref name="services" /> or <paramref name="section"/> are <see langword="null" />.</exception>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public static IServiceCollection AddTelemetryHealthCheckPublisher(this IServiceCollection services, IConfigurationSection section)
         => Throw.IfNull(services)
             .Configure<TelemetryHealthCheckPublisherOptions>(Throw.IfNull(section))
@@ -44,7 +44,7 @@ public static IServiceCollection AddTelemetryHealthCheckPublisher(this IServiceC
     /// <param name="configure">Configuration for <see cref="TelemetryHealthCheckPublisherOptions"/>.</param>
     /// <returns>The value of <paramref name="services"/>.</returns>
     /// <exception cref="ArgumentNullException"><paramref name="services" /> or <paramref name="configure"/> are <see langword="null" />.</exception>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public static IServiceCollection AddTelemetryHealthCheckPublisher(this IServiceCollection services, Action<TelemetryHealthCheckPublisherOptions> configure)
         => Throw.IfNull(services)
             .Configure(Throw.IfNull(configure))
diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.Common/TelemetryHealthCheckPublisherOptions.cs b/src/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.Common/TelemetryHealthCheckPublisherOptions.cs
index bf5d07c5dce..d2b1155551a 100644
--- a/src/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.Common/TelemetryHealthCheckPublisherOptions.cs
+++ b/src/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.Common/TelemetryHealthCheckPublisherOptions.cs
@@ -8,7 +8,7 @@ namespace Microsoft.Extensions.Diagnostics.HealthChecks;
 /// <summary>
 /// Options for the telemetry health check publisher.
 /// </summary>
-[Experimental]
+[Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
 public class TelemetryHealthCheckPublisherOptions
 {
     /// <summary>
diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization/Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization.csproj b/src/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization/Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization.csproj
index cacc4326872..8497c054823 100644
--- a/src/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization/Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization.csproj
+++ b/src/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization/Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization.csproj
@@ -6,7 +6,6 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <UseOptionsValidationGenerator>true</UseOptionsValidationGenerator>
     <InjectSharedDataValidation>true</InjectSharedDataValidation>
     <InjectExperimentalAttributeOnLegacy>true</InjectExperimentalAttributeOnLegacy>
   </PropertyGroup>
diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization/ResourceUtilizationHealthCheckOptions.cs b/src/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization/ResourceUtilizationHealthCheckOptions.cs
index 29afe898c19..115c94da936 100644
--- a/src/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization/ResourceUtilizationHealthCheckOptions.cs
+++ b/src/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization/ResourceUtilizationHealthCheckOptions.cs
@@ -3,7 +3,7 @@
 
 using System;
 using Microsoft.Extensions.Diagnostics.ResourceMonitoring;
-using Microsoft.Extensions.Options.Validation;
+using Microsoft.Extensions.Options;
 using Microsoft.Shared.Data.Validation;
 
 namespace Microsoft.Extensions.Diagnostics.HealthChecks;
diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization/ResourceUtilizationHealthCheckOptionsValidator.cs b/src/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization/ResourceUtilizationHealthCheckOptionsValidator.cs
index 5ed6da4d506..2ed4d499a14 100644
--- a/src/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization/ResourceUtilizationHealthCheckOptionsValidator.cs
+++ b/src/Libraries/Microsoft.Extensions.Diagnostics.HealthChecks.ResourceUtilization/ResourceUtilizationHealthCheckOptionsValidator.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
 
 namespace Microsoft.Extensions.Diagnostics.HealthChecks;
 
diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.Probes/Kubernetes/TcpEndpointHealthCheckOptionsValidator.cs b/src/Libraries/Microsoft.Extensions.Diagnostics.Probes/Kubernetes/TcpEndpointHealthCheckOptionsValidator.cs
index b606417706d..0a11191883e 100644
--- a/src/Libraries/Microsoft.Extensions.Diagnostics.Probes/Kubernetes/TcpEndpointHealthCheckOptionsValidator.cs
+++ b/src/Libraries/Microsoft.Extensions.Diagnostics.Probes/Kubernetes/TcpEndpointHealthCheckOptionsValidator.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
 
 namespace Microsoft.Extensions.Diagnostics.Probes;
 
diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.Probes/Microsoft.Extensions.Diagnostics.Probes.csproj b/src/Libraries/Microsoft.Extensions.Diagnostics.Probes/Microsoft.Extensions.Diagnostics.Probes.csproj
index deaa8dc277a..ec64ad46cc5 100644
--- a/src/Libraries/Microsoft.Extensions.Diagnostics.Probes/Microsoft.Extensions.Diagnostics.Probes.csproj
+++ b/src/Libraries/Microsoft.Extensions.Diagnostics.Probes/Microsoft.Extensions.Diagnostics.Probes.csproj
@@ -7,7 +7,6 @@
 
   <PropertyGroup>
     <UseLoggingGenerator>true</UseLoggingGenerator>
-    <UseOptionsValidationGenerator>true</UseOptionsValidationGenerator>
     <InjectExperimentalAttributeOnLegacy>true</InjectExperimentalAttributeOnLegacy>
     <InjectSharedDataValidation>true</InjectSharedDataValidation>
   </PropertyGroup>
@@ -21,7 +20,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.Extensions.Telemetry.Abstractions\Microsoft.Extensions.Telemetry.Abstractions.csproj" />
-    <ProjectReference Include="..\Microsoft.Extensions.Options.Validation\Microsoft.Extensions.Options.Validation.csproj" />
     <ProjectReference Include="..\..\ToBeRemoved\Options.ValidateOnStart\Options.ValidateOnStart.csproj" />
   </ItemGroup>
 
diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Internal/ResourceUtilizationTrackerOptionsValidator.cs b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Internal/ResourceUtilizationTrackerOptionsValidator.cs
index e7c38f1bbeb..6295ecdaecd 100644
--- a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Internal/ResourceUtilizationTrackerOptionsValidator.cs
+++ b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Internal/ResourceUtilizationTrackerOptionsValidator.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
 
 namespace Microsoft.Extensions.Diagnostics.ResourceMonitoring;
 
diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Linux/Internal/LinuxResourceUtilizationProviderOptionsValidator.cs b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Linux/Internal/LinuxResourceUtilizationProviderOptionsValidator.cs
index b8e0ebc445c..7631d2d4d10 100644
--- a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Linux/Internal/LinuxResourceUtilizationProviderOptionsValidator.cs
+++ b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Linux/Internal/LinuxResourceUtilizationProviderOptionsValidator.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
 
 namespace Microsoft.Extensions.Diagnostics.ResourceMonitoring.Internal;
 
diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Linux/LinuxUtilizationExtensions.cs b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Linux/LinuxUtilizationExtensions.cs
index 7c4163199ca..5183b37810e 100644
--- a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Linux/LinuxUtilizationExtensions.cs
+++ b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Linux/LinuxUtilizationExtensions.cs
@@ -6,6 +6,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Diagnostics.ResourceMonitoring.Internal;
+using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Options.Validation;
 using Microsoft.Extensions.Telemetry.Metering;
 using Microsoft.Shared.Diagnostics;
diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Microsoft.Extensions.Diagnostics.ResourceMonitoring.csproj b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Microsoft.Extensions.Diagnostics.ResourceMonitoring.csproj
index 532e55ea400..c09459bdb77 100644
--- a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Microsoft.Extensions.Diagnostics.ResourceMonitoring.csproj
+++ b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Microsoft.Extensions.Diagnostics.ResourceMonitoring.csproj
@@ -7,7 +7,6 @@
 
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <UseOptionsValidationGenerator>true</UseOptionsValidationGenerator>
     <UseLoggingGenerator>true</UseLoggingGenerator>
     <InjectSharedDataValidation>true</InjectSharedDataValidation>
     <InjectSharedRentedSpan>true</InjectSharedRentedSpan>
@@ -27,7 +26,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.Extensions.Options.Validation\Microsoft.Extensions.Options.Validation.csproj" />
     <ProjectReference Include="..\Microsoft.Extensions.Telemetry.Abstractions\Microsoft.Extensions.Telemetry.Abstractions.csproj" />
     <ProjectReference Include="..\..\ToBeRemoved\Options.ValidateOnStart\Options.ValidateOnStart.csproj" />
     <ProjectReference Include="..\..\ToBeMoved\DependencyInjection.AutoActivation\DependencyInjection.AutoActivation.csproj" />
diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/ResourceMonitoringOptions.cs b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/ResourceMonitoringOptions.cs
index d6b55d14820..97f2b805ff1 100644
--- a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/ResourceMonitoringOptions.cs
+++ b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/ResourceMonitoringOptions.cs
@@ -50,7 +50,7 @@ public class ResourceMonitoringOptions
     /// The value needs to be less than or equal to the <see cref="CollectionWindow"/>.
     /// Most importantly, this period is used to calculate <see cref="Utilization"/> instances pushed to publishers.
     /// </remarks>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     [TimeSpan(MinimumSamplingWindow, MaximumSamplingWindow)]
     public TimeSpan CalculationPeriod { get; set; } = DefaultCollectionWindow;
 }
diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Windows/Internal/WindowsCountersOptionsValidator.cs b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Windows/Internal/WindowsCountersOptionsValidator.cs
index 501d31049df..2058dd53ecb 100644
--- a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Windows/Internal/WindowsCountersOptionsValidator.cs
+++ b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Windows/Internal/WindowsCountersOptionsValidator.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
 
 namespace Microsoft.Extensions.Diagnostics.ResourceMonitoring;
 
diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Windows/WindowsCountersOptions.cs b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Windows/WindowsCountersOptions.cs
index 5d90106ce54..1678918817c 100644
--- a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Windows/WindowsCountersOptions.cs
+++ b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Windows/WindowsCountersOptions.cs
@@ -12,7 +12,7 @@ namespace Microsoft.Extensions.Diagnostics.ResourceMonitoring;
 /// <summary>
 /// Options for WindowsCounters.
 /// </summary>
-[Experimental]
+[Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
 public class WindowsCountersOptions
 {
     internal const int MinimumCachingInterval = 100;
@@ -33,7 +33,7 @@ public class WindowsCountersOptions
     /// <value>
     /// The default value is 5 seconds.
     /// </value>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     [TimeSpan(MinimumCachingInterval, MaximumCachingInterval)]
     public TimeSpan CachingInterval { get; set; } = DefaultCachingInterval;
 }
diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Windows/WindowsUtilizationExtensions.cs b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Windows/WindowsUtilizationExtensions.cs
index 211f6976e5e..1718e85d9e9 100644
--- a/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Windows/WindowsUtilizationExtensions.cs
+++ b/src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Windows/WindowsUtilizationExtensions.cs
@@ -65,7 +65,7 @@ public static IResourceMonitorBuilder AddWindowsPerfCounterPublisher(this IResou
     /// <returns>The value of <paramref name="builder" />.</returns>
     /// <exception cref="ArgumentNullException"><paramref name="builder"/> is <see langword="null" />.</exception>
     /// <seealso cref="System.Diagnostics.Metrics.Instrument"/>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public static IResourceMonitorBuilder AddWindowsCounters(this IResourceMonitorBuilder builder)
     {
         _ = Throw.IfNull(builder);
@@ -93,7 +93,7 @@ public static IResourceMonitorBuilder AddWindowsCounters(this IResourceMonitorBu
     /// <returns>The value of <paramref name="builder"/>.</returns>
     /// <exception cref="ArgumentNullException"><paramref name="builder"/> is <see langword="null" />.</exception>
     /// <seealso cref="System.Diagnostics.Metrics.Instrument"/>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public static IResourceMonitorBuilder AddWindowsCounters(this IResourceMonitorBuilder builder, IConfigurationSection section)
     {
         _ = Throw.IfNull(builder);
@@ -123,7 +123,7 @@ public static IResourceMonitorBuilder AddWindowsCounters(this IResourceMonitorBu
     /// <returns>The value of <paramref name="builder"/>.</returns>
     /// <exception cref="ArgumentNullException"><paramref name="builder"/> is <see langword="null" />.</exception>
     /// <seealso cref="System.Diagnostics.Metrics.Instrument"/>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public static IResourceMonitorBuilder AddWindowsCounters(this IResourceMonitorBuilder builder, Action<WindowsCountersOptions> configure)
     {
         _ = Throw.IfNull(builder);
diff --git a/src/Libraries/Microsoft.Extensions.Hosting.Testing/HostingFakesExtensions.cs b/src/Libraries/Microsoft.Extensions.Hosting.Testing/HostingFakesExtensions.cs
index 57234351d7c..9d61e191b86 100644
--- a/src/Libraries/Microsoft.Extensions.Hosting.Testing/HostingFakesExtensions.cs
+++ b/src/Libraries/Microsoft.Extensions.Hosting.Testing/HostingFakesExtensions.cs
@@ -19,7 +19,7 @@ namespace Microsoft.Extensions.Hosting.Testing;
 /// <summary>
 /// Extension methods supporting host unit testing scenarios.
 /// </summary>
-[Experimental]
+[Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
 public static class HostingFakesExtensions
 {
     /// <summary>
diff --git a/src/Libraries/Microsoft.Extensions.Http.AutoClient/AutoClientAttribute.cs b/src/Libraries/Microsoft.Extensions.Http.AutoClient/AutoClientAttribute.cs
index 0c3323cde5f..43f66cda85e 100644
--- a/src/Libraries/Microsoft.Extensions.Http.AutoClient/AutoClientAttribute.cs
+++ b/src/Libraries/Microsoft.Extensions.Http.AutoClient/AutoClientAttribute.cs
@@ -27,7 +27,7 @@ namespace Microsoft.Extensions.Http.AutoClient;
 /// }
 /// </code>
 /// </example>
-[Experimental]
+[Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
 [AttributeUsage(AttributeTargets.Interface)]
 [Conditional("CODE_GENERATION_ATTRIBUTES")]
 public sealed class AutoClientAttribute : Attribute
diff --git a/src/Libraries/Microsoft.Extensions.Http.AutoClient/AutoClientException.cs b/src/Libraries/Microsoft.Extensions.Http.AutoClient/AutoClientException.cs
index e244ea0691d..56bdd54dae6 100644
--- a/src/Libraries/Microsoft.Extensions.Http.AutoClient/AutoClientException.cs
+++ b/src/Libraries/Microsoft.Extensions.Http.AutoClient/AutoClientException.cs
@@ -27,7 +27,7 @@ namespace Microsoft.Extensions.Http.AutoClient;
 /// </code>
 /// </example>
 [SuppressMessage("Design", "CA1032:Implement standard exception constructors", Justification = "Not applicable to this exception")]
-[Experimental]
+[Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
 public class AutoClientException : Exception
 {
     /// <summary>
diff --git a/src/Libraries/Microsoft.Extensions.Http.AutoClient/AutoClientHttpError.cs b/src/Libraries/Microsoft.Extensions.Http.AutoClient/AutoClientHttpError.cs
index 05b9b713973..a194a4c2d1c 100644
--- a/src/Libraries/Microsoft.Extensions.Http.AutoClient/AutoClientHttpError.cs
+++ b/src/Libraries/Microsoft.Extensions.Http.AutoClient/AutoClientHttpError.cs
@@ -19,7 +19,7 @@ namespace Microsoft.Extensions.Http.AutoClient;
 /// When a REST API client fails, it will throw a <see cref="AutoClientException"/>.
 /// This exception contains a <see cref="AutoClientHttpError"/> instance that holds details like content, headers and status code.
 /// </remarks>
-[Experimental]
+[Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
 public class AutoClientHttpError
 {
     /// <summary>
diff --git a/src/Libraries/Microsoft.Extensions.Http.AutoClient/AutoClientOptions.cs b/src/Libraries/Microsoft.Extensions.Http.AutoClient/AutoClientOptions.cs
index 63a961dcde7..11df36f248c 100644
--- a/src/Libraries/Microsoft.Extensions.Http.AutoClient/AutoClientOptions.cs
+++ b/src/Libraries/Microsoft.Extensions.Http.AutoClient/AutoClientOptions.cs
@@ -21,7 +21,7 @@ namespace Microsoft.Extensions.Http.AutoClient;
 /// });
 /// </code>
 /// </example>
-[Experimental]
+[Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
 public class AutoClientOptions
 {
     /// <summary>
diff --git a/src/Libraries/Microsoft.Extensions.Http.AutoClient/BodyAttribute.cs b/src/Libraries/Microsoft.Extensions.Http.AutoClient/BodyAttribute.cs
index d6b3d8bf8d4..697c8806ee8 100644
--- a/src/Libraries/Microsoft.Extensions.Http.AutoClient/BodyAttribute.cs
+++ b/src/Libraries/Microsoft.Extensions.Http.AutoClient/BodyAttribute.cs
@@ -24,7 +24,7 @@ namespace Microsoft.Extensions.Http.AutoClient;
 /// }
 /// </code>
 /// </example>
-[Experimental]
+[Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
 [AttributeUsage(AttributeTargets.Parameter)]
 [Conditional("CODE_GENERATION_ATTRIBUTES")]
 public sealed class BodyAttribute : Attribute
diff --git a/src/Libraries/Microsoft.Extensions.Http.AutoClient/BodyContentType.cs b/src/Libraries/Microsoft.Extensions.Http.AutoClient/BodyContentType.cs
index 93baae2b791..4a4617cdc0b 100644
--- a/src/Libraries/Microsoft.Extensions.Http.AutoClient/BodyContentType.cs
+++ b/src/Libraries/Microsoft.Extensions.Http.AutoClient/BodyContentType.cs
@@ -8,7 +8,7 @@ namespace Microsoft.Extensions.Http.AutoClient;
 /// <summary>
 /// Defines the types of encoding possible for request bodies.
 /// </summary>
-[Experimental]
+[Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
 public enum BodyContentType
 {
     /// <summary>
diff --git a/src/Libraries/Microsoft.Extensions.Http.AutoClient/HeaderAttribute.cs b/src/Libraries/Microsoft.Extensions.Http.AutoClient/HeaderAttribute.cs
index 48a3d45a679..e1af6b6240f 100644
--- a/src/Libraries/Microsoft.Extensions.Http.AutoClient/HeaderAttribute.cs
+++ b/src/Libraries/Microsoft.Extensions.Http.AutoClient/HeaderAttribute.cs
@@ -23,7 +23,7 @@ namespace Microsoft.Extensions.Http.AutoClient;
 /// }
 /// </code>
 /// </example>
-[Experimental]
+[Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
 [AttributeUsage(AttributeTargets.Parameter)]
 [Conditional("CODE_GENERATION_ATTRIBUTES")]
 public sealed class HeaderAttribute : Attribute
diff --git a/src/Libraries/Microsoft.Extensions.Http.AutoClient/Methods/DeleteAttribute.cs b/src/Libraries/Microsoft.Extensions.Http.AutoClient/Methods/DeleteAttribute.cs
index 8b2a2fd473f..ab67d7e61f8 100644
--- a/src/Libraries/Microsoft.Extensions.Http.AutoClient/Methods/DeleteAttribute.cs
+++ b/src/Libraries/Microsoft.Extensions.Http.AutoClient/Methods/DeleteAttribute.cs
@@ -29,7 +29,7 @@ namespace Microsoft.Extensions.Http.AutoClient;
 /// }
 /// </code>
 /// </example>
-[Experimental]
+[Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
 [AttributeUsage(AttributeTargets.Method)]
 public sealed class DeleteAttribute : Attribute
 {
diff --git a/src/Libraries/Microsoft.Extensions.Http.AutoClient/Methods/GetAttribute.cs b/src/Libraries/Microsoft.Extensions.Http.AutoClient/Methods/GetAttribute.cs
index 577a82321e2..29859dac58a 100644
--- a/src/Libraries/Microsoft.Extensions.Http.AutoClient/Methods/GetAttribute.cs
+++ b/src/Libraries/Microsoft.Extensions.Http.AutoClient/Methods/GetAttribute.cs
@@ -29,7 +29,7 @@ namespace Microsoft.Extensions.Http.AutoClient;
 /// }
 /// </code>
 /// </example>
-[Experimental]
+[Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
 [AttributeUsage(AttributeTargets.Method)]
 public sealed class GetAttribute : Attribute
 {
diff --git a/src/Libraries/Microsoft.Extensions.Http.AutoClient/Methods/HeadAttribute.cs b/src/Libraries/Microsoft.Extensions.Http.AutoClient/Methods/HeadAttribute.cs
index e9121a281b4..7ede1879fc4 100644
--- a/src/Libraries/Microsoft.Extensions.Http.AutoClient/Methods/HeadAttribute.cs
+++ b/src/Libraries/Microsoft.Extensions.Http.AutoClient/Methods/HeadAttribute.cs
@@ -29,7 +29,7 @@ namespace Microsoft.Extensions.Http.AutoClient;
 /// }
 /// </code>
 /// </example>
-[Experimental]
+[Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
 [AttributeUsage(AttributeTargets.Method)]
 public sealed class HeadAttribute : Attribute
 {
diff --git a/src/Libraries/Microsoft.Extensions.Http.AutoClient/Methods/OptionsAttribute.cs b/src/Libraries/Microsoft.Extensions.Http.AutoClient/Methods/OptionsAttribute.cs
index de23fa8d0f9..11659f78b06 100644
--- a/src/Libraries/Microsoft.Extensions.Http.AutoClient/Methods/OptionsAttribute.cs
+++ b/src/Libraries/Microsoft.Extensions.Http.AutoClient/Methods/OptionsAttribute.cs
@@ -29,7 +29,7 @@ namespace Microsoft.Extensions.Http.AutoClient;
 /// }
 /// </code>
 /// </example>
-[Experimental]
+[Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
 [AttributeUsage(AttributeTargets.Method)]
 public sealed class OptionsAttribute : Attribute
 {
diff --git a/src/Libraries/Microsoft.Extensions.Http.AutoClient/Methods/PatchAttribute.cs b/src/Libraries/Microsoft.Extensions.Http.AutoClient/Methods/PatchAttribute.cs
index 04e5803ab8d..489259c9c28 100644
--- a/src/Libraries/Microsoft.Extensions.Http.AutoClient/Methods/PatchAttribute.cs
+++ b/src/Libraries/Microsoft.Extensions.Http.AutoClient/Methods/PatchAttribute.cs
@@ -29,7 +29,7 @@ namespace Microsoft.Extensions.Http.AutoClient;
 /// }
 /// </code>
 /// </example>
-[Experimental]
+[Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
 [AttributeUsage(AttributeTargets.Method)]
 public sealed class PatchAttribute : Attribute
 {
diff --git a/src/Libraries/Microsoft.Extensions.Http.AutoClient/Methods/PostAttribute.cs b/src/Libraries/Microsoft.Extensions.Http.AutoClient/Methods/PostAttribute.cs
index a42a3f6bb16..52385dc5873 100644
--- a/src/Libraries/Microsoft.Extensions.Http.AutoClient/Methods/PostAttribute.cs
+++ b/src/Libraries/Microsoft.Extensions.Http.AutoClient/Methods/PostAttribute.cs
@@ -29,7 +29,7 @@ namespace Microsoft.Extensions.Http.AutoClient;
 /// }
 /// </code>
 /// </example>
-[Experimental]
+[Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
 [AttributeUsage(AttributeTargets.Method)]
 public sealed class PostAttribute : Attribute
 {
diff --git a/src/Libraries/Microsoft.Extensions.Http.AutoClient/Methods/PutAttribute.cs b/src/Libraries/Microsoft.Extensions.Http.AutoClient/Methods/PutAttribute.cs
index c7de67fa335..9342d15fca2 100644
--- a/src/Libraries/Microsoft.Extensions.Http.AutoClient/Methods/PutAttribute.cs
+++ b/src/Libraries/Microsoft.Extensions.Http.AutoClient/Methods/PutAttribute.cs
@@ -29,7 +29,7 @@ namespace Microsoft.Extensions.Http.AutoClient;
 /// }
 /// </code>
 /// </example>
-[Experimental]
+[Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
 [AttributeUsage(AttributeTargets.Method)]
 public sealed class PutAttribute : Attribute
 {
diff --git a/src/Libraries/Microsoft.Extensions.Http.AutoClient/Microsoft.Extensions.Http.AutoClient.csproj b/src/Libraries/Microsoft.Extensions.Http.AutoClient/Microsoft.Extensions.Http.AutoClient.csproj
index 5c5b7eca3bc..4d4185e35b1 100644
--- a/src/Libraries/Microsoft.Extensions.Http.AutoClient/Microsoft.Extensions.Http.AutoClient.csproj
+++ b/src/Libraries/Microsoft.Extensions.Http.AutoClient/Microsoft.Extensions.Http.AutoClient.csproj
@@ -6,7 +6,6 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <UseOptionsValidationGenerator>true</UseOptionsValidationGenerator>
     <InjectExperimentalAttributeOnLegacy>true</InjectExperimentalAttributeOnLegacy>
   </PropertyGroup>
 
@@ -25,10 +24,6 @@
     <AnalyzerReference Include="..\..\Generators\Microsoft.Gen.AutoClient\Roslyn4.0\Microsoft.Gen.AutoClient.Roslyn4.0.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\Microsoft.Extensions.Options.Validation\Microsoft.Extensions.Options.Validation.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Http" />
     <PackageReference Include="System.Text.Json" />
diff --git a/src/Libraries/Microsoft.Extensions.Http.AutoClient/QueryAttribute.cs b/src/Libraries/Microsoft.Extensions.Http.AutoClient/QueryAttribute.cs
index 0b9b9da47d1..306ad18839d 100644
--- a/src/Libraries/Microsoft.Extensions.Http.AutoClient/QueryAttribute.cs
+++ b/src/Libraries/Microsoft.Extensions.Http.AutoClient/QueryAttribute.cs
@@ -23,7 +23,7 @@ namespace Microsoft.Extensions.Http.AutoClient;
 /// }
 /// </code>
 /// </example>
-[Experimental]
+[Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
 [AttributeUsage(AttributeTargets.Parameter)]
 [Conditional("CODE_GENERATION_ATTRIBUTES")]
 public sealed class QueryAttribute : Attribute
diff --git a/src/Libraries/Microsoft.Extensions.Http.AutoClient/RequestNameAttribute.cs b/src/Libraries/Microsoft.Extensions.Http.AutoClient/RequestNameAttribute.cs
index e3fbc2a2e8b..48cefbdc1e9 100644
--- a/src/Libraries/Microsoft.Extensions.Http.AutoClient/RequestNameAttribute.cs
+++ b/src/Libraries/Microsoft.Extensions.Http.AutoClient/RequestNameAttribute.cs
@@ -26,7 +26,7 @@ namespace Microsoft.Extensions.Http.AutoClient;
 /// }
 /// </code>
 /// </example>
-[Experimental]
+[Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
 [AttributeUsage(AttributeTargets.Method)]
 [Conditional("CODE_GENERATION_ATTRIBUTES")]
 public sealed class RequestNameAttribute : Attribute
diff --git a/src/Libraries/Microsoft.Extensions.Http.AutoClient/StaticHeaderAttribute.cs b/src/Libraries/Microsoft.Extensions.Http.AutoClient/StaticHeaderAttribute.cs
index 774d9716267..5c44944c918 100644
--- a/src/Libraries/Microsoft.Extensions.Http.AutoClient/StaticHeaderAttribute.cs
+++ b/src/Libraries/Microsoft.Extensions.Http.AutoClient/StaticHeaderAttribute.cs
@@ -27,7 +27,7 @@ namespace Microsoft.Extensions.Http.AutoClient;
 /// }
 /// </code>
 /// </example>
-[Experimental]
+[Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
 [AttributeUsage(AttributeTargets.Interface | AttributeTargets.Method, AllowMultiple = true)]
 [Conditional("CODE_GENERATION_ATTRIBUTES")]
 public sealed class StaticHeaderAttribute : Attribute
diff --git a/src/Libraries/Microsoft.Extensions.Http.Resilience/FaultInjection/ContextExtensions.cs b/src/Libraries/Microsoft.Extensions.Http.Resilience/FaultInjection/ContextExtensions.cs
index 7ff798724cc..72f6fc491b8 100644
--- a/src/Libraries/Microsoft.Extensions.Http.Resilience/FaultInjection/ContextExtensions.cs
+++ b/src/Libraries/Microsoft.Extensions.Http.Resilience/FaultInjection/ContextExtensions.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.
 
 using System.Diagnostics.CodeAnalysis;
@@ -11,7 +11,7 @@ namespace Microsoft.Extensions.Http.Resilience.FaultInjection;
 /// <summary>
 /// Provides extension methods for <see cref="Context"/>.
 /// </summary>
-[Experimental]
+[Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
 public static class ContextExtensions
 {
     private const string CallingRequestMessage = "CallingRequestMessage";
diff --git a/src/Libraries/Microsoft.Extensions.Http.Resilience/FaultInjection/HttpClientFaultInjectionExtensions.cs b/src/Libraries/Microsoft.Extensions.Http.Resilience/FaultInjection/HttpClientFaultInjectionExtensions.cs
index a4d5e91c5c8..289b9aed156 100644
--- a/src/Libraries/Microsoft.Extensions.Http.Resilience/FaultInjection/HttpClientFaultInjectionExtensions.cs
+++ b/src/Libraries/Microsoft.Extensions.Http.Resilience/FaultInjection/HttpClientFaultInjectionExtensions.cs
@@ -147,7 +147,7 @@ public static IHttpClientBuilder AddFaultInjectionPolicyHandler(this IHttpClient
     /// <returns>
     /// The <see cref="IHttpClientBuilder"/> so that additional calls can be chained.
     /// </returns>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public static IHttpClientBuilder AddWeightedFaultInjectionPolicyHandlers(this IHttpClientBuilder httpClientBuilder,
         Action<FaultPolicyWeightAssignmentsOptions> weightAssignmentsConfig)
     {
@@ -176,7 +176,7 @@ public static IHttpClientBuilder AddWeightedFaultInjectionPolicyHandlers(this IH
     /// <returns>
     /// The <see cref="IHttpClientBuilder"/> so that additional calls can be chained.
     /// </returns>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     [DynamicDependency(
         DynamicallyAccessedMemberTypes.PublicProperties | DynamicallyAccessedMemberTypes.PublicParameterlessConstructor,
         typeof(FaultPolicyWeightAssignmentsOptions))]
diff --git a/src/Libraries/Microsoft.Extensions.Http.Resilience/Hedging/HedgingEndpointOptions.cs b/src/Libraries/Microsoft.Extensions.Http.Resilience/Hedging/HedgingEndpointOptions.cs
index d3b73a59afa..0e95be87f24 100644
--- a/src/Libraries/Microsoft.Extensions.Http.Resilience/Hedging/HedgingEndpointOptions.cs
+++ b/src/Libraries/Microsoft.Extensions.Http.Resilience/Hedging/HedgingEndpointOptions.cs
@@ -1,10 +1,10 @@
-// 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.
 
 using System;
 using System.ComponentModel.DataAnnotations;
 using Microsoft.Extensions.Http.Resilience.Internal.Validators;
-using Microsoft.Extensions.Options.Validation;
+using Microsoft.Extensions.Options;
 using Polly.Timeout;
 
 namespace Microsoft.Extensions.Http.Resilience;
diff --git a/src/Libraries/Microsoft.Extensions.Http.Resilience/Hedging/HttpStandardHedgingResilienceOptions.cs b/src/Libraries/Microsoft.Extensions.Http.Resilience/Hedging/HttpStandardHedgingResilienceOptions.cs
index 7f4f560b2d4..e30ce2862ff 100644
--- a/src/Libraries/Microsoft.Extensions.Http.Resilience/Hedging/HttpStandardHedgingResilienceOptions.cs
+++ b/src/Libraries/Microsoft.Extensions.Http.Resilience/Hedging/HttpStandardHedgingResilienceOptions.cs
@@ -1,11 +1,11 @@
-// 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.
 
 using System;
 using System.ComponentModel.DataAnnotations;
 using Microsoft.Extensions.Compliance.Classification;
 using Microsoft.Extensions.Http.Resilience.Internal.Validators;
-using Microsoft.Extensions.Options.Validation;
+using Microsoft.Extensions.Options;
 
 namespace Microsoft.Extensions.Http.Resilience;
 
diff --git a/src/Libraries/Microsoft.Extensions.Http.Resilience/Hedging/Internals/Validators/HttpStandardHedgingResilienceOptionsValidator.cs b/src/Libraries/Microsoft.Extensions.Http.Resilience/Hedging/Internals/Validators/HttpStandardHedgingResilienceOptionsValidator.cs
index d9c81573d81..7cc7faa75fd 100644
--- a/src/Libraries/Microsoft.Extensions.Http.Resilience/Hedging/Internals/Validators/HttpStandardHedgingResilienceOptionsValidator.cs
+++ b/src/Libraries/Microsoft.Extensions.Http.Resilience/Hedging/Internals/Validators/HttpStandardHedgingResilienceOptionsValidator.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
 
 namespace Microsoft.Extensions.Http.Resilience.Internal.Validators;
 
diff --git a/src/Libraries/Microsoft.Extensions.Http.Resilience/Hedging/StandardHedgingHandlerBuilderExtensions.cs b/src/Libraries/Microsoft.Extensions.Http.Resilience/Hedging/StandardHedgingHandlerBuilderExtensions.cs
index acfe72386ae..a51f69f3a82 100644
--- a/src/Libraries/Microsoft.Extensions.Http.Resilience/Hedging/StandardHedgingHandlerBuilderExtensions.cs
+++ b/src/Libraries/Microsoft.Extensions.Http.Resilience/Hedging/StandardHedgingHandlerBuilderExtensions.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.
 
 using System;
@@ -65,7 +65,7 @@ public static IStandardHedgingHandlerBuilder Configure(this IStandardHedgingHand
     /// <param name="builder">The strategy builder.</param>
     /// <param name="configure">The configure method.</param>
     /// <returns>The same builder instance.</returns>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public static IStandardHedgingHandlerBuilder Configure(this IStandardHedgingHandlerBuilder builder, Action<HttpStandardHedgingResilienceOptions, IServiceProvider> configure)
     {
         _ = Throw.IfNull(builder);
diff --git a/src/Libraries/Microsoft.Extensions.Http.Resilience/Microsoft.Extensions.Http.Resilience.csproj b/src/Libraries/Microsoft.Extensions.Http.Resilience/Microsoft.Extensions.Http.Resilience.csproj
index b63bf4ab1c4..733b5ae0bb8 100644
--- a/src/Libraries/Microsoft.Extensions.Http.Resilience/Microsoft.Extensions.Http.Resilience.csproj
+++ b/src/Libraries/Microsoft.Extensions.Http.Resilience/Microsoft.Extensions.Http.Resilience.csproj
@@ -10,7 +10,6 @@
     <UseLoggingGenerator>true</UseLoggingGenerator>
     <UseMeteringGenerator>true</UseMeteringGenerator>
     <UseEnumStringsGenerator>true</UseEnumStringsGenerator>
-    <UseOptionsValidationGenerator>true</UseOptionsValidationGenerator>
     <InjectxxH3OnLegacy>true</InjectxxH3OnLegacy>
     <InjectSharedNumericExtensions>true</InjectSharedNumericExtensions>
     <InjectSharedThrow>false</InjectSharedThrow>
@@ -28,7 +27,6 @@
     <ProjectReference Include="..\Microsoft.Extensions.Resilience\Microsoft.Extensions.Resilience.csproj" />
     <ProjectReference Include="..\Microsoft.Extensions.Diagnostics.ExceptionSummarization\Microsoft.Extensions.Diagnostics.ExceptionSummarization.csproj" />
     <ProjectReference Include="..\Microsoft.Extensions.Compliance.Abstractions\Microsoft.Extensions.Compliance.Abstractions.csproj" />
-    <ProjectReference Include="..\Microsoft.Extensions.Options.Validation\Microsoft.Extensions.Options.Validation.csproj" />
     <ProjectReference Include="..\..\ToBeMoved\DependencyInjection.NamedService\DependencyInjection.NamedService.csproj" />
     <ProjectReference Include="..\Microsoft.Extensions.ObjectPool.DependencyInjection\Microsoft.Extensions.ObjectPool.DependencyInjection.csproj" />
   </ItemGroup>
diff --git a/src/Libraries/Microsoft.Extensions.Http.Resilience/Resilience/HttpStandardResilienceBuilderBuilderExtensions.cs b/src/Libraries/Microsoft.Extensions.Http.Resilience/Resilience/HttpStandardResilienceBuilderBuilderExtensions.cs
index ce8acf3c861..b3cee1fc974 100644
--- a/src/Libraries/Microsoft.Extensions.Http.Resilience/Resilience/HttpStandardResilienceBuilderBuilderExtensions.cs
+++ b/src/Libraries/Microsoft.Extensions.Http.Resilience/Resilience/HttpStandardResilienceBuilderBuilderExtensions.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.
 
 using System;
@@ -65,7 +65,7 @@ public static IHttpStandardResilienceStrategyBuilder Configure(this IHttpStandar
     /// <param name="configure">The configure method.</param>
     /// <returns>The same builder instance.</returns>
 #pragma warning disable S3872 // Parameter names should not duplicate the names of their methods
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public static IHttpStandardResilienceStrategyBuilder Configure(this IHttpStandardResilienceStrategyBuilder builder, Action<HttpStandardResilienceOptions, IServiceProvider> configure)
 #pragma warning restore S3872 // Parameter names should not duplicate the names of their methods
     {
diff --git a/src/Libraries/Microsoft.Extensions.Http.Resilience/Resilience/HttpStandardResilienceOptions.cs b/src/Libraries/Microsoft.Extensions.Http.Resilience/Resilience/HttpStandardResilienceOptions.cs
index b3c58506e13..cd3fa7a94cf 100644
--- a/src/Libraries/Microsoft.Extensions.Http.Resilience/Resilience/HttpStandardResilienceOptions.cs
+++ b/src/Libraries/Microsoft.Extensions.Http.Resilience/Resilience/HttpStandardResilienceOptions.cs
@@ -1,10 +1,10 @@
-// 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.
 
 using System;
 using System.ComponentModel.DataAnnotations;
 using Microsoft.Extensions.Http.Resilience.Internal;
-using Microsoft.Extensions.Options.Validation;
+using Microsoft.Extensions.Options;
 using Polly.Timeout;
 
 namespace Microsoft.Extensions.Http.Resilience;
diff --git a/src/Libraries/Microsoft.Extensions.Http.Resilience/Resilience/Internal/Validators/HttpStandardResilienceOptionsValidator.cs b/src/Libraries/Microsoft.Extensions.Http.Resilience/Resilience/Internal/Validators/HttpStandardResilienceOptionsValidator.cs
index d07c5564bf4..06018537821 100644
--- a/src/Libraries/Microsoft.Extensions.Http.Resilience/Resilience/Internal/Validators/HttpStandardResilienceOptionsValidator.cs
+++ b/src/Libraries/Microsoft.Extensions.Http.Resilience/Resilience/Internal/Validators/HttpStandardResilienceOptionsValidator.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
 
 namespace Microsoft.Extensions.Http.Resilience.Internal.Validators;
 
diff --git a/src/Libraries/Microsoft.Extensions.Http.Resilience/Routing/EndpointGroup.cs b/src/Libraries/Microsoft.Extensions.Http.Resilience/Routing/EndpointGroup.cs
index 12a43a3959d..2c95550db07 100644
--- a/src/Libraries/Microsoft.Extensions.Http.Resilience/Routing/EndpointGroup.cs
+++ b/src/Libraries/Microsoft.Extensions.Http.Resilience/Routing/EndpointGroup.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Collections.Generic;
-using Microsoft.Extensions.Options.Validation;
+using Microsoft.Extensions.Options;
 
 namespace Microsoft.Extensions.Http.Resilience;
 
diff --git a/src/Libraries/Microsoft.Extensions.Http.Resilience/Routing/Internal/OrderedGroups/OrderedGroupsRoutingOptionsValidator.cs b/src/Libraries/Microsoft.Extensions.Http.Resilience/Routing/Internal/OrderedGroups/OrderedGroupsRoutingOptionsValidator.cs
index f69a0cd7226..3ba6ed3df24 100644
--- a/src/Libraries/Microsoft.Extensions.Http.Resilience/Routing/Internal/OrderedGroups/OrderedGroupsRoutingOptionsValidator.cs
+++ b/src/Libraries/Microsoft.Extensions.Http.Resilience/Routing/Internal/OrderedGroups/OrderedGroupsRoutingOptionsValidator.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
 
 namespace Microsoft.Extensions.Http.Resilience.Internal.Routing;
 
diff --git a/src/Libraries/Microsoft.Extensions.Http.Resilience/Routing/Internal/WeightedGroups/WeightedGroupsRoutingOptionsValidator.cs b/src/Libraries/Microsoft.Extensions.Http.Resilience/Routing/Internal/WeightedGroups/WeightedGroupsRoutingOptionsValidator.cs
index 34659cd2bcb..35686af2ba3 100644
--- a/src/Libraries/Microsoft.Extensions.Http.Resilience/Routing/Internal/WeightedGroups/WeightedGroupsRoutingOptionsValidator.cs
+++ b/src/Libraries/Microsoft.Extensions.Http.Resilience/Routing/Internal/WeightedGroups/WeightedGroupsRoutingOptionsValidator.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
 
 namespace Microsoft.Extensions.Http.Resilience.Internal.Routing;
 
diff --git a/src/Libraries/Microsoft.Extensions.Http.Resilience/Routing/OrderedGroupsRoutingOptions.cs b/src/Libraries/Microsoft.Extensions.Http.Resilience/Routing/OrderedGroupsRoutingOptions.cs
index 0b99daabf7b..6d856ab6345 100644
--- a/src/Libraries/Microsoft.Extensions.Http.Resilience/Routing/OrderedGroupsRoutingOptions.cs
+++ b/src/Libraries/Microsoft.Extensions.Http.Resilience/Routing/OrderedGroupsRoutingOptions.cs
@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using Microsoft.Extensions.Options.Validation;
+using Microsoft.Extensions.Options;
 
 namespace Microsoft.Extensions.Http.Resilience;
 
diff --git a/src/Libraries/Microsoft.Extensions.Http.Resilience/Routing/RoutingStrategyBuilderExtensions.cs b/src/Libraries/Microsoft.Extensions.Http.Resilience/Routing/RoutingStrategyBuilderExtensions.cs
index fbd3530f7c1..f1ef1667a4a 100644
--- a/src/Libraries/Microsoft.Extensions.Http.Resilience/Routing/RoutingStrategyBuilderExtensions.cs
+++ b/src/Libraries/Microsoft.Extensions.Http.Resilience/Routing/RoutingStrategyBuilderExtensions.cs
@@ -67,7 +67,7 @@ public static IRoutingStrategyBuilder ConfigureOrderedGroups(this IRoutingStrate
     /// <returns>
     /// The same routing builder instance.
     /// </returns>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public static IRoutingStrategyBuilder ConfigureOrderedGroups(this IRoutingStrategyBuilder builder, Action<OrderedGroupsRoutingOptions, IServiceProvider> configure)
     {
         _ = Throw.IfNull(builder);
@@ -121,7 +121,7 @@ public static IRoutingStrategyBuilder ConfigureWeightedGroups(this IRoutingStrat
     /// <returns>
     /// The same routing builder instance.
     /// </returns>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public static IRoutingStrategyBuilder ConfigureWeightedGroups(this IRoutingStrategyBuilder builder, Action<WeightedGroupsRoutingOptions, IServiceProvider> configure)
     {
         _ = Throw.IfNull(builder);
diff --git a/src/Libraries/Microsoft.Extensions.Http.Resilience/Routing/WeightedGroupsRoutingOptions.cs b/src/Libraries/Microsoft.Extensions.Http.Resilience/Routing/WeightedGroupsRoutingOptions.cs
index 7ce868e494d..5d3bdfa8bdd 100644
--- a/src/Libraries/Microsoft.Extensions.Http.Resilience/Routing/WeightedGroupsRoutingOptions.cs
+++ b/src/Libraries/Microsoft.Extensions.Http.Resilience/Routing/WeightedGroupsRoutingOptions.cs
@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using Microsoft.Extensions.Options.Validation;
+using Microsoft.Extensions.Options;
 
 namespace Microsoft.Extensions.Http.Resilience;
 
diff --git a/src/Libraries/Microsoft.Extensions.Http.Telemetry/Logging/Internal/LoggingOptionsValidator.cs b/src/Libraries/Microsoft.Extensions.Http.Telemetry/Logging/Internal/LoggingOptionsValidator.cs
index 582d87fd874..64103a74b4d 100644
--- a/src/Libraries/Microsoft.Extensions.Http.Telemetry/Logging/Internal/LoggingOptionsValidator.cs
+++ b/src/Libraries/Microsoft.Extensions.Http.Telemetry/Logging/Internal/LoggingOptionsValidator.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
 
 namespace Microsoft.Extensions.Http.Telemetry.Logging.Internal;
 
diff --git a/src/Libraries/Microsoft.Extensions.Http.Telemetry/Logging/LoggingOptions.cs b/src/Libraries/Microsoft.Extensions.Http.Telemetry/Logging/LoggingOptions.cs
index 0d44db5149a..aa05eb08e3f 100644
--- a/src/Libraries/Microsoft.Extensions.Http.Telemetry/Logging/LoggingOptions.cs
+++ b/src/Libraries/Microsoft.Extensions.Http.Telemetry/Logging/LoggingOptions.cs
@@ -134,7 +134,7 @@ public class LoggingOptions
     /// <value>
     /// The default value is <see cref="HttpRouteParameterRedactionMode.Strict"/>.
     /// </value>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public HttpRouteParameterRedactionMode RequestPathParameterRedactionMode { get; set; } = DefaultPathParameterRedactionMode;
 
     /// <summary>
diff --git a/src/Libraries/Microsoft.Extensions.Http.Telemetry/Metering/HttpClientMeteringExtensions.cs b/src/Libraries/Microsoft.Extensions.Http.Telemetry/Metering/HttpClientMeteringExtensions.cs
index 7927428efaf..5a96349c2ba 100644
--- a/src/Libraries/Microsoft.Extensions.Http.Telemetry/Metering/HttpClientMeteringExtensions.cs
+++ b/src/Libraries/Microsoft.Extensions.Http.Telemetry/Metering/HttpClientMeteringExtensions.cs
@@ -34,7 +34,7 @@ public static class HttpClientMeteringExtensions
     /// <returns>
     /// <see cref="IServiceCollection" /> instance for chaining.
     /// </returns>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public static IServiceCollection AddHttpClientMeteringForAllHttpClients(this IServiceCollection services)
     {
         _ = Throw.IfNull(services);
diff --git a/src/Libraries/Microsoft.Extensions.Http.Telemetry/Metering/HttpMeteringHandler.cs b/src/Libraries/Microsoft.Extensions.Http.Telemetry/Metering/HttpMeteringHandler.cs
index ba946b7198b..309ed468fc2 100644
--- a/src/Libraries/Microsoft.Extensions.Http.Telemetry/Metering/HttpMeteringHandler.cs
+++ b/src/Libraries/Microsoft.Extensions.Http.Telemetry/Metering/HttpMeteringHandler.cs
@@ -49,7 +49,7 @@ public class HttpMeteringHandler : DelegatingHandler
     /// </summary>
     /// <param name="meter">The meter.</param>
     /// <param name="enrichers">Enumerable of outgoing request metric enrichers.</param>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public HttpMeteringHandler(
         Meter<HttpMeteringHandler> meter,
         IEnumerable<IOutgoingRequestMetricEnricher> enrichers)
diff --git a/src/Libraries/Microsoft.Extensions.Http.Telemetry/Metering/HttpRequestResultType.cs b/src/Libraries/Microsoft.Extensions.Http.Telemetry/Metering/HttpRequestResultType.cs
index d6c33a18376..a24204404d5 100644
--- a/src/Libraries/Microsoft.Extensions.Http.Telemetry/Metering/HttpRequestResultType.cs
+++ b/src/Libraries/Microsoft.Extensions.Http.Telemetry/Metering/HttpRequestResultType.cs
@@ -9,7 +9,7 @@ namespace Microsoft.Extensions.Http.Telemetry.Metering;
 /// <summary>
 /// Statuses for classifying http request result.
 /// </summary>
-[Experimental]
+[Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
 [EnumStrings]
 public enum HttpRequestResultType
 {
diff --git a/src/Libraries/Microsoft.Extensions.Http.Telemetry/Microsoft.Extensions.Http.Telemetry.csproj b/src/Libraries/Microsoft.Extensions.Http.Telemetry/Microsoft.Extensions.Http.Telemetry.csproj
index 2e1f3b162ae..5da0cb9d370 100644
--- a/src/Libraries/Microsoft.Extensions.Http.Telemetry/Microsoft.Extensions.Http.Telemetry.csproj
+++ b/src/Libraries/Microsoft.Extensions.Http.Telemetry/Microsoft.Extensions.Http.Telemetry.csproj
@@ -8,7 +8,6 @@
   <PropertyGroup>
     <UseEnumStringsGenerator>true</UseEnumStringsGenerator>
     <UseLoggingGenerator>true</UseLoggingGenerator>
-    <UseOptionsValidationGenerator>true</UseOptionsValidationGenerator>
     <UseMeteringGenerator>true</UseMeteringGenerator>
     <UseMeteringReportsGenerator>true</UseMeteringReportsGenerator>
     <InjectGetOrAddOnLegacy>false</InjectGetOrAddOnLegacy>
@@ -32,7 +31,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\ToBeMoved\DependencyInjection.AutoActivation\DependencyInjection.AutoActivation.csproj" />
-    <ProjectReference Include="..\Microsoft.Extensions.Options.Validation\Microsoft.Extensions.Options.Validation.csproj" />
     <ProjectReference Include="..\Microsoft.Extensions.Telemetry\Microsoft.Extensions.Telemetry.csproj" />
     <ProjectReference Include="..\Microsoft.Extensions.EnumStrings\Microsoft.Extensions.EnumStrings.csproj" />
   </ItemGroup>
diff --git a/src/Libraries/Microsoft.Extensions.Http.Telemetry/Tracing/HttpClientTracingExtensions.cs b/src/Libraries/Microsoft.Extensions.Http.Telemetry/Tracing/HttpClientTracingExtensions.cs
index 5901f2668f3..85fff0062b3 100644
--- a/src/Libraries/Microsoft.Extensions.Http.Telemetry/Tracing/HttpClientTracingExtensions.cs
+++ b/src/Libraries/Microsoft.Extensions.Http.Telemetry/Tracing/HttpClientTracingExtensions.cs
@@ -82,7 +82,7 @@ public static TracerProviderBuilder AddHttpClientTracing(this TracerProviderBuil
     /// <param name="services">The <see cref="IServiceCollection"/> to add this enricher to.</param>
     /// <returns><see cref="IServiceCollection"/> for chaining.</returns>
     /// <exception cref="ArgumentNullException">The argument <paramref name="services"/> is <see langword="null"/>.</exception>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public static IServiceCollection AddHttpClientTraceEnricher<T>(this IServiceCollection services)
         where T : class, IHttpClientTraceEnricher
     {
@@ -98,7 +98,7 @@ public static IServiceCollection AddHttpClientTraceEnricher<T>(this IServiceColl
     /// <param name="enricher">Enricher to be added.</param>
     /// <returns><see cref="IServiceCollection"/> for chaining.</returns>
     /// <exception cref="ArgumentNullException">The argument <paramref name="services"/> or <paramref name="enricher"/> is <see langword="null" />.</exception>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public static IServiceCollection AddHttpClientTraceEnricher(this IServiceCollection services, IHttpClientTraceEnricher enricher)
     {
         _ = Throw.IfNull(services);
diff --git a/src/Libraries/Microsoft.Extensions.Http.Telemetry/Tracing/HttpClientTracingOptions.cs b/src/Libraries/Microsoft.Extensions.Http.Telemetry/Tracing/HttpClientTracingOptions.cs
index ac0e56ff31c..a1b678643a9 100644
--- a/src/Libraries/Microsoft.Extensions.Http.Telemetry/Tracing/HttpClientTracingOptions.cs
+++ b/src/Libraries/Microsoft.Extensions.Http.Telemetry/Tracing/HttpClientTracingOptions.cs
@@ -23,7 +23,7 @@ public class HttpClientTracingOptions
     /// <value>
     /// The default value is <see cref="HttpRouteParameterRedactionMode.Strict"/>.
     /// </value>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public HttpRouteParameterRedactionMode RequestPathParameterRedactionMode { get; set; } = DefaultPathParameterRedactionMode;
 
     /// <summary>
diff --git a/src/Libraries/Microsoft.Extensions.Http.Telemetry/Tracing/IHttpClientTraceEnricher.netfx.cs b/src/Libraries/Microsoft.Extensions.Http.Telemetry/Tracing/IHttpClientTraceEnricher.netfx.cs
index e557eb5ac59..307325ab00f 100644
--- a/src/Libraries/Microsoft.Extensions.Http.Telemetry/Tracing/IHttpClientTraceEnricher.netfx.cs
+++ b/src/Libraries/Microsoft.Extensions.Http.Telemetry/Tracing/IHttpClientTraceEnricher.netfx.cs
@@ -23,7 +23,7 @@ public interface IHttpClientTraceEnricher
     /// <remarks>
     /// If your enricher fetches some information from <see cref="HttpWebRequest"/> or <see cref="HttpWebResponse"/> to enrich HTTP traces, then make sure to check it for <see langword="null"/>.
     /// </remarks>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     void Enrich(Activity activity, HttpWebRequest? webRequest, HttpWebResponse? webResponse);
 }
 
diff --git a/src/Libraries/Microsoft.Extensions.Http.Telemetry/Tracing/IHttpPathRedactor.cs b/src/Libraries/Microsoft.Extensions.Http.Telemetry/Tracing/IHttpPathRedactor.cs
index f15a5465e66..1ec02d6758f 100644
--- a/src/Libraries/Microsoft.Extensions.Http.Telemetry/Tracing/IHttpPathRedactor.cs
+++ b/src/Libraries/Microsoft.Extensions.Http.Telemetry/Tracing/IHttpPathRedactor.cs
@@ -10,7 +10,7 @@ namespace Microsoft.Extensions.Http.Telemetry.Tracing;
 /// <summary>
 /// Interface for implementing a redaction mechanism for outgoing HTTP request paths.
 /// </summary>
-[Experimental]
+[Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
 public interface IHttpPathRedactor
 {
     /// <summary>
diff --git a/src/Libraries/Microsoft.Extensions.Http.Telemetry/Tracing/Internal/HttpClientTracingOptionsValidator.cs b/src/Libraries/Microsoft.Extensions.Http.Telemetry/Tracing/Internal/HttpClientTracingOptionsValidator.cs
index bdae1d856eb..efb9c70c443 100644
--- a/src/Libraries/Microsoft.Extensions.Http.Telemetry/Tracing/Internal/HttpClientTracingOptionsValidator.cs
+++ b/src/Libraries/Microsoft.Extensions.Http.Telemetry/Tracing/Internal/HttpClientTracingOptionsValidator.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
 
 namespace Microsoft.Extensions.Http.Telemetry.Tracing.Internal;
 
diff --git a/src/Libraries/Microsoft.Extensions.ObjectPool.DependencyInjection/DependencyInjectionPoolOptions.cs b/src/Libraries/Microsoft.Extensions.ObjectPool.DependencyInjection/DependencyInjectionPoolOptions.cs
index cbb398634ee..f5002f122ca 100644
--- a/src/Libraries/Microsoft.Extensions.ObjectPool.DependencyInjection/DependencyInjectionPoolOptions.cs
+++ b/src/Libraries/Microsoft.Extensions.ObjectPool.DependencyInjection/DependencyInjectionPoolOptions.cs
@@ -8,7 +8,7 @@ namespace Microsoft.Extensions.ObjectPool;
 /// <summary>
 /// Contains configuration for pools.
 /// </summary>
-[Experimental]
+[Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
 public sealed class DependencyInjectionPoolOptions
 {
     internal const int DefaultCapacity = 1024;
diff --git a/src/Libraries/Microsoft.Extensions.ObjectPool.DependencyInjection/ObjectPoolServiceCollectionExtensions.cs b/src/Libraries/Microsoft.Extensions.ObjectPool.DependencyInjection/ObjectPoolServiceCollectionExtensions.cs
index 2622a9d9958..29ea71e2995 100644
--- a/src/Libraries/Microsoft.Extensions.ObjectPool.DependencyInjection/ObjectPoolServiceCollectionExtensions.cs
+++ b/src/Libraries/Microsoft.Extensions.ObjectPool.DependencyInjection/ObjectPoolServiceCollectionExtensions.cs
@@ -15,7 +15,7 @@ namespace Microsoft.Extensions.ObjectPool;
 /// <summary>
 /// Extension methods for adding <see cref="ObjectPool{T}"/> to DI container.
 /// </summary>
-[Experimental]
+[Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
 public static class ObjectPoolServiceCollectionExtensions
 {
     /// <summary>
diff --git a/src/Libraries/Microsoft.Extensions.Options.Validation/Microsoft.Extensions.Options.Validation.csproj b/src/Libraries/Microsoft.Extensions.Options.Validation/Microsoft.Extensions.Options.Validation.csproj
deleted file mode 100644
index be466cb0dc0..00000000000
--- a/src/Libraries/Microsoft.Extensions.Options.Validation/Microsoft.Extensions.Options.Validation.csproj
+++ /dev/null
@@ -1,38 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <RootNamespace>Microsoft.Extensions.Options.Validation</RootNamespace>
-    <Description>Support for extended option validation.</Description>
-    <Workstream>Fundamentals</Workstream>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <InjectSharedTextFormatting>true</InjectSharedTextFormatting>
-    <InjectSharedPools>true</InjectSharedPools>
-    <InjectExperimentalAttributeOnLegacy>true</InjectExperimentalAttributeOnLegacy>
-    <BuildAnalyzerReferences>true</BuildAnalyzerReferences>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <Stage>normal</Stage>
-    <MinCodeCoverage>100</MinCodeCoverage>
-    <TempMinCodeCoverage>95</TempMinCodeCoverage>
-    <MinMutationScore>92</MinMutationScore>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Include="buildTransitive\*" CopyToOutputDirectory="PreserveNewest" Pack="true" PackagePath="buildTransitive\" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <AnalyzerReference Include="..\..\Generators\Microsoft.Gen.OptionsValidation\Roslyn3.8\Microsoft.Gen.OptionsValidation.Roslyn3.8.csproj" />
-    <AnalyzerReference Include="..\..\Generators\Microsoft.Gen.OptionsValidation\Roslyn4.0\Microsoft.Gen.OptionsValidation.Roslyn4.0.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Options" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <InternalsVisibleToTest Include="$(AssemblyName).Tests" />
-  </ItemGroup>
-</Project>
diff --git a/src/Libraries/Microsoft.Extensions.Options.Validation/Microsoft.Extensions.Options.Validation.json b/src/Libraries/Microsoft.Extensions.Options.Validation/Microsoft.Extensions.Options.Validation.json
deleted file mode 100644
index 89c2e051c7d..00000000000
--- a/src/Libraries/Microsoft.Extensions.Options.Validation/Microsoft.Extensions.Options.Validation.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "Name": "Microsoft.Extensions.Options.Validation, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35",
-  "Types": [
-    {
-      "Type": "sealed class Microsoft.Extensions.Options.Validation.OptionsValidatorAttribute : System.Attribute",
-      "Stage": "Stable",
-      "Methods": [
-        {
-          "Member": "Microsoft.Extensions.Options.Validation.OptionsValidatorAttribute.OptionsValidatorAttribute();",
-          "Stage": "Stable"
-        }
-      ]
-    },
-    {
-      "Type": "sealed class Microsoft.Extensions.Options.Validation.ValidateEnumeratedItemsAttribute : System.Attribute",
-      "Stage": "Experimental",
-      "Methods": [
-        {
-          "Member": "Microsoft.Extensions.Options.Validation.ValidateEnumeratedItemsAttribute.ValidateEnumeratedItemsAttribute();",
-          "Stage": "Experimental"
-        },
-        {
-          "Member": "Microsoft.Extensions.Options.Validation.ValidateEnumeratedItemsAttribute.ValidateEnumeratedItemsAttribute(System.Type validator);",
-          "Stage": "Experimental"
-        }
-      ],
-      "Properties": [
-        {
-          "Member": "System.Type? Microsoft.Extensions.Options.Validation.ValidateEnumeratedItemsAttribute.Validator { get; }",
-          "Stage": "Experimental"
-        }
-      ]
-    },
-    {
-      "Type": "sealed class Microsoft.Extensions.Options.Validation.ValidateObjectMembersAttribute : System.Attribute",
-      "Stage": "Stable",
-      "Methods": [
-        {
-          "Member": "Microsoft.Extensions.Options.Validation.ValidateObjectMembersAttribute.ValidateObjectMembersAttribute();",
-          "Stage": "Stable"
-        },
-        {
-          "Member": "Microsoft.Extensions.Options.Validation.ValidateObjectMembersAttribute.ValidateObjectMembersAttribute(System.Type validator);",
-          "Stage": "Stable"
-        }
-      ],
-      "Properties": [
-        {
-          "Member": "System.Type? Microsoft.Extensions.Options.Validation.ValidateObjectMembersAttribute.Validator { get; }",
-          "Stage": "Stable"
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/src/Libraries/Microsoft.Extensions.Options.Validation/OptionsValidatorAttribute.cs b/src/Libraries/Microsoft.Extensions.Options.Validation/OptionsValidatorAttribute.cs
deleted file mode 100644
index c5a8fa15ba4..00000000000
--- a/src/Libraries/Microsoft.Extensions.Options.Validation/OptionsValidatorAttribute.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System;
-using System.Diagnostics;
-
-namespace Microsoft.Extensions.Options.Validation;
-
-/// <summary>
-/// Triggers the automatic generation of the implementation of <see cref="Microsoft.Extensions.Options.IValidateOptions{T}" /> at compile time.
-/// </summary>
-[AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct)]
-[Conditional("CODE_GENERATION_ATTRIBUTES")]
-public sealed class OptionsValidatorAttribute : Attribute
-{
-}
diff --git a/src/Libraries/Microsoft.Extensions.Options.Validation/ValidateEnumeratedItemsAttribute.cs b/src/Libraries/Microsoft.Extensions.Options.Validation/ValidateEnumeratedItemsAttribute.cs
deleted file mode 100644
index 11ccd1c22fd..00000000000
--- a/src/Libraries/Microsoft.Extensions.Options.Validation/ValidateEnumeratedItemsAttribute.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System;
-using System.Diagnostics.CodeAnalysis;
-using Microsoft.Extensions.Options;
-
-namespace Microsoft.Extensions.Options.Validation;
-
-/// <summary>
-/// Marks a field or property to be enumerated, and each enumerated object to be validated.
-/// </summary>
-[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field)]
-[Experimental]
-public sealed class ValidateEnumeratedItemsAttribute : Attribute
-{
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ValidateEnumeratedItemsAttribute"/> class.
-    /// </summary>
-    /// <remarks>
-    /// Using this constructor for a field/property tells the code generator to
-    /// generate validation for the individual members of the enumerable's type.
-    /// </remarks>
-    public ValidateEnumeratedItemsAttribute()
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ValidateEnumeratedItemsAttribute"/> class.
-    /// </summary>
-    /// <param name="validator">A type that implements <see cref="IValidateOptions{T}" /> for the enumerable's type.</param>
-    /// <remarks>
-    /// Using this constructor for a field/property tells the code generator to use the given type to validate
-    /// the object held by the enumerable.
-    /// </remarks>
-    public ValidateEnumeratedItemsAttribute(Type validator)
-    {
-        Validator = validator;
-    }
-
-    /// <summary>
-    /// Gets the type to use to validate the enumerable's objects.
-    /// </summary>
-    public Type? Validator { get; }
-}
diff --git a/src/Libraries/Microsoft.Extensions.Options.Validation/ValidateObjectMembersAttribute.cs b/src/Libraries/Microsoft.Extensions.Options.Validation/ValidateObjectMembersAttribute.cs
deleted file mode 100644
index 6bdd46261f7..00000000000
--- a/src/Libraries/Microsoft.Extensions.Options.Validation/ValidateObjectMembersAttribute.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System;
-using Microsoft.Extensions.Options;
-
-namespace Microsoft.Extensions.Options.Validation;
-
-/// <summary>
-/// Marks a field or property to be validated transitively.
-/// </summary>
-[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field)]
-public sealed class ValidateObjectMembersAttribute : Attribute
-{
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ValidateObjectMembersAttribute"/> class.
-    /// </summary>
-    /// <remarks>
-    /// Using this constructor for a field/property tells the code generator to
-    /// generate validation for the individual members of the field/property's type.
-    /// </remarks>
-    public ValidateObjectMembersAttribute()
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ValidateObjectMembersAttribute"/> class.
-    /// </summary>
-    /// <param name="validator">A type that implements <see cref="IValidateOptions{T}" /> for the field/property's type.</param>
-    /// <remarks>
-    /// Using this constructor for a field/property tells the code generator to use the given type to validate
-    /// the object held by the field/property.
-    /// </remarks>
-    public ValidateObjectMembersAttribute(Type validator)
-    {
-        Validator = validator;
-    }
-
-    /// <summary>
-    /// Gets the type to use to validate a field or property.
-    /// </summary>
-    public Type? Validator { get; }
-}
diff --git a/src/Libraries/Microsoft.Extensions.Options.Validation/buildTransitive/Microsoft.Extensions.Options.Validation.props b/src/Libraries/Microsoft.Extensions.Options.Validation/buildTransitive/Microsoft.Extensions.Options.Validation.props
deleted file mode 100644
index 7bc91e44385..00000000000
--- a/src/Libraries/Microsoft.Extensions.Options.Validation/buildTransitive/Microsoft.Extensions.Options.Validation.props
+++ /dev/null
@@ -1,2 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>
diff --git a/src/Libraries/Microsoft.Extensions.Options.Validation/buildTransitive/Microsoft.Extensions.Options.Validation.targets b/src/Libraries/Microsoft.Extensions.Options.Validation/buildTransitive/Microsoft.Extensions.Options.Validation.targets
deleted file mode 100644
index ceadfacb28c..00000000000
--- a/src/Libraries/Microsoft.Extensions.Options.Validation/buildTransitive/Microsoft.Extensions.Options.Validation.targets
+++ /dev/null
@@ -1,3 +0,0 @@
-<Project>
-  <Import Project="$(MSBuildThisFileDirectory)/MultiTargetRoslynComponent.targets" />
-</Project>
diff --git a/src/Libraries/Microsoft.Extensions.Resilience/FaultInjection/FaultInjectionExtensions.cs b/src/Libraries/Microsoft.Extensions.Resilience/FaultInjection/FaultInjectionExtensions.cs
index 315decc55e3..f57611abe36 100644
--- a/src/Libraries/Microsoft.Extensions.Resilience/FaultInjection/FaultInjectionExtensions.cs
+++ b/src/Libraries/Microsoft.Extensions.Resilience/FaultInjection/FaultInjectionExtensions.cs
@@ -125,7 +125,7 @@ public static Context WithFaultInjection(this Context context, string groupName)
     /// <exception cref="ArgumentNullException">
     /// Any of the parameters are <see langword="null"/>.
     /// </exception>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public static Context WithFaultInjection(this Context context, FaultPolicyWeightAssignmentsOptions weightAssignments)
     {
         _ = Throw.IfNull(context);
diff --git a/src/Libraries/Microsoft.Extensions.Resilience/FaultInjection/FaultInjectionOptionsBuilder.cs b/src/Libraries/Microsoft.Extensions.Resilience/FaultInjection/FaultInjectionOptionsBuilder.cs
index eb126f6615f..93d68bd3c86 100644
--- a/src/Libraries/Microsoft.Extensions.Resilience/FaultInjection/FaultInjectionOptionsBuilder.cs
+++ b/src/Libraries/Microsoft.Extensions.Resilience/FaultInjection/FaultInjectionOptionsBuilder.cs
@@ -126,7 +126,7 @@ public FaultInjectionOptionsBuilder AddException(string key, Exception exception
     /// <exception cref="ArgumentException">
     /// <paramref name="key"/> is an empty string or <see langword="null"/>.
     /// </exception>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public FaultInjectionOptionsBuilder AddCustomResult(string key, object customResult)
     {
         _ = Throw.IfNull(customResult);
diff --git a/src/Libraries/Microsoft.Extensions.Resilience/FaultInjection/IChaosPolicyFactory.cs b/src/Libraries/Microsoft.Extensions.Resilience/FaultInjection/IChaosPolicyFactory.cs
index f89120b5073..32906ec0217 100644
--- a/src/Libraries/Microsoft.Extensions.Resilience/FaultInjection/IChaosPolicyFactory.cs
+++ b/src/Libraries/Microsoft.Extensions.Resilience/FaultInjection/IChaosPolicyFactory.cs
@@ -40,6 +40,6 @@ public interface IChaosPolicyFactory
     /// </summary>
     /// <typeparam name="TResult">The type of value policies created by this method will inject.</typeparam>
     /// <returns>A custom result policy, an instance of <see cref="AsyncInjectOutcomePolicy{TResult}"/>.</returns>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public AsyncInjectOutcomePolicy<TResult> CreateCustomResultPolicy<TResult>();
 }
diff --git a/src/Libraries/Microsoft.Extensions.Resilience/FaultInjection/Options/ChaosPolicyOptionsGroup.cs b/src/Libraries/Microsoft.Extensions.Resilience/FaultInjection/Options/ChaosPolicyOptionsGroup.cs
index 13473760cc1..ee261e4c747 100644
--- a/src/Libraries/Microsoft.Extensions.Resilience/FaultInjection/Options/ChaosPolicyOptionsGroup.cs
+++ b/src/Libraries/Microsoft.Extensions.Resilience/FaultInjection/Options/ChaosPolicyOptionsGroup.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Diagnostics.CodeAnalysis;
-using Microsoft.Extensions.Options.Validation;
+using Microsoft.Extensions.Options;
 
 namespace Microsoft.Extensions.Resilience.FaultInjection;
 
@@ -42,6 +42,6 @@ public class ChaosPolicyOptionsGroup
     /// Gets or sets the custom result policy options of the chaos policy options group.
     /// </summary>
     [ValidateObjectMembers]
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public CustomResultPolicyOptions? CustomResultPolicyOptions { get; set; }
 }
diff --git a/src/Libraries/Microsoft.Extensions.Resilience/FaultInjection/Options/CustomResultPolicyOptions.cs b/src/Libraries/Microsoft.Extensions.Resilience/FaultInjection/Options/CustomResultPolicyOptions.cs
index 92cea07fe31..8fd856fbe58 100644
--- a/src/Libraries/Microsoft.Extensions.Resilience/FaultInjection/Options/CustomResultPolicyOptions.cs
+++ b/src/Libraries/Microsoft.Extensions.Resilience/FaultInjection/Options/CustomResultPolicyOptions.cs
@@ -9,7 +9,7 @@ namespace Microsoft.Extensions.Resilience.FaultInjection;
 /// <summary>
 /// Custom Result chaos policy options definition.
 /// </summary>
-[Experimental]
+[Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
 public class CustomResultPolicyOptions : ChaosPolicyOptionsBase
 {
     /// <summary>
@@ -20,7 +20,7 @@ public class CustomResultPolicyOptions : ChaosPolicyOptionsBase
     /// from <see cref="ICustomResultRegistry"/>.
     /// Default is set to <see cref="string.Empty"/>.
     /// </remarks>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     [Required]
     public string CustomResultKey { get; set; } = string.Empty;
 }
diff --git a/src/Libraries/Microsoft.Extensions.Resilience/FaultInjection/Options/FaultPolicyWeightAssignmentsOptions.cs b/src/Libraries/Microsoft.Extensions.Resilience/FaultInjection/Options/FaultPolicyWeightAssignmentsOptions.cs
index 05254afa450..53daba3e416 100644
--- a/src/Libraries/Microsoft.Extensions.Resilience/FaultInjection/Options/FaultPolicyWeightAssignmentsOptions.cs
+++ b/src/Libraries/Microsoft.Extensions.Resilience/FaultInjection/Options/FaultPolicyWeightAssignmentsOptions.cs
@@ -9,7 +9,7 @@ namespace Microsoft.Extensions.Resilience.FaultInjection;
 /// <summary>
 /// Class to contain fault-injection policy weight assignments.
 /// </summary>
-[Experimental]
+[Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
 public class FaultPolicyWeightAssignmentsOptions
 {
     /// <summary>
diff --git a/src/Libraries/Microsoft.Extensions.Resilience/Microsoft.Extensions.Resilience.csproj b/src/Libraries/Microsoft.Extensions.Resilience/Microsoft.Extensions.Resilience.csproj
index 24fddc1e8f9..4205a709204 100644
--- a/src/Libraries/Microsoft.Extensions.Resilience/Microsoft.Extensions.Resilience.csproj
+++ b/src/Libraries/Microsoft.Extensions.Resilience/Microsoft.Extensions.Resilience.csproj
@@ -8,7 +8,6 @@
   <PropertyGroup>
     <UseLoggingGenerator>true</UseLoggingGenerator>
     <UseMeteringGenerator>true</UseMeteringGenerator>
-    <UseOptionsValidationGenerator>true</UseOptionsValidationGenerator>
     <UseEnumStringsGenerator>true</UseEnumStringsGenerator>
     <InjectTrimAttributesOnLegacy>true</InjectTrimAttributesOnLegacy>
     <InjectGetOrAddOnLegacy>true</InjectGetOrAddOnLegacy>
@@ -27,7 +26,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.Extensions.Diagnostics.ExceptionSummarization\Microsoft.Extensions.Diagnostics.ExceptionSummarization.csproj" />
-    <ProjectReference Include="..\Microsoft.Extensions.Options.Validation\Microsoft.Extensions.Options.Validation.csproj" />
     <ProjectReference Include="..\Microsoft.Extensions.Telemetry\Microsoft.Extensions.Telemetry.csproj" />
     <ProjectReference Include="..\Microsoft.Extensions.EnumStrings\Microsoft.Extensions.EnumStrings.csproj" />
   </ItemGroup>
diff --git a/src/Libraries/Microsoft.Extensions.Resilience/Polly/Internals/PipelineId.cs b/src/Libraries/Microsoft.Extensions.Resilience/Polly/Internals/PipelineId.cs
index 94afb13edd6..4c995c9bcc6 100644
--- a/src/Libraries/Microsoft.Extensions.Resilience/Polly/Internals/PipelineId.cs
+++ b/src/Libraries/Microsoft.Extensions.Resilience/Polly/Internals/PipelineId.cs
@@ -9,7 +9,7 @@ namespace Microsoft.Extensions.Resilience.Internal;
 /// <summary>
 /// Composite key for the pipeline.
 /// </summary>
-[Experimental]
+[Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
 internal sealed record PipelineId(string PipelineName, string PipelineKey, string? ResultType, string PolicyPipelineKey)
 {
     /// <summary>
@@ -19,7 +19,7 @@ internal sealed record PipelineId(string PipelineName, string PipelineKey, strin
     /// <param name="pipelineName">The pipeline name.</param>
     /// <param name="pipelineKey">The pipeline key.</param>
     /// <returns>The pipeline id instance.</returns>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public static PipelineId Create<T>(string pipelineName, string pipelineKey)
     {
         var policyPipelineKey = string.IsNullOrEmpty(pipelineKey) ? $"{typeof(T).Name}-{pipelineName}" : $"{typeof(T).Name}-{pipelineName}-{pipelineKey}";
@@ -33,7 +33,7 @@ public static PipelineId Create<T>(string pipelineName, string pipelineKey)
     /// <param name="pipelineName">The pipeline name.</param>
     /// <param name="pipelineKey">The pipeline key.</param>
     /// <returns>The pipeline id instance.</returns>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public static PipelineId Create(string pipelineName, string pipelineKey)
     {
         var policyPipelineKey = string.IsNullOrEmpty(pipelineKey) ? pipelineName : $"{pipelineName}-{pipelineKey}";
diff --git a/src/Libraries/Microsoft.Extensions.Resilience/Polly/Internals/Validators/Generated/BulkheadPolicyOptionsValidator.cs b/src/Libraries/Microsoft.Extensions.Resilience/Polly/Internals/Validators/Generated/BulkheadPolicyOptionsValidator.cs
index 933add3b643..936851360e0 100644
--- a/src/Libraries/Microsoft.Extensions.Resilience/Polly/Internals/Validators/Generated/BulkheadPolicyOptionsValidator.cs
+++ b/src/Libraries/Microsoft.Extensions.Resilience/Polly/Internals/Validators/Generated/BulkheadPolicyOptionsValidator.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
 using Microsoft.Extensions.Resilience.Options;
 
 namespace Microsoft.Extensions.Resilience.Internal;
diff --git a/src/Libraries/Microsoft.Extensions.Resilience/Polly/Internals/Validators/Generated/CircuitBreakerPolicyOptionsValidator.cs b/src/Libraries/Microsoft.Extensions.Resilience/Polly/Internals/Validators/Generated/CircuitBreakerPolicyOptionsValidator.cs
index b9e44fb2c27..697662e702d 100644
--- a/src/Libraries/Microsoft.Extensions.Resilience/Polly/Internals/Validators/Generated/CircuitBreakerPolicyOptionsValidator.cs
+++ b/src/Libraries/Microsoft.Extensions.Resilience/Polly/Internals/Validators/Generated/CircuitBreakerPolicyOptionsValidator.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
 using Microsoft.Extensions.Resilience.Options;
 
 namespace Microsoft.Extensions.Resilience.Internal;
diff --git a/src/Libraries/Microsoft.Extensions.Resilience/Polly/Internals/Validators/Generated/CircuitBreakerPolicyOptionsValidatorT.cs b/src/Libraries/Microsoft.Extensions.Resilience/Polly/Internals/Validators/Generated/CircuitBreakerPolicyOptionsValidatorT.cs
index 1721378ee28..f206d6f5b60 100644
--- a/src/Libraries/Microsoft.Extensions.Resilience/Polly/Internals/Validators/Generated/CircuitBreakerPolicyOptionsValidatorT.cs
+++ b/src/Libraries/Microsoft.Extensions.Resilience/Polly/Internals/Validators/Generated/CircuitBreakerPolicyOptionsValidatorT.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
 using Microsoft.Extensions.Resilience.Options;
 
 namespace Microsoft.Extensions.Resilience.Internal;
diff --git a/src/Libraries/Microsoft.Extensions.Resilience/Polly/Internals/Validators/Generated/HedgingPolicyOptionsValidator.cs b/src/Libraries/Microsoft.Extensions.Resilience/Polly/Internals/Validators/Generated/HedgingPolicyOptionsValidator.cs
index 96912a27e8c..c337243b3e8 100644
--- a/src/Libraries/Microsoft.Extensions.Resilience/Polly/Internals/Validators/Generated/HedgingPolicyOptionsValidator.cs
+++ b/src/Libraries/Microsoft.Extensions.Resilience/Polly/Internals/Validators/Generated/HedgingPolicyOptionsValidator.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
 using Microsoft.Extensions.Resilience.Options;
 
 namespace Microsoft.Extensions.Resilience.Internal;
diff --git a/src/Libraries/Microsoft.Extensions.Resilience/Polly/Internals/Validators/Generated/HedgingPolicyOptionsValidatorT.cs b/src/Libraries/Microsoft.Extensions.Resilience/Polly/Internals/Validators/Generated/HedgingPolicyOptionsValidatorT.cs
index 7a01df2ddfb..d96ec809a5d 100644
--- a/src/Libraries/Microsoft.Extensions.Resilience/Polly/Internals/Validators/Generated/HedgingPolicyOptionsValidatorT.cs
+++ b/src/Libraries/Microsoft.Extensions.Resilience/Polly/Internals/Validators/Generated/HedgingPolicyOptionsValidatorT.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
 using Microsoft.Extensions.Resilience.Options;
 
 namespace Microsoft.Extensions.Resilience.Internal;
diff --git a/src/Libraries/Microsoft.Extensions.Resilience/Polly/Internals/Validators/Generated/RetryPolicyOptionsValidator.cs b/src/Libraries/Microsoft.Extensions.Resilience/Polly/Internals/Validators/Generated/RetryPolicyOptionsValidator.cs
index 79de3d93c12..0e5267a1be0 100644
--- a/src/Libraries/Microsoft.Extensions.Resilience/Polly/Internals/Validators/Generated/RetryPolicyOptionsValidator.cs
+++ b/src/Libraries/Microsoft.Extensions.Resilience/Polly/Internals/Validators/Generated/RetryPolicyOptionsValidator.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
 using Microsoft.Extensions.Resilience.Options;
 
 namespace Microsoft.Extensions.Resilience.Internal;
diff --git a/src/Libraries/Microsoft.Extensions.Resilience/Polly/Internals/Validators/Generated/RetryPolicyOptionsValidatorT.cs b/src/Libraries/Microsoft.Extensions.Resilience/Polly/Internals/Validators/Generated/RetryPolicyOptionsValidatorT.cs
index 4f17bf0bbb0..80c1abb7fc0 100644
--- a/src/Libraries/Microsoft.Extensions.Resilience/Polly/Internals/Validators/Generated/RetryPolicyOptionsValidatorT.cs
+++ b/src/Libraries/Microsoft.Extensions.Resilience/Polly/Internals/Validators/Generated/RetryPolicyOptionsValidatorT.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
 using Microsoft.Extensions.Resilience.Options;
 
 namespace Microsoft.Extensions.Resilience.Internal;
diff --git a/src/Libraries/Microsoft.Extensions.Resilience/Polly/Internals/Validators/Generated/TimeoutPolicyOptionsValidator.cs b/src/Libraries/Microsoft.Extensions.Resilience/Polly/Internals/Validators/Generated/TimeoutPolicyOptionsValidator.cs
index a12aee93c2c..adfd092cebf 100644
--- a/src/Libraries/Microsoft.Extensions.Resilience/Polly/Internals/Validators/Generated/TimeoutPolicyOptionsValidator.cs
+++ b/src/Libraries/Microsoft.Extensions.Resilience/Polly/Internals/Validators/Generated/TimeoutPolicyOptionsValidator.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
 using Microsoft.Extensions.Resilience.Options;
 
 namespace Microsoft.Extensions.Resilience.Internal;
diff --git a/src/Libraries/Microsoft.Extensions.Resilience/Polly/ResilienceDimensions.cs b/src/Libraries/Microsoft.Extensions.Resilience/Polly/ResilienceDimensions.cs
index 52705a74e0a..a4343075435 100644
--- a/src/Libraries/Microsoft.Extensions.Resilience/Polly/ResilienceDimensions.cs
+++ b/src/Libraries/Microsoft.Extensions.Resilience/Polly/ResilienceDimensions.cs
@@ -15,77 +15,77 @@ namespace Microsoft.Extensions.Resilience;
 /// Constants are standardized in <see href="https://aka.ms/commonschema">MS Common Schema</see>.
 /// </remarks>
 // Avoid changing const values in this class by all means. Such a breaking change would break customer's monitoring.
-[Experimental]
+[Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
 [EditorBrowsable(EditorBrowsableState.Never)]
 public static class ResilienceDimensions
 {
     /// <summary>
     /// Pipeline name.
     /// </summary>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     [EditorBrowsable(EditorBrowsableState.Never)]
     public const string PipelineName = "pipeline_name";
 
     /// <summary>
     /// Pipeline key.
     /// </summary>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     [EditorBrowsable(EditorBrowsableState.Never)]
     public const string PipelineKey = "pipeline_key";
 
     /// <summary>
     /// Result type.
     /// </summary>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     [EditorBrowsable(EditorBrowsableState.Never)]
     public const string ResultType = "result_type";
 
     /// <summary>
     /// Policy name.
     /// </summary>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     [EditorBrowsable(EditorBrowsableState.Never)]
     public const string PolicyName = "policy_name";
 
     /// <summary>
     /// Event name.
     /// </summary>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     [EditorBrowsable(EditorBrowsableState.Never)]
     public const string EventName = "event_name";
 
     /// <summary>
     /// Failure source.
     /// </summary>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     [EditorBrowsable(EditorBrowsableState.Never)]
     public const string FailureSource = "failure_source";
 
     /// <summary>
     /// Failure reason.
     /// </summary>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     [EditorBrowsable(EditorBrowsableState.Never)]
     public const string FailureReason = "failure_reason";
 
     /// <summary>
     /// Failure summary.
     /// </summary>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     [EditorBrowsable(EditorBrowsableState.Never)]
     public const string FailureSummary = "failure_summary";
 
     /// <summary>
     /// Dependency name.
     /// </summary>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     [EditorBrowsable(EditorBrowsableState.Never)]
     public const string DependencyName = "dep_name";
 
     /// <summary>
     /// Request name.
     /// </summary>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     [EditorBrowsable(EditorBrowsableState.Never)]
     public const string RequestName = "req_name";
 
@@ -93,7 +93,7 @@ public static class ResilienceDimensions
     /// Gets a list of all dimension names.
     /// </summary>
     /// <returns>A read-only <see cref="IReadOnlyList{String}"/> of all dimension names.</returns>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     [EditorBrowsable(EditorBrowsableState.Never)]
     public static IReadOnlyList<string> DimensionNames { get; } =
         Array.AsReadOnly(new[]
diff --git a/src/Libraries/Microsoft.Extensions.Resilience/Resilience/Internal/OptionsBuilderExtensions.cs b/src/Libraries/Microsoft.Extensions.Resilience/Resilience/Internal/OptionsBuilderExtensions.cs
index 0bff0195411..2a7fd66022a 100644
--- a/src/Libraries/Microsoft.Extensions.Resilience/Resilience/Internal/OptionsBuilderExtensions.cs
+++ b/src/Libraries/Microsoft.Extensions.Resilience/Resilience/Internal/OptionsBuilderExtensions.cs
@@ -13,7 +13,7 @@ namespace Microsoft.Extensions.Resilience.Internal;
 /// <summary>
 /// Extensions for <see cref="OptionsBuilder{TOptions}"/>.
 /// </summary>
-[Experimental]
+[Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
 internal static class OptionsBuilderExtensions
 {
     /// <summary>
diff --git a/src/Libraries/Microsoft.Extensions.Resilience/Resilience/Internal/ResiliencePipelineBuilderExtensions.cs b/src/Libraries/Microsoft.Extensions.Resilience/Resilience/Internal/ResiliencePipelineBuilderExtensions.cs
index bc3e5c58506..9a6106c6e0b 100644
--- a/src/Libraries/Microsoft.Extensions.Resilience/Resilience/Internal/ResiliencePipelineBuilderExtensions.cs
+++ b/src/Libraries/Microsoft.Extensions.Resilience/Resilience/Internal/ResiliencePipelineBuilderExtensions.cs
@@ -15,7 +15,7 @@ namespace Microsoft.Extensions.Resilience.Internal;
 /// Pub-internal extension methods for the <see cref="IResiliencePipelineBuilder{TResult}"/>.
 /// </summary>
 /// <remarks>Do not use this class directly, it's reserved for internal use and can change at any time.</remarks>
-[Experimental]
+[Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
 internal static class ResiliencePipelineBuilderExtensions
 {
     /// <summary>
diff --git a/src/Libraries/Microsoft.Extensions.Resilience/Resilience/Internal/ResiliencePipelineFactoryOptionsValidatorT.cs b/src/Libraries/Microsoft.Extensions.Resilience/Resilience/Internal/ResiliencePipelineFactoryOptionsValidatorT.cs
index 12b23fc8587..11d677c1883 100644
--- a/src/Libraries/Microsoft.Extensions.Resilience/Resilience/Internal/ResiliencePipelineFactoryOptionsValidatorT.cs
+++ b/src/Libraries/Microsoft.Extensions.Resilience/Resilience/Internal/ResiliencePipelineFactoryOptionsValidatorT.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
 
 namespace Microsoft.Extensions.Resilience.Internal;
 
diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Http/TelemetryConstants.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Http/TelemetryConstants.cs
index 7ccb595318c..e942a25099d 100644
--- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Http/TelemetryConstants.cs
+++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Http/TelemetryConstants.cs
@@ -28,12 +28,12 @@ public static class TelemetryConstants
     /// <summary>
     /// Header for client application name, sent on an outgoing http call.
     /// </summary>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public const string ClientApplicationNameHeader = "X-ClientApplication";
 
     /// <summary>
     /// Header for server application name, sent on a http request.
     /// </summary>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public const string ServerApplicationNameHeader = "X-ServerApplication";
 }
diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/LogMethodAttribute.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/LogMethodAttribute.cs
index 5942a141091..8e7659d3cc2 100644
--- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/LogMethodAttribute.cs
+++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Logging/LogMethodAttribute.cs
@@ -266,7 +266,7 @@ public LogMethodAttribute(int eventId)
     /// }
     /// </code>
     /// </example>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public LogMethodAttribute()
     {
         EventId = 0;
diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Metering/MeterT.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Metering/MeterT.cs
index 6726b6cd6d2..3f2f6a034ab 100644
--- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Metering/MeterT.cs
+++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Metering/MeterT.cs
@@ -12,13 +12,13 @@ namespace Microsoft.Extensions.Telemetry.Metering;
 /// A meter class where the meter name is derived from the specified <typeparamref name="TMeterName"/> type name.
 /// </summary>
 /// <typeparam name="TMeterName">The type whose name is used as the meter name.</typeparam>
-[Experimental]
+[Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
 public class Meter<TMeterName> : Meter
 {
     /// <summary>
     /// Initializes a new instance of the <see cref="Meter{TMeterName}"/> class.
     /// </summary>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public Meter()
         : base(typeof(TMeterName).FullName!)
     {
diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Metering/MeteringExtensions.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Metering/MeteringExtensions.cs
index e69dbb13093..a4f6354dabc 100644
--- a/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Metering/MeteringExtensions.cs
+++ b/src/Libraries/Microsoft.Extensions.Telemetry.Abstractions/Metering/MeteringExtensions.cs
@@ -17,7 +17,7 @@ public static class MeteringExtensions
     /// </summary>
     /// <param name="services">The dependency injection container to register metering into.</param>
     /// <returns>The value of <paramref name="services"/>.</returns>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public static IServiceCollection RegisterMetering(this IServiceCollection services)
     {
         services.TryAdd(ServiceDescriptor.Singleton(typeof(Meter<>), typeof(Meter<>)));
diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Metering/CollectedMeasurement.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Metering/CollectedMeasurement.cs
index c3624db32c0..687a62b44d7 100644
--- a/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Metering/CollectedMeasurement.cs
+++ b/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Metering/CollectedMeasurement.cs
@@ -14,7 +14,7 @@ namespace Microsoft.Extensions.Telemetry.Testing.Metering;
 /// Represents a single measurement performed by an instrument.
 /// </summary>
 /// <typeparam name="T">The type of metric measurement value.</typeparam>
-[Experimental]
+[Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
 [DebuggerDisplay("{DebuggerToString(),nq}")]
 public sealed class CollectedMeasurement<T>
     where T : struct
diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Metering/MeasurementExtensions.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Metering/MeasurementExtensions.cs
index 9986306f002..ee8bed03241 100644
--- a/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Metering/MeasurementExtensions.cs
+++ b/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Metering/MeasurementExtensions.cs
@@ -11,7 +11,7 @@ namespace Microsoft.Extensions.Telemetry.Testing.Metering;
 /// <summary>
 /// Extensions to simplify working with lists of measurements.
 /// </summary>
-[Experimental]
+[Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
 public static class MeasurementExtensions
 {
     /// <summary>
diff --git a/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Metering/MetricCollector.cs b/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Metering/MetricCollector.cs
index 4d162b9b5ab..cdf8405b73f 100644
--- a/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Metering/MetricCollector.cs
+++ b/src/Libraries/Microsoft.Extensions.Telemetry.Testing/Metering/MetricCollector.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.
 
 using System;
@@ -17,7 +17,7 @@ namespace Microsoft.Extensions.Telemetry.Testing.Metering;
 /// Collects the measurements published from an <see cref="Instrument{T}"/> or <see cref="ObservableInstrument{T}"/>.
 /// </summary>
 /// <typeparam name="T">The type of metric data being recorded.</typeparam>
-[Experimental]
+[Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
 [DebuggerDisplay("{_measurements.Count} measurements")]
 public sealed class MetricCollector<T> : IDisposable
     where T : struct
diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Logging/LoggerProvider.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Logging/LoggerProvider.cs
index b913abc9027..7a724330783 100644
--- a/src/Libraries/Microsoft.Extensions.Telemetry/Logging/LoggerProvider.cs
+++ b/src/Libraries/Microsoft.Extensions.Telemetry/Logging/LoggerProvider.cs
@@ -19,7 +19,7 @@ namespace Microsoft.Extensions.Telemetry.Logging;
 /// OpenTelemetry Logger provider class.
 /// </summary>
 [ProviderAlias("R9")]
-[Experimental]
+[Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
 public sealed class LoggerProvider : BaseProvider, ILoggerProvider, ISupportExternalScope
 {
     private const int ProcessorShutdownGracePeriodInMs = 5000;
diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Logging/LoggingOptions.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Logging/LoggingOptions.cs
index 1188d2f7e11..8cdc35b2251 100644
--- a/src/Libraries/Microsoft.Extensions.Telemetry/Logging/LoggingOptions.cs
+++ b/src/Libraries/Microsoft.Extensions.Telemetry/Logging/LoggingOptions.cs
@@ -59,7 +59,7 @@ public class LoggingOptions
     /// <remarks>
     /// When set to a value less than 2 KB or greater than 32 KB, an exception will be thrown.
     /// </remarks>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     [Range(MinDefinedStackTraceLength, MaxDefinedStackTraceLength, ErrorMessage = "Maximum stack trace length should be between 2kb and 32kb")]
     public int MaxStackTraceLength { get; set; } = DefaultStackTraceLength;
 }
diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Logging/LoggingOptionsValidator.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Logging/LoggingOptionsValidator.cs
index 9d9489c9a66..3f396c504e6 100644
--- a/src/Libraries/Microsoft.Extensions.Telemetry/Logging/LoggingOptionsValidator.cs
+++ b/src/Libraries/Microsoft.Extensions.Telemetry/Logging/LoggingOptionsValidator.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
 
 namespace Microsoft.Extensions.Telemetry.Logging;
 
diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Metering.Collectors.EventCounters/EventCountersCollectorOptions.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Metering.Collectors.EventCounters/EventCountersCollectorOptions.cs
index 2bb199698a3..d9be1869744 100644
--- a/src/Libraries/Microsoft.Extensions.Telemetry/Metering.Collectors.EventCounters/EventCountersCollectorOptions.cs
+++ b/src/Libraries/Microsoft.Extensions.Telemetry/Metering.Collectors.EventCounters/EventCountersCollectorOptions.cs
@@ -69,7 +69,7 @@ public class EventCountersCollectorOptions
     /// EventSource: "Microsoft-AspNetCore-Server-Kestrel", Counters:
     ///   - "connection-queue-length", "request-queue-length".
     /// </remarks>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public bool IncludeRecommendedDefault { get; set; }
 
 #if NET5_0_OR_GREATER
diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Metering.Collectors.EventCounters/Internal/EventCountersCollectorOptionsValidator.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Metering.Collectors.EventCounters/Internal/EventCountersCollectorOptionsValidator.cs
index 8eb3e85bc89..0c70de10791 100644
--- a/src/Libraries/Microsoft.Extensions.Telemetry/Metering.Collectors.EventCounters/Internal/EventCountersCollectorOptionsValidator.cs
+++ b/src/Libraries/Microsoft.Extensions.Telemetry/Metering.Collectors.EventCounters/Internal/EventCountersCollectorOptionsValidator.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
 
 namespace Microsoft.Extensions.Telemetry.Metering.Internal;
 
diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Metering/MeteringOptions.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Metering/MeteringOptions.cs
index 76b4234fd6f..141a982c8f4 100644
--- a/src/Libraries/Microsoft.Extensions.Telemetry/Metering/MeteringOptions.cs
+++ b/src/Libraries/Microsoft.Extensions.Telemetry/Metering/MeteringOptions.cs
@@ -9,7 +9,7 @@ namespace Microsoft.Extensions.Telemetry.Metering;
 /// <summary>
 /// Options for configuring metering.
 /// </summary>
-[Experimental]
+[Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
 public class MeteringOptions
 {
     /// <summary>
diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Metering/OTelMeteringExtensions.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Metering/OTelMeteringExtensions.cs
index 688762886bc..3fccb6ef825 100644
--- a/src/Libraries/Microsoft.Extensions.Telemetry/Metering/OTelMeteringExtensions.cs
+++ b/src/Libraries/Microsoft.Extensions.Telemetry/Metering/OTelMeteringExtensions.cs
@@ -14,7 +14,7 @@ namespace Microsoft.Extensions.Telemetry.Metering;
 /// <summary>
 /// Metering extensions for OpenTelemetry based metrics.
 /// </summary>
-[Experimental]
+[Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
 public static class OTelMeteringExtensions
 {
     /// <summary>
@@ -22,7 +22,7 @@ public static class OTelMeteringExtensions
     /// </summary>
     /// <param name="builder"><see cref="MeterProviderBuilder"/> instance.</param>
     /// <returns>Returns <see cref="MeterProviderBuilder"/> for chaining.</returns>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public static MeterProviderBuilder AddMetering(
         this MeterProviderBuilder builder)
     {
@@ -35,7 +35,7 @@ public static MeterProviderBuilder AddMetering(
     /// <param name="builder"><see cref="MeterProviderBuilder"/> instance.</param>
     /// <param name="configurationSection">Configuration section that contains <see cref="MeteringOptions"/>.</param>
     /// <returns>Returns <see cref="MeterProviderBuilder"/> for chaining.</returns>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public static MeterProviderBuilder AddMetering(
         this MeterProviderBuilder builder,
         IConfigurationSection configurationSection)
@@ -52,7 +52,7 @@ public static MeterProviderBuilder AddMetering(
     /// <param name="builder"><see cref="MeterProviderBuilder"/> instance.</param>
     /// <param name="configure">The <see cref="MeteringOptions"/> configuration delegate.</param>
     /// <returns>Returns <see cref="MeterProviderBuilder"/> for chaining.</returns>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public static MeterProviderBuilder AddMetering(
         this MeterProviderBuilder builder,
         Action<MeteringOptions> configure)
diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Microsoft.Extensions.Telemetry.csproj b/src/Libraries/Microsoft.Extensions.Telemetry/Microsoft.Extensions.Telemetry.csproj
index 026721a8001..31890f7372b 100644
--- a/src/Libraries/Microsoft.Extensions.Telemetry/Microsoft.Extensions.Telemetry.csproj
+++ b/src/Libraries/Microsoft.Extensions.Telemetry/Microsoft.Extensions.Telemetry.csproj
@@ -16,7 +16,6 @@
     <InjectSharedMemoization>true</InjectSharedMemoization>
     <InjectGetOrAddOnLegacy>true</InjectGetOrAddOnLegacy>
     <UseLoggingGenerator>true</UseLoggingGenerator>
-    <UseOptionsValidationGenerator>true</UseOptionsValidationGenerator>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -29,12 +28,12 @@
   <ItemGroup>
     <ProjectReference Include="..\..\ToBeMoved\DependencyInjection.AutoActivation\DependencyInjection.AutoActivation.csproj" />
     <ProjectReference Include="..\Microsoft.Extensions.AmbientMetadata.Application\Microsoft.Extensions.AmbientMetadata.Application.csproj" />
-    <ProjectReference Include="..\Microsoft.Extensions.Options.Validation\Microsoft.Extensions.Options.Validation.csproj" />
     <ProjectReference Include="..\Microsoft.Extensions.Compliance.Abstractions\Microsoft.Extensions.Compliance.Abstractions.csproj" />
     <ProjectReference Include="..\Microsoft.Extensions.Telemetry.Abstractions\Microsoft.Extensions.Telemetry.Abstractions.csproj" />
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Options" />
     <PackageReference Include="Microsoft.Bcl.TimeProvider" />
     <!-- Manually referencing Logging.Configuration in nca3.1 which is a transitive dependency of OpenTelemetry in order to bump the version to 8.0 era -->
     <PackageReference Include="Microsoft.Extensions.Logging.Configuration" />
diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Telemetry.Internal/IHttpRouteFormatter.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Telemetry.Internal/IHttpRouteFormatter.cs
index f109271773f..258e30afd33 100644
--- a/src/Libraries/Microsoft.Extensions.Telemetry/Telemetry.Internal/IHttpRouteFormatter.cs
+++ b/src/Libraries/Microsoft.Extensions.Telemetry/Telemetry.Internal/IHttpRouteFormatter.cs
@@ -21,7 +21,7 @@ internal interface IHttpRouteFormatter
     /// <param name="redactionMode">Strategy to decide how parameters are redacted.</param>
     /// <param name="parametersToRedact">Dictionary of parameters with their data classification that needs to be redacted.</param>
     /// <returns>Returns formatted path with sensitive parameter values redacted.</returns>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     string Format(string httpRoute, string httpPath, HttpRouteParameterRedactionMode redactionMode, IReadOnlyDictionary<string, DataClassification> parametersToRedact);
 
     /// <summary>
@@ -32,6 +32,6 @@ internal interface IHttpRouteFormatter
     /// <param name="redactionMode">Strategy to decide how parameters are redacted.</param>
     /// <param name="parametersToRedact">Dictionary of parameters with their data classification that needs to be redacted.</param>
     /// <returns>Returns formatted path with sensitive parameter values redacted.</returns>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     string Format(in ParsedRouteSegments routeSegments, string httpPath, HttpRouteParameterRedactionMode redactionMode, IReadOnlyDictionary<string, DataClassification> parametersToRedact);
 }
diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Telemetry/TelemetryExtensions.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Telemetry/TelemetryExtensions.cs
index 1d106201a91..911759ca8d1 100644
--- a/src/Libraries/Microsoft.Extensions.Telemetry/Telemetry/TelemetryExtensions.cs
+++ b/src/Libraries/Microsoft.Extensions.Telemetry/Telemetry/TelemetryExtensions.cs
@@ -25,7 +25,7 @@ public static class TelemetryExtensions
     /// </summary>
     /// <param name="request"><see cref="HttpWebRequest"/> object.</param>
     /// <param name="metadata">Metadata for the request.</param>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public static void SetRequestMetadata(this HttpWebRequest request, RequestMetadata metadata)
     {
         _ = Throw.IfNull(request);
@@ -58,7 +58,7 @@ public static void SetRequestMetadata(this HttpRequestMessage request, RequestMe
     /// </summary>
     /// <param name="request"><see cref="HttpWebRequest"/> object.</param>
     /// <returns>Request metadata.</returns>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public static RequestMetadata? GetRequestMetadata(this HttpWebRequest request)
     {
         _ = Throw.IfNull(request);
diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Tracing.Sampling/Internal/SamplingOptionsAutoValidator.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Tracing.Sampling/Internal/SamplingOptionsAutoValidator.cs
index 083fd1c358f..6ad25eb2e93 100644
--- a/src/Libraries/Microsoft.Extensions.Telemetry/Tracing.Sampling/Internal/SamplingOptionsAutoValidator.cs
+++ b/src/Libraries/Microsoft.Extensions.Telemetry/Tracing.Sampling/Internal/SamplingOptionsAutoValidator.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
 
 namespace Microsoft.Extensions.Telemetry.Tracing.Internal;
 
diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Tracing.Sampling/ParentBasedSamplerOptions.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Tracing.Sampling/ParentBasedSamplerOptions.cs
index aee2e9731ea..b77dffb8eba 100644
--- a/src/Libraries/Microsoft.Extensions.Telemetry/Tracing.Sampling/ParentBasedSamplerOptions.cs
+++ b/src/Libraries/Microsoft.Extensions.Telemetry/Tracing.Sampling/ParentBasedSamplerOptions.cs
@@ -1,7 +1,7 @@
 // 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.Options.Validation;
+using Microsoft.Extensions.Options;
 
 namespace Microsoft.Extensions.Telemetry.Tracing;
 
diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Tracing.Sampling/SamplingOptions.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Tracing.Sampling/SamplingOptions.cs
index 5c109e773bc..a91b19dcce8 100644
--- a/src/Libraries/Microsoft.Extensions.Telemetry/Tracing.Sampling/SamplingOptions.cs
+++ b/src/Libraries/Microsoft.Extensions.Telemetry/Tracing.Sampling/SamplingOptions.cs
@@ -1,7 +1,7 @@
 // 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.Options.Validation;
+using Microsoft.Extensions.Options;
 
 namespace Microsoft.Extensions.Telemetry.Tracing;
 
diff --git a/src/Libraries/Microsoft.Extensions.Telemetry/Tracing/TracingEnricherExtensions.cs b/src/Libraries/Microsoft.Extensions.Telemetry/Tracing/TracingEnricherExtensions.cs
index 36cc62c5b47..76854f58e0d 100644
--- a/src/Libraries/Microsoft.Extensions.Telemetry/Tracing/TracingEnricherExtensions.cs
+++ b/src/Libraries/Microsoft.Extensions.Telemetry/Tracing/TracingEnricherExtensions.cs
@@ -53,7 +53,7 @@ public static TracerProviderBuilder AddTraceEnricher(this TracerProviderBuilder
     /// <param name="services">The <see cref="IServiceCollection"/> to add this enricher to.</param>
     /// <returns>The <see cref="IServiceCollection"/> so that additional calls can be chained.</returns>
     /// <exception cref="ArgumentNullException">The argument <paramref name="services"/> is <see langword="null"/>.</exception>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public static IServiceCollection AddTraceEnricher<T>(this IServiceCollection services)
         where T : class, ITraceEnricher
     {
@@ -71,7 +71,7 @@ public static IServiceCollection AddTraceEnricher<T>(this IServiceCollection ser
     /// <param name="enricher">Enricher to be added.</param>
     /// <returns>The <see cref="IServiceCollection"/> so that additional calls can be chained.</returns>
     /// <exception cref="ArgumentNullException">The argument <paramref name="services"/> or <paramref name="enricher"/> is <see langword="null" />.</exception>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public static IServiceCollection AddTraceEnricher(this IServiceCollection services, ITraceEnricher enricher)
     {
         _ = Throw.IfNull(services);
diff --git a/src/Libraries/Microsoft.Extensions.TimeProvider.Testing/FakeTimeProvider.cs b/src/Libraries/Microsoft.Extensions.TimeProvider.Testing/FakeTimeProvider.cs
index 55c8310299b..b45f50d29f8 100644
--- a/src/Libraries/Microsoft.Extensions.TimeProvider.Testing/FakeTimeProvider.cs
+++ b/src/Libraries/Microsoft.Extensions.TimeProvider.Testing/FakeTimeProvider.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.
 
 using System;
@@ -30,7 +30,7 @@ public class FakeTimeProvider : TimeProvider
     /// This creates a provider whose time is initially set to midnight January 1st 2000.
     /// The provider is set to not automatically advance time each time it is read.
     /// </remarks>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public FakeTimeProvider()
     {
         Start = _now;
@@ -43,7 +43,7 @@ public FakeTimeProvider()
     /// <remarks>
     /// The provider is set to not automatically advance time each time it is read.
     /// </remarks>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public FakeTimeProvider(DateTimeOffset startDateTime)
     {
         _ = Throw.IfLessThan(startDateTime.Ticks, 0);
@@ -55,7 +55,7 @@ public FakeTimeProvider(DateTimeOffset startDateTime)
     /// <summary>
     /// Gets the starting date and time for this provider.
     /// </summary>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public DateTimeOffset Start { get; }
 
     /// <summary>
@@ -64,7 +64,7 @@ public FakeTimeProvider(DateTimeOffset startDateTime)
     /// <remarks>
     /// This defaults to <see cref="TimeSpan.Zero"/>.
     /// </remarks>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public TimeSpan AutoAdvanceAmount
     {
         get => _autoAdvanceAmount;
@@ -94,7 +94,7 @@ public override DateTimeOffset GetUtcNow()
     /// Sets the date and time in the UTC time zone.
     /// </summary>
     /// <param name="value">The date and time in the UTC time zone.</param>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public void SetUtcNow(DateTimeOffset value)
     {
         lock (Waiters)
@@ -120,7 +120,7 @@ public void SetUtcNow(DateTimeOffset value)
     /// marches forward automatically in hardware, for the fake time provider the application is responsible for
     /// doing this explicitly by calling this method.
     /// </remarks>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public void Advance(TimeSpan delta)
     {
         _ = Throw.IfLessThan(delta.Ticks, 0);
@@ -155,7 +155,7 @@ public override long GetTimestamp()
     /// Sets the local time zone.
     /// </summary>
     /// <param name="localTimeZone">The local time zone.</param>
-    [Experimental]
+    [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
     public void SetLocalTimeZone(TimeZoneInfo localTimeZone) => _localTimeZone = localTimeZone;
 
     /// <summary>
diff --git a/src/ToBeMoved/Hosting.StartupInitialization/Hosting.StartupInitialization.csproj b/src/ToBeMoved/Hosting.StartupInitialization/Hosting.StartupInitialization.csproj
index 58974307386..6efbe56cc68 100644
--- a/src/ToBeMoved/Hosting.StartupInitialization/Hosting.StartupInitialization.csproj
+++ b/src/ToBeMoved/Hosting.StartupInitialization/Hosting.StartupInitialization.csproj
@@ -6,7 +6,6 @@
     <Description>Provides infrastructure to execute asynchronous functions on server startups</Description>
     <Workstream>Fundamentals</Workstream>
     <Category>Application Bootstrap</Category>
-    <UseOptionsValidationGenerator>true</UseOptionsValidationGenerator>
     <InjectSharedTextFormatting>true</InjectSharedTextFormatting>
     <InjectSharedDebugger>true</InjectSharedDebugger>
     <InjectSharedDataValidation>true</InjectSharedDataValidation>
@@ -28,7 +27,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\Libraries\Microsoft.Extensions.Telemetry.Abstractions\Microsoft.Extensions.Telemetry.Abstractions.csproj " />
-    <ProjectReference Include="..\..\Libraries\Microsoft.Extensions.Options.Validation\Microsoft.Extensions.Options.Validation.csproj" />
     <ProjectReference Include="..\..\ToBeRemoved\Options.ValidateOnStart\Options.ValidateOnStart.csproj" />
   </ItemGroup>
 
diff --git a/src/ToBeMoved/Hosting.StartupInitialization/Internal/StartupInitializationBuilder.cs b/src/ToBeMoved/Hosting.StartupInitialization/Internal/StartupInitializationBuilder.cs
index 6c70493a12c..c82281e9cae 100644
--- a/src/ToBeMoved/Hosting.StartupInitialization/Internal/StartupInitializationBuilder.cs
+++ b/src/ToBeMoved/Hosting.StartupInitialization/Internal/StartupInitializationBuilder.cs
@@ -6,7 +6,6 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
-using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options.Validation;
 using Microsoft.Shared.Diagnostics;
 
diff --git a/src/ToBeMoved/Hosting.StartupInitialization/Internal/StartupInitializationOptionsValidator.cs b/src/ToBeMoved/Hosting.StartupInitialization/Internal/StartupInitializationOptionsValidator.cs
index a15058129ea..20b926881e5 100644
--- a/src/ToBeMoved/Hosting.StartupInitialization/Internal/StartupInitializationOptionsValidator.cs
+++ b/src/ToBeMoved/Hosting.StartupInitialization/Internal/StartupInitializationOptionsValidator.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
 
 namespace Microsoft.Extensions.Hosting.Testing.Internal;
 
diff --git a/src/ToBeMoved/Hosting.StartupInitialization/StartupInitializationExtensions.cs b/src/ToBeMoved/Hosting.StartupInitialization/StartupInitializationExtensions.cs
index 31276de6c92..00371c48685 100644
--- a/src/ToBeMoved/Hosting.StartupInitialization/StartupInitializationExtensions.cs
+++ b/src/ToBeMoved/Hosting.StartupInitialization/StartupInitializationExtensions.cs
@@ -6,6 +6,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting.Testing.Internal;
+using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Options.Validation;
 using Microsoft.Shared.Diagnostics;
 
diff --git a/src/ToBeMoved/HttpClient.SocketHandling/HttpClient.SocketHandling.csproj b/src/ToBeMoved/HttpClient.SocketHandling/HttpClient.SocketHandling.csproj
index 288becef1e3..03b7a3f67da 100644
--- a/src/ToBeMoved/HttpClient.SocketHandling/HttpClient.SocketHandling.csproj
+++ b/src/ToBeMoved/HttpClient.SocketHandling/HttpClient.SocketHandling.csproj
@@ -7,7 +7,6 @@
     <Workstream>Fundamentals</Workstream>
     <Category>HTTP Processing</Category>
     <TargetFrameworks>$(NetCoreTargetFrameworks)</TargetFrameworks>
-    <UseOptionsValidationGenerator>true</UseOptionsValidationGenerator>
     <InjectSharedDataValidation>true</InjectSharedDataValidation>
   </PropertyGroup>
 
@@ -23,7 +22,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Libraries\Microsoft.Extensions.Options.Validation\Microsoft.Extensions.Options.Validation.csproj" />
     <ProjectReference Include="..\..\ToBeRemoved\Options.ValidateOnStart\Options.ValidateOnStart.csproj" />
   </ItemGroup>
 
diff --git a/src/ToBeMoved/HttpClient.SocketHandling/SocketsHttpHandlerOptionsValidator.cs b/src/ToBeMoved/HttpClient.SocketHandling/SocketsHttpHandlerOptionsValidator.cs
index c5c343d8ef2..4a05de361d1 100644
--- a/src/ToBeMoved/HttpClient.SocketHandling/SocketsHttpHandlerOptionsValidator.cs
+++ b/src/ToBeMoved/HttpClient.SocketHandling/SocketsHttpHandlerOptionsValidator.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
 
 namespace Microsoft.Extensions.HttpClient.SocketHandling;
 
diff --git a/test/Analyzers/Microsoft.Extensions.ExtraAnalyzers/Common/UsingExperimentalApiAnalyzerTest.cs b/test/Analyzers/Microsoft.Extensions.ExtraAnalyzers/Common/UsingExperimentalApiAnalyzerTest.cs
index 972b29df052..3e2771f0a7e 100644
--- a/test/Analyzers/Microsoft.Extensions.ExtraAnalyzers/Common/UsingExperimentalApiAnalyzerTest.cs
+++ b/test/Analyzers/Microsoft.Extensions.ExtraAnalyzers/Common/UsingExperimentalApiAnalyzerTest.cs
@@ -13,19 +13,12 @@ public static class UsingExperimentalApiAnalyzerTest
     [MemberData(nameof(TestData))]
     public static async Task Common(string source)
     {
-        const string AttributeSource = @"
-            namespace System.Diagnostics.CodeAnalysis
-            {
-                public sealed class ExperimentalAttribute : System.Attribute { }
-            }";
-
         var d = await RoslynTestUtils.RunAnalyzer(
                 new UsingExperimentalApiAnalyzer(),
                 null,
                 new[]
                 {
                     source,
-                    AttributeSource,
                 }).ConfigureAwait(false);
 
         var expectedCount = source.CountSpans();
@@ -67,7 +60,7 @@ public void Test()
                 }
             }
 
-            [Experimental]
+            [Experimental(diagnosticId: ""TBD"", UrlFormat = ""TBD"")]
             public class ExpClass
             {
             }
@@ -81,7 +74,7 @@ public class ExpClass
             using System.Diagnostics.CodeAnalysis;
 
             #pragma warning disable R9A029
-            [assembly: Experimental]
+            [assembly: Experimental(diagnosticId: ""TBD"", UrlFormat = ""TBD"")]
             #pragma warning restore R9A029
 
             public class TestClass : /*0+*/ExpClass/*-0*/
diff --git a/test/Analyzers/Microsoft.Extensions.LocalAnalyzers/ApiLifecycle/ApiLifecycleAnalyzerTest.cs b/test/Analyzers/Microsoft.Extensions.LocalAnalyzers/ApiLifecycle/ApiLifecycleAnalyzerTest.cs
index 4f81b21e6fd..379a0fe65df 100644
--- a/test/Analyzers/Microsoft.Extensions.LocalAnalyzers/ApiLifecycle/ApiLifecycleAnalyzerTest.cs
+++ b/test/Analyzers/Microsoft.Extensions.LocalAnalyzers/ApiLifecycle/ApiLifecycleAnalyzerTest.cs
@@ -228,7 +228,7 @@ namespace Microsoft.Extensions.Security.Identity;
                 using System.Collections.Generic;
                 using System.Diagnostics.CodeAnalysis;
 
-                [Experimental]
+                [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
                 public class AdditionalContext2
                 {
                     protected IReadOnlyDictionary<string, object> Features { get; } = new Dictionary<string, object>();
@@ -347,7 +347,7 @@ public sealed class BufferWriter2<T> : IBufferWriter<T>
 
                 private T[] _buffer = Array.Empty<T>();
 
-                [Experimental]
+                [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
                 public BufferWriter2() { }
 
                 public ReadOnlyMemory<T> WrittenMemory => _buffer.AsMemory(0, WrittenCount);
@@ -474,7 +474,7 @@ public interface IClassifiedData
                     public DataClass DataClass { get; }
                 }
 
-                [Experimental]
+                [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
                 public enum DataClass
                 {
 
@@ -562,10 +562,10 @@ namespace SomePackage;
 
             using System.Diagnostics.CodeAnalysis;
 
-            [Experimental]
+            [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
             public static class Test
             {
-                [Experimental]
+                [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
                 public static void Load()
                 {
                     // Intentionally left empty.
@@ -707,7 +707,7 @@ namespace Microsoft.Extensions.Diagnostics;
                 using System.Collections.Generic;
                 using System.Diagnostics.CodeAnalysis;
 
-                [Experimental]
+                [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
                 public class WindowsCountersOptions2
                 {
                     [Required]
@@ -728,7 +728,7 @@ namespace Test;
 
                 using System.Diagnostics.CodeAnalysis;
 
-                [Experimental]
+                [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
                 public sealed class BufferWriter<T>
                 {
                     internal const int MaxArrayLength = 0X7FEF_FFFF;   // Copy of the internal Array.MaxArrayLength const
@@ -751,7 +751,7 @@ namespace Inheritance;
 
                 using System.Diagnostics.CodeAnalysis;
 
-                [Experimental]
+                [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
                 public class BaseType
                 {
                     public virtual int P => 1;
@@ -774,7 +774,7 @@ namespace Nested;
 
                 using System.Diagnostics.CodeAnalysis;
 
-                [Experimental]
+                [Experimental(diagnosticId: "TBD", UrlFormat = "TBD")]
                 public class OuterType
                 {
                     public int ReadValue(string s) => new InnerType().P;
diff --git a/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/CustomAttrTests.cs b/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/CustomAttrTests.cs
deleted file mode 100644
index 9770924b5b1..00000000000
--- a/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/CustomAttrTests.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using CustomAttr;
-using Microsoft.Extensions.Options;
-using Xunit;
-
-namespace Microsoft.Gen.OptionsValidation.Test;
-
-public class CustomAttrTests
-{
-    [Fact]
-    public void Invalid()
-    {
-        var firstModel = new FirstModel
-        {
-            P1 = 'a',
-            P2 = 'x',
-        };
-
-        var validator = new FirstValidator();
-        var vr = validator.Validate("CustomAttr", firstModel);
-
-        Utils.VerifyValidateOptionsResult(vr, 2, "P1", "P2");
-    }
-
-    [Fact]
-    public void Valid()
-    {
-        var firstModel = new FirstModel
-        {
-            P1 = 'A',
-            P2 = 'A',
-        };
-
-        var validator = new FirstValidator();
-        Assert.Equal(ValidateOptionsResult.Success, validator.Validate("CustomAttr", firstModel));
-    }
-}
diff --git a/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/EnumerationTests.cs b/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/EnumerationTests.cs
deleted file mode 100644
index d2f9bddca28..00000000000
--- a/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/EnumerationTests.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Enumeration;
-using Microsoft.Extensions.Options;
-using Xunit;
-
-namespace Microsoft.Gen.OptionsValidation.Test;
-
-public class EnumerationTests
-{
-    [Fact]
-    public void Invalid()
-    {
-        var secondModelC = new SecondModel
-        {
-            P6 = "1234",
-        };
-
-        var secondModelB = new SecondModel
-        {
-            P6 = "12345",
-        };
-
-        var secondModel = new SecondModel
-        {
-            P6 = "1234",
-        };
-
-        ThirdModel? thirdModel = new ThirdModel
-        {
-            Value = 11
-        };
-
-        var firstModel = new FirstModel
-        {
-            P1 = new[] { secondModel },
-            P2 = new[] { secondModel, secondModelB, secondModelC },
-            P51 = new[] { thirdModel }
-        };
-
-        var validator = default(FirstValidator);
-        var vr = validator.Validate("Enumeration", firstModel);
-
-        Utils.VerifyValidateOptionsResult(vr, 4, "P1[0].P6", "P2[0].P6", "P2[2].P6", "P51[0].Value");
-    }
-
-    [Fact]
-    public void NullElement()
-    {
-        var firstModel = new FirstModel
-        {
-            P1 = new[] { (SecondModel)null! },
-        };
-
-        var validator = default(FirstValidator);
-        var vr = validator.Validate("Enumeration", firstModel);
-
-        Utils.VerifyValidateOptionsResult(vr, 1, "P1[0]");
-    }
-
-    [Fact]
-    public void Valid()
-    {
-        var secondModel = new SecondModel
-        {
-            P6 = "12345",
-        };
-
-        var thirdModelA = new ThirdModel
-        {
-            Value = 2
-        };
-
-        var thirdModelB = new ThirdModel
-        {
-            Value = 9
-        };
-
-        var firstModel = new FirstModel
-        {
-            P1 = new[] { secondModel },
-            P2 = new[] { secondModel },
-            P3 = new[] { (SecondModel?)null },
-            P4 = new[] { thirdModelA, thirdModelB },
-            P5 = new ThirdModel?[] { thirdModelA, default },
-            P51 = new ThirdModel?[] { thirdModelB, default }
-        };
-
-        var validator = default(FirstValidator);
-        Assert.Equal(ValidateOptionsResult.Success, validator.Validate("Enumeration", firstModel));
-    }
-}
diff --git a/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/FieldTests.cs b/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/FieldTests.cs
deleted file mode 100644
index 3656d4f359e..00000000000
--- a/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/FieldTests.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Fields;
-using Microsoft.Extensions.Options;
-using Xunit;
-
-namespace Microsoft.Gen.OptionsValidation.Test;
-
-public class FieldTests
-{
-    [Fact]
-    public void Invalid()
-    {
-        var thirdModel = new ThirdModel
-        {
-            P5 = "1234",
-        };
-
-        var secondModel = new SecondModel
-        {
-            P4 = "1234",
-        };
-
-        var firstModel = new FirstModel
-        {
-            P1 = "1234",
-            P2 = secondModel,
-            P3 = thirdModel,
-        };
-
-        var validator = default(FirstValidator);
-        var vr = validator.Validate("Fields", firstModel);
-
-        Utils.VerifyValidateOptionsResult(vr, 3, "P1", "P2.P4", "P3.P5");
-    }
-
-    [Fact]
-    public void Valid()
-    {
-        var thirdModel = new ThirdModel
-        {
-            P5 = "12345",
-            P6 = 1
-        };
-
-        var secondModel = new SecondModel
-        {
-            P4 = "12345",
-        };
-
-        var firstModel = new FirstModel
-        {
-            P1 = "12345",
-            P2 = secondModel,
-            P3 = thirdModel,
-        };
-
-        var validator = default(FirstValidator);
-        Assert.Equal(ValidateOptionsResult.Success, validator.Validate("Fields", firstModel));
-    }
-}
diff --git a/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/FunnyStringsTests.cs b/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/FunnyStringsTests.cs
deleted file mode 100644
index 29b62a5c4b4..00000000000
--- a/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/FunnyStringsTests.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using FunnyStrings;
-using Microsoft.Extensions.Options;
-using Xunit;
-
-namespace Microsoft.Gen.OptionsValidation.Test;
-
-public class FunnyStringsTests
-{
-    [Fact]
-    public void Invalid()
-    {
-        var firstModel = new FirstModel
-        {
-            P1 = "XXX",
-        };
-
-        var validator = default(FirstValidator);
-        var vr = validator.Validate("FunnyStrings", firstModel);
-
-        Utils.VerifyValidateOptionsResult(vr, 1, "P1");
-    }
-
-    [Fact]
-    public void Valid()
-    {
-        var firstModel = new FirstModel
-        {
-            P1 = "\"\r\n\\",
-        };
-
-        var validator = default(FirstValidator);
-        Assert.Equal(ValidateOptionsResult.Success, validator.Validate("FunnyStrings", firstModel));
-    }
-}
diff --git a/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/GenericsTests.cs b/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/GenericsTests.cs
deleted file mode 100644
index 838fe529689..00000000000
--- a/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/GenericsTests.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Generics;
-using Microsoft.Extensions.Options;
-using Xunit;
-
-namespace Microsoft.Gen.OptionsValidation.Test;
-
-public class GenericsTests
-{
-    [Fact]
-    public void Invalid()
-    {
-        var secondModel = new SecondModel
-        {
-            P4 = "1234",
-        };
-
-        var firstModel = new FirstModel<int>
-        {
-            P1 = "1234",
-            P3 = secondModel,
-        };
-
-        var validator = new FirstValidator<int>();
-        var vr = validator.Validate("Generics", firstModel);
-
-        Utils.VerifyValidateOptionsResult(vr, 2, "P1", "P3.P4");
-    }
-
-    [Fact]
-    public void Valid()
-    {
-        var secondModel = new SecondModel
-        {
-            P4 = "12345",
-        };
-
-        var firstModel = new FirstModel<int>
-        {
-            P1 = "12345",
-            P3 = secondModel,
-        };
-
-        var validator = new FirstValidator<int>();
-        Assert.Equal(ValidateOptionsResult.Success, validator.Validate("Generics", firstModel));
-    }
-}
diff --git a/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/MultiModelValidatorTests.cs b/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/MultiModelValidatorTests.cs
deleted file mode 100644
index fff83ced918..00000000000
--- a/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/MultiModelValidatorTests.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-// 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.Options;
-using MultiModelValidator;
-using Xunit;
-
-namespace Microsoft.Gen.OptionsValidation.Test;
-
-public class MultiModelValidatorTests
-{
-    [Fact]
-    public void Invalid()
-    {
-        var secondModel = new SecondModel
-        {
-            P3 = "1234",
-        };
-
-        var firstModel = new FirstModel
-        {
-            P1 = "1234",
-            P2 = secondModel,
-        };
-
-        var validator = default(MultiValidator);
-        var vr = validator.Validate("MultiModelValidator", firstModel);
-
-        Utils.VerifyValidateOptionsResult(vr, 2, "P1", "P2.P3");
-    }
-
-    [Fact]
-    public void Valid()
-    {
-        var secondModel = new SecondModel
-        {
-            P3 = "12345",
-        };
-
-        var firstModel = new FirstModel
-        {
-            P1 = "12345",
-            P2 = secondModel,
-        };
-
-        var validator = default(MultiValidator);
-        Assert.Equal(ValidateOptionsResult.Success, validator.Validate("MultiModelValidator", firstModel));
-    }
-}
diff --git a/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/NestedTests.cs b/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/NestedTests.cs
deleted file mode 100644
index 8a4b04361a3..00000000000
--- a/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/NestedTests.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-#if ROSLYN_4_0_OR_GREATER
-
-using Microsoft.Extensions.Options;
-using Nested;
-using Xunit;
-
-namespace Microsoft.Gen.OptionsValidation.Test;
-
-public class NestedTests
-{
-    [Fact]
-    public void Invalid()
-    {
-        var thirdModel = new Container1.ThirdModel
-        {
-            P6 = "1234",
-        };
-
-        var secondModel = new Container1.SecondModel
-        {
-            P5 = "1234",
-        };
-
-        var firstModel = new Container1.FirstModel
-        {
-            P1 = "1234",
-            P2 = secondModel,
-            P3 = thirdModel,
-            P4 = secondModel,
-        };
-
-        var validator = default(Container2.Container3.FirstValidator);
-        var vr = validator.Validate("Nested", firstModel);
-
-        Utils.VerifyValidateOptionsResult(vr, 4, "P1", "P2.P5", "P3.P6", "P4.P5");
-    }
-
-    [Fact]
-    public void Valid()
-    {
-        var thirdModel = new Container1.ThirdModel
-        {
-            P6 = "12345",
-        };
-
-        var secondModel = new Container1.SecondModel
-        {
-            P5 = "12345",
-        };
-
-        var firstModel = new Container1.FirstModel
-        {
-            P1 = "12345",
-            P2 = secondModel,
-            P3 = thirdModel,
-            P4 = secondModel,
-        };
-
-        var validator = default(Container2.Container3.FirstValidator);
-        Assert.Equal(ValidateOptionsResult.Success, validator.Validate("Nested", firstModel));
-    }
-}
-
-#endif
diff --git a/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/NoNamespaceTests.cs b/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/NoNamespaceTests.cs
deleted file mode 100644
index 5530b639531..00000000000
--- a/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/NoNamespaceTests.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-// 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.Options;
-using Xunit;
-
-namespace Microsoft.Gen.OptionsValidation.Test;
-
-public class NoNamespaceTests
-{
-    [Fact]
-    public void Invalid()
-    {
-        var thirdModel = new ThirdModelNoNamespace
-        {
-            P5 = "1234",
-        };
-
-        var secondModel = new SecondModelNoNamespace
-        {
-            P4 = "1234",
-        };
-
-        var firstModel = new FirstModelNoNamespace
-        {
-            P1 = "1234",
-            P2 = secondModel,
-            P3 = thirdModel,
-        };
-
-        var validator = new FirstValidatorNoNamespace();
-        var vr = validator.Validate("NoNamespace", firstModel);
-
-        Utils.VerifyValidateOptionsResult(vr, 3, "P1", "P2.P4", "P3.P5");
-    }
-
-    [Fact]
-    public void Valid()
-    {
-        var thirdModel = new ThirdModelNoNamespace
-        {
-            P5 = "12345",
-        };
-
-        var secondModel = new SecondModelNoNamespace
-        {
-            P4 = "12345",
-        };
-
-        var firstModel = new FirstModelNoNamespace
-        {
-            P1 = "12345",
-            P2 = secondModel,
-            P3 = thirdModel,
-        };
-
-        var validator = new FirstValidatorNoNamespace();
-        Assert.Equal(ValidateOptionsResult.Success, validator.Validate("NoNamespace", firstModel));
-    }
-}
diff --git a/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/OptionsValidationTests.cs b/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/OptionsValidationTests.cs
deleted file mode 100644
index 49941010f1a..00000000000
--- a/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/OptionsValidationTests.cs
+++ /dev/null
@@ -1,442 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.Globalization;
-using Microsoft.Extensions.Options;
-using TestClasses.OptionsValidation;
-using Xunit;
-
-namespace Microsoft.Gen.OptionsValidation.Test;
-
-public class OptionsValidationTests
-{
-    [Fact]
-    public void RequiredAttributeValid()
-    {
-        var validModel = new RequiredAttributeModel
-        {
-            Val = "val"
-        };
-
-        var modelValidator = new RequiredAttributeModelValidator();
-        var result = modelValidator.Validate(nameof(validModel), validModel);
-
-        Assert.Equal(ValidateOptionsResult.Success, result);
-    }
-
-    [Fact]
-    public void RequiredAttributeInvalid()
-    {
-        var validModel = new RequiredAttributeModel
-        {
-            Val = null
-        };
-
-        var modelValidator = new RequiredAttributeModelValidator();
-        Utils.VerifyValidateOptionsResult(modelValidator.Validate(nameof(validModel), validModel), 1);
-    }
-
-    [Fact]
-    public void RegularExpressionAttributeValid()
-    {
-        var validModel = new RegularExpressionAttributeModel
-        {
-            Val = " "
-        };
-
-        var modelValidator = new RegularExpressionAttributeModelValidator();
-        var result = modelValidator.Validate(nameof(validModel), validModel);
-
-        Assert.Equal(ValidateOptionsResult.Success, result);
-    }
-
-    [Fact]
-    public void RegularExpressionAttributeInvalid()
-    {
-        var validModel = new RegularExpressionAttributeModel
-        {
-            Val = "Not Space"
-        };
-
-        var modelValidator = new RegularExpressionAttributeModelValidator();
-        Utils.VerifyValidateOptionsResult(modelValidator.Validate(nameof(validModel), validModel), 1);
-    }
-
-    [Fact]
-    public void EmailAttributeValid()
-    {
-        var validModel = new EmailAttributeModel
-        {
-            Val = "abc@xyz.com"
-        };
-
-        var modelValidator = new EmailAttributeModelValidator();
-        var result = modelValidator.Validate(nameof(validModel), validModel);
-
-        Assert.Equal(ValidateOptionsResult.Success, result);
-    }
-
-    [Fact]
-    public void EmailAttributeInvalid()
-    {
-        var validModel = new EmailAttributeModel
-        {
-            Val = "Not Email Address"
-        };
-
-        var modelValidator = new EmailAttributeModelValidator();
-        Utils.VerifyValidateOptionsResult(modelValidator.Validate(nameof(validModel), validModel), 1);
-    }
-
-    [Fact]
-    public void CustomValidationAttributeValid()
-    {
-        var validModel = new CustomValidationAttributeModel
-        {
-            Val = "Pass"
-        };
-
-        var modelValidator = new CustomValidationAttributeModelValidator();
-        var result = modelValidator.Validate(nameof(validModel), validModel);
-
-        Assert.Equal(ValidateOptionsResult.Success, result);
-    }
-
-    [Fact]
-    public void CustomValidationAttributeInvalid()
-    {
-        var validModel = new CustomValidationAttributeModel
-        {
-            Val = "NOT PASS"
-        };
-
-        var modelValidator = new CustomValidationAttributeModelValidator();
-        Assert.Throws<ValidationException>(() => modelValidator.Validate(nameof(validModel), validModel));
-    }
-
-    [Fact]
-    public void DataTypeAttributeValid()
-    {
-        var validModel = new DataTypeAttributeModel
-        {
-            Val = "ABC"
-        };
-
-        var modelValidator = new DataTypeAttributeModelValidator();
-        var result = modelValidator.Validate(nameof(validModel), validModel);
-
-        Assert.Equal(ValidateOptionsResult.Success, result);
-    }
-
-    [Fact]
-    public void RangeAttributeModelIntValid()
-    {
-        var validModel = new RangeAttributeModelInt
-        {
-            Val = 1
-        };
-
-        var modelValidator = new RangeAttributeModelIntValidator();
-        var result = modelValidator.Validate(nameof(validModel), validModel);
-
-        Assert.Equal(ValidateOptionsResult.Success, result);
-    }
-
-    [Fact]
-    public void RangeAttributeModelIntInvalid()
-    {
-        var validModel = new RangeAttributeModelInt
-        {
-            Val = 0
-        };
-
-        var modelValidator = new RangeAttributeModelIntValidator();
-        Utils.VerifyValidateOptionsResult(modelValidator.Validate(nameof(validModel), validModel), 1);
-    }
-
-    [Fact]
-    public void RangeAttributeModelDoubleValid()
-    {
-        var validModel = new RangeAttributeModelDouble
-        {
-            Val = 0.6
-        };
-
-        var modelValidator = new RangeAttributeModelDoubleValidator();
-        var result = modelValidator.Validate(nameof(validModel), validModel);
-
-        Assert.Equal(ValidateOptionsResult.Success, result);
-    }
-
-    [Fact]
-    public void RangeAttributeModelDoubleInvalid()
-    {
-        var validModel = new RangeAttributeModelDouble
-        {
-            Val = 0.1
-        };
-
-        var modelValidator = new RangeAttributeModelDoubleValidator();
-        Utils.VerifyValidateOptionsResult(modelValidator.Validate(nameof(validModel), validModel), 1);
-    }
-
-    [Fact]
-    public void RangeAttributeModelDateValid()
-    {
-#if NETCOREAPP3_1_OR_GREATER
-        // Setting non-invariant culture to check that
-        // attribute's "ParseLimitsInInvariantCulture" property
-        // was set up correctly in the validator:
-        CultureInfo.CurrentCulture = new CultureInfo("cs");
-#else
-        // Setting invariant culture to avoid DateTime parsing discrepancies:
-        CultureInfo.CurrentCulture = CultureInfo.InvariantCulture;
-#endif
-        var validModel = new RangeAttributeModelDate
-        {
-            Val = new DateTime(day: 3, month: 1, year: 2004)
-        };
-
-        var modelValidator = new RangeAttributeModelDateValidator();
-        var result = modelValidator.Validate(nameof(validModel), validModel);
-
-        Assert.Equal(ValidateOptionsResult.Success, result);
-    }
-
-    [Fact]
-    public void RangeAttributeModelDateInvalid()
-    {
-        var validModel = new RangeAttributeModelDate
-        {
-            Val = new DateTime(day: 1, month: 1, year: 2004)
-        };
-
-        var modelValidator = new RangeAttributeModelDateValidator();
-        Utils.VerifyValidateOptionsResult(modelValidator.Validate(nameof(validModel), validModel), 1);
-    }
-
-    [Fact]
-    public void MultipleAttributeModelValid()
-    {
-        var validModel = new MultipleAttributeModel
-        {
-            Val1 = "abc",
-            Val2 = 2,
-            Val3 = 4,
-            Val4 = 6
-        };
-
-        var modelValidator = new MultipleAttributeModelValidator();
-        var result = modelValidator.Validate(nameof(validModel), validModel);
-
-        Assert.Equal(ValidateOptionsResult.Success, result);
-    }
-
-    [Theory]
-    [InlineData("", 2, 4, 7)]
-    [InlineData(null, 2, 4, 7)]
-    [InlineData("abc", 0, 4, 9)]
-    [InlineData("abc", 2, 8, 8)]
-    [InlineData("abc", 2, 4, 10)]
-    public void MultipleAttributeModelInvalid(string val1, int val2, int val3, int val4)
-    {
-        var validModel = new MultipleAttributeModel
-        {
-            Val1 = val1,
-            Val2 = val2,
-            Val3 = val3,
-            Val4 = val4
-        };
-
-        var modelValidator = new MultipleAttributeModelValidator();
-        Utils.VerifyValidateOptionsResult(modelValidator.Validate(nameof(validModel), validModel), 1);
-    }
-
-    [Fact]
-    public void CustomTypeCustomValidationAttributeModelValid()
-    {
-        var validModel = new CustomTypeCustomValidationAttributeModel
-        {
-            Val = new CustomType { Val1 = "Pass", Val2 = "Pass" }
-        };
-
-        var modelValidator = new CustomTypeCustomValidationAttributeModelValidator();
-        var result = modelValidator.Validate(nameof(validModel), validModel);
-
-        Assert.Equal(ValidateOptionsResult.Success, result);
-    }
-
-    [Fact]
-    public void CustomTypeCustomValidationAttributeModelInvalid()
-    {
-        var validModel = new CustomTypeCustomValidationAttributeModel
-        {
-            Val = new CustomType { Val1 = "Pass", Val2 = "Not Pass" }
-        };
-
-        var modelValidator = new CustomTypeCustomValidationAttributeModelValidator();
-        Assert.Throws<ValidationException>(() => modelValidator.Validate(nameof(validModel), validModel));
-    }
-
-    [Fact]
-    public void DerivedModelIsValid()
-    {
-        var validModel = new DerivedModel
-        {
-            Val = 1,
-            DerivedVal = "Valid",
-            VirtualValWithAttr = 1,
-            VirtualValWithoutAttr = null
-        };
-
-        ((RequiredAttributeModel)validModel).Val = "Valid hidden member from base class";
-
-        var validator = new DerivedModelValidator();
-        var result = validator.Validate(nameof(validModel), validModel);
-        Assert.Equal(ValidateOptionsResult.Success, result);
-    }
-
-    [Theory]
-    [InlineData(0, "", 1, null, "Valid hidden member from base class")]
-    [InlineData(null, "Valid", 1, null, "Valid hidden member from base class")]
-    [InlineData(1, "Valid", null, null, "Valid hidden member from base class")]
-    public void DerivedModelIsInvalid(int? val, string? derivedVal, int? virtValAttr, int? virtVal, string? hiddenValBaseClass)
-    {
-        var invalidModel = new DerivedModel
-        {
-            Val = val,
-            DerivedVal = derivedVal,
-            VirtualValWithAttr = virtValAttr,
-            VirtualValWithoutAttr = virtVal
-        };
-
-        ((RequiredAttributeModel)invalidModel).Val = hiddenValBaseClass;
-
-        var validator = new DerivedModelValidator();
-        Utils.VerifyValidateOptionsResult(validator.Validate(nameof(invalidModel), invalidModel), 1);
-    }
-
-    [Fact]
-    public void LeafModelIsValid()
-    {
-        var validModel = new LeafModel
-        {
-            Val = 1,
-            DerivedVal = "Valid",
-            VirtualValWithAttr = null,
-            VirtualValWithoutAttr = 1
-        };
-
-        ((RequiredAttributeModel)validModel).Val = "Valid hidden member from base class";
-
-        var validator = new LeafModelValidator();
-        var result = validator.Validate(nameof(validModel), validModel);
-        Assert.Equal(ValidateOptionsResult.Success, result);
-    }
-
-    [Fact]
-    public void ComplexModelValid()
-    {
-        var validModel = new ComplexModel
-        {
-            ComplexVal = new RequiredAttributeModel { Val = "Valid" }
-        };
-
-        var modelValidator = new ComplexModelValidator();
-        var result = modelValidator.Validate(nameof(validModel), validModel);
-        Assert.Equal(ValidateOptionsResult.Success, result);
-
-        validModel = new ComplexModel
-        {
-            ValWithoutOptionsValidator = new TypeWithoutOptionsValidator
-            {
-                Val1 = "Valid",
-                Val2 = new DateTime(day: 3, month: 1, year: 2004)
-            }
-        };
-
-        // Setting invariant culture to avoid DateTime parsing discrepancies:
-        CultureInfo.CurrentCulture = CultureInfo.InvariantCulture;
-        result = modelValidator.Validate(nameof(validModel), validModel);
-        Assert.Equal(ValidateOptionsResult.Success, result);
-
-        validModel = new ComplexModel
-        {
-            ValWithoutOptionsValidator = new TypeWithoutOptionsValidator
-            {
-                Val1 = "A",
-                Val2 = new DateTime(day: 2, month: 2, year: 2004),
-                YetAnotherComplexVal = new RangeAttributeModelDouble { Val = 0.7 }
-            }
-        };
-
-        result = modelValidator.Validate(nameof(validModel), validModel);
-        Assert.Equal(ValidateOptionsResult.Success, result);
-    }
-
-    [Fact]
-    public void ComplexModelInvalid()
-    {
-        var invalidModel = new ComplexModel
-        {
-            ComplexVal = new RequiredAttributeModel { Val = null }
-        };
-
-        var modelValidator = new ComplexModelValidator();
-        Utils.VerifyValidateOptionsResult(modelValidator.Validate(nameof(invalidModel), invalidModel), 1);
-
-        invalidModel = new ComplexModel
-        {
-            ValWithoutOptionsValidator = new TypeWithoutOptionsValidator { Val1 = "Valid", Val2 = new DateTime(2003, 3, 3) }
-        };
-
-        Utils.VerifyValidateOptionsResult(modelValidator.Validate(nameof(invalidModel), invalidModel), 1);
-
-        invalidModel = new ComplexModel
-        {
-            ValWithoutOptionsValidator = new TypeWithoutOptionsValidator { Val1 = string.Empty, Val2 = new DateTime(2004, 3, 3) }
-        };
-
-        Utils.VerifyValidateOptionsResult(modelValidator.Validate(nameof(invalidModel), invalidModel), 1);
-
-        invalidModel = new ComplexModel
-        {
-            ValWithoutOptionsValidator = new TypeWithoutOptionsValidator
-            {
-                Val1 = "A",
-                Val2 = new DateTime(2004, 2, 2),
-                YetAnotherComplexVal = new RangeAttributeModelDouble { Val = 0.4999 }
-            }
-        };
-
-        Utils.VerifyValidateOptionsResult(modelValidator.Validate(nameof(invalidModel), invalidModel), 1);
-    }
-
-    [Fact]
-    public void AttributePropertyModelTestOnErrorMessage()
-    {
-        var validModel = new AttributePropertyModel
-        {
-            Val1 = 5,
-            Val2 = 1
-        };
-
-        var modelValidator = new AttributePropertyModelValidator();
-        Utils.VerifyValidateOptionsResult(modelValidator.Validate(nameof(validModel), validModel), 1);
-    }
-
-    [Fact]
-    public void AttributePropertyModelTestOnErrorMessageResource()
-    {
-        var validModel = new AttributePropertyModel
-        {
-            Val1 = 1,
-            Val2 = 5
-        };
-
-        var modelValidator = new AttributePropertyModelValidator();
-        Utils.VerifyValidateOptionsResult(modelValidator.Validate(nameof(validModel), validModel), 1);
-    }
-}
diff --git a/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/RandomMembersTests.cs b/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/RandomMembersTests.cs
deleted file mode 100644
index 1c87892b279..00000000000
--- a/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/RandomMembersTests.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// 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.Options;
-using RandomMembers;
-using Xunit;
-
-namespace Microsoft.Gen.OptionsValidation.Test;
-
-public class RandomMembersTests
-{
-    [Fact]
-    public void Invalid()
-    {
-        var firstModel = new FirstModel
-        {
-            P1 = "1234",
-        };
-
-        var validator = new FirstValidator();
-        var vr = validator.Validate("RandomMembers", firstModel);
-
-        Utils.VerifyValidateOptionsResult(vr, 1, "P1");
-    }
-
-    [Fact]
-    public void Valid()
-    {
-        var firstModel = new FirstModel
-        {
-            P1 = "12345",
-        };
-
-        var validator = new FirstValidator();
-        Assert.Equal(ValidateOptionsResult.Success, validator.Validate("RandomMembers", firstModel));
-    }
-}
diff --git a/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/RecordTypesTests.cs b/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/RecordTypesTests.cs
deleted file mode 100644
index bd0d872c8b6..00000000000
--- a/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/RecordTypesTests.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-#if ROSLYN_4_0_OR_GREATER
-
-using Microsoft.Extensions.Options;
-using RecordTypes;
-using Xunit;
-
-namespace Microsoft.Gen.OptionsValidation.Test;
-
-public class RecordTypesTests
-{
-    [Fact]
-    public void Invalid()
-    {
-        var thirdModel = new ThirdModel
-        {
-            P6 = "1234",
-        };
-
-        var secondModel = new SecondModel
-        {
-            P5 = "1234",
-        };
-
-        var firstModel = new FirstModel
-        {
-            P1 = "1234",
-            P2 = secondModel,
-            P3 = secondModel,
-            P4 = thirdModel,
-        };
-
-        var validator = default(FirstValidator);
-        var vr = validator.Validate("RecordTypes", firstModel);
-
-        Utils.VerifyValidateOptionsResult(vr, 4, "P1", "P2.P5", "P3.P5", "P4.P6");
-    }
-
-    [Fact]
-    public void Valid()
-    {
-        var thirdModel = new ThirdModel
-        {
-            P6 = "12345",
-        };
-
-        var secondModel = new SecondModel
-        {
-            P5 = "12345",
-        };
-
-        var firstModel = new FirstModel
-        {
-            P1 = "12345",
-            P2 = secondModel,
-            P3 = secondModel,
-            P4 = thirdModel,
-        };
-
-        var validator = default(FirstValidator);
-        Assert.Equal(ValidateOptionsResult.Success, validator.Validate("RecordTypes", firstModel));
-    }
-}
-
-#endif
diff --git a/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/RepeatedTypesTests.cs b/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/RepeatedTypesTests.cs
deleted file mode 100644
index b45fcbf9ced..00000000000
--- a/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/RepeatedTypesTests.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-// 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.Options;
-using RepeatedTypes;
-using Xunit;
-
-namespace Microsoft.Gen.OptionsValidation.Test;
-
-public class RepeatedTypesTests
-{
-    [Fact]
-    public void Invalid()
-    {
-        var thirdModel = new ThirdModel
-        {
-            P5 = "1234",
-        };
-
-        var secondModel = new SecondModel
-        {
-            P4 = thirdModel,
-        };
-
-        var firstModel = new FirstModel
-        {
-            P1 = secondModel,
-            P2 = secondModel,
-            P3 = thirdModel,
-        };
-
-        var validator = new FirstValidator();
-        var vr = validator.Validate("RepeatedTypes", firstModel);
-
-        Utils.VerifyValidateOptionsResult(vr, 3, "P1.P4.P5", "P2.P4.P5", "P3.P5");
-    }
-
-    [Fact]
-    public void Valid()
-    {
-        var thirdModel = new ThirdModel
-        {
-            P5 = "12345",
-        };
-
-        var secondModel = new SecondModel
-        {
-            P4 = thirdModel,
-        };
-
-        var firstModel = new FirstModel
-        {
-            P1 = secondModel,
-            P2 = secondModel,
-            P3 = thirdModel,
-        };
-
-        var validator = new FirstValidator();
-        Assert.Equal(ValidateOptionsResult.Success, validator.Validate("RepeatedTypes", firstModel));
-    }
-}
diff --git a/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/SelfValidationTests.cs b/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/SelfValidationTests.cs
deleted file mode 100644
index 0a511333f03..00000000000
--- a/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/SelfValidationTests.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// 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.Options;
-using SelfValidation;
-using Xunit;
-
-namespace Microsoft.Gen.OptionsValidation.Test;
-
-public class SelfValidationTests
-{
-    [Fact]
-    public void Invalid()
-    {
-        var firstModel = new FirstModel
-        {
-            P1 = "1234",
-        };
-
-        var validator = default(FirstValidator);
-        var vr = validator.Validate("SelfValidation", firstModel);
-
-        Utils.VerifyValidateOptionsResult(vr, 1, "P1");
-    }
-
-    [Fact]
-    public void Valid()
-    {
-        var firstModel = new FirstModel
-        {
-            P1 = "12345",
-        };
-
-        var validator = default(FirstValidator);
-        Assert.Equal(ValidateOptionsResult.Success, validator.Validate("SelfValidation", firstModel));
-    }
-}
diff --git a/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/TestResource.Designer.cs b/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/TestResource.Designer.cs
deleted file mode 100644
index 4fa3e97cbd2..00000000000
--- a/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/TestResource.Designer.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Microsoft.Gen.OptionsValidation.Test {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class TestResource {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal TestResource() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Gen.OptionsValidation.Test.TestResource", typeof(TestResource).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to ErrorMessageResourceName.
-        /// </summary>
-        internal static string ErrorMessageResourceName {
-            get {
-                return ResourceManager.GetString("ErrorMessageResourceName", resourceCulture);
-            }
-        }
-    }
-}
diff --git a/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/TestResource.resx b/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/TestResource.resx
deleted file mode 100644
index 70f767945b3..00000000000
--- a/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/TestResource.resx
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="ErrorMessageResourceName" xml:space="preserve">
-    <value>ErrorMessageResourceName</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/Utils.cs b/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/Utils.cs
deleted file mode 100644
index 7412374f18a..00000000000
--- a/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/Utils.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-#if NETCOREAPP3_1_OR_GREATER
-using System.Linq;
-#endif
-using Microsoft.Extensions.Options;
-using Xunit;
-
-namespace Microsoft.Gen.OptionsValidation.Test;
-
-internal static class Utils
-{
-    public static void VerifyValidateOptionsResult(ValidateOptionsResult vr, int expectedErrorCount, params string[] expectedErrorSubstrings)
-    {
-        Assert.NotNull(vr);
-
-#if NETCOREAPP3_1_OR_GREATER
-        var failures = vr.Failures!.ToArray();
-#else
-        var failures = vr.FailureMessage!.Split(';');
-#endif
-
-        Assert.Equal(expectedErrorCount, failures.Length);
-
-        for (int i = 0; i < expectedErrorSubstrings.Length; i++)
-        {
-            Assert.Contains(expectedErrorSubstrings[i], failures[i]);
-        }
-    }
-}
diff --git a/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/ValueTypesTests.cs b/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/ValueTypesTests.cs
deleted file mode 100644
index 543e8eb882b..00000000000
--- a/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Common/ValueTypesTests.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-// 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.Options;
-using ValueTypes;
-using Xunit;
-
-namespace Microsoft.Gen.OptionsValidation.Test;
-
-public class ValueTypesTests
-{
-    [Fact]
-    public void Invalid()
-    {
-        var secondModel = new SecondModel
-        {
-            P4 = "1234",
-        };
-
-        var firstModel = new FirstModel
-        {
-            P1 = "1234",
-            P3 = secondModel,
-            P2 = secondModel,
-            P4 = default,
-        };
-
-        var validator = default(FirstValidator);
-        var vr = validator.Validate("ValueTypes", firstModel);
-
-        Utils.VerifyValidateOptionsResult(vr, 3, "P1", "P2.P4", "P3.P4");
-    }
-
-    [Fact]
-    public void Valid()
-    {
-        var secondModel = new SecondModel
-        {
-            P4 = "12345",
-        };
-
-        var firstModel = new FirstModel
-        {
-            P1 = "12345",
-            P3 = secondModel,
-            P2 = secondModel,
-            P4 = default,
-        };
-
-        var validator = default(FirstValidator);
-        Assert.Equal(ValidateOptionsResult.Success, validator.Validate("ValueTypes", firstModel));
-    }
-}
diff --git a/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Directory.Build.props b/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Directory.Build.props
deleted file mode 100644
index ee32cd31896..00000000000
--- a/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Directory.Build.props
+++ /dev/null
@@ -1,33 +0,0 @@
-<Project>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
-
-  <PropertyGroup>
-    <RootNamespace>Microsoft.Gen.OptionsValidation.Test</RootNamespace>
-    <Description>Tests for code generated by Gen.OptionsValidation.</Description>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <TargetFrameworks>$(TestNetCoreTargetFrameworks)</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(IsWindowsBuild)' == 'true' ">$(TestNetCoreTargetFrameworks)$(ConditionalNet462)</TargetFrameworks>
-    <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
-    <InjectIsExternalInitOnLegacy>true</InjectIsExternalInitOnLegacy>
-    <InjectSharedNumericExtensions>true</InjectSharedNumericExtensions>
-    <InjectSharedDataValidation>true</InjectSharedDataValidation>
-    <NoWarn>$(NoWarn);CA1824</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="..\Common\**\*.cs" />
-    <Compile Include="..\..\TestClasses\**\*.cs" LinkBase="TestClasses" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="..\Common\TestResource.resx" Generator="ResXFileCodeGenerator" LastGenOutput="TestResource.Designer.cs" CustomToolNamespace="$(RootNamespace)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\src\Generators\Microsoft.Gen.OptionsValidation\Roslyn$(AnalyzerRoslynVersion)\Microsoft.Gen.OptionsValidation.Roslyn$(AnalyzerRoslynVersion).csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" Private="false" />
-    <ProjectReference Include="..\..\..\..\..\src\Libraries\Microsoft.Extensions.Options.Validation\Microsoft.Extensions.Options.Validation.csproj"  />
-  </ItemGroup>
-
-</Project>
diff --git a/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Roslyn3.8/Microsoft.Gen.OptionsValidation.Roslyn3.8.Generated.Tests.csproj b/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Roslyn3.8/Microsoft.Gen.OptionsValidation.Roslyn3.8.Generated.Tests.csproj
deleted file mode 100644
index 68a4e354e8c..00000000000
--- a/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Roslyn3.8/Microsoft.Gen.OptionsValidation.Roslyn3.8.Generated.Tests.csproj
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <AnalyzerRoslynVersion>3.8</AnalyzerRoslynVersion>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Update="..\Common\TestResource.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>TestResource.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-</Project>
diff --git a/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Roslyn4.0/Microsoft.Gen.OptionsValidation.Roslyn4.0.Generated.Tests.csproj b/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Roslyn4.0/Microsoft.Gen.OptionsValidation.Roslyn4.0.Generated.Tests.csproj
deleted file mode 100644
index 1dbe0b6f25c..00000000000
--- a/test/Generators/Microsoft.Gen.OptionsValidation/Generated/Roslyn4.0/Microsoft.Gen.OptionsValidation.Roslyn4.0.Generated.Tests.csproj
+++ /dev/null
@@ -1,14 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <AnalyzerRoslynVersion>4.0</AnalyzerRoslynVersion>
-    <DefineConstants>$(DefineConstants);ROSLYN_4_0_OR_GREATER</DefineConstants>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Update="..\Common\TestResource.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>TestResource.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-</Project>
diff --git a/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/CustomAttr.cs b/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/CustomAttr.cs
deleted file mode 100644
index 4259af039bc..00000000000
--- a/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/CustomAttr.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System;
-using System.ComponentModel.DataAnnotations;
-using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
-
-namespace CustomAttr
-{
-#pragma warning disable SA1649
-#pragma warning disable SA1402
-#pragma warning disable CA1019
-#pragma warning disable IDE0052
-
-    [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter, AllowMultiple = false)]
-    public sealed class CustomAttribute : ValidationAttribute
-    {
-        private readonly char _ch;
-        private readonly bool _caseSensitive;
-        private readonly string? _extra;
-
-        public CustomAttribute(char ch, bool caseSensitive, string? extra)
-        {
-            _ch = ch;
-            _caseSensitive = caseSensitive;
-            _extra = extra;
-        }
-
-        protected override ValidationResult IsValid(object? value, ValidationContext? validationContext)
-        {
-            if (value == null)
-            {
-                return ValidationResult.Success!;
-            }
-
-            if (_caseSensitive)
-            {
-                if ((char)value != _ch)
-                {
-                    return new ValidationResult($"{validationContext?.MemberName} didn't match");
-                }
-            }
-            else
-            {
-                if (char.ToUpperInvariant((char)value) != char.ToUpperInvariant(_ch))
-                {
-                    return new ValidationResult($"{validationContext?.MemberName} didn't match");
-                }
-            }
-
-            return ValidationResult.Success!;
-        }
-    }
-
-    public class FirstModel
-    {
-        [Custom('A', true, null)]
-        public char P1 { get; set; }
-
-        [Custom('A', false, "X")]
-        public char P2 { get; set; }
-    }
-
-    [OptionsValidator]
-    public partial class FirstValidator : IValidateOptions<FirstModel>
-    {
-    }
-}
diff --git a/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/Enumeration.cs b/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/Enumeration.cs
deleted file mode 100644
index bf5d1f7c634..00000000000
--- a/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/Enumeration.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Diagnostics.CodeAnalysis;
-using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
-
-namespace Enumeration
-{
-#pragma warning disable SA1649
-#pragma warning disable SA1402
-
-    public class FirstModel
-    {
-        [ValidateEnumeratedItems]
-        public IList<SecondModel>? P1;
-
-        [ValidateEnumeratedItems(typeof(SecondValidator))]
-        public IList<SecondModel>? P2;
-
-        [ValidateEnumeratedItems]
-        public IList<SecondModel?>? P3;
-
-        [ValidateEnumeratedItems]
-        public IList<ThirdModel>? P4;
-
-        [ValidateEnumeratedItems]
-        public IList<ThirdModel?>? P5;
-
-        [ValidateEnumeratedItems]
-        [SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1125:Use shorthand for nullable types", Justification = "Testing System>Nullable<T>")]
-        public IList<Nullable<ThirdModel>>? P51;
-
-        [ValidateEnumeratedItems]
-        public SynteticEnumerable? P6;
-
-        [ValidateEnumeratedItems]
-        public SynteticEnumerable P7;
-
-        [ValidateEnumeratedItems]
-        [SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1125:Use shorthand for nullable types", Justification = "Testing System>Nullable<T>")]
-        public Nullable<SynteticEnumerable> P8;
-    }
-
-    public class SecondModel
-    {
-        [Required]
-        [MinLength(5)]
-        public string P6 = string.Empty;
-    }
-
-    public struct ThirdModel
-    {
-        [Range(0, 10)]
-        public int Value;
-    }
-
-    public struct SynteticEnumerable : IEnumerable<SecondModel>
-    {
-        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
-
-        public IEnumerator<SecondModel> GetEnumerator() => new InternalEnumerator();
-
-        private class InternalEnumerator : IEnumerator<SecondModel>
-        {
-            public SecondModel Current => throw new NotSupportedException();
-
-            object IEnumerator.Current => Current;
-
-            public void Dispose()
-            {
-                // Nothing to dispose...
-            }
-
-            public bool MoveNext() => false;
-
-            public void Reset() => throw new NotSupportedException();
-        }
-    }
-
-    [OptionsValidator]
-    public partial struct FirstValidator : IValidateOptions<FirstModel>
-    {
-    }
-
-    [OptionsValidator]
-    public partial struct SecondValidator : IValidateOptions<SecondModel>
-    {
-    }
-}
diff --git a/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/Fields.cs b/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/Fields.cs
deleted file mode 100644
index ddf54f49f4e..00000000000
--- a/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/Fields.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.ComponentModel.DataAnnotations;
-using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
-
-namespace Fields
-{
-#pragma warning disable SA1649
-#pragma warning disable SA1402
-#pragma warning disable S1186
-#pragma warning disable CA1822
-
-    public class FirstModel
-    {
-        [Required]
-        [MinLength(5)]
-        public string P1 = string.Empty;
-
-        [Microsoft.Extensions.Options.Validation.ValidateObjectMembers(typeof(SecondValidator))]
-        public SecondModel? P2;
-
-        [Microsoft.Extensions.Options.Validation.ValidateObjectMembers]
-        public ThirdModel P3;
-    }
-
-    public class SecondModel
-    {
-        [Required]
-        [MinLength(5)]
-        public string P4 = string.Empty;
-    }
-
-    public struct ThirdModel
-    {
-        [Required]
-        [MinLength(5)]
-        public string P5 = string.Empty;
-
-        public int P6 = default;
-
-        public ThirdModel(object _)
-        {
-        }
-    }
-
-    [OptionsValidator]
-    public partial struct FirstValidator : IValidateOptions<FirstModel>
-    {
-        public void Validate()
-        {
-        }
-
-        public void Validate(int _)
-        {
-        }
-
-        public void Validate(string? _)
-        {
-        }
-
-        public void Validate(string? _0, object _1)
-        {
-        }
-    }
-
-    [OptionsValidator]
-    public partial struct SecondValidator : IValidateOptions<SecondModel>
-    {
-    }
-}
diff --git a/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/FileScopedNamespace.cs b/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/FileScopedNamespace.cs
deleted file mode 100644
index 1341181d24d..00000000000
--- a/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/FileScopedNamespace.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.ComponentModel.DataAnnotations;
-using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
-
-namespace FileScopedNamespace;
-
-#pragma warning disable SA1649 // File name should match first type name
-
-public class FirstModel
-{
-    [Required]
-    [MinLength(5)]
-    public string P1 = string.Empty;
-}
-
-[OptionsValidator]
-public partial struct FirstValidator : IValidateOptions<FirstModel>
-{
-}
diff --git a/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/FunnyStrings.cs b/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/FunnyStrings.cs
deleted file mode 100644
index 401109dd621..00000000000
--- a/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/FunnyStrings.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.ComponentModel.DataAnnotations;
-using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
-
-namespace FunnyStrings
-{
-#pragma warning disable SA1649
-#pragma warning disable SA1402
-
-    public class FirstModel
-    {
-        [RegularExpression("\"\r\n\\\\")]
-        public string P1 { get; set; } = string.Empty;
-    }
-
-    [OptionsValidator]
-    public partial struct FirstValidator : IValidateOptions<FirstModel>
-    {
-    }
-}
diff --git a/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/Generics.cs b/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/Generics.cs
deleted file mode 100644
index bde80402a18..00000000000
--- a/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/Generics.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.ComponentModel.DataAnnotations;
-using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
-
-namespace Generics
-{
-#pragma warning disable SA1649
-#pragma warning disable SA1402
-
-    public class FirstModel<T>
-    {
-        [Required]
-        [MinLength(5)]
-        public string P1 { get; set; } = string.Empty;
-
-        public T? P2 { get; set; }
-
-        [Microsoft.Extensions.Options.Validation.ValidateObjectMembers]
-        public SecondModel? P3 { get; set; }
-    }
-
-    public class SecondModel
-    {
-        [Required]
-        [MinLength(5)]
-        public string P4 { get; set; } = string.Empty;
-    }
-
-    [OptionsValidator]
-    public partial class FirstValidator<T> : IValidateOptions<FirstModel<T>>
-    {
-    }
-}
diff --git a/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/Models.cs b/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/Models.cs
deleted file mode 100644
index 2234bd650da..00000000000
--- a/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/Models.cs
+++ /dev/null
@@ -1,252 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System;
-using System.ComponentModel.DataAnnotations;
-using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
-using Microsoft.Gen.OptionsValidation.Test;
-
-#pragma warning disable SA1649
-#pragma warning disable SA1402
-
-namespace TestClasses.OptionsValidation
-{
-    // ValidationAttribute without parameter
-    public class RequiredAttributeModel
-    {
-        [Required]
-        public string? Val { get; set; }
-    }
-
-    // ValidationAttribute with string parameter
-    public class RegularExpressionAttributeModel
-    {
-        [RegularExpression("\\s")]
-        public string Val { get; set; } = string.Empty;
-    }
-
-    // DataTypeAttribute
-    public class EmailAttributeModel
-    {
-        [EmailAddress]
-        public string Val { get; set; } = string.Empty;
-    }
-
-    // ValidationAttribute with System.Type parameter
-    public class CustomValidationAttributeModel
-    {
-        [CustomValidation(typeof(CustomValidationTest), "TestMethod")]
-        public string Val { get; set; } = string.Empty;
-    }
-
-#pragma warning disable SA1204 // Static elements should appear before instance elements
-    public static class CustomValidationTest
-#pragma warning restore SA1204 // Static elements should appear before instance elements
-    {
-        public static ValidationResult? TestMethod(string val, ValidationContext _)
-        {
-            if (val.Equals("Pass", StringComparison.Ordinal))
-            {
-                return ValidationResult.Success;
-            }
-
-            throw new ValidationException();
-        }
-    }
-
-    // ValidationAttribute with DataType parameter
-    public class DataTypeAttributeModel
-    {
-        [DataType(DataType.Text)]
-        public string Val { get; set; } = string.Empty;
-    }
-
-    // ValidationAttribute with type, double, int parameters
-    public class RangeAttributeModelInt
-    {
-        [Range(1, 3)]
-        public int Val { get; set; }
-    }
-
-    public class RangeAttributeModelDouble
-    {
-        [Range(0.5, 0.9)]
-        public double Val { get; set; }
-    }
-
-    public class RangeAttributeModelDate
-    {
-#if NETCOREAPP3_1_OR_GREATER
-        [Range(typeof(DateTime), "1/2/2004", "3/4/2004", ParseLimitsInInvariantCulture = true)]
-#else
-        [Range(typeof(DateTime), "1/2/2004", "3/4/2004")]
-#endif
-        public DateTime Val { get; set; }
-    }
-
-    public class MultipleAttributeModel
-    {
-        [Required]
-        [DataType(DataType.Password)]
-        public string Val1 { get; set; } = string.Empty;
-
-        [Range(1, 3)]
-        public int Val2 { get; set; }
-
-        [Range(3, 5)]
-        public int Val3 { get; set; }
-
-        [Range(5, 9)]
-        public int Val4 { get; set; }
-    }
-
-    public class CustomTypeCustomValidationAttributeModel
-    {
-        [CustomValidation(typeof(CustomTypeCustomValidationTest), "TestMethod")]
-        public CustomType? Val { get; set; }
-    }
-
-    public class CustomType
-    {
-        public string Val1 { get; set; } = string.Empty;
-        public string Val2 { get; set; } = string.Empty;
-    }
-
-#pragma warning disable SA1204 // Static elements should appear before instance elements
-    public static class CustomTypeCustomValidationTest
-#pragma warning restore SA1204 // Static elements should appear before instance elements
-    {
-        public static ValidationResult? TestMethod(CustomType val, ValidationContext _)
-        {
-            if (val.Val1.Equals("Pass", StringComparison.Ordinal) && val.Val2.Equals("Pass", StringComparison.Ordinal))
-            {
-                return ValidationResult.Success;
-            }
-
-            throw new ValidationException();
-        }
-    }
-
-    public class AttributePropertyModel
-    {
-        [Range(1, 3, ErrorMessage = "ErrorMessage")]
-        public int Val1 { get; set; }
-
-        [Range(1, 3, ErrorMessageResourceType = typeof(TestResource), ErrorMessageResourceName = "ErrorMessageResourceName")]
-        public int Val2 { get; set; }
-    }
-
-    public class TypeWithoutOptionsValidator
-    {
-        [Required]
-        public string? Val1 { get; set; }
-
-        [Range(typeof(DateTime), "1/2/2004", "3/4/2004")]
-        public DateTime Val2 { get; set; }
-
-        [Microsoft.Extensions.Options.Validation.ValidateObjectMembers]
-        public RangeAttributeModelDouble? YetAnotherComplexVal { get; set; }
-    }
-
-    public class DerivedModel : RequiredAttributeModel
-    {
-        [Required]
-        public string? DerivedVal { get; set; }
-
-        [Required]
-        internal virtual int? VirtualValWithAttr { get; set; }
-
-        public virtual int? VirtualValWithoutAttr { get; set; }
-
-        [Required]
-        public new int? Val { get; set; }
-    }
-
-    public class LeafModel : DerivedModel
-    {
-        internal override int? VirtualValWithAttr { get; set; }
-
-        [Required]
-        public override int? VirtualValWithoutAttr { get; set; }
-    }
-
-    public class ComplexModel
-    {
-        [Microsoft.Extensions.Options.Validation.ValidateObjectMembers]
-        public RequiredAttributeModel? ComplexVal { get; set; }
-
-        [Microsoft.Extensions.Options.Validation.ValidateObjectMembers]
-        public TypeWithoutOptionsValidator? ValWithoutOptionsValidator { get; set; }
-    }
-
-    [OptionsValidator]
-    public partial class RequiredAttributeModelValidator : IValidateOptions<RequiredAttributeModel>
-    {
-    }
-
-    [OptionsValidator]
-    public partial class RegularExpressionAttributeModelValidator : IValidateOptions<RegularExpressionAttributeModel>
-    {
-    }
-
-    [OptionsValidator]
-    public partial class EmailAttributeModelValidator : IValidateOptions<EmailAttributeModel>
-    {
-    }
-
-    [OptionsValidator]
-    public partial class CustomValidationAttributeModelValidator : IValidateOptions<CustomValidationAttributeModel>
-    {
-    }
-
-    [OptionsValidator]
-    public partial class DataTypeAttributeModelValidator : IValidateOptions<DataTypeAttributeModel>
-    {
-    }
-
-    [OptionsValidator]
-    public partial class RangeAttributeModelIntValidator : IValidateOptions<RangeAttributeModelInt>
-    {
-    }
-
-    [OptionsValidator]
-    public partial class RangeAttributeModelDoubleValidator : IValidateOptions<RangeAttributeModelDouble>
-    {
-    }
-
-    [OptionsValidator]
-    public partial class RangeAttributeModelDateValidator : IValidateOptions<RangeAttributeModelDate>
-    {
-    }
-
-    [OptionsValidator]
-    public partial class MultipleAttributeModelValidator : IValidateOptions<MultipleAttributeModel>
-    {
-    }
-
-    [OptionsValidator]
-    public partial class CustomTypeCustomValidationAttributeModelValidator : IValidateOptions<CustomTypeCustomValidationAttributeModel>
-    {
-    }
-
-    [OptionsValidator]
-    public partial class AttributePropertyModelValidator : IValidateOptions<AttributePropertyModel>
-    {
-    }
-
-    [OptionsValidator]
-    public partial class DerivedModelValidator : IValidateOptions<DerivedModel>
-    {
-    }
-
-    [OptionsValidator]
-    public partial class LeafModelValidator : IValidateOptions<LeafModel>
-    {
-    }
-
-    [OptionsValidator]
-    internal sealed partial class ComplexModelValidator : IValidateOptions<ComplexModel>
-    {
-    }
-}
diff --git a/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/MultiModelValidator.cs b/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/MultiModelValidator.cs
deleted file mode 100644
index fd725d8403c..00000000000
--- a/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/MultiModelValidator.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.ComponentModel.DataAnnotations;
-using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
-
-namespace MultiModelValidator
-{
-#pragma warning disable SA1649
-#pragma warning disable SA1402
-
-    public class FirstModel
-    {
-        [Required]
-        [MinLength(5)]
-        public string P1 = string.Empty;
-
-        [Microsoft.Extensions.Options.Validation.ValidateObjectMembers(typeof(MultiValidator))]
-        public SecondModel? P2;
-    }
-
-    public class SecondModel
-    {
-        [Required]
-        [MinLength(5)]
-        public string P3 = string.Empty;
-    }
-
-    [OptionsValidator]
-    public partial struct MultiValidator : IValidateOptions<FirstModel>, IValidateOptions<SecondModel>
-    {
-    }
-}
diff --git a/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/Nested.cs b/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/Nested.cs
deleted file mode 100644
index 531e0eed0d1..00000000000
--- a/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/Nested.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-#if ROSLYN_4_0_OR_GREATER
-
-using System.ComponentModel.DataAnnotations;
-using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
-
-namespace Nested
-{
-#pragma warning disable SA1649
-#pragma warning disable SA1402
-
-    public static class Container1
-    {
-        public class FirstModel
-        {
-            [Required]
-            [MinLength(5)]
-            public string P1 { get; set; } = string.Empty;
-
-            [Microsoft.Extensions.Options.Validation.ValidateObjectMembers(typeof(Container2.Container3.SecondValidator))]
-            public SecondModel? P2 { get; set; }
-
-            [Microsoft.Extensions.Options.Validation.ValidateObjectMembers]
-            public ThirdModel P3 { get; set; }
-
-            [Microsoft.Extensions.Options.Validation.ValidateObjectMembers(typeof(Container4.Container5.ThirdValidator))]
-            public SecondModel? P4 { get; set; }
-        }
-
-        public class SecondModel
-        {
-            [Required]
-            [MinLength(5)]
-            public string P5 { get; set; } = string.Empty;
-        }
-
-        public struct ThirdModel
-        {
-            public ThirdModel(int _)
-            {
-            }
-
-            [Required]
-            [MinLength(5)]
-            public string P6 { get; set; } = string.Empty;
-        }
-    }
-
-    public static partial class Container2
-    {
-        public partial class Container3
-        {
-            public Container3(int _)
-            {
-                // nothing to do
-            }
-
-            [OptionsValidator]
-            public partial struct FirstValidator : IValidateOptions<Container1.FirstModel>
-            {
-            }
-
-            [OptionsValidator]
-            public partial struct SecondValidator : IValidateOptions<Container1.SecondModel>
-            {
-            }
-        }
-    }
-
-    public partial record class Container4
-    {
-        public partial record class Container5
-        {
-            public Container5(int _)
-            {
-                // nothing to do
-            }
-
-            [OptionsValidator]
-            public partial struct ThirdValidator : IValidateOptions<Container1.SecondModel>
-            {
-            }
-        }
-    }
-
-    public partial struct Container6
-    {
-        [OptionsValidator]
-        public partial struct FourthValidator : IValidateOptions<Container1.SecondModel>
-        {
-        }
-    }
-
-    public partial record struct Container7
-    {
-        [OptionsValidator]
-        public partial record struct FifthValidator : IValidateOptions<Container1.SecondModel>
-        {
-        }
-    }
-}
-
-#endif
diff --git a/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/NoNamespace.cs b/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/NoNamespace.cs
deleted file mode 100644
index db6461ddf18..00000000000
--- a/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/NoNamespace.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.ComponentModel.DataAnnotations;
-using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
-
-#pragma warning disable SA1649
-#pragma warning disable SA1402
-
-public class FirstModelNoNamespace
-{
-    [Required]
-    [MinLength(5)]
-    public string P1 { get; set; } = string.Empty;
-
-    [Microsoft.Extensions.Options.Validation.ValidateObjectMembers(typeof(SecondValidatorNoNamespace))]
-    public SecondModelNoNamespace? P2 { get; set; }
-
-    [Microsoft.Extensions.Options.Validation.ValidateObjectMembers]
-    public ThirdModelNoNamespace? P3 { get; set; }
-}
-
-public class SecondModelNoNamespace
-{
-    [Required]
-    [MinLength(5)]
-    public string P4 { get; set; } = string.Empty;
-}
-
-public class ThirdModelNoNamespace
-{
-    [Required]
-    [MinLength(5)]
-    public string P5 { get; set; } = string.Empty;
-}
-
-[OptionsValidator]
-public partial class FirstValidatorNoNamespace : IValidateOptions<FirstModelNoNamespace>
-{
-}
-
-[OptionsValidator]
-public partial class SecondValidatorNoNamespace : IValidateOptions<SecondModelNoNamespace>
-{
-}
diff --git a/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/RandomMembers.cs b/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/RandomMembers.cs
deleted file mode 100644
index 08a3327a874..00000000000
--- a/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/RandomMembers.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System;
-using System.ComponentModel.DataAnnotations;
-using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
-
-namespace RandomMembers
-{
-#pragma warning disable SA1649
-#pragma warning disable SA1402
-#pragma warning disable CA1822
-
-    public class FirstModel
-    {
-        [Required]
-        [MinLength(5)]
-        public string? P1 { get; set; }
-
-        public void Foo()
-        {
-            throw new NotSupportedException();
-        }
-
-        public class Nested
-        {
-        }
-    }
-
-    [OptionsValidator]
-    public partial class FirstValidator : IValidateOptions<FirstModel>
-    {
-    }
-}
diff --git a/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/RecordTypes.cs b/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/RecordTypes.cs
deleted file mode 100644
index b0b393f737d..00000000000
--- a/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/RecordTypes.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-#if ROSLYN_4_0_OR_GREATER
-
-using System.ComponentModel.DataAnnotations;
-using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
-
-namespace RecordTypes
-{
-#pragma warning disable SA1649
-
-    public record class FirstModel
-    {
-        [Required]
-        [MinLength(5)]
-        public string P1 { get; set; } = string.Empty;
-
-        [Microsoft.Extensions.Options.Validation.ValidateObjectMembers(typeof(SecondValidator))]
-        public SecondModel? P2 { get; set; }
-
-        [Microsoft.Extensions.Options.Validation.ValidateObjectMembers(typeof(ThirdValidator))]
-        public SecondModel P3 { get; set; } = new SecondModel();
-
-        [Microsoft.Extensions.Options.Validation.ValidateObjectMembers]
-        public ThirdModel P4 { get; set; }
-    }
-
-    public record class SecondModel
-    {
-        [Required]
-        [MinLength(5)]
-        public string P5 { get; set; } = string.Empty;
-    }
-
-    public record struct ThirdModel
-    {
-        [Required]
-        [MinLength(5)]
-        public string P6 { get; set; } = string.Empty;
-
-        public ThirdModel(int _)
-        {
-        }
-
-        public ThirdModel(object _)
-        {
-        }
-    }
-
-    [OptionsValidator]
-    public partial record struct FirstValidator : IValidateOptions<FirstModel>
-    {
-    }
-
-    [OptionsValidator]
-    public partial record struct SecondValidator : IValidateOptions<SecondModel>
-    {
-    }
-
-    [OptionsValidator]
-    public partial record class ThirdValidator : IValidateOptions<SecondModel>
-    {
-    }
-}
-
-#endif
diff --git a/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/RepeatedTypes.cs b/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/RepeatedTypes.cs
deleted file mode 100644
index f5fa327bae5..00000000000
--- a/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/RepeatedTypes.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.ComponentModel.DataAnnotations;
-using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
-
-namespace RepeatedTypes
-{
-#pragma warning disable SA1649
-#pragma warning disable SA1402
-#pragma warning disable CA1019
-
-    public class FirstModel
-    {
-        [Required]
-        [Microsoft.Extensions.Options.Validation.ValidateObjectMembers]
-        public SecondModel? P1 { get; set; }
-
-        [Required]
-        [Microsoft.Extensions.Options.Validation.ValidateObjectMembers]
-        public SecondModel? P2 { get; set; }
-
-        [Required]
-        [Microsoft.Extensions.Options.Validation.ValidateObjectMembers]
-        public ThirdModel? P3 { get; set; }
-    }
-
-    public class SecondModel
-    {
-        [Required]
-        [Microsoft.Extensions.Options.Validation.ValidateObjectMembers]
-        public ThirdModel? P4 { get; set; }
-    }
-
-    public class ThirdModel
-    {
-        [Required]
-        [MinLength(5)]
-        public string? P5;
-    }
-
-    [OptionsValidator]
-    public partial class FirstValidator : IValidateOptions<FirstModel>
-    {
-    }
-}
diff --git a/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/SelfValidation.cs b/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/SelfValidation.cs
deleted file mode 100644
index 673af4a0896..00000000000
--- a/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/SelfValidation.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
-
-namespace SelfValidation
-{
-#pragma warning disable SA1649
-
-    public class FirstModel : IValidatableObject
-    {
-        [Required]
-        public string P1 = string.Empty;
-
-        public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
-        {
-            if (P1.Length < 5)
-            {
-                return new[] { new ValidationResult("P1 is not long enough") };
-            }
-
-            return Array.Empty<ValidationResult>();
-        }
-    }
-
-    [OptionsValidator]
-    public partial struct FirstValidator : IValidateOptions<FirstModel>
-    {
-    }
-}
diff --git a/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/ValueTypes.cs b/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/ValueTypes.cs
deleted file mode 100644
index aa6a8c3f972..00000000000
--- a/test/Generators/Microsoft.Gen.OptionsValidation/TestClasses/ValueTypes.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.Diagnostics.CodeAnalysis;
-using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
-
-namespace ValueTypes
-{
-#pragma warning disable SA1649
-
-    public class FirstModel
-    {
-        [Required]
-        [MinLength(5)]
-        public string P1 { get; set; } = string.Empty;
-
-        [ValidateObjectMembers]
-        public SecondModel? P2 { get; set; }
-
-        [ValidateObjectMembers]
-        public SecondModel P3 { get; set; }
-
-        [ValidateObjectMembers]
-        [SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1125:Use shorthand for nullable types", Justification = "Testing System>Nullable<T>")]
-        public Nullable<SecondModel> P4 { get; set; }
-    }
-
-    public struct SecondModel
-    {
-        [Required]
-        [MinLength(5)]
-        public string P4 { get; set; } = string.Empty;
-
-        public SecondModel(object _)
-        {
-        }
-    }
-
-    [OptionsValidator]
-    public partial struct FirstValidator : IValidateOptions<FirstModel>
-    {
-    }
-}
diff --git a/test/Generators/Microsoft.Gen.OptionsValidation/Unit/Common/EmitterTests.cs b/test/Generators/Microsoft.Gen.OptionsValidation/Unit/Common/EmitterTests.cs
deleted file mode 100644
index 56c0abdbfcb..00000000000
--- a/test/Generators/Microsoft.Gen.OptionsValidation/Unit/Common/EmitterTests.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.IO;
-using System.Reflection;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
-using Microsoft.Gen.Shared;
-using Microsoft.Shared.Data.Validation;
-using Xunit;
-
-namespace Microsoft.Gen.OptionsValidation.Test;
-
-public class EmitterTests
-{
-    [Fact]
-    public async Task TestEmitter()
-    {
-        var sources = new List<string>();
-        foreach (var file in Directory.GetFiles("TestClasses"))
-        {
-#if !ROSLYN_4_0_OR_GREATER
-            if (file.EndsWith("Nested.cs") || file.EndsWith("RecordTypes.cs"))
-            {
-                continue;
-            }
-#endif
-
-#if NETCOREAPP3_1_OR_GREATER
-            sources.Add("#define NETCOREAPP3_1_OR_GREATER\n" + File.ReadAllText(file));
-#else
-            sources.Add(File.ReadAllText(file));
-#endif
-        }
-
-        var (d, r) = await RoslynTestUtils.RunGenerator(
-            new Generator(),
-            new[]
-            {
-                Assembly.GetAssembly(typeof(RequiredAttribute))!,
-                Assembly.GetAssembly(typeof(TimeSpanAttribute))!,
-                Assembly.GetAssembly(typeof(OptionsValidatorAttribute))!,
-                Assembly.GetAssembly(typeof(IValidateOptions<object>))!,
-            },
-            sources)
-            .ConfigureAwait(false);
-
-        Assert.Empty(d);
-        _ = Assert.Single(r);
-
-        var golden = File.ReadAllText($"GoldenFiles/Microsoft.Gen.OptionsValidation/Microsoft.Gen.OptionsValidation.Generator/Validators.g.cs");
-        var result = r[0].SourceText.ToString();
-        Assert.Equal(golden, result);
-    }
-}
diff --git a/test/Generators/Microsoft.Gen.OptionsValidation/Unit/Common/ParserTests.Enumeration.cs b/test/Generators/Microsoft.Gen.OptionsValidation/Unit/Common/ParserTests.Enumeration.cs
deleted file mode 100644
index 4e99becec9a..00000000000
--- a/test/Generators/Microsoft.Gen.OptionsValidation/Unit/Common/ParserTests.Enumeration.cs
+++ /dev/null
@@ -1,212 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.Threading.Tasks;
-using Xunit;
-
-namespace Microsoft.Gen.OptionsValidation.Test;
-
-public partial class ParserTests
-{
-    [Fact]
-    public async Task CircularTypeReferencesInEnumeration()
-    {
-        var (d, _) = await RunGenerator(@"
-            public class FirstModel
-            {
-                [Required]
-                [ValidateEnumeratedItems]
-                public FirstModel[]? P1 { get; set; }
-            }
-
-            [OptionsValidator]
-            public partial class FirstValidator : IValidateOptions<FirstModel>
-            {
-            }
-        ");
-
-        _ = Assert.Single(d);
-        Assert.Equal(DiagDescriptors.CircularTypeReferences.Id, d[0].Id);
-    }
-
-    [Fact]
-    public async Task NotValidatorInEnumeration()
-    {
-        var (d, _) = await RunGenerator(@"
-            public class FirstModel
-            {
-                [ValidateEnumeratedItems(typeof(SecondValidator)]
-                public SecondModel[]? P1;
-            }
-
-            public class SecondModel
-            {
-                [Required]
-                public string? P2;
-            }
-
-            [OptionsValidator]
-            public partial class FirstValidator : IValidateOptions<FirstModel>
-            {
-            }
-
-            public partial class SecondValidator
-            {
-            }
-        ");
-
-        _ = Assert.Single(d);
-        Assert.Equal(DiagDescriptors.DoesntImplementIValidateOptions.Id, d[0].Id);
-    }
-
-    [Fact]
-    public async Task NullValidatorInEnumeration()
-    {
-        var (d, _) = await RunGenerator(@"
-            public class FirstModel
-            {
-                [ValidateEnumeratedItems(null!)]
-                public SecondModel[]? P1;
-            }
-
-            public class SecondModel
-            {
-                [Required]
-                public string? P2;
-            }
-
-            [OptionsValidator]
-            public partial class FirstValidator : IValidateOptions<FirstModel>
-            {
-            }
-
-            [OptionsValidator]
-            public partial class SecondValidator : IValidateOptions<SecondModel>
-            {
-            }
-        ");
-
-        _ = Assert.Single(d);
-        Assert.Equal(DiagDescriptors.NullValidatorType.Id, d[0].Id);
-    }
-
-    [Fact]
-    public async Task NoSimpleValidatorConstructorInEnumeration()
-    {
-        var (d, _) = await RunGenerator(@"
-            public class FirstModel
-            {
-                [Required]
-                public string? P1;
-
-                [ValidateEnumeratedItems(typeof(SecondValidator)]
-                public SecondModel[]? P2;
-            }
-
-            public class SecondModel
-            {
-                [Required]
-                public string? P3;
-            }
-
-            [OptionsValidator]
-            public partial class FirstValidator : IValidateOptions<FirstModel>
-            {
-            }
-
-            [OptionsValidator]
-            public partial class SecondValidator : IValidateOptions<SecondModel>
-            {
-                public SecondValidator(int _)
-                {
-                }
-            }
-        ");
-
-        _ = Assert.Single(d);
-        Assert.Equal(DiagDescriptors.ValidatorsNeedSimpleConstructor.Id, d[0].Id);
-    }
-
-    [Fact]
-    public async Task CantValidateOpenGenericMembersInEnumeration()
-    {
-        var (d, _) = await RunGenerator(@"
-            public class FirstModel<T>
-            {
-                [Required]
-                [ValidateEnumeratedItems]
-                public T[]? P1;
-
-                [ValidateEnumeratedItems]
-                [Required]
-                public T[]? P2;
-
-                [ValidateEnumeratedItems]
-                [Required]
-                public System.Collections.Generic.IList<T> P3 = null!;
-            }
-
-            [OptionsValidator]
-            public partial class FirstValidator<T> : IValidateOptions<FirstModel<T>>
-            {
-            }
-        ");
-
-        Assert.Equal(3, d.Count);
-        Assert.Equal(DiagDescriptors.CantUseWithGenericTypes.Id, d[0].Id);
-        Assert.Equal(DiagDescriptors.CantUseWithGenericTypes.Id, d[1].Id);
-        Assert.Equal(DiagDescriptors.CantUseWithGenericTypes.Id, d[2].Id);
-    }
-
-    [Fact]
-    public async Task ClosedGenericsInEnumeration()
-    {
-        var (d, _) = await RunGenerator(@"
-            public class FirstModel<T>
-            {
-                [ValidateEnumeratedItems]
-                [Required]
-                public T[]? P1;
-
-                [ValidateEnumeratedItems]
-                [Required]
-                public int[]? P2;
-
-                [ValidateEnumeratedItems]
-                [Required]
-                public System.Collections.Generic.IList<T>? P3;
-            }
-
-            [OptionsValidator]
-            public partial class FirstValidator : IValidateOptions<FirstModel<string>>
-            {
-            }
-        ");
-
-        Assert.Equal(3, d.Count);
-        Assert.Equal(DiagDescriptors.NoEligibleMember.Id, d[0].Id);
-        Assert.Equal(DiagDescriptors.NoEligibleMember.Id, d[1].Id);
-        Assert.Equal(DiagDescriptors.NoEligibleMember.Id, d[2].Id);
-    }
-
-    [Fact]
-    public async Task NotEnumerable()
-    {
-        var (d, _) = await RunGenerator(@"
-            public class FirstModel
-            {
-                [Required]
-                [ValidateEnumeratedItems]
-                public int P1;
-            }
-
-            [OptionsValidator]
-            public partial class FirstValidator : IValidateOptions<FirstModel>
-            {
-            }
-        ");
-
-        Assert.Equal(1, d.Count);
-        Assert.Equal(DiagDescriptors.NotEnumerableType.Id, d[0].Id);
-    }
-}
diff --git a/test/Generators/Microsoft.Gen.OptionsValidation/Unit/Common/ParserTests.cs b/test/Generators/Microsoft.Gen.OptionsValidation/Unit/Common/ParserTests.cs
deleted file mode 100644
index 8dbdfa237e3..00000000000
--- a/test/Generators/Microsoft.Gen.OptionsValidation/Unit/Common/ParserTests.cs
+++ /dev/null
@@ -1,930 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.ComponentModel.DataAnnotations;
-using System.Globalization;
-using System.Linq;
-using System.Reflection;
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.Extensions.Options;
-using Microsoft.Extensions.Options.Validation;
-using Microsoft.Gen.Shared;
-using Xunit;
-
-namespace Microsoft.Gen.OptionsValidation.Test;
-
-public partial class ParserTests
-{
-    [Fact]
-    public async Task PotentiallyMissingAttributes()
-    {
-        var (d, _) = await RunGenerator(@"
-            public class FirstModel
-            {
-                [Required]
-                public SecondModel? P1 { get; set; }
-
-                [Required]
-                public System.Collections.Generic.IList<SecondModel>? P2 { get; set; }
-            }
-
-            public class SecondModel
-            {
-                [Required]
-                public string? P3;
-            }
-
-            [OptionsValidator]
-            public partial class FirstValidator : IValidateOptions<FirstModel>
-            {
-            }
-        ");
-
-        Assert.Equal(2, d.Count);
-        Assert.Equal(DiagDescriptors.PotentiallyMissingTransitiveValidation.Id, d[0].Id);
-        Assert.Equal(DiagDescriptors.PotentiallyMissingEnumerableValidation.Id, d[1].Id);
-    }
-
-    [Fact]
-    public async Task CircularTypeReferences()
-    {
-        var (d, _) = await RunGenerator(@"
-            public class FirstModel
-            {
-                [Required]
-                [ValidateObjectMembers]
-                public FirstModel? P1 { get; set; }
-            }
-
-            [OptionsValidator]
-            public partial class FirstValidator : IValidateOptions<FirstModel>
-            {
-            }
-        ");
-
-        _ = Assert.Single(d);
-        Assert.Equal(DiagDescriptors.CircularTypeReferences.Id, d[0].Id);
-    }
-
-    [Fact]
-    public async Task InvalidValidatorInterface()
-    {
-        var (d, _) = await RunGenerator(@"
-            public class FirstModel
-            {
-                [Required]
-                public string? P1;
-            }
-
-            public class SecondModel
-            {
-                [Required]
-                public string? P2;
-            }
-
-            [OptionsValidator]
-            public partial class FirstValidator : IValidateOptions<FirstModel>
-            {
-            }
-
-            [OptionsValidator]
-            public partial class SecondValidator
-            {
-            }
-        ");
-
-        _ = Assert.Single(d);
-        Assert.Equal(DiagDescriptors.DoesntImplementIValidateOptions.Id, d[0].Id);
-    }
-
-    [Fact]
-    public async Task NotValidator()
-    {
-        var (d, _) = await RunGenerator(@"
-            public class FirstModel
-            {
-                [ValidateObjectMembers(typeof(SecondValidator)]
-                public SecondModel? P1;
-            }
-
-            public class SecondModel
-            {
-                [Required]
-                public string? P2;
-            }
-
-            [OptionsValidator]
-            public partial class FirstValidator : IValidateOptions<FirstModel>
-            {
-            }
-
-            public partial class SecondValidator
-            {
-            }
-        ");
-
-        _ = Assert.Single(d);
-        Assert.Equal(DiagDescriptors.DoesntImplementIValidateOptions.Id, d[0].Id);
-    }
-
-    [Fact]
-    public async Task ValidatorAlreadyImplementValidateFunction()
-    {
-        var (d, _) = await RunGenerator(@"
-            public class FirstModel
-            {
-                [Required]
-                public string? P1;
-
-                [ValidateObjectMembers(typeof(SecondValidator)]
-                public SecondModel? P2;
-            }
-
-            public class SecondModel
-            {
-                [Required]
-                public string? P3;
-            }
-
-            [OptionsValidator]
-            public partial class FirstValidator : IValidateOptions<FirstModel>
-            {
-            }
-
-            [OptionsValidator]
-            public partial class SecondValidator : IValidateOptions<SecondModel>
-            {
-                public ValidateOptionsResult Validate(string name, SecondModel options)
-                {
-                    throw new System.NotSupportedException();
-                }
-            }
-        ");
-
-        _ = Assert.Single(d);
-        Assert.Equal(DiagDescriptors.AlreadyImplementsValidateMethod.Id, d[0].Id);
-    }
-
-    [Fact]
-    public async Task NullValidator()
-    {
-        var (d, _) = await RunGenerator(@"
-            public class FirstModel
-            {
-                [ValidateObjectMembers(null!)]
-                public SecondModel? P1;
-            }
-
-            public class SecondModel
-            {
-                [Required]
-                public string? P2;
-            }
-
-            [OptionsValidator]
-            public partial class FirstValidator : IValidateOptions<FirstModel>
-            {
-            }
-
-            [OptionsValidator]
-            public partial class SecondValidator : IValidateOptions<SecondModel>
-            {
-            }
-        ");
-
-        _ = Assert.Single(d);
-        Assert.Equal(DiagDescriptors.NullValidatorType.Id, d[0].Id);
-    }
-
-    [Fact]
-    public async Task NoSimpleValidatorConstructor()
-    {
-        var (d, _) = await RunGenerator(@"
-            public class FirstModel
-            {
-                [Required]
-                public string? P1;
-
-                [ValidateObjectMembers(typeof(SecondValidator)]
-                public SecondModel? P2;
-            }
-
-            public class SecondModel
-            {
-                [Required]
-                public string? P3;
-            }
-
-            [OptionsValidator]
-            public partial class FirstValidator : IValidateOptions<FirstModel>
-            {
-            }
-
-            [OptionsValidator]
-            public partial class SecondValidator : IValidateOptions<SecondModel>
-            {
-                public SecondValidator(int _)
-                {
-                }
-            }
-        ");
-
-        _ = Assert.Single(d);
-        Assert.Equal(DiagDescriptors.ValidatorsNeedSimpleConstructor.Id, d[0].Id);
-    }
-
-    [Fact]
-    public async Task NoStaticValidator()
-    {
-        var (d, _) = await RunGenerator(@"
-            public class FirstModel
-            {
-                [Required]
-                public string P1;
-            }
-
-            [OptionsValidator]
-            public static partial class FirstValidator : IValidateOptions<FirstModel>
-            {
-            }
-        ");
-
-        _ = Assert.Single(d);
-        Assert.Equal(DiagDescriptors.CantBeStaticClass.Id, d[0].Id);
-    }
-
-    [Fact]
-    public async Task BogusModelType()
-    {
-        var (d, _) = await RunGenerator(@"
-            [OptionsValidator]
-            public partial class FirstValidator : IValidateOptions<Bogus>
-            {
-            }
-        ");
-
-        // the generator doesn't produce any errors here, since the C# compiler will take care of it
-        Assert.Empty(d);
-    }
-
-    [Fact]
-    public async Task CantValidateOpenGenericMembers()
-    {
-        var (d, _) = await RunGenerator(@"
-            public class FirstModel<T>
-            {
-                [Required]
-                [ValidateObjectMembers]
-                public T? P1;
-
-                [ValidateObjectMembers]
-                [Required]
-                public T[]? P2;
-
-                [ValidateObjectMembers]
-                [Required]
-                public System.Collections.Generics.IList<T> P3 = null!;
-            }
-
-            [OptionsValidator]
-            public partial class FirstValidator<T> : IValidateOptions<FirstModel<T>>
-            {
-            }
-        ");
-
-        Assert.Equal(3, d.Count);
-        Assert.Equal(DiagDescriptors.CantUseWithGenericTypes.Id, d[0].Id);
-        Assert.Equal(DiagDescriptors.CantUseWithGenericTypes.Id, d[1].Id);
-        Assert.Equal(DiagDescriptors.CantUseWithGenericTypes.Id, d[2].Id);
-    }
-
-    [Fact]
-    public async Task ClosedGenerics()
-    {
-        var (d, _) = await RunGenerator(@"
-            public class FirstModel<T>
-            {
-                [Required]
-                [ValidateObjectMembers]
-                public T? P1;
-
-                [ValidateObjectMembers]
-                [Required]
-                public T[]? P2;
-
-                [ValidateObjectMembers]
-                [Required]
-                public int[]? P3;
-
-                [ValidateObjectMembers]
-                [Required]
-                public System.Collections.Generics.IList<T>? P4;
-            }
-
-            [OptionsValidator]
-            public partial class FirstValidator : IValidateOptions<FirstModel<string>>
-            {
-            }
-        ");
-
-        Assert.Equal(4, d.Count);
-        Assert.Equal(DiagDescriptors.NoEligibleMember.Id, d[0].Id);
-        Assert.Equal(DiagDescriptors.NoEligibleMember.Id, d[1].Id);
-        Assert.Equal(DiagDescriptors.NoEligibleMember.Id, d[2].Id);
-        Assert.Equal(DiagDescriptors.NoEligibleMember.Id, d[3].Id);
-    }
-
-    [Fact]
-    public async Task NoEligibleMembers()
-    {
-        var (d, _) = await RunGenerator(@"
-            public class FirstModel
-            {
-                [Required]
-                [ValidateObjectMembers]
-                public SecondModel? P1;
-            }
-
-            public class SecondModel
-            {
-                public string P2;
-            }
-
-            [OptionsValidator]
-            public partial class FirstValidator : IValidateOptions<FirstModel>
-            {
-            }
-
-            [OptionsValidator]
-            public partial class SecondValidator : IValidateOptions<SecondModel>
-            {
-            }
-        ");
-
-        Assert.Equal(2, d.Count);
-        Assert.Equal(DiagDescriptors.NoEligibleMember.Id, d[0].Id);
-        Assert.Equal(DiagDescriptors.NoEligibleMembersFromValidator.Id, d[1].Id);
-    }
-
-    [Fact]
-    public async Task AlreadyImplemented()
-    {
-        var (d, _) = await RunGenerator(@"
-            public class FirstModel
-            {
-                [Required]
-                public string One { get; set; } = string.Empty;
-            }
-
-            [OptionsValidator]
-            public partial class FirstValidator : IValidateOptions<FirstModel>
-            {
-                public void Validate(string name, FirstModel fm)
-                {
-                }
-            }
-        ");
-
-        _ = Assert.Single(d);
-        Assert.Equal(DiagDescriptors.AlreadyImplementsValidateMethod.Id, d[0].Id);
-    }
-
-    [Fact]
-    public async Task ShouldNotProduceInfoWhenTheClassHasABaseClass()
-    {
-        var (d, _) = await RunGenerator(@"
-                public class Parent
-                {
-                    [Required]
-                    public string parentString { get; set; }
-                }
-
-                public class Child : Parent
-                {
-                    [Required]
-                    public string childString { get; set; }
-                }
-
-                [OptionsValidator]
-                public partial class Validator : IValidateOptions<Child>
-                {
-                }
-            ");
-
-        Assert.Empty(d);
-    }
-
-    [Fact]
-    public async Task ShouldNotProduceInfoWhenTransitiveClassHasABaseClass()
-    {
-        var (d, _) = await RunGenerator(@"
-                public class Parent
-                {
-                    [Required]
-                    public string parentString { get; set; }
-                }
-
-                public class Child : Parent
-                {
-                    [Required]
-                    public string childString { get; set; }
-                }
-
-                public class MyOptions
-                {
-                    [ValidateObjectMembers]
-                    public Child childVal { get; set; }
-                }
-
-                [OptionsValidator]
-                public partial class Validator : IValidateOptions<MyOptions>
-                {
-                }
-            ");
-
-        Assert.Empty(d);
-    }
-
-    [Theory]
-    [InlineData("bool")]
-    [InlineData("int")]
-    [InlineData("double")]
-    [InlineData("string")]
-    [InlineData("System.String")]
-    [InlineData("System.DateTime")]
-    public async Task ShouldProduceWarn_WhenTransitiveAttrMisused(string memberClass)
-    {
-        var (d, _) = await RunGenerator(@$"
-                public class InnerModel
-                {{
-                    [Required]
-                    public string childString {{ get; set; }}
-                }}
-
-                public class MyOptions
-                {{
-                    [Required]
-                    public string simpleVal {{ get; set; }}
-
-                    [ValidateObjectMembers]
-                    public {memberClass} complexVal {{ get; set; }}
-                }}
-
-                [OptionsValidator]
-                public partial class Validator : IValidateOptions<MyOptions>
-                {{
-                }}
-            ");
-
-        Assert.Single(d);
-        Assert.Equal(DiagDescriptors.NoEligibleMember.Id, d[0].Id);
-    }
-
-    [Fact]
-    public async Task ShouldProduceWarningWhenTheClassHasNoEligibleMembers()
-    {
-        var (d, _) = await RunGenerator(@"
-                public class Child
-                {
-                    private string AccountName { get; set; }
-                    public object Weight;
-                }
-
-                [OptionsValidator]
-                public partial class Validator : IValidateOptions<Child>
-                {
-                }
-            ");
-
-        Assert.Single(d);
-        Assert.Equal(DiagDescriptors.NoEligibleMembersFromValidator.Id, d[0].Id);
-    }
-
-    [Theory]
-    [InlineData("private")]
-    [InlineData("protected")]
-    public async Task ShouldProduceWarningWhenTheClassMembersAreInaccessible(string accessModifier)
-    {
-        var (d, _) = await RunGenerator($@"
-                public class Model
-                {{
-                    [Required]
-                    public string? PublicVal {{ get; set; }}
-
-                    [Required]
-                    {accessModifier} string? Val {{ get; set; }}
-                }}
-
-                [OptionsValidator]
-                public partial class Validator : IValidateOptions<Model>
-                {{
-                }}
-            ");
-
-        Assert.Single(d);
-        Assert.Equal("R9G106", d[0].Id);
-    }
-
-    [Fact]
-    public async Task ShouldNotProduceErrorWhenMultipleValidationAnnotationsExist()
-    {
-        var (d, _) = await RunGenerator(@"
-                public class IValidateOptionsTestFile
-                {
-                    [MinLength(5)]
-                    [MaxLength(15)]
-                    public string Val9 { get; set; }
-                }
-
-                [OptionsValidator]
-                public partial class Validator : IValidateOptions<IValidateOptionsTestFile>
-                {
-                }
-            ");
-
-        Assert.Empty(d);
-    }
-
-    [Fact]
-    public async Task ShouldNotProduceErrorWhenDataTypeAttributesAreUsed()
-    {
-        var (d, _) = await RunGenerator(@"
-                public class IValidateOptionsTestFile
-                {
-                    [CreditCard]
-                    public string Val3 = """";
-
-                    [EmailAddress]
-                    public string Val6 { get; set; }
-
-                    [EnumDataType(typeof(string))]
-                    public string Val7 { get; set; }
-
-                    [FileExtensions]
-                    public string Val8 { get; set; }
-
-                    [Phone]
-                    public string Val10 { get; set; }
-
-                    [Url]
-                    public string Val11 { get; set; }
-                }
-
-                [OptionsValidator]
-                public partial class Validator : IValidateOptions<IValidateOptionsTestFile>
-                {
-                }
-            ");
-
-        Assert.Empty(d);
-    }
-
-    [Fact]
-    public async Task ShouldNotProduceErrorWhenConstVariableIsUsedAsAttributeArgument()
-    {
-        var (d, _) = await RunGenerator(@"
-                public class IValidateOptionsTestFile
-                {
-                    private const int q = 5;
-                    [Range(q, 10)]
-                    public string Val11 { get; set; }
-                }
-
-                [OptionsValidator]
-                public partial class Validator : IValidateOptions<IValidateOptionsTestFile>
-                {
-                }
-            ");
-
-        Assert.Empty(d);
-    }
-
-    // Testing on all existing & eligible annotations extending ValidationAttribute that aren't used above
-    [Fact]
-    public async Task ShouldNotProduceAnyMessagesWhenExistingValidationsArePlaced()
-    {
-        var (d, _) = await RunGenerator(@"
-                public class IValidateOptionsTestFile
-                {
-                    [Required]
-                    public string Val { get; set; }
-
-                    [Compare(""val"")]
-                    public string Val2 { get; set; }
-
-                    [DataType(DataType.Password)]
-                    public string _val5 = """";
-
-                    [Range(5.1, 10.11)]
-                    public string Val12 { get; set; }
-
-                    [Range(typeof(MemberDeclarationSyntax), ""1/2/2004"", ""3/4/2004"")]
-                    public string Val14 { get; set; }
-
-                    [RegularExpression("""")]
-                    public string Val15 { get; set; }
-
-                    [StringLength(5)]
-                    public string Val16 { get; set; }
-
-                    [CustomValidation(typeof(MemberDeclarationSyntax), ""CustomMethod"")]
-                    public string Val17 { get; set; }
-                }
-
-                [OptionsValidator]
-                public partial class Validator : IValidateOptions<IValidateOptionsTestFile>
-                {
-                }
-            ");
-
-        Assert.Empty(d);
-    }
-
-    [Fact]
-    public async Task ShouldNotProduceErrorWhenPropertiesAreUsedAsAttributeArgument()
-    {
-        var (d, _) = await RunGenerator(@"
-                public class IValidateOptionsTestFile
-                {
-                    private const int q = 5;
-                    [Range(q, 10, ErrorMessage = ""ErrorMessage"")]
-                    public string Val11 { get; set; }
-                }
-
-                [OptionsValidator]
-                public partial class Validator : IValidateOptions<IValidateOptionsTestFile>
-                {
-                }
-            ");
-
-        Assert.Empty(d);
-    }
-
-    [Fact]
-    public async Task ShouldSkipWhenOptionsValidatorAttributeDoesNotExist()
-    {
-        var (d, _) = await RunGenerator(@"
-                public class IValidateOptionsTestFile
-                {
-                    private const int q = 5;
-                    [Range(q, 10, ErrorMessage = ""ErrorMessage"")]
-                    public string Val11 { get; set; }
-                }
-
-                [OptionsValidator]
-                public partial class Validator : IValidateOptions<IValidateOptionsTestFile>
-                {
-                }
-            ", includeR9References: false);
-
-        Assert.Empty(d);
-    }
-
-    [Fact]
-    public async Task ShouldSkipAtrributeWhenAttributeSymbolCannotBeFound()
-    {
-        var (d, _) = await RunGenerator(@"
-                public class IValidateOptionsTestFile
-                {
-                    [RandomTest]
-                    public string Val11 { get; set; }
-
-                    [Range(1, 10, ErrorMessage = ""ErrorMessage"")]
-                    public string Val12 { get; set; }
-                }
-
-                [OptionsValidator]
-                public partial class Validator : IValidateOptions<IValidateOptionsTestFile>
-                {
-                }
-            ");
-
-        Assert.Empty(d);
-    }
-
-    [Fact]
-    public async Task ShouldSkipAtrributeWhenAttributeSymbolIsNotBasedOnValidationAttribute()
-    {
-        var (d, _) = await RunGenerator(@"
-                public class IValidateOptionsTestFile
-                {
-                    [FilterUIHint(""MultiForeignKey"")]
-                    public string Val11 { get; set; }
-
-                    [Range(1, 10, ErrorMessage = ""ErrorMessage"")]
-                    public string Val12 { get; set; }
-                }
-
-                [OptionsValidator]
-                public partial class Validator : IValidateOptions<IValidateOptionsTestFile>
-                {
-                }
-            ");
-
-        Assert.Empty(d);
-    }
-
-    [Fact]
-    public async Task ShouldAcceptAtrributeWhenAttributeIsInDifferentNamespace()
-    {
-        var (d, _) = await RunGenerator(@"
-                namespace Test {
-                    public class IValidateOptionsTestFile
-                    {
-                        [Test]
-                        public string Val11 { get; set; }
-                    }
-
-                    [AttributeUsage(AttributeTargets.Class)]
-                    public sealed class TestAttribute : ValidationAttribute
-                    {
-                    }
-
-                    [OptionsValidator]
-                    public partial class Validator : IValidateOptions<IValidateOptionsTestFile>
-                    {
-                    }
-                }
-            ", inNamespace: false);
-
-        Assert.Empty(d);
-    }
-
-    [Fact]
-    public async Task ShouldHandleAtrributePropertiesOtherThanString()
-    {
-        var (d, _) = await RunGenerator(@"
-                namespace Test {
-                    public class IValidateOptionsTestFile
-                    {
-                        [Test(num = 5)]
-                        public string Val11 { get; set; }
-
-                        [Required]
-                        public string Val12 { get; set; }
-                    }
-
-                    [OptionsValidator]
-                    public partial class Validator : IValidateOptions<IValidateOptionsTestFile>
-                    {
-                    }
-                }
-
-                namespace System.ComponentModel.DataAnnotations {
-                    [AttributeUsage(AttributeTargets.Class)]
-                    public sealed class TestAttribute : ValidationAttribute
-                    {
-                        public int num { get; set; }
-                        public TestAttribute() {
-                        }
-                    }
-                }
-            ", inNamespace: false);
-
-        Assert.Empty(d);
-    }
-
-    [Fact]
-    public async Task ShouldStoreFloatValuesCorrectly()
-    {
-        var backupCulture = CultureInfo.CurrentCulture;
-        CultureInfo.CurrentCulture = new CultureInfo("ru-RU", false);
-        try
-        {
-            var (diagMessages, generatedResults) = await RunGenerator(@"
-                    public class Model
-                    {
-                        [Range(-0.1, 1.3)]
-                        public string Val { get; set; }
-                    }
-
-                    [OptionsValidator]
-                    public partial class Validator : IValidateOptions<Model>
-                    {
-                    }
-                ");
-
-            Assert.Empty(diagMessages);
-            Assert.Single(generatedResults);
-            Assert.DoesNotContain("0,1", generatedResults[0].SourceText.ToString());
-            Assert.DoesNotContain("1,3", generatedResults[0].SourceText.ToString());
-        }
-        finally
-        {
-            CultureInfo.CurrentCulture = backupCulture;
-        }
-    }
-
-    [Fact]
-    public async Task MultiModelValidatorGeneratesOnlyOnePartialTypeBlock()
-    {
-        var (d, sources) = await RunGenerator(@"
-            public class FirstModel
-            {
-                [Required]
-                public string P1 { get; set; }
-            }
-
-            public class SecondModel
-            {
-                [Required]
-                public string P2 { get; set; }
-            }
-
-            public class ThirdModel
-            {
-                [Required]
-                public string P3 { get; set; }
-            }
-
-            [OptionsValidator]
-            public partial class MultiValidator : IValidateOptions<FirstModel>, IValidateOptions<SecondModel>, IValidateOptions<ThirdModel>
-            {
-            }
-        ");
-
-        var typeDeclarations = sources[0].SyntaxTree
-            .GetRoot()
-            .DescendantNodes()
-            .OfType<TypeDeclarationSyntax>()
-            .ToArray();
-
-        var multiValidatorTypeDeclarations = typeDeclarations
-            .Where(x => x.Identifier.ValueText == "MultiValidator")
-            .ToArray();
-
-        Assert.Single(multiValidatorTypeDeclarations);
-
-        var validateMethodDeclarations = multiValidatorTypeDeclarations[0]
-            .DescendantNodes()
-            .OfType<MethodDeclarationSyntax>()
-            .Where(x => x.Identifier.ValueText == "Validate")
-            .ToArray();
-
-        Assert.Equal(3, validateMethodDeclarations.Length);
-    }
-
-    private static async Task<(IReadOnlyList<Diagnostic> diagnostics, ImmutableArray<GeneratedSourceResult> generatedSources)> RunGenerator(
-        string code,
-        bool wrap = true,
-        bool inNamespace = true,
-        bool includeR9References = true,
-        bool includeSystemReferences = true,
-        bool includeOptionsReferences = true,
-        bool includeTransitiveReferences = true)
-    {
-        var text = code;
-        if (wrap)
-        {
-            var nspaceStart = "namespace Test {";
-            var nspaceEnd = "}";
-            if (!inNamespace)
-            {
-                nspaceStart = "";
-                nspaceEnd = "";
-            }
-
-            text = $@"
-                    {nspaceStart}
-                    using System.ComponentModel.DataAnnotations;
-                    using Microsoft.Extensions.Options.Validation;
-                    using Microsoft.Shared.Data.Validation;
-                    using Microsoft.Extensions.Options;
-                    using Microsoft.CodeAnalysis.CSharp.Syntax;
-                    {code}
-                    {nspaceEnd}
-                ";
-        }
-
-        var assemblies = new List<Assembly> { Assembly.GetAssembly(typeof(MemberDeclarationSyntax))! };
-
-        if (includeR9References)
-        {
-            assemblies.Add(Assembly.GetAssembly(typeof(OptionsValidatorAttribute))!);
-        }
-
-        if (includeSystemReferences)
-        {
-            assemblies.Add(Assembly.GetAssembly(typeof(RequiredAttribute))!);
-        }
-
-        if (includeOptionsReferences)
-        {
-            assemblies.Add(Assembly.GetAssembly(typeof(IValidateOptions<object>))!);
-        }
-
-        if (includeTransitiveReferences)
-        {
-            assemblies.Add(Assembly.GetAssembly(typeof(Microsoft.Extensions.Options.Validation.ValidateObjectMembersAttribute))!);
-        }
-
-        var result = await RoslynTestUtils.RunGenerator(new Generator(), assemblies.ToArray(), new[] { text })
-            .ConfigureAwait(false);
-
-        return result;
-    }
-}
diff --git a/test/Generators/Microsoft.Gen.OptionsValidation/Unit/Common/SymbolLoaderTests.cs b/test/Generators/Microsoft.Gen.OptionsValidation/Unit/Common/SymbolLoaderTests.cs
deleted file mode 100644
index 287072ea951..00000000000
--- a/test/Generators/Microsoft.Gen.OptionsValidation/Unit/Common/SymbolLoaderTests.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using Microsoft.CodeAnalysis;
-using Moq;
-using Moq.Protected;
-using Xunit;
-
-namespace Microsoft.Gen.OptionsValidation.Test;
-
-public class SymbolLoaderTests
-{
-    [Theory]
-    [InlineData(SymbolLoader.OptionsValidatorAttribute)]
-    [InlineData(SymbolLoader.ValidationAttribute)]
-    [InlineData(SymbolLoader.DataTypeAttribute)]
-    [InlineData(SymbolLoader.IValidatableObjectType)]
-    [InlineData(SymbolLoader.IValidateOptionsType)]
-    [InlineData(SymbolLoader.TypeOfType)]
-    public void Loader_ReturnsFalse_WhenRequiredTypeIsUnavailable(string type)
-    {
-        var compilationMock = new Mock<Compilation>(
-            string.Empty,
-            Array.Empty<MetadataReference>().ToImmutableArray(),
-            new Dictionary<string, string>(),
-            false,
-            null!,
-            null!);
-
-        compilationMock
-            .Protected()
-            .Setup<INamedTypeSymbol>("CommonGetTypeByMetadataName", ItExpr.Is<string>(t => t != type))
-            .Returns(Mock.Of<INamedTypeSymbol>());
-
-        compilationMock
-            .Protected()
-            .Setup<INamedTypeSymbol?>("CommonGetTypeByMetadataName", ItExpr.Is<string>(t => t == type))
-            .Returns((INamedTypeSymbol?)null);
-
-        var callbackMock = new Mock<Action<Diagnostic>>();
-        var result = SymbolLoader.TryLoad(compilationMock.Object, out var holder);
-        Assert.False(result);
-        Assert.Null(holder);
-        callbackMock.VerifyNoOtherCalls();
-    }
-
-    [Theory]
-    [InlineData(SymbolLoader.LegacyValidateTransitivelyAttribute)]
-    [InlineData(SymbolLoader.ValidateObjectMembersAttribute)]
-    [InlineData(SymbolLoader.ValidateEnumeratedItemsAttribute)]
-    public void Loader_ReturnsTrue_WhenOptionalTypeIsUnavailable(string type)
-    {
-        var compilationMock = new Mock<Compilation>(
-            string.Empty,
-            Array.Empty<MetadataReference>().ToImmutableArray(),
-            new Dictionary<string, string>(),
-            false,
-            null!,
-            null!);
-
-        compilationMock
-            .Protected()
-            .Setup<INamedTypeSymbol>("CommonGetTypeByMetadataName", ItExpr.Is<string>(t => t != type))
-            .Returns(Mock.Of<INamedTypeSymbol>());
-
-        compilationMock
-            .Protected()
-            .Setup<INamedTypeSymbol?>("CommonGetTypeByMetadataName", ItExpr.Is<string>(t => t == type))
-            .Returns((INamedTypeSymbol?)null);
-
-        var callbackMock = new Mock<Action<Diagnostic>>();
-        var result = SymbolLoader.TryLoad(compilationMock.Object, out var holder);
-        Assert.True(result);
-        Assert.NotNull(holder);
-        callbackMock.VerifyNoOtherCalls();
-    }
-}
diff --git a/test/Generators/Microsoft.Gen.OptionsValidation/Unit/Directory.Build.props b/test/Generators/Microsoft.Gen.OptionsValidation/Unit/Directory.Build.props
deleted file mode 100644
index feb0e78d598..00000000000
--- a/test/Generators/Microsoft.Gen.OptionsValidation/Unit/Directory.Build.props
+++ /dev/null
@@ -1,31 +0,0 @@
-<Project>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
-
-  <PropertyGroup>
-    <RootNamespace>Microsoft.Gen.OptionsValidation.Test</RootNamespace>
-    <Description>Unit tests for Gen.OptionsValidation.</Description>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <SkipR9Analyzers>true</SkipR9Analyzers>
-    <InjectSharedEmptyCollections>true</InjectSharedEmptyCollections>
-    <InjectSharedDataValidation>true</InjectSharedDataValidation>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="..\Common\**\*.cs" />
-    <Compile Include="..\..\..\Shared\*.cs" LinkBase="Shared" />
-    <Content Include="..\..\TestClasses\**\*.cs" Link="TestClasses\%(RecursiveDir)%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="..\..\Generated\Common\TestResource.Designer.cs" Link="TestClasses\%(RecursiveDir)%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\src\Libraries\Microsoft.Extensions.Options.Validation\Microsoft.Extensions.Options.Validation.csproj"  />
-    <ProjectReference Include="..\..\..\..\..\src\Generators\Microsoft.Gen.OptionsValidation\Roslyn$(AnalyzerRoslynVersion)\Microsoft.Gen.OptionsValidation.Roslyn$(AnalyzerRoslynVersion).csproj" />
-    <ProjectReference Include="..\..\Generated\Roslyn$(AnalyzerRoslynVersion)\Microsoft.Gen.OptionsValidation.Roslyn$(AnalyzerRoslynVersion).Generated.Tests.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis" />
-  </ItemGroup>
-</Project>
diff --git a/test/Generators/Microsoft.Gen.OptionsValidation/Unit/Roslyn3.8/Microsoft.Gen.OptionsValidation.Roslyn3.8.Unit.Tests.csproj b/test/Generators/Microsoft.Gen.OptionsValidation/Unit/Roslyn3.8/Microsoft.Gen.OptionsValidation.Roslyn3.8.Unit.Tests.csproj
deleted file mode 100644
index eac2eac2172..00000000000
--- a/test/Generators/Microsoft.Gen.OptionsValidation/Unit/Roslyn3.8/Microsoft.Gen.OptionsValidation.Roslyn3.8.Unit.Tests.csproj
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <AnalyzerRoslynVersion>3.8</AnalyzerRoslynVersion>
-  </PropertyGroup>
-</Project>
diff --git a/test/Generators/Microsoft.Gen.OptionsValidation/Unit/Roslyn4.0/Microsoft.Gen.OptionsValidation.Roslyn4.0.Unit.Tests.csproj b/test/Generators/Microsoft.Gen.OptionsValidation/Unit/Roslyn4.0/Microsoft.Gen.OptionsValidation.Roslyn4.0.Unit.Tests.csproj
deleted file mode 100644
index 18ce9dd9ba0..00000000000
--- a/test/Generators/Microsoft.Gen.OptionsValidation/Unit/Roslyn4.0/Microsoft.Gen.OptionsValidation.Roslyn4.0.Unit.Tests.csproj
+++ /dev/null
@@ -1,6 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <AnalyzerRoslynVersion>4.0</AnalyzerRoslynVersion>
-    <DefineConstants>$(DefineConstants);ROSLYN_4_0_OR_GREATER</DefineConstants>
-  </PropertyGroup>
-</Project>
diff --git a/test/Libraries/Microsoft.Extensions.Options.Validation.Tests/Microsoft.Extensions.Options.Validation.Tests.csproj b/test/Libraries/Microsoft.Extensions.Options.Validation.Tests/Microsoft.Extensions.Options.Validation.Tests.csproj
deleted file mode 100644
index 7adea74ea1d..00000000000
--- a/test/Libraries/Microsoft.Extensions.Options.Validation.Tests/Microsoft.Extensions.Options.Validation.Tests.csproj
+++ /dev/null
@@ -1,22 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <RootNamespace>Microsoft.Extensions.Options.Validation</RootNamespace>
-    <Description>Tests for Microsoft.Extensions.Options.Validation</Description>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <UseOptionsValidationGenerator>true</UseOptionsValidationGenerator>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Libraries\Microsoft.Extensions.Options.Validation\Microsoft.Extensions.Options.Validation.csproj" ProjectUnderTest="true" />
-    <ProjectReference Include="..\..\..\src\Libraries\Microsoft.Extensions.Hosting.Testing\Microsoft.Extensions.Hosting.Testing.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
-    <PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" />
-    <PackageReference Include="System.Collections.Immutable" Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))" />
-  </ItemGroup>
-</Project>
diff --git a/test/Libraries/Microsoft.Extensions.Options.Validation.Tests/ValidateEnumeratedItemsAttributeTests.cs b/test/Libraries/Microsoft.Extensions.Options.Validation.Tests/ValidateEnumeratedItemsAttributeTests.cs
deleted file mode 100644
index 26f5cf70e30..00000000000
--- a/test/Libraries/Microsoft.Extensions.Options.Validation.Tests/ValidateEnumeratedItemsAttributeTests.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Xunit;
-
-namespace Microsoft.Extensions.Options.Validation.Test;
-
-public class ValidateEnumeratedItemsAttributeTests
-{
-    [Fact]
-    public void Basic()
-    {
-        var a = new ValidateEnumeratedItemsAttribute();
-        Assert.NotNull(a);
-        Assert.Null(a.Validator);
-
-        a = new ValidateEnumeratedItemsAttribute(typeof(int));
-        Assert.Equal(typeof(int), a.Validator);
-    }
-}
diff --git a/test/Libraries/Microsoft.Extensions.Options.Validation.Tests/ValidateObjectMembersAttributeTest.cs b/test/Libraries/Microsoft.Extensions.Options.Validation.Tests/ValidateObjectMembersAttributeTest.cs
deleted file mode 100644
index 69208ed9b56..00000000000
--- a/test/Libraries/Microsoft.Extensions.Options.Validation.Tests/ValidateObjectMembersAttributeTest.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Xunit;
-
-namespace Microsoft.Extensions.Options.Validation.Test;
-
-public class ValidateObjectMembersAttributeTest
-{
-    [Fact]
-    public void Basic()
-    {
-        var a = new ValidateObjectMembersAttribute();
-        Assert.NotNull(a);
-        Assert.Null(a.Validator);
-
-        a = new ValidateObjectMembersAttribute(typeof(int));
-        Assert.Equal(typeof(int), a.Validator);
-    }
-}
diff --git a/test/ToBeRemoved/Options.ValidateOnStart.Tests/Helpers/OptionsValidationModels.cs b/test/ToBeRemoved/Options.ValidateOnStart.Tests/Helpers/OptionsValidationModels.cs
index 3d2e0ebbfd9..cd513ad9ec2 100644
--- a/test/ToBeRemoved/Options.ValidateOnStart.Tests/Helpers/OptionsValidationModels.cs
+++ b/test/ToBeRemoved/Options.ValidateOnStart.Tests/Helpers/OptionsValidationModels.cs
@@ -61,9 +61,9 @@ public class ComplexModel
     [ValidateObjectMembers]
     public ModelWithoutOptionsValidator? ValWithoutOptionsValidator { get; set; }
 
-#pragma warning disable R9G113
+#pragma warning disable SYSLIB1212 // Member potentially missing transitive validation.
     public Model? ValWithoutRecursiveValidation { get; set; }
-#pragma warning restore R9G113
+#pragma warning restore SYSLIB1212 // Member potentially missing transitive validation.
 }
 
 public class InceptionComplexModel
diff --git a/test/ToBeRemoved/Options.ValidateOnStart.Tests/Options.ValidateOnStart.Tests.csproj b/test/ToBeRemoved/Options.ValidateOnStart.Tests/Options.ValidateOnStart.Tests.csproj
index aadeb05c93f..3de3dc9c92d 100644
--- a/test/ToBeRemoved/Options.ValidateOnStart.Tests/Options.ValidateOnStart.Tests.csproj
+++ b/test/ToBeRemoved/Options.ValidateOnStart.Tests/Options.ValidateOnStart.Tests.csproj
@@ -3,7 +3,6 @@
     <AssemblyName>Microsoft.Extensions.Options.ValidateOnStart.Tests</AssemblyName>
     <RootNamespace>Microsoft.Extensions.Options.ValidateOnStart.Test</RootNamespace>
     <Description>Tests for Microsoft.Extensions.Options.ValidateOnStart</Description>
-    <UseOptionsValidationGenerator>true</UseOptionsValidationGenerator>
   </PropertyGroup>
 
   <ItemGroup>
@@ -14,7 +13,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Libraries\Microsoft.Extensions.Options.Validation\Microsoft.Extensions.Options.Validation.csproj" ProjectUnderTest="true" />
     <ProjectReference Include="..\..\..\src\Libraries\Microsoft.Extensions.Hosting.Testing\Microsoft.Extensions.Hosting.Testing.csproj" />
   </ItemGroup>
 </Project>