[net10.0] Merge main into net10.0. (#23855)

---------

Co-authored-by: Alex Soto <[email protected]>
Co-authored-by: Manuel de la Pena <[email protected]>
Co-authored-by: Mauro Agnoletti <[email protected]>
Co-authored-by: dartasen <[email protected]>

Author: 5 people

.config/dotnet-tools.json

@@ -6,13 +6,22 @@
       "version": "2.2.1",
       "commands": [
         "t4"
-      ]
+      ],
+      "rollForward": false
     },
     "dotnet-ilrepack": {
       "version": "2.0.43",
       "commands": [
         "ilrepack"
-      ]
+      ],
+      "rollForward": false
+    },
+    "microsoft.dotnet.apicompat.tool": {
+      "version": "9.0.304",
+      "commands": [
+        "apicompat"
+      ],
+      "rollForward": false
     }
   }
 }

Make.config

@@ -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=16.4
-XCODE_URL=https://dl.internalx.com/internal-files/xcodes/Xcode_16.4.xip
-XCODE_DEVELOPER_ROOT=/Applications/Xcode_16.4.0.app/Contents/Developer
+XCODE_VERSION=26.0
+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"
@@ -240,9 +240,9 @@ MAX_MONO_VERSION=6.12.99
 MIN_MONO_URL=https://download.mono-project.com/archive/6.12.0/macos-10-universal/MonoFramework-MDK-6.12.0.179.macos10.xamarin.universal.pkg
 
 # ObjectiveSharpie min/max versions
-MIN_SHARPIE_VERSION=3.5.116
+MIN_SHARPIE_VERSION=3.5.126
 MAX_SHARPIE_VERSION=3.5.999
-MIN_SHARPIE_URL=https://download.visualstudio.microsoft.com/download/pr/3a748cc2-780d-403c-88ba-700aa9a2d299/88cbfd86e85f56b4c61e092d0f0b9ad9/objectivesharpie-3.5.116.pkg
+MIN_SHARPIE_URL=https://download.visualstudio.microsoft.com/download/pr/0f25c412-fde2-408f-a3e6-13facf6d1484/33033e7ce78cbea9f876dd4e75eabc60/objectivesharpie-3.5.126.pkg
 
 # Minimum OSX versions for building XI/XM
 MIN_OSX_BUILD_VERSION=15.3
@@ -600,5 +600,7 @@ $(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
+
 .SUFFIXES:
 MAKEFLAGS += --no-builtin-rules

Make.versions

@@ -21,17 +21,17 @@
 # IMPORTANT: There must be *no* managed API differences unless the two first
 # numbers (major.minor) changes.
 
-IOS_NUGET_OS_VERSION=18.5
-TVOS_NUGET_OS_VERSION=18.5
-MACOS_NUGET_OS_VERSION=15.5
-MACCATALYST_NUGET_OS_VERSION=18.5
+IOS_NUGET_OS_VERSION=26.0
+TVOS_NUGET_OS_VERSION=26.0
+MACOS_NUGET_OS_VERSION=26.0
+MACCATALYST_NUGET_OS_VERSION=26.0
 
 # 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.
-IOS_TARGET_PLATFORM_VERSION_LIBRARY=18.5
-TVOS_TARGET_PLATFORM_VERSION_LIBRARY=18.5
-MACOS_TARGET_PLATFORM_VERSION_LIBRARY=15.5
-MACCATALYST_TARGET_PLATFORM_VERSION_LIBRARY=18.5
+IOS_TARGET_PLATFORM_VERSION_LIBRARY=26.0
+TVOS_TARGET_PLATFORM_VERSION_LIBRARY=26.0
+MACOS_TARGET_PLATFORM_VERSION_LIBRARY=26.0
+MACCATALYST_TARGET_PLATFORM_VERSION_LIBRARY=26.0
 
 # In theory we should define the default platform version if it's not specified in the TFM. The default should not change for a given .NET version:
 # * We release support for iOS 14.5 with .NET 6
@@ -115,23 +115,13 @@ SUPPORTED_API_VERSIONS_TVOS+=net9.0-18.0
 SUPPORTED_API_VERSIONS_MACOS+=net9.0-15.0
 SUPPORTED_API_VERSIONS_MACCATALYST+=net9.0-18.0
 
-SUPPORTED_API_VERSIONS_IOS+=net9.0-18.5
-SUPPORTED_API_VERSIONS_TVOS+=net9.0-18.5
-SUPPORTED_API_VERSIONS_MACOS+=net9.0-15.5
-SUPPORTED_API_VERSIONS_MACCATALYST+=net9.0-18.5
+SUPPORTED_API_VERSIONS_IOS+=net9.0-26.0
+SUPPORTED_API_VERSIONS_TVOS+=net9.0-26.0
+SUPPORTED_API_VERSIONS_MACOS+=net9.0-26.0
+SUPPORTED_API_VERSIONS_MACCATALYST+=net9.0-26.0
 
 # Add beta versions here!
 
-BETA_API_VERSIONS_IOS+=net9.0-26.0
-BETA_API_VERSIONS_TVOS+=net9.0-26.0
-BETA_API_VERSIONS_MACOS+=net9.0-26.0
-BETA_API_VERSIONS_MACCATALYST+=net9.0-26.0
-
-BETA_API_VERSIONS_IOS+=net10.0-26.0
-BETA_API_VERSIONS_TVOS+=net10.0-26.0
-BETA_API_VERSIONS_MACOS+=net10.0-26.0
-BETA_API_VERSIONS_MACCATALYST+=net10.0-26.0
-
 # Don't change these (even if there aren't any beta versions)!
 
 SUPPORTED_API_VERSIONS_IOS+=$(BETA_API_VERSIONS_IOS)

builds/Makefile

@@ -96,6 +96,7 @@ package-download/all-package-references.csproj: $(GIT_DIRECTORY)/HEAD $(GIT_DIRE
 	@# https://github.com/dotnet/sdk/issues/16165
 	$(Q) rm -f ~/.dotnet/toolResolverCache/*/dotnet-t4
 	$(Q) rm -f ~/.dotnet/toolResolverCache/*/dotnet-ilrepack
+	$(Q) rm -f ~/.dotnet/toolResolverCache/*/microsoft.dotnet.apicompat.tool
 	$(DOTNET) tool restore
 	$(Q) touch $@
 

builds/Versions-MacCatalyst.plist.in

@@ -24,6 +24,7 @@
 			<string>18.3</string>
 			<string>18.4</string>
 			<string>18.5</string>
+			<string>26.0</string>
 		</array>
 	</dict>
 	<key>SupportedTargetPlatformVersions</key>
@@ -58,6 +59,7 @@
 			<string>18.3</string>
 			<string>18.4</string>
 			<string>18.5</string>
+			<string>26.0</string>
 		</array>
 	</dict>
 	<key>MacCatalystVersionMap</key>
@@ -106,6 +108,14 @@
 		<string>15.1</string>
 		<key>18.2</key>
 		<string>15.2</string>
+		<key>18.3</key>
+		<string>15.3</string>
+		<key>18.4</key>
+		<string>15.4</string>
+		<key>18.5</key>
+		<string>15.5</string>
+		<key>26.0</key>
+		<string>26.0</string>
 	</dict>
 	<key>RecommendedXcodeVersion</key>
 	<string>@XCODE_VERSION@</string>

builds/Versions-iOS.plist.in

@@ -41,6 +41,7 @@
 			<string>18.3</string>
 			<string>18.4</string>
 			<string>18.5</string>
+			<string>26.0</string>
 		</array>
 	</dict>
 	<key>SupportedTargetPlatformVersions</key>
@@ -94,6 +95,7 @@
 			<string>18.3</string>
 			<string>18.4</string>
 			<string>18.5</string>
+			<string>26.0</string>
 		</array>
 	</dict>
 	<key>RecommendedXcodeVersion</key>

builds/Versions-macOS.plist.in

@@ -24,6 +24,7 @@
 			<string>15.3</string>
 			<string>15.4</string>
 			<string>15.5</string>
+			<string>26.0</string>
 		</array>
 	</dict>
 	<key>SupportedTargetPlatformVersions</key>
@@ -56,6 +57,7 @@
 			<string>15.3</string>
 			<string>15.4</string>
 			<string>15.5</string>
+			<string>26.0</string>
 		</array>
 	</dict>
 	<key>RecommendedXcodeVersion</key>

builds/Versions-tvOS.plist.in

@@ -36,6 +36,7 @@
 			<string>18.3</string>
 			<string>18.4</string>
 			<string>18.5</string>
+			<string>26.0</string>
 		</array>
 	</dict>
 	<key>SupportedTargetPlatformVersions</key>
@@ -84,6 +85,7 @@
 			<string>18.3</string>
 			<string>18.4</string>
 			<string>18.5</string>
+			<string>26.0</string>
 		</array>
 	</dict>
 	<key>RecommendedXcodeVersion</key>

docs/ReleaseCheckList.md

@@ -20,11 +20,10 @@ Copy this list into a new issue and then check off as the release progresses.
     * XCODE_VERSION
     * XCODE_URL
     * XCODE_DEVELOPER_ROOT
-  * Update any `xcodeChannel` values in tools/devops. Change to `Beta` if using an Xcode beta or release candidate, and switch back to `Stable` with the final (stable) Xcode release.
+  * Update the `xcodeChannel` value in `tools/devops/automation/templates/variables/common.yml`. Change to `Beta` if using an Xcode beta or release candidate, and switch back to `Stable` with the final (stable) Xcode release.
     ```shell
-    $ cd tools/devops
-    $ git grep -nE -e 'xcodeChannel: (Stable|Beta)' -i
-      [...] # these are the matches that may need fixing.
+    $ git grep -A 1 -E 'xcodeChannel' -- tools/devops/automation/templates/variables/common.yml
+      [...] # the value that needs to be updated
     ```
   * Add the new OS versions to the `builds/Version-*.plist.in` files.
   * Build and fix any issues.