Skip to content

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

Merged
rolfbjarne merged 7 commits intonet11.0from
merge/main-to-net11.0
Apr 14, 2026
Merged

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

Conversation

@github-actions
Copy link
Copy Markdown
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:

  • rolfbjarne
  • dependabot[bot]
  • 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.

dotnet-maestro bot and others added 6 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).
Reset patterns:
- global.json
- NuGet.config
- eng/Version.Details.xml
- eng/Version.Details.props
- eng/common/*
@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines:
2 pipeline(s) require an authorized user to comment /azp run to run.

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

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines:
2 pipeline(s) require an authorized user to comment /azp run to run.

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

✅ [CI Build #17751cd] Build passed (Build packages) ✅

Pipeline on Agent
Hash: 17751cdde09d57f334a0b3add23616fd458d4930 [PR build]

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

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

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

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

✅ [CI Build #17751cd] Build passed (Build macOS tests) ✅

Pipeline on Agent
Hash: 17751cdde09d57f334a0b3add23616fd458d4930 [PR build]

@vs-mobiletools-engineering-service2

This comment has been minimized.

@rolfbjarne rolfbjarne enabled auto-merge April 14, 2026 14:20
@vs-mobiletools-engineering-service2
Copy link
Copy Markdown
Collaborator

🚀 [CI Build #17751cd] Test results 🚀

Test results

✅ All tests passed on VSTS: test results.

🎉 All 161 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 15 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ monotouch (MacCatalyst): All 19 tests passed. Html Report (VSDrops) Download
✅ monotouch (macOS): All 12 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ monotouch (tvOS): All 15 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

Linux Build Verification

Linux build succeeded

Pipeline on Agent
Hash: 17751cdde09d57f334a0b3add23616fd458d4930 [PR build]

@rolfbjarne rolfbjarne merged commit c860839 into net11.0 Apr 14, 2026
46 checks passed
@rolfbjarne rolfbjarne deleted the merge/main-to-net11.0 branch April 14, 2026 15:19
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.

2 participants