Skip to content

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

Merged
rolfbjarne merged 15 commits intonet11.0from
merge/main-to-net11.0
Mar 4, 2026
Merged

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

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

@github-actions github-actions Bot commented Mar 3, 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
  • noiseonwires
  • 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.

rolfbjarne and others added 8 commits February 27, 2026 11:17
…24772)

Fix a copy-paste bug in create-windows-html-report.cs where both the
success and failure branches wrote '# 🎉 All N tests passed 🎉'.
The failure branch now generates a proper summary with <details>/## 
tags listing failed tests, matching the format TestResults.psm1 expects.

Also fix TestResults.psm1 to emit <details> before ##  (correct
HTML nesting order), and avoid including misleading success-format file
content in the failure section when the result file has no failure details.

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…ive calls (#24794)

All these native functions follow Apple's Create/Copy rule, returning retained
handles that the caller must release. The handles were being passed to
FromHandle/GetNSObject/ArrayFromHandle without specifying releaseHandle: true
or owns: true, leaking the native objects.

Also add tests for those APIs that were changed but didn't have tests already.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
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**: [20260226.3](https://dev.azure.com/dnceng/internal/_build/results?buildId=2913312) ([303524](https://maestro.dot.net/channel/9626/github:dotnet:dotnet/build/303524))
- **Date Produced**: February 26, 2026 2:17:36 PM UTC
- **Commit**: [c9c7256d0410d9f00ad7e4df1f56dfdf88f44418](dotnet/dotnet@c9c7256)
- **Branch**: [release/10.0.3xx](https://github.com/dotnet/dotnet/tree/release/10.0.3xx)

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

[1]: dotnet/dotnet@44cf811...c9c7256
* Add a --only-sharpie option to configure.
* Automatically enable --only-sharpie for the release/sharpie and release-test/only-sharpie branches.
* Cut away parts from the build that don't work when we're not building any platform.
* Ignore tests that don't have the desired platform available.
* For CI, some parts depend on having build artifacts from at least one platform. We now generate those build artifacts for iOS, and use those when no platforms are enabled.
* Enable symbol packages for sharpie, the publishing logic expects symbol packages to be present.

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This PR makes a change to improve the Hot Reload experience for .NET MAUI iOS device builds in VS Code:

In VS Code, design-time builds did not receive the correct RuntimeIdentifier for iOS device targets — they defaulted to iossimulator-x64. This caused Roslyn to resolve the wrong baseline assemblies, that broke Hot Reload. The .mobile.props mechanism (already used by VS on Windows) solves this.

As discussed with Mauro and Tomas, the better solution is not to introduce a new parameter, but add "DesignTimeBuild" as one of the triggers for the condition. This is safe for both VS and VS Code and should not cause any side effects.

---------

Co-authored-by: Kirill Ovchinnikov <kovchinnikov@microsoft.com>
…4805)

Add missing [NullAllowed] attributes on return types and parameters
for Foundation.NSBundle members as reported by xtro-sharpie tests.
Remove the corresponding entries from the ignore files.

Fixes #24803.
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 March 3, 2026 14:27
@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.

@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.

@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 added a commit that referenced this pull request Mar 4, 2026
These branches come from the inter-branch-merge workflow
(.github/workflows/inter-branch-merge-flow.yml).

Example: #24809.
@rolfbjarne
Copy link
Copy Markdown
Member

/azp run xamarin-macios-pr,xamarin-macios-pr-apidiff

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@vs-mobiletools-engineering-service2

This comment has been minimized.

@vs-mobiletools-engineering-service2

This comment has been minimized.

This pull request updates the following dependencies

[marker]: <> (Begin:c0371266-dd6f-4959-822b-decc72d2d668)
## From https://github.com/dotnet/macios
- **Subscription**:
[c0371266-dd6f-4959-822b-decc72d2d668](https://maestro.dot.net/subscriptions?search=c0371266-dd6f-4959-822b-decc72d2d668)
- **Build**:
[20260302.8](https://dev.azure.com/devdiv/DevDiv/_build/results?buildId=13440985)
([304125](https://maestro.dot.net/channel/3884/github:dotnet:macios/build/304125))
- **Date Produced**: March 3, 2026 2:21:46 AM UTC
- **Commit**:
[42038e1](42038e1)
- **Branch**:
[release/9.0.1xx](https://github.com/dotnet/macios/tree/release/9.0.1xx)

[DependencyUpdate]: <> (Begin)

- **Dependency Updates**:
  - From [26.2.9000 to 26.2.9001][1]
     - Microsoft.iOS.Sdk.net9.0_26.2
     - Microsoft.MacCatalyst.Sdk.net9.0_26.2
     - Microsoft.macOS.Sdk.net9.0_26.2
     - Microsoft.tvOS.Sdk.net9.0_26.2

[1]: 2634d0a...42038e1

[DependencyUpdate]: <> (End)


[marker]: <> (End:c0371266-dd6f-4959-822b-decc72d2d668)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@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.

dotnet-maestro Bot and others added 3 commits March 4, 2026 11:37
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**: [20260302.4](https://dev.azure.com/dnceng/internal/_build/results?buildId=2916063) ([304003](https://maestro.dot.net/channel/9626/github:dotnet:dotnet/build/304003))
- **Date Produced**: March 2, 2026 3:25:47 PM UTC
- **Commit**: [938faf92928867a829fc5678ff93daf37821a3c5](dotnet/dotnet@938faf9)
- **Branch**: [release/10.0.3xx](https://github.com/dotnet/dotnet/tree/release/10.0.3xx)

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

[1]: dotnet/dotnet@c9c7256...938faf9
These branches come from the inter-branch-merge workflow
(.github/workflows/inter-branch-merge-flow.yml).

Example: #24809.
@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.

@vs-mobiletools-engineering-service2

This comment has been minimized.

@vs-mobiletools-engineering-service2

This comment has been minimized.

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

✅ [CI Build #9d00f4e] Build passed (Build packages) ✅

Pipeline on Agent
Hash: 9d00f4e3d288a3b153fce262480956ae1fd615c7 [PR build]

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

✅ [PR Build #9d00f4e] Build passed (Detect API changes) ✅

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

@vs-mobiletools-engineering-service2

This comment has been minimized.

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

✅ [CI Build #9d00f4e] Build passed (Build macOS tests) ✅

Pipeline on Agent
Hash: 9d00f4e3d288a3b153fce262480956ae1fd615c7 [PR build]

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

🚀 [CI Build #9d00f4e] Test results 🚀

Test results

✅ All tests passed on VSTS: test results.

🎉 All 155 tests passed 🎉

Tests counts

✅ cecil: All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (iOS): 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
✅ fsharp: All 4 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
✅ linker: All 44 tests passed. Html Report (VSDrops) Download
✅ monotouch (iOS): All 13 tests passed. Html Report (VSDrops) Download
✅ monotouch (MacCatalyst): All 17 tests passed. Html Report (VSDrops) Download
✅ monotouch (macOS): All 12 tests passed. Html Report (VSDrops) Download
✅ monotouch (tvOS): All 13 tests passed. Html Report (VSDrops) Download
✅ msbuild: All 2 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

Pipeline on Agent
Hash: 9d00f4e3d288a3b153fce262480956ae1fd615c7 [PR build]

@rolfbjarne rolfbjarne merged commit a7c76d4 into net11.0 Mar 4, 2026
46 checks passed
@rolfbjarne rolfbjarne deleted the merge/main-to-net11.0 branch March 4, 2026 16:45
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