[xcode13.1] Bump macios to Xcode 13.1 SDKs

Make.versions

@@ -48,8 +48,8 @@
 #   line changed in git).
 #
 
-IOS_PACKAGE_VERSION=15.1.0.$(IOS_COMMIT_DISTANCE)
-MAC_PACKAGE_VERSION=8.1.0.$(MAC_COMMIT_DISTANCE)
+IOS_PACKAGE_VERSION=15.2.0.$(IOS_COMMIT_DISTANCE)
+MAC_PACKAGE_VERSION=8.2.0.$(MAC_COMMIT_DISTANCE)
 
 #
 # ** NuGet package version numbers **

src/AVFoundation/Enums.cs

@@ -1358,4 +1358,24 @@ public enum AVCaptionConversionValidatorStatus : long
 		Stopped = 3,
 	}
 
+	[NoWatch, NoTV, MacCatalyst (15,0), Mac (12,0), iOS (15,0)]
+	[Native]
+	public enum AVCapturePrimaryConstituentDeviceSwitchingBehavior : long
+	{
+		Unsupported = 0,
+		Auto = 1,
+		Restricted = 2,
+		Locked = 3,
+	}
+
+	[Flags, NoWatch, NoTV, MacCatalyst (15,0), Mac (12,0), iOS (15,0)]
+	[Native]
+	public enum AVCapturePrimaryConstituentDeviceRestrictedSwitchingBehaviorConditions : ulong
+	{
+		None = 0x0,
+		VideoZoomChanged = 1uL << 0,
+		FocusModeChanged = 1uL << 1,
+		ExposureModeChanged = 1uL << 2,
+	}
+
 }

src/CoreMedia/CMEnums.cs

@@ -126,6 +126,8 @@ public enum CMVideoCodecType : uint
 		Hevc             = 0x68766331,
 		[iOS (14,5)][TV (14,5)][Watch (7,4)][Mac (11,3)]
 		DolbyVisionHevc  = 0x64766831,
+		DisparityHevc    = 0x64697368,
+		DepthHevc        = 0x64657068,
 	}
 
 	// UInt32 enum => CMFormatDescription.h

src/Metal/MTLEnums.cs

@@ -1381,4 +1381,12 @@ public enum MTLAccelerationStructureInstanceDescriptorType : ulong {
 		UserID = 1,
 		Motion = 2,
 	}
+
+	[NoMac, iOS (15,0), NoMacCatalyst, NoTV, NoWatch]
+	[Native]
+	public enum MTLTextureCompressionType : long
+	{
+		Lossless = 0,
+		Lossy = 1,
+	}
 }

src/appkit.cs

@@ -13146,6 +13146,21 @@ partial interface NSScreen {
 		[Export ("localizedName", ArgumentSemantic.Copy)]
 		string LocalizedName { get; }
 
+		[ThreadSafe]
+		[Mac (12,0)]
+		[Export ("safeAreaInsets")]
+		NSEdgeInsets SafeAreaInsets { get; }
+
+		[ThreadSafe]
+		[Mac (12,0)]
+		[Export ("auxiliaryTopLeftArea")]
+		CGRect AuxiliaryTopLeftArea { get; }
+
+		[ThreadSafe]
+		[Mac (12,0)]
+		[Export ("auxiliaryTopRightArea")]
+		CGRect AuxiliaryTopRightArea { get; }
+
 		[Mac (12,0)]
 		[Export ("maximumFramesPerSecond")]
 		nint MaximumFramesPerSecond { get; }

src/avfoundation.cs

@@ -8212,7 +8212,7 @@ interface AVAssetExportSession {
 		[Field ("AVAssetExportPresetPassthrough")]
 		NSString PresetPassthrough { get; }
 
-		[NoWatch, NoTV, NoiOS, Mac (10,15)]
+		[NoWatch, NoTV, MacCatalyst (15,0), iOS (15,0), Mac (10,15)]
 		[Field ("AVAssetExportPresetAppleProRes4444LPCM")]
 		NSString PresetAppleProRes4444Lpcm { get; }
 
@@ -9250,37 +9250,43 @@ interface AVCaptureAudioPreviewOutput {
 		float Volume { get; set; } /* float, not CGFloat */
 	}
 
-#if MONOMAC
+	[NoWatch, NoTV]
 	[Static]
 	interface AVAssetExportPresetApple {
 
+		[NoiOS]
 		[Field ("AVAssetExportPresetAppleM4VCellular")]
 		NSString M4VCellular { get; }
 
+		[NoiOS]
 		[Field ("AVAssetExportPresetAppleM4ViPod")]
 		NSString M4ViPod { get; }
 
+		[NoiOS]
 		[Field ("AVAssetExportPresetAppleM4V480pSD")]
 		NSString M4V480pSD { get; }
 
+		[NoiOS]
 		[Field ("AVAssetExportPresetAppleM4VAppleTV")]
 		NSString M4VAppleTV { get; }
 
+		[NoiOS]
 		[Field ("AVAssetExportPresetAppleM4VWiFi")]
 		NSString M4VWiFi { get; }
 
+		[NoiOS]
 		[Field ("AVAssetExportPresetAppleM4V720pHD")]
 		NSString M4V720pHD { get; }
 
+		[NoiOS]
 		[Field ("AVAssetExportPresetAppleM4V1080pHD")]
 		NSString M4V1080pHD { get; }
 
+		[iOS (15,0), MacCatalyst (15,0)]
 		[Field ("AVAssetExportPresetAppleProRes422LPCM")]
 		NSString ProRes422Lpcm { get; }
 	}
 
-#endif
-
 	[Introduced (PlatformName.MacCatalyst, 14, 0)]
 	[NoWatch]
 	[NoTV]
@@ -10366,6 +10372,22 @@ interface AVCaptureMovieFileOutput {
 		[NoWatch, NoTV, NoMac, iOS (12,0)]
 		[Export ("supportedOutputSettingsKeysForConnection:")]
 		string[] GetSupportedOutputSettingsKeys (AVCaptureConnection connection);
+
+		[NoWatch, NoTV, MacCatalyst (15,0), Mac (12,0), iOS (15,0)]
+		[Export ("primaryConstituentDeviceSwitchingBehaviorForRecordingEnabled")]
+		bool PrimaryConstituentDeviceSwitchingBehaviorForRecordingEnabled { [Bind ("isPrimaryConstituentDeviceSwitchingBehaviorForRecordingEnabled")] get; set; }
+
+		[NoWatch, NoTV, MacCatalyst (15,0), Mac (12,0), iOS (15,0)]
+		[Export ("setPrimaryConstituentDeviceSwitchingBehaviorForRecording:restrictedSwitchingBehaviorConditions:")]
+		void SetPrimaryConstituentDeviceSwitchingBehaviorForRecording (AVCapturePrimaryConstituentDeviceSwitchingBehavior switchingBehavior, AVCapturePrimaryConstituentDeviceRestrictedSwitchingBehaviorConditions restrictedSwitchingBehaviorConditions);
+
+		[NoWatch, NoTV, MacCatalyst (15,0), Mac (12,0), iOS (15,0)]
+		[Export ("primaryConstituentDeviceSwitchingBehaviorForRecording")]
+		AVCapturePrimaryConstituentDeviceSwitchingBehavior PrimaryConstituentDeviceSwitchingBehaviorForRecording { get; }
+
+		[NoWatch, NoTV, MacCatalyst (15,0), Mac (12,0), iOS (15,0)]
+		[Export ("primaryConstituentDeviceRestrictedSwitchingBehaviorConditionsForRecording")]
+		AVCapturePrimaryConstituentDeviceRestrictedSwitchingBehaviorConditions PrimaryConstituentDeviceRestrictedSwitchingBehaviorConditionsForRecording { get; }
 	}
 
 	[NoTV]
@@ -11079,6 +11101,41 @@ interface AVCaptureDevice {
 		[Export ("virtualDeviceSwitchOverVideoZoomFactors")]
 		NSNumber[] VirtualDeviceSwitchOverVideoZoomFactors { get; }
 
+		// From AVCaptureDevice_AVCaptureDeviceVirtual
+
+		[NoWatch, NoTV, MacCatalyst (15,0), Mac (12,0), iOS (15,0)]
+		[Export ("setPrimaryConstituentDeviceSwitchingBehavior:restrictedSwitchingBehaviorConditions:")]
+		void SetPrimaryConstituentDeviceSwitchingBehavior (AVCapturePrimaryConstituentDeviceSwitchingBehavior switchingBehavior, AVCapturePrimaryConstituentDeviceRestrictedSwitchingBehaviorConditions restrictedSwitchingBehaviorConditions);
+
+		[NoWatch, NoTV, MacCatalyst (15,0), Mac (12,0), iOS (15,0)]
+		[Export ("primaryConstituentDeviceSwitchingBehavior")]
+		AVCapturePrimaryConstituentDeviceSwitchingBehavior PrimaryConstituentDeviceSwitchingBehavior { get; }
+
+		[NoWatch, NoTV, MacCatalyst (15,0), Mac (12,0), iOS (15,0)]
+		[Export ("primaryConstituentDeviceRestrictedSwitchingBehaviorConditions")]
+		AVCapturePrimaryConstituentDeviceRestrictedSwitchingBehaviorConditions PrimaryConstituentDeviceRestrictedSwitchingBehaviorConditions { get; }
+
+		[NoWatch, NoTV, MacCatalyst (15,0), Mac (12,0), iOS (15,0)]
+		[Export ("activePrimaryConstituentDeviceSwitchingBehavior")]
+		AVCapturePrimaryConstituentDeviceSwitchingBehavior ActivePrimaryConstituentDeviceSwitchingBehavior { get; }
+
+		[NoWatch, NoTV, MacCatalyst (15,0), Mac (12,0), iOS (15,0)]
+		[Export ("activePrimaryConstituentDeviceRestrictedSwitchingBehaviorConditions")]
+		AVCapturePrimaryConstituentDeviceRestrictedSwitchingBehaviorConditions ActivePrimaryConstituentDeviceRestrictedSwitchingBehaviorConditions { get; }
+
+		[NullAllowed]
+		[NoWatch, NoTV, MacCatalyst (15,0), Mac (12,0), iOS (15,0)]
+		[Export ("activePrimaryConstituentDevice")]
+		AVCaptureDevice ActivePrimaryConstituentDevice { get; }
+
+		[NoWatch, NoTV, MacCatalyst (15,0), Mac (12,0), iOS (15,0)]
+		[Export ("supportedFallbackPrimaryConstituentDevices")]
+		AVCaptureDevice[] SupportedFallbackPrimaryConstituentDevices { get; }
+
+		[NoWatch, NoTV, MacCatalyst (15,0), Mac (12,0), iOS (15,0)]
+		[Export ("fallbackPrimaryConstituentDevices", ArgumentSemantic.Assign)]
+		AVCaptureDevice[] FallbackPrimaryConstituentDevices { get; set; }
+
 		// from AVCaptureDevice_AVCaptureDeviceGeometricDistortionCorrection
 
 		[NoWatch, NoTV, NoMac, iOS (13, 0)]

src/corelocation.cs

@@ -47,7 +47,11 @@ public enum CLProximity : long {
 	}
 
 	[ErrorDomain ("CLLocationPushServiceErrorDomain")]
+#if XAMCORE_4_0 // Apple fixed this in Xcode 13.1
+	[iOS (15,0), NoTV, NoMacCatalyst, NoMac, NoWatch]
+#else
 	[iOS (15,0), TV (15,0), MacCatalyst (15,0), Mac (12,0), Watch (8,0)]
+#endif
 	[Native]
 	public enum CLLocationPushServiceError : long {
 		Unknown = 0,
@@ -905,7 +909,11 @@ interface CLBeaconIdentityConstraint : NSCopying, NSSecureCoding {
 		NSNumber Minor { get; }
 	}
 
+#if XAMCORE_4_0 // Apple fixed this in Xcode 13.1
+	[iOS (15,0), NoTV, NoMacCatalyst, NoMac, NoWatch]
+#else
 	[iOS (15,0), TV (15,0), MacCatalyst (15,0), Mac (12,0), Watch (8,0)]
+#endif
 	[Protocol]
 	interface CLLocationPushServiceExtension
 	{

src/coreml.cs

@@ -65,6 +65,10 @@ public enum MLMultiArrayDataType : long {
 		// added in xcode12 but it's the same a `Double` and can be used in earlier versions
 		Float64 = 0x10000 | 64,
 		Float32 = 0x10000 | 32,
+#if MONOMAC // macOS 12 Only
+		[Mac (12,0)]
+		Float16 = 0x10000 | 16,
+#endif
 		// added in xcode12 but it's the same a `Float32` and can be used in earlier versions
 		Float = 0x10000 | 32,
 		Int32 = 0x20000 | 32,
@@ -516,6 +520,11 @@ interface MLMultiArray : NSSecureCoding {
 		[Export ("count")]
 		nint Count { get; }
 
+		[NullAllowed]
+		[NoWatch, NoTV, NoiOS, Mac (12,0)]
+		[Export ("pixelBuffer")]
+		CVPixelBuffer PixelBuffer { get; }
+
 		// From MLMultiArray (Creation) Category
 
 		[Export ("initWithShape:dataType:error:")]
@@ -524,6 +533,10 @@ interface MLMultiArray : NSSecureCoding {
 		[Export ("initWithDataPointer:shape:dataType:strides:deallocator:error:")]
 		IntPtr Constructor (IntPtr dataPointer, NSNumber [] shape, MLMultiArrayDataType dataType, NSNumber [] strides, [NullAllowed] Action<IntPtr> deallocator, out NSError error);
 
+		[NoWatch, NoTV, NoiOS, Mac (12,0)]
+		[Export ("initWithPixelBuffer:shape:")]
+		IntPtr Constructor (CVPixelBuffer pixelBuffer, NSNumber [] shape);
+
 		// From MLMultiArray (NSNumberDataAccess) Category
 
 		[Export ("objectAtIndexedSubscript:")]
@@ -614,6 +627,11 @@ interface MLPredictionOptions {
  		[Deprecated (PlatformName.MacOSX, 12, 0, message: "Use 'MLModelConfiguration.ComputeUnits' instead.")]
 		[Export ("usesCPUOnly")]
 		bool UsesCpuOnly { get; set; }
+
+		// Leaving it intentionally as NSDictionary to make it easier to use the lowlevel apis.
+		[NoWatch, NoTV, NoiOS, Mac (12,0)]
+		[Export ("outputBackings", ArgumentSemantic.Copy)]
+		NSDictionary OutputBackings { get; set; }
 	}
 
 	[NoWatch, TV (11,2), Mac (10,13,2), iOS (11,2)]

src/fileprovider.cs

@@ -796,6 +796,11 @@ interface NSFileProviderItemVersion {
 
 		[Export ("metadataVersion")]
 		NSData MetadataVersion { get; }
+
+		[NoWatch, NoTV, NoMacCatalyst, NoiOS, Mac (12,0)]
+		[Static]
+		[Export ("beforeFirstSyncComponent")]
+		NSData BeforeFirstSyncComponent { get; }
 	}
 
 	[Mac (11,0)]

src/gamecontroller.cs

@@ -2090,4 +2090,43 @@ interface GCVirtualControllerElementConfiguration
 		[Export ("actsAsTouchpad")]
 		bool ActsAsTouchpad { get; set; }
 	}
+
+	// Deliberate decision on not enum'ifying these
+	[TV (15,0), Mac (12,0), iOS (15,0), MacCatalyst (15,0)]
+	[Static]
+	interface GCProductCategory
+	{
+		[Field ("GCProductCategoryDualSense")]
+		NSString DualSense { get; }
+
+		[Field ("GCProductCategoryDualShock4")]
+		NSString DualShock4 { get; }
+
+		[Field ("GCProductCategoryMFi")]
+		NSString MFi { get; }
+
+		[Field ("GCProductCategoryXboxOne")]
+		NSString XboxOne { get; }
+
+		[Field ("GCProductCategorySiriRemote1stGen")]
+		NSString SiriRemote1stGen { get; }
+
+		[Field ("GCProductCategorySiriRemote2ndGen")]
+		NSString SiriRemote2ndGen { get; }
+
+		[Field ("GCProductCategoryControlCenterRemote")]
+		NSString ControlCenterRemote { get; }
+
+		[Field ("GCProductCategoryUniversalElectronicsRemote")]
+		NSString UniversalElectronicsRemote { get; }
+
+		[Field ("GCProductCategoryCoalescedRemote")]
+		NSString CoalescedRemote { get; }
+
+		[Field ("GCProductCategoryMouse")]
+		NSString Mouse { get; }
+
+		[Field ("GCProductCategoryKeyboard")]
+		NSString Keyboard { get; }
+	}
 }