-
Notifications
You must be signed in to change notification settings - Fork 533
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
Remove custom types marking for types which XA does not own for netcore #5354
Conversation
d6b9365
to
79f6c78
Compare
@@ -217,7 +217,11 @@ public void InstallWithoutSharedRuntime () | |||
// "The Shared Runtime should not have been installed."); | |||
var directorylist = GetContentFromAllOverrideDirectories (proj.PackageName); | |||
StringAssert.Contains ($"{proj.ProjectName}.dll", directorylist, $"{proj.ProjectName}.dll should exist in the .__override__ directory."); | |||
StringAssert.Contains ($"System.dll", directorylist, $"System.dll should exist in the .__override__ directory."); | |||
if (Builder.UseDotNet) | |||
StringAssert.Contains ($"System.Private.CoreLib.dll", directorylist, $"System.Private.CoreLib.dll should exist in the .__override__ directory."); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If this test fails, you might check for a different assembly like System.Linq.dll
. I think System.Private.CoreLib.dll
can be in a sub-directory like armeabi-v7a
or x86
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
System.Private.CoreLib.dll is probably only reliable marker. I hope System.Linq.dll
will be gone too next week ;-)
@radekdoulik: please address the merge conflicts. Additionally, you had mentioned that this change would "implicitly" break apps requiring serialization, e.g. dotnet/runtime#45559 Please write up a description/explanation for the non-obvious relation here. |
This is or will be handled by BCL libraries and XA tooling should try not to interfere with more fine tuned handling done by BCL.
This is or will be handled by BCL libraries and XA tooling should try
not to interfere with more fine tuned handling done by BCL.
Simplifies
[Preserve]
attribute implementation and removesold code to preserve serialization, which doesn't work
well with new .NET5/6 runtime libraries. (the old serialization
code: https://github.com/xamarin/xamarin-android/blob/master/src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/ApplyPreserveAttribute.cs#L57-L82)
The serialization is currently broken
and will be fixed in runtime libs. Part of
CustomLinkDescriptionPreserve
test is thus disabled.
Also the attribute removal is now handled in illink.
The serialization fix leads to great reduction of assemblies size in simple
XA test app by cca 1MB, apkdiff before/after: