Skip to content

Commit

Permalink
[SceneKit] Add support for Xcode 15 beta 6 (#18778)
Browse files Browse the repository at this point in the history
Notes:
- Beta 6 changes are targeting only visionOS
- Adding an [Abstract] to an existing protocol is a breaking change so
added a conditional XAMCORE and added xtro error to .ignore

---------

Co-authored-by: GitHub Actions Autoformatter <github-actions-autoformatter@xamarin.com>
  • Loading branch information
haritha-mohan and GitHub Actions Autoformatter authored Aug 23, 2023
1 parent f99645b commit 272b753
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 7 deletions.
7 changes: 7 additions & 0 deletions src/scenekit.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3293,6 +3293,13 @@ interface SCNSceneRenderer {
#endif
[Export ("currentRenderPassDescriptor")]
MTLRenderPassDescriptor CurrentRenderPassDescriptor { get; }

[Watch (10, 0), TV (17, 0), Mac (14, 0), iOS (17, 0), MacCatalyst (17, 0)]
#if XAMCORE_5_0
[Abstract]
#endif
[Export ("workingColorSpace")]
CGColorSpace WorkingColorSpace { get; }
}

[MacCatalyst (13, 1)]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,6 @@

# normal pattern accept null delegate and unit tests shows it works just fine
!extra-null-allowed! 'System.Void SceneKit.SCNAvoidOccluderConstraint::set_Delegate(SceneKit.ISCNAvoidOccluderConstraintDelegate)' has a extraneous [NullAllowed] on parameter #0

## we cannot add abstract members to existing SCNSceneRenderer protocols (breaking changes)
!incorrect-protocol-member! SCNSceneRenderer::workingColorSpace is REQUIRED and should be abstract

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 1 addition & 0 deletions tests/xtro-sharpie/common-SceneKit.ignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
!incorrect-protocol-member! SCNSceneRenderer::setTemporalAntialiasingEnabled: is REQUIRED and should be abstract
!incorrect-protocol-member! SCNSceneRenderer::setUsesReverseZ: is REQUIRED and should be abstract
!incorrect-protocol-member! SCNSceneRenderer::usesReverseZ is REQUIRED and should be abstract
!incorrect-protocol-member! SCNSceneRenderer::workingColorSpace is REQUIRED and should be abstract

## same for SCNActionable, it is required member of a protocol added to .NET
!incorrect-protocol-member! SCNActionable::actionKeys is REQUIRED and should be abstract
Expand Down
1 change: 0 additions & 1 deletion tests/xtro-sharpie/iOS-SceneKit.todo

This file was deleted.

1 change: 0 additions & 1 deletion tests/xtro-sharpie/macOS-SceneKit.todo

This file was deleted.

1 change: 0 additions & 1 deletion tests/xtro-sharpie/tvOS-SceneKit.todo

This file was deleted.

1 change: 0 additions & 1 deletion tests/xtro-sharpie/watchOS-SceneKit.todo

This file was deleted.

1 comment on commit 272b753

@vs-mobiletools-engineering-service2

This comment was marked as outdated.

Please sign in to comment.