[xcode26] Update baseline to Xcode 26 Beta 2 (#23184)

Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>

Author: dalexsoto

Make.config

@@ -202,8 +202,8 @@ MACCATALYST_NUGET_VERSION_FULL=$(MACCATALYST_NUGET_VERSION_NO_METADATA)$(NUGET_B
 
 # Xcode version should have both a major and a minor version (even if the minor version is 0)
 XCODE_VERSION=26.0
-XCODE_URL=https://dl.internalx.com/internal-files/xcodes/Xcode_26_beta.xip
-XCODE_DEVELOPER_ROOT=/Applications/Xcode_26.0.0-beta.app/Contents/Developer
+XCODE_URL=https://dl.internalx.com/internal-files/xcodes/Xcode_26_beta_2.xip
+XCODE_DEVELOPER_ROOT=/Applications/Xcode_26.0.0-beta2.app/Contents/Developer
 XCODE_PRODUCT_BUILD_VERSION:=$(shell /usr/libexec/PlistBuddy -c 'Print :ProductBuildVersion' $(XCODE_DEVELOPER_ROOT)/../version.plist 2>/dev/null || echo "    $(shell tput setaf 1 2>/dev/null)The required Xcode ($(XCODE_VERSION)) is not installed in $(basename $(basename $(XCODE_DEVELOPER_ROOT)))$(shell tput sgr0 2>/dev/null)" >&2)
 
 # We define stable Xcode as the Xcode app being named like "Xcode_#.#[.#].app"

mk/xamarin.mk

@@ -10,7 +10,7 @@ endif
 
 # Available versions can be seen here:
 # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.Tools.Mlaunch/versions
-MLAUNCH_NUGET_VERSION=1.1.63
+MLAUNCH_NUGET_VERSION=1.1.71
 
 define CheckVersionTemplate
 check-$(1)::

src/eventkit.cs

@@ -148,10 +148,6 @@ interface EKCalendarItem {
 
 		[Export ("calendarItemExternalIdentifier")]
 		string CalendarItemExternalIdentifier { get; }
-
-		[iOS (26, 0), MacCatalyst (26, 0), Mac (26, 0)]
-		[Export ("hasMaximumAlarms")]
-		bool HasMaximumAlarms { get; }
 	}
 
 	/// <summary>Encapsulates an account that a calendar reflects.</summary>

tests/common/TestRuntime.cs

@@ -382,6 +382,12 @@ public static bool CheckExactXcodeVersion (int major, int minor, int beta = 0)
 			macOS = new { Major = 26, Minor = 0, Build = "25A5279m" },
 		};
 
+		var twentysixb2 = new {
+			Xcode = new { Major = 26, Minor = 0, Beta = 2 },
+			iOS = new { Major = 26, Minor = 0, Build = "23A5276e" },
+			tvOS = new { Major = 26, Minor = 0, Build = "23J5295e" },
+			macOS = new { Major = 26, Minor = 0, Build = "25A5295e" },
+		};
 		var versions = new [] {
 			nineb1,
 			nineb2,
@@ -391,6 +397,7 @@ public static bool CheckExactXcodeVersion (int major, int minor, int beta = 0)
 			twelvedot2b2,
 			twelvedot2b3,
 			twentysixb1,
+			twentysixb2,
 		};
 
 		foreach (var v in versions) {
@@ -1356,7 +1363,7 @@ public static void RequestMicrophonePermission (bool assert_granted = false)
 		// so just ignore these tests for now.
 		NUnit.Framework.Assert.Ignore ("Requires a hardened runtime entitlement: com.apple.security.device.microphone");
 #else
-		if (CheckExactXcodeVersion (26, 0, beta: 1))
+		if (CheckExactXcodeVersion (26, 0, beta: 1) || CheckExactXcodeVersion (26, 0, beta: 2))
 			NUnit.Framework.Assert.Ignore ("AVAudioApplication.RecordPermission crashes. FB18023766");
 
 		if (!CheckXcodeVersion (6, 0))

tests/introspection/ApiCoreImageFiltersTest.cs

@@ -83,9 +83,9 @@ protected virtual bool Skip (string nativeName)
 			case "CISignedDistanceGradientFromRedMask":
 			case "CISystemToneMap":
 				return true;
-			case "CIPersonSegmentation": // removed in Xcode 26 beta 1?
-			case "CISaliencyMapFilter": // removed in Xcode 26 beta 1?
-				return TestRuntime.CheckExactXcodeVersion (26, 0, 1);
+			case "CIPersonSegmentation": // removed in Xcode 26 beta 1/2?
+			case "CISaliencyMapFilter": // removed in Xcode 26 beta 1/2?
+				return TestRuntime.CheckExactXcodeVersion (26, 0, 1) || TestRuntime.CheckExactXcodeVersion (26, 0, 2);
 			}
 		}
 

tests/introspection/ApiCtorInitTest.cs

@@ -177,9 +177,9 @@ protected virtual bool Skip (Type type)
 					return true;
 				break;
 #endif
-			case "CIPersonSegmentation": // removed in Xcode 26 beta 1?
-			case "CISaliencyMapFilter": // removed in Xcode 26 beta 1?
-				return TestRuntime.CheckExactXcodeVersion (26, 0, 1);
+			case "CIPersonSegmentation": // removed in Xcode 26 beta 1/2?
+			case "CISaliencyMapFilter": // removed in Xcode 26 beta 1/2?
+				return TestRuntime.CheckExactXcodeVersion (26, 0, 1) || TestRuntime.CheckExactXcodeVersion (26, 0, 2);
 			}
 
 			switch (type.Namespace) {

tests/introspection/ApiSelectorTest.cs

@@ -1124,14 +1124,12 @@ protected virtual bool Skip (Type type, string selectorName)
 					return TestRuntime.CheckXcodeVersion (26, 0); // https://github.com/rolfbjarne/apple-feedback/tree/main/FB18122430
 				}
 				break;
-#if __MACOS__
 			case "PhaseSoundEvent":
 				switch (selectorName) {
-				case "startAndReturnError:": // introspection complains about this in Xcode 26 b1 on macOS only, but the selector is still available in the header for macOS.
-					return TestRuntime.CheckExactXcodeVersion (26, 0, 1);
+				case "startAndReturnError:": // introspection complains about this in Xcode 26 b1 and b2 only, but the selector is still available in the headers, so only verify the exact Xcode version for now to see if Apple changes their minds in a future beta.
+					return TestRuntime.CheckExactXcodeVersion (26, 0, 1) || TestRuntime.CheckExactXcodeVersion (26, 0, 2);
 				}
 				break;
-#endif // __MACOS__
 			}
 
 			// old binding mistake

tests/monotouch-test/CoreGraphics/ColorSpaceTest.cs

@@ -219,6 +219,10 @@ public void CreateIccData ()
 				using (var cs = CGColorSpace.CreateIccData (icc)) {
 					TestICC (cs);
 				}
+#if __TVOS__
+				if (TestRuntime.CheckXcodeVersion (26, 0))
+					Assert.Ignore ("Creating a color space from a CGDataProvider crashes: https://github.com/rolfbjarne/apple-feedback/tree/main/FB18396591");
+#endif
 				using (var provider = new CGDataProvider (icc)) {
 					using (var cs = CGColorSpace.CreateIccData (provider)) {
 						// broke? with Xcode 13 beta 1 (iOS, tvOS)
@@ -229,11 +233,19 @@ public void CreateIccData ()
 					}
 				}
 			}
+		}
 
+		[Test]
+		public void CreateIccData_Null_NSData ()
+		{
 			using (var space = CGColorSpace.CreateIccData ((NSData) null)) {
 				Assert.IsNull (space, "null data");
 			}
+		}
 
+		[Test]
+		public void CreateIccData_Null_CGDataProvider ()
+		{
 			using (var space = CGColorSpace.CreateIccData ((CGDataProvider) null)) {
 				Assert.IsNull (space, "null data provider");
 			}

tests/xtro-sharpie/api-annotations-dotnet/MacCatalyst-AVFoundation.todo

@@ -182,3 +182,16 @@
 !missing-type! AVMetadataDogHeadObject not bound
 !missing-type! AVMetricDownloadSummaryEvent not bound
 !missing-type! AVPlaybackCoordinationMedium not bound
+!missing-selector! AVCaptureVideoDataOutput::preservesDynamicHDRMetadata not bound
+!missing-selector! AVCaptureVideoDataOutput::setPreservesDynamicHDRMetadata: not bound
+!missing-selector! AVMetricHLSMediaSegmentRequestEvent::segmentDuration not bound
+!missing-selector! AVMetricMediaRendition::stableID not bound
+!missing-selector! AVMetricMediaRendition::URL not bound
+!missing-selector! AVMetricPlayerItemVariantSwitchEvent::audioRendition not bound
+!missing-selector! AVMetricPlayerItemVariantSwitchEvent::subtitleRendition not bound
+!missing-selector! AVMetricPlayerItemVariantSwitchEvent::videoRendition not bound
+!missing-selector! AVMetricPlayerItemVariantSwitchStartEvent::audioRendition not bound
+!missing-selector! AVMetricPlayerItemVariantSwitchStartEvent::subtitleRendition not bound
+!missing-selector! AVMetricPlayerItemVariantSwitchStartEvent::videoRendition not bound
+!missing-selector! AVSampleBufferVideoRenderer::recommendedPixelBufferAttributes not bound
+!missing-type! AVMetricMediaRendition not bound

tests/xtro-sharpie/api-annotations-dotnet/MacCatalyst-AppKit.todo

@@ -3,3 +3,10 @@
 !missing-selector! NSToolbarItem::setBackgroundTintColor: not bound
 !missing-selector! NSToolbarItem::setStyle: not bound
 !missing-selector! NSToolbarItem::style not bound
+!missing-selector! +NSItemBadge::badgeWithCount: not bound
+!missing-selector! +NSItemBadge::badgeWithText: not bound
+!missing-selector! +NSItemBadge::indicatorBadge not bound
+!missing-selector! NSItemBadge::text not bound
+!missing-selector! NSToolbarItem::badge not bound
+!missing-selector! NSToolbarItem::setBadge: not bound
+!missing-type! NSItemBadge not bound