Move IDispatcher logic out of IPlatformServices

src/Compatibility/ControlGallery/src/Issues.Shared/TestPages/TestPages.cs

@@ -4,6 +4,7 @@
 using System.Reflection;
 using Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues;
 using Microsoft.Maui.Controls.CustomAttributes;
+using Microsoft.Maui.Dispatching;
 using NUnit.Framework.Interfaces;
 using IOPath = System.IO.Path;
 
@@ -431,9 +432,6 @@ public abstract class TestCarouselPage : CarouselPage
 		public IApp RunningApp => AppSetup.RunningApp;
 
 		protected virtual bool Isolate => false;
-
-		IDispatcher _dispatcher = new FallbackDispatcher();
-		public override IDispatcher Dispatcher { get => _dispatcher; }
 #endif
 
 		protected TestCarouselPage()
@@ -536,9 +534,6 @@ public abstract class TestTabbedPage : TabbedPage
 		public IApp RunningApp => AppSetup.RunningApp;
 
 		protected virtual bool Isolate => false;
-
-		IDispatcher _dispatcher = new FallbackDispatcher();
-		public override IDispatcher Dispatcher { get => _dispatcher; }
 #endif
 
 		protected TestTabbedPage()

src/Compatibility/Core/src/Android/Forms.cs

@@ -490,25 +490,13 @@ class AndroidPlatformServices : IPlatformServices, IPlatformInvalidate
 			double _microSize;
 			double _smallSize;
 
-			static Handler s_handler;
-
 			readonly Context _context;
 
 			public AndroidPlatformServices(Context context)
 			{
 				_context = context;
 			}
 
-			public void BeginInvokeOnMainThread(Action action)
-			{
-				if (s_handler == null || s_handler.Looper != Looper.MainLooper)
-				{
-					s_handler = new Handler(Looper.MainLooper);
-				}
-
-				s_handler.Post(action);
-			}
-
 			public Assembly[] GetAssemblies()
 			{
 				return AppDomain.CurrentDomain.GetAssemblies();
@@ -664,14 +652,6 @@ public Color GetNamedColor(string name)
 				return null;
 			}
 
-			public bool IsInvokeRequired
-			{
-				get
-				{
-					return Looper.MainLooper != Looper.MyLooper();
-				}
-			}
-
 			public string RuntimePlatform => Device.Android;
 
 			public void StartTimer(TimeSpan interval, Func<bool> callback)

src/Compatibility/Core/src/Windows/Forms.cs

@@ -86,9 +86,7 @@ static void SetupInit(
 
 			Registrar.ExtraAssemblies = rendererAssemblies?.ToArray();
 
-			var dispatcher = mainWindow?.DispatcherQueue ?? UI.Dispatching.DispatcherQueue.GetForCurrentThread();
-
-			var platformServices = new WindowsPlatformServices(dispatcher);
+			var platformServices = new WindowsPlatformServices();
 
 			Device.PlatformServices = platformServices;
 			Device.PlatformInvalidator = platformServices;

src/Compatibility/Core/src/Windows/Properties/Xamarin.Forms.Platform.UAP.rd.xml

@@ -30,7 +30,6 @@
   	<!-- add directives for your library here -->
     <Namespace Name="Windows.UI.Xaml.Automation.Peers" MarshalObject="Required All"/>
     <Type Name="Xamarin.Forms.Platform.UWP.WindowsPlatformServices" Activate="Required All"/>
-    <Type Name="Xamarin.Forms.Platform.UWP.WindowsBasePlatformServices" Activate="Required All"/>
     <Type Name="Xamarin.Forms.Platform.UWP.WindowsPlatform" Activate="Required All"/>
   </Library>
 </Directives>