Skip to content

[api-merge] Fix for correctly calculating method level 'deprecated-since' attribute. #7645

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
merged 1 commit into from
Jan 5, 2023
Merged

[api-merge] Fix for correctly calculating method level 'deprecated-since' attribute. #7645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion build-tools/api-merge/ApiDescription.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@ public void Merge (XDocument n, string apiLocation)
continue;
}

UpdateDeprecatedSince (smember, nmember, platform);
if (nmember.Name.LocalName == "field") {
// FIXME: enable this to get the latest field attributes precisely.
/*
Expand All @@ -140,6 +139,9 @@ public void Merge (XDocument n, string apiLocation)
sa.SetValue (a.Value);
}
*/

UpdateDeprecatedSince (smember, nmember, platform);

#if KEEP_OLD_WRONG_COMPATIBILITY
var isDeprecatedS = smember.Attribute ("deprecated");
var isDeprecatedN = nmember.Attribute ("deprecated");
Expand All @@ -154,6 +156,9 @@ public void Merge (XDocument n, string apiLocation)
AddNewMember (stype, nmember, apiLocation, platform);
continue;
}

UpdateDeprecatedSince (smember, nmember, platform);

foreach (var a in nmember.Attributes ()) {
var sa = smember.Attribute (a.Name);
if (sa == null)
Expand Down
Loading