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

[NET Attribute Conversion] Rerun with fixes to catch old/unlisted availability and type information. Enable one test. #14287

Closed
Closed
Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
08619d0
[NET Attribute Conversion] Chip Framework
chamons Feb 11, 2022
d9acdf1
[NET Attribute Conversion] Rerun with many fixes
chamons Feb 11, 2022
5d06b66
Code reivew improvements
chamons Mar 1, 2022
b7b6329
Revert unnecessary ignores
chamons Mar 2, 2022
5c3786b
Remove all attributes on partial classes in code behind
chamons Mar 2, 2022
b23cbb4
Add enum todo's as generator work is not complete
chamons Mar 2, 2022
a47fc13
[generator] Fix crash when referencing types that have introduced wit…
chamons Mar 2, 2022
0ba56ed
[Introspection] Improve error message in case to include type
chamons Mar 3, 2022
ef02857
Disable availabile & unavailable check in NET as its required there
chamons Mar 3, 2022
baae3c1
[Introspection] Add disables until generator work is in
chamons Mar 3, 2022
c305405
More code reivew changes
chamons Mar 3, 2022
8f02430
Remove a few more unneeded attributes
chamons Mar 3, 2022
353b9fc
Code review changes
chamons Mar 7, 2022
1bd9713
Merge branch 'main' into attribute_super_convert_type_mass_smash_2
chamons Mar 7, 2022
81057e7
Fix test failures
chamons Mar 7, 2022
2e6e1b6
Remove unnecessary attributes on public partial
chamons Mar 8, 2022
eba0ec5
Clear up some incorrect supported on types mel mis-guessed on
chamons Mar 8, 2022
bf5b19d
Add new cecil test to detect double attributed elements and fix a lar…
chamons Mar 8, 2022
f1b8e9b
Merge branch 'main' into attribute_super_convert_type_mass_smash_2
chamons Mar 10, 2022
fc3e428
Update src/generator-attribute-manager.cs
chamons Mar 10, 2022
32658fa
Code review changes
chamons Mar 10, 2022
669494c
Merge branch 'main' into attribute_super_convert_type_mass_smash_2
chamons Mar 10, 2022
bd872e5
Merge branch 'main' into attribute_super_convert_type_mass_smash_2
chamons Mar 11, 2022
f32651c
Merge branch 'main' into attribute_super_convert_type_mass_smash_2
chamons Mar 11, 2022
1c36da1
Merge branch 'main' into attribute_super_convert_type_mass_smash_2
mandel-macaque Mar 12, 2022
92e446d
Merge branch 'main' into attribute_super_convert_type_mass_smash_2
chamons Mar 14, 2022
7c3f397
Merge branch 'main' into attribute_super_convert_type_mass_smash_2
chamons Mar 15, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions src/AVFoundation/AVAudioConverterPrimeInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ namespace AVFoundation {
#if NET
[SupportedOSPlatform ("ios9.0")]
[SupportedOSPlatform ("macos10.11")]
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("tvos")]
#else
[iOS (9,0)]
[Mac (10,11)]
Expand Down
1 change: 1 addition & 0 deletions src/AVFoundation/AVAudioRecorder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ public static AVAudioRecorder Create (NSUrl url, AudioSettings settings, out NSE
#if NET
[SupportedOSPlatform ("ios10.0")]
[SupportedOSPlatform ("macos10.12")]
[SupportedOSPlatform ("maccatalyst")]
[UnsupportedOSPlatform ("tvos")]
#else
[iOS (10,0)]
Expand Down
16 changes: 16 additions & 0 deletions src/AVFoundation/AVAudioSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,13 @@

namespace AVFoundation {


#if NET
[SupportedOSPlatform ("ios")]
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
#endif
// Should be called AVAudioSetting but AVAudioSetting has been already used by keys class
public class AudioSettings : DictionaryContainer
{
Expand Down Expand Up @@ -164,6 +171,9 @@ public int? EncoderBitDepthHint {

#if NET
[SupportedOSPlatform ("ios7.0")]
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
#else
[iOS (7,0)]
#endif
Expand Down Expand Up @@ -206,6 +216,9 @@ public AVAudioBitRateStrategy? BitRateStrategy {

#if NET
[SupportedOSPlatform ("ios7.0")]
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
#else
[iOS (7,0)]
#endif
Expand Down Expand Up @@ -238,6 +251,9 @@ public AVSampleRateConverterAlgorithm? SampleRateConverterAlgorithm {

#if NET
[SupportedOSPlatform ("ios7.0")]
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
#else
[iOS (7,0)]
#endif
Expand Down
2 changes: 2 additions & 0 deletions src/AVFoundation/AVBeatRange.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ namespace AVFoundation {
#if NET
[SupportedOSPlatform ("ios9.0")]
[SupportedOSPlatform ("macos10.11")]
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("tvos")]
#else
[iOS (9,0)]
[Mac (10,11)]
Expand Down
7 changes: 7 additions & 0 deletions src/AVFoundation/AVEdgeWidths.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,16 @@
using System.Runtime.InteropServices;
using Foundation;
using ObjCRuntime;
using System.Runtime.Versioning;

namespace AVFoundation {

#if NET
[SupportedOSPlatform ("ios")]
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
#endif
[StructLayout (LayoutKind.Sequential)]
public struct AVEdgeWidths {
public nfloat /* CGFloat */ Left, Top, Right, Bottom;
Expand Down
7 changes: 7 additions & 0 deletions src/AVFoundation/AVPixelAspectRatio.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,16 @@
using System.Runtime.InteropServices;
using Foundation;
using ObjCRuntime;
using System.Runtime.Versioning;

namespace AVFoundation {

#if NET
[SupportedOSPlatform ("ios")]
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
#endif
[StructLayout (LayoutKind.Sequential)]
public struct AVPixelAspectRatio {
public nint /* NSInteger */ HorizontalSpacing;
Expand Down
1 change: 1 addition & 0 deletions src/AVFoundation/AVPlayerItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ public partial class AVPlayerItem {
[SupportedOSPlatform ("tvos11.0")]
[SupportedOSPlatform ("macos10.13")]
[SupportedOSPlatform ("ios11.0")]
[SupportedOSPlatform ("maccatalyst")]
#else
[TV (11, 0)]
[NoWatch]
Expand Down
2 changes: 2 additions & 0 deletions src/AVFoundation/AVPlayerLayer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ public partial class AVPlayerLayer {
#if NET
[SupportedOSPlatform ("ios9.0")]
[SupportedOSPlatform ("macos10.11")]
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("tvos")]
#else
[iOS (9,0)]
[Mac (10,11)]
Expand Down
46 changes: 46 additions & 0 deletions src/AVFoundation/AVTypes.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@

namespace AVFoundation {

#if NET
[SupportedOSPlatform ("ios")]
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
#endif
[StructLayout (LayoutKind.Sequential)]
public struct AVAudio3DVectorOrientation {
#if !COREBUILD
Expand Down Expand Up @@ -61,6 +67,12 @@ public override int GetHashCode ()
#endif
}

#if NET
[SupportedOSPlatform ("ios")]
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
#endif
[StructLayout (LayoutKind.Sequential)]
public struct AVAudio3DAngularOrientation {

Expand Down Expand Up @@ -104,6 +116,12 @@ public override int GetHashCode ()
}
}

#if NET
[SupportedOSPlatform ("ios")]
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
#endif
[StructLayout (LayoutKind.Sequential)]
public struct AVCaptureWhiteBalanceGains {
public float RedGain, GreenGain, BlueGain;
Expand Down Expand Up @@ -153,6 +171,12 @@ public override int GetHashCode ()
}
}

#if NET
[SupportedOSPlatform ("ios")]
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
#endif
[StructLayout (LayoutKind.Sequential)]
public struct AVCaptureWhiteBalanceChromaticityValues {
public float X, Y;
Expand Down Expand Up @@ -197,6 +221,12 @@ public override int GetHashCode ()
}
}

#if NET
[SupportedOSPlatform ("ios")]
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
#endif
[StructLayout (LayoutKind.Sequential)]
public struct AVCaptureWhiteBalanceTemperatureAndTintValues {
public float Temperature, Tint;
Expand Down Expand Up @@ -241,11 +271,23 @@ public override int GetHashCode ()
}
}

#if NET
[SupportedOSPlatform ("ios8.0")]
[SupportedOSPlatform ("macos10.10")]
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("tvos")]
#endif
#if !COREBUILD
public static partial class AVMetadataIdentifiers {
}
#endif

#if NET
[SupportedOSPlatform ("ios")]
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
#endif
#if !WATCH
public static class AVUtilities {

Expand All @@ -263,6 +305,7 @@ public static CGRect WithAspectRatio (this CGRect self, CGSize aspectRatio)

#if NET
[SupportedOSPlatform ("macos10.10")]
[SupportedOSPlatform ("maccatalyst")]
[UnsupportedOSPlatform ("ios")]
[UnsupportedOSPlatform ("tvos")]
#else
Expand All @@ -288,6 +331,7 @@ public struct AVSampleCursorSyncInfo {

#if NET
[SupportedOSPlatform ("macos10.10")]
[SupportedOSPlatform ("maccatalyst")]
[UnsupportedOSPlatform ("ios")]
[UnsupportedOSPlatform ("tvos")]
#else
Expand Down Expand Up @@ -322,6 +366,7 @@ public struct AVSampleCursorDependencyInfo {

#if NET
[SupportedOSPlatform ("macos10.10")]
[SupportedOSPlatform ("maccatalyst")]
[UnsupportedOSPlatform ("ios")]
[UnsupportedOSPlatform ("tvos")]
#else
Expand All @@ -341,6 +386,7 @@ public struct AVSampleCursorStorageRange {

#if NET
[SupportedOSPlatform ("macos10.10")]
[SupportedOSPlatform ("maccatalyst")]
[UnsupportedOSPlatform ("ios")]
[UnsupportedOSPlatform ("tvos")]
#else
Expand Down
7 changes: 6 additions & 1 deletion src/AVFoundation/AVUrlAssetOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,12 @@

namespace AVFoundation {

#if !NET
#if NET
[SupportedOSPlatform ("ios")]
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
#else
[Watch (6,0)]
#endif
public class AVUrlAssetOptions : DictionaryContainer
Expand Down
46 changes: 45 additions & 1 deletion src/AVFoundation/AVVideoSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,12 @@ public enum AVVideoProfileLevelH264 : int
}

#if !WATCH
#if NET
[SupportedOSPlatform ("ios")]
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
#endif
public class AVVideoSettingsUncompressed : CVPixelBufferAttributes
{
#if !COREBUILD
Expand Down Expand Up @@ -138,7 +144,13 @@ public enum AVVideoH264EntropyMode {
AdaptiveBinaryArithmetic
}
#endif


#if NET
[SupportedOSPlatform ("ios")]
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
#endif
public class AVVideoSettingsCompressed : DictionaryContainer
{
#if !COREBUILD
Expand Down Expand Up @@ -207,6 +219,9 @@ public int? Height {

#if NET
[SupportedOSPlatform ("ios7.0")]
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
#else
[iOS (7,0)]
#endif
Expand All @@ -222,6 +237,8 @@ public double? MaxKeyFrameIntervalDuration {
#if !MONOMAC
#if NET
[SupportedOSPlatform ("ios7.0")]
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("tvos")]
#else
[iOS (7,0)]
#endif
Expand All @@ -236,6 +253,9 @@ public bool? AllowFrameReordering {

#if NET
[SupportedOSPlatform ("ios7.0")]
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
#else
[iOS (7,0)]
#endif
Expand Down Expand Up @@ -276,6 +296,9 @@ public AVVideoH264EntropyMode? EntropyEncoding {
// frame rate can be floating point (29.97 is common for instance)
#if NET
[SupportedOSPlatform ("ios7.0")]
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
#else
[iOS (7,0)]
#endif
Expand All @@ -291,6 +314,9 @@ public float? ExpectedSourceFrameRate {
// frame rate can be floating point (29.97 is common for instance)
#if NET
[SupportedOSPlatform ("ios7.0")]
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
#else
[iOS (7,0)]
#endif
Expand Down Expand Up @@ -353,6 +379,12 @@ public AVVideoCodecSettings CodecSettings {
#endif
}

#if NET
[SupportedOSPlatform ("ios")]
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
#endif
public class AVVideoCodecSettings : DictionaryContainer
{
#if !COREBUILD
Expand Down Expand Up @@ -518,6 +550,12 @@ public AVVideoCleanApertureSettings VideoCleanAperture {
#endif
}

#if NET
[SupportedOSPlatform ("ios")]
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
#endif
public class AVVideoPixelAspectRatioSettings : DictionaryContainer
{
#if !COREBUILD
Expand Down Expand Up @@ -551,6 +589,12 @@ public int? VerticalSpacing {
#endif
}

#if NET
[SupportedOSPlatform ("ios")]
[SupportedOSPlatform ("maccatalyst")]
[SupportedOSPlatform ("macos")]
[SupportedOSPlatform ("tvos")]
#endif
public class AVVideoCleanApertureSettings : DictionaryContainer
{
#if !COREBUILD
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ namespace AVFoundation {
[SupportedOSPlatform ("tvos11.0")]
[SupportedOSPlatform ("macos10.13")]
[SupportedOSPlatform ("ios11.0")]
[SupportedOSPlatform ("maccatalyst")]
#else
[TV (11, 0)]
[NoWatch]
Expand Down
Loading