Skip to content

[net10.0] Merge main into net10.0. #23104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 19 commits into from
Jun 23, 2025

Conversation

rolfbjarne
Copy link
Member

No description provided.

rolfbjarne and others added 6 commits June 19, 2025 11:01
Some of the delegates in the framework were wrong.
…1: Build ID 11794572 (#23089)

Localized file check-in by OneLocBuild Task: Build definition ID 14411: Build ID 11794572 (#23089)

This is the pull request automatically created by the OneLocBuild task in the build process to check-in localized files generated based upon translation source files (.lcl files) handed-back from the downstream localization pipeline. If there are issues in translations, visit https://aka.ms/icxLocBug and log bugs for fixes. The OneLocBuild wiki is https://aka.ms/onelocbuild and the localization process in general is documented at https://aka.ms/AllAboutLoc.
@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.

mandel-macaque and others added 9 commits June 20, 2025 16:42
Add the correct nullability to the delegates.

---------

Co-authored-by: GitHub Actions Autoformatter <github-actions-autoformatter@xamarin.com>
…all. (#23091)

Use the block literal pointer created in the conversions and cast it to
a NativeHandle.

---------

Co-authored-by: GitHub Actions Autoformatter <github-actions-autoformatter@xamarin.com>
#23114)

Complete the property getter implementation by:

1. Including the return and the param attributes.
2. Convert the return type to the correct delegate.

This was done after completing the Trampolines.g.cs so that we could
reuse a number of methods needed to generate that file. This should mean
that we finally completed all possible properyt getters.

---------

Co-authored-by: GitHub Actions Autoformatter <github-actions-autoformatter@xamarin.com>
…23117)

The code is the same for properties, trampolines and methods. We add a
intermediate readonly struct to customize the conversion and that way we
can share the logic.

---------

Co-authored-by: GitHub Actions Autoformatter <github-actions-autoformatter@xamarin.com>
The refactor was wrong and we refactored the
GetTrampolineInitializationByRefArgument whichs does native -> managed
instead of GetTrampolineNativeInvokeArgumentInitializations.

This commit undoos that mistake.

---------

Co-authored-by: GitHub Actions Autoformatter <github-actions-autoformatter@xamarin.com>
…20250620053646603 to main (#23095)

LEGO: Pull request from lego/hb_5df43909-4a19-4f55-bc3f-9ea8fccf3c82_20250620053646603 to main with localized lcls

---------

Co-authored-by: CSIGS-Expires-nextweek <csigs@outlook.com>
@vs-mobiletools-engineering-service2

This comment has been minimized.

…tional branches. (#23107)

When handling an unconditional branch, we need to mark all the instructions
until the end of the method, not only until the end of block that is currently
being processed.

This fixes a problem where the dead code optimizer would optimize away code
after an unconditonal branch, ending up with invalid IL because code that
wasn't optimized away would have branches into the removed code.
@vs-mobiletools-engineering-service2

This comment has been minimized.

@vs-mobiletools-engineering-service2
Copy link
Collaborator

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

Pipeline on Agent
Hash: b960a6938fd99aef2c4dbad01bb9d29a2db6c7bc [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

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

Pipeline on Agent
Hash: b960a6938fd99aef2c4dbad01bb9d29a2db6c7bc [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

✅ API diff for current PR / commit

.NET ( No breaking changes )

✅ API diff vs stable

.NET ( No breaking changes )

ℹ️ Generator diff

Generator Diff: vsdrops (html) vsdrops (raw diff) gist (raw diff) - Please review changes)

Pipeline on Agent
Hash: b960a6938fd99aef2c4dbad01bb9d29a2db6c7bc [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

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

Pipeline on Agent
Hash: b960a6938fd99aef2c4dbad01bb9d29a2db6c7bc [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

💻 [CI Build #b960a69] Tests on macOS X64 - Mac Sonoma (14) passed 💻

All tests on macOS X64 - Mac Sonoma (14) passed.

Pipeline on Agent
Hash: b960a6938fd99aef2c4dbad01bb9d29a2db6c7bc [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

💻 [CI Build #b960a69] Tests on macOS M1 - Mac Monterey (12) passed 💻

All tests on macOS M1 - Mac Monterey (12) passed.

Pipeline on Agent
Hash: b960a6938fd99aef2c4dbad01bb9d29a2db6c7bc [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

💻 [CI Build #b960a69] Tests on macOS M1 - Mac Ventura (13) passed 💻

All tests on macOS M1 - Mac Ventura (13) passed.

Pipeline on Agent
Hash: b960a6938fd99aef2c4dbad01bb9d29a2db6c7bc [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

💻 [CI Build #b960a69] Tests on macOS arm64 - Mac Sequoia (15) passed 💻

All tests on macOS arm64 - Mac Sequoia (15) passed.

Pipeline on Agent
Hash: b960a6938fd99aef2c4dbad01bb9d29a2db6c7bc [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

🚀 [CI Build #b960a69] Test results 🚀

Test results

✅ All tests passed on VSTS: test results.

🎉 All 124 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 4 tests passed. Html Report (VSDrops) Download
✅ linker: All 44 tests passed. Html Report (VSDrops) Download
✅ monotouch (iOS): All 8 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 10 tests passed. Html Report (VSDrops) Download
✅ msbuild: All 2 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

Pipeline on Agent
Hash: b960a6938fd99aef2c4dbad01bb9d29a2db6c7bc [PR build]

@rolfbjarne rolfbjarne merged commit 3f99143 into net10.0 Jun 23, 2025
44 checks passed
@rolfbjarne rolfbjarne deleted the dev/rolf/bump-main-in-net10.0-2025-06-20 branch June 23, 2025 16:05
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