Upgrade to Elastic.Clients.Elasticsearch (ES 8.x)

.agents/skills/foundatio-repositories/SKILL.md

@@ -6,13 +6,13 @@ description: >
   aggregation queries, partial and script patches, and search-after pagination.
   Apply when working with any IRepository, ISearchableRepository, FindAsync,
   CountAsync, PatchAsync, PatchAllAsync, or RemoveAllAsync method. Never use
-  raw IElasticClient directly -- always use repository methods. Use context7
+  raw ElasticsearchClient directly -- always use repository methods. Use context7
   MCP to fetch current API docs and examples.
 ---
 
 # Foundatio Repositories
 
-High-level Elasticsearch repository pattern for .NET. Interface-first, with built-in caching, messaging, patch operations, and soft deletes. **Never use raw `IElasticClient` directly** -- always use repository methods.
+High-level Elasticsearch repository pattern for .NET. Interface-first, with built-in caching, messaging, patch operations, and soft deletes. **Never use raw `ElasticsearchClient` directly** -- always use repository methods.
 
 ## Documentation via context7
 

.github/workflows/build.yml

@@ -7,3 +7,4 @@ jobs:
     secrets: inherit
     with:
       new-test-runner: true
+      minimum-major-minor: '8.0'

.gitignore

@@ -39,24 +39,4 @@ _NCrunch_*
 .DS_Store
 
 # Rider
-
-# User specific
-**/.idea/**/workspace.xml
-**/.idea/**/tasks.xml
-**/.idea/shelf/*
-**/.idea/dictionaries
-
-# Sensitive or high-churn files
-**/.idea/**/dataSources/
-**/.idea/**/dataSources.ids
-**/.idea/**/dataSources.xml
-**/.idea/**/dataSources.local.xml
-**/.idea/**/sqlDataSources.xml
-**/.idea/**/dynamic.xml
-
-# Rider
-# Rider auto-generates .iml files, and contentModel.xml
-**/.idea/**/*.iml
-**/.idea/**/contentModel.xml
-**/.idea/**/modules.xml
-**/.idea/copilot/chatSessions/
+.idea/

AGENTS.md

@@ -88,7 +88,7 @@ samples
 - **Guard clauses**: Use `ArgumentNullException.ThrowIfNull(param)` instead of manual `if (param == null) throw`
 - **Lambda bodies**: Prefer multi-line bodies for lambda expressions—no single-line `{ action(); return true; }` patterns
 - **Raw string literals**: Use `"""..."""` for multi-line strings. Never use string concatenation (`+`) to build script or query strings
-- **Domain-correct syntax in scripts**: Verify operator syntax for the target language (e.g., Painless uses `==` not `===`; NEST uses specific query DSL methods)
+- **Domain-correct syntax in scripts**: Verify operator syntax for the target language (e.g., Painless uses `==` not `===`; Elasticsearch client uses specific query DSL methods)
 
 ### Architecture Patterns
 

README.md

@@ -46,16 +46,15 @@ public sealed class EmployeeIndex : VersionedIndex<Employee>
     public EmployeeIndex(IElasticConfiguration configuration) 
         : base(configuration, "employees", version: 1) { }
 
-    public override TypeMappingDescriptor<Employee> ConfigureIndexMapping(
-        TypeMappingDescriptor<Employee> map)
+    public override void ConfigureIndexMapping(TypeMappingDescriptor<Employee> map)
     {
-        return map
-            .Dynamic(false)
+        map
+            .Dynamic(DynamicMapping.False)
             .Properties(p => p
                 .SetupDefaults()
-                .Text(f => f.Name(e => e.Name).AddKeywordAndSortFields())
-                .Text(f => f.Name(e => e.Email).AddKeywordAndSortFields())
-                .Number(f => f.Name(e => e.Age).Type(NumberType.Integer))
+                .Text(e => e.Name, t => t.AddKeywordAndSortFields())
+                .Text(e => e.Email, t => t.AddKeywordAndSortFields())
+                .IntegerNumber(e => e.Age)
             );
     }
 }

build/common.props

@@ -6,10 +6,11 @@
     <Description>Generic Repository implementations for Elasticsearch.</Description>
     <PackageProjectUrl>https://github.com/FoundatioFx/Foundatio.Repositories</PackageProjectUrl>
     <PackageReleaseNotes>https://github.com/FoundatioFx/Foundatio.Repositories/releases</PackageReleaseNotes>
+    <MinVerMinimumMajorMinor>8.0</MinVerMinimumMajorMinor>
     <MinVerSkip Condition="'$(Configuration)' == 'Debug'">true</MinVerSkip>
     <MinVerTagPrefix>v</MinVerTagPrefix>
     <ReferenceFoundatioSource Condition="$(SolutionName.Contains('All')) Or !$(SolutionName.Contains('Foundatio'))">true</ReferenceFoundatioSource>
-    <ReferenceFoundatioRepositoriesSource>false</ReferenceFoundatioRepositoriesSource>
+    <ReferenceFoundatioRepositoriesSource Condition="$(SolutionName.Contains('All')) Or !$(SolutionName.Contains('Foundatio'))">true</ReferenceFoundatioRepositoriesSource>
     <FoundatioProjectsDir>$(ProjectDir)..\..\..\</FoundatioProjectsDir>
 
     <Copyright>Copyright © $([System.DateTime]::Now.ToString(yyyy)) Foundatio.  All rights reserved.</Copyright>

docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.19.11
+    image: docker.elastic.co/elasticsearch/elasticsearch:9.3.1
     environment:
       discovery.type: single-node
       xpack.security.enabled: "false"
@@ -20,7 +20,7 @@ services:
     depends_on:
       elasticsearch:
         condition: service_healthy
-    image: docker.elastic.co/kibana/kibana:8.19.11
+    image: docker.elastic.co/kibana/kibana:9.3.1
     environment:
       xpack.security.enabled: "false"
     ports:

docs/.vitepress/config.ts

@@ -75,6 +75,7 @@ export default withMermaid(
             { text: 'Jobs', link: '/guide/jobs' },
             { text: 'Custom Fields', link: '/guide/custom-fields' },
             { text: 'Troubleshooting', link: '/guide/troubleshooting' },
+            { text: 'Upgrading to ES9', link: '/guide/upgrading-to-es9' },
           ],
         },
       ],

docs/guide/custom-fields.md

@@ -177,16 +177,15 @@ public sealed class EmployeeIndex : VersionedIndex<Employee>
         AddStandardCustomFieldTypes();
     }
 
-    public override TypeMappingDescriptor<Employee> ConfigureIndexMapping(
-        TypeMappingDescriptor<Employee> map)
+    public override void ConfigureIndexMapping(TypeMappingDescriptor<Employee> map)
     {
-        return map
-            .Dynamic(false)
+        map
+            .Dynamic(DynamicMapping.False)
             .Properties(p => p
                 .SetupDefaults()
-                .Keyword(f => f.Name(e => e.Id))
-                .Keyword(f => f.Name(e => e.CompanyId))
-                .Text(f => f.Name(e => e.Name))
+                .Keyword(e => e.Id)
+                .Keyword(e => e.CompanyId)
+                .Text(e => e.Name)
             );
     }
 }
@@ -417,7 +416,7 @@ public interface ICustomFieldType
     string Type { get; }
     Task<ProcessFieldValueResult> ProcessValueAsync<T>(
         T document, object value, CustomFieldDefinition fieldDefinition) where T : class;
-    IProperty ConfigureMapping<T>(SingleMappingSelector<T> map) where T : class;
+    Func<PropertyFactory<T>, IProperty> ConfigureMapping<T>() where T : class;
 }
 
 public class ProcessFieldValueResult
@@ -453,9 +452,9 @@ public class PercentFieldType : ICustomFieldType
         return Task.FromResult(new ProcessFieldValueResult { Value = value });
     }
 
-    public IProperty ConfigureMapping<T>(SingleMappingSelector<T> map) where T : class
+    public Func<PropertyFactory<T>, IProperty> ConfigureMapping<T>() where T : class
     {
-        return map.Number(n => n.Type(NumberType.Integer));
+        return factory => factory.IntegerNumber();
     }
 }
 ```