Regroup projects in solution by type

.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

.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'))

.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 }}

build/CommandLine.fs

@@ -28,7 +28,6 @@ type Build =
     | [<CliPrefix(CliPrefix.None);Hidden;SubCommand>] PublishContainers
     | [<CliPrefix(CliPrefix.None);Hidden;SubCommand>] PublishZip
 
-    | [<CliPrefix(CliPrefix.None);SubCommand>] ReleaseNotes
     | [<CliPrefix(CliPrefix.None);SubCommand>] Release
 
     | [<Inherit;AltCommandLine("-s")>] 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"

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<Build>) =
     | _ -> 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<Build>) =
-    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<Build>) =
     let wireCommandLine (t: Build) =
         match t with
@@ -159,7 +137,7 @@ let Setup (parsed:ParseResults<Build>) =
         | Release ->
             Build.Cmd 
                 [PristineCheck; Build]
-                [ValidateLicenses; ReleaseNotes]
+                [ValidateLicenses;]
                 release
 
         | Publish ->
@@ -178,7 +156,6 @@ let Setup (parsed:ParseResults<Build>) =
         | PublishContainers -> Build.Step publishContainers
         | PublishZip -> Build.Step publishZip
         | ValidateLicenses -> Build.Step validateLicenses
-        | ReleaseNotes -> Build.Step generateReleaseNotes
 
         // flags
         | Single_Target

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

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)
 

src/Directory.Build.props

@@ -10,11 +10,4 @@
     <!-- TODO ENABLE to document our code properly <GenerateDocumentationFile>true</GenerateDocumentationFile> -->
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
   </PropertyGroup>
-
-  <ItemGroup>
-    <Content Include="$(SolutionRoot)\build\nuget-icon.png" Pack="True" Link="nuget-icon.png" PackagePath="nuget-icon.png" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="$(SolutionRoot)\LICENSE.txt" Pack="True" PackagePath="LICENSE.txt" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" />
-    <Content Include="$(SolutionRoot)\NOTICE.txt" Pack="True" PackagePath="NOTICE.txt" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest"/>
-  </ItemGroup>
-
 </Project>

src/Elastic.Documentation.Configuration/Elastic.Documentation.Configuration.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Elastic.Documentation\Elastic.Documentation.csproj"/>
+    <ProjectReference Include="..\Elastic.Documentation\Elastic.Documentation.csproj"/>
   </ItemGroup>
 
   <ItemGroup>

src/Elastic.Markdown/Elastic.Markdown.csproj

@@ -64,7 +64,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Elastic.Documentation\Elastic.Documentation.csproj" />
+    <ProjectReference Include="..\Elastic.Documentation\Elastic.Documentation.csproj" />
     <ProjectReference Include="..\Elastic.Documentation.Configuration\Elastic.Documentation.Configuration.csproj" />
   </ItemGroup>
 

src/Elastic.Markdown.Refactor/Elastic.Markdown.Refactor.csproj → src/authoring/Elastic.Documentation.Refactor/Elastic.Documentation.Refactor.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Elastic.Markdown\Elastic.Markdown.csproj"/>
+    <ProjectReference Include="..\..\Elastic.Markdown\Elastic.Markdown.csproj"/>
   </ItemGroup>
 
   <ItemGroup>

src/Elastic.Markdown.Refactor/Move.cs → 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);

src/infra/docs-lambda-index-publisher/docs-lambda-index-publisher.csproj

@@ -28,6 +28,6 @@
     <PackageReference Include="AWSSDK.SQS" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Elastic.Markdown\Elastic.Markdown.csproj"/>
+    <ProjectReference Include="..\..\Elastic.Documentation\Elastic.Documentation.csproj"/>
   </ItemGroup>
 </Project>

src/tooling/Directory.Build.props

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <!-- Src Directory Build Properties -->
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+  <PropertyGroup>
+    <NuGetAuditMode>all</NuGetAuditMode>
+    <NuGetAuditLevel>low</NuGetAuditLevel>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+
+    <!-- TODO ENABLE to document our code properly <GenerateDocumentationFile>true</GenerateDocumentationFile> -->
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(OutputType)' == 'Exe'">
+    <Content Include="$(SolutionRoot)\build\nuget-icon.png" Pack="True" Link="nuget-icon.png" PackagePath="nuget-icon.png" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="$(SolutionRoot)\LICENSE.txt" Pack="True" PackagePath="LICENSE.txt" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" />
+    <Content Include="$(SolutionRoot)\NOTICE.txt" Pack="True" PackagePath="NOTICE.txt" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest"/>
+  </ItemGroup>
+
+</Project>

src/Elastic.Documentation.Tooling/Elastic.Documentation.Tooling.csproj → src/tooling/Elastic.Documentation.Tooling/Elastic.Documentation.Tooling.csproj

@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Elastic.Markdown\Elastic.Markdown.csproj" />
+    <ProjectReference Include="..\..\Elastic.Markdown\Elastic.Markdown.csproj" />
   </ItemGroup>
 
 </Project>

src/docs-assembler/AssembleContext.cs → src/tooling/docs-assembler/AssembleContext.cs

@@ -49,20 +49,20 @@ 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))
 			ExtractAssemblerConfiguration(configPath, "assembler.yml");
 		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);

src/docs-assembler/docs-assembler.csproj → src/tooling/docs-assembler/docs-assembler.csproj

@@ -27,8 +27,8 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\Elastic.Documentation\Elastic.Documentation.csproj" />
+    <ProjectReference Include="..\..\Elastic.Markdown\Elastic.Markdown.csproj" />
     <ProjectReference Include="..\Elastic.Documentation.Tooling\Elastic.Documentation.Tooling.csproj" />
-    <ProjectReference Include="..\Elastic.Markdown\Elastic.Markdown.csproj" />
   </ItemGroup>
 
   <ItemGroup>

src/docs-builder/Cli/Commands.cs → 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;

src/docs-builder/docs-builder.csproj → src/tooling/docs-builder/docs-builder.csproj

@@ -26,7 +26,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Elastic.Documentation.Tooling\Elastic.Documentation.Tooling.csproj" />
-    <ProjectReference Include="..\Elastic.Markdown.Refactor\Elastic.Markdown.Refactor.csproj" />
-    <ProjectReference Include="..\Elastic.Markdown\Elastic.Markdown.csproj" />
+    <ProjectReference Include="..\..\authoring\Elastic.Documentation.Refactor\Elastic.Documentation.Refactor.csproj" />
+    <ProjectReference Include="..\..\Elastic.Markdown\Elastic.Markdown.csproj" />
   </ItemGroup>
 </Project>

tests/Elastic.Markdown.Tests/Elastic.Markdown.Tests.csproj

@@ -25,7 +25,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Elastic.Markdown.Refactor\Elastic.Markdown.Refactor.csproj" />
+    <ProjectReference Include="..\..\src\authoring\Elastic.Documentation.Refactor\Elastic.Documentation.Refactor.csproj" />
     <ProjectReference Include="..\..\src\Elastic.Markdown\Elastic.Markdown.csproj"/>
   </ItemGroup>
 

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;
 

tests/docs-assembler.Tests/src/docs-assembler.Tests/docs-assembler.Tests.csproj

@@ -31,6 +31,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\src\docs-assembler\docs-assembler.csproj" />
+    <ProjectReference Include="..\..\..\..\src\tooling\docs-assembler\docs-assembler.csproj" />
   </ItemGroup>
 </Project>