Multi-RID tool packages usability tweaks

src/Cli/dotnet/ToolPackage/ToolConfigurationDeserialization/DotNetCliToolRuntimeIdentifierPackage.cs

@@ -16,7 +16,4 @@ public class DotNetCliToolRuntimeIdentifierPackage
 
     [XmlAttribute]
     public string? Id { get; set; }
-
-    [XmlAttribute]
-    public string? Version { get; set; }
 }

src/Cli/dotnet/ToolPackage/ToolConfigurationDeserializer.cs

@@ -67,7 +67,7 @@ public static ToolConfiguration Deserialize(string pathToXml, IFileSystem fileSy
                     dotNetCliTool.Commands[0].Runner));
         }
 
-        var ridSpecificPackages = dotNetCliTool.RuntimeIdentifierPackages?.ToDictionary(p => p.RuntimeIdentifier, p => new PackageIdentity(p.Id, new NuGet.Versioning.NuGetVersion(p.Version)))
+        var ridSpecificPackages = dotNetCliTool.RuntimeIdentifierPackages?.ToDictionary(p => p.RuntimeIdentifier, p => new PackageIdentity(p.Id, null))
             .AsReadOnly();
 
         //  Also error out if there are no RID-specific packages and the runner is empty

src/Cli/dotnet/ToolPackage/ToolPackageDownloaderBase.cs

@@ -276,15 +276,14 @@ protected virtual void DownloadTool(
         CreateAssetFile(packageId, packageVersion, packageDownloadDir, Path.Combine(assetFileDirectory.Value, ToolPackageInstance.AssetsFileName), _runtimeJsonPath, targetFramework);
 
         //  Also download RID-specific package if needed
-        var ridSpecificPackage = ResolveRidSpecificPackage(packageId, packageVersion, packageDownloadDir, assetFileDirectory);
-        if (ridSpecificPackage != null)
+        if (ResolveRidSpecificPackage(packageId, packageVersion, packageDownloadDir, assetFileDirectory) is PackageId ridSpecificPackage)
         {
-            if (!IsPackageInstalled(new PackageId(ridSpecificPackage.Id), ridSpecificPackage.Version, packageDownloadDir.Value))
+            if (!IsPackageInstalled(ridSpecificPackage, packageVersion, packageDownloadDir.Value))
             {
-                DownloadAndExtractPackage(new PackageId(ridSpecificPackage.Id), nugetPackageDownloader, packageDownloadDir.Value, ridSpecificPackage.Version, packageSourceLocation, includeUnlisted: true);
+                DownloadAndExtractPackage(ridSpecificPackage, nugetPackageDownloader, packageDownloadDir.Value, packageVersion, packageSourceLocation, includeUnlisted: true);
             }
 
-            CreateAssetFile(new PackageId(ridSpecificPackage.Id), ridSpecificPackage.Version, packageDownloadDir, Path.Combine(assetFileDirectory.Value, ToolPackageInstance.RidSpecificPackageAssetsFileName), _runtimeJsonPath, targetFramework);
+            CreateAssetFile(ridSpecificPackage, packageVersion, packageDownloadDir, Path.Combine(assetFileDirectory.Value, ToolPackageInstance.RidSpecificPackageAssetsFileName), _runtimeJsonPath, targetFramework);
         }
     }
 
@@ -301,15 +300,14 @@ public bool TryGetDownloadedTool(
         }
         CreateAssetFile(packageId, packageVersion, _localToolDownloadDir, Path.Combine(_localToolAssetDir.Value, ToolPackageInstance.AssetsFileName), _runtimeJsonPath, targetFramework);
 
-        var ridSpecificPackage = ResolveRidSpecificPackage(packageId, packageVersion, _localToolDownloadDir, _localToolAssetDir);
-        if (ridSpecificPackage != null)
+        if (ResolveRidSpecificPackage(packageId, packageVersion, _localToolDownloadDir, _localToolAssetDir) is PackageId ridSpecificPackage)
         {
-            if (!IsPackageInstalled(new PackageId(ridSpecificPackage.Id), ridSpecificPackage.Version, _localToolDownloadDir.Value))
+            if (!IsPackageInstalled(ridSpecificPackage, packageVersion, _localToolDownloadDir.Value))
             {
                 toolPackage = null;
                 return false;
             }
-            CreateAssetFile(new PackageId(ridSpecificPackage.Id), ridSpecificPackage.Version, _localToolDownloadDir,
+            CreateAssetFile(ridSpecificPackage, packageVersion, _localToolDownloadDir,
                 Path.Combine(_localToolAssetDir.Value, ToolPackageInstance.RidSpecificPackageAssetsFileName), _runtimeJsonPath, targetFramework);
         }
 
@@ -322,7 +320,7 @@ public bool TryGetDownloadedTool(
 
     }
 
-    private PackageIdentity? ResolveRidSpecificPackage(PackageId packageId,
+    private PackageId? ResolveRidSpecificPackage(PackageId packageId,
         NuGetVersion packageVersion,
         DirectoryPath packageDownloadDir,
         DirectoryPath assetFileDirectory)
@@ -341,7 +339,11 @@ public bool TryGetDownloadedTool(
 
             var resolvedPackage = toolConfiguration.RidSpecificPackages[bestRuntimeIdentifier];
 
-            return resolvedPackage;
+            if (resolvedPackage is PackageIdentity p)
+            {
+                return new PackageId(p.Id);
+            }
+            return null;
         }
 
         return null;

src/Tasks/Microsoft.NET.Build.Tasks/GenerateToolsSettingsFile.cs

@@ -79,13 +79,6 @@ internal static XDocument GenerateDocument(string entryPointRelativePath, string
                     string ridPackageId = toolPackageId + "." + toolPackageRuntimeIdentifier;
                     packageNode.Add(new XAttribute("Id", ridPackageId));
 
-                    string ridPackageVersion = runtimeIdentifierPackage.GetMetadata("Version");
-                    if (string.IsNullOrEmpty(ridPackageVersion))
-                    {
-                        ridPackageVersion = toolPackageVersion;
-                    }
-                    packageNode.Add(new XAttribute("Version", ridPackageVersion));
-
                     runtimeIdentifierPackagesNode.Add(packageNode);
                 }
             }

src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.PackTool.props

@@ -12,6 +12,5 @@ Copyright (c) .NET Foundation. All rights reserved.
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);PackTool</TargetsForTfmSpecificContentInPackage>
   </PropertyGroup>
 </Project>