Merge remote-tracking branch 'origin/main' into refactor-jcw

jonpryor · jonpryor · commit 0431ac10194c · 2024-02-20T14:14:59.000-05:00
diff --git a/src/Java.Interop/Java.Interop/JniRuntime.JniMarshalMemberBuilder.cs b/src/Java.Interop/Java.Interop/JniRuntime.JniMarshalMemberBuilder.cs
@@ -28,6 +28,7 @@ public  JniMarshalMemberBuilder        MarshalMemberBuilder        {
 		}
 
 		[DynamicDependency (DynamicallyAccessedMemberTypes.PublicParameterlessConstructor, "Java.Interop.MarshalMemberBuilder", "Java.Interop.Export")]
+		[UnconditionalSuppressMessage ("Trimming", "IL2035", Justification = "Java.Interop.Export.dll is not always present.")]
 		partial void SetMarshalMemberBuilder (CreationOptions options)
 		{
 			if (!options.UseMarshalMemberBuilder) {

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ public JniMarshalMemberBuilder MarshalMemberBuilder {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`[DynamicDependency (DynamicallyAccessedMemberTypes.PublicParameterlessConstructor, "Java.Interop.MarshalMemberBuilder", "Java.Interop.Export")]`
	`31`	`+ [UnconditionalSuppressMessage ("Trimming", "IL2035", Justification = "Java.Interop.Export.dll is not always present.")]`
`31`	`32`	`partial void SetMarshalMemberBuilder (CreationOptions options)`
`32`	`33`	`{`
`33`	`34`	`if (!options.UseMarshalMemberBuilder) {`