From df05d7c2c6ef64c30018a0769e9f0a9c23dc9e7c Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 13 May 2026 11:57:15 +0200
Subject: [PATCH 01/39] feat: Make HybridWebView JS-to-.NET invocation trimming
 and AOT safe

- Remove HybridWebView feature switch (IsHybridWebViewSupported) entirely
- Remove class-level [RequiresUnreferencedCode]/[RequiresDynamicCode] from HybridWebViewHandler and platform classes
- Register HybridWebViewHandler and IHybridWebViewTaskManager unconditionally
- Add safe SetInvokeJavaScriptTarget<T>(T target, JsonSerializerContext) overload
- Mark legacy SetInvokeJavaScriptTarget<T>(T target) as [Obsolete]
- Build method cache at registration time with pre-resolved JsonTypeInfos
- AOT-safe invocation path: dictionary lookup -> MethodInfo.Invoke -> PropertyInfo.GetValue -> JsonSerializer.Serialize(object, JsonTypeInfo)
- Add interceptor source generator that replaces BuildMethodCache with fully typed delegates at compile time
- Update tests and sample to use the new safe overload
- Add 11 unit tests for BuildMethodCache (method filtering, error handling, delegate invocation)
- Add device tests for interceptor-vs-fallback path verification

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 docs/design/FeatureSwitches.md                |   7 +-
 .../Pages/Controls/HybridWebViewPage.xaml.cs  |   4 +-
 .../Microsoft.Maui.Controls.targets           |   6 +-
 .../netstandard2.0/maui-blazor.aotprofile.txt |   1 -
 .../netstandard2.0/maui-sc.aotprofile.txt     |   1 -
 .../netstandard2.0/maui.aotprofile.txt        |   1 -
 src/Controls/src/Core/Controls.Core.csproj    |   6 +-
 .../Core/Hosting/AppHostBuilderExtensions.cs  |  12 +-
 .../src/Core/HybridWebView/HybridWebView.cs   |  79 ++++-
 .../net-android/PublicAPI.Unshipped.txt       |   1 +
 .../PublicAPI/net-ios/PublicAPI.Unshipped.txt |   3 +-
 .../net-maccatalyst/PublicAPI.Unshipped.txt   |   1 +
 .../net-tizen/PublicAPI.Unshipped.txt         |   1 +
 .../net-windows/PublicAPI.Unshipped.txt       |   1 +
 .../PublicAPI/net/PublicAPI.Unshipped.txt     |   1 +
 .../netstandard/PublicAPI.Unshipped.txt       |   1 +
 .../HybridWebViewTests_ExceptionHandling.cs   |  40 ++-
 .../HybridWebViewTests_InvokeDotNetFails.cs   |  10 +-
 ...dWebViewTests_SetInvokeJavaScriptTarget.cs |  49 ++-
 src/Core/src/Core.csproj                      |   1 +
 src/Core/src/Core/IHybridWebView.cs           |  25 +-
 .../HybridWebViewHandler.Windows.cs           |   7 +-
 .../HybridWebView/HybridWebViewHandler.cs     | 275 +++++++++++++---
 .../HybridWebView/HybridWebViewHandler.iOS.cs |  11 +-
 .../Core.HybridWebViewSourceGen.csproj        |  33 ++
 .../HybridWebViewInvokeTargetGenerator.cs     | 306 ++++++++++++++++++
 .../src/Platform/Android/MauiHybridWebView.cs |   7 +-
 .../Android/MauiHybridWebViewClient.cs        |   5 -
 .../src/Platform/Windows/MauiHybridWebView.cs |   7 +-
 .../net-android/PublicAPI.Unshipped.txt       |   3 +
 .../PublicAPI/net-ios/PublicAPI.Unshipped.txt |   1 +
 .../net-maccatalyst/PublicAPI.Unshipped.txt   |   1 +
 .../net-tizen/PublicAPI.Unshipped.txt         |   3 +
 .../net-windows/PublicAPI.Unshipped.txt       |   3 +
 .../src/PublicAPI/net/PublicAPI.Unshipped.txt |   7 +-
 .../netstandard/PublicAPI.Unshipped.txt       |   3 +
 .../netstandard2.0/PublicAPI.Unshipped.txt    |   7 +-
 src/Core/src/RuntimeFeature.cs                |  11 -
 .../HybridWebViewBuildMethodCacheTests.cs     | 198 ++++++++++++
 39 files changed, 1001 insertions(+), 138 deletions(-)
 create mode 100644 src/Core/src/HybridWebViewSourceGen/Core.HybridWebViewSourceGen.csproj
 create mode 100644 src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs
 create mode 100644 src/Core/tests/UnitTests/HybridWebViewBuildMethodCacheTests.cs

diff --git a/docs/design/FeatureSwitches.md b/docs/design/FeatureSwitches.md
index 30e82b0b38f5..833c0c5d3a29 100644
--- a/docs/design/FeatureSwitches.md
+++ b/docs/design/FeatureSwitches.md
@@ -14,7 +14,6 @@ The following switches are toggled for applications running on Mono for `TrimMod
 | MauiImplicitCastOperatorsUsageViaReflectionSupport | Microsoft.Maui.RuntimeFeature.IsImplicitCastOperatorsUsageViaReflectionSupported | When disabled, MAUI won't look for implicit cast operators when converting values from one type to another. This feature is not trim-compatible. |
 | _MauiBindingInterceptorsSupport | Microsoft.Maui.RuntimeFeature.AreBindingInterceptorsSupported | When disabled, MAUI won't intercept any calls to `SetBinding` methods and try to compile them. Enabled by default. |
 | MauiEnableXamlCBindingWithSourceCompilation | Microsoft.Maui.RuntimeFeature.XamlCBindingWithSourceCompilationEnabled | When enabled, MAUI will compile all bindings, including those where the `Source` property is used. |
-| MauiHybridWebViewSupported | Microsoft.Maui.RuntimeFeature.IsHybridWebViewSupported | Enables HybridWebView, which makes use of dynamic System.Text.Json serialization features |
 | MauiNamescopesSupported | Microsoft.Maui.RuntimeFeature.AreNamescopesSupported | Enable support for Namescopes, FindByName if the application uses it, or to keep supporting runtime and XamlC XAML inflators |
 | EnableDiagnostics | Microsoft.Maui.RuntimeFeature.EnableDiagnostics | Enables diagnostic for the running app |
 | EnableMauiDiagnostics | Microsoft.Maui.RuntimeFeature.EnableMauiDiagnostics | Enables MAUI specific diagnostics, like VisualDiagnostics and BindingDiagnostics. Defaults to EnableDiagnostics |
@@ -100,9 +99,7 @@ This feature is a counterpart of [XAML Compiled bindings](https://learn.microsof
 
 It is necessary to use this feature instead of the string-based bindings in NativeAOT apps and in apps with full trimming enabled.
 
-## MauiHybridWebViewSupported
-
-When this feature is disabled, `HybridWebView` will not be available. This is the default for projects using `TrimMode=full` or `PublishAot=true`.
+## MauiEnableXamlCBindingWithSourceCompilation
 
 ### Example use-case
 
@@ -124,8 +121,6 @@ Compiled binding in XAML:
 <Label Text="{Binding Customer.Name}" x:DataType="local:PageViewModel" />
 ```
 
-## MauiEnableXamlCBindingWithSourceCompilation
-
 XamlC skipped compilation of bindings with the `Source` property set to any value in previous releases. Some bindings might start producing build errors or start failing at runtime after this feature is enabled. After enabling this feature, make sure all bindings have the right `x:DataType` so they are compiled correctly. For bindings which should not be compiled, clear the data type like this:
 ```
 {Binding MyProperty, Source={x:Reference MyTarget}, x:DataType={x:Null}}
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/HybridWebViewPage.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/Controls/HybridWebViewPage.xaml.cs
index 673296d2b3c5..638d004bc3bc 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/HybridWebViewPage.xaml.cs
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/HybridWebViewPage.xaml.cs
@@ -14,7 +14,7 @@ public HybridWebViewPage()
 		{
 			InitializeComponent();
 
-			hwv.SetInvokeJavaScriptTarget<DotNetMethods>(new DotNetMethods(this));
+			hwv.SetInvokeJavaScriptTarget<DotNetMethods>(new DotNetMethods(this), SampleInvokeJsContext.Default);
 		}
 
 		int count;
@@ -128,6 +128,8 @@ public class ComputationResult
 
 		[JsonSourceGenerationOptions(WriteIndented = true)]
 		[JsonSerializable(typeof(ComputationResult))]
+		[JsonSerializable(typeof(SyncReturn))]
+		[JsonSerializable(typeof(int))]
 		[JsonSerializable(typeof(double))]
 		[JsonSerializable(typeof(string))]
 		[JsonSerializable(typeof(Dictionary<string, string>))]
diff --git a/src/Controls/src/Build.Tasks/nuget/buildTransitive/netstandard2.0/Microsoft.Maui.Controls.targets b/src/Controls/src/Build.Tasks/nuget/buildTransitive/netstandard2.0/Microsoft.Maui.Controls.targets
index 1bae631fbeb1..aea1cc349cbb 100644
--- a/src/Controls/src/Build.Tasks/nuget/buildTransitive/netstandard2.0/Microsoft.Maui.Controls.targets
+++ b/src/Controls/src/Build.Tasks/nuget/buildTransitive/netstandard2.0/Microsoft.Maui.Controls.targets
@@ -38,6 +38,7 @@
 	<PropertyGroup>
 		<_MauiBindingInterceptorsSupport Condition=" '$(_MauiBindingInterceptorsSupport)' == '' and '$(DisableMauiAnalyzers)' != 'true' ">true</_MauiBindingInterceptorsSupport>
 		<InterceptorsPreviewNamespaces Condition=" '$(_MauiBindingInterceptorsSupport)' == 'true' ">$(InterceptorsPreviewNamespaces);Microsoft.Maui.Controls.Generated</InterceptorsPreviewNamespaces>
+		<InterceptorsPreviewNamespaces>$(InterceptorsPreviewNamespaces);Microsoft.Maui.Generated</InterceptorsPreviewNamespaces>
 	</PropertyGroup>
 	<ItemGroup Condition=" '$(_MauiBindingInterceptorsSupport)' == 'true' ">
 		<Analyzer Include="$(MSBuildThisFileDirectory)Microsoft.Maui.Controls.BindingSourceGen.dll" IsImplicitlyDefined="true" />
@@ -322,7 +323,6 @@
       <MauiQueryPropertyAttributeSupport Condition="'$(MauiQueryPropertyAttributeSupport)' == ''">false</MauiQueryPropertyAttributeSupport>
       <MauiImplicitCastOperatorsUsageViaReflectionSupport Condition="'$(MauiImplicitCastOperatorsUsageViaReflectionSupport)' == ''">false</MauiImplicitCastOperatorsUsageViaReflectionSupport>
       <MauiEnableXamlCBindingWithSourceCompilation Condition="'$(MauiEnableXamlCBindingWithSourceCompilation)' == ''">true</MauiEnableXamlCBindingWithSourceCompilation>
-      <MauiHybridWebViewSupported Condition="'$(MauiHybridWebViewSupported)' == ''">false</MauiHybridWebViewSupported>
       <MauiCssEnabled Condition="'$(MauiCssEnabled)' == '' and '@(MauiCss->Count())' == '0'">false</MauiCssEnabled>
       <!-- FIXME: https://github.com/xamarin/xamarin-macios/issues/22065 -->
       <MobileAggressiveAttributeTrimming Condition="'$(PublishAot)' == 'true' and '$(MobileAggressiveAttributeTrimming)' == ''">false</MobileAggressiveAttributeTrimming>
@@ -356,10 +356,6 @@
                                       Condition="'$(MauiEnableXamlCBindingWithSourceCompilation)' != ''"
                                       Value="$(MauiEnableXamlCBindingWithSourceCompilation)"
                                       Trim="false" />
-      <RuntimeHostConfigurationOption Include="Microsoft.Maui.RuntimeFeature.IsHybridWebViewSupported"
-                                      Condition="'$(MauiHybridWebViewSupported)' != ''"
-                                      Value="$(MauiHybridWebViewSupported)"
-                                      Trim="true" />
       <RuntimeHostConfigurationOption Include="Microsoft.Maui.RuntimeFeature.IsCssEnabled"
                                       Condition="'$(MauiCssEnabled)' != ''"
                                       Value="$(MauiCssEnabled)"
diff --git a/src/Controls/src/Build.Tasks/nuget/buildTransitive/netstandard2.0/maui-blazor.aotprofile.txt b/src/Controls/src/Build.Tasks/nuget/buildTransitive/netstandard2.0/maui-blazor.aotprofile.txt
index 089880bcfb33..bcb43fccf747 100644
--- a/src/Controls/src/Build.Tasks/nuget/buildTransitive/netstandard2.0/maui-blazor.aotprofile.txt
+++ b/src/Controls/src/Build.Tasks/nuget/buildTransitive/netstandard2.0/maui-blazor.aotprofile.txt
@@ -312,7 +312,6 @@ Methods:
 	bool Microsoft.Maui.RuntimeFeature:get_EnableDiagnostics ()
 	bool Microsoft.Maui.RuntimeFeature:get_EnableMauiAspire ()
 	bool Microsoft.Maui.RuntimeFeature:get_EnableMauiDiagnostics ()
-	bool Microsoft.Maui.RuntimeFeature:get_IsHybridWebViewSupported ()
 	bool Microsoft.Maui.RuntimeFeature:InitializeIsMeterSupported ()
 	bool Microsoft.Maui.ViewExtensions:NeedsContainer (Microsoft.Maui.IView)
 	bool Microsoft.Maui.VisualDiagnostics:get_IsEnabled ()
diff --git a/src/Controls/src/Build.Tasks/nuget/buildTransitive/netstandard2.0/maui-sc.aotprofile.txt b/src/Controls/src/Build.Tasks/nuget/buildTransitive/netstandard2.0/maui-sc.aotprofile.txt
index cf63344a2780..4d3e1bdd5ba0 100644
--- a/src/Controls/src/Build.Tasks/nuget/buildTransitive/netstandard2.0/maui-sc.aotprofile.txt
+++ b/src/Controls/src/Build.Tasks/nuget/buildTransitive/netstandard2.0/maui-sc.aotprofile.txt
@@ -560,7 +560,6 @@ Methods:
 	bool Microsoft.Maui.RuntimeFeature:get_EnableDiagnostics ()
 	bool Microsoft.Maui.RuntimeFeature:get_EnableMauiAspire ()
 	bool Microsoft.Maui.RuntimeFeature:get_EnableMauiDiagnostics ()
-	bool Microsoft.Maui.RuntimeFeature:get_IsHybridWebViewSupported ()
 	bool Microsoft.Maui.RuntimeFeature:get_IsImplicitCastOperatorsUsageViaReflectionSupported ()
 	bool Microsoft.Maui.RuntimeFeature:InitializeIsMeterSupported ()
 	bool Microsoft.Maui.Storage.PreferencesImplementation:ContainsKey (string,string)
diff --git a/src/Controls/src/Build.Tasks/nuget/buildTransitive/netstandard2.0/maui.aotprofile.txt b/src/Controls/src/Build.Tasks/nuget/buildTransitive/netstandard2.0/maui.aotprofile.txt
index 4f8d262a6a60..1a9c6861ac41 100644
--- a/src/Controls/src/Build.Tasks/nuget/buildTransitive/netstandard2.0/maui.aotprofile.txt
+++ b/src/Controls/src/Build.Tasks/nuget/buildTransitive/netstandard2.0/maui.aotprofile.txt
@@ -538,7 +538,6 @@ Methods:
 	bool Microsoft.Maui.RuntimeFeature:get_EnableDiagnostics ()
 	bool Microsoft.Maui.RuntimeFeature:get_EnableMauiAspire ()
 	bool Microsoft.Maui.RuntimeFeature:get_EnableMauiDiagnostics ()
-	bool Microsoft.Maui.RuntimeFeature:get_IsHybridWebViewSupported ()
 	bool Microsoft.Maui.RuntimeFeature:get_IsImplicitCastOperatorsUsageViaReflectionSupported ()
 	bool Microsoft.Maui.RuntimeFeature:InitializeIsMeterSupported ()
 	bool Microsoft.Maui.StringExtensions:ContainsChar (string,char)
diff --git a/src/Controls/src/Core/Controls.Core.csproj b/src/Controls/src/Core/Controls.Core.csproj
index d409661ba472..13efc39fe152 100644
--- a/src/Controls/src/Core/Controls.Core.csproj
+++ b/src/Controls/src/Core/Controls.Core.csproj
@@ -54,13 +54,17 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <InterceptorsPreviewNamespaces>$(InterceptorsPreviewNamespaces);Microsoft.Maui.Controls.Generated</InterceptorsPreviewNamespaces>
+    <InterceptorsPreviewNamespaces>$(InterceptorsPreviewNamespaces);Microsoft.Maui.Controls.Generated;Microsoft.Maui.Generated</InterceptorsPreviewNamespaces>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference
       Include="..\..\..\Controls\src\BindingSourceGen\Controls.BindingSourceGen.csproj"
       OutputItemType="Analyzer"
       ReferenceOutputAssembly="false" />
+    <ProjectReference
+      Include="..\..\..\Core\src\HybridWebViewSourceGen\Core.HybridWebViewSourceGen.csproj"
+      OutputItemType="Analyzer"
+      ReferenceOutputAssembly="false" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Controls/src/Core/Hosting/AppHostBuilderExtensions.cs b/src/Controls/src/Core/Hosting/AppHostBuilderExtensions.cs
index 545ce838cabc..5631f127d48b 100644
--- a/src/Controls/src/Core/Hosting/AppHostBuilderExtensions.cs
+++ b/src/Controls/src/Core/Hosting/AppHostBuilderExtensions.cs
@@ -127,11 +127,7 @@ internal static IMauiHandlersCollection AddControlsHandlers(this IMauiHandlersCo
 		handlersCollection.AddHandler<Stepper, StepperHandler>();
 		handlersCollection.AddHandler<Page, PageHandler>();
 		handlersCollection.AddHandler<WebView, WebViewHandler>();
-		if (RuntimeFeature.IsHybridWebViewSupported)
-		{
-			// NOTE: not registered under NativeAOT or TrimMode=Full scenarios
-			handlersCollection.AddHandler<HybridWebView, HybridWebViewHandler>();
-		}
+		handlersCollection.AddHandler<HybridWebView, HybridWebViewHandler>();
 
 		handlersCollection.AddHandler<Border, BorderHandler>();
 		handlersCollection.AddHandler<IContentView, ContentViewHandler>();
@@ -247,11 +243,7 @@ static MauiAppBuilder SetupDefaults(this MauiAppBuilder builder)
 			handlers.AddControlsHandlers();
 		});
 
-		// NOTE: not registered under NativeAOT or TrimMode=Full scenarios
-		if (RuntimeFeature.IsHybridWebViewSupported)
-		{
-			builder.Services.AddScoped<IHybridWebViewTaskManager>(_ => new HybridWebViewTaskManager());
-		}
+		builder.Services.AddScoped<IHybridWebViewTaskManager>(_ => new HybridWebViewTaskManager());
 
 		builder.ConfigureMauiControlsDiagnostics();
 
diff --git a/src/Controls/src/Core/HybridWebView/HybridWebView.cs b/src/Controls/src/Core/HybridWebView/HybridWebView.cs
index 26bd068576c4..332e6dbf019a 100644
--- a/src/Controls/src/Core/HybridWebView/HybridWebView.cs
+++ b/src/Controls/src/Core/HybridWebView/HybridWebView.cs
@@ -1,6 +1,8 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
+using System.Text.Json.Serialization;
 using System.Text.Json.Serialization.Metadata;
 using System.Threading.Tasks;
 
@@ -12,6 +14,8 @@ namespace Microsoft.Maui.Controls
 	/// </summary>
 	public class HybridWebView : View, IHybridWebView
 	{
+		const string LegacyInvokeJavaScriptTargetObsoleteMessage = "This overload uses reflection and dynamic System.Text.Json serialization features and is not compatible with trimming or NativeAOT. Use SetInvokeJavaScriptTarget<T>(T target, JsonSerializerContext jsonSerializerContext) instead.";
+
 		/// <summary>Bindable property for <see cref="DefaultFile"/>.</summary>
 		public static readonly BindableProperty DefaultFileProperty =
 			BindableProperty.Create(nameof(DefaultFile), typeof(string), typeof(HybridWebView), defaultValue: "index.html");
@@ -35,25 +39,86 @@ public string? HybridRoot
 		}
 
 		/// <inheritdoc/>
-		object? IHybridWebView.InvokeJavaScriptTarget { get; set; }
+		object? IHybridWebView.InvokeJavaScriptTarget
+		{
+			get => _invokeJavaScriptTarget;
+			set
+			{
+				_invokeJavaScriptTarget = value;
+				_invokeJavaScriptJsonSerializerContext = null;
+			}
+		}
+
+		object? _invokeJavaScriptTarget;
 
-		[UnconditionalSuppressMessage("Trimming", "IL2114", Justification = "Base type VisualElement specifies DynamicallyAccessedMemberTypes.NonPublicFields: https://github.com/dotnet/runtime/issues/108978#issuecomment-2420091986")]
-		[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
 		Type? _invokeJavaScriptType;
 
 		/// <inheritdoc/>
-		[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
 		Type? IHybridWebView.InvokeJavaScriptType
 		{
 			get => _invokeJavaScriptType;
-			set => _invokeJavaScriptType = value;
+			set
+			{
+				_invokeJavaScriptType = value;
+				_invokeJavaScriptJsonSerializerContext = null;
+			}
+		}
+
+		/// <inheritdoc/>
+		JsonSerializerContext? IHybridWebView.InvokeJavaScriptJsonSerializerContext
+		{
+			get => _invokeJavaScriptJsonSerializerContext;
+			set => _invokeJavaScriptJsonSerializerContext = value;
 		}
 
+		JsonSerializerContext? _invokeJavaScriptJsonSerializerContext;
+
+		/// <inheritdoc/>
+		IReadOnlyDictionary<string, object>? IHybridWebView.InvokeJavaScriptMethodCache
+		{
+			get => _invokeJavaScriptMethodCache;
+			set => _invokeJavaScriptMethodCache = value;
+		}
+
+		IReadOnlyDictionary<string, object>? _invokeJavaScriptMethodCache;
+
 		/// <inheritdoc/>
+		[Obsolete(LegacyInvokeJavaScriptTargetObsoleteMessage)]
 		public void SetInvokeJavaScriptTarget<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>(T target) where T : class
 		{
-			((IHybridWebView)this).InvokeJavaScriptTarget = target;
-			((IHybridWebView)this).InvokeJavaScriptType = typeof(T);
+			SetInvokeJavaScriptTargetCore<T>(target, jsonSerializerContext: null);
+		}
+
+		/// <inheritdoc/>
+		public void SetInvokeJavaScriptTarget<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>(T target, JsonSerializerContext jsonSerializerContext) where T : class
+		{
+			if (jsonSerializerContext is null)
+			{
+				throw new ArgumentNullException(nameof(jsonSerializerContext));
+			}
+
+			SetInvokeJavaScriptTargetCore(target, jsonSerializerContext);
+		}
+
+		void SetInvokeJavaScriptTargetCore<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>(T target, JsonSerializerContext? jsonSerializerContext) where T : class
+		{
+			if (target is null)
+			{
+				throw new ArgumentNullException(nameof(target));
+			}
+
+			_invokeJavaScriptTarget = target;
+			_invokeJavaScriptType = typeof(T);
+			_invokeJavaScriptJsonSerializerContext = jsonSerializerContext;
+
+			if (jsonSerializerContext is not null)
+			{
+				_invokeJavaScriptMethodCache = Maui.Handlers.HybridWebViewHandler.BuildMethodCache(typeof(T), jsonSerializerContext);
+			}
+			else
+			{
+				_invokeJavaScriptMethodCache = null;
+			}
 		}
 
 		void IHybridWebView.RawMessageReceived(string rawMessage)
diff --git a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
index b7339488c40b..d9e5b381fc75 100644
--- a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -1,5 +1,6 @@
 #nullable enable
 *REMOVED*~static Microsoft.Maui.Controls.VisualStateManager.GetVisualStateGroups(Microsoft.Maui.Controls.VisualElement visualElement) -> System.Collections.Generic.IList<Microsoft.Maui.Controls.VisualStateGroup>
+Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 *REMOVED*~static readonly Microsoft.Maui.Controls.Handlers.Compatibility.ShellRenderer.DefaultForegroundColor -> Microsoft.Maui.Graphics.Color
 *REMOVED*~static readonly Microsoft.Maui.Controls.Handlers.Compatibility.ShellRenderer.DefaultTitleColor -> Microsoft.Maui.Graphics.Color
 Microsoft.Maui.Controls.AppThemeBinding
diff --git a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index 6b24df5b8374..177b5749cac2 100644
--- a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -1,4 +1,5 @@
-#nullable enable
+#nullable enable
+Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.Controls.AppThemeBinding
 Microsoft.Maui.Controls.AppThemeBinding.AppThemeBinding() -> void
 ~Microsoft.Maui.Controls.AppThemeBinding.Dark.get -> object
diff --git a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index 6b24df5b8374..a50ae5b8a346 100644
--- a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -1,4 +1,5 @@
 #nullable enable
+Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.Controls.AppThemeBinding
 Microsoft.Maui.Controls.AppThemeBinding.AppThemeBinding() -> void
 ~Microsoft.Maui.Controls.AppThemeBinding.Dark.get -> object
diff --git a/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
index a1e12da20465..220dc459405d 100644
--- a/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
@@ -1,4 +1,5 @@
 #nullable enable
+Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 *REMOVED*~static Microsoft.Maui.Controls.VisualStateManager.GetVisualStateGroups(Microsoft.Maui.Controls.VisualElement visualElement) -> System.Collections.Generic.IList<Microsoft.Maui.Controls.VisualStateGroup>
 Microsoft.Maui.Controls.AppThemeBinding
 Microsoft.Maui.Controls.AppThemeBinding.AppThemeBinding() -> void
diff --git a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index bb9d69e97c91..2df7917dfb4b 100644
--- a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -1,4 +1,5 @@
 #nullable enable
+Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 *REMOVED*~static Microsoft.Maui.Controls.VisualStateManager.GetVisualStateGroups(Microsoft.Maui.Controls.VisualElement visualElement) -> System.Collections.Generic.IList<Microsoft.Maui.Controls.VisualStateGroup>
 Microsoft.Maui.Controls.AppThemeBinding
 Microsoft.Maui.Controls.AppThemeBinding.AppThemeBinding() -> void
diff --git a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
index dabd1a31ed04..e6f6dd96fe09 100644
--- a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -1,4 +1,5 @@
 #nullable enable
+Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.Controls.AppThemeBinding
 Microsoft.Maui.Controls.AppThemeBinding.AppThemeBinding() -> void
 ~Microsoft.Maui.Controls.AppThemeBinding.Dark.get -> object
diff --git a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index e9eedd2e1040..6199d40e77a3 100644
--- a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -1,4 +1,5 @@
 #nullable enable
+Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 ~Microsoft.Maui.Controls.BackButtonBehavior.AccessibilityLabel.get -> string
 ~Microsoft.Maui.Controls.BackButtonBehavior.AccessibilityLabel.set -> void
 ~Microsoft.Maui.Controls.BaseShellItem.BadgeColor.get -> Microsoft.Maui.Graphics.Color
diff --git a/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_ExceptionHandling.cs b/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_ExceptionHandling.cs
index 8c0c065315df..54bda4587c3c 100644
--- a/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_ExceptionHandling.cs
+++ b/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_ExceptionHandling.cs
@@ -1,5 +1,6 @@
 #nullable enable
 using System;
+using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 using Xunit;
 
@@ -16,7 +17,7 @@ public Task CSharpMethodThatThrowsException_ShouldPropagateToJavaScript() =>
 		RunTest("exception-tests.html", async (hybridWebView) =>
 		{
 			var invokeJavaScriptTarget = new TestExceptionMethods();
-			hybridWebView.SetInvokeJavaScriptTarget(invokeJavaScriptTarget);
+			hybridWebView.SetInvokeJavaScriptTarget(invokeJavaScriptTarget, ExceptionHandlingJsonContext.Default);
 
 			// Tell JavaScript to invoke the method that throws an exception
 			hybridWebView.SendRawMessage("ThrowException");
@@ -37,7 +38,7 @@ public Task CSharpAsyncMethodThatThrowsException_ShouldPropagateToJavaScript() =
 		RunTest("exception-tests.html", async (hybridWebView) =>
 		{
 			var invokeJavaScriptTarget = new TestExceptionMethods();
-			hybridWebView.SetInvokeJavaScriptTarget(invokeJavaScriptTarget);
+			hybridWebView.SetInvokeJavaScriptTarget(invokeJavaScriptTarget, ExceptionHandlingJsonContext.Default);
 
 			// Tell JavaScript to invoke the async method that throws an exception
 			hybridWebView.SendRawMessage("ThrowExceptionAsync");
@@ -58,7 +59,7 @@ public Task CSharpMethodThatThrowsCustomException_ShouldIncludeExceptionDetails(
 		RunTest("exception-tests.html", async (hybridWebView) =>
 		{
 			var invokeJavaScriptTarget = new TestExceptionMethods();
-			hybridWebView.SetInvokeJavaScriptTarget(invokeJavaScriptTarget);
+			hybridWebView.SetInvokeJavaScriptTarget(invokeJavaScriptTarget, ExceptionHandlingJsonContext.Default);
 
 			// Tell JavaScript to invoke the method that throws a custom exception
 			hybridWebView.SendRawMessage("ThrowCustomException");
@@ -79,7 +80,7 @@ public Task CSharpMethodThatSucceeds_ShouldStillWorkNormally() =>
 		RunTest("exception-tests.html", async (hybridWebView) =>
 		{
 			var invokeJavaScriptTarget = new TestExceptionMethods();
-			hybridWebView.SetInvokeJavaScriptTarget(invokeJavaScriptTarget);
+			hybridWebView.SetInvokeJavaScriptTarget(invokeJavaScriptTarget, ExceptionHandlingJsonContext.Default);
 
 			// Tell JavaScript to invoke a normal method that doesn't throw
 			hybridWebView.SendRawMessage("SuccessMethod");
@@ -96,6 +97,25 @@ public Task CSharpMethodThatSucceeds_ShouldStillWorkNormally() =>
 			Assert.Contains("false", hasError, StringComparison.Ordinal);
 		});
 
+	[Fact]
+	public Task MissingJsonMetadata_ShouldPropagateToJavaScript() =>
+		RunTest("exception-tests.html", async (hybridWebView) =>
+		{
+			var invokeJavaScriptTarget = new TestExceptionMethods();
+			hybridWebView.SetInvokeJavaScriptTarget(invokeJavaScriptTarget, MissingMetadataJsonContext.Default);
+
+			hybridWebView.SendRawMessage("SuccessMethod");
+
+			await WebViewHelpers.WaitForHtmlStatusSet(hybridWebView);
+
+			var errorType = await hybridWebView.EvaluateJavaScriptAsync("GetLastErrorType()");
+			var errorMessage = await hybridWebView.EvaluateJavaScriptAsync("GetLastErrorMessage()");
+
+			Assert.Equal("InvalidOperationException", errorType);
+			Assert.Equal("The JSON serializer context did not provide metadata for type 'System.String'.", errorMessage);
+			Assert.Equal("SuccessMethod", invokeJavaScriptTarget.LastMethodCalled);
+		});
+
 	private class TestExceptionMethods
 	{
 		public string? LastMethodCalled { get; private set; }
@@ -125,4 +145,14 @@ public string SuccessMethod()
 			return "Success!";
 		}
 	}
-}
\ No newline at end of file
+
+	[JsonSerializable(typeof(string))]
+	internal partial class ExceptionHandlingJsonContext : JsonSerializerContext
+	{
+	}
+
+	[JsonSerializable(typeof(int))]
+	internal partial class MissingMetadataJsonContext : JsonSerializerContext
+	{
+	}
+}
diff --git a/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_InvokeDotNetFails.cs b/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_InvokeDotNetFails.cs
index 0de3289cbc3b..84c5d380346c 100644
--- a/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_InvokeDotNetFails.cs
+++ b/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_InvokeDotNetFails.cs
@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
+using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 using Microsoft.Maui.Controls;
 using Xunit;
@@ -12,7 +13,7 @@ namespace Microsoft.Maui.DeviceTests;
 #if WINDOWS
 [Collection(WebViewsCollection)]
 #endif
-public class HybridWebViewTests_InvokeDotNet : HybridWebViewTestsBase
+public partial class HybridWebViewTests_InvokeDotNet : HybridWebViewTestsBase
 {
 	[Fact]
 	public Task GetRequestsAreBlocked() =>
@@ -103,7 +104,7 @@ private Task RunJavaScriptTest(Func<HybridWebView, InvokeTarget, Task> validateR
 		{
 			var target = new InvokeTarget();
 
-			hybridWebView.SetInvokeJavaScriptTarget(target);
+			hybridWebView.SetInvokeJavaScriptTarget(target, InvokeDotNetFailsJsonContext.Default);
 
 			// Execute the JavaScript test method
 			await hybridWebView.EvaluateJavaScriptAsync($"Test{jsMethodName}()");
@@ -130,4 +131,9 @@ public void TestMethod(string param)
 			ParamValues.Add(param);
         }
     }
+
+	[JsonSerializable(typeof(string))]
+	internal partial class InvokeDotNetFailsJsonContext : JsonSerializerContext
+	{
+	}
 }
diff --git a/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs b/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs
index a904e3ccf467..2646057792bd 100644
--- a/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs
+++ b/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs
@@ -2,6 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
+using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 using Xunit;
 
@@ -19,7 +20,7 @@ public Task InvokeDotNet(string methodName, string expectedReturnValue) =>
 		RunTest("invokedotnettests.html", async (hybridWebView) =>
 		{
 			var invokeJavaScriptTarget = new TestDotNetMethods();
-			hybridWebView.SetInvokeJavaScriptTarget(invokeJavaScriptTarget);
+			hybridWebView.SetInvokeJavaScriptTarget(invokeJavaScriptTarget, InvokeDotNetJsonContext.Default);
 
 			// Tell JavaScript to invoke the method
 			hybridWebView.SendRawMessage(methodName);
@@ -33,6 +34,42 @@ public Task InvokeDotNet(string methodName, string expectedReturnValue) =>
 			Assert.Equal(methodName, invokeJavaScriptTarget.LastMethodCalled);
 		});
 
+	[Fact]
+	public Task MethodCacheIsPopulated_WhenUsingJsonSerializerContext() =>
+		RunTest("invokedotnettests.html", async (hybridWebView) =>
+		{
+			var invokeJavaScriptTarget = new TestDotNetMethods();
+			hybridWebView.SetInvokeJavaScriptTarget(invokeJavaScriptTarget, InvokeDotNetJsonContext.Default);
+
+			// Verify the method cache was populated (AOT-safe path)
+			var cache = ((IHybridWebView)hybridWebView).InvokeJavaScriptMethodCache;
+			Assert.NotNull(cache);
+			Assert.True(cache.ContainsKey("Invoke_NoParam_NoReturn"), "Cache should contain void method");
+			Assert.True(cache.ContainsKey("Invoke_NoParam_ReturnTaskValueType"), "Cache should contain Task<int> method");
+			Assert.True(cache.ContainsKey("Invoke_OneParam_ReturnValueType"), "Cache should contain parameterized method");
+
+			// Verify the cached path actually works end-to-end
+			hybridWebView.SendRawMessage("Invoke_NoParam_ReturnTaskValueType");
+			await WebViewHelpers.WaitForHtmlStatusSet(hybridWebView);
+			var result = await hybridWebView.EvaluateJavaScriptAsync("GetLastScriptResult()");
+			Assert.Equal("2", result);
+		});
+
+	[Fact]
+	public Task MethodCacheIsNull_WhenUsingLegacyOverload() =>
+		RunTest("invokedotnettests.html", (hybridWebView) =>
+		{
+#pragma warning disable CS0618 // Testing the legacy obsolete overload
+			hybridWebView.SetInvokeJavaScriptTarget(new TestDotNetMethods());
+#pragma warning restore CS0618
+
+			// Verify the method cache is NOT populated (legacy fallback path)
+			var cache = ((IHybridWebView)hybridWebView).InvokeJavaScriptMethodCache;
+			Assert.Null(cache);
+
+			return Task.CompletedTask;
+		});
+
 	private class TestDotNetMethods
 	{
 		private static ComputationResult NewComplexResult =>
@@ -171,4 +208,14 @@ public class ComputationResult
 		public decimal result { get; set; }
 		public string? operationName { get; set; }
 	}
+
+	[JsonSerializable(typeof(ComputationResult))]
+	[JsonSerializable(typeof(Dictionary<string, int>))]
+	[JsonSerializable(typeof(int[]))]
+	[JsonSerializable(typeof(string))]
+	[JsonSerializable(typeof(int))]
+	[JsonSerializable(typeof(object))]
+	internal partial class InvokeDotNetJsonContext : JsonSerializerContext
+	{
+	}
 }
diff --git a/src/Core/src/Core.csproj b/src/Core/src/Core.csproj
index 41e5ba010d08..1231325332c7 100644
--- a/src/Core/src/Core.csproj
+++ b/src/Core/src/Core.csproj
@@ -99,6 +99,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Remove="Platform\iOS\CALayerAutosizeObserver.cs" />
+    <Compile Remove="HybridWebViewSourceGen\**" />
   </ItemGroup>
 
   <Target Name="_CopyToBuildTasksDir" AfterTargets="Build">
diff --git a/src/Core/src/Core/IHybridWebView.cs b/src/Core/src/Core/IHybridWebView.cs
index 553c13045c5b..4ad31a322e0d 100644
--- a/src/Core/src/Core/IHybridWebView.cs
+++ b/src/Core/src/Core/IHybridWebView.cs
@@ -1,5 +1,7 @@
-using System;
+using System;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
+using System.Text.Json.Serialization;
 using System.Text.Json.Serialization.Metadata;
 using System.Threading.Tasks;
 
@@ -31,14 +33,33 @@ public interface IHybridWebView : IView, IWebRequestInterceptingWebView, IInitia
 		/// </summary>
 		/// <typeparam name="T">The type that contains methods callable from JavaScript.</typeparam>
 		/// <param name="target">An instance of type <typeparamref name="T"/> that will be used to call methods on.</param>
+		[Obsolete("This overload uses reflection and dynamic System.Text.Json serialization features and is not compatible with trimming or NativeAOT. Use SetInvokeJavaScriptTarget<T>(T target, JsonSerializerContext jsonSerializerContext) instead.")]
 		void SetInvokeJavaScriptTarget<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>(T target) where T : class;
 
+		/// <summary>
+		///  Sets the object that will be the target of JavaScript calls from the web view. The public methods on this object
+		///  are callable from JavaScript using the <c>window.HybridWebView.InvokeDotNet</c> method.
+		/// </summary>
+		/// <typeparam name="T">The type that contains methods callable from JavaScript.</typeparam>
+		/// <param name="target">An instance of type <typeparamref name="T"/> that will be used to call methods on.</param>
+		/// <param name="jsonSerializerContext">The source-generated JSON serializer context for parameter and return types used by the target methods.</param>
+		void SetInvokeJavaScriptTarget<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>(T target, JsonSerializerContext jsonSerializerContext) where T : class;
+
 		/// <summary>
 		/// For internal use only.
 		/// </summary>
-		[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
 		Type? InvokeJavaScriptType { get; set; }
 
+		/// <summary>
+		/// For internal use only.
+		/// </summary>
+		JsonSerializerContext? InvokeJavaScriptJsonSerializerContext { get; set; }
+
+		/// <summary>
+		/// For internal use only. Pre-resolved method cache for AOT-safe JS-to-.NET invocation.
+		/// </summary>
+		IReadOnlyDictionary<string, object>? InvokeJavaScriptMethodCache { get; set; }
+
 		void RawMessageReceived(string rawMessage);
 
 		void SendRawMessage(string rawMessage);
diff --git a/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.Windows.cs b/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.Windows.cs
index f9cef27e49cd..bddfa2e3e81c 100644
--- a/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.Windows.cs
+++ b/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.Windows.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Diagnostics.CodeAnalysis;
+using System;
 using System.IO;
 using System.Runtime.InteropServices.WindowsRuntime;
 using System.Threading.Tasks;
@@ -281,10 +280,6 @@ static async Task<IRandomAccessStream> CopyContentToRandomAccessStreamAsync(IBuf
 			return ras;
 		}
 
-		[RequiresUnreferencedCode(DynamicFeatures)]
-#if !NETSTANDARD
-		[RequiresDynamicCode(DynamicFeatures)]
-#endif
 		private sealed class HybridWebView2Proxy
 		{
 			private WeakReference<Window>? _window;
diff --git a/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs b/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs
index 652164ccf494..8c0dc0f63b75 100644
--- a/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs
+++ b/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs
@@ -32,6 +32,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
+using System.Text.Json.Serialization.Metadata;
 using System.Text;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Maui.Hosting;
@@ -44,14 +45,15 @@
 
 namespace Microsoft.Maui.Handlers
 {
-	[RequiresUnreferencedCode(DynamicFeatures)]
-#if !NETSTANDARD
-	[RequiresDynamicCode(DynamicFeatures)]
-#endif
 	public partial class HybridWebViewHandler : IHybridWebViewHandler
 	{
-		internal const string DynamicFeatures = "HybridWebView uses dynamic System.Text.Json serialization features.";
-		internal const string NotSupportedMessage = DynamicFeatures + " Enable the $(MauiHybridWebViewSupported) property in your .csproj file to use in a trimming unsafe manner.";
+		internal const string DynamicFeatures = "HybridWebView's legacy SetInvokeJavaScriptTarget API uses reflection and dynamic System.Text.Json serialization features.";
+
+		/// <summary>
+		/// The delegate type stored in the method cache. Each entry handles the full pipeline:
+		/// deserialize params → invoke method → await if Task → serialize result.
+		/// </summary>
+		internal delegate Task<string?> DotNetMethodDelegate(object target, string[]? paramJsonValues);
 
 		// Using an IP address means that the web view doesn't wait for any DNS resolution,
 		// making it substantially faster. Note that this isn't real HTTP traffic, since
@@ -184,13 +186,14 @@ void MessageReceived(string rawMessage)
 			}
 		}
 
+		[RequiresUnreferencedCode(DynamicFeatures)]
+#if !NETSTANDARD
+		[RequiresDynamicCode(DynamicFeatures)]
+#endif
 		internal async Task<byte[]?> InvokeDotNetAsync(Stream? streamBody = null, string? stringBody = null)
 		{
 			try
 			{
-				var invokeTarget = VirtualView.InvokeJavaScriptTarget ?? throw new InvalidOperationException($"The {nameof(IHybridWebView)}.{nameof(IHybridWebView.InvokeJavaScriptTarget)} property must have a value in order to invoke a .NET method from JavaScript.");
-				var invokeTargetType = VirtualView.InvokeJavaScriptType ?? throw new InvalidOperationException($"The {nameof(IHybridWebView)}.{nameof(IHybridWebView.InvokeJavaScriptType)} property must have a value in order to invoke a .NET method from JavaScript.");
-
 				JSInvokeMethodData? invokeData = null;
 				if (streamBody is not null)
 				{
@@ -206,34 +209,95 @@ void MessageReceived(string rawMessage)
 					throw new InvalidOperationException("The invoke data did not provide a method name.");
 				}
 
-				var invokeResultRaw = await InvokeDotNetMethodAsync(invokeTargetType, invokeTarget, invokeData);
-				var invokeResult = CreateInvokeResult(invokeResultRaw);
-				var json = JsonSerializer.Serialize(invokeResult);
-				var contentBytes = Encoding.UTF8.GetBytes(json);
+				DotNetInvokeResult invokeResult;
+				if (VirtualView.InvokeJavaScriptMethodCache is { } methodCache)
+				{
+					// AOT-safe path: use pre-built delegates from method cache
+					invokeResult = await InvokeCachedMethodAsync(
+						VirtualView.InvokeJavaScriptTarget!,
+						methodCache,
+						invokeData);
+				}
+				else
+				{
+					// Legacy path: full reflection
+					invokeResult = await InvokeLegacyAsync(invokeData);
+				}
 
-				return contentBytes;
+				var json = JsonSerializer.Serialize(invokeResult, HybridWebViewHandlerJsonContext.Default.DotNetInvokeResult);
+				return Encoding.UTF8.GetBytes(json);
 			}
 			catch (Exception ex)
 			{
 				MauiContext?.CreateLogger<HybridWebViewHandler>()?.LogError(ex, "An error occurred while invoking a .NET method from JavaScript: {ErrorMessage}", ex.Message);
 
-				// Return error response instead of null so JavaScript can handle the error
-				var errorResult = CreateErrorResult(ex);
+				var errorResult = new DotNetInvokeResult
+				{
+					IsError = true,
+					ErrorMessage = ex.Message,
+					ErrorType = ex.GetType().Name,
+					ErrorStackTrace = ex.StackTrace
+				};
 				var errorJson = JsonSerializer.Serialize(errorResult, HybridWebViewHandlerJsonContext.Default.DotNetInvokeResult);
-				var errorBytes = Encoding.UTF8.GetBytes(errorJson);
-				return errorBytes;
+				return Encoding.UTF8.GetBytes(errorJson);
 			}
 		}
 
-		private static DotNetInvokeResult CreateInvokeResult(object? result)
+		/// <summary>
+		/// AOT-safe invocation path: uses pre-built typed delegates from the method cache.
+		/// No MakeGenericMethod, no GetProperty, no reflection-based JSON.
+		/// </summary>
+		private static async Task<DotNetInvokeResult> InvokeCachedMethodAsync(
+			object target,
+			IReadOnlyDictionary<string, object> methodCache,
+			JSInvokeMethodData invokeData)
+		{
+			var methodName = invokeData.MethodName!;
+			if (!methodCache.TryGetValue(methodName, out var entry) || entry is not DotNetMethodDelegate handler)
+			{
+				throw new InvalidOperationException($"The method '{methodName}' was not found on the invoke target. Available methods: {string.Join(", ", methodCache.Keys)}.");
+			}
+
+			var jsonResult = await handler(target, invokeData.ParamValues);
+			if (jsonResult is null)
+			{
+				return new DotNetInvokeResult();
+			}
+
+			return new DotNetInvokeResult
+			{
+				Result = jsonResult,
+				IsJson = true,
+			};
+		}
+
+		/// <summary>
+		/// Legacy reflection-based invocation path for backward compatibility.
+		/// </summary>
+		[RequiresUnreferencedCode(DynamicFeatures)]
+#if !NETSTANDARD
+		[RequiresDynamicCode(DynamicFeatures)]
+#endif
+		private async Task<DotNetInvokeResult> InvokeLegacyAsync(JSInvokeMethodData invokeData)
+		{
+			var invokeTarget = VirtualView.InvokeJavaScriptTarget ?? throw new InvalidOperationException($"The {nameof(IHybridWebView)}.{nameof(IHybridWebView.InvokeJavaScriptTarget)} property must have a value in order to invoke a .NET method from JavaScript.");
+			var invokeTargetType = VirtualView.InvokeJavaScriptType ?? throw new InvalidOperationException($"The {nameof(IHybridWebView)}.{nameof(IHybridWebView.InvokeJavaScriptType)} property must have a value in order to invoke a .NET method from JavaScript.");
+
+			var result = await InvokeDotNetMethodLegacyAsync(invokeTargetType, invokeTarget, invokeData);
+			return CreateInvokeResultLegacy(result);
+		}
+
+		[RequiresUnreferencedCode(DynamicFeatures)]
+#if !NETSTANDARD
+		[RequiresDynamicCode(DynamicFeatures)]
+#endif
+		private static DotNetInvokeResult CreateInvokeResultLegacy(object? result)
 		{
-			// null invoke result means an empty result
 			if (result is null)
 			{
 				return new();
 			}
 
-			// a reference type or an array should be serialized to JSON
 			var resultType = result.GetType();
 			if (resultType.IsArray || resultType.IsClass)
 			{
@@ -244,25 +308,17 @@ private static DotNetInvokeResult CreateInvokeResult(object? result)
 				};
 			}
 
-			// a value type should be returned as is
 			return new DotNetInvokeResult()
 			{
 				Result = result,
 			};
 		}
 
-		private static DotNetInvokeResult CreateErrorResult(Exception ex)
-		{
-			return new DotNetInvokeResult()
-			{
-				IsError = true,
-				ErrorMessage = ex.Message,
-				ErrorType = ex.GetType().Name,
-				ErrorStackTrace = ex.StackTrace
-			};
-		}
-
-		private static async Task<object?> InvokeDotNetMethodAsync(
+		[RequiresUnreferencedCode(DynamicFeatures)]
+#if !NETSTANDARD
+		[RequiresDynamicCode(DynamicFeatures)]
+#endif
+		private static async Task<object?> InvokeDotNetMethodLegacyAsync(
 			[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] Type targetType,
 			object jsInvokeTarget,
 			JSInvokeMethodData invokeData)
@@ -270,7 +326,6 @@ private static DotNetInvokeResult CreateErrorResult(Exception ex)
 			var requestMethodName = invokeData.MethodName!;
 			var requestParams = invokeData.ParamValues;
 
-			// get the method and its parameters from the .NET object instance
 			var dotnetMethod = targetType.GetMethod(requestMethodName, BindingFlags.Public | BindingFlags.Instance | BindingFlags.InvokeMethod);
 			if (dotnetMethod is null)
 			{
@@ -282,47 +337,40 @@ private static DotNetInvokeResult CreateErrorResult(Exception ex)
 				throw new InvalidOperationException($"The number of parameters on {nameof(jsInvokeTarget)}'s method {requestMethodName} ({dotnetParams.Length}) doesn't match the number of values passed from JavaScript code ({requestParams.Length}).");
 			}
 
-			// deserialize the parameters from JSON to .NET types
 			object?[]? invokeParamValues = null;
 			if (requestParams is not null)
 			{
 				invokeParamValues = new object?[requestParams.Length];
 				for (var i = 0; i < requestParams.Length; i++)
 				{
-					var reqValue = requestParams[i];
-					var paramType = dotnetParams[i].ParameterType;
-					var deserialized = JsonSerializer.Deserialize(reqValue, paramType);
-					invokeParamValues[i] = deserialized;
+					invokeParamValues[i] = JsonSerializer.Deserialize(requestParams[i], dotnetParams[i].ParameterType);
 				}
 			}
 
-			// invoke the .NET method
-			var dotnetReturnValue = GetDotNetMethodReturnValue(jsInvokeTarget, dotnetMethod, invokeParamValues);
+			var dotnetReturnValue = InvokeMethod(jsInvokeTarget, dotnetMethod, invokeParamValues);
 
-			if (dotnetReturnValue is null) // null result
+			if (dotnetReturnValue is null)
 			{
 				return null;
 			}
 
-			if (dotnetReturnValue is Task task) // Task or Task<T> result
+			if (dotnetReturnValue is Task task)
 			{
 				await task;
 
-				// Task<T>
 				if (dotnetMethod.ReturnType.IsGenericType)
 				{
 					var resultProperty = dotnetMethod.ReturnType.GetProperty(nameof(Task<object>.Result));
 					return resultProperty?.GetValue(task);
 				}
 
-				// Task
 				return null;
 			}
 
-			return dotnetReturnValue; // regular result
+			return dotnetReturnValue;
 		}
 
-		private static object? GetDotNetMethodReturnValue(object jsInvokeTarget, MethodInfo dotnetMethod, object?[]? invokeParamValues)
+		private static object? InvokeMethod(object jsInvokeTarget, MethodInfo dotnetMethod, object?[]? invokeParamValues)
 		{
 			try
 			{
@@ -345,6 +393,137 @@ private static DotNetInvokeResult CreateErrorResult(Exception ex)
 			}
 		}
 
+		/// <summary>
+		/// Builds a method cache at registration time using reflection.
+		/// This is the runtime fallback — the source generator will replace this with
+		/// fully typed delegates that don't need any suppressions.
+		/// </summary>
+		internal static IReadOnlyDictionary<string, object> BuildMethodCache(
+			[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods)] Type targetType,
+			JsonSerializerContext jsonSerializerContext)
+		{
+			var cache = new Dictionary<string, object>(StringComparer.Ordinal);
+
+			var methods = targetType.GetMethods(BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly);
+			foreach (var method in methods)
+			{
+				if (method.IsSpecialName || method.IsGenericMethodDefinition)
+				{
+					continue;
+				}
+
+				var methodName = method.Name;
+				if (cache.ContainsKey(methodName))
+				{
+					throw new InvalidOperationException($"The type '{targetType.FullName}' has multiple methods named '{methodName}'. Method overloads are not supported for JavaScript invocation.");
+				}
+
+				var parameters = method.GetParameters();
+
+				// Pre-resolve parameter JsonTypeInfos
+				var paramJsonTypeInfos = new JsonTypeInfo[parameters.Length];
+				for (var i = 0; i < parameters.Length; i++)
+				{
+					var paramType = parameters[i].ParameterType;
+					if (paramType.IsByRef || paramType.IsPointer)
+					{
+						throw new InvalidOperationException($"The method '{methodName}' on type '{targetType.FullName}' has a ref/pointer parameter '{parameters[i].Name}' which is not supported for JavaScript invocation.");
+					}
+
+					paramJsonTypeInfos[i] = jsonSerializerContext.GetTypeInfo(paramType)
+						?? throw new InvalidOperationException($"The JSON serializer context does not contain metadata for parameter type '{paramType.FullName}' (parameter '{parameters[i].Name}' of method '{methodName}'). Add [JsonSerializable(typeof({paramType.Name}))] to your JsonSerializerContext.");
+				}
+
+				// Pre-resolve return type handling
+				var returnType = method.ReturnType;
+				JsonTypeInfo? returnJsonTypeInfo = null;
+				PropertyInfo? taskResultProperty = null;
+				bool isTask = false;
+				bool isTaskOfT = false;
+
+				if (returnType == typeof(void))
+				{
+					// no-op
+				}
+				else if (returnType == typeof(Task))
+				{
+					isTask = true;
+				}
+				else if (returnType.IsGenericType && returnType.GetGenericTypeDefinition() == typeof(Task<>))
+				{
+					isTask = true;
+					isTaskOfT = true;
+					var resultType = returnType.GetGenericArguments()[0];
+					returnJsonTypeInfo = jsonSerializerContext.GetTypeInfo(resultType)
+						?? throw new InvalidOperationException($"The JSON serializer context does not contain metadata for return type '{resultType.FullName}' (Task<{resultType.Name}> of method '{methodName}'). Add [JsonSerializable(typeof({resultType.Name}))] to your JsonSerializerContext.");
+					taskResultProperty = GetTaskResultProperty(returnType);
+				}
+				else
+				{
+					returnJsonTypeInfo = jsonSerializerContext.GetTypeInfo(returnType)
+						?? throw new InvalidOperationException($"The JSON serializer context does not contain metadata for return type '{returnType.FullName}' of method '{methodName}'. Add [JsonSerializable(typeof({returnType.Name}))] to your JsonSerializerContext.");
+				}
+
+				// Capture everything in a closure — this delegate handles the full pipeline
+				var capturedMethod = method;
+				var capturedParamInfos = paramJsonTypeInfos;
+				var capturedReturnInfo = returnJsonTypeInfo;
+				var capturedTaskResultProp = taskResultProperty;
+				var capturedIsTask = isTask;
+				var capturedIsTaskOfT = isTaskOfT;
+
+				cache[methodName] = new DotNetMethodDelegate(async (object target, string[]? paramJsonValues) =>
+				{
+					// Deserialize parameters
+					object?[]? args = null;
+					if (capturedParamInfos.Length > 0)
+					{
+						if (paramJsonValues is null || paramJsonValues.Length != capturedParamInfos.Length)
+						{
+							throw new InvalidOperationException($"The method '{methodName}' expects {capturedParamInfos.Length} parameter(s) but {paramJsonValues?.Length ?? 0} were provided from JavaScript.");
+						}
+
+						args = new object?[capturedParamInfos.Length];
+						for (var i = 0; i < capturedParamInfos.Length; i++)
+						{
+							args[i] = JsonSerializer.Deserialize(paramJsonValues[i], capturedParamInfos[i]);
+						}
+					}
+
+					// Invoke
+					var returnValue = InvokeMethod(target, capturedMethod, args);
+
+					// Handle result
+					if (capturedIsTask && returnValue is Task task)
+					{
+						await task;
+
+						if (capturedIsTaskOfT)
+						{
+							var result = capturedTaskResultProp!.GetValue(task);
+							return result is null ? null : JsonSerializer.Serialize(result, capturedReturnInfo!);
+						}
+
+						return null; // Task (void)
+					}
+
+					if (returnValue is null)
+					{
+						return null;
+					}
+
+					return JsonSerializer.Serialize(returnValue, capturedReturnInfo!);
+				});
+			}
+
+			return cache;
+		}
+
+		[UnconditionalSuppressMessage("Trimming", "IL2070",
+			Justification = "Task<T> is a BCL framework type whose public properties (including Result) are always preserved and never trimmed. This will be replaced by the source generator.")]
+		private static PropertyInfo GetTaskResultProperty(Type taskOfTType) =>
+			taskOfTType.GetProperty(nameof(Task<object>.Result))!;
+
 		private sealed class JSInvokeMethodData
 		{
 			public string? MethodName { get; set; }
diff --git a/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.iOS.cs b/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.iOS.cs
index 266ce62e9c03..7ca5f449d8fd 100644
--- a/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.iOS.cs
+++ b/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.iOS.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Diagnostics.CodeAnalysis;
+using System;
 using System.Globalization;
 using System.IO;
 using System.Runtime.Versioning;
@@ -123,10 +122,6 @@ protected override void DisconnectHandler(WKWebView platformView)
 		}
 
 
-		[RequiresUnreferencedCode(DynamicFeatures)]
-#if !NETSTANDARD
-		[RequiresDynamicCode(DynamicFeatures)]
-#endif
 		private sealed class WebViewScriptMessageHandler : NSObject, IWKScriptMessageHandler
 		{
 			private readonly WeakReference<HybridWebViewHandler?> _webViewHandler;
@@ -145,10 +140,6 @@ public void DidReceiveScriptMessage(WKUserContentController userContentControlle
 			}
 		}
 
-		[RequiresUnreferencedCode(DynamicFeatures)]
-#if !NETSTANDARD
-		[RequiresDynamicCode(DynamicFeatures)]
-#endif
 		private class SchemeHandler : NSObject, IWKUrlSchemeHandler
 		{
 			private readonly WeakReference<HybridWebViewHandler?> _webViewHandler;
diff --git a/src/Core/src/HybridWebViewSourceGen/Core.HybridWebViewSourceGen.csproj b/src/Core/src/HybridWebViewSourceGen/Core.HybridWebViewSourceGen.csproj
new file mode 100644
index 000000000000..ce0159e662bb
--- /dev/null
+++ b/src/Core/src/HybridWebViewSourceGen/Core.HybridWebViewSourceGen.csproj
@@ -0,0 +1,33 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>true</ImplicitUsings>
+    <LangVersion>Latest</LangVersion>
+    <AssemblyName>Microsoft.Maui.Core.HybridWebViewSourceGen</AssemblyName>
+    <RootNamespace>Microsoft.Maui.HybridWebViewSourceGen</RootNamespace>
+    <PackageId>Microsoft.Maui.Core.HybridWebViewSourceGen</PackageId>
+    <IsPackable>false</IsPackable>
+    <NoWarn>$(NoWarn);RSEXPERIMENTAL002</NoWarn>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
+    <EmitCompilerGeneratedFiles Condition="'$(Configuration)' == 'Debug'">true</EmitCompilerGeneratedFiles>
+    <IsRoslynComponent>true</IsRoslynComponent>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" PrivateAssets="all" />
+  </ItemGroup>
+
+  <Target Name="_CopyToBuildTasksDir" AfterTargets="Build">
+    <ItemGroup>
+      <_CopyItems Include="$(TargetDir)*.dll" Exclude="$(TargetDir)System.*.dll" />
+      <_CopyItems Include="$(TargetDir)*.pdb" Exclude="$(TargetDir)System.*.pdb" />
+    </ItemGroup>
+    <Copy SourceFiles="@(_CopyItems)" DestinationFolder="$(_MauiBuildTasksLocation)" ContinueOnError="true" Retries="3" RetryDelayMilliseconds="1000" />
+  </Target>
+</Project>
diff --git a/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs b/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs
new file mode 100644
index 000000000000..5af14cb645e4
--- /dev/null
+++ b/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs
@@ -0,0 +1,306 @@
+using System.Collections.Immutable;
+using System.Text;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
+namespace Microsoft.Maui.HybridWebViewSourceGen;
+
+[Generator(LanguageNames.CSharp)]
+public sealed class HybridWebViewInvokeTargetGenerator : IIncrementalGenerator
+{
+	private const string SetInvokeJavaScriptTargetMethodName = "SetInvokeJavaScriptTarget";
+	private const string HybridWebViewTypeName = "Microsoft.Maui.Controls.HybridWebView";
+	private const string IHybridWebViewTypeName = "Microsoft.Maui.IHybridWebView";
+	private const string JsonSerializerContextTypeName = "System.Text.Json.Serialization.JsonSerializerContext";
+
+	public void Initialize(IncrementalGeneratorInitializationContext context)
+	{
+		var invocations = context.SyntaxProvider.CreateSyntaxProvider(
+			predicate: static (node, _) => IsSetInvokeJavaScriptTargetCandidate(node),
+			transform: static (ctx, ct) => GetInvocationInfo(ctx, ct))
+			.Where(static info => info is not null);
+
+		context.RegisterSourceOutput(invocations.Collect(), GenerateSource);
+	}
+
+	private static bool IsSetInvokeJavaScriptTargetCandidate(SyntaxNode node)
+	{
+		if (node is not InvocationExpressionSyntax invocation)
+			return false;
+
+		var name = invocation.Expression switch
+		{
+			MemberAccessExpressionSyntax memberAccess => memberAccess.Name.Identifier.Text,
+			_ => null,
+		};
+
+		return name == SetInvokeJavaScriptTargetMethodName;
+	}
+
+	private static InvocationInfo? GetInvocationInfo(GeneratorSyntaxContext ctx, System.Threading.CancellationToken ct)
+	{
+		var invocation = (InvocationExpressionSyntax)ctx.Node;
+		var symbolInfo = ctx.SemanticModel.GetSymbolInfo(invocation, ct);
+		if (symbolInfo.Symbol is not IMethodSymbol method)
+			return null;
+
+		// Must be the 2-arg overload: SetInvokeJavaScriptTarget<T>(T target, JsonSerializerContext ctx)
+		if (method.Parameters.Length != 2)
+			return null;
+
+		var containingType = method.ContainingType?.ToDisplayString();
+		if (containingType != HybridWebViewTypeName && containingType != IHybridWebViewTypeName)
+			return null;
+
+		var secondParamType = method.Parameters[1].Type?.ToDisplayString();
+		if (secondParamType != JsonSerializerContextTypeName)
+			return null;
+
+		// Get the type argument T
+		if (method.TypeArguments.Length != 1)
+			return null;
+
+		var targetType = method.TypeArguments[0] as INamedTypeSymbol;
+		if (targetType is null)
+			return null;
+
+		// Get interceptable location
+		var interceptableLocation = ctx.SemanticModel.GetInterceptableLocation(invocation, ct);
+		if (interceptableLocation is null)
+			return null;
+
+		// Gather public instance methods on T (DeclaredOnly equivalent)
+		var methods = new List<MethodInfo>();
+		foreach (var member in targetType.GetMembers())
+		{
+			if (member is not IMethodSymbol m)
+				continue;
+			if (m.DeclaredAccessibility != Accessibility.Public)
+				continue;
+			if (m.IsStatic || m.IsAbstract)
+				continue;
+			if (m.MethodKind != MethodKind.Ordinary)
+				continue;
+			if (m.IsGenericMethod)
+				continue;
+			if (!SymbolEqualityComparer.Default.Equals(m.ContainingType, targetType))
+				continue;
+
+			// Check for ref/out/pointer params
+			bool hasUnsupportedParam = false;
+			var paramInfos = new List<ParamInfo>();
+			foreach (var p in m.Parameters)
+			{
+				if (p.RefKind != RefKind.None)
+				{
+					hasUnsupportedParam = true;
+					break;
+				}
+				paramInfos.Add(new ParamInfo(p.Name, p.Type.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)));
+			}
+
+			if (hasUnsupportedParam)
+				continue;
+
+			// Determine return kind
+			var returnType = m.ReturnType;
+			string returnKind;
+			string? resultTypeName = null;
+
+			if (returnType.SpecialType == SpecialType.System_Void)
+			{
+				returnKind = "void";
+			}
+			else if (returnType.ToDisplayString() == "System.Threading.Tasks.Task")
+			{
+				returnKind = "Task";
+			}
+			else if (returnType is INamedTypeSymbol namedReturn
+				&& namedReturn.IsGenericType
+				&& namedReturn.ConstructedFrom.ToDisplayString() == "System.Threading.Tasks.Task<TResult>")
+			{
+				returnKind = "TaskOfT";
+				resultTypeName = namedReturn.TypeArguments[0].ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat);
+			}
+			else
+			{
+				returnKind = "sync";
+				resultTypeName = returnType.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat);
+			}
+
+			methods.Add(new MethodInfo(m.Name, returnKind, resultTypeName, paramInfos.ToArray()));
+		}
+
+		return new InvocationInfo(
+			interceptableLocation,
+			targetType.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat),
+			methods.ToArray());
+	}
+
+	private static void GenerateSource(SourceProductionContext spc, ImmutableArray<InvocationInfo?> invocations)
+	{
+		if (invocations.IsDefaultOrEmpty)
+			return;
+
+		var sb = new StringBuilder();
+		sb.AppendLine("// <auto-generated />");
+		sb.AppendLine("#nullable enable");
+		sb.AppendLine();
+		sb.AppendLine("using System;");
+		sb.AppendLine("using System.Collections.Generic;");
+		sb.AppendLine("using System.Text.Json;");
+		sb.AppendLine("using System.Text.Json.Serialization;");
+		sb.AppendLine("using System.Text.Json.Serialization.Metadata;");
+		sb.AppendLine("using System.Threading.Tasks;");
+		sb.AppendLine();
+		sb.AppendLine("namespace System.Runtime.CompilerServices");
+		sb.AppendLine("{");
+		sb.AppendLine("    [global::System.Diagnostics.Conditional(\"DEBUG\")]");
+		sb.AppendLine("    [global::System.AttributeUsage(global::System.AttributeTargets.Method, AllowMultiple = true)]");
+		sb.AppendLine("    file sealed class InterceptsLocationAttribute : Attribute");
+		sb.AppendLine("    {");
+		sb.AppendLine("        public InterceptsLocationAttribute(int version, string data) { }");
+		sb.AppendLine("    }");
+		sb.AppendLine("}");
+		sb.AppendLine();
+		sb.AppendLine("namespace Microsoft.Maui.Generated");
+		sb.AppendLine("{");
+		sb.AppendLine("    file static class HybridWebViewInterceptors");
+		sb.AppendLine("    {");
+
+		int index = 0;
+		foreach (var info in invocations)
+		{
+			if (info is null)
+				continue;
+
+			var loc = info.Location;
+			sb.AppendLine($"        [global::System.Runtime.CompilerServices.InterceptsLocationAttribute({loc.Version}, @\"{loc.Data}\")]");
+			sb.AppendLine($"        public static void SetInvokeJavaScriptTarget_{index}<T>(this global::Microsoft.Maui.Controls.HybridWebView hybridWebView, T target, global::System.Text.Json.Serialization.JsonSerializerContext jsonSerializerContext) where T : class");
+			sb.AppendLine("        {");
+			sb.AppendLine("            if (target is null) throw new ArgumentNullException(nameof(target));");
+			sb.AppendLine("            if (jsonSerializerContext is null) throw new ArgumentNullException(nameof(jsonSerializerContext));");
+			sb.AppendLine();
+			sb.AppendLine($"            var cache = BuildMethodCache_{index}(({info.TargetTypeName})(object)target, jsonSerializerContext);");
+			sb.AppendLine("            ((global::Microsoft.Maui.IHybridWebView)hybridWebView).InvokeJavaScriptTarget = target;");
+			sb.AppendLine($"            ((global::Microsoft.Maui.IHybridWebView)hybridWebView).InvokeJavaScriptType = typeof({info.TargetTypeName});");
+			sb.AppendLine("            ((global::Microsoft.Maui.IHybridWebView)hybridWebView).InvokeJavaScriptJsonSerializerContext = jsonSerializerContext;");
+			sb.AppendLine("            ((global::Microsoft.Maui.IHybridWebView)hybridWebView).InvokeJavaScriptMethodCache = cache;");
+			sb.AppendLine("        }");
+			sb.AppendLine();
+
+			// Generate the typed BuildMethodCache
+			sb.AppendLine($"        private static global::System.Collections.Generic.IReadOnlyDictionary<string, object> BuildMethodCache_{index}({info.TargetTypeName} target, global::System.Text.Json.Serialization.JsonSerializerContext ctx)");
+			sb.AppendLine("        {");
+			sb.AppendLine("            return new global::System.Collections.Generic.Dictionary<string, object>(global::System.StringComparer.Ordinal)");
+			sb.AppendLine("            {");
+
+			foreach (var method in info.Methods)
+			{
+				sb.AppendLine($"                [\"{method.Name}\"] = new global::Microsoft.Maui.Handlers.HybridWebViewHandler.DotNetMethodDelegate(async (object __target, string[]? __args) =>");
+				sb.AppendLine("                {");
+				sb.AppendLine($"                    var __typedTarget = ({info.TargetTypeName})(object)__target;");
+
+				// Deserialize params — validate args count first
+				if (method.Parameters.Length > 0)
+				{
+					sb.AppendLine($"                    if (__args is null || __args.Length != {method.Parameters.Length})");
+					sb.AppendLine($"                        throw new global::System.InvalidOperationException(\"Method '{method.Name}' expects {method.Parameters.Length} argument(s) but received \" + (__args?.Length ?? 0) + \".\");");
+
+					for (int i = 0; i < method.Parameters.Length; i++)
+					{
+						var p = method.Parameters[i];
+						sb.AppendLine($"                    var __{p.Name} = global::System.Text.Json.JsonSerializer.Deserialize<{p.TypeName}>(__args[{i}], GetRequiredJsonTypeInfo<{p.TypeName}>(ctx, \"{method.Name}\", \"{p.Name}\"));");
+					}
+				}
+
+				// Build argument list
+				var argList = string.Join(", ", Array.ConvertAll(method.Parameters, p => $"__{p.Name}"));
+
+				// Invoke + handle result
+				switch (method.ReturnKind)
+				{
+					case "void":
+						sb.AppendLine($"                    __typedTarget.{method.Name}({argList});");
+						sb.AppendLine("                    return null;");
+						break;
+					case "Task":
+						sb.AppendLine($"                    await __typedTarget.{method.Name}({argList});");
+						sb.AppendLine("                    return null;");
+						break;
+					case "TaskOfT":
+						sb.AppendLine($"                    var __result = await __typedTarget.{method.Name}({argList});");
+						sb.AppendLine($"                    if (__result is null) return null;");
+						sb.AppendLine($"                    return global::System.Text.Json.JsonSerializer.Serialize<{method.ResultTypeName}>(__result, GetRequiredJsonTypeInfo<{method.ResultTypeName}>(ctx, \"{method.Name}\", \"return\"));");
+						break;
+					case "sync":
+						sb.AppendLine($"                    var __result = __typedTarget.{method.Name}({argList});");
+						sb.AppendLine($"                    if (__result is null) return null;");
+						sb.AppendLine($"                    return global::System.Text.Json.JsonSerializer.Serialize<{method.ResultTypeName}>(__result, GetRequiredJsonTypeInfo<{method.ResultTypeName}>(ctx, \"{method.Name}\", \"return\"));");
+						break;
+				}
+
+				sb.AppendLine("                }),");
+			}
+
+			sb.AppendLine("            };");
+			sb.AppendLine("        }");
+			sb.AppendLine();
+			index++;
+		}
+
+		sb.AppendLine("    }");
+		sb.AppendLine();
+		sb.AppendLine("        private static global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<T> GetRequiredJsonTypeInfo<T>(global::System.Text.Json.Serialization.JsonSerializerContext ctx, string methodName, string paramName)");
+		sb.AppendLine("        {");
+		sb.AppendLine("            var typeInfo = ctx.GetTypeInfo(typeof(T));");
+		sb.AppendLine("            if (typeInfo is not global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<T> typed)");
+		sb.AppendLine("                throw new global::System.InvalidOperationException($\"The JSON serializer context does not contain metadata for type '{typeof(T).FullName}' (used by {paramName} of method '{methodName}'). Add [JsonSerializable(typeof({typeof(T).Name}))] to your JsonSerializerContext.\");");
+		sb.AppendLine("            return typed;");
+		sb.AppendLine("        }");
+		sb.AppendLine("    }");
+		sb.AppendLine("}");
+
+		spc.AddSource("HybridWebViewInterceptors.g.cs", sb.ToString());
+	}
+
+	private sealed class InvocationInfo
+	{
+		public InvocationInfo(InterceptableLocation location, string targetTypeName, MethodInfo[] methods)
+		{
+			Location = location;
+			TargetTypeName = targetTypeName;
+			Methods = methods;
+		}
+		public InterceptableLocation Location { get; }
+		public string TargetTypeName { get; }
+		public MethodInfo[] Methods { get; }
+	}
+
+	private sealed class MethodInfo
+	{
+		public MethodInfo(string name, string returnKind, string? resultTypeName, ParamInfo[] parameters)
+		{
+			Name = name;
+			ReturnKind = returnKind;
+			ResultTypeName = resultTypeName;
+			Parameters = parameters;
+		}
+		public string Name { get; }
+		public string ReturnKind { get; }
+		public string? ResultTypeName { get; }
+		public ParamInfo[] Parameters { get; }
+	}
+
+	private sealed class ParamInfo
+	{
+		public ParamInfo(string name, string typeName)
+		{
+			Name = name;
+			TypeName = typeName;
+		}
+		public string Name { get; }
+		public string TypeName { get; }
+	}
+}
diff --git a/src/Core/src/Platform/Android/MauiHybridWebView.cs b/src/Core/src/Platform/Android/MauiHybridWebView.cs
index 6354bdf7abea..dcf2cb31d6d6 100644
--- a/src/Core/src/Platform/Android/MauiHybridWebView.cs
+++ b/src/Core/src/Platform/Android/MauiHybridWebView.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Diagnostics.CodeAnalysis;
+using System;
 using Android.Content;
 using Android.Graphics;
 using Android.Webkit;
@@ -8,10 +7,6 @@
 
 namespace Microsoft.Maui.Platform
 {
-	[RequiresUnreferencedCode(HybridWebViewHandler.DynamicFeatures)]
-#if !NETSTANDARD
-	[RequiresDynamicCode(HybridWebViewHandler.DynamicFeatures)]
-#endif
 	public class MauiHybridWebView : AWebView, IHybridPlatformWebView
 	{
 		private readonly WeakReference<HybridWebViewHandler> _handler;
diff --git a/src/Core/src/Platform/Android/MauiHybridWebViewClient.cs b/src/Core/src/Platform/Android/MauiHybridWebViewClient.cs
index 1c8b1bd3ce1b..04954e482a07 100644
--- a/src/Core/src/Platform/Android/MauiHybridWebViewClient.cs
+++ b/src/Core/src/Platform/Android/MauiHybridWebViewClient.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Text;
 using System.Web;
@@ -15,10 +14,6 @@
 
 namespace Microsoft.Maui.Platform
 {
-	[RequiresUnreferencedCode(HybridWebViewHandler.DynamicFeatures)]
-#if !NETSTANDARD
-	[RequiresDynamicCode(HybridWebViewHandler.DynamicFeatures)]
-#endif
 	public class MauiHybridWebViewClient : WebViewClient
 	{
 		private readonly WeakReference<HybridWebViewHandler?> _handler;
diff --git a/src/Core/src/Platform/Windows/MauiHybridWebView.cs b/src/Core/src/Platform/Windows/MauiHybridWebView.cs
index 34e6081a9d0a..6f89c31c7a0b 100644
--- a/src/Core/src/Platform/Windows/MauiHybridWebView.cs
+++ b/src/Core/src/Platform/Windows/MauiHybridWebView.cs
@@ -1,15 +1,10 @@
-using System;
-using System.Diagnostics.CodeAnalysis;
+using System;
 using System.Threading.Tasks;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.Web.WebView2.Core;
 
 namespace Microsoft.Maui.Platform
 {
-	[RequiresUnreferencedCode(HybridWebViewHandler.DynamicFeatures)]
-#if !NETSTANDARD
-	[RequiresDynamicCode(HybridWebViewHandler.DynamicFeatures)]
-#endif
 	public partial class MauiHybridWebView : WebView2, IHybridPlatformWebView
 	{
 		private readonly WeakReference<HybridWebViewHandler> _handler;
diff --git a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
index 0f1a34ae4fbd..0142a349bb0b 100644
--- a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -92,6 +92,9 @@ Microsoft.Maui.Platform.MauiMaterialTimePicker.MauiMaterialTimePicker(nint javaR
 Microsoft.Maui.Platform.MauiMaterialTimePicker.OnClick(Android.Views.View? v) -> void
 Microsoft.Maui.Platform.MauiMaterialTimePicker.ShowPicker.get -> System.Action?
 Microsoft.Maui.Platform.MauiMaterialTimePicker.ShowPicker.set -> void
+Microsoft.Maui.IHybridWebView.InvokeJavaScriptJsonSerializerContext.get -> System.Text.Json.Serialization.JsonSerializerContext?
+Microsoft.Maui.IHybridWebView.InvokeJavaScriptJsonSerializerContext.set -> void
+Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.PlatformDrawable
 Microsoft.Maui.PlatformDrawable.PlatformDrawable(Android.Content.Context? context) -> void
 Microsoft.Maui.PlatformDrawable.PlatformDrawable(nint javaReference, Android.Runtime.JniHandleOwnership transfer) -> void
diff --git a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index f9fb7a71c421..0cf5f7f1b600 100644
--- a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -1,4 +1,5 @@
 #nullable enable
+Microsoft.Maui.IHybridWebViewInvoker
 override Microsoft.Maui.Handlers.LabelHandler.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
 override Microsoft.Maui.Handlers.ShapeViewHandler.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
 override Microsoft.Maui.Handlers.StepperHandler.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
diff --git a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index f9fb7a71c421..0cf5f7f1b600 100644
--- a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -1,4 +1,5 @@
 #nullable enable
+Microsoft.Maui.IHybridWebViewInvoker
 override Microsoft.Maui.Handlers.LabelHandler.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
 override Microsoft.Maui.Handlers.ShapeViewHandler.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
 override Microsoft.Maui.Handlers.StepperHandler.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
diff --git a/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
index 66a516d720b9..cc90139ccfec 100644
--- a/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
@@ -1,2 +1,5 @@
 #nullable enable
 static Microsoft.Maui.GridLength.implicit operator Microsoft.Maui.GridLength(string! value) -> Microsoft.Maui.GridLength
+Microsoft.Maui.IHybridWebView.InvokeJavaScriptJsonSerializerContext.get -> System.Text.Json.Serialization.JsonSerializerContext?
+Microsoft.Maui.IHybridWebView.InvokeJavaScriptJsonSerializerContext.set -> void
+Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
diff --git a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index dc3f33edec53..8b0885a86d5b 100644
--- a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -1,4 +1,7 @@
 #nullable enable
+Microsoft.Maui.IHybridWebView.InvokeJavaScriptJsonSerializerContext.get -> System.Text.Json.Serialization.JsonSerializerContext?
+Microsoft.Maui.IHybridWebView.InvokeJavaScriptJsonSerializerContext.set -> void
+Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 override Microsoft.Maui.Platform.MauiPasswordTextBox.OnCreateAutomationPeer() -> Microsoft.UI.Xaml.Automation.Peers.AutomationPeer!
 static Microsoft.Maui.GridLength.implicit operator Microsoft.Maui.GridLength(string! value) -> Microsoft.Maui.GridLength
 static Microsoft.Maui.SafeAreaEdges.Container.get -> Microsoft.Maui.SafeAreaEdges
diff --git a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
index b5d23f77de0b..46f266bb458e 100644
--- a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -1,3 +1,8 @@
-#nullable enable
+#nullable enable
+Microsoft.Maui.IHybridWebView.InvokeJavaScriptJsonSerializerContext.get -> System.Text.Json.Serialization.JsonSerializerContext?
+Microsoft.Maui.IHybridWebView.InvokeJavaScriptJsonSerializerContext.set -> void
+Microsoft.Maui.IHybridWebView.InvokeJavaScriptMethodCache.get -> System.Collections.Generic.IReadOnlyDictionary<string!, object!>?
+Microsoft.Maui.IHybridWebView.InvokeJavaScriptMethodCache.set -> void
+Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 static Microsoft.Maui.GridLength.implicit operator Microsoft.Maui.GridLength(string! value) -> Microsoft.Maui.GridLength
 static Microsoft.Maui.SafeAreaEdges.Container.get -> Microsoft.Maui.SafeAreaEdges
diff --git a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index 6e861c095c55..f0ad60398d4f 100644
--- a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -1,2 +1,5 @@
 #nullable enable
 static Microsoft.Maui.SafeAreaEdges.Container.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.IHybridWebView.InvokeJavaScriptJsonSerializerContext.get -> System.Text.Json.Serialization.JsonSerializerContext?
+Microsoft.Maui.IHybridWebView.InvokeJavaScriptJsonSerializerContext.set -> void
+Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
diff --git a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
index 6e861c095c55..69742923694c 100644
--- a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
@@ -1,2 +1,7 @@
-#nullable enable
+#nullable enable
+Microsoft.Maui.IHybridWebView.InvokeJavaScriptJsonSerializerContext.get -> System.Text.Json.Serialization.JsonSerializerContext?
+Microsoft.Maui.IHybridWebView.InvokeJavaScriptJsonSerializerContext.set -> void
+Microsoft.Maui.IHybridWebView.InvokeJavaScriptMethodCache.get -> System.Collections.Generic.IReadOnlyDictionary<string!, object!>?
+Microsoft.Maui.IHybridWebView.InvokeJavaScriptMethodCache.set -> void
+Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 static Microsoft.Maui.SafeAreaEdges.Container.get -> Microsoft.Maui.SafeAreaEdges
diff --git a/src/Core/src/RuntimeFeature.cs b/src/Core/src/RuntimeFeature.cs
index 68e67c6588e5..5434b87dad0e 100644
--- a/src/Core/src/RuntimeFeature.cs
+++ b/src/Core/src/RuntimeFeature.cs
@@ -22,7 +22,6 @@ static class RuntimeFeature
 		const bool IsImplicitCastOperatorsUsageViaReflectionSupportedByDefault = true;
 		const bool AreBindingInterceptorsSupportedByDefault = true;
 		const bool IsXamlCBindingWithSourceCompilationEnabledByDefault = false;
-		const bool IsHybridWebViewSupportedByDefault = true;
 		const bool SupportNamescopesByDefault = true;
 		const bool EnableDiagnosticsByDefault = false;
 		const bool IsMeterSupportedByDefault = true;
@@ -83,16 +82,6 @@ public static bool IsShellSearchResultsRendererDisplayMemberNameSupported
 				? areSupported
 				: IsXamlCBindingWithSourceCompilationEnabledByDefault;
 
-#if NET9_0_OR_GREATER
-		[FeatureSwitchDefinition($"{FeatureSwitchPrefix}.{nameof(IsHybridWebViewSupported)}")]
-		[FeatureGuard(typeof(RequiresUnreferencedCodeAttribute))]
-		[FeatureGuard(typeof(RequiresDynamicCodeAttribute))]
-#endif
-		public static bool IsHybridWebViewSupported =>
-			AppContext.TryGetSwitch($"{FeatureSwitchPrefix}.{nameof(IsHybridWebViewSupported)}", out bool isSupported)
-				? isSupported
-				: IsHybridWebViewSupportedByDefault;
-
 #if NET9_0_OR_GREATER
 		[FeatureSwitchDefinition($"{FeatureSwitchPrefix}.{nameof(AreNamescopesSupported)}")]
 #endif
diff --git a/src/Core/tests/UnitTests/HybridWebViewBuildMethodCacheTests.cs b/src/Core/tests/UnitTests/HybridWebViewBuildMethodCacheTests.cs
new file mode 100644
index 000000000000..8dc1ce6cec5e
--- /dev/null
+++ b/src/Core/tests/UnitTests/HybridWebViewBuildMethodCacheTests.cs
@@ -0,0 +1,198 @@
+#nullable enable
+using System;
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
+using System.Text.Json.Serialization.Metadata;
+using System.Threading.Tasks;
+using Microsoft.Maui.Handlers;
+using Xunit;
+
+namespace Microsoft.Maui.UnitTests
+{
+
+public partial class HybridWebViewBuildMethodCacheTests
+{
+	[Fact]
+	public void ValidMethods_AreCached()
+	{
+		var cache = HybridWebViewHandler.BuildMethodCache(typeof(ValidTarget), ValidTargetJsonContext.Default);
+
+		Assert.True(cache.ContainsKey("Add"));
+		Assert.True(cache.ContainsKey("GetNameAsync"));
+		Assert.True(cache.ContainsKey("DoWork"));
+		Assert.Equal(3, cache.Count);
+	}
+
+	[Fact]
+	public void OverloadedMethods_ThrowAtRegistration()
+	{
+		var ex = Assert.Throws<InvalidOperationException>(
+			() => HybridWebViewHandler.BuildMethodCache(typeof(OverloadedTarget), OverloadedTargetJsonContext.Default));
+
+		Assert.Contains("multiple methods named", ex.Message, StringComparison.OrdinalIgnoreCase);
+		Assert.Contains("Compute", ex.Message, StringComparison.OrdinalIgnoreCase);
+	}
+
+	[Fact]
+	public void GenericMethods_AreSkipped()
+	{
+		var cache = HybridWebViewHandler.BuildMethodCache(typeof(GenericMethodTarget), GenericMethodJsonContext.Default);
+
+		Assert.False(cache.ContainsKey("Echo"));
+		Assert.True(cache.ContainsKey("NonGeneric"));
+		Assert.Single(cache);
+	}
+
+	[Fact]
+	public void SpecialNameMethods_AreSkipped()
+	{
+		var cache = HybridWebViewHandler.BuildMethodCache(typeof(PropertyTarget), PropertyTargetJsonContext.Default);
+
+		// get_Value and set_Value should be skipped (IsSpecialName)
+		Assert.False(cache.ContainsKey("get_Value"));
+		Assert.False(cache.ContainsKey("set_Value"));
+		Assert.True(cache.ContainsKey("DoSomething"));
+		Assert.Single(cache);
+	}
+
+	[Fact]
+	public void RefParameter_ThrowsAtRegistration()
+	{
+		var ex = Assert.Throws<InvalidOperationException>(
+			() => HybridWebViewHandler.BuildMethodCache(typeof(RefParamTarget), RefParamJsonContext.Default));
+
+		Assert.Contains("ref/pointer", ex.Message, StringComparison.OrdinalIgnoreCase);
+	}
+
+	[Fact]
+	public void MissingParamJsonTypeInfo_ThrowsAtRegistration()
+	{
+		// EmptyJsonContext has no type registrations at all
+		var ex = Assert.Throws<InvalidOperationException>(
+			() => HybridWebViewHandler.BuildMethodCache(typeof(ValidTarget), EmptyJsonContext.Default));
+
+		Assert.Contains("does not contain metadata", ex.Message, StringComparison.OrdinalIgnoreCase);
+	}
+
+	[Fact]
+	public void MissingReturnJsonTypeInfo_ThrowsAtRegistration()
+	{
+		// ParamOnlyJsonContext has int but NOT string — GetNameAsync returns Task<string>
+		var ex = Assert.Throws<InvalidOperationException>(
+			() => HybridWebViewHandler.BuildMethodCache(typeof(ValidTarget), ParamOnlyJsonContext.Default));
+
+		Assert.Contains("does not contain metadata", ex.Message, StringComparison.OrdinalIgnoreCase);
+		Assert.Contains("GetNameAsync", ex.Message, StringComparison.OrdinalIgnoreCase);
+	}
+
+	[Fact]
+	public async Task CachedDelegate_InvokesCorrectly_VoidReturn()
+	{
+		var cache = HybridWebViewHandler.BuildMethodCache(typeof(ValidTarget), ValidTargetJsonContext.Default);
+		var target = new ValidTarget();
+
+		var handler = (HybridWebViewHandler.DotNetMethodDelegate)cache["DoWork"];
+		var result = await handler(target, null);
+
+		Assert.Null(result);
+		Assert.True(target.WorkDone);
+	}
+
+	[Fact]
+	public async Task CachedDelegate_InvokesCorrectly_SyncReturn()
+	{
+		var cache = HybridWebViewHandler.BuildMethodCache(typeof(ValidTarget), ValidTargetJsonContext.Default);
+		var target = new ValidTarget();
+
+		var handler = (HybridWebViewHandler.DotNetMethodDelegate)cache["Add"];
+		var result = await handler(target, new[] { "3", "4" });
+
+		Assert.Equal("7", result);
+	}
+
+	[Fact]
+	public async Task CachedDelegate_InvokesCorrectly_AsyncReturn()
+	{
+		var cache = HybridWebViewHandler.BuildMethodCache(typeof(ValidTarget), ValidTargetJsonContext.Default);
+		var target = new ValidTarget();
+
+		var handler = (HybridWebViewHandler.DotNetMethodDelegate)cache["GetNameAsync"];
+		var result = await handler(target, null);
+
+		Assert.Equal("\"test\"", result);
+	}
+
+	[Fact]
+	public async Task CachedDelegate_WrongParamCount_Throws()
+	{
+		var cache = HybridWebViewHandler.BuildMethodCache(typeof(ValidTarget), ValidTargetJsonContext.Default);
+		var target = new ValidTarget();
+
+		var handler = (HybridWebViewHandler.DotNetMethodDelegate)cache["Add"];
+		await Assert.ThrowsAsync<InvalidOperationException>(
+			() => handler(target, new[] { "1" })); // expects 2 params, got 1
+	}
+
+	// --- Target types ---
+
+	public class ValidTarget
+	{
+		public bool WorkDone { get; private set; }
+
+		public int Add(int a, int b) => a + b;
+		public async Task<string> GetNameAsync()
+		{
+			await Task.Yield();
+			return "test";
+		}
+		public void DoWork() => WorkDone = true;
+	}
+
+	public class OverloadedTarget
+	{
+		public int Compute(int a) => a;
+		public int Compute(int a, int b) => a + b;
+	}
+
+	public class GenericMethodTarget
+	{
+		public T Echo<T>(T value) => value;
+		public int NonGeneric() => 42;
+	}
+
+	public class PropertyTarget
+	{
+		public int Value { get; set; }
+		public void DoSomething() { }
+	}
+
+	public class RefParamTarget
+	{
+		public void Modify(ref int x) => x = 42;
+	}
+
+	// --- JSON contexts ---
+
+	[JsonSerializable(typeof(int))]
+	[JsonSerializable(typeof(string))]
+	internal partial class ValidTargetJsonContext : JsonSerializerContext { }
+
+	[JsonSerializable(typeof(int))]
+	internal partial class OverloadedTargetJsonContext : JsonSerializerContext { }
+
+	[JsonSerializable(typeof(int))]
+	internal partial class GenericMethodJsonContext : JsonSerializerContext { }
+
+	[JsonSerializable(typeof(int))]
+	internal partial class PropertyTargetJsonContext : JsonSerializerContext { }
+
+	[JsonSerializable(typeof(int))]
+	internal partial class RefParamJsonContext : JsonSerializerContext { }
+
+	[JsonSerializable(typeof(bool))]
+	internal partial class EmptyJsonContext : JsonSerializerContext { }
+
+	[JsonSerializable(typeof(int))]
+	internal partial class ParamOnlyJsonContext : JsonSerializerContext { }
+}
+}

From ec9f97a52a2a2dc37335aa74c051310bf5c00291 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 13 May 2026 12:07:27 +0200
Subject: [PATCH 02/39] refactor: Remove BuildMethodCache fallback and legacy
 reflection path

The handler now exclusively uses the source-generated method cache.
No suppressions, no reflection, no RUC/RDC on the invocation path.

- Remove BuildMethodCache and all reflection helpers
- Remove legacy fallback from InvokeDotNetAsync
- InvokeDotNetAsync throws if no method cache is configured
- Remove BuildMethodCache unit tests (behavior tested via device tests)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../src/Core/HybridWebView/HybridWebView.cs   |  10 +-
 .../HybridWebView/HybridWebViewHandler.cs     | 316 +-----------------
 .../HybridWebViewBuildMethodCacheTests.cs     | 198 -----------
 3 files changed, 17 insertions(+), 507 deletions(-)
 delete mode 100644 src/Core/tests/UnitTests/HybridWebViewBuildMethodCacheTests.cs

diff --git a/src/Controls/src/Core/HybridWebView/HybridWebView.cs b/src/Controls/src/Core/HybridWebView/HybridWebView.cs
index 332e6dbf019a..36e6bc6e27ef 100644
--- a/src/Controls/src/Core/HybridWebView/HybridWebView.cs
+++ b/src/Controls/src/Core/HybridWebView/HybridWebView.cs
@@ -110,15 +110,7 @@ public string? HybridRoot
 			_invokeJavaScriptTarget = target;
 			_invokeJavaScriptType = typeof(T);
 			_invokeJavaScriptJsonSerializerContext = jsonSerializerContext;
-
-			if (jsonSerializerContext is not null)
-			{
-				_invokeJavaScriptMethodCache = Maui.Handlers.HybridWebViewHandler.BuildMethodCache(typeof(T), jsonSerializerContext);
-			}
-			else
-			{
-				_invokeJavaScriptMethodCache = null;
-			}
+			_invokeJavaScriptMethodCache = null;
 		}
 
 		void IHybridWebView.RawMessageReceived(string rawMessage)
diff --git a/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs b/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs
index 8c0dc0f63b75..cf42330055e8 100644
--- a/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs
+++ b/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs
@@ -39,15 +39,12 @@
 using System.Collections.Specialized;
 using System.Text.Json.Serialization;
 using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
 using Microsoft.Extensions.Logging;
-using System.Runtime.ExceptionServices;
 
 namespace Microsoft.Maui.Handlers
 {
 	public partial class HybridWebViewHandler : IHybridWebViewHandler
 	{
-		internal const string DynamicFeatures = "HybridWebView's legacy SetInvokeJavaScriptTarget API uses reflection and dynamic System.Text.Json serialization features.";
 
 		/// <summary>
 		/// The delegate type stored in the method cache. Each entry handles the full pipeline:
@@ -186,14 +183,18 @@ void MessageReceived(string rawMessage)
 			}
 		}
 
-		[RequiresUnreferencedCode(DynamicFeatures)]
-#if !NETSTANDARD
-		[RequiresDynamicCode(DynamicFeatures)]
-#endif
 		internal async Task<byte[]?> InvokeDotNetAsync(Stream? streamBody = null, string? stringBody = null)
 		{
 			try
 			{
+				var methodCache = VirtualView.InvokeJavaScriptMethodCache
+					?? throw new InvalidOperationException(
+						$"No method cache is configured. Call {nameof(IHybridWebView.SetInvokeJavaScriptTarget)} with a JsonSerializerContext to enable JS-to-.NET method invocation.");
+
+				var target = VirtualView.InvokeJavaScriptTarget
+					?? throw new InvalidOperationException(
+						$"The {nameof(IHybridWebView)}.{nameof(IHybridWebView.InvokeJavaScriptTarget)} property must have a value in order to invoke a .NET method from JavaScript.");
+
 				JSInvokeMethodData? invokeData = null;
 				if (streamBody is not null)
 				{
@@ -209,21 +210,17 @@ void MessageReceived(string rawMessage)
 					throw new InvalidOperationException("The invoke data did not provide a method name.");
 				}
 
-				DotNetInvokeResult invokeResult;
-				if (VirtualView.InvokeJavaScriptMethodCache is { } methodCache)
+				var methodName = invokeData.MethodName;
+				if (!methodCache.TryGetValue(methodName, out var entry) || entry is not DotNetMethodDelegate handler)
 				{
-					// AOT-safe path: use pre-built delegates from method cache
-					invokeResult = await InvokeCachedMethodAsync(
-						VirtualView.InvokeJavaScriptTarget!,
-						methodCache,
-						invokeData);
-				}
-				else
-				{
-					// Legacy path: full reflection
-					invokeResult = await InvokeLegacyAsync(invokeData);
+					throw new InvalidOperationException($"The method '{methodName}' was not found on the invoke target. Available methods: {string.Join(", ", methodCache.Keys)}.");
 				}
 
+				var jsonResult = await handler(target, invokeData.ParamValues);
+				var invokeResult = jsonResult is null
+					? new DotNetInvokeResult()
+					: new DotNetInvokeResult { Result = jsonResult, IsJson = true };
+
 				var json = JsonSerializer.Serialize(invokeResult, HybridWebViewHandlerJsonContext.Default.DotNetInvokeResult);
 				return Encoding.UTF8.GetBytes(json);
 			}
@@ -243,287 +240,6 @@ void MessageReceived(string rawMessage)
 			}
 		}
 
-		/// <summary>
-		/// AOT-safe invocation path: uses pre-built typed delegates from the method cache.
-		/// No MakeGenericMethod, no GetProperty, no reflection-based JSON.
-		/// </summary>
-		private static async Task<DotNetInvokeResult> InvokeCachedMethodAsync(
-			object target,
-			IReadOnlyDictionary<string, object> methodCache,
-			JSInvokeMethodData invokeData)
-		{
-			var methodName = invokeData.MethodName!;
-			if (!methodCache.TryGetValue(methodName, out var entry) || entry is not DotNetMethodDelegate handler)
-			{
-				throw new InvalidOperationException($"The method '{methodName}' was not found on the invoke target. Available methods: {string.Join(", ", methodCache.Keys)}.");
-			}
-
-			var jsonResult = await handler(target, invokeData.ParamValues);
-			if (jsonResult is null)
-			{
-				return new DotNetInvokeResult();
-			}
-
-			return new DotNetInvokeResult
-			{
-				Result = jsonResult,
-				IsJson = true,
-			};
-		}
-
-		/// <summary>
-		/// Legacy reflection-based invocation path for backward compatibility.
-		/// </summary>
-		[RequiresUnreferencedCode(DynamicFeatures)]
-#if !NETSTANDARD
-		[RequiresDynamicCode(DynamicFeatures)]
-#endif
-		private async Task<DotNetInvokeResult> InvokeLegacyAsync(JSInvokeMethodData invokeData)
-		{
-			var invokeTarget = VirtualView.InvokeJavaScriptTarget ?? throw new InvalidOperationException($"The {nameof(IHybridWebView)}.{nameof(IHybridWebView.InvokeJavaScriptTarget)} property must have a value in order to invoke a .NET method from JavaScript.");
-			var invokeTargetType = VirtualView.InvokeJavaScriptType ?? throw new InvalidOperationException($"The {nameof(IHybridWebView)}.{nameof(IHybridWebView.InvokeJavaScriptType)} property must have a value in order to invoke a .NET method from JavaScript.");
-
-			var result = await InvokeDotNetMethodLegacyAsync(invokeTargetType, invokeTarget, invokeData);
-			return CreateInvokeResultLegacy(result);
-		}
-
-		[RequiresUnreferencedCode(DynamicFeatures)]
-#if !NETSTANDARD
-		[RequiresDynamicCode(DynamicFeatures)]
-#endif
-		private static DotNetInvokeResult CreateInvokeResultLegacy(object? result)
-		{
-			if (result is null)
-			{
-				return new();
-			}
-
-			var resultType = result.GetType();
-			if (resultType.IsArray || resultType.IsClass)
-			{
-				return new DotNetInvokeResult()
-				{
-					Result = JsonSerializer.Serialize(result),
-					IsJson = true,
-				};
-			}
-
-			return new DotNetInvokeResult()
-			{
-				Result = result,
-			};
-		}
-
-		[RequiresUnreferencedCode(DynamicFeatures)]
-#if !NETSTANDARD
-		[RequiresDynamicCode(DynamicFeatures)]
-#endif
-		private static async Task<object?> InvokeDotNetMethodLegacyAsync(
-			[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] Type targetType,
-			object jsInvokeTarget,
-			JSInvokeMethodData invokeData)
-		{
-			var requestMethodName = invokeData.MethodName!;
-			var requestParams = invokeData.ParamValues;
-
-			var dotnetMethod = targetType.GetMethod(requestMethodName, BindingFlags.Public | BindingFlags.Instance | BindingFlags.InvokeMethod);
-			if (dotnetMethod is null)
-			{
-				throw new InvalidOperationException($"The method {requestMethodName} couldn't be found on the {nameof(jsInvokeTarget)} of type {jsInvokeTarget.GetType().FullName}.");
-			}
-			var dotnetParams = dotnetMethod.GetParameters();
-			if (requestParams is not null && dotnetParams.Length != requestParams.Length)
-			{
-				throw new InvalidOperationException($"The number of parameters on {nameof(jsInvokeTarget)}'s method {requestMethodName} ({dotnetParams.Length}) doesn't match the number of values passed from JavaScript code ({requestParams.Length}).");
-			}
-
-			object?[]? invokeParamValues = null;
-			if (requestParams is not null)
-			{
-				invokeParamValues = new object?[requestParams.Length];
-				for (var i = 0; i < requestParams.Length; i++)
-				{
-					invokeParamValues[i] = JsonSerializer.Deserialize(requestParams[i], dotnetParams[i].ParameterType);
-				}
-			}
-
-			var dotnetReturnValue = InvokeMethod(jsInvokeTarget, dotnetMethod, invokeParamValues);
-
-			if (dotnetReturnValue is null)
-			{
-				return null;
-			}
-
-			if (dotnetReturnValue is Task task)
-			{
-				await task;
-
-				if (dotnetMethod.ReturnType.IsGenericType)
-				{
-					var resultProperty = dotnetMethod.ReturnType.GetProperty(nameof(Task<object>.Result));
-					return resultProperty?.GetValue(task);
-				}
-
-				return null;
-			}
-
-			return dotnetReturnValue;
-		}
-
-		private static object? InvokeMethod(object jsInvokeTarget, MethodInfo dotnetMethod, object?[]? invokeParamValues)
-		{
-			try
-			{
-				// invoke the .NET method
-				return dotnetMethod.Invoke(jsInvokeTarget, invokeParamValues);
-			}
-			catch (TargetInvocationException tie) // unwrap while preserving original stack trace
-			{
-				if (tie.InnerException is not null)
-				{
-					// Rethrow the underlying exception without losing its original stack trace
-					ExceptionDispatchInfo.Capture(tie.InnerException).Throw();
-
-					// unreachable, but required for compiler flow analysis
-					throw;
-				}
-
-				// no inner exception; rethrow the TargetInvocationException itself preserving its stack
-				throw;
-			}
-		}
-
-		/// <summary>
-		/// Builds a method cache at registration time using reflection.
-		/// This is the runtime fallback — the source generator will replace this with
-		/// fully typed delegates that don't need any suppressions.
-		/// </summary>
-		internal static IReadOnlyDictionary<string, object> BuildMethodCache(
-			[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods)] Type targetType,
-			JsonSerializerContext jsonSerializerContext)
-		{
-			var cache = new Dictionary<string, object>(StringComparer.Ordinal);
-
-			var methods = targetType.GetMethods(BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly);
-			foreach (var method in methods)
-			{
-				if (method.IsSpecialName || method.IsGenericMethodDefinition)
-				{
-					continue;
-				}
-
-				var methodName = method.Name;
-				if (cache.ContainsKey(methodName))
-				{
-					throw new InvalidOperationException($"The type '{targetType.FullName}' has multiple methods named '{methodName}'. Method overloads are not supported for JavaScript invocation.");
-				}
-
-				var parameters = method.GetParameters();
-
-				// Pre-resolve parameter JsonTypeInfos
-				var paramJsonTypeInfos = new JsonTypeInfo[parameters.Length];
-				for (var i = 0; i < parameters.Length; i++)
-				{
-					var paramType = parameters[i].ParameterType;
-					if (paramType.IsByRef || paramType.IsPointer)
-					{
-						throw new InvalidOperationException($"The method '{methodName}' on type '{targetType.FullName}' has a ref/pointer parameter '{parameters[i].Name}' which is not supported for JavaScript invocation.");
-					}
-
-					paramJsonTypeInfos[i] = jsonSerializerContext.GetTypeInfo(paramType)
-						?? throw new InvalidOperationException($"The JSON serializer context does not contain metadata for parameter type '{paramType.FullName}' (parameter '{parameters[i].Name}' of method '{methodName}'). Add [JsonSerializable(typeof({paramType.Name}))] to your JsonSerializerContext.");
-				}
-
-				// Pre-resolve return type handling
-				var returnType = method.ReturnType;
-				JsonTypeInfo? returnJsonTypeInfo = null;
-				PropertyInfo? taskResultProperty = null;
-				bool isTask = false;
-				bool isTaskOfT = false;
-
-				if (returnType == typeof(void))
-				{
-					// no-op
-				}
-				else if (returnType == typeof(Task))
-				{
-					isTask = true;
-				}
-				else if (returnType.IsGenericType && returnType.GetGenericTypeDefinition() == typeof(Task<>))
-				{
-					isTask = true;
-					isTaskOfT = true;
-					var resultType = returnType.GetGenericArguments()[0];
-					returnJsonTypeInfo = jsonSerializerContext.GetTypeInfo(resultType)
-						?? throw new InvalidOperationException($"The JSON serializer context does not contain metadata for return type '{resultType.FullName}' (Task<{resultType.Name}> of method '{methodName}'). Add [JsonSerializable(typeof({resultType.Name}))] to your JsonSerializerContext.");
-					taskResultProperty = GetTaskResultProperty(returnType);
-				}
-				else
-				{
-					returnJsonTypeInfo = jsonSerializerContext.GetTypeInfo(returnType)
-						?? throw new InvalidOperationException($"The JSON serializer context does not contain metadata for return type '{returnType.FullName}' of method '{methodName}'. Add [JsonSerializable(typeof({returnType.Name}))] to your JsonSerializerContext.");
-				}
-
-				// Capture everything in a closure — this delegate handles the full pipeline
-				var capturedMethod = method;
-				var capturedParamInfos = paramJsonTypeInfos;
-				var capturedReturnInfo = returnJsonTypeInfo;
-				var capturedTaskResultProp = taskResultProperty;
-				var capturedIsTask = isTask;
-				var capturedIsTaskOfT = isTaskOfT;
-
-				cache[methodName] = new DotNetMethodDelegate(async (object target, string[]? paramJsonValues) =>
-				{
-					// Deserialize parameters
-					object?[]? args = null;
-					if (capturedParamInfos.Length > 0)
-					{
-						if (paramJsonValues is null || paramJsonValues.Length != capturedParamInfos.Length)
-						{
-							throw new InvalidOperationException($"The method '{methodName}' expects {capturedParamInfos.Length} parameter(s) but {paramJsonValues?.Length ?? 0} were provided from JavaScript.");
-						}
-
-						args = new object?[capturedParamInfos.Length];
-						for (var i = 0; i < capturedParamInfos.Length; i++)
-						{
-							args[i] = JsonSerializer.Deserialize(paramJsonValues[i], capturedParamInfos[i]);
-						}
-					}
-
-					// Invoke
-					var returnValue = InvokeMethod(target, capturedMethod, args);
-
-					// Handle result
-					if (capturedIsTask && returnValue is Task task)
-					{
-						await task;
-
-						if (capturedIsTaskOfT)
-						{
-							var result = capturedTaskResultProp!.GetValue(task);
-							return result is null ? null : JsonSerializer.Serialize(result, capturedReturnInfo!);
-						}
-
-						return null; // Task (void)
-					}
-
-					if (returnValue is null)
-					{
-						return null;
-					}
-
-					return JsonSerializer.Serialize(returnValue, capturedReturnInfo!);
-				});
-			}
-
-			return cache;
-		}
-
-		[UnconditionalSuppressMessage("Trimming", "IL2070",
-			Justification = "Task<T> is a BCL framework type whose public properties (including Result) are always preserved and never trimmed. This will be replaced by the source generator.")]
-		private static PropertyInfo GetTaskResultProperty(Type taskOfTType) =>
-			taskOfTType.GetProperty(nameof(Task<object>.Result))!;
-
 		private sealed class JSInvokeMethodData
 		{
 			public string? MethodName { get; set; }
diff --git a/src/Core/tests/UnitTests/HybridWebViewBuildMethodCacheTests.cs b/src/Core/tests/UnitTests/HybridWebViewBuildMethodCacheTests.cs
deleted file mode 100644
index 8dc1ce6cec5e..000000000000
--- a/src/Core/tests/UnitTests/HybridWebViewBuildMethodCacheTests.cs
+++ /dev/null
@@ -1,198 +0,0 @@
-#nullable enable
-using System;
-using System.Collections.Generic;
-using System.Text.Json.Serialization;
-using System.Text.Json.Serialization.Metadata;
-using System.Threading.Tasks;
-using Microsoft.Maui.Handlers;
-using Xunit;
-
-namespace Microsoft.Maui.UnitTests
-{
-
-public partial class HybridWebViewBuildMethodCacheTests
-{
-	[Fact]
-	public void ValidMethods_AreCached()
-	{
-		var cache = HybridWebViewHandler.BuildMethodCache(typeof(ValidTarget), ValidTargetJsonContext.Default);
-
-		Assert.True(cache.ContainsKey("Add"));
-		Assert.True(cache.ContainsKey("GetNameAsync"));
-		Assert.True(cache.ContainsKey("DoWork"));
-		Assert.Equal(3, cache.Count);
-	}
-
-	[Fact]
-	public void OverloadedMethods_ThrowAtRegistration()
-	{
-		var ex = Assert.Throws<InvalidOperationException>(
-			() => HybridWebViewHandler.BuildMethodCache(typeof(OverloadedTarget), OverloadedTargetJsonContext.Default));
-
-		Assert.Contains("multiple methods named", ex.Message, StringComparison.OrdinalIgnoreCase);
-		Assert.Contains("Compute", ex.Message, StringComparison.OrdinalIgnoreCase);
-	}
-
-	[Fact]
-	public void GenericMethods_AreSkipped()
-	{
-		var cache = HybridWebViewHandler.BuildMethodCache(typeof(GenericMethodTarget), GenericMethodJsonContext.Default);
-
-		Assert.False(cache.ContainsKey("Echo"));
-		Assert.True(cache.ContainsKey("NonGeneric"));
-		Assert.Single(cache);
-	}
-
-	[Fact]
-	public void SpecialNameMethods_AreSkipped()
-	{
-		var cache = HybridWebViewHandler.BuildMethodCache(typeof(PropertyTarget), PropertyTargetJsonContext.Default);
-
-		// get_Value and set_Value should be skipped (IsSpecialName)
-		Assert.False(cache.ContainsKey("get_Value"));
-		Assert.False(cache.ContainsKey("set_Value"));
-		Assert.True(cache.ContainsKey("DoSomething"));
-		Assert.Single(cache);
-	}
-
-	[Fact]
-	public void RefParameter_ThrowsAtRegistration()
-	{
-		var ex = Assert.Throws<InvalidOperationException>(
-			() => HybridWebViewHandler.BuildMethodCache(typeof(RefParamTarget), RefParamJsonContext.Default));
-
-		Assert.Contains("ref/pointer", ex.Message, StringComparison.OrdinalIgnoreCase);
-	}
-
-	[Fact]
-	public void MissingParamJsonTypeInfo_ThrowsAtRegistration()
-	{
-		// EmptyJsonContext has no type registrations at all
-		var ex = Assert.Throws<InvalidOperationException>(
-			() => HybridWebViewHandler.BuildMethodCache(typeof(ValidTarget), EmptyJsonContext.Default));
-
-		Assert.Contains("does not contain metadata", ex.Message, StringComparison.OrdinalIgnoreCase);
-	}
-
-	[Fact]
-	public void MissingReturnJsonTypeInfo_ThrowsAtRegistration()
-	{
-		// ParamOnlyJsonContext has int but NOT string — GetNameAsync returns Task<string>
-		var ex = Assert.Throws<InvalidOperationException>(
-			() => HybridWebViewHandler.BuildMethodCache(typeof(ValidTarget), ParamOnlyJsonContext.Default));
-
-		Assert.Contains("does not contain metadata", ex.Message, StringComparison.OrdinalIgnoreCase);
-		Assert.Contains("GetNameAsync", ex.Message, StringComparison.OrdinalIgnoreCase);
-	}
-
-	[Fact]
-	public async Task CachedDelegate_InvokesCorrectly_VoidReturn()
-	{
-		var cache = HybridWebViewHandler.BuildMethodCache(typeof(ValidTarget), ValidTargetJsonContext.Default);
-		var target = new ValidTarget();
-
-		var handler = (HybridWebViewHandler.DotNetMethodDelegate)cache["DoWork"];
-		var result = await handler(target, null);
-
-		Assert.Null(result);
-		Assert.True(target.WorkDone);
-	}
-
-	[Fact]
-	public async Task CachedDelegate_InvokesCorrectly_SyncReturn()
-	{
-		var cache = HybridWebViewHandler.BuildMethodCache(typeof(ValidTarget), ValidTargetJsonContext.Default);
-		var target = new ValidTarget();
-
-		var handler = (HybridWebViewHandler.DotNetMethodDelegate)cache["Add"];
-		var result = await handler(target, new[] { "3", "4" });
-
-		Assert.Equal("7", result);
-	}
-
-	[Fact]
-	public async Task CachedDelegate_InvokesCorrectly_AsyncReturn()
-	{
-		var cache = HybridWebViewHandler.BuildMethodCache(typeof(ValidTarget), ValidTargetJsonContext.Default);
-		var target = new ValidTarget();
-
-		var handler = (HybridWebViewHandler.DotNetMethodDelegate)cache["GetNameAsync"];
-		var result = await handler(target, null);
-
-		Assert.Equal("\"test\"", result);
-	}
-
-	[Fact]
-	public async Task CachedDelegate_WrongParamCount_Throws()
-	{
-		var cache = HybridWebViewHandler.BuildMethodCache(typeof(ValidTarget), ValidTargetJsonContext.Default);
-		var target = new ValidTarget();
-
-		var handler = (HybridWebViewHandler.DotNetMethodDelegate)cache["Add"];
-		await Assert.ThrowsAsync<InvalidOperationException>(
-			() => handler(target, new[] { "1" })); // expects 2 params, got 1
-	}
-
-	// --- Target types ---
-
-	public class ValidTarget
-	{
-		public bool WorkDone { get; private set; }
-
-		public int Add(int a, int b) => a + b;
-		public async Task<string> GetNameAsync()
-		{
-			await Task.Yield();
-			return "test";
-		}
-		public void DoWork() => WorkDone = true;
-	}
-
-	public class OverloadedTarget
-	{
-		public int Compute(int a) => a;
-		public int Compute(int a, int b) => a + b;
-	}
-
-	public class GenericMethodTarget
-	{
-		public T Echo<T>(T value) => value;
-		public int NonGeneric() => 42;
-	}
-
-	public class PropertyTarget
-	{
-		public int Value { get; set; }
-		public void DoSomething() { }
-	}
-
-	public class RefParamTarget
-	{
-		public void Modify(ref int x) => x = 42;
-	}
-
-	// --- JSON contexts ---
-
-	[JsonSerializable(typeof(int))]
-	[JsonSerializable(typeof(string))]
-	internal partial class ValidTargetJsonContext : JsonSerializerContext { }
-
-	[JsonSerializable(typeof(int))]
-	internal partial class OverloadedTargetJsonContext : JsonSerializerContext { }
-
-	[JsonSerializable(typeof(int))]
-	internal partial class GenericMethodJsonContext : JsonSerializerContext { }
-
-	[JsonSerializable(typeof(int))]
-	internal partial class PropertyTargetJsonContext : JsonSerializerContext { }
-
-	[JsonSerializable(typeof(int))]
-	internal partial class RefParamJsonContext : JsonSerializerContext { }
-
-	[JsonSerializable(typeof(bool))]
-	internal partial class EmptyJsonContext : JsonSerializerContext { }
-
-	[JsonSerializable(typeof(int))]
-	internal partial class ParamOnlyJsonContext : JsonSerializerContext { }
-}
-}

From b8a94f0cd2c6e19a57035e917040e5b1e2fd67de Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 13 May 2026 12:22:15 +0200
Subject: [PATCH 03/39] refactor: Use Microsoft.Maui.Controls.Generated
 namespace for interceptor

Consolidates to a single interceptor namespace shared with the binding
source generator.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../netstandard2.0/Microsoft.Maui.Controls.targets              | 1 -
 src/Controls/src/Core/Controls.Core.csproj                      | 2 +-
 .../HybridWebViewInvokeTargetGenerator.cs                       | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Controls/src/Build.Tasks/nuget/buildTransitive/netstandard2.0/Microsoft.Maui.Controls.targets b/src/Controls/src/Build.Tasks/nuget/buildTransitive/netstandard2.0/Microsoft.Maui.Controls.targets
index aea1cc349cbb..3e079f7ccb81 100644
--- a/src/Controls/src/Build.Tasks/nuget/buildTransitive/netstandard2.0/Microsoft.Maui.Controls.targets
+++ b/src/Controls/src/Build.Tasks/nuget/buildTransitive/netstandard2.0/Microsoft.Maui.Controls.targets
@@ -38,7 +38,6 @@
 	<PropertyGroup>
 		<_MauiBindingInterceptorsSupport Condition=" '$(_MauiBindingInterceptorsSupport)' == '' and '$(DisableMauiAnalyzers)' != 'true' ">true</_MauiBindingInterceptorsSupport>
 		<InterceptorsPreviewNamespaces Condition=" '$(_MauiBindingInterceptorsSupport)' == 'true' ">$(InterceptorsPreviewNamespaces);Microsoft.Maui.Controls.Generated</InterceptorsPreviewNamespaces>
-		<InterceptorsPreviewNamespaces>$(InterceptorsPreviewNamespaces);Microsoft.Maui.Generated</InterceptorsPreviewNamespaces>
 	</PropertyGroup>
 	<ItemGroup Condition=" '$(_MauiBindingInterceptorsSupport)' == 'true' ">
 		<Analyzer Include="$(MSBuildThisFileDirectory)Microsoft.Maui.Controls.BindingSourceGen.dll" IsImplicitlyDefined="true" />
diff --git a/src/Controls/src/Core/Controls.Core.csproj b/src/Controls/src/Core/Controls.Core.csproj
index 13efc39fe152..fac9e0c587a0 100644
--- a/src/Controls/src/Core/Controls.Core.csproj
+++ b/src/Controls/src/Core/Controls.Core.csproj
@@ -54,7 +54,7 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <InterceptorsPreviewNamespaces>$(InterceptorsPreviewNamespaces);Microsoft.Maui.Controls.Generated;Microsoft.Maui.Generated</InterceptorsPreviewNamespaces>
+    <InterceptorsPreviewNamespaces>$(InterceptorsPreviewNamespaces);Microsoft.Maui.Controls.Generated</InterceptorsPreviewNamespaces>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference
diff --git a/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs b/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs
index 5af14cb645e4..2928329b971f 100644
--- a/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs
+++ b/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs
@@ -164,7 +164,7 @@ private static void GenerateSource(SourceProductionContext spc, ImmutableArray<I
 		sb.AppendLine("    }");
 		sb.AppendLine("}");
 		sb.AppendLine();
-		sb.AppendLine("namespace Microsoft.Maui.Generated");
+		sb.AppendLine("namespace Microsoft.Maui.Controls.Generated");
 		sb.AppendLine("{");
 		sb.AppendLine("    file static class HybridWebViewInterceptors");
 		sb.AppendLine("    {");

From 05f97cbe3f1b378b944ac167a2ed7ca44985edb0 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 13 May 2026 12:23:59 +0200
Subject: [PATCH 04/39] refactor: Remove unnecessary
 [DynamicallyAccessedMembers] from SetInvokeJavaScriptTarget
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The interceptor source generator sees T at compile time — no runtime
reflection on T's members is needed. The legacy obsolete overload is
RUC/RDC territory where DAM doesn't help either.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 src/Controls/src/Core/HybridWebView/HybridWebView.cs | 6 +++---
 src/Core/src/Core/IHybridWebView.cs                  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Controls/src/Core/HybridWebView/HybridWebView.cs b/src/Controls/src/Core/HybridWebView/HybridWebView.cs
index 36e6bc6e27ef..6e2551ca8be3 100644
--- a/src/Controls/src/Core/HybridWebView/HybridWebView.cs
+++ b/src/Controls/src/Core/HybridWebView/HybridWebView.cs
@@ -84,13 +84,13 @@ public string? HybridRoot
 
 		/// <inheritdoc/>
 		[Obsolete(LegacyInvokeJavaScriptTargetObsoleteMessage)]
-		public void SetInvokeJavaScriptTarget<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>(T target) where T : class
+		public void SetInvokeJavaScriptTarget<T>(T target) where T : class
 		{
 			SetInvokeJavaScriptTargetCore<T>(target, jsonSerializerContext: null);
 		}
 
 		/// <inheritdoc/>
-		public void SetInvokeJavaScriptTarget<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>(T target, JsonSerializerContext jsonSerializerContext) where T : class
+		public void SetInvokeJavaScriptTarget<T>(T target, JsonSerializerContext jsonSerializerContext) where T : class
 		{
 			if (jsonSerializerContext is null)
 			{
@@ -100,7 +100,7 @@ public string? HybridRoot
 			SetInvokeJavaScriptTargetCore(target, jsonSerializerContext);
 		}
 
-		void SetInvokeJavaScriptTargetCore<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>(T target, JsonSerializerContext? jsonSerializerContext) where T : class
+		void SetInvokeJavaScriptTargetCore<T>(T target, JsonSerializerContext? jsonSerializerContext) where T : class
 		{
 			if (target is null)
 			{
diff --git a/src/Core/src/Core/IHybridWebView.cs b/src/Core/src/Core/IHybridWebView.cs
index 4ad31a322e0d..d1787ea0f651 100644
--- a/src/Core/src/Core/IHybridWebView.cs
+++ b/src/Core/src/Core/IHybridWebView.cs
@@ -34,7 +34,7 @@ public interface IHybridWebView : IView, IWebRequestInterceptingWebView, IInitia
 		/// <typeparam name="T">The type that contains methods callable from JavaScript.</typeparam>
 		/// <param name="target">An instance of type <typeparamref name="T"/> that will be used to call methods on.</param>
 		[Obsolete("This overload uses reflection and dynamic System.Text.Json serialization features and is not compatible with trimming or NativeAOT. Use SetInvokeJavaScriptTarget<T>(T target, JsonSerializerContext jsonSerializerContext) instead.")]
-		void SetInvokeJavaScriptTarget<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>(T target) where T : class;
+		void SetInvokeJavaScriptTarget<T>(T target) where T : class;
 
 		/// <summary>
 		///  Sets the object that will be the target of JavaScript calls from the web view. The public methods on this object
@@ -43,7 +43,7 @@ public interface IHybridWebView : IView, IWebRequestInterceptingWebView, IInitia
 		/// <typeparam name="T">The type that contains methods callable from JavaScript.</typeparam>
 		/// <param name="target">An instance of type <typeparamref name="T"/> that will be used to call methods on.</param>
 		/// <param name="jsonSerializerContext">The source-generated JSON serializer context for parameter and return types used by the target methods.</param>
-		void SetInvokeJavaScriptTarget<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>(T target, JsonSerializerContext jsonSerializerContext) where T : class;
+		void SetInvokeJavaScriptTarget<T>(T target, JsonSerializerContext jsonSerializerContext) where T : class;
 
 		/// <summary>
 		/// For internal use only.

From 493c334170b1074d3a163e7dd5a04cb73e0c90ef Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 13 May 2026 12:33:19 +0200
Subject: [PATCH 05/39] fix: Restore BuildMethodCacheLegacy for obsolete
 SetInvokeJavaScriptTarget overload

The legacy overload without JsonSerializerContext still needs to build
a method cache using reflection so InvokeDotNetAsync can dispatch.
BuildMethodCacheLegacy is called lazily from InvokeDotNetAsync (internal,
RUC/RDC annotated). No RUC/RDC on user-facing API.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../HybridWebView/HybridWebViewHandler.cs     | 111 +++++++++++++++++-
 1 file changed, 108 insertions(+), 3 deletions(-)

diff --git a/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs b/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs
index cf42330055e8..883995b20129 100644
--- a/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs
+++ b/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs
@@ -39,12 +39,15 @@
 using System.Collections.Specialized;
 using System.Text.Json.Serialization;
 using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
 using Microsoft.Extensions.Logging;
+using System.Runtime.ExceptionServices;
 
 namespace Microsoft.Maui.Handlers
 {
 	public partial class HybridWebViewHandler : IHybridWebViewHandler
 	{
+		internal const string LegacyApiMessage = "This API uses reflection and dynamic System.Text.Json serialization. Use SetInvokeJavaScriptTarget<T>(T target, JsonSerializerContext jsonSerializerContext) instead.";
 
 		/// <summary>
 		/// The delegate type stored in the method cache. Each entry handles the full pipeline:
@@ -183,13 +186,26 @@ void MessageReceived(string rawMessage)
 			}
 		}
 
+		[RequiresUnreferencedCode(LegacyApiMessage)]
+#if !NETSTANDARD
+		[RequiresDynamicCode(LegacyApiMessage)]
+#endif
 		internal async Task<byte[]?> InvokeDotNetAsync(Stream? streamBody = null, string? stringBody = null)
 		{
 			try
 			{
-				var methodCache = VirtualView.InvokeJavaScriptMethodCache
-					?? throw new InvalidOperationException(
-						$"No method cache is configured. Call {nameof(IHybridWebView.SetInvokeJavaScriptTarget)} with a JsonSerializerContext to enable JS-to-.NET method invocation.");
+				var methodCache = VirtualView.InvokeJavaScriptMethodCache;
+
+				// Legacy path: if no cache exists, lazily build one from the target type using reflection.
+				// This happens when the obsolete SetInvokeJavaScriptTarget<T>(T) overload was used.
+				if (methodCache is null)
+				{
+					var targetType = VirtualView.InvokeJavaScriptType
+						?? throw new InvalidOperationException(
+							$"No method cache is configured. Call {nameof(IHybridWebView.SetInvokeJavaScriptTarget)} with a JsonSerializerContext to enable JS-to-.NET method invocation.");
+					methodCache = BuildMethodCacheLegacy(targetType);
+					VirtualView.InvokeJavaScriptMethodCache = methodCache;
+				}
 
 				var target = VirtualView.InvokeJavaScriptTarget
 					?? throw new InvalidOperationException(
@@ -240,6 +256,95 @@ void MessageReceived(string rawMessage)
 			}
 		}
 
+		/// <summary>
+		/// Builds a method cache using reflection for the legacy SetInvokeJavaScriptTarget overload.
+		/// This is only called from the obsolete overload that doesn't take a JsonSerializerContext.
+		/// </summary>
+		[RequiresUnreferencedCode(LegacyApiMessage)]
+#if !NETSTANDARD
+		[RequiresDynamicCode(LegacyApiMessage)]
+#endif
+		internal static IReadOnlyDictionary<string, object> BuildMethodCacheLegacy(
+			Type targetType)
+		{
+			var cache = new Dictionary<string, object>(StringComparer.Ordinal);
+
+			var methods = targetType.GetMethods(BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly);
+			foreach (var method in methods)
+			{
+				if (method.IsSpecialName || method.IsGenericMethodDefinition)
+				{
+					continue;
+				}
+
+				var methodName = method.Name;
+				if (cache.ContainsKey(methodName))
+				{
+					continue; // skip overloads silently in legacy mode
+				}
+
+				var capturedMethod = method;
+				cache[methodName] = new DotNetMethodDelegate(async (object t, string[]? paramJsonValues) =>
+				{
+					var dotnetParams = capturedMethod.GetParameters();
+					object?[]? args = null;
+					if (paramJsonValues is not null)
+					{
+						if (dotnetParams.Length != paramJsonValues.Length)
+						{
+							throw new InvalidOperationException($"Method '{methodName}' expects {dotnetParams.Length} parameter(s) but {paramJsonValues.Length} were provided.");
+						}
+
+						args = new object?[paramJsonValues.Length];
+						for (var i = 0; i < paramJsonValues.Length; i++)
+						{
+							args[i] = JsonSerializer.Deserialize(paramJsonValues[i], dotnetParams[i].ParameterType);
+						}
+					}
+
+					object? returnValue;
+					try
+					{
+						returnValue = capturedMethod.Invoke(t, args);
+					}
+					catch (TargetInvocationException tie) when (tie.InnerException is not null)
+					{
+						ExceptionDispatchInfo.Capture(tie.InnerException).Throw();
+						throw; // unreachable
+					}
+
+					if (returnValue is null)
+					{
+						return null;
+					}
+
+					if (returnValue is Task task)
+					{
+						await task;
+
+						if (capturedMethod.ReturnType.IsGenericType && capturedMethod.ReturnType.GetGenericTypeDefinition() == typeof(Task<>))
+						{
+							var resultProperty = capturedMethod.ReturnType.GetProperty(nameof(Task<object>.Result));
+							var result = resultProperty?.GetValue(task);
+							return result is null ? null : JsonSerializer.Serialize(result);
+						}
+
+						return null;
+					}
+
+					var resultType = returnValue.GetType();
+					if (resultType.IsArray || resultType.IsClass)
+					{
+						return JsonSerializer.Serialize(returnValue);
+					}
+
+					return JsonSerializer.Serialize(returnValue);
+				});
+			}
+
+			return cache;
+		}
+
 		private sealed class JSInvokeMethodData
 		{
 			public string? MethodName { get; set; }

From 1b73fc34f473dc6d5920ede4cfd5c3482b623bbb Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 13 May 2026 12:58:17 +0200
Subject: [PATCH 06/39] refactor: Introduce IHybridWebViewInvoker abstraction

Replace the dictionary-based method cache with a clean internal
IHybridWebViewInvoker interface:
- ReflectionHybridWebViewInvoker: legacy path, RUC/RDC on class
- Source-generated implementation: interceptor generates typed invoker

The handler is now trivial: invoker.InvokeMethodAsync(name, args).
Zero reflection, zero RUC/RDC, zero suppressions in the handler.

Legacy SetInvokeJavaScriptTarget<T>(T) is now an explicit interface
implementation to avoid tainting typeof(HybridWebView) with RUC.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../src/Core/HybridWebView/HybridWebView.cs   |  81 +++--------
 .../PublicAPI/net/PublicAPI.Unshipped.txt     |   2 +
 .../netstandard/PublicAPI.Unshipped.txt       |   2 +
 ...dWebViewTests_SetInvokeJavaScriptTarget.cs |  26 ++--
 src/Core/src/Core/IHybridWebView.cs           |  22 +--
 src/Core/src/Core/IHybridWebViewInvoker.cs    |  19 +++
 .../HybridWebView/HybridWebViewHandler.cs     | 137 +-----------------
 .../ReflectionHybridWebViewInvoker.cs         |  87 +++++++++++
 .../HybridWebViewInvokeTargetGenerator.cs     |  70 +++++----
 .../src/PublicAPI/net/PublicAPI.Unshipped.txt |   8 +-
 .../netstandard2.0/PublicAPI.Unshipped.txt    |   8 +-
 11 files changed, 205 insertions(+), 257 deletions(-)
 create mode 100644 src/Core/src/Core/IHybridWebViewInvoker.cs
 create mode 100644 src/Core/src/Handlers/HybridWebView/ReflectionHybridWebViewInvoker.cs

diff --git a/src/Controls/src/Core/HybridWebView/HybridWebView.cs b/src/Controls/src/Core/HybridWebView/HybridWebView.cs
index 6e2551ca8be3..676c2bd99243 100644
--- a/src/Controls/src/Core/HybridWebView/HybridWebView.cs
+++ b/src/Controls/src/Core/HybridWebView/HybridWebView.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
 using System.Text.Json.Serialization;
@@ -14,8 +13,6 @@ namespace Microsoft.Maui.Controls
 	/// </summary>
 	public class HybridWebView : View, IHybridWebView
 	{
-		const string LegacyInvokeJavaScriptTargetObsoleteMessage = "This overload uses reflection and dynamic System.Text.Json serialization features and is not compatible with trimming or NativeAOT. Use SetInvokeJavaScriptTarget<T>(T target, JsonSerializerContext jsonSerializerContext) instead.";
-
 		/// <summary>Bindable property for <see cref="DefaultFile"/>.</summary>
 		public static readonly BindableProperty DefaultFileProperty =
 			BindableProperty.Create(nameof(DefaultFile), typeof(string), typeof(HybridWebView), defaultValue: "index.html");
@@ -23,7 +20,6 @@ public class HybridWebView : View, IHybridWebView
 		public static readonly BindableProperty HybridRootProperty =
 			BindableProperty.Create(nameof(HybridRoot), typeof(string), typeof(HybridWebView), defaultValue: "wwwroot");
 
-
 		/// <inheritdoc/>
 		public string? DefaultFile
 		{
@@ -38,79 +34,50 @@ public string? HybridRoot
 			set { SetValue(HybridRootProperty, value); }
 		}
 
+		IHybridWebViewInvoker? _invoker;
+
 		/// <inheritdoc/>
-		object? IHybridWebView.InvokeJavaScriptTarget
+		IHybridWebViewInvoker? IHybridWebView.Invoker
 		{
-			get => _invokeJavaScriptTarget;
-			set
-			{
-				_invokeJavaScriptTarget = value;
-				_invokeJavaScriptJsonSerializerContext = null;
-			}
+			get => _invoker;
+			set => _invoker = value;
 		}
 
-		object? _invokeJavaScriptTarget;
-
-		Type? _invokeJavaScriptType;
-
 		/// <inheritdoc/>
-		Type? IHybridWebView.InvokeJavaScriptType
+		[Obsolete("This overload uses reflection and dynamic System.Text.Json serialization features and is not compatible with trimming or NativeAOT. Use SetInvokeJavaScriptTarget<T>(T target, JsonSerializerContext jsonSerializerContext) instead.")]
+		[RequiresUnreferencedCode("This overload uses reflection and is not compatible with trimming or NativeAOT.")]
+#if !NETSTANDARD
+		[RequiresDynamicCode("This overload uses reflection and is not compatible with trimming or NativeAOT.")]
+#endif
+		void IHybridWebView.SetInvokeJavaScriptTarget<T>(T target)
 		{
-			get => _invokeJavaScriptType;
-			set
+			if (target is null)
 			{
-				_invokeJavaScriptType = value;
-				_invokeJavaScriptJsonSerializerContext = null;
+				throw new ArgumentNullException(nameof(target));
 			}
-		}
 
-		/// <inheritdoc/>
-		JsonSerializerContext? IHybridWebView.InvokeJavaScriptJsonSerializerContext
-		{
-			get => _invokeJavaScriptJsonSerializerContext;
-			set => _invokeJavaScriptJsonSerializerContext = value;
-		}
-
-		JsonSerializerContext? _invokeJavaScriptJsonSerializerContext;
-
-		/// <inheritdoc/>
-		IReadOnlyDictionary<string, object>? IHybridWebView.InvokeJavaScriptMethodCache
-		{
-			get => _invokeJavaScriptMethodCache;
-			set => _invokeJavaScriptMethodCache = value;
-		}
-
-		IReadOnlyDictionary<string, object>? _invokeJavaScriptMethodCache;
-
-		/// <inheritdoc/>
-		[Obsolete(LegacyInvokeJavaScriptTargetObsoleteMessage)]
-		public void SetInvokeJavaScriptTarget<T>(T target) where T : class
-		{
-			SetInvokeJavaScriptTargetCore<T>(target, jsonSerializerContext: null);
+			_invoker = new ReflectionHybridWebViewInvoker(target, typeof(T));
 		}
 
 		/// <inheritdoc/>
 		public void SetInvokeJavaScriptTarget<T>(T target, JsonSerializerContext jsonSerializerContext) where T : class
 		{
-			if (jsonSerializerContext is null)
+			if (target is null)
 			{
-				throw new ArgumentNullException(nameof(jsonSerializerContext));
+				throw new ArgumentNullException(nameof(target));
 			}
 
-			SetInvokeJavaScriptTargetCore(target, jsonSerializerContext);
-		}
-
-		void SetInvokeJavaScriptTargetCore<T>(T target, JsonSerializerContext? jsonSerializerContext) where T : class
-		{
-			if (target is null)
+			if (jsonSerializerContext is null)
 			{
-				throw new ArgumentNullException(nameof(target));
+				throw new ArgumentNullException(nameof(jsonSerializerContext));
 			}
 
-			_invokeJavaScriptTarget = target;
-			_invokeJavaScriptType = typeof(T);
-			_invokeJavaScriptJsonSerializerContext = jsonSerializerContext;
-			_invokeJavaScriptMethodCache = null;
+			// The source generator interceptor replaces this method call at compile time
+			// and sets _invoker to a generated implementation with fully typed delegates.
+			// If the interceptor didn't fire (e.g. indirect call), throw at runtime.
+			throw new InvalidOperationException(
+				"SetInvokeJavaScriptTarget<T>(T, JsonSerializerContext) must be intercepted by the source generator. " +
+				"Ensure the Microsoft.Maui.Core.HybridWebViewSourceGen analyzer is referenced.");
 		}
 
 		void IHybridWebView.RawMessageReceived(string rawMessage)
diff --git a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
index e6f6dd96fe09..6d2861d08522 100644
--- a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -1,4 +1,6 @@
 #nullable enable
+Microsoft.Maui.IHybridWebView.Invoker.get -> Microsoft.Maui.IHybridWebViewInvoker?
+Microsoft.Maui.IHybridWebView.Invoker.set -> void
 Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.Controls.AppThemeBinding
 Microsoft.Maui.Controls.AppThemeBinding.AppThemeBinding() -> void
diff --git a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index 6199d40e77a3..12afce06a1a7 100644
--- a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -1,4 +1,6 @@
 #nullable enable
+Microsoft.Maui.IHybridWebView.Invoker.get -> Microsoft.Maui.IHybridWebViewInvoker?
+Microsoft.Maui.IHybridWebView.Invoker.set -> void
 Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 ~Microsoft.Maui.Controls.BackButtonBehavior.AccessibilityLabel.get -> string
 ~Microsoft.Maui.Controls.BackButtonBehavior.AccessibilityLabel.set -> void
diff --git a/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs b/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs
index 2646057792bd..e8407e763e95 100644
--- a/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs
+++ b/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs
@@ -35,20 +35,17 @@ public Task InvokeDotNet(string methodName, string expectedReturnValue) =>
 		});
 
 	[Fact]
-	public Task MethodCacheIsPopulated_WhenUsingJsonSerializerContext() =>
+	public Task InvokerIsSet_WhenUsingJsonSerializerContext() =>
 		RunTest("invokedotnettests.html", async (hybridWebView) =>
 		{
 			var invokeJavaScriptTarget = new TestDotNetMethods();
 			hybridWebView.SetInvokeJavaScriptTarget(invokeJavaScriptTarget, InvokeDotNetJsonContext.Default);
 
-			// Verify the method cache was populated (AOT-safe path)
-			var cache = ((IHybridWebView)hybridWebView).InvokeJavaScriptMethodCache;
-			Assert.NotNull(cache);
-			Assert.True(cache.ContainsKey("Invoke_NoParam_NoReturn"), "Cache should contain void method");
-			Assert.True(cache.ContainsKey("Invoke_NoParam_ReturnTaskValueType"), "Cache should contain Task<int> method");
-			Assert.True(cache.ContainsKey("Invoke_OneParam_ReturnValueType"), "Cache should contain parameterized method");
+			// Verify the invoker was set (AOT-safe path)
+			var invoker = ((IHybridWebView)hybridWebView).Invoker;
+			Assert.NotNull(invoker);
 
-			// Verify the cached path actually works end-to-end
+			// Verify the invoker actually works end-to-end
 			hybridWebView.SendRawMessage("Invoke_NoParam_ReturnTaskValueType");
 			await WebViewHelpers.WaitForHtmlStatusSet(hybridWebView);
 			var result = await hybridWebView.EvaluateJavaScriptAsync("GetLastScriptResult()");
@@ -56,16 +53,17 @@ public Task MethodCacheIsPopulated_WhenUsingJsonSerializerContext() =>
 		});
 
 	[Fact]
-	public Task MethodCacheIsNull_WhenUsingLegacyOverload() =>
+	public Task InvokerIsSet_WhenUsingLegacyOverload() =>
 		RunTest("invokedotnettests.html", (hybridWebView) =>
 		{
-#pragma warning disable CS0618 // Testing the legacy obsolete overload
+#pragma warning disable CS0618, IL2026, IL3050 // Testing the legacy obsolete overload
 			hybridWebView.SetInvokeJavaScriptTarget(new TestDotNetMethods());
-#pragma warning restore CS0618
+#pragma warning restore CS0618, IL2026, IL3050
 
-			// Verify the method cache is NOT populated (legacy fallback path)
-			var cache = ((IHybridWebView)hybridWebView).InvokeJavaScriptMethodCache;
-			Assert.Null(cache);
+			// Verify the invoker was set (legacy reflection path)
+			var invoker = ((IHybridWebView)hybridWebView).Invoker;
+			Assert.NotNull(invoker);
+			Assert.IsType<ReflectionHybridWebViewInvoker>(invoker);
 
 			return Task.CompletedTask;
 		});
diff --git a/src/Core/src/Core/IHybridWebView.cs b/src/Core/src/Core/IHybridWebView.cs
index d1787ea0f651..a6f8bf80b818 100644
--- a/src/Core/src/Core/IHybridWebView.cs
+++ b/src/Core/src/Core/IHybridWebView.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization.Metadata;
@@ -22,11 +21,6 @@ public interface IHybridWebView : IView, IWebRequestInterceptingWebView, IInitia
 		/// </summary>
 		string? HybridRoot { get; }
 
-		/// <summary>
-		/// For internal use only.
-		/// </summary>
-		object? InvokeJavaScriptTarget { get; set; }
-
 		/// <summary>
 		///  Sets the object that will be the target of JavaScript calls from the web view. The public methods on this object
 		///  are callable from JavaScript using the <c>window.HybridWebView.InvokeDotNet</c> method.
@@ -34,6 +28,10 @@ public interface IHybridWebView : IView, IWebRequestInterceptingWebView, IInitia
 		/// <typeparam name="T">The type that contains methods callable from JavaScript.</typeparam>
 		/// <param name="target">An instance of type <typeparamref name="T"/> that will be used to call methods on.</param>
 		[Obsolete("This overload uses reflection and dynamic System.Text.Json serialization features and is not compatible with trimming or NativeAOT. Use SetInvokeJavaScriptTarget<T>(T target, JsonSerializerContext jsonSerializerContext) instead.")]
+		[RequiresUnreferencedCode("This overload uses reflection and is not compatible with trimming or NativeAOT.")]
+#if !NETSTANDARD
+		[RequiresDynamicCode("This overload uses reflection and is not compatible with trimming or NativeAOT.")]
+#endif
 		void SetInvokeJavaScriptTarget<T>(T target) where T : class;
 
 		/// <summary>
@@ -48,17 +46,7 @@ public interface IHybridWebView : IView, IWebRequestInterceptingWebView, IInitia
 		/// <summary>
 		/// For internal use only.
 		/// </summary>
-		Type? InvokeJavaScriptType { get; set; }
-
-		/// <summary>
-		/// For internal use only.
-		/// </summary>
-		JsonSerializerContext? InvokeJavaScriptJsonSerializerContext { get; set; }
-
-		/// <summary>
-		/// For internal use only. Pre-resolved method cache for AOT-safe JS-to-.NET invocation.
-		/// </summary>
-		IReadOnlyDictionary<string, object>? InvokeJavaScriptMethodCache { get; set; }
+		internal IHybridWebViewInvoker? Invoker { get; set; }
 
 		void RawMessageReceived(string rawMessage);
 
diff --git a/src/Core/src/Core/IHybridWebViewInvoker.cs b/src/Core/src/Core/IHybridWebViewInvoker.cs
new file mode 100644
index 000000000000..c650f310f376
--- /dev/null
+++ b/src/Core/src/Core/IHybridWebViewInvoker.cs
@@ -0,0 +1,19 @@
+using System.Threading.Tasks;
+
+namespace Microsoft.Maui
+{
+	/// <summary>
+	/// Internal abstraction for JS-to-.NET method invocation.
+	/// Implemented by the reflection-based fallback and by the source generator.
+	/// </summary>
+	internal interface IHybridWebViewInvoker
+	{
+		/// <summary>
+		/// Invokes the named .NET method with JSON-serialized parameters and returns a JSON-serialized result.
+		/// </summary>
+		/// <param name="methodName">The name of the method to invoke.</param>
+		/// <param name="paramJsonValues">JSON-serialized parameter values, or null for parameterless methods.</param>
+		/// <returns>JSON-serialized result, or null for void methods or null returns.</returns>
+		Task<string?> InvokeMethodAsync(string methodName, string[]? paramJsonValues);
+	}
+}
diff --git a/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs b/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs
index 883995b20129..df80361ee873 100644
--- a/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs
+++ b/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs
@@ -32,28 +32,17 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
-using System.Text.Json.Serialization.Metadata;
 using System.Text;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Maui.Hosting;
 using System.Collections.Specialized;
 using System.Text.Json.Serialization;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
 using Microsoft.Extensions.Logging;
-using System.Runtime.ExceptionServices;
 
 namespace Microsoft.Maui.Handlers
 {
 	public partial class HybridWebViewHandler : IHybridWebViewHandler
 	{
-		internal const string LegacyApiMessage = "This API uses reflection and dynamic System.Text.Json serialization. Use SetInvokeJavaScriptTarget<T>(T target, JsonSerializerContext jsonSerializerContext) instead.";
-
-		/// <summary>
-		/// The delegate type stored in the method cache. Each entry handles the full pipeline:
-		/// deserialize params → invoke method → await if Task → serialize result.
-		/// </summary>
-		internal delegate Task<string?> DotNetMethodDelegate(object target, string[]? paramJsonValues);
 
 		// Using an IP address means that the web view doesn't wait for any DNS resolution,
 		// making it substantially faster. Note that this isn't real HTTP traffic, since
@@ -186,30 +175,13 @@ void MessageReceived(string rawMessage)
 			}
 		}
 
-		[RequiresUnreferencedCode(LegacyApiMessage)]
-#if !NETSTANDARD
-		[RequiresDynamicCode(LegacyApiMessage)]
-#endif
 		internal async Task<byte[]?> InvokeDotNetAsync(Stream? streamBody = null, string? stringBody = null)
 		{
 			try
 			{
-				var methodCache = VirtualView.InvokeJavaScriptMethodCache;
-
-				// Legacy path: if no cache exists, lazily build one from the target type using reflection.
-				// This happens when the obsolete SetInvokeJavaScriptTarget<T>(T) overload was used.
-				if (methodCache is null)
-				{
-					var targetType = VirtualView.InvokeJavaScriptType
-						?? throw new InvalidOperationException(
-							$"No method cache is configured. Call {nameof(IHybridWebView.SetInvokeJavaScriptTarget)} with a JsonSerializerContext to enable JS-to-.NET method invocation.");
-					methodCache = BuildMethodCacheLegacy(targetType);
-					VirtualView.InvokeJavaScriptMethodCache = methodCache;
-				}
-
-				var target = VirtualView.InvokeJavaScriptTarget
+				var invoker = VirtualView.Invoker
 					?? throw new InvalidOperationException(
-						$"The {nameof(IHybridWebView)}.{nameof(IHybridWebView.InvokeJavaScriptTarget)} property must have a value in order to invoke a .NET method from JavaScript.");
+						$"No invoker is configured. Call {nameof(IHybridWebView.SetInvokeJavaScriptTarget)} to set up JS-to-.NET method invocation.");
 
 				JSInvokeMethodData? invokeData = null;
 				if (streamBody is not null)
@@ -226,19 +198,13 @@ void MessageReceived(string rawMessage)
 					throw new InvalidOperationException("The invoke data did not provide a method name.");
 				}
 
-				var methodName = invokeData.MethodName;
-				if (!methodCache.TryGetValue(methodName, out var entry) || entry is not DotNetMethodDelegate handler)
-				{
-					throw new InvalidOperationException($"The method '{methodName}' was not found on the invoke target. Available methods: {string.Join(", ", methodCache.Keys)}.");
-				}
-
-				var jsonResult = await handler(target, invokeData.ParamValues);
+				var jsonResult = await invoker.InvokeMethodAsync(invokeData.MethodName, invokeData.ParamValues);
 				var invokeResult = jsonResult is null
 					? new DotNetInvokeResult()
 					: new DotNetInvokeResult { Result = jsonResult, IsJson = true };
 
-				var json = JsonSerializer.Serialize(invokeResult, HybridWebViewHandlerJsonContext.Default.DotNetInvokeResult);
-				return Encoding.UTF8.GetBytes(json);
+				return Encoding.UTF8.GetBytes(
+					JsonSerializer.Serialize(invokeResult, HybridWebViewHandlerJsonContext.Default.DotNetInvokeResult));
 			}
 			catch (Exception ex)
 			{
@@ -251,98 +217,9 @@ void MessageReceived(string rawMessage)
 					ErrorType = ex.GetType().Name,
 					ErrorStackTrace = ex.StackTrace
 				};
-				var errorJson = JsonSerializer.Serialize(errorResult, HybridWebViewHandlerJsonContext.Default.DotNetInvokeResult);
-				return Encoding.UTF8.GetBytes(errorJson);
-			}
-		}
-
-		/// <summary>
-		/// Builds a method cache using reflection for the legacy SetInvokeJavaScriptTarget overload.
-		/// This is only called from the obsolete overload that doesn't take a JsonSerializerContext.
-		/// </summary>
-		[RequiresUnreferencedCode(LegacyApiMessage)]
-#if !NETSTANDARD
-		[RequiresDynamicCode(LegacyApiMessage)]
-#endif
-		internal static IReadOnlyDictionary<string, object> BuildMethodCacheLegacy(
-			Type targetType)
-		{
-			var cache = new Dictionary<string, object>(StringComparer.Ordinal);
-
-			var methods = targetType.GetMethods(BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly);
-			foreach (var method in methods)
-			{
-				if (method.IsSpecialName || method.IsGenericMethodDefinition)
-				{
-					continue;
-				}
-
-				var methodName = method.Name;
-				if (cache.ContainsKey(methodName))
-				{
-					continue; // skip overloads silently in legacy mode
-				}
-
-				var capturedMethod = method;
-				cache[methodName] = new DotNetMethodDelegate(async (object t, string[]? paramJsonValues) =>
-				{
-					var dotnetParams = capturedMethod.GetParameters();
-					object?[]? args = null;
-					if (paramJsonValues is not null)
-					{
-						if (dotnetParams.Length != paramJsonValues.Length)
-						{
-							throw new InvalidOperationException($"Method '{methodName}' expects {dotnetParams.Length} parameter(s) but {paramJsonValues.Length} were provided.");
-						}
-
-						args = new object?[paramJsonValues.Length];
-						for (var i = 0; i < paramJsonValues.Length; i++)
-						{
-							args[i] = JsonSerializer.Deserialize(paramJsonValues[i], dotnetParams[i].ParameterType);
-						}
-					}
-
-					object? returnValue;
-					try
-					{
-						returnValue = capturedMethod.Invoke(t, args);
-					}
-					catch (TargetInvocationException tie) when (tie.InnerException is not null)
-					{
-						ExceptionDispatchInfo.Capture(tie.InnerException).Throw();
-						throw; // unreachable
-					}
-
-					if (returnValue is null)
-					{
-						return null;
-					}
-
-					if (returnValue is Task task)
-					{
-						await task;
-
-						if (capturedMethod.ReturnType.IsGenericType && capturedMethod.ReturnType.GetGenericTypeDefinition() == typeof(Task<>))
-						{
-							var resultProperty = capturedMethod.ReturnType.GetProperty(nameof(Task<object>.Result));
-							var result = resultProperty?.GetValue(task);
-							return result is null ? null : JsonSerializer.Serialize(result);
-						}
-
-						return null;
-					}
-
-					var resultType = returnValue.GetType();
-					if (resultType.IsArray || resultType.IsClass)
-					{
-						return JsonSerializer.Serialize(returnValue);
-					}
-
-					return JsonSerializer.Serialize(returnValue);
-				});
+				return Encoding.UTF8.GetBytes(
+					JsonSerializer.Serialize(errorResult, HybridWebViewHandlerJsonContext.Default.DotNetInvokeResult));
 			}
-
-			return cache;
 		}
 
 		private sealed class JSInvokeMethodData
diff --git a/src/Core/src/Handlers/HybridWebView/ReflectionHybridWebViewInvoker.cs b/src/Core/src/Handlers/HybridWebView/ReflectionHybridWebViewInvoker.cs
new file mode 100644
index 000000000000..25c52966d8d2
--- /dev/null
+++ b/src/Core/src/Handlers/HybridWebView/ReflectionHybridWebViewInvoker.cs
@@ -0,0 +1,87 @@
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+using System.Runtime.ExceptionServices;
+using System.Text.Json;
+using System.Threading.Tasks;
+
+namespace Microsoft.Maui
+{
+	/// <summary>
+	/// Reflection-based invoker for the legacy SetInvokeJavaScriptTarget overload.
+	/// </summary>
+	[RequiresUnreferencedCode("Uses reflection and dynamic JSON serialization.")]
+#if !NETSTANDARD
+	[RequiresDynamicCode("Uses reflection and dynamic JSON serialization.")]
+#endif
+	internal sealed class ReflectionHybridWebViewInvoker : IHybridWebViewInvoker
+	{
+		private readonly object _target;
+		private readonly Type _targetType;
+
+		public ReflectionHybridWebViewInvoker(object target, Type targetType)
+		{
+			_target = target;
+			_targetType = targetType;
+		}
+
+		public async Task<string?> InvokeMethodAsync(string methodName, string[]? paramJsonValues)
+		{
+			var method = _targetType.GetMethod(methodName, BindingFlags.Public | BindingFlags.Instance | BindingFlags.InvokeMethod)
+				?? throw new InvalidOperationException($"The method '{methodName}' was not found on type '{_targetType.FullName}'.");
+
+			var parameters = method.GetParameters();
+			if (paramJsonValues is not null && parameters.Length != paramJsonValues.Length)
+			{
+				throw new InvalidOperationException($"Method '{methodName}' expects {parameters.Length} parameter(s) but {paramJsonValues.Length} were provided.");
+			}
+
+			// Deserialize parameters
+			object?[]? args = null;
+			if (paramJsonValues is not null)
+			{
+				args = new object?[paramJsonValues.Length];
+				for (var i = 0; i < paramJsonValues.Length; i++)
+				{
+					args[i] = JsonSerializer.Deserialize(paramJsonValues[i], parameters[i].ParameterType);
+				}
+			}
+
+			// Invoke
+			object? returnValue;
+			try
+			{
+				returnValue = method.Invoke(_target, args);
+			}
+			catch (TargetInvocationException tie) when (tie.InnerException is not null)
+			{
+				ExceptionDispatchInfo.Capture(tie.InnerException).Throw();
+				throw; // unreachable
+			}
+
+			if (returnValue is null)
+			{
+				return null;
+			}
+
+			// Handle Task / Task<T>
+			if (returnValue is Task task)
+			{
+				await task;
+
+				var returnType = method.ReturnType;
+				if (returnType.IsGenericType && returnType.GetGenericTypeDefinition() == typeof(Task<>))
+				{
+					var resultProperty = returnType.GetProperty(nameof(Task<object>.Result));
+					var result = resultProperty?.GetValue(task);
+					return result is null ? null : JsonSerializer.Serialize(result);
+				}
+
+				return null;
+			}
+
+			// Synchronous return
+			return JsonSerializer.Serialize(returnValue);
+		}
+	}
+}
diff --git a/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs b/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs
index 2928329b971f..3c4ef49be0b5 100644
--- a/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs
+++ b/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs
@@ -176,82 +176,90 @@ private static void GenerateSource(SourceProductionContext spc, ImmutableArray<I
 				continue;
 
 			var loc = info.Location;
+
+			// Generate the interceptor method
 			sb.AppendLine($"        [global::System.Runtime.CompilerServices.InterceptsLocationAttribute({loc.Version}, @\"{loc.Data}\")]");
 			sb.AppendLine($"        public static void SetInvokeJavaScriptTarget_{index}<T>(this global::Microsoft.Maui.Controls.HybridWebView hybridWebView, T target, global::System.Text.Json.Serialization.JsonSerializerContext jsonSerializerContext) where T : class");
 			sb.AppendLine("        {");
 			sb.AppendLine("            if (target is null) throw new ArgumentNullException(nameof(target));");
 			sb.AppendLine("            if (jsonSerializerContext is null) throw new ArgumentNullException(nameof(jsonSerializerContext));");
 			sb.AppendLine();
-			sb.AppendLine($"            var cache = BuildMethodCache_{index}(({info.TargetTypeName})(object)target, jsonSerializerContext);");
-			sb.AppendLine("            ((global::Microsoft.Maui.IHybridWebView)hybridWebView).InvokeJavaScriptTarget = target;");
-			sb.AppendLine($"            ((global::Microsoft.Maui.IHybridWebView)hybridWebView).InvokeJavaScriptType = typeof({info.TargetTypeName});");
-			sb.AppendLine("            ((global::Microsoft.Maui.IHybridWebView)hybridWebView).InvokeJavaScriptJsonSerializerContext = jsonSerializerContext;");
-			sb.AppendLine("            ((global::Microsoft.Maui.IHybridWebView)hybridWebView).InvokeJavaScriptMethodCache = cache;");
+			sb.AppendLine($"            ((global::Microsoft.Maui.IHybridWebView)hybridWebView).Invoker = new Invoker_{index}(({info.TargetTypeName})(object)target, jsonSerializerContext);");
 			sb.AppendLine("        }");
 			sb.AppendLine();
 
-			// Generate the typed BuildMethodCache
-			sb.AppendLine($"        private static global::System.Collections.Generic.IReadOnlyDictionary<string, object> BuildMethodCache_{index}({info.TargetTypeName} target, global::System.Text.Json.Serialization.JsonSerializerContext ctx)");
+			// Generate the IHybridWebViewInvoker implementation
+			sb.AppendLine($"        private sealed class Invoker_{index} : global::Microsoft.Maui.IHybridWebViewInvoker");
 			sb.AppendLine("        {");
-			sb.AppendLine("            return new global::System.Collections.Generic.Dictionary<string, object>(global::System.StringComparer.Ordinal)");
+			sb.AppendLine($"            private readonly {info.TargetTypeName} _target;");
+			sb.AppendLine("            private readonly global::System.Text.Json.Serialization.JsonSerializerContext _ctx;");
+			sb.AppendLine();
+			sb.AppendLine($"            public Invoker_{index}({info.TargetTypeName} target, global::System.Text.Json.Serialization.JsonSerializerContext ctx)");
+			sb.AppendLine("            {");
+			sb.AppendLine("                _target = target;");
+			sb.AppendLine("                _ctx = ctx;");
+			sb.AppendLine("            }");
+			sb.AppendLine();
+			sb.AppendLine("            public async global::System.Threading.Tasks.Task<string?> InvokeMethodAsync(string methodName, string[]? paramJsonValues)");
 			sb.AppendLine("            {");
+			sb.AppendLine("                switch (methodName)");
+			sb.AppendLine("                {");
 
 			foreach (var method in info.Methods)
 			{
-				sb.AppendLine($"                [\"{method.Name}\"] = new global::Microsoft.Maui.Handlers.HybridWebViewHandler.DotNetMethodDelegate(async (object __target, string[]? __args) =>");
-				sb.AppendLine("                {");
-				sb.AppendLine($"                    var __typedTarget = ({info.TargetTypeName})(object)__target;");
+				sb.AppendLine($"                    case \"{method.Name}\":");
+				sb.AppendLine("                    {");
 
-				// Deserialize params — validate args count first
+				// Deserialize params
 				if (method.Parameters.Length > 0)
 				{
-					sb.AppendLine($"                    if (__args is null || __args.Length != {method.Parameters.Length})");
-					sb.AppendLine($"                        throw new global::System.InvalidOperationException(\"Method '{method.Name}' expects {method.Parameters.Length} argument(s) but received \" + (__args?.Length ?? 0) + \".\");");
+					sb.AppendLine($"                        if (paramJsonValues is null || paramJsonValues.Length != {method.Parameters.Length})");
+					sb.AppendLine($"                            throw new global::System.InvalidOperationException(\"Method '{method.Name}' expects {method.Parameters.Length} argument(s) but received \" + (paramJsonValues?.Length ?? 0) + \".\");");
 
 					for (int i = 0; i < method.Parameters.Length; i++)
 					{
 						var p = method.Parameters[i];
-						sb.AppendLine($"                    var __{p.Name} = global::System.Text.Json.JsonSerializer.Deserialize<{p.TypeName}>(__args[{i}], GetRequiredJsonTypeInfo<{p.TypeName}>(ctx, \"{method.Name}\", \"{p.Name}\"));");
+						sb.AppendLine($"                        var __{p.Name} = global::System.Text.Json.JsonSerializer.Deserialize<{p.TypeName}>(paramJsonValues[{i}], GetRequiredJsonTypeInfo<{p.TypeName}>(_ctx, \"{method.Name}\", \"{p.Name}\"));");
 					}
 				}
 
-				// Build argument list
 				var argList = string.Join(", ", Array.ConvertAll(method.Parameters, p => $"__{p.Name}"));
 
-				// Invoke + handle result
 				switch (method.ReturnKind)
 				{
 					case "void":
-						sb.AppendLine($"                    __typedTarget.{method.Name}({argList});");
-						sb.AppendLine("                    return null;");
+						sb.AppendLine($"                        _target.{method.Name}({argList});");
+						sb.AppendLine("                        return null;");
 						break;
 					case "Task":
-						sb.AppendLine($"                    await __typedTarget.{method.Name}({argList});");
-						sb.AppendLine("                    return null;");
+						sb.AppendLine($"                        await _target.{method.Name}({argList});");
+						sb.AppendLine("                        return null;");
 						break;
 					case "TaskOfT":
-						sb.AppendLine($"                    var __result = await __typedTarget.{method.Name}({argList});");
-						sb.AppendLine($"                    if (__result is null) return null;");
-						sb.AppendLine($"                    return global::System.Text.Json.JsonSerializer.Serialize<{method.ResultTypeName}>(__result, GetRequiredJsonTypeInfo<{method.ResultTypeName}>(ctx, \"{method.Name}\", \"return\"));");
+						sb.AppendLine($"                        var __result = await _target.{method.Name}({argList});");
+						sb.AppendLine($"                        if (__result is null) return null;");
+						sb.AppendLine($"                        return global::System.Text.Json.JsonSerializer.Serialize<{method.ResultTypeName}>(__result, GetRequiredJsonTypeInfo<{method.ResultTypeName}>(_ctx, \"{method.Name}\", \"return\"));");
 						break;
 					case "sync":
-						sb.AppendLine($"                    var __result = __typedTarget.{method.Name}({argList});");
-						sb.AppendLine($"                    if (__result is null) return null;");
-						sb.AppendLine($"                    return global::System.Text.Json.JsonSerializer.Serialize<{method.ResultTypeName}>(__result, GetRequiredJsonTypeInfo<{method.ResultTypeName}>(ctx, \"{method.Name}\", \"return\"));");
+						sb.AppendLine($"                        var __result = _target.{method.Name}({argList});");
+						sb.AppendLine($"                        if (__result is null) return null;");
+						sb.AppendLine($"                        return global::System.Text.Json.JsonSerializer.Serialize<{method.ResultTypeName}>(__result, GetRequiredJsonTypeInfo<{method.ResultTypeName}>(_ctx, \"{method.Name}\", \"return\"));");
 						break;
 				}
 
-				sb.AppendLine("                }),");
+				sb.AppendLine("                    }");
 			}
 
-			sb.AppendLine("            };");
+			sb.AppendLine("                    default:");
+			sb.AppendLine($"                        throw new global::System.InvalidOperationException($\"The method '{{methodName}}' was not found on type '{info.TargetTypeName}'.\");");
+			sb.AppendLine("                }");
+			sb.AppendLine("            }");
 			sb.AppendLine("        }");
 			sb.AppendLine();
 			index++;
 		}
 
-		sb.AppendLine("    }");
-		sb.AppendLine();
+		// Shared helper method
 		sb.AppendLine("        private static global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<T> GetRequiredJsonTypeInfo<T>(global::System.Text.Json.Serialization.JsonSerializerContext ctx, string methodName, string paramName)");
 		sb.AppendLine("        {");
 		sb.AppendLine("            var typeInfo = ctx.GetTypeInfo(typeof(T));");
diff --git a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
index 46f266bb458e..a0f9e77cfecc 100644
--- a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -1,8 +1,8 @@
 #nullable enable
-Microsoft.Maui.IHybridWebView.InvokeJavaScriptJsonSerializerContext.get -> System.Text.Json.Serialization.JsonSerializerContext?
-Microsoft.Maui.IHybridWebView.InvokeJavaScriptJsonSerializerContext.set -> void
-Microsoft.Maui.IHybridWebView.InvokeJavaScriptMethodCache.get -> System.Collections.Generic.IReadOnlyDictionary<string!, object!>?
-Microsoft.Maui.IHybridWebView.InvokeJavaScriptMethodCache.set -> void
+*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptTarget.get -> object?
+*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptTarget.set -> void
+*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptType.get -> System.Type?
+*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptType.set -> void
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 static Microsoft.Maui.GridLength.implicit operator Microsoft.Maui.GridLength(string! value) -> Microsoft.Maui.GridLength
 static Microsoft.Maui.SafeAreaEdges.Container.get -> Microsoft.Maui.SafeAreaEdges
diff --git a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
index 69742923694c..b16184fc8cd7 100644
--- a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
@@ -1,7 +1,7 @@
 #nullable enable
-Microsoft.Maui.IHybridWebView.InvokeJavaScriptJsonSerializerContext.get -> System.Text.Json.Serialization.JsonSerializerContext?
-Microsoft.Maui.IHybridWebView.InvokeJavaScriptJsonSerializerContext.set -> void
-Microsoft.Maui.IHybridWebView.InvokeJavaScriptMethodCache.get -> System.Collections.Generic.IReadOnlyDictionary<string!, object!>?
-Microsoft.Maui.IHybridWebView.InvokeJavaScriptMethodCache.set -> void
+*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptTarget.get -> object?
+*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptTarget.set -> void
+*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptType.get -> System.Type?
+*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptType.set -> void
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 static Microsoft.Maui.SafeAreaEdges.Container.get -> Microsoft.Maui.SafeAreaEdges

From bd9063c0c43e9deb7835f80b4701fe2e00a29392 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 13 May 2026 13:09:32 +0200
Subject: [PATCH 07/39] fix: Make IHybridWebViewInvoker public for source
 generator access

The interceptor generates code in the consumer's assembly, which needs
to implement IHybridWebViewInvoker and set IHybridWebView.Invoker.
Both must be public. Invoker property hidden from IntelliSense via
[EditorBrowsable(Never)].

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 src/Core/src/Core/IHybridWebView.cs                | 6 ++++--
 src/Core/src/Core/IHybridWebViewInvoker.cs         | 4 ++--
 src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt | 4 ++++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/Core/src/Core/IHybridWebView.cs b/src/Core/src/Core/IHybridWebView.cs
index a6f8bf80b818..78bbb695e692 100644
--- a/src/Core/src/Core/IHybridWebView.cs
+++ b/src/Core/src/Core/IHybridWebView.cs
@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization.Metadata;
@@ -44,9 +45,10 @@ public interface IHybridWebView : IView, IWebRequestInterceptingWebView, IInitia
 		void SetInvokeJavaScriptTarget<T>(T target, JsonSerializerContext jsonSerializerContext) where T : class;
 
 		/// <summary>
-		/// For internal use only.
+		/// For internal use only. The invoker that handles JS-to-.NET method dispatch.
 		/// </summary>
-		internal IHybridWebViewInvoker? Invoker { get; set; }
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		IHybridWebViewInvoker? Invoker { get; set; }
 
 		void RawMessageReceived(string rawMessage);
 
diff --git a/src/Core/src/Core/IHybridWebViewInvoker.cs b/src/Core/src/Core/IHybridWebViewInvoker.cs
index c650f310f376..f94bc6acc2fb 100644
--- a/src/Core/src/Core/IHybridWebViewInvoker.cs
+++ b/src/Core/src/Core/IHybridWebViewInvoker.cs
@@ -3,10 +3,10 @@
 namespace Microsoft.Maui
 {
 	/// <summary>
-	/// Internal abstraction for JS-to-.NET method invocation.
+	/// Abstraction for JS-to-.NET method invocation in HybridWebView.
 	/// Implemented by the reflection-based fallback and by the source generator.
 	/// </summary>
-	internal interface IHybridWebViewInvoker
+	public interface IHybridWebViewInvoker
 	{
 		/// <summary>
 		/// Invokes the named .NET method with JSON-serialized parameters and returns a JSON-serialized result.
diff --git a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
index a0f9e77cfecc..2a36150e10fd 100644
--- a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -3,6 +3,10 @@
 *REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptTarget.set -> void
 *REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptType.get -> System.Type?
 *REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptType.set -> void
+Microsoft.Maui.IHybridWebView.Invoker.get -> Microsoft.Maui.IHybridWebViewInvoker?
+Microsoft.Maui.IHybridWebView.Invoker.set -> void
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
+Microsoft.Maui.IHybridWebViewInvoker
+Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
 static Microsoft.Maui.GridLength.implicit operator Microsoft.Maui.GridLength(string! value) -> Microsoft.Maui.GridLength
 static Microsoft.Maui.SafeAreaEdges.Container.get -> Microsoft.Maui.SafeAreaEdges

From bb408293001a3c6e5d0607c2b5f8cdbf228bcd00 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 13 May 2026 13:17:27 +0200
Subject: [PATCH 08/39] =?UTF-8?q?fix:=20Clean=20up=20PublicAPI=20files=20?=
 =?UTF-8?q?=E2=80=94=20only=20add=20our=20new=20entries?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reset all PublicAPI.Unshipped.txt files to net11.0 base and add only
the entries for our new public API surface:
- IHybridWebViewInvoker interface and its InvokeMethodAsync method
- IHybridWebView.Invoker property
- IHybridWebView.SetInvokeJavaScriptTarget<T>(T, JsonSerializerContext)
- *REMOVED* HybridWebView.SetInvokeJavaScriptTarget<T>(T) (now explicit iface)
- HybridWebView.SetInvokeJavaScriptTarget<T>(T, JsonSerializerContext)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../PublicAPI/net-android/PublicAPI.Unshipped.txt    |  8 +++++---
 .../src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt  |  6 ++++--
 .../PublicAPI/net-windows/PublicAPI.Unshipped.txt    |  8 +++++---
 .../PublicAPI/netstandard/PublicAPI.Unshipped.txt    |  6 ++++--
 .../PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt | 12 ++++++------
 5 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
index 0142a349bb0b..9a43c8aedbcd 100644
--- a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -92,9 +92,6 @@ Microsoft.Maui.Platform.MauiMaterialTimePicker.MauiMaterialTimePicker(nint javaR
 Microsoft.Maui.Platform.MauiMaterialTimePicker.OnClick(Android.Views.View? v) -> void
 Microsoft.Maui.Platform.MauiMaterialTimePicker.ShowPicker.get -> System.Action?
 Microsoft.Maui.Platform.MauiMaterialTimePicker.ShowPicker.set -> void
-Microsoft.Maui.IHybridWebView.InvokeJavaScriptJsonSerializerContext.get -> System.Text.Json.Serialization.JsonSerializerContext?
-Microsoft.Maui.IHybridWebView.InvokeJavaScriptJsonSerializerContext.set -> void
-Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.PlatformDrawable
 Microsoft.Maui.PlatformDrawable.PlatformDrawable(Android.Content.Context? context) -> void
 Microsoft.Maui.PlatformDrawable.PlatformDrawable(nint javaReference, Android.Runtime.JniHandleOwnership transfer) -> void
@@ -279,3 +276,8 @@ static Microsoft.Maui.Platform.TimePickerExtensions.UpdateTime(this Microsoft.Ma
 static Microsoft.Maui.SafeAreaEdges.Container.get -> Microsoft.Maui.SafeAreaEdges
 virtual Microsoft.Maui.Handlers.DatePickerHandler2.CreateDatePickerDialog(int year, int month, int day) -> Google.Android.Material.DatePicker.MaterialDatePicker?
 virtual Microsoft.Maui.Handlers.TimePickerHandler2.CreateTimePickerDialog(int hour, int minute) -> Google.Android.Material.TimePicker.MaterialTimePicker?
+Microsoft.Maui.IHybridWebView.Invoker.get -> Microsoft.Maui.IHybridWebViewInvoker?
+Microsoft.Maui.IHybridWebView.Invoker.set -> void
+Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
+Microsoft.Maui.IHybridWebViewInvoker
+Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string[]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
diff --git a/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
index cc90139ccfec..276303e82cce 100644
--- a/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
@@ -1,5 +1,7 @@
 #nullable enable
 static Microsoft.Maui.GridLength.implicit operator Microsoft.Maui.GridLength(string! value) -> Microsoft.Maui.GridLength
-Microsoft.Maui.IHybridWebView.InvokeJavaScriptJsonSerializerContext.get -> System.Text.Json.Serialization.JsonSerializerContext?
-Microsoft.Maui.IHybridWebView.InvokeJavaScriptJsonSerializerContext.set -> void
+Microsoft.Maui.IHybridWebView.Invoker.get -> Microsoft.Maui.IHybridWebViewInvoker?
+Microsoft.Maui.IHybridWebView.Invoker.set -> void
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
+Microsoft.Maui.IHybridWebViewInvoker
+Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string[]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
diff --git a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index 8b0885a86d5b..3abefb99aa2c 100644
--- a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -1,7 +1,9 @@
 #nullable enable
-Microsoft.Maui.IHybridWebView.InvokeJavaScriptJsonSerializerContext.get -> System.Text.Json.Serialization.JsonSerializerContext?
-Microsoft.Maui.IHybridWebView.InvokeJavaScriptJsonSerializerContext.set -> void
-Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 override Microsoft.Maui.Platform.MauiPasswordTextBox.OnCreateAutomationPeer() -> Microsoft.UI.Xaml.Automation.Peers.AutomationPeer!
 static Microsoft.Maui.GridLength.implicit operator Microsoft.Maui.GridLength(string! value) -> Microsoft.Maui.GridLength
 static Microsoft.Maui.SafeAreaEdges.Container.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.IHybridWebView.Invoker.get -> Microsoft.Maui.IHybridWebViewInvoker?
+Microsoft.Maui.IHybridWebView.Invoker.set -> void
+Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
+Microsoft.Maui.IHybridWebViewInvoker
+Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string[]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
diff --git a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index f0ad60398d4f..8a32b72f072c 100644
--- a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -1,5 +1,7 @@
 #nullable enable
 static Microsoft.Maui.SafeAreaEdges.Container.get -> Microsoft.Maui.SafeAreaEdges
-Microsoft.Maui.IHybridWebView.InvokeJavaScriptJsonSerializerContext.get -> System.Text.Json.Serialization.JsonSerializerContext?
-Microsoft.Maui.IHybridWebView.InvokeJavaScriptJsonSerializerContext.set -> void
+Microsoft.Maui.IHybridWebView.Invoker.get -> Microsoft.Maui.IHybridWebViewInvoker?
+Microsoft.Maui.IHybridWebView.Invoker.set -> void
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
+Microsoft.Maui.IHybridWebViewInvoker
+Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string[]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
diff --git a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
index b16184fc8cd7..8a32b72f072c 100644
--- a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
@@ -1,7 +1,7 @@
-#nullable enable
-*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptTarget.get -> object?
-*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptTarget.set -> void
-*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptType.get -> System.Type?
-*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptType.set -> void
-Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
+#nullable enable
 static Microsoft.Maui.SafeAreaEdges.Container.get -> Microsoft.Maui.SafeAreaEdges
+Microsoft.Maui.IHybridWebView.Invoker.get -> Microsoft.Maui.IHybridWebViewInvoker?
+Microsoft.Maui.IHybridWebView.Invoker.set -> void
+Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
+Microsoft.Maui.IHybridWebViewInvoker
+Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string[]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!

From 6266be35ddf46e159786556cc3c86e754504b9be Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 13 May 2026 13:23:55 +0200
Subject: [PATCH 09/39] refactor: Replace [Obsolete] with RUC/RDC messages on
 legacy overload

The legacy SetInvokeJavaScriptTarget<T>(T) no longer shows an obsolete
warning to everyone. Instead, RUC/RDC messages guide trimming/AOT users
to the safe overload. CoreCLR/MonoVM users are not bothered.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 src/Controls/src/Core/HybridWebView/HybridWebView.cs         | 5 ++---
 .../HybridWebViewTests_SetInvokeJavaScriptTarget.cs          | 4 ++--
 src/Core/src/Core/IHybridWebView.cs                          | 5 ++---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/Controls/src/Core/HybridWebView/HybridWebView.cs b/src/Controls/src/Core/HybridWebView/HybridWebView.cs
index 676c2bd99243..aa1b9dd22fd9 100644
--- a/src/Controls/src/Core/HybridWebView/HybridWebView.cs
+++ b/src/Controls/src/Core/HybridWebView/HybridWebView.cs
@@ -44,10 +44,9 @@ public string? HybridRoot
 		}
 
 		/// <inheritdoc/>
-		[Obsolete("This overload uses reflection and dynamic System.Text.Json serialization features and is not compatible with trimming or NativeAOT. Use SetInvokeJavaScriptTarget<T>(T target, JsonSerializerContext jsonSerializerContext) instead.")]
-		[RequiresUnreferencedCode("This overload uses reflection and is not compatible with trimming or NativeAOT.")]
+		[RequiresUnreferencedCode("Use SetInvokeJavaScriptTarget<T>(T target, JsonSerializerContext jsonSerializerContext) for trimming and NativeAOT compatibility.")]
 #if !NETSTANDARD
-		[RequiresDynamicCode("This overload uses reflection and is not compatible with trimming or NativeAOT.")]
+		[RequiresDynamicCode("Use SetInvokeJavaScriptTarget<T>(T target, JsonSerializerContext jsonSerializerContext) for trimming and NativeAOT compatibility.")]
 #endif
 		void IHybridWebView.SetInvokeJavaScriptTarget<T>(T target)
 		{
diff --git a/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs b/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs
index e8407e763e95..e418ca54e2a0 100644
--- a/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs
+++ b/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs
@@ -56,9 +56,9 @@ public Task InvokerIsSet_WhenUsingJsonSerializerContext() =>
 	public Task InvokerIsSet_WhenUsingLegacyOverload() =>
 		RunTest("invokedotnettests.html", (hybridWebView) =>
 		{
-#pragma warning disable CS0618, IL2026, IL3050 // Testing the legacy obsolete overload
+#pragma warning disable IL2026, IL3050 // Testing the legacy overload
 			hybridWebView.SetInvokeJavaScriptTarget(new TestDotNetMethods());
-#pragma warning restore CS0618, IL2026, IL3050
+#pragma warning restore IL2026, IL3050
 
 			// Verify the invoker was set (legacy reflection path)
 			var invoker = ((IHybridWebView)hybridWebView).Invoker;
diff --git a/src/Core/src/Core/IHybridWebView.cs b/src/Core/src/Core/IHybridWebView.cs
index 78bbb695e692..e9c24551e5eb 100644
--- a/src/Core/src/Core/IHybridWebView.cs
+++ b/src/Core/src/Core/IHybridWebView.cs
@@ -28,10 +28,9 @@ public interface IHybridWebView : IView, IWebRequestInterceptingWebView, IInitia
 		/// </summary>
 		/// <typeparam name="T">The type that contains methods callable from JavaScript.</typeparam>
 		/// <param name="target">An instance of type <typeparamref name="T"/> that will be used to call methods on.</param>
-		[Obsolete("This overload uses reflection and dynamic System.Text.Json serialization features and is not compatible with trimming or NativeAOT. Use SetInvokeJavaScriptTarget<T>(T target, JsonSerializerContext jsonSerializerContext) instead.")]
-		[RequiresUnreferencedCode("This overload uses reflection and is not compatible with trimming or NativeAOT.")]
+		[RequiresUnreferencedCode("Use SetInvokeJavaScriptTarget<T>(T target, JsonSerializerContext jsonSerializerContext) for trimming and NativeAOT compatibility.")]
 #if !NETSTANDARD
-		[RequiresDynamicCode("This overload uses reflection and is not compatible with trimming or NativeAOT.")]
+		[RequiresDynamicCode("Use SetInvokeJavaScriptTarget<T>(T target, JsonSerializerContext jsonSerializerContext) for trimming and NativeAOT compatibility.")]
 #endif
 		void SetInvokeJavaScriptTarget<T>(T target) where T : class;
 

From 37fc3cd412cd5bf31d7d85f41915192be1ef49e0 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Tue, 26 May 2026 18:13:26 +0200
Subject: [PATCH 10/39] refactor: Use safer type check in generated interceptor

Use 'is not' pattern to validate target type matches expected type at
runtime instead of unsafe cast. Provides better error message if type
mismatch occurs (though this should never happen since type is known at
compile time via generic parameter T).

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../HybridWebViewInvokeTargetGenerator.cs                    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs b/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs
index 3c4ef49be0b5..c7ed3596cbf9 100644
--- a/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs
+++ b/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs
@@ -184,7 +184,10 @@ private static void GenerateSource(SourceProductionContext spc, ImmutableArray<I
 			sb.AppendLine("            if (target is null) throw new ArgumentNullException(nameof(target));");
 			sb.AppendLine("            if (jsonSerializerContext is null) throw new ArgumentNullException(nameof(jsonSerializerContext));");
 			sb.AppendLine();
-			sb.AppendLine($"            ((global::Microsoft.Maui.IHybridWebView)hybridWebView).Invoker = new Invoker_{index}(({info.TargetTypeName})(object)target, jsonSerializerContext);");
+			sb.AppendLine($"            if (target is not {info.TargetTypeName} typedTarget)");
+			sb.AppendLine($"                throw new InvalidOperationException($\"Type mismatch: expected {info.TargetTypeName.Split('.').Last()} but got {{target.GetType().FullName}}\");");
+			sb.AppendLine();
+			sb.AppendLine($"            ((global::Microsoft.Maui.IHybridWebView)hybridWebView).Invoker = new Invoker_{index}(typedTarget, jsonSerializerContext);");
 			sb.AppendLine("        }");
 			sb.AppendLine();
 

From f136c184e239b5ea9e5060a87b5749c4bb331337 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 27 May 2026 07:20:52 +0000
Subject: [PATCH 11/39] fix: Update Core public API baselines for HybridWebView
 invoker

Co-authored-by: simonrozsival <374616+simonrozsival@users.noreply.github.com>
---
 .../Handlers/HybridWebView/HybridWebView.js   | 206 +++++++++++-------
 .../net-android/PublicAPI.Unshipped.txt       |  14 +-
 .../PublicAPI/net-ios/PublicAPI.Unshipped.txt |   8 +
 .../net-maccatalyst/PublicAPI.Unshipped.txt   |   8 +
 .../net-tizen/PublicAPI.Unshipped.txt         |   8 +-
 .../net-windows/PublicAPI.Unshipped.txt       |  12 +-
 .../netstandard/PublicAPI.Unshipped.txt       |   8 +-
 .../netstandard2.0/PublicAPI.Unshipped.txt    |   8 +-
 8 files changed, 184 insertions(+), 88 deletions(-)

diff --git a/src/Core/src/Handlers/HybridWebView/HybridWebView.js b/src/Core/src/Handlers/HybridWebView/HybridWebView.js
index e4b9d2330c93..3e5aa04f8a74 100644
--- a/src/Core/src/Handlers/HybridWebView/HybridWebView.js
+++ b/src/Core/src/Handlers/HybridWebView/HybridWebView.js
@@ -5,22 +5,58 @@
  * The JavaScript file is generated from TypeScript and should not be modified
  * directly. To make changes, modify the TypeScript file and then recompile it.
  */
-(() => {
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+(function () {
     // Cached function to send messages to the host application.
-    let sendMessageFunction = null;
+    var sendMessageFunction = null;
     /*
      * Initialize the HybridWebView messaging system.
      * This method is called once when the page is loaded.
      */
     function initHybridWebView() {
         function dispatchHybridWebViewMessage(message) {
-            const event = new CustomEvent('HybridWebViewMessageReceived', { detail: { message: message } });
+            var event = new CustomEvent('HybridWebViewMessageReceived', { detail: { message: message } });
             window.dispatchEvent(event);
         }
         // Determine the mechanism to receive messages from the host application.
         if (window.chrome && window.chrome.webview && window.chrome.webview.addEventListener) {
             // Windows WebView2
-            window.chrome.webview.addEventListener('message', (arg) => {
+            window.chrome.webview.addEventListener('message', function (arg) {
                 dispatchHybridWebViewMessage(arg.data);
             });
         }
@@ -28,29 +64,29 @@
             // iOS and MacCatalyst WKWebView
             // @ts-ignore - We are extending the global object here
             window.external = {
-                receiveMessage: (message) => {
+                receiveMessage: function (message) {
                     dispatchHybridWebViewMessage(message);
                 },
             };
         }
         else {
             // Android WebView
-            window.addEventListener('message', (arg) => {
+            window.addEventListener('message', function (arg) {
                 dispatchHybridWebViewMessage(arg.data);
             });
         }
         // Determine the function to use to send messages to the host application.
         if (window.chrome && window.chrome.webview) {
             // Windows WebView2
-            sendMessageFunction = msg => window.chrome.webview.postMessage(msg);
+            sendMessageFunction = function (msg) { return window.chrome.webview.postMessage(msg); };
         }
         else if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.webwindowinterop) {
             // iOS and MacCatalyst WKWebView
-            sendMessageFunction = msg => window.webkit.messageHandlers.webwindowinterop.postMessage(msg);
+            sendMessageFunction = function (msg) { return window.webkit.messageHandlers.webwindowinterop.postMessage(msg); };
         }
         else if (window.hybridWebViewHost) {
             // Android WebView
-            sendMessageFunction = msg => window.hybridWebViewHost.sendMessage(msg);
+            sendMessageFunction = function (msg) { return window.hybridWebViewHost.sendMessage(msg); };
         }
     }
     /*
@@ -58,7 +94,7 @@
      * The message is sent as a string with the following format: `<type>|<message>`.
      */
     function sendMessageToDotNet(type, message) {
-        const messageToSend = type + '|' + message;
+        var messageToSend = type + '|' + message;
         if (sendMessageFunction) {
             sendMessageFunction(messageToSend);
         }
@@ -71,7 +107,7 @@
      * The result is sent as a string with the following format: `<taskId>|<result-json>`.
      */
     function invokeJavaScriptCallbackInDotNet(taskId, result) {
-        const json = JSON.stringify(result);
+        var json = JSON.stringify(result);
         sendMessageToDotNet('__InvokeJavaScriptCompleted', taskId + '|' + json);
     }
     /*
@@ -79,7 +115,7 @@
      * The error message is sent as a string with the following format: `<taskId>|<JSInvokeError>`.
      */
     function invokeJavaScriptFailedInDotNet(taskId, error) {
-        let errorObj;
+        var errorObj;
         if (!error) {
             errorObj = {
                 Message: 'Unknown error',
@@ -105,7 +141,7 @@
                 StackTrace: Error().stack
             };
         }
-        const json = JSON.stringify(errorObj);
+        var json = JSON.stringify(errorObj);
         sendMessageToDotNet('__InvokeJavaScriptFailed', taskId + '|' + json);
     }
     /*
@@ -126,57 +162,68 @@
      *
      * @returns A promise that resolves with the result of the .NET method invocation.
      */
-    async function invokeDotNet(methodName, paramValues) {
-        const body = {
-            MethodName: methodName
-        };
-        // if parameters were provided, serialize them first
-        if (paramValues !== undefined) {
-            if (!Array.isArray(paramValues)) {
-                paramValues = [paramValues];
-            }
-            for (let i = 0; i < paramValues.length; i++) {
-                paramValues[i] = JSON.stringify(paramValues[i]);
-            }
-            if (paramValues.length > 0) {
-                body.ParamValues = paramValues;
-            }
-        }
-        const message = JSON.stringify(body);
-        // send the request to .NET
-        const requestUrl = `${window.location.origin}/__hwvInvokeDotNet`;
-        const rawResponse = await fetch(requestUrl, {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-                'Accept': 'application/json',
-                'X-Maui-Invoke-Token': 'HybridWebView',
-                'X-Maui-Request-Body': message // Some platforms (Android) do not expose the POST body
-            },
-            body: message
+    function invokeDotNet(methodName, paramValues) {
+        return __awaiter(this, void 0, void 0, function () {
+            var body, i, message, requestUrl, rawResponse, response, error;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        body = {
+                            MethodName: methodName
+                        };
+                        // if parameters were provided, serialize them first
+                        if (paramValues !== undefined) {
+                            if (!Array.isArray(paramValues)) {
+                                paramValues = [paramValues];
+                            }
+                            for (i = 0; i < paramValues.length; i++) {
+                                paramValues[i] = JSON.stringify(paramValues[i]);
+                            }
+                            if (paramValues.length > 0) {
+                                body.ParamValues = paramValues;
+                            }
+                        }
+                        message = JSON.stringify(body);
+                        requestUrl = "".concat(window.location.origin, "/__hwvInvokeDotNet");
+                        return [4 /*yield*/, fetch(requestUrl, {
+                                method: 'POST',
+                                headers: {
+                                    'Content-Type': 'application/json',
+                                    'Accept': 'application/json',
+                                    'X-Maui-Invoke-Token': 'HybridWebView',
+                                    'X-Maui-Request-Body': message // Some platforms (Android) do not expose the POST body
+                                },
+                                body: message
+                            })];
+                    case 1:
+                        rawResponse = _a.sent();
+                        return [4 /*yield*/, rawResponse.json()];
+                    case 2:
+                        response = _a.sent();
+                        // a null response is a null response
+                        if (!response) {
+                            return [2 /*return*/, null];
+                        }
+                        // Check if the response indicates an error
+                        if (response.IsError) {
+                            error = new Error(response.ErrorMessage || 'Unknown error occurred in .NET method');
+                            if (response.ErrorType) {
+                                error.dotNetErrorType = response.ErrorType;
+                            }
+                            if (response.ErrorStackTrace) {
+                                error.dotNetStackTrace = response.ErrorStackTrace;
+                            }
+                            throw error;
+                        }
+                        // deserialize if there is JSON data
+                        if (response.IsJson) {
+                            return [2 /*return*/, JSON.parse(response.Result)];
+                        }
+                        // otherwise return the primitive
+                        return [2 /*return*/, response.Result];
+                }
+            });
         });
-        const response = await rawResponse.json();
-        // a null response is a null response
-        if (!response) {
-            return null;
-        }
-        // Check if the response indicates an error
-        if (response.IsError) {
-            const error = new Error(response.ErrorMessage || 'Unknown error occurred in .NET method');
-            if (response.ErrorType) {
-                error.dotNetErrorType = response.ErrorType;
-            }
-            if (response.ErrorStackTrace) {
-                error.dotNetStackTrace = response.ErrorStackTrace;
-            }
-            throw error;
-        }
-        // deserialize if there is JSON data
-        if (response.IsJson) {
-            return JSON.parse(response.Result);
-        }
-        // otherwise return the primitive
-        return response.Result;
     }
     /*
      * Invoke a JavaScript method from the .NET host application.
@@ -188,18 +235,30 @@
      *
      * @returns A promise.
      */
-    async function invokeJavaScript(taskId, methodName, args) {
-        try {
-            const result = await methodName(...args);
-            invokeJavaScriptCallbackInDotNet(taskId, result);
-        }
-        catch (ex) {
-            console.error(ex);
-            invokeJavaScriptFailedInDotNet(taskId, ex);
-        }
+    function invokeJavaScript(taskId, methodName, args) {
+        return __awaiter(this, void 0, void 0, function () {
+            var result, ex_1;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 2, , 3]);
+                        return [4 /*yield*/, methodName.apply(void 0, args)];
+                    case 1:
+                        result = _a.sent();
+                        invokeJavaScriptCallbackInDotNet(taskId, result);
+                        return [3 /*break*/, 3];
+                    case 2:
+                        ex_1 = _a.sent();
+                        console.error(ex_1);
+                        invokeJavaScriptFailedInDotNet(taskId, ex_1);
+                        return [3 /*break*/, 3];
+                    case 3: return [2 /*return*/];
+                }
+            });
+        });
     }
     // Define the public API of the HybridWebView control.
-    const HybridWebView = {
+    var HybridWebView = {
         SendRawMessage: sendRawMessage,
         InvokeDotNet: invokeDotNet,
         __InvokeJavaScript: invokeJavaScript
@@ -210,3 +269,4 @@
     // Initialize the HybridWebView
     initHybridWebView();
 })();
+//# sourceMappingURL=HybridWebView.js.map
\ No newline at end of file
diff --git a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
index 9a43c8aedbcd..15f4caef6c0d 100644
--- a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -1,4 +1,13 @@
 #nullable enable
+*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptTarget.get -> object?
+*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptTarget.set -> void
+*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptType.get -> System.Type?
+*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptType.set -> void
+Microsoft.Maui.IHybridWebView.Invoker.get -> Microsoft.Maui.IHybridWebViewInvoker?
+Microsoft.Maui.IHybridWebView.Invoker.set -> void
+Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
+Microsoft.Maui.IHybridWebViewInvoker
+Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
 *REMOVED*override Microsoft.Maui.Graphics.MauiDrawable.Dispose(bool disposing) -> void
 *REMOVED*override Microsoft.Maui.Graphics.MauiDrawable.OnBoundsChange(Android.Graphics.Rect! bounds) -> void
 *REMOVED*override Microsoft.Maui.Graphics.MauiDrawable.OnDraw(Android.Graphics.Drawables.Shapes.Shape? shape, Android.Graphics.Canvas? canvas, Android.Graphics.Paint? paint) -> void
@@ -276,8 +285,3 @@ static Microsoft.Maui.Platform.TimePickerExtensions.UpdateTime(this Microsoft.Ma
 static Microsoft.Maui.SafeAreaEdges.Container.get -> Microsoft.Maui.SafeAreaEdges
 virtual Microsoft.Maui.Handlers.DatePickerHandler2.CreateDatePickerDialog(int year, int month, int day) -> Google.Android.Material.DatePicker.MaterialDatePicker?
 virtual Microsoft.Maui.Handlers.TimePickerHandler2.CreateTimePickerDialog(int hour, int minute) -> Google.Android.Material.TimePicker.MaterialTimePicker?
-Microsoft.Maui.IHybridWebView.Invoker.get -> Microsoft.Maui.IHybridWebViewInvoker?
-Microsoft.Maui.IHybridWebView.Invoker.set -> void
-Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
-Microsoft.Maui.IHybridWebViewInvoker
-Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string[]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
diff --git a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index 0cf5f7f1b600..2ded1e2bc20d 100644
--- a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -1,5 +1,13 @@
 #nullable enable
+*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptTarget.get -> object?
+*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptTarget.set -> void
+*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptType.get -> System.Type?
+*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptType.set -> void
+Microsoft.Maui.IHybridWebView.Invoker.get -> Microsoft.Maui.IHybridWebViewInvoker?
+Microsoft.Maui.IHybridWebView.Invoker.set -> void
+Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.IHybridWebViewInvoker
+Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
 override Microsoft.Maui.Handlers.LabelHandler.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
 override Microsoft.Maui.Handlers.ShapeViewHandler.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
 override Microsoft.Maui.Handlers.StepperHandler.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
diff --git a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index 0cf5f7f1b600..2ded1e2bc20d 100644
--- a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -1,5 +1,13 @@
 #nullable enable
+*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptTarget.get -> object?
+*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptTarget.set -> void
+*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptType.get -> System.Type?
+*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptType.set -> void
+Microsoft.Maui.IHybridWebView.Invoker.get -> Microsoft.Maui.IHybridWebViewInvoker?
+Microsoft.Maui.IHybridWebView.Invoker.set -> void
+Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.IHybridWebViewInvoker
+Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
 override Microsoft.Maui.Handlers.LabelHandler.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
 override Microsoft.Maui.Handlers.ShapeViewHandler.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
 override Microsoft.Maui.Handlers.StepperHandler.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
diff --git a/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
index 276303e82cce..6dc4d4de4afa 100644
--- a/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
@@ -1,7 +1,11 @@
 #nullable enable
-static Microsoft.Maui.GridLength.implicit operator Microsoft.Maui.GridLength(string! value) -> Microsoft.Maui.GridLength
+*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptTarget.get -> object?
+*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptTarget.set -> void
+*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptType.get -> System.Type?
+*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptType.set -> void
 Microsoft.Maui.IHybridWebView.Invoker.get -> Microsoft.Maui.IHybridWebViewInvoker?
 Microsoft.Maui.IHybridWebView.Invoker.set -> void
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.IHybridWebViewInvoker
-Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string[]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
+Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
+static Microsoft.Maui.GridLength.implicit operator Microsoft.Maui.GridLength(string! value) -> Microsoft.Maui.GridLength
diff --git a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index 3abefb99aa2c..79b1fa62eae6 100644
--- a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -1,9 +1,13 @@
 #nullable enable
-override Microsoft.Maui.Platform.MauiPasswordTextBox.OnCreateAutomationPeer() -> Microsoft.UI.Xaml.Automation.Peers.AutomationPeer!
-static Microsoft.Maui.GridLength.implicit operator Microsoft.Maui.GridLength(string! value) -> Microsoft.Maui.GridLength
-static Microsoft.Maui.SafeAreaEdges.Container.get -> Microsoft.Maui.SafeAreaEdges
+*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptTarget.get -> object?
+*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptTarget.set -> void
+*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptType.get -> System.Type?
+*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptType.set -> void
 Microsoft.Maui.IHybridWebView.Invoker.get -> Microsoft.Maui.IHybridWebViewInvoker?
 Microsoft.Maui.IHybridWebView.Invoker.set -> void
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.IHybridWebViewInvoker
-Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string[]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
+Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
+override Microsoft.Maui.Platform.MauiPasswordTextBox.OnCreateAutomationPeer() -> Microsoft.UI.Xaml.Automation.Peers.AutomationPeer!
+static Microsoft.Maui.GridLength.implicit operator Microsoft.Maui.GridLength(string! value) -> Microsoft.Maui.GridLength
+static Microsoft.Maui.SafeAreaEdges.Container.get -> Microsoft.Maui.SafeAreaEdges
diff --git a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index 8a32b72f072c..522b6080d0ad 100644
--- a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -1,7 +1,11 @@
 #nullable enable
-static Microsoft.Maui.SafeAreaEdges.Container.get -> Microsoft.Maui.SafeAreaEdges
+*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptTarget.get -> object?
+*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptTarget.set -> void
+*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptType.get -> System.Type?
+*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptType.set -> void
 Microsoft.Maui.IHybridWebView.Invoker.get -> Microsoft.Maui.IHybridWebViewInvoker?
 Microsoft.Maui.IHybridWebView.Invoker.set -> void
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.IHybridWebViewInvoker
-Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string[]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
+Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
+static Microsoft.Maui.SafeAreaEdges.Container.get -> Microsoft.Maui.SafeAreaEdges
diff --git a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
index 8a32b72f072c..522b6080d0ad 100644
--- a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
@@ -1,7 +1,11 @@
 #nullable enable
-static Microsoft.Maui.SafeAreaEdges.Container.get -> Microsoft.Maui.SafeAreaEdges
+*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptTarget.get -> object?
+*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptTarget.set -> void
+*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptType.get -> System.Type?
+*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptType.set -> void
 Microsoft.Maui.IHybridWebView.Invoker.get -> Microsoft.Maui.IHybridWebViewInvoker?
 Microsoft.Maui.IHybridWebView.Invoker.set -> void
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.IHybridWebViewInvoker
-Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string[]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
+Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
+static Microsoft.Maui.SafeAreaEdges.Container.get -> Microsoft.Maui.SafeAreaEdges

From d28ca44a3e6b59b0fcc7fe8d27e14977c41f2f9d Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Mon, 15 Jun 2026 13:29:35 +0200
Subject: [PATCH 12/39] Fix HybridWebView AOT review feedback

Package the HybridWebView source generator for consuming apps and minimize public API churn from the invoker plumbing.

Keep the legacy reflection invoker isolated behind the existing one-argument overload while preserving the source-generated JsonSerializerContext path as the AOT-safe dispatch path.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../Build.Tasks/Controls.Build.Tasks.csproj   |  3 +
 .../Microsoft.Maui.Controls.targets           |  3 +-
 .../src/Core/HybridWebView/HybridWebView.cs   | 23 +++---
 .../PublicAPI/net/PublicAPI.Unshipped.txt     |  4 +-
 .../netstandard/PublicAPI.Unshipped.txt       |  2 -
 ...dWebViewTests_SetInvokeJavaScriptTarget.cs |  4 +-
 src/Core/src/Core/HybridWebViewInvoker.cs     | 75 +++++++++++++++++++
 src/Core/src/Core/IHybridWebView.cs           | 18 ++---
 src/Core/src/Core/IHybridWebViewInvoker.cs    |  2 +
 .../HybridWebView/HybridWebViewHandler.cs     |  7 +-
 .../ReflectionHybridWebViewInvoker.cs         | 18 ++---
 .../HybridWebViewInvokeTargetGenerator.cs     |  2 +-
 .../net-android/PublicAPI.Unshipped.txt       |  8 +-
 .../PublicAPI/net-ios/PublicAPI.Unshipped.txt |  8 +-
 .../net-maccatalyst/PublicAPI.Unshipped.txt   |  8 +-
 .../net-tizen/PublicAPI.Unshipped.txt         |  8 +-
 .../net-windows/PublicAPI.Unshipped.txt       |  8 +-
 .../src/PublicAPI/net/PublicAPI.Unshipped.txt |  8 +-
 .../netstandard/PublicAPI.Unshipped.txt       |  8 +-
 .../netstandard2.0/PublicAPI.Unshipped.txt    |  8 +-
 20 files changed, 132 insertions(+), 93 deletions(-)
 create mode 100644 src/Core/src/Core/HybridWebViewInvoker.cs

diff --git a/src/Controls/src/Build.Tasks/Controls.Build.Tasks.csproj b/src/Controls/src/Build.Tasks/Controls.Build.Tasks.csproj
index a785a933cd33..b0736f21c565 100644
--- a/src/Controls/src/Build.Tasks/Controls.Build.Tasks.csproj
+++ b/src/Controls/src/Build.Tasks/Controls.Build.Tasks.csproj
@@ -38,6 +38,7 @@
 		<ProjectReference Include="..\Xaml\Controls.Xaml.csproj" />
 		<ProjectReference Include="..\SourceGen\Controls.SourceGen.csproj" ReferenceOutputAssembly="false" />
 		<ProjectReference Include="..\BindingSourceGen\Controls.BindingSourceGen.csproj" ReferenceOutputAssembly="false" />
+		<ProjectReference Include="..\..\..\Core\src\HybridWebViewSourceGen\Core.HybridWebViewSourceGen.csproj" ReferenceOutputAssembly="false" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -54,6 +55,8 @@
 		<None Include="$(ArtifactsBinDir)Controls.SourceGen\$(Configuration)\netstandard2.0\Microsoft.Maui.Controls.SourceGen.pdb" Visible="false" Pack="true" PackagePath="buildTransitive\netstandard2.0" />
 		<None Include="$(ArtifactsBinDir)Controls.BindingSourceGen\$(Configuration)\netstandard2.0\Microsoft.Maui.Controls.BindingSourceGen.dll" Visible="false" Pack="true" PackagePath="buildTransitive\netstandard2.0" />
 		<None Include="$(ArtifactsBinDir)Controls.BindingSourceGen\$(Configuration)\netstandard2.0\Microsoft.Maui.Controls.BindingSourceGen.pdb" Visible="false" Pack="true" PackagePath="buildTransitive\netstandard2.0" />
+		<None Include="$(ArtifactsBinDir)Core.HybridWebViewSourceGen\$(Configuration)\netstandard2.0\Microsoft.Maui.Core.HybridWebViewSourceGen.dll" Visible="false" Pack="true" PackagePath="buildTransitive\netstandard2.0" />
+		<None Include="$(ArtifactsBinDir)Core.HybridWebViewSourceGen\$(Configuration)\netstandard2.0\Microsoft.Maui.Core.HybridWebViewSourceGen.pdb" Visible="false" Pack="true" PackagePath="buildTransitive\netstandard2.0" />
 		<None Remove="$(OutputPath)*.xml" />
 		<None Include="nuget\**" PackagePath="" Pack="true" Exclude="nuget\**\*.aotprofile.txt" />
 	</ItemGroup>
diff --git a/src/Controls/src/Build.Tasks/nuget/buildTransitive/netstandard2.0/Microsoft.Maui.Controls.targets b/src/Controls/src/Build.Tasks/nuget/buildTransitive/netstandard2.0/Microsoft.Maui.Controls.targets
index 3e079f7ccb81..0e57f9e57e1b 100644
--- a/src/Controls/src/Build.Tasks/nuget/buildTransitive/netstandard2.0/Microsoft.Maui.Controls.targets
+++ b/src/Controls/src/Build.Tasks/nuget/buildTransitive/netstandard2.0/Microsoft.Maui.Controls.targets
@@ -32,12 +32,13 @@
 
 	<ItemGroup Condition=" '$(DisableMauiAnalyzers)' != 'true' ">
 		<Analyzer Include="$(MSBuildThisFileDirectory)Microsoft.Maui.Controls.SourceGen.dll" IsImplicitlyDefined="true" />
+		<Analyzer Include="$(MSBuildThisFileDirectory)Microsoft.Maui.Core.HybridWebViewSourceGen.dll" IsImplicitlyDefined="true" />
 	</ItemGroup>
 
 	<!-- Enable BindingSourceGen -->
 	<PropertyGroup>
 		<_MauiBindingInterceptorsSupport Condition=" '$(_MauiBindingInterceptorsSupport)' == '' and '$(DisableMauiAnalyzers)' != 'true' ">true</_MauiBindingInterceptorsSupport>
-		<InterceptorsPreviewNamespaces Condition=" '$(_MauiBindingInterceptorsSupport)' == 'true' ">$(InterceptorsPreviewNamespaces);Microsoft.Maui.Controls.Generated</InterceptorsPreviewNamespaces>
+		<InterceptorsPreviewNamespaces Condition=" '$(DisableMauiAnalyzers)' != 'true' or '$(_MauiBindingInterceptorsSupport)' == 'true' ">$(InterceptorsPreviewNamespaces);Microsoft.Maui.Controls.Generated</InterceptorsPreviewNamespaces>
 	</PropertyGroup>
 	<ItemGroup Condition=" '$(_MauiBindingInterceptorsSupport)' == 'true' ">
 		<Analyzer Include="$(MSBuildThisFileDirectory)Microsoft.Maui.Controls.BindingSourceGen.dll" IsImplicitlyDefined="true" />
diff --git a/src/Controls/src/Core/HybridWebView/HybridWebView.cs b/src/Controls/src/Core/HybridWebView/HybridWebView.cs
index aa1b9dd22fd9..7a6428328b51 100644
--- a/src/Controls/src/Core/HybridWebView/HybridWebView.cs
+++ b/src/Controls/src/Core/HybridWebView/HybridWebView.cs
@@ -34,28 +34,27 @@ public string? HybridRoot
 			set { SetValue(HybridRootProperty, value); }
 		}
 
-		IHybridWebViewInvoker? _invoker;
+		/// <inheritdoc/>
+		object? IHybridWebView.InvokeJavaScriptTarget { get; set; }
 
 		/// <inheritdoc/>
-		IHybridWebViewInvoker? IHybridWebView.Invoker
+		[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
+		Type? IHybridWebView.InvokeJavaScriptType
 		{
-			get => _invoker;
-			set => _invoker = value;
+			get => HybridWebViewInvoker.GetInvokeJavaScriptType(this);
+			set => HybridWebViewInvoker.SetInvokeJavaScriptType(this, value);
 		}
 
-		/// <inheritdoc/>
-		[RequiresUnreferencedCode("Use SetInvokeJavaScriptTarget<T>(T target, JsonSerializerContext jsonSerializerContext) for trimming and NativeAOT compatibility.")]
-#if !NETSTANDARD
-		[RequiresDynamicCode("Use SetInvokeJavaScriptTarget<T>(T target, JsonSerializerContext jsonSerializerContext) for trimming and NativeAOT compatibility.")]
-#endif
-		void IHybridWebView.SetInvokeJavaScriptTarget<T>(T target)
+		public void SetInvokeJavaScriptTarget<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>(T target) where T : class
 		{
 			if (target is null)
 			{
 				throw new ArgumentNullException(nameof(target));
 			}
 
-			_invoker = new ReflectionHybridWebViewInvoker(target, typeof(T));
+			HybridWebViewInvoker.SetInvoker(this, new ReflectionHybridWebViewInvoker(target, typeof(T)));
+			((IHybridWebView)this).InvokeJavaScriptTarget = target;
+			((IHybridWebView)this).InvokeJavaScriptType = typeof(T);
 		}
 
 		/// <inheritdoc/>
@@ -72,7 +71,7 @@ public void SetInvokeJavaScriptTarget<T>(T target, JsonSerializerContext jsonSer
 			}
 
 			// The source generator interceptor replaces this method call at compile time
-			// and sets _invoker to a generated implementation with fully typed delegates.
+			// and registers a generated implementation with fully typed delegates.
 			// If the interceptor didn't fire (e.g. indirect call), throw at runtime.
 			throw new InvalidOperationException(
 				"SetInvokeJavaScriptTarget<T>(T, JsonSerializerContext) must be intercepted by the source generator. " +
diff --git a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
index 6d2861d08522..e00e5f59a2a9 100644
--- a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -1,7 +1,4 @@
 #nullable enable
-Microsoft.Maui.IHybridWebView.Invoker.get -> Microsoft.Maui.IHybridWebViewInvoker?
-Microsoft.Maui.IHybridWebView.Invoker.set -> void
-Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.Controls.AppThemeBinding
 Microsoft.Maui.Controls.AppThemeBinding.AppThemeBinding() -> void
 ~Microsoft.Maui.Controls.AppThemeBinding.Dark.get -> object
@@ -25,6 +22,7 @@ Microsoft.Maui.Controls.BoxView.~BoxView() -> void
 ~Microsoft.Maui.Controls.Editor.ReturnCommand.set -> void
 ~Microsoft.Maui.Controls.Editor.ReturnCommandParameter.get -> object
 ~Microsoft.Maui.Controls.Editor.ReturnCommandParameter.set -> void
+Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.Controls.ImageSource.InvalidateStyle() -> void
 ~Microsoft.Maui.Controls.Internals.ResourcesChangedEventArgs.Keys.get -> System.Collections.Generic.IEnumerable<string>
 ~Microsoft.Maui.Controls.Internals.ResourcesChangedEventArgs.ResolveValue(string key) -> object
diff --git a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index 12afce06a1a7..6199d40e77a3 100644
--- a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -1,6 +1,4 @@
 #nullable enable
-Microsoft.Maui.IHybridWebView.Invoker.get -> Microsoft.Maui.IHybridWebViewInvoker?
-Microsoft.Maui.IHybridWebView.Invoker.set -> void
 Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 ~Microsoft.Maui.Controls.BackButtonBehavior.AccessibilityLabel.get -> string
 ~Microsoft.Maui.Controls.BackButtonBehavior.AccessibilityLabel.set -> void
diff --git a/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs b/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs
index e418ca54e2a0..7ec0da51e8d0 100644
--- a/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs
+++ b/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs
@@ -42,7 +42,7 @@ public Task InvokerIsSet_WhenUsingJsonSerializerContext() =>
 			hybridWebView.SetInvokeJavaScriptTarget(invokeJavaScriptTarget, InvokeDotNetJsonContext.Default);
 
 			// Verify the invoker was set (AOT-safe path)
-			var invoker = ((IHybridWebView)hybridWebView).Invoker;
+			var invoker = HybridWebViewInvoker.GetInvoker(hybridWebView);
 			Assert.NotNull(invoker);
 
 			// Verify the invoker actually works end-to-end
@@ -61,7 +61,7 @@ public Task InvokerIsSet_WhenUsingLegacyOverload() =>
 #pragma warning restore IL2026, IL3050
 
 			// Verify the invoker was set (legacy reflection path)
-			var invoker = ((IHybridWebView)hybridWebView).Invoker;
+			var invoker = HybridWebViewInvoker.GetInvoker(hybridWebView);
 			Assert.NotNull(invoker);
 			Assert.IsType<ReflectionHybridWebViewInvoker>(invoker);
 
diff --git a/src/Core/src/Core/HybridWebViewInvoker.cs b/src/Core/src/Core/HybridWebViewInvoker.cs
new file mode 100644
index 000000000000..f991c3362f6b
--- /dev/null
+++ b/src/Core/src/Core/HybridWebViewInvoker.cs
@@ -0,0 +1,75 @@
+using System;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Maui
+{
+	/// <summary>
+	/// For internal use by generated HybridWebView invocation code.
+	/// </summary>
+	[EditorBrowsable(EditorBrowsableState.Never)]
+	public static class HybridWebViewInvoker
+	{
+		static readonly ConditionalWeakTable<IHybridWebView, InvokerHolder> s_invokers = new();
+
+		/// <summary>
+		/// Sets the invoker used to dispatch JavaScript calls to .NET methods.
+		/// </summary>
+		/// <param name="hybridWebView">The hybrid web view that owns the invoker.</param>
+		/// <param name="invoker">The invoker used to dispatch JavaScript calls.</param>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public static void SetInvoker(IHybridWebView hybridWebView, IHybridWebViewInvoker invoker)
+		{
+			if (hybridWebView is null)
+			{
+				throw new ArgumentNullException(nameof(hybridWebView));
+			}
+
+			if (invoker is null)
+			{
+				throw new ArgumentNullException(nameof(invoker));
+			}
+
+			s_invokers.GetOrCreateValue(hybridWebView).Invoker = invoker;
+		}
+
+		internal static IHybridWebViewInvoker? GetInvoker(IHybridWebView hybridWebView)
+		{
+			return s_invokers.TryGetValue(hybridWebView, out var holder)
+				? holder.Invoker
+				: null;
+		}
+
+		internal static void SetInvokeJavaScriptType(IHybridWebView hybridWebView, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] Type? invokeJavaScriptType)
+		{
+			if (hybridWebView is null)
+			{
+				throw new ArgumentNullException(nameof(hybridWebView));
+			}
+
+			s_invokers.GetOrCreateValue(hybridWebView).InvokeJavaScriptType = invokeJavaScriptType;
+		}
+
+		[return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
+		internal static Type? GetInvokeJavaScriptType(IHybridWebView hybridWebView)
+		{
+			if (hybridWebView is null)
+			{
+				throw new ArgumentNullException(nameof(hybridWebView));
+			}
+
+			return s_invokers.TryGetValue(hybridWebView, out var holder)
+				? holder.InvokeJavaScriptType
+				: null;
+		}
+
+		sealed class InvokerHolder
+		{
+			public IHybridWebViewInvoker? Invoker { get; set; }
+
+			[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
+			public Type? InvokeJavaScriptType { get; set; }
+		}
+	}
+}
diff --git a/src/Core/src/Core/IHybridWebView.cs b/src/Core/src/Core/IHybridWebView.cs
index e9c24551e5eb..f93b0e2ccde7 100644
--- a/src/Core/src/Core/IHybridWebView.cs
+++ b/src/Core/src/Core/IHybridWebView.cs
@@ -1,5 +1,4 @@
 using System;
-using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization.Metadata;
@@ -22,17 +21,18 @@ public interface IHybridWebView : IView, IWebRequestInterceptingWebView, IInitia
 		/// </summary>
 		string? HybridRoot { get; }
 
+		/// <summary>
+		/// For internal use only.
+		/// </summary>
+		object? InvokeJavaScriptTarget { get; set; }
+
 		/// <summary>
 		///  Sets the object that will be the target of JavaScript calls from the web view. The public methods on this object
 		///  are callable from JavaScript using the <c>window.HybridWebView.InvokeDotNet</c> method.
 		/// </summary>
 		/// <typeparam name="T">The type that contains methods callable from JavaScript.</typeparam>
 		/// <param name="target">An instance of type <typeparamref name="T"/> that will be used to call methods on.</param>
-		[RequiresUnreferencedCode("Use SetInvokeJavaScriptTarget<T>(T target, JsonSerializerContext jsonSerializerContext) for trimming and NativeAOT compatibility.")]
-#if !NETSTANDARD
-		[RequiresDynamicCode("Use SetInvokeJavaScriptTarget<T>(T target, JsonSerializerContext jsonSerializerContext) for trimming and NativeAOT compatibility.")]
-#endif
-		void SetInvokeJavaScriptTarget<T>(T target) where T : class;
+		void SetInvokeJavaScriptTarget<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>(T target) where T : class;
 
 		/// <summary>
 		///  Sets the object that will be the target of JavaScript calls from the web view. The public methods on this object
@@ -44,10 +44,10 @@ public interface IHybridWebView : IView, IWebRequestInterceptingWebView, IInitia
 		void SetInvokeJavaScriptTarget<T>(T target, JsonSerializerContext jsonSerializerContext) where T : class;
 
 		/// <summary>
-		/// For internal use only. The invoker that handles JS-to-.NET method dispatch.
+		/// For internal use only.
 		/// </summary>
-		[EditorBrowsable(EditorBrowsableState.Never)]
-		IHybridWebViewInvoker? Invoker { get; set; }
+		[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
+		Type? InvokeJavaScriptType { get; set; }
 
 		void RawMessageReceived(string rawMessage);
 
diff --git a/src/Core/src/Core/IHybridWebViewInvoker.cs b/src/Core/src/Core/IHybridWebViewInvoker.cs
index f94bc6acc2fb..fce2a4031988 100644
--- a/src/Core/src/Core/IHybridWebViewInvoker.cs
+++ b/src/Core/src/Core/IHybridWebViewInvoker.cs
@@ -1,3 +1,4 @@
+using System.ComponentModel;
 using System.Threading.Tasks;
 
 namespace Microsoft.Maui
@@ -6,6 +7,7 @@ namespace Microsoft.Maui
 	/// Abstraction for JS-to-.NET method invocation in HybridWebView.
 	/// Implemented by the reflection-based fallback and by the source generator.
 	/// </summary>
+	[EditorBrowsable(EditorBrowsableState.Never)]
 	public interface IHybridWebViewInvoker
 	{
 		/// <summary>
diff --git a/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs b/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs
index df80361ee873..b20af2f7264a 100644
--- a/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs
+++ b/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs
@@ -179,10 +179,6 @@ void MessageReceived(string rawMessage)
 		{
 			try
 			{
-				var invoker = VirtualView.Invoker
-					?? throw new InvalidOperationException(
-						$"No invoker is configured. Call {nameof(IHybridWebView.SetInvokeJavaScriptTarget)} to set up JS-to-.NET method invocation.");
-
 				JSInvokeMethodData? invokeData = null;
 				if (streamBody is not null)
 				{
@@ -198,6 +194,9 @@ void MessageReceived(string rawMessage)
 					throw new InvalidOperationException("The invoke data did not provide a method name.");
 				}
 
+				var invoker = HybridWebViewInvoker.GetInvoker(VirtualView)
+					?? throw new InvalidOperationException(
+						$"No invoker is configured. Call {nameof(IHybridWebView.SetInvokeJavaScriptTarget)} to set up JS-to-.NET method invocation.");
 				var jsonResult = await invoker.InvokeMethodAsync(invokeData.MethodName, invokeData.ParamValues);
 				var invokeResult = jsonResult is null
 					? new DotNetInvokeResult()
diff --git a/src/Core/src/Handlers/HybridWebView/ReflectionHybridWebViewInvoker.cs b/src/Core/src/Handlers/HybridWebView/ReflectionHybridWebViewInvoker.cs
index 25c52966d8d2..c797394686e5 100644
--- a/src/Core/src/Handlers/HybridWebView/ReflectionHybridWebViewInvoker.cs
+++ b/src/Core/src/Handlers/HybridWebView/ReflectionHybridWebViewInvoker.cs
@@ -8,23 +8,23 @@
 namespace Microsoft.Maui
 {
 	/// <summary>
-	/// Reflection-based invoker for the legacy SetInvokeJavaScriptTarget overload.
+	/// Reflection-based invoker for the legacy SetInvokeJavaScriptTarget overload. Use the JsonSerializerContext overload for NativeAOT-safe dispatch.
 	/// </summary>
-	[RequiresUnreferencedCode("Uses reflection and dynamic JSON serialization.")]
-#if !NETSTANDARD
-	[RequiresDynamicCode("Uses reflection and dynamic JSON serialization.")]
-#endif
 	internal sealed class ReflectionHybridWebViewInvoker : IHybridWebViewInvoker
 	{
 		private readonly object _target;
+		[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
 		private readonly Type _targetType;
 
-		public ReflectionHybridWebViewInvoker(object target, Type targetType)
+		public ReflectionHybridWebViewInvoker(object target, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] Type targetType)
 		{
 			_target = target;
 			_targetType = targetType;
 		}
 
+		[UnconditionalSuppressMessage("Trimming", "IL2026:RequiresUnreferencedCode", Justification = "Legacy reflection dispatch preserves the target type with DAM; use the JsonSerializerContext overload for the NativeAOT-safe path.")]
+		[UnconditionalSuppressMessage("AOT", "IL3050:RequiresDynamicCode", Justification = "Legacy reflection dispatch may use runtime JSON metadata; use the JsonSerializerContext overload for the NativeAOT-safe path.")]
+		[UnconditionalSuppressMessage("Trimming", "IL2075:DynamicallyAccessedMembers", Justification = "The legacy overload preserves the target type and its public members with DynamicallyAccessedMembers.")]
 		public async Task<string?> InvokeMethodAsync(string methodName, string[]? paramJsonValues)
 		{
 			var method = _targetType.GetMethod(methodName, BindingFlags.Public | BindingFlags.Instance | BindingFlags.InvokeMethod)
@@ -36,7 +36,6 @@ public ReflectionHybridWebViewInvoker(object target, Type targetType)
 				throw new InvalidOperationException($"Method '{methodName}' expects {parameters.Length} parameter(s) but {paramJsonValues.Length} were provided.");
 			}
 
-			// Deserialize parameters
 			object?[]? args = null;
 			if (paramJsonValues is not null)
 			{
@@ -47,7 +46,6 @@ public ReflectionHybridWebViewInvoker(object target, Type targetType)
 				}
 			}
 
-			// Invoke
 			object? returnValue;
 			try
 			{
@@ -56,7 +54,7 @@ public ReflectionHybridWebViewInvoker(object target, Type targetType)
 			catch (TargetInvocationException tie) when (tie.InnerException is not null)
 			{
 				ExceptionDispatchInfo.Capture(tie.InnerException).Throw();
-				throw; // unreachable
+				throw;
 			}
 
 			if (returnValue is null)
@@ -64,7 +62,6 @@ public ReflectionHybridWebViewInvoker(object target, Type targetType)
 				return null;
 			}
 
-			// Handle Task / Task<T>
 			if (returnValue is Task task)
 			{
 				await task;
@@ -80,7 +77,6 @@ public ReflectionHybridWebViewInvoker(object target, Type targetType)
 				return null;
 			}
 
-			// Synchronous return
 			return JsonSerializer.Serialize(returnValue);
 		}
 	}
diff --git a/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs b/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs
index c7ed3596cbf9..81a02c04c18e 100644
--- a/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs
+++ b/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs
@@ -187,7 +187,7 @@ private static void GenerateSource(SourceProductionContext spc, ImmutableArray<I
 			sb.AppendLine($"            if (target is not {info.TargetTypeName} typedTarget)");
 			sb.AppendLine($"                throw new InvalidOperationException($\"Type mismatch: expected {info.TargetTypeName.Split('.').Last()} but got {{target.GetType().FullName}}\");");
 			sb.AppendLine();
-			sb.AppendLine($"            ((global::Microsoft.Maui.IHybridWebView)hybridWebView).Invoker = new Invoker_{index}(typedTarget, jsonSerializerContext);");
+			sb.AppendLine($"            global::Microsoft.Maui.HybridWebViewInvoker.SetInvoker(hybridWebView, new Invoker_{index}(typedTarget, jsonSerializerContext));");
 			sb.AppendLine("        }");
 			sb.AppendLine();
 
diff --git a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
index 15f4caef6c0d..c96d0f5bfb5f 100644
--- a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -1,10 +1,6 @@
 #nullable enable
-*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptTarget.get -> object?
-*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptTarget.set -> void
-*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptType.get -> System.Type?
-*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptType.set -> void
-Microsoft.Maui.IHybridWebView.Invoker.get -> Microsoft.Maui.IHybridWebViewInvoker?
-Microsoft.Maui.IHybridWebView.Invoker.set -> void
+Microsoft.Maui.HybridWebViewInvoker
+static Microsoft.Maui.HybridWebViewInvoker.SetInvoker(Microsoft.Maui.IHybridWebView! hybridWebView, Microsoft.Maui.IHybridWebViewInvoker! invoker) -> void
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.IHybridWebViewInvoker
 Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
diff --git a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index 2ded1e2bc20d..ec8cbd91cb9b 100644
--- a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -1,10 +1,6 @@
 #nullable enable
-*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptTarget.get -> object?
-*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptTarget.set -> void
-*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptType.get -> System.Type?
-*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptType.set -> void
-Microsoft.Maui.IHybridWebView.Invoker.get -> Microsoft.Maui.IHybridWebViewInvoker?
-Microsoft.Maui.IHybridWebView.Invoker.set -> void
+Microsoft.Maui.HybridWebViewInvoker
+static Microsoft.Maui.HybridWebViewInvoker.SetInvoker(Microsoft.Maui.IHybridWebView! hybridWebView, Microsoft.Maui.IHybridWebViewInvoker! invoker) -> void
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.IHybridWebViewInvoker
 Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
diff --git a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index 2ded1e2bc20d..ec8cbd91cb9b 100644
--- a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -1,10 +1,6 @@
 #nullable enable
-*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptTarget.get -> object?
-*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptTarget.set -> void
-*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptType.get -> System.Type?
-*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptType.set -> void
-Microsoft.Maui.IHybridWebView.Invoker.get -> Microsoft.Maui.IHybridWebViewInvoker?
-Microsoft.Maui.IHybridWebView.Invoker.set -> void
+Microsoft.Maui.HybridWebViewInvoker
+static Microsoft.Maui.HybridWebViewInvoker.SetInvoker(Microsoft.Maui.IHybridWebView! hybridWebView, Microsoft.Maui.IHybridWebViewInvoker! invoker) -> void
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.IHybridWebViewInvoker
 Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
diff --git a/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
index 6dc4d4de4afa..94597d7d421c 100644
--- a/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
@@ -1,10 +1,6 @@
 #nullable enable
-*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptTarget.get -> object?
-*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptTarget.set -> void
-*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptType.get -> System.Type?
-*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptType.set -> void
-Microsoft.Maui.IHybridWebView.Invoker.get -> Microsoft.Maui.IHybridWebViewInvoker?
-Microsoft.Maui.IHybridWebView.Invoker.set -> void
+Microsoft.Maui.HybridWebViewInvoker
+static Microsoft.Maui.HybridWebViewInvoker.SetInvoker(Microsoft.Maui.IHybridWebView! hybridWebView, Microsoft.Maui.IHybridWebViewInvoker! invoker) -> void
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.IHybridWebViewInvoker
 Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
diff --git a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index 79b1fa62eae6..01e2ade1f79a 100644
--- a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -1,10 +1,6 @@
 #nullable enable
-*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptTarget.get -> object?
-*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptTarget.set -> void
-*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptType.get -> System.Type?
-*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptType.set -> void
-Microsoft.Maui.IHybridWebView.Invoker.get -> Microsoft.Maui.IHybridWebViewInvoker?
-Microsoft.Maui.IHybridWebView.Invoker.set -> void
+Microsoft.Maui.HybridWebViewInvoker
+static Microsoft.Maui.HybridWebViewInvoker.SetInvoker(Microsoft.Maui.IHybridWebView! hybridWebView, Microsoft.Maui.IHybridWebViewInvoker! invoker) -> void
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.IHybridWebViewInvoker
 Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
diff --git a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
index 2a36150e10fd..aa5e7835d095 100644
--- a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -1,10 +1,6 @@
 #nullable enable
-*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptTarget.get -> object?
-*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptTarget.set -> void
-*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptType.get -> System.Type?
-*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptType.set -> void
-Microsoft.Maui.IHybridWebView.Invoker.get -> Microsoft.Maui.IHybridWebViewInvoker?
-Microsoft.Maui.IHybridWebView.Invoker.set -> void
+Microsoft.Maui.HybridWebViewInvoker
+static Microsoft.Maui.HybridWebViewInvoker.SetInvoker(Microsoft.Maui.IHybridWebView! hybridWebView, Microsoft.Maui.IHybridWebViewInvoker! invoker) -> void
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.IHybridWebViewInvoker
 Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
diff --git a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index 522b6080d0ad..ca79830bcc99 100644
--- a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -1,10 +1,6 @@
 #nullable enable
-*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptTarget.get -> object?
-*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptTarget.set -> void
-*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptType.get -> System.Type?
-*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptType.set -> void
-Microsoft.Maui.IHybridWebView.Invoker.get -> Microsoft.Maui.IHybridWebViewInvoker?
-Microsoft.Maui.IHybridWebView.Invoker.set -> void
+Microsoft.Maui.HybridWebViewInvoker
+static Microsoft.Maui.HybridWebViewInvoker.SetInvoker(Microsoft.Maui.IHybridWebView! hybridWebView, Microsoft.Maui.IHybridWebViewInvoker! invoker) -> void
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.IHybridWebViewInvoker
 Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
diff --git a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
index 522b6080d0ad..ca79830bcc99 100644
--- a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
@@ -1,10 +1,6 @@
 #nullable enable
-*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptTarget.get -> object?
-*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptTarget.set -> void
-*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptType.get -> System.Type?
-*REMOVED*Microsoft.Maui.IHybridWebView.InvokeJavaScriptType.set -> void
-Microsoft.Maui.IHybridWebView.Invoker.get -> Microsoft.Maui.IHybridWebViewInvoker?
-Microsoft.Maui.IHybridWebView.Invoker.set -> void
+Microsoft.Maui.HybridWebViewInvoker
+static Microsoft.Maui.HybridWebViewInvoker.SetInvoker(Microsoft.Maui.IHybridWebView! hybridWebView, Microsoft.Maui.IHybridWebViewInvoker! invoker) -> void
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.IHybridWebViewInvoker
 Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!

From 8ef3631cb66dae1f949529bd98f02f21ca89522a Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Mon, 15 Jun 2026 13:39:29 +0200
Subject: [PATCH 13/39] Clarify HybridWebView source generator interception
 requirement

Document that the JsonSerializerContext overload must be intercepted and that reaching the method body is a non-recoverable analyzer/build configuration bug, not a supported fallback path.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 src/Controls/src/Core/HybridWebView/HybridWebView.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Controls/src/Core/HybridWebView/HybridWebView.cs b/src/Controls/src/Core/HybridWebView/HybridWebView.cs
index 7a6428328b51..fc0d954ab5d8 100644
--- a/src/Controls/src/Core/HybridWebView/HybridWebView.cs
+++ b/src/Controls/src/Core/HybridWebView/HybridWebView.cs
@@ -70,9 +70,10 @@ public void SetInvokeJavaScriptTarget<T>(T target, JsonSerializerContext jsonSer
 				throw new ArgumentNullException(nameof(jsonSerializerContext));
 			}
 
-			// The source generator interceptor replaces this method call at compile time
-			// and registers a generated implementation with fully typed delegates.
-			// If the interceptor didn't fire (e.g. indirect call), throw at runtime.
+			// The source generator interceptor must replace this method call at compile time
+			// and register a generated implementation with fully typed delegates. Reaching
+			// this body means interception failed (for example, the analyzer was not
+			// referenced), which is a non-recoverable build/configuration bug.
 			throw new InvalidOperationException(
 				"SetInvokeJavaScriptTarget<T>(T, JsonSerializerContext) must be intercepted by the source generator. " +
 				"Ensure the Microsoft.Maui.Core.HybridWebViewSourceGen analyzer is referenced.");

From a0f6df0655e3f07596f9915449880bdece00bf40 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Mon, 15 Jun 2026 13:56:44 +0200
Subject: [PATCH 14/39] Mark HybridWebView legacy reflection path unsafe for
 AOT

Add RequiresUnreferencedCode and RequiresDynamicCode to the legacy SetInvokeJavaScriptTarget overload and ReflectionHybridWebViewInvoker, with migration guidance to the JsonSerializerContext overload.

Revert the unrelated generated HybridWebView.js compiler-output change; this PR does not intentionally change the JavaScript protocol.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../src/Core/HybridWebView/HybridWebView.cs   |   8 +
 src/Core/src/Core/IHybridWebView.cs           |   4 +
 .../Handlers/HybridWebView/HybridWebView.js   | 206 +++++++-----------
 .../ReflectionHybridWebViewInvoker.cs         |   6 +-
 4 files changed, 89 insertions(+), 135 deletions(-)

diff --git a/src/Controls/src/Core/HybridWebView/HybridWebView.cs b/src/Controls/src/Core/HybridWebView/HybridWebView.cs
index fc0d954ab5d8..033e40ee315a 100644
--- a/src/Controls/src/Core/HybridWebView/HybridWebView.cs
+++ b/src/Controls/src/Core/HybridWebView/HybridWebView.cs
@@ -14,9 +14,13 @@ namespace Microsoft.Maui.Controls
 	public class HybridWebView : View, IHybridWebView
 	{
 		/// <summary>Bindable property for <see cref="DefaultFile"/>.</summary>
+		[UnconditionalSuppressMessage("Trimming", "IL2026:RequiresUnreferencedCode", Justification = "BindableProperty.Create preserves public methods on the declaring type; it does not call the annotated legacy SetInvokeJavaScriptTarget overload.")]
+		[UnconditionalSuppressMessage("AOT", "IL3050:RequiresDynamicCode", Justification = "BindableProperty.Create preserves public methods on the declaring type; it does not call the annotated legacy SetInvokeJavaScriptTarget overload.")]
 		public static readonly BindableProperty DefaultFileProperty =
 			BindableProperty.Create(nameof(DefaultFile), typeof(string), typeof(HybridWebView), defaultValue: "index.html");
 		/// <summary>Bindable property for <see cref="HybridRoot"/>.</summary>
+		[UnconditionalSuppressMessage("Trimming", "IL2026:RequiresUnreferencedCode", Justification = "BindableProperty.Create preserves public methods on the declaring type; it does not call the annotated legacy SetInvokeJavaScriptTarget overload.")]
+		[UnconditionalSuppressMessage("AOT", "IL3050:RequiresDynamicCode", Justification = "BindableProperty.Create preserves public methods on the declaring type; it does not call the annotated legacy SetInvokeJavaScriptTarget overload.")]
 		public static readonly BindableProperty HybridRootProperty =
 			BindableProperty.Create(nameof(HybridRoot), typeof(string), typeof(HybridWebView), defaultValue: "wwwroot");
 
@@ -45,6 +49,10 @@ public string? HybridRoot
 			set => HybridWebViewInvoker.SetInvokeJavaScriptType(this, value);
 		}
 
+		[RequiresUnreferencedCode("Use SetInvokeJavaScriptTarget<T>(T target, JsonSerializerContext jsonSerializerContext) for trimming and NativeAOT compatibility.")]
+#if !NETSTANDARD
+		[RequiresDynamicCode("Use SetInvokeJavaScriptTarget<T>(T target, JsonSerializerContext jsonSerializerContext) for trimming and NativeAOT compatibility.")]
+#endif
 		public void SetInvokeJavaScriptTarget<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>(T target) where T : class
 		{
 			if (target is null)
diff --git a/src/Core/src/Core/IHybridWebView.cs b/src/Core/src/Core/IHybridWebView.cs
index f93b0e2ccde7..1c56385a36b9 100644
--- a/src/Core/src/Core/IHybridWebView.cs
+++ b/src/Core/src/Core/IHybridWebView.cs
@@ -32,6 +32,10 @@ public interface IHybridWebView : IView, IWebRequestInterceptingWebView, IInitia
 		/// </summary>
 		/// <typeparam name="T">The type that contains methods callable from JavaScript.</typeparam>
 		/// <param name="target">An instance of type <typeparamref name="T"/> that will be used to call methods on.</param>
+		[RequiresUnreferencedCode("Use SetInvokeJavaScriptTarget<T>(T target, JsonSerializerContext jsonSerializerContext) for trimming and NativeAOT compatibility.")]
+#if !NETSTANDARD
+		[RequiresDynamicCode("Use SetInvokeJavaScriptTarget<T>(T target, JsonSerializerContext jsonSerializerContext) for trimming and NativeAOT compatibility.")]
+#endif
 		void SetInvokeJavaScriptTarget<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>(T target) where T : class;
 
 		/// <summary>
diff --git a/src/Core/src/Handlers/HybridWebView/HybridWebView.js b/src/Core/src/Handlers/HybridWebView/HybridWebView.js
index 3e5aa04f8a74..e4b9d2330c93 100644
--- a/src/Core/src/Handlers/HybridWebView/HybridWebView.js
+++ b/src/Core/src/Handlers/HybridWebView/HybridWebView.js
@@ -5,58 +5,22 @@
  * The JavaScript file is generated from TypeScript and should not be modified
  * directly. To make changes, modify the TypeScript file and then recompile it.
  */
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-(function () {
+(() => {
     // Cached function to send messages to the host application.
-    var sendMessageFunction = null;
+    let sendMessageFunction = null;
     /*
      * Initialize the HybridWebView messaging system.
      * This method is called once when the page is loaded.
      */
     function initHybridWebView() {
         function dispatchHybridWebViewMessage(message) {
-            var event = new CustomEvent('HybridWebViewMessageReceived', { detail: { message: message } });
+            const event = new CustomEvent('HybridWebViewMessageReceived', { detail: { message: message } });
             window.dispatchEvent(event);
         }
         // Determine the mechanism to receive messages from the host application.
         if (window.chrome && window.chrome.webview && window.chrome.webview.addEventListener) {
             // Windows WebView2
-            window.chrome.webview.addEventListener('message', function (arg) {
+            window.chrome.webview.addEventListener('message', (arg) => {
                 dispatchHybridWebViewMessage(arg.data);
             });
         }
@@ -64,29 +28,29 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
             // iOS and MacCatalyst WKWebView
             // @ts-ignore - We are extending the global object here
             window.external = {
-                receiveMessage: function (message) {
+                receiveMessage: (message) => {
                     dispatchHybridWebViewMessage(message);
                 },
             };
         }
         else {
             // Android WebView
-            window.addEventListener('message', function (arg) {
+            window.addEventListener('message', (arg) => {
                 dispatchHybridWebViewMessage(arg.data);
             });
         }
         // Determine the function to use to send messages to the host application.
         if (window.chrome && window.chrome.webview) {
             // Windows WebView2
-            sendMessageFunction = function (msg) { return window.chrome.webview.postMessage(msg); };
+            sendMessageFunction = msg => window.chrome.webview.postMessage(msg);
         }
         else if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.webwindowinterop) {
             // iOS and MacCatalyst WKWebView
-            sendMessageFunction = function (msg) { return window.webkit.messageHandlers.webwindowinterop.postMessage(msg); };
+            sendMessageFunction = msg => window.webkit.messageHandlers.webwindowinterop.postMessage(msg);
         }
         else if (window.hybridWebViewHost) {
             // Android WebView
-            sendMessageFunction = function (msg) { return window.hybridWebViewHost.sendMessage(msg); };
+            sendMessageFunction = msg => window.hybridWebViewHost.sendMessage(msg);
         }
     }
     /*
@@ -94,7 +58,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
      * The message is sent as a string with the following format: `<type>|<message>`.
      */
     function sendMessageToDotNet(type, message) {
-        var messageToSend = type + '|' + message;
+        const messageToSend = type + '|' + message;
         if (sendMessageFunction) {
             sendMessageFunction(messageToSend);
         }
@@ -107,7 +71,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
      * The result is sent as a string with the following format: `<taskId>|<result-json>`.
      */
     function invokeJavaScriptCallbackInDotNet(taskId, result) {
-        var json = JSON.stringify(result);
+        const json = JSON.stringify(result);
         sendMessageToDotNet('__InvokeJavaScriptCompleted', taskId + '|' + json);
     }
     /*
@@ -115,7 +79,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
      * The error message is sent as a string with the following format: `<taskId>|<JSInvokeError>`.
      */
     function invokeJavaScriptFailedInDotNet(taskId, error) {
-        var errorObj;
+        let errorObj;
         if (!error) {
             errorObj = {
                 Message: 'Unknown error',
@@ -141,7 +105,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
                 StackTrace: Error().stack
             };
         }
-        var json = JSON.stringify(errorObj);
+        const json = JSON.stringify(errorObj);
         sendMessageToDotNet('__InvokeJavaScriptFailed', taskId + '|' + json);
     }
     /*
@@ -162,68 +126,57 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
      *
      * @returns A promise that resolves with the result of the .NET method invocation.
      */
-    function invokeDotNet(methodName, paramValues) {
-        return __awaiter(this, void 0, void 0, function () {
-            var body, i, message, requestUrl, rawResponse, response, error;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        body = {
-                            MethodName: methodName
-                        };
-                        // if parameters were provided, serialize them first
-                        if (paramValues !== undefined) {
-                            if (!Array.isArray(paramValues)) {
-                                paramValues = [paramValues];
-                            }
-                            for (i = 0; i < paramValues.length; i++) {
-                                paramValues[i] = JSON.stringify(paramValues[i]);
-                            }
-                            if (paramValues.length > 0) {
-                                body.ParamValues = paramValues;
-                            }
-                        }
-                        message = JSON.stringify(body);
-                        requestUrl = "".concat(window.location.origin, "/__hwvInvokeDotNet");
-                        return [4 /*yield*/, fetch(requestUrl, {
-                                method: 'POST',
-                                headers: {
-                                    'Content-Type': 'application/json',
-                                    'Accept': 'application/json',
-                                    'X-Maui-Invoke-Token': 'HybridWebView',
-                                    'X-Maui-Request-Body': message // Some platforms (Android) do not expose the POST body
-                                },
-                                body: message
-                            })];
-                    case 1:
-                        rawResponse = _a.sent();
-                        return [4 /*yield*/, rawResponse.json()];
-                    case 2:
-                        response = _a.sent();
-                        // a null response is a null response
-                        if (!response) {
-                            return [2 /*return*/, null];
-                        }
-                        // Check if the response indicates an error
-                        if (response.IsError) {
-                            error = new Error(response.ErrorMessage || 'Unknown error occurred in .NET method');
-                            if (response.ErrorType) {
-                                error.dotNetErrorType = response.ErrorType;
-                            }
-                            if (response.ErrorStackTrace) {
-                                error.dotNetStackTrace = response.ErrorStackTrace;
-                            }
-                            throw error;
-                        }
-                        // deserialize if there is JSON data
-                        if (response.IsJson) {
-                            return [2 /*return*/, JSON.parse(response.Result)];
-                        }
-                        // otherwise return the primitive
-                        return [2 /*return*/, response.Result];
-                }
-            });
+    async function invokeDotNet(methodName, paramValues) {
+        const body = {
+            MethodName: methodName
+        };
+        // if parameters were provided, serialize them first
+        if (paramValues !== undefined) {
+            if (!Array.isArray(paramValues)) {
+                paramValues = [paramValues];
+            }
+            for (let i = 0; i < paramValues.length; i++) {
+                paramValues[i] = JSON.stringify(paramValues[i]);
+            }
+            if (paramValues.length > 0) {
+                body.ParamValues = paramValues;
+            }
+        }
+        const message = JSON.stringify(body);
+        // send the request to .NET
+        const requestUrl = `${window.location.origin}/__hwvInvokeDotNet`;
+        const rawResponse = await fetch(requestUrl, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+                'Accept': 'application/json',
+                'X-Maui-Invoke-Token': 'HybridWebView',
+                'X-Maui-Request-Body': message // Some platforms (Android) do not expose the POST body
+            },
+            body: message
         });
+        const response = await rawResponse.json();
+        // a null response is a null response
+        if (!response) {
+            return null;
+        }
+        // Check if the response indicates an error
+        if (response.IsError) {
+            const error = new Error(response.ErrorMessage || 'Unknown error occurred in .NET method');
+            if (response.ErrorType) {
+                error.dotNetErrorType = response.ErrorType;
+            }
+            if (response.ErrorStackTrace) {
+                error.dotNetStackTrace = response.ErrorStackTrace;
+            }
+            throw error;
+        }
+        // deserialize if there is JSON data
+        if (response.IsJson) {
+            return JSON.parse(response.Result);
+        }
+        // otherwise return the primitive
+        return response.Result;
     }
     /*
      * Invoke a JavaScript method from the .NET host application.
@@ -235,30 +188,18 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
      *
      * @returns A promise.
      */
-    function invokeJavaScript(taskId, methodName, args) {
-        return __awaiter(this, void 0, void 0, function () {
-            var result, ex_1;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        _a.trys.push([0, 2, , 3]);
-                        return [4 /*yield*/, methodName.apply(void 0, args)];
-                    case 1:
-                        result = _a.sent();
-                        invokeJavaScriptCallbackInDotNet(taskId, result);
-                        return [3 /*break*/, 3];
-                    case 2:
-                        ex_1 = _a.sent();
-                        console.error(ex_1);
-                        invokeJavaScriptFailedInDotNet(taskId, ex_1);
-                        return [3 /*break*/, 3];
-                    case 3: return [2 /*return*/];
-                }
-            });
-        });
+    async function invokeJavaScript(taskId, methodName, args) {
+        try {
+            const result = await methodName(...args);
+            invokeJavaScriptCallbackInDotNet(taskId, result);
+        }
+        catch (ex) {
+            console.error(ex);
+            invokeJavaScriptFailedInDotNet(taskId, ex);
+        }
     }
     // Define the public API of the HybridWebView control.
-    var HybridWebView = {
+    const HybridWebView = {
         SendRawMessage: sendRawMessage,
         InvokeDotNet: invokeDotNet,
         __InvokeJavaScript: invokeJavaScript
@@ -269,4 +210,3 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     // Initialize the HybridWebView
     initHybridWebView();
 })();
-//# sourceMappingURL=HybridWebView.js.map
\ No newline at end of file
diff --git a/src/Core/src/Handlers/HybridWebView/ReflectionHybridWebViewInvoker.cs b/src/Core/src/Handlers/HybridWebView/ReflectionHybridWebViewInvoker.cs
index c797394686e5..ec19205b5a24 100644
--- a/src/Core/src/Handlers/HybridWebView/ReflectionHybridWebViewInvoker.cs
+++ b/src/Core/src/Handlers/HybridWebView/ReflectionHybridWebViewInvoker.cs
@@ -10,6 +10,10 @@ namespace Microsoft.Maui
 	/// <summary>
 	/// Reflection-based invoker for the legacy SetInvokeJavaScriptTarget overload. Use the JsonSerializerContext overload for NativeAOT-safe dispatch.
 	/// </summary>
+	[RequiresUnreferencedCode("Use SetInvokeJavaScriptTarget<T>(T target, JsonSerializerContext jsonSerializerContext) for trimming and NativeAOT compatibility.")]
+#if !NETSTANDARD
+	[RequiresDynamicCode("Use SetInvokeJavaScriptTarget<T>(T target, JsonSerializerContext jsonSerializerContext) for trimming and NativeAOT compatibility.")]
+#endif
 	internal sealed class ReflectionHybridWebViewInvoker : IHybridWebViewInvoker
 	{
 		private readonly object _target;
@@ -22,8 +26,6 @@ public ReflectionHybridWebViewInvoker(object target, [DynamicallyAccessedMembers
 			_targetType = targetType;
 		}
 
-		[UnconditionalSuppressMessage("Trimming", "IL2026:RequiresUnreferencedCode", Justification = "Legacy reflection dispatch preserves the target type with DAM; use the JsonSerializerContext overload for the NativeAOT-safe path.")]
-		[UnconditionalSuppressMessage("AOT", "IL3050:RequiresDynamicCode", Justification = "Legacy reflection dispatch may use runtime JSON metadata; use the JsonSerializerContext overload for the NativeAOT-safe path.")]
 		[UnconditionalSuppressMessage("Trimming", "IL2075:DynamicallyAccessedMembers", Justification = "The legacy overload preserves the target type and its public members with DynamicallyAccessedMembers.")]
 		public async Task<string?> InvokeMethodAsync(string methodName, string[]? paramJsonValues)
 		{

From 7eaa8f82ea5cec3375e8a838a4119b0b0f88b0f4 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Mon, 15 Jun 2026 14:35:44 +0200
Subject: [PATCH 15/39] Use invoker attach model for HybridWebView

Make IHybridWebViewInvoker an abstract base class that owns the invocation target metadata and attaches itself to HybridWebView through an internal host interface.

Remove the public static invoker store/extension hook; generated invokers and the legacy reflection invoker now call AttachTo, while HybridWebView getters delegate to the attached invoker.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../src/Core/HybridWebView/HybridWebView.cs   | 32 ++++++--
 ...dWebViewTests_SetInvokeJavaScriptTarget.cs |  4 +-
 src/Core/src/Core/HybridWebViewInvoker.cs     | 75 -------------------
 src/Core/src/Core/IHybridWebViewInvoker.cs    | 48 +++++++++++-
 .../HybridWebView/HybridWebViewHandler.cs     |  2 +-
 .../ReflectionHybridWebViewInvoker.cs         | 19 +++--
 .../HybridWebViewInvokeTargetGenerator.cs     |  3 +-
 .../net-android/PublicAPI.Unshipped.txt       |  5 +-
 .../PublicAPI/net-ios/PublicAPI.Unshipped.txt |  5 +-
 .../net-maccatalyst/PublicAPI.Unshipped.txt   |  5 +-
 .../net-tizen/PublicAPI.Unshipped.txt         |  5 +-
 .../net-windows/PublicAPI.Unshipped.txt       |  5 +-
 .../src/PublicAPI/net/PublicAPI.Unshipped.txt |  6 +-
 .../netstandard/PublicAPI.Unshipped.txt       |  8 +-
 .../netstandard2.0/PublicAPI.Unshipped.txt    |  8 +-
 15 files changed, 106 insertions(+), 124 deletions(-)
 delete mode 100644 src/Core/src/Core/HybridWebViewInvoker.cs

diff --git a/src/Controls/src/Core/HybridWebView/HybridWebView.cs b/src/Controls/src/Core/HybridWebView/HybridWebView.cs
index 033e40ee315a..ebb96c8a666e 100644
--- a/src/Controls/src/Core/HybridWebView/HybridWebView.cs
+++ b/src/Controls/src/Core/HybridWebView/HybridWebView.cs
@@ -11,7 +11,7 @@ namespace Microsoft.Maui.Controls
 	/// A <see cref="View"/> that presents local HTML content in a web view and allows JavaScript and C# code to
 	/// communicate by using messages and by invoking methods.
 	/// </summary>
-	public class HybridWebView : View, IHybridWebView
+	public class HybridWebView : View, IHybridWebView, IHybridWebViewInvokerHost
 	{
 		/// <summary>Bindable property for <see cref="DefaultFile"/>.</summary>
 		[UnconditionalSuppressMessage("Trimming", "IL2026:RequiresUnreferencedCode", Justification = "BindableProperty.Create preserves public methods on the declaring type; it does not call the annotated legacy SetInvokeJavaScriptTarget overload.")]
@@ -38,15 +38,35 @@ public string? HybridRoot
 			set { SetValue(HybridRootProperty, value); }
 		}
 
+		IHybridWebViewInvoker? _invoker;
+
+		IHybridWebViewInvoker? IHybridWebViewInvokerHost.Invoker => _invoker;
+
+		void IHybridWebViewInvokerHost.SetInvoker(IHybridWebViewInvoker invoker)
+		{
+			_invoker = invoker ?? throw new ArgumentNullException(nameof(invoker));
+		}
+
 		/// <inheritdoc/>
-		object? IHybridWebView.InvokeJavaScriptTarget { get; set; }
+		object? IHybridWebView.InvokeJavaScriptTarget
+		{
+			get => GetInvoker().InvokeJavaScriptTarget;
+			set => GetInvoker().InvokeJavaScriptTarget = value;
+		}
 
 		/// <inheritdoc/>
 		[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
 		Type? IHybridWebView.InvokeJavaScriptType
 		{
-			get => HybridWebViewInvoker.GetInvokeJavaScriptType(this);
-			set => HybridWebViewInvoker.SetInvokeJavaScriptType(this, value);
+			get => GetInvoker().InvokeJavaScriptType;
+			set => GetInvoker().InvokeJavaScriptType = value;
+		}
+
+		IHybridWebViewInvoker GetInvoker()
+		{
+			return _invoker
+				?? throw new InvalidOperationException(
+					$"No invoker is configured. Call {nameof(SetInvokeJavaScriptTarget)} to set up JS-to-.NET method invocation.");
 		}
 
 		[RequiresUnreferencedCode("Use SetInvokeJavaScriptTarget<T>(T target, JsonSerializerContext jsonSerializerContext) for trimming and NativeAOT compatibility.")]
@@ -60,9 +80,7 @@ public string? HybridRoot
 				throw new ArgumentNullException(nameof(target));
 			}
 
-			HybridWebViewInvoker.SetInvoker(this, new ReflectionHybridWebViewInvoker(target, typeof(T)));
-			((IHybridWebView)this).InvokeJavaScriptTarget = target;
-			((IHybridWebView)this).InvokeJavaScriptType = typeof(T);
+			new ReflectionHybridWebViewInvoker(target, typeof(T)).AttachTo(this);
 		}
 
 		/// <inheritdoc/>
diff --git a/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs b/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs
index 7ec0da51e8d0..ccd9a1a2f3ab 100644
--- a/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs
+++ b/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs
@@ -42,7 +42,7 @@ public Task InvokerIsSet_WhenUsingJsonSerializerContext() =>
 			hybridWebView.SetInvokeJavaScriptTarget(invokeJavaScriptTarget, InvokeDotNetJsonContext.Default);
 
 			// Verify the invoker was set (AOT-safe path)
-			var invoker = HybridWebViewInvoker.GetInvoker(hybridWebView);
+			var invoker = ((IHybridWebViewInvokerHost)hybridWebView).Invoker;
 			Assert.NotNull(invoker);
 
 			// Verify the invoker actually works end-to-end
@@ -61,7 +61,7 @@ public Task InvokerIsSet_WhenUsingLegacyOverload() =>
 #pragma warning restore IL2026, IL3050
 
 			// Verify the invoker was set (legacy reflection path)
-			var invoker = HybridWebViewInvoker.GetInvoker(hybridWebView);
+			var invoker = ((IHybridWebViewInvokerHost)hybridWebView).Invoker;
 			Assert.NotNull(invoker);
 			Assert.IsType<ReflectionHybridWebViewInvoker>(invoker);
 
diff --git a/src/Core/src/Core/HybridWebViewInvoker.cs b/src/Core/src/Core/HybridWebViewInvoker.cs
deleted file mode 100644
index f991c3362f6b..000000000000
--- a/src/Core/src/Core/HybridWebViewInvoker.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
-
-namespace Microsoft.Maui
-{
-	/// <summary>
-	/// For internal use by generated HybridWebView invocation code.
-	/// </summary>
-	[EditorBrowsable(EditorBrowsableState.Never)]
-	public static class HybridWebViewInvoker
-	{
-		static readonly ConditionalWeakTable<IHybridWebView, InvokerHolder> s_invokers = new();
-
-		/// <summary>
-		/// Sets the invoker used to dispatch JavaScript calls to .NET methods.
-		/// </summary>
-		/// <param name="hybridWebView">The hybrid web view that owns the invoker.</param>
-		/// <param name="invoker">The invoker used to dispatch JavaScript calls.</param>
-		[EditorBrowsable(EditorBrowsableState.Never)]
-		public static void SetInvoker(IHybridWebView hybridWebView, IHybridWebViewInvoker invoker)
-		{
-			if (hybridWebView is null)
-			{
-				throw new ArgumentNullException(nameof(hybridWebView));
-			}
-
-			if (invoker is null)
-			{
-				throw new ArgumentNullException(nameof(invoker));
-			}
-
-			s_invokers.GetOrCreateValue(hybridWebView).Invoker = invoker;
-		}
-
-		internal static IHybridWebViewInvoker? GetInvoker(IHybridWebView hybridWebView)
-		{
-			return s_invokers.TryGetValue(hybridWebView, out var holder)
-				? holder.Invoker
-				: null;
-		}
-
-		internal static void SetInvokeJavaScriptType(IHybridWebView hybridWebView, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] Type? invokeJavaScriptType)
-		{
-			if (hybridWebView is null)
-			{
-				throw new ArgumentNullException(nameof(hybridWebView));
-			}
-
-			s_invokers.GetOrCreateValue(hybridWebView).InvokeJavaScriptType = invokeJavaScriptType;
-		}
-
-		[return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
-		internal static Type? GetInvokeJavaScriptType(IHybridWebView hybridWebView)
-		{
-			if (hybridWebView is null)
-			{
-				throw new ArgumentNullException(nameof(hybridWebView));
-			}
-
-			return s_invokers.TryGetValue(hybridWebView, out var holder)
-				? holder.InvokeJavaScriptType
-				: null;
-		}
-
-		sealed class InvokerHolder
-		{
-			public IHybridWebViewInvoker? Invoker { get; set; }
-
-			[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
-			public Type? InvokeJavaScriptType { get; set; }
-		}
-	}
-}
diff --git a/src/Core/src/Core/IHybridWebViewInvoker.cs b/src/Core/src/Core/IHybridWebViewInvoker.cs
index fce2a4031988..6424fa3cdf17 100644
--- a/src/Core/src/Core/IHybridWebViewInvoker.cs
+++ b/src/Core/src/Core/IHybridWebViewInvoker.cs
@@ -1,4 +1,6 @@
+using System;
 using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
 
 namespace Microsoft.Maui
@@ -8,14 +10,56 @@ namespace Microsoft.Maui
 	/// Implemented by the reflection-based fallback and by the source generator.
 	/// </summary>
 	[EditorBrowsable(EditorBrowsableState.Never)]
-	public interface IHybridWebViewInvoker
+	public abstract class IHybridWebViewInvoker
 	{
+		/// <summary>
+		/// Creates a new invoker for the specified JavaScript invocation target.
+		/// </summary>
+		/// <param name="invokeJavaScriptTarget">The object containing methods callable from JavaScript.</param>
+		/// <param name="invokeJavaScriptType">The type containing methods callable from JavaScript.</param>
+		protected IHybridWebViewInvoker(object? invokeJavaScriptTarget, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] Type? invokeJavaScriptType)
+		{
+			InvokeJavaScriptTarget = invokeJavaScriptTarget;
+			InvokeJavaScriptType = invokeJavaScriptType;
+		}
+
+		internal object? InvokeJavaScriptTarget { get; set; }
+
+		[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
+		internal Type? InvokeJavaScriptType { get; set; }
+
+		/// <summary>
+		/// Attaches the invoker to a HybridWebView instance.
+		/// </summary>
+		/// <param name="hybridWebView">The hybrid web view that owns the invoker.</param>
+		public void AttachTo(IHybridWebView hybridWebView)
+		{
+			if (hybridWebView is null)
+			{
+				throw new ArgumentNullException(nameof(hybridWebView));
+			}
+
+			if (hybridWebView is not IHybridWebViewInvokerHost host)
+			{
+				throw new InvalidOperationException("HybridWebView invokers can only be attached to Microsoft.Maui.Controls.HybridWebView instances.");
+			}
+
+			host.SetInvoker(this);
+		}
+
 		/// <summary>
 		/// Invokes the named .NET method with JSON-serialized parameters and returns a JSON-serialized result.
 		/// </summary>
 		/// <param name="methodName">The name of the method to invoke.</param>
 		/// <param name="paramJsonValues">JSON-serialized parameter values, or null for parameterless methods.</param>
 		/// <returns>JSON-serialized result, or null for void methods or null returns.</returns>
-		Task<string?> InvokeMethodAsync(string methodName, string[]? paramJsonValues);
+		public abstract Task<string?> InvokeMethodAsync(string methodName, string[]? paramJsonValues);
+	}
+
+	internal interface IHybridWebViewInvokerHost
+	{
+		IHybridWebViewInvoker? Invoker { get; }
+
+		void SetInvoker(IHybridWebViewInvoker invoker);
 	}
 }
diff --git a/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs b/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs
index b20af2f7264a..1c1fbe037950 100644
--- a/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs
+++ b/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs
@@ -194,7 +194,7 @@ void MessageReceived(string rawMessage)
 					throw new InvalidOperationException("The invoke data did not provide a method name.");
 				}
 
-				var invoker = HybridWebViewInvoker.GetInvoker(VirtualView)
+				var invoker = (VirtualView as IHybridWebViewInvokerHost)?.Invoker
 					?? throw new InvalidOperationException(
 						$"No invoker is configured. Call {nameof(IHybridWebView.SetInvokeJavaScriptTarget)} to set up JS-to-.NET method invocation.");
 				var jsonResult = await invoker.InvokeMethodAsync(invokeData.MethodName, invokeData.ParamValues);
diff --git a/src/Core/src/Handlers/HybridWebView/ReflectionHybridWebViewInvoker.cs b/src/Core/src/Handlers/HybridWebView/ReflectionHybridWebViewInvoker.cs
index ec19205b5a24..4998d2fa074e 100644
--- a/src/Core/src/Handlers/HybridWebView/ReflectionHybridWebViewInvoker.cs
+++ b/src/Core/src/Handlers/HybridWebView/ReflectionHybridWebViewInvoker.cs
@@ -16,21 +16,20 @@ namespace Microsoft.Maui
 #endif
 	internal sealed class ReflectionHybridWebViewInvoker : IHybridWebViewInvoker
 	{
-		private readonly object _target;
-		[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
-		private readonly Type _targetType;
-
 		public ReflectionHybridWebViewInvoker(object target, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] Type targetType)
+			: base(target, targetType)
 		{
-			_target = target;
-			_targetType = targetType;
 		}
 
 		[UnconditionalSuppressMessage("Trimming", "IL2075:DynamicallyAccessedMembers", Justification = "The legacy overload preserves the target type and its public members with DynamicallyAccessedMembers.")]
-		public async Task<string?> InvokeMethodAsync(string methodName, string[]? paramJsonValues)
+		public override async Task<string?> InvokeMethodAsync(string methodName, string[]? paramJsonValues)
 		{
-			var method = _targetType.GetMethod(methodName, BindingFlags.Public | BindingFlags.Instance | BindingFlags.InvokeMethod)
-				?? throw new InvalidOperationException($"The method '{methodName}' was not found on type '{_targetType.FullName}'.");
+			var target = InvokeJavaScriptTarget
+				?? throw new InvalidOperationException($"The {nameof(IHybridWebView)}.{nameof(IHybridWebView.InvokeJavaScriptTarget)} property must have a value in order to invoke a .NET method from JavaScript.");
+			var targetType = InvokeJavaScriptType
+				?? throw new InvalidOperationException($"The {nameof(IHybridWebView)}.{nameof(IHybridWebView.InvokeJavaScriptType)} property must have a value in order to invoke a .NET method from JavaScript.");
+			var method = targetType.GetMethod(methodName, BindingFlags.Public | BindingFlags.Instance | BindingFlags.InvokeMethod)
+				?? throw new InvalidOperationException($"The method '{methodName}' was not found on type '{targetType.FullName}'.");
 
 			var parameters = method.GetParameters();
 			if (paramJsonValues is not null && parameters.Length != paramJsonValues.Length)
@@ -51,7 +50,7 @@ public ReflectionHybridWebViewInvoker(object target, [DynamicallyAccessedMembers
 			object? returnValue;
 			try
 			{
-				returnValue = method.Invoke(_target, args);
+				returnValue = method.Invoke(target, args);
 			}
 			catch (TargetInvocationException tie) when (tie.InnerException is not null)
 			{
diff --git a/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs b/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs
index 81a02c04c18e..7e7c18d5ec56 100644
--- a/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs
+++ b/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs
@@ -187,7 +187,7 @@ private static void GenerateSource(SourceProductionContext spc, ImmutableArray<I
 			sb.AppendLine($"            if (target is not {info.TargetTypeName} typedTarget)");
 			sb.AppendLine($"                throw new InvalidOperationException($\"Type mismatch: expected {info.TargetTypeName.Split('.').Last()} but got {{target.GetType().FullName}}\");");
 			sb.AppendLine();
-			sb.AppendLine($"            global::Microsoft.Maui.HybridWebViewInvoker.SetInvoker(hybridWebView, new Invoker_{index}(typedTarget, jsonSerializerContext));");
+			sb.AppendLine($"            new Invoker_{index}(typedTarget, jsonSerializerContext).AttachTo(hybridWebView);");
 			sb.AppendLine("        }");
 			sb.AppendLine();
 
@@ -198,6 +198,7 @@ private static void GenerateSource(SourceProductionContext spc, ImmutableArray<I
 			sb.AppendLine("            private readonly global::System.Text.Json.Serialization.JsonSerializerContext _ctx;");
 			sb.AppendLine();
 			sb.AppendLine($"            public Invoker_{index}({info.TargetTypeName} target, global::System.Text.Json.Serialization.JsonSerializerContext ctx)");
+			sb.AppendLine($"                : base(target, typeof({info.TargetTypeName}))");
 			sb.AppendLine("            {");
 			sb.AppendLine("                _target = target;");
 			sb.AppendLine("                _ctx = ctx;");
diff --git a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
index c96d0f5bfb5f..edf1cd99a826 100644
--- a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -1,9 +1,8 @@
 #nullable enable
-Microsoft.Maui.HybridWebViewInvoker
-static Microsoft.Maui.HybridWebViewInvoker.SetInvoker(Microsoft.Maui.IHybridWebView! hybridWebView, Microsoft.Maui.IHybridWebViewInvoker! invoker) -> void
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.IHybridWebViewInvoker
-Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
+Microsoft.Maui.IHybridWebViewInvoker.AttachTo(Microsoft.Maui.IHybridWebView! hybridWebView) -> void
+abstract Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
 *REMOVED*override Microsoft.Maui.Graphics.MauiDrawable.Dispose(bool disposing) -> void
 *REMOVED*override Microsoft.Maui.Graphics.MauiDrawable.OnBoundsChange(Android.Graphics.Rect! bounds) -> void
 *REMOVED*override Microsoft.Maui.Graphics.MauiDrawable.OnDraw(Android.Graphics.Drawables.Shapes.Shape? shape, Android.Graphics.Canvas? canvas, Android.Graphics.Paint? paint) -> void
diff --git a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index ec8cbd91cb9b..6923a9717dd1 100644
--- a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -1,9 +1,8 @@
 #nullable enable
-Microsoft.Maui.HybridWebViewInvoker
-static Microsoft.Maui.HybridWebViewInvoker.SetInvoker(Microsoft.Maui.IHybridWebView! hybridWebView, Microsoft.Maui.IHybridWebViewInvoker! invoker) -> void
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.IHybridWebViewInvoker
-Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
+Microsoft.Maui.IHybridWebViewInvoker.AttachTo(Microsoft.Maui.IHybridWebView! hybridWebView) -> void
+abstract Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
 override Microsoft.Maui.Handlers.LabelHandler.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
 override Microsoft.Maui.Handlers.ShapeViewHandler.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
 override Microsoft.Maui.Handlers.StepperHandler.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
diff --git a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index ec8cbd91cb9b..6923a9717dd1 100644
--- a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -1,9 +1,8 @@
 #nullable enable
-Microsoft.Maui.HybridWebViewInvoker
-static Microsoft.Maui.HybridWebViewInvoker.SetInvoker(Microsoft.Maui.IHybridWebView! hybridWebView, Microsoft.Maui.IHybridWebViewInvoker! invoker) -> void
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.IHybridWebViewInvoker
-Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
+Microsoft.Maui.IHybridWebViewInvoker.AttachTo(Microsoft.Maui.IHybridWebView! hybridWebView) -> void
+abstract Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
 override Microsoft.Maui.Handlers.LabelHandler.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
 override Microsoft.Maui.Handlers.ShapeViewHandler.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
 override Microsoft.Maui.Handlers.StepperHandler.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
diff --git a/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
index 94597d7d421c..5cee7b8327b2 100644
--- a/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
@@ -1,7 +1,6 @@
 #nullable enable
-Microsoft.Maui.HybridWebViewInvoker
-static Microsoft.Maui.HybridWebViewInvoker.SetInvoker(Microsoft.Maui.IHybridWebView! hybridWebView, Microsoft.Maui.IHybridWebViewInvoker! invoker) -> void
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.IHybridWebViewInvoker
-Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
+Microsoft.Maui.IHybridWebViewInvoker.AttachTo(Microsoft.Maui.IHybridWebView! hybridWebView) -> void
+abstract Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
 static Microsoft.Maui.GridLength.implicit operator Microsoft.Maui.GridLength(string! value) -> Microsoft.Maui.GridLength
diff --git a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index 01e2ade1f79a..f9b837ed9d8c 100644
--- a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -1,9 +1,8 @@
 #nullable enable
-Microsoft.Maui.HybridWebViewInvoker
-static Microsoft.Maui.HybridWebViewInvoker.SetInvoker(Microsoft.Maui.IHybridWebView! hybridWebView, Microsoft.Maui.IHybridWebViewInvoker! invoker) -> void
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.IHybridWebViewInvoker
-Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
+Microsoft.Maui.IHybridWebViewInvoker.AttachTo(Microsoft.Maui.IHybridWebView! hybridWebView) -> void
+abstract Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
 override Microsoft.Maui.Platform.MauiPasswordTextBox.OnCreateAutomationPeer() -> Microsoft.UI.Xaml.Automation.Peers.AutomationPeer!
 static Microsoft.Maui.GridLength.implicit operator Microsoft.Maui.GridLength(string! value) -> Microsoft.Maui.GridLength
 static Microsoft.Maui.SafeAreaEdges.Container.get -> Microsoft.Maui.SafeAreaEdges
diff --git a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
index aa5e7835d095..f06b01886e66 100644
--- a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -1,8 +1,8 @@
 #nullable enable
-Microsoft.Maui.HybridWebViewInvoker
-static Microsoft.Maui.HybridWebViewInvoker.SetInvoker(Microsoft.Maui.IHybridWebView! hybridWebView, Microsoft.Maui.IHybridWebViewInvoker! invoker) -> void
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.IHybridWebViewInvoker
-Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
+Microsoft.Maui.IHybridWebViewInvoker.AttachTo(Microsoft.Maui.IHybridWebView! hybridWebView) -> void
+Microsoft.Maui.IHybridWebViewInvoker.IHybridWebViewInvoker(object? invokeJavaScriptTarget, System.Type? invokeJavaScriptType) -> void
+abstract Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
 static Microsoft.Maui.GridLength.implicit operator Microsoft.Maui.GridLength(string! value) -> Microsoft.Maui.GridLength
 static Microsoft.Maui.SafeAreaEdges.Container.get -> Microsoft.Maui.SafeAreaEdges
diff --git a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index ca79830bcc99..7a17603e63b5 100644
--- a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -1,7 +1,7 @@
-#nullable enable
-Microsoft.Maui.HybridWebViewInvoker
-static Microsoft.Maui.HybridWebViewInvoker.SetInvoker(Microsoft.Maui.IHybridWebView! hybridWebView, Microsoft.Maui.IHybridWebViewInvoker! invoker) -> void
+#nullable enable
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.IHybridWebViewInvoker
-Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
+Microsoft.Maui.IHybridWebViewInvoker.AttachTo(Microsoft.Maui.IHybridWebView! hybridWebView) -> void
+Microsoft.Maui.IHybridWebViewInvoker.IHybridWebViewInvoker(object? invokeJavaScriptTarget, System.Type? invokeJavaScriptType) -> void
+abstract Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
 static Microsoft.Maui.SafeAreaEdges.Container.get -> Microsoft.Maui.SafeAreaEdges
diff --git a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
index ca79830bcc99..7a17603e63b5 100644
--- a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
@@ -1,7 +1,7 @@
-#nullable enable
-Microsoft.Maui.HybridWebViewInvoker
-static Microsoft.Maui.HybridWebViewInvoker.SetInvoker(Microsoft.Maui.IHybridWebView! hybridWebView, Microsoft.Maui.IHybridWebViewInvoker! invoker) -> void
+#nullable enable
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.IHybridWebViewInvoker
-Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
+Microsoft.Maui.IHybridWebViewInvoker.AttachTo(Microsoft.Maui.IHybridWebView! hybridWebView) -> void
+Microsoft.Maui.IHybridWebViewInvoker.IHybridWebViewInvoker(object? invokeJavaScriptTarget, System.Type? invokeJavaScriptType) -> void
+abstract Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
 static Microsoft.Maui.SafeAreaEdges.Container.get -> Microsoft.Maui.SafeAreaEdges

From 82285a2fb9a393928c1dc247ca4d877927563318 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Mon, 15 Jun 2026 14:55:50 +0200
Subject: [PATCH 16/39] Use public HybridWebView SetInvoker hook

Remove the internal host interface and make HybridWebView.SetInvoker the generated-code hook while keeping handler retrieval internal through IHybridWebViewInvoker storage.

Generated invokers now call the public class method directly, avoiding any new API on IHybridWebView.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../src/Core/HybridWebView/HybridWebView.cs   | 20 +++++-----
 .../net-android/PublicAPI.Unshipped.txt       |  1 +
 .../PublicAPI/net-ios/PublicAPI.Unshipped.txt |  1 +
 .../net-maccatalyst/PublicAPI.Unshipped.txt   |  1 +
 .../net-tizen/PublicAPI.Unshipped.txt         |  1 +
 .../net-windows/PublicAPI.Unshipped.txt       |  1 +
 .../PublicAPI/net/PublicAPI.Unshipped.txt     |  1 +
 .../netstandard/PublicAPI.Unshipped.txt       |  1 +
 ...dWebViewTests_SetInvokeJavaScriptTarget.cs |  4 +-
 src/Core/src/Core/IHybridWebViewInvoker.cs    | 37 ++++++++++++-------
 .../HybridWebView/HybridWebViewHandler.cs     |  2 +-
 .../HybridWebViewInvokeTargetGenerator.cs     |  2 +-
 .../net-android/PublicAPI.Unshipped.txt       |  1 -
 .../PublicAPI/net-ios/PublicAPI.Unshipped.txt |  1 -
 .../net-maccatalyst/PublicAPI.Unshipped.txt   |  1 -
 .../net-tizen/PublicAPI.Unshipped.txt         |  1 -
 .../net-windows/PublicAPI.Unshipped.txt       |  1 -
 .../src/PublicAPI/net/PublicAPI.Unshipped.txt |  1 -
 .../netstandard/PublicAPI.Unshipped.txt       |  1 -
 .../netstandard2.0/PublicAPI.Unshipped.txt    |  1 -
 20 files changed, 45 insertions(+), 35 deletions(-)

diff --git a/src/Controls/src/Core/HybridWebView/HybridWebView.cs b/src/Controls/src/Core/HybridWebView/HybridWebView.cs
index ebb96c8a666e..2273548c5a08 100644
--- a/src/Controls/src/Core/HybridWebView/HybridWebView.cs
+++ b/src/Controls/src/Core/HybridWebView/HybridWebView.cs
@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
 using System.Text.Json.Serialization;
@@ -11,7 +12,7 @@ namespace Microsoft.Maui.Controls
 	/// A <see cref="View"/> that presents local HTML content in a web view and allows JavaScript and C# code to
 	/// communicate by using messages and by invoking methods.
 	/// </summary>
-	public class HybridWebView : View, IHybridWebView, IHybridWebViewInvokerHost
+	public class HybridWebView : View, IHybridWebView
 	{
 		/// <summary>Bindable property for <see cref="DefaultFile"/>.</summary>
 		[UnconditionalSuppressMessage("Trimming", "IL2026:RequiresUnreferencedCode", Justification = "BindableProperty.Create preserves public methods on the declaring type; it does not call the annotated legacy SetInvokeJavaScriptTarget overload.")]
@@ -38,13 +39,14 @@ public string? HybridRoot
 			set { SetValue(HybridRootProperty, value); }
 		}
 
-		IHybridWebViewInvoker? _invoker;
-
-		IHybridWebViewInvoker? IHybridWebViewInvokerHost.Invoker => _invoker;
-
-		void IHybridWebViewInvokerHost.SetInvoker(IHybridWebViewInvoker invoker)
+		/// <summary>
+		/// Sets the invoker used to dispatch JavaScript calls to .NET methods.
+		/// </summary>
+		/// <param name="invoker">The invoker used to dispatch JavaScript calls.</param>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public void SetInvoker(IHybridWebViewInvoker invoker)
 		{
-			_invoker = invoker ?? throw new ArgumentNullException(nameof(invoker));
+			IHybridWebViewInvoker.SetInvoker(this, invoker);
 		}
 
 		/// <inheritdoc/>
@@ -64,7 +66,7 @@ void IHybridWebViewInvokerHost.SetInvoker(IHybridWebViewInvoker invoker)
 
 		IHybridWebViewInvoker GetInvoker()
 		{
-			return _invoker
+			return IHybridWebViewInvoker.GetInvoker(this)
 				?? throw new InvalidOperationException(
 					$"No invoker is configured. Call {nameof(SetInvokeJavaScriptTarget)} to set up JS-to-.NET method invocation.");
 		}
@@ -80,7 +82,7 @@ IHybridWebViewInvoker GetInvoker()
 				throw new ArgumentNullException(nameof(target));
 			}
 
-			new ReflectionHybridWebViewInvoker(target, typeof(T)).AttachTo(this);
+			SetInvoker(new ReflectionHybridWebViewInvoker(target, typeof(T)));
 		}
 
 		/// <inheritdoc/>
diff --git a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
index d9e5b381fc75..165e54d288f9 100644
--- a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -1,6 +1,7 @@
 #nullable enable
 *REMOVED*~static Microsoft.Maui.Controls.VisualStateManager.GetVisualStateGroups(Microsoft.Maui.Controls.VisualElement visualElement) -> System.Collections.Generic.IList<Microsoft.Maui.Controls.VisualStateGroup>
 Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
+Microsoft.Maui.Controls.HybridWebView.SetInvoker(Microsoft.Maui.IHybridWebViewInvoker! invoker) -> void
 *REMOVED*~static readonly Microsoft.Maui.Controls.Handlers.Compatibility.ShellRenderer.DefaultForegroundColor -> Microsoft.Maui.Graphics.Color
 *REMOVED*~static readonly Microsoft.Maui.Controls.Handlers.Compatibility.ShellRenderer.DefaultTitleColor -> Microsoft.Maui.Graphics.Color
 Microsoft.Maui.Controls.AppThemeBinding
diff --git a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index 177b5749cac2..fc119ef3793a 100644
--- a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -1,5 +1,6 @@
 #nullable enable
 Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
+Microsoft.Maui.Controls.HybridWebView.SetInvoker(Microsoft.Maui.IHybridWebViewInvoker! invoker) -> void
 Microsoft.Maui.Controls.AppThemeBinding
 Microsoft.Maui.Controls.AppThemeBinding.AppThemeBinding() -> void
 ~Microsoft.Maui.Controls.AppThemeBinding.Dark.get -> object
diff --git a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index a50ae5b8a346..374694d95e2c 100644
--- a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -1,5 +1,6 @@
 #nullable enable
 Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
+Microsoft.Maui.Controls.HybridWebView.SetInvoker(Microsoft.Maui.IHybridWebViewInvoker! invoker) -> void
 Microsoft.Maui.Controls.AppThemeBinding
 Microsoft.Maui.Controls.AppThemeBinding.AppThemeBinding() -> void
 ~Microsoft.Maui.Controls.AppThemeBinding.Dark.get -> object
diff --git a/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
index 220dc459405d..3f5e1eefb892 100644
--- a/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
@@ -1,5 +1,6 @@
 #nullable enable
 Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
+Microsoft.Maui.Controls.HybridWebView.SetInvoker(Microsoft.Maui.IHybridWebViewInvoker! invoker) -> void
 *REMOVED*~static Microsoft.Maui.Controls.VisualStateManager.GetVisualStateGroups(Microsoft.Maui.Controls.VisualElement visualElement) -> System.Collections.Generic.IList<Microsoft.Maui.Controls.VisualStateGroup>
 Microsoft.Maui.Controls.AppThemeBinding
 Microsoft.Maui.Controls.AppThemeBinding.AppThemeBinding() -> void
diff --git a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index 2df7917dfb4b..3897dae1a013 100644
--- a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -1,5 +1,6 @@
 #nullable enable
 Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
+Microsoft.Maui.Controls.HybridWebView.SetInvoker(Microsoft.Maui.IHybridWebViewInvoker! invoker) -> void
 *REMOVED*~static Microsoft.Maui.Controls.VisualStateManager.GetVisualStateGroups(Microsoft.Maui.Controls.VisualElement visualElement) -> System.Collections.Generic.IList<Microsoft.Maui.Controls.VisualStateGroup>
 Microsoft.Maui.Controls.AppThemeBinding
 Microsoft.Maui.Controls.AppThemeBinding.AppThemeBinding() -> void
diff --git a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
index e00e5f59a2a9..c80ee47bf559 100644
--- a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -23,6 +23,7 @@ Microsoft.Maui.Controls.BoxView.~BoxView() -> void
 ~Microsoft.Maui.Controls.Editor.ReturnCommandParameter.get -> object
 ~Microsoft.Maui.Controls.Editor.ReturnCommandParameter.set -> void
 Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
+Microsoft.Maui.Controls.HybridWebView.SetInvoker(Microsoft.Maui.IHybridWebViewInvoker! invoker) -> void
 Microsoft.Maui.Controls.ImageSource.InvalidateStyle() -> void
 ~Microsoft.Maui.Controls.Internals.ResourcesChangedEventArgs.Keys.get -> System.Collections.Generic.IEnumerable<string>
 ~Microsoft.Maui.Controls.Internals.ResourcesChangedEventArgs.ResolveValue(string key) -> object
diff --git a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index 6199d40e77a3..2f5ed5096437 100644
--- a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -1,5 +1,6 @@
 #nullable enable
 Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
+Microsoft.Maui.Controls.HybridWebView.SetInvoker(Microsoft.Maui.IHybridWebViewInvoker! invoker) -> void
 ~Microsoft.Maui.Controls.BackButtonBehavior.AccessibilityLabel.get -> string
 ~Microsoft.Maui.Controls.BackButtonBehavior.AccessibilityLabel.set -> void
 ~Microsoft.Maui.Controls.BaseShellItem.BadgeColor.get -> Microsoft.Maui.Graphics.Color
diff --git a/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs b/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs
index ccd9a1a2f3ab..2205eecdbf29 100644
--- a/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs
+++ b/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs
@@ -42,7 +42,7 @@ public Task InvokerIsSet_WhenUsingJsonSerializerContext() =>
 			hybridWebView.SetInvokeJavaScriptTarget(invokeJavaScriptTarget, InvokeDotNetJsonContext.Default);
 
 			// Verify the invoker was set (AOT-safe path)
-			var invoker = ((IHybridWebViewInvokerHost)hybridWebView).Invoker;
+			var invoker = IHybridWebViewInvoker.GetInvoker(hybridWebView);
 			Assert.NotNull(invoker);
 
 			// Verify the invoker actually works end-to-end
@@ -61,7 +61,7 @@ public Task InvokerIsSet_WhenUsingLegacyOverload() =>
 #pragma warning restore IL2026, IL3050
 
 			// Verify the invoker was set (legacy reflection path)
-			var invoker = ((IHybridWebViewInvokerHost)hybridWebView).Invoker;
+			var invoker = IHybridWebViewInvoker.GetInvoker(hybridWebView);
 			Assert.NotNull(invoker);
 			Assert.IsType<ReflectionHybridWebViewInvoker>(invoker);
 
diff --git a/src/Core/src/Core/IHybridWebViewInvoker.cs b/src/Core/src/Core/IHybridWebViewInvoker.cs
index 6424fa3cdf17..fd10e4480e21 100644
--- a/src/Core/src/Core/IHybridWebViewInvoker.cs
+++ b/src/Core/src/Core/IHybridWebViewInvoker.cs
@@ -1,6 +1,7 @@
 using System;
 using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
+using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 
 namespace Microsoft.Maui
@@ -12,6 +13,8 @@ namespace Microsoft.Maui
 	[EditorBrowsable(EditorBrowsableState.Never)]
 	public abstract class IHybridWebViewInvoker
 	{
+		static readonly ConditionalWeakTable<IHybridWebView, InvokerHolder> s_invokers = new();
+
 		/// <summary>
 		/// Creates a new invoker for the specified JavaScript invocation target.
 		/// </summary>
@@ -28,23 +31,31 @@ protected IHybridWebViewInvoker(object? invokeJavaScriptTarget, [DynamicallyAcce
 		[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
 		internal Type? InvokeJavaScriptType { get; set; }
 
-		/// <summary>
-		/// Attaches the invoker to a HybridWebView instance.
-		/// </summary>
-		/// <param name="hybridWebView">The hybrid web view that owns the invoker.</param>
-		public void AttachTo(IHybridWebView hybridWebView)
+		internal static void SetInvoker(IHybridWebView hybridWebView, IHybridWebViewInvoker invoker)
 		{
 			if (hybridWebView is null)
 			{
 				throw new ArgumentNullException(nameof(hybridWebView));
 			}
 
-			if (hybridWebView is not IHybridWebViewInvokerHost host)
+			if (invoker is null)
+			{
+				throw new ArgumentNullException(nameof(invoker));
+			}
+
+			s_invokers.GetOrCreateValue(hybridWebView).Invoker = invoker;
+		}
+
+		internal static IHybridWebViewInvoker? GetInvoker(IHybridWebView hybridWebView)
+		{
+			if (hybridWebView is null)
 			{
-				throw new InvalidOperationException("HybridWebView invokers can only be attached to Microsoft.Maui.Controls.HybridWebView instances.");
+				throw new ArgumentNullException(nameof(hybridWebView));
 			}
 
-			host.SetInvoker(this);
+			return s_invokers.TryGetValue(hybridWebView, out var holder)
+				? holder.Invoker
+				: null;
 		}
 
 		/// <summary>
@@ -54,12 +65,10 @@ public void AttachTo(IHybridWebView hybridWebView)
 		/// <param name="paramJsonValues">JSON-serialized parameter values, or null for parameterless methods.</param>
 		/// <returns>JSON-serialized result, or null for void methods or null returns.</returns>
 		public abstract Task<string?> InvokeMethodAsync(string methodName, string[]? paramJsonValues);
-	}
 
-	internal interface IHybridWebViewInvokerHost
-	{
-		IHybridWebViewInvoker? Invoker { get; }
-
-		void SetInvoker(IHybridWebViewInvoker invoker);
+		sealed class InvokerHolder
+		{
+			public IHybridWebViewInvoker? Invoker { get; set; }
+		}
 	}
 }
diff --git a/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs b/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs
index 1c1fbe037950..86a07f903ee4 100644
--- a/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs
+++ b/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs
@@ -194,7 +194,7 @@ void MessageReceived(string rawMessage)
 					throw new InvalidOperationException("The invoke data did not provide a method name.");
 				}
 
-				var invoker = (VirtualView as IHybridWebViewInvokerHost)?.Invoker
+				var invoker = IHybridWebViewInvoker.GetInvoker(VirtualView)
 					?? throw new InvalidOperationException(
 						$"No invoker is configured. Call {nameof(IHybridWebView.SetInvokeJavaScriptTarget)} to set up JS-to-.NET method invocation.");
 				var jsonResult = await invoker.InvokeMethodAsync(invokeData.MethodName, invokeData.ParamValues);
diff --git a/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs b/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs
index 7e7c18d5ec56..578c7fe3b745 100644
--- a/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs
+++ b/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs
@@ -187,7 +187,7 @@ private static void GenerateSource(SourceProductionContext spc, ImmutableArray<I
 			sb.AppendLine($"            if (target is not {info.TargetTypeName} typedTarget)");
 			sb.AppendLine($"                throw new InvalidOperationException($\"Type mismatch: expected {info.TargetTypeName.Split('.').Last()} but got {{target.GetType().FullName}}\");");
 			sb.AppendLine();
-			sb.AppendLine($"            new Invoker_{index}(typedTarget, jsonSerializerContext).AttachTo(hybridWebView);");
+			sb.AppendLine($"            hybridWebView.SetInvoker(new Invoker_{index}(typedTarget, jsonSerializerContext));");
 			sb.AppendLine("        }");
 			sb.AppendLine();
 
diff --git a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
index edf1cd99a826..47e075d89926 100644
--- a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -1,7 +1,6 @@
 #nullable enable
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.IHybridWebViewInvoker
-Microsoft.Maui.IHybridWebViewInvoker.AttachTo(Microsoft.Maui.IHybridWebView! hybridWebView) -> void
 abstract Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
 *REMOVED*override Microsoft.Maui.Graphics.MauiDrawable.Dispose(bool disposing) -> void
 *REMOVED*override Microsoft.Maui.Graphics.MauiDrawable.OnBoundsChange(Android.Graphics.Rect! bounds) -> void
diff --git a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index 6923a9717dd1..626fea295a25 100644
--- a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -1,7 +1,6 @@
 #nullable enable
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.IHybridWebViewInvoker
-Microsoft.Maui.IHybridWebViewInvoker.AttachTo(Microsoft.Maui.IHybridWebView! hybridWebView) -> void
 abstract Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
 override Microsoft.Maui.Handlers.LabelHandler.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
 override Microsoft.Maui.Handlers.ShapeViewHandler.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
diff --git a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index 6923a9717dd1..626fea295a25 100644
--- a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -1,7 +1,6 @@
 #nullable enable
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.IHybridWebViewInvoker
-Microsoft.Maui.IHybridWebViewInvoker.AttachTo(Microsoft.Maui.IHybridWebView! hybridWebView) -> void
 abstract Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
 override Microsoft.Maui.Handlers.LabelHandler.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
 override Microsoft.Maui.Handlers.ShapeViewHandler.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
diff --git a/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
index 5cee7b8327b2..30bca78fc0d0 100644
--- a/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
@@ -1,6 +1,5 @@
 #nullable enable
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.IHybridWebViewInvoker
-Microsoft.Maui.IHybridWebViewInvoker.AttachTo(Microsoft.Maui.IHybridWebView! hybridWebView) -> void
 abstract Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
 static Microsoft.Maui.GridLength.implicit operator Microsoft.Maui.GridLength(string! value) -> Microsoft.Maui.GridLength
diff --git a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index f9b837ed9d8c..ce73a69d2622 100644
--- a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -1,7 +1,6 @@
 #nullable enable
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.IHybridWebViewInvoker
-Microsoft.Maui.IHybridWebViewInvoker.AttachTo(Microsoft.Maui.IHybridWebView! hybridWebView) -> void
 abstract Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
 override Microsoft.Maui.Platform.MauiPasswordTextBox.OnCreateAutomationPeer() -> Microsoft.UI.Xaml.Automation.Peers.AutomationPeer!
 static Microsoft.Maui.GridLength.implicit operator Microsoft.Maui.GridLength(string! value) -> Microsoft.Maui.GridLength
diff --git a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
index f06b01886e66..6f804ad500e9 100644
--- a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -1,7 +1,6 @@
 #nullable enable
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.IHybridWebViewInvoker
-Microsoft.Maui.IHybridWebViewInvoker.AttachTo(Microsoft.Maui.IHybridWebView! hybridWebView) -> void
 Microsoft.Maui.IHybridWebViewInvoker.IHybridWebViewInvoker(object? invokeJavaScriptTarget, System.Type? invokeJavaScriptType) -> void
 abstract Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
 static Microsoft.Maui.GridLength.implicit operator Microsoft.Maui.GridLength(string! value) -> Microsoft.Maui.GridLength
diff --git a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index 7a17603e63b5..1f80bf5df89c 100644
--- a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -1,7 +1,6 @@
 #nullable enable
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.IHybridWebViewInvoker
-Microsoft.Maui.IHybridWebViewInvoker.AttachTo(Microsoft.Maui.IHybridWebView! hybridWebView) -> void
 Microsoft.Maui.IHybridWebViewInvoker.IHybridWebViewInvoker(object? invokeJavaScriptTarget, System.Type? invokeJavaScriptType) -> void
 abstract Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
 static Microsoft.Maui.SafeAreaEdges.Container.get -> Microsoft.Maui.SafeAreaEdges
diff --git a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
index 7a17603e63b5..1f80bf5df89c 100644
--- a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
@@ -1,7 +1,6 @@
 #nullable enable
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.IHybridWebViewInvoker
-Microsoft.Maui.IHybridWebViewInvoker.AttachTo(Microsoft.Maui.IHybridWebView! hybridWebView) -> void
 Microsoft.Maui.IHybridWebViewInvoker.IHybridWebViewInvoker(object? invokeJavaScriptTarget, System.Type? invokeJavaScriptType) -> void
 abstract Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
 static Microsoft.Maui.SafeAreaEdges.Container.get -> Microsoft.Maui.SafeAreaEdges

From 462529a9dcad75bd9c05e0d4f98b7cb664080d58 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Mon, 15 Jun 2026 15:27:34 +0200
Subject: [PATCH 17/39] Rename HybridWebView invoker base class

Rename the unshipped abstract invoker type from IHybridWebViewInvoker to HybridWebViewInvoker to match .NET naming conventions now that the abstraction is a base class rather than an interface.

Update generated code, tests, and PublicAPI baselines accordingly.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 src/Controls/src/Core/HybridWebView/HybridWebView.cs   |  8 ++++----
 .../Core/PublicAPI/net-android/PublicAPI.Unshipped.txt |  2 +-
 .../src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt |  2 +-
 .../PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt  |  2 +-
 .../Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt   |  2 +-
 .../Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt |  2 +-
 .../src/Core/PublicAPI/net/PublicAPI.Unshipped.txt     |  2 +-
 .../Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt |  2 +-
 .../HybridWebViewTests_SetInvokeJavaScriptTarget.cs    |  4 ++--
 ...HybridWebViewInvoker.cs => HybridWebViewInvoker.cs} | 10 +++++-----
 .../src/Handlers/HybridWebView/HybridWebViewHandler.cs |  2 +-
 .../HybridWebView/ReflectionHybridWebViewInvoker.cs    |  2 +-
 .../HybridWebViewInvokeTargetGenerator.cs              |  4 ++--
 .../src/PublicAPI/net-android/PublicAPI.Unshipped.txt  |  4 ++--
 src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt |  4 ++--
 .../PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt  |  4 ++--
 .../src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt    |  4 ++--
 .../src/PublicAPI/net-windows/PublicAPI.Unshipped.txt  |  4 ++--
 src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt     |  6 +++---
 .../src/PublicAPI/netstandard/PublicAPI.Unshipped.txt  |  6 +++---
 .../PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt   |  6 +++---
 21 files changed, 41 insertions(+), 41 deletions(-)
 rename src/Core/src/Core/{IHybridWebViewInvoker.cs => HybridWebViewInvoker.cs} (85%)

diff --git a/src/Controls/src/Core/HybridWebView/HybridWebView.cs b/src/Controls/src/Core/HybridWebView/HybridWebView.cs
index 2273548c5a08..3c5ae88390a5 100644
--- a/src/Controls/src/Core/HybridWebView/HybridWebView.cs
+++ b/src/Controls/src/Core/HybridWebView/HybridWebView.cs
@@ -44,9 +44,9 @@ public string? HybridRoot
 		/// </summary>
 		/// <param name="invoker">The invoker used to dispatch JavaScript calls.</param>
 		[EditorBrowsable(EditorBrowsableState.Never)]
-		public void SetInvoker(IHybridWebViewInvoker invoker)
+		public void SetInvoker(HybridWebViewInvoker invoker)
 		{
-			IHybridWebViewInvoker.SetInvoker(this, invoker);
+			HybridWebViewInvoker.SetInvoker(this, invoker);
 		}
 
 		/// <inheritdoc/>
@@ -64,9 +64,9 @@ public void SetInvoker(IHybridWebViewInvoker invoker)
 			set => GetInvoker().InvokeJavaScriptType = value;
 		}
 
-		IHybridWebViewInvoker GetInvoker()
+		HybridWebViewInvoker GetInvoker()
 		{
-			return IHybridWebViewInvoker.GetInvoker(this)
+			return HybridWebViewInvoker.GetInvoker(this)
 				?? throw new InvalidOperationException(
 					$"No invoker is configured. Call {nameof(SetInvokeJavaScriptTarget)} to set up JS-to-.NET method invocation.");
 		}
diff --git a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
index 165e54d288f9..d506f7943107 100644
--- a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -1,7 +1,7 @@
 #nullable enable
 *REMOVED*~static Microsoft.Maui.Controls.VisualStateManager.GetVisualStateGroups(Microsoft.Maui.Controls.VisualElement visualElement) -> System.Collections.Generic.IList<Microsoft.Maui.Controls.VisualStateGroup>
 Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
-Microsoft.Maui.Controls.HybridWebView.SetInvoker(Microsoft.Maui.IHybridWebViewInvoker! invoker) -> void
+Microsoft.Maui.Controls.HybridWebView.SetInvoker(Microsoft.Maui.HybridWebViewInvoker! invoker) -> void
 *REMOVED*~static readonly Microsoft.Maui.Controls.Handlers.Compatibility.ShellRenderer.DefaultForegroundColor -> Microsoft.Maui.Graphics.Color
 *REMOVED*~static readonly Microsoft.Maui.Controls.Handlers.Compatibility.ShellRenderer.DefaultTitleColor -> Microsoft.Maui.Graphics.Color
 Microsoft.Maui.Controls.AppThemeBinding
diff --git a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index fc119ef3793a..87bc29c50ca0 100644
--- a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -1,6 +1,6 @@
 #nullable enable
 Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
-Microsoft.Maui.Controls.HybridWebView.SetInvoker(Microsoft.Maui.IHybridWebViewInvoker! invoker) -> void
+Microsoft.Maui.Controls.HybridWebView.SetInvoker(Microsoft.Maui.HybridWebViewInvoker! invoker) -> void
 Microsoft.Maui.Controls.AppThemeBinding
 Microsoft.Maui.Controls.AppThemeBinding.AppThemeBinding() -> void
 ~Microsoft.Maui.Controls.AppThemeBinding.Dark.get -> object
diff --git a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index 374694d95e2c..6a806a03db76 100644
--- a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -1,6 +1,6 @@
 #nullable enable
 Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
-Microsoft.Maui.Controls.HybridWebView.SetInvoker(Microsoft.Maui.IHybridWebViewInvoker! invoker) -> void
+Microsoft.Maui.Controls.HybridWebView.SetInvoker(Microsoft.Maui.HybridWebViewInvoker! invoker) -> void
 Microsoft.Maui.Controls.AppThemeBinding
 Microsoft.Maui.Controls.AppThemeBinding.AppThemeBinding() -> void
 ~Microsoft.Maui.Controls.AppThemeBinding.Dark.get -> object
diff --git a/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
index 3f5e1eefb892..fa3d38339a6c 100644
--- a/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
@@ -1,6 +1,6 @@
 #nullable enable
 Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
-Microsoft.Maui.Controls.HybridWebView.SetInvoker(Microsoft.Maui.IHybridWebViewInvoker! invoker) -> void
+Microsoft.Maui.Controls.HybridWebView.SetInvoker(Microsoft.Maui.HybridWebViewInvoker! invoker) -> void
 *REMOVED*~static Microsoft.Maui.Controls.VisualStateManager.GetVisualStateGroups(Microsoft.Maui.Controls.VisualElement visualElement) -> System.Collections.Generic.IList<Microsoft.Maui.Controls.VisualStateGroup>
 Microsoft.Maui.Controls.AppThemeBinding
 Microsoft.Maui.Controls.AppThemeBinding.AppThemeBinding() -> void
diff --git a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index 3897dae1a013..19ec8c195463 100644
--- a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -1,6 +1,6 @@
 #nullable enable
 Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
-Microsoft.Maui.Controls.HybridWebView.SetInvoker(Microsoft.Maui.IHybridWebViewInvoker! invoker) -> void
+Microsoft.Maui.Controls.HybridWebView.SetInvoker(Microsoft.Maui.HybridWebViewInvoker! invoker) -> void
 *REMOVED*~static Microsoft.Maui.Controls.VisualStateManager.GetVisualStateGroups(Microsoft.Maui.Controls.VisualElement visualElement) -> System.Collections.Generic.IList<Microsoft.Maui.Controls.VisualStateGroup>
 Microsoft.Maui.Controls.AppThemeBinding
 Microsoft.Maui.Controls.AppThemeBinding.AppThemeBinding() -> void
diff --git a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
index c80ee47bf559..8675aab9e8a0 100644
--- a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -23,7 +23,7 @@ Microsoft.Maui.Controls.BoxView.~BoxView() -> void
 ~Microsoft.Maui.Controls.Editor.ReturnCommandParameter.get -> object
 ~Microsoft.Maui.Controls.Editor.ReturnCommandParameter.set -> void
 Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
-Microsoft.Maui.Controls.HybridWebView.SetInvoker(Microsoft.Maui.IHybridWebViewInvoker! invoker) -> void
+Microsoft.Maui.Controls.HybridWebView.SetInvoker(Microsoft.Maui.HybridWebViewInvoker! invoker) -> void
 Microsoft.Maui.Controls.ImageSource.InvalidateStyle() -> void
 ~Microsoft.Maui.Controls.Internals.ResourcesChangedEventArgs.Keys.get -> System.Collections.Generic.IEnumerable<string>
 ~Microsoft.Maui.Controls.Internals.ResourcesChangedEventArgs.ResolveValue(string key) -> object
diff --git a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index 2f5ed5096437..fba3c1892630 100644
--- a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -1,6 +1,6 @@
 #nullable enable
 Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
-Microsoft.Maui.Controls.HybridWebView.SetInvoker(Microsoft.Maui.IHybridWebViewInvoker! invoker) -> void
+Microsoft.Maui.Controls.HybridWebView.SetInvoker(Microsoft.Maui.HybridWebViewInvoker! invoker) -> void
 ~Microsoft.Maui.Controls.BackButtonBehavior.AccessibilityLabel.get -> string
 ~Microsoft.Maui.Controls.BackButtonBehavior.AccessibilityLabel.set -> void
 ~Microsoft.Maui.Controls.BaseShellItem.BadgeColor.get -> Microsoft.Maui.Graphics.Color
diff --git a/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs b/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs
index 2205eecdbf29..7ec0da51e8d0 100644
--- a/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs
+++ b/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs
@@ -42,7 +42,7 @@ public Task InvokerIsSet_WhenUsingJsonSerializerContext() =>
 			hybridWebView.SetInvokeJavaScriptTarget(invokeJavaScriptTarget, InvokeDotNetJsonContext.Default);
 
 			// Verify the invoker was set (AOT-safe path)
-			var invoker = IHybridWebViewInvoker.GetInvoker(hybridWebView);
+			var invoker = HybridWebViewInvoker.GetInvoker(hybridWebView);
 			Assert.NotNull(invoker);
 
 			// Verify the invoker actually works end-to-end
@@ -61,7 +61,7 @@ public Task InvokerIsSet_WhenUsingLegacyOverload() =>
 #pragma warning restore IL2026, IL3050
 
 			// Verify the invoker was set (legacy reflection path)
-			var invoker = IHybridWebViewInvoker.GetInvoker(hybridWebView);
+			var invoker = HybridWebViewInvoker.GetInvoker(hybridWebView);
 			Assert.NotNull(invoker);
 			Assert.IsType<ReflectionHybridWebViewInvoker>(invoker);
 
diff --git a/src/Core/src/Core/IHybridWebViewInvoker.cs b/src/Core/src/Core/HybridWebViewInvoker.cs
similarity index 85%
rename from src/Core/src/Core/IHybridWebViewInvoker.cs
rename to src/Core/src/Core/HybridWebViewInvoker.cs
index fd10e4480e21..78ae37bc647f 100644
--- a/src/Core/src/Core/IHybridWebViewInvoker.cs
+++ b/src/Core/src/Core/HybridWebViewInvoker.cs
@@ -11,7 +11,7 @@ namespace Microsoft.Maui
 	/// Implemented by the reflection-based fallback and by the source generator.
 	/// </summary>
 	[EditorBrowsable(EditorBrowsableState.Never)]
-	public abstract class IHybridWebViewInvoker
+	public abstract class HybridWebViewInvoker
 	{
 		static readonly ConditionalWeakTable<IHybridWebView, InvokerHolder> s_invokers = new();
 
@@ -20,7 +20,7 @@ public abstract class IHybridWebViewInvoker
 		/// </summary>
 		/// <param name="invokeJavaScriptTarget">The object containing methods callable from JavaScript.</param>
 		/// <param name="invokeJavaScriptType">The type containing methods callable from JavaScript.</param>
-		protected IHybridWebViewInvoker(object? invokeJavaScriptTarget, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] Type? invokeJavaScriptType)
+		protected HybridWebViewInvoker(object? invokeJavaScriptTarget, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] Type? invokeJavaScriptType)
 		{
 			InvokeJavaScriptTarget = invokeJavaScriptTarget;
 			InvokeJavaScriptType = invokeJavaScriptType;
@@ -31,7 +31,7 @@ protected IHybridWebViewInvoker(object? invokeJavaScriptTarget, [DynamicallyAcce
 		[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
 		internal Type? InvokeJavaScriptType { get; set; }
 
-		internal static void SetInvoker(IHybridWebView hybridWebView, IHybridWebViewInvoker invoker)
+		internal static void SetInvoker(IHybridWebView hybridWebView, HybridWebViewInvoker invoker)
 		{
 			if (hybridWebView is null)
 			{
@@ -46,7 +46,7 @@ internal static void SetInvoker(IHybridWebView hybridWebView, IHybridWebViewInvo
 			s_invokers.GetOrCreateValue(hybridWebView).Invoker = invoker;
 		}
 
-		internal static IHybridWebViewInvoker? GetInvoker(IHybridWebView hybridWebView)
+		internal static HybridWebViewInvoker? GetInvoker(IHybridWebView hybridWebView)
 		{
 			if (hybridWebView is null)
 			{
@@ -68,7 +68,7 @@ internal static void SetInvoker(IHybridWebView hybridWebView, IHybridWebViewInvo
 
 		sealed class InvokerHolder
 		{
-			public IHybridWebViewInvoker? Invoker { get; set; }
+			public HybridWebViewInvoker? Invoker { get; set; }
 		}
 	}
 }
diff --git a/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs b/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs
index 86a07f903ee4..b20af2f7264a 100644
--- a/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs
+++ b/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs
@@ -194,7 +194,7 @@ void MessageReceived(string rawMessage)
 					throw new InvalidOperationException("The invoke data did not provide a method name.");
 				}
 
-				var invoker = IHybridWebViewInvoker.GetInvoker(VirtualView)
+				var invoker = HybridWebViewInvoker.GetInvoker(VirtualView)
 					?? throw new InvalidOperationException(
 						$"No invoker is configured. Call {nameof(IHybridWebView.SetInvokeJavaScriptTarget)} to set up JS-to-.NET method invocation.");
 				var jsonResult = await invoker.InvokeMethodAsync(invokeData.MethodName, invokeData.ParamValues);
diff --git a/src/Core/src/Handlers/HybridWebView/ReflectionHybridWebViewInvoker.cs b/src/Core/src/Handlers/HybridWebView/ReflectionHybridWebViewInvoker.cs
index 4998d2fa074e..64426dfa3c2d 100644
--- a/src/Core/src/Handlers/HybridWebView/ReflectionHybridWebViewInvoker.cs
+++ b/src/Core/src/Handlers/HybridWebView/ReflectionHybridWebViewInvoker.cs
@@ -14,7 +14,7 @@ namespace Microsoft.Maui
 #if !NETSTANDARD
 	[RequiresDynamicCode("Use SetInvokeJavaScriptTarget<T>(T target, JsonSerializerContext jsonSerializerContext) for trimming and NativeAOT compatibility.")]
 #endif
-	internal sealed class ReflectionHybridWebViewInvoker : IHybridWebViewInvoker
+	internal sealed class ReflectionHybridWebViewInvoker : HybridWebViewInvoker
 	{
 		public ReflectionHybridWebViewInvoker(object target, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] Type targetType)
 			: base(target, targetType)
diff --git a/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs b/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs
index 578c7fe3b745..a278e0c3db3e 100644
--- a/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs
+++ b/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs
@@ -191,8 +191,8 @@ private static void GenerateSource(SourceProductionContext spc, ImmutableArray<I
 			sb.AppendLine("        }");
 			sb.AppendLine();
 
-			// Generate the IHybridWebViewInvoker implementation
-			sb.AppendLine($"        private sealed class Invoker_{index} : global::Microsoft.Maui.IHybridWebViewInvoker");
+			// Generate the HybridWebViewInvoker implementation
+			sb.AppendLine($"        private sealed class Invoker_{index} : global::Microsoft.Maui.HybridWebViewInvoker");
 			sb.AppendLine("        {");
 			sb.AppendLine($"            private readonly {info.TargetTypeName} _target;");
 			sb.AppendLine("            private readonly global::System.Text.Json.Serialization.JsonSerializerContext _ctx;");
diff --git a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
index 47e075d89926..8e2427b86c79 100644
--- a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -1,7 +1,7 @@
 #nullable enable
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
-Microsoft.Maui.IHybridWebViewInvoker
-abstract Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
+Microsoft.Maui.HybridWebViewInvoker
+abstract Microsoft.Maui.HybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
 *REMOVED*override Microsoft.Maui.Graphics.MauiDrawable.Dispose(bool disposing) -> void
 *REMOVED*override Microsoft.Maui.Graphics.MauiDrawable.OnBoundsChange(Android.Graphics.Rect! bounds) -> void
 *REMOVED*override Microsoft.Maui.Graphics.MauiDrawable.OnDraw(Android.Graphics.Drawables.Shapes.Shape? shape, Android.Graphics.Canvas? canvas, Android.Graphics.Paint? paint) -> void
diff --git a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index 626fea295a25..eceb881eed05 100644
--- a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -1,7 +1,7 @@
 #nullable enable
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
-Microsoft.Maui.IHybridWebViewInvoker
-abstract Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
+Microsoft.Maui.HybridWebViewInvoker
+abstract Microsoft.Maui.HybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
 override Microsoft.Maui.Handlers.LabelHandler.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
 override Microsoft.Maui.Handlers.ShapeViewHandler.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
 override Microsoft.Maui.Handlers.StepperHandler.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
diff --git a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index 626fea295a25..eceb881eed05 100644
--- a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -1,7 +1,7 @@
 #nullable enable
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
-Microsoft.Maui.IHybridWebViewInvoker
-abstract Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
+Microsoft.Maui.HybridWebViewInvoker
+abstract Microsoft.Maui.HybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
 override Microsoft.Maui.Handlers.LabelHandler.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
 override Microsoft.Maui.Handlers.ShapeViewHandler.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
 override Microsoft.Maui.Handlers.StepperHandler.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
diff --git a/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
index 30bca78fc0d0..5897dafa064e 100644
--- a/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
@@ -1,5 +1,5 @@
 #nullable enable
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
-Microsoft.Maui.IHybridWebViewInvoker
-abstract Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
+Microsoft.Maui.HybridWebViewInvoker
+abstract Microsoft.Maui.HybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
 static Microsoft.Maui.GridLength.implicit operator Microsoft.Maui.GridLength(string! value) -> Microsoft.Maui.GridLength
diff --git a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index ce73a69d2622..53af9841aa12 100644
--- a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -1,7 +1,7 @@
 #nullable enable
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
-Microsoft.Maui.IHybridWebViewInvoker
-abstract Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
+Microsoft.Maui.HybridWebViewInvoker
+abstract Microsoft.Maui.HybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
 override Microsoft.Maui.Platform.MauiPasswordTextBox.OnCreateAutomationPeer() -> Microsoft.UI.Xaml.Automation.Peers.AutomationPeer!
 static Microsoft.Maui.GridLength.implicit operator Microsoft.Maui.GridLength(string! value) -> Microsoft.Maui.GridLength
 static Microsoft.Maui.SafeAreaEdges.Container.get -> Microsoft.Maui.SafeAreaEdges
diff --git a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
index 6f804ad500e9..196170b2400a 100644
--- a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -1,7 +1,7 @@
 #nullable enable
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
-Microsoft.Maui.IHybridWebViewInvoker
-Microsoft.Maui.IHybridWebViewInvoker.IHybridWebViewInvoker(object? invokeJavaScriptTarget, System.Type? invokeJavaScriptType) -> void
-abstract Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
+Microsoft.Maui.HybridWebViewInvoker
+Microsoft.Maui.HybridWebViewInvoker.HybridWebViewInvoker(object? invokeJavaScriptTarget, System.Type? invokeJavaScriptType) -> void
+abstract Microsoft.Maui.HybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
 static Microsoft.Maui.GridLength.implicit operator Microsoft.Maui.GridLength(string! value) -> Microsoft.Maui.GridLength
 static Microsoft.Maui.SafeAreaEdges.Container.get -> Microsoft.Maui.SafeAreaEdges
diff --git a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index 1f80bf5df89c..a29f844ffbef 100644
--- a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -1,6 +1,6 @@
 #nullable enable
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
-Microsoft.Maui.IHybridWebViewInvoker
-Microsoft.Maui.IHybridWebViewInvoker.IHybridWebViewInvoker(object? invokeJavaScriptTarget, System.Type? invokeJavaScriptType) -> void
-abstract Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
+Microsoft.Maui.HybridWebViewInvoker
+Microsoft.Maui.HybridWebViewInvoker.HybridWebViewInvoker(object? invokeJavaScriptTarget, System.Type? invokeJavaScriptType) -> void
+abstract Microsoft.Maui.HybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
 static Microsoft.Maui.SafeAreaEdges.Container.get -> Microsoft.Maui.SafeAreaEdges
diff --git a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
index 1f80bf5df89c..a29f844ffbef 100644
--- a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
@@ -1,6 +1,6 @@
 #nullable enable
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
-Microsoft.Maui.IHybridWebViewInvoker
-Microsoft.Maui.IHybridWebViewInvoker.IHybridWebViewInvoker(object? invokeJavaScriptTarget, System.Type? invokeJavaScriptType) -> void
-abstract Microsoft.Maui.IHybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
+Microsoft.Maui.HybridWebViewInvoker
+Microsoft.Maui.HybridWebViewInvoker.HybridWebViewInvoker(object? invokeJavaScriptTarget, System.Type? invokeJavaScriptType) -> void
+abstract Microsoft.Maui.HybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
 static Microsoft.Maui.SafeAreaEdges.Container.get -> Microsoft.Maui.SafeAreaEdges

From 9c16fe8d2f63b663cd07320e4d4af02d6dc83a4a Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Mon, 15 Jun 2026 15:52:37 +0200
Subject: [PATCH 18/39] Remove DAM from HybridWebView legacy type property

InvokeJavaScriptType is only used by the legacy reflection path, which is explicitly RUC/RDC, so remove unnecessary DynamicallyAccessedMembers annotations from the interface property and invoker storage.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 src/Controls/src/Core/HybridWebView/HybridWebView.cs | 1 -
 src/Core/src/Core/HybridWebViewInvoker.cs            | 3 +--
 src/Core/src/Core/IHybridWebView.cs                  | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Controls/src/Core/HybridWebView/HybridWebView.cs b/src/Controls/src/Core/HybridWebView/HybridWebView.cs
index 3c5ae88390a5..6133c381afe0 100644
--- a/src/Controls/src/Core/HybridWebView/HybridWebView.cs
+++ b/src/Controls/src/Core/HybridWebView/HybridWebView.cs
@@ -57,7 +57,6 @@ public void SetInvoker(HybridWebViewInvoker invoker)
 		}
 
 		/// <inheritdoc/>
-		[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
 		Type? IHybridWebView.InvokeJavaScriptType
 		{
 			get => GetInvoker().InvokeJavaScriptType;
diff --git a/src/Core/src/Core/HybridWebViewInvoker.cs b/src/Core/src/Core/HybridWebViewInvoker.cs
index 78ae37bc647f..9a87ccd5c2f1 100644
--- a/src/Core/src/Core/HybridWebViewInvoker.cs
+++ b/src/Core/src/Core/HybridWebViewInvoker.cs
@@ -20,7 +20,7 @@ public abstract class HybridWebViewInvoker
 		/// </summary>
 		/// <param name="invokeJavaScriptTarget">The object containing methods callable from JavaScript.</param>
 		/// <param name="invokeJavaScriptType">The type containing methods callable from JavaScript.</param>
-		protected HybridWebViewInvoker(object? invokeJavaScriptTarget, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] Type? invokeJavaScriptType)
+		protected HybridWebViewInvoker(object? invokeJavaScriptTarget, Type? invokeJavaScriptType)
 		{
 			InvokeJavaScriptTarget = invokeJavaScriptTarget;
 			InvokeJavaScriptType = invokeJavaScriptType;
@@ -28,7 +28,6 @@ protected HybridWebViewInvoker(object? invokeJavaScriptTarget, [DynamicallyAcces
 
 		internal object? InvokeJavaScriptTarget { get; set; }
 
-		[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
 		internal Type? InvokeJavaScriptType { get; set; }
 
 		internal static void SetInvoker(IHybridWebView hybridWebView, HybridWebViewInvoker invoker)
diff --git a/src/Core/src/Core/IHybridWebView.cs b/src/Core/src/Core/IHybridWebView.cs
index 1c56385a36b9..a41370438b7d 100644
--- a/src/Core/src/Core/IHybridWebView.cs
+++ b/src/Core/src/Core/IHybridWebView.cs
@@ -50,7 +50,6 @@ public interface IHybridWebView : IView, IWebRequestInterceptingWebView, IInitia
 		/// <summary>
 		/// For internal use only.
 		/// </summary>
-		[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
 		Type? InvokeJavaScriptType { get; set; }
 
 		void RawMessageReceived(string rawMessage);

From 7884e3257caba7f3d843e718acb025c91ccebe5f Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Mon, 15 Jun 2026 16:04:33 +0200
Subject: [PATCH 19/39] Remove unnecessary HybridWebView AOT suppressions

Keep only the IL2026 suppressions needed for BindableProperty.Create preserving public methods on the declaring type; the AOT analyzer does not require IL3050 suppressions here.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 src/Controls/src/Core/HybridWebView/HybridWebView.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Controls/src/Core/HybridWebView/HybridWebView.cs b/src/Controls/src/Core/HybridWebView/HybridWebView.cs
index 6133c381afe0..e4f55cef066f 100644
--- a/src/Controls/src/Core/HybridWebView/HybridWebView.cs
+++ b/src/Controls/src/Core/HybridWebView/HybridWebView.cs
@@ -16,12 +16,10 @@ public class HybridWebView : View, IHybridWebView
 	{
 		/// <summary>Bindable property for <see cref="DefaultFile"/>.</summary>
 		[UnconditionalSuppressMessage("Trimming", "IL2026:RequiresUnreferencedCode", Justification = "BindableProperty.Create preserves public methods on the declaring type; it does not call the annotated legacy SetInvokeJavaScriptTarget overload.")]
-		[UnconditionalSuppressMessage("AOT", "IL3050:RequiresDynamicCode", Justification = "BindableProperty.Create preserves public methods on the declaring type; it does not call the annotated legacy SetInvokeJavaScriptTarget overload.")]
 		public static readonly BindableProperty DefaultFileProperty =
 			BindableProperty.Create(nameof(DefaultFile), typeof(string), typeof(HybridWebView), defaultValue: "index.html");
 		/// <summary>Bindable property for <see cref="HybridRoot"/>.</summary>
 		[UnconditionalSuppressMessage("Trimming", "IL2026:RequiresUnreferencedCode", Justification = "BindableProperty.Create preserves public methods on the declaring type; it does not call the annotated legacy SetInvokeJavaScriptTarget overload.")]
-		[UnconditionalSuppressMessage("AOT", "IL3050:RequiresDynamicCode", Justification = "BindableProperty.Create preserves public methods on the declaring type; it does not call the annotated legacy SetInvokeJavaScriptTarget overload.")]
 		public static readonly BindableProperty HybridRootProperty =
 			BindableProperty.Create(nameof(HybridRoot), typeof(string), typeof(HybridWebView), defaultValue: "wwwroot");
 

From 08b502c9840332a6bec9ddb50d9081e176480eec Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Mon, 15 Jun 2026 17:15:18 +0200
Subject: [PATCH 20/39] Clean up the API

---
 .../src/Core/HybridWebView/HybridWebView.cs   | 28 +++++----------
 .../PublicAPI/net/PublicAPI.Unshipped.txt     |  3 +-
 .../netstandard/PublicAPI.Unshipped.txt       |  5 +--
 ...dWebViewTests_SetInvokeJavaScriptTarget.cs |  4 +--
 src/Core/src/Core/HybridWebViewInvoker.cs     | 35 -------------------
 src/Core/src/Core/IHybridWebView.cs           |  9 ++++-
 .../HybridWebView/HybridWebViewHandler.cs     |  5 +--
 .../ReflectionHybridWebViewInvoker.cs         |  3 +-
 .../src/PublicAPI/net/PublicAPI.Unshipped.txt |  4 ++-
 .../netstandard/PublicAPI.Unshipped.txt       |  4 ++-
 .../netstandard2.0/PublicAPI.Unshipped.txt    |  4 ++-
 11 files changed, 35 insertions(+), 69 deletions(-)

diff --git a/src/Controls/src/Core/HybridWebView/HybridWebView.cs b/src/Controls/src/Core/HybridWebView/HybridWebView.cs
index e4f55cef066f..ca314c39ceff 100644
--- a/src/Controls/src/Core/HybridWebView/HybridWebView.cs
+++ b/src/Controls/src/Core/HybridWebView/HybridWebView.cs
@@ -37,49 +37,39 @@ public string? HybridRoot
 			set { SetValue(HybridRootProperty, value); }
 		}
 
-		/// <summary>
-		/// Sets the invoker used to dispatch JavaScript calls to .NET methods.
-		/// </summary>
-		/// <param name="invoker">The invoker used to dispatch JavaScript calls.</param>
 		[EditorBrowsable(EditorBrowsableState.Never)]
-		public void SetInvoker(HybridWebViewInvoker invoker)
+		public HybridWebViewInvoker Invoker
 		{
-			HybridWebViewInvoker.SetInvoker(this, invoker);
+			get => field ?? throw new InvalidOperationException($"No invoker is configured. Call {nameof(SetInvokeJavaScriptTarget)} to set up JS-to-.NET method invocation.");
+			set;
 		}
 
 		/// <inheritdoc/>
 		object? IHybridWebView.InvokeJavaScriptTarget
 		{
-			get => GetInvoker().InvokeJavaScriptTarget;
-			set => GetInvoker().InvokeJavaScriptTarget = value;
+			get => Invoker.InvokeJavaScriptTarget;
+			set => Invoker.InvokeJavaScriptTarget = value;
 		}
 
 		/// <inheritdoc/>
 		Type? IHybridWebView.InvokeJavaScriptType
 		{
-			get => GetInvoker().InvokeJavaScriptType;
-			set => GetInvoker().InvokeJavaScriptType = value;
-		}
-
-		HybridWebViewInvoker GetInvoker()
-		{
-			return HybridWebViewInvoker.GetInvoker(this)
-				?? throw new InvalidOperationException(
-					$"No invoker is configured. Call {nameof(SetInvokeJavaScriptTarget)} to set up JS-to-.NET method invocation.");
+			get => Invoker.InvokeJavaScriptType;
+			set => Invoker.InvokeJavaScriptType = value;
 		}
 
 		[RequiresUnreferencedCode("Use SetInvokeJavaScriptTarget<T>(T target, JsonSerializerContext jsonSerializerContext) for trimming and NativeAOT compatibility.")]
 #if !NETSTANDARD
 		[RequiresDynamicCode("Use SetInvokeJavaScriptTarget<T>(T target, JsonSerializerContext jsonSerializerContext) for trimming and NativeAOT compatibility.")]
 #endif
-		public void SetInvokeJavaScriptTarget<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>(T target) where T : class
+		public void SetInvokeJavaScriptTarget<T>(T target) where T : class
 		{
 			if (target is null)
 			{
 				throw new ArgumentNullException(nameof(target));
 			}
 
-			SetInvoker(new ReflectionHybridWebViewInvoker(target, typeof(T)));
+			Invoker = new ReflectionHybridWebViewInvoker(target, typeof(T));
 		}
 
 		/// <inheritdoc/>
diff --git a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
index 8675aab9e8a0..3d971e9a4ae8 100644
--- a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -22,8 +22,9 @@ Microsoft.Maui.Controls.BoxView.~BoxView() -> void
 ~Microsoft.Maui.Controls.Editor.ReturnCommand.set -> void
 ~Microsoft.Maui.Controls.Editor.ReturnCommandParameter.get -> object
 ~Microsoft.Maui.Controls.Editor.ReturnCommandParameter.set -> void
+Microsoft.Maui.Controls.HybridWebView.Invoker.get -> Microsoft.Maui.HybridWebViewInvoker!
+Microsoft.Maui.Controls.HybridWebView.Invoker.set -> void
 Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
-Microsoft.Maui.Controls.HybridWebView.SetInvoker(Microsoft.Maui.HybridWebViewInvoker! invoker) -> void
 Microsoft.Maui.Controls.ImageSource.InvalidateStyle() -> void
 ~Microsoft.Maui.Controls.Internals.ResourcesChangedEventArgs.Keys.get -> System.Collections.Generic.IEnumerable<string>
 ~Microsoft.Maui.Controls.Internals.ResourcesChangedEventArgs.ResolveValue(string key) -> object
diff --git a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index fba3c1892630..611c54b2a85b 100644
--- a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -1,6 +1,4 @@
 #nullable enable
-Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
-Microsoft.Maui.Controls.HybridWebView.SetInvoker(Microsoft.Maui.HybridWebViewInvoker! invoker) -> void
 ~Microsoft.Maui.Controls.BackButtonBehavior.AccessibilityLabel.get -> string
 ~Microsoft.Maui.Controls.BackButtonBehavior.AccessibilityLabel.set -> void
 ~Microsoft.Maui.Controls.BaseShellItem.BadgeColor.get -> Microsoft.Maui.Graphics.Color
@@ -16,6 +14,9 @@ Microsoft.Maui.Controls.BoxView.~BoxView() -> void
 ~Microsoft.Maui.Controls.Editor.ReturnCommand.set -> void
 ~Microsoft.Maui.Controls.Editor.ReturnCommandParameter.get -> object
 ~Microsoft.Maui.Controls.Editor.ReturnCommandParameter.set -> void
+Microsoft.Maui.Controls.HybridWebView.Invoker.get -> Microsoft.Maui.HybridWebViewInvoker!
+Microsoft.Maui.Controls.HybridWebView.Invoker.set -> void
+Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.Controls.ImageSource.InvalidateStyle() -> void
 ~Microsoft.Maui.Controls.Internals.ResourcesChangedEventArgs.Keys.get -> System.Collections.Generic.IEnumerable<string>
 ~Microsoft.Maui.Controls.Internals.ResourcesChangedEventArgs.ResolveValue(string key) -> object
diff --git a/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs b/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs
index 7ec0da51e8d0..cd133207cadf 100644
--- a/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs
+++ b/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs
@@ -42,7 +42,7 @@ public Task InvokerIsSet_WhenUsingJsonSerializerContext() =>
 			hybridWebView.SetInvokeJavaScriptTarget(invokeJavaScriptTarget, InvokeDotNetJsonContext.Default);
 
 			// Verify the invoker was set (AOT-safe path)
-			var invoker = HybridWebViewInvoker.GetInvoker(hybridWebView);
+			var invoker = hybridWebView.Invoker;
 			Assert.NotNull(invoker);
 
 			// Verify the invoker actually works end-to-end
@@ -61,7 +61,7 @@ public Task InvokerIsSet_WhenUsingLegacyOverload() =>
 #pragma warning restore IL2026, IL3050
 
 			// Verify the invoker was set (legacy reflection path)
-			var invoker = HybridWebViewInvoker.GetInvoker(hybridWebView);
+			var invoker = hybridWebView.Invoker;
 			Assert.NotNull(invoker);
 			Assert.IsType<ReflectionHybridWebViewInvoker>(invoker);
 
diff --git a/src/Core/src/Core/HybridWebViewInvoker.cs b/src/Core/src/Core/HybridWebViewInvoker.cs
index 9a87ccd5c2f1..03ab24c9f21f 100644
--- a/src/Core/src/Core/HybridWebViewInvoker.cs
+++ b/src/Core/src/Core/HybridWebViewInvoker.cs
@@ -1,7 +1,6 @@
 using System;
 using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 
 namespace Microsoft.Maui
@@ -13,8 +12,6 @@ namespace Microsoft.Maui
 	[EditorBrowsable(EditorBrowsableState.Never)]
 	public abstract class HybridWebViewInvoker
 	{
-		static readonly ConditionalWeakTable<IHybridWebView, InvokerHolder> s_invokers = new();
-
 		/// <summary>
 		/// Creates a new invoker for the specified JavaScript invocation target.
 		/// </summary>
@@ -30,33 +27,6 @@ protected HybridWebViewInvoker(object? invokeJavaScriptTarget, Type? invokeJavaS
 
 		internal Type? InvokeJavaScriptType { get; set; }
 
-		internal static void SetInvoker(IHybridWebView hybridWebView, HybridWebViewInvoker invoker)
-		{
-			if (hybridWebView is null)
-			{
-				throw new ArgumentNullException(nameof(hybridWebView));
-			}
-
-			if (invoker is null)
-			{
-				throw new ArgumentNullException(nameof(invoker));
-			}
-
-			s_invokers.GetOrCreateValue(hybridWebView).Invoker = invoker;
-		}
-
-		internal static HybridWebViewInvoker? GetInvoker(IHybridWebView hybridWebView)
-		{
-			if (hybridWebView is null)
-			{
-				throw new ArgumentNullException(nameof(hybridWebView));
-			}
-
-			return s_invokers.TryGetValue(hybridWebView, out var holder)
-				? holder.Invoker
-				: null;
-		}
-
 		/// <summary>
 		/// Invokes the named .NET method with JSON-serialized parameters and returns a JSON-serialized result.
 		/// </summary>
@@ -64,10 +34,5 @@ internal static void SetInvoker(IHybridWebView hybridWebView, HybridWebViewInvok
 		/// <param name="paramJsonValues">JSON-serialized parameter values, or null for parameterless methods.</param>
 		/// <returns>JSON-serialized result, or null for void methods or null returns.</returns>
 		public abstract Task<string?> InvokeMethodAsync(string methodName, string[]? paramJsonValues);
-
-		sealed class InvokerHolder
-		{
-			public HybridWebViewInvoker? Invoker { get; set; }
-		}
 	}
 }
diff --git a/src/Core/src/Core/IHybridWebView.cs b/src/Core/src/Core/IHybridWebView.cs
index a41370438b7d..0f786537dde9 100644
--- a/src/Core/src/Core/IHybridWebView.cs
+++ b/src/Core/src/Core/IHybridWebView.cs
@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization.Metadata;
@@ -21,6 +22,12 @@ public interface IHybridWebView : IView, IWebRequestInterceptingWebView, IInitia
 		/// </summary>
 		string? HybridRoot { get; }
 
+		/// <summary>
+		/// For internal use only.
+		/// </summary>
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		HybridWebViewInvoker Invoker { get; set; }
+
 		/// <summary>
 		/// For internal use only.
 		/// </summary>
@@ -36,7 +43,7 @@ public interface IHybridWebView : IView, IWebRequestInterceptingWebView, IInitia
 #if !NETSTANDARD
 		[RequiresDynamicCode("Use SetInvokeJavaScriptTarget<T>(T target, JsonSerializerContext jsonSerializerContext) for trimming and NativeAOT compatibility.")]
 #endif
-		void SetInvokeJavaScriptTarget<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>(T target) where T : class;
+		void SetInvokeJavaScriptTarget<T>(T target) where T : class;
 
 		/// <summary>
 		///  Sets the object that will be the target of JavaScript calls from the web view. The public methods on this object
diff --git a/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs b/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs
index b20af2f7264a..3a79e8f6c695 100644
--- a/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs
+++ b/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs
@@ -194,10 +194,7 @@ void MessageReceived(string rawMessage)
 					throw new InvalidOperationException("The invoke data did not provide a method name.");
 				}
 
-				var invoker = HybridWebViewInvoker.GetInvoker(VirtualView)
-					?? throw new InvalidOperationException(
-						$"No invoker is configured. Call {nameof(IHybridWebView.SetInvokeJavaScriptTarget)} to set up JS-to-.NET method invocation.");
-				var jsonResult = await invoker.InvokeMethodAsync(invokeData.MethodName, invokeData.ParamValues);
+				var jsonResult = await VirtualView.Invoker.InvokeMethodAsync(invokeData.MethodName, invokeData.ParamValues);
 				var invokeResult = jsonResult is null
 					? new DotNetInvokeResult()
 					: new DotNetInvokeResult { Result = jsonResult, IsJson = true };
diff --git a/src/Core/src/Handlers/HybridWebView/ReflectionHybridWebViewInvoker.cs b/src/Core/src/Handlers/HybridWebView/ReflectionHybridWebViewInvoker.cs
index 64426dfa3c2d..c4856533d2d4 100644
--- a/src/Core/src/Handlers/HybridWebView/ReflectionHybridWebViewInvoker.cs
+++ b/src/Core/src/Handlers/HybridWebView/ReflectionHybridWebViewInvoker.cs
@@ -16,12 +16,11 @@ namespace Microsoft.Maui
 #endif
 	internal sealed class ReflectionHybridWebViewInvoker : HybridWebViewInvoker
 	{
-		public ReflectionHybridWebViewInvoker(object target, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] Type targetType)
+		public ReflectionHybridWebViewInvoker(object target, Type targetType)
 			: base(target, targetType)
 		{
 		}
 
-		[UnconditionalSuppressMessage("Trimming", "IL2075:DynamicallyAccessedMembers", Justification = "The legacy overload preserves the target type and its public members with DynamicallyAccessedMembers.")]
 		public override async Task<string?> InvokeMethodAsync(string methodName, string[]? paramJsonValues)
 		{
 			var target = InvokeJavaScriptTarget
diff --git a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
index 196170b2400a..5316c956a136 100644
--- a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -1,7 +1,9 @@
 #nullable enable
-Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.HybridWebViewInvoker
 Microsoft.Maui.HybridWebViewInvoker.HybridWebViewInvoker(object? invokeJavaScriptTarget, System.Type? invokeJavaScriptType) -> void
+Microsoft.Maui.IHybridWebView.Invoker.get -> Microsoft.Maui.HybridWebViewInvoker!
+Microsoft.Maui.IHybridWebView.Invoker.set -> void
+Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 abstract Microsoft.Maui.HybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
 static Microsoft.Maui.GridLength.implicit operator Microsoft.Maui.GridLength(string! value) -> Microsoft.Maui.GridLength
 static Microsoft.Maui.SafeAreaEdges.Container.get -> Microsoft.Maui.SafeAreaEdges
diff --git a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index a29f844ffbef..465ee052aac0 100644
--- a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -1,6 +1,8 @@
 #nullable enable
-Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.HybridWebViewInvoker
 Microsoft.Maui.HybridWebViewInvoker.HybridWebViewInvoker(object? invokeJavaScriptTarget, System.Type? invokeJavaScriptType) -> void
+Microsoft.Maui.IHybridWebView.Invoker.get -> Microsoft.Maui.HybridWebViewInvoker!
+Microsoft.Maui.IHybridWebView.Invoker.set -> void
+Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 abstract Microsoft.Maui.HybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
 static Microsoft.Maui.SafeAreaEdges.Container.get -> Microsoft.Maui.SafeAreaEdges
diff --git a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
index a29f844ffbef..465ee052aac0 100644
--- a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
@@ -1,6 +1,8 @@
 #nullable enable
-Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.HybridWebViewInvoker
 Microsoft.Maui.HybridWebViewInvoker.HybridWebViewInvoker(object? invokeJavaScriptTarget, System.Type? invokeJavaScriptType) -> void
+Microsoft.Maui.IHybridWebView.Invoker.get -> Microsoft.Maui.HybridWebViewInvoker!
+Microsoft.Maui.IHybridWebView.Invoker.set -> void
+Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 abstract Microsoft.Maui.HybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
 static Microsoft.Maui.SafeAreaEdges.Container.get -> Microsoft.Maui.SafeAreaEdges

From aa183bce4a53175d40760318ea965bfba20a5047 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 16 Jun 2026 08:24:57 +0000
Subject: [PATCH 21/39] Fix HybridWebViewInvoker platform PublicAPI baselines

Co-authored-by: simonrozsival <374616+simonrozsival@users.noreply.github.com>
---
 src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt     | 1 +
 src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt         | 1 +
 src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt | 1 +
 src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt       | 1 +
 src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt     | 1 +
 5 files changed, 5 insertions(+)

diff --git a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
index 8e2427b86c79..0b9936e91869 100644
--- a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -1,6 +1,7 @@
 #nullable enable
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.HybridWebViewInvoker
+Microsoft.Maui.HybridWebViewInvoker.HybridWebViewInvoker(object? invokeJavaScriptTarget, System.Type? invokeJavaScriptType) -> void
 abstract Microsoft.Maui.HybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
 *REMOVED*override Microsoft.Maui.Graphics.MauiDrawable.Dispose(bool disposing) -> void
 *REMOVED*override Microsoft.Maui.Graphics.MauiDrawable.OnBoundsChange(Android.Graphics.Rect! bounds) -> void
diff --git a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index eceb881eed05..b151e2043e7d 100644
--- a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -1,6 +1,7 @@
 #nullable enable
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.HybridWebViewInvoker
+Microsoft.Maui.HybridWebViewInvoker.HybridWebViewInvoker(object? invokeJavaScriptTarget, System.Type? invokeJavaScriptType) -> void
 abstract Microsoft.Maui.HybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
 override Microsoft.Maui.Handlers.LabelHandler.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
 override Microsoft.Maui.Handlers.ShapeViewHandler.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
diff --git a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index eceb881eed05..b151e2043e7d 100644
--- a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -1,6 +1,7 @@
 #nullable enable
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.HybridWebViewInvoker
+Microsoft.Maui.HybridWebViewInvoker.HybridWebViewInvoker(object? invokeJavaScriptTarget, System.Type? invokeJavaScriptType) -> void
 abstract Microsoft.Maui.HybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
 override Microsoft.Maui.Handlers.LabelHandler.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
 override Microsoft.Maui.Handlers.ShapeViewHandler.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
diff --git a/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
index 5897dafa064e..d631f80f311c 100644
--- a/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
@@ -1,5 +1,6 @@
 #nullable enable
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.HybridWebViewInvoker
+Microsoft.Maui.HybridWebViewInvoker.HybridWebViewInvoker(object? invokeJavaScriptTarget, System.Type? invokeJavaScriptType) -> void
 abstract Microsoft.Maui.HybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
 static Microsoft.Maui.GridLength.implicit operator Microsoft.Maui.GridLength(string! value) -> Microsoft.Maui.GridLength
diff --git a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index 53af9841aa12..e61e0f3eb869 100644
--- a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -1,6 +1,7 @@
 #nullable enable
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.HybridWebViewInvoker
+Microsoft.Maui.HybridWebViewInvoker.HybridWebViewInvoker(object? invokeJavaScriptTarget, System.Type? invokeJavaScriptType) -> void
 abstract Microsoft.Maui.HybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
 override Microsoft.Maui.Platform.MauiPasswordTextBox.OnCreateAutomationPeer() -> Microsoft.UI.Xaml.Automation.Peers.AutomationPeer!
 static Microsoft.Maui.GridLength.implicit operator Microsoft.Maui.GridLength(string! value) -> Microsoft.Maui.GridLength

From 8907b5c1798fd2621f890e8a96c04d1c274cf760 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 16 Jun 2026 14:33:25 +0000
Subject: [PATCH 22/39] Fix HybridWebView handler netstandard build after merge

Co-authored-by: simonrozsival <374616+simonrozsival@users.noreply.github.com>
---
 src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs b/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs
index 8c5f613c642b..8e16203f2ba6 100644
--- a/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs
+++ b/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs
@@ -100,8 +100,10 @@ public HybridWebViewHandler(IPropertyMapper? mapper = null, CommandMapper? comma
 		private static bool IsInvokeJavaScriptThrowsExceptionsEnabled =>
 			!AppContext.TryGetSwitch(InvokeJavaScriptThrowsExceptionsSwitch, out var enabled) || enabled;
 
+#if PLATFORM && !TIZEN
 		void MessageReceived(string rawMessage) =>
 			HybridWebViewHelper.ProcessRawMessage(this, VirtualView, rawMessage);
+#endif
 
 		internal async Task<byte[]?> InvokeDotNetAsync(Stream? streamBody = null, string? stringBody = null)
 		{

From 64c143ac346787b924ce444ba14cdb69f676db66 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 16 Jun 2026 14:52:31 +0000
Subject: [PATCH 23/39] Fix HybridWebView source generator review issues

Co-authored-by: simonrozsival <374616+simonrozsival@users.noreply.github.com>
---
 .../AnalyzerReleases.Unshipped.md             |  8 +++
 .../HybridWebViewInvokeTargetGenerator.cs     | 59 +++++++++++++++++--
 2 files changed, 62 insertions(+), 5 deletions(-)
 create mode 100644 src/Core/src/HybridWebViewSourceGen/AnalyzerReleases.Unshipped.md

diff --git a/src/Core/src/HybridWebViewSourceGen/AnalyzerReleases.Unshipped.md b/src/Core/src/HybridWebViewSourceGen/AnalyzerReleases.Unshipped.md
new file mode 100644
index 000000000000..1806b5cbf5cc
--- /dev/null
+++ b/src/Core/src/HybridWebViewSourceGen/AnalyzerReleases.Unshipped.md
@@ -0,0 +1,8 @@
+; Unshipped analyzer release
+; https://github.com/dotnet/roslyn-analyzers/blob/master/src/Microsoft.CodeAnalysis.Analyzers/ReleaseTrackingAnalyzers.Help.md
+
+### New Rules
+
+Rule ID | Category | Severity | Notes
+--------|----------|----------|-------
+MAUIHWVSG001 | HybridWebView | Error | UnsupportedOverloadedMethods
diff --git a/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs b/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs
index a278e0c3db3e..55843e8a30c2 100644
--- a/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs
+++ b/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs
@@ -13,6 +13,15 @@ public sealed class HybridWebViewInvokeTargetGenerator : IIncrementalGenerator
 	private const string HybridWebViewTypeName = "Microsoft.Maui.Controls.HybridWebView";
 	private const string IHybridWebViewTypeName = "Microsoft.Maui.IHybridWebView";
 	private const string JsonSerializerContextTypeName = "System.Text.Json.Serialization.JsonSerializerContext";
+	private const string HybridWebViewFullyQualifiedTypeName = "global::Microsoft.Maui.Controls.HybridWebView";
+	private const string IHybridWebViewFullyQualifiedTypeName = "global::Microsoft.Maui.IHybridWebView";
+	private static readonly DiagnosticDescriptor UnsupportedOverloadedMethods = new(
+		"MAUIHWVSG001",
+		"HybridWebView invoke targets cannot contain overloaded methods",
+		"HybridWebView invoke target type '{0}' contains overloaded public method name(s): {1}. JavaScript-to-.NET invocation is dispatched by method name, so overloaded target methods are not supported.",
+		"HybridWebView",
+		DiagnosticSeverity.Error,
+		isEnabledByDefault: true);
 
 	public void Initialize(IncrementalGeneratorInitializationContext context)
 	{
@@ -53,6 +62,10 @@ private static bool IsSetInvokeJavaScriptTargetCandidate(SyntaxNode node)
 		if (containingType != HybridWebViewTypeName && containingType != IHybridWebViewTypeName)
 			return null;
 
+		var receiverTypeName = containingType == IHybridWebViewTypeName
+			? IHybridWebViewFullyQualifiedTypeName
+			: HybridWebViewFullyQualifiedTypeName;
+
 		var secondParamType = method.Parameters[1].Type?.ToDisplayString();
 		if (secondParamType != JsonSerializerContextTypeName)
 			return null;
@@ -132,10 +145,20 @@ private static bool IsSetInvokeJavaScriptTargetCandidate(SyntaxNode node)
 			methods.Add(new MethodInfo(m.Name, returnKind, resultTypeName, paramInfos.ToArray()));
 		}
 
+		var overloadedMethodNames = methods
+			.GroupBy(static method => method.Name)
+			.Where(static group => group.Count() > 1)
+			.Select(static group => group.Key)
+			.OrderBy(static name => name)
+			.ToArray();
+
 		return new InvocationInfo(
 			interceptableLocation,
+			invocation.GetLocation(),
+			receiverTypeName,
 			targetType.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat),
-			methods.ToArray());
+			methods.ToArray(),
+			overloadedMethodNames);
 	}
 
 	private static void GenerateSource(SourceProductionContext spc, ImmutableArray<InvocationInfo?> invocations)
@@ -177,9 +200,19 @@ private static void GenerateSource(SourceProductionContext spc, ImmutableArray<I
 
 			var loc = info.Location;
 
+			if (info.OverloadedMethodNames.Length > 0)
+			{
+				spc.ReportDiagnostic(Diagnostic.Create(
+					UnsupportedOverloadedMethods,
+					info.DiagnosticLocation,
+					info.TargetTypeName,
+					string.Join(", ", info.OverloadedMethodNames)));
+				continue;
+			}
+
 			// Generate the interceptor method
 			sb.AppendLine($"        [global::System.Runtime.CompilerServices.InterceptsLocationAttribute({loc.Version}, @\"{loc.Data}\")]");
-			sb.AppendLine($"        public static void SetInvokeJavaScriptTarget_{index}<T>(this global::Microsoft.Maui.Controls.HybridWebView hybridWebView, T target, global::System.Text.Json.Serialization.JsonSerializerContext jsonSerializerContext) where T : class");
+			sb.AppendLine($"        public static void SetInvokeJavaScriptTarget_{index}<T>(this {info.ReceiverTypeName} hybridWebView, T target, global::System.Text.Json.Serialization.JsonSerializerContext jsonSerializerContext) where T : class");
 			sb.AppendLine("        {");
 			sb.AppendLine("            if (target is null) throw new ArgumentNullException(nameof(target));");
 			sb.AppendLine("            if (jsonSerializerContext is null) throw new ArgumentNullException(nameof(jsonSerializerContext));");
@@ -187,7 +220,17 @@ private static void GenerateSource(SourceProductionContext spc, ImmutableArray<I
 			sb.AppendLine($"            if (target is not {info.TargetTypeName} typedTarget)");
 			sb.AppendLine($"                throw new InvalidOperationException($\"Type mismatch: expected {info.TargetTypeName.Split('.').Last()} but got {{target.GetType().FullName}}\");");
 			sb.AppendLine();
-			sb.AppendLine($"            hybridWebView.SetInvoker(new Invoker_{index}(typedTarget, jsonSerializerContext));");
+			if (info.ReceiverTypeName == IHybridWebViewFullyQualifiedTypeName)
+			{
+				sb.AppendLine("            if (hybridWebView is not global::Microsoft.Maui.Controls.HybridWebView concreteHybridWebView)");
+				sb.AppendLine("                throw new InvalidOperationException(\"The AOT-safe HybridWebView source-generated invoker can only be registered on Microsoft.Maui.Controls.HybridWebView instances.\");");
+				sb.AppendLine();
+				sb.AppendLine($"            concreteHybridWebView.SetInvoker(new Invoker_{index}(typedTarget, jsonSerializerContext));");
+			}
+			else
+			{
+				sb.AppendLine($"            hybridWebView.SetInvoker(new Invoker_{index}(typedTarget, jsonSerializerContext));");
+			}
 			sb.AppendLine("        }");
 			sb.AppendLine();
 
@@ -204,7 +247,7 @@ private static void GenerateSource(SourceProductionContext spc, ImmutableArray<I
 			sb.AppendLine("                _ctx = ctx;");
 			sb.AppendLine("            }");
 			sb.AppendLine();
-			sb.AppendLine("            public async global::System.Threading.Tasks.Task<string?> InvokeMethodAsync(string methodName, string[]? paramJsonValues)");
+			sb.AppendLine("            public override async global::System.Threading.Tasks.Task<string?> InvokeMethodAsync(string methodName, string[]? paramJsonValues)");
 			sb.AppendLine("            {");
 			sb.AppendLine("                switch (methodName)");
 			sb.AppendLine("                {");
@@ -279,15 +322,21 @@ private static void GenerateSource(SourceProductionContext spc, ImmutableArray<I
 
 	private sealed class InvocationInfo
 	{
-		public InvocationInfo(InterceptableLocation location, string targetTypeName, MethodInfo[] methods)
+		public InvocationInfo(InterceptableLocation location, Location diagnosticLocation, string receiverTypeName, string targetTypeName, MethodInfo[] methods, string[] overloadedMethodNames)
 		{
 			Location = location;
+			DiagnosticLocation = diagnosticLocation;
+			ReceiverTypeName = receiverTypeName;
 			TargetTypeName = targetTypeName;
 			Methods = methods;
+			OverloadedMethodNames = overloadedMethodNames;
 		}
 		public InterceptableLocation Location { get; }
+		public Location DiagnosticLocation { get; }
+		public string ReceiverTypeName { get; }
 		public string TargetTypeName { get; }
 		public MethodInfo[] Methods { get; }
+		public string[] OverloadedMethodNames { get; }
 	}
 
 	private sealed class MethodInfo

From 1d7c16b022bd2793b4f598d62eadec5158eb9ba8 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 17 Jun 2026 14:35:31 +0200
Subject: [PATCH 24/39] Remove RUC and RDC from HybridWebViewHelper

---
 src/Core/src/Handlers/HybridWebView/HybridWebViewHelper.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/Core/src/Handlers/HybridWebView/HybridWebViewHelper.cs b/src/Core/src/Handlers/HybridWebView/HybridWebViewHelper.cs
index 65b82df20bf9..2bacad17d13c 100644
--- a/src/Core/src/Handlers/HybridWebView/HybridWebViewHelper.cs
+++ b/src/Core/src/Handlers/HybridWebView/HybridWebViewHelper.cs
@@ -20,10 +20,6 @@ namespace Microsoft.Maui;
 /// Helper class containing all business logic for HybridWebView operations.
 /// Keeps both Controls and Handler layers thin by centralizing processing logic.
 /// </summary>
-[RequiresUnreferencedCode("HybridWebView uses dynamic System.Text.Json serialization features.")]
-#if !NETSTANDARD
-[RequiresDynamicCode("HybridWebView uses dynamic System.Text.Json serialization features.")]
-#endif
 internal static partial class HybridWebViewHelper
 {
 	/// <summary>

From 900bbc5ae50a88baa0545d62aa3b1502fbcfa1fa Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 17 Jun 2026 14:51:28 +0200
Subject: [PATCH 25/39] Fix packaging build error

---
 Microsoft.Maui-dev.sln               | 7 +++++++
 Microsoft.Maui-mac.slnf              | 1 +
 Microsoft.Maui-windows.slnf          | 1 +
 Microsoft.Maui.BuildTasks.slnf       | 1 +
 Microsoft.Maui.sln                   | 7 +++++++
 eng/Microsoft.Maui.Packages-mac.slnf | 1 +
 eng/Microsoft.Maui.Packages.slnf     | 1 +
 7 files changed, 19 insertions(+)

diff --git a/Microsoft.Maui-dev.sln b/Microsoft.Maui-dev.sln
index efaad84182ac..581401a01795 100644
--- a/Microsoft.Maui-dev.sln
+++ b/Microsoft.Maui-dev.sln
@@ -5,6 +5,8 @@ VisualStudioVersion = 18.3.11408.92 d18.3
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "src\Core\src\Core.csproj", "{95BA42B5-B00E-4986-B9B5-517140378452}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.HybridWebViewSourceGen", "src\Core\src\HybridWebViewSourceGen\Core.HybridWebViewSourceGen.csproj", "{3649A4BE-24DE-4B1F-9FA4-84B3335A833A}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.Core", "src\Controls\src\Core\Controls.Core.csproj", "{AF64451F-E2BD-41C2-B083-F60C26AE2A9F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Controls", "Controls", "{459BF674-83CB-46F6-881F-A2D2117DBF4D}"
@@ -281,6 +283,10 @@ Global
 		{95BA42B5-B00E-4986-B9B5-517140378452}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{95BA42B5-B00E-4986-B9B5-517140378452}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{95BA42B5-B00E-4986-B9B5-517140378452}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3649A4BE-24DE-4B1F-9FA4-84B3335A833A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3649A4BE-24DE-4B1F-9FA4-84B3335A833A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3649A4BE-24DE-4B1F-9FA4-84B3335A833A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3649A4BE-24DE-4B1F-9FA4-84B3335A833A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AF64451F-E2BD-41C2-B083-F60C26AE2A9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AF64451F-E2BD-41C2-B083-F60C26AE2A9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AF64451F-E2BD-41C2-B083-F60C26AE2A9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -690,6 +696,7 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{95BA42B5-B00E-4986-B9B5-517140378452} = {E8AD265B-3C67-4640-AC58-A522F9FB3361}
+		{3649A4BE-24DE-4B1F-9FA4-84B3335A833A} = {E8AD265B-3C67-4640-AC58-A522F9FB3361}
 		{AF64451F-E2BD-41C2-B083-F60C26AE2A9F} = {50C758FE-4E10-409A-94F5-A75480960864}
 		{E1082E26-D700-4127-9329-66D673FD2D55} = {459BF674-83CB-46F6-881F-A2D2117DBF4D}
 		{B8DC1324-977C-46F1-B697-9064ADE6099A} = {E1082E26-D700-4127-9329-66D673FD2D55}
diff --git a/Microsoft.Maui-mac.slnf b/Microsoft.Maui-mac.slnf
index 623e1571661a..1cdb0ae49579 100644
--- a/Microsoft.Maui-mac.slnf
+++ b/Microsoft.Maui-mac.slnf
@@ -25,6 +25,7 @@
       "src\\Controls\\src\\SourceGen\\Controls.SourceGen.csproj",
       "src\\Controls\\src\\Xaml.Design\\Controls.Xaml.Design.csproj",
       "src\\Controls\\src\\Xaml\\Controls.Xaml.csproj",
+      "src\\Core\\src\\HybridWebViewSourceGen\\Core.HybridWebViewSourceGen.csproj",
       "src\\Controls\\tests\\Core.UnitTests\\Controls.Core.UnitTests.csproj",
       "src\\Controls\\tests\\CustomAttributes\\Controls.CustomAttributes.csproj",
       "src\\Controls\\tests\\DeviceTests\\Controls.DeviceTests.csproj",
diff --git a/Microsoft.Maui-windows.slnf b/Microsoft.Maui-windows.slnf
index 4ed4c36e2225..5c975ef5789a 100644
--- a/Microsoft.Maui-windows.slnf
+++ b/Microsoft.Maui-windows.slnf
@@ -29,6 +29,7 @@
       "src\\Controls\\src\\SourceGen\\Controls.SourceGen.csproj",
       "src\\Controls\\src\\Xaml.Design\\Controls.Xaml.Design.csproj",
       "src\\Controls\\src\\Xaml\\Controls.Xaml.csproj",
+      "src\\Core\\src\\HybridWebViewSourceGen\\Core.HybridWebViewSourceGen.csproj",
       "src\\Controls\\tests\\Core.Design.UnitTests\\Controls.Core.Design.UnitTests.csproj",
       "src\\Controls\\tests\\Core.UnitTests\\Controls.Core.UnitTests.csproj",
       "src\\Controls\\tests\\CustomAttributes\\Controls.CustomAttributes.csproj",
diff --git a/Microsoft.Maui.BuildTasks.slnf b/Microsoft.Maui.BuildTasks.slnf
index 2e02561743f0..81081fdfb526 100644
--- a/Microsoft.Maui.BuildTasks.slnf
+++ b/Microsoft.Maui.BuildTasks.slnf
@@ -9,6 +9,7 @@
       "src\\Controls\\src\\SourceGen\\Controls.SourceGen.csproj",
       "src\\Controls\\src\\Xaml.Design\\Controls.Xaml.Design.csproj",
       "src\\Controls\\src\\Xaml\\Controls.Xaml.csproj",
+      "src\\Core\\src\\HybridWebViewSourceGen\\Core.HybridWebViewSourceGen.csproj",
       "src\\Core\\src\\Core.csproj",
       "src\\SingleProject\\Resizetizer\\src\\Resizetizer.csproj"
     ]
diff --git a/Microsoft.Maui.sln b/Microsoft.Maui.sln
index 37c133515923..6658ca3bdc72 100644
--- a/Microsoft.Maui.sln
+++ b/Microsoft.Maui.sln
@@ -4,6 +4,8 @@ VisualStudioVersion = 17.0.31410.414
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "src\Core\src\Core.csproj", "{95BA42B5-B00E-4986-B9B5-517140378452}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.HybridWebViewSourceGen", "src\Core\src\HybridWebViewSourceGen\Core.HybridWebViewSourceGen.csproj", "{3649A4BE-24DE-4B1F-9FA4-84B3335A833A}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.Core", "src\Controls\src\Core\Controls.Core.csproj", "{AF64451F-E2BD-41C2-B083-F60C26AE2A9F}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Compatibility", "src\Compatibility\Core\src\Compatibility.csproj", "{00A11C2F-969F-4964-8557-91ADF4B1523D}"
@@ -279,6 +281,10 @@ Global
 		{95BA42B5-B00E-4986-B9B5-517140378452}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{95BA42B5-B00E-4986-B9B5-517140378452}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{95BA42B5-B00E-4986-B9B5-517140378452}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3649A4BE-24DE-4B1F-9FA4-84B3335A833A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3649A4BE-24DE-4B1F-9FA4-84B3335A833A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3649A4BE-24DE-4B1F-9FA4-84B3335A833A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3649A4BE-24DE-4B1F-9FA4-84B3335A833A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AF64451F-E2BD-41C2-B083-F60C26AE2A9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AF64451F-E2BD-41C2-B083-F60C26AE2A9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AF64451F-E2BD-41C2-B083-F60C26AE2A9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -692,6 +698,7 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{95BA42B5-B00E-4986-B9B5-517140378452} = {E8AD265B-3C67-4640-AC58-A522F9FB3361}
+		{3649A4BE-24DE-4B1F-9FA4-84B3335A833A} = {E8AD265B-3C67-4640-AC58-A522F9FB3361}
 		{AF64451F-E2BD-41C2-B083-F60C26AE2A9F} = {50C758FE-4E10-409A-94F5-A75480960864}
 		{00A11C2F-969F-4964-8557-91ADF4B1523D} = {446EB407-57EB-441D-9ADB-1A006CBF672A}
 		{E1082E26-D700-4127-9329-66D673FD2D55} = {459BF674-83CB-46F6-881F-A2D2117DBF4D}
diff --git a/eng/Microsoft.Maui.Packages-mac.slnf b/eng/Microsoft.Maui.Packages-mac.slnf
index 5529edb22fdb..ac7fa3cf41db 100644
--- a/eng/Microsoft.Maui.Packages-mac.slnf
+++ b/eng/Microsoft.Maui.Packages-mac.slnf
@@ -14,6 +14,7 @@
       "src\\Controls\\src\\SourceGen\\Controls.SourceGen.csproj",
       "src\\Controls\\src\\Xaml.Design\\Controls.Xaml.Design.csproj",
       "src\\Controls\\src\\Xaml\\Controls.Xaml.csproj",
+      "src\\Core\\src\\HybridWebViewSourceGen\\Core.HybridWebViewSourceGen.csproj",
       "src\\Core\\src\\Core.csproj",
       "src\\Core\\maps\\src\\Maps.csproj",
       "src\\Essentials\\src\\Essentials.csproj",
diff --git a/eng/Microsoft.Maui.Packages.slnf b/eng/Microsoft.Maui.Packages.slnf
index 7c21491d97e3..0ce389468544 100644
--- a/eng/Microsoft.Maui.Packages.slnf
+++ b/eng/Microsoft.Maui.Packages.slnf
@@ -16,6 +16,7 @@
       "src\\Controls\\src\\SourceGen\\Controls.SourceGen.csproj",
       "src\\Controls\\src\\Xaml.Design\\Controls.Xaml.Design.csproj",
       "src\\Controls\\src\\Xaml\\Controls.Xaml.csproj",
+      "src\\Core\\src\\HybridWebViewSourceGen\\Core.HybridWebViewSourceGen.csproj",
       "src\\Core\\src\\Core.csproj",
       "src\\Core\\maps\\src\\Maps.csproj",
       "src\\Graphics\\src\\Graphics\\Graphics.csproj",

From 0b5268c9a0af1fb833922cf320024fc984035ae7 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 17 Jun 2026 14:58:37 +0200
Subject: [PATCH 26/39] Fix remaining unsafe serialization and deserialization
 APIs in HybridWebViewHelper

---
 .../src/Handlers/HybridWebView/HybridWebViewHelper.cs     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Core/src/Handlers/HybridWebView/HybridWebViewHelper.cs b/src/Core/src/Handlers/HybridWebView/HybridWebViewHelper.cs
index 2bacad17d13c..9990b605b221 100644
--- a/src/Core/src/Handlers/HybridWebView/HybridWebViewHelper.cs
+++ b/src/Core/src/Handlers/HybridWebView/HybridWebViewHelper.cs
@@ -97,7 +97,7 @@ internal static partial class HybridWebViewHelper
 		if (OperatingSystem.IsAndroid())
 		{
 			// Deserialize once to unwrap the JSON string
-			result = JsonSerializer.Deserialize<string>(result);
+			result = JsonSerializer.Deserialize<string>(result, HybridWebViewHelperJsonContext.Default.String);
 			if (result == null)
 				return null;
 		}
@@ -124,7 +124,7 @@ internal static partial class HybridWebViewHelper
 			if (returnValue.Length >= 2 && returnValue[0] == '"' && returnValue[^1] == '"')
 			{
 				// Properly deserialize the JSON string to handle escaped characters
-				returnValue = JsonSerializer.Deserialize<string>(returnValue);
+				returnValue = JsonSerializer.Deserialize<string>(returnValue, HybridWebViewHelperJsonContext.Default.String);
 			}
 			// Otherwise it's a primitive value (number, boolean, etc.) that's already in string form
 			// No need to deserialize - just return as-is
@@ -183,6 +183,7 @@ internal static partial class HybridWebViewHelper
 	/// <summary>
 	/// Invokes a .NET method from JavaScript.
 	/// </summary>
+	[RequiresUnreferencedCode ("This method serializes arbitrary objects to JSON using unconstrained reflection.")]
 	public static async Task<byte[]?> ProcessInvokeDotNetAsync(
 		object? invokeTarget,
 		[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] Type? invokeTargetType,
@@ -219,7 +220,7 @@ internal static partial class HybridWebViewHelper
 
 			var invokeResultRaw = await InvokeDotNetMethodAsync(invokeTargetType, invokeTarget, invokeData);
 			var invokeResult = CreateInvokeResult(invokeResultRaw);
-			var json = JsonSerializer.Serialize(invokeResult);
+			var json = JsonSerializer.Serialize(invokeResult, HybridWebViewHelperJsonContext.Default.DotNetInvokeResult);
 			var contentBytes = Encoding.UTF8.GetBytes(json);
 
 			return contentBytes;
@@ -236,6 +237,7 @@ internal static partial class HybridWebViewHelper
 		}
 	}
 
+	[RequiresUnreferencedCode ("This method serializes arbitrary objects to JSON using unconstrained reflection.")]
 	private static DotNetInvokeResult CreateInvokeResult(object? result)
 	{
 		// null invoke result means an empty result

From 78de7432a55d42898ac140592afde5c255bb5202 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 17 Jun 2026 20:49:24 +0200
Subject: [PATCH 27/39] Delete unreachable code

---
 .../HybridWebView/HybridWebViewHelper.cs      | 178 ------------------
 1 file changed, 178 deletions(-)

diff --git a/src/Core/src/Handlers/HybridWebView/HybridWebViewHelper.cs b/src/Core/src/Handlers/HybridWebView/HybridWebViewHelper.cs
index 9990b605b221..39fffada097c 100644
--- a/src/Core/src/Handlers/HybridWebView/HybridWebViewHelper.cs
+++ b/src/Core/src/Handlers/HybridWebView/HybridWebViewHelper.cs
@@ -180,184 +180,6 @@ internal static partial class HybridWebViewHelper
 		}
 	}
 
-	/// <summary>
-	/// Invokes a .NET method from JavaScript.
-	/// </summary>
-	[RequiresUnreferencedCode ("This method serializes arbitrary objects to JSON using unconstrained reflection.")]
-	public static async Task<byte[]?> ProcessInvokeDotNetAsync(
-		object? invokeTarget,
-		[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] Type? invokeTargetType,
-		ILogger? logger,
-		Stream? streamBody = null,
-		string? stringBody = null)
-	{
-		try
-		{
-			if (invokeTarget is null)
-			{
-				throw new InvalidOperationException($"The InvokeJavaScriptTarget property must have a value in order to invoke a .NET method from JavaScript.");
-			}
-
-			if (invokeTargetType is null)
-			{
-				throw new InvalidOperationException($"The InvokeJavaScriptType property must have a value in order to invoke a .NET method from JavaScript.");
-			}
-
-			JSInvokeMethodData? invokeData = null;
-			if (streamBody is not null)
-			{
-				invokeData = await JsonSerializer.DeserializeAsync<JSInvokeMethodData>(streamBody, HybridWebViewHelperJsonContext.Default.JSInvokeMethodData);
-			}
-			else if (stringBody is not null && !string.IsNullOrWhiteSpace(stringBody))
-			{
-				invokeData = JsonSerializer.Deserialize<JSInvokeMethodData>(stringBody, HybridWebViewHelperJsonContext.Default.JSInvokeMethodData);
-			}
-
-			if (invokeData?.MethodName is null)
-			{
-				throw new InvalidOperationException("The invoke data did not provide a method name.");
-			}
-
-			var invokeResultRaw = await InvokeDotNetMethodAsync(invokeTargetType, invokeTarget, invokeData);
-			var invokeResult = CreateInvokeResult(invokeResultRaw);
-			var json = JsonSerializer.Serialize(invokeResult, HybridWebViewHelperJsonContext.Default.DotNetInvokeResult);
-			var contentBytes = Encoding.UTF8.GetBytes(json);
-
-			return contentBytes;
-		}
-		catch (Exception ex)
-		{
-			logger?.LogError(ex, "An error occurred while invoking a .NET method from JavaScript: {ErrorMessage}", ex.Message);
-
-			// Return error response instead of null so JavaScript can handle the error
-			var errorResult = CreateErrorResult(ex);
-			var errorJson = JsonSerializer.Serialize(errorResult, HybridWebViewHelperJsonContext.Default.DotNetInvokeResult);
-			var errorBytes = Encoding.UTF8.GetBytes(errorJson);
-			return errorBytes;
-		}
-	}
-
-	[RequiresUnreferencedCode ("This method serializes arbitrary objects to JSON using unconstrained reflection.")]
-	private static DotNetInvokeResult CreateInvokeResult(object? result)
-	{
-		// null invoke result means an empty result
-		if (result is null)
-		{
-			return new();
-		}
-
-		// a reference type or an array should be serialized to JSON
-		var resultType = result.GetType();
-		if (resultType.IsArray || resultType.IsClass)
-		{
-			return new DotNetInvokeResult()
-			{
-				Result = JsonSerializer.Serialize(result),
-				IsJson = true,
-			};
-		}
-
-		// a value type should be returned as is
-		return new DotNetInvokeResult()
-		{
-			Result = result,
-		};
-	}
-
-	private static DotNetInvokeResult CreateErrorResult(Exception ex)
-	{
-		return new DotNetInvokeResult()
-		{
-			IsError = true,
-			ErrorMessage = ex.Message,
-			ErrorType = ex.GetType().Name,
-			ErrorStackTrace = ex.StackTrace
-		};
-	}
-
-	private static async Task<object?> InvokeDotNetMethodAsync(
-		[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] Type targetType,
-		object jsInvokeTarget,
-		JSInvokeMethodData invokeData)
-	{
-		var requestMethodName = invokeData.MethodName!;
-		var requestParams = invokeData.ParamValues;
-
-		// get the method and its parameters from the .NET object instance
-		var dotnetMethod = targetType.GetMethod(requestMethodName, BindingFlags.Public | BindingFlags.Instance | BindingFlags.InvokeMethod);
-		if (dotnetMethod is null)
-		{
-			throw new InvalidOperationException($"The method {requestMethodName} couldn't be found on the {nameof(jsInvokeTarget)} of type {jsInvokeTarget.GetType().FullName}.");
-		}
-		var dotnetParams = dotnetMethod.GetParameters();
-		if (requestParams is not null && dotnetParams.Length != requestParams.Length)
-		{
-			throw new InvalidOperationException($"The number of parameters on {nameof(jsInvokeTarget)}'s method {requestMethodName} ({dotnetParams.Length}) doesn't match the number of values passed from JavaScript code ({requestParams.Length}).");
-		}
-
-		// deserialize the parameters from JSON to .NET types
-		object?[]? invokeParamValues = null;
-		if (requestParams is not null)
-		{
-			invokeParamValues = new object?[requestParams.Length];
-			for (var i = 0; i < requestParams.Length; i++)
-			{
-				var reqValue = requestParams[i];
-				var paramType = dotnetParams[i].ParameterType;
-				var deserialized = JsonSerializer.Deserialize(reqValue, paramType);
-				invokeParamValues[i] = deserialized;
-			}
-		}
-
-		// invoke the .NET method
-		var dotnetReturnValue = GetDotNetMethodReturnValue(jsInvokeTarget, dotnetMethod, invokeParamValues);
-
-		if (dotnetReturnValue is null) // null result
-		{
-			return null;
-		}
-
-		if (dotnetReturnValue is Task task) // Task or Task<T> result
-		{
-			await task;
-
-			// Task<T>
-			if (dotnetMethod.ReturnType.IsGenericType)
-			{
-				var resultProperty = dotnetMethod.ReturnType.GetProperty(nameof(Task<object>.Result));
-				return resultProperty?.GetValue(task);
-			}
-
-			// Task
-			return null;
-		}
-
-		return dotnetReturnValue; // regular result
-	}
-
-	private static object? GetDotNetMethodReturnValue(object jsInvokeTarget, MethodInfo dotnetMethod, object?[]? invokeParamValues)
-	{
-		try
-		{
-			// invoke the .NET method
-			return dotnetMethod.Invoke(jsInvokeTarget, invokeParamValues);
-		}
-		catch (TargetInvocationException tie) // unwrap while preserving original stack trace
-		{
-			if (tie.InnerException is not null)
-			{
-				// Rethrow the underlying exception without losing its original stack trace
-				ExceptionDispatchInfo.Capture(tie.InnerException).Throw();
-
-				// unreachable, but required for compiler flow analysis
-				throw;
-			}
-
-			// no inner exception; rethrow the TargetInvocationException itself preserving its stack
-			throw;
-		}
-	}
-
 	/// <summary>
 	/// Processes raw messages from the web view, handling special message types like JavaScript invoke results.
 	/// </summary>

From 3cd60c22e6dd58a08e8ef6ffa3b56e6a2a18dbfd Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 17 Jun 2026 22:34:46 +0200
Subject: [PATCH 28/39] Suppress HybridWebView trim warning

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 src/Controls/src/Core/HybridWebView/HybridWebView.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Controls/src/Core/HybridWebView/HybridWebView.cs b/src/Controls/src/Core/HybridWebView/HybridWebView.cs
index ca314c39ceff..1a211402c709 100644
--- a/src/Controls/src/Core/HybridWebView/HybridWebView.cs
+++ b/src/Controls/src/Core/HybridWebView/HybridWebView.cs
@@ -15,14 +15,17 @@ namespace Microsoft.Maui.Controls
 	public class HybridWebView : View, IHybridWebView
 	{
 		/// <summary>Bindable property for <see cref="DefaultFile"/>.</summary>
-		[UnconditionalSuppressMessage("Trimming", "IL2026:RequiresUnreferencedCode", Justification = "BindableProperty.Create preserves public methods on the declaring type; it does not call the annotated legacy SetInvokeJavaScriptTarget overload.")]
 		public static readonly BindableProperty DefaultFileProperty =
 			BindableProperty.Create(nameof(DefaultFile), typeof(string), typeof(HybridWebView), defaultValue: "index.html");
 		/// <summary>Bindable property for <see cref="HybridRoot"/>.</summary>
-		[UnconditionalSuppressMessage("Trimming", "IL2026:RequiresUnreferencedCode", Justification = "BindableProperty.Create preserves public methods on the declaring type; it does not call the annotated legacy SetInvokeJavaScriptTarget overload.")]
 		public static readonly BindableProperty HybridRootProperty =
 			BindableProperty.Create(nameof(HybridRoot), typeof(string), typeof(HybridWebView), defaultValue: "wwwroot");
 
+		[UnconditionalSuppressMessage("Trimming", "IL2026:RequiresUnreferencedCode", Justification = "BindableProperty.Create preserves public methods on the declaring type; it does not call the annotated legacy SetInvokeJavaScriptTarget overload.")]
+		static HybridWebView()
+		{
+		}
+
 		/// <inheritdoc/>
 		public string? DefaultFile
 		{

From 7505c11e0d8cc179ce8b44b58eca02e9450a5c5a Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 17 Jun 2026 23:53:32 +0200
Subject: [PATCH 29/39] Move HybridWebView bindable property setup

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 src/Controls/src/Core/HybridWebView/HybridWebView.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Controls/src/Core/HybridWebView/HybridWebView.cs b/src/Controls/src/Core/HybridWebView/HybridWebView.cs
index 1a211402c709..cfb0b69660c1 100644
--- a/src/Controls/src/Core/HybridWebView/HybridWebView.cs
+++ b/src/Controls/src/Core/HybridWebView/HybridWebView.cs
@@ -15,15 +15,15 @@ namespace Microsoft.Maui.Controls
 	public class HybridWebView : View, IHybridWebView
 	{
 		/// <summary>Bindable property for <see cref="DefaultFile"/>.</summary>
-		public static readonly BindableProperty DefaultFileProperty =
-			BindableProperty.Create(nameof(DefaultFile), typeof(string), typeof(HybridWebView), defaultValue: "index.html");
+		public static readonly BindableProperty DefaultFileProperty;
 		/// <summary>Bindable property for <see cref="HybridRoot"/>.</summary>
-		public static readonly BindableProperty HybridRootProperty =
-			BindableProperty.Create(nameof(HybridRoot), typeof(string), typeof(HybridWebView), defaultValue: "wwwroot");
+		public static readonly BindableProperty HybridRootProperty;
 
 		[UnconditionalSuppressMessage("Trimming", "IL2026:RequiresUnreferencedCode", Justification = "BindableProperty.Create preserves public methods on the declaring type; it does not call the annotated legacy SetInvokeJavaScriptTarget overload.")]
 		static HybridWebView()
 		{
+			DefaultFileProperty = BindableProperty.Create(nameof(DefaultFile), typeof(string), typeof(HybridWebView), defaultValue: "index.html");
+			HybridRootProperty = BindableProperty.Create(nameof(HybridRoot), typeof(string), typeof(HybridWebView), defaultValue: "wwwroot");
 		}
 
 		/// <inheritdoc/>

From 8795b52af8795efb6c74050b3e581f8c50d81a86 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Thu, 18 Jun 2026 09:36:07 +0200
Subject: [PATCH 30/39] Add missing suppression

---
 src/Controls/src/Core/HybridWebView/HybridWebView.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Controls/src/Core/HybridWebView/HybridWebView.cs b/src/Controls/src/Core/HybridWebView/HybridWebView.cs
index cfb0b69660c1..74e441784a2f 100644
--- a/src/Controls/src/Core/HybridWebView/HybridWebView.cs
+++ b/src/Controls/src/Core/HybridWebView/HybridWebView.cs
@@ -20,6 +20,7 @@ public class HybridWebView : View, IHybridWebView
 		public static readonly BindableProperty HybridRootProperty;
 
 		[UnconditionalSuppressMessage("Trimming", "IL2026:RequiresUnreferencedCode", Justification = "BindableProperty.Create preserves public methods on the declaring type; it does not call the annotated legacy SetInvokeJavaScriptTarget overload.")]
+		[UnconditionalSuppressMessage("Trimming", "IL3050:RequiresDynamicCode", Justification = "BindableProperty.Create preserves public methods on the declaring type; it does not call the annotated legacy SetInvokeJavaScriptTarget overload.")]
 		static HybridWebView()
 		{
 			DefaultFileProperty = BindableProperty.Create(nameof(DefaultFile), typeof(string), typeof(HybridWebView), defaultValue: "index.html");

From 2133f421210980028903bf2d35bd9fd7adcb1d5c Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Thu, 18 Jun 2026 15:15:25 +0200
Subject: [PATCH 31/39] Fix HybridWebView source generator interception

Enable the HybridWebView interceptor generator through the same implicit MAUI targets path as the existing XAML and binding source generators, and make the generator handle source-generated JsonSerializerContext members before System.Text.Json generation completes.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../Microsoft.Maui.Controls.targets           |   9 +-
 .../net-android/PublicAPI.Unshipped.txt       |   3 +-
 .../PublicAPI/net-ios/PublicAPI.Unshipped.txt |   3 +-
 .../net-maccatalyst/PublicAPI.Unshipped.txt   |   3 +-
 .../net-tizen/PublicAPI.Unshipped.txt         |   3 +-
 .../net-windows/PublicAPI.Unshipped.txt       |   3 +-
 .../HybridWebViewSourceGenTests.cs            |  72 +++++++++++++
 .../SourceGen.UnitTests.csproj                |   1 +
 .../HybridWebViewInvokeTargetGenerator.cs     | 101 ++++++++++++++----
 .../net-android/PublicAPI.Unshipped.txt       |   2 +
 .../PublicAPI/net-ios/PublicAPI.Unshipped.txt |   2 +
 .../net-maccatalyst/PublicAPI.Unshipped.txt   |   2 +
 .../net-tizen/PublicAPI.Unshipped.txt         |   2 +
 .../net-windows/PublicAPI.Unshipped.txt       |   2 +
 14 files changed, 182 insertions(+), 26 deletions(-)
 create mode 100644 src/Controls/tests/SourceGen.UnitTests/HybridWebViewSourceGenTests.cs

diff --git a/src/Controls/src/Build.Tasks/nuget/buildTransitive/netstandard2.0/Microsoft.Maui.Controls.targets b/src/Controls/src/Build.Tasks/nuget/buildTransitive/netstandard2.0/Microsoft.Maui.Controls.targets
index 0e57f9e57e1b..ec1489820395 100644
--- a/src/Controls/src/Build.Tasks/nuget/buildTransitive/netstandard2.0/Microsoft.Maui.Controls.targets
+++ b/src/Controls/src/Build.Tasks/nuget/buildTransitive/netstandard2.0/Microsoft.Maui.Controls.targets
@@ -32,17 +32,20 @@
 
 	<ItemGroup Condition=" '$(DisableMauiAnalyzers)' != 'true' ">
 		<Analyzer Include="$(MSBuildThisFileDirectory)Microsoft.Maui.Controls.SourceGen.dll" IsImplicitlyDefined="true" />
-		<Analyzer Include="$(MSBuildThisFileDirectory)Microsoft.Maui.Core.HybridWebViewSourceGen.dll" IsImplicitlyDefined="true" />
 	</ItemGroup>
 
-	<!-- Enable BindingSourceGen -->
+	<!-- Enable interceptor source generators -->
 	<PropertyGroup>
 		<_MauiBindingInterceptorsSupport Condition=" '$(_MauiBindingInterceptorsSupport)' == '' and '$(DisableMauiAnalyzers)' != 'true' ">true</_MauiBindingInterceptorsSupport>
-		<InterceptorsPreviewNamespaces Condition=" '$(DisableMauiAnalyzers)' != 'true' or '$(_MauiBindingInterceptorsSupport)' == 'true' ">$(InterceptorsPreviewNamespaces);Microsoft.Maui.Controls.Generated</InterceptorsPreviewNamespaces>
+		<_MauiHybridWebViewInterceptorsSupport Condition=" '$(_MauiHybridWebViewInterceptorsSupport)' == '' and '$(DisableMauiAnalyzers)' != 'true' ">true</_MauiHybridWebViewInterceptorsSupport>
+		<InterceptorsPreviewNamespaces Condition=" '$(_MauiBindingInterceptorsSupport)' == 'true' or '$(_MauiHybridWebViewInterceptorsSupport)' == 'true' ">$(InterceptorsPreviewNamespaces);Microsoft.Maui.Controls.Generated</InterceptorsPreviewNamespaces>
 	</PropertyGroup>
 	<ItemGroup Condition=" '$(_MauiBindingInterceptorsSupport)' == 'true' ">
 		<Analyzer Include="$(MSBuildThisFileDirectory)Microsoft.Maui.Controls.BindingSourceGen.dll" IsImplicitlyDefined="true" />
 	</ItemGroup>
+	<ItemGroup Condition=" '$(_MauiHybridWebViewInterceptorsSupport)' == 'true' ">
+		<Analyzer Include="$(MSBuildThisFileDirectory)Microsoft.Maui.Core.HybridWebViewSourceGen.dll" IsImplicitlyDefined="true" />
+	</ItemGroup>
 
 	<ItemGroup Condition="'$(AndroidEnableProfiledAot)' == 'true' and '$(MauiUseDefaultAotProfile)' != 'false'">
 		<AndroidAotProfile Include="$(MSBuildThisFileDirectory)maui.aotprofile" />
diff --git a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
index f7d4dc83a367..81caec389761 100644
--- a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -1,7 +1,8 @@
 #nullable enable
 *REMOVED*~static Microsoft.Maui.Controls.VisualStateManager.GetVisualStateGroups(Microsoft.Maui.Controls.VisualElement visualElement) -> System.Collections.Generic.IList<Microsoft.Maui.Controls.VisualStateGroup>
+Microsoft.Maui.Controls.HybridWebView.Invoker.get -> Microsoft.Maui.HybridWebViewInvoker!
+Microsoft.Maui.Controls.HybridWebView.Invoker.set -> void
 Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
-Microsoft.Maui.Controls.HybridWebView.SetInvoker(Microsoft.Maui.HybridWebViewInvoker! invoker) -> void
 *REMOVED*~static readonly Microsoft.Maui.Controls.Handlers.Compatibility.ShellRenderer.DefaultForegroundColor -> Microsoft.Maui.Graphics.Color
 *REMOVED*~static readonly Microsoft.Maui.Controls.Handlers.Compatibility.ShellRenderer.DefaultTitleColor -> Microsoft.Maui.Graphics.Color
 *REMOVED*~static readonly Microsoft.Maui.Controls.Handlers.Compatibility.ShellRenderer.DefaultUnselectedColor -> Microsoft.Maui.Graphics.Color
diff --git a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index da21bc727321..6c842f3dc63e 100644
--- a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -4,8 +4,9 @@
 Microsoft.Maui.Controls.AppThemeBinding
 Microsoft.Maui.Controls.AppThemeBinding.AppThemeBinding() -> void
 Microsoft.Maui.Controls.BoxView.~BoxView() -> void
+Microsoft.Maui.Controls.HybridWebView.Invoker.get -> Microsoft.Maui.HybridWebViewInvoker!
+Microsoft.Maui.Controls.HybridWebView.Invoker.set -> void
 Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
-Microsoft.Maui.Controls.HybridWebView.SetInvoker(Microsoft.Maui.HybridWebViewInvoker! invoker) -> void
 Microsoft.Maui.Controls.ImageSource.InvalidateStyle() -> void
 Microsoft.Maui.Controls.LongPressGestureRecognizer
 Microsoft.Maui.Controls.LongPressGestureRecognizer.AllowableMovement.get -> double
diff --git a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index da21bc727321..6c842f3dc63e 100644
--- a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -4,8 +4,9 @@
 Microsoft.Maui.Controls.AppThemeBinding
 Microsoft.Maui.Controls.AppThemeBinding.AppThemeBinding() -> void
 Microsoft.Maui.Controls.BoxView.~BoxView() -> void
+Microsoft.Maui.Controls.HybridWebView.Invoker.get -> Microsoft.Maui.HybridWebViewInvoker!
+Microsoft.Maui.Controls.HybridWebView.Invoker.set -> void
 Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
-Microsoft.Maui.Controls.HybridWebView.SetInvoker(Microsoft.Maui.HybridWebViewInvoker! invoker) -> void
 Microsoft.Maui.Controls.ImageSource.InvalidateStyle() -> void
 Microsoft.Maui.Controls.LongPressGestureRecognizer
 Microsoft.Maui.Controls.LongPressGestureRecognizer.AllowableMovement.get -> double
diff --git a/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
index f6dccb3392cb..3a76458b5cbf 100644
--- a/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
@@ -1,6 +1,7 @@
 #nullable enable
+Microsoft.Maui.Controls.HybridWebView.Invoker.get -> Microsoft.Maui.HybridWebViewInvoker!
+Microsoft.Maui.Controls.HybridWebView.Invoker.set -> void
 Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
-Microsoft.Maui.Controls.HybridWebView.SetInvoker(Microsoft.Maui.HybridWebViewInvoker! invoker) -> void
 *REMOVED*~static Microsoft.Maui.Controls.VisualStateManager.GetVisualStateGroups(Microsoft.Maui.Controls.VisualElement visualElement) -> System.Collections.Generic.IList<Microsoft.Maui.Controls.VisualStateGroup>
 Microsoft.Maui.Controls.AppThemeBinding
 Microsoft.Maui.Controls.AppThemeBinding.AppThemeBinding() -> void
diff --git a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index 886f97c17664..646a9484122f 100644
--- a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -1,6 +1,7 @@
 #nullable enable
+Microsoft.Maui.Controls.HybridWebView.Invoker.get -> Microsoft.Maui.HybridWebViewInvoker!
+Microsoft.Maui.Controls.HybridWebView.Invoker.set -> void
 Microsoft.Maui.Controls.HybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
-Microsoft.Maui.Controls.HybridWebView.SetInvoker(Microsoft.Maui.HybridWebViewInvoker! invoker) -> void
 *REMOVED*~static Microsoft.Maui.Controls.VisualStateManager.GetVisualStateGroups(Microsoft.Maui.Controls.VisualElement visualElement) -> System.Collections.Generic.IList<Microsoft.Maui.Controls.VisualStateGroup>
 Microsoft.Maui.Controls.AppThemeBinding
 Microsoft.Maui.Controls.AppThemeBinding.AppThemeBinding() -> void
diff --git a/src/Controls/tests/SourceGen.UnitTests/HybridWebViewSourceGenTests.cs b/src/Controls/tests/SourceGen.UnitTests/HybridWebViewSourceGenTests.cs
new file mode 100644
index 000000000000..376091b824ec
--- /dev/null
+++ b/src/Controls/tests/SourceGen.UnitTests/HybridWebViewSourceGenTests.cs
@@ -0,0 +1,72 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text.Json.Serialization;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.Maui.HybridWebViewSourceGen;
+using Xunit;
+
+namespace Microsoft.Maui.Controls.Xaml.UnitTests.SourceGen;
+
+public class HybridWebViewSourceGenTests
+{
+	[Fact]
+	public void GeneratesInterceptorWhenJsonSerializerContextDefaultIsSourceGenerated()
+	{
+		const string source = """
+using System.Text.Json.Serialization;
+using Microsoft.Maui.Controls;
+
+namespace TestApp;
+
+public static class Registration
+{
+	public static void Register(HybridWebView hybridWebView)
+	{
+		hybridWebView.SetInvokeJavaScriptTarget(new InvokeTarget(), InvokeTargetJsonContext.Default);
+	}
+}
+
+public sealed class InvokeTarget
+{
+	public string Echo(string value) => value;
+}
+
+[JsonSerializable(typeof(string))]
+internal sealed partial class InvokeTargetJsonContext : JsonSerializerContext
+{
+}
+""";
+
+		var parseOptions = CSharpParseOptions.Default
+			.WithLanguageVersion(LanguageVersion.Preview)
+			.WithFeatures([new KeyValuePair<string, string>("InterceptorsPreviewNamespaces", "Microsoft.Maui.Controls.Generated")]);
+		var compilation = CSharpCompilation.Create(
+			"HwvSourceGenTest",
+			[CSharpSyntaxTree.ParseText(source, parseOptions, path: "/tmp/TestApp/Registration.cs")],
+			GetReferences(),
+			new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary));
+
+		GeneratorDriver driver = CSharpGeneratorDriver.Create([new HybridWebViewInvokeTargetGenerator().AsSourceGenerator()], parseOptions: parseOptions);
+		var result = driver.RunGenerators(compilation).GetRunResult();
+
+		var generated = Assert.Single(result.Results.Single().GeneratedSources);
+		Assert.Equal("HybridWebViewInterceptors.g.cs", generated.HintName);
+		Assert.Contains("file static class HybridWebViewInterceptors", generated.SourceText.ToString(), StringComparison.Ordinal);
+		Assert.Contains("SetInvokeJavaScriptTarget_0", generated.SourceText.ToString(), StringComparison.Ordinal);
+	}
+
+	static IEnumerable<MetadataReference> GetReferences()
+	{
+		var trustedPlatformAssemblies = ((string?)AppContext.GetData("TRUSTED_PLATFORM_ASSEMBLIES"))!
+			.Split(Path.PathSeparator);
+
+		return trustedPlatformAssemblies
+			.Append(typeof(IHybridWebView).Assembly.Location)
+			.Append(typeof(HybridWebView).Assembly.Location)
+			.Distinct()
+			.Select(static path => MetadataReference.CreateFromFile(path));
+	}
+}
diff --git a/src/Controls/tests/SourceGen.UnitTests/SourceGen.UnitTests.csproj b/src/Controls/tests/SourceGen.UnitTests/SourceGen.UnitTests.csproj
index 1767e782eee7..ae3aee131bab 100644
--- a/src/Controls/tests/SourceGen.UnitTests/SourceGen.UnitTests.csproj
+++ b/src/Controls/tests/SourceGen.UnitTests/SourceGen.UnitTests.csproj
@@ -28,6 +28,7 @@
     <ProjectReference Include="..\..\src\Core\Controls.Core.csproj" />
     <ProjectReference Include="..\..\src\SourceGen\Controls.SourceGen.csproj" />
     <ProjectReference Include="..\..\src\Xaml\Controls.Xaml.csproj" />
+    <ProjectReference Include="..\..\..\Core\src\HybridWebViewSourceGen\Core.HybridWebViewSourceGen.csproj" />
     <ProjectReference Include="..\..\..\..\src\BlazorWebView\src\Maui\Microsoft.AspNetCore.Components.WebView.Maui.csproj" />
   </ItemGroup>
 
diff --git a/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs b/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs
index 9f56610ac6de..6173644f8aa5 100644
--- a/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs
+++ b/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs
@@ -30,7 +30,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
 			transform: static (ctx, ct) => GetInvocationInfo(ctx, ct))
 			.Where(static info => info is not null);
 
-		context.RegisterSourceOutput(invocations.Collect(), GenerateSource);
+		context.RegisterImplementationSourceOutput(invocations.Collect(), GenerateSource);
 	}
 
 	private static bool IsSetInvokeJavaScriptTargetCandidate(SyntaxNode node)
@@ -50,31 +50,68 @@ private static bool IsSetInvokeJavaScriptTargetCandidate(SyntaxNode node)
 	private static InvocationInfo? GetInvocationInfo(GeneratorSyntaxContext ctx, System.Threading.CancellationToken ct)
 	{
 		var invocation = (InvocationExpressionSyntax)ctx.Node;
-		var symbolInfo = ctx.SemanticModel.GetSymbolInfo(invocation, ct);
-		if (symbolInfo.Symbol is not IMethodSymbol method)
+		if (invocation.Expression is not MemberAccessExpressionSyntax memberAccess)
 			return null;
 
 		// Must be the 2-arg overload: SetInvokeJavaScriptTarget<T>(T target, JsonSerializerContext ctx)
-		if (method.Parameters.Length != 2)
+		if (invocation.ArgumentList.Arguments.Count != 2)
 			return null;
 
-		var containingType = method.ContainingType?.ToDisplayString();
-		if (containingType != HybridWebViewTypeName && containingType != IHybridWebViewTypeName)
-			return null;
+		string receiverTypeName;
+		INamedTypeSymbol? targetType;
+		var method = ctx.SemanticModel.GetSymbolInfo(invocation.Expression, ct).Symbol as IMethodSymbol;
+		if (method is not null)
+		{
+			if (method.Parameters.Length != 2)
+				return null;
 
-		var receiverTypeName = containingType == IHybridWebViewTypeName
-			? IHybridWebViewFullyQualifiedTypeName
-			: HybridWebViewFullyQualifiedTypeName;
+			var containingType = method.ContainingType?.ToDisplayString();
+			if (containingType != HybridWebViewTypeName && containingType != IHybridWebViewTypeName)
+				return null;
 
-		var secondParamType = method.Parameters[1].Type?.ToDisplayString();
-		if (secondParamType != JsonSerializerContextTypeName)
-			return null;
+			var secondParamType = method.Parameters[1].Type?.ToDisplayString();
+			if (secondParamType != JsonSerializerContextTypeName)
+				return null;
 
-		// Get the type argument T
-		if (method.TypeArguments.Length != 1)
-			return null;
+			// Get the type argument T
+			if (method.TypeArguments.Length != 1)
+				return null;
+
+			receiverTypeName = containingType == IHybridWebViewTypeName
+				? IHybridWebViewFullyQualifiedTypeName
+				: HybridWebViewFullyQualifiedTypeName;
+			targetType = method.TypeArguments[0] as INamedTypeSymbol;
+		}
+		else
+		{
+			var receiverType = ctx.SemanticModel.GetTypeInfo(memberAccess.Expression, ct).Type;
+			if (receiverType is null)
+				return null;
+
+			if (IsSameOrDerivedFrom(receiverType, HybridWebViewTypeName))
+			{
+				receiverTypeName = HybridWebViewFullyQualifiedTypeName;
+			}
+			else if (IsSameOrDerivedFrom(receiverType, IHybridWebViewTypeName) || ImplementsInterface(receiverType, IHybridWebViewTypeName))
+			{
+				receiverTypeName = IHybridWebViewFullyQualifiedTypeName;
+			}
+			else
+			{
+				return null;
+			}
+
+			var jsonSerializerContextType = ctx.SemanticModel.GetTypeInfo(invocation.ArgumentList.Arguments[1].Expression, ct).Type;
+			if (jsonSerializerContextType is not null
+				&& jsonSerializerContextType is not IErrorTypeSymbol
+				&& !IsSameOrDerivedFrom(jsonSerializerContextType, JsonSerializerContextTypeName))
+			{
+				return null;
+			}
+
+			targetType = GetTargetType(ctx, memberAccess, invocation, ct);
+		}
 
-		var targetType = method.TypeArguments[0] as INamedTypeSymbol;
 		if (targetType is null)
 			return null;
 
@@ -161,6 +198,34 @@ private static bool IsSetInvokeJavaScriptTargetCandidate(SyntaxNode node)
 			overloadedMethodNames);
 	}
 
+	private static INamedTypeSymbol? GetTargetType(GeneratorSyntaxContext ctx, MemberAccessExpressionSyntax memberAccess, InvocationExpressionSyntax invocation, System.Threading.CancellationToken ct)
+	{
+		if (memberAccess.Name is GenericNameSyntax genericName
+			&& genericName.TypeArgumentList.Arguments.Count == 1
+			&& ctx.SemanticModel.GetSymbolInfo(genericName.TypeArgumentList.Arguments[0], ct).Symbol is INamedTypeSymbol explicitType)
+		{
+			return explicitType;
+		}
+
+		return ctx.SemanticModel.GetTypeInfo(invocation.ArgumentList.Arguments[0].Expression, ct).Type as INamedTypeSymbol;
+	}
+
+	private static bool IsSameOrDerivedFrom(ITypeSymbol type, string typeName)
+	{
+		for (var current = type; current is not null; current = current.BaseType)
+		{
+			if (current.ToDisplayString() == typeName)
+				return true;
+		}
+
+		return false;
+	}
+
+	private static bool ImplementsInterface(ITypeSymbol type, string interfaceTypeName)
+	{
+		return type.AllInterfaces.Any(interfaceType => interfaceType.ToDisplayString() == interfaceTypeName);
+	}
+
 	private static void GenerateSource(SourceProductionContext spc, ImmutableArray<InvocationInfo?> invocations)
 	{
 		if (invocations.IsDefaultOrEmpty)
@@ -266,7 +331,7 @@ private static void GenerateSource(SourceProductionContext spc, ImmutableArray<I
 					for (int i = 0; i < method.Parameters.Length; i++)
 					{
 						var p = method.Parameters[i];
-						sb.AppendLine($"                        var __{p.Name} = global::System.Text.Json.JsonSerializer.Deserialize<{p.TypeName}>(paramJsonValues[{i}], GetRequiredJsonTypeInfo<{p.TypeName}>(_ctx, \"{method.Name}\", \"{p.Name}\"));");
+						sb.AppendLine($"                        var __{p.Name} = global::System.Text.Json.JsonSerializer.Deserialize<{p.TypeName}>(paramJsonValues[{i}], GetRequiredJsonTypeInfo<{p.TypeName}>(_ctx, \"{method.Name}\", \"{p.Name}\"))!;");
 					}
 				}
 
diff --git a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
index 4dc806f4cefc..b143c1a00237 100644
--- a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -2,6 +2,8 @@
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.HybridWebViewInvoker
 Microsoft.Maui.HybridWebViewInvoker.HybridWebViewInvoker(object? invokeJavaScriptTarget, System.Type? invokeJavaScriptType) -> void
+Microsoft.Maui.IHybridWebView.Invoker.get -> Microsoft.Maui.HybridWebViewInvoker!
+Microsoft.Maui.IHybridWebView.Invoker.set -> void
 abstract Microsoft.Maui.HybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
 *REMOVED*override Microsoft.Maui.Graphics.MauiDrawable.Dispose(bool disposing) -> void
 *REMOVED*override Microsoft.Maui.Graphics.MauiDrawable.OnBoundsChange(Android.Graphics.Rect! bounds) -> void
diff --git a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index f3aa046921d3..f404adc88419 100644
--- a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -1,6 +1,8 @@
 #nullable enable
 Microsoft.Maui.HybridWebViewInvoker
 Microsoft.Maui.HybridWebViewInvoker.HybridWebViewInvoker(object? invokeJavaScriptTarget, System.Type? invokeJavaScriptType) -> void
+Microsoft.Maui.IHybridWebView.Invoker.get -> Microsoft.Maui.HybridWebViewInvoker!
+Microsoft.Maui.IHybridWebView.Invoker.set -> void
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 abstract Microsoft.Maui.HybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
 override Microsoft.Maui.Handlers.LabelHandler.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
diff --git a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index f3aa046921d3..f404adc88419 100644
--- a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -1,6 +1,8 @@
 #nullable enable
 Microsoft.Maui.HybridWebViewInvoker
 Microsoft.Maui.HybridWebViewInvoker.HybridWebViewInvoker(object? invokeJavaScriptTarget, System.Type? invokeJavaScriptType) -> void
+Microsoft.Maui.IHybridWebView.Invoker.get -> Microsoft.Maui.HybridWebViewInvoker!
+Microsoft.Maui.IHybridWebView.Invoker.set -> void
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 abstract Microsoft.Maui.HybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
 override Microsoft.Maui.Handlers.LabelHandler.GetDesiredSize(double widthConstraint, double heightConstraint) -> Microsoft.Maui.Graphics.Size
diff --git a/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
index d631f80f311c..7c0b1ed097b2 100644
--- a/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
@@ -2,5 +2,7 @@
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 Microsoft.Maui.HybridWebViewInvoker
 Microsoft.Maui.HybridWebViewInvoker.HybridWebViewInvoker(object? invokeJavaScriptTarget, System.Type? invokeJavaScriptType) -> void
+Microsoft.Maui.IHybridWebView.Invoker.get -> Microsoft.Maui.HybridWebViewInvoker!
+Microsoft.Maui.IHybridWebView.Invoker.set -> void
 abstract Microsoft.Maui.HybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
 static Microsoft.Maui.GridLength.implicit operator Microsoft.Maui.GridLength(string! value) -> Microsoft.Maui.GridLength
diff --git a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index 8686fb474223..8a82c536155e 100644
--- a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -1,6 +1,8 @@
 #nullable enable
 Microsoft.Maui.HybridWebViewInvoker
 Microsoft.Maui.HybridWebViewInvoker.HybridWebViewInvoker(object? invokeJavaScriptTarget, System.Type? invokeJavaScriptType) -> void
+Microsoft.Maui.IHybridWebView.Invoker.get -> Microsoft.Maui.HybridWebViewInvoker!
+Microsoft.Maui.IHybridWebView.Invoker.set -> void
 Microsoft.Maui.IHybridWebView.SetInvokeJavaScriptTarget<T>(T! target, System.Text.Json.Serialization.JsonSerializerContext! jsonSerializerContext) -> void
 abstract Microsoft.Maui.HybridWebViewInvoker.InvokeMethodAsync(string! methodName, string![]? paramJsonValues) -> System.Threading.Tasks.Task<string?>!
 override Microsoft.Maui.Platform.ContentPanel.OnCreateAutomationPeer() -> Microsoft.UI.Xaml.Automation.Peers.AutomationPeer!

From 471995e19a0dc76842097c4704432d5553b18e91 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Thu, 18 Jun 2026 15:26:52 +0200
Subject: [PATCH 32/39] Report open generic HybridWebView invoke targets

Emit MAUIHWVSG002 when SetInvokeJavaScriptTarget<T> is used with an open generic target type, since the source generator cannot produce closed AOT-safe dispatch for an unknown T.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../HybridWebViewSourceGenTests.cs            | 36 ++++++++++
 .../AnalyzerReleases.Unshipped.md             |  1 +
 .../HybridWebViewInvokeTargetGenerator.cs     | 71 ++++++++++++++++---
 3 files changed, 99 insertions(+), 9 deletions(-)

diff --git a/src/Controls/tests/SourceGen.UnitTests/HybridWebViewSourceGenTests.cs b/src/Controls/tests/SourceGen.UnitTests/HybridWebViewSourceGenTests.cs
index 376091b824ec..95281e356eed 100644
--- a/src/Controls/tests/SourceGen.UnitTests/HybridWebViewSourceGenTests.cs
+++ b/src/Controls/tests/SourceGen.UnitTests/HybridWebViewSourceGenTests.cs
@@ -58,6 +58,42 @@ internal sealed partial class InvokeTargetJsonContext : JsonSerializerContext
 		Assert.Contains("SetInvokeJavaScriptTarget_0", generated.SourceText.ToString(), StringComparison.Ordinal);
 	}
 
+	[Fact]
+	public void ReportsDiagnosticForOpenGenericInvokeTarget()
+	{
+		const string source = """
+using System.Text.Json.Serialization;
+using Microsoft.Maui.Controls;
+
+namespace TestApp;
+
+public static class Registration
+{
+	public static void Register<TTarget>(HybridWebView hybridWebView, TTarget target, JsonSerializerContext jsonSerializerContext)
+		where TTarget : class
+	{
+		hybridWebView.SetInvokeJavaScriptTarget<TTarget>(target, jsonSerializerContext);
+	}
+}
+""";
+
+		var parseOptions = CSharpParseOptions.Default
+			.WithLanguageVersion(LanguageVersion.Preview)
+			.WithFeatures([new KeyValuePair<string, string>("InterceptorsPreviewNamespaces", "Microsoft.Maui.Controls.Generated")]);
+		var compilation = CSharpCompilation.Create(
+			"HwvSourceGenTest",
+			[CSharpSyntaxTree.ParseText(source, parseOptions, path: "/tmp/TestApp/Registration.cs")],
+			GetReferences(),
+			new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary));
+
+		GeneratorDriver driver = CSharpGeneratorDriver.Create([new HybridWebViewInvokeTargetGenerator().AsSourceGenerator()], parseOptions: parseOptions);
+		var result = driver.RunGenerators(compilation).GetRunResult();
+
+		var diagnostic = Assert.Single(result.Results.Single().Diagnostics);
+		Assert.Equal("MAUIHWVSG002", diagnostic.Id);
+		Assert.Contains("TTarget", diagnostic.GetMessage(), StringComparison.Ordinal);
+	}
+
 	static IEnumerable<MetadataReference> GetReferences()
 	{
 		var trustedPlatformAssemblies = ((string?)AppContext.GetData("TRUSTED_PLATFORM_ASSEMBLIES"))!
diff --git a/src/Core/src/HybridWebViewSourceGen/AnalyzerReleases.Unshipped.md b/src/Core/src/HybridWebViewSourceGen/AnalyzerReleases.Unshipped.md
index 1806b5cbf5cc..448247bb4c6a 100644
--- a/src/Core/src/HybridWebViewSourceGen/AnalyzerReleases.Unshipped.md
+++ b/src/Core/src/HybridWebViewSourceGen/AnalyzerReleases.Unshipped.md
@@ -6,3 +6,4 @@
 Rule ID | Category | Severity | Notes
 --------|----------|----------|-------
 MAUIHWVSG001 | HybridWebView | Error | UnsupportedOverloadedMethods
+MAUIHWVSG002 | HybridWebView | Error | OpenGenericInvokeTarget
diff --git a/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs b/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs
index 6173644f8aa5..433c44159869 100644
--- a/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs
+++ b/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs
@@ -22,6 +22,13 @@ public sealed class HybridWebViewInvokeTargetGenerator : IIncrementalGenerator
 		"HybridWebView",
 		DiagnosticSeverity.Error,
 		isEnabledByDefault: true);
+	private static readonly DiagnosticDescriptor OpenGenericInvokeTarget = new(
+		"MAUIHWVSG002",
+		"HybridWebView invoke target type must be closed",
+		"HybridWebView invoke target type '{0}' is open generic. SetInvokeJavaScriptTarget<T> requires a closed target type so the source generator can generate AOT-safe dispatch.",
+		"HybridWebView",
+		DiagnosticSeverity.Error,
+		isEnabledByDefault: true);
 
 	public void Initialize(IncrementalGeneratorInitializationContext context)
 	{
@@ -58,7 +65,7 @@ private static bool IsSetInvokeJavaScriptTargetCandidate(SyntaxNode node)
 			return null;
 
 		string receiverTypeName;
-		INamedTypeSymbol? targetType;
+		ITypeSymbol? targetTypeSymbol;
 		var method = ctx.SemanticModel.GetSymbolInfo(invocation.Expression, ct).Symbol as IMethodSymbol;
 		if (method is not null)
 		{
@@ -80,7 +87,7 @@ private static bool IsSetInvokeJavaScriptTargetCandidate(SyntaxNode node)
 			receiverTypeName = containingType == IHybridWebViewTypeName
 				? IHybridWebViewFullyQualifiedTypeName
 				: HybridWebViewFullyQualifiedTypeName;
-			targetType = method.TypeArguments[0] as INamedTypeSymbol;
+			targetTypeSymbol = method.TypeArguments[0];
 		}
 		else
 		{
@@ -109,10 +116,20 @@ private static bool IsSetInvokeJavaScriptTargetCandidate(SyntaxNode node)
 				return null;
 			}
 
-			targetType = GetTargetType(ctx, memberAccess, invocation, ct);
+			targetTypeSymbol = GetTargetType(ctx, memberAccess, invocation, ct);
+		}
+
+		if (targetTypeSymbol is null)
+			return null;
+
+		if (ContainsTypeParameter(targetTypeSymbol))
+		{
+			return new InvocationInfo(
+				invocation.GetLocation(),
+				targetTypeSymbol.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat));
 		}
 
-		if (targetType is null)
+		if (targetTypeSymbol is not INamedTypeSymbol targetType)
 			return null;
 
 		// Get interceptable location
@@ -198,16 +215,30 @@ private static bool IsSetInvokeJavaScriptTargetCandidate(SyntaxNode node)
 			overloadedMethodNames);
 	}
 
-	private static INamedTypeSymbol? GetTargetType(GeneratorSyntaxContext ctx, MemberAccessExpressionSyntax memberAccess, InvocationExpressionSyntax invocation, System.Threading.CancellationToken ct)
+	private static ITypeSymbol? GetTargetType(GeneratorSyntaxContext ctx, MemberAccessExpressionSyntax memberAccess, InvocationExpressionSyntax invocation, System.Threading.CancellationToken ct)
 	{
 		if (memberAccess.Name is GenericNameSyntax genericName
 			&& genericName.TypeArgumentList.Arguments.Count == 1
-			&& ctx.SemanticModel.GetSymbolInfo(genericName.TypeArgumentList.Arguments[0], ct).Symbol is INamedTypeSymbol explicitType)
+			&& ctx.SemanticModel.GetSymbolInfo(genericName.TypeArgumentList.Arguments[0], ct).Symbol is ITypeSymbol explicitType)
 		{
 			return explicitType;
 		}
 
-		return ctx.SemanticModel.GetTypeInfo(invocation.ArgumentList.Arguments[0].Expression, ct).Type as INamedTypeSymbol;
+		return ctx.SemanticModel.GetTypeInfo(invocation.ArgumentList.Arguments[0].Expression, ct).Type;
+	}
+
+	private static bool ContainsTypeParameter(ITypeSymbol type)
+	{
+		if (type.TypeKind == TypeKind.TypeParameter)
+			return true;
+
+		return type switch
+		{
+			INamedTypeSymbol namedType => namedType.TypeArguments.Any(ContainsTypeParameter),
+			IArrayTypeSymbol arrayType => ContainsTypeParameter(arrayType.ElementType),
+			IPointerTypeSymbol pointerType => ContainsTypeParameter(pointerType.PointedAtType),
+			_ => false
+		};
 	}
 
 	private static bool IsSameOrDerivedFrom(ITypeSymbol type, string typeName)
@@ -263,7 +294,16 @@ private static void GenerateSource(SourceProductionContext spc, ImmutableArray<I
 			if (info is null)
 				continue;
 
-			var loc = info.Location;
+			if (info.OpenGenericTargetTypeName is not null)
+			{
+				spc.ReportDiagnostic(Diagnostic.Create(
+					OpenGenericInvokeTarget,
+					info.DiagnosticLocation,
+					info.OpenGenericTargetTypeName));
+				continue;
+			}
+
+			var loc = info.Location!;
 
 			if (info.OverloadedMethodNames.Length > 0)
 			{
@@ -387,6 +427,17 @@ private static void GenerateSource(SourceProductionContext spc, ImmutableArray<I
 
 	private sealed class InvocationInfo
 	{
+		public InvocationInfo(Location diagnosticLocation, string openGenericTargetTypeName)
+		{
+			Location = null;
+			DiagnosticLocation = diagnosticLocation;
+			ReceiverTypeName = string.Empty;
+			TargetTypeName = string.Empty;
+			Methods = [];
+			OverloadedMethodNames = [];
+			OpenGenericTargetTypeName = openGenericTargetTypeName;
+		}
+
 		public InvocationInfo(InterceptableLocation location, Location diagnosticLocation, string receiverTypeName, string targetTypeName, MethodInfo[] methods, string[] overloadedMethodNames)
 		{
 			Location = location;
@@ -395,13 +446,15 @@ public InvocationInfo(InterceptableLocation location, Location diagnosticLocatio
 			TargetTypeName = targetTypeName;
 			Methods = methods;
 			OverloadedMethodNames = overloadedMethodNames;
+			OpenGenericTargetTypeName = null;
 		}
-		public InterceptableLocation Location { get; }
+		public InterceptableLocation? Location { get; }
 		public Location DiagnosticLocation { get; }
 		public string ReceiverTypeName { get; }
 		public string TargetTypeName { get; }
 		public MethodInfo[] Methods { get; }
 		public string[] OverloadedMethodNames { get; }
+		public string? OpenGenericTargetTypeName { get; }
 	}
 
 	private sealed class MethodInfo

From 3c175ac318c961f015aa72137aaed3d6b097b6a1 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 18 Jun 2026 14:43:12 +0000
Subject: [PATCH 33/39] Address HybridWebView merge review feedback

Co-authored-by: PureWeen <5375137+PureWeen@users.noreply.github.com>
---
 .../HybridWebViewTests_InvokeJavaScriptAsync.cs           | 6 +++---
 .../HybridWebViewTests_SetInvokeJavaScriptTarget.cs       | 6 +++---
 .../src/Handlers/HybridWebView/HybridWebViewHandler.cs    | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_InvokeJavaScriptAsync.cs b/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_InvokeJavaScriptAsync.cs
index 1d0b36a7faad..cd700cadf08f 100644
--- a/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_InvokeJavaScriptAsync.cs
+++ b/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_InvokeJavaScriptAsync.cs
@@ -316,7 +316,7 @@ public Task InvokeJavaScriptMethodWithParametersAndVoidReturnUsingNullReturnMeth
 	public Task InvokeJavaScriptMethodThatThrowsNumber(string type) =>
 		RunExceptionTest("EvaluateMeWithParamsThatThrows" + type, 1, ex =>
 		{
-			Assert.Equal("InvokeJavaScript threw an exception: 777.777", ex.Message);
+			Assert.Equal("InvokeJavaScriptAsync threw an exception: 777.777", ex.Message);
 			Assert.Equal("777.777", ex.InnerException?.Message);
 			Assert.Null(ex.InnerException?.Data["JavaScriptErrorName"]);
 			Assert.NotNull(ex.InnerException?.StackTrace);
@@ -328,7 +328,7 @@ public Task InvokeJavaScriptMethodThatThrowsNumber(string type) =>
 	public Task InvokeJavaScriptMethodThatThrowsString(string type) =>
 		RunExceptionTest("EvaluateMeWithParamsThatThrows" + type, 2, ex =>
 		{
-			Assert.Equal("InvokeJavaScript threw an exception: String: 777.777", ex.Message);
+			Assert.Equal("InvokeJavaScriptAsync threw an exception: String: 777.777", ex.Message);
 			Assert.Equal("String: 777.777", ex.InnerException?.Message);
 			Assert.Null(ex.InnerException?.Data["JavaScriptErrorName"]);
 			Assert.NotNull(ex.InnerException?.StackTrace);
@@ -340,7 +340,7 @@ public Task InvokeJavaScriptMethodThatThrowsString(string type) =>
 	public Task InvokeJavaScriptMethodThatThrowsError(string type) =>
 		RunExceptionTest("EvaluateMeWithParamsThatThrows" + type, 3, ex =>
 		{
-			Assert.Equal("InvokeJavaScript threw an exception: Generic Error: 777.777", ex.Message);
+			Assert.Equal("InvokeJavaScriptAsync threw an exception: Generic Error: 777.777", ex.Message);
 			Assert.Equal("Generic Error: 777.777", ex.InnerException?.Message);
 			Assert.Equal("Error", ex.InnerException?.Data["JavaScriptErrorName"]);
 			Assert.NotNull(ex.InnerException?.StackTrace);
diff --git a/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs b/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs
index cd133207cadf..8a5514e7b48a 100644
--- a/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs
+++ b/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs
@@ -174,8 +174,8 @@ private class InvokeJavaScriptAsyncTestData : IEnumerable<object?[]>
 	{
 		public IEnumerator<object?[]> GetEnumerator()
 		{
-			const string ComplexResult = "{\\\"result\\\":123,\\\"operationName\\\":\\\"Test\\\"}";
-			const string DictionaryResult = "{\\\"first\\\":111,\\\"second\\\":222,\\\"third\\\":333}";
+			const string ComplexResult = "{\"result\":123,\"operationName\":\"Test\"}";
+			const string DictionaryResult = "{\"first\":111,\"second\":222,\"third\":333}";
 			const int ValueTypeResult = 2;
 
 			// Test variations of:
@@ -200,7 +200,7 @@ IEnumerator IEnumerable.GetEnumerator()
 		}
 	}
 
-	
+
 	public class ComputationResult
 	{
 		public decimal result { get; set; }
diff --git a/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs b/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs
index c8a929ca2d41..6924b46eb41a 100644
--- a/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs
+++ b/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs
@@ -109,7 +109,7 @@ void MessageReceived(string rawMessage)
 		{
 			if (string.IsNullOrEmpty(rawMessage))
 			{
-				throw new ArgumentException($"The raw message cannot be null or empty.", nameof(rawMessage));
+				throw new ArgumentException("The raw message cannot be null or empty.", nameof(rawMessage));
 			}
 #if !NETSTANDARD2_0
 			var indexOfPipe = rawMessage.IndexOf('|', StringComparison.Ordinal);
@@ -155,7 +155,7 @@ void MessageReceived(string rawMessage)
 								{
 									var jsError = JsonSerializer.Deserialize(result, HybridWebViewHandlerJsonContext.Default.JSInvokeError);
 									var jsException = new HybridWebViewInvokeJavaScriptException(jsError?.Message, jsError?.Name, jsError?.StackTrace);
-									var ex = new HybridWebViewInvokeJavaScriptException($"InvokeJavaScript threw an exception: {jsException.Message}", jsException);
+									var ex = new HybridWebViewInvokeJavaScriptException($"InvokeJavaScriptAsync threw an exception: {jsException.Message}", jsException);
 									taskManager.SetTaskFailed(taskId, ex);
 								}
 							}
@@ -259,7 +259,7 @@ private partial class HybridWebViewHandlerJsonContext : JsonSerializerContext
 		public static async void MapEvaluateJavaScriptAsync(IHybridWebViewHandler handler, IHybridWebView hybridWebView, object? arg)
 		{
 			if (arg is not EvaluateJavaScriptAsyncRequest request ||
-				handler.PlatformView is not MauiHybridWebView hybridPlatformWebView)
+				handler.PlatformView is not MauiHybridWebView)
 			{
 				return;
 			}
@@ -344,7 +344,7 @@ public static async void MapInvokeJavaScriptAsync(IHybridWebViewHandler handler,
 				? string.Empty
 				: string.Join(
 					", ",
-					invokeJavaScriptRequest.ParamValues.Select((v, i) => (v == null ? "null" : JsonSerializer.Serialize(v, invokeJavaScriptRequest.ParamJsonTypeInfos![i]!))));
+					invokeJavaScriptRequest.ParamValues.Select((v, i) => v == null ? "null" : JsonSerializer.Serialize(v, invokeJavaScriptRequest.ParamJsonTypeInfos![i]!)));
 
 			await handler.InvokeAsync(nameof(IHybridWebView.EvaluateJavaScriptAsync),
 				new EvaluateJavaScriptAsyncRequest($"window.HybridWebView.__InvokeJavaScript({currentInvokeTaskId}, {invokeJavaScriptRequest.MethodName}, [{paramsValuesStringArray}])"));

From 2982cf90be7ff703112a0433d56f445310ddc941 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Thu, 18 Jun 2026 17:49:50 +0200
Subject: [PATCH 34/39] Fix HybridWebView source generator edge cases

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../HybridWebViewTests_ExceptionHandling.cs   |   4 +-
 .../HybridWebViewTests_InvokeDotNetFails.cs   |   2 +-
 ...dWebViewTests_SetInvokeJavaScriptTarget.cs |   2 +-
 .../HybridWebViewSourceGenTests.cs            | 317 ++++++++++++++++--
 .../AnalyzerReleases.Unshipped.md             |   1 +
 .../HybridWebViewInvokeTargetGenerator.cs     | 161 +++++++--
 6 files changed, 428 insertions(+), 59 deletions(-)

diff --git a/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_ExceptionHandling.cs b/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_ExceptionHandling.cs
index 54bda4587c3c..9cbcea880efd 100644
--- a/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_ExceptionHandling.cs
+++ b/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_ExceptionHandling.cs
@@ -112,11 +112,11 @@ public Task MissingJsonMetadata_ShouldPropagateToJavaScript() =>
 			var errorMessage = await hybridWebView.EvaluateJavaScriptAsync("GetLastErrorMessage()");
 
 			Assert.Equal("InvalidOperationException", errorType);
-			Assert.Equal("The JSON serializer context did not provide metadata for type 'System.String'.", errorMessage);
+			Assert.Equal("The JSON serializer context does not contain metadata for type 'System.String' (used by return of method 'SuccessMethod'). Add [JsonSerializable(typeof(String))] to your JsonSerializerContext.", errorMessage);
 			Assert.Equal("SuccessMethod", invokeJavaScriptTarget.LastMethodCalled);
 		});
 
-	private class TestExceptionMethods
+	internal class TestExceptionMethods
 	{
 		public string? LastMethodCalled { get; private set; }
 
diff --git a/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_InvokeDotNetFails.cs b/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_InvokeDotNetFails.cs
index 84c5d380346c..d7dddbb5d85b 100644
--- a/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_InvokeDotNetFails.cs
+++ b/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_InvokeDotNetFails.cs
@@ -120,7 +120,7 @@ private Task RunJavaScriptTest(Func<HybridWebView, InvokeTarget, Task> validateR
 			await validateResult(hybridWebView, target);
 		});
 
-	private class InvokeTarget
+	internal class InvokeTarget
 	{
 		public List<string> ParamValues { get; private set; } = new();
 
diff --git a/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs b/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs
index 8a5514e7b48a..ebb554833908 100644
--- a/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs
+++ b/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs
@@ -68,7 +68,7 @@ public Task InvokerIsSet_WhenUsingLegacyOverload() =>
 			return Task.CompletedTask;
 		});
 
-	private class TestDotNetMethods
+	internal class TestDotNetMethods
 	{
 		private static ComputationResult NewComplexResult =>
 			new ComputationResult { result = 123, operationName = "Test" };
diff --git a/src/Controls/tests/SourceGen.UnitTests/HybridWebViewSourceGenTests.cs b/src/Controls/tests/SourceGen.UnitTests/HybridWebViewSourceGenTests.cs
index 95281e356eed..85bf9d315aa4 100644
--- a/src/Controls/tests/SourceGen.UnitTests/HybridWebViewSourceGenTests.cs
+++ b/src/Controls/tests/SourceGen.UnitTests/HybridWebViewSourceGenTests.cs
@@ -1,8 +1,8 @@
 using System;
+using System.Collections.Immutable;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text.Json.Serialization;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.Maui.HybridWebViewSourceGen;
@@ -16,7 +16,10 @@ public class HybridWebViewSourceGenTests
 	public void GeneratesInterceptorWhenJsonSerializerContextDefaultIsSourceGenerated()
 	{
 		const string source = """
+using System;
+using System.Text.Json;
 using System.Text.Json.Serialization;
+using System.Text.Json.Serialization.Metadata;
 using Microsoft.Maui.Controls;
 
 namespace TestApp;
@@ -34,23 +37,17 @@ public sealed class InvokeTarget
 	public string Echo(string value) => value;
 }
 
-[JsonSerializable(typeof(string))]
-internal sealed partial class InvokeTargetJsonContext : JsonSerializerContext
+internal sealed class InvokeTargetJsonContext : JsonSerializerContext
 {
+	public static InvokeTargetJsonContext Default { get; } = new();
+	private InvokeTargetJsonContext() : base(null) { }
+	protected override JsonSerializerOptions? GeneratedSerializerOptions => null;
+	public override JsonTypeInfo? GetTypeInfo(Type type) => null;
 }
 """;
 
-		var parseOptions = CSharpParseOptions.Default
-			.WithLanguageVersion(LanguageVersion.Preview)
-			.WithFeatures([new KeyValuePair<string, string>("InterceptorsPreviewNamespaces", "Microsoft.Maui.Controls.Generated")]);
-		var compilation = CSharpCompilation.Create(
-			"HwvSourceGenTest",
-			[CSharpSyntaxTree.ParseText(source, parseOptions, path: "/tmp/TestApp/Registration.cs")],
-			GetReferences(),
-			new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary));
-
-		GeneratorDriver driver = CSharpGeneratorDriver.Create([new HybridWebViewInvokeTargetGenerator().AsSourceGenerator()], parseOptions: parseOptions);
-		var result = driver.RunGenerators(compilation).GetRunResult();
+		var (result, updatedCompilation, generatorDiagnostics) = RunGenerator(source);
+		AssertNoCompilationErrors(updatedCompilation, generatorDiagnostics);
 
 		var generated = Assert.Single(result.Results.Single().GeneratedSources);
 		Assert.Equal("HybridWebViewInterceptors.g.cs", generated.HintName);
@@ -58,6 +55,272 @@ internal sealed partial class InvokeTargetJsonContext : JsonSerializerContext
 		Assert.Contains("SetInvokeJavaScriptTarget_0", generated.SourceText.ToString(), StringComparison.Ordinal);
 	}
 
+	[Fact]
+	public void GeneratesDispatchForInheritedPublicMethods()
+	{
+		const string source = """
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.Text.Json.Serialization.Metadata;
+using Microsoft.Maui.Controls;
+
+namespace TestApp;
+
+public static class Registration
+{
+	public static void Register(HybridWebView hybridWebView)
+	{
+		hybridWebView.SetInvokeJavaScriptTarget(new InvokeTarget(), InvokeTargetJsonContext.Default);
+	}
+}
+
+public class BaseInvokeTarget
+{
+	public string InheritedEcho(string value) => value;
+}
+
+public sealed class InvokeTarget : BaseInvokeTarget
+{
+	public string OwnEcho(string value) => value;
+}
+
+internal sealed class InvokeTargetJsonContext : JsonSerializerContext
+{
+	public static InvokeTargetJsonContext Default { get; } = new();
+	private InvokeTargetJsonContext() : base(null) { }
+	protected override JsonSerializerOptions? GeneratedSerializerOptions => null;
+	public override JsonTypeInfo? GetTypeInfo(Type type) => null;
+}
+""";
+
+		var (result, updatedCompilation, generatorDiagnostics) = RunGenerator(source);
+		AssertNoCompilationErrors(updatedCompilation, generatorDiagnostics);
+
+		var generated = Assert.Single(result.Results.Single().GeneratedSources).SourceText.ToString();
+		Assert.Contains("case \"InheritedEcho\":", generated, StringComparison.Ordinal);
+		Assert.Contains("_target.InheritedEcho(__value)", generated, StringComparison.Ordinal);
+		Assert.Contains("case \"OwnEcho\":", generated, StringComparison.Ordinal);
+	}
+
+	[Fact]
+	public void InterfaceReceiverAssignsInvokerThroughInterface()
+	{
+		const string source = """
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.Text.Json.Serialization.Metadata;
+using Microsoft.Maui;
+
+namespace TestApp;
+
+public static class Registration
+{
+	public static void Register(IHybridWebView hybridWebView)
+	{
+		hybridWebView.SetInvokeJavaScriptTarget(new InvokeTarget(), InvokeTargetJsonContext.Default);
+	}
+}
+
+public sealed class InvokeTarget
+{
+	public string Echo(string value) => value;
+}
+
+internal sealed class InvokeTargetJsonContext : JsonSerializerContext
+{
+	public static InvokeTargetJsonContext Default { get; } = new();
+	private InvokeTargetJsonContext() : base(null) { }
+	protected override JsonSerializerOptions? GeneratedSerializerOptions => null;
+	public override JsonTypeInfo? GetTypeInfo(Type type) => null;
+}
+""";
+
+		var (result, updatedCompilation, generatorDiagnostics) = RunGenerator(source);
+		AssertNoCompilationErrors(updatedCompilation, generatorDiagnostics);
+
+		var generated = Assert.Single(result.Results.Single().GeneratedSources).SourceText.ToString();
+		Assert.Contains("this global::Microsoft.Maui.IHybridWebView hybridWebView", generated, StringComparison.Ordinal);
+		Assert.Contains("hybridWebView.Invoker = new Invoker_0(typedTarget, jsonSerializerContext);", generated, StringComparison.Ordinal);
+		Assert.DoesNotContain("concreteHybridWebView", generated, StringComparison.Ordinal);
+		Assert.DoesNotContain("can only be registered on Microsoft.Maui.Controls.HybridWebView", generated, StringComparison.Ordinal);
+	}
+
+	[Fact]
+	public void GeneratesDispatchForInterfaceTargetMethods()
+	{
+		const string source = """
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.Text.Json.Serialization.Metadata;
+using Microsoft.Maui.Controls;
+
+namespace TestApp;
+
+public static class Registration
+{
+	public static void Register(HybridWebView hybridWebView, InvokeTarget target)
+	{
+		hybridWebView.SetInvokeJavaScriptTarget<IInvokeTarget>(target, InvokeTargetJsonContext.Default);
+	}
+}
+
+public interface IInvokeTarget
+{
+	string Echo(string value);
+}
+
+public sealed class InvokeTarget : IInvokeTarget
+{
+	public string Echo(string value) => value;
+}
+
+internal sealed class InvokeTargetJsonContext : JsonSerializerContext
+{
+	public static InvokeTargetJsonContext Default { get; } = new();
+	private InvokeTargetJsonContext() : base(null) { }
+	protected override JsonSerializerOptions? GeneratedSerializerOptions => null;
+	public override JsonTypeInfo? GetTypeInfo(Type type) => null;
+}
+""";
+
+		var (result, updatedCompilation, generatorDiagnostics) = RunGenerator(source);
+		AssertNoCompilationErrors(updatedCompilation, generatorDiagnostics);
+
+		var generated = Assert.Single(result.Results.Single().GeneratedSources).SourceText.ToString();
+		Assert.Contains("private readonly global::TestApp.IInvokeTarget _target;", generated, StringComparison.Ordinal);
+		Assert.Contains("case \"Echo\":", generated, StringComparison.Ordinal);
+		Assert.Contains("_target.Echo(__value)", generated, StringComparison.Ordinal);
+	}
+
+	[Fact]
+	public void ReturnSerializationDoesNotCollideWithResultParameter()
+	{
+		const string source = """
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.Text.Json.Serialization.Metadata;
+using Microsoft.Maui.Controls;
+
+namespace TestApp;
+
+public static class Registration
+{
+	public static void Register(HybridWebView hybridWebView)
+	{
+		hybridWebView.SetInvokeJavaScriptTarget(new InvokeTarget(), InvokeTargetJsonContext.Default);
+	}
+}
+
+public sealed class InvokeTarget
+{
+	public string Echo(string result) => result;
+}
+
+internal sealed class InvokeTargetJsonContext : JsonSerializerContext
+{
+	public static InvokeTargetJsonContext Default { get; } = new();
+	private InvokeTargetJsonContext() : base(null) { }
+	protected override JsonSerializerOptions? GeneratedSerializerOptions => null;
+	public override JsonTypeInfo? GetTypeInfo(Type type) => null;
+}
+""";
+
+		var (result, updatedCompilation, generatorDiagnostics) = RunGenerator(source);
+		AssertNoCompilationErrors(updatedCompilation, generatorDiagnostics);
+
+		var generated = Assert.Single(result.Results.Single().GeneratedSources).SourceText.ToString();
+		Assert.Contains("return SerializeResult<", generated, StringComparison.Ordinal);
+		Assert.Contains("_target.Echo(__result), _ctx, \"Echo\");", generated, StringComparison.Ordinal);
+		Assert.DoesNotContain("var __result = _target.Echo(__result);", generated, StringComparison.Ordinal);
+	}
+
+	[Fact]
+	public void ReportsDiagnosticForPrivateNestedInvokeTarget()
+	{
+		const string source = """
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.Text.Json.Serialization.Metadata;
+using Microsoft.Maui.Controls;
+
+namespace TestApp;
+
+public sealed class Registration
+{
+	public void Register(HybridWebView hybridWebView)
+	{
+		hybridWebView.SetInvokeJavaScriptTarget(new InvokeTarget(), InvokeTargetJsonContext.Default);
+	}
+
+	private sealed class InvokeTarget
+	{
+		public string Echo(string value) => value;
+	}
+}
+
+internal sealed class InvokeTargetJsonContext : JsonSerializerContext
+{
+	public static InvokeTargetJsonContext Default { get; } = new();
+	private InvokeTargetJsonContext() : base(null) { }
+	protected override JsonSerializerOptions? GeneratedSerializerOptions => null;
+	public override JsonTypeInfo? GetTypeInfo(Type type) => null;
+}
+""";
+
+		var (result, _, _) = RunGenerator(source);
+
+		var diagnostic = Assert.Single(result.Results.Single().Diagnostics);
+		Assert.Equal("MAUIHWVSG003", diagnostic.Id);
+		Assert.Contains("InvokeTarget", diagnostic.GetMessage(), StringComparison.Ordinal);
+	}
+
+	[Fact]
+	public void ReportsDiagnosticForOverloadsBeforeUnsupportedMethodsAreFiltered()
+	{
+		const string source = """
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.Text.Json.Serialization.Metadata;
+using Microsoft.Maui.Controls;
+
+namespace TestApp;
+
+public static class Registration
+{
+	public static void Register(HybridWebView hybridWebView)
+	{
+		hybridWebView.SetInvokeJavaScriptTarget(new InvokeTarget(), InvokeTargetJsonContext.Default);
+	}
+}
+
+public sealed class InvokeTarget
+{
+	public string Echo() => "";
+	public string Echo<T>() => "";
+}
+
+internal sealed class InvokeTargetJsonContext : JsonSerializerContext
+{
+	public static InvokeTargetJsonContext Default { get; } = new();
+	private InvokeTargetJsonContext() : base(null) { }
+	protected override JsonSerializerOptions? GeneratedSerializerOptions => null;
+	public override JsonTypeInfo? GetTypeInfo(Type type) => null;
+}
+""";
+
+		var (result, _, _) = RunGenerator(source);
+
+		var diagnostic = Assert.Single(result.Results.Single().Diagnostics);
+		Assert.Equal("MAUIHWVSG001", diagnostic.Id);
+		Assert.Contains("Echo", diagnostic.GetMessage(), StringComparison.Ordinal);
+	}
+
 	[Fact]
 	public void ReportsDiagnosticForOpenGenericInvokeTarget()
 	{
@@ -77,9 +340,18 @@ public static void Register<TTarget>(HybridWebView hybridWebView, TTarget target
 }
 """;
 
+		var (result, _, _) = RunGenerator(source);
+
+		var diagnostic = Assert.Single(result.Results.Single().Diagnostics);
+		Assert.Equal("MAUIHWVSG002", diagnostic.Id);
+		Assert.Contains("TTarget", diagnostic.GetMessage(), StringComparison.Ordinal);
+	}
+
+	static (GeneratorDriverRunResult Result, Compilation UpdatedCompilation, ImmutableArray<Diagnostic> GeneratorDiagnostics) RunGenerator(string source)
+	{
 		var parseOptions = CSharpParseOptions.Default
 			.WithLanguageVersion(LanguageVersion.Preview)
-			.WithFeatures([new KeyValuePair<string, string>("InterceptorsPreviewNamespaces", "Microsoft.Maui.Controls.Generated")]);
+			.WithFeatures([new KeyValuePair<string, string>("InterceptorsNamespaces", "Microsoft.Maui.Controls.Generated")]);
 		var compilation = CSharpCompilation.Create(
 			"HwvSourceGenTest",
 			[CSharpSyntaxTree.ParseText(source, parseOptions, path: "/tmp/TestApp/Registration.cs")],
@@ -87,11 +359,18 @@ public static void Register<TTarget>(HybridWebView hybridWebView, TTarget target
 			new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary));
 
 		GeneratorDriver driver = CSharpGeneratorDriver.Create([new HybridWebViewInvokeTargetGenerator().AsSourceGenerator()], parseOptions: parseOptions);
-		var result = driver.RunGenerators(compilation).GetRunResult();
+		driver = driver.RunGeneratorsAndUpdateCompilation(compilation, out var updatedCompilation, out var generatorDiagnostics);
+		return (driver.GetRunResult(), updatedCompilation, generatorDiagnostics);
+	}
 
-		var diagnostic = Assert.Single(result.Results.Single().Diagnostics);
-		Assert.Equal("MAUIHWVSG002", diagnostic.Id);
-		Assert.Contains("TTarget", diagnostic.GetMessage(), StringComparison.Ordinal);
+	static void AssertNoCompilationErrors(Compilation compilation, ImmutableArray<Diagnostic> generatorDiagnostics)
+	{
+		var errors = generatorDiagnostics
+			.Concat(compilation.GetDiagnostics())
+			.Where(static diagnostic => diagnostic.Severity == DiagnosticSeverity.Error)
+			.ToArray();
+
+		Assert.Empty(errors);
 	}
 
 	static IEnumerable<MetadataReference> GetReferences()
diff --git a/src/Core/src/HybridWebViewSourceGen/AnalyzerReleases.Unshipped.md b/src/Core/src/HybridWebViewSourceGen/AnalyzerReleases.Unshipped.md
index 448247bb4c6a..e0f1f39afbe9 100644
--- a/src/Core/src/HybridWebViewSourceGen/AnalyzerReleases.Unshipped.md
+++ b/src/Core/src/HybridWebViewSourceGen/AnalyzerReleases.Unshipped.md
@@ -7,3 +7,4 @@ Rule ID | Category | Severity | Notes
 --------|----------|----------|-------
 MAUIHWVSG001 | HybridWebView | Error | UnsupportedOverloadedMethods
 MAUIHWVSG002 | HybridWebView | Error | OpenGenericInvokeTarget
+MAUIHWVSG003 | HybridWebView | Error | InaccessibleInvokeTarget
diff --git a/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs b/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs
index 433c44159869..cb9195677574 100644
--- a/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs
+++ b/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs
@@ -29,6 +29,13 @@ public sealed class HybridWebViewInvokeTargetGenerator : IIncrementalGenerator
 		"HybridWebView",
 		DiagnosticSeverity.Error,
 		isEnabledByDefault: true);
+	private static readonly DiagnosticDescriptor InaccessibleInvokeTarget = new(
+		"MAUIHWVSG003",
+		"HybridWebView invoke target type must be accessible",
+		"HybridWebView invoke target type '{0}' is not accessible to generated code. Use an internal or public invoke target type.",
+		"HybridWebView",
+		DiagnosticSeverity.Error,
+		isEnabledByDefault: true);
 
 	public void Initialize(IncrementalGeneratorInitializationContext context)
 	{
@@ -132,27 +139,32 @@ private static bool IsSetInvokeJavaScriptTargetCandidate(SyntaxNode node)
 		if (targetTypeSymbol is not INamedTypeSymbol targetType)
 			return null;
 
+		if (!IsAccessibleFromGeneratedCode(targetType))
+		{
+			return InvocationInfo.CreateInaccessibleTarget(
+				invocation.GetLocation(),
+				targetType.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat));
+		}
+
 		// Get interceptable location
 		var interceptableLocation = ctx.SemanticModel.GetInterceptableLocation(invocation, ct);
 		if (interceptableLocation is null)
 			return null;
 
-		// Gather public instance methods on T (DeclaredOnly equivalent)
+		var overloadedMethodNames = GetPublicInstanceMethods(targetType)
+			.GroupBy(static method => method.Name)
+			.Where(static group => group.Count() > 1)
+			.Select(static group => group.Key)
+			.OrderBy(static name => name)
+			.ToArray();
+
+		// Gather public instance methods on T, including inherited public methods
+		// to match the legacy reflection invoker's dispatch behavior.
 		var methods = new List<MethodInfo>();
-		foreach (var member in targetType.GetMembers())
+		foreach (var m in GetPublicInstanceMethods(targetType))
 		{
-			if (member is not IMethodSymbol m)
-				continue;
-			if (m.DeclaredAccessibility != Accessibility.Public)
-				continue;
-			if (m.IsStatic || m.IsAbstract)
-				continue;
-			if (m.MethodKind != MethodKind.Ordinary)
-				continue;
 			if (m.IsGenericMethod)
 				continue;
-			if (!SymbolEqualityComparer.Default.Equals(m.ContainingType, targetType))
-				continue;
 
 			// Check for ref/out/pointer params
 			bool hasUnsupportedParam = false;
@@ -199,13 +211,6 @@ private static bool IsSetInvokeJavaScriptTargetCandidate(SyntaxNode node)
 			methods.Add(new MethodInfo(m.Name, returnKind, resultTypeName, paramInfos.ToArray()));
 		}
 
-		var overloadedMethodNames = methods
-			.GroupBy(static method => method.Name)
-			.Where(static group => group.Count() > 1)
-			.Select(static group => group.Key)
-			.OrderBy(static name => name)
-			.ToArray();
-
 		return new InvocationInfo(
 			interceptableLocation,
 			invocation.GetLocation(),
@@ -215,6 +220,70 @@ private static bool IsSetInvokeJavaScriptTargetCandidate(SyntaxNode node)
 			overloadedMethodNames);
 	}
 
+	private static IEnumerable<IMethodSymbol> GetPublicInstanceMethods(INamedTypeSymbol targetType)
+	{
+		var seenSignatures = new HashSet<string>();
+
+		if (targetType.TypeKind == TypeKind.Interface)
+		{
+			foreach (var method in GetPublicInstanceMethods(targetType, seenSignatures))
+				yield return method;
+
+			foreach (var interfaceType in targetType.AllInterfaces)
+			{
+				foreach (var method in GetPublicInstanceMethods(interfaceType, seenSignatures))
+					yield return method;
+			}
+
+			yield break;
+		}
+
+		for (var current = targetType; current is not null && current.SpecialType != SpecialType.System_Object; current = current.BaseType)
+		{
+			foreach (var method in GetPublicInstanceMethods(current, seenSignatures))
+				yield return method;
+		}
+	}
+
+	private static IEnumerable<IMethodSymbol> GetPublicInstanceMethods(INamedTypeSymbol type, HashSet<string> seenSignatures)
+	{
+		foreach (var member in type.GetMembers())
+		{
+			if (member is not IMethodSymbol method)
+				continue;
+			if (method.DeclaredAccessibility != Accessibility.Public)
+				continue;
+			if (method.IsStatic)
+				continue;
+			if (method.MethodKind != MethodKind.Ordinary)
+				continue;
+
+			if (seenSignatures.Add(GetMethodSignature(method)))
+				yield return method;
+		}
+	}
+
+	private static string GetMethodSignature(IMethodSymbol method)
+	{
+		var parameters = string.Join(
+			",",
+			method.Parameters.Select(static parameter =>
+				$"{parameter.RefKind}:{parameter.Type.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)}"));
+
+		return $"{method.Name}`{method.TypeParameters.Length}({parameters})";
+	}
+
+	private static bool IsAccessibleFromGeneratedCode(INamedTypeSymbol targetType)
+	{
+		for (var current = targetType; current is not null; current = current.ContainingType)
+		{
+			if (current.DeclaredAccessibility is not (Accessibility.Public or Accessibility.Internal or Accessibility.ProtectedOrInternal))
+				return false;
+		}
+
+		return true;
+	}
+
 	private static ITypeSymbol? GetTargetType(GeneratorSyntaxContext ctx, MemberAccessExpressionSyntax memberAccess, InvocationExpressionSyntax invocation, System.Threading.CancellationToken ct)
 	{
 		if (memberAccess.Name is GenericNameSyntax genericName
@@ -303,6 +372,15 @@ private static void GenerateSource(SourceProductionContext spc, ImmutableArray<I
 				continue;
 			}
 
+			if (info.InaccessibleTargetTypeName is not null)
+			{
+				spc.ReportDiagnostic(Diagnostic.Create(
+					InaccessibleInvokeTarget,
+					info.DiagnosticLocation,
+					info.InaccessibleTargetTypeName));
+				continue;
+			}
+
 			var loc = info.Location!;
 
 			if (info.OverloadedMethodNames.Length > 0)
@@ -325,17 +403,7 @@ private static void GenerateSource(SourceProductionContext spc, ImmutableArray<I
 			sb.AppendLine($"            if (target is not {info.TargetTypeName} typedTarget)");
 			sb.AppendLine($"                throw new InvalidOperationException($\"Type mismatch: expected {info.TargetTypeName.Split('.').Last()} but got {{target.GetType().FullName}}\");");
 			sb.AppendLine();
-			if (info.ReceiverTypeName == IHybridWebViewFullyQualifiedTypeName)
-			{
-				sb.AppendLine("            if (hybridWebView is not global::Microsoft.Maui.Controls.HybridWebView concreteHybridWebView)");
-				sb.AppendLine("                throw new InvalidOperationException(\"The AOT-safe HybridWebView source-generated invoker can only be registered on Microsoft.Maui.Controls.HybridWebView instances.\");");
-				sb.AppendLine();
-				sb.AppendLine($"            concreteHybridWebView.Invoker = new Invoker_{index}(typedTarget, jsonSerializerContext);");
-			}
-			else
-			{
-				sb.AppendLine($"            hybridWebView.Invoker = new Invoker_{index}(typedTarget, jsonSerializerContext);");
-			}
+			sb.AppendLine($"            hybridWebView.Invoker = new Invoker_{index}(typedTarget, jsonSerializerContext);");
 			sb.AppendLine("        }");
 			sb.AppendLine();
 
@@ -388,14 +456,10 @@ private static void GenerateSource(SourceProductionContext spc, ImmutableArray<I
 						sb.AppendLine("                        return null;");
 						break;
 					case "TaskOfT":
-						sb.AppendLine($"                        var __result = await _target.{method.Name}({argList});");
-						sb.AppendLine($"                        if (__result is null) return null;");
-						sb.AppendLine($"                        return global::System.Text.Json.JsonSerializer.Serialize<{method.ResultTypeName}>(__result, GetRequiredJsonTypeInfo<{method.ResultTypeName}>(_ctx, \"{method.Name}\", \"return\"));");
+						sb.AppendLine($"                        return SerializeResult<{method.ResultTypeName}>(await _target.{method.Name}({argList}), _ctx, \"{method.Name}\");");
 						break;
 					case "sync":
-						sb.AppendLine($"                        var __result = _target.{method.Name}({argList});");
-						sb.AppendLine($"                        if (__result is null) return null;");
-						sb.AppendLine($"                        return global::System.Text.Json.JsonSerializer.Serialize<{method.ResultTypeName}>(__result, GetRequiredJsonTypeInfo<{method.ResultTypeName}>(_ctx, \"{method.Name}\", \"return\"));");
+						sb.AppendLine($"                        return SerializeResult<{method.ResultTypeName}>(_target.{method.Name}({argList}), _ctx, \"{method.Name}\");");
 						break;
 				}
 
@@ -412,6 +476,12 @@ private static void GenerateSource(SourceProductionContext spc, ImmutableArray<I
 		}
 
 		// Shared helper method
+		sb.AppendLine("        private static string? SerializeResult<T>(T? result, global::System.Text.Json.Serialization.JsonSerializerContext ctx, string methodName)");
+		sb.AppendLine("        {");
+		sb.AppendLine("            if (result is null) return null;");
+		sb.AppendLine("            return global::System.Text.Json.JsonSerializer.Serialize<T>(result, GetRequiredJsonTypeInfo<T>(ctx, methodName, \"return\"));");
+		sb.AppendLine("        }");
+		sb.AppendLine();
 		sb.AppendLine("        private static global::System.Text.Json.Serialization.Metadata.JsonTypeInfo<T> GetRequiredJsonTypeInfo<T>(global::System.Text.Json.Serialization.JsonSerializerContext ctx, string methodName, string paramName)");
 		sb.AppendLine("        {");
 		sb.AppendLine("            var typeInfo = ctx.GetTypeInfo(typeof(T));");
@@ -436,6 +506,19 @@ public InvocationInfo(Location diagnosticLocation, string openGenericTargetTypeN
 			Methods = [];
 			OverloadedMethodNames = [];
 			OpenGenericTargetTypeName = openGenericTargetTypeName;
+			InaccessibleTargetTypeName = null;
+		}
+
+		private InvocationInfo(Location diagnosticLocation, string inaccessibleTargetTypeName, bool _)
+		{
+			Location = null;
+			DiagnosticLocation = diagnosticLocation;
+			ReceiverTypeName = string.Empty;
+			TargetTypeName = string.Empty;
+			Methods = [];
+			OverloadedMethodNames = [];
+			OpenGenericTargetTypeName = null;
+			InaccessibleTargetTypeName = inaccessibleTargetTypeName;
 		}
 
 		public InvocationInfo(InterceptableLocation location, Location diagnosticLocation, string receiverTypeName, string targetTypeName, MethodInfo[] methods, string[] overloadedMethodNames)
@@ -447,7 +530,12 @@ public InvocationInfo(InterceptableLocation location, Location diagnosticLocatio
 			Methods = methods;
 			OverloadedMethodNames = overloadedMethodNames;
 			OpenGenericTargetTypeName = null;
+			InaccessibleTargetTypeName = null;
 		}
+
+		public static InvocationInfo CreateInaccessibleTarget(Location diagnosticLocation, string inaccessibleTargetTypeName) =>
+			new(diagnosticLocation, inaccessibleTargetTypeName, true);
+
 		public InterceptableLocation? Location { get; }
 		public Location DiagnosticLocation { get; }
 		public string ReceiverTypeName { get; }
@@ -455,6 +543,7 @@ public InvocationInfo(InterceptableLocation location, Location diagnosticLocatio
 		public MethodInfo[] Methods { get; }
 		public string[] OverloadedMethodNames { get; }
 		public string? OpenGenericTargetTypeName { get; }
+		public string? InaccessibleTargetTypeName { get; }
 	}
 
 	private sealed class MethodInfo

From 10129009edab998dad80db383bc02ea97c63d858 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Mon, 22 Jun 2026 10:16:37 +0200
Subject: [PATCH 35/39] Fix HybridWebView raw invoke result marshalling

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 ...dWebViewTests_SetInvokeJavaScriptTarget.cs |  2 +-
 .../HybridWebView/HybridWebViewHandler.cs     | 40 +++++++++++++------
 2 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs b/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs
index ebb554833908..1031a6fa9f7d 100644
--- a/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs
+++ b/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs
@@ -29,7 +29,7 @@ public Task InvokeDotNet(string methodName, string expectedReturnValue) =>
 			await WebViewHelpers.WaitForHtmlStatusSet(hybridWebView);
 
 			// Run some JavaScript to see if it got the expected result
-			var result = await hybridWebView.EvaluateJavaScriptAsync("GetLastScriptResult()");
+			var result = await hybridWebView.EvaluateJavaScriptAsync("JSON.parse(GetLastScriptResult())");
 			Assert.Equal(expectedReturnValue, result);
 			Assert.Equal(methodName, invokeJavaScriptTarget.LastMethodCalled);
 		});
diff --git a/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs b/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs
index 6924b46eb41a..c9a88c233e44 100644
--- a/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs
+++ b/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs
@@ -194,32 +194,48 @@ void MessageReceived(string rawMessage)
 				}
 
 				var jsonResult = await VirtualView.Invoker.InvokeMethodAsync(invokeData.MethodName, invokeData.ParamValues);
-				var invokeResult = jsonResult is null
-					? new DotNetInvokeResult()
-					: new DotNetInvokeResult { Result = jsonResult, IsJson = true };
-
-				return Encoding.UTF8.GetBytes(
-					JsonSerializer.Serialize(invokeResult, HybridWebViewHandlerJsonContext.Default.DotNetInvokeResult));
+				return CreateInvokeResultBytes(jsonResult);
 			}
 			catch (Exception ex)
 			{
 				MauiContext?.CreateLogger<HybridWebViewHandler>()?.LogError(ex, "An error occurred while invoking a .NET method from JavaScript: {ErrorMessage}", ex.Message);
-
-				var errorResult = CreateErrorResult(ex);
-				var errorJson = JsonSerializer.Serialize(errorResult, HybridWebViewHandlerJsonContext.Default.DotNetInvokeResult);
-				return Encoding.UTF8.GetBytes(errorJson);
+				return CreateErrorResultBytes(ex);
 			}
 		}
 
-		private static DotNetInvokeResult CreateErrorResult(Exception ex)
+		private static byte[] CreateErrorResultBytes(Exception ex)
 		{
-			return new DotNetInvokeResult
+			var errorResult = new DotNetInvokeResult
 			{
 				IsError = true,
 				ErrorMessage = ex.Message,
 				ErrorType = ex.GetType().Name,
 				ErrorStackTrace = ex.StackTrace
 			};
+
+			return JsonSerializer.SerializeToUtf8Bytes(errorResult, HybridWebViewHandlerJsonContext.Default.DotNetInvokeResult);
+		}
+
+		private static byte[] CreateInvokeResultBytes(string? jsonResult)
+		{
+			using var stream = new MemoryStream();
+			using (var writer = new Utf8JsonWriter(stream))
+			{
+				writer.WriteStartObject();
+				// The JavaScript bridge treats Result as a JSON string and calls
+				// JSON.parse(response.Result). Keep jsonResult as a string here;
+				// the result JSON is already escaped, so avoid escaping it twice
+				// or changing the wire contract by writing it as raw JSON.
+				writer.WriteString(nameof(DotNetInvokeResult.Result), jsonResult);
+				writer.WriteBoolean(nameof(DotNetInvokeResult.IsJson), jsonResult is not null);
+				writer.WriteBoolean(nameof(DotNetInvokeResult.IsError), false);
+				writer.WriteNull(nameof(DotNetInvokeResult.ErrorMessage));
+				writer.WriteNull(nameof(DotNetInvokeResult.ErrorType));
+				writer.WriteNull(nameof(DotNetInvokeResult.ErrorStackTrace));
+				writer.WriteEndObject();
+			}
+
+			return stream.ToArray();
 		}
 
 		private sealed class JSInvokeMethodData

From 09cc1d3e1d4db4accfb789667faa8c801da5761b Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Mon, 22 Jun 2026 10:16:37 +0200
Subject: [PATCH 36/39] Fix HybridWebView InvokeDotNet JSON result envelope

Write the InvokeDotNet response envelope manually while preserving Result as the JSON string consumed by the existing JavaScript JSON.parse path. Restore the existing InvokeDotNet device-test expectations so they keep asserting the pre-existing JSON.stringify transport shape.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 ...dWebViewTests_SetInvokeJavaScriptTarget.cs |  4 +-
 .../HybridWebView/HybridWebViewHandler.cs     | 40 +++++++++++++------
 2 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs b/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs
index ebb554833908..4845e3e6f2dd 100644
--- a/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs
+++ b/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs
@@ -174,8 +174,8 @@ private class InvokeJavaScriptAsyncTestData : IEnumerable<object?[]>
 	{
 		public IEnumerator<object?[]> GetEnumerator()
 		{
-			const string ComplexResult = "{\"result\":123,\"operationName\":\"Test\"}";
-			const string DictionaryResult = "{\"first\":111,\"second\":222,\"third\":333}";
+			const string ComplexResult = "{\\\"result\\\":123,\\\"operationName\\\":\\\"Test\\\"}";
+			const string DictionaryResult = "{\\\"first\\\":111,\\\"second\\\":222,\\\"third\\\":333}";
 			const int ValueTypeResult = 2;
 
 			// Test variations of:
diff --git a/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs b/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs
index 6924b46eb41a..c9a88c233e44 100644
--- a/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs
+++ b/src/Core/src/Handlers/HybridWebView/HybridWebViewHandler.cs
@@ -194,32 +194,48 @@ void MessageReceived(string rawMessage)
 				}
 
 				var jsonResult = await VirtualView.Invoker.InvokeMethodAsync(invokeData.MethodName, invokeData.ParamValues);
-				var invokeResult = jsonResult is null
-					? new DotNetInvokeResult()
-					: new DotNetInvokeResult { Result = jsonResult, IsJson = true };
-
-				return Encoding.UTF8.GetBytes(
-					JsonSerializer.Serialize(invokeResult, HybridWebViewHandlerJsonContext.Default.DotNetInvokeResult));
+				return CreateInvokeResultBytes(jsonResult);
 			}
 			catch (Exception ex)
 			{
 				MauiContext?.CreateLogger<HybridWebViewHandler>()?.LogError(ex, "An error occurred while invoking a .NET method from JavaScript: {ErrorMessage}", ex.Message);
-
-				var errorResult = CreateErrorResult(ex);
-				var errorJson = JsonSerializer.Serialize(errorResult, HybridWebViewHandlerJsonContext.Default.DotNetInvokeResult);
-				return Encoding.UTF8.GetBytes(errorJson);
+				return CreateErrorResultBytes(ex);
 			}
 		}
 
-		private static DotNetInvokeResult CreateErrorResult(Exception ex)
+		private static byte[] CreateErrorResultBytes(Exception ex)
 		{
-			return new DotNetInvokeResult
+			var errorResult = new DotNetInvokeResult
 			{
 				IsError = true,
 				ErrorMessage = ex.Message,
 				ErrorType = ex.GetType().Name,
 				ErrorStackTrace = ex.StackTrace
 			};
+
+			return JsonSerializer.SerializeToUtf8Bytes(errorResult, HybridWebViewHandlerJsonContext.Default.DotNetInvokeResult);
+		}
+
+		private static byte[] CreateInvokeResultBytes(string? jsonResult)
+		{
+			using var stream = new MemoryStream();
+			using (var writer = new Utf8JsonWriter(stream))
+			{
+				writer.WriteStartObject();
+				// The JavaScript bridge treats Result as a JSON string and calls
+				// JSON.parse(response.Result). Keep jsonResult as a string here;
+				// the result JSON is already escaped, so avoid escaping it twice
+				// or changing the wire contract by writing it as raw JSON.
+				writer.WriteString(nameof(DotNetInvokeResult.Result), jsonResult);
+				writer.WriteBoolean(nameof(DotNetInvokeResult.IsJson), jsonResult is not null);
+				writer.WriteBoolean(nameof(DotNetInvokeResult.IsError), false);
+				writer.WriteNull(nameof(DotNetInvokeResult.ErrorMessage));
+				writer.WriteNull(nameof(DotNetInvokeResult.ErrorType));
+				writer.WriteNull(nameof(DotNetInvokeResult.ErrorStackTrace));
+				writer.WriteEndObject();
+			}
+
+			return stream.ToArray();
 		}
 
 		private sealed class JSInvokeMethodData

From 7295de2bcaa5e606500e1d18af806544df5105c9 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Mon, 22 Jun 2026 12:49:55 +0200
Subject: [PATCH 37/39] Restore HybridWebView InvokeDotNet test shape

Keep the existing test path that reads GetLastScriptResult directly; the page already stores JSON.stringify(result) and the expected strings assert that transport shape.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../HybridWebViewTests_SetInvokeJavaScriptTarget.cs             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs b/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs
index 2e49e4a1911e..4845e3e6f2dd 100644
--- a/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs
+++ b/src/Controls/tests/DeviceTests/Elements/HybridWebView/HybridWebViewTests_SetInvokeJavaScriptTarget.cs
@@ -29,7 +29,7 @@ public Task InvokeDotNet(string methodName, string expectedReturnValue) =>
 			await WebViewHelpers.WaitForHtmlStatusSet(hybridWebView);
 
 			// Run some JavaScript to see if it got the expected result
-			var result = await hybridWebView.EvaluateJavaScriptAsync("JSON.parse(GetLastScriptResult())");
+			var result = await hybridWebView.EvaluateJavaScriptAsync("GetLastScriptResult()");
 			Assert.Equal(expectedReturnValue, result);
 			Assert.Equal(methodName, invokeJavaScriptTarget.LastMethodCalled);
 		});

From 6e4d84e4c2a7e018cd231d18bf4498d40d70a5ee Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Mon, 22 Jun 2026 13:15:26 +0200
Subject: [PATCH 38/39] Fix HybridWebView source generator edge cases

Handle parameterless arity checks, escaped method identifiers, and unsafe pointer parameters in generated HybridWebView dispatch.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../HybridWebViewSourceGenTests.cs            | 141 +++++++++++++++++-
 .../HybridWebViewInvokeTargetGenerator.cs     |  38 ++++-
 2 files changed, 170 insertions(+), 9 deletions(-)

diff --git a/src/Controls/tests/SourceGen.UnitTests/HybridWebViewSourceGenTests.cs b/src/Controls/tests/SourceGen.UnitTests/HybridWebViewSourceGenTests.cs
index 85bf9d315aa4..105241055a3a 100644
--- a/src/Controls/tests/SourceGen.UnitTests/HybridWebViewSourceGenTests.cs
+++ b/src/Controls/tests/SourceGen.UnitTests/HybridWebViewSourceGenTests.cs
@@ -1,6 +1,6 @@
 using System;
-using System.Collections.Immutable;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.IO;
 using System.Linq;
 using Microsoft.CodeAnalysis;
@@ -103,6 +103,139 @@ private InvokeTargetJsonContext() : base(null) { }
 		Assert.Contains("case \"OwnEcho\":", generated, StringComparison.Ordinal);
 	}
 
+	[Fact]
+	public void GeneratesArgumentCountCheckForParameterlessMethods()
+	{
+		const string source = """
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.Text.Json.Serialization.Metadata;
+using Microsoft.Maui.Controls;
+
+namespace TestApp;
+
+public static class Registration
+{
+	public static void Register(HybridWebView hybridWebView)
+	{
+		hybridWebView.SetInvokeJavaScriptTarget(new InvokeTarget(), InvokeTargetJsonContext.Default);
+	}
+}
+
+public sealed class InvokeTarget
+{
+	public string NoArgs() => "";
+}
+
+internal sealed class InvokeTargetJsonContext : JsonSerializerContext
+{
+	public static InvokeTargetJsonContext Default { get; } = new();
+	private InvokeTargetJsonContext() : base(null) { }
+	protected override JsonSerializerOptions? GeneratedSerializerOptions => null;
+	public override JsonTypeInfo? GetTypeInfo(Type type) => null;
+}
+""";
+
+		var (result, updatedCompilation, generatorDiagnostics) = RunGenerator(source);
+		AssertNoCompilationErrors(updatedCompilation, generatorDiagnostics);
+
+		var generated = Assert.Single(result.Results.Single().GeneratedSources).SourceText.ToString();
+		Assert.Contains("case \"NoArgs\":", generated, StringComparison.Ordinal);
+		Assert.Contains("if (paramJsonValues is not null && paramJsonValues.Length != 0)", generated, StringComparison.Ordinal);
+		Assert.Contains("Method 'NoArgs' expects 0 argument(s) but received ", generated, StringComparison.Ordinal);
+	}
+
+	[Fact]
+	public void EscapesKeywordMethodIdentifiers()
+	{
+		const string source = """
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.Text.Json.Serialization.Metadata;
+using Microsoft.Maui.Controls;
+
+namespace TestApp;
+
+public static class Registration
+{
+	public static void Register(HybridWebView hybridWebView)
+	{
+		hybridWebView.SetInvokeJavaScriptTarget(new InvokeTarget(), InvokeTargetJsonContext.Default);
+	}
+}
+
+public sealed class InvokeTarget
+{
+	public string @event() => "";
+}
+
+internal sealed class InvokeTargetJsonContext : JsonSerializerContext
+{
+	public static InvokeTargetJsonContext Default { get; } = new();
+	private InvokeTargetJsonContext() : base(null) { }
+	protected override JsonSerializerOptions? GeneratedSerializerOptions => null;
+	public override JsonTypeInfo? GetTypeInfo(Type type) => null;
+}
+""";
+
+		var (result, updatedCompilation, generatorDiagnostics) = RunGenerator(source);
+		AssertNoCompilationErrors(updatedCompilation, generatorDiagnostics);
+
+		var generated = Assert.Single(result.Results.Single().GeneratedSources).SourceText.ToString();
+		Assert.Contains("case \"event\":", generated, StringComparison.Ordinal);
+		Assert.Contains("_target.@event()", generated, StringComparison.Ordinal);
+		Assert.DoesNotContain("_target.event()", generated, StringComparison.Ordinal);
+	}
+
+	[Fact]
+	public void SkipsMethodsWithUnsafePointerParameters()
+	{
+		const string source = """
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.Text.Json.Serialization.Metadata;
+using Microsoft.Maui.Controls;
+
+namespace TestApp;
+
+public static class Registration
+{
+	public static void Register(HybridWebView hybridWebView)
+	{
+		hybridWebView.SetInvokeJavaScriptTarget(new InvokeTarget(), InvokeTargetJsonContext.Default);
+	}
+}
+
+public sealed class InvokeTarget
+{
+	public string Supported() => "";
+	public unsafe string Pointer(int* value) => "";
+	public unsafe string FunctionPointer(delegate*<int, void> callback) => "";
+}
+
+internal sealed class InvokeTargetJsonContext : JsonSerializerContext
+{
+	public static InvokeTargetJsonContext Default { get; } = new();
+	private InvokeTargetJsonContext() : base(null) { }
+	protected override JsonSerializerOptions? GeneratedSerializerOptions => null;
+	public override JsonTypeInfo? GetTypeInfo(Type type) => null;
+}
+""";
+
+		var (result, updatedCompilation, generatorDiagnostics) = RunGenerator(source, allowUnsafe: true);
+		AssertNoCompilationErrors(updatedCompilation, generatorDiagnostics);
+
+		var generated = Assert.Single(result.Results.Single().GeneratedSources).SourceText.ToString();
+		Assert.Contains("case \"Supported\":", generated, StringComparison.Ordinal);
+		Assert.DoesNotContain("case \"Pointer\":", generated, StringComparison.Ordinal);
+		Assert.DoesNotContain("case \"FunctionPointer\":", generated, StringComparison.Ordinal);
+		Assert.DoesNotContain("Deserialize<global::System.Int32*>", generated, StringComparison.Ordinal);
+		Assert.DoesNotContain("delegate*", generated, StringComparison.Ordinal);
+	}
+
 	[Fact]
 	public void InterfaceReceiverAssignsInvokerThroughInterface()
 	{
@@ -347,16 +480,18 @@ public static void Register<TTarget>(HybridWebView hybridWebView, TTarget target
 		Assert.Contains("TTarget", diagnostic.GetMessage(), StringComparison.Ordinal);
 	}
 
-	static (GeneratorDriverRunResult Result, Compilation UpdatedCompilation, ImmutableArray<Diagnostic> GeneratorDiagnostics) RunGenerator(string source)
+	static (GeneratorDriverRunResult Result, Compilation UpdatedCompilation, ImmutableArray<Diagnostic> GeneratorDiagnostics) RunGenerator(string source, bool allowUnsafe = false)
 	{
 		var parseOptions = CSharpParseOptions.Default
 			.WithLanguageVersion(LanguageVersion.Preview)
 			.WithFeatures([new KeyValuePair<string, string>("InterceptorsNamespaces", "Microsoft.Maui.Controls.Generated")]);
+		var compilationOptions = new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary)
+			.WithAllowUnsafe(allowUnsafe);
 		var compilation = CSharpCompilation.Create(
 			"HwvSourceGenTest",
 			[CSharpSyntaxTree.ParseText(source, parseOptions, path: "/tmp/TestApp/Registration.cs")],
 			GetReferences(),
-			new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary));
+			compilationOptions);
 
 		GeneratorDriver driver = CSharpGeneratorDriver.Create([new HybridWebViewInvokeTargetGenerator().AsSourceGenerator()], parseOptions: parseOptions);
 		driver = driver.RunGeneratorsAndUpdateCompilation(compilation, out var updatedCompilation, out var generatorDiagnostics);
diff --git a/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs b/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs
index cb9195677574..615939308526 100644
--- a/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs
+++ b/src/Core/src/HybridWebViewSourceGen/HybridWebViewInvokeTargetGenerator.cs
@@ -166,12 +166,12 @@ private static bool IsSetInvokeJavaScriptTargetCandidate(SyntaxNode node)
 			if (m.IsGenericMethod)
 				continue;
 
-			// Check for ref/out/pointer params
+			// Check for ref/out/unsafe pointer params
 			bool hasUnsupportedParam = false;
 			var paramInfos = new List<ParamInfo>();
 			foreach (var p in m.Parameters)
 			{
-				if (p.RefKind != RefKind.None)
+				if (p.RefKind != RefKind.None || ContainsUnsupportedParameterType(p.Type))
 				{
 					hasUnsupportedParam = true;
 					break;
@@ -310,6 +310,18 @@ private static bool ContainsTypeParameter(ITypeSymbol type)
 		};
 	}
 
+	private static bool ContainsUnsupportedParameterType(ITypeSymbol type)
+	{
+		return type switch
+		{
+			IPointerTypeSymbol => true,
+			IFunctionPointerTypeSymbol => true,
+			INamedTypeSymbol namedType => namedType.TypeArguments.Any(ContainsUnsupportedParameterType),
+			IArrayTypeSymbol arrayType => ContainsUnsupportedParameterType(arrayType.ElementType),
+			_ => false
+		};
+	}
+
 	private static bool IsSameOrDerivedFrom(ITypeSymbol type, string typeName)
 	{
 		for (var current = type; current is not null; current = current.BaseType)
@@ -442,24 +454,30 @@ private static void GenerateSource(SourceProductionContext spc, ImmutableArray<I
 						sb.AppendLine($"                        var __{p.Name} = global::System.Text.Json.JsonSerializer.Deserialize<{p.TypeName}>(paramJsonValues[{i}], GetRequiredJsonTypeInfo<{p.TypeName}>(_ctx, \"{method.Name}\", \"{p.Name}\"))!;");
 					}
 				}
+				else
+				{
+					sb.AppendLine("                        if (paramJsonValues is not null && paramJsonValues.Length != 0)");
+					sb.AppendLine($"                            throw new global::System.InvalidOperationException(\"Method '{method.Name}' expects 0 argument(s) but received \" + paramJsonValues.Length + \".\");");
+				}
 
 				var argList = string.Join(", ", Array.ConvertAll(method.Parameters, p => $"__{p.Name}"));
+				var escapedMethodName = EscapeIdentifier(method.Name);
 
 				switch (method.ReturnKind)
 				{
 					case "void":
-						sb.AppendLine($"                        _target.{method.Name}({argList});");
+						sb.AppendLine($"                        _target.{escapedMethodName}({argList});");
 						sb.AppendLine("                        return null;");
 						break;
 					case "Task":
-						sb.AppendLine($"                        await _target.{method.Name}({argList});");
+						sb.AppendLine($"                        await _target.{escapedMethodName}({argList});");
 						sb.AppendLine("                        return null;");
 						break;
 					case "TaskOfT":
-						sb.AppendLine($"                        return SerializeResult<{method.ResultTypeName}>(await _target.{method.Name}({argList}), _ctx, \"{method.Name}\");");
+						sb.AppendLine($"                        return SerializeResult<{method.ResultTypeName}>(await _target.{escapedMethodName}({argList}), _ctx, \"{method.Name}\");");
 						break;
 					case "sync":
-						sb.AppendLine($"                        return SerializeResult<{method.ResultTypeName}>(_target.{method.Name}({argList}), _ctx, \"{method.Name}\");");
+						sb.AppendLine($"                        return SerializeResult<{method.ResultTypeName}>(_target.{escapedMethodName}({argList}), _ctx, \"{method.Name}\");");
 						break;
 				}
 
@@ -495,6 +513,14 @@ private static void GenerateSource(SourceProductionContext spc, ImmutableArray<I
 		spc.AddSource("HybridWebViewInterceptors.g.cs", sb.ToString());
 	}
 
+	private static string EscapeIdentifier(string identifier)
+	{
+		return SyntaxFacts.GetKeywordKind(identifier) == SyntaxKind.None
+			&& SyntaxFacts.GetContextualKeywordKind(identifier) == SyntaxKind.None
+			? identifier
+			: "@" + identifier;
+	}
+
 	private sealed class InvocationInfo
 	{
 		public InvocationInfo(Location diagnosticLocation, string openGenericTargetTypeName)

From 2af48615b5c365937a9fe4136e2bbdb45e9e62e1 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Mon, 22 Jun 2026 13:28:26 +0200
Subject: [PATCH 39/39] Preserve HybridWebView invoke target null getters

Keep explicit IHybridWebView invoke target/type getters null-safe before an invoker is configured while preserving the throwing Invoker getter.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../src/Core/HybridWebView/HybridWebView.cs   | 10 +++++---
 .../Core.UnitTests/HybridWebViewTests.cs      | 25 +++++++++++++++++++
 2 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 src/Controls/tests/Core.UnitTests/HybridWebViewTests.cs

diff --git a/src/Controls/src/Core/HybridWebView/HybridWebView.cs b/src/Controls/src/Core/HybridWebView/HybridWebView.cs
index 74e441784a2f..985433a2ab57 100644
--- a/src/Controls/src/Core/HybridWebView/HybridWebView.cs
+++ b/src/Controls/src/Core/HybridWebView/HybridWebView.cs
@@ -41,24 +41,26 @@ public string? HybridRoot
 			set { SetValue(HybridRootProperty, value); }
 		}
 
+		HybridWebViewInvoker? _invoker;
+
 		[EditorBrowsable(EditorBrowsableState.Never)]
 		public HybridWebViewInvoker Invoker
 		{
-			get => field ?? throw new InvalidOperationException($"No invoker is configured. Call {nameof(SetInvokeJavaScriptTarget)} to set up JS-to-.NET method invocation.");
-			set;
+			get => _invoker ?? throw new InvalidOperationException($"No invoker is configured. Call {nameof(SetInvokeJavaScriptTarget)} to set up JS-to-.NET method invocation.");
+			set => _invoker = value;
 		}
 
 		/// <inheritdoc/>
 		object? IHybridWebView.InvokeJavaScriptTarget
 		{
-			get => Invoker.InvokeJavaScriptTarget;
+			get => _invoker?.InvokeJavaScriptTarget;
 			set => Invoker.InvokeJavaScriptTarget = value;
 		}
 
 		/// <inheritdoc/>
 		Type? IHybridWebView.InvokeJavaScriptType
 		{
-			get => Invoker.InvokeJavaScriptType;
+			get => _invoker?.InvokeJavaScriptType;
 			set => Invoker.InvokeJavaScriptType = value;
 		}
 
diff --git a/src/Controls/tests/Core.UnitTests/HybridWebViewTests.cs b/src/Controls/tests/Core.UnitTests/HybridWebViewTests.cs
new file mode 100644
index 000000000000..ab8e4b6ccea3
--- /dev/null
+++ b/src/Controls/tests/Core.UnitTests/HybridWebViewTests.cs
@@ -0,0 +1,25 @@
+using System;
+using Xunit;
+
+namespace Microsoft.Maui.Controls.Core.UnitTests
+{
+	public class HybridWebViewTests : BaseTestFixture
+	{
+		[Fact]
+		public void ExplicitInterfaceInvokeTargetPropertiesReturnNullBeforeTargetIsSet()
+		{
+			var hybridWebView = (IHybridWebView)new HybridWebView();
+
+			Assert.Null(hybridWebView.InvokeJavaScriptTarget);
+			Assert.Null(hybridWebView.InvokeJavaScriptType);
+		}
+
+		[Fact]
+		public void InvokerGetterThrowsBeforeTargetIsSet()
+		{
+			var hybridWebView = new HybridWebView();
+
+			Assert.Throws<InvalidOperationException>(() => hybridWebView.Invoker);
+		}
+	}
+}