[release/10.0.1xx] [system-dependencies] Check if a universal simulator is needed, and if so delete any existing non-universal simulators. (#24087)

1. We run x64 test apps on all machines.
2. Arm64 machines need a universal simulator to run x64 apps.
3. So if we're on an arm64 bot, and we only have the arm64 simulator, delete it and re-install the universal simulator.

There are also a few other misc cleanups here as well.
Backport of #24030.

Author: rolfbjarne

system-dependencies.sh

@@ -314,6 +314,23 @@ function install_mono () {
 	rm -f $MONO_PKG
 }
 
+SIMULATORS_WITHOUT_X64=()
+SIMULATORS_WITHOUT_X64_COUNT=0
+function get_non_universal_simulator_runtimes ()
+{
+	local TMPFILE
+	TMPFILE=$(mktemp)
+
+	xcrun simctl runtime list -j --json-output="$TMPFILE"
+
+	# this json query filters the json to simulator runtimes where iOS/tvOS >= 26.0 and where x64 is *not* supported (which we need to run x64 apps in the simulator on arm64)
+	JQ_QUERY='map({identifier: .identifier, version: .version, supportedArchitectures: .supportedArchitectures | join("|"), majorVersion: .version | split(".")[0] | tonumber }) | map(select(.majorVersion>=26) ) | map(select(.supportedArchitectures | contains("x86_64") | not)) | .[].identifier'
+	SIMULATORS_WITHOUT_X64=($(jq "$JQ_QUERY" -r "$TMPFILE"))
+	SIMULATORS_WITHOUT_X64_COUNT="${#SIMULATORS_WITHOUT_X64[@]}"
+
+	rm -f "$TMPFILE"
+}
+
 function xcodebuild_download_selected_platforms ()
 {
 	local XCODE_DEVELOPER_ROOT
@@ -342,13 +359,60 @@ function xcodebuild_download_selected_platforms ()
 			TVOS_NUGET_OS_VERSION=$(grep '^TVOS_NUGET_OS_VERSION=' Make.versions | sed 's/.*=//')
 			TVOS_BUILD_VERSION=" -buildVersion $TVOS_NUGET_OS_VERSION -architectureVariant universal"
 		fi
+	elif is_at_least_version "$XCODE_VERSION" 26.0; then
+		# we always want the universal variant, so that we can run x64 test apps on arm64
+		IOS_BUILD_VERSION=" -architectureVariant universal"
+		TVOS_BUILD_VERSION=" -architectureVariant universal"
+	fi
+
+	# If we're executing on arm64, we need simulator runtimes that support x64 in order to run
+	# x64 apps in the simulator (aka the universal architecture variant). If we have any simulator
+	# runtimes that don't support x64, then delete those, so that we can re-install the universal
+	# variant.
+	local DOTNET_ARCH
+	if [[ "$(arch)" == "arm64" ]]; then
+		DOTNET_ARCH=arm64
+	elif [[ "$(sysctl -n sysctl.proc_translated 2>/dev/null)" == "1" ]]; then
+		DOTNET_ARCH=arm64
+	fi
+	if [[ "$DOTNET_ARCH" == "arm64" ]]; then
+		log "Looking for iOS/tvOS 26+ simulator runtimes that don't support x64..."
+
+		get_non_universal_simulator_runtimes
+		if [[ "$SIMULATORS_WITHOUT_X64_COUNT" -gt 0 ]]; then
+			log "Found ${SIMULATORS_WITHOUT_X64_COUNT} simulator runtimes that don't support x64, which will now be deleted: ${SIMULATORS_WITHOUT_X64[@]}"
+			for sim in "${SIMULATORS_WITHOUT_X64[@]}"; do
+				log "Executing 'xcrun simctl runtime delete $sim'"
+				sleep 60
+				xcrun simctl runtime delete "$sim"
+			done
+			# sadly simulator deletion is done asynchronously, so we have to wait until they're all gone
+			log "Waiting for the simulators to be deleted..."
+			printf "            "
+			for i in $(seq 1 60); do
+				sleep 1
+				get_non_universal_simulator_runtimes
+				if [[ "$SIMULATORS_WITHOUT_X64_COUNT" == "0" ]]; then
+					break
+				fi
+				printf "$SIMULATORS_WITHOUT_X64_COUNT"
+			done
+			printf "\n"
+			if [[ "$SIMULATORS_WITHOUT_X64_COUNT" != "0" ]]; then
+				warn "Waited for 60 seconds, but there are still $SIMULATORS_WITHOUT_X64_COUNT simulators waiting to deleted."
+			fi
+		else
+			log "All installed iOS/tvOS 26+ simulators support x64"
+		fi
 	fi
 
 	log "Executing '$XCODE_DEVELOPER_ROOT/usr/bin/xcodebuild -downloadPlatform iOS$IOS_BUILD_VERSION' $1"
-	"$XCODE_DEVELOPER_ROOT/usr/bin/xcodebuild" -downloadPlatform iOS $IOS_BUILD_VERSION
+	"$XCODE_DEVELOPER_ROOT/usr/bin/xcodebuild" -downloadPlatform iOS $IOS_BUILD_VERSION   2>&1 | sed 's/^/        /'
 
 	log "Executing '$XCODE_DEVELOPER_ROOT/usr/bin/xcodebuild -downloadPlatform tvOS$TVOS_BUILD_VERSION' $1"
-	"$XCODE_DEVELOPER_ROOT/usr/bin/xcodebuild" -downloadPlatform tvOS $TVOS_BUILD_VERSION
+	"$XCODE_DEVELOPER_ROOT/usr/bin/xcodebuild" -downloadPlatform tvOS $TVOS_BUILD_VERSION 2>&1 | sed 's/^/        /'
+
+	exit 0
 }
 
 function download_xcode_platforms ()
@@ -377,38 +441,24 @@ function download_xcode_platforms ()
 	$SUDO pkill -9 -f "CoreSimulator.framework" || true
 	if ! xcodebuild_download_selected_platforms; then
 		log "Executing '$XCODE_DEVELOPER_ROOT/usr/bin/simctl runtime list -v"
-		"$XCODE_DEVELOPER_ROOT/usr/bin/simctl" runtime list -v
+		"$XCODE_DEVELOPER_ROOT/usr/bin/simctl" runtime list -v 2>&1 | sed 's/^/        /'
 		# Don't exit here, just hope for the best instead.
-		set +x
-		echo "##vso[task.logissue type=warning;sourcepath=system-dependencies.sh]Failed to download all simulator platforms, this may result in problems executing tests in the simulator."
-		set -x
+		(
+			set +x
+			echo "##vso[task.logissue type=warning;sourcepath=system-dependencies.sh]Failed to download all simulator platforms, this may result in problems executing tests in the simulator."
+			set -x
+		)
 	else
 		log "Executing '$XCODE_DEVELOPER_ROOT/usr/bin/simctl runtime list -v"
-		"$XCODE_DEVELOPER_ROOT/usr/bin/simctl" runtime list -v
+		"$XCODE_DEVELOPER_ROOT/usr/bin/simctl" runtime list -v 2>&1 | sed 's/^/        /'
 		log "Executing '$XCODE_DEVELOPER_ROOT/usr/bin/simctl list -v"
-		"$XCODE_DEVELOPER_ROOT/usr/bin/simctl" list -v
+		"$XCODE_DEVELOPER_ROOT/usr/bin/simctl" list -v 2>&1 | sed 's/^/        /'
 	fi
 
-	xcodebuild_download_selected_platforms "(second time)" || true
-	xcodebuild_download_selected_platforms "(third time)" || true
-	xcodebuild_download_selected_platforms "(fourth time)" || true
-
 	log "Executing '$SUDO $XCODE_DEVELOPER_ROOT/usr/bin/xcodebuild -runFirstLaunch'"
 	$SUDO "$XCODE_DEVELOPER_ROOT/usr/bin/xcodebuild" -runFirstLaunch
 	log "Executed '$SUDO $XCODE_DEVELOPER_ROOT/usr/bin/xcodebuild -runFirstLaunch'"
 
-	# This is a workaround for a bug in Xcode 15 where we need to open the platforms panel for it to register the simulators.
-	log "Executing 'open xcpref://Xcode.PreferencePane.Platforms'"
-	log "Killing Xcode"
-	pkill -9 "Xcode" || log "Xcode was not running."
-	log "Opening Xcode preferences panel"
-	open xcpref://Xcode.PreferencePane.Platforms
-	log "waiting 10 secs for Xcode to open the preferences panel"
-	sleep 10
-	log "Killing Xcode"
-	pkill -9 "Xcode" || log "Xcode was not running."
-	log "Executed 'open xcpref://Xcode.PreferencePane.Platforms'"
-
 	log "Finished installing Xcode platforms"
 }
 
@@ -1020,7 +1070,7 @@ function check_old_simulators ()
 			$action "The $os $version simulator is not installed. Execute ${COLOR_MAGENTA}xcodebuild -downloadPlatform $os -buildVersion $version${COLOR_RESET} to install."
 		else
 			warn "The $os $version simulator is not installed. Now executing ${COLOR_BLUE}"$XCODE_DEVELOPER_ROOT/usr/bin/xcodebuild" -downloadPlatform $os -buildVersion $version${COLOR_RESET} to install..."
-			"$XCODE_DEVELOPER_ROOT/usr/bin/xcodebuild" -downloadPlatform "$os" -buildVersion "$version"
+			"$XCODE_DEVELOPER_ROOT/usr/bin/xcodebuild" -downloadPlatform "$os" -buildVersion "$version" 2>&1 | sed 's/^/        /'
 			warn "Successfully executed ${COLOR_BLUE}"$XCODE_DEVELOPER_ROOT/usr/bin/xcodebuild" -downloadPlatform $os -buildVersion $version${COLOR_RESET}."
 		fi
 	done