Skip to content

Commit baf2973

Browse files
committed
!fixup! <Copy/> not <Delete/>
1 parent ecf65ca commit baf2973

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

eng/targets/Helix.targets

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,11 +178,17 @@
178178
<Output TaskParameter="AbsolutePaths" PropertyName="PublishAbsoluteDir" />
179179
</ConvertToAbsolutePath>
180180

181-
<!-- Temporary: Remove assemblies from work item payload found in shared Fx. -->
181+
<!-- Another heavy hammer: Overwrite assemblies from work item payload with those found in shared Fx. -->
182182
<ItemGroup>
183-
<_FilesToDelete Include="$(LocalDotNetRoot)shared\$(SharedFxName)\$(SharedFxVersion)\*.dll" />
183+
<_FilesToUse Include="$(LocalDotNetRoot)shared\$(SharedFxName)\$(SharedFxVersion)\*.dll"
184+
Condition=" EXISTS('$(PublishAbsoluteDir)%(Filename).dll') " />
184185
</ItemGroup>
185-
<Delete Files="@(_FilesToDelete->'$(PublishAbsoluteDir)%(Filename)%(Extension)')" />
186+
<Copy SourceFiles="@(_FilesToUse)"
187+
DestinationFolder="$(PublishAbsoluteDir)"
188+
OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)"
189+
Retries="$(CopyRetryCount)"
190+
RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"
191+
SkipUnchangedFiles="$(SkipCopyUnchangedFiles)" />
186192

187193
<ItemGroup>
188194
<HelixWorkItem Include="$(HelixTestName)">

0 commit comments

Comments
 (0)