[WIP] marshal methods & IntPtr.Size #8156

jonathanpeppers · 2023-06-28T22:06:34Z

jonpryor · 2023-06-28T22:19:05Z

src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsAssemblyRewriter.cs

@@ -114,47 +114,37 @@ public void Rewrite (DirectoryAssemblyResolver resolver, List<string> targetAsse
 				}
 			}

-			var newAssemblyPaths = new List<string> ();
+			var newAssemblyPaths = new List<ValueTuple<string, string>> ();


Can we not use the glorious (string Something, string SomethingElse) tuple syntax?

jonathanpeppers · 2023-06-29T14:46:12Z

This PR is actually an insufficient fix as this list:

https://github.com/xamarin/xamarin-android/blob/efa14e262efa42411783d7ae6869bdde165b68e4/src/Xamarin.Android.Build.Tasks/Utilities/MarshalMethodsAssemblyRewriter.cs#L25

Only contains the first android-arm assembly, and so it can only save this assembly on top of the 4 architectures.

I added a parameter to my test:

public void DoNotErrorOnPerArchJavaTypeDuplicates ([Values(true, false)] bool enableMarshalMethods)

It passes on false and fails on true.

[WIP] marshal methods & IntPtr.Size

d481a15

Fixes: dotnet#8155

jonpryor reviewed Jun 28, 2023

View reviewed changes

jonathanpeppers added 2 commits June 28, 2023 17:22

Use newer C# syntax

b1ae2e9

Test cases

66bfd45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[WIP] marshal methods & IntPtr.Size #8156

[WIP] marshal methods & IntPtr.Size #8156

jonathanpeppers commented Jun 28, 2023

jonpryor Jun 28, 2023

jonathanpeppers commented Jun 29, 2023

[WIP] marshal methods & IntPtr.Size #8156

Are you sure you want to change the base?

[WIP] marshal methods & IntPtr.Size #8156

Conversation

jonathanpeppers commented Jun 28, 2023

jonpryor Jun 28, 2023

Choose a reason for hiding this comment

jonathanpeppers commented Jun 29, 2023