Skip to content

Update handling of SelfContained and RuntimeIdentifier properties when specified on the command line #21986

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
dsplaisted merged 12 commits into from
Aug 22, 2022
Merged

Update handling of SelfContained and RuntimeIdentifier properties when specified on the command line #21986

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5c8503a
Improve handling of RuntimeIdentifier and SelfContained across projec…
dsplaisted Oct 12, 2021
5f4ba10
Add test for SelfContained flowing across project reference
dsplaisted Oct 12, 2021
63ae00b
Move AcceptsRuntimeIdentifier logic and exclude test projects
dsplaisted Oct 12, 2021
bf9b7a3
Add breaking change information
dsplaisted Oct 12, 2021
45f8979
Detect whether SelfContained is a global property inside task
dsplaisted Oct 18, 2021
117a1c9
Handle consuming AcceptsRuntimeIdentifier metadata from multi-targete…
dsplaisted Dec 3, 2021
26df179
Use IsRidAgnostic instead of AcceptsRuntimeIdentifier
dsplaisted Aug 12, 2022
579ad7f
Handle more cases of global property flow
dsplaisted Aug 18, 2022
4468b0b
Add tests for global property flow across project references
dsplaisted Aug 18, 2022
8a303dd
Code review feedback
dsplaisted Aug 19, 2022
27fe291
Require updated MSBuild for global property flow tests
dsplaisted Aug 22, 2022
4d634e9
Fix tests
dsplaisted Aug 22, 2022
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
Prev Previous commit
Next Next commit
Move AcceptsRuntimeIdentifier logic and exclude test projects
  • Loading branch information
@dsplaisted
dsplaisted committed Aug 12, 2022
commit 63ae00b1af54cc74a8d1dd7b426e2b783e0d6911
8 changes: 0 additions & 8 deletions src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.BeforeCommon.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,6 @@ Copyright (c) .NET Foundation. All rights reserved.

</PropertyGroup>

<!-- Set the AcceptsRuntimeIdentifier property if this project should accept global RuntimeIdentifier and SelfContained
property values from referencing projects. -->
<PropertyGroup Condition="'$(AcceptsRuntimeIdentifier)' == ''">
<AcceptsRuntimeIdentifier Condition="'$(_IsExecutable)' == 'true' Or
'$(RuntimeIdentifier)' != '' Or
'$(RuntimeIdentifiers)' != ''">true</AcceptsRuntimeIdentifier>
</PropertyGroup>

<PropertyGroup Condition="'$(HasRuntimeOutput)' == ''">
<HasRuntimeOutput>$(_IsExecutable)</HasRuntimeOutput>
<_UsingDefaultForHasRuntimeOutput>true</_UsingDefaultForHasRuntimeOutput>
Expand Down
8 changes: 8 additions & 0 deletions src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,14 @@ Copyright (c) .NET Foundation. All rights reserved.
<PredefinedCulturesOnly Condition="'$(PredefinedCulturesOnly)' == '' and '$(InvariantGlobalization)' == 'true'">true</PredefinedCulturesOnly>
</PropertyGroup>

<!-- Set the AcceptsRuntimeIdentifier property if this project should accept global RuntimeIdentifier and SelfContained
property values from referencing projects. -->
<PropertyGroup Condition="'$(AcceptsRuntimeIdentifier)' == '' And '$(IsTestProject)' != 'true'">
<AcceptsRuntimeIdentifier Condition="'$(_IsExecutable)' == 'true' Or
'$(RuntimeIdentifier)' != '' Or
'$(RuntimeIdentifiers)' != ''">true</AcceptsRuntimeIdentifier>
Copy link
Member

@rainersigwald rainersigwald Oct 15, 2021

Choose a reason for hiding this comment

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

Does this imply that if the project has any RID, we'll flow the RID from the entrypoint? Is that what we want? What if e.g. the entry-point is win11-x64 and the reference is win7-x86? That seems like an OK combination to me . . .

Copy link
Member Author

@dsplaisted dsplaisted Oct 18, 2021

Choose a reason for hiding this comment

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

Yes, we will flow any RID. Most of this is existing logic, ie if RuntimeIdentifier or RuntimeIdentifiers was set in the referenced project, we would have flowed the RID since .NET Core 1.0 I think. The change here is to also flow it if the referenced project is an Exe project, but not if it's a test project.

</PropertyGroup>

<!-- Opt into .NET Core resource-serialization strategy by default when targeting frameworks
that support it by default.
-->
Expand Down