Skip to content

Add extension point to override TargetFramework in consuming project #6361

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
ViktorHofer merged 9 commits into from
Oct 8, 2020
Merged

Add extension point to override TargetFramework in consuming project #6361

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f30d23c
Add extension point to override TargetFramework in consumer
ViktorHofer Oct 8, 2020
190be25
Update Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk.targets
ViktorHofer Oct 8, 2020
aebc03f
Update ChooseBestP2PTargetFrameworkTask.cs
ViktorHofer Oct 8, 2020
952fe36
Update Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk.targets
ViktorHofer Oct 8, 2020
8be9506
Code cleanup
ViktorHofer Oct 8, 2020
318891e
Update ChooseBestP2PTargetFrameworkTask.cs
ViktorHofer Oct 8, 2020
2f067d7
Restore old property set
ViktorHofer Oct 8, 2020
696281c
Nit condition addition
ViktorHofer Oct 8, 2020
3ff5293
Feedback
ViktorHofer Oct 8, 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
14 changes: 9 additions & 5 deletions src/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk/src/ChooseBestP2PTargetFrameworkTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,13 @@
// The .NET Foundation licenses this file to you under the MIT license.

using Microsoft.Build.Framework;
using System;
using System.IO;

namespace Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk
{
public class ChooseBestP2PTargetFrameworkTask : BuildTask
{
[Required]
public string TargetFramework { get; set; }

[Required]
public ITaskItem[] ProjectReferencesWithTargetFrameworks { get; set; }

Expand All @@ -34,11 +32,17 @@ public override bool Execute()
targetFrameworksValue = projectReference.GetMetadata("TargetFrameworks");
}
string[] targetFrameworks = targetFrameworksValue.Split(';');

string consumingTargetFramework = projectReference.GetMetadata("ConsumingTargetFramework");
if (string.IsNullOrWhiteSpace(consumingTargetFramework))
{
throw new Exception($"ConsumingTargetFramework metadata must be set for Project {Path.GetFileName(projectReference.ItemSpec)}.");
}

string bestTargetFramework = targetFrameworkResolver.GetBestSupportedTargetFramework(targetFrameworks, TargetFramework);
string bestTargetFramework = targetFrameworkResolver.GetBestSupportedTargetFramework(targetFrameworks, consumingTargetFramework);
if (bestTargetFramework == null)
{
Log.LogError($"Not able to find a compatible supported target framework for {TargetFramework} in Project {Path.GetFileName(projectReference.ItemSpec)}. The Supported Configurations are {string.Join(", ", targetFrameworks)}");
Log.LogError($"Not able to find a compatible supported target framework for {consumingTargetFramework} in Project {Path.GetFileName(projectReference.ItemSpec)}. The Supported Configurations are {string.Join(", ", targetFrameworks)}");
}

projectReference.SetMetadata("SetTargetFramework", "TargetFramework=" + bestTargetFramework);
Expand Down
22 changes: 13 additions & 9 deletions ...ks.TargetFramework.Sdk/src/build/Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,22 +68,26 @@
BuildInParallel="$(BuildInParallel)"
RemoveProperties="TargetFramework;RuntimeIdentifier"
SkipNonexistentTargets="true">
<Output TaskParameter="TargetOutputs" ItemName="_ProjectRefWithTfms"/>
<Output TaskParameter="TargetOutputs" ItemName="_ProjectReferenceWithSetTargetFramework" />
</MSBuild>

<PropertyGroup>
<_OriginalTargetFramework Condition="'$(_OriginalTargetFramework)' == ''">$(TargetFramework)</_OriginalTargetFramework>
</PropertyGroup>

<ChooseBestP2PTargetFrameworkTask TargetFramework="$(_OriginalTargetFramework)"
ProjectReferencesWithTargetFrameworks="@(_ProjectRefWithTfms)"
<ItemGroup>
<_ProjectReferenceWithSetTargetFramework>
<ConsumingTargetFramework Condition="'%(ProjectReference.Identity)' == '%(Identity)' and '%(ProjectReference.ConsumingTargetFramework)' != ''">%(ProjectReference.ConsumingTargetFramework)</ConsumingTargetFramework>
<ConsumingTargetFramework Condition="'%(_ProjectReferenceWithSetTargetFramework.ConsumingTargetFramework)' == ''">$([MSBuild]::ValueOrDefault('$(_OriginalTargetFramework)', '$(TargetFramework)'))</ConsumingTargetFramework>
</_ProjectReferenceWithSetTargetFramework>
</ItemGroup>

<ChooseBestP2PTargetFrameworkTask ProjectReferencesWithTargetFrameworks="@(_ProjectReferenceWithSetTargetFramework)"
RuntimeGraph="$(RuntimeGraph)" >
<Output TaskParameter="AnnotatedProjectReferencesWithSetTargetFramework" ItemName="_ProjectReferencesWithBestTargetFrameworks" />
<Output TaskParameter="AnnotatedProjectReferencesWithSetTargetFramework" ItemName="_ProjectReferenceWithBestTargetFramework" />
</ChooseBestP2PTargetFrameworkTask>

<ItemGroup>
<ProjectReference Remove="@(ProjectReference)" />
<ProjectReference Include="@(_ProjectReferencesWithBestTargetFrameworks)" SkipGetTargetFrameworkProperties="true"/>
<ProjectReference Include="@(_ProjectReferenceWithBestTargetFramework)"
RemoveMetadata="ConsumingTargetFramework;RawTargetFrameworks"
SkipGetTargetFrameworkProperties="true" />
</ItemGroup>
</Target>

Expand Down