Have user code return the built MauiApp

Eilon · Eilon · commit 13c077255bc4 · 2021-08-23T23:57:24.000-07:00
Instead of returning the builder.
diff --git a/src/Compatibility/ControlGallery/src/Core/Startup.cs b/src/Compatibility/ControlGallery/src/Core/Startup.cs
@@ -10,7 +10,13 @@ public static class MauiProgram
 	{
 		internal static bool UseBlazor = false;
 
-		public static MauiAppBuilder CreateAppBuilder()
+		public static MauiApp CreateMauiApp()
+		{
+			var builder = CreateMauiAppBuilder();
+			return builder.Build();
+		}
+
+		public static MauiAppBuilder CreateMauiAppBuilder()
 		{
 			var builder = MauiApp.CreateBuilder();
 			builder
diff --git a/src/Compatibility/ControlGallery/src/WinUI/App.xaml.cs b/src/Compatibility/ControlGallery/src/WinUI/App.xaml.cs
@@ -16,6 +16,6 @@ public App()
 			InitializeComponent();
 		}
 
-		protected override MauiAppBuilder CreateAppBuilder() => WinUIMauiProgram.CreateAppBuilder();
+		protected override MauiApp CreateMauiApp() => WinUIMauiProgram.CreateMauiApp();
 	}
 }
diff --git a/src/Compatibility/ControlGallery/src/WinUI/WinUIStartup.cs b/src/Compatibility/ControlGallery/src/WinUI/WinUIStartup.cs
@@ -18,7 +18,7 @@ namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI
 {
 	public class WinUIMauiProgram
 	{
-		public static MauiAppBuilder CreateAppBuilder()
+		public static MauiApp CreateMauiApp()
 		{
 			var builder = MauiProgram.CreateAppBuilder();
 
@@ -34,7 +34,7 @@ public static MauiAppBuilder CreateAppBuilder()
 					})
 					.OnActivated(WinUIPageStartup.OnActivated)));
 
-			return builder;
+			return builder.Build();
 		}
 	}
 
diff --git a/src/Compatibility/ControlGallery/src/iOS/AppDelegate.cs b/src/Compatibility/ControlGallery/src/iOS/AppDelegate.cs
@@ -103,7 +103,7 @@ public string GetTestCloudDevice()
 	[Register("AppDelegate")]
 	public partial class AppDelegate : MauiUIApplicationDelegate
 	{
-		protected override MauiAppBuilder CreateAppBuilder() => MauiProgram.CreateAppBuilder();
+		protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
 
 		public override bool FinishedLaunching(UIApplication uiApplication, NSDictionary launchOptions)
 		{
diff --git a/src/Controls/samples/Controls.Sample.Droid/MainApplication.cs b/src/Controls/samples/Controls.Sample.Droid/MainApplication.cs
@@ -13,6 +13,6 @@ public MainApplication(IntPtr handle, JniHandleOwnership ownership) : base(handl
 		{
 		}
 
-		protected override MauiAppBuilder CreateAppBuilder() => MauiProgram.CreateAppBuilder();
+		protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
 	}
 }
diff --git a/src/Controls/samples/Controls.Sample.MacCatalyst/AppDelegate.cs b/src/Controls/samples/Controls.Sample.MacCatalyst/AppDelegate.cs
@@ -13,6 +13,6 @@ namespace Sample.MacCatalyst
 	[Register("AppDelegate")]
 	public class AppDelegate : MauiUIApplicationDelegate
 	{
-		protected override MauiAppBuilder CreateAppBuilder() => MauiProgram.CreateAppBuilder();
+		protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
 	}
 }
diff --git a/src/Controls/samples/Controls.Sample.Profiling/Platforms/Android/MainApplication.cs b/src/Controls/samples/Controls.Sample.Profiling/Platforms/Android/MainApplication.cs
@@ -12,6 +12,6 @@ public MainApplication(IntPtr handle, JniHandleOwnership ownership) : base(handl
 		{
 		}
 
-		protected override MauiAppBuilder CreateAppBuilder() => MauiProgram.CreateAppBuilder();
+		protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
 	}
 }
diff --git a/src/Controls/samples/Controls.Sample.Profiling/Platforms/MacCatalyst/AppDelegate.cs b/src/Controls/samples/Controls.Sample.Profiling/Platforms/MacCatalyst/AppDelegate.cs
@@ -6,6 +6,6 @@ namespace Maui.Controls.Sample.Profiling
 	[Register("AppDelegate")]
 	public class AppDelegate : MauiUIApplicationDelegate
 	{
-		protected override MauiAppBuilder CreateAppBuilder() => MauiProgram.CreateAppBuilder();
+		protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
 	}
 }
diff --git a/src/Controls/samples/Controls.Sample.Profiling/Platforms/iOS/AppDelegate.cs b/src/Controls/samples/Controls.Sample.Profiling/Platforms/iOS/AppDelegate.cs
@@ -6,6 +6,6 @@ namespace Maui.Controls.Sample.Profiling
 	[Register("AppDelegate")]
 	public class AppDelegate : MauiUIApplicationDelegate
 	{
-		protected override MauiAppBuilder CreateAppBuilder() => MauiProgram.CreateAppBuilder();
+		protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
 	}
 }
diff --git a/src/Controls/samples/Controls.Sample.Profiling/Startup.cs b/src/Controls/samples/Controls.Sample.Profiling/Startup.cs
@@ -9,7 +9,7 @@ namespace Maui.Controls.Sample.Profiling
 {
 	public static class MauiProgram
 	{
-		public static MauiAppBuilder CreateAppBuilder()
+		public static MauiApp CreateMauiApp()
 		{
 			var appBuilder = MauiApp.CreateBuilder();
 
@@ -20,7 +20,7 @@ public static MauiAppBuilder CreateAppBuilder()
 					fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
 				});
 
-			return appBuilder;
+			return builder.Build();
 		}
 	}
 }
diff --git a/src/Controls/samples/Controls.Sample.SingleProject/Platforms/Android/MainApplication.cs b/src/Controls/samples/Controls.Sample.SingleProject/Platforms/Android/MainApplication.cs
@@ -12,6 +12,6 @@ public MainApplication(IntPtr handle, JniHandleOwnership ownership) : base(handl
 		{
 		}
 
-		protected override MauiAppBuilder CreateAppBuilder() => MauiProgram.CreateAppBuilder();
+		protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
 	}
 }
diff --git a/src/Controls/samples/Controls.Sample.SingleProject/Platforms/MacCatalyst/AppDelegate.cs b/src/Controls/samples/Controls.Sample.SingleProject/Platforms/MacCatalyst/AppDelegate.cs
@@ -6,6 +6,6 @@ namespace Maui.Controls.Sample.SingleProject
 	[Register("AppDelegate")]
 	public class AppDelegate : MauiUIApplicationDelegate
 	{
-		protected override MauiAppBuilder CreateAppBuilder() => MauiProgram.CreateAppBuilder();
+		protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
 	}
 }
diff --git a/src/Controls/samples/Controls.Sample.SingleProject/Platforms/Windows/App.xaml.cs b/src/Controls/samples/Controls.Sample.SingleProject/Platforms/Windows/App.xaml.cs
@@ -24,6 +24,6 @@ public App()
 
     public class MiddleApp : MauiWinUIApplication
     {
-		protected override MauiAppBuilder CreateAppBuilder() => MauiProgram.CreateAppBuilder();
+		protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
 	}
 }
diff --git a/src/Controls/samples/Controls.Sample.SingleProject/Platforms/iOS/AppDelegate.cs b/src/Controls/samples/Controls.Sample.SingleProject/Platforms/iOS/AppDelegate.cs
@@ -6,6 +6,6 @@ namespace Maui.Controls.Sample.SingleProject
 	[Register("AppDelegate")]
 	public class AppDelegate : MauiUIApplicationDelegate
 	{
-		protected override MauiAppBuilder CreateAppBuilder() => MauiProgram.CreateAppBuilder();
+		protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
 	}
 }
diff --git a/src/Controls/samples/Controls.Sample.SingleProject/Startup.cs b/src/Controls/samples/Controls.Sample.SingleProject/Startup.cs
@@ -9,7 +9,7 @@ public static class MauiProgram
 	{
 		internal static bool UseBlazor = false;
 
-		public static MauiAppBuilder CreateAppBuilder()
+		public static MauiApp CreateMauiApp()
 		{
 			var appBuilder = MauiApp.CreateBuilder();
 			appBuilder
@@ -21,7 +21,7 @@ public static MauiAppBuilder CreateAppBuilder()
 				appBuilder.Services.AddBlazorWebView();
 			}
 
-			return appBuilder;
+			return appBuilder.Build();
 		}
 	}
 }
diff --git a/src/Controls/samples/Controls.Sample.WinUI/App.xaml.cs b/src/Controls/samples/Controls.Sample.WinUI/App.xaml.cs
@@ -9,6 +9,6 @@ public App()
 			InitializeComponent();
 		}
 
-		protected override MauiAppBuilder CreateAppBuilder() => MauiProgram.CreateAppBuilder();
+		protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
 	}
 }
diff --git a/src/Controls/samples/Controls.Sample.iOS/AppDelegate.cs b/src/Controls/samples/Controls.Sample.iOS/AppDelegate.cs
@@ -6,6 +6,6 @@ namespace Maui.Controls.Sample.iOS
 	[Register("AppDelegate")]
 	public class AppDelegate : MauiUIApplicationDelegate
 	{
-		protected override MauiAppBuilder CreateAppBuilder() => MauiProgram.CreateAppBuilder();
+		protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
 	}
 }
diff --git a/src/Controls/samples/Controls.Sample/Startup.cs b/src/Controls/samples/Controls.Sample/Startup.cs
@@ -29,7 +29,7 @@ public static class MauiProgram
 		enum PageType { Main, Blazor, Shell, Template }
 		readonly static PageType _pageType = PageType.Main;
 
-		public static MauiAppBuilder CreateAppBuilder()
+		public static MauiApp CreateMauiApp()
 		{
 			var appBuilder = MauiApp.CreateBuilder();
 
@@ -217,7 +217,7 @@ static bool LogEvent(string eventName, string type = null)
 					}
 				});
 
-			return appBuilder;
+			return appBuilder.Build();
 		}
 	}
 }
diff --git a/src/Core/src/Platform/Android/MauiApplication.cs b/src/Core/src/Platform/Android/MauiApplication.cs
@@ -18,13 +18,13 @@ protected MauiApplication(IntPtr handle, JniHandleOwnership ownership) : base(ha
 			Current = this;
 		}
 
-		protected abstract MauiAppBuilder CreateAppBuilder();
+		protected abstract MauiApp CreateMauiApp();
 
 		public override void OnCreate()
 		{
 			RegisterActivityLifecycleCallbacks(new ActivityLifecycleCallbacks());
 
-			var builder = CreateAppBuilder();
+			var mauiApp = CreateMauiApp();
 
 			//var startup = OnCreateStartup();
 
@@ -34,8 +34,6 @@ public override void OnCreate()
 			//	.ConfigureUsing(startup)
 			//	.Build();
 
-			var mauiApp = builder.Build();
-
 			Services = mauiApp.Services;
 
 			Current.Services?.InvokeLifecycleEvents<AndroidLifecycle.OnApplicationCreating>(del => del(this));
diff --git a/src/Core/src/Platform/Windows/MauiWinUIApplication.cs b/src/Core/src/Platform/Windows/MauiWinUIApplication.cs
@@ -8,14 +8,13 @@ namespace Microsoft.Maui
 {
 	public abstract class MauiWinUIApplication : UI.Xaml.Application
 	{
-		protected abstract MauiAppBuilder CreateAppBuilder();
+		protected abstract MauiApp CreateMauiApp();
 
 		protected override void OnLaunched(UI.Xaml.LaunchActivatedEventArgs args)
 		{
 			LaunchActivatedEventArgs = args;
 
-			var builder = CreateAppBuilder();
-			var mauiApp = builder.Build();
+			var mauiApp = CreateMauiApp();
 
 			//var startup = OnCreateStartup() ??
 			//	throw new InvalidOperationException($"A valid startup object must be provided by overriding {nameof(OnCreateStartup)}.");
diff --git a/src/Core/src/Platform/iOS/MauiUIApplicationDelegate.cs b/src/Core/src/Platform/iOS/MauiUIApplicationDelegate.cs
@@ -26,11 +26,11 @@ protected MauiUIApplicationDelegate()
 			Current = this;
 		}
 
-		protected abstract MauiAppBuilder CreateAppBuilder();
+		protected abstract MauiApp CreateMauiApp();
 
 		public override bool WillFinishLaunching(UIApplication application, NSDictionary launchOptions)
 		{
-			var builder = CreateAppBuilder();
+			var mauiApp = CreateMauiApp();
 
 			//var startup = OnCreateStartup();
 
@@ -40,8 +40,6 @@ public override bool WillFinishLaunching(UIApplication application, NSDictionary
 			//	.ConfigureUsing(startup)
 			//	.Build();
 
-			var mauiApp = builder.Build();
-
 			Services = mauiApp.Services;
 
 			Current.Services?.InvokeLifecycleEvents<iOSLifecycle.WillFinishLaunching>(del => del(application, launchOptions));
diff --git a/src/Core/tests/DeviceTests/Platforms/Windows/App.xaml.cs b/src/Core/tests/DeviceTests/Platforms/Windows/App.xaml.cs
@@ -24,6 +24,6 @@ public App()
 
     public class MiddleApp : MauiWinUIApplication
     {
-		protected override MauiAppBuilder CreateAppBuilder() => MauiProgram.CreateAppBuilder();
+		protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
 	}
 }
diff --git a/src/Core/tests/DeviceTests/Startup.cs b/src/Core/tests/DeviceTests/Startup.cs
@@ -6,7 +6,7 @@ namespace Microsoft.Maui.DeviceTests
 {
 	public static class MauiProgram
 	{
-		public static MauiAppBuilder CreateAppBuilder()
+		public static MauiApp CreateMauiApp()
 		{
 			var appBuilder = MauiApp.CreateBuilder();
 			appBuilder
@@ -32,7 +32,7 @@ public static MauiAppBuilder CreateAppBuilder()
 				})
 				.UseVisualRunner();
 
-			return appBuilder;
+			return appBuilder.Build();
 		}
 	}
 }
diff --git a/src/Essentials/samples/Samples/Platforms/Android/MainApplication.cs b/src/Essentials/samples/Samples/Platforms/Android/MainApplication.cs
@@ -13,6 +13,6 @@ public MainApplication(IntPtr handle, JniHandleOwnership ownership) : base(handl
 		{
 		}
 
-		protected override MauiAppBuilder CreateAppBuilder() => MauiProgram.CreateAppBuilder();
+		protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
 	}
 }
diff --git a/src/Essentials/samples/Samples/Platforms/MacCatalyst/AppDelegate.cs b/src/Essentials/samples/Samples/Platforms/MacCatalyst/AppDelegate.cs
@@ -6,6 +6,6 @@ namespace Samples.iOS
 	[Register(nameof(AppDelegate))]
 	public partial class AppDelegate : MauiUIApplicationDelegate
 	{
-		protected override MauiAppBuilder CreateAppBuilder() => MauiProgram.CreateAppBuilder();
+		protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
 	}
 }
diff --git a/src/Essentials/samples/Samples/Platforms/Windows/App.xaml.cs b/src/Essentials/samples/Samples/Platforms/Windows/App.xaml.cs
@@ -4,7 +4,7 @@ namespace Samples.UWP
 {
 	public class MiddleApp : MauiWinUIApplication
 	{
-		protected override MauiAppBuilder CreateAppBuilder() => MauiProgram.CreateAppBuilder();
+		protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
 	}
 
 	public partial class App : MiddleApp
diff --git a/src/Essentials/samples/Samples/Platforms/iOS/AppDelegate.cs b/src/Essentials/samples/Samples/Platforms/iOS/AppDelegate.cs
@@ -6,6 +6,6 @@ namespace Samples.iOS
 	[Register(nameof(AppDelegate))]
 	public partial class AppDelegate : MauiUIApplicationDelegate
 	{
-		protected override MauiAppBuilder CreateAppBuilder() => MauiProgram.CreateAppBuilder();
+		protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
 	}
 }
diff --git a/src/Essentials/samples/Samples/Startup.cs b/src/Essentials/samples/Samples/Startup.cs
@@ -6,7 +6,7 @@ namespace Samples
 {
 	public static class MauiProgram
 	{
-		public static MauiAppBuilder CreateAppBuilder()
+		public static MauiApp CreateMauiApp()
 		{
 			var appBuilder = MauiApp.CreateBuilder();
 
@@ -36,7 +36,7 @@ public static MauiAppBuilder CreateAppBuilder()
 				})
 				.UseMauiApp<App>();
 
-			return appBuilder;
+			return appBuilder.Build();
 		}
 	}
 }
diff --git a/src/Essentials/test/DeviceTests/Platforms/Windows/App.xaml.cs b/src/Essentials/test/DeviceTests/Platforms/Windows/App.xaml.cs
@@ -24,6 +24,6 @@ public App()
 
     public class MiddleApp : MauiWinUIApplication
     {
-		protected override MauiAppBuilder CreateAppBuilder() => MauiProgram.CreateAppBuilder();
+		protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
 	}
 }
diff --git a/src/Essentials/test/DeviceTests/Startup.cs b/src/Essentials/test/DeviceTests/Startup.cs
@@ -7,7 +7,7 @@ namespace Microsoft.Maui.Essentials.DeviceTests
 {
 	public static class MauiProgram
 	{
-		public static MauiAppBuilder CreateAppBuilder()
+		public static MauiApp CreateMauiApp()
 		{
 			var appBuilder = MauiApp.CreateBuilder();
 			appBuilder
@@ -42,7 +42,7 @@ public static MauiAppBuilder CreateAppBuilder()
 				})
 				.UseVisualRunner();
 
-			return appBuilder;
+			return appBuilder.Build();
 		}
 	}
 }
diff --git a/src/TestUtils/samples/DeviceTests.Sample/Platforms/Windows/App.xaml.cs b/src/TestUtils/samples/DeviceTests.Sample/Platforms/Windows/App.xaml.cs
@@ -24,6 +24,6 @@ public App()
 
     public class MiddleApp : MauiWinUIApplication
     {
-		protected override MauiAppBuilder CreateAppBuilder() => MauiProgram.CreateAppBuilder();
+		protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
 	}
 }
diff --git a/src/TestUtils/samples/DeviceTests.Sample/Startup.cs b/src/TestUtils/samples/DeviceTests.Sample/Startup.cs
diff --git a/src/TestUtils/src/DeviceTests.Runners.SourceGen/RunnerGenerator.cs b/src/TestUtils/src/DeviceTests.Runners.SourceGen/RunnerGenerator.cs
diff --git a/src/TestUtils/src/DeviceTests.Runners/HeadlessRunner/iOS/MauiTestApplicationDelegate.cs b/src/TestUtils/src/DeviceTests.Runners/HeadlessRunner/iOS/MauiTestApplicationDelegate.cs

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,13 @@ public static class MauiProgram`
`10`	`10`	`{`
`11`	`11`	`internal static bool UseBlazor = false;`
`12`	`12`
`13`		`- public static MauiAppBuilder CreateAppBuilder()`
	`13`	`+ public static MauiApp CreateMauiApp()`
	`14`	`+ {`
	`15`	`+ var builder = CreateMauiAppBuilder();`
	`16`	`+ return builder.Build();`
	`17`	`+ }`
	`18`	`+`
	`19`	`+ public static MauiAppBuilder CreateMauiAppBuilder()`
`14`	`20`	`{`
`15`	`21`	`var builder = MauiApp.CreateBuilder();`
`16`	`22`	`builder`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,6 @@ public App()`
`16`	`16`	`InitializeComponent();`
`17`	`17`	`}`
`18`	`18`
`19`		`- protected override MauiAppBuilder CreateAppBuilder() => WinUIMauiProgram.CreateAppBuilder();`
	`19`	`+ protected override MauiApp CreateMauiApp() => WinUIMauiProgram.CreateMauiApp();`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI`
`18`	`18`	`{`
`19`	`19`	`public class WinUIMauiProgram`
`20`	`20`	`{`
`21`		`- public static MauiAppBuilder CreateAppBuilder()`
	`21`	`+ public static MauiApp CreateMauiApp()`
`22`	`22`	`{`
`23`	`23`	`var builder = MauiProgram.CreateAppBuilder();`
`24`	`24`
`@@ -34,7 +34,7 @@ public static MauiAppBuilder CreateAppBuilder()`
`34`	`34`	`})`
`35`	`35`	`.OnActivated(WinUIPageStartup.OnActivated)));`
`36`	`36`
`37`		`- return builder;`
	`37`	`+ return builder.Build();`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public string GetTestCloudDevice()`
`103`	`103`	`[Register("AppDelegate")]`
`104`	`104`	`public partial class AppDelegate : MauiUIApplicationDelegate`
`105`	`105`	`{`
`106`		`- protected override MauiAppBuilder CreateAppBuilder() => MauiProgram.CreateAppBuilder();`
	`106`	`+ protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();`
`107`	`107`
`108`	`108`	`public override bool FinishedLaunching(UIApplication uiApplication, NSDictionary launchOptions)`
`109`	`109`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@ public MainApplication(IntPtr handle, JniHandleOwnership ownership) : base(handl`
`13`	`13`	`{`
`14`	`14`	`}`
`15`	`15`
`16`		`- protected override MauiAppBuilder CreateAppBuilder() => MauiProgram.CreateAppBuilder();`
	`16`	`+ protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();`
`17`	`17`	`}`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@ namespace Sample.MacCatalyst`
`13`	`13`	`[Register("AppDelegate")]`
`14`	`14`	`public class AppDelegate : MauiUIApplicationDelegate`
`15`	`15`	`{`
`16`		`- protected override MauiAppBuilder CreateAppBuilder() => MauiProgram.CreateAppBuilder();`
	`16`	`+ protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();`
`17`	`17`	`}`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@ public MainApplication(IntPtr handle, JniHandleOwnership ownership) : base(handl`
`12`	`12`	`{`
`13`	`13`	`}`
`14`	`14`
`15`		`- protected override MauiAppBuilder CreateAppBuilder() => MauiProgram.CreateAppBuilder();`
	`15`	`+ protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@ namespace Maui.Controls.Sample.Profiling`
`6`	`6`	`[Register("AppDelegate")]`
`7`	`7`	`public class AppDelegate : MauiUIApplicationDelegate`
`8`	`8`	`{`
`9`		`- protected override MauiAppBuilder CreateAppBuilder() => MauiProgram.CreateAppBuilder();`
	`9`	`+ protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();`
`10`	`10`	`}`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace Maui.Controls.Sample.Profiling`
`9`	`9`	`{`
`10`	`10`	`public static class MauiProgram`
`11`	`11`	`{`
`12`		`- public static MauiAppBuilder CreateAppBuilder()`
	`12`	`+ public static MauiApp CreateMauiApp()`
`13`	`13`	`{`
`14`	`14`	`var appBuilder = MauiApp.CreateBuilder();`
`15`	`15`
`@@ -20,7 +20,7 @@ public static MauiAppBuilder CreateAppBuilder()`
`20`	`20`	`fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");`
`21`	`21`	`});`
`22`	`22`
`23`		`- return appBuilder;`
	`23`	`+ return builder.Build();`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`	`}`