Fix ambiguity between package ID and command name in NETCoreToolHelper

Author: Lamparter

src/features/Riverside.CompilerPlatform.Features.Kiota/KiotaGenerator.cs

@@ -78,7 +78,7 @@ protected override void OnBeforeGeneration(GeneratorContext context, Cancellatio
 		try
 		{
 			var (installed, installError) = NETCoreToolHelpers
-				.EnsureToolAsync("Microsoft.OpenApi.Kiota", ToolDirectory, version)
+				.EnsureToolAsync("Microsoft.OpenApi.Kiota", ToolDirectory, version, commandName: "kiota")
 				.GetAwaiter().GetResult();
 
 			if (!installed)

src/roslyn/Riverside.CompilerPlatform.Extensions/Helpers/NETCoreToolHelpers.cs

@@ -31,22 +31,28 @@ public static string GetExecutablePath(string toolDirectory, string toolName)
 	///		<item>Installation succeeds when the executable is present after the above steps.</item>
 	/// </list>
 	/// </remarks>
-	/// <param name="toolName">The NuGet package ID of the tool (e.g. <c>Riverside.JsonBinder.Console</c>).</param>
+	/// <param name="packageId">The NuGet package ID of the tool (e.g. <c>Riverside.JsonBinder.Console</c>).</param>
 	/// <param name="toolDirectory">The directory to install the tool into, passed to <c>--tool-path</c>.</param>
 	/// <param name="version">
 	/// A specific version to pin. Pass <see langword="null"/> to install or keep the latest.
 	/// </param>
 	/// <param name="timeout">Maximum wait time per install or update process. Defaults to 5 minutes.</param>
+	/// <param name="commandName">
+	/// The executable/command name to look for in <paramref name="toolDirectory"/> (e.g. <c>jsonbinder</c>).
+	/// If <see langword="null"/>, <paramref name="packageId"/> is used as the command name.
+	/// </param>
 	/// <returns>
 	/// A tuple where <c>Success</c> is <see langword="true"/> when the executable is available, and <c>Error</c> carries the captured stderr when installation fails.
 	/// </returns>
 	public static async Task<(bool Success, string? Error)> EnsureToolAsync(
-		string toolName,
+		string packageId,
 		string toolDirectory,
 		string? version = null,
-		TimeSpan? timeout = null)
+		TimeSpan? timeout = null,
+		string? commandName = null)
 	{
-		var exe = GetExecutablePath(toolDirectory, toolName);
+		var exeName = string.IsNullOrWhiteSpace(commandName) ? packageId : commandName;
+		var exe = GetExecutablePath(toolDirectory, exeName!);
 		var effectiveTimeout = timeout ?? TimeSpan.FromMinutes(5);
 
 		Directory.CreateDirectory(toolDirectory);
@@ -58,14 +64,14 @@ public static string GetExecutablePath(string toolDirectory, string toolName)
 		var versionArg = string.IsNullOrWhiteSpace(version) ? string.Empty : $" --version {version}";
 
 		var installResult = await ProcessHelpers.RunNETCoreCliAsync(
-			$"tool install {toolName} {toolPathArg}{versionArg}", effectiveTimeout);
+			$"tool install {packageId} {toolPathArg}{versionArg}", effectiveTimeout);
 
 		if (installResult.ExitCode == 0)
 			return (true, null);
 
 		// install exits non-zero when the tool is already present; attempt an update instead
 		var updateResult = await ProcessHelpers.RunNETCoreCliAsync(
-			$"tool update {toolName} {toolPathArg}{versionArg}", effectiveTimeout);
+			$"tool update {packageId} {toolPathArg}{versionArg}", effectiveTimeout);
 
 		return File.Exists(exe)
 			? (true, null)