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
Detect whether SelfContained is a global property inside task
  • Loading branch information
@dsplaisted
dsplaisted committed Aug 12, 2022
commit 45f8979059e8f787d48f8b1b01e81a7952d31992
6 changes: 3 additions & 3 deletions src/Tasks/Microsoft.NET.Build.Tasks/ValidateExecutableReferences.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ public class ValidateExecutableReferences : TaskBase
{
public bool SelfContained { get; set; }

public bool SelfContainedIsGlobalProperty { get; set; }

public bool IsExecutable { get; set; }

public ITaskItem[] ReferencedProjects { get; set; } = Array.Empty<ITaskItem>();
Expand Down Expand Up @@ -55,7 +53,9 @@ protected override void ExecuteCore()
bool referencedProjectIsExecutable = MSBuildUtilities.ConvertStringToBool(projectAdditionalProperties["_IsExecutable"]);
bool referencedProjectIsSelfContained = MSBuildUtilities.ConvertStringToBool(projectAdditionalProperties["SelfContained"]);

if (SelfContainedIsGlobalProperty && project.GetBooleanMetadata("AcceptsRuntimeIdentifier") == true)
bool selfContainedIsGlobalProperty = BuildEngine6.GetGlobalProperties().ContainsKey("SelfContained");

if (selfContainedIsGlobalProperty && project.GetBooleanMetadata("AcceptsRuntimeIdentifier") == true)
{
// If AcceptsRuntimeIdentifier is true for the project, and SelfContained was set as a global property,
// then the SelfContained value will flow across the project reference when we go to build it, despite the
Expand Down
13 changes: 0 additions & 13 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 @@ -1104,25 +1104,12 @@ Copyright (c) .NET Foundation. All rights reserved.
<_UseAttributeForTargetFrameworkInfoPropertyNames Condition="$([MSBuild]::VersionGreaterThanOrEquals($(MSBuildVersion), '17.0'))">true</_UseAttributeForTargetFrameworkInfoPropertyNames>
</PropertyGroup>

<PropertyGroup>
<!-- Check if SelfContained is specified as a global property, by trying to change its value and seeing if that's successful.
We need to know if it's a global property because if it is, then it will flow to referenced projects that had
AcceptsRuntimeIdentifier set to true, possibly overriding the value for SelfContained that we got back from
the GetTargetFrameworks negotiation. -->
<_SelfContainedBackupValue>$(SelfContained)</_SelfContainedBackupValue>
<SelfContained>NotAValue</SelfContained>
<_SelfContainedIsGlobalProperty Condition="'$(SelfContained)' == '$(_SelfContainedBackupValue)'">true</_SelfContainedIsGlobalProperty>
<SelfContained>$(_SelfContainedBackupValue)</SelfContained>
<_SelfContainedBackupValue></_SelfContainedBackupValue>
</PropertyGroup>

<Target Name="ValidateExecutableReferences"
AfterTargets="_GetProjectReferenceTargetFrameworkProperties"
Condition="'$(ValidateExecutableReferencesMatchSelfContained)' != 'false'">

<ValidateExecutableReferences
SelfContained="$(SelfContained)"
SelfContainedIsGlobalProperty="$(_SelfContainedIsGlobalProperty)"
IsExecutable="$(_IsExecutable)"
ReferencedProjects="@(_MSBuildProjectReferenceExistent)"
UseAttributeForTargetFrameworkInfoPropertyNames="$(_UseAttributeForTargetFrameworkInfoPropertyNames)"
Expand Down