From 5765a40716317a85e5d54159e9644d312897896e Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Fri, 6 Mar 2020 13:22:39 +0100
Subject: [PATCH] Fix sequencing of TargetFramework stripping

Hooking into CollectPackageReferences for stripping the TargetFrameworkSuffix is a big hammer and unnecessary as the exact targets that read the TargetFrameworks value are _GetRestoreTargetFrameworksOutput;_GetRestoreTargetFrameworksAsItems. Those targets are always invoked as part of the _GenerateRestoreGraph on which we hook the attaching of the TargetFarmeworkSuffix then.
---
 .../Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk.targets  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/src/build/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk.targets b/src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/src/build/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk.targets
index dd75db03363..5a1e633eb77 100644
--- a/src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/src/build/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk.targets
+++ b/src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/src/build/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk.targets
@@ -43,7 +43,7 @@
   <!-- Restore does not take into account TargetFrameworkSuffix, so we remove the it from the TargetFramework before restore.-->
   <Target Name="StripTargetFrameworkSuffixFromTargetFrameworks"
           Condition="'$(TargetFrameworks)' != ''"
-          BeforeTargets="CollectPackageReferences">
+          BeforeTargets="_GetRestoreTargetFrameworksOutput;_GetRestoreTargetFrameworksAsItems">
     <ItemGroup>
       <_TargetFrameworks Include="$(TargetFrameworks)" />
       <!-- Remove placeholders from restore. -->
@@ -60,7 +60,7 @@
 
   <!-- Attaching the TargetFrameworkSuffix after restore for build.-->
   <Target Name="AttachTargetFrameworkSuffixToTargetFrameworks"
-          AfterTargets="Restore">    
+          AfterTargets="_GenerateRestoreGraph">    
     <PropertyGroup>
       <TargetFrameworks>$(_OriginalTargetFrameworks)</TargetFrameworks>
     </PropertyGroup>