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.

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

CLR hosting #9572

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

CLR hosting #9572

wants to merge 139 commits into from

Conversation

grendello
Copy link
Contributor

@grendello grendello commented Dec 2, 2024

No description provided.

@grendello grendello force-pushed the dev/grendel/clr-host branch from cbc08f4 to 0370d7d Compare December 3, 2024 12:41
@grendello grendello force-pushed the dev/grendel/clr-host branch 2 times, most recently from c085352 to 13bbd93 Compare December 3, 2024 21:15
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
  * Add a version script which hides all the symbols except for the
    handful we have to export.
  * Enable exceptions
* main:
  [ci] Remove references to sdk-insertions (#9731)
  `$(AndroidPackVersionSuffix)`=preview.2 (#9733)
  [Mono.Android] Java.Lang.Object.GetObject<T>() implementation (#9728)
* main:
  [Xamarin.Android.Build.Tasks] Don't Open .aar files with ReadWrite FileAccess (#9737)
* main:
  [tests] fix build warnings as errors in TestRunner.NUnit.NET (#9739)
* main:
  [NativeAOT] Add support for `Application` subclasses (#9716)
  Bump to dotnet/sdk@d6bc7918c0 10.0.100-preview.2.25102.3 (#9726)
  [xa-prep-tasks] fix build errors for long `darc-` branch names (#9740)
* main:
  [NativeAOT] Integrate TryCreatePeer (#9746)
  Bump to dotnet/java-interop@dd3c1d05 (#9745)
Comment on lines 54 to 57
<ResolvedFileToPublish
Condition=" '%(ResolvedFileToPublish.RuntimeIdentifier)' == '' "
Update="@(ResolvedFileToPublish)"
RuntimeIdentifier="$(RuntimeIdentifier)"
/>
Copy link
Member

Choose a reason for hiding this comment

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

If you are using at least a .NET 10 Preview 2 runtime, you can remove this change.

It should successfully use Android RIDs now, and we don't need to replace the linux-bionic RID that was here previously.

* main:
  [XABT] Ensure `$(DocumentationFile)` correctly uses `$(OutputPath)`. (#9755)
  [coreclr] projects with `UseMonoRuntime=false` successfully build (#9754)
  [.github] Update issue templates to include `net10.0-android`. (#9753)
* main:
  [illink] refactor code sharing between ILLink and MSBuild tasks (#9688)
jonpryor pushed a commit that referenced this pull request Feb 6, 2025
Context: #9572

#9572 is prototyping CoreCLR support, and as part of
that it renamed e.g. `src/native/monodroid` to
`src/native/mono/monodroid` -- "inserting" a "runtime" value
underneath `src/native` -- so that CoreCLR code won't be intermingled
with MonoVM code.

Separate out these file moves into a separate PR, to reduce the size
and review complexity of #9572.
* main:
  [native] Move MonoVM runtime to a subdirectory (#9749)
@grendello grendello mentioned this pull request Feb 10, 2025
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