Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rolfbjarne merged 4 commits into from
Sep 17, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
70365f0
[xcode26.0] Bump to Xcode 26 Stable
dalexsoto Sep 15, 2025
44d72de
Use the stable channel now.
rolfbjarne Sep 16, 2025
c952dad
Pass -architectureVariant arm64|universal when downloading simulators.
rolfbjarne Sep 16, 2025
dd844b5
Don't pass -buildVersion ... -architectureVariant ... quite yet.
rolfbjarne Sep 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Make.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
20 changes: 15 additions & 5 deletions system-dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion tools/devops/automation/templates/variables/common.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,4 @@ variables:
value: 15.6

- name: xcodeChannel
value: Beta
value: Stable
Loading