[automated] Merge branch 'main' => 'net11.0'#25331
Open
github-actions[bot] wants to merge 41 commits intonet11.0from
Open
[automated] Merge branch 'main' => 'net11.0'#25331github-actions[bot] wants to merge 41 commits intonet11.0from
github-actions[bot] wants to merge 41 commits intonet11.0from
Conversation
…25234) This simplifies the code, since we only have a single property as the source of truth whether we're building for the simulator or not. --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…1: Build ID 14005679 (#25305) This is the pull request automatically created by the OneLocBuild task in the build process to check-in localized files generated based upon translation source files (.lcl files) handed-back from the downstream localization pipeline. If there are issues in translations, visit https://aka.ms/icxLocBug and log bugs for fixes. The OneLocBuild wiki is https://aka.ms/onelocbuild and the localization process in general is documented at https://aka.ms/AllAboutLoc.
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**: [20260430.4](https://dev.azure.com/dnceng/internal/_build/results?buildId=2964906) ([312724](https://maestro.dot.net/channel/2/github:dotnet:xharness/build/312724)) - **Date Produced**: May 1, 2026 7:05:11 AM UTC - **Commit**: [92962e5c46ac08a66ded4c5696209cc60f1a232f](dotnet/xharness@92962e5) - **Branch**: [main](https://github.com/dotnet/xharness/tree/main) - **Dependency Updates**: - From [11.0.0-prerelease.26224.1 to 11.0.0-prerelease.26230.4][2] - Microsoft.DotNet.XHarness.iOS.Shared [2]: dotnet/xharness@888ef3e...92962e5
…y. (#25307) It's not necessary to run it on every push to main (which will usually fail if the PR branch was modified, which we always do).
The activation job in the `macios-reviewer` workflow was missing `pull-requests: write` permission, causing the 'Add eyes reaction for immediate feedback' step to fail with a 403 when triggered by `/review` on a PR comment. This was a known gh-aw bug ([github/gh-aw#28767](github/gh-aw#28767)), fixed in v0.71.2 via [github/gh-aw#28854](github/gh-aw#28854). This PR recompiles the lock file with gh-aw v0.71.2, which adds `pull-requests: write` to the activation job. 🤖 Pull request created by Copilot --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…uts in CI (#25302) Wrap the Tls12 test body in a try/catch that calls TestRuntime.IgnoreInCIIfBadNetwork to mark the test as ignored (rather than failed) when transient network issues occur in CI. Also extend IgnoreInCIIfTimedOut to handle SocketException timeouts, not just WebException timeouts, so that the SocketException thrown by TcpClient is properly recognized. Fixes #25241 --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…20260505064756191 to main (#25325) LEGO: Pull request from lego/hb_5df43909-4a19-4f55-bc3f-9ea8fccf3c82_20260505064756191 to main with localized lcls
…elpers (#25268) Multiple XML loading helpers use `DtdProcessing.Parse`, which enables inline DTD processing and opens a vector for entity expansion DoS ("billion laughs"). While `XmlResolver = null` prevents external entity resolution, inline DTDs are still processed. Apple plist files declare a DTD but don't depend on DTD processing for correctness. This PR changes `DtdProcessing.Parse` to `DtdProcessing.Prohibit` in all affected locations: - `tools/common/PListExtensions.cs` — 2 occurrences (file and string overloads) - `src/bgen/Extensions/ExtensionMethods.cs` — 1 occurrence - `tests/cecil-tests/Helper.cs` — 1 occurrence - `tests/mtouch/MTouch.cs` — 1 occurrence - `tests/common/ProductTests.cs` — 1 occurrence 🤖 Pull request created by Copilot --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…html report publish fails. (#25233) When the "Publish to Artifact Services Drop" step times out or fails, the VSDrops link in the GitHub comment would point to a non-existent page. Now detect the failure by setting an output variable when the step does not succeed, and show "(Publish failed)" in plain text instead of a broken link. --------- 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/*
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.
… later .NET versions). (#25327)
Fixes the following problem: 1. We compile the api definition, and csc resolves the `cref="Mount"` reference to `cref="M:FSKit.FSVolumeOperations.Mount(FSKit.FSTaskOptions,FSKit.FSVolumeOperationsMountHandler)"` 2. We run the generator, and copy the xml docs from the compiled api definition, which is `cref="M:FSKit.FSVolumeOperations.Mount(FSKit.FSTaskOptions,FSKit.FSVolumeOperationsMountHandler)"` 3. The actual type name is `IFSVolumeOperations` (because the type is a protocol), which means the cref is now pointing to somewhere that doesn't exist. Fix this by specifying the complete reference in the api definition's xml comment, which csc won't process, and just copy as-is.
This comment has been minimized.
This comment has been minimized.
rolfbjarne
approved these changes
May 5, 2026
- Update old Apple documentation URLs to modern developer.apple.com/documentation/ format in src/ C# files and docs/api/ XML files - Remove dead Xamarin links (developer.xamarin.com, docs.xamarin.com) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This comment has been minimized.
This comment has been minimized.
… step (#24888) Add a new custom linker step that replaces runtime `Dlfcn.dlsym` calls with direct native symbol lookups via P/Invokes to `__Internal`. This improves startup performance and app size, and ensures the native linker can see symbol references that would otherwise only be resolved at runtime. Two modes are supported, controlled by the `InlineDlfcnMethods` MSBuild property: * `strict`: inlines all calls to `ObjCRuntime.Dlfcn` APIs. * `compatibility`: only inlines calls that reference symbols from `[Field]` attributes. Post-trimming MSBuild targets ensure native code is only generated for symbols that survive trimming (ILTrim or NativeAOT): * `_CollectPostILTrimInformation`: scans trimmed assemblies for surviving inlined dlfcn P/Invokes, with per-assembly caching for incremental builds. * `_CollectPostNativeAOTTrimInformation`: reads unresolved symbols from the NativeAOT object file or static library and filters for inlined dlfcn symbols. * `_PostTrimmingProcessing`: generates native C code for surviving symbols and adds it to the native link inputs. Extends `MachO.cs` with LC_SYMTAB parsing to read unresolved symbols from both Mach-O object files and static libraries. Contributes towards #17693. --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Introduce two new MSBuild properties to simplify platform checks in the build system: - **`SdkIsDesktop`**: `true` when building for macOS or Mac Catalyst. Replaces `'$(_PlatformName)' == 'macOS' Or '$(_PlatformName)' == 'MacCatalyst'` checks. - **`SdkIsMobile`**: `true` when building for iOS or tvOS. Replaces `'$(_PlatformName)' == 'iOS' Or '$(_PlatformName)' == 'tvOS'` checks. These complement the existing `SdkIsSimulator` and `SdkIsDevice` properties (from #25234). The `SdkIsDevice` definition was also updated to use `SdkIsMobile` instead of raw platform checks. ### Deliberately not updated - Patterns that also include `watchOS` (bundle structure paths, PkgInfo, etc.) - `DynamicCodeSupport` (also includes MacCatalyst alongside iOS/tvOS) - `ComputeRegistrarConstant.targets` (uses `TargetFramework.EndsWith()` patterns) - Linker/introspection test `.csproj` files (also check tvOS separately) - `_LibMonoLinkMode`/`_LibXamarinLinkMode` (check macOS and MacCatalyst with distinct behavior) Both properties are documented in `docs/building-apps/build-properties.md`. 🤖 Pull request created by Copilot --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…entitlements (#25332) Add the com.apple.developer.payment-pass-provisioning entitlement to the known entitlements list so that validation properly reports a warning/error when an app requests this entitlement but the provisioning profile doesn't grant it. Previously this was an unknown entitlement that only logged a low-importance message, causing silent install failures on device. Also add tests verifying the error, warning, and disable modes for this entitlement validation scenario. Fixes #25306 --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Adds a new agentic workflow (`code-radiator`) that merges `main` into active target branches daily at midnight UTC.
**Target branches:** `net[0-9]*.0`, `xcode[0-9]*`, `xcode[0-9]*.[0-9]*` (with activity in the last 30 days).
**Features:**
- Creates or updates merge PRs for each active target branch
- Resolves `eng/Version.Details.{props,xml}` conflicts by picking highest versions
- Resolves `NuGet.config` conflicts by including feeds from both branches
- Excludes conflicting `tests/dotnet/UnitTests/expected/*` files from merge commits
- Merges target branch into PR branch first to pick up new target commits
- For other conflicts: resolves best-effort, adds `do-not-merge` label and requests human review
- Enables automerge for clean merges; skips draft PRs with a comment
🤖 Pull request created by Copilot
---------
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Also these enums are only available for arm64.
…rimmed. (#25354) This is not the default in .NET 11 (it is in .NET 10), so make it explicit.
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.
…1: Build ID 14036358 (#25356) This is the pull request automatically created by the OneLocBuild task in the build process to check-in localized files generated based upon translation source files (.lcl files) handed-back from the downstream localization pipeline. If there are issues in translations, visit https://aka.ms/icxLocBug and log bugs for fixes. The OneLocBuild wiki is https://aka.ms/onelocbuild and the localization process in general is documented at https://aka.ms/AllAboutLoc.
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.
Collaborator
🔥 [CI Build #a9faacb] Test results 🔥Test results❌ Tests failed on VSTS: test results 1 tests crashed, 22 tests failed, 162 tests passed. Failures❌ monotouch tests (iOS)22 tests failed, 0 tests passed.Failed tests
Html Report (VSDrops) Download ❌ 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 Sonoma (14): All 5 tests passed. Html Report (VSDrops) Download Linux Build VerificationPipeline on Agent |
Collaborator
✅ [PR Build #7d5b618] Build passed (Detect API changes) ✅Pipeline on Agent |
This comment has been minimized.
This comment has been minimized.
Collaborator
✅ [PR Build #7d5b618] Build passed (Build packages) ✅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
✅ [PR Build #7d5b618] Build passed (Build macOS tests) ✅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
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.