Skip to content

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

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

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

Conversation

@github-actions
Copy link
Contributor

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:

  • dalexsoto
  • rolfbjarne
  • dotnet-maestro[bot]
  • emaf
  • csigs

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 17 commits March 18, 2026 17:01
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**: [20260317.11](https://dev.azure.com/dnceng/internal/_build/results?buildId=2928892) ([306642](https://maestro.dot.net/channel/9626/github:dotnet:dotnet/build/306642))
- **Date Produced**: March 17, 2026 9:45:30 PM UTC
- **Commit**: [853c0311d71c9991dbf3ec6e7324c0ff349700da](dotnet/dotnet@853c031)
- **Branch**: [release/10.0.3xx](https://github.com/dotnet/dotnet/tree/release/10.0.3xx)

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

[1]: dotnet/dotnet@e116d98...853c031
* Use web sockets to connect the endpoints when doing hot reload / dotnet watch.
* Change the defaults when launching desktop apps and we're in 'dotnet watch' mode:
	* Always open app in a new instance.
	* Wait for exit enabled.
	* Pipe stdout/stderr to the current terminal.
* Validate that the project wasn't built with a build configuration that would prevent Hot Reload from working.

Contributes towards #24782.
…20260317174730541 to main (#24912)

LEGO: Pull request from lego/hb_5df43909-4a19-4f55-bc3f-9ea8fccf3c82_20260317174730541 to main with localized lcls
…ized buffer (#24920)

CreateAdaptive_3 and CreateAdaptive_4 used a hardcoded 512-byte buffer for
a 256x256 adaptive bitmap context. When ToImage() called
CGBitmapContextCreateImage, CoreGraphics tried to copy the bitmap data from
this tiny buffer, reading past the allocation and causing a SIGSEGV.

Fix CreateAdaptive_3 by computing the buffer size from
parameters.AlignedBytesPerRow * parameters.Height (matching CreateAdaptive_2).

Fix CreateAdaptive_4 by using a 1MB buffer, large enough for any 256x256
adaptive bitmap format.

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* Improve nullability annotations for FromArrayOfArray (accept NSArray?, return NSObject[][]?).
* Rewrite FromArrayOfArray to use ArrayFromHandleDropNullElements.
* Improve nullability annotations for From(NSObject[][]) (accept NSObject[][]?, return NSArray?).
* Rewrite From(NSObject[][]) to use FromNSObjects.
* Update XML docs for all modified members.
* Add tests for NSArray.FromArrayOfArray, NSArray.From(NSObject[][]) and NSEntityDescription.UniquenessConstraints.

Contributes towards #17285.

---------

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**: [20260317.2](https://dev.azure.com/dnceng/internal/_build/results?buildId=2928635) ([306520](https://maestro.dot.net/channel/2/github:dotnet:xharness/build/306520))
- **Date Produced**: March 17, 2026 1:33:45 PM UTC
- **Commit**: [f3b160fbbe5a43f6fc03b27629e689ef00de3ef9](dotnet/xharness@f3b160f)
- **Branch**: [main](https://github.com/dotnet/xharness/tree/main)

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

[1]: dotnet/xharness@581c6a9...f3b160f
[main] Update dependencies from dotnet/dotnet (#24930)

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**: [20260317.15](https://dev.azure.com/dnceng/internal/_build/results?buildId=2929122) ([306693](https://maestro.dot.net/channel/9626/github:dotnet:dotnet/build/306693))
- **Date Produced**: March 18, 2026 3:24:01 AM UTC
- **Commit**: [4a2e646b931b90322897a5166f0bbcd3f5508a03](dotnet/dotnet@4a2e646)
- **Branch**: [release/10.0.3xx](https://github.com/dotnet/dotnet/tree/release/10.0.3xx)

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

[1]: dotnet/dotnet@853c031...4a2e646
…20260318174924112 to main (#24925)

LEGO: Pull request from lego/hb_5df43909-4a19-4f55-bc3f-9ea8fccf3c82_20260318174924112 to main with localized lcls
Brings fixes for building from Windows targeting a .NET version lower
than the used to build (i.e., building with .NET 11 a project targeting
net10.0-ios).

---------

Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
…s.dll). (#24932)

We want to build our task assembly for .NET 10, but there's a breaking change
when loading .NET assemblies in MSBuild: they're isolated from eachother.

However, we need all our tasks to be able to talk to eachother when building
remotely (because the remote connection is stored in static state) - so the
solution is to put all the tasks in the same assembly.

The quickest and easiest way to do this is to just create an empty subclass of
the actual task class in the assembly where we have all the other tasks, so
this pull request does that.

To simplify iterating on the MSBuild logic, I've also included the `Xamarin.Messaging.targets` file.
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**: [20260318.1](https://dev.azure.com/dnceng/internal/_build/results?buildId=2929517) ([306735](https://maestro.dot.net/channel/2/github:dotnet:xharness/build/306735))
- **Date Produced**: March 18, 2026 9:51:17 AM UTC
- **Commit**: [607b3de9cf2dbfec6734e686e68d2813b40b2b51](dotnet/xharness@607b3de)
- **Branch**: [main](https://github.com/dotnet/xharness/tree/main)

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

[1]: dotnet/xharness@f3b160f...607b3de
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**: [20260319.1](https://dev.azure.com/dnceng/internal/_build/results?buildId=2930521) ([306917](https://maestro.dot.net/channel/2/github:dotnet:xharness/build/306917))
- **Date Produced**: March 19, 2026 11:31:01 AM UTC
- **Commit**: [b0c8bf6dba87c70e284cff06819f0cd714c8f2e4](dotnet/xharness@b0c8bf6)
- **Branch**: [main](https://github.com/dotnet/xharness/tree/main)

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

[1]: dotnet/xharness@607b3de...b0c8bf6
…uto-decompressed responses in NSUrlSessionHandler. Fixes #23958. (#24924)

NSURLSession automatically decompresses content for supported encodings (gzip,
deflate, br, zstd, etc.) but leaves the original Content-Encoding and
Content-Length headers in the response. This causes a mismatch where
Content-Length refers to the compressed size while the body is decompressed.

All other HTTP handlers (SocketsHttpHandler, WinHttpHandler, Android's
handler) remove these headers after automatic decompression. This change makes
NSUrlSessionHandler consistent with them.

Fixes #23958

---------

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

This fixes an issue where passing `--device=<ipad-udid>` wouldn't work,
because the UDID wouldn't be found in the list of applicable devices, because
iPads weren't listed as applicable devices.
Reset patterns:
- global.json
- NuGet.config
- eng/Version.Details.xml
- eng/Version.Details.props
- eng/common/*
@vs-mobiletools-engineering-service2
Copy link
Collaborator

🔥 [CI Build #e2b662e] Build failed (Build packages) 🔥

Build failed for the job 'Build packages' (with job status 'Failed')

Pipeline on Agent
Hash: e2b662ed698466ce57041ac971617f10eac22f36 [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

🔥 [PR Build #e2b662e] Build failed (Detect API changes) 🔥

Build failed for the job 'Detect API changes' (with job status 'Failed')

Pipeline on Agent
Hash: e2b662ed698466ce57041ac971617f10eac22f36 [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

🔥 Unable to find the contents for the comment: D:\a\1\s\change-detection\results\gh-comment.md does not exist :fire

Pipeline on Agent
Hash: e2b662ed698466ce57041ac971617f10eac22f36 [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.

5 participants