[automated] Merge branch 'main' => 'net11.0'#24830
[automated] Merge branch 'main' => 'net11.0'#24830github-actions[bot] wants to merge 6 commits intonet11.0from
Conversation
…mittent SIGSEGV (#24814) After obj.GetHandle() extracts the native handle, the GC can finalize obj (a NativeObject, not protected by ObjC runtime reference tracking) before DangerousRetain executes. This causes a use-after-free when the finalizer calls CFRelease on the handle before it's been retained. Add GC.KeepAlive(obj) to ensure the managed wrapper survives until after the retain+autorelease has completed. This fixes intermittent SIGSEGV crashes in CGBitmapContext.CreateAdaptive tests (and potentially any other caller of RetainAndAutoreleaseHandle with NativeObject-derived types). --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Fixes #18098. (#24828) Sharpie's clang reports visionOS app extension availability as 'xros_app_extension', which was not handled in the GetPlatform() switch statement, causing an 'Unsupported clang availability platform' exception. This is the same class of bug as #18098. Add: - VisionOSAppExtension to the PlatformName enum - Handle 'xros_app_extension' and 'visionos_app_extension' strings in GetPlatform() - Test with all app extension availability platforms Fixes #18098. --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…24826) When the Xamarin.Localization.MSBuild project was changed to multi-target (netstandard2.0 + net10.0), both inner builds run in parallel and both try to generate MSBStrings.Designer.cs to the same path. One build may write the file while the other is compiling it, causing: CSC : error CS1504: Source file 'MSBStrings.Designer.cs' could not be opened -- Attempted to read past the end of the stream. Fix by directing StronglyTypedFileName to $(IntermediateOutputPath), which is per-TFM (obj/Debug/netstandard2.0/ vs obj/Debug/net10.0/), so each inner build generates its own copy without interfering with the other. --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Reset patterns: - global.json - NuGet.config - eng/Version.Details.xml - eng/Version.Details.props - eng/common/*
github-actions
bot
requested review from
emaf,
mauroa and
rolfbjarne
as code owners
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
✅ [CI Build #f08dae6] Build passed (Build packages) ✅Pipeline on Agent |
✅ [PR Build #f08dae6] Build passed (Detect API changes) ✅Pipeline on Agent |
🔥 [CI Build #f08dae6] Build failed (Build macOS tests) 🔥Build failed for the job 'Build macOS tests' (with job status 'Failed') Pipeline on Agent |
✅ 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 |
🔥 [CI Build #f08dae6] Test results 🔥Test results❌ Tests failed on VSTS: test results 3 tests crashed, 46 tests failed, 94 tests passed. Failures❌ dotnettests tests (MacCatalyst)1 tests failed, 0 tests passed.Failed tests
Html Report (VSDrops) Download ❌ dotnettests tests (macOS)1 tests failed, 0 tests passed.Failed tests
Html Report (VSDrops) Download ❌ monotouch tests (iOS)13 tests failed, 0 tests passed.Failed tests
|
2 participants
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.