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

[CoreText] Add support for Xcode 14 beta 1,2 & 3 #15534

Merged
merged 3 commits into from
Jul 19, 2022
Merged

[CoreText] Add support for Xcode 14 beta 1,2 & 3 #15534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d13ed29
[CoreText] Add support for Xcode 14 beta 1,2 & 3
mandel-macaque Jul 18, 2022
cfcaed6
Add missing ignore.
mandel-macaque Jul 18, 2022
f9e65e4
Merge branch 'xcode14' into coretext-xcode14
mandel-macaque Jul 19, 2022
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
9 changes: 9 additions & 0 deletions src/CoreText/CTFont.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,15 @@ public enum CTFontTable : uint {
// defined as uint32_t - /System/Library/Frameworks/CoreText.framework/Headers/CTFont.h
public enum CTFontTableOptions : uint {
None = 0,
#if NET
[UnsupportedOSPlatform ("tvos16.0")]
#if TVOS
[Obsolete ("Starting with tvos16.0.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
#else
[Deprecated (PlatformName.TvOS, 16, 0)]
[Deprecated (PlatformName.WatchOS, 9, 0)]
#endif
ExcludeSynthetic = (1 << 0),
}

Expand Down
4 changes: 4 additions & 0 deletions src/CoreText/CTParagraphStyle.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,14 @@ internal enum CTParagraphStyleSpecifier : uint {
[Obsolete ("Starting with macos10.8 use 'MaximumLineSpacing' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif IOS
[Obsolete ("Starting with ios6.0 use 'MaximumLineSpacing' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#elif TVOS
[Obsolete ("Starting with tvos16.0 use 'MaximumLineSpacing' instead.", DiagnosticId = "BI1234", UrlFormat = "https://github.com/xamarin/xamarin-macios/wiki/Obsolete")]
#endif
#else
[Deprecated (PlatformName.iOS, 6, 0, message : "Use 'MaximumLineSpacing' instead.")]
[Deprecated (PlatformName.MacOSX, 10, 8, message : "Use 'MaximumLineSpacing' instead.")]
[Deprecated (PlatformName.TvOS, 16, 0, message : "Use 'MaximumLineSpacing' instead.")]
[Deprecated (PlatformName.WatchOS, 9, 0, message : "Use 'MaximumLineSpacing' instead.")]
#endif
LineSpacing = 10,
ParagraphSpacing = 11,
Expand Down
1 change: 1 addition & 0 deletions tests/xtro-sharpie/watchOS-CoreText.todo → ...i-annotations-dotnet/tvOS-CoreText.ignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
# bound in previous versions but removed in xcode 14
!extra-enum-value! Managed value 1 for CTFontTableOptions.ExcludeSynthetic is available for the current platform while the value in the native header is not
!extra-enum-value! Managed value 10 for CTParagraphStyleSpecifier.LineSpacing is available for the current platform while the value in the native header is not
0 ...api-annotations-dotnet/tvOS-CoreText.todo → ...nnotations-dotnet/watchOS-CoreText.ignore
View file
Open in desktop
File renamed without changes.
3 changes: 3 additions & 0 deletions tests/xtro-sharpie/tvOS-CoreText.ignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# bound in previous versions but removed in xcode 14
!extra-enum-value! Managed value 1 for CTFontTableOptions.ExcludeSynthetic is available for the current platform while the value in the native header is not
!extra-enum-value! Managed value 10 for CTParagraphStyleSpecifier.LineSpacing is available for the current platform while the value in the native header is not
0 tests/xtro-sharpie/tvOS-CoreText.todo → tests/xtro-sharpie/watchOS-CoreText.ignore
View file
Open in desktop
File renamed without changes.