[net11.0] Merge main into net11.0.

.github/ISSUE_TEMPLATE/config.yml

@@ -4,11 +4,11 @@ contact_links:
     url: https://github.com/dotnet/maui/issues/new/choose
     about: Issues with MAUI
   - name: "⚙ Bug report or feature request for Visual Studio (for Windows)"
-    url: https://learn.microsoft.com/en-us/visualstudio/ide/how-to-report-a-problem-with-visual-studio?view=vs-2022
+    url: https://learn.microsoft.com/visualstudio/ide/how-to-report-a-problem-with-visual-studio
     about: Use Visual Studio's Report a Problem feature for issues and suggestions with Visual Studio tooling. This includes problems with connecting to remote Macs from Visual Studio.
   - name: "⚙ VSCode"
     url: https://github.com/microsoft/vscode-dotnettools/issues
     about: Issues with VSCode.
   - name: "🙋‍♀️ Community Support"
-    url: https://learn.microsoft.com/en-us/answers/products/97/dotnet/
+    url: https://learn.microsoft.com/answers/products/97/dotnet/
     about: For issues that likely aren't bugs, Microsoft Q&A is a good place to ask for help.

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_18.5/18.5.9199
-STABLE_NUGET_VERSION_tvOS=net9.0_18.5/18.5.9199
-STABLE_NUGET_VERSION_MacCatalyst=net9.0_18.5/18.5.9199
-STABLE_NUGET_VERSION_macOS=net9.0_15.5/15.5.9199
+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
 
 PACKAGE_HEAD_REV=$(shell git rev-parse HEAD)
 
@@ -282,6 +282,9 @@ INCLUDE_MAC=1
 INCLUDE_TVOS=1
 INCLUDE_MACCATALYST=1
 
+INCLUDE_SIMULATOR=1
+INCLUDE_DEVICE=1
+
 -include $(TOP)/Make.config.local
 -include $(TOP)/configure.inc
 
@@ -428,52 +431,64 @@ DOTNET_MACCATALYST_ASSEMBLY_NAME=Microsoft.MacCatalyst
 DOTNET_MACOS_ASSEMBLY_NAME=Microsoft.macOS
 
 DOTNET_PLATFORMS=
+
 ifdef INCLUDE_IOS
 DOTNET_PLATFORMS+=iOS
 DOTNET_MONOVM_PLATFORMS+=iOS
-DOTNET_IOS_BITNESSES+=64
 DOTNET_NATIVEAOT_PLATFORMS+=iOS
-XCFRAMEWORK_PLATFORMS+=iossimulator
-XCFRAMEWORK_iOS_PLATFORMS+=iossimulator
-XCFRAMEWORK_iossimulator_RUNTIME_IDENTIFIERS=iossimulator-x64 iossimulator-arm64
 DOTNET_IOS_RUNTIME_IDENTIFIERS_NO_ARCH=ios
 
-# 64-bit architectures
-DOTNET_IOS_RUNTIME_IDENTIFIERS_64=ios-arm64
-XCFRAMEWORK_PLATFORMS+=ios
+ifdef INCLUDE_SIMULATOR
+DOTNET_IOS_RUNTIME_IDENTIFIERS_SIMULATOR+=iossimulator-x64 iossimulator-arm64
+XCFRAMEWORK_iOS_PLATFORMS+=iossimulator
+XCFRAMEWORK_iossimulator_RUNTIME_IDENTIFIERS+=$(DOTNET_IOS_RUNTIME_IDENTIFIERS_SIMULATOR)
+DOTNET_IOS_RUNTIME_IDENTIFIERS+=$(DOTNET_IOS_RUNTIME_IDENTIFIERS_SIMULATOR)
+DOTNET_iOS_SDK_PLATFORMS+=iphonesimulator
+endif # INCLUDE_SIMULATOR
+
+ifdef INCLUDE_DEVICE
+DOTNET_IOS_RUNTIME_IDENTIFIERS_DEVICE+=ios-arm64
 XCFRAMEWORK_iOS_PLATFORMS+=ios
-XCFRAMEWORK_ios_RUNTIME_IDENTIFIERS=ios-arm64
-DOTNET_IOS_RUNTIME_IDENTIFIERS_64+=iossimulator-x64 iossimulator-arm64
+XCFRAMEWORK_ios_RUNTIME_IDENTIFIERS+=$(DOTNET_IOS_RUNTIME_IDENTIFIERS_DEVICE)
+DOTNET_IOS_RUNTIME_IDENTIFIERS+=$(DOTNET_IOS_RUNTIME_IDENTIFIERS_DEVICE)
+DOTNET_iOS_SDK_PLATFORMS+=iphoneos
+endif # INCLUDE_DEVICE
 
-# All of them
-DOTNET_IOS_RUNTIME_IDENTIFIERS=$(DOTNET_IOS_RUNTIME_IDENTIFIERS_32) $(DOTNET_IOS_RUNTIME_IDENTIFIERS_64)
+XCFRAMEWORK_PLATFORMS+=$(XCFRAMEWORK_iOS_PLATFORMS)
 endif # INCLUDE_IOS
 
 ifdef INCLUDE_TVOS
 DOTNET_PLATFORMS+=tvOS
 DOTNET_MONOVM_PLATFORMS+=tvOS
-DOTNET_TVOS_BITNESSES+=64
 DOTNET_NATIVEAOT_PLATFORMS+=tvOS
-XCFRAMEWORK_PLATFORMS+=tvossimulator
+DOTNET_TVOS_RUNTIME_IDENTIFIERS_NO_ARCH=tvos
+
+ifdef INCLUDE_SIMULATOR
+DOTNET_TVOS_RUNTIME_IDENTIFIERS_SIMULATOR+=tvossimulator-x64 tvossimulator-arm64
 XCFRAMEWORK_tvOS_PLATFORMS+=tvossimulator
-XCFRAMEWORK_tvossimulator_RUNTIME_IDENTIFIERS=tvossimulator-x64 tvossimulator-arm64
+XCFRAMEWORK_tvossimulator_RUNTIME_IDENTIFIERS=$(DOTNET_TVOS_RUNTIME_IDENTIFIERS_SIMULATOR)
+DOTNET_TVOS_RUNTIME_IDENTIFIERS+=$(DOTNET_TVOS_RUNTIME_IDENTIFIERS_SIMULATOR)
+DOTNET_tvOS_SDK_PLATFORMS+=tvsimulator
+endif # INCLUDE_SIMULATOR
 
-DOTNET_TVOS_RUNTIME_IDENTIFIERS_NO_ARCH=tvos
-DOTNET_TVOS_RUNTIME_IDENTIFIERS=tvos-arm64 tvossimulator-x64 tvossimulator-arm64
-XCFRAMEWORK_PLATFORMS+=tvos
+ifdef INCLUDE_DEVICE
+DOTNET_TVOS_RUNTIME_IDENTIFIERS_DEVICE+=tvos-arm64
 XCFRAMEWORK_tvOS_PLATFORMS+=tvos
-XCFRAMEWORK_tvos_RUNTIME_IDENTIFIERS=tvos-arm64
-DOTNET_TVOS_RUNTIME_IDENTIFIERS_64+=$(DOTNET_TVOS_RUNTIME_IDENTIFIERS)
+XCFRAMEWORK_tvos_RUNTIME_IDENTIFIERS=$(DOTNET_TVOS_RUNTIME_IDENTIFIERS_DEVICE)
+DOTNET_TVOS_RUNTIME_IDENTIFIERS+=$(DOTNET_TVOS_RUNTIME_IDENTIFIERS_DEVICE)
+DOTNET_tvOS_SDK_PLATFORMS+=tvos
+endif
+
+XCFRAMEWORK_PLATFORMS+=$(XCFRAMEWORK_tvOS_PLATFORMS)
 endif
 
 ifdef INCLUDE_MACCATALYST
 DOTNET_PLATFORMS+=MacCatalyst
 DOTNET_MONOVM_PLATFORMS+=MacCatalyst
-DOTNET_MACCATALYST_BITNESSES+=64
 DOTNET_NATIVEAOT_PLATFORMS+=MacCatalyst
 DOTNET_MACCATALYST_RUNTIME_IDENTIFIERS_NO_ARCH=maccatalyst
 DOTNET_MACCATALYST_RUNTIME_IDENTIFIERS=maccatalyst-x64 maccatalyst-arm64
-DOTNET_MACCATALYST_RUNTIME_IDENTIFIERS_64+=$(DOTNET_MACCATALYST_RUNTIME_IDENTIFIERS)
+DOTNET_MacCatalyst_SDK_PLATFORMS+=maccatalyst
 XCFRAMEWORK_PLATFORMS+=maccatalyst
 XCFRAMEWORK_MacCatalyst_PLATFORMS+=maccatalyst
 XCFRAMEWORK_DESKTOP_PLATFORMS+=maccatalyst
@@ -483,11 +498,10 @@ endif
 ifdef INCLUDE_MAC
 DOTNET_PLATFORMS+=macOS
 DOTNET_CORECLR_PLATFORMS+=macOS
-DOTNET_MACOS_BITNESSES+=64
 DOTNET_NATIVEAOT_PLATFORMS+=macOS
 DOTNET_MACOS_RUNTIME_IDENTIFIERS_NO_ARCH=osx
 DOTNET_MACOS_RUNTIME_IDENTIFIERS=osx-x64 osx-arm64
-DOTNET_MACOS_RUNTIME_IDENTIFIERS_64=$(DOTNET_MACOS_RUNTIME_IDENTIFIERS)
+DOTNET_macOS_SDK_PLATFORMS+=mac
 XCFRAMEWORK_PLATFORMS+=macos
 XCFRAMEWORK_macOS_PLATFORMS+=macos
 XCFRAMEWORK_DESKTOP_PLATFORMS+=macos
@@ -546,11 +560,6 @@ DOTNET_osx-arm64_SDK_PLATFORM=mac
 DOTNET_maccatalyst-x64_SDK_PLATFORM=maccatalyst
 DOTNET_maccatalyst-arm64_SDK_PLATFORM=maccatalyst
 
-DOTNET_iOS_SDK_PLATFORMS=iphonesimulator iphoneos
-DOTNET_tvOS_SDK_PLATFORMS=tvsimulator tvos
-DOTNET_macOS_SDK_PLATFORMS=mac
-DOTNET_MacCatalyst_SDK_PLATFORMS=maccatalyst
-
 # XCFRAMEWORK_PLATFORM -> PLATFORM
 DOTNET_iossimulator_PLATFORM=ios
 DOTNET_ios_PLATFORM=ios

configure

@@ -126,6 +126,14 @@ while test "x$1" != x; do
         echo "DOTNET_RUNTIME_PATH=$2" >> "$CONFIGURED_FILE"
         shift 2
         ;;
+    --disable-device)
+        echo "ENABLE_DEVICE=" >> "$CONFIGURED_FILE"
+        shift
+        ;;
+    --disable-simulator)
+        echo "ENABLE_SIMULATOR=" >> "$CONFIGURED_FILE"
+        shift
+        ;;
     --ignore-unknown-params)
         echo "ignoring unknown parameters"
         IGNORE_UNKNOWN_PARAMS=true

docs/ReleaseCheckList.md

@@ -4,27 +4,25 @@ This is a checklist for what to do for every release.
 
 Copy this list into a new issue and then check off as the release progresses.
 
-# (release version)
+# ✅ Checklist 
+
+## Xcode X.Y
 
 * [ ] Create new milestone in GitHub.
 * [ ] Create a new issue with a copy of this list, assign it to the milestone.
+
+### Beta 1
 
-## (for each Xcode beta/rc/stable release; copy this section as many times as needed for each Xcode version)
-
-* [ ] Update binding status in wiki.
-* [ ] Create a new `xcodeX[.Y]` branch (only for the first Xcode bump) - this needs deciding where to branch from (which is outside the scope of this document). Push this branch to `origin` with no changes.
+* [ ] Update binding status in wiki (read instructions in the Makefile in the wiki's git repository)
+* [ ] Create a new `xcodeX[.Y]` branch - this needs deciding where to branch from (which is outside the scope of this document). Push this branch to `origin` with no changes.
 * [ ] Create PR with an Xcode bump.
-  * Update the following values in `Make.versions` (only for the first Xcode bump):
-    * \*_NUGET_OS_VERSION
+  * Update the following values in `Make.versions`:
+    * \*_NUGET\_OS\_VERSION
   * Update the following values in `Make.config`:
-    * XCODE_VERSION
-    * XCODE_URL
-    * XCODE_DEVELOPER_ROOT
+    * XCODE\_VERSION
+    * XCODE\_URL
+    * XCODE\_DEVELOPER\_ROOT
   * 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
-    $ 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.
   * Run the following tests locally, and fix any issues (these are the ones that typically fail in Xcode bumps, but there may be other failing tests as well - CI will report any such failures once the PR is created):
@@ -33,10 +31,23 @@ Copy this list into a new issue and then check off as the release progresses.
     * introspection
     * cecil
     * bgen
+* [ ] Bind APIs!
+
+### Beta X
+
+* [ ] Update binding status in wiki.
+* [ ] Create PR with an Xcode bump.
+  * Build and fix any issues.
+  * Run the following tests locally, and fix any issues (these are the ones that typically fail in Xcode bumps, but there may be other failing tests as well - CI will report any such failures once the PR is created):
+    * xtro
+    * monotouch-test
+    * introspection
+    * cecil
+    * bgen
 * [ ] Update any existing API bindings PRs if needed.
 * [ ] Bind APIs!
 
-## Pre-release process
+### Pre-release process
 
 This happens after the stable version of Xcode has been released and the `xcodeX[.Y]` branch has been updated according to the previous section(s).
 

docs/os-onboarding.md

@@ -0,0 +1,37 @@
+# Onboarding Guide for New Operating System Versions
+
+Adding support for new operating systems versions is a frequent need. This guide describes how we do that, including the policies we use.
+
+TLDR: [ReleaseCheckList.md](ReleaseCheckList.md)
+
+## Context
+
+There are multiple sides to adding support for new OS versions:
+
+* Make sure existing products / code continue to work.
+* Bind new APIs.
+
+### Making sure existing products continue to work
+
+This involves:
+
+1. Testing the current stable version(s) to see if everything still works. If something doesn't work anymore, we may consider backporting any fixes and release them in a service release before the new OS is released.
+2. Building and running tests using the new Xcode / OS.
+
+### Bind new APIs
+
+This is technically optional, because we can release support for a new OS version even if we bind any of the new APIs.
+
+Yet we try to bind most of new APIs, because it's hard to predict what users will need.
+
+However, for some frameworks that are rarely used and/or very complex to bind, we've decided to skip them. We file an issue for each such framework.
+
+## Removal of support for older OS versions
+
+We typically follow whatever the .NET runtime supports (we can't support anything lower than they do, and so far we've never had a reason to not support their lowest OS version).
+
+Typically we're rather conservative when removing support for older OS versions, however we have limited testing on older OS versions, in particular for mobile platforms.
+
+## References:
+
+* https://github.com/dotnet/runtime/blob/main/docs/project/os-onboarding.md

eng/Version.Details.props

@@ -31,7 +31,7 @@ This file should be imported by eng/Versions.props
     <MicrosoftmacOSSdknet90_150PackageVersion>15.0.9617</MicrosoftmacOSSdknet90_150PackageVersion>
     <MicrosofttvOSSdknet90_180PackageVersion>18.0.9617</MicrosofttvOSSdknet90_180PackageVersion>
     <!-- dotnet/xharness dependencies -->
-    <MicrosoftDotNetXHarnessiOSSharedPackageVersion>10.0.0-prerelease.25513.3</MicrosoftDotNetXHarnessiOSSharedPackageVersion>
+    <MicrosoftDotNetXHarnessiOSSharedPackageVersion>10.0.0-prerelease.25516.4</MicrosoftDotNetXHarnessiOSSharedPackageVersion>
   </PropertyGroup>
   <!--Property group for alternate package version names-->
   <PropertyGroup>

eng/Version.Details.xml

@@ -90,9 +90,9 @@
       <Uri>https://github.com/dotnet/dotnet</Uri>
       <Sha>f5afaa5ed1d15c5750ebc71a06e39611272e7eca</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.iOS.Shared" Version="10.0.0-prerelease.25513.3">
+    <Dependency Name="Microsoft.DotNet.XHarness.iOS.Shared" Version="10.0.0-prerelease.25516.4">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>47d2875bd1eacb26e5c4b06a5fe3fc15186e2ae4</Sha>
+      <Sha>88399512021dfa8b5f45d91f84c8ce6f0959b127</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25524.106">
       <Uri>https://github.com/dotnet/dotnet</Uri>

macios/Localize/loc/cs/macios/msbuild/Xamarin.Localization.MSBuild/MSBStrings.resx.lcl

@@ -2605,15 +2605,6 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";E7141" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The library {0} is a static library, and static libraries are not supported with Hot Restart. Set 'SkipStaticLibraryValidation=true' in the project file to ignore this error.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Knihovna {0} je statická knihovna a statické knihovny se při restartu za provozu nepodporují. Pokud chcete tuto chybu ignorovat, nastavte v souboru projektu SkipStaticLibraryValidation=true.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";E7142" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Unknown value for 'SkipStaticLibraryValidation': {0}. Valid values are: 'true', 'false', 'warn'.]]></Val>
@@ -2623,15 +2614,6 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";E7143" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
-        <Str Cat="Text">
-          <Val><![CDATA[The file {0} is an object file, and object files are not supported with Hot Restart. Set 'SkipStaticLibraryValidation=true' in the project file to ignore this error.]]></Val>
-          <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Soubor {0} je soubor objektu a soubory objektů nejsou při restartování za provozu podporovány. Pokud chcete tuto chybu ignorovat, nastavte v souboru projektu SkipStaticLibraryValidation=true.]]></Val>
-          </Tgt>
-        </Str>
-        <Disp Icon="Str" />
-      </Item>
       <Item ItemId=";E7145" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Can't process the native reference '{0}' on this platform because it is or contains a symlink.]]></Val>
@@ -2740,7 +2722,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";E7160" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";E7162" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Unable to execute this task remotely for unknown reasons. The build log may have more information.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -2749,7 +2731,7 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
-      <Item ItemId=";E7161" ItemType="0;.resx" PsrId="211" Leaf="true">
+      <Item ItemId=";E7163" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Unable to copy the inputs to this task to the remote build server for unknown reasons. The build log may have more information.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
@@ -3631,6 +3613,18 @@
         </Str>
         <Disp Icon="Str" />
       </Item>
+      <Item ItemId=";W7160" ItemType="0;.resx" PsrId="211" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Creating a compressed binding resource package to avoid MAX_PATH problems on Windows.]]></Val>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
+      <Item ItemId=";W7161" ItemType="0;.resx" PsrId="211" Leaf="true">
+        <Str Cat="Text">
+          <Val><![CDATA[Not creating a compressed binding resource package, because all the native references are already compressed.]]></Val>
+        </Str>
+        <Disp Icon="Str" />
+      </Item>
       <Item ItemId=";XcodeBuild_CreateNativeRef" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
         <Str Cat="Text">
           <Val><![CDATA[Adding reference to Xcode project output: '{0}'. The '%(CreateNativeReference)' metadata can be set to 'false' to opt out of this behavior.]]></Val>