don't use Items for ToolPackageRuntimeIdentifier - use a property instead for ease of use

Author: baronfel

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

@@ -70,7 +70,8 @@ Copyright (c) .NET Foundation. All rights reserved.
       <ToolEntryPoint Condition=" '$(UseAppHost)' == 'true' ">$(AssemblyName)$(_NativeExecutableExtension)</ToolEntryPoint>
     </PropertyGroup>
 
-    <PropertyGroup Condition="'@(ToolPackageRuntimeIdentifier)' != '' And '$(RuntimeIdentifier)' != ''">
+    <!-- inner-build tool packages get a RID suffix -->
+    <PropertyGroup Condition="'$(ToolPackageRuntimeIdentifier)' != '' And '$(RuntimeIdentifier)' != ''">
       <PackageId>$(PackageId).$(RuntimeIdentifier)</PackageId>
     </PropertyGroup>
 
@@ -127,13 +128,14 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   <Target Name="_GenerateToolsSettingsFileInputCache">
     <ItemGroup>
+      <_ToolPackageRuntimeIdentifier Include="$(ToolRuntimeIdentifier)" />
       <_GenerateToolsSettingsFileInputCacheToHash Include="$(ToolEntryPoint)" />
       <_GenerateToolsSettingsFileInputCacheToHash Include="$(ToolCommandName)" />
       <_GenerateToolsSettingsFileInputCacheToHash Include="$(ToolCommandRunner)" />
       <_GenerateToolsSettingsFileInputCacheToHash Include="$(ToolRuntimeIdentifier)" />
       <_GenerateToolsSettingsFileInputCacheToHash Include="$(PackageId)" />
       <_GenerateToolsSettingsFileInputCacheToHash Include="$(Version)" />
-      <_GenerateToolsSettingsFileInputCacheToHash Include="@(ToolPackageRuntimeIdentifier->'%(Identity)%(Version)')" />
+      <_GenerateToolsSettingsFileInputCacheToHash Include="@(_ToolPackageRuntimeIdentifier->'%(Identity)')" />
     </ItemGroup>
 
     <Hash ItemsToHash="@(_GenerateToolsSettingsFileInputCacheToHash)">
@@ -164,7 +166,7 @@ Copyright (c) .NET Foundation. All rights reserved.
        RuntimeIdentifier="$(ToolRuntimeIdentifier)"
        ToolPackageId="$(PackageId)"
        ToolPackageVersion="$(Version)"
-       ToolPackageRuntimeIdentifiers="@(ToolPackageRuntimeIdentifier)"
+       ToolPackageRuntimeIdentifiers="@(_ToolPackageRuntimeIdentifier)"
        ToolsSettingsFilePath="$(_ToolsSettingsFilePath)" />
   </Target>
 

src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.Common.targets

@@ -54,7 +54,7 @@ Copyright (c) .NET Foundation. All rights reserved.
           BeforeTargets="GenerateNuspec">
 
     <PropertyGroup>
-      <_ToolPackageType Condition="'$(RuntimeIdentifier)' != '' And '@(ToolPackageRuntimeIdentifier)' != ''">DotnetToolRidPackage</_ToolPackageType>
+      <_ToolPackageType Condition="'$(RuntimeIdentifier)' != '' And '$(ToolPackageRuntimeIdentifier)' != ''">DotnetToolRidPackage</_ToolPackageType>
       <_ToolPackageType Condition="'$(_ToolPackageType)' == ''">DotnetTool</_ToolPackageType>
     </PropertyGroup>
 
@@ -75,7 +75,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 
     _PaddedPackageType is used to ensure that the PackageType is semicolon delimited and can be easily checked for an existing DotnetTool package type.
     -->
-    
+
     <AddPackageType CurrentPackageType="$(PackageType)" PackageTypeToAdd="$(_ToolPackageType)">
       <Output TaskParameter="UpdatedPackageType" PropertyName="PackageType" />
     </AddPackageType>