From 862b5c6ae839e80437c332963db9869e339a3655 Mon Sep 17 00:00:00 2001
From: Jose Perez Rodriguez <joperezr@microsoft.com>
Date: Fri, 23 Aug 2024 14:41:24 -0700
Subject: [PATCH 1/3] Fix issue where replacement text is not getting evaluated
 when pack

---
 eng/ReplaceText.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/ReplaceText.targets b/eng/ReplaceText.targets
index 9890863abf2..8e032f4ba9b 100644
--- a/eng/ReplaceText.targets
+++ b/eng/ReplaceText.targets
@@ -34,7 +34,7 @@
   that use the processed file but preserve all other metadata.
   -->
   <Target Name="GenerateTextReplacementFiles"
-    BeforeTargets="Build;AssignTargetPaths"
+    BeforeTargets="Build;AssignTargetPaths;_GetPackageFiles"
     DependsOnTargets="_GatherTextReplacementFiles;_ProcessTextReplacementFiles"
     Condition="@(None->AnyHaveMetadataValue('PerformTextReplacement', 'True'))"
     >

From f16e6cff60d7d00280883b45c5005cb88d3a17c1 Mon Sep 17 00:00:00 2001
From: Jose Perez Rodriguez <joperezr@microsoft.com>
Date: Fri, 23 Aug 2024 16:38:24 -0700
Subject: [PATCH 2/3] Do not depend on Restore target and instead copy to obj
 directory

---
 eng/ReplaceText.targets      |  2 +-
 eng/dcppack/Common.projitems | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/eng/ReplaceText.targets b/eng/ReplaceText.targets
index 8e032f4ba9b..9890863abf2 100644
--- a/eng/ReplaceText.targets
+++ b/eng/ReplaceText.targets
@@ -34,7 +34,7 @@
   that use the processed file but preserve all other metadata.
   -->
   <Target Name="GenerateTextReplacementFiles"
-    BeforeTargets="Build;AssignTargetPaths;_GetPackageFiles"
+    BeforeTargets="Build;AssignTargetPaths"
     DependsOnTargets="_GatherTextReplacementFiles;_ProcessTextReplacementFiles"
     Condition="@(None->AnyHaveMetadataValue('PerformTextReplacement', 'True'))"
     >
diff --git a/eng/dcppack/Common.projitems b/eng/dcppack/Common.projitems
index 7a01c1815c9..fa759044167 100644
--- a/eng/dcppack/Common.projitems
+++ b/eng/dcppack/Common.projitems
@@ -48,9 +48,17 @@
 
   <Target Name="Build" />
 
-  <Target Name="GetDCPBinaryLocation" Returns="$(DCPBinariesLocation)" DependsOnTargets="Restore">
+  <Target Name="_CopyDCPBinaryToIntermediateDir" AfterTargets="Build">
+    <ItemGroup>
+      <_DcpFilesToCopy Include="$(NuGetPackageRoot)microsoft.developercontrolplane.$(DcpPlatform)/$(MicrosoftDeveloperControlPlanedarwinamd64PackageVersion)\tools\**\*" />
+    </ItemGroup>
+
+    <Copy SourceFiles="@(_DcpFilesToCopy)" DestinationFolder="$(IntermediateOutputPath)\tools" />
+  </Target>
+
+  <Target Name="GetDCPBinaryLocation" Returns="$(DCPBinariesLocation)">
     <PropertyGroup>
-      <DCPBinariesLocation>$(NuGetPackageRoot)microsoft.developercontrolplane.$(DcpPlatform)/$(MicrosoftDeveloperControlPlanedarwinamd64PackageVersion)/tools</DCPBinariesLocation>
+      <DCPBinariesLocation>$(IntermediateOutputPath)/tools</DCPBinariesLocation>
     </PropertyGroup>
   </Target>
 

From 911a69ede90a4ac6c21152821c357153954cc36f Mon Sep 17 00:00:00 2001
From: Jose Perez Rodriguez <joperezr@microsoft.com>
Date: Fri, 23 Aug 2024 20:58:30 -0700
Subject: [PATCH 3/3] Include recursive dir

---
 eng/dcppack/Common.projitems | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/dcppack/Common.projitems b/eng/dcppack/Common.projitems
index fa759044167..2aa23ec83d4 100644
--- a/eng/dcppack/Common.projitems
+++ b/eng/dcppack/Common.projitems
@@ -53,7 +53,7 @@
       <_DcpFilesToCopy Include="$(NuGetPackageRoot)microsoft.developercontrolplane.$(DcpPlatform)/$(MicrosoftDeveloperControlPlanedarwinamd64PackageVersion)\tools\**\*" />
     </ItemGroup>
 
-    <Copy SourceFiles="@(_DcpFilesToCopy)" DestinationFolder="$(IntermediateOutputPath)\tools" />
+    <Copy SourceFiles="@(_DcpFilesToCopy)" DestinationFolder="$(IntermediateOutputPath)\tools\%(RecursiveDir)" />
   </Target>
 
   <Target Name="GetDCPBinaryLocation" Returns="$(DCPBinariesLocation)">