Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Make global tools work with helix #34913

Merged
ViktorHofer merged 2 commits into from
Jan 29, 2019
Merged

Make global tools work with helix #34913

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e326fc
Make global tools work with helix
ViktorHofer Jan 28, 2019
327621a
Add runtime dependencies as target inputs
ViktorHofer Jan 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion eng/sendtohelix.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,24 @@
<_RuntimeInputs Include="$(TestHostRootPath)**/*.dll" />
</ItemGroup>

<!-- Add global tools to runtime -->
<ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true'">
<TestArchiveRuntimeDependencies Include="$(GlobalToolsDir)**\*.*" />
Copy link
Copy Markdown
Member

@safern safern Jan 29, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: prefix with _?

Copy link
Copy Markdown
Member Author

@ViktorHofer ViktorHofer Jan 29, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be used from outside to add additional runtime dependencies therefore no underscore.

</ItemGroup>

<Target Name="CompressRuntimeDirectory"
Inputs="@(_RuntimeInputs)"
Inputs="@(_RuntimeInputs);@(TestArchiveRuntimeDependencies)"
Outputs="$(TestArchiveRuntimeFile)"
Condition="'$(TargetGroup)' != 'AllConfigurations'">

<!-- Copy additional test dependencies. -->
<Copy SourceFiles="@(TestArchiveRuntimeDependencies)"
DestinationFolder="$(TestHostRootPath)\%(RecursiveDir)"
SkipUnchangedFiles="true"
OverwriteReadOnlyFiles="true"
Retries="3"
RetryDelayMilliseconds="300" />

<MakeDir Directories="$(TestArchiveRuntimeRoot)" />
<ZipDirectory
SourceDirectory="$(TestHostRootPath)"
Expand Down