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

Remove opt in for new schema for CombineTargetFrameworkInfoProperties #6928

Merged
merged 6 commits into from
Apr 11, 2022
Merged

Remove opt in for new schema for CombineTargetFrameworkInfoProperties #6928

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ee48e23
Remove opt in for new schema
Forgind Oct 8, 2021
ebaa450
Update src/Tasks/Microsoft.Common.CurrentVersion.targets
Forgind Oct 8, 2021
4e1147e
Put back attribute
Forgind Oct 8, 2021
d669e98
Merge branch 'main' of https://github.com/dotnet/msbuild into remove-…
Forgind Feb 18, 2022
b7c40f8
Put in change wave
Forgind Feb 28, 2022
fedbbca
Update src/Tasks/CombineTargetFrameworkInfoProperties.cs
Forgind Feb 28, 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
3 changes: 2 additions & 1 deletion src/Framework/ChangeWaves.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ internal class ChangeWaves
{
internal static readonly Version Wave16_10 = new Version(16, 10);
internal static readonly Version Wave17_0 = new Version(17, 0);
internal static readonly Version[] AllWaves = { Wave16_10, Wave17_0 };
internal static readonly Version Wave17_2 = new Version(17, 2);
internal static readonly Version[] AllWaves = { Wave16_10, Wave17_0, Wave17_2 };

/// <summary>
/// Special value indicating that all features behind all Change Waves should be enabled.
Expand Down
2 changes: 1 addition & 1 deletion src/Tasks/CombineTargetFrameworkInfoProperties.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public override bool Execute()
{
if (PropertiesAndValues != null)
{
XElement root = UseAttributeForTargetFrameworkInfoPropertyNames ?
Forgind marked this conversation as resolved.
Show resolved Hide resolved
XElement root = ChangeWaves.AreFeaturesEnabled(ChangeWaves.Wave17_2) || UseAttributeForTargetFrameworkInfoPropertyNames ?
Forgind marked this conversation as resolved.
Show resolved Hide resolved
new("TargetFramework", new XAttribute("Name", EscapingUtilities.Escape(RootElementName))) :
new(RootElementName);

Expand Down
7 changes: 1 addition & 6 deletions src/Tasks/Microsoft.Common.CurrentVersion.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1905,14 +1905,9 @@ Copyright (C) Microsoft Corporation. All rights reserved.
</_AdditionalTargetFrameworkInfoPropertyWithValue>
</ItemGroup>

<PropertyGroup>
<_UseAttributeForTargetFrameworkInfoPropertyNames Condition="'$(_UseAttributeForTargetFrameworkInfoPropertyNames)' == ''">false</_UseAttributeForTargetFrameworkInfoPropertyNames>
Copy link
Member Author

Choose a reason for hiding this comment

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

Also put this in a change wave? I vote no because it's a private property, so anyone abusing it knows they might be broken.

Copy link
Member

Choose a reason for hiding this comment

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

Agree.

</PropertyGroup>

<CombineTargetFrameworkInfoProperties
RootElementName="$(TargetFramework)"
PropertiesAndValues="@(_AdditionalTargetFrameworkInfoPropertyWithValue)"
UseAttributeForTargetFrameworkInfoPropertyNames="$(_UseAttributeForTargetFrameworkInfoPropertyNames)">
PropertiesAndValues="@(_AdditionalTargetFrameworkInfoPropertyWithValue)">
<Output TaskParameter="Result"
PropertyName="_AdditionalTargetFrameworkInfoProperties"/>
</CombineTargetFrameworkInfoProperties>
Expand Down