Dev/startup di

eng/scripts/profile-android.ps1

@@ -38,9 +38,6 @@ The $(Configuration) MSBuild property. Defaults to 'Debug'.
 Additional command-line arguments to pass to MSBuild. For example,
 '-extra /p:AotAssemblies=True' would enable AOT.
 
-.PARAMETER xamarinformsversion
-The Xamarin.Forms version to run hello world on
-
 .PARAMETER sleep
 
 The number of seconds to wait between each app launch. Defaults to 3,
@@ -89,8 +86,7 @@ param
     [string] $package,
     [string] $configuration = 'Debug',
     [string] $extra,
-    [string] $xamarinformsversion = '4.7.0.1351',
-    [string] $androidapi = 'android-28',
+    [string] $androidapi = 'android-30',
     [int] $sleep = 3,
     [int] $iterations = 10
 )
@@ -172,7 +168,7 @@ Function Build-App{
     $isFlutter = -not $project.EndsWith("csproj")
     if(-not $isFlutter)
     {
-        & $msbuild $project /v:minimal /nologo /restore /t:Clean,Install /p:Configuration=$configuration /p:XamarinFormsVersion=$xamarinformsversion $extra
+        & $msbuild $project /v:minimal /nologo /restore /t:Clean,Install /p:Configuration=$configuration $extra
     }
     else
     {

src/Compatibility/Core/src/Android/AppCompat/Platform.cs

@@ -313,6 +313,7 @@ internal static IVisualElementRenderer CreateRenderer(VisualElement element, Con
 				try
 				{
 					handler = Forms.MauiContext.Handlers.GetHandler(element.GetType());
+					handler.SetMauiContext(Forms.MauiContext);
 				}
 				catch
 				{
@@ -340,10 +341,7 @@ internal static IVisualElementRenderer CreateRenderer(VisualElement element, Con
 				else if (handler is IVisualElementRenderer ver)
 					renderer = ver;
 				else if (handler is IAndroidViewHandler vh)
-				{
-					vh.SetContext(context);
 					renderer = new HandlerToRendererShim(vh);
-				}
 			}
 
 			renderer.SetElement(element);

src/Compatibility/Core/src/iOS/Platform.cs

@@ -239,6 +239,7 @@ public static IVisualElementRenderer CreateRenderer(VisualElement element)
 				try
 				{
 					handler = Forms.ActivationState.Context.Handlers.GetHandler(element.GetType());
+					handler.SetMauiContext(Forms.ActivationState.Context);
 				}
 				catch
 				{

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

@@ -6,7 +6,7 @@
 namespace Maui.Controls.Sample.Droid
 {
 	[Application]
-	public class MainApplication : MauiApplication<MyApp>
+	public class MainApplication : MauiApplication<Startup>
 	{
 		public MainApplication(IntPtr handle, JniHandleOwnership ownerShip) : base(handle, ownerShip)
 		{

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

@@ -11,7 +11,7 @@
 namespace Sample.iOS
 {
 	[Register("AppDelegate")]
-	public class AppDelegate : MauiUIApplicationDelegate<MyApp>
+	public class AppDelegate : MauiUIApplicationDelegate<Startup>
 	{
 	}
 }

src/Controls/samples/Controls.Sample/MainWindow.cs

@@ -1,18 +1,13 @@
 using Maui.Controls.Sample.Controls;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Maui;
 
 namespace Maui.Controls.Sample
 {
 	public class MainWindow : Window
 	{
-		public MainWindow() : this(App.Current.Services.GetRequiredService<IPage>())
-		{
-		}
-
 		public MainWindow(IPage page)
 		{
 			Page = page;
 		}
 	}
-}
+}

src/Controls/samples/Controls.Sample/MyApp.cs

@@ -1,3 +1,5 @@
+using System;
+using Maui.Controls.Sample.Services;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Maui;
 using Microsoft.Maui.Controls.Compatibility;
@@ -6,7 +8,11 @@ namespace Maui.Controls.Sample
 {
 	public class MyApp : MauiApp
 	{
-		// IAppState state
+		public MyApp(ITextService textService)
+		{
+			Console.WriteLine($"The injected text service had a message: '{textService.GetText()}'");
+		}
+
 		public override IWindow CreateWindow(IActivationState state)
 		{
 			Forms.Init(state);

src/Controls/samples/Controls.Sample/Pages/MainPage.cs

@@ -1,5 +1,4 @@
 using Maui.Controls.Sample.ViewModel;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Maui;
 using Microsoft.Maui.Controls;
 
@@ -9,14 +8,10 @@ public class MainPage : ContentPage, IPage
 	{
 		MainPageViewModel _viewModel;
 
-		public MainPage() : this(App.Current.Services.GetService<MainPageViewModel>())
-		{
-
-		}
-
 		public MainPage(MainPageViewModel viewModel)
 		{
 			BindingContext = _viewModel = viewModel;
+
 			SetupMauiLayout();
 			//SetupCompatibilityLayout();
 		}
@@ -89,7 +84,7 @@ void SetupMauiLayout()
 			};
 
 			verticalStack.Add(entry);
-			verticalStack.Add(new Entry { Text = "Entry", TextColor = Color.DarkRed });
+			verticalStack.Add(new Entry { Text = "Entry", TextColor = Color.DarkRed, FontFamily = "Dokdo" });
 			verticalStack.Add(new Entry { IsPassword = true, TextColor = Color.Black });
 			verticalStack.Add(new Entry { IsTextPredictionEnabled = false });
 			verticalStack.Add(new Entry { Placeholder = "This should be placeholder text" });
@@ -120,7 +115,10 @@ void SetupMauiLayout()
 
 			verticalStack.Add(new Image() { Source = "dotnet_bot.png" });
 
-			Content = verticalStack;
+			Content = new ScrollView
+			{
+				Content = verticalStack
+			};
 		}
 
 		void SetupCompatibilityLayout()

src/Controls/samples/Controls.Sample/Startup.cs

@@ -1,13 +1,14 @@
 using System;
+using System.Collections.Generic;
 using Maui.Controls.Sample.Pages;
 using Maui.Controls.Sample.Services;
 using Maui.Controls.Sample.ViewModel;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Maui;
+using Microsoft.Maui.Controls.Compatibility;
 using Microsoft.Maui.Hosting;
-using Microsoft.Extensions.DependencyInjection.Extensions;
-using Microsoft.Extensions.Configuration;
-using System.Collections.Generic;
 
 namespace Maui.Controls.Sample
 {
@@ -18,7 +19,8 @@ public class Startup : IStartup
 		public void Configure(IAppHostBuilder appBuilder)
 		{
 			appBuilder
-				//.RegisterCompatibilityRenderers()
+				.RegisterCompatibilityRenderers()
+				.UseMauiApp<MyApp>()
 				.ConfigureAppConfiguration((hostingContext, config) =>
 				{
 					config.AddInMemoryCollection(new Dictionary<string, string>
@@ -29,7 +31,8 @@ public void Configure(IAppHostBuilder appBuilder)
 						{"Logging:LogLevel:Default", "Warning"}
 					});
 				})
-				.UseServiceProviderFactory(new DIExtensionsServiceProviderFactory())
+				.UseMauiServiceProviderFactory(true)
+				//.UseServiceProviderFactory(new DIExtensionsServiceProviderFactory())
 				.ConfigureServices((hostingContext, services) =>
 				{
 					services.AddSingleton<ITextService, TextService>();

src/Controls/samples/Controls.Sample/ViewModel/MainPageViewModel.cs

@@ -1,44 +1,29 @@
-using System.Collections.Generic;
-using System.Linq;
+using System;
 using Maui.Controls.Sample.Services;
 using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Microsoft.Maui;
 
 namespace Maui.Controls.Sample.ViewModel
 {
 	public class MainPageViewModel : ViewModelBase
 	{
-		private readonly IConfiguration Configuration;
-		ITextService textService;
-
-		public MainPageViewModel() : this(new ITextService[] { App.Current.Services.GetService<ITextService>() })
-		{
-		}
+		readonly IConfiguration _configuration;
+		readonly ITextService _textService;
+		string _text;
 
-		public MainPageViewModel(IEnumerable<ITextService> textServices)
+		public MainPageViewModel(IConfiguration configuration, ITextService textService)
 		{
-			Configuration = App.Current.Services.GetService<IConfiguration>();
+			_configuration = configuration;
+			_textService = textService;
 
-			//var logger = App.Current.Services.GetService<ILogger<MainPageViewModel>>();
+			Console.WriteLine($"Value from config: {_configuration["MyKey"]}");
 
-			//logger.LogInformation("hello");
-
-			textService = textServices.FirstOrDefault();
-			Text = textService.GetText();
+			Text = _textService.GetText();
 		}
 
-		//public MainPageViewModel(ITextService textService)
-		//{
-		//	Text = textService.GetText();
-		//}
-
-		string _text;
 		public string Text
 		{
 			get => _text;
 			set => SetProperty(ref _text, value);
 		}
 	}
-}
+}

src/Controls/src/Core/HandlerImpl/SearchBar.Impl.cs

@@ -0,0 +1,6 @@
+namespace Microsoft.Maui.Controls
+{
+	public partial class SearchBar : ISearchBar
+	{
+	}
+}

src/Controls/src/Core/SearchBar.cs

@@ -5,7 +5,7 @@
 
 namespace Microsoft.Maui.Controls
 {
-	public class SearchBar : InputView, IFontElement, ITextAlignmentElement, ISearchBarController, IElementConfiguration<SearchBar>
+	public partial class SearchBar : InputView, IFontElement, ITextAlignmentElement, ISearchBarController, IElementConfiguration<SearchBar>
 	{
 		public static readonly BindableProperty SearchCommandProperty = BindableProperty.Create("SearchCommand", typeof(ICommand), typeof(SearchBar), null, propertyChanged: OnCommandChanged);
 

src/Core/src/App.cs

@@ -1,36 +1,14 @@
 using System;
-using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.Maui
 {
 	public abstract class App : IApp
 	{
-		IServiceProvider? _serviceProvider;
-		IMauiContext? _context;
-
-		protected App()
-		{
-			if (Current != null)
-				throw new InvalidOperationException($"Only one {nameof(App)} instance is allowed");
-
-			Current = this;
-		}
-
-		public static App? Current { get; internal set; }
-
-		public IServiceProvider? Services => _serviceProvider;
-
-		public IMauiContext? Context => _context;
+		public IServiceProvider? Services { get; private set; }
 
 		internal void SetServiceProvider(IServiceProvider provider)
 		{
-			_serviceProvider = provider;
-			SetHandlerContext(provider.GetService<IMauiContext>());
-		}
-
-		internal void SetHandlerContext(IMauiContext? context)
-		{
-			_context = context;
+			Services = provider;
 		}
 	}
 }

src/Core/src/Handlers/Button/ButtonHandler.Android.cs

@@ -55,9 +55,9 @@ public static void MapTextColor(ButtonHandler handler, IButton button)
 
 		public static void MapFont(ButtonHandler handler, IButton button)
 		{
-			var services = App.Current?.Services
-				?? throw new InvalidOperationException($"Unable to find service provider, the App.Current.Services was null.");
-			var fontManager = services.GetRequiredService<IFontManager>();
+			_ = handler.Services ?? throw new InvalidOperationException($"{nameof(Services)} should have been set by base class.");
+
+			var fontManager = handler.Services.GetRequiredService<IFontManager>();
 
 			handler.TypedNativeView?.UpdateFont(button, fontManager);
 		}

src/Core/src/Handlers/Button/ButtonHandler.cs

@@ -15,7 +15,7 @@ public ButtonHandler() : base(ButtonMapper)
 
 		}
 
-		public ButtonHandler(PropertyMapper mapper) : base(mapper ?? ButtonMapper)
+		public ButtonHandler(PropertyMapper? mapper = null) : base(mapper ?? ButtonMapper)
 		{
 		}
 	}

src/Core/src/Handlers/Button/ButtonHandler.iOS.cs

@@ -61,9 +61,9 @@ public static void MapPadding(ButtonHandler handler, IButton button)
 
 		public static void MapFont(ButtonHandler handler, IButton button)
 		{
-			var services = App.Current?.Services ??
-				throw new InvalidOperationException($"Unable to find service provider, the App.Current.Services was null.");
-			var fontManager = services.GetRequiredService<IFontManager>();
+			_ = handler.Services ?? throw new InvalidOperationException($"{nameof(Services)} should have been set by base class.");
+
+			var fontManager = handler.Services.GetRequiredService<IFontManager>();
 
 			handler.TypedNativeView?.UpdateFont(button, fontManager);
 		}

src/Core/src/Handlers/Editor/EditorHandler.cs

@@ -12,7 +12,7 @@ public EditorHandler() : base(EditorMapper)
 
 		}
 
-		public EditorHandler(PropertyMapper mapper) : base(mapper ?? EditorMapper)
+		public EditorHandler(PropertyMapper? mapper = null) : base(mapper ?? EditorMapper)
 		{
 
 		}

src/Core/src/Handlers/Entry/EntryHandler.Android.cs

@@ -62,9 +62,9 @@ public static void MapPlaceholder(EntryHandler handler, IEntry entry)
 
 		public static void MapFont(EntryHandler handler, IEntry entry)
 		{
-			var services = App.Current?.Services
-				?? throw new InvalidOperationException($"Unable to find service provider, the App.Current.Services was null.");
-			var fontManager = services.GetRequiredService<IFontManager>();
+			_ = handler.Services ?? throw new InvalidOperationException($"{nameof(Services)} should have been set by base class.");
+
+			var fontManager = handler.Services.GetRequiredService<IFontManager>();
 
 			handler.TypedNativeView?.UpdateFont(entry, fontManager);
 		}

src/Core/src/Handlers/Entry/EntryHandler.cs

@@ -18,7 +18,7 @@ public EntryHandler() : base(EntryMapper)
 
 		}
 
-		public EntryHandler(PropertyMapper mapper) : base(mapper ?? EntryMapper)
+		public EntryHandler(PropertyMapper? mapper = null) : base(mapper ?? EntryMapper)
 		{
 
 		}

src/Core/src/Handlers/Entry/EntryHandler.iOS.cs

@@ -93,9 +93,9 @@ void OnTextChanged()
 
 		public static void MapFont(EntryHandler handler, IEntry entry)
 		{
-			var services = App.Current?.Services
-				?? throw new InvalidOperationException($"Unable to find service provider, the App.Current.Services was null.");
-			var fontManager = services.GetRequiredService<IFontManager>();
+			_ = handler.Services ?? throw new InvalidOperationException($"{nameof(Services)} should have been set by base class.");
+
+			var fontManager = handler.Services.GetRequiredService<IFontManager>();
 
 			handler.TypedNativeView?.UpdateFont(entry, fontManager);
 		}

src/Core/src/Handlers/IViewHandler.Android.cs

@@ -5,8 +5,6 @@ namespace Microsoft.Maui
 {
 	public interface IAndroidViewHandler : IViewHandler
 	{
-		void SetContext(Context context);
-
 		AView? View { get; }
 	}
 }