more WIP

Author: baronfel

src/Cli/dotnet/Program.cs

@@ -291,7 +291,7 @@ static void InvokeBuiltInCommand(ParseResult parseResult, out int exitCode)
             // walk the parent command tree to find the top-level command name and get the full command name for this parseresult
             List<string> parentNames = [parseResult.CommandResult.Command.Name];
             var current = parseResult.CommandResult.Parent;
-            while (parseResult.CommandResult.Parent is CommandResult parentCommandResult)
+            while (current is CommandResult parentCommandResult)
             {
                 parentNames.Add(parentCommandResult.Command.Name);
                 current = parentCommandResult.Parent;

src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs

@@ -66,13 +66,13 @@ protected override NuGetVersion DownloadAndExtractPackage(
         bool includeUnlisted = false
         )
     {
-        using var _downloadActivity = Activities.s_source.StartActivity("download-tool");
-        _downloadActivity?.DisplayName = $"Downloading tool {packageId}@{packageVersion}";
         var versionFolderPathResolver = new VersionFolderPathResolver(packagesRootPath);
 
         string folderToDeleteOnFailure = null;
         return TransactionalAction.Run<NuGetVersion>(() =>
         {
+            using var _downloadActivity = Activities.s_source.StartActivity("download-tool");
+            _downloadActivity?.DisplayName = $"Downloading tool {packageId}@{packageVersion}";
             var packagePath = nugetPackageDownloader.DownloadPackageAsync(packageId, packageVersion, packageSourceLocation,
                         includeUnlisted: includeUnlisted, downloadFolder: new DirectoryPath(packagesRootPath)).ConfigureAwait(false).GetAwaiter().GetResult();
             _downloadActivity?.AddEvent(new("Downloaded package"));