Simplify ToolRestoreResult

There doesn't seem to be a reason to have SaveToCache be a list

Author: dsplaisted

src/Cli/dotnet/Commands/Tool/Restore/ToolPackageRestorer.cs

@@ -47,7 +47,7 @@ public ToolPackageRestorer(IToolPackageDownloader toolPackageDownloader,
         _fileSystem = fileSystem ?? new FileSystemWrapper();
     }
 
-    public ToolRestoreResult InstallPackages(
+    public ToolRestoreResult InstallPackage(
         ToolManifestPackage package,
         FilePath? configFile)
     {
@@ -56,7 +56,7 @@ public ToolRestoreResult InstallPackages(
         if (PackageHasBeenRestored(package, targetFramework))
         {
             return ToolRestoreResult.Success(
-                saveToCache: [],
+                saveToCache: null,
                 message: string.Format(
                     CliCommandStrings.RestoreSuccessful, package.PackageId,
                     package.Version.ToNormalizedString(), string.Join(", ", package.CommandNames)));
@@ -89,13 +89,13 @@ public ToolRestoreResult InstallPackages(
 
             return ToolRestoreResult.Success(
                 saveToCache:
-                    [(new RestoredCommandIdentifier(
+                    (new RestoredCommandIdentifier(
                         toolPackage.Id,
                         toolPackage.Version,
                         NuGetFramework.Parse(targetFramework),
                         Constants.AnyRid,
                         toolPackage.Command.Name),
-                    toolPackage.Command)],
+                    toolPackage.Command),
                 message: string.Format(
                     CliCommandStrings.RestoreSuccessful,
                     package.PackageId,

src/Cli/dotnet/Commands/Tool/Restore/ToolRestoreCommand.cs

@@ -115,11 +115,12 @@ public override int Execute()
         ToolRestoreResult[] toolRestoreResults =
             [.. packagesFromManifest
                 .AsEnumerable()
-                .Select(package => toolPackageRestorer.InstallPackages(package, configFile))];
+                .Select(package => toolPackageRestorer.InstallPackage(package, configFile))];
 
         Dictionary<RestoredCommandIdentifier, ToolCommand> downloaded =
-            toolRestoreResults.SelectMany(result => result.SaveToCache)
-                .ToDictionary(pair => pair.Item1, pair => pair.Item2);
+            toolRestoreResults.Select(result => result.SaveToCache)
+                .Where(item => item is not null)
+                .ToDictionary(pair => pair.Value.Item1, pair => pair.Value.Item2);
 
         EnsureNoCommandNameCollision(downloaded);
 
@@ -202,26 +203,26 @@ private static void EnsureNoCommandNameCollision(Dictionary<RestoredCommandIdent
 
     public struct ToolRestoreResult
     {
-        public (RestoredCommandIdentifier, ToolCommand)[] SaveToCache { get; }
+        public (RestoredCommandIdentifier, ToolCommand)? SaveToCache { get; }
         public bool IsSuccess { get; }
         public string Message { get; }
 
         private ToolRestoreResult(
-            (RestoredCommandIdentifier, ToolCommand)[] saveToCache,
+            (RestoredCommandIdentifier, ToolCommand)? saveToCache,
             bool isSuccess, string message)
         {
             if (string.IsNullOrWhiteSpace(message))
             {
                 throw new ArgumentException("message", nameof(message));
             }
 
-            SaveToCache = saveToCache ?? [];
+            SaveToCache = saveToCache;
             IsSuccess = isSuccess;
             Message = message;
         }
 
         public static ToolRestoreResult Success(
-            (RestoredCommandIdentifier, ToolCommand)[] saveToCache,
+            (RestoredCommandIdentifier, ToolCommand)? saveToCache,
             string message)
         {
             return new ToolRestoreResult(saveToCache, true, message);