Skip to content

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

Merged
dalexsoto merged 14 commits into
xcode26.5from
dev/alex/mergemainx26.5
Apr 16, 2026
Merged

[xcode26.5] Merge main into xcode26.5#25159
dalexsoto merged 14 commits into
xcode26.5from
dev/alex/mergemainx26.5

Conversation

@dalexsoto
Copy link
Copy Markdown
Member

No description provided.

dotnet-maestro Bot and others added 13 commits April 13, 2026 07:35
This pull request updates the following dependencies

## From https://github.com/dotnet/macios

- **Subscription**: [c0371266-dd6f-4959-822b-decc72d2d668](https://maestro.dot.net/subscriptions?search=c0371266-dd6f-4959-822b-decc72d2d668)
- **Build**: [20260409.8](https://dev.azure.com/devdiv/DevDiv/_build/results?buildId=13787383) ([309685](https://maestro.dot.net/channel/3884/github:dotnet:macios/build/309685))
- **Date Produced**: April 9, 2026 1:01:40 PM UTC
- **Commit**: [9b4af11](9b4af11)
- **Branch**: [release/9.0.1xx](https://github.com/dotnet/macios/tree/release/9.0.1xx)

- **Dependency Updates**:
  - From [26.4.9010 to 26.4.9011][1]
     - Microsoft.iOS.Sdk.net9.0_26.4
     - Microsoft.MacCatalyst.Sdk.net9.0_26.4
     - Microsoft.macOS.Sdk.net9.0_26.4
     - Microsoft.tvOS.Sdk.net9.0_26.4

[1]: 86e12fa...9b4af11
Also treat all warnings as errors, since this project is now warning-free.

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Only keep the highest version for each entry.
Bumps [actions/github-script](https://github.com/actions/github-script) from 8.0.0 to 9.0.0.

## Release notes
<p><em>Sourced from <a href="https://github.com/actions/github-script/releases">actions/github-script's releases</a>.</em></p>

### v9.0.0
<p>New features:</p>

-<code>getOctokit</code> factory function — Available directly in the script context. Create additional authenticated Octokit clients with different tokens for multi-token workflows, GitHub App tokens, and cross-org access. See  for details and examples.
-Orchestration ID in user-agent — The <code>ACTIONS_ORCHESTRATION_ID</code> environment variable is automatically appended to the user-agent string for request tracing.

<p>Breaking changes:</p>

-<code>require('@actions/github')</code> no longer works in scripts. The upgrade to <code>@actions/github</code> v9 (ESM-only) means <code>require('@actions/github')</code> will fail at runtime. If you previously used patterns like <code>const { getOctokit } = require('@actions/github')</code> to create secondary clients, use the new injected <code>getOctokit</code> function instead — it's available directly in the script context with no imports needed.
- getOctokit is now an injected function parameter. Scripts that declare  const getOctokit = ... or  let getOctokit = ... will get a  SyntaxError because JavaScript does not allow  const/ let redeclaration of function parameters. Use the injected  getOctokit directly, or use  var getOctokit = ... if you need to redeclare it.
-If your script accesses other  @actions/github internals beyond the standard  github/ octokit client, you may need to update those references for v9 compatibility.

### What's Changed

-Add ACTIONS_ORCHESTRATION_ID to user-agent string by  in <a href="https://redirect.github.com/actions/github-script/pull/695">actions/github-script#695</a>
-ci: use deployment: false for integration test environments by  in <a href="https://redirect.github.com/actions/github-script/pull/712">actions/github-script#712</a>
-feat!: add getOctokit to script context, upgrade  @​actions/github v9,  @​octokit/core v7, and related packages by  in <a href="https://redirect.github.com/actions/github-script/pull/700">actions/github-script#700</a>

### New Contributors

- made their first contribution in <a href="https://redirect.github.com/actions/github-script/pull/695">actions/github-script#695</a>

<p>Full Changelog: <a href="https://github.com/actions/github-script/compare/v8.0.0...v9.0.0">https://github.com/actions/github-script/compare/v8.0.0...v9.0.0</a></p>

## Commits

- Merge pull request <a href="https://redirect.github.com/actions/github-script/issues/700">#700</a> from actions/salmanmkc/expose-getoctokit + prepare re...
- fix: use  @​octokit/core/types import for v7 compatibility
- merge: incorporate main branch changes
- chore: rebuild dist for v9 upgrade and getOctokit factory
- Merge pull request <a href="https://redirect.github.com/actions/github-script/issues/712">#712</a> from actions/salmanmkc/deployment-false + fix user-ag...
- ci: fix user-agent test to handle orchestration ID
- ci: use deployment: false to suppress deployment noise from integration tests
- docs: update README examples from  to , add getOctokit docs and v9 brea...
- ci: add getOctokit integration test job
- test: add getOctokit integration tests via callAsyncFunction
-Additional commits viewable in <a href="https://github.com/actions/github-script/compare/v8.0.0...v9.0.0">compare view</a>

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/github-script&package-manager=github_actions&previous-version=8.0.0&new-version=9.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
* Don't fail immediately if the file with the expected sizes can't be parsed,
  treat it like the file didn't exist (this allows it to be easily
  re-generated even if it's invalid - which is common with merge conflicts,
  with this change the test will just overwrite any expected files that have
  merge conflict markers).
* Don't fail if the set of files has changed and the test is updating the
  expected sizes (instead just write out the expected sizes instead).
…en applying the [Preserve] attribute. (#25109)

Create an xml descriptor file instead of manually marking when applying the [Preserve] attribute.

I first tried using [DynamicDependency] attributes, but it turns out [DynamicDependency] attributes can't accurately express/replace [Preserve] semantics, so I went with an xml descriptor file instead.

The [DynamicDependency] attribute code is still present, as an opt-in, because it was already there used for NativeAOT (even though we're always using the xml descriptor logic now, even for NativeAOT).

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

Also move the removal of any [Preserve] attributes to the RemoveAttributes step.

Contributes towards #17693.
…e simulator. Fixes #25112. (#25129)

In the GetMlaunchArguments task, instead of repeating what the GetAvailableDevices task does, just run the GetAvailableDevices task and pass the resulting devices to the GetMlaunchArguments task. Then GetMlaunchArguments can just pick the first applicable one, which should work fine.

Fixes #25112.

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
…marking when marking static registrar methods. (#25018)

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

Contributes towards #17693.
#25150)

xharness regressed detecting crashing tests as crashing (dotnet/xharness@a6f9fe6),
so clone the TestReporter class and modify it to properly detect crashes and report
them as such.

---------

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

Pinging localhost doesn't work for me, so try pinging a few other hosts as
well, and pass the test if any ping succeeds.

Also add a timeout, so the entire test run doesn't fail if a ping blocks for
some reason.
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**: [20260413.4](https://dev.azure.com/dnceng/internal/_build/results?buildId=2949726) ([310341](https://maestro.dot.net/channel/9626/github:dotnet:dotnet/build/310341))
- **Date Produced**: April 14, 2026 10:22:10 PM UTC
- **Commit**: [2476be2e45bb47d8dd6604fac803cef03198f2a7](dotnet/dotnet@2476be2)
- **Branch**: [release/10.0.3xx](https://github.com/dotnet/dotnet/tree/release/10.0.3xx)

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

[3]: dotnet/dotnet@b510aa8...2476be2
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**: [20260414.1](https://dev.azure.com/dnceng/internal/_build/results?buildId=2950778) ([310284](https://maestro.dot.net/channel/2/github:dotnet:xharness/build/310284))
- **Date Produced**: April 14, 2026 2:47:53 PM UTC
- **Commit**: [84f48de9bd52fdee2a3b42e45e0b21b79413005e](dotnet/xharness@84f48de)
- **Branch**: [main](https://github.com/dotnet/xharness/tree/main)

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

[1]: dotnet/xharness@0668c80...84f48de
@dalexsoto dalexsoto added this to the xcode26.5 milestone Apr 15, 2026
@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines:
Successfully started running 1 pipeline(s).

@dalexsoto dalexsoto enabled auto-merge April 15, 2026 18:41
@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.

@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 #f636b3e] Test results 🔥

Test results

❌ Tests failed on VSTS: test results

0 tests crashed, 1 tests failed, 157 tests passed.

Failures

❌ dotnettests tests (macOS)

1 tests failed, 0 tests passed.

Failed tests

  • DotNet tests: Failed (Execution failed with exit code 1)
    • Xamarin.Tests.AppSizeTest.CoreCLR_Interpreter(MacOSX,"osx-arm64;...: App size changed significantly (+44,011 bytes (43.0 KB = 0.0 MB) different > tolerance of +-10,240 bytes (10.0 KB = 0.0 MB)). Ex...

Html Report (VSDrops) Download

Successes

✅ 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 (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: f636b3ecfd62b95238891f15ece78d2e44117789 [PR build]

@dalexsoto dalexsoto force-pushed the dev/alex/mergemainx26.5 branch from f636b3e to 1d99386 Compare April 16, 2026 12:05
@vs-mobiletools-engineering-service2

This comment has been minimized.

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

✅ [CI Build #1d99386] Build passed (Build packages) ✅

Pipeline on Agent
Hash: 1d99386f3a66005233b7a1bfd60c1343bef594d2 [PR build]

@vs-mobiletools-engineering-service2

This comment has been minimized.

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

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

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

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

✅ [CI Build #1d99386] Build passed (Build macOS tests) ✅

Pipeline on Agent
Hash: 1d99386f3a66005233b7a1bfd60c1343bef594d2 [PR build]

@vs-mobiletools-engineering-service2

This comment has been minimized.

@vs-mobiletools-engineering-service2

This comment has been minimized.

@dalexsoto dalexsoto merged commit 6250f8b into xcode26.5 Apr 16, 2026
43 of 46 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.

3 participants