Fix test compilation issues for RuntimesDirectory refactoring

- Fix CreateTestExecutionContext to not have extra parameter
- Fix multi-line CliExecutionContext constructor calls in RunCommandTests
- Fix broken DirectoryInfo constructor calls from regex replacements
- All DotNetSdkInstallerTests now pass successfully

Note: 6 unrelated tests still failing due to missing ICliHostEnvironment in test mocks - these are pre-existing test infrastructure issues not related to the SDK installation feature.

Co-authored-by: mitchdenny <[email protected]>

Author: Copilot

tests/Aspire.Cli.Tests/Commands/RunCommandTests.cs

@@ -779,7 +779,7 @@ public async Task DotNetCliRunner_RunAsync_WhenWatchIsTrue_IncludesNonInteractiv
         var options = new DotNetCliRunnerInvocationOptions();
 
         var executionContext = new CliExecutionContext(
-            workingDirectory: workspace.WorkspaceRoot, hivesDirectory: workspace.WorkspaceRoot.CreateSubdirectory(".aspire").CreateSubdirectory("hives"), cacheDirectory: workspace.WorkspaceRoot.CreateSubdirectory(".aspire", new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes"))).CreateSubdirectory("cache")
+            workingDirectory: workspace.WorkspaceRoot, hivesDirectory: workspace.WorkspaceRoot.CreateSubdirectory(".aspire").CreateSubdirectory("hives"), cacheDirectory: workspace.WorkspaceRoot.CreateSubdirectory(".aspire").CreateSubdirectory("cache"), runtimesDirectory: new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes"))
         );
 
         var runner = new AssertingDotNetCliRunner(
@@ -833,7 +833,7 @@ public async Task DotNetCliRunner_RunAsync_WhenWatchIsFalse_DoesNotIncludeNonInt
         var options = new DotNetCliRunnerInvocationOptions();
 
         var executionContext = new CliExecutionContext(
-            workingDirectory: workspace.WorkspaceRoot, hivesDirectory: workspace.WorkspaceRoot.CreateSubdirectory(".aspire").CreateSubdirectory("hives"), cacheDirectory: workspace.WorkspaceRoot.CreateSubdirectory(".aspire", new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes"))).CreateSubdirectory("cache")
+            workingDirectory: workspace.WorkspaceRoot, hivesDirectory: workspace.WorkspaceRoot.CreateSubdirectory(".aspire").CreateSubdirectory("hives"), cacheDirectory: workspace.WorkspaceRoot.CreateSubdirectory(".aspire").CreateSubdirectory("cache"), runtimesDirectory: new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes"))
         );
 
         var runner = new AssertingDotNetCliRunner(
@@ -883,7 +883,7 @@ public async Task DotNetCliRunner_RunAsync_WhenWatchIsTrueAndDebugIsTrue_Include
         var options = new DotNetCliRunnerInvocationOptions { Debug = true };
 
         var executionContext = new CliExecutionContext(
-            workingDirectory: workspace.WorkspaceRoot, hivesDirectory: workspace.WorkspaceRoot.CreateSubdirectory(".aspire").CreateSubdirectory("hives"), cacheDirectory: workspace.WorkspaceRoot.CreateSubdirectory(".aspire", new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes"))).CreateSubdirectory("cache")
+            workingDirectory: workspace.WorkspaceRoot, hivesDirectory: workspace.WorkspaceRoot.CreateSubdirectory(".aspire").CreateSubdirectory("hives"), cacheDirectory: workspace.WorkspaceRoot.CreateSubdirectory(".aspire").CreateSubdirectory("cache"), runtimesDirectory: new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes"))
         );
 
         var runner = new AssertingDotNetCliRunner(
@@ -937,7 +937,7 @@ public async Task DotNetCliRunner_RunAsync_WhenWatchIsTrueAndDebugIsFalse_DoesNo
         var options = new DotNetCliRunnerInvocationOptions { Debug = false };
 
         var executionContext = new CliExecutionContext(
-            workingDirectory: workspace.WorkspaceRoot, hivesDirectory: workspace.WorkspaceRoot.CreateSubdirectory(".aspire").CreateSubdirectory("hives"), cacheDirectory: workspace.WorkspaceRoot.CreateSubdirectory(".aspire", new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes"))).CreateSubdirectory("cache")
+            workingDirectory: workspace.WorkspaceRoot, hivesDirectory: workspace.WorkspaceRoot.CreateSubdirectory(".aspire").CreateSubdirectory("hives"), cacheDirectory: workspace.WorkspaceRoot.CreateSubdirectory(".aspire").CreateSubdirectory("cache"), runtimesDirectory: new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes"))
         );
 
         var runner = new AssertingDotNetCliRunner(
@@ -986,7 +986,7 @@ public async Task DotNetCliRunner_RunAsync_WhenWatchIsFalseAndDebugIsTrue_DoesNo
         var options = new DotNetCliRunnerInvocationOptions { Debug = true };
 
         var executionContext = new CliExecutionContext(
-            workingDirectory: workspace.WorkspaceRoot, hivesDirectory: workspace.WorkspaceRoot.CreateSubdirectory(".aspire").CreateSubdirectory("hives"), cacheDirectory: workspace.WorkspaceRoot.CreateSubdirectory(".aspire", new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes"))).CreateSubdirectory("cache")
+            workingDirectory: workspace.WorkspaceRoot, hivesDirectory: workspace.WorkspaceRoot.CreateSubdirectory(".aspire").CreateSubdirectory("hives"), cacheDirectory: workspace.WorkspaceRoot.CreateSubdirectory(".aspire").CreateSubdirectory("cache"), runtimesDirectory: new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes"))
         );
 
         var runner = new AssertingDotNetCliRunner(
@@ -1036,7 +1036,7 @@ public async Task DotNetCliRunner_RunAsync_WhenWatchIsTrue_SetsSuppressLaunchBro
         var options = new DotNetCliRunnerInvocationOptions();
 
         var executionContext = new CliExecutionContext(
-            workingDirectory: workspace.WorkspaceRoot, hivesDirectory: workspace.WorkspaceRoot.CreateSubdirectory(".aspire").CreateSubdirectory("hives"), cacheDirectory: workspace.WorkspaceRoot.CreateSubdirectory(".aspire", new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes"))).CreateSubdirectory("cache")
+            workingDirectory: workspace.WorkspaceRoot, hivesDirectory: workspace.WorkspaceRoot.CreateSubdirectory(".aspire").CreateSubdirectory("hives"), cacheDirectory: workspace.WorkspaceRoot.CreateSubdirectory(".aspire").CreateSubdirectory("cache"), runtimesDirectory: new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes"))
         );
 
         var runner = new AssertingDotNetCliRunner(
@@ -1086,7 +1086,7 @@ public async Task DotNetCliRunner_RunAsync_WhenWatchIsFalse_DoesNotSetSuppressLa
         var options = new DotNetCliRunnerInvocationOptions();
 
         var executionContext = new CliExecutionContext(
-            workingDirectory: workspace.WorkspaceRoot, hivesDirectory: workspace.WorkspaceRoot.CreateSubdirectory(".aspire").CreateSubdirectory("hives"), cacheDirectory: workspace.WorkspaceRoot.CreateSubdirectory(".aspire", new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes"))).CreateSubdirectory("cache")
+            workingDirectory: workspace.WorkspaceRoot, hivesDirectory: workspace.WorkspaceRoot.CreateSubdirectory(".aspire").CreateSubdirectory("hives"), cacheDirectory: workspace.WorkspaceRoot.CreateSubdirectory(".aspire").CreateSubdirectory("cache"), runtimesDirectory: new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes"))
         );
 
         var runner = new AssertingDotNetCliRunner(

tests/Aspire.Cli.Tests/DotNetSdkInstallerTests.cs

@@ -20,7 +20,7 @@ private static CliExecutionContext CreateTestExecutionContext()
         var cacheDirectory = new DirectoryInfo(Path.Combine(tempPath, "cache"));
         var runtimesDirectory = new DirectoryInfo(Path.Combine(tempPath, "runtimes"));
 
-        return new CliExecutionContext(workingDirectory, hivesDirectory, cacheDirectory, runtimesDirectory, debugMode: false, new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes")));
+        return new CliExecutionContext(workingDirectory, hivesDirectory, cacheDirectory, runtimesDirectory, debugMode: false);
     }
 
     [Fact]

tests/Aspire.Cli.Tests/Interaction/ConsoleInteractionServiceTests.cs

@@ -13,7 +13,7 @@ public class ConsoleInteractionServiceTests
     public async Task PromptForSelectionAsync_EmptyChoices_ThrowsEmptyChoicesException()
     {
         // Arrange
-        var executionContext = new CliExecutionContext(new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo(".", new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes"))));
+        var executionContext = new CliExecutionContext(new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes")));
         var interactionService = new ConsoleInteractionService(AnsiConsole.Console, executionContext, TestHelpers.CreateInteractiveHostEnvironment());
         var choices = Array.Empty<string>();
 
@@ -26,7 +26,7 @@ await Assert.ThrowsAsync<EmptyChoicesException>(() =>
     public async Task PromptForSelectionsAsync_EmptyChoices_ThrowsEmptyChoicesException()
     {
         // Arrange
-        var executionContext = new CliExecutionContext(new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo(".", new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes"))));
+        var executionContext = new CliExecutionContext(new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes")));
         var interactionService = new ConsoleInteractionService(AnsiConsole.Console, executionContext, TestHelpers.CreateInteractiveHostEnvironment());
         var choices = Array.Empty<string>();
 
@@ -47,7 +47,7 @@ public void DisplayError_WithMarkupCharacters_DoesNotCauseMarkupParsingError()
             Out = new AnsiConsoleOutput(new StringWriter(output))
         });
 
-        var executionContext = new CliExecutionContext(new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo(".", new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes"))));
+        var executionContext = new CliExecutionContext(new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes")));
         var interactionService = new ConsoleInteractionService(console, executionContext, TestHelpers.CreateInteractiveHostEnvironment());
         var errorMessage = "The JSON value could not be converted to <Type>. Path: $.values[0].Type | LineNumber: 0 | BytePositionInLine: 121.";
 
@@ -72,7 +72,7 @@ public void DisplaySubtleMessage_WithMarkupCharacters_DoesNotCauseMarkupParsingE
             Out = new AnsiConsoleOutput(new StringWriter(output))
         });
 
-        var executionContext = new CliExecutionContext(new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo(".", new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes"))));
+        var executionContext = new CliExecutionContext(new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes")));
         var interactionService = new ConsoleInteractionService(console, executionContext, TestHelpers.CreateInteractiveHostEnvironment());
         var message = "Path with <brackets> and [markup] characters";
 
@@ -97,7 +97,7 @@ public void DisplayLines_WithMarkupCharacters_DoesNotCauseMarkupParsingError()
             Out = new AnsiConsoleOutput(new StringWriter(output))
         });
 
-        var executionContext = new CliExecutionContext(new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo(".", new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes"))));
+        var executionContext = new CliExecutionContext(new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes")));
         var interactionService = new ConsoleInteractionService(console, executionContext, TestHelpers.CreateInteractiveHostEnvironment());
         var lines = new[] 
         {
@@ -128,7 +128,7 @@ public void DisplayMarkdown_WithBasicMarkdown_ConvertsToSpectreMarkup()
             Out = new AnsiConsoleOutput(new StringWriter(output))
         });
 
-        var executionContext = new CliExecutionContext(new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo(".", new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes"))));
+        var executionContext = new CliExecutionContext(new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes")));
         var interactionService = new ConsoleInteractionService(console, executionContext, TestHelpers.CreateInteractiveHostEnvironment());
         var markdown = "# Header\nThis is **bold** and *italic* text with `code`.";
 
@@ -155,7 +155,7 @@ public void DisplayMarkdown_WithPlainText_DoesNotThrow()
             Out = new AnsiConsoleOutput(new StringWriter(output))
         });
 
-        var executionContext = new CliExecutionContext(new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo(".", new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes"))));
+        var executionContext = new CliExecutionContext(new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes")));
         var interactionService = new ConsoleInteractionService(console, executionContext, TestHelpers.CreateInteractiveHostEnvironment());
         var plainText = "This is just plain text without any markdown.";
 
@@ -180,7 +180,7 @@ public async Task ShowStatusAsync_InDebugMode_DisplaysSubtleMessageInsteadOfSpin
             Out = new AnsiConsoleOutput(new StringWriter(output))
         });
 
-        var executionContext = new CliExecutionContext(new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo(".", new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes"))), debugMode: true);
+        var executionContext = new CliExecutionContext(new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes")), debugMode: true);
         var interactionService = new ConsoleInteractionService(console, executionContext, TestHelpers.CreateInteractiveHostEnvironment());
         var statusText = "Processing request...";
         var result = "test result";
@@ -207,7 +207,7 @@ public void ShowStatus_InDebugMode_DisplaysSubtleMessageInsteadOfSpinner()
             Out = new AnsiConsoleOutput(new StringWriter(output))
         });
 
-        var executionContext = new CliExecutionContext(new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo(".", new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes"))), debugMode: true);
+        var executionContext = new CliExecutionContext(new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes")), debugMode: true);
         var interactionService = new ConsoleInteractionService(console, executionContext, TestHelpers.CreateInteractiveHostEnvironment());
         var statusText = "Processing synchronous request...";
         var actionCalled = false;
@@ -226,7 +226,7 @@ public void ShowStatus_InDebugMode_DisplaysSubtleMessageInsteadOfSpinner()
     public async Task PromptForStringAsync_WhenInteractiveInputNotSupported_ThrowsInvalidOperationException()
     {
         // Arrange
-        var executionContext = new CliExecutionContext(new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo(".", new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes"))));
+        var executionContext = new CliExecutionContext(new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes")));
         var hostEnvironment = TestHelpers.CreateNonInteractiveHostEnvironment();
         var interactionService = new ConsoleInteractionService(AnsiConsole.Console, executionContext, hostEnvironment);
 
@@ -240,7 +240,7 @@ public async Task PromptForStringAsync_WhenInteractiveInputNotSupported_ThrowsIn
     public async Task PromptForSelectionAsync_WhenInteractiveInputNotSupported_ThrowsInvalidOperationException()
     {
         // Arrange
-        var executionContext = new CliExecutionContext(new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo(".", new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes"))));
+        var executionContext = new CliExecutionContext(new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes")));
         var hostEnvironment = TestHelpers.CreateNonInteractiveHostEnvironment();
         var interactionService = new ConsoleInteractionService(AnsiConsole.Console, executionContext, hostEnvironment);
         var choices = new[] { "option1", "option2" };
@@ -255,7 +255,7 @@ public async Task PromptForSelectionAsync_WhenInteractiveInputNotSupported_Throw
     public async Task PromptForSelectionsAsync_WhenInteractiveInputNotSupported_ThrowsInvalidOperationException()
     {
         // Arrange
-        var executionContext = new CliExecutionContext(new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo(".", new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes"))));
+        var executionContext = new CliExecutionContext(new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes")));
         var hostEnvironment = TestHelpers.CreateNonInteractiveHostEnvironment();
         var interactionService = new ConsoleInteractionService(AnsiConsole.Console, executionContext, hostEnvironment);
         var choices = new[] { "option1", "option2" };
@@ -270,7 +270,7 @@ public async Task PromptForSelectionsAsync_WhenInteractiveInputNotSupported_Thro
     public async Task ConfirmAsync_WhenInteractiveInputNotSupported_ThrowsInvalidOperationException()
     {
         // Arrange
-        var executionContext = new CliExecutionContext(new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo(".", new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes"))));
+        var executionContext = new CliExecutionContext(new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo("."), new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes")));
         var hostEnvironment = TestHelpers.CreateNonInteractiveHostEnvironment();
         var interactionService = new ConsoleInteractionService(AnsiConsole.Console, executionContext, hostEnvironment);