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.

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

[Intents] Fix xtro output - Backport of #3512 #3520

Merged
merged 1 commit into from
Feb 19, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 15 additions & 3 deletions src/intents.cs
Original file line number Diff line number Diff line change
Expand Up @@ -282,8 +282,12 @@ public enum INListRideOptionsIntentResponseCode : long {
FailurePreviousRideNeedsFeedback,
}

[iOS (10, 0)]
#if XAMCORE_4_0 // TODO: Double check this if XAMCORE_4_0 happens, its been 2 years (2018) and still not usable in macOS
[NoMac]
#else
[Mac (10, 12, 0, PlatformArchitecture.Arch64)]
#endif
[iOS (10, 0)]
[Watch (3, 2)]
[Native]
public enum INMessageAttribute : long {
Expand Down Expand Up @@ -2143,8 +2147,12 @@ interface INDateComponentsRangeResolutionResult {
INDateComponentsRangeResolutionResult Unsupported { get; }
}

[iOS (10, 0)]
#if XAMCORE_4_0 // TODO: Double check this if XAMCORE_4_0 happens, its been 2 years (2018) and still not usable in macOS
[NoMac]
#else
[Mac (10, 12, 0, PlatformArchitecture.Arch64)]
#endif
[iOS (10, 0)]
[Watch (3, 2)]
[Protocol]
interface INCallsDomainHandling : INStartAudioCallIntentHandling, INSearchCallHistoryIntentHandling
Expand Down Expand Up @@ -3077,8 +3085,12 @@ interface INMessageAttributeOptionsResolutionResult {
INMessageAttributeOptionsResolutionResult Unsupported { get; }
}

[iOS (10, 0)]
#if XAMCORE_4_0 // TODO: Double check this if XAMCORE_4_0 happens, its been 2 years (2018) and still not usable in macOS
[NoMac]
#else
[Mac (10, 12, 0, PlatformArchitecture.Arch64)]
#endif
[iOS (10, 0)]
[Watch (3, 2)]
[BaseType (typeof (INIntentResolutionResult))]
[DisableDefaultCtor]
Expand Down
9 changes: 9 additions & 0 deletions tests/xtro-sharpie/macOS-Intents.ignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,12 @@
## unsorted

!unknown-native-enum! INSetMessageAttributeIntentResponseCode bound

## Fixed in XAMCORE_4_0 but with a conditional TODO check in code
## API_AVAILABLE(macosx(10.12), ios(10.0)); This is supposed to be there according to availability (Last Review: Feb 2018)
!unknown-protocol! INCallsDomainHandling bound

## No availability set on headers, it is possible to be fixed later since makes sense to have in macOS.
## unfortunately it is not at the moment (Last Review: Feb 2018)
!unknown-native-enum! INMessageAttribute bound
!unknown-type! INMessageAttributeResolutionResult bound
6 changes: 0 additions & 6 deletions tests/xtro-sharpie/macOS-Intents.todo
Original file line number Diff line number Diff line change
@@ -1,6 +0,0 @@
## API_AVAILABLE(macosx(10.12), ios(10.0)); This is supposed to be there according to availability (Last Review: Beta 3)
!unknown-protocol! INCallsDomainHandling bound

## No availability set on headers, it is possible to be fixed later since makes sense to have in macOS
!unknown-native-enum! INMessageAttribute bound
!unknown-type! INMessageAttributeResolutionResult bound