WIP: GH18: Add support for dotnet local tools #19
Conversation
| @@ -190,9 +198,9 @@ private List<DotNetToolPackage> GetInstalledTools(string toolLocation) | |||
| var installedTools = isInstalledProcess.GetStandardOutput().ToList(); | |||
| var installedToolNames = new List<DotNetToolPackage>(); | |||
|
|
|||
| string pattern = @"(?<packageName>[^\s]+)\s+(?<packageVersion>[^\s]+)\s+(?<packageShortCode>[^`s])"; | |||
There was a problem hiding this comment.
This regex had a bug; `s should be \s for non-whitespace match.
There was a problem hiding this comment.
Just noticed, it also didn't match more than one character. I guess it's not used.
| @@ -201,7 +209,8 @@ private List<DotNetToolPackage> GetInstalledTools(string toolLocation) | |||
| { | |||
| Id = match.Groups["packageName"].Value, | |||
| Version = match.Groups["packageVersion"].Value, | |||
| ShortCode = match.Groups["packageShortCode"].Value | |||
| ShortCode = match.Groups["packageShortCode"].Value, | |||
| Manifest = match.Groups["packageManifest"].Value | |||
There was a problem hiding this comment.
I've done no testing so far, but expecting this to be empty and not throw when not matched.
| @@ -190,9 +198,9 @@ private List<DotNetToolPackage> GetInstalledTools(string toolLocation) | |||
| var installedTools = isInstalledProcess.GetStandardOutput().ToList(); | |||
| var installedToolNames = new List<DotNetToolPackage>(); | |||
|
|
|||
| string pattern = @"(?<packageName>[^\s]+)\s+(?<packageVersion>[^\s]+)\s+(?<packageShortCode>[^`s])"; | |||
| string pattern = @"(?<packageName>[^\s]+)\s+(?<packageVersion>[^\s]+)\s+(?<packageShortCode>[^\s]+)(?:\s+(?<packageManifest>[^\s]+))?"; | |||
There was a problem hiding this comment.
Optionally match the package manifest, when available, for local tools.
| @@ -229,7 +238,7 @@ private void RunDotNetTool(PackageReference package, DirectoryPath toolsFolderDi | |||
| { | |||
| _log.Warning("dotnet exited with {0}", exitCode); | |||
| var output = string.Join(Environment.NewLine, process.GetStandardError()); | |||
| _log.Verbose(Verbosity.Diagnostic, "Output:\r\n{0}", output); | |||
| _log.Verbose(Verbosity.Diagnostic, "Output:{0}{1}", Environment.NewLine, output); | |||
There was a problem hiding this comment.
There was another minor bug here. Changed to use Environment.NewLine when composing output message.
| @@ -69,6 +69,10 @@ public IReadOnlyCollection<IFile> GetFiles(PackageReference package, PackageType | |||
| return GetToolFiles(new DirectoryPath(_environment.GetEnvironmentVariable("USERPROFILE")).Combine(".dotnet/tools"), package); | |||
| } | |||
| } | |||
| else if (package.Parameters.ContainsKey("local")) | |||
| { | |||
| return new List<IFile>(); //TODO | |||
There was a problem hiding this comment.
Not sure what, if anything, can be done here, since dotnet local tools are not put in the user subdirectory like dotnet global tools.
Only idea is they must be in the NuGet cache, but how to get the correct path?
Failing that, would need to revisit how tools work and allow them to be managed behind the dotnet CLI.
WIP to fix #18. No unit tests. Just playing around.