Skip to content

[automated] Merge branch 'main' => 'net11.0'#25099

Merged
rolfbjarne merged 10 commits intonet11.0from
merge/main-to-net11.0
Apr 7, 2026
Merged

[automated] Merge branch 'main' => 'net11.0'#25099
rolfbjarne merged 10 commits intonet11.0from
merge/main-to-net11.0

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

@github-actions github-actions bot commented Apr 6, 2026

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:

  • csigs
  • rolfbjarne
  • dotnet-maestro[bot]

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.

merge button instructions

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.

git fetch
git checkout main
git pull --ff-only
git checkout net11.0
git pull --ff-only
git merge --no-ff main

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet/macios HEAD:merge/main-to-net11.0
or if you are using SSH
git push git@github.com:dotnet/macios HEAD:merge/main-to-net11.0

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

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.

git fetch
git checkout -b merge/main-to-net11.0 origin/net11.0
git pull https://github.com/dotnet/macios merge/main-to-net11.0
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/macios HEAD:merge/main-to-net11.0
or if you are using SSH
git fetch
git checkout -b merge/main-to-net11.0 origin/net11.0
git pull git@github.com:dotnet/macios merge/main-to-net11.0
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/macios HEAD:merge/main-to-net11.0

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.

dotnet-maestro bot and others added 9 commits April 3, 2026 08:30
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**: [20260401.20](https://dev.azure.com/dnceng/internal/_build/results?buildId=2941690) ([308860](https://maestro.dot.net/channel/9626/github:dotnet:dotnet/build/308860))
- **Date Produced**: April 2, 2026 4:17:47 AM UTC
- **Commit**: [f1719664fe01dca57ebc5e4199138908699a8ad3](dotnet/dotnet@f171966)
- **Branch**: [release/10.0.3xx](https://github.com/dotnet/dotnet/tree/release/10.0.3xx)

- **Dependency Updates**:
  - From [10.0.0-beta.26201.115 to 10.0.0-beta.26201.120][1]
     - Microsoft.DotNet.Arcade.Sdk
     - Microsoft.DotNet.Build.Tasks.Feed
     - Microsoft.DotNet.SharedFramework.Sdk
  - From [10.0.300-preview.0.26201.115 to 10.0.300-preview.0.26201.120][1]
     - Microsoft.NET.Sdk
  - From [10.0.300-preview.26201.115 to 10.0.300-preview.26201.120][1]
     - Microsoft.TemplateEngine.Authoring.Tasks

[1]: dotnet/dotnet@008a44e...f171966
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**: [20260402.2](https://dev.azure.com/dnceng/internal/_build/results?buildId=2942174) ([308972](https://maestro.dot.net/channel/2/github:dotnet:xharness/build/308972))
- **Date Produced**: April 2, 2026 1:17:15 PM UTC
- **Commit**: [e396a851e1271ab84454f77acdb03b63f2543a5a](dotnet/xharness@e396a85)
- **Branch**: [main](https://github.com/dotnet/xharness/tree/main)

- **Dependency Updates**:
  - From [11.0.0-prerelease.26181.1 to 11.0.0-prerelease.26202.2][1]
     - Microsoft.DotNet.XHarness.iOS.Shared

[1]: dotnet/xharness@3d43498...e396a85
…20260403055317303 to main (#25076)

LEGO: Pull request from lego/hb_5df43909-4a19-4f55-bc3f-9ea8fccf3c82_20260403055317303 to main with localized lcls
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**: [20260403.6](https://dev.azure.com/dnceng/internal/_build/results?buildId=2943226) ([309184](https://maestro.dot.net/channel/9626/github:dotnet:dotnet/build/309184))
- **Date Produced**: April 3, 2026 11:59:16 PM UTC
- **Commit**: [f53e3a87c05e7d5ba77e7327dd453dc5fef64b7f](dotnet/dotnet@f53e3a8)
- **Branch**: [release/10.0.3xx](https://github.com/dotnet/dotnet/tree/release/10.0.3xx)

- **Dependency Updates**:
  - From [10.0.0-beta.26201.120 to 10.0.0-beta.26203.106][1]
     - Microsoft.DotNet.Arcade.Sdk
     - Microsoft.DotNet.Build.Tasks.Feed
     - Microsoft.DotNet.SharedFramework.Sdk
  - From [10.0.300-preview.0.26201.120 to 10.0.300-preview.0.26203.106][1]
     - Microsoft.NET.Sdk
  - From [10.0.300-preview.26201.120 to 10.0.300-preview.26203.106][1]
     - Microsoft.TemplateEngine.Authoring.Tasks

[1]: dotnet/dotnet@f171966...f53e3a8
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**: [20260404.1](https://dev.azure.com/dnceng/internal/_build/results?buildId=2943687) ([309231](https://maestro.dot.net/channel/2/github:dotnet:xharness/build/309231))
- **Date Produced**: April 4, 2026 10:33:51 AM UTC
- **Commit**: [0668c80ec27851f3c7f1b3e4536110a1d39af587](dotnet/xharness@0668c80)
- **Branch**: [main](https://github.com/dotnet/xharness/tree/main)

- **Dependency Updates**:
  - From [11.0.0-prerelease.26202.2 to 11.0.0-prerelease.26204.1][1]
     - Microsoft.DotNet.XHarness.iOS.Shared

[1]: dotnet/xharness@e396a85...0668c80
…AnnotationHit. (#25068)

Because it's accessed using a literal string, not a constant string.
…20260402174929646 to main (#25069)

LEGO: Pull request from lego/hb_5df43909-4a19-4f55-bc3f-9ea8fccf3c82_20260402174929646 to main with localized lcls
Reset patterns:
- global.json
- NuGet.config
- eng/Version.Details.xml
- eng/Version.Details.props
- eng/common/*
@vs-mobiletools-engineering-service2

This comment has been minimized.

@vs-mobiletools-engineering-service2

This comment has been minimized.

@vs-mobiletools-engineering-service2

This comment has been minimized.

@rolfbjarne rolfbjarne enabled auto-merge April 7, 2026 05:47
@vs-mobiletools-engineering-service2
Copy link
Copy Markdown
Collaborator

✅ [PR Build #7a2d3fa] Build passed (Detect API changes) ✅

Pipeline on Agent
Hash: 7a2d3fa686d87bccc068066f68c7ba8bbdc00898 [PR build]

@vs-mobiletools-engineering-service2
Copy link
Copy Markdown
Collaborator

✅ [CI Build #7a2d3fa] Build passed (Build packages) ✅

Pipeline on Agent
Hash: 7a2d3fa686d87bccc068066f68c7ba8bbdc00898 [PR build]

@vs-mobiletools-engineering-service2
Copy link
Copy Markdown
Collaborator

✅ API diff for current PR / commit

NET (empty diffs)

✅ API diff vs stable

NET (empty diffs)

ℹ️ Generator diff

Generator Diff: vsdrops (html) vsdrops (raw diff) gist (raw diff) - Please review changes)

Pipeline on Agent
Hash: 7a2d3fa686d87bccc068066f68c7ba8bbdc00898 [PR build]

@vs-mobiletools-engineering-service2
Copy link
Copy Markdown
Collaborator

✅ [CI Build #7a2d3fa] Build passed (Build macOS tests) ✅

Pipeline on Agent
Hash: 7a2d3fa686d87bccc068066f68c7ba8bbdc00898 [PR build]

@vs-mobiletools-engineering-service2

This comment has been minimized.

@vs-mobiletools-engineering-service2
Copy link
Copy Markdown
Collaborator

🚀 [CI Build #7a2d3fa] Test results 🚀

Test results

✅ All tests passed on VSTS: test results.

🎉 All 161 tests passed 🎉

Tests counts

✅ cecil: All 1 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ dotnettests (iOS): All 1 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ dotnettests (MacCatalyst): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (macOS): All 1 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ dotnettests (Multiple platforms): All 1 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ dotnettests (tvOS): All 1 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ framework: All 2 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ fsharp: All 4 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ generator: All 5 tests passed. Html Report (VSDrops) Download
✅ interdependent-binding-projects: All 4 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ introspection: All 9 tests passed. Html Report (VSDrops) Download
✅ linker: All 44 tests passed. Html Report (VSDrops) Download
✅ monotouch (iOS): All 15 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ monotouch (MacCatalyst): All 19 tests passed. Html Report (VSDrops) Download
✅ monotouch (macOS): All 12 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ monotouch (tvOS): All 15 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ msbuild: All 2 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ sharpie: All 1 tests passed. Html Report (VSDrops) Download
✅ windows: All 3 tests passed. Html Report (VSDrops) Download
✅ xcframework: All 4 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ xtro: All 1 tests passed. [attempt 2] Html Report (VSDrops) Download

macOS tests

✅ Tests on macOS Sonoma (14): All 5 tests passed. Html Report (VSDrops) Download
✅ Tests on macOS Sequoia (15): All 5 tests passed. Html Report (VSDrops) Download
✅ Tests on macOS Tahoe (26): All 5 tests passed. Html Report (VSDrops) Download

Linux Build Verification

Linux build succeeded

Pipeline on Agent
Hash: 7a2d3fa686d87bccc068066f68c7ba8bbdc00898 [PR build]

@rolfbjarne rolfbjarne merged commit ce1f3d2 into net11.0 Apr 7, 2026
46 checks passed
@rolfbjarne rolfbjarne deleted the merge/main-to-net11.0 branch April 7, 2026 14:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants