Clean up error experience when downloading non-tools

Author: Forgind

src/Cli/dotnet/NugetPackageDownloader/INuGetPackageDownloader.cs

@@ -16,7 +16,8 @@ Task<string> DownloadPackageAsync(PackageId packageId,
             bool includePreview = false,
             bool? includeUnlisted = null,
             DirectoryPath? downloadFolder = null,
-            PackageSourceMapping packageSourceMapping = null);
+            PackageSourceMapping packageSourceMapping = null,
+            bool isTool = false);
 
         Task<string> GetPackageUrl(PackageId packageId,
             NuGetVersion packageVersion = null,

src/Cli/dotnet/NugetPackageDownloader/LocalizableStrings.resx

@@ -126,6 +126,9 @@
   <data name="IsNotFoundInNuGetFeeds" xml:space="preserve">
     <value>{0} is not found in NuGet feeds {1}.</value>
   </data>
+  <data name="NotATool" xml:space="preserve">
+    <value>Package {0} is not a dotnet tool.</value>
+  </data>
   <data name="DownloadVersionFailed" xml:space="preserve">
     <value>Downloading {0} version {1} failed.</value>
   </data>

src/Cli/dotnet/NugetPackageDownloader/NuGetPackageDownloader.cs

@@ -86,19 +86,30 @@ public async Task<string> DownloadPackageAsync(PackageId packageId,
             bool includePreview = false,
             bool? includeUnlisted = null,
             DirectoryPath? downloadFolder = null,
-            PackageSourceMapping packageSourceMapping = null)
+            PackageSourceMapping packageSourceMapping = null,
+            bool isTool = false)
         {
             CancellationToken cancellationToken = CancellationToken.None;
 
             (var source, var resolvedPackageVersion) = await GetPackageSourceAndVersion(packageId, packageVersion,
                 packageSourceLocation, includePreview, includeUnlisted ?? packageVersion is not null, packageSourceMapping).ConfigureAwait(false);
 
-            FindPackageByIdResource resource = null;
             SourceRepository repository = GetSourceRepository(source);
 
-            resource = await repository.GetResourceAsync<FindPackageByIdResource>(cancellationToken)
-                .ConfigureAwait(false);
+            if (isTool && await repository.GetResourceAsync<ServiceIndexResourceV3>().ConfigureAwait(false) is ServiceIndexResourceV3 serviceIndex)
+            {
+                var uri = serviceIndex.GetServiceEntries("SearchQueryService/3.5.0")[0].Uri;
+                var queryUri = uri + $"?q={packageId}&packageType=dotnettool";
+                using HttpClient client = new(new HttpClientHandler() { CheckCertificateRevocationList = true });
+                using HttpResponseMessage response = await client.GetAsync(queryUri).ConfigureAwait(false);
+                if (response.Content.Headers.ContentLength == 139)
+                {
+                    throw new ToolPackageException(string.Format(LocalizableStrings.NotATool, packageId));
+                }
+            }
 
+            FindPackageByIdResource resource = await repository.GetResourceAsync<FindPackageByIdResource>(cancellationToken)
+                .ConfigureAwait(false);
             if (resource == null)
             {
                 throw new NuGetPackageNotFoundException(