fixup
This commit is contained in:
parent
8c563a58f8
commit
f5b17e63ce
2 changed files with 6 additions and 4 deletions
|
@ -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);
|
||||
|
|
|
@ -96,7 +96,7 @@ namespace Microsoft.DotNet.Cli.Utils
|
|||
IEnumerable<string> 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);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue