diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index a49192f40..c0a9b88af 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -24,7 +24,7 @@ jobs: uses: ./.github/actions/bootstrap - name: Build - run: dotnet run --project src/docs-assembler -c release -- navigation validate + run: dotnet run --project src/tooling/docs-assembler -c release -- navigation validate build-lambda: runs-on: ubuntu-latest diff --git a/.github/workflows/preview-build.yml b/.github/workflows/preview-build.yml index 06db6a492..b1695d6b7 100644 --- a/.github/workflows/preview-build.yml +++ b/.github/workflows/preview-build.yml @@ -139,7 +139,7 @@ jobs: - name: Build documentation if: github.repository == 'elastic/docs-builder' && steps.deployment.outputs.result run: | - dotnet run --project src/docs-builder -- --strict --path-prefix "${PATH_PREFIX}" + dotnet run --project src/tooling/docs-builder -- --strict --path-prefix "${PATH_PREFIX}" - name: Build documentation if: github.repository != 'elastic/docs-builder' && (steps.deployment.outputs.result || (steps.check-files.outputs.any_modified == 'true' && github.event_name == 'merge_group')) diff --git a/.github/workflows/smoke-test.yml b/.github/workflows/smoke-test.yml index f0f34d4b0..f1c5f8807 100644 --- a/.github/workflows/smoke-test.yml +++ b/.github/workflows/smoke-test.yml @@ -35,7 +35,7 @@ jobs: - name: Build documentation id: docs-build run: | - dotnet run --project src/docs-builder -- --strict --path-prefix "/docs" -p test-repo + dotnet run --project src/tooling/docs-builder -- --strict --path-prefix "/docs" -p test-repo - name: Verify landing-page-path output run: test ${{ steps.docs-build.outputs.landing-page-path }} == ${{ matrix.landing-page-path-output }} diff --git a/build/CommandLine.fs b/build/CommandLine.fs index 60af3d86c..d3244adb8 100644 --- a/build/CommandLine.fs +++ b/build/CommandLine.fs @@ -28,7 +28,6 @@ type Build = | [] PublishContainers | [] PublishZip - | [] ReleaseNotes | [] Release | [] Single_Target @@ -57,8 +56,7 @@ with | PublishContainers | PublishZip | ValidateLicenses - | ReleaseNotes - | Compile + | Compile // flags | Single_Target -> "Runs the provided sub command without running their dependencies" diff --git a/build/Targets.fs b/build/Targets.fs index 05dfcf3a4..0ebcec515 100644 --- a/build/Targets.fs +++ b/build/Targets.fs @@ -5,7 +5,6 @@ module Targets open Argu -open System.IO open CommandLine open Fake.Core open Fake.IO @@ -57,12 +56,12 @@ let private pristineCheck (arguments:ParseResults) = | _ -> failwithf "There are dotnet formatting violations. Call `dotnet format` to fix or specify -c to ./build.sh to skip this check" let private publishBinaries _ = - exec { run "dotnet" "publish" "src/docs-builder/docs-builder.csproj" } - exec { run "dotnet" "publish" "src/docs-assembler/docs-assembler.csproj" } + exec { run "dotnet" "publish" "src/tooling/docs-builder/docs-builder.csproj" } + exec { run "dotnet" "publish" "src/tooling/docs-assembler/docs-assembler.csproj" } let private publishZip _ = let zip tool = - exec { run "dotnet" "publish" $"src/{tool}/{tool}.csproj" } + exec { run "dotnet" "publish" $"src/tooling/{tool}/{tool}.csproj" } let binary = match OS.Current with Windows -> $"{tool}.exe" | _ -> tool Zip.zip $".artifacts/publish/{tool}/release" @@ -89,7 +88,7 @@ let private publishContainers _ = } match exitCode with | 0 -> "edge;latest" | _ -> "edge" let args = - ["publish"; $"src/%s{project}/%s{project}.csproj"] + ["publish"; $"src/tooling/%s{project}/%s{project}.csproj"] @ [ "/t:PublishContainer"; "-p"; "DebugType=none"; @@ -122,27 +121,6 @@ let private validateLicenses _ = "--packages-filter"; "#System\..*#";] exec { run "dotnet" (["dotnet-project-licenses"] @ args) } -let private generateReleaseNotes (arguments:ParseResults) = - let currentVersion = Software.Version.NormalizeToShorter() - let releaseNotesPath = Paths.ArtifactPath "release-notes" - let output = - Paths.RelativePathToRoot <| Path.Combine(releaseNotesPath.FullName, $"release-notes-%s{currentVersion}.md") - let tokenArgs = - match arguments.TryGetResult Token with - | None -> [] - | Some token -> ["--token"; token;] - let releaseNotesArgs = - (Software.GithubMoniker.Split("/") |> Seq.toList) - @ ["--version"; currentVersion - "--label"; "enhancement"; "Features" - "--label"; "bug"; "Fixes" - "--label"; "documentation"; "Documentation" - ] @ tokenArgs - @ ["--output"; output] - - let args = ["release-notes"] @ releaseNotesArgs - exec { run "dotnet" args } - let Setup (parsed:ParseResults) = let wireCommandLine (t: Build) = match t with @@ -159,7 +137,7 @@ let Setup (parsed:ParseResults) = | Release -> Build.Cmd [PristineCheck; Build] - [ValidateLicenses; ReleaseNotes] + [ValidateLicenses;] release | Publish -> @@ -178,7 +156,6 @@ let Setup (parsed:ParseResults) = | PublishContainers -> Build.Step publishContainers | PublishZip -> Build.Step publishZip | ValidateLicenses -> Build.Step validateLicenses - | ReleaseNotes -> Build.Step generateReleaseNotes // flags | Single_Target diff --git a/docs-builder.sln b/docs-builder.sln index 03dbe45c6..d5d61dbb1 100644 --- a/docs-builder.sln +++ b/docs-builder.sln @@ -20,7 +20,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BE6011CC-120 src\Directory.Build.props = src\Directory.Build.props EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "docs-builder", "src\docs-builder\docs-builder.csproj", "{01F05AD0-E0E0-401F-A7EC-905928E1E9F0}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "docs-builder", "src\tooling\docs-builder\docs-builder.csproj", "{01F05AD0-E0E0-401F-A7EC-905928E1E9F0}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = ".github", ".github\.github.csproj", "{1A8659C1-222A-4824-B562-ED8F88658C05}" EndProject @@ -43,18 +43,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "publish-vercel", "publish-v EndProject Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "build", "build\build.fsproj", "{10857974-6CF1-42B5-B793-AAA988BD7348}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "docs-assembler", "src\docs-assembler\docs-assembler.csproj", "{28350800-B44B-479B-86E2-1D39E321C0B4}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "docs-assembler", "src\tooling\docs-assembler\docs-assembler.csproj", "{28350800-B44B-479B-86E2-1D39E321C0B4}" EndProject Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "authoring", "tests\authoring\authoring.fsproj", "{018F959E-824B-4664-B345-066784478D24}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.Markdown.Refactor", "src\Elastic.Markdown.Refactor\Elastic.Markdown.Refactor.csproj", "{7D36DDDA-9E0B-4D2C-8033-5D62FF8B6166}" +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("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assembler", "assembler", "{CFEE9FAD-9E0C-4C0E-A0C2-B97D594C14B5}" ProjectSection(SolutionItems) = preProject actions\assembler\action.yml = actions\assembler\action.yml EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.Documentation.Tooling", "src\Elastic.Documentation.Tooling\Elastic.Documentation.Tooling.csproj", "{4CCE599A-B9FE-4DF2-8763-34CF0A99D4AA}" +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 @@ -78,10 +78,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "validate-path-prefixes-loca actions\validate-path-prefixes-local\action.yml = actions\validate-path-prefixes-local\action.yml EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.Documentation", "Elastic.Documentation\Elastic.Documentation.csproj", "{09CE30F6-013A-49ED-B3D6-60AFA84682AC}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.Documentation", "src\Elastic.Documentation\Elastic.Documentation.csproj", "{09CE30F6-013A-49ED-B3D6-60AFA84682AC}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.Documentation.Configuration", "src\Elastic.Documentation.Configuration\Elastic.Documentation.Configuration.csproj", "{CD94F9E4-7FCD-4152-81F1-4288C6B75367}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tooling", "tooling", "{73ABAE37-118F-4A53-BC2C-F19333555C90}" + ProjectSection(SolutionItems) = preProject + src\tooling\Directory.Build.props = src\tooling\Directory.Build.props + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "authoring", "authoring", "{059E787F-85C1-43BE-9DD6-CE319E106383}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -146,15 +153,11 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {4D198E25-C211-41DC-9E84-B15E89BD7048} = {BE6011CC-1200-4957-B01F-FCCA10C5CF5A} - {01F05AD0-E0E0-401F-A7EC-905928E1E9F0} = {BE6011CC-1200-4957-B01F-FCCA10C5CF5A} {B27C5107-128B-465A-B8F8-8985399E4CFB} = {67B576EE-02FA-4F9B-94BC-3630BC09ECE5} {CD2887E3-BDA9-434B-A5BF-9ED38DE20332} = {245023D2-D3CA-47B9-831D-DAB91A2FFDC7} {A2A34BBC-CB5E-4100-9529-A12B6ECB769C} = {245023D2-D3CA-47B9-831D-DAB91A2FFDC7} - {28350800-B44B-479B-86E2-1D39E321C0B4} = {BE6011CC-1200-4957-B01F-FCCA10C5CF5A} {018F959E-824B-4664-B345-066784478D24} = {67B576EE-02FA-4F9B-94BC-3630BC09ECE5} - {7D36DDDA-9E0B-4D2C-8033-5D62FF8B6166} = {BE6011CC-1200-4957-B01F-FCCA10C5CF5A} {CFEE9FAD-9E0C-4C0E-A0C2-B97D594C14B5} = {245023D2-D3CA-47B9-831D-DAB91A2FFDC7} - {4CCE599A-B9FE-4DF2-8763-34CF0A99D4AA} = {BE6011CC-1200-4957-B01F-FCCA10C5CF5A} {6E2ED6CC-AFC1-4E58-965D-6AEC500EBB46} = {245023D2-D3CA-47B9-831D-DAB91A2FFDC7} {6554F917-73CE-4B3D-9101-F28EAA762C6B} = {245023D2-D3CA-47B9-831D-DAB91A2FFDC7} {CDC0ECF4-6597-4FBA-8D25-5C244F0877E3} = {67B576EE-02FA-4F9B-94BC-3630BC09ECE5} @@ -163,5 +166,11 @@ Global {BB789671-B262-43DD-91DB-39F9186B8257} = {245023D2-D3CA-47B9-831D-DAB91A2FFDC7} {09CE30F6-013A-49ED-B3D6-60AFA84682AC} = {BE6011CC-1200-4957-B01F-FCCA10C5CF5A} {CD94F9E4-7FCD-4152-81F1-4288C6B75367} = {BE6011CC-1200-4957-B01F-FCCA10C5CF5A} + {73ABAE37-118F-4A53-BC2C-F19333555C90} = {BE6011CC-1200-4957-B01F-FCCA10C5CF5A} + {28350800-B44B-479B-86E2-1D39E321C0B4} = {73ABAE37-118F-4A53-BC2C-F19333555C90} + {01F05AD0-E0E0-401F-A7EC-905928E1E9F0} = {73ABAE37-118F-4A53-BC2C-F19333555C90} + {4CCE599A-B9FE-4DF2-8763-34CF0A99D4AA} = {73ABAE37-118F-4A53-BC2C-F19333555C90} + {059E787F-85C1-43BE-9DD6-CE319E106383} = {BE6011CC-1200-4957-B01F-FCCA10C5CF5A} + {7D36DDDA-9E0B-4D2C-8033-5D62FF8B6166} = {059E787F-85C1-43BE-9DD6-CE319E106383} EndGlobalSection EndGlobal diff --git a/docs/configure/site/index.md b/docs/configure/site/index.md index 1b7240194..b20e5af7f 100644 --- a/docs/configure/site/index.md +++ b/docs/configure/site/index.md @@ -22,8 +22,8 @@ TBD In both the AsciiDoctor- and V3-based system, there is site-wide configuration where you list all content sources, where to find those sources, and in what order they should be added to the site. In the AsciiDoctor system, this all happens in one YAML file in the `/docs` repo. In the V3 system: -* Content configuration happens in the [`assembler.yml`](https://github.com/elastic/docs-builder/blob/main/src/docs-assembler/assembler.yml) file in `docs-builder`. -* Navigation configuration happens in the [`navigation.yml`](https://github.com/elastic/docs-builder/blob/main/src/docs-assembler/navigation.yml) file in `docs-builder`. +* Content configuration happens in the [`assembler.yml`](https://github.com/elastic/docs-builder/blob/main/src/tooling/docs-assembler/assembler.yml) file in `docs-builder`. +* Navigation configuration happens in the [`navigation.yml`](https://github.com/elastic/docs-builder/blob/main/src/tooling/docs-assembler/navigation.yml) file in `docs-builder`. [assembler.yml](./content.md) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 2a24b118b..44c6f4409 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -10,11 +10,4 @@ true - - - - - - - \ No newline at end of file diff --git a/src/Elastic.Documentation.Configuration/Elastic.Documentation.Configuration.csproj b/src/Elastic.Documentation.Configuration/Elastic.Documentation.Configuration.csproj index 6697a2d71..2eb80e658 100644 --- a/src/Elastic.Documentation.Configuration/Elastic.Documentation.Configuration.csproj +++ b/src/Elastic.Documentation.Configuration/Elastic.Documentation.Configuration.csproj @@ -7,7 +7,7 @@ - + diff --git a/Elastic.Documentation/ContentSourceMoniker.cs b/src/Elastic.Documentation/ContentSourceMoniker.cs similarity index 100% rename from Elastic.Documentation/ContentSourceMoniker.cs rename to src/Elastic.Documentation/ContentSourceMoniker.cs diff --git a/Elastic.Documentation/Diagnostics/Diagnostic.cs b/src/Elastic.Documentation/Diagnostics/Diagnostic.cs similarity index 100% rename from Elastic.Documentation/Diagnostics/Diagnostic.cs rename to src/Elastic.Documentation/Diagnostics/Diagnostic.cs diff --git a/Elastic.Documentation/Diagnostics/DiagnosticsChannel.cs b/src/Elastic.Documentation/Diagnostics/DiagnosticsChannel.cs similarity index 100% rename from Elastic.Documentation/Diagnostics/DiagnosticsChannel.cs rename to src/Elastic.Documentation/Diagnostics/DiagnosticsChannel.cs diff --git a/Elastic.Documentation/Diagnostics/DiagnosticsCollector.cs b/src/Elastic.Documentation/Diagnostics/DiagnosticsCollector.cs similarity index 100% rename from Elastic.Documentation/Diagnostics/DiagnosticsCollector.cs rename to src/Elastic.Documentation/Diagnostics/DiagnosticsCollector.cs diff --git a/Elastic.Documentation/Diagnostics/Severity.cs b/src/Elastic.Documentation/Diagnostics/Severity.cs similarity index 100% rename from Elastic.Documentation/Diagnostics/Severity.cs rename to src/Elastic.Documentation/Diagnostics/Severity.cs diff --git a/Elastic.Documentation/Elastic.Documentation.csproj b/src/Elastic.Documentation/Elastic.Documentation.csproj similarity index 100% rename from Elastic.Documentation/Elastic.Documentation.csproj rename to src/Elastic.Documentation/Elastic.Documentation.csproj diff --git a/Elastic.Documentation/GitCheckoutInformation.cs b/src/Elastic.Documentation/GitCheckoutInformation.cs similarity index 100% rename from Elastic.Documentation/GitCheckoutInformation.cs rename to src/Elastic.Documentation/GitCheckoutInformation.cs diff --git a/Elastic.Documentation/IDocumentationContext.cs b/src/Elastic.Documentation/IDocumentationContext.cs similarity index 100% rename from Elastic.Documentation/IDocumentationContext.cs rename to src/Elastic.Documentation/IDocumentationContext.cs diff --git a/Elastic.Documentation/Legacy/ILegacyUrlMapper.cs b/src/Elastic.Documentation/Legacy/ILegacyUrlMapper.cs similarity index 100% rename from Elastic.Documentation/Legacy/ILegacyUrlMapper.cs rename to src/Elastic.Documentation/Legacy/ILegacyUrlMapper.cs diff --git a/Elastic.Documentation/Links/LinkReference.cs b/src/Elastic.Documentation/Links/LinkReference.cs similarity index 100% rename from Elastic.Documentation/Links/LinkReference.cs rename to src/Elastic.Documentation/Links/LinkReference.cs diff --git a/Elastic.Documentation/Links/LinkReferenceRegistry.cs b/src/Elastic.Documentation/Links/LinkReferenceRegistry.cs similarity index 100% rename from Elastic.Documentation/Links/LinkReferenceRegistry.cs rename to src/Elastic.Documentation/Links/LinkReferenceRegistry.cs diff --git a/Elastic.Documentation/Navigation/ITableOfContentsScope.cs b/src/Elastic.Documentation/Navigation/ITableOfContentsScope.cs similarity index 100% rename from Elastic.Documentation/Navigation/ITableOfContentsScope.cs rename to src/Elastic.Documentation/Navigation/ITableOfContentsScope.cs diff --git a/Elastic.Documentation/Serialization/SourceGenerationContext.cs b/src/Elastic.Documentation/Serialization/SourceGenerationContext.cs similarity index 100% rename from Elastic.Documentation/Serialization/SourceGenerationContext.cs rename to src/Elastic.Documentation/Serialization/SourceGenerationContext.cs diff --git a/Elastic.Documentation/State/GenerationState.cs b/src/Elastic.Documentation/State/GenerationState.cs similarity index 100% rename from Elastic.Documentation/State/GenerationState.cs rename to src/Elastic.Documentation/State/GenerationState.cs diff --git a/src/Elastic.Markdown/Elastic.Markdown.csproj b/src/Elastic.Markdown/Elastic.Markdown.csproj index 32cd22044..f4e330173 100644 --- a/src/Elastic.Markdown/Elastic.Markdown.csproj +++ b/src/Elastic.Markdown/Elastic.Markdown.csproj @@ -64,7 +64,7 @@ - + diff --git a/src/Elastic.Markdown.Refactor/Elastic.Markdown.Refactor.csproj b/src/authoring/Elastic.Documentation.Refactor/Elastic.Documentation.Refactor.csproj similarity index 80% rename from src/Elastic.Markdown.Refactor/Elastic.Markdown.Refactor.csproj rename to src/authoring/Elastic.Documentation.Refactor/Elastic.Documentation.Refactor.csproj index d49cdd08e..d516d72ff 100644 --- a/src/Elastic.Markdown.Refactor/Elastic.Markdown.Refactor.csproj +++ b/src/authoring/Elastic.Documentation.Refactor/Elastic.Documentation.Refactor.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/Elastic.Markdown.Refactor/Move.cs b/src/authoring/Elastic.Documentation.Refactor/Move.cs similarity index 99% rename from src/Elastic.Markdown.Refactor/Move.cs rename to src/authoring/Elastic.Documentation.Refactor/Move.cs index 71af0dff3..1d6ff9bd3 100644 --- a/src/Elastic.Markdown.Refactor/Move.cs +++ b/src/authoring/Elastic.Documentation.Refactor/Move.cs @@ -9,7 +9,7 @@ using Microsoft.Extensions.Logging; using static System.StringComparison; -namespace Elastic.Markdown.Refactor; +namespace Elastic.Documentation.Refactor; public record ChangeSet(IFileInfo From, IFileInfo To); public record Change(IFileInfo Source, string OriginalContent, string NewContent); diff --git a/src/infra/docs-lambda-index-publisher/docs-lambda-index-publisher.csproj b/src/infra/docs-lambda-index-publisher/docs-lambda-index-publisher.csproj index a104f5e5d..ef852db7b 100644 --- a/src/infra/docs-lambda-index-publisher/docs-lambda-index-publisher.csproj +++ b/src/infra/docs-lambda-index-publisher/docs-lambda-index-publisher.csproj @@ -28,6 +28,6 @@ - + diff --git a/src/tooling/Directory.Build.props b/src/tooling/Directory.Build.props new file mode 100644 index 000000000..56df938ef --- /dev/null +++ b/src/tooling/Directory.Build.props @@ -0,0 +1,20 @@ + + + + + + all + low + true + + + true + + + + + + + + + \ No newline at end of file diff --git a/src/Elastic.Documentation.Tooling/Diagnostics/Console/ConsoleDiagnosticsCollector.cs b/src/tooling/Elastic.Documentation.Tooling/Diagnostics/Console/ConsoleDiagnosticsCollector.cs similarity index 100% rename from src/Elastic.Documentation.Tooling/Diagnostics/Console/ConsoleDiagnosticsCollector.cs rename to src/tooling/Elastic.Documentation.Tooling/Diagnostics/Console/ConsoleDiagnosticsCollector.cs diff --git a/src/Elastic.Documentation.Tooling/Diagnostics/Console/ErrataFileSourceRepository.cs b/src/tooling/Elastic.Documentation.Tooling/Diagnostics/Console/ErrataFileSourceRepository.cs similarity index 100% rename from src/Elastic.Documentation.Tooling/Diagnostics/Console/ErrataFileSourceRepository.cs rename to src/tooling/Elastic.Documentation.Tooling/Diagnostics/Console/ErrataFileSourceRepository.cs diff --git a/src/Elastic.Documentation.Tooling/Diagnostics/Console/GithubAnnotationOutput.cs b/src/tooling/Elastic.Documentation.Tooling/Diagnostics/Console/GithubAnnotationOutput.cs similarity index 100% rename from src/Elastic.Documentation.Tooling/Diagnostics/Console/GithubAnnotationOutput.cs rename to src/tooling/Elastic.Documentation.Tooling/Diagnostics/Console/GithubAnnotationOutput.cs diff --git a/src/Elastic.Documentation.Tooling/Diagnostics/Log.cs b/src/tooling/Elastic.Documentation.Tooling/Diagnostics/Log.cs similarity index 100% rename from src/Elastic.Documentation.Tooling/Diagnostics/Log.cs rename to src/tooling/Elastic.Documentation.Tooling/Diagnostics/Log.cs diff --git a/src/Elastic.Documentation.Tooling/DocumentationTooling.cs b/src/tooling/Elastic.Documentation.Tooling/DocumentationTooling.cs similarity index 100% rename from src/Elastic.Documentation.Tooling/DocumentationTooling.cs rename to src/tooling/Elastic.Documentation.Tooling/DocumentationTooling.cs diff --git a/src/Elastic.Documentation.Tooling/Elastic.Documentation.Tooling.csproj b/src/tooling/Elastic.Documentation.Tooling/Elastic.Documentation.Tooling.csproj similarity index 88% rename from src/Elastic.Documentation.Tooling/Elastic.Documentation.Tooling.csproj rename to src/tooling/Elastic.Documentation.Tooling/Elastic.Documentation.Tooling.csproj index 85e858764..52cc0b08e 100644 --- a/src/Elastic.Documentation.Tooling/Elastic.Documentation.Tooling.csproj +++ b/src/tooling/Elastic.Documentation.Tooling/Elastic.Documentation.Tooling.csproj @@ -16,7 +16,7 @@ - + diff --git a/src/Elastic.Documentation.Tooling/Filters/CatchExceptionFilter.cs b/src/tooling/Elastic.Documentation.Tooling/Filters/CatchExceptionFilter.cs similarity index 100% rename from src/Elastic.Documentation.Tooling/Filters/CatchExceptionFilter.cs rename to src/tooling/Elastic.Documentation.Tooling/Filters/CatchExceptionFilter.cs diff --git a/src/Elastic.Documentation.Tooling/Filters/StopwatchFilter.cs b/src/tooling/Elastic.Documentation.Tooling/Filters/StopwatchFilter.cs similarity index 100% rename from src/Elastic.Documentation.Tooling/Filters/StopwatchFilter.cs rename to src/tooling/Elastic.Documentation.Tooling/Filters/StopwatchFilter.cs diff --git a/src/Elastic.Documentation.Tooling/Logging/CondensedConsoleLogger.cs b/src/tooling/Elastic.Documentation.Tooling/Logging/CondensedConsoleLogger.cs similarity index 100% rename from src/Elastic.Documentation.Tooling/Logging/CondensedConsoleLogger.cs rename to src/tooling/Elastic.Documentation.Tooling/Logging/CondensedConsoleLogger.cs diff --git a/src/Elastic.Documentation.Tooling/README.md b/src/tooling/Elastic.Documentation.Tooling/README.md similarity index 100% rename from src/Elastic.Documentation.Tooling/README.md rename to src/tooling/Elastic.Documentation.Tooling/README.md diff --git a/src/docs-assembler/AssembleContext.cs b/src/tooling/docs-assembler/AssembleContext.cs similarity index 94% rename from src/docs-assembler/AssembleContext.cs rename to src/tooling/docs-assembler/AssembleContext.cs index 8f8402001..be7b47657 100644 --- a/src/docs-assembler/AssembleContext.cs +++ b/src/tooling/docs-assembler/AssembleContext.cs @@ -49,7 +49,7 @@ public AssembleContext( ReadFileSystem = readFileSystem; WriteFileSystem = writeFileSystem; - var configPath = Path.Combine(Paths.WorkingDirectoryRoot.FullName, "src", "docs-assembler", "assembler.yml"); + var configPath = Path.Combine(Paths.WorkingDirectoryRoot.FullName, "src", "tooling", "docs-assembler", "assembler.yml"); // temporarily fallback to embedded assembler.yml // This will live in docs-content soon if (!ReadFileSystem.File.Exists(configPath)) @@ -57,12 +57,12 @@ public AssembleContext( ConfigurationPath = ReadFileSystem.FileInfo.New(configPath); Configuration = AssemblyConfiguration.Deserialize(ReadFileSystem.File.ReadAllText(ConfigurationPath.FullName)); - var navigationPath = Path.Combine(Paths.WorkingDirectoryRoot.FullName, "src", "docs-assembler", "navigation.yml"); + var navigationPath = Path.Combine(Paths.WorkingDirectoryRoot.FullName, "src", "tooling", "docs-assembler", "navigation.yml"); if (!ReadFileSystem.File.Exists(navigationPath)) ExtractAssemblerConfiguration(navigationPath, "navigation.yml"); NavigationPath = ReadFileSystem.FileInfo.New(navigationPath); - var historyMappingPath = Path.Combine(Paths.WorkingDirectoryRoot.FullName, "src", "docs-assembler", "legacy-url-mappings.yml"); + var historyMappingPath = Path.Combine(Paths.WorkingDirectoryRoot.FullName, "src", "tooling", "docs-assembler", "legacy-url-mappings.yml"); if (!ReadFileSystem.File.Exists(historyMappingPath)) ExtractAssemblerConfiguration(historyMappingPath, "legacy-url-mappings.yml"); HistoryMappingPath = ReadFileSystem.FileInfo.New(historyMappingPath); diff --git a/src/docs-assembler/AssembleSources.cs b/src/tooling/docs-assembler/AssembleSources.cs similarity index 100% rename from src/docs-assembler/AssembleSources.cs rename to src/tooling/docs-assembler/AssembleSources.cs diff --git a/src/docs-assembler/Building/AssemblerBuilder.cs b/src/tooling/docs-assembler/Building/AssemblerBuilder.cs similarity index 100% rename from src/docs-assembler/Building/AssemblerBuilder.cs rename to src/tooling/docs-assembler/Building/AssemblerBuilder.cs diff --git a/src/docs-assembler/Building/AssemblerCrossLinkFetcher.cs b/src/tooling/docs-assembler/Building/AssemblerCrossLinkFetcher.cs similarity index 100% rename from src/docs-assembler/Building/AssemblerCrossLinkFetcher.cs rename to src/tooling/docs-assembler/Building/AssemblerCrossLinkFetcher.cs diff --git a/src/docs-assembler/Building/PublishEnvironmentUriResolver.cs b/src/tooling/docs-assembler/Building/PublishEnvironmentUriResolver.cs similarity index 100% rename from src/docs-assembler/Building/PublishEnvironmentUriResolver.cs rename to src/tooling/docs-assembler/Building/PublishEnvironmentUriResolver.cs diff --git a/src/docs-assembler/Building/SitemapBuilder.cs b/src/tooling/docs-assembler/Building/SitemapBuilder.cs similarity index 100% rename from src/docs-assembler/Building/SitemapBuilder.cs rename to src/tooling/docs-assembler/Building/SitemapBuilder.cs diff --git a/src/docs-assembler/Cli/InboundLinkCommands.cs b/src/tooling/docs-assembler/Cli/InboundLinkCommands.cs similarity index 100% rename from src/docs-assembler/Cli/InboundLinkCommands.cs rename to src/tooling/docs-assembler/Cli/InboundLinkCommands.cs diff --git a/src/docs-assembler/Cli/NavigationCommands.cs b/src/tooling/docs-assembler/Cli/NavigationCommands.cs similarity index 100% rename from src/docs-assembler/Cli/NavigationCommands.cs rename to src/tooling/docs-assembler/Cli/NavigationCommands.cs diff --git a/src/docs-assembler/Cli/RepositoryCommands.cs b/src/tooling/docs-assembler/Cli/RepositoryCommands.cs similarity index 100% rename from src/docs-assembler/Cli/RepositoryCommands.cs rename to src/tooling/docs-assembler/Cli/RepositoryCommands.cs diff --git a/src/docs-assembler/Extensions/SpanExtensions.cs b/src/tooling/docs-assembler/Extensions/SpanExtensions.cs similarity index 100% rename from src/docs-assembler/Extensions/SpanExtensions.cs rename to src/tooling/docs-assembler/Extensions/SpanExtensions.cs diff --git a/src/docs-assembler/Legacy/PageLegacyUrlMapper.cs b/src/tooling/docs-assembler/Legacy/PageLegacyUrlMapper.cs similarity index 100% rename from src/docs-assembler/Legacy/PageLegacyUrlMapper.cs rename to src/tooling/docs-assembler/Legacy/PageLegacyUrlMapper.cs diff --git a/src/docs-assembler/Links/NavigationPrefixChecker.cs b/src/tooling/docs-assembler/Links/NavigationPrefixChecker.cs similarity index 100% rename from src/docs-assembler/Links/NavigationPrefixChecker.cs rename to src/tooling/docs-assembler/Links/NavigationPrefixChecker.cs diff --git a/src/docs-assembler/Navigation/AssemblerDocumentationSet.cs b/src/tooling/docs-assembler/Navigation/AssemblerDocumentationSet.cs similarity index 100% rename from src/docs-assembler/Navigation/AssemblerDocumentationSet.cs rename to src/tooling/docs-assembler/Navigation/AssemblerDocumentationSet.cs diff --git a/src/docs-assembler/Navigation/GlobalNavigation.cs b/src/tooling/docs-assembler/Navigation/GlobalNavigation.cs similarity index 100% rename from src/docs-assembler/Navigation/GlobalNavigation.cs rename to src/tooling/docs-assembler/Navigation/GlobalNavigation.cs diff --git a/src/docs-assembler/Navigation/GlobalNavigationFile.cs b/src/tooling/docs-assembler/Navigation/GlobalNavigationFile.cs similarity index 100% rename from src/docs-assembler/Navigation/GlobalNavigationFile.cs rename to src/tooling/docs-assembler/Navigation/GlobalNavigationFile.cs diff --git a/src/docs-assembler/Navigation/GlobalNavigationHtmlWriter.cs b/src/tooling/docs-assembler/Navigation/GlobalNavigationHtmlWriter.cs similarity index 100% rename from src/docs-assembler/Navigation/GlobalNavigationHtmlWriter.cs rename to src/tooling/docs-assembler/Navigation/GlobalNavigationHtmlWriter.cs diff --git a/src/docs-assembler/Navigation/GlobalNavigationPathProvider.cs b/src/tooling/docs-assembler/Navigation/GlobalNavigationPathProvider.cs similarity index 100% rename from src/docs-assembler/Navigation/GlobalNavigationPathProvider.cs rename to src/tooling/docs-assembler/Navigation/GlobalNavigationPathProvider.cs diff --git a/src/docs-assembler/Program.cs b/src/tooling/docs-assembler/Program.cs similarity index 100% rename from src/docs-assembler/Program.cs rename to src/tooling/docs-assembler/Program.cs diff --git a/src/docs-assembler/Sourcing/Checkout.cs b/src/tooling/docs-assembler/Sourcing/Checkout.cs similarity index 100% rename from src/docs-assembler/Sourcing/Checkout.cs rename to src/tooling/docs-assembler/Sourcing/Checkout.cs diff --git a/src/docs-assembler/Sourcing/RepositorySourcesFetcher.cs b/src/tooling/docs-assembler/Sourcing/RepositorySourcesFetcher.cs similarity index 100% rename from src/docs-assembler/Sourcing/RepositorySourcesFetcher.cs rename to src/tooling/docs-assembler/Sourcing/RepositorySourcesFetcher.cs diff --git a/src/docs-assembler/assembler.yml b/src/tooling/docs-assembler/assembler.yml similarity index 100% rename from src/docs-assembler/assembler.yml rename to src/tooling/docs-assembler/assembler.yml diff --git a/src/docs-assembler/docs-assembler.csproj b/src/tooling/docs-assembler/docs-assembler.csproj similarity index 94% rename from src/docs-assembler/docs-assembler.csproj rename to src/tooling/docs-assembler/docs-assembler.csproj index 0f7bc6138..cfed86523 100644 --- a/src/docs-assembler/docs-assembler.csproj +++ b/src/tooling/docs-assembler/docs-assembler.csproj @@ -27,8 +27,8 @@ + - diff --git a/src/docs-assembler/legacy-url-mappings.yml b/src/tooling/docs-assembler/legacy-url-mappings.yml similarity index 100% rename from src/docs-assembler/legacy-url-mappings.yml rename to src/tooling/docs-assembler/legacy-url-mappings.yml diff --git a/src/docs-assembler/navigation.yml b/src/tooling/docs-assembler/navigation.yml similarity index 100% rename from src/docs-assembler/navigation.yml rename to src/tooling/docs-assembler/navigation.yml diff --git a/src/docs-builder/Cli/CheckForUpdatesFilter.cs b/src/tooling/docs-builder/Cli/CheckForUpdatesFilter.cs similarity index 100% rename from src/docs-builder/Cli/CheckForUpdatesFilter.cs rename to src/tooling/docs-builder/Cli/CheckForUpdatesFilter.cs diff --git a/src/docs-builder/Cli/Commands.cs b/src/tooling/docs-builder/Cli/Commands.cs similarity index 99% rename from src/docs-builder/Cli/Commands.cs rename to src/tooling/docs-builder/Cli/Commands.cs index 5893e8017..f567a2a1a 100644 --- a/src/docs-builder/Cli/Commands.cs +++ b/src/tooling/docs-builder/Cli/Commands.cs @@ -7,12 +7,12 @@ using Actions.Core.Services; using ConsoleAppFramework; using Documentation.Builder.Http; +using Elastic.Documentation.Refactor; using Elastic.Documentation.Tooling.Diagnostics.Console; using Elastic.Documentation.Tooling.Filters; using Elastic.Markdown; using Elastic.Markdown.Exporters; using Elastic.Markdown.IO; -using Elastic.Markdown.Refactor; using Microsoft.Extensions.Logging; namespace Documentation.Builder.Cli; diff --git a/src/docs-builder/Cli/InboundLinkCommands.cs b/src/tooling/docs-builder/Cli/InboundLinkCommands.cs similarity index 100% rename from src/docs-builder/Cli/InboundLinkCommands.cs rename to src/tooling/docs-builder/Cli/InboundLinkCommands.cs diff --git a/src/docs-builder/Diagnostics/LiveMode/LiveModeDiagnosticsCollector.cs b/src/tooling/docs-builder/Diagnostics/LiveMode/LiveModeDiagnosticsCollector.cs similarity index 100% rename from src/docs-builder/Diagnostics/LiveMode/LiveModeDiagnosticsCollector.cs rename to src/tooling/docs-builder/Diagnostics/LiveMode/LiveModeDiagnosticsCollector.cs diff --git a/src/docs-builder/Http/DocumentationWebHost.cs b/src/tooling/docs-builder/Http/DocumentationWebHost.cs similarity index 100% rename from src/docs-builder/Http/DocumentationWebHost.cs rename to src/tooling/docs-builder/Http/DocumentationWebHost.cs diff --git a/src/docs-builder/Http/LiveReload.cs b/src/tooling/docs-builder/Http/LiveReload.cs similarity index 100% rename from src/docs-builder/Http/LiveReload.cs rename to src/tooling/docs-builder/Http/LiveReload.cs diff --git a/src/docs-builder/Http/ParcelWatchService.cs b/src/tooling/docs-builder/Http/ParcelWatchService.cs similarity index 100% rename from src/docs-builder/Http/ParcelWatchService.cs rename to src/tooling/docs-builder/Http/ParcelWatchService.cs diff --git a/src/docs-builder/Http/ReloadGeneratorService.cs b/src/tooling/docs-builder/Http/ReloadGeneratorService.cs similarity index 100% rename from src/docs-builder/Http/ReloadGeneratorService.cs rename to src/tooling/docs-builder/Http/ReloadGeneratorService.cs diff --git a/src/docs-builder/Http/ReloadableGeneratorState.cs b/src/tooling/docs-builder/Http/ReloadableGeneratorState.cs similarity index 100% rename from src/docs-builder/Http/ReloadableGeneratorState.cs rename to src/tooling/docs-builder/Http/ReloadableGeneratorState.cs diff --git a/src/docs-builder/Http/StaticWebHost.cs b/src/tooling/docs-builder/Http/StaticWebHost.cs similarity index 100% rename from src/docs-builder/Http/StaticWebHost.cs rename to src/tooling/docs-builder/Http/StaticWebHost.cs diff --git a/src/docs-builder/Program.cs b/src/tooling/docs-builder/Program.cs similarity index 100% rename from src/docs-builder/Program.cs rename to src/tooling/docs-builder/Program.cs diff --git a/src/docs-builder/docs-builder.csproj b/src/tooling/docs-builder/docs-builder.csproj similarity index 85% rename from src/docs-builder/docs-builder.csproj rename to src/tooling/docs-builder/docs-builder.csproj index 6128b6c5e..414bdfdae 100644 --- a/src/docs-builder/docs-builder.csproj +++ b/src/tooling/docs-builder/docs-builder.csproj @@ -26,7 +26,7 @@ - - + + diff --git a/tests/Elastic.Markdown.Tests/Elastic.Markdown.Tests.csproj b/tests/Elastic.Markdown.Tests/Elastic.Markdown.Tests.csproj index 7898e0615..1f21189a5 100644 --- a/tests/Elastic.Markdown.Tests/Elastic.Markdown.Tests.csproj +++ b/tests/Elastic.Markdown.Tests/Elastic.Markdown.Tests.csproj @@ -25,7 +25,7 @@ - + diff --git a/tests/Elastic.Markdown.Tests/Mover/MoverTests.cs b/tests/Elastic.Markdown.Tests/Mover/MoverTests.cs index a2af9f44c..cc8711e12 100644 --- a/tests/Elastic.Markdown.Tests/Mover/MoverTests.cs +++ b/tests/Elastic.Markdown.Tests/Mover/MoverTests.cs @@ -2,7 +2,7 @@ // Elasticsearch B.V licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information -using Elastic.Markdown.Refactor; +using Elastic.Documentation.Refactor; using Elastic.Markdown.Tests.DocSet; using FluentAssertions; diff --git a/tests/docs-assembler.Tests/src/docs-assembler.Tests/docs-assembler.Tests.csproj b/tests/docs-assembler.Tests/src/docs-assembler.Tests/docs-assembler.Tests.csproj index e1e544dc3..557acbb99 100644 --- a/tests/docs-assembler.Tests/src/docs-assembler.Tests/docs-assembler.Tests.csproj +++ b/tests/docs-assembler.Tests/src/docs-assembler.Tests/docs-assembler.Tests.csproj @@ -31,6 +31,6 @@ - + \ No newline at end of file