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

Enable marshal methods by default, except when Blazor is used #8925

Merged
merged 21 commits into from
May 28, 2024
+95 −73
Merged

Enable marshal methods by default, except when Blazor is used #8925

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
e35296e
Enable marshal methods by default, except when Blazor is used
grendello May 6, 2024
6f2371e
Update src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
grendello May 6, 2024
8c7aa5d
Merge branch 'main' into dev/grendel/enable-marshal-methods
grendello May 13, 2024
9275fa3
Merge branch 'main' into dev/grendel/enable-marshal-methods
grendello May 14, 2024
6bbcfdb
Merge branch 'main' into dev/grendel/enable-marshal-methods
grendello May 15, 2024
459d4b1
Update apkdesc files
grendello May 15, 2024
79d6968
Merge branch 'main' into dev/grendel/enable-marshal-methods
grendello May 16, 2024
5eb2542
Merge branch 'main' into dev/grendel/enable-marshal-methods
grendello May 16, 2024
77cf560
Disable marshal methods when IL stripping is enabled
grendello May 17, 2024
9ea817f
Hush MSBuild warnings which break some tests
grendello May 17, 2024
f89003b
Merge branch 'main' into dev/grendel/enable-marshal-methods
grendello May 17, 2024
8c74570
Update apkdesc
grendello May 17, 2024
ac317ff
Update apkdesc
grendello May 17, 2024
4a6c033
Merge branch 'main' into dev/grendel/enable-marshal-methods
grendello May 21, 2024
54d04f1
Re-enable marshal methods when ILStrip is enabled
grendello May 21, 2024
2127b04
Create the stamp dir first
grendello May 21, 2024
f8d51c7
Merge branch 'main' into dev/grendel/enable-marshal-methods
grendello May 21, 2024
705b573
Be careful to touch the stamp file if ILStrip actually ran...
grendello May 22, 2024
ad416d2
Fix expression syntax
grendello May 22, 2024
219ca31
Fix the expression syntax
grendello May 22, 2024
e779c21
Round and round we go... another syntax fixup
grendello May 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...marin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.Aot.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,11 +159,11 @@ They run in a context of an inner build with a single $(RuntimeIdentifier).
<_StampDir>$(_AndroidStampDirectory)\..\..\stamp</_StampDir>
</PropertyGroup>
<MakeDir
Condition=" '$(AndroidStripILAfterAOT)' == 'true' and '%(_UpdateStamp.Count)' > 0 "
Condition=" '$(AndroidStripILAfterAOT)' == 'true' and '@(_UpdateStamp->Count())' gt; 0 "
Directories="$(_StampDir)"
/>
<Touch
Condition=" '$(AndroidStripILAfterAOT)' == 'true' and '%(_UpdateStamp.Count)' > 0 "
Condition=" '$(AndroidStripILAfterAOT)' == 'true' and '@(_UpdateStamp->Count())' gt; 0 "
dellis1972 marked this conversation as resolved.
Show resolved Hide resolved
Files="$(_StampDir)\_GenerateJavaStubs.stamp"
AlwaysCreate="True"
/>
Expand Down
Loading