Merge xcode14.1 into net7.0-xcode14.1.

2022-10-24 23:43:35 +02:00 · 2022-10-24 23:43:35 +02:00 · 13ee421a67
--- a/src/CoreLocation/CLEnums.cs
+++ b/src/CoreLocation/CLEnums.cs
@ -93,7 +93,8 @@ namespace CoreLocation {
 		[Deprecated (PlatformName.iOS, 8, 0, message : "Use 'AuthorizedAlways' instead.")]
 		Authorized,
 		AuthorizedAlways = Authorized,
-		AuthorizedWhenInUse			
+		[Deprecated (PlatformName.MacOSX, 13, 0)]
+		AuthorizedWhenInUse,
 	}

 	// NSInteger -> CLLocationManager.h
--- a/src/CoreMedia/Enums.cs
+++ b/src/CoreMedia/Enums.cs
@ -84,5 +84,8 @@ namespace CoreMedia {
 		[Mac (10,10)]
 		[Field ("kCMSampleBufferAttachmentKey_ForceKeyFrame")]
 		ForceKeyFrame,
+		[Watch (9, 0), TV (16, 0), Mac (13, 0), iOS (16, 0)]
+		[Field ("kCMSampleAttachmentKey_HDR10PlusPerFrameData")]
+		Hdr10PlusPerFrameData,
 	}
 }
--- a/src/HealthKit/HKObjectType.cs
+++ b/src/HealthKit/HKObjectType.cs
@ -51,7 +51,10 @@ namespace HealthKit
 	public partial class HKDocumentType {
 		public static HKDocumentType? Create (HKDocumentTypeIdentifier kind)
 		{
-			return HKObjectType._GetDocumentType (kind.GetConstant ());
+			var constant = kind.GetConstant ();
+			if (constant is not null)
+				return HKObjectType._GetDocumentType (constant);
+			return null;
 		}
 	}
 #endif
--- a/src/coremedia.cs
+++ b/src/coremedia.cs
@ -176,6 +176,10 @@ namespace CoreMedia {
 		[Mac (10,10)]
 		[Field ("kCMSampleBufferAttachmentKey_ForceKeyFrame")]
 		NSString ForceKeyFrameKey { get; }
+
+		[Watch (9, 0), TV (16, 0), Mac (13, 0), iOS (16, 0)]
+		[Field ("kCMSampleAttachmentKey_HDR10PlusPerFrameData")]
+		NSString Hdr10PlusPerFrameDataKey { get; }
 	}

 	[Watch (6,0)]
@ -213,6 +217,10 @@ namespace CoreMedia {

 		[Mac (10,10)]
 		bool ForceKeyFrame { get; set; }
+
+		[Watch (9, 0), TV (16, 0), Mac (13, 0), iOS (16, 0)]
+		[Field ("kCMSampleAttachmentKey_HDR10PlusPerFrameData")]
+		NSData Hdr10PlusPerFrameData { get; set; } // it is a CFData, but that is a toll-free bridged
 	}

 	[Internal]
--- a/src/healthkit.cs
+++ b/src/healthkit.cs
@ -1260,7 +1260,7 @@ namespace HealthKit {
 		[Static]
 		[Export ("documentTypeForIdentifier:")]
 		[return: NullAllowed]
-		HKDocumentType _GetDocumentType ([NullAllowed] NSString hkDocumentTypeIdentifier);
+		HKDocumentType _GetDocumentType (NSString hkDocumentTypeIdentifier);

 		[Static, Export ("workoutType")]
 #if NET
@ -2285,6 +2285,18 @@ namespace HealthKit {
 		[Watch (9, 0), MacCatalyst (16, 0), Mac (13, 0), iOS (16, 0), NoTV]
 		[Field ("HKQuantityTypeIdentifierAtrialFibrillationBurden")]
 		AtrialFibrillationBurden,
+
+		[Watch (9, 0), MacCatalyst (16, 0), Mac (13, 0), iOS (16, 0)]
+		[Field ("HKQuantityTypeIdentifierAppleSleepingWristTemperature")]
+		AppleSleepingWristTemperature,
+
+		[Watch (9, 0), MacCatalyst (16, 0), Mac (13, 0), iOS (16, 0)]
+		[Field ("HKQuantityTypeIdentifierUnderwaterDepth")]
+		UnderwaterDepth,
+
+		[Watch (9, 0), MacCatalyst (16, 0), Mac (13, 0), iOS (16, 0)]
+		[Field ("HKQuantityTypeIdentifierWaterTemperature")]
+		WaterTemperature,
 	}

 	[Watch (2,0)]
@ -2558,6 +2570,22 @@ namespace HealthKit {
 		[Watch (8, 0), iOS (15, 0)]
 		[Field ("HKCategoryTypeIdentifierProgesteroneTestResult")]
 		ProgesteroneTestResult,
+
+		[Watch (9, 0), MacCatalyst (16, 0), Mac (13, 0), iOS (16, 0)]
+		[Field ("HKCategoryTypeIdentifierInfrequentMenstrualCycles")]
+		InfrequentMenstrualCycles,
+
+		[Watch (9, 0), MacCatalyst (16, 0), Mac (13, 0), iOS (16, 0)]
+		[Field ("HKCategoryTypeIdentifierIrregularMenstrualCycles")]
+		IrregularMenstrualCycles,
+
+		[Watch (9, 0), MacCatalyst (16, 0), Mac (13, 0), iOS (16, 0)]
+		[Field ("HKCategoryTypeIdentifierPersistentIntermenstrualBleeding")]
+		PersistentIntermenstrualBleeding,
+
+		[Watch (9, 0), MacCatalyst (16, 0), Mac (13, 0), iOS (16, 0)]
+		[Field ("HKCategoryTypeIdentifierProlongedMenstrualPeriods")]
+		ProlongedMenstrualPeriods,
 	}

 	[Watch (2,0)]
--- a/src/uikit.cs
+++ b/src/uikit.cs
@ -21732,6 +21732,10 @@ namespace UIKit {
 		[DesignatedInitializer]
 		[Wrap ("base (action)")]
 		NativeHandle Constructor (Action action);
+
+		[iOS (16, 1)]
+		[Export ("zOffset")]
+		nfloat ZOffset { get; }
 	}

 	interface IUILargeContentViewerItem { }
--- a/tests/xtro-sharpie/api-annotations-dotnet/common-HealthKit.ignore
+++ b/tests/xtro-sharpie/api-annotations-dotnet/common-HealthKit.ignore
@ -5,5 +5,4 @@
 !extra-null-allowed! 'HealthKit.HKCategoryType HealthKit.HKObjectType::GetCategoryType(Foundation.NSString)' has a extraneous [NullAllowed] on parameter #0
 !extra-null-allowed! 'HealthKit.HKCharacteristicType HealthKit.HKObjectType::GetCharacteristicType(Foundation.NSString)' has a extraneous [NullAllowed] on parameter #0
 !extra-null-allowed! 'HealthKit.HKCorrelationType HealthKit.HKObjectType::GetCorrelationType(Foundation.NSString)' has a extraneous [NullAllowed] on parameter #0
-!extra-null-allowed! 'HealthKit.HKDocumentType HealthKit.HKObjectType::_GetDocumentType(Foundation.NSString)' has a extraneous [NullAllowed] on parameter #0
 !extra-null-allowed! 'HealthKit.HKQuantityType HealthKit.HKObjectType::GetQuantityType(Foundation.NSString)' has a extraneous [NullAllowed] on parameter #0
--- a/tests/xtro-sharpie/api-annotations-dotnet/iOS-CoreMedia.todo
+++ b/tests/xtro-sharpie/api-annotations-dotnet/iOS-CoreMedia.todo
@ -1 +0,0 @@
-!missing-field! kCMSampleAttachmentKey_HDR10PlusPerFrameData not bound
--- a/tests/xtro-sharpie/api-annotations-dotnet/iOS-HealthKit.todo
+++ b/tests/xtro-sharpie/api-annotations-dotnet/iOS-HealthKit.todo
@ -1,7 +0,0 @@
-!missing-field! HKCategoryTypeIdentifierInfrequentMenstrualCycles not bound
-!missing-field! HKCategoryTypeIdentifierIrregularMenstrualCycles not bound
-!missing-field! HKCategoryTypeIdentifierPersistentIntermenstrualBleeding not bound
-!missing-field! HKCategoryTypeIdentifierProlongedMenstrualPeriods not bound
-!missing-field! HKQuantityTypeIdentifierAppleSleepingWristTemperature not bound
-!missing-field! HKQuantityTypeIdentifierUnderwaterDepth not bound
-!missing-field! HKQuantityTypeIdentifierWaterTemperature not bound
--- a/tests/xtro-sharpie/api-annotations-dotnet/iOS-UIKit.todo
+++ b/tests/xtro-sharpie/api-annotations-dotnet/iOS-UIKit.todo
@ -1 +0,0 @@
-!missing-selector! UIHoverGestureRecognizer::zOffset not bound
--- a/tests/xtro-sharpie/api-annotations-dotnet/macOS-CoreLocation.todo
+++ b/tests/xtro-sharpie/api-annotations-dotnet/macOS-CoreLocation.todo
@ -1 +0,0 @@
-!extra-enum-value! Managed value 4 for CLAuthorizationStatus.AuthorizedWhenInUse is available for the current platform while the value in the native header is not
--- a/tests/xtro-sharpie/api-annotations-dotnet/macOS-CoreMedia.todo
+++ b/tests/xtro-sharpie/api-annotations-dotnet/macOS-CoreMedia.todo
@ -1 +0,0 @@
-!missing-field! kCMSampleAttachmentKey_HDR10PlusPerFrameData not bound
--- a/tests/xtro-sharpie/api-annotations-dotnet/macOS-HealthKit.todo
+++ b/tests/xtro-sharpie/api-annotations-dotnet/macOS-HealthKit.todo
@ -1,7 +0,0 @@
-!missing-field! HKCategoryTypeIdentifierInfrequentMenstrualCycles not bound
-!missing-field! HKCategoryTypeIdentifierIrregularMenstrualCycles not bound
-!missing-field! HKCategoryTypeIdentifierPersistentIntermenstrualBleeding not bound
-!missing-field! HKCategoryTypeIdentifierProlongedMenstrualPeriods not bound
-!missing-field! HKQuantityTypeIdentifierAppleSleepingWristTemperature not bound
-!missing-field! HKQuantityTypeIdentifierUnderwaterDepth not bound
-!missing-field! HKQuantityTypeIdentifierWaterTemperature not bound
--- a/tests/xtro-sharpie/api-annotations-dotnet/tvOS-CoreMedia.todo
+++ b/tests/xtro-sharpie/api-annotations-dotnet/tvOS-CoreMedia.todo
@ -1 +0,0 @@
-!missing-field! kCMSampleAttachmentKey_HDR10PlusPerFrameData not bound
--- a/tests/xtro-sharpie/iOS-CoreMedia.todo
+++ b/tests/xtro-sharpie/iOS-CoreMedia.todo
@ -1 +0,0 @@
-!missing-field! kCMSampleAttachmentKey_HDR10PlusPerFrameData not bound
--- a/tests/xtro-sharpie/iOS-HealthKit.ignore
+++ b/tests/xtro-sharpie/iOS-HealthKit.ignore
@ -1 +0,0 @@
-!extra-null-allowed! 'HealthKit.HKDocumentType HealthKit.HKObjectType::_GetDocumentType(Foundation.NSString)' has a extraneous [NullAllowed] on parameter #0
--- a/tests/xtro-sharpie/iOS-HealthKit.todo
+++ b/tests/xtro-sharpie/iOS-HealthKit.todo
@ -1,7 +0,0 @@
-!missing-field! HKCategoryTypeIdentifierInfrequentMenstrualCycles not bound
-!missing-field! HKCategoryTypeIdentifierIrregularMenstrualCycles not bound
-!missing-field! HKCategoryTypeIdentifierPersistentIntermenstrualBleeding not bound
-!missing-field! HKCategoryTypeIdentifierProlongedMenstrualPeriods not bound
-!missing-field! HKQuantityTypeIdentifierAppleSleepingWristTemperature not bound
-!missing-field! HKQuantityTypeIdentifierUnderwaterDepth not bound
-!missing-field! HKQuantityTypeIdentifierWaterTemperature not bound
--- a/tests/xtro-sharpie/iOS-UIKit.todo
+++ b/tests/xtro-sharpie/iOS-UIKit.todo
@ -1 +0,0 @@
-!missing-selector! UIHoverGestureRecognizer::zOffset not bound
--- a/tests/xtro-sharpie/macOS-CoreLocation.todo
+++ b/tests/xtro-sharpie/macOS-CoreLocation.todo
@ -1 +0,0 @@
-!extra-enum-value! Managed value 4 for CLAuthorizationStatus.AuthorizedWhenInUse is available for the current platform while the value in the native header is not
--- a/tests/xtro-sharpie/macOS-CoreMedia.todo
+++ b/tests/xtro-sharpie/macOS-CoreMedia.todo
@ -1 +0,0 @@
-!missing-field! kCMSampleAttachmentKey_HDR10PlusPerFrameData not bound
--- a/tests/xtro-sharpie/macOS-HealthKit.todo
+++ b/tests/xtro-sharpie/macOS-HealthKit.todo
@ -1,8 +0,0 @@
-!extra-null-allowed! 'HealthKit.HKDocumentType HealthKit.HKObjectType::_GetDocumentType(Foundation.NSString)' has a extraneous [NullAllowed] on parameter #0
-!missing-field! HKCategoryTypeIdentifierInfrequentMenstrualCycles not bound
-!missing-field! HKCategoryTypeIdentifierIrregularMenstrualCycles not bound
-!missing-field! HKCategoryTypeIdentifierPersistentIntermenstrualBleeding not bound
-!missing-field! HKCategoryTypeIdentifierProlongedMenstrualPeriods not bound
-!missing-field! HKQuantityTypeIdentifierAppleSleepingWristTemperature not bound
-!missing-field! HKQuantityTypeIdentifierUnderwaterDepth not bound
-!missing-field! HKQuantityTypeIdentifierWaterTemperature not bound
--- a/tests/xtro-sharpie/tvOS-CoreMedia.todo
+++ b/tests/xtro-sharpie/tvOS-CoreMedia.todo
@ -1 +0,0 @@
-!missing-field! kCMSampleAttachmentKey_HDR10PlusPerFrameData not bound
--- a/tests/xtro-sharpie/watchOS-CoreMedia.todo
+++ b/tests/xtro-sharpie/watchOS-CoreMedia.todo
@ -1 +0,0 @@
-!missing-field! kCMSampleAttachmentKey_HDR10PlusPerFrameData not bound
--- a/tests/xtro-sharpie/watchOS-HealthKit.todo
+++ b/tests/xtro-sharpie/watchOS-HealthKit.todo
@ -1,7 +0,0 @@
-!missing-field! HKCategoryTypeIdentifierInfrequentMenstrualCycles not bound
-!missing-field! HKCategoryTypeIdentifierIrregularMenstrualCycles not bound
-!missing-field! HKCategoryTypeIdentifierPersistentIntermenstrualBleeding not bound
-!missing-field! HKCategoryTypeIdentifierProlongedMenstrualPeriods not bound
-!missing-field! HKQuantityTypeIdentifierAppleSleepingWristTemperature not bound
-!missing-field! HKQuantityTypeIdentifierUnderwaterDepth not bound
-!missing-field! HKQuantityTypeIdentifierWaterTemperature not bound
				`@ -1 +0,0 @@`
				`!missing-field! kCMSampleAttachmentKey_HDR10PlusPerFrameData not bound`
				`@ -1 +0,0 @@`
				`!missing-selector! UIHoverGestureRecognizer::zOffset not bound`
				`@ -1 +0,0 @@`
				`!extra-enum-value! Managed value 4 for CLAuthorizationStatus.AuthorizedWhenInUse is available for the current platform while the value in the native header is not`
				`@ -1 +0,0 @@`
				`!extra-null-allowed! 'HealthKit.HKDocumentType HealthKit.HKObjectType::_GetDocumentType(Foundation.NSString)' has a extraneous [NullAllowed] on parameter #0`