diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ProjectDependenciesCommandResolver.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ProjectDependenciesCommandResolver.cs index c0166e57f..ee4c963e4 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ProjectDependenciesCommandResolver.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ProjectDependenciesCommandResolver.cs @@ -95,14 +95,14 @@ namespace Microsoft.DotNet.Cli.Utils } var toolLibrary = GetToolLibraryForContext(projectContext, commandName); - var nugetPackagesRoot = PathUtility.EnsureNoTrailingDirectorySeparator(projectContext.PackagesDirectory); + var normalizedNugetPackagesRoot = PathUtility.EnsureNoTrailingDirectorySeparator(projectContext.PackagesDirectory); return _packagedCommandSpecFactory.CreateCommandSpecFromLibrary( toolLibrary, commandName, commandArguments, allowedExtensions, - nugetPackagesRoot, + normalizedNugetPackagesRoot, s_commandResolutionStrategy, depsFilePath, runtimeConfigPath); diff --git a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ProjectToolsCommandResolver.cs b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ProjectToolsCommandResolver.cs index 15b10c7f5..6d8a1999a 100644 --- a/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ProjectToolsCommandResolver.cs +++ b/src/Microsoft.DotNet.Cli.Utils/CommandResolution/ProjectToolsCommandResolver.cs @@ -96,7 +96,7 @@ namespace Microsoft.DotNet.Cli.Utils IEnumerable args, ProjectContext projectContext) { - var nugetPackagesRoot = PathUtility.EnsureNoTrailingDirectorySeparator(projectContext.PackagesDirectory); + var nugetPackagesRoot = projectContext.PackagesDirectory; var lockFile = GetToolLockFile(toolLibraryRange, nugetPackagesRoot); @@ -112,12 +112,14 @@ namespace Microsoft.DotNet.Cli.Utils var depsFileRoot = Path.GetDirectoryName(lockFile.Path); var depsFilePath = GetToolDepsFilePath(toolLibraryRange, lockFile, depsFileRoot); + var normalizedNugetPackagesRoot = PathUtility.EnsureNoTrailingDirectorySeparator(nugetPackagesRoot); + return _packagedCommandSpecFactory.CreateCommandSpecFromLibrary( toolLibrary, commandName, args, _allowedCommandExtensions, - projectContext.PackagesDirectory, + normalizedNugetPackagesRoot, s_commandResolutionStrategy, depsFilePath, null);