Skip to content

Commit 13b4e91

Browse files
authored
Update to stable version of internal site search contracts (#3448)
1 parent 46d8dcb commit 13b4e91

3 files changed

Lines changed: 12 additions & 10 deletions

File tree

Directory.Packages.props

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<PackageVersion Include="AWSSDK.S3" Version="4.0.23.3" />
4141
<PackageVersion Include="Elastic.OpenTelemetry" Version="1.3.0" />
4242
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.0" />
43-
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.3" />
43+
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.8" />
4444
<PackageVersion Include="Microsoft.Extensions.Telemetry.Abstractions" Version="10.0.0" />
4545
<PackageVersion Include="Nullean.ScopedFileSystem" Version="0.4.0" />
4646
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.2" />
@@ -51,11 +51,11 @@
5151
<PackageVersion Include="FakeItEasy" Version="9.0.1" />
5252
<PackageVersion Include="Elastic.Ingest.Elasticsearch" Version="0.41.2" />
5353
<PackageVersion Include="Elastic.Mapping" Version="0.44.1" />
54-
<PackageVersion Include="Elastic.Internal.Search.Contract" Version="0.1.0-canary.0.144" />
55-
<PackageVersion Include="Elastic.Internal.Search.Elasticsearch" Version="0.1.0-canary.0.144" />
54+
<PackageVersion Include="Elastic.Internal.Search.Contract" Version="0.8.0" />
55+
<PackageVersion Include="Elastic.Internal.Search.Elasticsearch" Version="0.8.0" />
5656
<PackageVersion Include="InMemoryLogger" Version="1.0.66" />
5757
<PackageVersion Include="MartinCostello.Logging.XUnit.v3" Version="0.7.1" />
58-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.3" />
58+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.8" />
5959
<PackageVersion Include="Microsoft.OpenApi" Version="3.1.1" />
6060
<PackageVersion Include="Tomlyn" Version="2.3.2" />
6161
<PackageVersion Include="TUnit" Version="0.25.21" />
@@ -80,7 +80,7 @@
8080
<PackageVersion Include="Errata" Version="0.16.0" />
8181
<PackageVersion Include="Github.Actions.Core" Version="9.0.0" />
8282
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.0" />
83-
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.0" />
83+
<PackageVersion Include="Microsoft.Extensions.Logging.Conso8e" Version="10.0.0" />
8484
<PackageVersion Include="Markdig" Version="1.1.2" />
8585
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.16.0" />
8686
<PackageVersion Include="ModelContextProtocol" Version="1.0.0" />
@@ -96,7 +96,7 @@
9696
<PackageVersion Include="SoftCircuits.IniFileParser" Version="2.7.0" />
9797
<PackageVersion Include="System.IO.Abstractions" Version="22.1.1" />
9898
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
99-
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.3" />
99+
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.8" />
100100
<PackageVersion Include="Utf8StreamReader" Version="1.3.2" />
101101
<PackageVersion Include="Vecc.YamlDotNet.Analyzers.StaticGenerator" Version="16.1.3" PrivateAssets="All" />
102102
<PackageVersion Include="Westwind.AspNetCore.LiveReload" Version="0.5.2" />
@@ -122,7 +122,7 @@
122122
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
123123
<PackageVersion Include="JetBrains.Annotations" Version="2025.2.4" />
124124
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.0" />
125-
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="10.0.3" />
125+
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="10.0.8" />
126126
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
127127
<PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="1.15.3" />
128128
<PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="22.1.1" />

src/Elastic.Markdown/Exporters/Elasticsearch/ElasticsearchMarkdownExporter.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
using Elastic.Ingest.Elasticsearch.Enrichment;
1616
using Elastic.Ingest.Elasticsearch.Indices;
1717
using Elastic.Internal.Search;
18+
using Elastic.Internal.Search.Mapping;
1819
using Elastic.Mapping;
1920
using Elastic.Transport;
2021
using Microsoft.Extensions.Logging;
@@ -94,7 +95,7 @@ IDocumentationConfigurationContext context
9495
_lexicalTypeContext = DocumentationMappingContext.DocumentationDocument
9596
.CreateContext(type: _buildType, env: endpoints.Environment) with
9697
{
97-
ConfigureAnalysis = a => DocumentationAnalysisFactory.BuildAnalysis(a, synonymSetName, indexTimeSynonyms),
98+
ConfigureAnalysis = a => SharedAnalysisFactory.BuildAnalysis(a, synonymSetName, indexTimeSynonyms),
9899
IndexSettings = new Dictionary<string, string>
99100
{
100101
["index.default_pipeline"] = _contentDateEnrichment.PipelineName
@@ -104,7 +105,7 @@ IDocumentationConfigurationContext context
104105
_semanticTypeContext = DocumentationMappingContext.DocumentationDocumentSemantic
105106
.CreateContext(type: _buildType, env: endpoints.Environment) with
106107
{
107-
ConfigureAnalysis = a => DocumentationAnalysisFactory.BuildAnalysis(a, synonymSetName, indexTimeSynonyms),
108+
ConfigureAnalysis = a => SharedAnalysisFactory.BuildAnalysis(a, synonymSetName, indexTimeSynonyms),
108109
IndexSettings = new Dictionary<string, string>
109110
{
110111
["index.final_pipeline"] = _contentDateEnrichment.PipelineName

tests-integration/Elastic.Documentation.IntegrationTests/Search/SearchBootstrapFixture.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
using Elastic.Ingest.Elasticsearch;
1414
using Elastic.Ingest.Elasticsearch.Indices;
1515
using Elastic.Internal.Search;
16+
using Elastic.Internal.Search.Mapping;
1617
using Elastic.Mapping;
1718
using Elastic.Markdown.Exporters.Elasticsearch;
1819
using Elastic.Transport;
@@ -155,7 +156,7 @@ private async ValueTask<bool> IsIndexingNeeded()
155156
// Create semantic type context to check channel hash (index namespace is 'dev' for tests)
156157
var semanticTypeContext = DocumentationMappingContext.DocumentationDocumentSemantic.CreateContext(type: "assembler") with
157158
{
158-
ConfigureAnalysis = a => DocumentationAnalysisFactory.BuildAnalysis(a, "docs-assembler", [])
159+
ConfigureAnalysis = a => SharedAnalysisFactory.BuildAnalysis(a, "docs-assembler", [])
159160
};
160161

161162
var options = new IngestChannelOptions<DocumentationDocument>(transport, semanticTypeContext);

0 commit comments

Comments
 (0)