[xcode26.4] Merge remote-tracking branch main into xcode26.4#24898
Merged
[xcode26.4] Merge remote-tracking branch main into xcode26.4#24898
Conversation
The create-makefile-fragment.sh script requires the DOTNET environment variable to be set. The previous BUILD_EXECUTABLE export was removed in 9cf7f59, but the replacement DOTNET export was not added, causing the Linux build to fail because the .csproj.inc file couldn't be generated, which meant ProductConstants.cs wasn't generated either. --------- 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**: [20260309.8](https://dev.azure.com/dnceng/internal/_build/results?buildId=2922172) ([305305](https://maestro.dot.net/channel/9626/github:dotnet:dotnet/build/305305)) - **Date Produced**: March 9, 2026 8:50:18 PM UTC - **Commit**: [8511f5b3494f6d7d052a8a302642da0f9aca356d](dotnet/dotnet@8511f5b) - **Branch**: [release/10.0.3xx](https://github.com/dotnet/dotnet/tree/release/10.0.3xx) - **Dependency Updates**: - From [10.0.0-beta.26153.116 to 10.0.0-beta.26159.108][3] - Microsoft.DotNet.Arcade.Sdk - Microsoft.DotNet.Build.Tasks.Feed - Microsoft.DotNet.SharedFramework.Sdk - From [10.0.300-preview.26153.116 to 10.0.300-preview.26159.108][3] - Microsoft.NET.Sdk - Microsoft.TemplateEngine.Authoring.Tasks [3]: dotnet/dotnet@cdfa384...8511f5b
…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.
When using `sharpie bind --header <file> --scope <dir>`, the --scope
argument was stored verbatim without path normalization. Since Clang
always reports declaration source locations as absolute paths, a
relative --scope value (e.g. `MyFramework.framework/Headers`) would
never match the absolute filename from `presumedLoc.FileName`, causing
IsInScope() to filter out every declaration and produce zero output
files — even though parsing succeeded.
Additionally, the StartsWith comparison in IsInScope() could produce
false positive matches when one directory name was a prefix of another
(e.g. scope `/tmp/scope` would incorrectly match files in
`/tmp/scopeextra/`).
~~Finally, when binding a very large number of Objective-C headers
(200+), ClangSharp can throw an ArgumentOutOfRangeException with
parameter name "handle" during AST traversal, due to cursor/type handle
misclassification in its managed wrapper layer. Sharpie caught this
exception but reported the raw, opaque message ("Specified argument was
out of the range of valid values"), giving users no guidance on how to
work around the issue.~~ -> Moved to
dotnet/ClangSharp#690
Changes:
1. Tools.cs: Normalize --scope paths to absolute via Path.GetFullPath()
when parsing CLI arguments, matching the behavior already used by
--framework mode (which calls Path.GetFullPath on SourceFramework in
ResolveFramework()).
2. ObjectiveCBinder.cs (IsInScope): Append a trailing directory
separator to scope directory paths before the StartsWith check, so that
`/tmp/scope/` does not falsely match `/tmp/scopeextra/`.
~~3. BindingResult.cs (ReportUnexpectedError): Detect the specific
ArgumentOutOfRangeException("handle") pattern from ClangSharp and report
an actionable error message that explains the root cause (translation
unit too complex) and suggests workarounds (bind fewer headers, use
--scope).~~
4. Tests: Added 5 new test cases:
- Scope_RelativePath: verifies relative --scope paths produce correct
output after normalization
- Scope_FiltersOutOfScopeDeclarations: verifies that only declarations
from in-scope headers are bound
- Scope_PrefixDoesNotFalseMatch: verifies that scope "/foo/bar" does not
match "/foo/barbaz/header.h"
- ~~HandleCrash_ReportsUsefulError: verifies the improved error message
for ClangSharp handle exceptions~~
- ~~HandleCrash_OtherExceptionsUnchanged: verifies that other exception
types still report their original message~~
---------
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
Collaborator
✅ [PR Build #72192d1] Build passed (Detect API changes) ✅Pipeline on Agent |
Collaborator
✅ API diff for current PR / commitNET (empty diffs)✅ API diff vs stableNET (empty diffs)ℹ️ Generator diffGenerator Diff: vsdrops (html) vsdrops (raw diff) gist (raw diff) - Please review changes) Pipeline on Agent |
Collaborator
✅ [CI Build #72192d1] Build passed (Build packages) ✅Pipeline on Agent |
rolfbjarne
approved these changes
Mar 16, 2026
Collaborator
✅ [CI Build #72192d1] Build passed (Build macOS tests) ✅Pipeline on Agent |
Collaborator
🔥 [CI Build #72192d1] Test results 🔥Test results❌ Tests failed on VSTS: test results 1 tests crashed, 0 tests failed, 155 tests passed. Failures❌ windows tests🔥 Failed catastrophically on VSTS: test results - windows (no summary found). Html Report (VSDrops) Download Successes✅ cecil: All 1 tests passed. Html Report (VSDrops) Download macOS tests✅ Tests on macOS Monterey (12): All 5 tests passed. Html Report (VSDrops) Download 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
3 participants
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.
No description provided.