Skip to content

[xcode26.4] Merge remote-tracking branch 'origin/main' into xcode26.4#25002

Merged
dalexsoto merged 13 commits intoxcode26.4from
dev/alex/x24.4-main-bump
Mar 24, 2026
Merged

[xcode26.4] Merge remote-tracking branch 'origin/main' into xcode26.4#25002
dalexsoto merged 13 commits intoxcode26.4from
dev/alex/x24.4-main-bump

Conversation

@dalexsoto
Copy link
Copy Markdown
Member

No description provided.

rolfbjarne and others added 13 commits March 23, 2026 09:11
…marking in MarkIProtocolHandler. (#24931)

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

Contributes towards #17693.
…evOps (#24926)

Replace the GitHub Actions workflow (.github/workflows/linux-build.yml)
with a new Azure DevOps stage that runs in parallel with the existing
pipeline stages. The new stage checks out the code on a Linux agent,
verifies system dependencies, and runs 'make' to confirm the build
succeeds.

The stage is added to both the official build pipeline (main-stage.yml)
and the test pipeline (tests-stage.yml), using the appropriate Linux
pool for each (1ES pool for official, ubuntu-latest for tests).

This solves a problem with the GitHub action where it wouldn't run if the last
commit was from another GitHub action (which is a good thing). This is
problematic for us though, because this happens fairly often (autoformat, global.json
generation), and it means such pull requests require admin rigths to merge,
because the linux validation is a required check.

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* Ship the net10.0 version of our msbuild tasks.
* This required a bit of a reshuffling of the files in our Sdk pack, since we now
  ship both a netstandard2.0 and a net10.0 version of our msbuild tasks.
* Use the net10.0 version of the msbuild tasks by default, but allow opt-out using
  the property '_UseDesktopTaskAssemblies'.

Loading the net10.0 version of the tasks should work in VS2026, because VS2026 supports
the "Runtime=NET" metadata on the 'UsingTask' directive (VS2022 does not, but this
doesn't matter, because we don't support VS2022 anymore in .NET 10+).

Hopefully we'll be able to remove the opt-out once we've confirmed nothing breaks,
and then we can remove the netstandard2.0 versions of our task assemblies.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…NSUrlSessionHandler (#24957)

Add an opt-out switch 'Foundation.NSUrlSessionHandler.KeepHeadersAfterDecompression'
that, when enabled, preserves the original Content-Encoding and Content-Length headers
on auto-decompressed responses instead of removing them.

This allows apps that depend on the original headers to restore the previous behavior.

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…nstead of Func<>/Action<> (#24975)

When binding ObjC blocks, sharpie normally generates Func<...> and
Action<...> types for anonymous block parameters and properties. The
new --custom-delegates option generates custom named delegate
declarations instead.

For method parameters, the delegate name is derived from the method
and parameter names (e.g. SetActionHandler). For properties, it's
derived from the property name (e.g. ActionHandler).

Implementation uses a new CustomDelegateMassager that runs as a
post-processing pass on the generated C# AST, consistent with the
existing massager architecture.

---------

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**: [20260323.11](https://dev.azure.com/dnceng/internal/_build/results?buildId=2933878) ([307407](https://maestro.dot.net/channel/9626/github:dotnet:dotnet/build/307407))
- **Date Produced**: March 24, 2026 12:38:36 AM UTC
- **Commit**: [4bf356979576e49df34287d2de49dcb600a6c0e6](dotnet/dotnet@4bf3569)
- **Branch**: [release/10.0.3xx](https://github.com/dotnet/dotnet/tree/release/10.0.3xx)

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

[1]: dotnet/dotnet@4a2e646...4bf3569
* Enable #nullable enable file-wide in NSArray.cs.
* Improve nullability annotations for ToArray<TKey> (return TKey?[]).
* Improve nullability annotations for NSArray<TKey>.ToArray (return TKey?[]).
* Add NonNullToArrayDropNullElements instance methods for callers needing non-null arrays.
* Update CVPixelBufferAttributes.PixelFormatTypes to handle nullable ToArray elements.
* Update NSPasteboard/NSPasteboardItem DetectValues Wrap attributes to use NonNullToArrayDropNullElements.
* Update XML docs for all modified members.

Contributes towards #17285.

---------

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

Contributes towards #17285.
@dalexsoto dalexsoto added this to the xcode26.4 milestone Mar 24, 2026
@vs-mobiletools-engineering-service2
Copy link
Copy Markdown
Collaborator

✅ [CI Build #c9ccaee] Build passed (Build packages) ✅

Pipeline on Agent
Hash: c9ccaee4658b3e6d768823eec55e003b9dd3421a [PR build]

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

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

Pipeline on Agent
Hash: c9ccaee4658b3e6d768823eec55e003b9dd3421a [PR build]

@vs-mobiletools-engineering-service2

This comment has been minimized.

@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: c9ccaee4658b3e6d768823eec55e003b9dd3421a [PR build]

@vs-mobiletools-engineering-service2

This comment has been minimized.

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

✅ [CI Build #c9ccaee] Build passed (Build macOS tests) ✅

Pipeline on Agent
Hash: c9ccaee4658b3e6d768823eec55e003b9dd3421a [PR build]

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

🚀 [CI Build #c9ccaee] Test results 🚀

Test results

✅ All tests passed on VSTS: test results.

🎉 All 156 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 6 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: c9ccaee4658b3e6d768823eec55e003b9dd3421a [PR build]

@dalexsoto dalexsoto merged commit 3098a3a into xcode26.4 Mar 24, 2026
48 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.

4 participants