Updating .NET MAUI to use MauiApp/MauiAppBuilder pattern and use MS.Extensions.DependencyInjection

eng/Microsoft.Extensions.targets

@@ -3,19 +3,7 @@
     <_UseNet6Packages Condition=" '$(TargetFramework.Contains(net6.0))' == 'true' or '$(PackageType)' == 'DotnetPlatform' ">true</_UseNet6Packages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(_UseNet6Packages)' != 'true' ">
-    <_MicrosoftHostingVersion>5.0.0</_MicrosoftHostingVersion>
     <SystemCodeDomPackageVersion>4.7.0</SystemCodeDomPackageVersion>
-    <MicrosoftExtensionsPrimitivesPackageVersion>(_MicrosoftHostingVersion)</MicrosoftExtensionsPrimitivesPackageVersion>
-    <MicrosoftExtensionsHostingAbstractionsPackageVersion>$(_MicrosoftHostingVersion)</MicrosoftExtensionsHostingAbstractionsPackageVersion>
-    <MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>$(_MicrosoftHostingVersion)</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
-    <MicrosoftExtensionsDependencyInjectionPackageVersion>5.0.1</MicrosoftExtensionsDependencyInjectionPackageVersion>
-    <MicrosoftExtensionsConfigurationAbstractionsPackageVersion>$(_MicrosoftHostingVersion)</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
-    <MicrosoftExtensionsConfigurationPackageVersion>$(_MicrosoftHostingVersion)</MicrosoftExtensionsConfigurationPackageVersion>
-    <MicrosoftExtensionsLoggingAbstractionsPackageVersion>$(_MicrosoftHostingVersion)</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
-    <MicrosoftExtensionsLoggingPackageVersion>$(_MicrosoftHostingVersion)</MicrosoftExtensionsLoggingPackageVersion>
-    <MicrosoftExtensionsLoggingConsolePackageVersion>$(_MicrosoftHostingVersion)</MicrosoftExtensionsLoggingConsolePackageVersion>
-    <MicrosoftExtensionsLoggingDebugPackageVersion>$(_MicrosoftHostingVersion)</MicrosoftExtensionsLoggingDebugPackageVersion>
-    <MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>$(_MicrosoftHostingVersion)</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
   </PropertyGroup>
    <!-- Microsoft.Maui.Graphics related Packages -->
   <PropertyGroup>
@@ -69,6 +57,10 @@
         Update="Microsoft.Extensions.FileProviders.Abstractions"
         Version="$(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion)"
     />
+    <PackageReference
+        Update="Microsoft.Extensions.Hosting"
+        Version="$(MicrosoftExtensionsHostingPackageVersion)"
+    />
     <PackageReference
         Update="Microsoft.Extensions.Hosting.Abstractions"
         Version="$(MicrosoftExtensionsHostingAbstractionsPackageVersion)"

eng/Version.Details.xml

@@ -36,6 +36,10 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>14b34eb02bc8969b77c0d3a1e39fb38f450625cf</Sha>
     </Dependency>
+    <Dependency Name="Microsoft.Extensions.Hosting" Version="6.0.0-rc.1.21417.1" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
+      <Uri>https://github.com/dotnet/runtime</Uri>
+      <Sha>58efa4b79751a2dad08d9bf7ca67930f8160afe3</Sha>
+    </Dependency>
     <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0-rc.1.21417.1" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>14b34eb02bc8969b77c0d3a1e39fb38f450625cf</Sha>

eng/Versions.props

@@ -10,6 +10,7 @@
     <MicrosoftmacOSSdkPackageVersion>12.0.100-rc.1.521</MicrosoftmacOSSdkPackageVersion>
     <MicrosoftExtensionsPrimitivesPackageVersion>6.0.0-rc.1.21417.1</MicrosoftExtensionsPrimitivesPackageVersion>
     <MicrosoftExtensionsHostingAbstractionsPackageVersion>6.0.0-rc.1.21417.1</MicrosoftExtensionsHostingAbstractionsPackageVersion>
+    <MicrosoftExtensionsHostingPackageVersion>6.0.0-rc.1.21417.1</MicrosoftExtensionsHostingPackageVersion>
     <MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>6.0.0-rc.1.21417.1</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
     <MicrosoftExtensionsDependencyInjectionPackageVersion>6.0.0-rc.1.21417.1</MicrosoftExtensionsDependencyInjectionPackageVersion>
     <MicrosoftExtensionsConfigurationAbstractionsPackageVersion>6.0.0-rc.1.21417.1</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>

src/BlazorWebView/src/Maui/BlazorWebViewRegistrationExtensions.cs

@@ -1,18 +1,19 @@
 using System;
+using Microsoft.Maui;
 using Microsoft.Maui.Hosting;
 
 namespace Microsoft.AspNetCore.Components.WebView.Maui
 {
 	public static class BlazorWebViewRegistrationExtensions
 	{
-		public static TAppHostBuilder RegisterBlazorMauiWebView<TAppHostBuilder>(this TAppHostBuilder appHostBuilder) where TAppHostBuilder : IAppHostBuilder
+		public static MauiAppBuilder RegisterBlazorMauiWebView(this MauiAppBuilder appHostBuilder)
 		{
 			if (appHostBuilder is null)
 			{
 				throw new ArgumentNullException(nameof(appHostBuilder));
 			}
 
-			appHostBuilder.ConfigureMauiHandlers((_, handlers) => handlers.AddHandler<IBlazorWebView, BlazorWebViewHandler>());
+			appHostBuilder.ConfigureMauiHandlers(handlers => handlers.AddHandler<IBlazorWebView, BlazorWebViewHandler>());
 
 			return appHostBuilder;
 		}

src/Compatibility/ControlGallery/src/Core/Startup.cs

@@ -6,13 +6,20 @@
 
 namespace Microsoft.Maui.Controls.Compatibility.ControlGallery
 {
-	public class Startup : IStartup
+	public static class MauiProgram
 	{
 		internal static bool UseBlazor = false;
 
-		public virtual void Configure(IAppHostBuilder appBuilder)
+		public static MauiApp CreateMauiApp()
 		{
-			appBuilder
+			var builder = CreateMauiAppBuilder();
+			return builder.Build();
+		}
+
+		public static MauiAppBuilder CreateMauiAppBuilder()
+		{
+			var builder = MauiApp.CreateBuilder();
+			builder
 				.UseMauiApp<App>()
 				.ConfigureMauiHandlers(handlers =>
 				{
@@ -26,14 +33,14 @@ public virtual void Configure(IAppHostBuilder appBuilder)
 				{
 					fonts.AddCompatibilityFonts(Device.GetAssemblies());
 				})
-				.ConfigureServices(services =>
-				{
-					DependencyService.Register(Device.GetAssemblies());
-				})
 				.ConfigureEffects(effects =>
 				{
 					effects.AddCompatibilityEffects(Device.GetAssemblies());
 				});
+
+			DependencyService.Register(Device.GetAssemblies());
+
+			return builder;
 		}
 	}
 }

src/Compatibility/ControlGallery/src/WinUI/App.xaml.cs

@@ -16,6 +16,6 @@ public App()
 			InitializeComponent();
 		}
 
-		protected override IStartup OnCreateStartup() => new WinUIStartup();
+		protected override MauiApp CreateMauiApp() => WinUIMauiProgram.CreateMauiApp();
 	}
 }

src/Compatibility/ControlGallery/src/WinUI/WinUIStartup.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Globalization;
+using System.Reflection.PortableExecutable;
 using Microsoft.Maui.Controls.Compatibility.Platform.UWP;
 using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
@@ -15,13 +16,13 @@
 
 namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI
 {
-	public class WinUIStartup : Startup
+	public class WinUIMauiProgram
 	{
-		public override void Configure(IAppHostBuilder appBuilder)
+		public static MauiApp CreateMauiApp()
 		{
-			base.Configure(appBuilder);
+			var builder = MauiProgram.CreateAppBuilder();
 
-			appBuilder.ConfigureLifecycleEvents(lifecycle => lifecycle
+			builder.ConfigureLifecycleEvents(lifecycle => lifecycle
 				.AddWindows(windows => windows
 					.OnLaunching((_, e) =>
 					{
@@ -32,6 +33,8 @@ public override void Configure(IAppHostBuilder appBuilder)
 						}
 					})
 					.OnActivated(WinUIPageStartup.OnActivated)));
+
+			return builder.Build();
 		}
 	}
 

src/Compatibility/ControlGallery/src/iOS/AppDelegate.cs

@@ -6,6 +6,7 @@
 using CoreGraphics;
 using Foundation;
 using UIKit;
+using Microsoft.Maui;
 using Microsoft.Maui.Controls;
 using Microsoft.Maui.Controls.Compatibility.ControlGallery.iOS;
 using Microsoft.Maui.Controls.Compatibility;
@@ -100,8 +101,10 @@ public string GetTestCloudDevice()
 	}
 
 	[Register("AppDelegate")]
-	public partial class AppDelegate : MauiUIApplicationDelegate<Startup>
+	public partial class AppDelegate : MauiUIApplicationDelegate
 	{
+		protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
+
 		public override bool FinishedLaunching(UIApplication uiApplication, NSDictionary launchOptions)
 		{
 			UISwitch.Appearance.OnTintColor = UIColor.Red;

src/Compatibility/Core/src/AppHostBuilderExtensions.Android.cs

@@ -6,7 +6,7 @@ namespace Microsoft.Maui.Controls.Hosting
 {
 	public static partial class AppHostBuilderExtensions
 	{
-		internal static IAppHostBuilder ConfigureCompatibilityLifecycleEvents(this IAppHostBuilder builder) =>
+		internal static MauiAppBuilder ConfigureCompatibilityLifecycleEvents(this MauiAppBuilder builder) =>
 			   builder.ConfigureLifecycleEvents(events => events.AddAndroid(OnConfigureLifeCycle));
 
 		static void OnConfigureLifeCycle(IAndroidLifecycleBuilder android)

src/Compatibility/Core/src/AppHostBuilderExtensions.Standard.cs

@@ -6,7 +6,7 @@ namespace Microsoft.Maui.Controls.Hosting
 {
 	public static partial class AppHostBuilderExtensions
 	{
-		internal static IAppHostBuilder ConfigureCompatibilityLifecycleEvents(this IAppHostBuilder builder) =>
+		internal static MauiAppBuilder ConfigureCompatibilityLifecycleEvents(this MauiAppBuilder builder) =>
 			builder;
 	}
 }

src/Compatibility/Core/src/AppHostBuilderExtensions.Windows.cs

@@ -17,7 +17,7 @@ namespace Microsoft.Maui.Controls.Hosting
 {
 	public static partial class AppHostBuilderExtensions
 	{
-		internal static IAppHostBuilder ConfigureCompatibilityLifecycleEvents(this IAppHostBuilder builder) =>
+		internal static MauiAppBuilder ConfigureCompatibilityLifecycleEvents(this MauiAppBuilder builder) =>
 			   builder.ConfigureLifecycleEvents(events => events.AddWindows(OnConfigureLifeCycle));
 
 		static void OnConfigureLifeCycle(IWindowsLifecycleBuilder windows)

src/Compatibility/Core/src/AppHostBuilderExtensions.cs

@@ -1,6 +1,7 @@
 #nullable enable
 using System;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Maui.Controls.Compatibility;
 using Microsoft.Maui.Controls.Shapes;
@@ -40,36 +41,25 @@
 
 namespace Microsoft.Maui.Controls.Hosting
 {
-	public static partial class AppHostBuilderExtensions
+	public static class MauiAppBuilderExtensions
 	{
-		public static IAppHostBuilder UseMauiApp<TApp>(this IAppHostBuilder builder)
+		public static MauiAppBuilder UseMauiApp<TApp>(this MauiAppBuilder builder)
 			where TApp : class, IApplication
 		{
-			builder.ConfigureServices((context, collection) =>
-			{
-				collection.AddSingleton<IApplication, TApp>();
-			});
-
+			builder.Services.TryAddSingleton<IApplication, TApp>();
 			builder.SetupDefaults();
-
 			return builder;
 		}
 
-		public static IAppHostBuilder UseMauiApp<TApp>(this IAppHostBuilder builder, Func<IServiceProvider, TApp> implementationFactory)
+		public static MauiAppBuilder UseMauiApp<TApp>(this MauiAppBuilder builder, Func<IServiceProvider, TApp> implementationFactory)
 			where TApp : class, IApplication
 		{
-			builder.ConfigureServices((context, collection) =>
-			{
-				collection.AddSingleton<IApplication>(implementationFactory);
-			});
-
+			builder.Services.TryAddSingleton<IApplication>(implementationFactory);
 			builder.SetupDefaults();
-
 			return builder;
 		}
 
-
-		static IAppHostBuilder ConfigureImageSourceHandlers(this IAppHostBuilder builder)
+		static MauiAppBuilder ConfigureImageSourceHandlers(this MauiAppBuilder builder)
 		{
 			builder.ConfigureImageSources(services =>
 			{
@@ -82,7 +72,7 @@ static IAppHostBuilder ConfigureImageSourceHandlers(this IAppHostBuilder builder
 			return builder;
 		}
 
-		static IAppHostBuilder SetupDefaults(this IAppHostBuilder builder)
+		static MauiAppBuilder SetupDefaults(this MauiAppBuilder builder)
 		{
 			builder.ConfigureCompatibilityLifecycleEvents();
 			builder.ConfigureImageSourceHandlers();
@@ -179,16 +169,30 @@ static IAppHostBuilder SetupDefaults(this IAppHostBuilder builder)
 					// Update the mappings for IView/View to work specifically for Controls
 					VisualElement.RemapForControls();
 					Label.RemapForControls();
+				});
 
-				})
-				.ConfigureServices<MauiCompatBuilder>();
+			builder.AddMauiCompat();
 
 			return builder;
 		}
 
-		class MauiCompatBuilder : IMauiServiceBuilder
+		private static MauiAppBuilder AddMauiCompat(this MauiAppBuilder builder)
 		{
-			public void Configure(HostBuilderContext context, IServiceProvider services)
+#if __IOS__ || MACCATALYST
+			builder.Services.TryAddSingleton<IGraphicsService>(NativeGraphicsService.Instance);
+#elif __ANDROID__
+			builder.Services.TryAddSingleton<IGraphicsService>(NativeGraphicsService.Instance);
+#elif WINDOWS
+			builder.Services.TryAddSingleton<IGraphicsService>(W2DGraphicsService.Instance);
+#endif
+
+			builder.Services.TryAddEnumerable(ServiceDescriptor.Transient<IMauiInitializeService, MauiCompatInitializer>());
+			return builder;
+		}
+
+		class MauiCompatInitializer : IMauiInitializeService
+		{
+			public void Initialize(IServiceProvider services)
 			{
 #if __ANDROID__ || __IOS__ || WINDOWS || MACCATALYST
 				CompatServiceProvider.SetServiceProvider(services);
@@ -216,17 +220,6 @@ public void Configure(HostBuilderContext context, IServiceProvider services)
 #endif
 			}
 
-			public void ConfigureServices(HostBuilderContext context, IServiceCollection services)
-			{
-#if __IOS__ || MACCATALYST
-				services.AddSingleton<IGraphicsService>(NativeGraphicsService.Instance);
-#elif __ANDROID__
-				services.AddSingleton<IGraphicsService>(NativeGraphicsService.Instance);
-#elif WINDOWS
-				services.AddSingleton<IGraphicsService>(W2DGraphicsService.Instance);
-#endif
-			}
-
 #if WINDOWS
 			static void AddLibraryResources(string key, string uri)
 			{

src/Compatibility/Core/src/AppHostBuilderExtensions.iOS.cs

@@ -6,7 +6,7 @@ namespace Microsoft.Maui.Controls.Hosting
 {
 	public static partial class AppHostBuilderExtensions
 	{
-		internal static IAppHostBuilder ConfigureCompatibilityLifecycleEvents(this IAppHostBuilder builder) =>
+		internal static MauiAppBuilder ConfigureCompatibilityLifecycleEvents(this MauiAppBuilder builder) =>
 			   builder.ConfigureLifecycleEvents(events => events.AddiOS(OnConfigureLifeCycle));
 
 		static void OnConfigureLifeCycle(IiOSLifecycleBuilder iOS)

src/Controls/samples/Controls.Sample.Droid/MainApplication.cs

@@ -7,10 +7,12 @@
 namespace Maui.Controls.Sample.Droid
 {
 	[Application]
-	public class MainApplication : MauiApplication<Startup>
+	public class MainApplication : MauiApplication
 	{
 		public MainApplication(IntPtr handle, JniHandleOwnership ownership) : base(handle, ownership)
 		{
 		}
+
+		protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
 	}
-}
+}

src/Controls/samples/Controls.Sample.MacCatalyst/AppDelegate.cs

@@ -11,7 +11,8 @@
 namespace Sample.MacCatalyst
 {
 	[Register("AppDelegate")]
-	public class AppDelegate : MauiUIApplicationDelegate<Startup>
+	public class AppDelegate : MauiUIApplicationDelegate
 	{
+		protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
 	}
 }

src/Controls/samples/Controls.Sample.Profiling/Platforms/Android/MainApplication.cs

@@ -6,10 +6,12 @@
 namespace Maui.Controls.Sample.Profiling
 {
 	[Application]
-	public class MainApplication : MauiApplication<Startup>
+	public class MainApplication : MauiApplication
 	{
 		public MainApplication(IntPtr handle, JniHandleOwnership ownership) : base(handle, ownership)
 		{
 		}
+
+		protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
 	}
 }

src/Controls/samples/Controls.Sample.Profiling/Platforms/MacCatalyst/AppDelegate.cs

@@ -4,7 +4,8 @@
 namespace Maui.Controls.Sample.Profiling
 {
 	[Register("AppDelegate")]
-	public class AppDelegate : MauiUIApplicationDelegate<Startup>
+	public class AppDelegate : MauiUIApplicationDelegate
 	{
+		protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
 	}
 }

src/Controls/samples/Controls.Sample.Profiling/Platforms/iOS/AppDelegate.cs

@@ -4,7 +4,8 @@
 namespace Maui.Controls.Sample.Profiling
 {
 	[Register("AppDelegate")]
-	public class AppDelegate : MauiUIApplicationDelegate<Startup>
+	public class AppDelegate : MauiUIApplicationDelegate
 	{
+		protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
 	}
 }