Add UIWindow and UI.XAML.Window to IMauiContext

src/Compatibility/Core/src/AppHostBuilderExtensions.cs

@@ -99,7 +99,7 @@ static IAppHostBuilder SetupDefaults(this IAppHostBuilder builder)
 				{
 					iOS.WillFinishLaunching((x, y) =>
 					{
-						MauiContext mauiContext = new MauiContext(MauiUIApplicationDelegate.Current.Services);
+						MauiContext mauiContext = new MauiContext(MauiUIApplicationDelegate.Current.Services, new UIKit.UIWindow());
 						Forms.Init(new ActivationState(mauiContext), new InitializationOptions() { Flags = InitializationFlags.SkipRenderers });
 						return true;
 					});
@@ -131,7 +131,7 @@ static IAppHostBuilder SetupDefaults(this IAppHostBuilder builder)
 								// window and root page start creating
 								// Inside OnLaunched we grab the MauiContext that's on the window so we can have the correct
 								// MauiContext inside Forms
-								MauiContext mauiContext = new MauiContext(MauiWinUIApplication.Current.Services);
+								MauiContext mauiContext = new MauiContext(MauiWinUIApplication.Current.Services, new UI.Xaml.Window());
 								ActivationState state = new ActivationState(mauiContext, args);
 								Forms.Init(state, new InitializationOptions() { Flags = InitializationFlags.SkipRenderers });
 							})

src/Core/src/Platform/IMauiContext.cs

@@ -11,7 +11,9 @@ public interface IMauiContext
 #if __ANDROID__
 		global::Android.Content.Context? Context { get; }
 #elif __IOS__
-
+		UIKit.UIWindow? Window { get; }
+#elif WINDOWS
+		UI.Xaml.Window? Window { get; }
 #endif
 	}
 }

src/Core/src/Platform/MauiContext.Android.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.Extensions.DependencyInjection;
+using Android.Content;
+
+
+namespace Microsoft.Maui
+{
+	public partial class MauiContext
+	{
+		readonly WeakReference<Context>? _context;
+		public MauiContext(IServiceProvider services, Context context) : this(services)
+		{
+			_context = new WeakReference<Context>(context ?? throw new ArgumentNullException(nameof(context)));
+		}
+
+		public MauiContext(Context context) : this()
+		{
+		}
+
+		public Context? Context
+		{
+			get
+			{
+				if (_context == null)
+					return null;
+
+				Context? context;
+				if (_context.TryGetTarget(out context))
+				{
+					return context;
+				}
+
+				return null;
+			}
+		}
+	}
+}

src/Core/src/Platform/MauiContext.Windows.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Microsoft.Maui
+{
+	public partial class MauiContext
+	{
+		public MauiContext(IServiceProvider services, UI.Xaml.Window window) : this(services)
+		{
+			Window = window ?? throw new ArgumentNullException(nameof(window));
+		}
+
+		public UI.Xaml.Window? Window
+		{
+			get;
+			private set;
+		}
+	}
+}

src/Core/src/Platform/MauiContext.cs

@@ -0,0 +1,25 @@
+using System;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.Maui
+{
+	public partial class MauiContext : IMauiContext
+	{
+		public MauiContext()
+		{
+			// Temporary hack until we fully remove Forms.Init
+			Services = null!;
+			Handlers = null!;
+		}
+
+		private MauiContext(IServiceProvider services)
+		{
+			Services = services ?? throw new ArgumentNullException(nameof(services));
+			Handlers = Services.GetRequiredService<IMauiHandlersServiceProvider>();
+		}
+
+		public IServiceProvider Services { get; }
+
+		public IMauiHandlersServiceProvider Handlers { get; }
+	}
+}

src/Core/src/Platform/MauiContext.iOS.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using UIKit;
+
+namespace Microsoft.Maui
+{
+	public partial class MauiContext
+	{
+		readonly WeakReference<UIWindow>? _window;
+		public MauiContext(IServiceProvider services, UIWindow window) : this(services)
+		{
+			_window = new WeakReference<UIWindow>(window ?? throw new ArgumentNullException(nameof(window)));
+		}
+
+
+		public UIWindow? Window
+		{
+			get
+			{
+				if (_window == null)
+					return null;
+
+				UIWindow? window;
+				if (_window.TryGetTarget(out window))
+				{
+					return window;
+				}
+
+				return null;
+			}
+		}
+	}
+}

src/Core/src/Platform/Windows/MauiWinUIApplication.cs

@@ -32,7 +32,7 @@ protected override void OnLaunched(UI.Xaml.LaunchActivatedEventArgs args)
 			Application = Services.GetRequiredService<IApplication>();
 			Current.Services?.InvokeLifecycleEvents<WindowsLifecycle.OnLaunching>(del => del(this, args));
 
-			var mauiContext = new MauiContext(Services);
+			var mauiContext = new MauiContext(Services, MainWindow);
 
 			var activationState = new ActivationState(mauiContext, args);
 			var window = Application.CreateWindow(activationState);

src/Core/src/Platform/iOS/MauiUIApplicationDelegate.cs

@@ -32,17 +32,16 @@ public override bool FinishedLaunching(UIApplication application, NSDictionary l
 		{
 			Application = Services.GetRequiredService<IApplication>();
 
-			var mauiContext = new MauiContext(Services);
+			UIWindow uIWindow = new UIWindow();
+			var mauiContext = new MauiContext(Services, uIWindow);
 
 			var activationState = new ActivationState(mauiContext);
 			var window = Application.CreateWindow(activationState);
 
 			var page = window.View;
 
-			Window = new UIWindow
-			{
-				RootViewController = window.View.ToUIViewController(mauiContext)
-			};
+			uIWindow.RootViewController = window.View.ToUIViewController(mauiContext);
+			Window = uIWindow;
 
 			Window.MakeKeyAndVisible();
 

src/Core/tests/DeviceTests/Stubs/ContextStub.cs

@@ -17,6 +17,8 @@ public ContextStub(IServiceProvider services)
 
 #if __ANDROID__
 		public Android.Content.Context Context => Platform.DefaultContext;
+#elif __IOS__
+		public UIKit.UIWindow Window => throw new NotImplementedException();
 #endif
 	}
 }