[automated] Merge branch 'main' => 'net11.0'#25111
Conversation
This makes it easier to navigate a generated project file in VSCode, since the files are located in folders instead of one potentially enormous list (the platform assemblies have thousands of source files).
--------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
As opposed to hanging the entire test suite (and then getting aborted) if something goes wrong. --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* Enable nullability and fix any issues. * Upgrade to NUnit v4. * Move code from tests/generator to tests/bgen to have everything in the same directory. --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…ed in multi-RID builds. Fixes #25053. (#25065) In multi-RID (universal) builds, the outer build saves all Content and BundleResource items to processed-items files, and inner builds remove them. However, items with PublishFolderType are not actually processed by CollectBundleResources (it skips them) — they're handled via ResolvedFileToPublish instead. By incorrectly saving them as processed, the inner builds remove them before they can be added to ResolvedFileToPublish, so they never end up in the app bundle. Fix by filtering out items with PublishFolderType when writing the processed-items files. Fixes #25053. --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…25106) This also revealed a couple of other issues: * Fix an issue stripping dylibs by passing the correct arguments to `strip` (fixes dotnet/runtime#124570). * Fix an issue running dsymutil on universal apps. --------- 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.
✅ [CI Build #2465220] Build passed (Build packages) ✅Pipeline on Agent |
✅ [PR Build #2465220] Build passed (Detect API changes) ✅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 #2465220] Build passed (Build macOS tests) ✅Pipeline on Agent |
🚀 [CI Build #2465220] Test results 🚀Test results✅ All tests passed on VSTS: test results. 🎉 All 161 tests passed 🎉 Tests counts✅ 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 |
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.