Skip to content

Commit 7063d81

Browse files
authored
Fix issue where replacement text is not getting evaluated when pack (#5411)
* Fix issue where replacement text is not getting evaluated when pack * Do not depend on Restore target and instead copy to obj directory * Include recursive dir
1 parent 7d1c388 commit 7063d81

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

eng/dcppack/Common.projitems

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,17 @@
4848

4949
<Target Name="Build" />
5050

51-
<Target Name="GetDCPBinaryLocation" Returns="$(DCPBinariesLocation)" DependsOnTargets="Restore">
51+
<Target Name="_CopyDCPBinaryToIntermediateDir" AfterTargets="Build">
52+
<ItemGroup>
53+
<_DcpFilesToCopy Include="$(NuGetPackageRoot)microsoft.developercontrolplane.$(DcpPlatform)/$(MicrosoftDeveloperControlPlanedarwinamd64PackageVersion)\tools\**\*" />
54+
</ItemGroup>
55+
56+
<Copy SourceFiles="@(_DcpFilesToCopy)" DestinationFolder="$(IntermediateOutputPath)\tools\%(RecursiveDir)" />
57+
</Target>
58+
59+
<Target Name="GetDCPBinaryLocation" Returns="$(DCPBinariesLocation)">
5260
<PropertyGroup>
53-
<DCPBinariesLocation>$(NuGetPackageRoot)microsoft.developercontrolplane.$(DcpPlatform)/$(MicrosoftDeveloperControlPlanedarwinamd64PackageVersion)/tools</DCPBinariesLocation>
61+
<DCPBinariesLocation>$(IntermediateOutputPath)/tools</DCPBinariesLocation>
5462
</PropertyGroup>
5563
</Target>
5664

0 commit comments

Comments
 (0)