dotnet · PureWeen · Jun 22, 2026 · May 13, 2026 · May 13, 2026 · May 13, 2026
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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/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/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
@@ -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",

diff --git 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/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/...rols/src/Build.Tasks/nuget/buildTransitive/netstandard2.0/Microsoft.Maui.Controls.targets b/...rols/src/Build.Tasks/nuget/buildTransitive/netstandard2.0/Microsoft.Maui.Controls.targets
@@ -34,14 +34,18 @@
 		<Analyzer Include="$(MSBuildThisFileDirectory)Microsoft.Maui.Controls.SourceGen.dll" IsImplicitlyDefined="true" />
 	</ItemGroup>
 
-	<!-- Enable BindingSourceGen -->
+	<!-- Enable interceptor source generators -->
 	<PropertyGroup>
 		<_MauiBindingInterceptorsSupport Condition=" '$(_MauiBindingInterceptorsSupport)' == '' and '$(DisableMauiAnalyzers)' != 'true' ">true</_MauiBindingInterceptorsSupport>
-		<InterceptorsPreviewNamespaces Condition=" '$(_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" />
@@ -322,7 +326,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 +359,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
@@ -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
@@ -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
@@ -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
@@ -61,6 +61,10 @@
       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
@@ -128,11 +128,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>();
@@ -248,11 +244,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();