[automated] Merge branch 'main' => 'net11.0'#25151
Merged
rolfbjarne merged 55 commits intonet11.0from Apr 24, 2026
Merged
Conversation
…en applying the [Preserve] attribute. (#25109) Create an xml descriptor file instead of manually marking when applying the [Preserve] attribute. I first tried using [DynamicDependency] attributes, but it turns out [DynamicDependency] attributes can't accurately express/replace [Preserve] semantics, so I went with an xml descriptor file instead. The [DynamicDependency] attribute code is still present, as an opt-in, because it was already there used for NativeAOT (even though we're always using the xml descriptor logic now, even for NativeAOT). This makes it easier to move this code out of a custom linker step in the future. Also move the removal of any [Preserve] attributes to the RemoveAttributes step. Contributes towards #17693.
…e simulator. Fixes #25112. (#25129) In the GetMlaunchArguments task, instead of repeating what the GetAvailableDevices task does, just run the GetAvailableDevices task and pass the resulting devices to the GetMlaunchArguments task. Then GetMlaunchArguments can just pick the first applicable one, which should work fine. Fixes #25112. --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Reset patterns: - global.json - NuGet.config - eng/Version.Details.xml - eng/Version.Details.props - eng/common/*
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.
rolfbjarne
approved these changes
Apr 15, 2026
#25150) xharness regressed detecting crashing tests as crashing (dotnet/xharness@a6f9fe6), so clone the TestReporter class and modify it to properly detect crashes and report them as such. --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
|
Azure Pipelines: 2 pipeline(s) require an authorized user to comment /azp run to run. |
…e hosts. (#25147) Pinging localhost doesn't work for me, so try pinging a few other hosts as well, and pass the test if any ping succeeds. Also add a timeout, so the entire test run doesn't fail if a ping blocks for some reason.
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.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
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**: [20260413.4](https://dev.azure.com/dnceng/internal/_build/results?buildId=2949726) ([310341](https://maestro.dot.net/channel/9626/github:dotnet:dotnet/build/310341)) - **Date Produced**: April 14, 2026 10:22:10 PM UTC - **Commit**: [2476be2e45bb47d8dd6604fac803cef03198f2a7](dotnet/dotnet@2476be2) - **Branch**: [release/10.0.3xx](https://github.com/dotnet/dotnet/tree/release/10.0.3xx) - **Dependency Updates**: - From [10.0.0-beta.26208.105 to 10.0.0-beta.26213.104][3] - Microsoft.DotNet.Arcade.Sdk - Microsoft.DotNet.Build.Tasks.Feed - Microsoft.DotNet.SharedFramework.Sdk - From [10.0.300-preview.0.26208.105 to 10.0.300-preview.0.26213.104][3] - Microsoft.NET.Sdk - From [10.0.300-preview.26208.105 to 10.0.300-preview.26213.104][3] - Microsoft.TemplateEngine.Authoring.Tasks [3]: dotnet/dotnet@b510aa8...2476be2
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**: [20260414.1](https://dev.azure.com/dnceng/internal/_build/results?buildId=2950778) ([310284](https://maestro.dot.net/channel/2/github:dotnet:xharness/build/310284)) - **Date Produced**: April 14, 2026 2:47:53 PM UTC - **Commit**: [84f48de9bd52fdee2a3b42e45e0b21b79413005e](dotnet/xharness@84f48de) - **Branch**: [main](https://github.com/dotnet/xharness/tree/main) - **Dependency Updates**: - From [11.0.0-prerelease.26204.1 to 11.0.0-prerelease.26214.1][1] - Microsoft.DotNet.XHarness.iOS.Shared [1]: dotnet/xharness@0668c80...84f48de
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.
…#25164) XML doc comment in `src/CoreSpotlight/CSEnums.cs` line 20 reads `An unknown error occured`. Fixed to `occurred`. Comment-only change. Signed-off-by: SAY-5 <SAY-5@users.noreply.github.com> Co-authored-by: SAY-5 <SAY-5@users.noreply.github.com>
This comment has been minimized.
This comment has been minimized.
Also remove the tests, they're not running and have bitrotted.
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.
…marking of NSObjects. (#25146) Add a new `MarkNSObjectsStep` step that runs before the mark stage in the trimmer, which uses `[DynamicDependency]` attributes to ensure `NSObject` subclasses aren't trimmed away when they shouldn't be. The logic is identical to the existing `MarkNSObjects` sub step, except `MarkNSObjects` directly marks APIs. The advantage is that the new step can easily be moved out of the trimmer (which will be done in a later stage). The new behavior is the default, but keep the old behavior behind an opt-out flag for now. Also update the preservation code to not handle "Xamarin.iOS.dll" or "Xamarin.Forms.Platform.iOS", since those assemblies aren't used anymore. This makes it easier to move this code out of a custom linker step in the future. There's one non-obvious part here: I had to move `Class.ValidateObjectPointers` to the `Runtime` class, because now the `Class` type's `IsBeforeFieldInit` flag is `false` (because otherwise the trimmer doesn't honor the `[DynamicDependency]` attributes we're now adding to the `Class`'s static cctor), and then the trimmer deems the static cctor as having side effects: https://github.com/dotnet/runtime/blob/16b9ae91f456c65ffcc5b28afc97034d828a19ad/src/tools/illink/src/linker/Linker.Steps/UnreachableBlocksOptimizer.cs#L268 and it refuses to inline anything: https://github.com/dotnet/runtime/blob/16b9ae91f456c65ffcc5b28afc97034d828a19ad/src/tools/illink/src/linker/Linker.Steps/UnreachableBlocksOptimizer.cs#L526-L529 Contributes towards #17693. --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
NSUrlSessionHandler was explicitly rejecting HTTP digest challenges by mapping NSURLAuthenticationMethodHTTPDigest to the internal reject sentinel. That meant iOS never answered digest auth challenges with configured credentials, while other supported auth schemes did. Handle digest challenges like other credential-backed auth methods so Credentials.GetCredential can return a NetworkCredential and the handler can respond with an NSUrlCredential. Add a System.Net.Http regression test covering successful and failed digest authentication, and add a shared httpbin helper for the digest auth endpoint. Recreated from #25179 (by @mandel-macaque) to not use a fork. --------- Co-authored-by: Manuel de la Pena <mandel@themacaque.com> Co-authored-by: Manuel de la Pena <mandel@microsoft.com>
This comment has been minimized.
This comment has been minimized.
Collaborator
🔥 [CI Build #14a851f] Test results 🔥Test results❌ Tests failed on VSTS: test results 0 tests crashed, 16 tests failed, 145 tests passed. Failures❌ monotouch tests (iOS) [attempt 2]15 tests failed, 0 tests passed.Failed tests
Html Report (VSDrops) Download ❌ windows tests [attempt 2]1 tests failed, 2 tests passed.Failed tests
Html Report (VSDrops) Download Successes✅ cecil: All 1 tests passed. Html Report (VSDrops) Download macOS tests✅ Tests on macOS Sonoma (14): All 5 tests passed. Html Report (VSDrops) Download Linux Build VerificationPipeline on Agent |
…25211) Without an explicit trigger section, Azure DevOps defaults to enabling CI triggers on all branches. This causes duplicate builds when a branch (e.g. darc-main-*) has an open PR — one from the implicit CI trigger and one from the PR trigger. Adding 'trigger: none' ensures only PR-triggered builds run. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…p. (#25210) This step has taken to hanging recently, and it'll hang until the job's timeout of 3 hours is hit, at which point it'll mark the entire job as failed. So add a timeout just for this step, so that it can timeout by itself, and then the job can finish successfully.
Create a Copilot skill that reviews PRs against conventions distilled from past reviews by senior maintainers (Sebastien, Rolf, Chris, Manuel, Alex). Covers: - Binding definitions (Export selectors, NullAllowed, platform attributes, naming conventions, protocol patterns, breaking change guards) - MSBuild tasks and targets (Required properties, incremental builds, SessionId for remote execution) - Nullable reference types (no null-forgiving operator, ThrowIfNull) - Formatting (Mono style with tabs, space before parens) - Memory management (GC.KeepAlive, Dispose patterns, SIMD marshalling) - Performance, security, testing, and AI-specific pitfalls Modelled after dotnet/android's reviewer skill with rules adapted for this repository's Apple platform binding patterns. --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* Remove code we don't use. * Enable nullability and fix any issues. --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…dler. (#25183) C# locks are re-entrant, so try to avoid re-entrancy issues by: * In `RemoveInflightData`: fetch and remove the inflight data in a single `Dictionary.Remove` call. This is also faster than doing two dictionary lookups. * In `Dispose`: collect all tasks to cancel and dispose first (inside the lock), and then we cancel and dispose after the lock. This hopefully fixes #20345 (this solution was tested by a customer and apparently worked). Might fix #20345.
…ssed. (#25236) This is a workaround for dotnet/msbuild#4056. Fixes https://devdiv.visualstudio.com/DevDiv/_workitems/edit/2903015.
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.
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.
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
4 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.
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.