[release/10.0.1xx] Merge main into release/10.0.1xx.

.azuredevops/dependabot.yml

@@ -0,0 +1,5 @@
+version: 2
+
+# Disabling dependabot on Azure DevOps as this is a mirrored repo. Updates should go through github.
+enable-campaigned-updates: false
+enable-security-updates: false

.github/workflows/autoformat.yml

@@ -12,7 +12,7 @@ jobs:
 
     steps:
     - name: 'Checkout'
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
       with:
         fetch-depth: 0
         repository: ${{ github.event.pull_request.head.repo.full_name }}

.github/workflows/bump-global-json.yml

@@ -13,7 +13,7 @@ jobs:
     if: contains(github.event.pull_request.title, 'Update dependencies from dotnet/') && github.actor == 'dotnet-maestro[bot]'
     steps:
     - name: 'Checkout repo'
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
       with:
         fetch-depth: 0
         repository: ${{ github.event.pull_request.head.repo.full_name }}

.github/workflows/localization-update.yml

@@ -15,7 +15,7 @@ jobs:
     name: '[Localization PR to main]'
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
       name: checkout
 
     - uses: repo-sync/pull-request@v2

.github/workflows/pwsh-ci.yml

@@ -10,7 +10,7 @@ jobs:
   test-pwsh:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Run Pester tests
       run: |
         Set-PSRepository psgallery -InstallationPolicy trusted

.github/workflows/update-single-platform-branches.yml

@@ -19,7 +19,7 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 

.github/workflows/yamllint.yml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: 'Checkout'
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           fetch-depth: 0

Make.config

@@ -44,10 +44,10 @@ include $(TOP)/Make.versions
 # The value is taken from the name + version of the Ref pack.
 # Example: given the Ref pack "Microsoft.iOS.Ref.net8.0_17.5" with the version "17.5.8030", the value
 # to write here would be the part after "Microsoft.iOS.Ref." + "/" + version: "net8.0_17.5/17.5.8030"
-STABLE_NUGET_VERSION_iOS=net9.0_26.0/26.0.9752
-STABLE_NUGET_VERSION_tvOS=net9.0_26.0/26.0.9752
-STABLE_NUGET_VERSION_MacCatalyst=net9.0_26.0/26.0.9752
-STABLE_NUGET_VERSION_macOS=net9.0_26.0/26.0.9752
+STABLE_NUGET_VERSION_iOS=net10.0_26.1/26.1.10494
+STABLE_NUGET_VERSION_tvOS=net10.0_26.1/26.1.10494
+STABLE_NUGET_VERSION_MacCatalyst=net10.0_26.1/26.1.10494
+STABLE_NUGET_VERSION_macOS=net10.0_26.1/26.1.10494
 
 PACKAGE_HEAD_REV=$(shell git rev-parse HEAD)
 
@@ -140,8 +140,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.1
-NUGET_HARDCODED_PRERELEASE_BRANCH=xcode26.1
+NUGET_HARDCODED_PRERELEASE_IDENTIFIER=xcode26.2
+NUGET_HARDCODED_PRERELEASE_BRANCH=xcode26.2
 
 # 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-]' '-')
@@ -201,9 +201,9 @@ 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.1
-XCODE_URL=https://dl.internalx.com/internal-files/xcodes/Xcode_26.1.xip
-XCODE_DEVELOPER_ROOT=/Applications/Xcode_26.1.0.app/Contents/Developer
+XCODE_VERSION=26.2
+XCODE_URL=https://dl.internalx.com/internal-files/xcodes/Xcode_26.2.xip
+XCODE_DEVELOPER_ROOT=/Applications/Xcode_26.2.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"
@@ -299,9 +299,7 @@ RANLIB=$(XCODE_DEVELOPER_ROOT)/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranli
 # things in other places if they absolutely must.
 MONO_PATH=$(TOP)/external/mono
 XAMARIN_MACDEV_PATH=$(TOP)/external/Xamarin.MacDev
-MONOTOUCH_DIALOG_PATH=$(TOP)/external/MonoTouch.Dialog
 API_TOOLS_PATH=$(TOP)/external/api-tools
-ADR_PATH:=$(abspath $(TOP)/../macios-adr)
 
 MONO_PREFIX ?= /Library/Frameworks/Mono.framework/Versions/Current
 SYSTEM_MONO=$(MONO_PREFIX)/bin/mono
@@ -391,8 +389,9 @@ export DOTNET_ROOT=$(DOTNET_DIR)
 export PATH := $(DOTNET_DIR):$(PATH)
 DOTNET=$(DOTNET_DIR)/dotnet
 DOTNET_BCL_DIR:=$(abspath $(TOP)/packages/microsoft.netcore.app.ref/$(DOTNET_BCL_VERSION)/ref/$(DOTNET_TFM))
+# when bumping to a new .NET version, there may be a period when some parts of .NET is still on the old .NET version, so handle that here for DOTNET_BCL_DIR
 ifneq ($(DOTNET_BCL_DIR),$(shell ls -1d $(DOTNET_BCL_DIR) 2>/dev/null))
-DOTNET_BCL_DIR:=$(abspath $(TOP)/packages/microsoft.netcore.app.ref/$(DOTNET_BCL_VERSION)/ref/net8.0)
+DOTNET_BCL_DIR:=$(abspath $(wildcard $(TOP)/packages/microsoft.netcore.app.ref/$(DOTNET_BCL_VERSION)/ref/net*.0))
 endif
 DOTNET_ANALYZERS_DIR?=$(DOTNET_DIR)/sdk/$(DOTNET_VERSION_BAND)/Sdks/Microsoft.NET.Sdk/analyzers
 
@@ -608,7 +607,13 @@ $(foreach platform,$(DOTNET_WINDOWS_PLATFORMS),$(eval $(platform)_NUGET_WINDOWS_
 # A local feed to place test nugets.
 NUGET_TEST_FEED=$(abspath $(TOP)/tests/.nuget/packages)
 
-ENABLE_ADR=1
+ifeq ($(shell arch),arm64)
+ADR_RUNTIME_IDENTIFIER=osx-arm64
+else ifeq ($(shell sysctl -n sysctl.proc_translated 2>/dev/null),1)
+ADR_RUNTIME_IDENTIFIER=osx-arm64
+else
+ADR_RUNTIME_IDENTIFIER=osx-x64
+endif
 
 .SUFFIXES:
 MAKEFLAGS += --no-builtin-rules

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.1
-TVOS_NUGET_OS_VERSION=26.1
-MACOS_NUGET_OS_VERSION=26.1
-MACCATALYST_NUGET_OS_VERSION=26.1
+IOS_NUGET_OS_VERSION=26.2
+TVOS_NUGET_OS_VERSION=26.2
+MACOS_NUGET_OS_VERSION=26.2
+MACCATALYST_NUGET_OS_VERSION=26.2
 
 # 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.

Makefile

@@ -93,32 +93,7 @@ git-clean-all:
 	@git clean -xffdq
 	@echo "Cleaning submodules..."
 	@git submodule foreach -q --recursive 'git clean -xffdq && git reset --hard -q'
-	@set -e; \
-	for dir in $(DEPENDENCY_DIRECTORIES); do \
-		if test -d $$dir; then \
-			echo "Cleaning $$(basename $$dir)..."; \
-			cd $$dir; \
-			git clean -xffdq; \
-			git reset --hard -q; \
-			git submodule foreach -q --recursive 'git clean -xffdq'; \
-		else \
-			echo "Skipped $$dir (does not exist)"; \
-		fi; \
-	done
-
-	@set -e;  \
-	if [ -n "$(ENABLE_XAMARIN)" ]; then \
-		CONFIGURE_FLAGS=""; \
-		if [ -n "$(ENABLE_XAMARIN)" ]; then \
-			echo "Xamarin-specific build has been re-enabled"; \
-			CONFIGURE_FLAGS="$$CONFIGURE_FLAGS --enable-xamarin"; \
-		fi; \
-		./configure $$CONFIGURE_FLAGS; \
-		$(MAKE) reset; \
-		echo "Done"; \
-	else \
-		echo "Done"; \
-	fi; \
+	@echo "Done"
 
 SUBDIRS += tests
 

builds/Makefile

@@ -70,7 +70,7 @@ ifdef CUSTOM_DOTNET
 DOWNLOAD_DOTNET_VERSION=$(CUSTOM_DOTNET_VERSION)
 ALL_NUGET_FEEDS:=$(shell grep '^[[:space:]]*<add.*value="https.*' $(TOP)/NuGet.config | sed -e 's/.*value="//' -e 's/".*//')
 CUSTOM_DOTNET_NUGET_FEED=\
-	--source $(DOTNET_RUNTIME_PATH)/artifacts/packages/Debug/Shipping \
+	--source $(DOTNET_RUNTIME_PATH)/artifacts/packages/Release/Shipping \
 	$(foreach feed,$(ALL_NUGET_FEEDS), --source $(feed))
 else
 ifneq ($(BUNDLED_NETCORE_PLATFORMS_PACKAGE_VERSION),)

builds/Versions-MacCatalyst.plist.in

@@ -26,6 +26,7 @@
 			<string>18.5</string>
 			<string>26.0</string>
 			<string>26.1</string>
+			<string>26.2</string>
 		</array>
 	</dict>
 	<key>SupportedTargetPlatformVersions</key>
@@ -62,6 +63,7 @@
 			<string>18.5</string>
 			<string>26.0</string>
 			<string>26.1</string>
+			<string>26.2</string>
 		</array>
 	</dict>
 	<key>MacCatalystVersionMap</key>
@@ -120,6 +122,8 @@
 		<string>26.0</string>
 		<key>26.1</key>
 		<string>26.1</string>
+		<key>26.2</key>
+		<string>26.2</string>
 	</dict>
 	<key>RecommendedXcodeVersion</key>
 	<string>@XCODE_VERSION@</string>

builds/Versions-iOS.plist.in

@@ -43,6 +43,7 @@
 			<string>18.5</string>
 			<string>26.0</string>
 			<string>26.1</string>
+			<string>26.2</string>
 		</array>
 	</dict>
 	<key>SupportedTargetPlatformVersions</key>
@@ -98,6 +99,7 @@
 			<string>18.5</string>
 			<string>26.0</string>
 			<string>26.1</string>
+			<string>26.2</string>
 		</array>
 	</dict>
 	<key>RecommendedXcodeVersion</key>

builds/Versions-macOS.plist.in

@@ -26,6 +26,7 @@
 			<string>15.5</string>
 			<string>26.0</string>
 			<string>26.1</string>
+			<string>26.2</string>
 		</array>
 	</dict>
 	<key>SupportedTargetPlatformVersions</key>
@@ -60,6 +61,7 @@
 			<string>15.5</string>
 			<string>26.0</string>
 			<string>26.1</string>
+			<string>26.2</string>
 		</array>
 	</dict>
 	<key>RecommendedXcodeVersion</key>

builds/Versions-tvOS.plist.in

@@ -38,6 +38,7 @@
 			<string>18.5</string>
 			<string>26.0</string>
 			<string>26.1</string>
+			<string>26.2</string>
 		</array>
 	</dict>
 	<key>SupportedTargetPlatformVersions</key>
@@ -88,6 +89,7 @@
 			<string>18.5</string>
 			<string>26.0</string>
 			<string>26.1</string>
+			<string>26.2</string>
 		</array>
 	</dict>
 	<key>RecommendedXcodeVersion</key>

configure

@@ -109,11 +109,11 @@ while test "x$1" != x; do
         shift
         ;;
     --enable-xamarin)
-        echo "ENABLE_XAMARIN=1" >> $CONFIGURED_FILE
+        echo "The argument '$1' is no longer in use."
         shift
         ;;
     --disable-xamarin)
-        echo "ENABLE_XAMARIN=" >> $CONFIGURED_FILE
+        echo "The argument '$1' is no longer in use."
         shift
         ;;
     --custom-dotnet=*)

create-make-config.sh

@@ -33,10 +33,4 @@ if which ccache > /dev/null 2>&1; then
 	echo "Found ccache on the system, enabling it"
 fi
 
-# Detect ADR
-if test -d ../macios-adr; then
-	printf "ENABLE_XAMARIN=1\n" >> "$OUTPUT_FILE"
-	echo "Detected the macios-adr repository, automatically enabled the Xamarin build"
-fi
-
 mv "$OUTPUT_FILE" "$OUTPUT"

docs/ReleaseCheckList.md

@@ -67,7 +67,7 @@ This happens after the stable version of Xcode has been released and the `xcodeX
 * [ ] Update https://github.com/dotnet/maui/wiki/Release-Versions
 * [ ] Update API diff (the `STABLE_NUGET_VERSION_*` variables in `Make.config`). Can only be done after the NuGets have been published to nuget.org.
 * [ ] Update docs by executing `docs/sync-mobile-docs.sh`. Beware if docs were modified in the [docs-mobile](https://github.com/dotnet/docs-mobile) repository by somebody else, any such changes will have to be copied back first.
-* [ ] Update API / reference docs. See [update-api-docs.md](/tree/main/docs/update-api-docs.md) for instructions.
+* [ ] Update API / reference docs. See [update-api-docs.md](https://github.com/dotnet/macios/blob/main/docs/update-api-docs.md) for instructions.
 * [ ] Make sure all items in the milestone for the current release have been closed.
 * [ ] Close this issue & close the milestone.
 * [ ] Wonder about life as you consider the impossibility of actually reaching this point, because you can't close the milestone before all issues have been closed, and you can't close this issue until checking off all items, which you can't do until you've closed the milestone. Decide to schedule yet another viewing of [Life of Brian](https://en.wikipedia.org/wiki/Monty_Python%27s_Life_of_Brian) to ~cope~ celebrate the release 🍾.