Merge remote-tracking branch 'xamarin/xcode12.3' into main

Make.config

@@ -36,7 +36,7 @@ $(TOP)/Make.config.inc: $(TOP)/Make.config $(TOP)/mk/mono.mk
 
 include $(TOP)/Make.versions
 
-APIDIFF_REFERENCES=https://bosstoragemirror.blob.core.windows.net/wrench/jenkins/d16-8/e30c41de32f64eca655953b17c78c1d9d70249e3/39/package/bundle.zip
+APIDIFF_REFERENCES=https://bosstoragemirror.blob.core.windows.net/wrench/jenkins/d16-8/87a1b18d8890ab76c4c658abd331dfde68d630ab/49/package/bundle.zip
 
 PACKAGE_HEAD_REV=$(shell git rev-parse HEAD)
 
@@ -119,9 +119,9 @@ MACCATALYST_NUGET_VERSION_NO_METADATA=$(MACCATALYST_NUGET_VERSION)-$(NUGET_PRERE
 MACCATALYST_NUGET_VERSION_FULL=$(MACCATALYST_NUGET_VERSION_NO_METADATA)+$(NUGET_BUILD_METADATA)
 
 # Xcode version should have both a major and a minor version (even if the minor version is 0)
-XCODE_VERSION=12.2
-XCODE_URL=http://xamarin-storage/bot-provisioning/xcodes/Xcode_12.2.xip
-XCODE_DEVELOPER_ROOT=/Applications/Xcode_12.2.0.app/Contents/Developer
+XCODE_VERSION=12.3
+XCODE_URL=http://xamarin-storage/bot-provisioning/xcodes/Xcode_12.3.xip
+XCODE_DEVELOPER_ROOT=/Applications/Xcode_12.3.0.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

Make.versions

@@ -48,8 +48,8 @@
 #   line changed in git).
 #
 
-IOS_PACKAGE_VERSION=14.9.0.$(IOS_COMMIT_DISTANCE)
-MAC_PACKAGE_VERSION=7.3.0.$(MAC_COMMIT_DISTANCE)
+IOS_PACKAGE_VERSION=14.9.1.$(IOS_COMMIT_DISTANCE)
+MAC_PACKAGE_VERSION=7.3.1.$(MAC_COMMIT_DISTANCE)
 
 #
 # ** NuGet package version numbers **
@@ -66,8 +66,7 @@ MAC_PACKAGE_VERSION=7.3.0.$(MAC_COMMIT_DISTANCE)
 # WARNING: Do **not** use versions higher than the available Xcode SDK or else we will have issues with mtouch (See https://github.com/xamarin/xamarin-macios/issues/7705)
 # When bumping the major macOS version in MACOS_NUGET_VERSION also update the macOS version where we execute on bots in jenkins/Jenkinsfile (in the 'node' element)
 
-IOS_NUGET_VERSION=14.2.100
-TVOS_NUGET_VERSION=14.2.100
-WATCHOS_NUGET_VERSION=7.1.100
-MACOS_NUGET_VERSION=11.0.100
-MACCATALYST_NUGET_VERSION=14.2.100
+IOS_NUGET_VERSION=14.3.100
+TVOS_NUGET_VERSION=14.3.100
+WATCHOS_NUGET_VERSION=7.2.100
+MACOS_NUGET_VERSION=11.1.100

Versions-ios.plist.in

@@ -43,6 +43,7 @@
 			<string>14.0</string>
 			<string>14.1</string>
 			<string>14.2</string>
+			<string>14.3</string>
 		</array>
 		<key>tvOS</key>
 		<array>
@@ -68,6 +69,7 @@
 			<string>13.4</string>
 			<string>14.0</string>
 			<string>14.2</string>
+			<string>14.3</string>
 		</array>
 		<key>watchOS</key>
 		<array>
@@ -90,6 +92,7 @@
 			<string>6.2</string>
 			<string>7.0</string>
 			<string>7.1</string>
+			<string>7.2</string>
 		</array>
 		<key>MacCatalyst</key>
 		<array>
@@ -99,6 +102,7 @@
 			<string>13.4</string>
 			<string>13.5</string>
 			<string>14.2</string>
+			<string>14.3</string>
 		</array>
 	</dict>
 	<key>MacCatalystVersionMap</key>
@@ -115,6 +119,8 @@
 		<string>10.15.5</string>
 		<key>14.2</key>
 		<string>11.0</string>
+		<key>14.3</key>
+		<string>11.1</string>
 	</dict>
 	<key>RecommendedXcodeVersion</key>
 	<string>@XCODE_VERSION@</string>

Versions-mac.plist.in

@@ -19,6 +19,7 @@
 			<string>10.15</string>
 			<string>10.16</string>
 			<string>11.0</string>
+			<string>11.1</string>
 		</array>
 	</dict>
 	<key>RecommendedXcodeVersion</key>

src/CoreGraphics/CGColor.cs

@@ -271,7 +271,8 @@ protected virtual void Dispose (bool disposing)
 			/* __nullable CGColorSpaceRef* */ IntPtr space, CGColorRenderingIntent intent,
 			/* CGColorRef __nullable */ IntPtr color, /* __nullable CFDictionaryRef */ IntPtr options);
 
-		static CGColor CreateByMatchingToColorSpace (CGColorSpace space, CGColorRenderingIntent intent,
+		[iOS (9,0)][Mac (10,11)]
+		static public CGColor CreateByMatchingToColorSpace (CGColorSpace space, CGColorRenderingIntent intent,
 			CGColor color, NSDictionary options)
 		{
 			var h = CGColorCreateCopyByMatchingToColorSpace (space == null ? IntPtr.Zero : space.Handle, intent,

src/CoreVideo/CVPixelFormatType.cs

@@ -118,5 +118,7 @@ public enum CVPixelFormatType : uint {
 		TwoComponent16 = 0x32433136, // '2C16'
 		CV16VersatileBayer = 0x62703136, // 'bp16'
 		CV64Rgba_DownscaledProResRaw = 0x62703634, // 'bp64'
+		// iOS 14.2
+		CV64RgbaLE = 0x6C363472,
 	}
 }

src/HealthKit/Enums.cs

@@ -541,6 +541,7 @@ public enum HKCategoryValueAppetiteChanges : long {
 	[Native]
 	public enum HKAppleEcgAlgorithmVersion : long {
 		Version1 = 1,
+		Version2 = 2,
 	}
 
 	[Watch (7,0), iOS (14,0)]

src/Metal/MTLEnums.cs

@@ -1130,9 +1130,9 @@ public enum MTLGpuFamily : long {
 		Apple3 = 1003,
 		Apple4 = 1004,
 		Apple5 = 1005,
-		[NoTV, NoMac, iOS (14,0)] // Yep just available in iOS
+		[NoTV, Mac (11,0), iOS (14,0)]
 		Apple6 = 1006,
-		[NoTV, NoMac, iOS (14,0)] // Yep just available in iOS
+		[NoTV, Mac (11,0), iOS (14,0)]
 		Apple7 = 1007,
 		Mac1 = 2001,
 		Mac2 = 2002,

src/Network/NWPath.cs

@@ -174,5 +174,15 @@ public void EnumerateGateways (Action<NWEndpoint> callback)
 				block_handler.CleanupBlock ();
 			}
 		}
+
+		[iOS (14,2)][TV (14,2)][Watch (7,1)][Mac (11,0)]
+		[DllImport (Constants.NetworkLibrary)]
+		static extern NWPathUnsatisfiedReason /* nw_path_unsatisfied_reason_t */ nw_path_get_unsatisfied_reason (IntPtr /* OS_nw_path */ path);
+
+		[iOS (14,2)][TV (14,2)][Watch (7,1)][Mac (11,0)]
+		public NWPathUnsatisfiedReason GetUnsatisfiedReason ()
+		{
+			return nw_path_get_unsatisfied_reason (GetCheckedHandle ());
+		}
 	}
 }

src/UIKit/UIEnums.cs

@@ -1914,7 +1914,13 @@ public enum UIPressType : long {
 		RightArrow,
 		Select,
 		Menu,
-		PlayPause
+		PlayPause,
+		[TV (14,3)]
+		[NoiOS]
+		PageUp = 30,
+		[TV (14,3)]
+		[NoiOS]
+		PageDown = 31,
 	}
 
 	[NoWatch]

src/adservices.cs

@@ -0,0 +1,28 @@
+using ObjCRuntime;
+using Foundation;
+using System;
+
+namespace AdServices {
+
+	[Mac (11,1), iOS (14,3)]
+	[NoTV][NoWatch]
+	[Native]
+	[ErrorDomain ("AAAttributionErrorDomain")]
+	enum AAAttributionErrorCode : long {
+		NetworkError = 1,
+		InternalError = 2,
+		PlatformNotSupported = 3,
+	}
+
+	[Mac (11,1), iOS (14,3)]
+	[NoTV][NoWatch]
+	[BaseType (typeof (NSObject))]
+	[DisableDefaultCtor]
+	interface AAAttribution {
+
+		[Static]
+		[Export ("attributionTokenWithError:")]
+		[return: NullAllowed]
+		string GetAttributionToken ([NullAllowed] out NSError error);
+	}
+}

src/arkit.cs

@@ -292,6 +292,14 @@ public enum ARGeoTrackingStateReason : long {
 		VisualLocalizationFailed,
 	}
 
+	[iOS (14,3)]
+	[Native]
+	public enum ARAppClipCodeUrlDecodingState : long {
+		Decoding,
+		Failed,
+		Decoded,
+	}
+
 	[iOS (12,0)]
 	[NoWatch, NoTV, NoMac]
 	[Protocol]
@@ -1046,6 +1054,15 @@ interface ARWorldTrackingConfiguration {
 		[Export ("userFaceTrackingEnabled")]
 		bool UserFaceTrackingEnabled { [Bind ("userFaceTrackingEnabled")] get; set; }
 
+		[iOS (14,3)]
+		[Export ("appClipCodeTrackingEnabled")]
+		bool AppClipCodeTrackingEnabled { get; set; }
+
+		[iOS (14,3)]
+		[Static]
+		[Export ("supportsAppClipCodeTracking")]
+		bool SupportsAppClipCodeTracking { get; }
+
 		[iOS (13,4)]
 		[Static]
 		[Export ("supportsSceneReconstruction:")]
@@ -1853,6 +1870,15 @@ interface ARBodyTrackingConfiguration {
 		[Static]
 		[Export ("supportsFrameSemantics:")]
 		bool SupportsFrameSemantics (ARFrameSemantics frameSemantics);
+
+		[iOS (14,3)]
+		[Export ("appClipCodeTrackingEnabled")]
+		bool AppClipCodeTrackingEnabled { get; set; }
+
+		[iOS (14,3)]
+		[Static]
+		[Export ("supportsAppClipCodeTracking")]
+		bool SupportsAppClipCodeTracking { get; }
 	}
 
 	[iOS (13,0)]
@@ -2287,6 +2313,15 @@ interface ARGeoTrackingConfiguration {
 		[Export ("maximumNumberOfTrackedImages")]
 		nint MaximumNumberOfTrackedImages { get; set; }
 
+		[iOS (14,3)]
+		[Export ("appClipCodeTrackingEnabled")]
+		bool AppClipCodeTrackingEnabled { get; set; }
+
+		[iOS (14,3)]
+		[Static]
+		[Export ("supportsAppClipCodeTracking")]
+		bool SupportsAppClipCodeTracking { get; }
+
 		[Export ("detectionObjects", ArgumentSemantic.Copy)]
 		NSSet<ARReferenceObject> DetectionObjects { get; set; }
 
@@ -2324,4 +2359,23 @@ interface ARGeoTrackingStatus : NSCopying, NSSecureCoding {
 		ARGeoTrackingStateReason StateReason { get; }
 	}
 
+	[iOS (14,3)]
+	[BaseType (typeof (ARAnchor))]
+	[DisableDefaultCtor]
+	interface ARAppClipCodeAnchor : ARTrackable {
+
+		// Inlined from 'ARAnchorCopying' protocol (we can't have constructors in interfaces)
+		[Export ("initWithAnchor:")]
+		IntPtr Constructor (ARAnchor anchor);
+
+		[NullAllowed, Export ("url", ArgumentSemantic.Copy)]
+		NSUrl Url { get; }
+
+		[Export ("urlDecodingState", ArgumentSemantic.Assign)]
+		ARAppClipCodeUrlDecodingState UrlDecodingState { get; }
+
+		[Export ("radius")]
+		float Radius { get; }
+	}
+
 }

src/avfoundation.cs

@@ -625,6 +625,10 @@ interface AVVideo {
 		[Field ("AVVideoMaxKeyFrameIntervalDurationKey")]
 		NSString MaxKeyFrameIntervalDurationKey { get; }
 
+		[Watch (7,2), TV (14,3), Mac (11,1), iOS (14,3)]
+		[Field ("AVVideoAppleProRAWBitDepthKey")]
+		NSString AppleProRawBitDepthKey { get; }
+
 		[iOS (7,0)]
 		[Mac (10,10)]
 		[Field ("AVVideoAllowFrameReorderingKey")]
@@ -9745,6 +9749,24 @@ interface AVCapturePhotoOutput
 		[Export ("availablePhotoCodecTypes")]
 		string [] AvailablePhotoCodecTypes { get; }
 
+		[NoWatch, NoTV, NoMac, iOS (14,3)]
+		[Export ("appleProRAWSupported")]
+		bool AppleProRawSupported { [Bind ("isAppleProRAWSupported")] get; }
+
+		[NoWatch, NoTV, NoMac, iOS (14,3)]
+		[Export ("appleProRAWEnabled")]
+		bool AppleProRawEnabled { [Bind ("isAppleProRAWEnabled")] get; set; }
+
+		[NoWatch, NoTV, NoMac, iOS (14,3)]
+		[Static]
+		[Export ("isBayerRAWPixelFormat:")]
+		bool IsBayerRawPixelFormat (CVPixelFormatType pixelFormat);
+
+		[NoWatch, NoTV, NoMac, iOS (14,3)]
+		[Static]
+		[Export ("isAppleProRAWPixelFormat:")]
+		bool IsAppleProRawPixelFormat (CVPixelFormatType pixelFormat);
+
 		[NoMac]
 		[Export ("availableRawPhotoPixelFormatTypes")]
 		NSNumber [] AvailableRawPhotoPixelFormatTypes { get; }
@@ -13570,6 +13592,10 @@ interface AVCapturePhotoFileDataRepresentationCustomizer
 		[Export ("replacementSemanticSegmentationMatteOfType:forPhoto:")]
 		[return: NullAllowed]
 		AVSemanticSegmentationMatte GetReplacementSemanticSegmentationMatte (NSString semanticSegmentationMatteType, AVCapturePhoto photo);
+
+		[NoWatch, NoTV, NoMac, iOS (14,3)]
+		[Export ("replacementAppleProRAWCompressionSettingsForPhoto:defaultSettings:maximumBitDepth:")]
+		NSDictionary<NSString, NSObject> GetReplacementAppleProRawCompressionSettings (AVCapturePhoto photo, NSDictionary<NSString, NSObject> defaultSettings, nint maximumBitDepth);
 	}
 
 	[NoTV, iOS (11,0), NoWatch, Mac (10,15)]

src/contacts.cs

@@ -2077,6 +2077,10 @@ interface CNLabelPhoneNumberKey {
 		[Field ("CNLabelPhoneNumberiPhone")]
 		NSString iPhone { get; }
 
+		[Watch (7,2), Mac (11,1), iOS (14,3)]
+		[Field ("CNLabelPhoneNumberAppleWatch")]
+		NSString AppleWatch { get; }
+
 		[Field ("CNLabelPhoneNumberMobile")]
 		NSString Mobile { get; }
 

src/coreimage.cs

@@ -766,6 +766,10 @@ interface CIRawFilterKeys {
 		[Field ("kCIInputEnableEDRModeKey")]
 		NSString EnableEdrModeKey { get; }
 
+		[iOS (14,3), TV (14,3), Mac (11,1)]
+		[Field ("kCIInputLocalToneMapAmountKey")]
+		NSString InputLocalToneMapAmountKey { get; }
+
 		[iOS (10,0)]
 		[Field ("kCIOutputNativeSizeKey")]
 		NSString OutputNativeSizeKey { get; }
@@ -1387,6 +1391,10 @@ interface CIImageInitializationOptionsKeys {
 		[Field ("kCIImageAuxiliarySemanticSegmentationGlassesMatte")]
 		NSString AuxiliarySemanticSegmentationGlassesMatteKey { get; }
 
+		[iOS (14,3), TV (14,3), Mac (11,1)]
+		[Field ("kCIImageAuxiliarySemanticSegmentationSkyMatte")]
+		NSString AuxiliarySemanticSegmentationSkyMatteKey { get; }
+
 		[iOS (14,1)][TV (14,2)][Mac (11,0)]
 		[Field ("kCIImageToneMapHDRtoSDR")]
 		NSString ToneMapHdrToSdrKey { get; }
@@ -5751,6 +5759,10 @@ partial interface CIImageRepresentationKeys {
 		[iOS (14,1)][TV (14,2)][Mac (11,0)]
 		[Field ("kCIImageRepresentationSemanticSegmentationGlassesMatteImage")]
 		NSString SemanticSegmentationGlassesMatteImage { get; }
+
+		[iOS (14,3), TV (14,3), Mac (11,1)]
+		[Field ("kCIImageRepresentationSemanticSegmentationSkyMatteImage")]
+		NSString SemanticSegmentationSkyMatteImage { get; }
 	}
 
 	[iOS (11,0)]