revert previous approach, go with simpler-but-less-good-long-term fix due to release schedules

Author: baronfel

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

@@ -38,6 +38,9 @@ NOTE: This file is imported from the following contexts, so be aware when writin
             AssemblyFile="$(MicrosoftNETBuildTasksAssembly)" />
 
   <PropertyGroup>
+    <!-- tools are specially-formatted packages, so we tell nuget Pack to not even try to include build output -->
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+
     <!-- Determine information about all of the potential tool packages to build -->
     <!-- If shims are included, we need to make sure we restore for those RIDs so the apphost shims are available during restore/publish.
       This means that we need to set RuntimeIdentifiers. However we need to track certain information about the _users_ decisions around RIDs
@@ -48,15 +51,28 @@ NOTE: This file is imported from the following contexts, so be aware when writin
     <_UserSpecifiedToolPackageRids Condition="'$(_UserSpecifiedToolPackageRids)' == ''">$(RuntimeIdentifiers)</_UserSpecifiedToolPackageRids>
     <_HasRIDSpecificTools Condition=" '$(_UserSpecifiedToolPackageRids)' != '' ">true</_HasRIDSpecificTools>
     <_HasRIDSpecificTools Condition="'$(_HasRIDSpecificTools)' == ''">false</_HasRIDSpecificTools>
-    <!-- unlike all of the other computed properties here, we _do_ want to mutate RuntimeIdentifiers here so that we ensure that the shims are included in restores -->
     <RuntimeIdentifiers Condition="'$(PackAsToolShimRuntimeIdentifiers)' != ''">$(_UserSpecifiedToolPackageRids);$(PackAsToolShimRuntimeIdentifiers)</RuntimeIdentifiers>
 
     <_IsRidSpecific>false</_IsRidSpecific>
     <_IsRidSpecific Condition="'$(RuntimeIdentifier)' != '' and '$(RuntimeIdentifier)' != 'any'">true</_IsRidSpecific>
+
+    <!-- Not determine information about this specific build of a single (or more!) tool packages -->
+    <!-- the publish* properties _can_ be set, but only for the 'inner' RID-specific builds. We need to make sure that for the outer, agnostic build they are unset  -->
+    <!-- RID information is also stripped during Restore, so we need to make sure user
+         decisions are preserved when Restoring, so that publishing-related packages are implicitly included.  -->
+    <PublishSelfContained Condition="!$(_IsRidSpecific) and '$(MSBuildIsRestoring)' != 'true'">false</PublishSelfContained>
+    <!-- Have to set SelfContained similarly because PackTool targets are imported _after_ RuntimeIdentifierInference targets, where the Publish* properties are
+         forwarded to the 'base' properties. -->
+    <SelfContained Condition="!$(_IsRidSpecific) and '$(MSBuildIsRestoring)' != 'true'">false</SelfContained>
+    <PublishTrimmed Condition="!$(_IsRidSpecific) and '$(MSBuildIsRestoring)' != 'true'">false</PublishTrimmed>
+    <PublishReadyToRun Condition="!$(_IsRidSpecific) and '$(MSBuildIsRestoring)' != 'true'">false</PublishReadyToRun>
+    <PublishSingleFile Condition="!$(_IsRidSpecific) and '$(MSBuildIsRestoring)' != 'true'">false</PublishSingleFile>
+
     <!-- We need to know if the inner builds are _intended_ to be AOT even if we then explicitly disable AOT for the outer builds.
          Knowing this lets us correctly decide to create the RID-specific inner tools or not when packaging the outer tool. -->
     <_InnerToolsPublishAot>false</_InnerToolsPublishAot>
     <_InnerToolsPublishAot Condition="$(_HasRIDSpecificTools) and '$(PublishAot)' == 'true'">true</_InnerToolsPublishAot>
+    <PublishAot Condition="!$(_IsRidSpecific) and '$(MSBuildIsRestoring)' != 'true'">false</PublishAot>
 
     <!-- Tool implementation files are not included in the primary package when the tool has RID-specific packages.  So only pack the tool implementation
        (and only depend on publish) if there are no RID-specific packages, or if the RuntimeIdentifier is set. -->
@@ -92,6 +108,15 @@ NOTE: This file is imported from the following contexts, so be aware when writin
   - Consider a way of declaring what RID a RID-specific package is for, besides just the convention in the package ID
   -->
 
+  <!--
+    Mark all dependency as private assets. But keep them as Publish. So dependency DLLs will be included in NuGet package, while
+    there is no dependency in nuspec. And add Microsoft.NETCore.Platforms, which is used to select correct RID assets.
+    -->
+  <PropertyGroup>
+    <_ToolsSettingsFilePath>$(IntermediateOutputPath)DotnetToolSettings.xml</_ToolsSettingsFilePath>
+    <SuppressDependenciesWhenPacking Condition=" '$(PackAsTool)' == 'true' ">true</SuppressDependenciesWhenPacking>
+  </PropertyGroup>
+
  <!--
     PackageId must be set before:
      - _GenerateRestoreProjectSpec -> _GetRestoreSettings
@@ -108,12 +133,6 @@ NOTE: This file is imported from the following contexts, so be aware when writin
            property for 'you should expect a native binary here' -->
       <_ToolUsesPlatformSpecificExecutable Condition="$(_IsRidSpecific) and ('$(UseAppHost)' == 'true' or '$(PublishAot)' == 'true')">true</_ToolUsesPlatformSpecificExecutable>
       <_ToolUsesPlatformSpecificExecutable Condition="'$(_ToolUsesPlatformSpecificExecutable)' == ''">false</_ToolUsesPlatformSpecificExecutable>
-
-      <!-- Tool packages do not participate at all in NuGet package dependency tracking, so suppress that behavior. -->
-      <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
-
-      <!-- tools are specially-formatted packages, so we tell nuget Pack to not even try to include build output -->
-      <IncludeBuildOutput>false</IncludeBuildOutput>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(ToolCommandRunner)' == ''">
@@ -146,34 +165,8 @@ NOTE: This file is imported from the following contexts, so be aware when writin
   <Target Name="PackToPublishDependencyIndirection"
           DependsOnTargets="$(_PackToolPublishDependency)"/>
 
-  <PropertyGroup>
-    <_PackToolDependsOn>
-      EnsureCorrectPublishingProperties;
-      SetPackToolProperties;
-      GenerateToolsSettingsFileFromBuildProperty;
-      PackToPublishDependencyIndirection;
-      _PackToolValidation;
-      PackToolImplementation
-    </_PackToolDependsOn>
-  </PropertyGroup>
-
-  <Target Name="EnsureCorrectPublishingProperties" Condition="!$(_IsRidSpecific)">
-    <PropertyGroup>
-      <!-- The publish* properties _can_ be set, but only for the 'inner' RID-specific builds.
-           We need to make sure that for the outer, agnostic build they are unset -->
-      <PublishSelfContained>false</PublishSelfContained>
-      <!-- Have to set SelfContained similarly because PackTool targets are imported _after_ RuntimeIdentifierInference targets,
-           where the Publish* properties are forwarded to the 'base' properties. -->
-      <SelfContained>false</SelfContained>
-      <PublishTrimmed>false</PublishTrimmed>
-      <PublishReadyToRun>false</PublishReadyToRun>
-      <PublishSingleFile>false</PublishSingleFile>
-      <PublishAot>false</PublishAot>
-    </PropertyGroup>
-  </Target>
-
-  <Target Name="PackTool"
-    DependsOnTargets="$(_PackToolDependsOn)"
+  <Target Name="PackTool" DependsOnTargets="SetPackToolProperties;GenerateToolsSettingsFileFromBuildProperty;PackToPublishDependencyIndirection;_PackToolValidation;PackToolImplementation"
+    Condition=" '$(PackAsTool)' == 'true' "
     Returns="@(TfmSpecificPackageFile)">
     <ItemGroup>
       <_GeneratedFiles Include="$(_ToolsSettingsFilePath)"/>
@@ -210,15 +203,14 @@ NOTE: This file is imported from the following contexts, so be aware when writin
     </ItemGroup>
   </Target>
 
-  <Target Name="_GenerateToolsSettingsFileInputCache">
-    <PropertyGroup>
-      <_ToolsSettingsFilePath>$(IntermediateOutputPath)DotnetToolSettings.xml</_ToolsSettingsFilePath>
-      <ToolCommandName Condition=" '$(ToolCommandName)' == '' ">$(TargetName)</ToolCommandName>
-      <ToolRuntimeIdentifier Condition=" '$(ToolRuntimeIdentifier)' == ''">$(RuntimeIdentifier)</ToolRuntimeIdentifier>
-      <_GenerateToolsSettingsFileCacheFile Condition="'$(_GenerateToolsSettingsFileCacheFile)' == ''">$(IntermediateOutputPath)$(MSBuildProjectName).toolssettingsinput.cache</_GenerateToolsSettingsFileCacheFile>
-      <_GenerateToolsSettingsFileCacheFile>$([MSBuild]::NormalizePath($(MSBuildProjectDirectory), $(_GenerateToolsSettingsFileCacheFile)))</_GenerateToolsSettingsFileCacheFile>
-    </PropertyGroup>
+  <PropertyGroup>
+    <ToolCommandName Condition=" '$(ToolCommandName)' == '' ">$(TargetName)</ToolCommandName>
+    <ToolRuntimeIdentifier Condition=" '$(ToolRuntimeIdentifier)' == ''">$(RuntimeIdentifier)</ToolRuntimeIdentifier>
+    <_GenerateToolsSettingsFileCacheFile Condition="'$(_GenerateToolsSettingsFileCacheFile)' == ''">$(IntermediateOutputPath)$(MSBuildProjectName).toolssettingsinput.cache</_GenerateToolsSettingsFileCacheFile>
+    <_GenerateToolsSettingsFileCacheFile>$([MSBuild]::NormalizePath($(MSBuildProjectDirectory), $(_GenerateToolsSettingsFileCacheFile)))</_GenerateToolsSettingsFileCacheFile>
+  </PropertyGroup>
 
+  <Target Name="_GenerateToolsSettingsFileInputCache">
     <ItemGroup>
       <_ToolPackageRuntimeIdentifier Include="$(_UserSpecifiedToolPackageRids)" />
       <_GenerateToolsSettingsFileInputCacheToHash Include="$(ToolEntryPoint)" />
@@ -294,15 +286,13 @@ NOTE: This file is imported from the following contexts, so be aware when writin
     ============================================================
     -->
 
-  <Target Name="_ComputeShimProperties">
-    <PropertyGroup>
-      <_ShimInputCacheFile Condition="'$(_ShimInputCacheFile)' == ''">$(IntermediateOutputPath)$(MSBuildProjectName).shiminput.cache</_ShimInputCacheFile>
-      <_ShimInputCacheFile>$([MSBuild]::NormalizePath($(MSBuildProjectDirectory), $(_ShimInputCacheFile)))</_ShimInputCacheFile>
-      <_ShimCreatedSentinelFile Condition="'$(_ShimCreatedSentinelFile)' == ''">$(IntermediateOutputPath)$(MSBuildProjectName).shimcreated.sentinel</_ShimCreatedSentinelFile>
-      <_ShimCreatedSentinelFile>$([MSBuild]::NormalizePath($(MSBuildProjectDirectory), $(_ShimCreatedSentinelFile)))</_ShimCreatedSentinelFile>
-      <PackagedShimOutputRootDirectory Condition=" '$(PackagedShimOutputRootDirectory)' == '' ">$(OutDir)</PackagedShimOutputRootDirectory>
-    </PropertyGroup>
-  </Target>
+  <PropertyGroup>
+    <_ShimInputCacheFile Condition="'$(_ShimInputCacheFile)' == ''">$(IntermediateOutputPath)$(MSBuildProjectName).shiminput.cache</_ShimInputCacheFile>
+    <_ShimInputCacheFile>$([MSBuild]::NormalizePath($(MSBuildProjectDirectory), $(_ShimInputCacheFile)))</_ShimInputCacheFile>
+    <_ShimCreatedSentinelFile Condition="'$(_ShimCreatedSentinelFile)' == ''">$(IntermediateOutputPath)$(MSBuildProjectName).shimcreated.sentinel</_ShimCreatedSentinelFile>
+    <_ShimCreatedSentinelFile>$([MSBuild]::NormalizePath($(MSBuildProjectDirectory), $(_ShimCreatedSentinelFile)))</_ShimCreatedSentinelFile>
+    <PackagedShimOutputRootDirectory Condition=" '$(PackagedShimOutputRootDirectory)' == '' ">$(OutDir)</PackagedShimOutputRootDirectory>
+  </PropertyGroup>
 
   <Target Name="GenerateShimsAssets"
           BeforeTargets="CopyFilesToOutputDirectory"
@@ -342,7 +332,7 @@ NOTE: This file is imported from the following contexts, so be aware when writin
     </ItemGroup>
   </Target>
 
-  <Target Name="_ComputeExpectedEmbeddedApphostPaths" DependsOnTargets="_ComputeShimProperties" >
+  <Target Name="_ComputeExpectedEmbeddedApphostPaths">
     <GetEmbeddedApphostPaths
       PackagedShimOutputDirectory="$([MSBuild]::NormalizeDirectory($(PackagedShimOutputRootDirectory), 'shims', $(_ToolPackShortTargetFrameworkName)))"
       ShimRuntimeIdentifiers="@(_PackAsToolShimRuntimeIdentifiers)"
@@ -354,7 +344,7 @@ NOTE: This file is imported from the following contexts, so be aware when writin
 
   <!-- To achieve incremental build with property change. When any property changes, WriteOnlyWhenDifferent will be triggered to write cache file.
   And the cache file's timestamp will be later, and it then triggers the incremental build.-->
-  <Target Name="_GenerateShimInputCache" DependsOnTargets="ResolveAssemblyReferences;_ComputeShimProperties">
+  <Target Name="_GenerateShimInputCache" DependsOnTargets="ResolveAssemblyReferences">
     <ItemGroup>
       <_GenerateShimsAssetsInput Include="$(_ShimInputCacheFile)" />
       <_GenerateShimsAssetsInput Include="@(_ApphostsForShimRuntimeIdentifiers)"/>

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

@@ -96,7 +96,7 @@ Copyright (c) .NET Foundation. All rights reserved.
   ... for these properties is limited to publishing only scenarios.
 
   .NET Tools that build RID-specific packages will also need a primary package without a RuntimeIdentifier, so we disable RID inference for them
-  in order to build the primary package
+  in order to build the primary package, but only when we are actually packing.
 
   Finally, library projects and non-executable projects have awkward interactions here so they are excluded.
   -->
@@ -105,6 +105,7 @@ Copyright (c) .NET Foundation. All rights reserved.
                  '$(RuntimeIdentifier)' == '' and
                  '$(_IsExecutable)' == 'true' and
                  '$(IsRidAgnostic)' != 'true' and
+                 ('$(PackAsTool)' != true or '$(_IsPacking)' != 'true') and
                  (
                    '$(SelfContained)' == 'true' or
                    ('$(_IsPublishing)' == 'true' and

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

@@ -15,7 +15,7 @@ Copyright (c) .NET Foundation. All rights reserved.
   <Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.Sdk.SourceLink.targets" Condition="'$(SuppressImplicitGitSourceLink)' != 'true'"/>
   <!-- Importing the PackTool targets because tools that have TargetFrameworks set still need a couple key targets
        in order to package correctly, like the ones that add the DotnetTool PackageType. -->
-  <Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.PackTool.targets" Condition="'$(PackAsTool)' == 'true'" />
+  <Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.PackTool.targets" Condition="'$(PackAsTool)' == 'true' and '$(_IsPacking)' == 'true'" />
 
   <!--
   ============================================================

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

@@ -1381,7 +1381,7 @@ Copyright (c) .NET Foundation. All rights reserved.
   <Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.ObsoleteReferences.targets" />
   <Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.Publish.targets" />
   <Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.PackStubs.targets" Condition="('$(Language)' == 'C++' and '$(_EnablePackageReferencesInVCProjects)' != 'true')"/>
-  <Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.PackTool.targets" Condition="'$(PackAsTool)' == 'true'" />
+  <Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.PackTool.targets" Condition="'$(PackAsTool)' == 'true'  and '$(_IsPacking)' == 'true'" />
   <Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.PackProjectTool.targets" />
   <Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.PreserveCompilationContext.targets" />
   <Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.ConflictResolution.targets" />