WIP: Test dcp path

dotnet · Aug 20, 2024 · bd4ea6f · bd4ea6f
1 parent c3cdb9b
commit bd4ea6f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/eng/dcppack/Common.projitems b/eng/dcppack/Common.projitems
@@ -48,7 +48,7 @@
 
   <Target Name="Build" />
 
-  <Target Name="GetDCPBinaryLocation" Returns="$(DCPBinariesLocation)">
+  <Target Name="GetDCPBinaryLocation" Returns="$(DCPBinariesLocation)" DependsOnTargets="Restore">
     <PropertyGroup>
       <DCPBinariesLocation>$(NuGetPackageRoot)microsoft.developercontrolplane.$(DcpPlatform)/$(MicrosoftDeveloperControlPlanedarwinamd64PackageVersion)/tools</DCPBinariesLocation>
     </PropertyGroup>

diff --git a/tests/helix/send-to-helix-inner.proj b/tests/helix/send-to-helix-inner.proj
@@ -165,8 +165,10 @@
     </MSBuild>
 
     <ItemGroup Condition="'$(NeedsDcpPathOverride)' == 'true'">
-      <_DcpInWorkloadPack Condition="'$(OS)' != 'Windows_NT'" Include="$(DCPBinaryLocation)\**\dcp" />
-      <_DcpInWorkloadPack Condition="'$(OS)' == 'Windows_NT'" Include="$(DCPBinaryLocation)\**\dcp.exe" />
+      <_joeTest Include="$(DCPBinaryLocation)\**\*" />
+
+      <_DcpInWorkloadPack Condition="'$(OS)' != 'Windows_NT'" Include="$(DCPBinaryLocation)/dcp" />
+      <_DcpInWorkloadPack Condition="'$(OS)' == 'Windows_NT'" Include="$(DCPBinaryLocation)\dcp.exe" />
 
       <HelixCorrelationPayload Include="@(_DcpInWorkloadPack -> '%(RootDir)%(Directory)')" Destination="dcp" />