Move SDK installation logic and change path from runtimes to sdks

Copilot · mitchdenny · Copilot · commit eaf74a06db87 · 2025-10-22T06:47:21.000Z
- Move GetNuGetConfigPathsAsync call from CheckAsync to InstallAsync
- Initialize NuGet configuration once after SDK installation completes
- Change path from $HOME/.aspire/runtimes/dotnet to $HOME/.aspire/sdks/dotnet
- Rename RuntimesDirectory to SdksDirectory throughout codebase
- Update GetRuntimesDirectory() to GetSdksDirectory()
- Update all test files to use sdks directory
- Update CacheCommand to clear sdks directory instead of runtimes

This addresses two feedback items:
1. NuGet initialization now happens once during installation (not every check)
2. SDK path changed to more appropriate "sdks" directory name

Co-authored-by: mitchdenny &lt;513398+mitchdenny@users.noreply.github.com&gt;
diff --git a/src/Aspire.Cli/CliExecutionContext.cs b/src/Aspire.Cli/CliExecutionContext.cs
@@ -5,12 +5,12 @@
 
 namespace Aspire.Cli;
 
-internal sealed class CliExecutionContext(DirectoryInfo workingDirectory, DirectoryInfo hivesDirectory, DirectoryInfo cacheDirectory, DirectoryInfo runtimesDirectory, bool debugMode = false)
+internal sealed class CliExecutionContext(DirectoryInfo workingDirectory, DirectoryInfo hivesDirectory, DirectoryInfo cacheDirectory, DirectoryInfo sdksDirectory, bool debugMode = false)
 {
     public DirectoryInfo WorkingDirectory { get; } = workingDirectory;
     public DirectoryInfo HivesDirectory { get; } = hivesDirectory;
     public DirectoryInfo CacheDirectory { get; } = cacheDirectory;
-    public DirectoryInfo RuntimesDirectory { get; } = runtimesDirectory;
+    public DirectoryInfo SdksDirectory { get; } = sdksDirectory;
     public bool DebugMode { get; } = debugMode;
 
     private BaseCommand? _command;
diff --git a/src/Aspire.Cli/Commands/CacheCommand.cs b/src/Aspire.Cli/Commands/CacheCommand.cs
@@ -78,11 +78,11 @@ protected override Task<int> ExecuteAsync(ParseResult parseResult, CancellationT
                     }
                 }
 
-                // Also clear the runtimes directory
-                var runtimesDirectory = ExecutionContext.RuntimesDirectory;
-                if (runtimesDirectory.Exists)
+                // Also clear the sdks directory
+                var sdksDirectory = ExecutionContext.SdksDirectory;
+                if (sdksDirectory.Exists)
                 {
-                    foreach (var file in runtimesDirectory.GetFiles("*", SearchOption.AllDirectories))
+                    foreach (var file in sdksDirectory.GetFiles("*", SearchOption.AllDirectories))
                     {
                         try
                         {
@@ -96,7 +96,7 @@ protected override Task<int> ExecuteAsync(ParseResult parseResult, CancellationT
                     }
 
                     // Delete subdirectories
-                    foreach (var directory in runtimesDirectory.GetDirectories())
+                    foreach (var directory in sdksDirectory.GetDirectories())
                     {
                         try
                         {
diff --git a/src/Aspire.Cli/DotNet/DotNetCliRunner.cs b/src/Aspire.Cli/DotNet/DotNetCliRunner.cs
@@ -1202,8 +1202,8 @@ private void ConfigurePrivateSdkEnvironment(ProcessStartInfo startInfo)
         // Get the effective minimum SDK version to determine which private SDK to use
         var sdkInstaller = serviceProvider.GetRequiredService<IDotNetSdkInstaller>();
         var sdkVersion = sdkInstaller.GetEffectiveMinimumSdkVersion();
-        var runtimesDirectory = executionContext.RuntimesDirectory.FullName;
-        var sdkInstallPath = Path.Combine(runtimesDirectory, "dotnet", sdkVersion);
+        var sdksDirectory = executionContext.SdksDirectory.FullName;
+        var sdkInstallPath = Path.Combine(sdksDirectory, "dotnet", sdkVersion);
         var dotnetExecutablePath = Path.Combine(
             sdkInstallPath,
             RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "dotnet.exe" : "dotnet"
diff --git a/src/Aspire.Cli/DotNet/DotNetSdkInstaller.cs b/src/Aspire.Cli/DotNet/DotNetSdkInstaller.cs
@@ -36,44 +36,19 @@ internal sealed class DotNetSdkInstaller(IFeatures features, IConfiguration conf
                           bool.TryParse(alwaysInstallSdk, out var alwaysInstall) && 
                           alwaysInstall;
         
-        // First check if we already have the SDK installed in our private runtimes directory
-        // If we do, verify it's working properly by calling dotnet nuget config paths
-        // This is important on Windows where NuGet needs to create initial config on first use
+        // First check if we already have the SDK installed in our private sdks directory
         if (!forceInstall)
         {
-            var runtimesDirectory = GetRuntimesDirectory();
-            var sdkInstallPath = Path.Combine(runtimesDirectory, "dotnet", minimumVersion);
+            var sdksDirectory = GetSdksDirectory();
+            var sdkInstallPath = Path.Combine(sdksDirectory, "dotnet", minimumVersion);
             var dotnetExecutable = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) 
                 ? Path.Combine(sdkInstallPath, "dotnet.exe")
                 : Path.Combine(sdkInstallPath, "dotnet");
 
             if (File.Exists(dotnetExecutable))
             {
-                logger.LogDebug("Found private SDK installation at {Path}, verifying it works", sdkInstallPath);
-                
-                try
-                {
-                    // Call GetNuGetConfigPathsAsync to ensure NuGet is properly initialized
-                    var options = new DotNetCliRunnerInvocationOptions();
-                    var (exitCode, _) = await dotNetCliRunner.GetNuGetConfigPathsAsync(
-                        new DirectoryInfo(Environment.CurrentDirectory), 
-                        options, 
-                        cancellationToken);
-                    
-                    if (exitCode == 0)
-                    {
-                        logger.LogDebug("Private SDK installation verified successfully");
-                        return (true, minimumVersion, minimumVersion, false);
-                    }
-                    else
-                    {
-                        logger.LogDebug("Private SDK installation verification failed with exit code {ExitCode}", exitCode);
-                    }
-                }
-                catch (Exception ex)
-                {
-                    logger.LogDebug(ex, "Failed to verify private SDK installation");
-                }
+                logger.LogDebug("Found private SDK installation at {Path}", sdkInstallPath);
+                return (true, minimumVersion, minimumVersion, false);
             }
         }
         
@@ -159,8 +134,8 @@ internal sealed class DotNetSdkInstaller(IFeatures features, IConfiguration conf
     public async Task InstallAsync(CancellationToken cancellationToken = default)
     {
         var sdkVersion = GetEffectiveMinimumSdkVersion();
-        var runtimesDirectory = GetRuntimesDirectory();
-        var sdkInstallPath = Path.Combine(runtimesDirectory, "dotnet", sdkVersion);
+        var sdksDirectory = GetSdksDirectory();
+        var sdkInstallPath = Path.Combine(sdksDirectory, "dotnet", sdkVersion);
 
         // Check if SDK is already installed in the private location
         if (Directory.Exists(sdkInstallPath))
@@ -169,14 +144,14 @@ public async Task InstallAsync(CancellationToken cancellationToken = default)
             return;
         }
 
-        // Create the runtimes directory if it doesn't exist
-        Directory.CreateDirectory(runtimesDirectory);
+        // Create the sdks directory if it doesn't exist
+        Directory.CreateDirectory(sdksDirectory);
 
         // Determine which install script to use based on the platform
         var (scriptUrl, scriptFileName, scriptRunner) = GetInstallScriptInfo();
 
         // Download the install script
-        var scriptPath = Path.Combine(runtimesDirectory, scriptFileName);
+        var scriptPath = Path.Combine(sdksDirectory, scriptFileName);
         using (var httpClient = new HttpClient())
         {
             httpClient.Timeout = TimeSpan.FromMinutes(5);
@@ -271,6 +246,31 @@ public async Task InstallAsync(CancellationToken cancellationToken = default)
         {
             // Ignore cleanup errors
         }
+        
+        // After installation, call dotnet nuget config paths to initialize NuGet
+        // This is important on Windows where NuGet needs to create initial config on first use
+        logger.LogDebug("Initializing NuGet configuration for private SDK installation");
+        try
+        {
+            var options = new DotNetCliRunnerInvocationOptions();
+            var (exitCode, _) = await dotNetCliRunner.GetNuGetConfigPathsAsync(
+                new DirectoryInfo(Environment.CurrentDirectory), 
+                options, 
+                cancellationToken);
+            
+            if (exitCode == 0)
+            {
+                logger.LogDebug("NuGet configuration initialized successfully");
+            }
+            else
+            {
+                logger.LogDebug("NuGet configuration initialization returned exit code {ExitCode}", exitCode);
+            }
+        }
+        catch (Exception ex)
+        {
+            logger.LogDebug(ex, "Failed to initialize NuGet configuration, continuing anyway");
+        }
     }
 
     /// <summary>
@@ -290,12 +290,12 @@ private static string GetCurrentArchitecture()
     }
 
     /// <summary>
-    /// Gets the directory where .NET runtimes are stored.
+    /// Gets the directory where .NET SDKs are stored.
     /// </summary>
-    /// <returns>The full path to the runtimes directory.</returns>
-    private string GetRuntimesDirectory()
+    /// <returns>The full path to the sdks directory.</returns>
+    private string GetSdksDirectory()
     {
-        return executionContext.RuntimesDirectory.FullName;
+        return executionContext.SdksDirectory.FullName;
     }
 
     /// <summary>
diff --git a/src/Aspire.Cli/Program.cs b/src/Aspire.Cli/Program.cs
@@ -170,20 +170,20 @@ private static DirectoryInfo GetHivesDirectory()
         return new DirectoryInfo(hivesDirectory);
     }
 
-    private static DirectoryInfo GetRuntimesDirectory()
+    private static DirectoryInfo GetSdksDirectory()
     {
         var homeDirectory = GetUsersAspirePath();
-        var runtimesPath = Path.Combine(homeDirectory, "runtimes");
-        return new DirectoryInfo(runtimesPath);
+        var sdksPath = Path.Combine(homeDirectory, "sdks");
+        return new DirectoryInfo(sdksPath);
     }
 
     private static CliExecutionContext BuildCliExecutionContext(bool debugMode)
     {
         var workingDirectory = new DirectoryInfo(Environment.CurrentDirectory);
         var hivesDirectory = GetHivesDirectory();
         var cacheDirectory = GetCacheDirectory();
-        var runtimesDirectory = GetRuntimesDirectory();
-        return new CliExecutionContext(workingDirectory, hivesDirectory, cacheDirectory, runtimesDirectory, debugMode);
+        var sdksDirectory = GetSdksDirectory();
+        return new CliExecutionContext(workingDirectory, hivesDirectory, cacheDirectory, sdksDirectory, debugMode);
     }
 
     private static DirectoryInfo GetCacheDirectory()
diff --git a/tests/Aspire.Cli.Tests/Commands/RunCommandTests.cs b/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").CreateSubdirectory("cache"), runtimesDirectory: new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes"))
+            workingDirectory: workspace.WorkspaceRoot, hivesDirectory: workspace.WorkspaceRoot.CreateSubdirectory(".aspire").CreateSubdirectory("hives"), cacheDirectory: workspace.WorkspaceRoot.CreateSubdirectory(".aspire").CreateSubdirectory("cache"), sdksDirectory: new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-sdks"))
         );
 
         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").CreateSubdirectory("cache"), runtimesDirectory: new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes"))
+            workingDirectory: workspace.WorkspaceRoot, hivesDirectory: workspace.WorkspaceRoot.CreateSubdirectory(".aspire").CreateSubdirectory("hives"), cacheDirectory: workspace.WorkspaceRoot.CreateSubdirectory(".aspire").CreateSubdirectory("cache"), sdksDirectory: new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-sdks"))
         );
 
         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").CreateSubdirectory("cache"), runtimesDirectory: new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes"))
+            workingDirectory: workspace.WorkspaceRoot, hivesDirectory: workspace.WorkspaceRoot.CreateSubdirectory(".aspire").CreateSubdirectory("hives"), cacheDirectory: workspace.WorkspaceRoot.CreateSubdirectory(".aspire").CreateSubdirectory("cache"), sdksDirectory: new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-sdks"))
         );
 
         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").CreateSubdirectory("cache"), runtimesDirectory: new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes"))
+            workingDirectory: workspace.WorkspaceRoot, hivesDirectory: workspace.WorkspaceRoot.CreateSubdirectory(".aspire").CreateSubdirectory("hives"), cacheDirectory: workspace.WorkspaceRoot.CreateSubdirectory(".aspire").CreateSubdirectory("cache"), sdksDirectory: new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-sdks"))
         );
 
         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").CreateSubdirectory("cache"), runtimesDirectory: new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes"))
+            workingDirectory: workspace.WorkspaceRoot, hivesDirectory: workspace.WorkspaceRoot.CreateSubdirectory(".aspire").CreateSubdirectory("hives"), cacheDirectory: workspace.WorkspaceRoot.CreateSubdirectory(".aspire").CreateSubdirectory("cache"), sdksDirectory: new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-sdks"))
         );
 
         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").CreateSubdirectory("cache"), runtimesDirectory: new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes"))
+            workingDirectory: workspace.WorkspaceRoot, hivesDirectory: workspace.WorkspaceRoot.CreateSubdirectory(".aspire").CreateSubdirectory("hives"), cacheDirectory: workspace.WorkspaceRoot.CreateSubdirectory(".aspire").CreateSubdirectory("cache"), sdksDirectory: new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-sdks"))
         );
 
         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").CreateSubdirectory("cache"), runtimesDirectory: new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-runtimes"))
+            workingDirectory: workspace.WorkspaceRoot, hivesDirectory: workspace.WorkspaceRoot.CreateSubdirectory(".aspire").CreateSubdirectory("hives"), cacheDirectory: workspace.WorkspaceRoot.CreateSubdirectory(".aspire").CreateSubdirectory("cache"), sdksDirectory: new DirectoryInfo(Path.Combine(Path.GetTempPath(), "aspire-test-sdks"))
         );
 
         var runner = new AssertingDotNetCliRunner(
diff --git a/tests/Aspire.Cli.Tests/DotNetSdkInstallerTests.cs b/tests/Aspire.Cli.Tests/DotNetSdkInstallerTests.cs
@@ -21,9 +21,9 @@ private static CliExecutionContext CreateTestExecutionContext()
         var workingDirectory = new DirectoryInfo(tempPath);
         var hivesDirectory = new DirectoryInfo(Path.Combine(tempPath, "hives"));
         var cacheDirectory = new DirectoryInfo(Path.Combine(tempPath, "cache"));
-        var runtimesDirectory = new DirectoryInfo(Path.Combine(tempPath, "runtimes"));
+        var sdksDirectory = new DirectoryInfo(Path.Combine(tempPath, "sdks"));
         
-        return new CliExecutionContext(workingDirectory, hivesDirectory, cacheDirectory, runtimesDirectory, debugMode: false);
+        return new CliExecutionContext(workingDirectory, hivesDirectory, cacheDirectory, sdksDirectory, debugMode: false);
     }
 
     private static ILogger<DotNetSdkInstaller> CreateTestLogger()
@@ -107,17 +107,17 @@ public async Task CheckAsync_WithInvalidMinimumVersion_ReturnsFalse()
     }
 
     [Fact]
-    public async Task InstallAsync_CreatesRuntimesDirectory()
+    public async Task InstallAsync_CreatesSdksDirectory()
     {
         var features = new TestFeatures()
             .SetFeature(KnownFeatures.MinimumSdkCheckEnabled, true);
         var context = CreateTestExecutionContext();
         var installer = new DotNetSdkInstaller(features, CreateEmptyConfiguration(), context, CreateTestDotNetCliRunner(), CreateTestLogger());
 
-        // Get the runtimes directory path
-        var runtimesDirectory = context.RuntimesDirectory.FullName;
+        // Get the sdks directory path
+        var sdksDirectory = context.SdksDirectory.FullName;
         var sdkVersion = installer.GetEffectiveMinimumSdkVersion();
-        var sdkInstallPath = Path.Combine(runtimesDirectory, "dotnet", sdkVersion);
+        var sdkInstallPath = Path.Combine(sdksDirectory, "dotnet", sdkVersion);
 
         // Clean up if it exists from a previous test
         if (Directory.Exists(sdkInstallPath))
@@ -140,18 +140,18 @@ public async Task InstallAsync_CreatesRuntimesDirectory()
     }
 
     [Fact]
-    public void GetRuntimesDirectory_ReturnsValidPath()
+    public void GetSdksDirectory_ReturnsValidPath()
     {
         var context = CreateTestExecutionContext();
         
-        // Verify the runtimes directory from the execution context
-        var runtimesDirectory = context.RuntimesDirectory.FullName;
+        // Verify the sdks directory from the execution context
+        var sdksDirectory = context.SdksDirectory.FullName;
         
         // Verify the path contains the expected components
-        Assert.Contains("runtimes", runtimesDirectory);
+        Assert.Contains("sdks", sdksDirectory);
         
         // Verify it's a valid path format
-        Assert.False(string.IsNullOrWhiteSpace(runtimesDirectory));
+        Assert.False(string.IsNullOrWhiteSpace(sdksDirectory));
     }
 
     [Fact]
diff --git a/tests/Aspire.Cli.Tests/Utils/CliTestHelper.cs b/tests/Aspire.Cli.Tests/Utils/CliTestHelper.cs

Original file line number	Diff line number	Diff line change
`@@ -78,11 +78,11 @@ protected override Task<int> ExecuteAsync(ParseResult parseResult, CancellationT`
`78`	`78`	`}`
`79`	`79`	`}`
`80`	`80`
`81`		`- // Also clear the runtimes directory`
`82`		`- var runtimesDirectory = ExecutionContext.RuntimesDirectory;`
`83`		`- if (runtimesDirectory.Exists)`
	`81`	`+ // Also clear the sdks directory`
	`82`	`+ var sdksDirectory = ExecutionContext.SdksDirectory;`
	`83`	`+ if (sdksDirectory.Exists)`
`84`	`84`	`{`
`85`		`- foreach (var file in runtimesDirectory.GetFiles("*", SearchOption.AllDirectories))`
	`85`	`+ foreach (var file in sdksDirectory.GetFiles("*", SearchOption.AllDirectories))`
`86`	`86`	`{`
`87`	`87`	`try`
`88`	`88`	`{`
`@@ -96,7 +96,7 @@ protected override Task<int> ExecuteAsync(ParseResult parseResult, CancellationT`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`// Delete subdirectories`
`99`		`- foreach (var directory in runtimesDirectory.GetDirectories())`
	`99`	`+ foreach (var directory in sdksDirectory.GetDirectories())`
`100`	`100`	`{`
`101`	`101`	`try`
`102`	`102`	`{`
Original file line number	Diff line number	Diff line change
`@@ -170,20 +170,20 @@ private static DirectoryInfo GetHivesDirectory()`
`170`	`170`	`return new DirectoryInfo(hivesDirectory);`
`171`	`171`	`}`
`172`	`172`
`173`		`- private static DirectoryInfo GetRuntimesDirectory()`
	`173`	`+ private static DirectoryInfo GetSdksDirectory()`
`174`	`174`	`{`
`175`	`175`	`var homeDirectory = GetUsersAspirePath();`
`176`		`- var runtimesPath = Path.Combine(homeDirectory, "runtimes");`
`177`		`- return new DirectoryInfo(runtimesPath);`
	`176`	`+ var sdksPath = Path.Combine(homeDirectory, "sdks");`
	`177`	`+ return new DirectoryInfo(sdksPath);`
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`private static CliExecutionContext BuildCliExecutionContext(bool debugMode)`
`181`	`181`	`{`
`182`	`182`	`var workingDirectory = new DirectoryInfo(Environment.CurrentDirectory);`
`183`	`183`	`var hivesDirectory = GetHivesDirectory();`
`184`	`184`	`var cacheDirectory = GetCacheDirectory();`
`185`		`- var runtimesDirectory = GetRuntimesDirectory();`
`186`		`- return new CliExecutionContext(workingDirectory, hivesDirectory, cacheDirectory, runtimesDirectory, debugMode);`
	`185`	`+ var sdksDirectory = GetSdksDirectory();`
	`186`	`+ return new CliExecutionContext(workingDirectory, hivesDirectory, cacheDirectory, sdksDirectory, debugMode);`
`187`	`187`	`}`
`188`	`188`
`189`	`189`	`private static DirectoryInfo GetCacheDirectory()`