[xcode26.0] Bump to Xcode 26 Stable (#23819)

Author: rolfbjarne

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_Release_Candidate.xip
-XCODE_DEVELOPER_ROOT=/Applications/Xcode_26.0.0-rc.app/Contents/Developer
+XCODE_URL=https://dl.internalx.com/internal-files/xcodes/Xcode_26.xip
+XCODE_DEVELOPER_ROOT=/Applications/Xcode_26.0.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"

system-dependencies.sh

@@ -319,6 +319,7 @@ function xcodebuild_download_selected_platforms ()
 	local XCODE_DEVELOPER_ROOT
 	local XCODE_NAME
 	local XCODE_IS_STABLE
+	local XCODE_VERSION
 	local IOS_NUGET_OS_VERSION
 	local IOS_BUILD_VERSION
 	local TVOS_NUGET_OS_VERSION
@@ -328,14 +329,23 @@ function xcodebuild_download_selected_platforms ()
 	XCODE_NAME=$(basename "$(dirname "$(dirname "$XCODE_DEVELOPER_ROOT")")")
 	# we use the same logic here as in Make.config to determine whether we're using a stable version of Xcode or not (search for XCODE_IS_STABLE/XCODE_IS_PREVIEW)
 	XCODE_IS_STABLE=$(echo "$XCODE_NAME" | sed -e 's@^Xcode[_0-9.]*[.]app$@YES@')
+	XCODE_VERSION=$(grep ^XCODE_VERSION= Make.config | sed 's/.*=//')
 
 	IOS_BUILD_VERSION=
 	TVOS_BUILD_VERSION=
-	if [[ "$XCODE_IS_STABLE" == "YES" ]]; then
-		IOS_NUGET_OS_VERSION=$(grep '^IOS_NUGET_OS_VERSION=' Make.versions | sed 's/.*=//')
-		IOS_BUILD_VERSION=" -buildVersion $IOS_NUGET_OS_VERSION"
-		TVOS_NUGET_OS_VERSION=$(grep '^TVOS_NUGET_OS_VERSION=' Make.versions | sed 's/.*=//')
-		TVOS_BUILD_VERSION=" -buildVersion $TVOS_NUGET_OS_VERSION"
+	if is_at_least_version "$XCODE_VERSION" 26.1; then
+		# passing -buildVersion .. --architectureVariant .. doesn't quite work in Xcode 26.0 (it works the first time, but then it always thinks it's the first time, tries to download and install, and gets confused), let's see if they fix it in Xcode 26.1
+		if [[ "$XCODE_IS_STABLE" == "YES" ]]; then
+			if [[ "$(arch)" == "arm64" ]]; then
+				ARCHITECTURE_VARIANT=arm64
+			else
+				ARCHITECTURE_VARIANT=universal
+			fi
+			IOS_NUGET_OS_VERSION=$(grep '^IOS_NUGET_OS_VERSION=' Make.versions | sed 's/.*=//')
+			IOS_BUILD_VERSION=" -buildVersion $IOS_NUGET_OS_VERSION -architectureVariant $ARCHITECTURE_VARIANT"
+			TVOS_NUGET_OS_VERSION=$(grep '^TVOS_NUGET_OS_VERSION=' Make.versions | sed 's/.*=//')
+			TVOS_BUILD_VERSION=" -buildVersion $TVOS_NUGET_OS_VERSION -architectureVariant $ARCHITECTURE_VARIANT"
+		fi
 	fi
 
 	log "Executing '$XCODE_DEVELOPER_ROOT/usr/bin/xcodebuild -downloadPlatform iOS$IOS_BUILD_VERSION' $1"

tools/devops/automation/templates/variables/common.yml

@@ -74,4 +74,4 @@ variables:
   value: 15.6
 
 - name: xcodeChannel
-  value: Beta
+  value: Stable