refactor: Remove WpfIslandsHost

src/Uno.UI.Runtime.Skia.Wpf/Islands/UnoXamlHost.cs → src/Uno.UI.Runtime.Skia.Wpf/Hosting/UnoXamlHost.cs

@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System.ComponentModel;
-using System.Runtime.InteropServices;
 using System.Windows;
 using WUX = Windows.UI.Xaml;
 

src/Uno.UI.Runtime.Skia.Wpf/Islands/UnoXamlHostBase.Layout.cs → src/Uno.UI.Runtime.Skia.Wpf/Hosting/UnoXamlHostBase.Layout.cs

@@ -98,7 +98,7 @@ private void UpdateUnoSize()
 		{
 			if (IsXamlContentLoaded())
 			{
-				if (_xamlSource.Content.VisualTree.RootElement is WUX.FrameworkElement element)
+				if (_xamlSource.Content.VisualTreeCache.RootElement is WUX.FrameworkElement element)
 				{
 					var width = ActualWidth;
 					var height = ActualHeight;

src/Uno.UI.Runtime.Skia.Wpf/Islands/UnoXamlHostBase.cs → src/Uno.UI.Runtime.Skia.Wpf/Hosting/UnoXamlHostBase.cs

@@ -37,12 +37,13 @@ static UnoXamlHostBase()
 				MetadataProviderDiscovery.MetadataProviderFactory = type =>
 				{
 					WUX.Application application = null;
-					var host = new WpfIslandsHost(
-						System.Windows.Application.Current.MainWindow.Dispatcher,
-						() => application = (WUX.Application)Activator.CreateInstance(type),
-						null);
-					var provider = (WUX.Markup.IXamlMetadataProvider)application;
-					return provider;
+
+					WUX.Application.Start(_ =>
+					{
+						application = (WUX.Application)Activator.CreateInstance(type);
+					});
+
+					return (WUX.Markup.IXamlMetadataProvider)application;
 				};
 			}
 

src/Uno.UI.Runtime.Skia.Wpf/Hosting/XamlRootMap.cs

@@ -4,22 +4,13 @@
 namespace Uno.UI.Runtime.Skia.Wpf.Hosting
 {
 	internal static class XamlRootMap
-    {
+	{
 		private static Dictionary<XamlRoot, IWpfHost> _map = new Dictionary<XamlRoot, IWpfHost>();
 
-		public static void Register(XamlRoot xamlRoot, IWpfHost host)
-		{
-			_map[xamlRoot] = host;
-		}
+		public static void Register(XamlRoot xamlRoot, IWpfHost host) => _map[xamlRoot] = host;
 
-		public static void Unregister(XamlRoot xamlRoot)
-		{
-			_map.Remove(xamlRoot);
-		}
+		public static void Unregister(XamlRoot xamlRoot) => _map.Remove(xamlRoot);
 
-		public static IWpfHost GetHostForRoot(XamlRoot xamlRoot)
-		{
-			return _map[xamlRoot];
-		}
+		public static IWpfHost GetHostForRoot(XamlRoot xamlRoot) => _map[xamlRoot];
 	}
 }

src/Uno.UI/Extensions/DependencyObjectExtensions.mux.depends.cs

@@ -16,7 +16,7 @@ internal static partial class DependencyObjectExtensions
 			//TODO:MZ: This should work for non-UIElement as well!
 			if (dependencyObject is UIElement uiElement)
 			{
-				return uiElement.VisualTree;
+				return uiElement.VisualTreeCache;
 			}
 
 			return null;
@@ -27,7 +27,7 @@ internal static void SetVisualTree(this DependencyObject dependencyObject, Visua
 			//TODO:MZ: This should work for non-UIElement as well!
 			if (dependencyObject is UIElement uiElement)
 			{
-				uiElement.VisualTree = visualTree;
+				uiElement.VisualTreeCache = visualTree;
 			}
 		}
 	}

src/Uno.UI/Generated/3.0.0.0/Windows.UI.Xaml/XamlRoot.cs

@@ -8,28 +8,10 @@ namespace Windows.UI.Xaml
 	public  partial class XamlRoot 
 	{
 		// Skipping already declared property Content
-		#if __ANDROID__ || __IOS__ || NET461 || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
-		[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "NET461", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
-		public  bool IsHostVisible
-		{
-			get
-			{
-				throw new global::System.NotImplementedException("The member bool XamlRoot.IsHostVisible is not implemented in Uno.");
-			}
-		}
-		#endif
+		// Skipping already declared property IsHostVisible
 		// Skipping already declared property RasterizationScale
 		// Skipping already declared property Size
-		#if __ANDROID__ || __IOS__ || NET461 || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
-		[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "NET461", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
-		public  global::Windows.UI.UIContext UIContext
-		{
-			get
-			{
-				throw new global::System.NotImplementedException("The member UIContext XamlRoot.UIContext is not implemented in Uno.");
-			}
-		}
-		#endif
+		// Skipping already declared property UIContext
 		// Forced skipping of method Windows.UI.Xaml.XamlRoot.Content.get
 		// Forced skipping of method Windows.UI.Xaml.XamlRoot.Size.get
 		// Forced skipping of method Windows.UI.Xaml.XamlRoot.RasterizationScale.get