Ensure that RID-specific packages set the right package type

Author: baronfel

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

@@ -319,6 +319,40 @@ Copyright (c) .NET Foundation. All rights reserved.
     </ItemGroup>
   </Target>
 
+  <UsingTask TaskName="AddPackageType" AssemblyFile="$(MicrosoftNETBuildTasksAssembly)" />
+
+  <Target Name="SetDotnetToolPackageType"
+          Condition=" '$(PackAsTool)' == 'true' "
+          BeforeTargets="GenerateNuspec">
+
+    <PropertyGroup>
+      <_ToolPackageType Condition="'$(RuntimeIdentifier)' != '' And '$(_HasRIDSpecificTools)' != ''">DotnetToolRidPackage</_ToolPackageType>
+      <_ToolPackageType Condition="'$(_ToolPackageType)' == ''">DotnetTool</_ToolPackageType>
+    </PropertyGroup>
+
+    <!--
+    PackageType is semicolon-delimited, case-insensitive, with an optional version.
+
+    DotnetTool should be added to the set of package types if the PackAsTool property is set to true.
+
+    Examples:
+       PackageType = ''                     -> 'DotnetTool'
+       PackageType = 'MyCustomType'         -> 'DotnetTool;MyCustomType'
+       PackageType = 'MyCustomType, 1.0'    -> 'DotnetTool;MyCustomType, 1.0'
+       PackageType = 'dotnettool'           -> 'dotnettool'
+       PackageType = 'DotnetTool, 1.0.0.0'  -> 'DotnetTool, 1.0.0.0'
+       PackageType = 'DotnetTool , 1.0.0.0' -> 'DotnetTool , 1.0.0.0'
+       PackageType = 'MyDotnetTool'         -> 'DotnetTool;MyDotnetTool'
+
+    _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>
+
+  </Target>
+
   <!-- orchestrator for making the N RID-specific tool packages -->
   <Target Name="_CreateRIDSpecificToolPackages" Condition="'$(RuntimeIdentifier)' == '' and $(_HasRIDSpecificTools) and '$(PublishAot)' != 'true'">
     <PropertyGroup>

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

@@ -42,41 +42,6 @@ Copyright (c) .NET Foundation. All rights reserved.
     <DotnetCliToolTargetFramework>netcoreapp2.2</DotnetCliToolTargetFramework>
   </PropertyGroup>
 
-  <UsingTask TaskName="AddPackageType" AssemblyFile="$(MicrosoftNETBuildTasksAssembly)" />
-
-  <Target Name="SetDotnetToolPackageType"
-          Condition=" '$(PackAsTool)' == 'true' "
-          BeforeTargets="GenerateNuspec">
-
-    <PropertyGroup>
-      <_ToolPackageType Condition="'$(RuntimeIdentifier)' != '' And '$(ToolPackageRuntimeIdentifiers)' != ''">DotnetToolRidPackage</_ToolPackageType>
-      <_ToolPackageType Condition="'$(_ToolPackageType)' == ''">DotnetTool</_ToolPackageType>
-    </PropertyGroup>
-
-
-    <!--
-    PackageType is semicolon-delimited, case-insensitive, with an optional version.
-
-    DotnetTool should be added to the set of package types if the PackAsTool property is set to true.
-
-    Examples:
-       PackageType = ''                     -> 'DotnetTool'
-       PackageType = 'MyCustomType'         -> 'DotnetTool;MyCustomType'
-       PackageType = 'MyCustomType, 1.0'    -> 'DotnetTool;MyCustomType, 1.0'
-       PackageType = 'dotnettool'           -> 'dotnettool'
-       PackageType = 'DotnetTool, 1.0.0.0'  -> 'DotnetTool, 1.0.0.0'
-       PackageType = 'DotnetTool , 1.0.0.0' -> 'DotnetTool , 1.0.0.0'
-       PackageType = 'MyDotnetTool'         -> 'DotnetTool;MyDotnetTool'
-
-    _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>
-
-  </Target>
-
   <PropertyGroup Condition="'$(EnablePreviewFeatures)' == 'true' And '$(IsNetCoreAppTargetingLatestTFM)' == 'true'">
     <LangVersion>Preview</LangVersion>
   </PropertyGroup>