refactor: tidyed up and replaced some missing usings

Author: kieronlanning

src/src/AspireC4/AspireC4.csproj

@@ -2,18 +2,18 @@
 	<PropertyGroup>
 		<IsPackable>true</IsPackable>
 		<AssemblyTitle>AspireC4 Hosting</AssemblyTitle>
-		<Description>Aspire hosting extensions for the AspireC4 plugin: builder API, lifecycle hook, and server resource.</Description>
-		<COPYRIGHT_YEAR>2025</COPYRIGHT_YEAR>
+		<Description>Aspire hosting extensions for the AspireC4 plugin, generating dynamic a LikeC4 model for your Aspire application.</Description>
+		<COPYRIGHT_YEAR>2026</COPYRIGHT_YEAR>
 		<PackageId>AspireC4</PackageId>
-		<Title>AspireC4 - Aspire LikeC4 Visualization</Title>
+		<Title>AspireC4 - Aspire LikeC4 Visualisation</Title>
 		<Authors>Kieron Lanning</Authors>
 		<Company>KJL Solutions Ltd.</Company>
 		<Copyright>KJL Solutions Ltd., $(COPYRIGHT_YEAR) | All rights reserved.</Copyright>
 		<PackageIcon>kjldev-logo.png</PackageIcon>
 		<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
 		<PackageProjectUrl>https://github.com/kjldev/aspirec4</PackageProjectUrl>
-		<PackageTags>aspire;dotnet;aspnetcore;c4;likec4;architecture;diagram;visualization;</PackageTags>
+		<PackageTags>aspire;dotnet;aspnetcore;c4;likec4;architecture;diagram;visualisation;visualization;</PackageTags>
 	</PropertyGroup>
 
 	<ItemGroup>

src/src/AspireC4/AspireC4Builder.cs

@@ -142,7 +142,7 @@ public IAspireC4Builder WithoutConfigFileGeneration()
 	/// On non-Windows the path is returned unchanged.
 	/// </remarks>
 	internal static string NormalizeBindMountPath(string absolutePath) =>
-		NormalizeBindMountPath(absolutePath, _containerRuntime.Value);
+		NormalizeBindMountPath(absolutePath, ContainerRuntime.Value);
 
 	/// <summary>Overload with an explicit runtime — used by unit tests to avoid
 	/// spawning a <c>docker</c> process.</summary>
@@ -153,7 +153,7 @@ internal static string NormalizeBindMountPath(string absolutePath, ContainerRunt
 		// Rancher Desktop exposes Windows drives under /mnt/<letter>/ inside WSL2.
 		// CA1308: intentional — Linux paths require lower-case.
 		if (
-			runtime == ContainerRuntime.RancherDesktop
+			runtime == AspireC4.ContainerRuntime.RancherDesktop
 			&& fullPath.Length >= 2
 			&& char.IsAsciiLetter(fullPath[0])
 			&& fullPath[1] == ':'
@@ -171,7 +171,7 @@ internal static string NormalizeBindMountPath(string absolutePath, ContainerRunt
 		return fullPath;
 	}
 
-	static readonly Lazy<ContainerRuntime> _containerRuntime = new(
+	static readonly Lazy<ContainerRuntime> ContainerRuntime = new(
 		DetectContainerRuntime,
 		LazyThreadSafetyMode.ExecutionAndPublication
 	);
@@ -184,12 +184,12 @@ internal static string NormalizeBindMountPath(string absolutePath, ContainerRunt
 	internal static ContainerRuntime DetectContainerRuntime()
 	{
 		if (!OperatingSystem.IsWindows())
-			return ContainerRuntime.Linux;
+			return AspireC4.ContainerRuntime.Linux;
 
 		// If Podman is explicitly requested, podman.exe handles path translation itself.
 		var runtimeEnv = Environment.GetEnvironmentVariable("ASPIRE_CONTAINER_RUNTIME");
 		if (runtimeEnv?.Equals("podman", StringComparison.OrdinalIgnoreCase) == true)
-			return ContainerRuntime.Podman;
+			return AspireC4.ContainerRuntime.Podman;
 
 		// Query the Docker daemon OS string to distinguish Docker Desktop from Rancher Desktop.
 		try
@@ -210,11 +210,11 @@ internal static ContainerRuntime DetectContainerRuntime()
 			var os = process?.StandardOutput.ReadToEnd().Trim() ?? "";
 
 			if (os.Contains("Rancher Desktop", StringComparison.OrdinalIgnoreCase))
-				return ContainerRuntime.RancherDesktop;
+				return AspireC4.ContainerRuntime.RancherDesktop;
 		}
 		catch { }
 
-		return ContainerRuntime.DockerDesktop;
+		return AspireC4.ContainerRuntime.DockerDesktop;
 	}
 
 	static LikeC4LocalCLIRuntime DetectRuntime()

src/tests/AspireC4.IntegrationTests/AspireC4.IntegrationTests.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<DisableGenerateAssemblyInfoClass>true</DisableGenerateAssemblyInfoClass>
 	</PropertyGroup>
@@ -12,7 +12,6 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<!--<ProjectReference Include="..\..\src\AspireC4\AspireC4.csproj" />-->
 		<ProjectReference Include="..\AspireC4.TestAppHost\AspireC4.TestAppHost.csproj" />
 	</ItemGroup>
 

src/tests/AspireC4.IntegrationTests/AspireC4HostTests.cs

@@ -53,7 +53,7 @@ public static async Task ClassSetUpAsync(CancellationToken cancellationToken)
 		// configure callback that sets ValidateBeforeStart=true and the default FormatGeneratedFile=true.
 		// Both invoke `npx likec4 …` which traverses up the directory tree and scans the entire
 		// repository workspace when run from within the repo — hanging the BeforeStartEvent handler.
-		appBuilder.Services.PostConfigure<AspireC4DiagramOptions>(opts =>
+		appBuilder.Services.PostConfigure<AspireC4DiagramOptions>(static opts =>
 		{
 			opts.ValidateBeforeStart = false;
 			opts.FormatGeneratedFile = false;
@@ -257,7 +257,7 @@ public async Task GeneratedAndAdditionalDSLFiles_PassLikeC4Validate(Cancellation
 		CancellationToken cancellationToken
 	)
 	{
-		var useDotFlag = IsDotAvailable() ? " --use-dot" : "";
+		var useDotFlag = await IsDotAvailableAsync(cancellationToken) ? " --use-dot" : "";
 
 		string shellFile,
 			shellArgs;
@@ -312,7 +312,7 @@ CancellationToken cancellationToken
 		"CA1031:Do not catch general exception types",
 		Justification = "dot availability check is best-effort; any failure means dot is unavailable"
 	)]
-	static bool IsDotAvailable()
+	static async Task<bool> IsDotAvailableAsync(CancellationToken cancellationToken)
 	{
 		try
 		{
@@ -326,8 +326,12 @@ static bool IsDotAvailable()
 					CreateNoWindow = true,
 				}
 			);
-			proc?.WaitForExit();
-			return proc?.ExitCode == 0;
+
+			if (proc is null)
+				return false;
+
+			await proc.WaitForExitAsync(cancellationToken);
+			return proc.ExitCode == 0;
 		}
 		catch
 		{

src/tests/AspireC4.TestAppHost/Extensions/AspireC4Extensions.cs

@@ -19,6 +19,7 @@ public static IAspireC4Builder ConfigureTestHost(this IAspireC4Builder builder)
 			builder.WithAdditionalDSLFolder(extensionsDir);
 		}
 
+		// There are some assets in the repo root that we'll include.
 		builder.WithImageAliasFolder("@", Path.Combine(AppContext.BaseDirectory, "../../../../../../assets/images/"));
 		var imagesDir = Path.Combine(
 			Path.GetDirectoryName(typeof(TestAppHostProgram).Assembly.Location)!,