Merge remote-tracking branch 'origin/net11.0' into inline-dlfcn-net11.0

Author: rolfbjarne

Directory.Build.props

@@ -27,5 +27,14 @@
 		<NUnitAnalyzersPackageVersion>4.7.0</NUnitAnalyzersPackageVersion>
 		<NUnitPackageVersion>4.3.2</NUnitPackageVersion>
 	</PropertyGroup>
+
+	<PropertyGroup>
+		<!-- workarounds for https://github.com/dotnet/runtime/issues/123503 -->
+		<!-- https://github.com/dotnet/macios/issues/24558 -->
+		<EnableTrimAnalyzer>false</EnableTrimAnalyzer>
+		<EnableAotAnalyzer>false</EnableAotAnalyzer>
+		<NoWarn>$(NoWarn);AD0001</NoWarn>
+	</PropertyGroup>
+
 	<Import Project="Build.props" Condition="Exists('Build.props')" />
 </Project>

Make.config

@@ -18,7 +18,7 @@ CURL = curl --fail --location --connect-timeout 15 $(if $(V),--verbose,--silent)
 # --retry-all-errors: ignore the definition of insanity and retry even for errors that seem like you'd get the same result (such as 404). This isn't the real purpose, because this will also retry errors that will get a different result (such as connection failures / resets), which apparently --retry doesn't cover.
 CURL_RETRY = $(CURL) --retry 20 --retry-delay 2 --retry-all-errors
 
-DOTNET_TFM=net10.0
+DOTNET_TFM=net11.0
 DOTNET_MAJOR_VERSION:=$(firstword $(subst ., ,$(subst net,,$(DOTNET_TFM))))
 # calculate commit distance and store it in a file so that we don't have to re-calculate it every time make is executed.
 
@@ -128,7 +128,7 @@ endif
 
 ## If this branch is a release branch, set NUGET_RELEASE_BRANCH to the exact branch name (so that any other branches won't become release branches just by branching off from a release branch).
 ## Example: release/6.0.3xx
-NUGET_RELEASE_BRANCH=release/10.0.1xx
+NUGET_RELEASE_BRANCH=release/11.0.1xx
 
 ## If this is a pre-release (alpha, beta, rc, xcode, etc.) branch, set NUGET_HARDCODED_PRERELASE_BRANCH to the exact branch name. Also set NUGET_HARDCODED_PRELEASE_IDENTIFIER to the prerelease identifier to use.
 ## Example:
@@ -146,8 +146,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.2
-NUGET_HARDCODED_PRERELEASE_BRANCH=xcode26.2
+NUGET_HARDCODED_PRERELEASE_IDENTIFIER=net11-p3
+NUGET_HARDCODED_PRERELEASE_BRANCH=net11.0
 
 # 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-]' '-')
@@ -275,17 +275,11 @@ MAX_IOS_SIMULATOR_VERSION=$(IOS_SDK_VERSION)
 MAX_TVOS_SIMULATOR_VERSION=$(TVOS_SDK_VERSION)
 endif
 
-# Minimum OS versions for running XI/XM apps.
-MIN_IOS_SDK_VERSION=12.2
-MIN_MACOS_SDK_VERSION=12.0
-MIN_TVOS_SDK_VERSION=12.2
-MIN_MACCATALYST_SDK_VERSION=15.0
-
-# Minimum OS versions for .NET 9 support
-DOTNET_MIN_IOS_SDK_VERSION=12.2
-DOTNET_MIN_TVOS_SDK_VERSION=12.2
-DOTNET_MIN_MACCATALYST_SDK_VERSION=15.0
-DOTNET_MIN_MACOS_SDK_VERSION=12.0
+# Minimum OS versions for .NET support
+DOTNET_MIN_IOS_SDK_VERSION=13.0
+DOTNET_MIN_TVOS_SDK_VERSION=13.0
+DOTNET_MIN_MACCATALYST_SDK_VERSION=17.0
+DOTNET_MIN_MACOS_SDK_VERSION=14.0
 
 # The min simulator version available in the Xcode we're using
 MIN_IOS_SIMULATOR_VERSION=16.0
@@ -448,6 +442,7 @@ DOTNET_PLATFORMS=
 
 ifdef INCLUDE_IOS
 DOTNET_PLATFORMS+=iOS
+DOTNET_CORECLR_PLATFORMS+=iOS
 DOTNET_MONOVM_PLATFORMS+=iOS
 DOTNET_NATIVEAOT_PLATFORMS+=iOS
 DOTNET_IOS_RUNTIME_IDENTIFIERS_NO_ARCH=ios
@@ -473,6 +468,7 @@ endif # INCLUDE_IOS
 
 ifdef INCLUDE_TVOS
 DOTNET_PLATFORMS+=tvOS
+DOTNET_CORECLR_PLATFORMS+=tvOS
 DOTNET_MONOVM_PLATFORMS+=tvOS
 DOTNET_NATIVEAOT_PLATFORMS+=tvOS
 DOTNET_TVOS_RUNTIME_IDENTIFIERS_NO_ARCH=tvos
@@ -498,6 +494,7 @@ endif
 
 ifdef INCLUDE_MACCATALYST
 DOTNET_PLATFORMS+=MacCatalyst
+DOTNET_CORECLR_PLATFORMS+=MacCatalyst
 DOTNET_MONOVM_PLATFORMS+=MacCatalyst
 DOTNET_NATIVEAOT_PLATFORMS+=MacCatalyst
 DOTNET_MACCATALYST_RUNTIME_IDENTIFIERS_NO_ARCH=maccatalyst

Make.versions

@@ -28,10 +28,10 @@ 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.
-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
+IOS_TARGET_PLATFORM_VERSION_LIBRARY=26.2
+TVOS_TARGET_PLATFORM_VERSION_LIBRARY=26.2
+MACOS_TARGET_PLATFORM_VERSION_LIBRARY=26.2
+MACCATALYST_TARGET_PLATFORM_VERSION_LIBRARY=26.2
 
 # 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
@@ -110,21 +110,16 @@ SUPPORTED_API_VERSIONS_MACCATALYST=$(DOTNET_TFM)-$(MACCATALYST_NUGET_OS_VERSION)
 
 # Add older versions here!
 
-SUPPORTED_API_VERSIONS_IOS+=net9.0-18.0
-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-26.2
-SUPPORTED_API_VERSIONS_TVOS+=net9.0-26.2
-SUPPORTED_API_VERSIONS_MACOS+=net9.0-26.2
-SUPPORTED_API_VERSIONS_MACCATALYST+=net9.0-26.2
-
 SUPPORTED_API_VERSIONS_IOS+=net10.0-26.0
 SUPPORTED_API_VERSIONS_TVOS+=net10.0-26.0
 SUPPORTED_API_VERSIONS_MACOS+=net10.0-26.0
 SUPPORTED_API_VERSIONS_MACCATALYST+=net10.0-26.0
 
+SUPPORTED_API_VERSIONS_IOS+=net10.0-26.2
+SUPPORTED_API_VERSIONS_TVOS+=net10.0-26.2
+SUPPORTED_API_VERSIONS_MACOS+=net10.0-26.2
+SUPPORTED_API_VERSIONS_MACCATALYST+=net10.0-26.2
+
 # Add beta versions here!
 
 # Don't change these (even if there aren't any beta versions)!

NuGet.config

@@ -9,10 +9,9 @@
   <packageSources>
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
-    <!--  Begin: Package sources from dotnet-dotnet -->
-    <!--  End: Package sources from dotnet-dotnet -->
     <!--  Begin: Package sources from dotnet-macios -->
     <add key="darc-pub-dotnet-macios-b34b8d3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-b34b8d33/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-macios-5797627" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-57976277/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-macios -->
     <!--  Begin: Package sources from xamarin-xamarin-macios -->
     <!--  End: Package sources from xamarin-xamarin-macios -->
@@ -26,27 +25,13 @@
     <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" protocolVersion="3" />
     <add key="Dotnet arcade" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
     <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
-    <add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
     <add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
-    <add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
+    <add key="dotnet11" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet11/nuget/v3/index.json" />
     <add key="dotnet10-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" />
+    <add key="dotnet11-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet11-transport/nuget/v3/index.json" />
     <add key="macios-dependencies" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/macios-dependencies/nuget/v3/index.json" />
     <add key="xamarin-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/xamarin-impl/nuget/v3/index.json" />
     <add key="local-tests-feed" value="tests/.nuget/packages" />
-    <!-- Add a 8.0.22 feed -->
-    <add key="darc-pub-dotnet-runtime-ad2d4fbc" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-ad2d4fbc/nuget/v3/index.json" />
-    <!-- Add a 8.0.23 feed -->
-    <add key="darc-pub-dotnet-runtime-891f8976" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-891f8976/nuget/v3/index.json" />
-    <!-- Add a 8.0.24 feed -->
-    <add key="darc-pub-dotnet-runtime-b43df221" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-b43df221/nuget/v3/index.json" />
-    <!-- Add a 9.0.11 feed -->
-    <add key="darc-pub-dotnet-runtime-35fe9c61" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-35fe9c61/nuget/v3/index.json" />
-    <!-- Add a 9.0.12 feed -->
-    <add key="darc-pub-dotnet-runtime-9c2fb4b7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-9c2fb4b7/nuget/v3/index.json" />
-    <!-- Add a 9.0.13 feed -->
-    <add key="darc-pub-dotnet-runtime-7dd1559a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-7dd1559a/nuget/v3/index.json" />
-    <!-- Add a 9.0.14 feed -->
-    <add key="darc-pub-dotnet-runtime-4a27bd0a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-4a27bd0a/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />

builds/Versions-MacCatalyst.plist.in

@@ -8,12 +8,6 @@
 	<dict>
 		<key>MacCatalyst</key>
 		<array>
-			<string>15.0</string>
-			<string>15.2</string>
-			<string>15.4</string>
-			<string>16.1</string>
-			<string>16.2</string>
-			<string>16.4</string>
 			<string>17.0</string>
 			<string>17.2</string>
 			<string>17.4</string>

builds/Versions-iOS.plist.in

@@ -8,9 +8,6 @@
 	<dict>
 		<key>iOS</key>
 		<array>
-			<string>12.2</string>
-			<string>12.3</string>
-			<string>12.4</string>
 			<string>13.0</string>
 			<string>13.1</string>
 			<string>13.2</string>

builds/Versions-macOS.plist.in

@@ -8,12 +8,6 @@
 	<dict>
 		<key>macOS</key>
 		<array>
-			<string>12.0</string>
-			<string>12.1</string>
-			<string>12.3</string>
-			<string>13.0</string>
-			<string>13.1</string>
-			<string>13.3</string>
 			<string>14.0</string>
 			<string>14.2</string>
 			<string>14.4</string>

builds/Versions-tvOS.plist.in

@@ -8,9 +8,6 @@
 	<dict>
 		<key>tvOS</key>
 		<array>
-			<string>12.2</string>
-			<string>12.3</string>
-			<string>12.4</string>
 			<string>13.0</string>
 			<string>13.2</string>
 			<string>13.3</string>

docs/building-apps/build-properties.md

@@ -275,6 +275,27 @@ By default we require a provisioning profile if:
 
 Setting this property to `true` or `false` will override the default logic.
 
+## ComputeInstructionSetForReadyToRun
+
+Controls whether to automatically compute and pass the instruction set to the ReadyToRun (R2R) compiler based on the deployment target.
+
+When `PublishReadyToRun` is `true`, the build system automatically computes the minimum CPU instruction set required based on:
+* The `SupportedOSPlatformVersion` (minimum OS version the app supports)
+* The `RuntimeIdentifier` (target architecture and platform)
+
+This computed instruction set is then passed to crossgen2 via the `--instruction-set` argument, enabling the R2R compiler to generate optimized native code using appropriate CPU instructions.
+
+Set this property to `false` to disable automatic instruction set computation and use crossgen2's default behavior.
+
+Default: `true`
+
+Example:
+```xml
+<PropertyGroup>
+  <ComputeInstructionSetForReadyToRun>false</ComputeInstructionSetForReadyToRun>
+</PropertyGroup>
+```
+
 ## CompressBindingResourcePackage
 
 The native references in a binding projects are copied to the output directory during the build process, next to the binding assembly (into something we call a "binding resource package").
@@ -1335,6 +1356,12 @@ See [TrimMode](/dotnet/core/deploying/trimming/trimming-options) for a bit more
 > to `false` - to disable trimming, set `TrimMode=copy` instead (a build error
 > will be raised if `PublishTrimmed` is set to `false`).
 
+> [!NOTE]
+> Due to [a known issue](https://github.com/dotnet/runtime/issues/108269), setting `PublishTrimmed`
+> to `true` may cause confusing problems, so the build will report an error if this
+> is detected (the solution is to not set `PublishTrimmed` at all).
+
+
 The `TrimMode` property is equivalent to the existing
 [MtouchLink](#mtouchlink) (for iOS, tvOS and Mac Catalyst) and
 [LinkMode](#linkmode) (for macOS) properties, but the valid properties values

dotnet/Makefile

@@ -36,6 +36,7 @@ $(1)_NUGET_TARGETS = \
 	$(DOTNET_DESTDIR)/$($(1)_NUGET_SDK_NAME)/targets/Microsoft.Sdk.Desktop.targets \
 	$(DOTNET_DESTDIR)/$($(1)_NUGET_SDK_NAME)/targets/Microsoft.Sdk.Eol.targets \
 	$(DOTNET_DESTDIR)/$($(1)_NUGET_SDK_NAME)/targets/Microsoft.Sdk.Mobile.targets \
+	$(DOTNET_DESTDIR)/$($(1)_NUGET_SDK_NAME)/targets/Microsoft.Sdk.R2R.targets \
 	$(DOTNET_DESTDIR)/$($(1)_NUGET_SDK_NAME)/targets/Xamarin.Shared.Sdk.DefaultItems.targets \
 	$(DOTNET_DESTDIR)/$($(1)_NUGET_SDK_NAME)/targets/Xamarin.Shared.Sdk.Publish.targets \
 	$(DOTNET_DESTDIR)/$($(1)_NUGET_SDK_NAME)/targets/Xamarin.Shared.Sdk.TargetFrameworkInference.props \