From 78e62f8564f66de7fcecd7503ce6de0dce2dbf63 Mon Sep 17 00:00:00 2001 From: VS MobileTools Engineering Service 2 Date: Wed, 21 Apr 2021 12:07:17 -0700 Subject: [PATCH] [main] [xcode12.5] Bump for Xcode 12.5 RC (#11263) and add the few new bindings added in the SDKs --- Make.config | 4 +- src/LocalAuthentication/LAEnums.cs | 2 + src/arkit.cs | 5 +++ src/avfoundation.cs | 58 ++++++++++++++++++++++++++ src/metal.cs | 9 ++-- tests/xtro-sharpie/common-Metal.ignore | 3 ++ tests/xtro-sharpie/macOS-Metal.ignore | 3 -- 7 files changed, 76 insertions(+), 8 deletions(-) diff --git a/Make.config b/Make.config index b74941b7e8..d1c20b31c4 100644 --- a/Make.config +++ b/Make.config @@ -127,8 +127,8 @@ MACCATALYST_NUGET_VERSION_FULL=$(MACCATALYST_NUGET_VERSION_NO_METADATA)+$(NUGET_ # Xcode version should have both a major and a minor version (even if the minor version is 0) XCODE_VERSION=12.5 -XCODE_URL=http://xamarin-storage/bot-provisioning/xcodes/Xcode_12.5_beta_3.xip -XCODE_DEVELOPER_ROOT=/Applications/Xcode_12.5.0-beta3.app/Contents/Developer +XCODE_URL=https://dl.internalx.com/internal-files/xcodes/Xcode_12.5_Release_Candidate.xip +XCODE_DEVELOPER_ROOT=/Applications/Xcode_12.5.0-rc.app/Contents/Developer XCODE_PRODUCT_BUILD_VERSION:=$(shell /usr/libexec/PlistBuddy -c 'Print :ProductBuildVersion' $(XCODE_DEVELOPER_ROOT)/../version.plist) # Mono version embedded in XI/XM (NEEDED_MONO_VERSION/BRANCH) are specified in mk/mono.mk diff --git a/src/LocalAuthentication/LAEnums.cs b/src/LocalAuthentication/LAEnums.cs index b74b5226cc..56dc6dbd11 100644 --- a/src/LocalAuthentication/LAEnums.cs +++ b/src/LocalAuthentication/LAEnums.cs @@ -49,6 +49,8 @@ namespace LocalAuthentication { AppCancel = -9, InvalidContext = -10, WatchNotAvailable = -11, + BiometryNotPaired = -12, + BiometryDisconnected = -13, BiometryNotAvailable = TouchIDNotAvailable, BiometryNotEnrolled = TouchIDNotEnrolled, diff --git a/src/arkit.cs b/src/arkit.cs index 8f8dd9ef00..cf1e371551 100644 --- a/src/arkit.cs +++ b/src/arkit.cs @@ -694,6 +694,11 @@ namespace ARKit { [Export ("framesPerSecond")] nint FramesPerSecond { get; } + + [iOS (14,5)] + [Export ("captureDeviceType")] + [return: BindAs (typeof (AVCaptureDeviceType))] + NSString CaptureDeviceType { get; } } [iOS (11,0)] diff --git a/src/avfoundation.cs b/src/avfoundation.cs index b89b6d8b4f..db7983e43c 100644 --- a/src/avfoundation.cs +++ b/src/avfoundation.cs @@ -10830,6 +10830,28 @@ namespace AVFoundation { [NoWatch, NoTV, NoMac, iOS (13, 0)] [Export ("geometricDistortionCorrectionEnabled")] bool GeometricDistortionCorrectionEnabled { [Bind ("isGeometricDistortionCorrectionEnabled")] get; set; } + + // from AVCaptureDevice_AVCaptureDeviceCenterStage + + [NoWatch, NoTV, NoMac] + [iOS (14,5)] + [MacCatalyst (14,5)] + [Static] + [Export ("centerStageControlMode", ArgumentSemantic.Assign)] + AVCaptureCenterStageControlMode CenterStageControlMode { get; set; } + + [NoWatch, NoTV, NoMac] + [iOS (14,5)] + [MacCatalyst (14,5)] + [Static] + [Export ("centerStageEnabled")] + bool CenterStageEnabled { [Bind ("isCenterStageEnabled")] get; set; } + + [NoWatch, NoTV, NoMac] + [iOS (14,5)] + [MacCatalyst (14,5)] + [Export ("centerStageActive")] + bool CenterStageActive { [Bind ("isCenterStageActive")] get; } } [Introduced (PlatformName.MacCatalyst, 14, 0)] @@ -10979,6 +11001,33 @@ namespace AVFoundation { [NoWatch, NoTV, NoMac, iOS (13, 0)] [Export ("geometricDistortionCorrectedVideoFieldOfView")] float GeometricDistortionCorrectedVideoFieldOfView { get; } + + // from AVCaptureDeviceFormat_AVCaptureDeviceFormatCenterStage + + [NoWatch, NoTV, NoMac] + [iOS (14,5)] + [MacCatalyst (14,5)] + [Export ("centerStageSupported")] + bool CenterStageSupported { [Bind ("isCenterStageSupported")] get; } + + [NoWatch, NoTV, NoMac] + [iOS (14,5)] + [MacCatalyst (14,5)] + [Export ("videoMinZoomFactorForCenterStage")] + nfloat VideoMinZoomFactorForCenterStage { get; } + + [NoWatch, NoTV, NoMac] + [iOS (14,5)] + [MacCatalyst (14,5)] + [Export ("videoMaxZoomFactorForCenterStage")] + nfloat VideoMaxZoomFactorForCenterStage { get; } + + [NoWatch, NoTV, NoMac] + [iOS (14,5)] + [MacCatalyst (14,5)] + [Export ("videoFrameRateRangeForCenterStage")] + [NullAllowed] + AVFrameRateRange VideoFrameRateRangeForCenterStage { get; } #endif } @@ -14320,4 +14369,13 @@ namespace AVFoundation { void LeaveArbitration (); } + [NoWatch, NoTV, NoMac] + [iOS (14,5)] + [MacCatalyst (14,5)] + [Native] + public enum AVCaptureCenterStageControlMode : long { + User = 0, + App = 1, + Cooperative = 2, + } } diff --git a/src/metal.cs b/src/metal.cs index 887b9e9dc6..8921d07ecf 100644 --- a/src/metal.cs +++ b/src/metal.cs @@ -1518,14 +1518,16 @@ namespace Metal { [Export ("locationNumber")] nuint LocationNumber { get; } - [NoiOS, Mac (11, 0), NoTV] + [Mac (11, 0), NoTV] + [iOS (14,5)] #if XAMCORE_4_0 [Abstract] #endif [Export ("supports32BitFloatFiltering")] bool Supports32BitFloatFiltering { get; } - [NoiOS, Mac (11, 0), NoTV] + [Mac (11, 0), NoTV] + [iOS (14,5)] #if XAMCORE_4_0 [Abstract] #endif @@ -1621,7 +1623,8 @@ namespace Metal { [Export ("supportsFunctionPointers")] bool SupportsFunctionPointers { get; } - [NoiOS, Mac (11, 0), NoTV] + [Mac (11, 0), NoTV] + [iOS (14,5)] #if XAMCORE_4_0 [Abstract] #endif diff --git a/tests/xtro-sharpie/common-Metal.ignore b/tests/xtro-sharpie/common-Metal.ignore index 2c5e88829d..5b478d4afe 100644 --- a/tests/xtro-sharpie/common-Metal.ignore +++ b/tests/xtro-sharpie/common-Metal.ignore @@ -164,3 +164,6 @@ !incorrect-protocol-member! MTLRenderPipelineState::imageblockSampleLength is REQUIRED and should be abstract !incorrect-protocol-member! MTLRenderPipelineState::maxTotalThreadsPerThreadgroup is REQUIRED and should be abstract !incorrect-protocol-member! MTLRenderPipelineState::threadgroupSizeMatchesTileSize is REQUIRED and should be abstract +!incorrect-protocol-member! MTLDevice::supports32BitFloatFiltering is REQUIRED and should be abstract +!incorrect-protocol-member! MTLDevice::supports32BitMSAA is REQUIRED and should be abstract +!incorrect-protocol-member! MTLDevice::supportsQueryTextureLOD is REQUIRED and should be abstract diff --git a/tests/xtro-sharpie/macOS-Metal.ignore b/tests/xtro-sharpie/macOS-Metal.ignore index 246401bb86..b71951dc07 100644 --- a/tests/xtro-sharpie/macOS-Metal.ignore +++ b/tests/xtro-sharpie/macOS-Metal.ignore @@ -113,8 +113,6 @@ !incorrect-protocol-member! MTLDevice::newDynamicLibraryWithURL:error: is REQUIRED and should be abstract !incorrect-protocol-member! MTLDevice::sparseTileSizeInBytes is REQUIRED and should be abstract !incorrect-protocol-member! MTLDevice::sparseTileSizeWithTextureType:pixelFormat:sampleCount: is REQUIRED and should be abstract -!incorrect-protocol-member! MTLDevice::supports32BitFloatFiltering is REQUIRED and should be abstract -!incorrect-protocol-member! MTLDevice::supports32BitMSAA is REQUIRED and should be abstract !incorrect-protocol-member! MTLDevice::supportsBCTextureCompression is REQUIRED and should be abstract !incorrect-protocol-member! MTLDevice::supportsCounterSampling: is REQUIRED and should be abstract !incorrect-protocol-member! MTLDevice::supportsDynamicLibraries is REQUIRED and should be abstract @@ -141,6 +139,5 @@ !incorrect-protocol-member! MTLComputePipelineState::newVisibleFunctionTableWithDescriptor: is REQUIRED and should be abstract !incorrect-protocol-member! MTLComputePipelineState::supportIndirectCommandBuffers is REQUIRED and should be abstract !incorrect-protocol-member! MTLFunction::options is REQUIRED and should be abstract -!incorrect-protocol-member! MTLDevice::supportsQueryTextureLOD is REQUIRED and should be abstract !incorrect-protocol-member! MTLIndirectComputeCommand::setImageblockWidth:height: is REQUIRED and should be abstract !incorrect-protocol-member! MTLDevice::isRemovable is REQUIRED and should be abstract