Update docs-assembler after merging with main.

Ensure namespaces are correct and docs-assembler is part of the build. It will now publish a container we can use as action later.

Author: Mpdreamz

build/Targets.fs

@@ -57,6 +57,7 @@ let private pristineCheck (arguments:ParseResults<Build>) =
 let private publishBinaries _ =
     exec { run "dotnet" "publish" "src/docs-builder/docs-builder.csproj" }
     exec { run "dotnet" "publish" "src/docs-generator/docs-generator.csproj" }
+    exec { run "dotnet" "publish" "src/docs-assembler/docs-assembler.csproj" }
     Zip.zip
         ".artifacts/publish/docs-builder/release"
         $"docs-builder-%s{OS.Name}-{OS.Arch}.zip"
@@ -103,6 +104,7 @@ let private publishContainers _ =
         exec { run "dotnet" (args @ registry) }
     createImage "docs-builder"
     createImage "docs-generator"
+    createImage "docs-assembler"
 
 let private runTests _ =
     exec {

src/docs-assembler/AssemblyConfiguration.cs

@@ -4,7 +4,7 @@
 
 using YamlDotNet.Serialization;
 
-namespace Documentation.Builder;
+namespace Documentation.Assembler;
 
 [YamlStaticContext]
 [YamlSerializable(typeof(AssemblyConfiguration))]

src/docs-assembler/Cli/ArgsFilter.cs

@@ -3,8 +3,8 @@
 using System.Collections.Concurrent;
 using System.Diagnostics;
 using ConsoleAppFramework;
+using Documentation.Assembler;
 using Documentation.Assembler.Cli;
-using Documentation.Builder;
 using Elastic.Markdown.IO;
 using ProcNet;
 using ProcNet.Std;
@@ -59,14 +59,13 @@ await Task.Run(() =>
 	{
 		var checkoutFolder = Path.Combine(assemblyPath, d.Name);
 
-		var consoleOut = new NoopConsoleLineHandler();
-		var capture = Proc.StartRedirected(
+		var capture = Proc.Start(
 			new StartArguments("git", "rev-parse", "--abbrev-ref", "HEAD")
 			{
 				WorkingDirectory = checkoutFolder
 			}
-			, consoleOut);
-		dictionary.Add(d.Name, consoleOut.Lines.FirstOrDefault()?.Line ?? "unknown");
+		);
+		dictionary.Add(d.Name, capture.ConsoleOut.FirstOrDefault()?.Line ?? "unknown");
 	}
 	foreach(var kv in dictionary.OrderBy(kv => kv.Value))
 		Console.WriteLine($"-> {kv.Key}\tbranch: {kv.Value}");
@@ -76,20 +75,14 @@ await Task.Run(() =>
 
 await app.RunAsync(args);
 
-public class ConsoleLineHandler(string prefix) : IConsoleLineHandler
+namespace Documentation.Assembler
 {
-	public void Handle(LineOut lineOut) => lineOut.CharsOrString(
-		r => Console.Write(prefix + ": " + r),
-		l => Console.WriteLine(prefix + ": " + l));
-
-	public void Handle(Exception e) {}
-}
-
-public class NoopConsoleLineHandler : IConsoleLineHandler
-{
-	public List<LineOut> Lines { get; } = new();
-
-	public void Handle(LineOut lineOut) => Lines.Add(lineOut);
+	public class ConsoleLineHandler(string prefix) : IConsoleLineHandler
+	{
+		public void Handle(LineOut lineOut) => lineOut.CharsOrString(
+			r => Console.Write(prefix + ": " + r),
+			l => Console.WriteLine(prefix + ": " + l));
 
-	public void Handle(Exception e) {}
+		public void Handle(Exception e) {}
+	}
 }

src/docs-assembler/Program.cs

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net9.0</TargetFramework>
     <OutputType>Exe</OutputType>
-    <AssemblyName>docs-builder</AssemblyName>
+    <AssemblyName>docs-assembler</AssemblyName>
     <RootNamespace>Documentation.Assembler</RootNamespace>
     <InvariantGlobalization>true</InvariantGlobalization>
 
@@ -20,7 +20,6 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Errata" Version="0.13.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0"/>
     <PackageReference Include="Github.Actions.Core" Version="9.0.0"/>
     <PackageReference Include="Proc" Version="0.9.1" />

src/docs-assembler/docs-assembler.csproj

@@ -6,16 +6,13 @@
     <AssemblyName>docs-generator</AssemblyName>
     <RootNamespace>Documentation.Generator</RootNamespace>
     <InvariantGlobalization>true</InvariantGlobalization>
+
     <PublishAot>false</PublishAot>
     <PublishSingleFile>true</PublishSingleFile>
     <SelfContained>true</SelfContained>
 
     <IsPublishable>true</IsPublishable>
     <EnableSdkContainerSupport>true</EnableSdkContainerSupport>
-
-    <!-- attempt fix for: https://github.com/dotnet/sdk-container-builds/issues/559
-        Fixed in upcomming .NET 9
-     -->
   </PropertyGroup>
 
   <ItemGroup>