From 0fca85f89a34d96466c4c4fcfee06717341aa3c9 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 19 Aug 2024 10:08:33 +0200
Subject: [PATCH] Fix GetTargetPath hook point (#106553)

I noticed that in some environments, the existing hook point (AfterTargets=GetTargetPathWithTargetPlatformMoniker) doesn't work. That resulted in some project compiling against the src instead of the ref assembly.

DependsOnTargets + BeforeTargets="GetTargetPath" is is more correct anyway and works as exected.
---
 eng/illink.targets          | 3 ++-
 eng/intellisense.targets    | 4 ++--
 eng/resolveContract.targets | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/eng/illink.targets b/eng/illink.targets
index 5304ecd8d1eb3..29dd3dd83bf76 100644
--- a/eng/illink.targets
+++ b/eng/illink.targets
@@ -73,7 +73,8 @@
   <!-- Flow the ILLinkSuppressionsXmls item list down to consuming projects, in order for sfx.proj and oob.proj to
        receive the suppression files. -->
   <Target Name="AnnotateTargetPathWithILLinkSuppressionsXmlsProp"
-          AfterTargets="GetTargetPathWithTargetPlatformMoniker">
+          DependsOnTargets="GetTargetPathWithTargetPlatformMoniker"
+          BeforeTargets="GetTargetPath">
     <ItemGroup>
       <TargetPathWithTargetPlatformMoniker ILLinkSuppressionsXmls="@(ILLinkSuppressionsXmls->Metadata('FullPath'))" />
     </ItemGroup>
diff --git a/eng/intellisense.targets b/eng/intellisense.targets
index 7e1cb0054d311..be8cfd197b04d 100644
--- a/eng/intellisense.targets
+++ b/eng/intellisense.targets
@@ -66,8 +66,8 @@
 
   <!-- Allow P2Ps to retrieve the DocFileItem path. -->
   <Target Name="AnnotateTargetPathWithTargetPlatformMonikerWithDocFileItem"
-          DependsOnTargets="ChangeDocumentationFileForPackaging"
-          AfterTargets="GetTargetPathWithTargetPlatformMoniker">
+          DependsOnTargets="ChangeDocumentationFileForPackaging;GetTargetPathWithTargetPlatformMoniker"
+          BeforeTargets="GetTargetPath">
     <ItemGroup>
       <TargetPathWithTargetPlatformMoniker DocFileItem="@(DocFileItem)" />
     </ItemGroup>
diff --git a/eng/resolveContract.targets b/eng/resolveContract.targets
index fb93fcd09e9a6..9e5189a757253 100644
--- a/eng/resolveContract.targets
+++ b/eng/resolveContract.targets
@@ -39,8 +39,8 @@
   <!-- Allow P2Ps that target a source project to build against the corresponding ref project. -->
   <Target Name="AnnotateTargetPathWithTargetPlatformMonikerWithReferenceAssembly"
           Condition="'$(AnnotateTargetPathWithContract)' == 'true'"
-          DependsOnTargets="ResolveProjectReferences"
-          AfterTargets="GetTargetPathWithTargetPlatformMoniker">
+          DependsOnTargets="ResolveProjectReferences;GetTargetPathWithTargetPlatformMoniker"
+          BeforeTargets="GetTargetPath">
     <ItemGroup>
       <TargetPathWithTargetPlatformMoniker ReferenceAssembly="@(ResolvedMatchingContract)" />
     </ItemGroup>