Skip to content

Don't flow self contained command-line option to referenced projects #6924

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 5 commits into from
Aug 19, 2022
Merged

Don't flow self contained command-line option to referenced projects #6924

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9c56b5e
Don't flow self contained command-line option to referenced projects
dsplaisted Oct 7, 2021
f849bea
Switch from IsRidAgnostic metadata to AcceptsRuntimeIdentifier property
dsplaisted Oct 11, 2021
59bf77d
Use IsRidAgnostic instead of AcceptsRuntimeIdentifier
dsplaisted Aug 12, 2022
ab2662a
Add task to handle IsRidAgnostic metadata for multitargeted projects
dsplaisted Aug 18, 2022
512a065
Apply code review feedback
dsplaisted Aug 18, 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
Apply code review feedback
  • Loading branch information
@dsplaisted
dsplaisted committed Aug 18, 2022
commit 512a0652036407e60662e02c7828dd847aebe668
6 changes: 3 additions & 3 deletions src/Tasks/Microsoft.Common.CurrentVersion.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1795,7 +1795,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
Targets="GetTargetFrameworks"
BuildInParallel="$(BuildInParallel)"
ContinueOnError="!$(BuildingProject)"
RemoveProperties="%(_MSBuildProjectReferenceExistent.GlobalPropertiesToRemove);TargetFramework;RuntimeIdentifier;SelfContained;Platform;Configuration$(_GlobalPropertiesToRemoveFromProjectReferences)"
RemoveProperties="%(_MSBuildProjectReferenceExistent.GlobalPropertiesToRemove);TargetFramework;RuntimeIdentifier;SelfContained;Platform;Configuration;$(_GlobalPropertiesToRemoveFromProjectReferences)"
Condition="'%(_MSBuildProjectReferenceExistent.SkipGetTargetFrameworkProperties)' != 'true' and '$(EnableDynamicPlatformResolution)' == 'true'"
SkipNonexistentTargets="true">
<Output TaskParameter="TargetOutputs" ItemName="_ProjectReferenceTargetFrameworkPossibilities" />
Expand Down Expand Up @@ -1961,8 +1961,8 @@ Copyright (C) Microsoft Corporation. All rights reserved.
Generally this value will come from the IsRidAgnostic property set by the .NET SDK. If that's not set, then the fallback logic here will be that the project
is RID agnostic if it doesn't have RuntimeIdentifier or RuntimeIdentifiers properties set. -->
<IsRidAgnostic>$(IsRidAgnostic)</IsRidAgnostic>
<IsRidAgnostic Condition=" '$(IsRidAgnostic)' == '' and '$(RuntimeIdentifier)' == '' and '$(RuntimeIdentifiers)' == '' ">false</IsRidAgnostic>
<IsRidAgnostic Condition=" '$(IsRidAgnostic)' == ''">true</IsRidAgnostic>
<IsRidAgnostic Condition=" '$(IsRidAgnostic)' == '' and '$(RuntimeIdentifier)' == '' and '$(RuntimeIdentifiers)' == '' ">true</IsRidAgnostic>
<IsRidAgnostic Condition=" '$(IsRidAgnostic)' == ''">false</IsRidAgnostic>

</_TargetFrameworkInfo>
</ItemGroup>
Expand Down