Skip to content

Update to stable version of internal site search contracts #3448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mpdreamz merged 1 commit into from
Jun 2, 2026
Merged

Update to stable version of internal site search contracts #3448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<PackageVersion Include="AWSSDK.S3" Version="4.0.23.3" />
<PackageVersion Include="Elastic.OpenTelemetry" Version="1.3.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.3" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.8" />
<PackageVersion Include="Microsoft.Extensions.Telemetry.Abstractions" Version="10.0.0" />
<PackageVersion Include="Nullean.ScopedFileSystem" Version="0.4.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.2" />
Expand All @@ -51,11 +51,11 @@
<PackageVersion Include="FakeItEasy" Version="9.0.1" />
<PackageVersion Include="Elastic.Ingest.Elasticsearch" Version="0.41.2" />
<PackageVersion Include="Elastic.Mapping" Version="0.44.1" />
<PackageVersion Include="Elastic.Internal.Search.Contract" Version="0.1.0-canary.0.144" />
<PackageVersion Include="Elastic.Internal.Search.Elasticsearch" Version="0.1.0-canary.0.144" />
<PackageVersion Include="Elastic.Internal.Search.Contract" Version="0.8.0" />
<PackageVersion Include="Elastic.Internal.Search.Elasticsearch" Version="0.8.0" />
<PackageVersion Include="InMemoryLogger" Version="1.0.66" />
<PackageVersion Include="MartinCostello.Logging.XUnit.v3" Version="0.7.1" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.3" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.8" />
<PackageVersion Include="Microsoft.OpenApi" Version="3.1.1" />
<PackageVersion Include="Tomlyn" Version="2.3.2" />
<PackageVersion Include="TUnit" Version="0.25.21" />
Expand All @@ -80,7 +80,7 @@
<PackageVersion Include="Errata" Version="0.16.0" />
<PackageVersion Include="Github.Actions.Core" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Conso8e" Version="10.0.0" />
<PackageVersion Include="Markdig" Version="1.1.2" />
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.16.0" />
<PackageVersion Include="ModelContextProtocol" Version="1.0.0" />
Expand All @@ -96,7 +96,7 @@
<PackageVersion Include="SoftCircuits.IniFileParser" Version="2.7.0" />
<PackageVersion Include="System.IO.Abstractions" Version="22.1.1" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.3" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.8" />
<PackageVersion Include="Utf8StreamReader" Version="1.3.2" />
<PackageVersion Include="Vecc.YamlDotNet.Analyzers.StaticGenerator" Version="16.1.3" PrivateAssets="All" />
<PackageVersion Include="Westwind.AspNetCore.LiveReload" Version="0.5.2" />
Expand All @@ -122,7 +122,7 @@
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
<PackageVersion Include="JetBrains.Annotations" Version="2025.2.4" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="10.0.3" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="10.0.8" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="1.15.3" />
<PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="22.1.1" />
Expand Down
5 changes: 3 additions & 2 deletions src/Elastic.Markdown/Exporters/Elasticsearch/ElasticsearchMarkdownExporter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
using Elastic.Ingest.Elasticsearch.Enrichment;
using Elastic.Ingest.Elasticsearch.Indices;
using Elastic.Internal.Search;
using Elastic.Internal.Search.Mapping;
using Elastic.Mapping;
using Elastic.Transport;
using Microsoft.Extensions.Logging;
Expand Down Expand Up @@ -94,7 +95,7 @@ IDocumentationConfigurationContext context
_lexicalTypeContext = DocumentationMappingContext.DocumentationDocument
.CreateContext(type: _buildType, env: endpoints.Environment) with
{
ConfigureAnalysis = a => DocumentationAnalysisFactory.BuildAnalysis(a, synonymSetName, indexTimeSynonyms),
ConfigureAnalysis = a => SharedAnalysisFactory.BuildAnalysis(a, synonymSetName, indexTimeSynonyms),
IndexSettings = new Dictionary<string, string>
{
["index.default_pipeline"] = _contentDateEnrichment.PipelineName
Expand All @@ -104,7 +105,7 @@ IDocumentationConfigurationContext context
_semanticTypeContext = DocumentationMappingContext.DocumentationDocumentSemantic
.CreateContext(type: _buildType, env: endpoints.Environment) with
{
ConfigureAnalysis = a => DocumentationAnalysisFactory.BuildAnalysis(a, synonymSetName, indexTimeSynonyms),
ConfigureAnalysis = a => SharedAnalysisFactory.BuildAnalysis(a, synonymSetName, indexTimeSynonyms),
IndexSettings = new Dictionary<string, string>
{
["index.final_pipeline"] = _contentDateEnrichment.PipelineName
Expand Down
3 changes: 2 additions & 1 deletion tests-integration/Elastic.Documentation.IntegrationTests/Search/SearchBootstrapFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
using Elastic.Ingest.Elasticsearch;
using Elastic.Ingest.Elasticsearch.Indices;
using Elastic.Internal.Search;
using Elastic.Internal.Search.Mapping;
using Elastic.Mapping;
using Elastic.Markdown.Exporters.Elasticsearch;
using Elastic.Transport;
Expand Down Expand Up @@ -155,7 +156,7 @@ private async ValueTask<bool> IsIndexingNeeded()
// Create semantic type context to check channel hash (index namespace is 'dev' for tests)
var semanticTypeContext = DocumentationMappingContext.DocumentationDocumentSemantic.CreateContext(type: "assembler") with
{
ConfigureAnalysis = a => DocumentationAnalysisFactory.BuildAnalysis(a, "docs-assembler", [])
ConfigureAnalysis = a => SharedAnalysisFactory.BuildAnalysis(a, "docs-assembler", [])
};

var options = new IngestChannelOptions<DocumentationDocument>(transport, semanticTypeContext);
Expand Down
Loading