[automated] Merge branch 'main' => 'net11.0'#24891
Open
github-actions[bot] wants to merge 9 commits intonet11.0from
Open
[automated] Merge branch 'main' => 'net11.0'#24891github-actions[bot] wants to merge 9 commits intonet11.0from
github-actions[bot] wants to merge 9 commits intonet11.0from
Conversation
…correct buffer size. (#24862) The hardcoded 512-byte rendering buffer was far too small for a 256x256 adaptive bitmap context. Replace with the correct size computed from the adaptive parameters (AlignedBytesPerRow * Height) to avoid SIGSEGV in CGBitmapContextCreateImage when it tries to read beyond the buffer. --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This pull request updates the following dependencies ## From https://github.com/dotnet/macios - **Subscription**: [c0371266-dd6f-4959-822b-decc72d2d668](https://maestro.dot.net/subscriptions?search=c0371266-dd6f-4959-822b-decc72d2d668) - **Build**: [20260304.10](https://dev.azure.com/devdiv/DevDiv/_build/results?buildId=13458877) ([304492](https://maestro.dot.net/channel/3884/github:dotnet:macios/build/304492)) - **Date Produced**: March 4, 2026 3:55:17 PM UTC - **Commit**: [b34b8d3](b34b8d3) - **Branch**: [release/9.0.1xx](https://github.com/dotnet/macios/tree/release/9.0.1xx) - **Dependency Updates**: - From [26.2.9001 to 26.2.9002][1] - Microsoft.iOS.Sdk.net9.0_26.2 - Microsoft.MacCatalyst.Sdk.net9.0_26.2 - Microsoft.macOS.Sdk.net9.0_26.2 - Microsoft.tvOS.Sdk.net9.0_26.2 [1]: 42038e1...b34b8d3
* Improve nullability annotations for EnumsFromHandle (return T[]? instead of T[]). * Add a NonNullEnumsFromHandle variant that guarantees a non-null return value. * Use Enum.ToObject instead of Convert.ChangeType, which doesn't support enum types. * Rewrite to use ArrayFromHandleDropNullElements/NonNullArrayFromHandleDropNullElements. * Update NEHotspotEapSettings.SupportedEapTypes to use NonNullEnumsFromHandle. * Add tests for NSArray.EnumsFromHandle and NEHotspotEapSettings.SupportedEapTypes. Contributes towards #17285. --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* Improve nullability annotations for FromArray<T> (accept NSArray?, return T[]?). * Add a ToNonNullArrayDropNullElements<T> variant that guarantees a non-null return value. * Add an ArrayFromHandleDropNullElements overload with NSNullBehavior parameter. * Rewrite FromArray<T> to use ArrayFromHandleDropNullElements. * Update UIFontDescriptor.CascadeList to use ToNonNullArrayDropNullElements. * Update bgen to append '!' for non-nullable wrapped array properties. * Fix MTKMesh.FromAsset to annotate sourceMeshes as MDLMesh[]?. * Add a test for MTKMesh.FromAsset. Contributes towards #17285. --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This pull request updates the following dependencies ## From https://github.com/dotnet/dotnet - **Subscription**: [30303172-6f12-44a9-887a-ea8520fce068](https://maestro.dot.net/subscriptions?search=30303172-6f12-44a9-887a-ea8520fce068) - **Build**: [20260310.13](https://dev.azure.com/dnceng/internal/_build/results?buildId=2923364) ([305561](https://maestro.dot.net/channel/9626/github:dotnet:dotnet/build/305561)) - **Date Produced**: March 11, 2026 12:08:50 AM UTC - **Commit**: [37ac471dd9cf9b9b784497fa71dcce9045eb1a78](dotnet/dotnet@37ac471) - **Branch**: [release/10.0.3xx](https://github.com/dotnet/dotnet/tree/release/10.0.3xx) - **Dependency Updates**: - From [10.0.0-beta.26159.108 to 10.0.0-beta.26160.113][1] - Microsoft.DotNet.Arcade.Sdk - Microsoft.DotNet.Build.Tasks.Feed - Microsoft.DotNet.SharedFramework.Sdk - From [10.0.300-preview.26159.108 to 10.0.300-preview.26160.113][1] - Microsoft.NET.Sdk - Microsoft.TemplateEngine.Authoring.Tasks [1]: dotnet/dotnet@8511f5b...37ac471
This pull request updates the following dependencies ## From https://github.com/dotnet/xharness - **Subscription**: [02e03784-16b3-4ced-b02a-3715797fc7da](https://maestro.dot.net/subscriptions?search=02e03784-16b3-4ced-b02a-3715797fc7da) - **Build**: [20260310.2](https://dev.azure.com/dnceng/internal/_build/results?buildId=2922976) ([305458](https://maestro.dot.net/channel/2/github:dotnet:xharness/build/305458)) - **Date Produced**: March 10, 2026 1:06:04 PM UTC - **Commit**: [c32a7777a0f8f7a4fc8d9920d445f5f4b5658d38](dotnet/xharness@c32a777) - **Branch**: [main](https://github.com/dotnet/xharness/tree/main) - **Dependency Updates**: - From [11.0.0-prerelease.26117.1 to 11.0.0-prerelease.26160.2][1] - Microsoft.DotNet.XHarness.iOS.Shared [1]: dotnet/xharness@0eeaa60...c32a777
This fixes the following problem: * We default the max simulator version to the SDK version of an OS (currently 26.2) * However, iOS/tvOS 26.3 exists, and that's the simulator 'xcodebuild -downloadPlatform' installs with Xcode 26.3. * The max simulator version is what we use in xharness to decide which simulator to run tests in. * The result is that xharness will try to use/create a simulator for iOS 26.2, but that might not be possible (unless said simulator was already installed from before the current build), because it wasn't provisioned.
Reset patterns: - global.json - NuGet.config - eng/Version.Details.xml - eng/Version.Details.props - eng/common/*
Collaborator
🔥 [CI Build #9814eb3] Build failed (Build packages) 🔥Build failed for the job 'Build packages' (with job status 'Failed') Pipeline on Agent |
Collaborator
🔥 [PR Build #9814eb3] Build failed (Detect API changes) 🔥Build failed for the job 'Detect API changes' (with job status 'Failed') Pipeline on Agent |
Collaborator
|
🔥 Unable to find the contents for the comment: D:\a\1\s\change-detection\results\gh-comment.md does not exist :fire Pipeline on Agent |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I detected changes in the main branch which have not been merged yet to net11.0. I'm a robot and am configured to help you automatically keep net11.0 up to date, so I've opened this PR.
This PR merges commits made on main by the following committers:
Instructions for merging from UI
This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.
If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.
Instructions for merging via command line
Run these commands to merge this pull request from the command line.
or if you are using SSH
After PR checks are complete push the branch
Instructions for resolving conflicts
Instructions for updating this pull request
Contributors to this repo have permission update this pull request by pushing to the branch 'merge/main-to-net11.0'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote.
or if you are using SSH
Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.