Remove references to an "app window" (#3003)

src/Core/src/Platform/Android/ContextExtensions.cs

@@ -240,9 +240,6 @@ public static int GetDrawableId(this Resources resources, string packageName, st
 		{
 			var nativeWindow = context.GetActivity();
 
-			if (nativeWindow is MauiAppCompatActivity mac && mac.VirtualWindow != null)
-				return mac.VirtualWindow;
-
 			foreach (var window in MauiApplication.Current.Application.Windows)
 			{
 				if (window?.Handler?.NativeView is AActivity win && win == nativeWindow)

src/Core/src/Platform/Android/MauiAppCompatActivity.cs

@@ -8,18 +8,6 @@ namespace Microsoft.Maui
 {
 	public partial class MauiAppCompatActivity : AppCompatActivity
 	{
-		WeakReference<IWindow>? _virtualWindow;
-		internal IWindow? VirtualWindow
-		{
-			get
-			{
-				IWindow? window = null;
-				_virtualWindow?.TryGetTarget(out window);
-				return window;
-			}
-		}
-
-
 		// Override this if you want to handle the default Android behavior of restoring fragments on an application restart
 		protected virtual bool AllowFragmentRestore => false;
 
@@ -51,13 +39,12 @@ void CreateNativeWindow(Bundle? savedInstanceState = null)
 			if (mauiApp == null)
 				throw new InvalidOperationException($"The {nameof(IApplication)} instance was not found.");
 
-			var services = MauiApplication.Current.Services;
-			if (services == null)
+			if (mauiApp.Handler?.MauiContext is not IMauiContext applicationContext)
 				throw new InvalidOperationException($"The {nameof(IServiceProvider)} instance was not found.");
 
-			var mauiContext = MauiApplication.Current.MauiApplicationContext.MakeScoped(this);
+			var mauiContext = applicationContext.MakeScoped(this);
 
-			services.InvokeLifecycleEvents<AndroidLifecycle.OnMauiContextCreated>(del => del(mauiContext));
+			applicationContext.Services.InvokeLifecycleEvents<AndroidLifecycle.OnMauiContextCreated>(del => del(mauiContext));
 
 			// TODO: Fix once we have multiple windows
 			IWindow window;
@@ -73,7 +60,6 @@ void CreateNativeWindow(Bundle? savedInstanceState = null)
 				window = mauiApp.CreateWindow(state);
 			}
 
-			_virtualWindow = new WeakReference<IWindow>(window);
 			this.SetWindowHandler(window, mauiContext);
 		}
 	}

src/Core/src/Platform/Android/MauiApplication.cs

@@ -27,15 +27,13 @@ public override void OnCreate()
 
 			var applicationContext = new MauiContext(mauiApp.Services, this);
 
-			MauiApplicationContext = applicationContext;
-
 			Services = mauiApp.Services;
 
 			Current.Services?.InvokeLifecycleEvents<AndroidLifecycle.OnApplicationCreating>(del => del(this));
 
 			Application = Services.GetRequiredService<IApplication>();
 
-			this.SetApplicationHandler(Application, MauiApplicationContext);
+			this.SetApplicationHandler(Application, applicationContext);
 
 			Current.Services?.InvokeLifecycleEvents<AndroidLifecycle.OnApplicationCreate>(del => del(this));
 
@@ -65,8 +63,6 @@ public override void OnConfigurationChanged(Configuration newConfig)
 
 		public static MauiApplication Current { get; private set; } = null!;
 
-		internal IMauiContext MauiApplicationContext { get; private set; } = null!;
-
 		public IServiceProvider Services { get; protected set; } = null!;
 
 		public IApplication Application { get; protected set; } = null!;

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

@@ -27,9 +27,7 @@ protected override void OnLaunched(UI.Xaml.LaunchActivatedEventArgs args)
 
 			var winuiWndow = CreateNativeWindow(args, applicationContext);
 
-			MainWindow = winuiWndow;
-
-			MainWindow.Activate();
+			winuiWndow.Activate();
 
 			Services.InvokeLifecycleEvents<WindowsLifecycle.OnLaunched>(del => del(this, args));
 		}
@@ -56,8 +54,6 @@ UI.Xaml.Window CreateNativeWindow(UI.Xaml.LaunchActivatedEventArgs args, IMauiCo
 
 		public UI.Xaml.LaunchActivatedEventArgs LaunchActivatedEventArgs { get; protected set; } = null!;
 
-		public UI.Xaml.Window MainWindow { get; protected set; } = null!;
-
 		public IServiceProvider Services { get; protected set; } = null!;
 
 		public IApplication Application { get; protected set; } = null!;

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

@@ -10,17 +10,6 @@ namespace Microsoft.Maui
 	public abstract class MauiUIApplicationDelegate : UIApplicationDelegate, IUIApplicationDelegate
 	{
 		MauiContext _applicationContext = null!;
-		WeakReference<IWindow>? _virtualWindow;
-
-		internal IWindow? VirtualWindow
-		{
-			get
-			{
-				IWindow? window = null;
-				_virtualWindow?.TryGetTarget(out window);
-				return window;
-			}
-		}
 
 		protected MauiUIApplicationDelegate()
 		{
@@ -69,7 +58,6 @@ UIWindow CreateNativeWindow()
 
 			var activationState = new ActivationState(mauiContext);
 			var window = Application.CreateWindow(activationState);
-			_virtualWindow = new WeakReference<IWindow>(window);
 			uiWindow.SetWindowHandler(window, mauiContext);
 
 			return uiWindow;

src/Core/src/Platform/iOS/UIApplicationExtensions.cs

@@ -1,4 +1,3 @@
-using System;
 using UIKit;
 
 namespace Microsoft.Maui
@@ -21,17 +20,15 @@ internal static class UIApplicationExtensions
 
 		public static IWindow? GetWindow(this UIApplication application)
 		{
-			if (MauiUIApplicationDelegate.Current.VirtualWindow != null)
-				return MauiUIApplicationDelegate.Current.VirtualWindow;
+			var windows = application.Windows;
 
-			var nativeWindow = application.GetKeyWindow();
 			foreach (var window in MauiUIApplicationDelegate.Current.Application.Windows)
 			{
-				if (window?.Handler?.NativeView is UIWindow win && win == nativeWindow)
+				if (window?.Handler?.NativeView is UIWindow win && windows.IndexOf(win) != -1)
 					return window;
 			}
 
 			return null;
 		}
 	}
-}
+}

src/TestUtils/src/DeviceTests/TestMainThread.cs

@@ -11,7 +11,9 @@ public static Task<T> InvokeOnMainThreadAsync<T>(Func<T> func)
 #if WINDOWS
 			var tcs = new TaskCompletionSource<T>();
 
-			var didQueue = MauiWinUIApplication.Current.MainWindow.DispatcherQueue.TryEnqueue(() =>
+			// TODO: this all needs to be cleaned up with the IDispatcher
+			var winuiApp = (UI.Xaml.Window)MauiWinUIApplication.Current.Application.Windows[0].Handler!.NativeView!;
+			var didQueue = winuiApp.DispatcherQueue.TryEnqueue(() =>
 			{
 				try
 				{
@@ -56,7 +58,9 @@ public static Task<T> InvokeOnMainThreadAsync<T>(Func<Task<T>> func)
 #if WINDOWS
 			var tcs = new TaskCompletionSource<T>();
 
-			var didQueue = MauiWinUIApplication.Current.MainWindow.DispatcherQueue.TryEnqueue(async () =>
+			// TODO: this all needs to be cleaned up with the IDispatcher
+			var winuiApp = (UI.Xaml.Window)MauiWinUIApplication.Current.Application.Windows[0].Handler!.NativeView!;
+			var didQueue = winuiApp.DispatcherQueue.TryEnqueue(async () =>
 			{
 				try
 				{