Update to .NET 8

kmcclellan · kmcclellan · commit 8b15615d4f56 · 2025-02-03T16:28:45.000-06:00
diff --git a/Elasticstretch.DependencyInjection.Example/Elasticstretch.DependencyInjection.Example.csproj b/Elasticstretch.DependencyInjection.Example/Elasticstretch.DependencyInjection.Example.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
diff --git a/Elasticstretch.DependencyInjection.Example/Program.cs b/Elasticstretch.DependencyInjection.Example/Program.cs
@@ -1,4 +1,5 @@
 ﻿using Elastic.Clients.Elasticsearch;
+
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
diff --git a/Elasticstretch.DependencyInjection/Elasticstretch.DependencyInjection.csproj b/Elasticstretch.DependencyInjection/Elasticstretch.DependencyInjection.csproj
@@ -1,17 +1,17 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <LangVersion>11.0</LangVersion>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <AnalysisLevel>7-all</AnalysisLevel>
+    <AnalysisMode>all</AnalysisMode>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <RootNamespace>Elastic.Clients.Elasticsearch</RootNamespace>
   </PropertyGroup>
 
   <PropertyGroup>
     <Authors>Kyle McClellan</Authors>
-    <Copyright>%A9 2023 Kyle McClellan</Copyright>
+    <Copyright>%A9 2023-2025 Kyle McClellan</Copyright>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <Description>An extension of Elastic.Clients.Elasticsearch for use with Microsoft.Extensions.DependencyInjection (and friends).</Description>
     <PackageTags>elasticsearch;elastic;search;dependencyinjection;di;ioc</PackageTags>
@@ -27,10 +27,10 @@
 
   <ItemGroup>
     <PackageReference Include="Elastic.Clients.Elasticsearch" Version="[8.9.*,8.12)" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.*" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.*" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.*" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.*" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.*" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.*" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.*" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.*" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="*" PrivateAssets="All" />
   </ItemGroup>
 
diff --git a/Elasticstretch.DependencyInjection/ElasticstretchServiceCollectionExtensions.cs b/Elasticstretch.DependencyInjection/ElasticstretchServiceCollectionExtensions.cs
@@ -1,6 +1,7 @@
 ﻿namespace Elastic.Clients.Elasticsearch;
 
 using Elastic.Clients.Elasticsearch.Options;
+
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Options;
diff --git a/Elasticstretch.DependencyInjection/Options/ConfigureClientFromNodes.cs b/Elasticstretch.DependencyInjection/Options/ConfigureClientFromNodes.cs
@@ -3,25 +3,13 @@
 using Microsoft.Extensions.Http;
 using Microsoft.Extensions.Options;
 
-sealed class ConfigureClientFromNodes
-    : ConfigureOptionsFromOptions<ElasticsearchClientOptions, ElasticsearchNodeOptions>
+sealed class ConfigureClientFromNodes(
+    IServiceProvider provider,
+    IOptionsFactory<ElasticsearchNodeOptions> nodeOptions,
+    IOptionsMonitor<HttpClientFactoryOptions> httpOptions,
+    IEnumerable<IHttpMessageHandlerBuilderFilter> httpFilters)
+        : ConfigureOptionsFromOptions<ElasticsearchClientOptions, ElasticsearchNodeOptions>(nodeOptions)
 {
-    readonly IServiceProvider _provider;
-    readonly IOptionsMonitor<HttpClientFactoryOptions> _httpOptions;
-    readonly IEnumerable<IHttpMessageHandlerBuilderFilter> _httpFilters;
-
-    public ConfigureClientFromNodes(
-        IServiceProvider provider,
-        IOptionsFactory<ElasticsearchNodeOptions> nodeOptions,
-        IOptionsMonitor<HttpClientFactoryOptions> httpOptions,
-        IEnumerable<IHttpMessageHandlerBuilderFilter> httpFilters)
-        : base(nodeOptions)
-    {
-        _provider = provider;
-        _httpOptions = httpOptions;
-        _httpFilters = httpFilters;
-    }
-
     protected override void Configure(ElasticsearchClientOptions options, ElasticsearchNodeOptions dependency)
     {
         if (dependency.CredentialsHeader != null)
@@ -31,6 +19,6 @@ protected override void Configure(ElasticsearchClientOptions options, Elasticsea
 
         var fallback = options.NodePool;
         options.NodePool = () => dependency.CreatePool() ?? fallback();
-        options.Connection = () => new HttpFactoryClient(_provider, _httpOptions, _httpFilters);
+        options.Connection = () => new HttpFactoryClient(provider, httpOptions, httpFilters);
     }
 }
diff --git a/Elasticstretch.DependencyInjection/Options/ConfigureCredentialsFromConfig.cs b/Elasticstretch.DependencyInjection/Options/ConfigureCredentialsFromConfig.cs
@@ -3,10 +3,8 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Options;
 
-sealed class ConfigureCredentialsFromConfig : ConfigureFromConfigurationOptions<ElasticsearchCredentialOptions>
+sealed class ConfigureCredentialsFromConfig(IConfiguration config)
+    : ConfigureFromConfigurationOptions<ElasticsearchCredentialOptions>(config.GetSection(Path))
 {
-    public ConfigureCredentialsFromConfig(IConfiguration config)
-        : base(config.GetSection(ConfigurationPath.Combine("Elasticsearch", "Credentials")))
-    {
-    }
+    public static readonly string Path = ConfigurationPath.Combine("Elasticsearch", "Credentials");
 }
diff --git a/Elasticstretch.DependencyInjection/Options/ConfigureNodesFromConfig.cs b/Elasticstretch.DependencyInjection/Options/ConfigureNodesFromConfig.cs
@@ -3,10 +3,8 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Options;
 
-sealed class ConfigureNodesFromConfig : ConfigureFromConfigurationOptions<ElasticsearchNodeOptions>
+sealed class ConfigureNodesFromConfig(IConfiguration config)
+    : ConfigureFromConfigurationOptions<ElasticsearchNodeOptions>(config.GetSection(Path))
 {
-    public ConfigureNodesFromConfig(IConfiguration config)
-        : base(config.GetSection("Elasticsearch"))
-    {
-    }
+    public const string Path = "Elasticsearch";
 }
diff --git a/Elasticstretch.DependencyInjection/Options/ConfigureNodesFromCredentials.cs b/Elasticstretch.DependencyInjection/Options/ConfigureNodesFromCredentials.cs
@@ -2,14 +2,9 @@
 
 using Microsoft.Extensions.Options;
 
-sealed class ConfigureNodesFromCredentials
-    : ConfigureOptionsFromOptions<ElasticsearchNodeOptions, ElasticsearchCredentialOptions>
+sealed class ConfigureNodesFromCredentials(IOptionsFactory<ElasticsearchCredentialOptions> optionsFactory)
+    : ConfigureOptionsFromOptions<ElasticsearchNodeOptions, ElasticsearchCredentialOptions>(optionsFactory)
 {
-    public ConfigureNodesFromCredentials(IOptionsFactory<ElasticsearchCredentialOptions> optionsFactory)
-        : base(optionsFactory)
-    {
-    }
-
     protected override void Configure(ElasticsearchNodeOptions options, ElasticsearchCredentialOptions dependency)
     {
         var credentials = dependency.CreateHeader();
diff --git a/Elasticstretch.DependencyInjection/Options/ConfigureOptionsFromOptions.cs b/Elasticstretch.DependencyInjection/Options/ConfigureOptionsFromOptions.cs
@@ -2,17 +2,10 @@
 
 using Microsoft.Extensions.Options;
 
-internal abstract class ConfigureOptionsFromOptions<TOptions, TDep> : IConfigureNamedOptions<TOptions>
+internal abstract class ConfigureOptionsFromOptions<TOptions, TDep>(IOptionsFactory<TDep> optionsFactory) : IConfigureNamedOptions<TOptions>
     where TOptions : class
     where TDep : class
 {
-    private readonly IOptionsFactory<TDep> optionsFactory;
-
-    public ConfigureOptionsFromOptions(IOptionsFactory<TDep> optionsFactory)
-    {
-        this.optionsFactory = optionsFactory;
-    }
-
     public void Configure(string? name, TOptions options)
     {
         Configure(options, optionsFactory.Create(name ?? Options.DefaultName));
diff --git a/Elasticstretch.DependencyInjection/Options/ElasticsearchNodeOptions.cs b/Elasticstretch.DependencyInjection/Options/ElasticsearchNodeOptions.cs
@@ -21,7 +21,7 @@ public class ElasticsearchNodeOptions
     /// <remarks>
     /// Incompatible with <see cref="CloudId"/>.
     /// </remarks>
-    public ICollection<Uri> NodeUris { get; } = new List<Uri>();
+    public ICollection<Uri> NodeUris { get; } = [];
 
     /// <summary>
     /// Gets or sets whether "sticky" node selection is used (e.g. <see cref="StickyNodePool"/>).
diff --git a/Elasticstretch.DependencyInjection/Options/HttpFactoryClient.cs b/Elasticstretch.DependencyInjection/Options/HttpFactoryClient.cs
@@ -2,32 +2,24 @@
 
 using Elastic.Clients.Elasticsearch;
 using Elastic.Transport;
+
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Http;
 using Microsoft.Extensions.Options;
+
 using System.Net.Http;
 
-sealed class HttpFactoryClient : HttpTransportClient
+sealed class HttpFactoryClient(
+    IServiceProvider provider,
+    IOptionsMonitor<HttpClientFactoryOptions> options,
+    IEnumerable<IHttpMessageHandlerBuilderFilter> filters)
+    : HttpTransportClient
 {
     public const string ClientName = nameof(ElasticsearchClient);
 
-    readonly IServiceProvider _provider;
-    readonly IOptionsMonitor<HttpClientFactoryOptions> _options;
-    readonly IEnumerable<IHttpMessageHandlerBuilderFilter> _filters;
-
-    public HttpFactoryClient(
-        IServiceProvider provider,
-        IOptionsMonitor<HttpClientFactoryOptions> options,
-        IEnumerable<IHttpMessageHandlerBuilderFilter> filters)
-    {
-        _provider = provider;
-        _options = options;
-        _filters = filters;
-    }
-
     protected override HttpMessageHandler CreateHttpClientHandler(RequestData requestData)
     {
-        var clientOptions = _options.Get(ClientName);
+        var clientOptions = options.Get(ClientName);
 
         var configureHandler = (HttpMessageHandlerBuilder builder) =>
         {
@@ -38,12 +30,12 @@ protected override HttpMessageHandler CreateHttpClientHandler(RequestData reques
         };
 
         // Not sure why filters are needed in addition to builder actions, but OK...
-        foreach (var filter in _filters.Reverse())
+        foreach (var filter in filters.Reverse())
         {
             configureHandler = filter.Configure(configureHandler);
         }
 
-        var builder = _provider.GetRequiredService<HttpMessageHandlerBuilder>(); 
+        var builder = provider.GetRequiredService<HttpMessageHandlerBuilder>(); 
         builder.Name = ClientName;
 
         configureHandler(builder);

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using Elastic.Clients.Elasticsearch;`
	`2`	`+`
`2`	`3`	`using Microsoft.Extensions.Configuration;`
`3`	`4`	`using Microsoft.Extensions.DependencyInjection;`
`4`	`5`	`using Microsoft.Extensions.Logging;`
Original file line number	Diff line number	Diff line change
`@@ -3,10 +3,8 @@`
`3`	`3`	`using Microsoft.Extensions.Configuration;`
`4`	`4`	`using Microsoft.Extensions.Options;`
`5`	`5`
`6`		`-sealed class ConfigureCredentialsFromConfig : ConfigureFromConfigurationOptions<ElasticsearchCredentialOptions>`
	`6`	`+sealed class ConfigureCredentialsFromConfig(IConfiguration config)`
	`7`	`+ : ConfigureFromConfigurationOptions<ElasticsearchCredentialOptions>(config.GetSection(Path))`
`7`	`8`	`{`
`8`		`- public ConfigureCredentialsFromConfig(IConfiguration config)`
`9`		`- : base(config.GetSection(ConfigurationPath.Combine("Elasticsearch", "Credentials")))`
`10`		`- {`
`11`		`- }`
	`9`	`+ public static readonly string Path = ConfigurationPath.Combine("Elasticsearch", "Credentials");`
`12`	`10`	`}`