Skip to content

[xtro-sharpie] Fix ProtocolAttribute native name lookup #26498

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rolfbjarne merged 6 commits into from
Sep 4, 2026
Merged

[xtro-sharpie] Fix ProtocolAttribute native name lookup #26498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6f4aef7
[xtro-sharpie] Fix native name lookup for [Protocol(Name=...)] types
rolfbjarne Aug 28, 2026
a183001
Update the potato.
rolfbjarne Sep 1, 2026
67a96b3
Fix ProtocolAttribute Name lookup to fall back on null/empty value
rolfbjarne Sep 1, 2026
e8ac9a5
Merge branch 'main' into dev/rolf/upgraded-potato
rolfbjarne Sep 1, 2026
6356809
Merge remote-tracking branch 'origin/main' into dev/rolf/upgraded-potato
rolfbjarne Sep 2, 2026
27ed9c2
Update xtro
rolfbjarne Sep 3, 2026
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: 3 additions & 0 deletions tests/xtro-sharpie/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,9 @@ $(U2TODO): $(wildcard u2todo/*.cs u2todo/*.csproj xtro-sharpie/Filter.cs)
unclassified2todo: $(U2TODO)
cd $(DOTNET_ANNOTATIONS_DIR) && $(DOTNET) exec $(abspath $(U2TODO))

unclassified2ignore: $(U2TODO)
cd $(DOTNET_ANNOTATIONS_DIR) && $(DOTNET) exec $(abspath $(U2TODO)) --ignore

run-tests run-unit-tests:
$(Q) $(MAKE) -C UnitTests $@

Expand Down
4 changes: 4 additions & 0 deletions tests/xtro-sharpie/api-annotations-dotnet/MacCatalyst-AuthenticationServices.ignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,7 @@
!missing-null-allowed! 'System.Void AuthenticationServices.ASCredentialIdentityStore::SaveCredentialIdentityEntries(AuthenticationServices.IASCredentialIdentity[],System.Action`2<System.Boolean,Foundation.NSError>)' is missing a '?' on parameter 'completion' block parameter #1
!missing-null-allowed! 'System.Void AuthenticationServices.ASSettingsHelper::OpenCredentialProviderAppSettings(System.Action`1<Foundation.NSError>)' is missing a '?' on parameter 'completionHandler' block parameter #0
!missing-null-allowed! 'System.Void AuthenticationServices.ASSettingsHelper::OpenVerificationCodeAppSettings(System.Action`1<Foundation.NSError>)' is missing a '?' on parameter 'completionHandler' block parameter #0
!missing-null-allowed! 'AuthenticationServices.ASPublicKeyCredentialClientData AuthenticationServices.IASAuthorizationWebBrowserPlatformPublicKeyCredentialAssertionRequest::get_ClientData()' is missing an [NullAllowed] on return type
!missing-null-allowed! 'AuthenticationServices.ASPublicKeyCredentialClientData AuthenticationServices.IASAuthorizationWebBrowserPlatformPublicKeyCredentialRegistrationRequest::get_ClientData()' is missing an [NullAllowed] on return type
!missing-null-allowed! 'AuthenticationServices.ASPublicKeyCredentialClientData AuthenticationServices.IASAuthorizationWebBrowserSecurityKeyPublicKeyCredentialAssertionRequest::get_ClientData()' is missing an [NullAllowed] on return type
!missing-null-allowed! 'AuthenticationServices.ASPublicKeyCredentialClientData AuthenticationServices.IASAuthorizationWebBrowserSecurityKeyPublicKeyCredentialRegistrationRequest::get_ClientData()' is missing an [NullAllowed] on return type
1 change: 1 addition & 0 deletions tests/xtro-sharpie/api-annotations-dotnet/MacCatalyst-BackgroundAssets.ignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
!missing-null-allowed! 'System.Void BackgroundAssets.IBADownloaderExtension::DidReceiveChallenge(BackgroundAssets.BADownload,Foundation.NSUrlAuthenticationChallenge,System.Action`2<Foundation.NSUrlSessionAuthChallengeDisposition,Foundation.NSUrlCredential>)' is missing a '?' on parameter 'completionHandler' block parameter #1
1 change: 1 addition & 0 deletions tests/xtro-sharpie/api-annotations-dotnet/MacCatalyst-ClassKit.ignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@
!missing-null-allowed! 'System.Void ClassKit.CLSDataStore::FindContextsMatching(Foundation.NSPredicate,System.Action`2<ClassKit.CLSContext[],Foundation.NSError>)' is missing a '?' on parameter 'completion' block parameter #1
!missing-null-allowed! 'System.Void ClassKit.CLSDataStore::FindContextsMatching(System.String[],System.Action`2<ClassKit.CLSContext[],Foundation.NSError>)' is missing a '?' on parameter 'completion' block parameter #1
!missing-null-allowed! 'System.Void ClassKit.CLSDataStore::Save(System.Action`1<Foundation.NSError>)' is missing a '?' on parameter 'completion' block parameter #0
!missing-null-allowed! 'System.Void ClassKit.ICLSContextProvider::UpdateDescendants(ClassKit.CLSContext,System.Action`1<Foundation.NSError>)' is missing a '?' on parameter 'completion' block parameter #0
4 changes: 4 additions & 0 deletions tests/xtro-sharpie/api-annotations-dotnet/MacCatalyst-CoreImage.ignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
!extra-null-allowed! 'System.Void CoreImage.ICIBlurredRectangleGeneratorProtocol::set_Color(CoreImage.CIColor)' has a extraneous [NullAllowed] on parameter #0
!extra-null-allowed! 'System.Void CoreImage.ICIRoundedRectangleStrokeGeneratorProtocol::set_Color(CoreImage.CIColor)' has a extraneous [NullAllowed] on parameter #0
!missing-null-allowed! 'System.Void CoreImage.ICIColorAbsoluteDifferenceProtocol::set_Image2(CoreImage.CIImage)' is missing an [NullAllowed] on parameter #0
!missing-null-allowed! 'System.Void CoreImage.ICIDistanceGradientFromRedMaskProtocol::set_InputImage(CoreImage.CIImage)' is missing an [NullAllowed] on parameter #0
31 changes: 31 additions & 0 deletions tests/xtro-sharpie/api-annotations-dotnet/MacCatalyst-CoreNFC.ignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,34 @@
# results from initial block parameter nullability analysis
!missing-null-allowed! 'System.Void CoreNFC.NFCNdefReaderSession::ConnectToTag(CoreNFC.INFCNdefTag,System.Action`1<Foundation.NSError>)' is missing a '?' on parameter 'completionHandler' block parameter #0
!missing-null-allowed! 'System.Void CoreNFC.NFCTagReaderSession::ConnectTo(CoreNFC.INFCTag,System.Action`1<Foundation.NSError>)' is missing a '?' on parameter 'completionHandler' block parameter #0
!missing-null-allowed! 'System.Void CoreNFC.INFCIso15693Tag::StayQuiet(System.Action`1<Foundation.NSError>)' is missing a '?' on parameter 'completionHandler' block parameter #0
!missing-null-allowed! 'System.Void CoreNFC.INFCFeliCaTag::RequestResponse(System.Action`2<System.IntPtr,Foundation.NSError>)' is missing a '?' on parameter 'completionHandler' block parameter #1
!missing-null-allowed! 'System.Void CoreNFC.INFCFeliCaTag::RequestService(Foundation.NSData[],System.Action`2<Foundation.NSData[],Foundation.NSError>)' is missing a '?' on parameter 'completionHandler' block parameter #1
!missing-null-allowed! 'System.Void CoreNFC.INFCFeliCaTag::RequestSystemCode(System.Action`2<Foundation.NSData[],Foundation.NSError>)' is missing a '?' on parameter 'completionHandler' block parameter #1
!missing-null-allowed! 'System.Void CoreNFC.INFCFeliCaTag::Send(Foundation.NSData,System.Action`2<Foundation.NSData,Foundation.NSError>)' is missing a '?' on parameter 'completionHandler' block parameter #1
!missing-null-allowed! 'System.Void CoreNFC.INFCIso15693Tag::Challenge(CoreNFC.NFCIso15693RequestFlag,System.IntPtr,Foundation.NSData,System.Action`1<Foundation.NSError>)' is missing a '?' on parameter 'completionHandler' block parameter #0
!missing-null-allowed! 'System.Void CoreNFC.INFCIso15693Tag::CustomCommand(CoreNFC.NFCIso15693RequestFlag,System.IntPtr,Foundation.NSData,System.Action`2<Foundation.NSData,Foundation.NSError>)' is missing a '?' on parameter 'completionHandler' block parameter #1
!missing-null-allowed! 'System.Void CoreNFC.INFCIso15693Tag::ExtendedLockBlock(CoreNFC.NFCIso15693RequestFlag,System.IntPtr,System.Action`1<Foundation.NSError>)' is missing a '?' on parameter 'completionHandler' block parameter #0
!missing-null-allowed! 'System.Void CoreNFC.INFCIso15693Tag::ExtendedReadMultipleBlocks(CoreNFC.NFCIso15693RequestFlag,Foundation.NSRange,System.Action`2<Foundation.NSData[],Foundation.NSError>)' is missing a '?' on parameter 'completionHandler' block parameter #1
!missing-null-allowed! 'System.Void CoreNFC.INFCIso15693Tag::ExtendedReadSingleBlock(CoreNFC.NFCIso15693RequestFlag,System.IntPtr,System.Action`2<Foundation.NSData,Foundation.NSError>)' is missing a '?' on parameter 'completionHandler' block parameter #1
!missing-null-allowed! 'System.Void CoreNFC.INFCIso15693Tag::ExtendedWriteMultipleBlocks(CoreNFC.NFCIso15693RequestFlag,Foundation.NSRange,Foundation.NSData[],System.Action`1<Foundation.NSError>)' is missing a '?' on parameter 'completionHandler' block parameter #0
!missing-null-allowed! 'System.Void CoreNFC.INFCIso15693Tag::ExtendedWriteSingleBlock(CoreNFC.NFCIso15693RequestFlag,System.IntPtr,Foundation.NSData,System.Action`1<Foundation.NSError>)' is missing a '?' on parameter 'completionHandler' block parameter #0
!missing-null-allowed! 'System.Void CoreNFC.INFCIso15693Tag::GetMultipleBlockSecurityStatus(CoreNFC.NFCIso15693RequestFlag,Foundation.NSRange,System.Action`2<Foundation.NSNumber[],Foundation.NSError>)' is missing a '?' on parameter 'completionHandler' block parameter #1
!missing-null-allowed! 'System.Void CoreNFC.INFCIso15693Tag::LockAfi(CoreNFC.NFCIso15693RequestFlag,System.Action`1<Foundation.NSError>)' is missing a '?' on parameter 'completionHandler' block parameter #0
!missing-null-allowed! 'System.Void CoreNFC.INFCIso15693Tag::LockBlock(CoreNFC.NFCIso15693RequestFlag,System.Byte,System.Action`1<Foundation.NSError>)' is missing a '?' on parameter 'completionHandler' block parameter #0
!missing-null-allowed! 'System.Void CoreNFC.INFCIso15693Tag::LockDsfId(CoreNFC.NFCIso15693RequestFlag,System.Action`1<Foundation.NSError>)' is missing a '?' on parameter 'completionHandler' block parameter #0
!missing-null-allowed! 'System.Void CoreNFC.INFCIso15693Tag::ReadMultipleBlocks(CoreNFC.NFCIso15693ReadMultipleBlocksConfiguration,System.Action`2<Foundation.NSData,Foundation.NSError>)' is missing a '?' on parameter 'completionHandler' block parameter #1
!missing-null-allowed! 'System.Void CoreNFC.INFCIso15693Tag::ReadMultipleBlocks(CoreNFC.NFCIso15693RequestFlag,Foundation.NSRange,System.Action`2<Foundation.NSData[],Foundation.NSError>)' is missing a '?' on parameter 'completionHandler' block parameter #1
!missing-null-allowed! 'System.Void CoreNFC.INFCIso15693Tag::ReadSingleBlock(CoreNFC.NFCIso15693RequestFlag,System.Byte,System.Action`2<Foundation.NSData,Foundation.NSError>)' is missing a '?' on parameter 'completionHandler' block parameter #1
!missing-null-allowed! 'System.Void CoreNFC.INFCIso15693Tag::ResetToReady(CoreNFC.NFCIso15693RequestFlag,System.Action`1<Foundation.NSError>)' is missing a '?' on parameter 'completionHandler' block parameter #0
!missing-null-allowed! 'System.Void CoreNFC.INFCIso15693Tag::Select(CoreNFC.NFCIso15693RequestFlag,System.Action`1<Foundation.NSError>)' is missing a '?' on parameter 'completionHandler' block parameter #0
!missing-null-allowed! 'System.Void CoreNFC.INFCIso15693Tag::SendCustomCommand(CoreNFC.NFCIso15693CustomCommandConfiguration,System.Action`2<Foundation.NSData,Foundation.NSError>)' is missing a '?' on parameter 'completionHandler' block parameter #1
!missing-null-allowed! 'System.Void CoreNFC.INFCIso15693Tag::WriteAfi(CoreNFC.NFCIso15693RequestFlag,System.Byte,System.Action`1<Foundation.NSError>)' is missing a '?' on parameter 'completionHandler' block parameter #0
!missing-null-allowed! 'System.Void CoreNFC.INFCIso15693Tag::WriteDsfi(CoreNFC.NFCIso15693RequestFlag,System.Byte,System.Action`1<Foundation.NSError>)' is missing a '?' on parameter 'completionHandler' block parameter #0
!missing-null-allowed! 'System.Void CoreNFC.INFCIso15693Tag::WriteMultipleBlocks(CoreNFC.NFCIso15693RequestFlag,Foundation.NSRange,Foundation.NSData[],System.Action`1<Foundation.NSError>)' is missing a '?' on parameter 'completionHandler' block parameter #0
!missing-null-allowed! 'System.Void CoreNFC.INFCIso15693Tag::WriteSingleBlock(CoreNFC.NFCIso15693RequestFlag,System.Byte,Foundation.NSData,System.Action`1<Foundation.NSError>)' is missing a '?' on parameter 'completionHandler' block parameter #0
!missing-null-allowed! 'System.Void CoreNFC.INFCMiFareTag::SendMiFareCommand(Foundation.NSData,System.Action`2<Foundation.NSData,Foundation.NSError>)' is missing a '?' on parameter 'completionHandler' block parameter #1
!missing-null-allowed! 'System.Void CoreNFC.INFCNdefTag::ReadNdef(System.Action`2<CoreNFC.NFCNdefMessage,Foundation.NSError>)' is missing a '?' on parameter 'completionHandler' block parameter #0
!missing-null-allowed! 'System.Void CoreNFC.INFCNdefTag::ReadNdef(System.Action`2<CoreNFC.NFCNdefMessage,Foundation.NSError>)' is missing a '?' on parameter 'completionHandler' block parameter #1
!missing-null-allowed! 'System.Void CoreNFC.INFCNdefTag::WriteLock(System.Action`1<Foundation.NSError>)' is missing a '?' on parameter 'completionHandler' block parameter #0
!missing-null-allowed! 'System.Void CoreNFC.INFCNdefTag::WriteNdef(CoreNFC.NFCNdefMessage,System.Action`1<Foundation.NSError>)' is missing a '?' on parameter 'completionHandler' block parameter #0
15 changes: 14 additions & 1 deletion tests/xtro-sharpie/api-annotations-dotnet/MacCatalyst-Foundation.ignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@
!missing-null-allowed! 'System.Void Foundation.NSBundleResourceRequest::BeginAccessingResources(System.Action`1<Foundation.NSError>)' is missing a '?' on parameter 'completionHandler' block parameter #0
!missing-null-allowed! 'System.Void Foundation.NSFileManager::GetFileProviderServices(Foundation.NSUrl,System.Action`2<Foundation.NSDictionary`2<Foundation.NSString,Foundation.NSFileProviderService>,Foundation.NSError>)' is missing a '?' on parameter 'completionHandler' block parameter #0
!missing-null-allowed! 'System.Void Foundation.NSFileManager::GetFileProviderServices(Foundation.NSUrl,System.Action`2<Foundation.NSDictionary`2<Foundation.NSString,Foundation.NSFileProviderService>,Foundation.NSError>)' is missing a '?' on parameter 'completionHandler' block parameter #1
!missing-null-allowed! 'System.Void Foundation.NSFilePresenter::AccommodatePresentedItemEviction(System.Action`1<Foundation.NSError>)' is missing a '?' on parameter 'completionHandler' block parameter #0
!missing-null-allowed! 'System.Void Foundation.INSFilePresenter::AccommodatePresentedItemEviction(System.Action`1<Foundation.NSError>)' is missing a '?' on parameter 'completionHandler' block parameter #0
!missing-null-allowed! 'System.Void Foundation.NSFileProviderService::GetFileProviderConnection(System.Action`2<Foundation.NSXpcConnection,Foundation.NSError>)' is missing a '?' on parameter 'completionHandler' block parameter #0
!missing-null-allowed! 'System.Void Foundation.NSFileProviderService::GetFileProviderConnection(System.Action`2<Foundation.NSXpcConnection,Foundation.NSError>)' is missing a '?' on parameter 'completionHandler' block parameter #1

Expand All @@ -493,3 +493,16 @@
## the class, managed callback infrastructure, or API Apple removed/privatized - kept for compatibility
## (baseline for https://github.com/dotnet/macios/issues/26053)
!unknown-selector! NSInputStream::_setCFClientFlags:callback:context: not found
!missing-null-allowed! 'Foundation.NSCachedUrlResponse Foundation.INSUrlConnectionDataDelegate::WillCacheResponse(Foundation.NSUrlConnection,Foundation.NSCachedUrlResponse)' is missing an [NullAllowed] on return type
!missing-null-allowed! 'Foundation.NSInputStream Foundation.INSUrlConnectionDataDelegate::NeedNewBodyStream(Foundation.NSUrlConnection,Foundation.NSUrlRequest)' is missing an [NullAllowed] on return type
!missing-null-allowed! 'Foundation.NSProgress Foundation.INSItemProviderWriting::LoadData(System.String,System.Action`2<Foundation.NSData,Foundation.NSError>)' is missing a '?' on parameter 'completionHandler' block parameter #0
!missing-null-allowed! 'Foundation.NSProgress Foundation.INSItemProviderWriting::LoadData(System.String,System.Action`2<Foundation.NSData,Foundation.NSError>)' is missing a '?' on parameter 'completionHandler' block parameter #1
!missing-null-allowed! 'Foundation.NSUrlRequest Foundation.INSUrlConnectionDataDelegate::WillSendRequest(Foundation.NSUrlConnection,Foundation.NSUrlRequest,Foundation.NSUrlResponse)' is missing an [NullAllowed] on parameter #2
!missing-null-allowed! 'Foundation.NSUrlRequest Foundation.INSUrlConnectionDataDelegate::WillSendRequest(Foundation.NSUrlConnection,Foundation.NSUrlRequest,Foundation.NSUrlResponse)' is missing an [NullAllowed] on return type
!missing-null-allowed! 'System.Void Foundation.INSUrlSessionDataDelegate::WillCacheResponse(Foundation.NSUrlSession,Foundation.NSUrlSessionDataTask,Foundation.NSCachedUrlResponse,System.Action`1<Foundation.NSCachedUrlResponse>)' is missing a '?' on parameter 'completionHandler' block parameter #0
!missing-null-allowed! 'System.Void Foundation.INSUrlSessionDelegate::DidBecomeInvalid(Foundation.NSUrlSession,Foundation.NSError)' is missing an [NullAllowed] on parameter #1
!missing-null-allowed! 'System.Void Foundation.INSUrlSessionDelegate::DidReceiveChallenge(Foundation.NSUrlSession,Foundation.NSUrlAuthenticationChallenge,System.Action`2<Foundation.NSUrlSessionAuthChallengeDisposition,Foundation.NSUrlCredential>)' is missing a '?' on parameter 'completionHandler' block parameter #1
!missing-null-allowed! 'System.Void Foundation.INSUrlSessionTaskDelegate::DidReceiveChallenge(Foundation.NSUrlSession,Foundation.NSUrlSessionTask,Foundation.NSUrlAuthenticationChallenge,System.Action`2<Foundation.NSUrlSessionAuthChallengeDisposition,Foundation.NSUrlCredential>)' is missing a '?' on parameter 'completionHandler' block parameter #1
!missing-null-allowed! 'System.Void Foundation.INSUrlSessionTaskDelegate::NeedNewBodyStream(Foundation.NSUrlSession,Foundation.NSUrlSessionTask,System.Action`1<Foundation.NSInputStream>)' is missing a '?' on parameter 'completionHandler' block parameter #0
!missing-null-allowed! 'System.Void Foundation.INSUrlSessionTaskDelegate::NeedNewBodyStream(Foundation.NSUrlSession,Foundation.NSUrlSessionTask,System.Int64,System.Action`1<Foundation.NSInputStream>)' is missing a '?' on parameter 'completionHandler' block parameter #0
!missing-null-allowed! 'System.Void Foundation.INSUrlSessionTaskDelegate::WillBeginDelayedRequest(Foundation.NSUrlSession,Foundation.NSUrlSessionTask,Foundation.NSUrlRequest,System.Action`2<Foundation.NSUrlSessionDelayedRequestDisposition,Foundation.NSUrlRequest>)' is missing a '?' on parameter 'completionHandler' block parameter #1
1 change: 1 addition & 0 deletions tests/xtro-sharpie/api-annotations-dotnet/MacCatalyst-GameController.ignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
# results from initial block parameter nullability analysis
!missing-null-allowed! 'System.Void GameController.GCVirtualController::Connect(System.Action`1<Foundation.NSError>)' is missing a '?' on parameter 'reply' block parameter #0
!deprecated-attribute-missing! GCDevice::physicalInputProfile missing a [Deprecated] attribute
1 change: 1 addition & 0 deletions tests/xtro-sharpie/api-annotations-dotnet/MacCatalyst-GameplayKit.ignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
!missing-null-allowed! 'GameplayKit.IGKGameModelUpdate GameplayKit.IGKStrategist::GetBestMoveForActivePlayer()' is missing an [NullAllowed] on return type
1 change: 1 addition & 0 deletions tests/xtro-sharpie/api-annotations-dotnet/MacCatalyst-Messages.ignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@
## the class, managed callback infrastructure, or API Apple removed/privatized - kept for compatibility
## (baseline for https://github.com/dotnet/macios/issues/26053)
!unknown-selector! MSSticker::initWithFileURL:identifier:localizedDescription: not found
!missing-null-allowed! 'UIKit.UIColor Messages.IMSMessagesAppTranscriptPresentation::get_MessageTintColor()' is missing an [NullAllowed] on return type
Loading