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

[generator] Use new ObsoletedOSPlatformAttribute for generated code #15941

Merged
merged 12 commits into from
Oct 6, 2022
Merged

[generator] Use new ObsoletedOSPlatformAttribute for generated code #15941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8fe969f
[generator] Use new ObsoletedOSPlatformAttribute for generated code
chamons Sep 12, 2022
2d5aedb
Merge branch 'net7.0' into net7.0_obsolete_attribute
chamons Sep 13, 2022
1bc338f
Merge branch 'net7.0' into net7.0_obsolete_attribute
chamons Sep 16, 2022
6f16d17
Code review changes
chamons Sep 16, 2022
2aef5d4
Merge remote-tracking branch 'origin/net7.0' into net7.0_obsolete_att…
rolfbjarne Sep 21, 2022
ce6c6be
[generator] Also strip deprecated attributes that are nonsense becaue…
chamons Sep 27, 2022
7af5972
[generator] Imply tvOS from iOS in NET6 just like Catalyst
chamons Oct 4, 2022
eeffe83
Manual binding corrections for improved xtro testing
chamons Oct 4, 2022
9b48210
[tests] Update intro/xtro for new Obsolete and remove todos
chamons Oct 4, 2022
f544689
Merge branch 'net7.0' into net7.0_obsolete_attribute
chamons Oct 4, 2022
ab08af9
[tests] We're generating even more attributes now.
rolfbjarne Oct 5, 2022
b8c9a98
[xtro] Add missing eof.
rolfbjarne Oct 5, 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
2 changes: 2 additions & 0 deletions src/ARKit/ARSkeleton.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ public partial class ARSkeleton {
#if NET
[SupportedOSPlatform ("ios14.0")]
[UnsupportedOSPlatform ("maccatalyst")]
[UnsupportedOSPlatform ("tvos")]
#else
[iOS (14,0)]
#endif
Expand All @@ -22,6 +23,7 @@ public partial class ARSkeleton {
#if NET
[SupportedOSPlatform ("ios14.0")]
[UnsupportedOSPlatform ("maccatalyst")]
[UnsupportedOSPlatform ("tvos")]
#else
[iOS (14,0)]
#endif
Expand Down
16 changes: 8 additions & 8 deletions src/CoreFoundation/CFStream.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,10 +462,10 @@ public static void CreatePairWithSocketToHost (string host, int port,
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.11")]
[UnsupportedOSPlatform ("ios9.0")]
[ObsoletedOSPlatform ("macos10.11")]
[ObsoletedOSPlatform ("ios9.0")]
[ObsoletedOSPlatform ("maccatalyst13.0")]
[ObsoletedOSPlatform ("tvos9.0")]
#else
[Deprecated (PlatformName.iOS, 9, 0)]
[Deprecated (PlatformName.MacOSX, 10, 11)]
Expand All @@ -479,10 +479,10 @@ public static void CreatePairWithSocketToHost (string host, int port,
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.11")]
[UnsupportedOSPlatform ("ios9.0")]
[ObsoletedOSPlatform ("macos10.11", "Use 'NSUrlSession' instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use 'NSUrlSession' instead.")]
[ObsoletedOSPlatform ("maccatalyst13.0", "Use 'NSUrlSession' instead.")]
[ObsoletedOSPlatform ("tvos9.0", "Use 'NSUrlSession' instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message : "Use 'NSUrlSession' instead.")]
[Deprecated (PlatformName.MacOSX, 10, 11, message : "Use 'NSUrlSession' instead.")]
Expand All @@ -502,10 +502,10 @@ public static CFHTTPStream CreateForHTTPRequest (CFHTTPMessage request)
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.11")]
[UnsupportedOSPlatform ("ios9.0")]
[ObsoletedOSPlatform ("macos10.11")]
[ObsoletedOSPlatform ("ios9.0")]
[ObsoletedOSPlatform ("maccatalyst13.0")]
[ObsoletedOSPlatform ("tvos9.0")]
#else
[Deprecated (PlatformName.iOS, 9,0)]
[Deprecated (PlatformName.MacOSX, 10,11)]
Expand All @@ -520,10 +520,10 @@ public static CFHTTPStream CreateForHTTPRequest (CFHTTPMessage request)
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.11")]
[UnsupportedOSPlatform ("ios9.0")]
[ObsoletedOSPlatform ("macos10.11", "Use 'NSUrlSession' instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use 'NSUrlSession' instead.")]
[ObsoletedOSPlatform ("maccatalyst13.0", "Use 'NSUrlSession' instead.")]
[ObsoletedOSPlatform ("tvos9.0", "Use 'NSUrlSession' instead.")]
#else
[Deprecated (PlatformName.iOS, 9,0, message : "Use 'NSUrlSession' instead.")]
[Deprecated (PlatformName.MacOSX, 10,11, message : "Use 'NSUrlSession' instead.")]
Expand Down
71 changes: 25 additions & 46 deletions src/CoreMedia/CMSync.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,12 +149,10 @@ private CMTimebase (NativeHandle handle, bool owns)
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("tvos9.0")]
[UnsupportedOSPlatform ("macos10.10")]
[UnsupportedOSPlatform ("ios8.0")]
[ObsoletedOSPlatform ("maccatalyst13.0")]
[ObsoletedOSPlatform ("tvos9.0")]
[ObsoletedOSPlatform ("macos10.10")]
[ObsoletedOSPlatform ("ios8.0")]
[ObsoletedOSPlatform ("ios9.0")]
#else
[Deprecated (PlatformName.iOS, 8, 0)]
[Deprecated (PlatformName.TvOS, 9, 0)]
Expand Down Expand Up @@ -185,12 +183,10 @@ public CMTimebase (CMClock masterClock)
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("tvos9.0")]
[UnsupportedOSPlatform ("macos10.10")]
[UnsupportedOSPlatform ("ios8.0")]
[ObsoletedOSPlatform ("tvos9.0")]
[ObsoletedOSPlatform ("macos10.10")]
[ObsoletedOSPlatform ("ios8.0")]
[ObsoletedOSPlatform ("maccatalyst13.0")]
#else
[Deprecated (PlatformName.iOS, 8, 0)]
[Deprecated (PlatformName.TvOS, 9, 0)]
Expand Down Expand Up @@ -351,9 +347,9 @@ public double Rate {
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.11")]
[UnsupportedOSPlatform ("ios9.0")]
[ObsoletedOSPlatform ("macos10.11")]
[ObsoletedOSPlatform ("maccatalyst13.0")]
[ObsoletedOSPlatform ("tvos9.0")]
[ObsoletedOSPlatform ("macos10.10")]
[ObsoletedOSPlatform ("ios9.0")]
#else
[Deprecated (PlatformName.iOS, 9,0)]
Expand All @@ -367,10 +363,10 @@ public double Rate {
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.11")]
[UnsupportedOSPlatform ("ios9.0")]
[ObsoletedOSPlatform ("macos10.11", "Use 'CopyMasterTimebase' instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use 'CopyMasterTimebase' instead.")]
[ObsoletedOSPlatform ("tvos9.0", "Use 'CopyMasterTimebase' instead.")]
[ObsoletedOSPlatform ("maccatalyst13.0", "Use 'CopyMasterTimebase' instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message : "Use 'CopyMasterTimebase' instead.")]
[Deprecated (PlatformName.MacOSX, 10, 11, message : "Use 'CopyMasterTimebase' instead.")]
Expand All @@ -389,9 +385,9 @@ public double Rate {
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.11")]
[UnsupportedOSPlatform ("ios9.0")]
[ObsoletedOSPlatform ("macos10.11")]
[ObsoletedOSPlatform ("maccatalyst13.0")]
[ObsoletedOSPlatform ("tvos9.0")]
[ObsoletedOSPlatform ("macos10.10")]
[ObsoletedOSPlatform ("ios9.0")]
#else
[Deprecated (PlatformName.iOS, 9,0)]
Expand All @@ -405,10 +401,10 @@ public double Rate {
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.11")]
[UnsupportedOSPlatform ("ios9.0")]
[ObsoletedOSPlatform ("macos10.11", "Use 'CopyMasterClock' instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use 'CopyMasterClock' instead.")]
[ObsoletedOSPlatform ("tvos9.0", "Use 'CopyMasterClock' instead.")]
[ObsoletedOSPlatform ("maccatalyst13.0", "Use 'CopyMasterClock' instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message : "Use 'CopyMasterClock' instead.")]
[Deprecated (PlatformName.MacOSX, 10, 11, message : "Use 'CopyMasterClock' instead.")]
Expand All @@ -427,8 +423,8 @@ public double Rate {
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.11")]
[UnsupportedOSPlatform ("ios9.0")]
[ObsoletedOSPlatform ("maccatalyst13.0")]
[ObsoletedOSPlatform ("tvos9.0")]
[ObsoletedOSPlatform ("macos10.11")]
[ObsoletedOSPlatform ("ios9.0")]
#else
Expand All @@ -443,10 +439,10 @@ public double Rate {
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.11")]
[UnsupportedOSPlatform ("ios9.0")]
[ObsoletedOSPlatform ("macos10.11", "Use 'CopyMaster' instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use 'CopyMaster' instead.")]
[ObsoletedOSPlatform ("tvos9.0", "Use 'CopyMaster' instead.")]
[ObsoletedOSPlatform ("maccatalyst13.0", "Use 'CopyMaster' instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message : "Use 'CopyMaster' instead.")]
[Deprecated (PlatformName.MacOSX, 10, 11, message : "Use 'CopyMaster' instead.")]
Expand All @@ -465,8 +461,8 @@ public double Rate {
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.11")]
[UnsupportedOSPlatform ("ios9.0")]
[ObsoletedOSPlatform ("maccatalyst13.0")]
[ObsoletedOSPlatform ("tvos9.0")]
[ObsoletedOSPlatform ("macos10.11")]
[ObsoletedOSPlatform ("ios9.0")]
#else
Expand All @@ -481,10 +477,10 @@ public double Rate {
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("macos10.11")]
[UnsupportedOSPlatform ("ios9.0")]
[ObsoletedOSPlatform ("macos10.11", "Use 'CopyUltimateMasterClock' instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use 'CopyUltimateMasterClock' instead.")]
[ObsoletedOSPlatform ("tvos9.0", "Use 'CopyUltimateMasterClock' instead.")]
[ObsoletedOSPlatform ("maccatalyst13.0", "Use 'CopyUltimateMasterClock' instead.")]
#else
[Deprecated (PlatformName.iOS, 9, 0, message : "Use 'CopyUltimateMasterClock' instead.")]
[Deprecated (PlatformName.MacOSX, 10, 11, message : "Use 'CopyUltimateMasterClock' instead.")]
Expand Down Expand Up @@ -616,9 +612,7 @@ public CMTimebaseError SetTimerToFireImmediately (NSTimer timer)
[SupportedOSPlatform ("ios")]
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[UnsupportedOSPlatform ("tvos9.0")]
[UnsupportedOSPlatform ("macos10.10")]
[UnsupportedOSPlatform ("ios8.0")]
[ObsoletedOSPlatform ("maccatalyst13.0")]
[ObsoletedOSPlatform ("tvos9.0")]
[ObsoletedOSPlatform ("macos10.10")]
[ObsoletedOSPlatform ("ios8.0")]
Expand All @@ -642,9 +636,7 @@ public CMTimebaseError SetMasterTimebase (CMTimebase newMasterTimebase)
[SupportedOSPlatform ("ios")]
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[UnsupportedOSPlatform ("tvos9.0")]
[UnsupportedOSPlatform ("macos10.10")]
[UnsupportedOSPlatform ("ios8.0")]
[ObsoletedOSPlatform ("maccatalyst13.0")]
[ObsoletedOSPlatform ("tvos9.0")]
[ObsoletedOSPlatform ("macos10.10")]
[ObsoletedOSPlatform ("ios8.0")]
Expand All @@ -663,9 +655,7 @@ public CMTimebaseError SetMasterTimebase (CMTimebase newMasterTimebase)
[SupportedOSPlatform ("ios")]
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[UnsupportedOSPlatform ("tvos9.0")]
[UnsupportedOSPlatform ("macos10.10")]
[UnsupportedOSPlatform ("ios8.0")]
[ObsoletedOSPlatform ("maccatalyst13.0")]
[ObsoletedOSPlatform ("tvos9.0")]
[ObsoletedOSPlatform ("macos10.10")]
[ObsoletedOSPlatform ("ios8.0")]
Expand Down Expand Up @@ -771,9 +761,6 @@ bool IsDeprecated ()
[SupportedOSPlatform ("ios9.0")]
[SupportedOSPlatform ("macos10.11")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("tvos9.0")]
[UnsupportedOSPlatform ("macos10.11")]
[UnsupportedOSPlatform ("ios9.0")]
[ObsoletedOSPlatform ("tvos9.0", "Use 'CMTimebaseGetMasterTimebase' instead.")]
[ObsoletedOSPlatform ("macos10.11", "Use 'CMTimebaseGetMasterTimebase' instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use 'CMTimebaseGetMasterTimebase' instead.")]
Expand All @@ -795,9 +782,7 @@ bool IsDeprecated ()
[SupportedOSPlatform ("macos10.11")]
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("tvos9.0")]
[UnsupportedOSPlatform ("macos10.11")]
[UnsupportedOSPlatform ("ios9.0")]
[ObsoletedOSPlatform ("maccatalyst13.0", "Use 'CMTimebaseGetMasterClock' instead.")]
[ObsoletedOSPlatform ("tvos9.0", "Use 'CMTimebaseGetMasterClock' instead.")]
[ObsoletedOSPlatform ("macos10.11", "Use 'CMTimebaseGetMasterClock' instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use 'CMTimebaseGetMasterClock' instead.")]
Expand All @@ -816,9 +801,6 @@ bool IsDeprecated ()
[SupportedOSPlatform ("ios9.0")]
[SupportedOSPlatform ("macos10.11")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("tvos9.0")]
[UnsupportedOSPlatform ("macos10.11")]
[UnsupportedOSPlatform ("ios9.0")]
[ObsoletedOSPlatform ("tvos9.0", "Use 'CMTimebaseGetMaster' instead.")]
[ObsoletedOSPlatform ("macos10.11", "Use 'CMTimebaseGetMaster' instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use 'CMTimebaseGetMaster' instead.")]
Expand All @@ -839,9 +821,6 @@ bool IsDeprecated ()
[SupportedOSPlatform ("ios9.0")]
[SupportedOSPlatform ("macos10.11")]
[SupportedOSPlatform ("tvos")]
[UnsupportedOSPlatform ("tvos9.0")]
[UnsupportedOSPlatform ("macos10.11")]
[UnsupportedOSPlatform ("ios9.0")]
[ObsoletedOSPlatform ("tvos9.0", "Use 'CMTimebaseGetUltimateMasterClock' instead.")]
[ObsoletedOSPlatform ("macos10.11", "Use 'CMTimebaseGetUltimateMasterClock' instead.")]
[ObsoletedOSPlatform ("ios9.0", "Use 'CMTimebaseGetUltimateMasterClock' instead.")]
Expand Down
2 changes: 2 additions & 0 deletions src/NetworkExtension/NEHotspotConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ public NEHotspotConfiguration (string ssid, string passphrase, bool isWep)
[SupportedOSPlatform ("ios13.0")]
[SupportedOSPlatform ("maccatalyst")]
[UnsupportedOSPlatform ("macos")]
[UnsupportedOSPlatform ("tvos")]
#else
[iOS (13,0)]
#endif
Expand All @@ -37,6 +38,7 @@ public NEHotspotConfiguration (string ssid, bool ssidIsPrefix)
[SupportedOSPlatform ("ios13.0")]
[SupportedOSPlatform ("maccatalyst")]
[UnsupportedOSPlatform ("macos")]
[UnsupportedOSPlatform ("tvos")]
#else
[iOS (13,0)]
#endif
Expand Down
1 change: 1 addition & 0 deletions src/NetworkExtension/NEVpnManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ public partial class NEVpnManager {
[SupportedOSPlatform ("macos10.11")]
[UnsupportedOSPlatform ("ios")]
[UnsupportedOSPlatform ("maccatalyst")]
[UnsupportedOSPlatform ("tvos")]
#else
[Mac (10,11)]
#endif
Expand Down
2 changes: 2 additions & 0 deletions src/PassKit/PKPaymentRequest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ public partial class PKPaymentRequest {
[SupportedOSPlatform ("ios11.0")]
[SupportedOSPlatform ("macos11.0")]
[SupportedOSPlatform ("maccatalyst")]
[UnsupportedOSPlatform ("tvos")]
#else
[Watch (4,0)]
[iOS (11,0)]
Expand All @@ -60,6 +61,7 @@ public PKContactFields RequiredBillingContactFields {
[SupportedOSPlatform ("ios11.0")]
[SupportedOSPlatform ("macos11.0")]
[SupportedOSPlatform ("maccatalyst")]
[UnsupportedOSPlatform ("tvos")]
#else
[Watch (4,0)]
[iOS (11,0)]
Expand Down
4 changes: 4 additions & 0 deletions src/PdfKit/PdfAnnotation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ public partial class PdfAnnotation {
[SupportedOSPlatform ("macos10.12")]
[SupportedOSPlatform ("ios11.0")]
[SupportedOSPlatform ("maccatalyst")]
[UnsupportedOSPlatform ("tvos")]
#else
[Mac (10,12)]
#endif
Expand All @@ -38,6 +39,7 @@ public bool SetValue<T> (T value, PdfAnnotationKey key) where T : class, INative
[SupportedOSPlatform ("macos10.12")]
[SupportedOSPlatform ("ios11.0")]
[SupportedOSPlatform ("maccatalyst")]
[UnsupportedOSPlatform ("tvos")]
#else
[Mac (10,12)]
#endif
Expand All @@ -55,6 +57,7 @@ public bool SetValue (string str, PdfAnnotationKey key)
[SupportedOSPlatform ("macos10.12")]
[SupportedOSPlatform ("ios11.0")]
[SupportedOSPlatform ("maccatalyst")]
[UnsupportedOSPlatform ("tvos")]
#else
[Mac (10,12)]
#endif
Expand All @@ -77,6 +80,7 @@ public PdfAnnotationKey AnnotationType {
[SupportedOSPlatform ("macos10.13")]
[SupportedOSPlatform ("ios11.0")]
[SupportedOSPlatform ("maccatalyst")]
[UnsupportedOSPlatform ("tvos")]
#else
[Mac (10,13)]
#endif
Expand Down
1 change: 1 addition & 0 deletions src/WKWebKit/WKPreferences.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ public partial class WKPreferences {
[SupportedOSPlatform ("macos11.3")]
[SupportedOSPlatform ("ios14.5")]
[SupportedOSPlatform ("maccatalyst14.5")]
[UnsupportedOSPlatform ("tvos")]
#else
[Mac (11,3)]
[iOS (14,5)]
Expand Down
Loading