Skip to content
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

Jump to bottom

Collect and bubble up "Build" TargetOutputs #183

Merged
merged 2 commits into from
Jun 2, 2020
Merged

Collect and bubble up "Build" TargetOutputs #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cca214c
Collect and bubble up "Build" TargetOutputs
MeikTranel May 28, 2020
3ad2f76
Merge branch 'master' into traversalBuildOutputs
MeikTranel Jun 1, 2020
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
43 changes: 43 additions & 0 deletions src/Traversal.UnitTests/TraversalTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,5 +302,48 @@ public void WorksWhenConfigurationSpecified(string configuration)

result.ShouldBeTrue(customMessage: () => buildOutput.GetConsoleLog());
}

[Fact]
public void CollectsProjectReferenceBuildTargetOutputs()
{
string[] projects = new[]
{
GetSkeletonCSProjWithTargetOutputs("A"),
GetSkeletonCSProjWithTargetOutputs("B")
}.Select(i => i.FullPath).ToArray();

var subTraversalProject = ProjectCreator
.Templates
.TraversalProject(projects, path: GetTempFile("dirs.proj"))
.Save();

ProjectCreator
.Create(path: GetTempFile("root.proj"))
.Target("BuildTraversalProject")
.Task(
"MSBuild",
parameters: new Dictionary<string, string>
{
["Projects"] = subTraversalProject.FullPath,
["Targets"] = "Build"
})
.TaskOutputItem("TargetOutputs", "CollectedOutputs")
.TaskMessage("%(CollectedOutputs.Identity)", MessageImportance.High)
.Save()
.TryBuild("BuildTraversalProject", out bool result, out BuildOutput buildOutput);

buildOutput.Messages.High.Count.ShouldBe(2, customMessage: () => buildOutput.GetConsoleLog());
buildOutput.Messages.High.ShouldContain("A.dll", customMessage: () => buildOutput.GetConsoleLog());
buildOutput.Messages.High.ShouldContain("B.dll", customMessage: () => buildOutput.GetConsoleLog());

ProjectCreator GetSkeletonCSProjWithTargetOutputs(string projectName)
{
return ProjectCreator.Templates.SdkCsproj(path: GetTempFile($"{projectName}.csproj"), sdk: string.Empty)
.Target("Build", returns: "@(TestReturnItem)")
.TargetItemGroup()
.TargetItemInclude("TestReturnItem", "$(MSBuildThisFileName).dll")
.Save();
}
}
}
}
7 changes: 5 additions & 2 deletions src/Traversal/Sdk/Sdk.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,13 +112,16 @@

<Target Name="Build"
DependsOnTargets="$(BuildDependsOn)"
Condition=" '$(IsGraphBuild)' != 'true' " >
Condition=" '$(IsGraphBuild)' != 'true' "
Returns="@(CollectedBuildOutput)">
<MSBuild Projects="@(ProjectReference)"
Condition="'%(ProjectReference.Build)' != 'false'"
BuildInParallel="$([MSBuild]::ValueOrDefault('%(ProjectReference.BuildInParallel)', '$(BuildInParallel)'))"
SkipNonexistentProjects="$(SkipNonexistentProjects)"
SkipNonexistentTargets="$(SkipNonexistentTargets)"
ContinueOnError="$(ContinueOnError)" />
ContinueOnError="$(ContinueOnError)">
<Output TaskParameter="TargetOutputs" ItemName="CollectedBuildOutput" />
</MSBuild>
</Target>

<Target Name="Clean"
Expand Down