Add some diagnostic logging for tool exec

Author: baronfel

src/Cli/dotnet/Commands/Tool/Execute/ToolExecuteCommand.cs

@@ -84,11 +84,9 @@ public override int Execute()
 
         (var bestVersion, var packageSource) = _toolPackageDownloader.GetNuGetVersion(packageLocation, packageId, _verbosity, versionRange, _restoreActionConfig);
 
-        IToolPackage toolPackage;
-
         //  TargetFramework is null, which means to use the current framework.  Global tools can override the target framework to use (or select assets for),
         //  but we don't support this for local or one-shot tools.
-        if (!_toolPackageDownloader.TryGetDownloadedTool(packageId, bestVersion, targetFramework: null, out toolPackage))
+        if (!_toolPackageDownloader.TryGetDownloadedTool(packageId, bestVersion, targetFramework: null, verbosity: _verbosity, out var toolPackage))
         {
             if (!UserAgreedToRunFromSource(packageId, bestVersion, packageSource))
             {

src/Cli/dotnet/ToolPackage/IToolPackageDownloader.cs

@@ -1,8 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#nullable disable
-
+using System.Diagnostics.CodeAnalysis;
 using Microsoft.DotNet.Cli.NuGetPackageDownloader;
 using NuGet.Configuration;
 using NuGet.Versioning;
@@ -14,25 +13,27 @@ internal interface IToolPackageDownloader
     IToolPackage InstallPackage(PackageLocation packageLocation,
         PackageId packageId,
         VerbosityOptions verbosity,
-        VersionRange versionRange = null,
-        string targetFramework = null,
+        VersionRange? versionRange = null,
+        string? targetFramework = null,
         bool isGlobalTool = false,
         bool isGlobalToolRollForward = false,
         bool verifySignatures = true,
-        RestoreActionConfig restoreActionConfig = null
+        RestoreActionConfig? restoreActionConfig = null
     );
 
     (NuGetVersion version, PackageSource source) GetNuGetVersion(
         PackageLocation packageLocation,
         PackageId packageId,
         VerbosityOptions verbosity,
-        VersionRange versionRange = null,
-        RestoreActionConfig restoreActionConfig = null
+        VersionRange? versionRange = null,
+        RestoreActionConfig? restoreActionConfig = null
     );
 
     bool TryGetDownloadedTool(
         PackageId packageId,
         NuGetVersion packageVersion,
-        string targetFramework,
-        out IToolPackage toolPackage);
+        string? targetFramework,
+        VerbosityOptions verbosity,
+        [NotNullWhen(true)]
+        out IToolPackage? toolPackage);
 }

src/Cli/dotnet/ToolPackage/ToolPackageDownloader.cs

@@ -1,19 +1,13 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-#nullable disable
-
-using System.Reflection;
 using Microsoft.DotNet.Cli.Extensions;
 using Microsoft.DotNet.Cli.NuGetPackageDownloader;
 using Microsoft.DotNet.Cli.Utils;
 using Microsoft.Extensions.EnvironmentAbstractions;
 using Microsoft.TemplateEngine.Utils;
-using Newtonsoft.Json.Linq;
 using NuGet.Client;
-using NuGet.Commands;
 using NuGet.Common;
-using NuGet.Configuration;
 using NuGet.ContentModel;
 using NuGet.Frameworks;
 using NuGet.LibraryModel;
@@ -30,23 +24,23 @@ internal class ToolPackageDownloader : ToolPackageDownloaderBase
 {
     public ToolPackageDownloader(
         IToolPackageStore store,
-        string runtimeJsonPathForTests = null,
-        string currentWorkingDirectory = null
+        string? runtimeJsonPathForTests = null,
+        string? currentWorkingDirectory = null
     ) : base(store, runtimeJsonPathForTests, currentWorkingDirectory, FileSystemWrapper.Default)
     {
     }
 
     protected override INuGetPackageDownloader CreateNuGetPackageDownloader(
         bool verifySignatures,
         VerbosityOptions verbosity,
-        RestoreActionConfig restoreActionConfig)
+        RestoreActionConfig? restoreActionConfig)
     {
         ILogger verboseLogger = new NullLogger();
         if (verbosity.IsDetailedOrDiagnostic())
         {
             verboseLogger = new NuGetConsoleLogger();
         }
-        
+
         return new NuGetPackageDownloader.NuGetPackageDownloader(
             new DirectoryPath(),
             verboseLogger: verboseLogger,
@@ -63,13 +57,14 @@ protected override NuGetVersion DownloadAndExtractPackage(
         string packagesRootPath,
         NuGetVersion packageVersion,
         PackageSourceLocation packageSourceLocation,
+        VerbosityOptions verbosity,
         bool includeUnlisted = false
         )
     {
         var versionFolderPathResolver = new VersionFolderPathResolver(packagesRootPath);
 
-        string folderToDeleteOnFailure = null;
-        return TransactionalAction.Run<NuGetVersion>(() =>
+        string? folderToDeleteOnFailure = null;
+        return TransactionalAction.Run(() =>
         {
             var packagePath = nugetPackageDownloader.DownloadPackageAsync(packageId, packageVersion, packageSourceLocation,
                         includeUnlisted: includeUnlisted, downloadFolder: new DirectoryPath(packagesRootPath)).ConfigureAwait(false).GetAwaiter().GetResult();
@@ -86,11 +81,14 @@ protected override NuGetVersion DownloadAndExtractPackage(
 
                 var packageHash = Convert.ToBase64String(new CryptoHashProvider("SHA512").CalculateHash(reader.GetNuspec()));
                 var hashPath = versionFolderPathResolver.GetHashPath(packageId.ToString(), version);
-
-                Directory.CreateDirectory(Path.GetDirectoryName(hashPath));
+                Directory.CreateDirectory(Path.GetDirectoryName(hashPath)!);
                 File.WriteAllText(hashPath, packageHash);
             }
 
+            if (verbosity.IsDetailedOrDiagnostic())
+            {
+                Reporter.Output.WriteLine($"Extracting package {packageId}@{packageVersion} to {packagePath}");
+            }
             // Extract the package
             var nupkgDir = versionFolderPathResolver.GetInstallPath(packageId.ToString(), version);
             nugetPackageDownloader.ExtractPackageAsync(packagePath, new DirectoryPath(nupkgDir)).ConfigureAwait(false).GetAwaiter().GetResult();
@@ -111,7 +109,6 @@ protected override bool IsPackageInstalled(PackageId packageId, NuGetVersion pac
         NuGetv3LocalRepository nugetLocalRepository = new(packagesRootPath);
 
         var package = nugetLocalRepository.FindPackage(packageId.ToString(), packageVersion);
-
         return package != null;
     }
 
@@ -126,7 +123,8 @@ protected override void CreateAssetFile(
         DirectoryPath packagesRootPath,
         string assetFilePath,
         string runtimeJsonGraph,
-        string targetFramework = null
+        VerbosityOptions verbosity,
+        string? targetFramework = null
         )
     {
         // To get runtimeGraph:
@@ -222,7 +220,7 @@ protected static IEnumerable<LockFileItem> GetLockFileItems(
     protected static IEnumerable<LockFileItem> GetLockFileItems(
        IReadOnlyList<SelectionCriteria> criteria,
        ContentItemCollection items,
-       Action<LockFileItem> additionalAction,
+       Action<LockFileItem>? additionalAction,
        params PatternSet[] patterns)
     {
         // Loop through each criteria taking the first one that matches one or more items.