[main] Merge branch xcode26.4 into main

.agents/skills/macios-xcode-beta-update/SKILL.md

@@ -96,15 +96,44 @@ Capture resulting `tests/xtro-sharpie/api-annotations-dotnet/*.todo` and `*.igno
 
 ## Introspection workflow (all platforms)
 
-Use explicit prebuild + run to avoid mobile run target issues:
+Use explicit prebuild + run to avoid mobile run target issues.
+
+**IMPORTANT: Run platforms sequentially, not in parallel.** The shared `obj/` directories
+(`tests/common/Touch.Unit/Touch.Client/dotnet/obj` and `tests/common/MonoTouch.Dialog/obj`)
+cause NETSDK1005 errors when concurrent restores overwrite `project.assets.json` with
+different platform TFMs. Clean shared obj dirs before each platform build:
 
 ```bash
+rm -rf tests/common/Touch.Unit/Touch.Client/dotnet/obj tests/common/MonoTouch.Dialog/obj
 make -C tests/introspection/dotnet build-ios run-ios
+
+rm -rf tests/common/Touch.Unit/Touch.Client/dotnet/obj tests/common/MonoTouch.Dialog/obj
 make -C tests/introspection/dotnet build-tvos run-tvos
+
+rm -rf tests/common/Touch.Unit/Touch.Client/dotnet/obj tests/common/MonoTouch.Dialog/obj
 make -C tests/introspection/dotnet build-macOS run-macOS
+
+rm -rf tests/common/Touch.Unit/Touch.Client/dotnet/obj tests/common/MonoTouch.Dialog/obj
 make -C tests/introspection/dotnet build-MacCatalyst run-MacCatalyst
 ```
 
+**Desktop test output:** For macOS and Mac Catalyst, `make run-macOS`/`run-MacCatalyst` uses
+`dotnet build -t:Run` which launches the app without waiting or capturing stdout. The make
+command exits immediately with success even while tests are still running. To get actual test
+results, run the executable directly after building:
+
+```bash
+# Build first
+make -C tests/introspection/dotnet build-macOS
+# Then run directly to capture output
+NUNIT_AUTOSTART=true NUNIT_AUTOEXIT=true \
+  tests/introspection/dotnet/macOS/bin/Debug/net10.0-macos/osx-arm64/introspection.app/Contents/MacOS/introspection
+```
+
+Same pattern for Mac Catalyst (replace `macOS` → `MacCatalyst`, `net10.0-macos` → `net10.0-maccatalyst`, `osx-arm64` → `maccatalyst-arm64`).
+
+iOS and tvOS simulator tests capture output correctly via `make run-ios`/`run-tvos`.
+
 These runs can take a long time; wait for completion and summarize outcomes per platform.
 
 ## Completion checklist

.agents/skills/macios-xcode-beta-update/references/session-pattern-notes.md

@@ -19,3 +19,29 @@
 
 `make -C tests/introspection/dotnet run-ios` may fail if the app isn't built first.
 Prefer `build-ios run-ios` (same for other platforms) in the same command.
+
+## Introspection parallelism gotcha
+
+Running introspection tests for multiple platforms in parallel causes NETSDK1005 errors.
+The shared test libraries (`Touch.Unit/Touch.Client/dotnet/` and `MonoTouch.Dialog/`) have
+per-platform `.csproj` files that share a single `obj/` directory. When one platform restores,
+it writes `project.assets.json` targeting only that platform's TFM, breaking other platforms.
+
+**Fix:** Run sequentially and clean shared obj dirs before each platform:
+```bash
+rm -rf tests/common/Touch.Unit/Touch.Client/dotnet/obj tests/common/MonoTouch.Dialog/obj
+```
+
+## Desktop introspection output capture
+
+For macOS and Mac Catalyst, `make run-macOS`/`run-MacCatalyst` uses `dotnet build -t:Run`
+which launches the desktop app and exits immediately without waiting or capturing stdout.
+The make target will report success (exit 0) while the test app is still running.
+
+**Fix:** After building, run the executable directly with environment variables:
+```bash
+NUNIT_AUTOSTART=true NUNIT_AUTOEXIT=true \
+  tests/introspection/dotnet/macOS/bin/Debug/net10.0-macos/osx-arm64/introspection.app/Contents/MacOS/introspection
+```
+
+iOS and tvOS simulator tests do not have this problem — their output is captured correctly.

Make.config

@@ -146,8 +146,8 @@ NUGET_RELEASE_BRANCH=release/10.0.1xx
 ##
 ## Note that the prerelease identifier should be as short as possible, because otherwise
 ## the resulting package name can become too long for MSIs.
-NUGET_HARDCODED_PRERELEASE_IDENTIFIER=xcode26.2
-NUGET_HARDCODED_PRERELEASE_BRANCH=xcode26.2
+NUGET_HARDCODED_PRERELEASE_IDENTIFIER=xcode26.4
+NUGET_HARDCODED_PRERELEASE_BRANCH=xcode26.4
 
 # compute the alphanumeric version of branch names
 NUGET_RELEASE_BRANCH_ALPHANUMERIC:=$(shell export LANG=C; printf "%s" "$(NUGET_RELEASE_BRANCH)" | tr -c '[a-zA-Z0-9-]' '-')
@@ -207,10 +207,10 @@ MACCATALYST_NUGET_VERSION_NO_METADATA=$(MACCATALYST_NUGET_VERSION)$(NUGET_PREREL
 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=26.3
-XCODE_URL=https://dl.internalx.com/internal-files/xcodes/Xcode_26.3.xip
+XCODE_VERSION=26.4
+XCODE_URL=https://bosstoragemirror.blob.core.windows.net/internal-files/xcodes/Xcode_26.4.xip
 ifndef IS_LINUX
-XCODE_DEVELOPER_ROOT=/Applications/Xcode_26.3.0.app/Contents/Developer
+XCODE_DEVELOPER_ROOT=/Applications/Xcode_26.4.0.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"

Make.versions

@@ -21,10 +21,10 @@
 # IMPORTANT: There must be *no* managed API differences unless the two first
 # numbers (major.minor) changes.
 
-IOS_NUGET_OS_VERSION=26.2
-TVOS_NUGET_OS_VERSION=26.2
-MACOS_NUGET_OS_VERSION=26.2
-MACCATALYST_NUGET_OS_VERSION=26.2
+IOS_NUGET_OS_VERSION=26.4
+TVOS_NUGET_OS_VERSION=26.4
+MACOS_NUGET_OS_VERSION=26.4
+MACCATALYST_NUGET_OS_VERSION=26.4
 
 # The following are the OS versions we first supported with the current .NET version.
 # These versions must *not* change with minor .NET updates, only major .NET releases.
@@ -133,4 +133,3 @@ SUPPORTED_API_VERSIONS_IOS+=$(BETA_API_VERSIONS_IOS)
 SUPPORTED_API_VERSIONS_TVOS+=$(BETA_API_VERSIONS_TVOS)
 SUPPORTED_API_VERSIONS_MACOS+=$(BETA_API_VERSIONS_MACOS)
 SUPPORTED_API_VERSIONS_MACCATALYST+=$(BETA_API_VERSIONS_MACCATALYST)
-

builds/Versions-MacCatalyst.plist.in

@@ -27,6 +27,7 @@
 			<string>26.0</string>
 			<string>26.1</string>
 			<string>26.2</string>
+			<string>26.4</string>
 		</array>
 	</dict>
 	<key>SupportedTargetPlatformVersions</key>
@@ -64,6 +65,7 @@
 			<string>26.0</string>
 			<string>26.1</string>
 			<string>26.2</string>
+			<string>26.4</string>
 		</array>
 	</dict>
 	<key>MacCatalystVersionMap</key>
@@ -124,6 +126,8 @@
 		<string>26.1</string>
 		<key>26.2</key>
 		<string>26.2</string>
+		<key>26.4</key>
+		<string>26.4</string>
 	</dict>
 	<key>RecommendedXcodeVersion</key>
 	<string>@XCODE_VERSION@</string>

builds/Versions-iOS.plist.in

@@ -44,6 +44,7 @@
 			<string>26.0</string>
 			<string>26.1</string>
 			<string>26.2</string>
+			<string>26.4</string>
 		</array>
 	</dict>
 	<key>SupportedTargetPlatformVersions</key>
@@ -100,6 +101,7 @@
 			<string>26.0</string>
 			<string>26.1</string>
 			<string>26.2</string>
+			<string>26.4</string>
 		</array>
 	</dict>
 	<key>RecommendedXcodeVersion</key>

builds/Versions-macOS.plist.in

@@ -27,6 +27,7 @@
 			<string>26.0</string>
 			<string>26.1</string>
 			<string>26.2</string>
+			<string>26.4</string>
 		</array>
 	</dict>
 	<key>SupportedTargetPlatformVersions</key>
@@ -62,6 +63,7 @@
 			<string>26.0</string>
 			<string>26.1</string>
 			<string>26.2</string>
+			<string>26.4</string>
 		</array>
 	</dict>
 	<key>RecommendedXcodeVersion</key>

builds/Versions-tvOS.plist.in

@@ -39,6 +39,7 @@
 			<string>26.0</string>
 			<string>26.1</string>
 			<string>26.2</string>
+			<string>26.4</string>
 		</array>
 	</dict>
 	<key>SupportedTargetPlatformVersions</key>
@@ -90,6 +91,7 @@
 			<string>26.0</string>
 			<string>26.1</string>
 			<string>26.2</string>
+			<string>26.4</string>
 		</array>
 	</dict>
 	<key>RecommendedXcodeVersion</key>

src/AVKit/AVLegibleMediaOptionsMenuState.cs

@@ -0,0 +1,28 @@
+#nullable enable
+
+#if !TVOS
+namespace AVKit {
+	[SupportedOSPlatform ("ios26.4")]
+	[SupportedOSPlatform ("macos26.4")]
+	[SupportedOSPlatform ("maccatalyst26.4")]
+	[UnsupportedOSPlatform ("tvos")]
+	[StructLayout (LayoutKind.Sequential)]
+	public struct AVLegibleMediaOptionsMenuState {
+#if !COREBUILD
+		byte enabled;
+
+		public bool Enabled {
+			get => enabled != 0;
+			set => enabled = value.AsByte ();
+		}
+
+		nint reason;
+
+		public AVLegibleMediaOptionsMenuStateChangeReason Reason {
+			get => (AVLegibleMediaOptionsMenuStateChangeReason) (long) reason;
+			set => reason = (nint) (long) value;
+		}
+#endif
+	}
+}
+#endif

src/AVKit/Enums.cs

@@ -65,4 +65,20 @@ public enum AVRoutePickerViewButtonState : long {
 		ActiveHighlighted,
 	}
 
+	[NoTV, Mac (26, 4), iOS (26, 4), MacCatalyst (26, 4)]
+	[Native]
+	public enum AVLegibleMediaOptionsMenuStateChangeReason : long {
+		None = 0,
+		LanguageMismatch,
+	}
+
+	[Flags]
+	[NoTV, Mac (26, 4), iOS (26, 4), MacCatalyst (26, 4)]
+	[Native]
+	public enum AVLegibleMediaOptionsMenuContents : long {
+		Legible = 1L << 0,
+		CaptionAppearance = 1L << 1,
+		All = Legible | CaptionAppearance,
+	}
+
 }

src/Accessibility/AXSettings.cs

@@ -33,6 +33,12 @@ public enum AXSettingsFeature : long {
 		[SupportedOSPlatform ("macos26.0")]
 		[SupportedOSPlatform ("tvos26.0")]
 		DwellControl,
+		/// <summary>Jump to the caption styles setting.</summary>
+		[SupportedOSPlatform ("ios26.4")]
+		[SupportedOSPlatform ("maccatalyst26.4")]
+		[SupportedOSPlatform ("macos26.4")]
+		[SupportedOSPlatform ("tvos26.4")]
+		CaptionStyles,
 	}
 
 	public static partial class AXSettings {
@@ -101,5 +107,42 @@ public static bool ShowBordersEnabled ()
 		{
 			return AXShowBordersEnabled () != 0;
 		}
+
+		[SupportedOSPlatform ("ios26.4")]
+		[SupportedOSPlatform ("maccatalyst26.4")]
+		[SupportedOSPlatform ("macos26.4")]
+		[SupportedOSPlatform ("tvos26.4")]
+		[DllImport (Constants.AccessibilityLibrary)]
+		static extern byte AXReduceHighlightingEffectsEnabled ();
+
+		/// <summary>Returns whether the system preference for reduce highlighting effects is enabled.</summary>
+		[SupportedOSPlatform ("ios26.4")]
+		[SupportedOSPlatform ("maccatalyst26.4")]
+		[SupportedOSPlatform ("macos26.4")]
+		[SupportedOSPlatform ("tvos26.4")]
+		public static bool IsReduceHighlightingEffectsEnabled {
+			get {
+				return AXReduceHighlightingEffectsEnabled () != 0;
+			}
+		}
+
+		[SupportedOSPlatform ("ios26.4")]
+		[SupportedOSPlatform ("maccatalyst26.4")]
+		[SupportedOSPlatform ("macos26.4")]
+		[SupportedOSPlatform ("tvos26.4")]
+		[DllImport (Constants.AccessibilityLibrary)]
+		static extern byte AXOpenSettingsFeatureIsSupported (nint /* AXSettingsFeature */ feature);
+
+		/// <summary>Returns whether the specified settings feature is supported on this device.</summary>
+		/// <param name="feature">The settings feature to check.</param>
+		/// <returns><see langword="true" /> if the feature is supported; otherwise, <see langword="false" />.</returns>
+		[SupportedOSPlatform ("ios26.4")]
+		[SupportedOSPlatform ("maccatalyst26.4")]
+		[SupportedOSPlatform ("macos26.4")]
+		[SupportedOSPlatform ("tvos26.4")]
+		public static bool OpenSettingsFeatureIsSupported (AXSettingsFeature feature)
+		{
+			return AXOpenSettingsFeatureIsSupported ((nint) (long) feature) != 0;
+		}
 	}
 }

src/CarPlay/CPEnums.cs

@@ -31,4 +31,51 @@ public enum CPListImageRowItemImageGridElementShape : long {
 		RoundedRect = 0,
 		Circle = 1,
 	}
+
+	[NoTV, NoMac, iOS (26, 4), MacCatalyst (26, 4)]
+	[Native]
+	public enum CPRerouteReason : long {
+		Unknown = 0,
+		MissedTurn,
+		Offline,
+		AlternateRoute,
+		WaypointModified,
+		Mandated,
+	}
+
+	[NoTV, NoMac, iOS (26, 4), MacCatalyst (26, 4)]
+	[Native]
+	public enum CPRouteSource : ulong {
+		Inactive = 0,
+		IOSUnchanged = 1,
+		IOSRouteModified = 2,
+		IOSRouteDestinationsModified = 3,
+		IOSDestinationsOnly = 4,
+		Vehicle = 5,
+	}
+
+	[NoTV, NoMac, iOS (26, 4), MacCatalyst (26, 4)]
+	[Native]
+	public enum CPImageOverlayAlignment : long {
+		Leading,
+		Center,
+		Trailing,
+	}
+
+	[NoTV, NoMac, iOS (26, 4), MacCatalyst (26, 4)]
+	[Native]
+	public enum CPPlaybackPresentation : long {
+		None = 0,
+		Audio,
+		Video,
+	}
+
+	[NoTV, NoMac, iOS (26, 4), MacCatalyst (26, 4)]
+	[Native]
+	public enum CPPlaybackAction : long {
+		None = 0,
+		Play,
+		Pause,
+		Replay,
+	}
 }

src/CarPlay/CPLocationCoordinate3D.cs

@@ -0,0 +1,24 @@
+#nullable enable
+
+using System.Runtime.InteropServices;
+using System.Runtime.Versioning;
+
+namespace CarPlay {
+
+	[SupportedOSPlatform ("ios26.4")]
+	[SupportedOSPlatform ("maccatalyst26.4")]
+	[UnsupportedOSPlatform ("tvos")]
+	[UnsupportedOSPlatform ("macos")]
+	[StructLayout (LayoutKind.Sequential)]
+	public struct CPLocationCoordinate3D {
+		double latitude;
+		double longitude;
+		double altitude;
+
+#if !COREBUILD
+		public double Latitude { get => latitude; set => latitude = value; }
+		public double Longitude { get => longitude; set => longitude = value; }
+		public double Altitude { get => altitude; set => altitude = value; }
+#endif
+	}
+}