Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 9 additions & 4 deletions Make.config
Original file line number Diff line number Diff line change
Expand Up @@ -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.2
XCODE_URL=https://dl.internalx.com/internal-files/xcodes/Xcode_26.2.xip
XCODE_VERSION=26.3
XCODE_URL=https://dl.internalx.com/internal-files/xcodes/Xcode_26.3_Release_Candidate.xip
ifndef IS_LINUX
XCODE_DEVELOPER_ROOT=/Applications/Xcode_26.2.0.app/Contents/Developer
XCODE_DEVELOPER_ROOT=/Applications/Xcode_26.3.0-rc.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 All @@ -232,11 +232,16 @@ endif
export DEVELOPER_DIR=$(XCODE_DEVELOPER_ROOT)
export MD_APPLE_SDK_ROOT=$(abspath $(XCODE_DEVELOPER_ROOT)/../..)
else
# On Linux, set placeholder Xcode values
# On Linux, set placeholder Xcode values but honor XCODE_CHANNEL so we configure bots correctly
XCODE_PRODUCT_BUILD_VERSION=
ifeq ($(XCODE_CHANNEL),Beta)
XCODE_IS_STABLE=false
XCODE_IS_PREVIEW=true
else
XCODE_IS_STABLE=true
XCODE_IS_PREVIEW=false
endif
endif

# We don't need to be told there are workload updates
export DOTNET_CLI_WORKLOAD_UPDATE_NOTIFY_DISABLE=true
Expand Down
2 changes: 1 addition & 1 deletion tools/common/SdkVersions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

namespace Xamarin {
static class SdkVersions {
public const string Xcode = "26.2";
public const string Xcode = "26.3";
public const string OSX = "26.2";
public const string iOS = "26.2";
public const string TVOS = "26.2";
Expand Down
2 changes: 1 addition & 1 deletion tools/devops/automation/templates/variables/common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,4 @@ variables:
value: 15.6

- name: xcodeChannel
value: Stable
value: Beta
Loading