Bump ConsoleAppFramework and remove Elastic.Documentation.Tooling (#2188)

Mpdreamz · web-flow · commit a229c63f823c · 2025-11-10T21:58:36.000+01:00
* Bump ConsoleAppFramework and remove Elastic.Documentation.Tooling

* format

* simplify name
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -49,8 +49,8 @@
     <PackageVersion Include="FSharp.Core" Version="9.0.202" />
   </ItemGroup>
   <ItemGroup>
-    <PackageVersion Include="ConsoleAppFramework" Version="5.6.2" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
-    <PackageVersion Include="ConsoleAppFramework.Abstractions" Version="5.4.1" />
+    <PackageVersion Include="ConsoleAppFramework" Version="5.7.2" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
+    <PackageVersion Include="ConsoleAppFramework.Abstractions" Version="5.7.2" />
     <PackageVersion Include="Crayon" Version="2.0.69" />
     <PackageVersion Include="DotNet.Glob" Version="3.1.3" />
     <PackageVersion Include="Errata" Version="0.14.0" />
@@ -99,4 +99,4 @@
     </PackageVersion>
     <PackageVersion Include="xunit.v3" Version="2.0.2" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/aspire/aspire.csproj b/aspire/aspire.csproj
@@ -14,16 +14,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ConsoleAppFramework" />
+    <PackageReference Include="ConsoleAppFramework">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Aspire.Hosting.AppHost"/>
     <PackageReference Include="Elastic.Aspire.Hosting.Elasticsearch"/>
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\src\api\Elastic.Documentation.Api.Lambda\Elastic.Documentation.Api.Lambda.csproj" />
     <ProjectReference Include="..\src\tooling\docs-builder\docs-builder.csproj"/>
-    
-    <ProjectReference Include="..\src\tooling\Elastic.Documentation.Tooling\Elastic.Documentation.Tooling.csproj"  IsAspireProjectResource="false" />
     <ProjectReference Include="..\src\Elastic.Documentation\Elastic.Documentation.csproj" IsAspireProjectResource="false" />
   </ItemGroup>
 
diff --git a/docs-builder.sln b/docs-builder.sln
@@ -51,8 +51,6 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "authoring", "tests\authorin
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.Documentation.Refactor", "src\authoring\Elastic.Documentation.Refactor\Elastic.Documentation.Refactor.csproj", "{7D36DDDA-9E0B-4D2C-8033-5D62FF8B6166}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.Documentation.Tooling", "src\tooling\Elastic.Documentation.Tooling\Elastic.Documentation.Tooling.csproj", "{4CCE599A-B9FE-4DF2-8763-34CF0A99D4AA}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "validate-inbound-local", "validate-inbound-local", "{6E2ED6CC-AFC1-4E58-965D-6AEC500EBB46}"
 	ProjectSection(SolutionItems) = preProject
 		actions\validate-inbound-local\action.yml = actions\validate-inbound-local\action.yml
@@ -254,18 +252,6 @@ Global
 		{7D36DDDA-9E0B-4D2C-8033-5D62FF8B6166}.Release|x64.Build.0 = Release|Any CPU
 		{7D36DDDA-9E0B-4D2C-8033-5D62FF8B6166}.Release|x86.ActiveCfg = Release|Any CPU
 		{7D36DDDA-9E0B-4D2C-8033-5D62FF8B6166}.Release|x86.Build.0 = Release|Any CPU
-		{4CCE599A-B9FE-4DF2-8763-34CF0A99D4AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4CCE599A-B9FE-4DF2-8763-34CF0A99D4AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4CCE599A-B9FE-4DF2-8763-34CF0A99D4AA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4CCE599A-B9FE-4DF2-8763-34CF0A99D4AA}.Debug|x64.Build.0 = Debug|Any CPU
-		{4CCE599A-B9FE-4DF2-8763-34CF0A99D4AA}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4CCE599A-B9FE-4DF2-8763-34CF0A99D4AA}.Debug|x86.Build.0 = Debug|Any CPU
-		{4CCE599A-B9FE-4DF2-8763-34CF0A99D4AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4CCE599A-B9FE-4DF2-8763-34CF0A99D4AA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4CCE599A-B9FE-4DF2-8763-34CF0A99D4AA}.Release|x64.ActiveCfg = Release|Any CPU
-		{4CCE599A-B9FE-4DF2-8763-34CF0A99D4AA}.Release|x64.Build.0 = Release|Any CPU
-		{4CCE599A-B9FE-4DF2-8763-34CF0A99D4AA}.Release|x86.ActiveCfg = Release|Any CPU
-		{4CCE599A-B9FE-4DF2-8763-34CF0A99D4AA}.Release|x86.Build.0 = Release|Any CPU
 		{C559D52D-100B-4B2B-BE87-2344D835761D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C559D52D-100B-4B2B-BE87-2344D835761D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C559D52D-100B-4B2B-BE87-2344D835761D}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -530,7 +516,6 @@ Global
 		{A2A34BBC-CB5E-4100-9529-A12B6ECB769C} = {245023D2-D3CA-47B9-831D-DAB91A2FFDC7}
 		{018F959E-824B-4664-B345-066784478D24} = {67B576EE-02FA-4F9B-94BC-3630BC09ECE5}
 		{7D36DDDA-9E0B-4D2C-8033-5D62FF8B6166} = {059E787F-85C1-43BE-9DD6-CE319E106383}
-		{4CCE599A-B9FE-4DF2-8763-34CF0A99D4AA} = {73ABAE37-118F-4A53-BC2C-F19333555C90}
 		{6E2ED6CC-AFC1-4E58-965D-6AEC500EBB46} = {245023D2-D3CA-47B9-831D-DAB91A2FFDC7}
 		{6554F917-73CE-4B3D-9101-F28EAA762C6B} = {245023D2-D3CA-47B9-831D-DAB91A2FFDC7}
 		{C559D52D-100B-4B2B-BE87-2344D835761D} = {4894063D-0DEF-4B7E-97D0-0D0A5B85C608}
diff --git a/src/Elastic.Documentation/Exporter.cs b/src/Elastic.Documentation/Exporter.cs
@@ -14,8 +14,9 @@ public enum Exporter
 	Configuration,
 	DocumentationState,
 	LinkMetadata,
-	Redirects,
+	Redirects
 }
+
 public static class ExportOptions
 {
 	public static HashSet<Exporter> Default { get; } = [Html, LLMText, Configuration, DocumentationState, LinkMetadata, Redirects];
diff --git a/src/Elastic.Markdown/Exporters/Elasticsearch/ElasticsearchExporter.cs b/src/Elastic.Markdown/Exporters/Elasticsearch/ElasticsearchExporter.cs
@@ -255,10 +255,10 @@ private static string AbstractMapping() =>
 		}
 		""";
 
-	private static string InferenceMapping(string inferenceId) =>
+	private static string InferenceMapping(string _) =>
 		$"""
 		 	"type": "semantic_text",
-		 	"inference_id": "{inferenceId}"
+		 	"inference_id": ".elser-2-elastic"
 		 """;
 
 	private static string AbstractInferenceMapping(string inferenceId) =>
diff --git a/src/tooling/Elastic.Documentation.Tooling/CompositeDisposableServiceProvider.cs b/src/tooling/Elastic.Documentation.Tooling/CompositeDisposableServiceProvider.cs
diff --git a/src/tooling/Elastic.Documentation.Tooling/Elastic.Documentation.Tooling.csproj b/src/tooling/Elastic.Documentation.Tooling/Elastic.Documentation.Tooling.csproj
diff --git a/src/tooling/Elastic.Documentation.Tooling/README.md b/src/tooling/Elastic.Documentation.Tooling/README.md
diff --git a/src/tooling/docs-builder/Arguments/ExportOption.cs b/src/tooling/docs-builder/Arguments/ExportOption.cs
@@ -3,9 +3,10 @@
 // See the LICENSE file in the project root for more information
 
 using ConsoleAppFramework;
+using Elastic.Documentation;
 using static Elastic.Documentation.Exporter;
 
-namespace Elastic.Documentation.Tooling.Arguments;
+namespace Documentation.Builder.Arguments;
 
 [AttributeUsage(AttributeTargets.Parameter)]
 public class ExporterParserAttribute : Attribute, IArgumentParser<IReadOnlySet<Exporter>>
@@ -24,7 +25,7 @@ public static bool TryParse(ReadOnlySpan<char> s, out IReadOnlySet<Exporter> res
 				"es" => Elasticsearch,
 				"elasticsearch" => Elasticsearch,
 				"html" => Html,
-				"config" => Exporter.Configuration,
+				"config" => Configuration,
 				"links" => LinkMetadata,
 				"state" => DocumentationState,
 				"redirects" => Redirects,
diff --git a/src/tooling/docs-builder/Commands/Assembler/AssemblerCommands.cs b/src/tooling/docs-builder/Commands/Assembler/AssemblerCommands.cs
@@ -5,6 +5,7 @@
 using System.IO.Abstractions;
 using Actions.Core.Services;
 using ConsoleAppFramework;
+using Documentation.Builder.Arguments;
 using Documentation.Builder.Http;
 using Elastic.Documentation;
 using Elastic.Documentation.Assembler.Building;
@@ -13,7 +14,6 @@
 using Elastic.Documentation.Configuration.Assembler;
 using Elastic.Documentation.Diagnostics;
 using Elastic.Documentation.Services;
-using Elastic.Documentation.Tooling.Arguments;
 using Microsoft.Extensions.Logging;
 
 namespace Documentation.Builder.Commands.Assembler;
diff --git a/src/tooling/docs-builder/Commands/IsolatedBuildCommand.cs b/src/tooling/docs-builder/Commands/IsolatedBuildCommand.cs
@@ -5,12 +5,12 @@
 using System.IO.Abstractions;
 using Actions.Core.Services;
 using ConsoleAppFramework;
+using Documentation.Builder.Arguments;
 using Elastic.Documentation;
 using Elastic.Documentation.Configuration;
 using Elastic.Documentation.Diagnostics;
 using Elastic.Documentation.Isolated;
 using Elastic.Documentation.Services;
-using Elastic.Documentation.Tooling.Arguments;
 using Microsoft.Extensions.Logging;
 
 namespace Documentation.Builder.Commands;
diff --git a/src/tooling/docs-builder/Diagnostics/Console/ConsoleDiagnosticsCollector.cs b/src/tooling/docs-builder/Diagnostics/Console/ConsoleDiagnosticsCollector.cs
@@ -8,7 +8,7 @@
 using Spectre.Console;
 using Diagnostic = Elastic.Documentation.Diagnostics.Diagnostic;
 
-namespace Elastic.Documentation.Tooling.Diagnostics.Console;
+namespace Documentation.Builder.Diagnostics.Console;
 
 public class ConsoleDiagnosticsCollector(ILoggerFactory logFactory, ICoreService? githubActions = null)
 	: DiagnosticsCollector([new Log(logFactory.CreateLogger<Log>()), new GithubAnnotationOutput(githubActions)])
diff --git a/src/tooling/docs-builder/Diagnostics/Console/ErrataFileSourceRepository.cs b/src/tooling/docs-builder/Diagnostics/Console/ErrataFileSourceRepository.cs
@@ -10,7 +10,7 @@
 using Spectre.Console;
 using Diagnostic = Elastic.Documentation.Diagnostics.Diagnostic;
 
-namespace Elastic.Documentation.Tooling.Diagnostics.Console;
+namespace Documentation.Builder.Diagnostics.Console;
 
 public class CustomDiagnosticsFormatter : DiagnosticFormatter
 {
diff --git a/src/tooling/docs-builder/Diagnostics/Console/GithubAnnotationOutput.cs b/src/tooling/docs-builder/Diagnostics/Console/GithubAnnotationOutput.cs
@@ -6,7 +6,7 @@
 using Actions.Core.Services;
 using Elastic.Documentation.Diagnostics;
 
-namespace Elastic.Documentation.Tooling.Diagnostics.Console;
+namespace Documentation.Builder.Diagnostics.Console;
 
 public class GithubAnnotationOutput(ICoreService? githubActions) : IDiagnosticsOutput
 {
diff --git a/src/tooling/docs-builder/Diagnostics/LiveMode/LiveModeDiagnosticsCollector.cs b/src/tooling/docs-builder/Diagnostics/LiveMode/LiveModeDiagnosticsCollector.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information
 
 using Elastic.Documentation.Diagnostics;
-using Elastic.Documentation.Tooling.Diagnostics;
 using Microsoft.Extensions.Logging;
 using Diagnostic = Elastic.Documentation.Diagnostics.Diagnostic;
 
diff --git a/src/tooling/docs-builder/Diagnostics/Log.cs b/src/tooling/docs-builder/Diagnostics/Log.cs
@@ -5,7 +5,7 @@
 using Elastic.Documentation.Diagnostics;
 using Microsoft.Extensions.Logging;
 
-namespace Elastic.Documentation.Tooling.Diagnostics;
+namespace Documentation.Builder.Diagnostics;
 
 // named Log for terseness on console output
 public class Log(ILogger logger) : IDiagnosticsOutput
diff --git a/src/tooling/docs-builder/DocumentationTooling.cs b/src/tooling/docs-builder/DocumentationTooling.cs
@@ -6,20 +6,20 @@
 using System.Net.Sockets;
 using Actions.Core.Extensions;
 using Actions.Core.Services;
+using Documentation.Builder.Diagnostics.Console;
+using Elastic.Documentation;
 using Elastic.Documentation.Configuration;
 using Elastic.Documentation.Configuration.LegacyUrlMappings;
 using Elastic.Documentation.Configuration.Products;
 using Elastic.Documentation.Configuration.Synonyms;
 using Elastic.Documentation.Configuration.Versions;
 using Elastic.Documentation.Diagnostics;
-using Elastic.Documentation.ServiceDefaults;
-using Elastic.Documentation.Tooling.Diagnostics.Console;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.ServiceDiscovery;
 
-namespace Elastic.Documentation.Tooling;
+namespace Documentation.Builder;
 
 public static class DocumentationTooling
 {
diff --git a/src/tooling/docs-builder/Filters/CatchExceptionFilter.cs b/src/tooling/docs-builder/Filters/CatchExceptionFilter.cs
@@ -6,10 +6,10 @@
 using Elastic.Documentation.Diagnostics;
 using Microsoft.Extensions.Logging;
 
-namespace Elastic.Documentation.Tooling.Filters;
+namespace Documentation.Builder.Filters;
 
 
-public sealed class CatchExceptionFilter(ConsoleAppFilter next, ILogger<CatchExceptionFilter> logger, IDiagnosticsCollector collector)
+internal sealed class CatchExceptionFilter(ConsoleAppFilter next, ILogger<CatchExceptionFilter> logger, IDiagnosticsCollector collector)
 	: ConsoleAppFilter(next)
 {
 	private bool _cancelKeyPressed;
diff --git a/src/tooling/docs-builder/Filters/CheckForUpdatesFilter.cs b/src/tooling/docs-builder/Filters/CheckForUpdatesFilter.cs
@@ -6,7 +6,6 @@
 using ConsoleAppFramework;
 using Elastic.Documentation;
 using Elastic.Documentation.Configuration;
-using Elastic.Documentation.ServiceDefaults;
 
 namespace Documentation.Builder.Filters;
 
diff --git a/src/tooling/docs-builder/Filters/InfoLoggerFilter.cs b/src/tooling/docs-builder/Filters/InfoLoggerFilter.cs
@@ -4,12 +4,13 @@
 
 using System.Reflection;
 using ConsoleAppFramework;
+using Elastic.Documentation;
 using Elastic.Documentation.Configuration;
 using Microsoft.Extensions.Logging;
 
-namespace Elastic.Documentation.Tooling.Filters;
+namespace Documentation.Builder.Filters;
 
-public class InfoLoggerFilter(
+internal sealed class InfoLoggerFilter(
 	ConsoleAppFilter next,
 	ILogger<InfoLoggerFilter> logger,
 	ConfigurationFileProvider fileProvider,
diff --git a/src/tooling/docs-builder/Filters/StopwatchFilter.cs b/src/tooling/docs-builder/Filters/StopwatchFilter.cs
@@ -6,9 +6,9 @@
 using ConsoleAppFramework;
 using Microsoft.Extensions.Logging;
 
-namespace Elastic.Documentation.Tooling.Filters;
+namespace Documentation.Builder.Filters;
 
-public class StopwatchFilter(ConsoleAppFilter next, ILogger<StopwatchFilter> logger) : ConsoleAppFilter(next)
+internal sealed class StopwatchFilter(ConsoleAppFilter next, ILogger<StopwatchFilter> logger) : ConsoleAppFilter(next)
 {
 	public override async Task InvokeAsync(ConsoleAppContext context, Cancel cancellationToken)
 	{
diff --git a/src/tooling/docs-builder/Program.cs b/src/tooling/docs-builder/Program.cs
diff --git a/src/tooling/docs-builder/docs-builder.csproj b/src/tooling/docs-builder/docs-builder.csproj

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,9 @@ public enum Exporter`
`14`	`14`	`Configuration,`
`15`	`15`	`DocumentationState,`
`16`	`16`	`LinkMetadata,`
`17`		`- Redirects,`
	`17`	`+ Redirects`
`18`	`18`	`}`
	`19`	`+`
`19`	`20`	`public static class ExportOptions`
`20`	`21`	`{`
`21`	`22`	`public static HashSet<Exporter> Default { get; } = [Html, LLMText, Configuration, DocumentationState, LinkMetadata, Redirects];`