Skip to content

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

Open
github-actions[bot] wants to merge 15 commits intonet11.0from
merge/main-to-net11.0
Open

[automated] Merge branch 'main' => 'net11.0'#25070
github-actions[bot] wants to merge 15 commits intonet11.0from
merge/main-to-net11.0

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

@github-actions github-actions bot commented Apr 2, 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:

  • rolfbjarne
  • dotnet-maestro[bot]
  • csigs
  • dalexsoto
  • vs-mobiletools-engineering-service2

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.

rolfbjarne and others added 14 commits April 1, 2026 09:26
…marking when optimizing generated code. (#24979)

This makes it easier to move this code out of a custom linker step in the future.

Also simplify a few things:

* There's no need to compute whether the code is optimizable, because the result
  is never used.
* Unify code to determine whether the InlineIsARM64CallingConvention optimization
  is to be applied.
* Any code that modifies the current assembly now returns a boolean saying so (so
  that we know if the current assembly has to be saved).

Contributes towards #17693.
And fix any resulting issues.

Also add a convenience make target to build bgen.

Contributes towards #17285.

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…1: Build ID 13711851 (#25062)

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.
…task assembly. (#25060)

For a .NET 10 version of our workload we have a "net10.0" version of the task assembly.

However, '$(BundledNETCoreAppTargetFrameworkVersion)' is the version of .NET
that is running - which would be '11.0' if using .NET 11 - so we can't use
this variable.

So use '$(TargetFramework)' instead, that should get the right 'netX.Y'
version for the path to the task assembly.
…e 26.4 (#25028)

- Bind ICCameraFile.Fingerprint property and GetFingerprint static
method
- Bind ICCameraFile.RequestSecurityScopedUrl (macOS 14.0+)
- Bind ICCameraFile.RequestFingerprint (macOS 15.0+)
- Add ICTransportType.Proximity field (macOS 14.0+)
- Fix ICReturnCodeOffset enum: add [Native], change to long backing
type, add Device, DeviceConnection, and Object values
- Add [Deprecated] on ICCameraDevice.RequestEnableTethering,
RequestDisableTethering, and RequestUploadFile (macOS 14.0)
- Move iOS and MacCatalyst .todo entries to .ignore files
- Delete all resolved .todo files

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
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**: [20260331.1](https://dev.azure.com/dnceng/internal/_build/results?buildId=2940378) ([308593](https://maestro.dot.net/channel/2/github:dotnet:xharness/build/308593))
- **Date Produced**: March 31, 2026 3:29:07 PM UTC
- **Commit**: [3d43498414571f4f63c4dd14241c46404e8c60f9](dotnet/xharness@3d43498)
- **Branch**: [main](https://github.com/dotnet/xharness/tree/main)

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

[1]: dotnet/xharness@28f5ed3...3d43498
…20260402054819308 to main (#25066)

LEGO: Pull request from lego/hb_5df43909-4a19-4f55-bc3f-9ea8fccf3c82_20260402054819308 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**: [20260330.4](https://dev.azure.com/dnceng/internal/_build/results?buildId=2939172) ([308358](https://maestro.dot.net/channel/9626/github:dotnet:dotnet/build/308358))
- **Date Produced**: March 30, 2026 12:42:18 PM UTC
- **Commit**: [36b89c782bda10112c52396d9f0fe18171b60604](dotnet/dotnet@36b89c7)
- **Branch**: [release/10.0.3xx](https://github.com/dotnet/dotnet/tree/release/10.0.3xx)

- **Dependency Updates**:
  - From [10.0.0-beta.26177.108 to 10.0.0-beta.26180.104][1]
     - Microsoft.DotNet.Arcade.Sdk
     - Microsoft.DotNet.Build.Tasks.Feed
     - Microsoft.DotNet.SharedFramework.Sdk
  - From [10.0.300-preview.0.26177.108 to 10.0.300-preview.0.26180.104][1]
     - Microsoft.NET.Sdk
  - From [10.0.300-preview.26177.108 to 10.0.300-preview.26180.104][1]
     - Microsoft.TemplateEngine.Authoring.Tasks

[1]: dotnet/dotnet@cf1948f...36b89c7
And fix any build issues.

---------

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 github-actions bot requested a review from rolfbjarne as a code owner April 2, 2026 18:59
@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 3, 2026 07:16
@vs-mobiletools-engineering-service2
Copy link
Copy Markdown
Collaborator

✅ [CI Build #4bc1124] Build passed (Build packages) ✅

Pipeline on Agent
Hash: 4bc11241e26eda2fbb9c43d31643836762ece4b4 [PR build]

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

✅ [PR Build #4bc1124] Build passed (Detect API changes) ✅

Pipeline on Agent
Hash: 4bc11241e26eda2fbb9c43d31643836762ece4b4 [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: 4bc11241e26eda2fbb9c43d31643836762ece4b4 [PR build]

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

✅ [CI Build #4bc1124] Build passed (Build macOS tests) ✅

Pipeline on Agent
Hash: 4bc11241e26eda2fbb9c43d31643836762ece4b4 [PR build]

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

🔥 [CI Build #4bc1124] Test results 🔥

Test results

❌ Tests failed on VSTS: test results

3 tests crashed, 23 tests failed, 88 tests passed.

Failures

❌ dotnettests tests (iOS)

1 tests failed, 0 tests passed.

Failed tests

  • DotNet tests: Failed (Execution failed with exit code 1)
    • Xamarin.Tests.AppSizeTest.CoreCLR_Interpreter(iOS,"ios-arm64"): No removed APIs (set the environment variable WRITE_KNOWN_FAILURES=1 and run the test again to update the expected set of APIs...
    • Xamarin.Tests.AppSizeTest.CoreCLR_R2R(iOS,"ios-arm64"): No removed APIs (set the environment variable WRITE_KNOWN_FAILURES=1 and run the test again to update the expected set of APIs...

Html Report (VSDrops) Download

❌ fsharp tests

🔥 Failed catastrophically on VSTS: test results - fsharp (no summary found).

Html Report (VSDrops) Download

❌ linker tests

🔥 Failed catastrophically on VSTS: test results - linker (no summary found).

Html Report (VSDrops) Download

❌ monotouch tests (MacCatalyst)

19 tests failed, 0 tests passed.

Failed tests

  • monotouch-test/Mac Catalyst/Debug: Failed (Test run failed.
    Tests run: 3747 Passed: 3572 Inconclusive: 12 Failed: 13 Ignored: 162)
  • monotouch-test/Mac Catalyst/Debug (CoreCLR): Failed (Test run failed.
    Tests run: 3747 Passed: 3586 Inconclusive: 13 Failed: 12 Ignored: 149)
  • monotouch-test/Mac Catalyst/Release (CoreCLR, ARM64): Failed (Test run failed.
    Tests run: 3744 Passed: 3580 Inconclusive: 12 Failed: 12 Ignored: 152)
  • monotouch-test/Mac Catalyst/Release (CoreCLR, x64): Failed (Test run failed.
    Tests run: 3744 Passed: 3575 Inconclusive: 13 Failed: 16 Ignored: 153)
  • monotouch-test/Mac Catalyst/Release (CoreCLR, Universal): Failed (Test run failed.
    Tests run: 3744 Passed: 3575 Inconclusive: 13 Failed: 15 Ignored: 154)
  • monotouch-test/Mac Catalyst/Debug (ARM64): Failed (Test run failed.
    Tests run: 3747 Passed: 3569 Inconclusive: 14 Failed: 14 Ignored: 164)
  • monotouch-test/Mac Catalyst/Debug (managed static registrar): Failed (Test run failed.
    Tests run: 3744 Passed: 3567 Inconclusive: 14 Failed: 14 Ignored: 163)
  • monotouch-test/Mac Catalyst/Debug (static registrar): Failed (Test run failed.
    Tests run: 3744 Passed: 3568 Inconclusive: 13 Failed: 15 Ignored: 161)
  • monotouch-test/Mac Catalyst/Debug (static registrar, ARM64): Failed (Test run failed.
    Tests run: 3744 Passed: 3569 Inconclusive: 13 Failed: 14 Ignored: 161)
  • monotouch-test/Mac Catalyst/Release (managed static registrar): Failed (Test run failed.
    Tests run: 3744 Passed: 3558 Inconclusive: 14 Failed: 17 Ignored: 169)
  • monotouch-test/Mac Catalyst/Release (managed static registrar, all optimizations): Failed (Test run failed.
    Tests run: 3744 Passed: 3555 Inconclusive: 13 Failed: 15 Ignored: 174)
  • monotouch-test/Mac Catalyst/Release (NativeAOT): Failed (Test run failed.
    Tests run: 3744 Passed: 3548 Inconclusive: 14 Failed: 18 Ignored: 178)
  • monotouch-test/Mac Catalyst/Release (NativeAOT, ARM64): TimedOut (Execution timed out after 1200 seconds.
    Test run crashed)
  • monotouch-test/Mac Catalyst/Release (NativeAOT, x64): Failed (Test run failed.
    Tests run: 3744 Passed: 3536 Inconclusive: 14 Failed: 19 Ignored: 189)
  • monotouch-test/Mac Catalyst/Release (static registrar): Failed (Test run failed.
    Tests run: 3744 Passed: 3559 Inconclusive: 13 Failed: 18 Ignored: 167)
  • monotouch-test/Mac Catalyst/Release (static registrar, all optimizations): Failed (Test run failed.
    Tests run: 3744 Passed: 3555 Inconclusive: 12 Failed: 17 Ignored: 172)
  • monotouch-test/Mac Catalyst/Release (ARM64, LLVM): Failed (Test run failed.
    Tests run: 3744 Passed: 3559 Inconclusive: 14 Failed: 17 Ignored: 168)
  • monotouch-test/Mac Catalyst/Debug (interpreter): Failed (Test run failed.
    Tests run: 3747 Passed: 3563 Inconclusive: 13 Failed: 18 Ignored: 166)
  • monotouch-test/Mac Catalyst/Release (interpreter): TimedOut (Execution timed out after 1200 seconds.
    Test run crashed)

Html Report (VSDrops) Download

❌ monotouch tests (tvOS)

3 tests failed, 12 tests passed.

Failed tests

  • monotouch-test/tvOS - simulator/Release (all optimizations): TimedOut
  • monotouch-test/tvOS - simulator/Release (managed static registrar, all optimizations): TimedOut
  • monotouch-test/tvOS - simulator/Release (interpreter): TimedOut

Html Report (VSDrops) Download

❌ msbuild tests

🔥 Failed catastrophically on VSTS: test results - msbuild (no summary found).

Html Report (VSDrops) Download

Successes

✅ cecil: All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (MacCatalyst): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (macOS): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (Multiple platforms): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (tvOS): All 1 tests passed. Html Report (VSDrops) Download
✅ framework: All 2 tests passed. Html Report (VSDrops) Download
✅ generator: All 5 tests passed. Html Report (VSDrops) Download
✅ interdependent-binding-projects: All 4 tests passed. Html Report (VSDrops) Download
✅ introspection: All 9 tests passed. Html Report (VSDrops) Download
✅ monotouch (iOS): All 15 tests passed. Html Report (VSDrops) Download
✅ monotouch (macOS): All 12 tests passed. 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. Html Report (VSDrops) Download
✅ xtro: All 1 tests passed. 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: 4bc11241e26eda2fbb9c43d31643836762ece4b4 [PR build]

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.

4 participants