From 085038dd7e61e179b3ab5498ceb04c25f6fa73cd Mon Sep 17 00:00:00 2001 From: Jeff Kluge Date: Fri, 10 Feb 2023 13:43:56 -0800 Subject: [PATCH] Pass dotnet directory instead of file path during .NET SDK resolution (#454) Fixes #453 --- src/Shared/DotNetCoreSdkResolver.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Shared/DotNetCoreSdkResolver.cs b/src/Shared/DotNetCoreSdkResolver.cs index 1c777c4e..3429180d 100644 --- a/src/Shared/DotNetCoreSdkResolver.cs +++ b/src/Shared/DotNetCoreSdkResolver.cs @@ -119,14 +119,14 @@ public static bool TryResolveDotNetCoreSdk(IEnvironmentProvider environmentProvi Console.ForegroundColor = ConsoleColor.Red; Console.BackgroundColor = ConsoleColor.Black; - ResolveSdk(environmentProvider, dotnetFileInfo.FullName); + ResolveSdk(environmentProvider, dotnetFileInfo.Directory); Console.ResetColor(); return false; } - private static (string sdkDirectory, string globalJsonPath) ResolveSdk(IEnvironmentProvider environmentProvider, string dotnetExeDirectory) + private static (string sdkDirectory, string globalJsonPath) ResolveSdk(IEnvironmentProvider environmentProvider, DirectoryInfo dotnetExeDirectory) { string sdkDirectory = null; string globalJsonPath = null; @@ -147,11 +147,11 @@ void HandleResolveSdkResult(int key, string value) if (Utility.RunningOnWindows) { - Windows.ResolveSdk(dotnetExeDirectory, environmentProvider.CurrentDirectory, 0 /* None */, HandleResolveSdkResult); + Windows.ResolveSdk(dotnetExeDirectory.FullName, environmentProvider.CurrentDirectory, 0 /* None */, HandleResolveSdkResult); } else { - Unix.ResolveSdk(dotnetExeDirectory, environmentProvider.CurrentDirectory, 0 /* None */, HandleResolveSdkResult); + Unix.ResolveSdk(dotnetExeDirectory.FullName, environmentProvider.CurrentDirectory, 0 /* None */, HandleResolveSdkResult); } return (sdkDirectory, globalJsonPath);