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

[generator] Fix an issue where we'd not copy attributes from inlined protocols. #17381

Merged
merged 2 commits into from
Jan 30, 2023
Merged

[generator] Fix an issue where we'd not copy attributes from inlined protocols. #17381

merged 2 commits into from
Jan 30, 2023

Conversation

rolfbjarne
Copy link
Member

Protocols with one set of introduced attributes ([TV (12, 0)]) inlined in
types that were introduced in a different version ([TV (10, 0)]) would always
use the attributes from the type.

This is wrong if the protocol was introduced after the type, in which case we
should instead use the introduced attributes from the protocol.

Fix this by choosing the latest introduced attribute when we have multiple to
choose from.

This required passing a bit more information around so that we always know if
a member is being inlined in another type.

This PR will also print availability attributes on the protocol members themselves:

[Protocol]
interface IProtocol
{
	[TV (12, 0)] // this was not printed before
	[Export ("someProperty")]
	string SomeProperty { get; set; }
}

Also add and improve some tests.

Contributes towards #14802.

@rolfbjarne
[generator] Fix an issue where we'd not copy attributes from inlined …
5eec307 
…protocols.

Protocols with one set of introduced attributes ([TV (12, 0)]) inlined in
types that were introduced in a different version ([TV (10, 0)]) would always
use the attributes from the type.

This is wrong if the protocol was introduced after the type, in which case we
should instead use the introduced attributes from the protocol.

Fix this by choosing the latest introduced attribute when we have multiple to
choose from.

This required passing a bit more information around so that we always know if
a member is being inlined in another type.

This PR will also print availability attributes on the protocol members themselves:

	[Protocol]
	interface IProtocol
	{
		[TV (12, 0)] // this was not printed before
		[Export ("someProperty")]
		string SomeProperty { get; set; }
	}

Also add and improve some tests.

Contributes towards xamarin#14802.
@rolfbjarne rolfbjarne requested a review from dalexsoto as a code owner January 26, 2023 11:18
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
mandel-macaque
mandel-macaque approved these changes Jan 26, 2023
View reviewed changes
Copy link
Member

@mandel-macaque mandel-macaque left a comment

Choose a reason for hiding this comment

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

In 688fa45 you removed the filtering for the inline protocols that is now fixed in this PR. Should we get back to get appkit and uikit running this tests?

@rolfbjarne
Copy link
Member Author

In 688fa45 you removed the filtering for the inline protocols that is now fixed in this PR. Should we get back to get appkit and uikit running this tests?

The AppKit/UIKit problem is different, it happens for things like this:

xamarin-macios/src/xkit.cs

Lines 94 to 106 in 41384c6

// NSInteger -> NSLayoutManager.h
[Native]
[Flags]
[NoWatch]
[Mac (10, 11)]
[MacCatalyst (13, 0)]
public enum NSControlCharacterAction : long {
ZeroAdvancement = (1 << 0),
Whitespace = (1 << 1),
HorizontalTab = (1 << 2),
LineBreak = (1 << 3),
ParagraphBreak = (1 << 4),
ContainerBreak = (1 << 5),

where that ends up being AppKit.NSControlCharacterAction on macOS and UIKit.NSControlCharacterAction on other platforms, but the availability attributes are the same - so AppKit.NSControlCharacterAction on macOS would say the type is available on other platforms as well, which isn't true (because it's in a different namespace on other platforms).

@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2
Copy link
Collaborator

✅ API diff for current PR / commit

Legacy Xamarin (No breaking changes)
  • iOS (no change detected)
  • tvOS (no change detected)
  • watchOS (no change detected)
  • macOS (no change detected)
NET (empty diffs)
  • iOS: (empty diff detected)
  • tvOS: (empty diff detected)
  • MacCatalyst: (empty diff detected)
  • macOS: (empty diff detected)

✅ API diff vs stable

Legacy Xamarin (No breaking changes)
.NET (No breaking changes)
Legacy Xamarin (stable) vs .NET

ℹ️ Generator diff

Generator Diff: vsdrops (html) vsdrops (raw diff) gist (raw diff) - Please review changes)

Pipeline on Agent
Hash: 8de26afa9c51386e07fc16b2e89fa71ff6735529 [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

💻 [PR Build] Tests on macOS M1 - Mac Big Sur (11.5) passed 💻

✅ All tests on macOS M1 - Mac Big Sur (11.5) passed.

Pipeline on Agent
Hash: 8de26afa9c51386e07fc16b2e89fa71ff6735529 [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

📚 [PR Build] Artifacts 📚

Packages generated

View packages

Pipeline on Agent XAMBOT-1035.Monterey'
Hash: 8de26afa9c51386e07fc16b2e89fa71ff6735529 [PR build]

@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2
Copy link
Collaborator

🚀 [CI Build] Test results 🚀

Test results

✅ All tests passed on VSTS: simulator tests.

🎉 All 225 tests passed 🎉

Tests counts

✅ bcl: All 69 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ cecil: All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests: All 1 tests passed. Html Report (VSDrops) Download
✅ fsharp: All 7 tests passed. Html Report (VSDrops) Download
✅ framework: All 8 tests passed. Html Report (VSDrops) Download
✅ generator: All 2 tests passed. Html Report (VSDrops) Download
✅ interdependent_binding_projects: All 7 tests passed. Html Report (VSDrops) Download
✅ install_source: All 1 tests passed. Html Report (VSDrops) Download
✅ introspection: All 8 tests passed. Html Report (VSDrops) Download
✅ linker: All 65 tests passed. Html Report (VSDrops) Download
✅ mac_binding_project: All 1 tests passed. Html Report (VSDrops) Download
✅ mmp: All 2 tests passed. Html Report (VSDrops) Download
✅ mononative: All 12 tests passed. Html Report (VSDrops) Download
✅ monotouch: All 25 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ msbuild: All 2 tests passed. Html Report (VSDrops) Download
✅ mtouch: All 1 tests passed. Html Report (VSDrops) Download
✅ xammac: All 3 tests passed. Html Report (VSDrops) Download
✅ xcframework: All 8 tests passed. Html Report (VSDrops) Download
✅ xtro: All 2 tests passed. Html Report (VSDrops) Download

Pipeline on Agent
Hash: 8de26afa9c51386e07fc16b2e89fa71ff6735529 [PR build]

@rolfbjarne rolfbjarne merged commit 50c01fe into xamarin:main Jan 30, 2023
@rolfbjarne rolfbjarne deleted the generator-fix-inlined-attributes-with-higher-versions branch January 30, 2023 07:00
@rolfbjarne rolfbjarne mentioned this pull request Jan 30, 2023
Closed
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stephen-hawley stephen-hawley stephen-hawley approved these changes

@mandel-macaque mandel-macaque mandel-macaque approved these changes

@dalexsoto dalexsoto dalexsoto approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@rolfbjarne @vs-mobiletools-engineering-service2 @dalexsoto @mandel-macaque @stephen-hawley