Add support for configuring WebViewSettings via DI

src/BlazorWebView/samples/BlazorWinFormsApp/Form1.cs

@@ -17,11 +17,18 @@ public partial class Form1 : Form
 		public Form1()
 		{
 			var services1 = new ServiceCollection();
-			services1.AddBlazorWebView();
+			services1.AddWindowsFormsBlazorWebView();
+#if DEBUG
+			services1.AddBlazorWebViewDeveloperTools();
+#endif
 			services1.AddSingleton<AppState>(_appState);
 
 			var services2 = new ServiceCollection();
-			services2.AddBlazorWebView();
+			services2.AddWindowsFormsBlazorWebView();
+#if DEBUG
+			services2.AddBlazorWebViewDeveloperTools();
+#endif
+
 			services2.AddSingleton<AppState>(_appState);
 
 			InitializeComponent();

src/BlazorWebView/samples/BlazorWpfApp/MainWindow.xaml.cs

@@ -18,12 +18,20 @@ public partial class MainWindow : Window
 		public MainWindow()
 		{
 			var services1 = new ServiceCollection();
-			services1.AddBlazorWebView();
+			services1.AddWpfBlazorWebView();
+#if DEBUG
+			services1.AddBlazorWebViewDeveloperTools();
+#endif
+
 			services1.AddSingleton<AppState>(_appState);
 			Resources.Add("services1", services1.BuildServiceProvider());
 
 			var services2 = new ServiceCollection();
-			services2.AddBlazorWebView();
+			services2.AddWpfBlazorWebView();
+#if DEBUG
+			services2.AddBlazorWebViewDeveloperTools();
+#endif
+
 			services2.AddSingleton<AppState>(_appState);
 			Resources.Add("services2", services2.BuildServiceProvider());
 

src/BlazorWebView/src/Maui/Android/AndroidWebKitWebViewManager.cs

@@ -3,6 +3,7 @@
 using System.IO;
 using Android.Webkit;
 using Microsoft.AspNetCore.Components.Web;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.FileProviders;
 using AWebView = Android.Webkit.WebView;
 using AUri = Android.Net.Uri;
@@ -33,6 +34,14 @@ public class AndroidWebKitWebViewManager : WebViewManager
 		public AndroidWebKitWebViewManager(AWebView webview!!, IServiceProvider services, Dispatcher dispatcher, IFileProvider fileProvider, JSComponentConfigurationStore jsComponents, string hostPageRelativePath)
 			: base(services, dispatcher, new Uri(AppOrigin), fileProvider, jsComponents, hostPageRelativePath)
 		{
+#if WEBVIEW2_MAUI
+			if (services.GetService<MauiBlazorMarkerService>() is null)
+			{
+				throw new InvalidOperationException(
+					"Unable to find the required services. " +
+					$"Please add all the required services by calling '{nameof(IServiceCollection)}.{nameof(BlazorWebViewServiceCollectionExtensions.AddMauiBlazorWebView)}' in the application startup code.");
+			}
+#endif
 			_webview = webview;
 		}
 

src/BlazorWebView/src/Maui/Android/BlazorWebViewHandler.Android.cs

@@ -29,7 +29,7 @@ protected override BlazorAndroidWebView CreatePlatformView()
 			// To allow overriding ExternalLinkMode.InsecureOpenInWebView and open links in browser with a _blank target
 			blazorAndroidWebView.Settings.SetSupportMultipleWindows(true);
 
-			BlazorAndroidWebView.SetWebContentsDebuggingEnabled(enabled: true);
+			BlazorAndroidWebView.SetWebContentsDebuggingEnabled(enabled: DeveloperTools.Enabled);
 
 			if (blazorAndroidWebView.Settings != null)
 			{

src/BlazorWebView/src/Maui/BlazorWebViewHandler.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using Microsoft.AspNetCore.Components.WebView;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Maui;
 using Microsoft.Maui.Handlers;
 
@@ -21,7 +22,7 @@ public partial class BlazorWebViewHandler
 		/// <summary>
 		/// Initializes a new instance of <see cref="BlazorWebViewHandler"/> with default mappings.
 		/// </summary>
-		public BlazorWebViewHandler() : base(BlazorWebViewMapper)
+		public BlazorWebViewHandler() : this(BlazorWebViewMapper)
 		{
 		}
 
@@ -33,6 +34,8 @@ public BlazorWebViewHandler(PropertyMapper? mapper) : base(mapper ?? BlazorWebVi
 		{
 		}
 
+		internal BlazorWebViewDeveloperTools DeveloperTools => MauiContext!.Services.GetRequiredService<BlazorWebViewDeveloperTools>();
+
 		/// <summary>
 		/// Maps the <see cref="IBlazorWebView.HostPage"/> property to the specified handler.
 		/// </summary>

src/BlazorWebView/src/Maui/MauiBlazorMarkerService.cs

@@ -0,0 +1,9 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.AspNetCore.Components.WebView.Maui
+{
+	internal class MauiBlazorMarkerService
+	{
+	}
+}

src/BlazorWebView/src/Maui/iOS/BlazorWebViewHandler.iOS.cs

@@ -50,7 +50,7 @@ protected override WKWebView CreatePlatformView()
 		{
 			var config = new WKWebViewConfiguration();
 
-			config.Preferences.SetValueForKey(NSObject.FromObject(true), new NSString("developerExtrasEnabled"));
+			config.Preferences.SetValueForKey(NSObject.FromObject(DeveloperTools.Enabled), new NSString("developerExtrasEnabled"));
 
 			config.UserContentController.AddScriptMessageHandler(new WebViewScriptMessageHandler(MessageReceived), "webwindowinterop");
 			config.UserContentController.AddUserScript(new WKUserScript(

src/BlazorWebView/src/Maui/iOS/IOSWebViewManager.cs

@@ -5,6 +5,7 @@
 using System.Text.Encodings.Web;
 using Foundation;
 using Microsoft.AspNetCore.Components.Web;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.FileProviders;
 using UIKit;
 using WebKit;
@@ -33,6 +34,13 @@ public class IOSWebViewManager : WebViewManager
 		public IOSWebViewManager(BlazorWebViewHandler blazorMauiWebViewHandler!!, WKWebView webview!!, IServiceProvider provider, Dispatcher dispatcher, IFileProvider fileProvider, JSComponentConfigurationStore jsComponents, string hostPageRelativePath)
 			: base(provider, dispatcher, new Uri(BlazorWebViewHandler.AppOrigin), fileProvider, jsComponents, hostPageRelativePath)
 		{
+			if (provider.GetService<MauiBlazorMarkerService>() is null)
+			{
+				throw new InvalidOperationException(
+					"Unable to find the required services. " +
+					$"Please add all the required services by calling '{nameof(IServiceCollection)}.{nameof(BlazorWebViewServiceCollectionExtensions.AddMauiBlazorWebView)}' in the application startup code.");
+			}
+
 			_blazorMauiWebViewHandler = blazorMauiWebViewHandler;
 			_webview = webview;
 

src/BlazorWebView/src/SharedSource/BlazorWebViewDeveloperTools.cs

@@ -0,0 +1,17 @@
+using System;
+
+#if WEBVIEW2_WINFORMS
+namespace Microsoft.AspNetCore.Components.WebView.WindowsForms
+#elif WEBVIEW2_WPF
+namespace Microsoft.AspNetCore.Components.WebView.Wpf
+#elif WEBVIEW2_MAUI
+namespace Microsoft.AspNetCore.Components.WebView.Maui
+#else
+#error Must define WEBVIEW2_WINFORMS, WEBVIEW2_WPF, WEBVIEW2_MAUI
+#endif
+{
+	internal class BlazorWebViewDeveloperTools
+	{
+		public bool Enabled { get; set; } = false;
+	}
+}

src/BlazorWebView/src/SharedSource/BlazorWebViewServiceCollectionExtensions.cs

@@ -0,0 +1,60 @@
+using System;
+#if WEBVIEW2_WINFORMS
+using Microsoft.AspNetCore.Components.WebView.WindowsForms;
+#elif WEBVIEW2_WPF
+using Microsoft.AspNetCore.Components.WebView.Wpf;
+#elif WEBVIEW2_MAUI
+using Microsoft.AspNetCore.Components.WebView.Maui;
+using Microsoft.Maui.Hosting;
+#else
+#error Must define WEBVIEW2_WINFORMS, WEBVIEW2_WPF, WEBVIEW2_MAUI
+#endif
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+
+namespace Microsoft.Extensions.DependencyInjection
+{
+	/// <summary>
+	/// Extension methods to <see cref="IServiceCollection"/>.
+	/// </summary>
+	public static class BlazorWebViewServiceCollectionExtensions
+	{
+		/// <summary>
+		/// Configures <see cref="IServiceCollection"/> to add support for <see cref="BlazorWebView"/>.
+		/// </summary>
+		/// <param name="services">The <see cref="IServiceCollection"/>.</param>
+		/// <returns>The <see cref="IServiceCollection"/>.</returns>
+#if WEBVIEW2_WINFORMS
+		public static IServiceCollection AddWindowsFormsBlazorWebView(this IServiceCollection services)
+#elif WEBVIEW2_WPF
+		public static IServiceCollection AddWpfBlazorWebView(this IServiceCollection services)
+#elif WEBVIEW2_MAUI
+		public static IServiceCollection AddMauiBlazorWebView(this IServiceCollection services)
+#else
+#error Must define WEBVIEW2_WINFORMS, WEBVIEW2_WPF, WEBVIEW2_MAUI
+#endif
+		{
+			services.AddBlazorWebView();
+			services.TryAddSingleton(new BlazorWebViewDeveloperTools { Enabled = false });
+#if WEBVIEW2_MAUI
+			services.TryAddSingleton<MauiBlazorMarkerService>();
+			services.ConfigureMauiHandlers(static handlers => handlers.AddHandler<IBlazorWebView, BlazorWebViewHandler>());
+#elif WEBVIEW2_WINFORMS
+			services.TryAddSingleton<WindowsFormsBlazorMarkerService>();
+#elif WEBVIEW2_WPF
+			services.TryAddSingleton<WpfBlazorMarkerService>();
+#endif
+			return services;
+		}
+
+		/// <summary>
+		/// Enables Developer tools on the underlying WebView controls.
+		/// </summary>
+		/// <param name="services">The <see cref="IServiceCollection"/>.</param>
+		/// <returns>The <see cref="IServiceCollection"/>.</returns>
+		public static IServiceCollection AddBlazorWebViewDeveloperTools(this IServiceCollection services)
+		{
+			return services.AddSingleton<BlazorWebViewDeveloperTools>(new BlazorWebViewDeveloperTools { Enabled = true });
+		}
+	}
+}

src/BlazorWebView/src/SharedSource/WebView2WebViewManager.cs

@@ -17,16 +17,21 @@
 using Microsoft.Extensions.FileProviders;
 #if WEBVIEW2_WINFORMS
 using System.Diagnostics;
+using Microsoft.AspNetCore.Components.WebView.WindowsForms;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Web.WebView2;
 using Microsoft.Web.WebView2.Core;
 using WebView2Control = Microsoft.Web.WebView2.WinForms.WebView2;
 #elif WEBVIEW2_WPF
 using System.Diagnostics;
+using Microsoft.AspNetCore.Components.WebView.Wpf;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Web.WebView2;
 using Microsoft.Web.WebView2.Core;
 using WebView2Control = Microsoft.Web.WebView2.Wpf.WebView2;
 #elif WEBVIEW2_MAUI
 using Microsoft.AspNetCore.Components.WebView.Maui;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Web.WebView2.Core;
 using WebView2Control = Microsoft.UI.Xaml.Controls.WebView2;
 using System.Runtime.InteropServices.WindowsRuntime;
@@ -58,6 +63,7 @@ public class WebView2WebViewManager : WebViewManager
 #if WEBVIEW2_WINFORMS || WEBVIEW2_WPF
 		private protected CoreWebView2Environment _coreWebView2Environment;
 		private readonly Action<ExternalLinkNavigationEventArgs> _externalNavigationStarting;
+		private readonly BlazorWebViewDeveloperTools _developerTools;
 
 		/// <summary>
 		/// Constructs an instance of <see cref="WebView2WebViewManager"/>.
@@ -80,8 +86,25 @@ public WebView2WebViewManager(
 			: base(services, dispatcher, new Uri(AppOrigin), fileProvider, jsComponents, hostPageRelativePath)
 
 		{
+#if WEBVIEW2_WINFORMS
+			if (services.GetService<WindowsFormsBlazorMarkerService>() is null)
+			{
+				throw new InvalidOperationException(
+					"Unable to find the required services. " +
+					$"Please add all the required services by calling '{nameof(IServiceCollection)}.{nameof(BlazorWebViewServiceCollectionExtensions.AddWindowsFormsBlazorWebView)}' in the application startup code.");
+			}
+#elif WEBVIEW2_WPF
+			if (services.GetService<WpfBlazorMarkerService>() is null)
+			{
+				throw new InvalidOperationException(
+					"Unable to find the required services. " +
+					$"Please add all the required services by calling '{nameof(IServiceCollection)}.{nameof(BlazorWebViewServiceCollectionExtensions.AddWpfBlazorWebView)}' in the application startup code.");
+			}
+#endif
+
 			_webview = webview;
 			_externalNavigationStarting = externalNavigationStarting;
+			_developerTools = services.GetRequiredService<BlazorWebViewDeveloperTools>();
 
 			// Unfortunately the CoreWebView2 can only be instantiated asynchronously.
 			// We want the external API to behave as if initalization is synchronous,
@@ -113,6 +136,13 @@ BlazorWebViewHandler blazorWebViewHandler
 		)
 			: base(services, dispatcher, new Uri(AppOrigin), fileProvider, jsComponents, hostPageRelativePath)
 		{
+			if (services.GetService<MauiBlazorMarkerService>() is null)
+			{
+				throw new InvalidOperationException(
+					"Unable to find the required services. " +
+					$"Please add all the required services by calling '{nameof(IServiceCollection)}.{nameof(BlazorWebViewServiceCollectionExtensions.AddMauiBlazorWebView)}' in the application startup code.");
+			}
+
 			_webview = webview;
 			_blazorWebViewHandler = blazorWebViewHandler;
 
@@ -145,7 +175,13 @@ private async Task InitializeWebView2()
 #endif
 				.ConfigureAwait(true);
 			await _webview.EnsureCoreWebView2Async();
-			ApplyDefaultWebViewSettings();
+
+#if WEBVIEW2_MAUI
+            var developerTools = _blazorWebViewHandler.DeveloperTools;
+#elif WEBVIEW2_WINFORMS || WEBVIEW2_WPF
+			var developerTools = _developerTools;
+#endif
+			ApplyDefaultWebViewSettings(developerTools);
 
 			_webview.CoreWebView2.AddWebResourceRequestedFilter($"{AppOrigin}*", CoreWebView2WebResourceContext.All);
 
@@ -263,8 +299,10 @@ private void LaunchUriInExternalBrowser(Uri uri)
 		private protected static string GetHeaderString(IDictionary<string, string> headers) =>
 			string.Join(Environment.NewLine, headers.Select(kvp => $"{kvp.Key}: {kvp.Value}"));
 
-		private void ApplyDefaultWebViewSettings()
+		private void ApplyDefaultWebViewSettings(BlazorWebViewDeveloperTools devTools)
 		{
+			_webview.CoreWebView2.Settings.AreDevToolsEnabled = devTools.Enabled;
+
 			// Desktop applications typically don't want the default web browser context menu
 			_webview.CoreWebView2.Settings.AreDefaultContextMenusEnabled = false;
 

src/BlazorWebView/src/WindowsForms/BlazorWebView.cs

@@ -9,6 +9,7 @@
 using System.Reflection;
 using System.Windows.Forms;
 using Microsoft.AspNetCore.Components.WebView.WebView2;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.FileProviders;
 using WebView2Control = Microsoft.Web.WebView2.WinForms.WebView2;
 

src/BlazorWebView/src/WindowsForms/WindowsFormsBlazorMarkerService.cs

@@ -0,0 +1,9 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.AspNetCore.Components.WebView.WindowsForms
+{
+	internal class WindowsFormsBlazorMarkerService
+	{
+	}
+}

src/BlazorWebView/src/Wpf/BlazorWebView.cs

@@ -12,6 +12,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using Microsoft.AspNetCore.Components.WebView.WebView2;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.FileProviders;
 using WebView2Control = Microsoft.Web.WebView2.Wpf.WebView2;
 

src/BlazorWebView/src/Wpf/WpfBlazorMarkerService.cs

@@ -0,0 +1,9 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace Microsoft.AspNetCore.Components.WebView.Wpf
+{
+	internal class WpfBlazorMarkerService
+	{
+	}
+}

src/BlazorWebView/tests/MauiDeviceTests/Elements/BlazorWebViewTests.cs

@@ -16,7 +16,7 @@ public async Task BasicRazorComponentClick()
 		{
 			EnsureHandlerCreated(additionalCreationActions: appBuilder =>
 			{
-				appBuilder.Services.AddBlazorWebView();
+				appBuilder.Services.AddMauiBlazorWebView();
 			});
 
 			var bwv = new BlazorWebViewWithCustomFiles