Skip to content

Work around Microsoft/msbuild#3345 #1683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 7, 2019
Merged

Work around Microsoft/msbuild#3345 #1683

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 9 additions & 2 deletions src/Microsoft.DotNet.Helix/Sdk/tools/Microsoft.DotNet.Helix.Sdk.MultiQueue.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,22 @@

<Import Project="$(_HelixMultiQueueTargets)" Condition="'$(_HelixMultiQueueTargets)' != ''"/>

<Target Name="Test"
<Target Name="CoreTest"
DependsOnTargets="$(TestDependsOn)">
<MSBuild Projects="$(MSBuildProjectFile)" Targets="Test" Properties="HelixTargetQueue=%(HelixTargetQueue.Identity);%(HelixTargetQueue.AdditionalProperties)">
<Output TaskParameter="TargetOutputs" ItemName="SentJobs" />
</MSBuild>
</Target>

<!-- Work around https://github.com/Microsoft/msbuild/issues/3345
(failures in AfterTargets of the entry target don't fail the build)
by ensuring that the entry-point target Test has simple dependencies
and hooking Wait to CoreTest instead of the entry-point. -->
<Target Name="Test"
DependsOnTargets="CoreTest" />

<Target Name="Wait"
AfterTargets="Test"
AfterTargets="CoreTest"
Condition="$(WaitForWorkItemCompletion)">
<Message Importance="High" Text="Waiting on job completion..." />
<HelixWait Jobs="@(SentJobs)" AccessToken="$(HelixAccessToken)" Source="$(HelixSource)" Type="$(HelixType)" Build="$(HelixBuild)" IsExternal="$(IsExternal)" Creator="$(Creator)" />
Expand Down