Don't modify behavior when PackAsTool is set unless actually packing

Author: dsplaisted

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

@@ -105,7 +105,7 @@ Copyright (c) .NET Foundation. All rights reserved.
                  '$(RuntimeIdentifier)' == '' and
                  '$(_IsExecutable)' == 'true' and
                  '$(IsRidAgnostic)' != 'true' and
-                 '$(PackAsTool)' != true and
+                 ('$(PackAsTool)' != 'true' or '$(_IsPacking)' != 'true') and
                  (
                    '$(SelfContained)' == 'true' or
                    ('$(_IsPublishing)' == 'true' and
@@ -216,10 +216,8 @@ Copyright (c) .NET Foundation. All rights reserved.
                                   $([MSBuild]::VersionLessThan('$(_TargetFrameworkVersionWithoutV)', '5.0'))">$(DefaultAppHostRuntimeIdentifier.Replace("arm64", "x64"))</DefaultAppHostRuntimeIdentifier>
   </PropertyGroup>
 
-  <Target Name="_CheckForUnsupportedAppHostUsage"
-          BeforeTargets="_CheckForInvalidConfigurationAndPlatform"
-          Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(HasRuntimeOutput)' == 'true'">
-
+  <Target Name="_CheckRIDAsserts"
+          Condition="'$(PackAsTool)' != 'true' or '$(_IsPacking)' != 'true'">
     <!-- The following RID errors are asserts, and we don't expect them to ever occur. The error message is added as a safeguard.-->
     <NETSdkError Condition="'$(SelfContained)' == 'true' and '$(RuntimeIdentifier)' == '' and '$(AllowSelfContainedWithoutRuntimeIdentifier)' != 'true'"
                  ResourceName="ImplicitRuntimeIdentifierResolutionForPublishPropertyFailed"
@@ -237,6 +235,14 @@ Copyright (c) .NET Foundation. All rights reserved.
                 ResourceName="ImplicitRuntimeIdentifierResolutionForPublishPropertyFailed"
                 FormatArguments="PublishAot"/>
 
+  </Target>
+  
+  <Target Name="_CheckForUnsupportedAppHostUsage"
+          BeforeTargets="_CheckForInvalidConfigurationAndPlatform"
+          DependsOnTargets="_CheckRIDAsserts"
+          Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(HasRuntimeOutput)' == 'true'">
+
+
     <!-- End of implicit RID resolver checks.-->
 
     <NETSdkError Condition="'$(PublishSelfContained)' != 'true' and '$(PublishSelfContained)' != 'false' and '$(PublishSelfContained)' != ''"