Skip to content

[xcode26.5] Merge main into xcode26.5#25127

Merged
dalexsoto merged 25 commits into
xcode26.5from
dev/alex/xc26.5-main
Apr 9, 2026
Merged

[xcode26.5] Merge main into xcode26.5#25127
dalexsoto merged 25 commits into
xcode26.5from
dev/alex/xc26.5-main

Conversation

@dalexsoto
Copy link
Copy Markdown
Member

No description provided.

dotnet-maestro Bot and others added 25 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
Only treat an XML result log as having rendered errors when the parser
actually emits a report. This lets the HTML report keep scanning later
cleaned NUnit XML files for Mac Catalyst monotouch runs instead of
stopping at an earlier empty wrapper XML.

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

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
…a certificate is needed but not provided. Fixes #24532. (#24544)

Fixes #21688

This allows the user to detect the specific exception when a certificate
is needed and react to it. Exceptions thrown are very similar to what
`SocketsHttpHandler` and other handlers throw, while also following the
pattern of other exceptions thrown by `NSUrlSessionHandler`.

This is a re-creation of #24532 from @dotMorten (due to our CI not being
able to build PRs from forks).

---------

Co-authored-by: Morten Nielsen <mort5161@esri.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Bumps [peterjgrainger/action-create-branch](https://github.com/peterjgrainger/action-create-branch) from 3.0.0 to 4.0.0.

## Release notes
<p><em>Sourced from <a href="https://github.com/peterjgrainger/action-create-branch/releases">peterjgrainger/action-create-branch's releases</a>.</em></p>

### V4.0.0
<p>Upgrade node version to 24</p>

## Commits

- Use node24 on runners
-See full diff in <a href="https://github.com/peterjgrainger/action-create-branch/compare/v3.0.0...v4.0.0">compare view</a>

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=peterjgrainger/action-create-branch&package-manager=github_actions&previous-version=3.0.0&new-version=4.0.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

## Dependabot commands and options
There are random test failures in this test:

> Remote .NET tests/Xamarin.Tests.WindowsTest.BundleStructureWithRemoteMac(iOS,"ios-arm64",All,"Debug"): Failed: The target '_CompileAppManifest' was unexpectedly executed (_CompileAppManifest Rebuild 1)

Add more asserts to this test to try to track down what's happening.

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
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>
https://github.com/GitOps-microsoft/GitOps.PullRequestIssueManagement/pull/262
(internal Microsoft link) changed the `${issueAuthor}` placeholder to
include the `@` character.

Remove the one we added so we don't duplicate it.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
And fix any errors/warnings.

Contributes towards #17285.
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**: [20260408.5](https://dev.azure.com/dnceng/internal/_build/results?buildId=2946125) ([309474](https://maestro.dot.net/channel/9626/github:dotnet:dotnet/build/309474))
- **Date Produced**: April 8, 2026 4:40:30 PM UTC
- **Commit**: [b510aa83c1ffafde50d015e37bff96bc8a08ea91](dotnet/dotnet@b510aa8)
- **Branch**: [release/10.0.3xx](https://github.com/dotnet/dotnet/tree/release/10.0.3xx)

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

[1]: dotnet/dotnet@f53e3a8...b510aa8
…cts. (#25113)

This makes it possible to debug macOS projects in VSCode (by manually adding a launch profile).

Ref: microsoft/vscode-dotnettools#549
@dalexsoto dalexsoto added this to the xcode26.5 milestone Apr 9, 2026
@dalexsoto dalexsoto enabled auto-merge April 9, 2026 13:47
@vs-mobiletools-engineering-service2
Copy link
Copy Markdown
Collaborator

✅ [CI Build #4730ff4] Build passed (Build packages) ✅

Pipeline on Agent
Hash: 4730ff43ec6786804b79e12fa94880e1601d6456 [PR build]

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

✅ [PR Build #4730ff4] Build passed (Detect API changes) ✅

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

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

✅ [CI Build #4730ff4] Build passed (Build macOS tests) ✅

Pipeline on Agent
Hash: 4730ff43ec6786804b79e12fa94880e1601d6456 [PR build]

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

🚀 [CI Build #4730ff4] Test results 🚀

Test results

✅ All tests passed on VSTS: test results.

🎉 All 158 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 8 tests passed. Html Report (VSDrops) Download
✅ linker: All 44 tests passed. Html Report (VSDrops) Download
✅ monotouch (iOS): All 11 tests passed. Html Report (VSDrops) Download
✅ monotouch (MacCatalyst): All 15 tests passed. Html Report (VSDrops) Download
✅ monotouch (macOS): All 12 tests passed. Html Report (VSDrops) Download
✅ monotouch (tvOS): All 11 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 Monterey (12): All 5 tests passed. Html Report (VSDrops) Download
✅ Tests on macOS Ventura (13): All 5 tests passed. Html Report (VSDrops) Download
✅ 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: 4730ff43ec6786804b79e12fa94880e1601d6456 [PR build]

@dalexsoto dalexsoto merged commit f2239ca into xcode26.5 Apr 9, 2026
49 checks passed
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