Skip to content

Commit

Permalink
Remove the last ToBeRemoved component! (#4278)
Browse files Browse the repository at this point in the history
Co-authored-by: Martin Taillefer <mataille@microsoft.com>
  • Loading branch information
geeknoid and Martin Taillefer authored Aug 11, 2023
1 parent 08c93ef commit 7c322ad
Show file tree
Hide file tree
Showing 59 changed files with 57 additions and 7,663 deletions.
1 change: 0 additions & 1 deletion scripts/MakeEditorConfigs.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ Write-Output "Creating .editorconfig files"
& $Command $Diags editorconfig save --exclude xunit.analyzers src/Analyzers/.editorconfig general,performance,production
& $Command $Diags editorconfig save --exclude xunit.analyzers src/Generators/.editorconfig general,performance,production
& $Command $Diags editorconfig save --exclude xunit.analyzers src/Libraries/.editorconfig general,api,performance,production
& $Command $Diags editorconfig save --exclude xunit.analyzers src/ToBeRemoved/.editorconfig general,performance,production
& $Command $Diags editorconfig save --exclude xunit.analyzers src/LegacySupport/.editorconfig general,performance,production
& $Command $Diags editorconfig save --exclude xunit.analyzers src/Shared/.editorconfig general,performance,production
& $Command $Diags editorconfig save --exclude xunit.analyzers bench/.editorconfig general,performance
Expand Down
4 changes: 2 additions & 2 deletions src/Generators/Microsoft.Gen.AutoClient/Emitter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ internal sealed class Emitter : EmitterBase
private const string AutoClientOptions = "global::Microsoft.Extensions.Http.AutoClient.AutoClientOptions";
private const string AutoClientOptionsValidator = "global::Microsoft.Extensions.Http.AutoClient.AutoClientOptionsValidator";
private const string Action = "global::System.Action";
private const string OptionsBuilderExtensions = "global::Microsoft.Extensions.Options.Validation.OptionsBuilderExtensions";
private const string OptionsBuilderExtensions = "global::Microsoft.Extensions.DependencyInjection.OptionsServiceCollectionExtensions";
private const string IOptionsMonitor = "global::Microsoft.Extensions.Options.IOptionsMonitor";
private const string ServiceProviderServiceExtensions = "global::Microsoft.Extensions.DependencyInjection.ServiceProviderServiceExtensions";
private const string MediaTypeHeaderValue = "global::System.Net.Http.Headers.MediaTypeHeaderValue";
Expand Down Expand Up @@ -147,7 +147,7 @@ private void EmitExtensions(IEnumerable<RestApiType> restApiTypes)
this {IServiceCollection} services,
{Action}<{AutoClientOptions}> configureOptions)");
OutOpenBrace();
OutLn(@$"{OptionsBuilderExtensions}.AddValidatedOptions<{AutoClientOptions}, {AutoClientOptionsValidator}>(services, ""{restApiType.Name}"").Configure(configureOptions);");
OutLn(@$"{OptionsBuilderExtensions}.AddOptionsWithValidateOnStart<{AutoClientOptions}, {AutoClientOptionsValidator}>(services, ""{restApiType.Name}"").Configure(configureOptions);");
OutLn($"{ServiceCollectionDescriptorExtensions}.TryAddSingleton<I{restApiType.Name}>(services, provider =>");
OutOpenBrace();
OutLn(@$"var httpClient = {ServiceProviderServiceExtensions}.GetRequiredService<{IHttpClientFactory}>(provider).CreateClient(""{restApiType.HttpClientName}"");");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
using Microsoft.Extensions.Options.Validation;
using Microsoft.Shared.Diagnostics;

namespace Microsoft.AspNetCore.Connections;
Expand Down Expand Up @@ -47,7 +46,7 @@ public static IServiceCollection AddConnectionTimeout(this IServiceCollection se
_ = Throw.IfNull(configure);

_ = services
.AddValidatedOptions<ConnectionTimeoutOptions, ConnectionTimeoutValidator>()
.AddOptionsWithValidateOnStart<ConnectionTimeoutOptions, ConnectionTimeoutValidator>()
.Configure(configure);

return services;
Expand All @@ -70,7 +69,7 @@ public static IServiceCollection AddConnectionTimeout(this IServiceCollection se
_ = Throw.IfNull(section);

_ = services
.AddValidatedOptions<ConnectionTimeoutOptions, ConnectionTimeoutValidator>()
.AddOptionsWithValidateOnStart<ConnectionTimeoutOptions, ConnectionTimeoutValidator>()
.Bind(section);

return services;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

using System;
using Microsoft.Extensions.Options;
using Validation = Microsoft.Extensions.Options.Validation;

namespace Microsoft.AspNetCore.Connections;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Options" />
<PackageReference Include="Microsoft.Bcl.TimeProvider" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\ToBeRemoved\Options.ValidateOnStart\Options.ValidateOnStart.csproj" />
</ItemGroup>

<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.ObjectPool;
using Microsoft.Extensions.Options.Validation;
using Microsoft.Extensions.Telemetry.Metering;
using Microsoft.Shared.Diagnostics;

Expand Down Expand Up @@ -50,8 +49,8 @@ public static IServiceCollection AddHeaderParsing(this IServiceCollection servic
{
_ = Throw.IfNull(services);

_ = services.AddValidatedOptions<HeaderParsingOptions, HeaderParsingOptionsValidator>();
_ = services.AddValidatedOptions<HeaderParsingOptions, HeaderParsingOptionsManualValidator>();
_ = services.AddOptionsWithValidateOnStart<HeaderParsingOptions, HeaderParsingOptionsValidator>();
_ = services.AddOptionsWithValidateOnStart<HeaderParsingOptions, HeaderParsingOptionsManualValidator>();

return services
.AddHeaderParsing()
Expand All @@ -69,11 +68,11 @@ public static IServiceCollection AddHeaderParsing(this IServiceCollection servic
_ = Throw.IfNull(services);

_ = services
.AddValidatedOptions<HeaderParsingOptions, HeaderParsingOptionsValidator>()
.AddOptionsWithValidateOnStart<HeaderParsingOptions, HeaderParsingOptionsValidator>()
.Bind(section);

_ = services
.AddValidatedOptions<HeaderParsingOptions, HeaderParsingOptionsManualValidator>()
.AddOptionsWithValidateOnStart<HeaderParsingOptions, HeaderParsingOptionsManualValidator>()
.Bind(section);

return services
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,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="..\..\ToBeRemoved\Options.ValidateOnStart\Options.ValidateOnStart.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' != 'net462'">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
using Microsoft.Extensions.Options.Validation;
using Microsoft.Extensions.Telemetry.Latency;
using Microsoft.Shared.Diagnostics;

Expand All @@ -32,7 +31,7 @@ public static IServiceCollection AddRequestLatencyTelemetry(this IServiceCollect
services.TryAddScoped(p => p.GetRequiredService<ILatencyContextProvider>().CreateContext());
services.TryAddSingleton<RequestLatencyTelemetryMiddleware>();

_ = services.AddValidatedOptions<RequestLatencyTelemetryOptions, RequestLatencyTelemetryOptionsValidator>();
_ = services.AddOptionsWithValidateOnStart<RequestLatencyTelemetryOptions, RequestLatencyTelemetryOptionsValidator>();

return services;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
using Microsoft.Extensions.Options;
using Microsoft.Extensions.Options.Validation;
using Microsoft.Extensions.Telemetry.Internal;
using Microsoft.IO;
using Microsoft.Shared.Diagnostics;
Expand Down Expand Up @@ -111,7 +110,7 @@ private static IServiceCollection AddHttpLoggingInternal(
Action<OptionsBuilder<LoggingOptions>>? configureOptionsBuilder = null)
{
var builder = services
.AddValidatedOptions<LoggingOptions, LoggingOptionsValidator>();
.AddOptionsWithValidateOnStart<LoggingOptions, LoggingOptionsValidator>();

configureOptionsBuilder?.Invoke(builder);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
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;

Expand Down Expand Up @@ -85,7 +84,7 @@ private static IServiceCollection AddLogEnricherOptions(
Action<RequestHeadersLogEnricherOptions> configure)
{
_ = services
.AddValidatedOptions<RequestHeadersLogEnricherOptions, RequestHeadersLogEnricherOptionsValidator>()
.AddOptionsWithValidateOnStart<RequestHeadersLogEnricherOptions, RequestHeadersLogEnricherOptionsValidator>()
.Configure(configure);

return services;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
using Microsoft.Extensions.Options.Validation;
using Microsoft.Extensions.Telemetry.Internal;
using Microsoft.Shared.DiagnosticIds;
using Microsoft.Shared.Diagnostics;
Expand All @@ -33,7 +32,7 @@ public static TracerProviderBuilder AddHttpTracing(this TracerProviderBuilder bu

return builder
.ConfigureServices(services => services
.AddValidatedOptions<HttpTracingOptions, HttpTracingOptionsValidator>())
.AddOptionsWithValidateOnStart<HttpTracingOptions, HttpTracingOptionsValidator>())
.AddHttpTracingInternal();
}

Expand All @@ -51,7 +50,7 @@ public static TracerProviderBuilder AddHttpTracing(this TracerProviderBuilder bu

return builder
.ConfigureServices(services => services
.AddValidatedOptions<HttpTracingOptions, HttpTracingOptionsValidator>()
.AddOptionsWithValidateOnStart<HttpTracingOptions, HttpTracingOptionsValidator>()
.Configure(configure))
.AddHttpTracingInternal();
}
Expand All @@ -75,7 +74,7 @@ public static TracerProviderBuilder AddHttpTracing(this TracerProviderBuilder bu

return builder
.ConfigureServices(services => services
.AddValidatedOptions<HttpTracingOptions, HttpTracingOptionsValidator>()
.AddOptionsWithValidateOnStart<HttpTracingOptions, HttpTracingOptionsValidator>()
.Bind(section))
.AddHttpTracingInternal();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Options.Validation;
using Microsoft.Shared.Diagnostics;

namespace Microsoft.Extensions.AmbientMetadata;
Expand Down Expand Up @@ -80,7 +79,7 @@ public static IServiceCollection AddApplicationMetadata(this IServiceCollection
_ = Throw.IfNull(services);
_ = Throw.IfNull(section);

_ = services.AddValidatedOptions<ApplicationMetadata, ApplicationMetadataValidator>().Bind(section);
_ = services.AddOptionsWithValidateOnStart<ApplicationMetadata, ApplicationMetadataValidator>().Bind(section);

return services;
}
Expand All @@ -97,7 +96,7 @@ public static IServiceCollection AddApplicationMetadata(this IServiceCollection
_ = Throw.IfNull(services);
_ = Throw.IfNull(configure);

_ = services.AddValidatedOptions<ApplicationMetadata, ApplicationMetadataValidator>().Configure(configure);
_ = services.AddOptionsWithValidateOnStart<ApplicationMetadata, ApplicationMetadataValidator>().Configure(configure);

return services;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@
<MinMutationScore>100</MinMutationScore>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\ToBeRemoved\Options.ValidateOnStart\Options.ValidateOnStart.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
using Microsoft.Extensions.Options;
using Microsoft.Extensions.Options.Validation;
using Microsoft.Shared.Diagnostics;

namespace Microsoft.Extensions.Compliance.Testing;
Expand Down Expand Up @@ -49,8 +48,8 @@ public static IRedactionBuilder SetFakeRedactor(this IRedactionBuilder builder,
_ = Throw.IfNull(configure);

builder
.Services.AddValidatedOptions<FakeRedactorOptions, FakeRedactorOptionsAutoValidator>()
.Services.AddValidatedOptions<FakeRedactorOptions, FakeRedactorOptionsCustomValidator>()
.Services.AddOptionsWithValidateOnStart<FakeRedactorOptions, FakeRedactorOptionsAutoValidator>()
.Services.AddOptionsWithValidateOnStart<FakeRedactorOptions, FakeRedactorOptionsCustomValidator>()
.Configure(configure)
.Services.TryAddSingleton<FakeRedactionCollector>();

Expand All @@ -74,8 +73,8 @@ public static IRedactionBuilder SetFakeRedactor(this IRedactionBuilder builder,
_ = Throw.IfNull(section);

builder
.Services.AddValidatedOptions<FakeRedactorOptions, FakeRedactorOptionsAutoValidator>()
.Services.AddValidatedOptions<FakeRedactorOptions, FakeRedactorOptionsCustomValidator>()
.Services.AddOptionsWithValidateOnStart<FakeRedactorOptions, FakeRedactorOptionsAutoValidator>()
.Services.AddOptionsWithValidateOnStart<FakeRedactorOptions, FakeRedactorOptionsCustomValidator>()
.Services.Configure<FakeRedactorOptions>(section)
.TryAddSingleton<FakeRedactionCollector>();

Expand All @@ -101,8 +100,8 @@ public static IServiceCollection AddFakeRedaction(this IServiceCollection servic
});

return services
.AddValidatedOptions<FakeRedactorOptions, FakeRedactorOptionsAutoValidator>()
.Services.AddValidatedOptions<FakeRedactorOptions, FakeRedactorOptionsCustomValidator>()
.AddOptionsWithValidateOnStart<FakeRedactorOptions, FakeRedactorOptionsAutoValidator>()
.Services.AddOptionsWithValidateOnStart<FakeRedactorOptions, FakeRedactorOptionsCustomValidator>()
.Services;
}

Expand All @@ -128,8 +127,8 @@ public static IServiceCollection AddFakeRedaction(this IServiceCollection servic
});

return services
.AddValidatedOptions<FakeRedactorOptions, FakeRedactorOptionsAutoValidator>()
.Services.AddValidatedOptions<FakeRedactorOptions, FakeRedactorOptionsCustomValidator>()
.AddOptionsWithValidateOnStart<FakeRedactorOptions, FakeRedactorOptionsAutoValidator>()
.Services.AddOptionsWithValidateOnStart<FakeRedactorOptions, FakeRedactorOptionsCustomValidator>()
.Configure(configure)
.Services;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using System;
using System.Globalization;
using Microsoft.Extensions.Options;
using Validation = Microsoft.Extensions.Options.Validation;

namespace Microsoft.Extensions.Compliance.Testing;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,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="..\..\ToBeRemoved\Options.ValidateOnStart\Options.ValidateOnStart.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
using System.Diagnostics.CodeAnalysis;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options.Validation;
using Microsoft.Shared.Diagnostics;

namespace Microsoft.Extensions.Diagnostics.HealthChecks;
Expand All @@ -30,7 +29,7 @@ public static IHealthChecksBuilder AddResourceUtilizationHealthCheck(this IHealt
_ = Throw.IfNull(builder);
_ = Throw.IfNull(tags);

_ = builder.Services.AddValidatedOptions<ResourceUtilizationHealthCheckOptions, ResourceUtilizationHealthCheckOptionsValidator>();
_ = builder.Services.AddOptionsWithValidateOnStart<ResourceUtilizationHealthCheckOptions, ResourceUtilizationHealthCheckOptionsValidator>();
return builder.AddCheck<ResourceUtilizationHealthCheck>(HealthCheckName, tags: tags);
}

Expand All @@ -46,7 +45,7 @@ public static IHealthChecksBuilder AddResourceUtilizationHealthCheck(this IHealt
_ = Throw.IfNull(builder);
_ = Throw.IfNull(tags);

_ = builder.Services.AddValidatedOptions<ResourceUtilizationHealthCheckOptions, ResourceUtilizationHealthCheckOptionsValidator>();
_ = builder.Services.AddOptionsWithValidateOnStart<ResourceUtilizationHealthCheckOptions, ResourceUtilizationHealthCheckOptionsValidator>();
return builder.AddCheck<ResourceUtilizationHealthCheck>(HealthCheckName, tags: tags);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
using Microsoft.Extensions.Diagnostics.HealthChecks;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Options;
using Microsoft.Extensions.Options.Validation;
using Microsoft.Shared.Diagnostics;

namespace Microsoft.Extensions.Diagnostics.Probes;
Expand Down Expand Up @@ -44,7 +43,7 @@ internal static IServiceCollection AddTcpEndpointHealthCheck(this IServiceCollec
_ = services.AddHealthChecks();

_ = services
.AddValidatedOptions<KubernetesProbesOptions.EndpointOptions, EndpointOptionsValidator>(name);
.AddOptionsWithValidateOnStart<KubernetesProbesOptions.EndpointOptions, EndpointOptionsValidator>(name);

_ = services.AddSingleton<IHostedService>(provider =>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

<ItemGroup>
<ProjectReference Include="..\Microsoft.Extensions.Telemetry.Abstractions\Microsoft.Extensions.Telemetry.Abstractions.csproj" />
<ProjectReference Include="..\..\ToBeRemoved\Options.ValidateOnStart\Options.ValidateOnStart.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.

using Microsoft.Extensions.Options;
using Validation = Microsoft.Extensions.Options.Validation;

namespace Microsoft.Extensions.Diagnostics.ResourceMonitoring.Internal;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
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;

Expand All @@ -30,7 +29,7 @@ public static IResourceMonitorBuilder AddLinuxProvider(this IResourceMonitorBuil

builder.Services
.RegisterMetering()
.AddValidatedOptions<LinuxResourceUtilizationProviderOptions, LinuxCountersOptionsValidator>()
.AddOptionsWithValidateOnStart<LinuxResourceUtilizationProviderOptions, LinuxCountersOptionsValidator>()
.Services.TryAddActivatedSingleton<ISnapshotProvider, LinuxUtilizationProvider>();

builder.Services.TryAddSingleton<IFileSystem, OSFileSystem>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@

<ItemGroup>
<ProjectReference Include="..\Microsoft.Extensions.Telemetry.Abstractions\Microsoft.Extensions.Telemetry.Abstractions.csproj" />
<ProjectReference Include="..\..\ToBeRemoved\Options.ValidateOnStart\Options.ValidateOnStart.csproj" />
<ProjectReference Include="..\..\Libraries\Microsoft.Extensions.DependencyInjection.AutoActivation\Microsoft.Extensions.DependencyInjection.AutoActivation.csproj" />
</ItemGroup>

Expand Down
Loading

0 comments on commit 7c322ad

Please sign in to comment.