From 361e18fbccff2290f1e977ef5fae801778c38cb5 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Thu, 30 Oct 2025 09:54:44 +0100 Subject: [PATCH 1/2] [AVFoundation] Fix naming of AVMetadataObjectType.CatHead, and update corresponding test to work on earlier OS versions. --- src/avfoundation.cs | 8 +++++++- .../AVFoundation/CaptureMetadataOutputTest.cs | 5 +++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/avfoundation.cs b/src/avfoundation.cs index 8ae96cb32616..a445c540ee1b 100644 --- a/src/avfoundation.cs +++ b/src/avfoundation.cs @@ -12395,9 +12395,15 @@ enum AVMetadataObjectType : ulong { [Field ("AVMetadataObjectTypeHumanFullBody")] HumanFullBody = 1 << 24, +#if !XAMCORE_5_0 + [Obsolete ("Use 'CatHead' instead.")] [MacCatalyst (26, 0), TV (26, 0), Mac (26, 0), iOS (26, 0)] - [Field ("AVMetadataObjectTypeCatHead")] AVMetadataObjectTypeCatHead = 1 << 25, +#endif + + [MacCatalyst (26, 0), TV (26, 0), Mac (26, 0), iOS (26, 0)] + [Field ("AVMetadataObjectTypeCatHead")] + CatHead = 1 << 25, [MacCatalyst (26, 0), TV (26, 0), Mac (26, 0), iOS (26, 0)] [Field ("AVMetadataObjectTypeDogHead")] diff --git a/tests/monotouch-test/AVFoundation/CaptureMetadataOutputTest.cs b/tests/monotouch-test/AVFoundation/CaptureMetadataOutputTest.cs index b433cd73bd46..5932a5c71724 100644 --- a/tests/monotouch-test/AVFoundation/CaptureMetadataOutputTest.cs +++ b/tests/monotouch-test/AVFoundation/CaptureMetadataOutputTest.cs @@ -119,6 +119,11 @@ public void MetadataObjectTypesTest () if (!TestRuntime.CheckXcodeVersion (13, 3)) continue; break; + case AVMetadataObjectType.CatHead: + case AVMetadataObjectType.DogHead: + if (!TestRuntime.CheckXcodeVersion (26, 0)) + continue; + break; } metadataOutput.MetadataObjectTypes = val; all |= val; From 750f3fe5bfe691974687de788be52c92e741bfe0 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Thu, 30 Oct 2025 15:24:21 +0100 Subject: [PATCH 2/2] Update cecil tests. --- tests/cecil-tests/Documentation.KnownFailures.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cecil-tests/Documentation.KnownFailures.txt b/tests/cecil-tests/Documentation.KnownFailures.txt index 42767cc9b990..97f6b0bd7cf5 100644 --- a/tests/cecil-tests/Documentation.KnownFailures.txt +++ b/tests/cecil-tests/Documentation.KnownFailures.txt @@ -1476,8 +1476,8 @@ F:AVFoundation.AVMediaCharacteristics.MachineGenerated F:AVFoundation.AVMediaCharacteristics.TactileMinimal F:AVFoundation.AVMediaTypes.AuxiliaryPicture F:AVFoundation.AVMediaTypes.Haptic -F:AVFoundation.AVMetadataObjectType.AVMetadataObjectTypeCatHead F:AVFoundation.AVMetadataObjectType.CatBody +F:AVFoundation.AVMetadataObjectType.CatHead F:AVFoundation.AVMetadataObjectType.CodabarCode F:AVFoundation.AVMetadataObjectType.DogBody F:AVFoundation.AVMetadataObjectType.DogHead