Skip to content
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.

Sign up for GitHub

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

Jump to bottom

CLR hosting #9572

Draft
wants to merge 103 commits into
base: main
Choose a base branch
from
Draft

CLR hosting #9572

wants to merge 103 commits into from

Conversation

grendello
Copy link
Contributor

@grendello grendello commented Dec 2, 2024 •
edited
Loading

No description provided.

@grendello grendello force-pushed the dev/grendel/clr-host branch from cbc08f4 to 0370d7d Compare December 3, 2024 12:41
@grendello
Enable static linking with libc++
4c6b83d 
  * Add a version script which hides all the symbols except for the
    handful we have to export.
  * Enable exceptions
@grendello
Remove C++ ABI compatibility sources
e2f89a4
@grendello
Update apkdesc files
e2ad767
@grendello
Playing around with some ideas
33500bb
@grendello
More consistent use of std::string_view + remove unused code
95ecd76
@grendello
Making EmbeddedAssemblies a static type
539b080 
In process to remove object instances for a slightly faster startup
@grendello
More cleanup
2aa6e2b
@grendello
More move to static, more cleanup
07246e5
@grendello
MonodroidRuntime is static now
6649f01
@grendello
Buglets fixed
51e007a
@grendello
Trying to find out why AppContext.GetData doesn't appear to work
497e094
@grendello
Cleanup
00d300f
@grendello
Lengths and offsets...
69a35ad
@grendello
Cleanup
01c77c0
@grendello
Start using std::format and std::string_view string literals
e0b1e57
@grendello
A bit less of reinterpret_cast<>
15ace79
@grendello
Conversion to std::format continues
28c6439 
Build is broken atm
@grendello
More std::format
98a4054
@grendello
Friendlier, no need to use std::format directly in log_* anymore
ac5c3ed
@grendello
Cleanup
886ef40
@grendello
Cleanup
15d864f
@grendello
Update apkdesc files
00f55b5
@grendello
std::format doesn't like null pointers when printing strings
d383a44
@grendello
Address feedback
5a4d188
@grendello grendello force-pushed the dev/grendel/clr-host branch 2 times, most recently from c085352 to 13bbd93 Compare December 3, 2024 21:15
jonathanpeppers
jonathanpeppers reviewed Dec 3, 2024
View reviewed changes
build-tools/create-packs/Microsoft.Android.Runtime.proj Outdated
Comment on lines 42 to 45
<_AndroidRuntimePackAssets Include="$(MicrosoftAndroidSdkOutDir)lib\$(AndroidRID)\libmono-android.debug.so" />
<_AndroidRuntimePackAssets Include="$(MicrosoftAndroidSdkOutDir)lib\$(AndroidRID)\libmono-android.release.so" />
<_AndroidRuntimePackAssets Condition=" Exists('$(MicrosoftAndroidSdkOutDir)lib\$(AndroidRID)\libmono-android.debug.so') " Include="$(MicrosoftAndroidSdkOutDir)lib\$(AndroidRID)\libmono-android.debug.so" />
<_AndroidRuntimePackAssets Condition=" Exists('$(MicrosoftAndroidSdkOutDir)lib\$(AndroidRID)\libmono-android.release.so') " Include="$(MicrosoftAndroidSdkOutDir)lib\$(AndroidRID)\libmono-android.release.so" />
<_AndroidRuntimePackAssets Condition=" Exists('$(MicrosoftAndroidSdkOutDir)lib\$(AndroidRID)\libnet-android.debug.so') " Include="$(MicrosoftAndroidSdkOutDir)lib\$(AndroidRID)\libnet-android.debug.so" />
<_AndroidRuntimePackAssets Condition=" Exists('$(MicrosoftAndroidSdkOutDir)lib\$(AndroidRID)\libnet-android.release.so') " Include="$(MicrosoftAndroidSdkOutDir)lib\$(AndroidRID)\libnet-android.release.so" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm fixing this up in #9583, but maybe I can split up part of it into a smaller PR.

@grendello grendello force-pushed the dev/grendel/clr-host branch from 13bbd93 to 82cfb8a Compare December 4, 2024 18:47
@grendello
Enable static linking with libc++
18fd987 
  * Add a version script which hides all the symbols except for the
    handful we have to export.
  * Enable exceptions
jonathanpeppers added a commit that referenced this pull request Jan 15, 2025
@jonathanpeppers
[Xamarin.Android.Build.Tasks] introduce $(_AndroidRuntime) property
4afa28d 
Context: #9572 (comment)
Context: https://github.com/xamarin/xamarin-macios/blob/2009c571aa8a975ab0e0b1785e5484dbd64d6f9b/dotnet/targets/Xamarin.Shared.Sdk.targets#L1004-L1006

To align with xamarin/xamarin-macios, the following public MSBuild
properties can be used to select a runtime for iOS, macOS, etc.:

* `$(UseMonoRuntime)=true`: MonoVM
* `$(UseMonoRuntime)=false`: CoreCLR
* `$(PublishAot)=true`: NativeAOT
* Defaults if blank, select MonoVM

Introduce a private `$(_AndroidRuntime)` property we can use
throughout our build to know which runtime is being targetted.

This way, if a new property is designed in the future, we can keep
using `$(_AndroidRuntime)` and simply update the defaults.
@jonathanpeppers jonathanpeppers mentioned this pull request Jan 15, 2025
Merged
@grendello
Merge branch 'main' into dev/grendel/clr-host
0438495 
* main:
  [ci] Run Mac MSBuild tests on `macos-14-arm64` (#9665)
@grendello
Update to match main
b857673
@grendello
Remove unnecessary sources
394a016
@grendello
Import changes from #9686
9ca6c05
@grendello
Mono -> MonoVM
425301c
@grendello
Fixes
2d4691f
@grendello
Fixes and workarounds to make CoreCLR build happen
198acae
@grendello
Merge branch 'main' into dev/grendel/clr-host
9eef4c4 
* main:
  [Mono.Android-Tests] Ignore "BadGateway" test failures. (#9687)
  [build] Build with Microsoft OpenJDK 21.0.5 (#9683)
@grendello
Hack to be able to use CoreCLR runtime pack we created
579505f
@grendello
Fake CoreCLR runtime pack works. Next step: use correct CoreCLR inste…
66a32f5 
…ad of the linux-bionic one
@grendello
Merge branch 'main' into dev/grendel/clr-host
79a7006 
* main:
  [Mono.Android] Java.Interop Unification! (#9640)
@grendello
Add support for local version of CoreCLR runtime pack
cc64d57
@grendello
Support for CoreCLR in xaprepare
9421f41
@grendello
Limit CoreCLR builds to android-arm64 for now
487dac0
jonpryor pushed a commit that referenced this pull request Jan 21, 2025
@jonathanpeppers
[Xamarin.Android.Build.Tasks] introduce $(_AndroidRuntime) property (…
8aca6e6 
…#9686)

Context: #9572 (comment)
Context: https://github.com/xamarin/xamarin-macios/blob/2009c571aa8a975ab0e0b1785e5484dbd64d6f9b/dotnet/targets/Xamarin.Shared.Sdk.targets#L1004-L1006

To align with xamarin/xamarin-macios, the following public MSBuild
properties can be used to select a runtime for iOS, macOS, etc.:

  * `$(UseMonoRuntime)=true`: MonoVM
  * `$(UseMonoRuntime)=false`: CoreCLR
  * `$(PublishAot)=true`: NativeAOT
  * Defaults if blank, select MonoVM

Introduce a private `$(_AndroidRuntime)` property we can use
throughout our build to know which runtime is being targeted.

This way, if a new property is designed in the future, we can keep
using `$(_AndroidRuntime)` and simply update the defaults.
@grendello
Build tweaks to make progress easier
3803f37 
Some of those changes will stay, most will go. Makes it possible to move foreward for now
without having CoreCLR packs for all the targets.

Only arm64 supported atm
@grendello
Merge branch 'main' into dev/grendel/clr-host
0e0b648 
* main:
  [Xamarin.Android.Build.Tasks] introduce `$(_AndroidRuntime)` property (#9686)
@grendello
A couple more hacks
e47f577 
This time to include the actual CoreCLR Android runtime in the apk
@grendello
Merge branch 'main' into dev/grendel/clr-host
f027b24 
* main:
  Bump to dotnet/java-interop@9b1d878 (#9694)
  Bump to dotnet/sdk@aca4b810e2 10.0.100-alpha.1.25069.2 (#9696)
@grendello
Fix JCW generation for CoreCLR
c64912a
@grendello
A handful of fixlets
7e8b92c
@grendello
Merge branch 'main' into dev/grendel/clr-host
8041644 
* main:
  [XABT] Create separate assembly preparation tasks. (#9637)
  Add `activity-alias` support (#9654)
  [CI] Grab 'dotnet-install.sh' script directly from GitHub. (#9699)
@grendello
Fix JCW again
4ff8fd0
@grendello
Merge branch 'main' into dev/grendel/clr-host
130161e 
* main:
  [NativeAOT] add sample that runs successfully (#9636)
@grendello
Revert "Fix JCW again", trying to figure out what's actually broken
276a4cf 
This reverts commit 4ff8fd0.
@grendello
Add some temporary logging
d834edc
@grendello
Merge branch 'main' into dev/grendel/clr-host
9906b4c 
* main:
  [Xamarin.Android.Build.Tasks] Rework DTB to use .aar files directly (#9700)
@grendello
Runtime config properties now stored in libxamarin-app.so
22fb1c3 
CoreCLR will not use the assembly blob at all, instead the properties
will be handed over to the runtime per request.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonathanpeppers jonathanpeppers jonathanpeppers left review comments

@dellis1972 dellis1972 Awaiting requested review from dellis1972 dellis1972 will be requested when the pull request is marked ready for review dellis1972 is a code owner

@jonpryor jonpryor Awaiting requested review from jonpryor jonpryor will be requested when the pull request is marked ready for review jonpryor is a code owner

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@grendello @jonathanpeppers