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

Support gathering additional arbitrary properties from referenced projects #5994

Merged
merged 4 commits into from Feb 3, 2021
Merged

Support gathering additional arbitrary properties from referenced projects #5994

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
19284a3
Support gathering additional arbitrary properties from referenced pro…
dsplaisted Dec 31, 2020
9ca4269
Use Xml for gathering additional properties from referenced projects
dsplaisted Jan 26, 2021
63cd06e
Fix tasks when inputs not set
dsplaisted Jan 27, 2021
8682eb1
Apply code review feedback
dsplaisted Jan 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Tasks/Microsoft.Common.CrossTargeting.targets
View file
Open in desktop
Expand Up @@ -32,6 +32,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
<TargetFrameworks>@(_TargetFrameworkInfo)</TargetFrameworks>
<TargetFrameworkMonikers>@(_TargetFrameworkInfo->'%(TargetFrameworkMonikers)')</TargetFrameworkMonikers>
<TargetPlatformMonikers>@(_TargetFrameworkInfo->'%(TargetPlatformMonikers)')</TargetPlatformMonikers>
<AdditionalPropertiesFromProject>@(_TargetFrameworkInfo->'%(AdditionalPropertiesFromProject)', ';;')</AdditionalPropertiesFromProject>

<HasSingleTargetFramework>false</HasSingleTargetFramework>

Expand Down
12 changes: 12 additions & 0 deletions src/Tasks/Microsoft.Common.CurrentVersion.targets
View file
Open in desktop
Expand Up @@ -1730,6 +1730,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
<TargetFrameworks>@(_TargetFrameworkInfo)</TargetFrameworks>
<TargetFrameworkMonikers>@(_TargetFrameworkInfo->'%(TargetFrameworkMonikers)')</TargetFrameworkMonikers>
<TargetPlatformMonikers>@(_TargetFrameworkInfo->'%(TargetPlatformMonikers)')</TargetPlatformMonikers>
<AdditionalPropertiesFromProject>@(_TargetFrameworkInfo->'%(AdditionalPropertiesFromProject)', ';;')</AdditionalPropertiesFromProject>
dsplaisted marked this conversation as resolved.
Show resolved Hide resolved

<HasSingleTargetFramework>true</HasSingleTargetFramework>

Expand All @@ -1743,12 +1744,23 @@ Copyright (C) Microsoft Corporation. All rights reserved.
<Target Name="GetTargetFrameworksWithPlatformForSingleTargetFramework"
Returns="@(_TargetFrameworkInfo)">

<ItemGroup>
<_AdditionalTargetFrameworkInfoPropertyWithValue Include="@(AdditionalTargetFrameworkInfoProperty)">
<PropertyAndValue>@(AdditionalTargetFrameworkInfoProperty->'%(Identity)')=$(%(AdditionalTargetFrameworkInfoProperty.Identity))</PropertyAndValue>
</_AdditionalTargetFrameworkInfoPropertyWithValue>
</ItemGroup>

<PropertyGroup>
<_AdditionalTargetFrameworkInfoProperties>@(_AdditionalTargetFrameworkInfoPropertyWithValue->'%(PropertyAndValue)')</_AdditionalTargetFrameworkInfoProperties>
</PropertyGroup>

<ItemGroup>
<_TargetFrameworkInfo Include="$(TargetFramework)">
<TargetFrameworks>$(TargetFramework)</TargetFrameworks>
<TargetFrameworkMonikers>$(TargetFrameworkMoniker)</TargetFrameworkMonikers>
<TargetPlatformMonikers>$(TargetPlatformMoniker)</TargetPlatformMonikers>
<TargetPlatformMonikers Condition="'$(TargetPlatformMoniker)' == ''">None</TargetPlatformMonikers>
<AdditionalPropertiesFromProject>$(_AdditionalTargetFrameworkInfoProperties)</AdditionalPropertiesFromProject>
</_TargetFrameworkInfo>
</ItemGroup>

Expand Down