From 38f9092f4a87aa0b14468b303bc2ced1567c2ec7 Mon Sep 17 00:00:00 2001
From: Nick Randolph <nick@builttoroam.com>
Date: Thu, 27 Jul 2023 21:13:52 +1000
Subject: [PATCH 1/3] fix: Adding net7.0 support for maui package

---
 .../MauiEmbedding/Directory.Packages.props    | 48 ++++++------
 .../MauiEmbedding.Skia.Gtk.csproj             | 25 ++++++
 .../Package.appxmanifest                      | 43 +++++++++++
 .../MauiEmbedding.Skia.Gtk/Program.cs         | 21 +++++
 .../MauiEmbedding.Skia.Gtk/app.manifest       | 77 +++++++++++++++++++
 samples/MauiEmbedding/MauiEmbedding.sln       | 32 ++++++++
 samples/MauiEmbedding/MauiEmbedding/App.cs    | 28 ++++---
 .../MauiEmbedding/MauiEmbedding.csproj        | 17 +++-
 .../MauiEmbedding/Presentation/MainPage.xaml  | 15 ++--
 .../Presentation/MainViewModel.cs             | 35 ---------
 .../Presentation/{ => Maui}/EsriMapsPage.xaml |  0
 .../{ => Maui}/EsriMapsPage.xaml.cs           |  0
 .../{ => Maui}/EsriMapsViewModel.cs           |  0
 .../{ => Maui}/ExternalLibPage.xaml           |  0
 .../{ => Maui}/ExternalLibPage.xaml.cs        |  0
 .../{ => Maui}/ExternalLibViewModel.cs        |  0
 .../{ => Maui}/MCTControlsPage.xaml           |  0
 .../{ => Maui}/MCTControlsPage.xaml.cs        |  0
 .../{ => Maui}/MCTControlsViewModel.cs        |  0
 .../{ => Maui}/MauiColorsPage.xaml            |  0
 .../{ => Maui}/MauiColorsPage.xaml.cs         |  0
 .../{ => Maui}/MauiColorsViewModel.cs         |  0
 .../{ => Maui}/MauiControlsPage.xaml          |  0
 .../{ => Maui}/MauiControlsPage.xaml.cs       |  0
 .../{ => Maui}/MauiControlsViewModel.cs       |  0
 .../{ => Maui}/MauiEssentialsPage.xaml        |  0
 .../{ => Maui}/MauiEssentialsPage.xaml.cs     |  0
 .../{ => Maui}/MauiEssentialsViewModel.cs     |  0
 .../{ => Maui}/TelerikControlsPage.xaml       |  0
 .../{ => Maui}/TelerikControlsPage.xaml.cs    |  0
 .../{ => Maui}/TelerikControlsViewModel.cs    |  0
 src/Uno.Extensions.Maui.UI/GlobalUsings.cs    | 13 ++--
 src/Uno.Extensions.Maui.UI/MauiBinding.cs     |  2 +
 src/Uno.Extensions.Maui.UI/MauiColor.cs       |  2 +
 src/Uno.Extensions.Maui.UI/MauiEmbedding.cs   |  7 +-
 .../MauiExtensionBase.cs                      |  4 +
 src/Uno.Extensions.Maui.UI/MauiHost.cs        | 16 +++-
 src/Uno.Extensions.Maui.UI/MauiResource.cs    |  2 +
 src/Uno.Extensions.Maui.UI/MauiThickness.cs   |  3 +
 .../Uno.Extensions.Maui.WinUI.csproj          | 22 +++++-
 .../build/Package.props                       |  5 ++
 .../build/Package.targets                     |  2 +-
 src/tfms-ui-maui.props                        |  1 +
 43 files changed, 331 insertions(+), 89 deletions(-)
 create mode 100644 samples/MauiEmbedding/MauiEmbedding.Skia.Gtk/MauiEmbedding.Skia.Gtk.csproj
 create mode 100644 samples/MauiEmbedding/MauiEmbedding.Skia.Gtk/Package.appxmanifest
 create mode 100644 samples/MauiEmbedding/MauiEmbedding.Skia.Gtk/Program.cs
 create mode 100644 samples/MauiEmbedding/MauiEmbedding.Skia.Gtk/app.manifest
 rename samples/MauiEmbedding/MauiEmbedding/Presentation/{ => Maui}/EsriMapsPage.xaml (100%)
 rename samples/MauiEmbedding/MauiEmbedding/Presentation/{ => Maui}/EsriMapsPage.xaml.cs (100%)
 rename samples/MauiEmbedding/MauiEmbedding/Presentation/{ => Maui}/EsriMapsViewModel.cs (100%)
 rename samples/MauiEmbedding/MauiEmbedding/Presentation/{ => Maui}/ExternalLibPage.xaml (100%)
 rename samples/MauiEmbedding/MauiEmbedding/Presentation/{ => Maui}/ExternalLibPage.xaml.cs (100%)
 rename samples/MauiEmbedding/MauiEmbedding/Presentation/{ => Maui}/ExternalLibViewModel.cs (100%)
 rename samples/MauiEmbedding/MauiEmbedding/Presentation/{ => Maui}/MCTControlsPage.xaml (100%)
 rename samples/MauiEmbedding/MauiEmbedding/Presentation/{ => Maui}/MCTControlsPage.xaml.cs (100%)
 rename samples/MauiEmbedding/MauiEmbedding/Presentation/{ => Maui}/MCTControlsViewModel.cs (100%)
 rename samples/MauiEmbedding/MauiEmbedding/Presentation/{ => Maui}/MauiColorsPage.xaml (100%)
 rename samples/MauiEmbedding/MauiEmbedding/Presentation/{ => Maui}/MauiColorsPage.xaml.cs (100%)
 rename samples/MauiEmbedding/MauiEmbedding/Presentation/{ => Maui}/MauiColorsViewModel.cs (100%)
 rename samples/MauiEmbedding/MauiEmbedding/Presentation/{ => Maui}/MauiControlsPage.xaml (100%)
 rename samples/MauiEmbedding/MauiEmbedding/Presentation/{ => Maui}/MauiControlsPage.xaml.cs (100%)
 rename samples/MauiEmbedding/MauiEmbedding/Presentation/{ => Maui}/MauiControlsViewModel.cs (100%)
 rename samples/MauiEmbedding/MauiEmbedding/Presentation/{ => Maui}/MauiEssentialsPage.xaml (100%)
 rename samples/MauiEmbedding/MauiEmbedding/Presentation/{ => Maui}/MauiEssentialsPage.xaml.cs (100%)
 rename samples/MauiEmbedding/MauiEmbedding/Presentation/{ => Maui}/MauiEssentialsViewModel.cs (100%)
 rename samples/MauiEmbedding/MauiEmbedding/Presentation/{ => Maui}/TelerikControlsPage.xaml (100%)
 rename samples/MauiEmbedding/MauiEmbedding/Presentation/{ => Maui}/TelerikControlsPage.xaml.cs (100%)
 rename samples/MauiEmbedding/MauiEmbedding/Presentation/{ => Maui}/TelerikControlsViewModel.cs (100%)

diff --git a/samples/MauiEmbedding/Directory.Packages.props b/samples/MauiEmbedding/Directory.Packages.props
index 8a4a39df79..c53a1d5732 100644
--- a/samples/MauiEmbedding/Directory.Packages.props
+++ b/samples/MauiEmbedding/Directory.Packages.props
@@ -1,25 +1,27 @@
 <Project ToolsVersion="15.0">
-  <ItemGroup>
-    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.3.230602002" />
-    <PackageVersion Include="SkiaSharp" Version="2.88.4-preview.89" />
-    <PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.4-preview.89" />
-    <PackageVersion Include="SkiaSharp.NativeAssets.iOS" Version="2.88.4-preview.89" />
-    <PackageVersion Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
-    <PackageVersion Include="Uno.Extensions.Logging.OSLog" Version="1.4.0" />
-    <PackageVersion Include="Uno.Material.WinUI" Version="3.0.0-dev.262" />
-    <PackageVersion Include="Uno.Dsp.Tasks" Version="1.1.0" />
-    <PackageVersion Include="Uno.Toolkit.WinUI" Version="3.1.0-dev.24" />
-    <PackageVersion Include="Uno.Toolkit.WinUI.Material" Version="3.1.0-dev.24" />
-    <PackageVersion Include="Uno.Resizetizer" Version="1.2.0-dev.13" />
-    <PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.0-dev.1610" />
-    <PackageVersion Include="Uno.UniversalImageLoader" Version="1.9.36" />
-    <PackageVersion Include="Uno.WinUI" Version="5.0.0-dev.1610" />
-    <PackageVersion Include="Uno.WinUI.RemoteControl" Version="5.0.0-dev.1610" />
-    <PackageVersion Include="CommunityToolkit.Maui" Version="2.0.0" />
-    <PackageVersion Include="Telerik.UI.for.Maui" Version="5.1.0" Condition="$(_UseTelerik)" />
-	<PackageVersion Include="Esri.ArcGISRuntime.Maui" Version="200.1.0" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.0" />
+		<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
+		<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
+		<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.3.230602002" />
+		<PackageVersion Include="SkiaSharp" Version="2.88.4-preview.89" />
+		<PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.4-preview.89" />
+		<PackageVersion Include="SkiaSharp.NativeAssets.iOS" Version="2.88.4-preview.89" />
+		<PackageVersion Include="SkiaSharp.Skottie" Version="2.88.4-preview.89" />
+		<PackageVersion Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
+		<PackageVersion Include="Uno.Extensions.Logging.OSLog" Version="1.4.0" />
+		<PackageVersion Include="Uno.Material.WinUI" Version="3.0.0-dev.262" />
+		<PackageVersion Include="Uno.Dsp.Tasks" Version="1.1.0" />
+		<PackageVersion Include="Uno.Toolkit.WinUI" Version="3.1.0-dev.24" />
+		<PackageVersion Include="Uno.Toolkit.WinUI.Material" Version="3.1.0-dev.24" />
+		<PackageVersion Include="Uno.Resizetizer" Version="1.2.0-dev.13" />
+		<PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.0-dev.1610" />
+		<PackageVersion Include="Uno.UniversalImageLoader" Version="1.9.36" />
+		<PackageVersion Include="Uno.WinUI" Version="5.0.0-dev.1610" />
+		<PackageVersion Include="Uno.WinUI.Skia.Gtk" Version="5.0.0-dev.1610" />
+		<PackageVersion Include="Uno.WinUI.RemoteControl" Version="5.0.0-dev.1610" />
+		<PackageVersion Include="CommunityToolkit.Maui" Version="2.0.0" />
+		<PackageVersion Include="Telerik.UI.for.Maui" Version="5.1.0" Condition="$(_UseTelerik)" />
+		<PackageVersion Include="Esri.ArcGISRuntime.Maui" Version="200.1.0" />
+	</ItemGroup>
 </Project>
diff --git a/samples/MauiEmbedding/MauiEmbedding.Skia.Gtk/MauiEmbedding.Skia.Gtk.csproj b/samples/MauiEmbedding/MauiEmbedding.Skia.Gtk/MauiEmbedding.Skia.Gtk.csproj
new file mode 100644
index 0000000000..76ef634c11
--- /dev/null
+++ b/samples/MauiEmbedding/MauiEmbedding.Skia.Gtk/MauiEmbedding.Skia.Gtk.csproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<OutputType Condition="'$(Configuration)'=='Release'">WinExe</OutputType>
+		<OutputType Condition="'$(Configuration)'=='Debug'">Exe</OutputType>
+		<TargetFramework>net7.0</TargetFramework>
+		<ApplicationManifest>app.manifest</ApplicationManifest>
+	</PropertyGroup>
+	<ItemGroup>
+		<EmbeddedResource Include="Package.appxmanifest" />
+		<Manifest Include="$(ApplicationManifest)" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Uno.WinUI.Skia.Gtk" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Console" />
+		<PackageReference Include="SkiaSharp.Views.Uno.WinUI" />
+		<PackageReference Include="SkiaSharp.Skottie" />
+		<PackageReference Include="Uno.WinUI.RemoteControl" Condition="'$(Configuration)'=='Debug'" />
+		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" />
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\MauiEmbedding\MauiEmbedding.csproj" />
+	</ItemGroup>
+	<Import Project="..\MauiEmbedding.Base\base.props" />
+</Project>
diff --git a/samples/MauiEmbedding/MauiEmbedding.Skia.Gtk/Package.appxmanifest b/samples/MauiEmbedding/MauiEmbedding.Skia.Gtk/Package.appxmanifest
new file mode 100644
index 0000000000..d4ac5a40e7
--- /dev/null
+++ b/samples/MauiEmbedding/MauiEmbedding.Skia.Gtk/Package.appxmanifest
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<Package
+	xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+	xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+	xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
+	IgnorableNamespaces="uap rescap">
+
+	<Identity
+		Name="MauiEmbedding"
+		Publisher="O=MauiEmbedding"
+		Version="1.0.0.0" />
+
+	<Properties>
+		<DisplayName>MauiEmbedding</DisplayName>
+		<PublisherDisplayName>MauiEmbedding</PublisherDisplayName>
+	</Properties>
+
+	<Dependencies>
+		<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
+		<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
+	</Dependencies>
+
+	<Resources>
+		<Resource Language="x-generate"/>
+	</Resources>
+
+	<Applications>
+		<Application Id="App"
+			Executable="$targetnametoken$.exe"
+			EntryPoint="$targetentrypoint$">
+			<uap:VisualElements
+				DisplayName="MauiEmbedding"
+				Description="MauiEmbedding">
+				<uap:SplashScreen />
+			</uap:VisualElements>
+		</Application>
+	</Applications>
+
+	<Capabilities>
+		<rescap:Capability Name="runFullTrust" />
+	</Capabilities>
+</Package>
diff --git a/samples/MauiEmbedding/MauiEmbedding.Skia.Gtk/Program.cs b/samples/MauiEmbedding/MauiEmbedding.Skia.Gtk/Program.cs
new file mode 100644
index 0000000000..03392a6b0c
--- /dev/null
+++ b/samples/MauiEmbedding/MauiEmbedding.Skia.Gtk/Program.cs
@@ -0,0 +1,21 @@
+using System;
+using GLib;
+using Uno.UI.Runtime.Skia;
+
+namespace MauiEmbedding.Skia.Gtk;
+
+public class Program
+{
+	public static void Main(string[] args)
+	{
+		ExceptionManager.UnhandledException += delegate (UnhandledExceptionArgs expArgs)
+		{
+			Console.WriteLine("GLIB UNHANDLED EXCEPTION" + expArgs.ExceptionObject.ToString());
+			expArgs.ExitApplication = true;
+		};
+
+		var host = new GtkHost(() => new AppHead());
+
+		host.Run();
+	}
+}
diff --git a/samples/MauiEmbedding/MauiEmbedding.Skia.Gtk/app.manifest b/samples/MauiEmbedding/MauiEmbedding.Skia.Gtk/app.manifest
new file mode 100644
index 0000000000..e56ae778d0
--- /dev/null
+++ b/samples/MauiEmbedding/MauiEmbedding.Skia.Gtk/app.manifest
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="MauiEmbedding.Gtk"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <!-- UAC Manifest Options
+             If you want to change the Windows User Account Control level replace the
+             requestedExecutionLevel node with one of the following.
+
+        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
+
+            Specifying requestedExecutionLevel element will disable file and registry virtualization.
+            Remove this element if your application requires this virtualization for backwards
+            compatibility.
+        -->
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- A list of the Windows versions that this application has been tested on
+           and is designed to work with. Uncomment the appropriate elements
+           and Windows will automatically select the most compatible environment. -->
+
+      <!-- Windows Vista -->
+      <!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
+
+      <!-- Windows 7 -->
+      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
+
+      <!-- Windows 8 -->
+      <!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
+
+      <!-- Windows 8.1 -->
+      <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
+
+      <!-- Windows 10 -->
+      <!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->
+
+    </application>
+  </compatibility>
+
+  <!-- Indicates that the application is DPI-aware and will not be automatically scaled by Windows at higher
+       DPIs. Windows Presentation Foundation (WPF) applications are automatically DPI-aware and do not need
+       to opt in. Windows Forms applications targeting .NET Framework 4.6 that opt into this setting, should
+       also set the 'EnableWindowsFormsHighDpiAutoResizing' setting to 'true' in their app.config. -->
+
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+			<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware>
+			<dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2, PerMonitor</dpiAwareness>
+    </windowsSettings>
+  </application>
+
+
+  <!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
+  <!--
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+          type="win32"
+          name="Microsoft.Windows.Common-Controls"
+          version="6.0.0.0"
+          processorArchitecture="*"
+          publicKeyToken="6595b64144ccf1df"
+          language="*"
+        />
+    </dependentAssembly>
+  </dependency>
+  -->
+
+</assembly>
diff --git a/samples/MauiEmbedding/MauiEmbedding.sln b/samples/MauiEmbedding/MauiEmbedding.sln
index daf5cad880..4cf09d3167 100644
--- a/samples/MauiEmbedding/MauiEmbedding.sln
+++ b/samples/MauiEmbedding/MauiEmbedding.sln
@@ -73,6 +73,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions Items", "Extensi
 		..\..\src\Directory.Build.props = ..\..\src\Directory.Build.props
 		..\..\src\Directory.Build.targets = ..\..\src\Directory.Build.targets
 		..\..\src\Directory.Packages.props = ..\..\src\Directory.Packages.props
+		..\..\src\tfms-ui-maui.props = ..\..\src\tfms-ui-maui.props
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MauiProjects", "MauiProjects", "{24511BF4-9869-4773-AF84-CC8F79AF5085}"
@@ -81,6 +82,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MauiControlsExternal", "Mau
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MauiApp1", "MauiProjects\MauiApp1\MauiApp1.csproj", "{8577882E-DA52-4D27-A529-C70998034566}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MauiEmbedding.Skia.Gtk", "MauiEmbedding.Skia.Gtk\MauiEmbedding.Skia.Gtk.csproj", "{00BAAAC1-9BA0-4F35-B7B6-5B4D64E45FAB}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -875,6 +878,34 @@ Global
 		{8577882E-DA52-4D27-A529-C70998034566}.Release|x64.Build.0 = Release|Any CPU
 		{8577882E-DA52-4D27-A529-C70998034566}.Release|x86.ActiveCfg = Release|Any CPU
 		{8577882E-DA52-4D27-A529-C70998034566}.Release|x86.Build.0 = Release|Any CPU
+		{00BAAAC1-9BA0-4F35-B7B6-5B4D64E45FAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{00BAAAC1-9BA0-4F35-B7B6-5B4D64E45FAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{00BAAAC1-9BA0-4F35-B7B6-5B4D64E45FAB}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{00BAAAC1-9BA0-4F35-B7B6-5B4D64E45FAB}.Debug|ARM.Build.0 = Debug|Any CPU
+		{00BAAAC1-9BA0-4F35-B7B6-5B4D64E45FAB}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{00BAAAC1-9BA0-4F35-B7B6-5B4D64E45FAB}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{00BAAAC1-9BA0-4F35-B7B6-5B4D64E45FAB}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{00BAAAC1-9BA0-4F35-B7B6-5B4D64E45FAB}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{00BAAAC1-9BA0-4F35-B7B6-5B4D64E45FAB}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{00BAAAC1-9BA0-4F35-B7B6-5B4D64E45FAB}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{00BAAAC1-9BA0-4F35-B7B6-5B4D64E45FAB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{00BAAAC1-9BA0-4F35-B7B6-5B4D64E45FAB}.Debug|x64.Build.0 = Debug|Any CPU
+		{00BAAAC1-9BA0-4F35-B7B6-5B4D64E45FAB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{00BAAAC1-9BA0-4F35-B7B6-5B4D64E45FAB}.Debug|x86.Build.0 = Debug|Any CPU
+		{00BAAAC1-9BA0-4F35-B7B6-5B4D64E45FAB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{00BAAAC1-9BA0-4F35-B7B6-5B4D64E45FAB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{00BAAAC1-9BA0-4F35-B7B6-5B4D64E45FAB}.Release|ARM.ActiveCfg = Release|Any CPU
+		{00BAAAC1-9BA0-4F35-B7B6-5B4D64E45FAB}.Release|ARM.Build.0 = Release|Any CPU
+		{00BAAAC1-9BA0-4F35-B7B6-5B4D64E45FAB}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{00BAAAC1-9BA0-4F35-B7B6-5B4D64E45FAB}.Release|ARM64.Build.0 = Release|Any CPU
+		{00BAAAC1-9BA0-4F35-B7B6-5B4D64E45FAB}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{00BAAAC1-9BA0-4F35-B7B6-5B4D64E45FAB}.Release|iPhone.Build.0 = Release|Any CPU
+		{00BAAAC1-9BA0-4F35-B7B6-5B4D64E45FAB}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{00BAAAC1-9BA0-4F35-B7B6-5B4D64E45FAB}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{00BAAAC1-9BA0-4F35-B7B6-5B4D64E45FAB}.Release|x64.ActiveCfg = Release|Any CPU
+		{00BAAAC1-9BA0-4F35-B7B6-5B4D64E45FAB}.Release|x64.Build.0 = Release|Any CPU
+		{00BAAAC1-9BA0-4F35-B7B6-5B4D64E45FAB}.Release|x86.ActiveCfg = Release|Any CPU
+		{00BAAAC1-9BA0-4F35-B7B6-5B4D64E45FAB}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -909,6 +940,7 @@ Global
 		{9F4A5914-3D10-4CDE-829C-BE53A9E441DB} = {9B9F35D5-E6DD-4FC7-9198-F8246D3CE366}
 		{A158CC84-0219-4BE4-A3F2-7AB7F613855A} = {24511BF4-9869-4773-AF84-CC8F79AF5085}
 		{8577882E-DA52-4D27-A529-C70998034566} = {24511BF4-9869-4773-AF84-CC8F79AF5085}
+		{00BAAAC1-9BA0-4F35-B7B6-5B4D64E45FAB} = {1C130CF4-EEF4-44D9-9DEF-C037FE1C221B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {584E156C-C094-4968-8A1F-3FB06081E34D}
diff --git a/samples/MauiEmbedding/MauiEmbedding/App.cs b/samples/MauiEmbedding/MauiEmbedding/App.cs
index 4e25e234cc..477263d2cb 100644
--- a/samples/MauiEmbedding/MauiEmbedding/App.cs
+++ b/samples/MauiEmbedding/MauiEmbedding/App.cs
@@ -1,3 +1,4 @@
+#if MAUI_EMBEDDING
 using CommunityToolkit.Maui;
 using Microsoft.Maui;
 //using Telerik.Maui.Controls;
@@ -5,6 +6,7 @@
 using MControls = Microsoft.Maui.Controls;
 using MauiControlsExternal;
 using Esri.ArcGISRuntime.Maui;
+#endif
 
 namespace MauiEmbedding;
 
@@ -16,6 +18,7 @@ public class App : Application
 	protected async override void OnLaunched(LaunchActivatedEventArgs args)
 	{
 		var builder = this.CreateBuilder(args)
+#if MAUI_EMBEDDING
 			.UseMauiEmbedding(maui =>
 			{
 
@@ -35,6 +38,7 @@ protected async override void OnLaunched(LaunchActivatedEventArgs args)
 					}
 				});
 			})
+#endif
 			// Add navigation support for toolkit controls such as TabBar and NavigationView
 			.UseToolkitNavigation()
 			.Configure(host => host
@@ -98,14 +102,16 @@ private static void RegisterRoutes(IViewRegistry views, IRouteRegistry routes)
 	{
 		views.Register(
 			new ViewMap(ViewModel: typeof(ShellViewModel)),
-			new ViewMap<MainPage, MainViewModel>(),
-			new ViewMap<MauiControlsPage, MauiControlsViewModel>(),
+			new ViewMap<MainPage, MainViewModel>()
+#if MAUI_EMBEDDING
+			,new ViewMap<MauiControlsPage, MauiControlsViewModel>(),
 			new ViewMap<MauiEssentialsPage, MauiEssentialsViewModel>(),
-			//new ViewMap<TelerikControlsPage, TelerikControlsViewModel>(),
+			new ViewMap<TelerikControlsPage, TelerikControlsViewModel>(),
 			new ViewMap<MauiColorsPage, MauiColorsViewModel>(),
 			new ViewMap<EsriMapsPage, EsriMapsViewModel>(),
 			new ViewMap<ExternalLibPage, ExternalLibViewModel>(),
 			new ViewMap<MCTControlsPage, MCTControlsViewModel>()
+#endif
 		);
 
 		routes.Register(
@@ -113,13 +119,15 @@ private static void RegisterRoutes(IViewRegistry views, IRouteRegistry routes)
 				Nested: new RouteMap[]
 				{
 					new RouteMap("Main", View: views.FindByViewModel<MainViewModel>()),
-					new RouteMap(nameof(MauiControlsViewModel), View: views.FindByViewModel<MauiControlsViewModel>()),
-					new RouteMap(nameof(MCTControlsViewModel), View: views.FindByViewModel<MCTControlsViewModel>()),
-					new RouteMap(nameof(MauiEssentialsViewModel), View: views.FindByViewModel<MauiEssentialsViewModel>()),
-					new RouteMap(nameof(MauiColorsViewModel), View: views.FindByViewModel<MauiColorsViewModel>()),
-					new RouteMap(nameof(EsriMapsViewModel), View: views.FindByViewModel<EsriMapsViewModel>()),
-					new RouteMap(nameof(ExternalLibPage), View: views.FindByViewModel<ExternalLibViewModel>()),
-					//new RouteMap(nameof(TelerikControlsViewModel), View: views.FindByViewModel<TelerikControlsViewModel>()),
+#if MAUI_EMBEDDING
+					new RouteMap("MauiControls", View: views.FindByViewModel<MauiControlsViewModel>()),
+					new RouteMap("MCTControls", View: views.FindByViewModel<MCTControlsViewModel>()),
+					new RouteMap("MauiEssentials", View: views.FindByViewModel<MauiEssentialsViewModel>()),
+					new RouteMap("MauiColors", View: views.FindByViewModel<MauiColorsViewModel>()),
+					new RouteMap("EsriMaps", View: views.FindByViewModel<EsriMapsViewModel>()),
+					new RouteMap("ExternalLib", View: views.FindByViewModel<ExternalLibViewModel>()),
+					new RouteMap("TelerikControls", View: views.FindByViewModel<TelerikControlsViewModel>()),
+#endif
 				}
 			)
 		);
diff --git a/samples/MauiEmbedding/MauiEmbedding/MauiEmbedding.csproj b/samples/MauiEmbedding/MauiEmbedding/MauiEmbedding.csproj
index be5ace9d76..e4bab0ed0c 100644
--- a/samples/MauiEmbedding/MauiEmbedding/MauiEmbedding.csproj
+++ b/samples/MauiEmbedding/MauiEmbedding/MauiEmbedding.csproj
@@ -4,14 +4,14 @@
 
 	<PropertyGroup>
 		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) or '$(EnableWindowsTargeting)' == 'true'">$(TargetFrameworks);net7.0-windows10.0.19041</TargetFrameworks>
-		<TargetFrameworks>$(TargetFrameworks);net7.0-ios;net7.0-android;net7.0-maccatalyst</TargetFrameworks>
+		<TargetFrameworks>$(TargetFrameworks);net7.0;net7.0-ios;net7.0-android;net7.0-maccatalyst</TargetFrameworks>
 
 		<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
 		<GenerateLibraryLayout>true</GenerateLibraryLayout>
+		<IsMauiEmbedding Condition="'$(IsMauiEmbedding)'==''">false</IsMauiEmbedding>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Telerik.UI.for.Maui" Condition="$(_UseTelerik)" />
 		<PackageReference Include="Uno.Dsp.Tasks" />
 		<PackageReference Include="Uno.WinUI" />
 		<PackageReference Include="Uno.Resizetizer" />
@@ -20,6 +20,9 @@
 		<PackageReference Include="Uno.Toolkit.WinUI.Material" />
 		<PackageReference Include="Uno.Toolkit.WinUI" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" />
+	</ItemGroup>
+	<ItemGroup Condition="$(IsMauiEmbedding)">
+		<PackageReference Include="Telerik.UI.for.Maui" Condition="$(_UseTelerik)" />
 		<PackageReference Include="CommunityToolkit.Maui" />
 		<PackageReference Include="Esri.ArcGISRuntime.Maui" />
 	</ItemGroup>
@@ -56,6 +59,11 @@
 		</Otherwise>
 	</Choose>
 
+	<ItemGroup Condition="!$(IsMauiEmbedding)">
+		<Compile Remove="Presentation\Maui\*.cs"/>
+		<Page Remove="Presentation\Maui\*.xaml"/>
+	</ItemGroup>
+
 	<ItemGroup>
 		<UnoDspImportColors Include="Styles\*.zip" Generator="Xaml" />
 		<UnoImage Include="Assets\**\*.svg" />
@@ -83,6 +91,11 @@
 		<ProjectReference Include="..\..\..\src\Uno.Extensions.Storage.UI\Uno.Extensions.Storage.WinUI.csproj" />
 		<ProjectReference Include="..\MauiProjects\MauiControlsExternal\MauiControlsExternal.csproj" />
 	</ItemGroup>
+
+
+	<ItemGroup>
+	  <Folder Include="Presentation\Maui\" />
+	</ItemGroup>
 	<Import Project="..\..\..\src\Uno.Extensions.Configuration\build\Package.targets" />
 	<Import Project="..\..\..\src\Uno.Extensions.Hosting\build\Package.targets" />
 	<Import Project="..\..\..\src\Uno.Extensions.Localization\build\Package.targets" />
diff --git a/samples/MauiEmbedding/MauiEmbedding/Presentation/MainPage.xaml b/samples/MauiEmbedding/MauiEmbedding/Presentation/MainPage.xaml
index e29f9bdc96..3b91a33d71 100644
--- a/samples/MauiEmbedding/MauiEmbedding/Presentation/MainPage.xaml
+++ b/samples/MauiEmbedding/MauiEmbedding/Presentation/MainPage.xaml
@@ -4,6 +4,7 @@
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	xmlns:uen="using:Uno.Extensions.Navigation.UI"
 	NavigationCacheMode="Required"
 	mc:Ignorable="d">
 
@@ -11,13 +12,13 @@
 		HorizontalAlignment="Center"
 		VerticalAlignment="Center"
 		Spacing="10">
-		<Button Click="{x:Bind Vm.GoToMauiControls}" Content="Maui simple controls" />
-		<Button Click="{x:Bind Vm.GoToCommunityToolkitMauiControls}" Content="CommunityToolkit.Maui controls" />
-		<Button Click="{x:Bind Vm.GoToMauiEssentialsApi}" Content="Maui.Essentials APIs" />
-		<Button Click="{x:Bind Vm.GoToTelerikPage}" Content="Telerik controls, remember to reference the nuget server" />
-		<Button Click="{x:Bind Vm.GoToColorsPage}" Content="Maui Colors and Resources" />
-		<Button Click="{x:Bind Vm.GoToExternalLibPage}" Content="Referenced External library controls" />
-		<Button Click="{x:Bind Vm.GoToMapsPage}" Content="ESRI maps page sample" />
+		<Button uen:Navigation.Request="MauiControls" Content="Maui simple controls" />
+		<Button uen:Navigation.Request="MCTControls" Content="CommunityToolkit.Maui controls" />
+		<Button uen:Navigation.Request="MauiEssentials" Content="Maui.Essentials APIs" />
+		<Button uen:Navigation.Request="TelerikControls" Content="Telerik controls, remember to reference the nuget server" />
+		<Button uen:Navigation.Request="MauiColors" Content="Maui Colors and Resources" />
+		<Button uen:Navigation.Request="ExternalLib" Content="Referenced External library controls" />
+		<Button uen:Navigation.Request="EsriMaps" Content="ESRI maps page sample" />
 	</StackPanel>
 
 </Page>
diff --git a/samples/MauiEmbedding/MauiEmbedding/Presentation/MainViewModel.cs b/samples/MauiEmbedding/MauiEmbedding/Presentation/MainViewModel.cs
index d4b6e99611..1e9a6b8e77 100644
--- a/samples/MauiEmbedding/MauiEmbedding/Presentation/MainViewModel.cs
+++ b/samples/MauiEmbedding/MauiEmbedding/Presentation/MainViewModel.cs
@@ -19,40 +19,5 @@ public MainViewModel(
 	}
 	public string? Title { get; }
 
-
-	public async Task GoToMauiControls()
-	{
-		await _navigator.NavigateViewModelAsync<MauiControlsViewModel>(this);
-	}
-
-
-	public async Task GoToCommunityToolkitMauiControls()
-	{
-		await _navigator.NavigateViewModelAsync<MCTControlsViewModel>(this);
-	}
-
-	public async Task GoToMauiEssentialsApi()
-	{
-		await _navigator.NavigateViewModelAsync<MauiEssentialsViewModel>(this);
-	}
-
-	public async Task GoToTelerikPage()
-	{
-		await _navigator.NavigateViewModelAsync<TelerikControlsViewModel>(this);
-	}
-
-	public async Task GoToColorsPage()
-	{
-		await _navigator.NavigateViewModelAsync<MauiColorsViewModel>(this);
-	}
-
-	public async Task GoToExternalLibPage()
-	{
-		await _navigator.NavigateViewModelAsync<ExternalLibViewModel>(this);
-	}
 	
-	public async Task GoToMapsPage()
-	{
-		await _navigator.NavigateViewModelAsync<EsriMapsViewModel>(this);
-	}
 }
diff --git a/samples/MauiEmbedding/MauiEmbedding/Presentation/EsriMapsPage.xaml b/samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/EsriMapsPage.xaml
similarity index 100%
rename from samples/MauiEmbedding/MauiEmbedding/Presentation/EsriMapsPage.xaml
rename to samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/EsriMapsPage.xaml
diff --git a/samples/MauiEmbedding/MauiEmbedding/Presentation/EsriMapsPage.xaml.cs b/samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/EsriMapsPage.xaml.cs
similarity index 100%
rename from samples/MauiEmbedding/MauiEmbedding/Presentation/EsriMapsPage.xaml.cs
rename to samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/EsriMapsPage.xaml.cs
diff --git a/samples/MauiEmbedding/MauiEmbedding/Presentation/EsriMapsViewModel.cs b/samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/EsriMapsViewModel.cs
similarity index 100%
rename from samples/MauiEmbedding/MauiEmbedding/Presentation/EsriMapsViewModel.cs
rename to samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/EsriMapsViewModel.cs
diff --git a/samples/MauiEmbedding/MauiEmbedding/Presentation/ExternalLibPage.xaml b/samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/ExternalLibPage.xaml
similarity index 100%
rename from samples/MauiEmbedding/MauiEmbedding/Presentation/ExternalLibPage.xaml
rename to samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/ExternalLibPage.xaml
diff --git a/samples/MauiEmbedding/MauiEmbedding/Presentation/ExternalLibPage.xaml.cs b/samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/ExternalLibPage.xaml.cs
similarity index 100%
rename from samples/MauiEmbedding/MauiEmbedding/Presentation/ExternalLibPage.xaml.cs
rename to samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/ExternalLibPage.xaml.cs
diff --git a/samples/MauiEmbedding/MauiEmbedding/Presentation/ExternalLibViewModel.cs b/samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/ExternalLibViewModel.cs
similarity index 100%
rename from samples/MauiEmbedding/MauiEmbedding/Presentation/ExternalLibViewModel.cs
rename to samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/ExternalLibViewModel.cs
diff --git a/samples/MauiEmbedding/MauiEmbedding/Presentation/MCTControlsPage.xaml b/samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MCTControlsPage.xaml
similarity index 100%
rename from samples/MauiEmbedding/MauiEmbedding/Presentation/MCTControlsPage.xaml
rename to samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MCTControlsPage.xaml
diff --git a/samples/MauiEmbedding/MauiEmbedding/Presentation/MCTControlsPage.xaml.cs b/samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MCTControlsPage.xaml.cs
similarity index 100%
rename from samples/MauiEmbedding/MauiEmbedding/Presentation/MCTControlsPage.xaml.cs
rename to samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MCTControlsPage.xaml.cs
diff --git a/samples/MauiEmbedding/MauiEmbedding/Presentation/MCTControlsViewModel.cs b/samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MCTControlsViewModel.cs
similarity index 100%
rename from samples/MauiEmbedding/MauiEmbedding/Presentation/MCTControlsViewModel.cs
rename to samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MCTControlsViewModel.cs
diff --git a/samples/MauiEmbedding/MauiEmbedding/Presentation/MauiColorsPage.xaml b/samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MauiColorsPage.xaml
similarity index 100%
rename from samples/MauiEmbedding/MauiEmbedding/Presentation/MauiColorsPage.xaml
rename to samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MauiColorsPage.xaml
diff --git a/samples/MauiEmbedding/MauiEmbedding/Presentation/MauiColorsPage.xaml.cs b/samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MauiColorsPage.xaml.cs
similarity index 100%
rename from samples/MauiEmbedding/MauiEmbedding/Presentation/MauiColorsPage.xaml.cs
rename to samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MauiColorsPage.xaml.cs
diff --git a/samples/MauiEmbedding/MauiEmbedding/Presentation/MauiColorsViewModel.cs b/samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MauiColorsViewModel.cs
similarity index 100%
rename from samples/MauiEmbedding/MauiEmbedding/Presentation/MauiColorsViewModel.cs
rename to samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MauiColorsViewModel.cs
diff --git a/samples/MauiEmbedding/MauiEmbedding/Presentation/MauiControlsPage.xaml b/samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MauiControlsPage.xaml
similarity index 100%
rename from samples/MauiEmbedding/MauiEmbedding/Presentation/MauiControlsPage.xaml
rename to samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MauiControlsPage.xaml
diff --git a/samples/MauiEmbedding/MauiEmbedding/Presentation/MauiControlsPage.xaml.cs b/samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MauiControlsPage.xaml.cs
similarity index 100%
rename from samples/MauiEmbedding/MauiEmbedding/Presentation/MauiControlsPage.xaml.cs
rename to samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MauiControlsPage.xaml.cs
diff --git a/samples/MauiEmbedding/MauiEmbedding/Presentation/MauiControlsViewModel.cs b/samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MauiControlsViewModel.cs
similarity index 100%
rename from samples/MauiEmbedding/MauiEmbedding/Presentation/MauiControlsViewModel.cs
rename to samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MauiControlsViewModel.cs
diff --git a/samples/MauiEmbedding/MauiEmbedding/Presentation/MauiEssentialsPage.xaml b/samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MauiEssentialsPage.xaml
similarity index 100%
rename from samples/MauiEmbedding/MauiEmbedding/Presentation/MauiEssentialsPage.xaml
rename to samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MauiEssentialsPage.xaml
diff --git a/samples/MauiEmbedding/MauiEmbedding/Presentation/MauiEssentialsPage.xaml.cs b/samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MauiEssentialsPage.xaml.cs
similarity index 100%
rename from samples/MauiEmbedding/MauiEmbedding/Presentation/MauiEssentialsPage.xaml.cs
rename to samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MauiEssentialsPage.xaml.cs
diff --git a/samples/MauiEmbedding/MauiEmbedding/Presentation/MauiEssentialsViewModel.cs b/samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MauiEssentialsViewModel.cs
similarity index 100%
rename from samples/MauiEmbedding/MauiEmbedding/Presentation/MauiEssentialsViewModel.cs
rename to samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MauiEssentialsViewModel.cs
diff --git a/samples/MauiEmbedding/MauiEmbedding/Presentation/TelerikControlsPage.xaml b/samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/TelerikControlsPage.xaml
similarity index 100%
rename from samples/MauiEmbedding/MauiEmbedding/Presentation/TelerikControlsPage.xaml
rename to samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/TelerikControlsPage.xaml
diff --git a/samples/MauiEmbedding/MauiEmbedding/Presentation/TelerikControlsPage.xaml.cs b/samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/TelerikControlsPage.xaml.cs
similarity index 100%
rename from samples/MauiEmbedding/MauiEmbedding/Presentation/TelerikControlsPage.xaml.cs
rename to samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/TelerikControlsPage.xaml.cs
diff --git a/samples/MauiEmbedding/MauiEmbedding/Presentation/TelerikControlsViewModel.cs b/samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/TelerikControlsViewModel.cs
similarity index 100%
rename from samples/MauiEmbedding/MauiEmbedding/Presentation/TelerikControlsViewModel.cs
rename to samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/TelerikControlsViewModel.cs
diff --git a/src/Uno.Extensions.Maui.UI/GlobalUsings.cs b/src/Uno.Extensions.Maui.UI/GlobalUsings.cs
index b5b81a0133..cc83e61f97 100644
--- a/src/Uno.Extensions.Maui.UI/GlobalUsings.cs
+++ b/src/Uno.Extensions.Maui.UI/GlobalUsings.cs
@@ -4,16 +4,19 @@
 global using System.Reflection;
 global using Microsoft.Extensions.DependencyInjection;
 global using Microsoft.Extensions.Logging;
-global using Microsoft.Maui.Controls;
-global using Microsoft.Maui.Embedding;
-global using Microsoft.Maui.Hosting;
-global using Microsoft.Maui.Platform;
 global using Microsoft.UI.Xaml;
 global using Microsoft.UI.Xaml.Controls;
 global using Microsoft.UI.Xaml.Markup;
 global using Microsoft.UI.Xaml.Media;
 global using Uno.Extensions.Hosting;
+
+global using Microsoft.Maui.Controls;
+global using Microsoft.Maui.Embedding;
+global using Microsoft.Maui.Hosting;
+global using Microsoft.Maui.Platform;
+#if MAUI_EMBEDDING
 global using Uno.Extensions.Maui.Internals;
+#endif
 
 // Where there's a name conflict, alias the WinUI type with same name
 global using Application = Microsoft.UI.Xaml.Application;
@@ -25,6 +28,7 @@
 global using Color = Windows.UI.Color;
 
 // Where there's a name conflict, alias Maui types with Maui prefix
+global using MauiView = Microsoft.Maui.Controls.View;
 global using MauiApplication = Microsoft.Maui.Controls.Application;
 global using MauiBindingMode = Microsoft.Maui.Controls.BindingMode;
 global using IMauiValueConverter = Microsoft.Maui.Controls.IValueConverter;
@@ -37,4 +41,3 @@
 // These types conflict with types being exposed in this package, so alias includes the namespace
 global using MauiControlsBinding = Microsoft.Maui.Controls.Binding;
 global using MauiGraphicsColor = Microsoft.Maui.Graphics.Color;
-
diff --git a/src/Uno.Extensions.Maui.UI/MauiBinding.cs b/src/Uno.Extensions.Maui.UI/MauiBinding.cs
index 06ddfde5ec..3bdecb711e 100644
--- a/src/Uno.Extensions.Maui.UI/MauiBinding.cs
+++ b/src/Uno.Extensions.Maui.UI/MauiBinding.cs
@@ -36,6 +36,7 @@ public class MauiBinding : MauiExtensionBase
 	/// </summary>
 	public object? Source { get; set; }
 
+#if MAUI_EMBEDDING
 	/// <inheritdoc/>
 	protected override void SetValue(View view, Type viewType, Type propertyType, BindableProperty property, string propertyName)
 	{
@@ -67,4 +68,5 @@ protected override void SetValue(View view, Type viewType, Type propertyType, Bi
 
 		view.SetBinding(property, binding);
 	}
+#endif
 }
diff --git a/src/Uno.Extensions.Maui.UI/MauiColor.cs b/src/Uno.Extensions.Maui.UI/MauiColor.cs
index ab3b97da17..a91a4d3a6e 100644
--- a/src/Uno.Extensions.Maui.UI/MauiColor.cs
+++ b/src/Uno.Extensions.Maui.UI/MauiColor.cs
@@ -12,6 +12,7 @@ public class MauiColor : MauiExtensionBase
 	/// </summary>
 	public string Value { get; set; } = string.Empty;
 
+#if MAUI_EMBEDDING
 	/// <inheritdoc/>
 	protected override void SetValue(View view, Type viewType, Type propertyType, BindableProperty property, string propertyName)
 	{
@@ -31,4 +32,5 @@ protected override void SetValue(View view, Type viewType, Type propertyType, Bi
 
 		view.SetValue(property, color);
 	}
+#endif
 }
diff --git a/src/Uno.Extensions.Maui.UI/MauiEmbedding.cs b/src/Uno.Extensions.Maui.UI/MauiEmbedding.cs
index 9f6673873a..e59e1d2051 100644
--- a/src/Uno.Extensions.Maui.UI/MauiEmbedding.cs
+++ b/src/Uno.Extensions.Maui.UI/MauiEmbedding.cs
@@ -6,6 +6,7 @@ namespace Uno.Extensions.Maui;
 /// </summary>
 public static class MauiEmbedding
 {
+#if MAUI_EMBEDDING
 	private static MauiApp? _app;
 	internal static IMauiContext MauiContext =>
 #if ANDROID
@@ -14,6 +15,7 @@ public static class MauiEmbedding
 #else
 	_app is not null ? new MauiContext(_app.Services)
 			: throw new MauiEmbeddingInitializationException();
+#endif
 #endif
 
 	/// <summary>
@@ -33,8 +35,9 @@ public static IApplicationBuilder UseMauiEmbedding(this IApplicationBuilder buil
 	/// </summary>
 	/// <param name="app">The Uno app.</param>
 	/// <param name="configure">Optional lambda to configure the Maui app builder.</param>
-	public static void UseMauiEmbedding(this Microsoft.UI.Xaml.Application app, Action<MauiAppBuilder>? configure = null)
+	public static Microsoft.UI.Xaml.Application UseMauiEmbedding(this Microsoft.UI.Xaml.Application app, Action<MauiAppBuilder>? configure = null)
 	{
+#if MAUI_EMBEDDING
 		var mauiAppBuilder = MauiApp.CreateBuilder()
 				.UseMauiEmbedding<MauiApplication>();
 
@@ -48,6 +51,8 @@ public static void UseMauiEmbedding(this Microsoft.UI.Xaml.Application app, Acti
 		mauiAppBuilder.Services.AddSingleton(app)
 			.AddSingleton<IMauiInitializeService, MauiEmbeddingInitializer>();
 		_app = mauiAppBuilder.Build();
+#endif
+		return app;
 	}
 
 	// NOTE: This was part of the POC and is out of scope for the MVP. Keeping it in case we want to add it back later.
diff --git a/src/Uno.Extensions.Maui.UI/MauiExtensionBase.cs b/src/Uno.Extensions.Maui.UI/MauiExtensionBase.cs
index 152c5fa90c..cd3c24bf4a 100644
--- a/src/Uno.Extensions.Maui.UI/MauiExtensionBase.cs
+++ b/src/Uno.Extensions.Maui.UI/MauiExtensionBase.cs
@@ -5,6 +5,8 @@
 /// </summary>
 public abstract class MauiExtensionBase : MarkupExtension
 {
+#if MAUI_EMBEDDING
+
 	private ILogger? _logger;
 
 	/// <summary>
@@ -12,6 +14,7 @@ public abstract class MauiExtensionBase : MarkupExtension
 	/// </summary>
 	protected ILogger Logger => _logger ??= GetLogger();
 
+
 	/// <inheritdoc/>
 	protected sealed override object? ProvideValue(IXamlServiceProvider serviceProvider)
 	{
@@ -79,6 +82,7 @@ private ILogger GetLogger()
 	/// <param name="property">The <see cref="BindableProperty"/> to set.</param>
 	/// <param name="propertyName">The name of the property to set.</param>
 	protected abstract void SetValue(View view, Type viewType, Type propertyType, BindableProperty property, string propertyName);
+#endif
 
 	/// <summary>
 	/// Returns a default value of <paramref name="type"/>.
diff --git a/src/Uno.Extensions.Maui.UI/MauiHost.cs b/src/Uno.Extensions.Maui.UI/MauiHost.cs
index 7c29fbcc91..c8c8d1a470 100644
--- a/src/Uno.Extensions.Maui.UI/MauiHost.cs
+++ b/src/Uno.Extensions.Maui.UI/MauiHost.cs
@@ -10,20 +10,24 @@ public partial class MauiHost : ContentControl
 	/// The MauiContent property represents the <see cref="MauiContent"/> that will be used as content.
 	/// </summary>
 	public static readonly DependencyProperty MauiContentProperty =
-		DependencyProperty.Register(nameof(MauiContent), typeof(View), typeof(MauiHost), new PropertyMetadata(null, OnMauiContentChanged));
+		DependencyProperty.Register(nameof(MauiContent), typeof(MauiView), typeof(MauiHost), new PropertyMetadata(null, OnMauiContentChanged));
 
 	private static void OnMauiContentChanged(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs args)
 	{
+#if MAUI_EMBEDDING
 		if (args.NewValue is null ||
-			args.NewValue is not View view ||
+			args.NewValue is not MauiView view ||
 			dependencyObject is not MauiHost mauiHost)
 		{
 			return;
 		}
 
 		mauiHost.Content = view;
+#endif
 	}
 
+#if MAUI_EMBEDDING
+
 	private static ILogger GetLogger() =>
 		MauiEmbedding.MauiContext.Services.GetRequiredService<ILogger<MauiHost>>();
 
@@ -56,16 +60,19 @@ private void OnMauiContentUnloaded(object sender, RoutedEventArgs e)
 		}
 		_host = null;
 	}
+#endif
 
 	/// <summary>
 	/// Gets or sets the <see cref="MauiContent"/> that will be used as content.
 	/// </summary>
-	public View MauiContent
+	public MauiView MauiContent
 	{
-		get => (View)GetValue(MauiContentProperty);
+		get => (MauiView)GetValue(MauiContentProperty);
 		set => SetValue(MauiContentProperty, value);
 	}
 
+#if MAUI_EMBEDDING
+
 	private void OnLoading(FrameworkElement sender, object args)
 	{
 		Loading -= OnLoading;
@@ -126,4 +133,5 @@ void OnDataContextChanged(FrameworkElement sender, DataContextChangedEventArgs a
 			_host.BindingContext = DataContext;
 		}
 	}
+#endif
 }
diff --git a/src/Uno.Extensions.Maui.UI/MauiResource.cs b/src/Uno.Extensions.Maui.UI/MauiResource.cs
index a5b505eb0c..dce48923bc 100644
--- a/src/Uno.Extensions.Maui.UI/MauiResource.cs
+++ b/src/Uno.Extensions.Maui.UI/MauiResource.cs
@@ -12,6 +12,7 @@ public class MauiResource : MauiExtensionBase
 	/// </summary>
 	public string Key { get; set; } = string.Empty;
 
+#if MAUI_EMBEDDING
 	/// <summary>
 	/// Sets the value of the view's property by the key.
 	/// </summary>
@@ -35,4 +36,5 @@ protected override void SetValue(View view, Type viewType, Type propertyType, Bi
 			view.SetDynamicResource(property, Key);
 		}
 	}
+#endif
 }
diff --git a/src/Uno.Extensions.Maui.UI/MauiThickness.cs b/src/Uno.Extensions.Maui.UI/MauiThickness.cs
index 2eaa4308fe..6d5793c215 100644
--- a/src/Uno.Extensions.Maui.UI/MauiThickness.cs
+++ b/src/Uno.Extensions.Maui.UI/MauiThickness.cs
@@ -11,6 +11,8 @@ public class MauiThickness : MarkupExtension
 	/// </summary>
 	public string Value { get; set; } = string.Empty;
 
+
+#if MAUI_EMBEDDING
 	/// <inheritdoc />
 	protected override object ProvideValue()
 	{
@@ -37,4 +39,5 @@ protected override object ProvideValue()
 			_ => throw new MauiEmbeddingException($"The Thickness string '{Value}' has an invalid number of arguments")
 		};
 	}
+#endif
 }
diff --git a/src/Uno.Extensions.Maui.UI/Uno.Extensions.Maui.WinUI.csproj b/src/Uno.Extensions.Maui.UI/Uno.Extensions.Maui.WinUI.csproj
index 0633147482..0ed6eded6f 100644
--- a/src/Uno.Extensions.Maui.UI/Uno.Extensions.Maui.WinUI.csproj
+++ b/src/Uno.Extensions.Maui.UI/Uno.Extensions.Maui.WinUI.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<Import Project="..\tfms-ui-maui.props" />
-	
+
 	<PropertyGroup>
 		<UseMaui>true</UseMaui>
 		<RootNamespace>Uno.Extensions.Maui</RootNamespace>
@@ -8,6 +8,10 @@
 		<Description>Extensions to embed .NET MAUI controls within your Uno app.</Description>
 		<!--Temporary disable missing XML doc until fixed in the whole package-->
 		<WarningsNotAsErrors>$(WarningsNotAsErrors);CS1591</WarningsNotAsErrors>
+
+		<IsMauiEmbedding>false</IsMauiEmbedding>
+		<IsMauiEmbedding Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android' OR $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios' OR $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst' OR $(TargetFramework.Contains('windows10'))" >true</IsMauiEmbedding>
+		<DefineConstants Condition="$(IsMauiEmbedding)">$(DefineConstants);MAUI_EMBEDDING</DefineConstants>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -34,8 +38,24 @@
 		</EmbeddedResource>
 	</ItemGroup>
 
+
+	<!-- These files are not currently used but kept in case we need them-->
 	<ItemGroup>
 		<Compile Remove="Interop\*.cs" />
 		<Compile Remove="Models\*.cs" />
 	</ItemGroup>
+
+	<Choose>
+		<When Condition="$(IsMauiEmbedding)">
+			<PropertyGroup>
+				<DefineConstants>$(DefineConstants);MAUI_EMBEDDING</DefineConstants>
+			</PropertyGroup>
+		</When>
+		<Otherwise>
+			<ItemGroup>
+				<Compile Remove="Internals\*.cs" />
+			</ItemGroup>
+		</Otherwise>
+	</Choose>
+
 </Project>
diff --git a/src/Uno.Extensions.Maui.UI/build/Package.props b/src/Uno.Extensions.Maui.UI/build/Package.props
index 163ffc3bf1..d19000a7ae 100644
--- a/src/Uno.Extensions.Maui.UI/build/Package.props
+++ b/src/Uno.Extensions.Maui.UI/build/Package.props
@@ -1,4 +1,9 @@
 <Project>
+	<PropertyGroup>
+		<IsMauiEmbedding>false</IsMauiEmbedding>
+		<IsMauiEmbedding Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android' OR $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios' OR $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst' OR $(TargetFramework.Contains('windows10'))" >true</IsMauiEmbedding>
+		<DefineConstants Condition="$(IsMauiEmbedding)">$(DefineConstants);MAUI_EMBEDDING</DefineConstants>
+	</PropertyGroup>
 	<PropertyGroup>
 		<UseMaui>true</UseMaui>
 		<UseMauiAssets>false</UseMauiAssets>
diff --git a/src/Uno.Extensions.Maui.UI/build/Package.targets b/src/Uno.Extensions.Maui.UI/build/Package.targets
index 286f106819..3c9fe37500 100644
--- a/src/Uno.Extensions.Maui.UI/build/Package.targets
+++ b/src/Uno.Extensions.Maui.UI/build/Package.targets
@@ -5,7 +5,7 @@
 	</PropertyGroup>
 
 	<ItemGroup Condition=" '$(ImplicitUsings)' == 'true' OR '$(ImplicitUsings)' == 'enable' ">
-		<Using Include="Uno.Extensions.Maui"  Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android' OR $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios' OR $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst' OR $(TargetFramework.Contains('windows10'))" />
+		<Using Include="Uno.Extensions.Maui" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/src/tfms-ui-maui.props b/src/tfms-ui-maui.props
index ca64be2999..b061275984 100644
--- a/src/tfms-ui-maui.props
+++ b/src/tfms-ui-maui.props
@@ -4,6 +4,7 @@
 		<TargetFrameworks>$(UnoTargetFrameworkOverride)</TargetFrameworks>
 	</PropertyGroup>
 	<PropertyGroup  Condition="'$(UnoTargetFrameworkOverride)'==''">
+		<TargetFrameworks>$(TargetFrameworks);net7.0;</TargetFrameworks>
 		<TargetFrameworks Condition="'$(Build_iOS)'=='true' and '$(UnoExtensionsDisableNet7)'==''">$(TargetFrameworks);net7.0-ios</TargetFrameworks>
 		<TargetFrameworks Condition="'$(Build_MacOS)'=='true' and '$(UnoExtensionsDisableNet7)'==''">$(TargetFrameworks);net7.0-maccatalyst</TargetFrameworks>
 		<TargetFrameworks Condition="'$(Build_Android)'=='true' and '$(UnoExtensionsDisableNet7)'==''">$(TargetFrameworks);net7.0-android</TargetFrameworks>

From 6a7436547dd9cb2c065f92368dfaba498c25ef8e Mon Sep 17 00:00:00 2001
From: Nick Randolph <nick@builttoroam.com>
Date: Fri, 28 Jul 2023 14:17:42 +1000
Subject: [PATCH 2/3] fix: Adding back most sample pages

---
 samples/MauiEmbedding/MauiEmbedding/App.cs    | 19 +++++++++++--------
 .../MauiEmbedding/MauiEmbedding.csproj        | 11 +++--------
 .../Presentation/{Maui => }/EsriMapsPage.xaml |  0
 .../{Maui => }/EsriMapsPage.xaml.cs           |  0
 .../{Maui => }/EsriMapsViewModel.cs           |  0
 .../{Maui => }/ExternalLibPage.xaml           |  0
 .../{Maui => }/ExternalLibPage.xaml.cs        |  0
 .../{Maui => }/ExternalLibViewModel.cs        |  0
 .../{Maui => }/MCTControlsPage.xaml           |  0
 .../{Maui => }/MCTControlsPage.xaml.cs        |  0
 .../{Maui => }/MCTControlsViewModel.cs        |  0
 .../{Maui => }/MauiColorsPage.xaml            |  0
 .../{Maui => }/MauiColorsPage.xaml.cs         |  0
 .../{Maui => }/MauiColorsViewModel.cs         |  0
 .../{Maui => }/MauiControlsPage.xaml          |  0
 .../{Maui => }/MauiControlsPage.xaml.cs       |  0
 .../{Maui => }/MauiControlsViewModel.cs       |  0
 .../{Maui => }/MauiEssentialsPage.xaml        |  0
 .../{Maui => }/MauiEssentialsPage.xaml.cs     |  0
 .../{Maui => }/MauiEssentialsViewModel.cs     |  0
 .../{Maui => }/TelerikControlsPage.xaml       |  0
 .../{Maui => }/TelerikControlsPage.xaml.cs    |  0
 .../{Maui => }/TelerikControlsViewModel.cs    |  0
 23 files changed, 14 insertions(+), 16 deletions(-)
 rename samples/MauiEmbedding/MauiEmbedding/Presentation/{Maui => }/EsriMapsPage.xaml (100%)
 rename samples/MauiEmbedding/MauiEmbedding/Presentation/{Maui => }/EsriMapsPage.xaml.cs (100%)
 rename samples/MauiEmbedding/MauiEmbedding/Presentation/{Maui => }/EsriMapsViewModel.cs (100%)
 rename samples/MauiEmbedding/MauiEmbedding/Presentation/{Maui => }/ExternalLibPage.xaml (100%)
 rename samples/MauiEmbedding/MauiEmbedding/Presentation/{Maui => }/ExternalLibPage.xaml.cs (100%)
 rename samples/MauiEmbedding/MauiEmbedding/Presentation/{Maui => }/ExternalLibViewModel.cs (100%)
 rename samples/MauiEmbedding/MauiEmbedding/Presentation/{Maui => }/MCTControlsPage.xaml (100%)
 rename samples/MauiEmbedding/MauiEmbedding/Presentation/{Maui => }/MCTControlsPage.xaml.cs (100%)
 rename samples/MauiEmbedding/MauiEmbedding/Presentation/{Maui => }/MCTControlsViewModel.cs (100%)
 rename samples/MauiEmbedding/MauiEmbedding/Presentation/{Maui => }/MauiColorsPage.xaml (100%)
 rename samples/MauiEmbedding/MauiEmbedding/Presentation/{Maui => }/MauiColorsPage.xaml.cs (100%)
 rename samples/MauiEmbedding/MauiEmbedding/Presentation/{Maui => }/MauiColorsViewModel.cs (100%)
 rename samples/MauiEmbedding/MauiEmbedding/Presentation/{Maui => }/MauiControlsPage.xaml (100%)
 rename samples/MauiEmbedding/MauiEmbedding/Presentation/{Maui => }/MauiControlsPage.xaml.cs (100%)
 rename samples/MauiEmbedding/MauiEmbedding/Presentation/{Maui => }/MauiControlsViewModel.cs (100%)
 rename samples/MauiEmbedding/MauiEmbedding/Presentation/{Maui => }/MauiEssentialsPage.xaml (100%)
 rename samples/MauiEmbedding/MauiEmbedding/Presentation/{Maui => }/MauiEssentialsPage.xaml.cs (100%)
 rename samples/MauiEmbedding/MauiEmbedding/Presentation/{Maui => }/MauiEssentialsViewModel.cs (100%)
 rename samples/MauiEmbedding/MauiEmbedding/Presentation/{Maui => }/TelerikControlsPage.xaml (100%)
 rename samples/MauiEmbedding/MauiEmbedding/Presentation/{Maui => }/TelerikControlsPage.xaml.cs (100%)
 rename samples/MauiEmbedding/MauiEmbedding/Presentation/{Maui => }/TelerikControlsViewModel.cs (100%)

diff --git a/samples/MauiEmbedding/MauiEmbedding/App.cs b/samples/MauiEmbedding/MauiEmbedding/App.cs
index 477263d2cb..0cb3d95ff9 100644
--- a/samples/MauiEmbedding/MauiEmbedding/App.cs
+++ b/samples/MauiEmbedding/MauiEmbedding/App.cs
@@ -1,9 +1,10 @@
-#if MAUI_EMBEDDING
-using CommunityToolkit.Maui;
 using Microsoft.Maui;
+using MControls = Microsoft.Maui.Controls;
+using CommunityToolkit.Maui;
+
+#if MAUI_EMBEDDING
 //using Telerik.Maui.Controls;
 //using Telerik.Maui.Controls.Compatibility;
-using MControls = Microsoft.Maui.Controls;
 using MauiControlsExternal;
 using Esri.ArcGISRuntime.Maui;
 #endif
@@ -18,16 +19,18 @@ public class App : Application
 	protected async override void OnLaunched(LaunchActivatedEventArgs args)
 	{
 		var builder = this.CreateBuilder(args)
-#if MAUI_EMBEDDING
 			.UseMauiEmbedding(maui =>
 			{
 
 				maui
 				.UseMauiCommunityToolkit()
+#if MAUI_EMBEDDING
 				.UseArcGISRuntime()
 				//.UseTelerik()
 				//.UseTelerikControls()
-				.UseCustomLibrary();
+				.UseCustomLibrary()
+#endif
+				;
 
 				Microsoft.Maui.Handlers.ShapeViewHandler.Mapper.AppendToMapping("BackgroundColor", (h, v) =>
 				{
@@ -38,7 +41,7 @@ protected async override void OnLaunched(LaunchActivatedEventArgs args)
 					}
 				});
 			})
-#endif
+
 			// Add navigation support for toolkit controls such as TabBar and NavigationView
 			.UseToolkitNavigation()
 			.Configure(host => host
@@ -103,15 +106,15 @@ private static void RegisterRoutes(IViewRegistry views, IRouteRegistry routes)
 		views.Register(
 			new ViewMap(ViewModel: typeof(ShellViewModel)),
 			new ViewMap<MainPage, MainViewModel>()
-#if MAUI_EMBEDDING
 			,new ViewMap<MauiControlsPage, MauiControlsViewModel>(),
 			new ViewMap<MauiEssentialsPage, MauiEssentialsViewModel>(),
 			new ViewMap<TelerikControlsPage, TelerikControlsViewModel>(),
 			new ViewMap<MauiColorsPage, MauiColorsViewModel>(),
+#if MAUI_EMBEDDING
 			new ViewMap<EsriMapsPage, EsriMapsViewModel>(),
+#endif
 			new ViewMap<ExternalLibPage, ExternalLibViewModel>(),
 			new ViewMap<MCTControlsPage, MCTControlsViewModel>()
-#endif
 		);
 
 		routes.Register(
diff --git a/samples/MauiEmbedding/MauiEmbedding/MauiEmbedding.csproj b/samples/MauiEmbedding/MauiEmbedding/MauiEmbedding.csproj
index e4bab0ed0c..47c691cf6a 100644
--- a/samples/MauiEmbedding/MauiEmbedding/MauiEmbedding.csproj
+++ b/samples/MauiEmbedding/MauiEmbedding/MauiEmbedding.csproj
@@ -20,10 +20,10 @@
 		<PackageReference Include="Uno.Toolkit.WinUI.Material" />
 		<PackageReference Include="Uno.Toolkit.WinUI" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" />
+		<PackageReference Include="CommunityToolkit.Maui" />
 	</ItemGroup>
 	<ItemGroup Condition="$(IsMauiEmbedding)">
 		<PackageReference Include="Telerik.UI.for.Maui" Condition="$(_UseTelerik)" />
-		<PackageReference Include="CommunityToolkit.Maui" />
 		<PackageReference Include="Esri.ArcGISRuntime.Maui" />
 	</ItemGroup>
 
@@ -60,8 +60,8 @@
 	</Choose>
 
 	<ItemGroup Condition="!$(IsMauiEmbedding)">
-		<Compile Remove="Presentation\Maui\*.cs"/>
-		<Page Remove="Presentation\Maui\*.xaml"/>
+		<Compile Remove="Presentation\Maui\EsriMapsPage.xaml.cs"/>
+		<Page Remove="Presentation\Maui\EsriMapsPage.xaml"/>
 	</ItemGroup>
 
 	<ItemGroup>
@@ -91,11 +91,6 @@
 		<ProjectReference Include="..\..\..\src\Uno.Extensions.Storage.UI\Uno.Extensions.Storage.WinUI.csproj" />
 		<ProjectReference Include="..\MauiProjects\MauiControlsExternal\MauiControlsExternal.csproj" />
 	</ItemGroup>
-
-
-	<ItemGroup>
-	  <Folder Include="Presentation\Maui\" />
-	</ItemGroup>
 	<Import Project="..\..\..\src\Uno.Extensions.Configuration\build\Package.targets" />
 	<Import Project="..\..\..\src\Uno.Extensions.Hosting\build\Package.targets" />
 	<Import Project="..\..\..\src\Uno.Extensions.Localization\build\Package.targets" />
diff --git a/samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/EsriMapsPage.xaml b/samples/MauiEmbedding/MauiEmbedding/Presentation/EsriMapsPage.xaml
similarity index 100%
rename from samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/EsriMapsPage.xaml
rename to samples/MauiEmbedding/MauiEmbedding/Presentation/EsriMapsPage.xaml
diff --git a/samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/EsriMapsPage.xaml.cs b/samples/MauiEmbedding/MauiEmbedding/Presentation/EsriMapsPage.xaml.cs
similarity index 100%
rename from samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/EsriMapsPage.xaml.cs
rename to samples/MauiEmbedding/MauiEmbedding/Presentation/EsriMapsPage.xaml.cs
diff --git a/samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/EsriMapsViewModel.cs b/samples/MauiEmbedding/MauiEmbedding/Presentation/EsriMapsViewModel.cs
similarity index 100%
rename from samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/EsriMapsViewModel.cs
rename to samples/MauiEmbedding/MauiEmbedding/Presentation/EsriMapsViewModel.cs
diff --git a/samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/ExternalLibPage.xaml b/samples/MauiEmbedding/MauiEmbedding/Presentation/ExternalLibPage.xaml
similarity index 100%
rename from samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/ExternalLibPage.xaml
rename to samples/MauiEmbedding/MauiEmbedding/Presentation/ExternalLibPage.xaml
diff --git a/samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/ExternalLibPage.xaml.cs b/samples/MauiEmbedding/MauiEmbedding/Presentation/ExternalLibPage.xaml.cs
similarity index 100%
rename from samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/ExternalLibPage.xaml.cs
rename to samples/MauiEmbedding/MauiEmbedding/Presentation/ExternalLibPage.xaml.cs
diff --git a/samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/ExternalLibViewModel.cs b/samples/MauiEmbedding/MauiEmbedding/Presentation/ExternalLibViewModel.cs
similarity index 100%
rename from samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/ExternalLibViewModel.cs
rename to samples/MauiEmbedding/MauiEmbedding/Presentation/ExternalLibViewModel.cs
diff --git a/samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MCTControlsPage.xaml b/samples/MauiEmbedding/MauiEmbedding/Presentation/MCTControlsPage.xaml
similarity index 100%
rename from samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MCTControlsPage.xaml
rename to samples/MauiEmbedding/MauiEmbedding/Presentation/MCTControlsPage.xaml
diff --git a/samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MCTControlsPage.xaml.cs b/samples/MauiEmbedding/MauiEmbedding/Presentation/MCTControlsPage.xaml.cs
similarity index 100%
rename from samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MCTControlsPage.xaml.cs
rename to samples/MauiEmbedding/MauiEmbedding/Presentation/MCTControlsPage.xaml.cs
diff --git a/samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MCTControlsViewModel.cs b/samples/MauiEmbedding/MauiEmbedding/Presentation/MCTControlsViewModel.cs
similarity index 100%
rename from samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MCTControlsViewModel.cs
rename to samples/MauiEmbedding/MauiEmbedding/Presentation/MCTControlsViewModel.cs
diff --git a/samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MauiColorsPage.xaml b/samples/MauiEmbedding/MauiEmbedding/Presentation/MauiColorsPage.xaml
similarity index 100%
rename from samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MauiColorsPage.xaml
rename to samples/MauiEmbedding/MauiEmbedding/Presentation/MauiColorsPage.xaml
diff --git a/samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MauiColorsPage.xaml.cs b/samples/MauiEmbedding/MauiEmbedding/Presentation/MauiColorsPage.xaml.cs
similarity index 100%
rename from samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MauiColorsPage.xaml.cs
rename to samples/MauiEmbedding/MauiEmbedding/Presentation/MauiColorsPage.xaml.cs
diff --git a/samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MauiColorsViewModel.cs b/samples/MauiEmbedding/MauiEmbedding/Presentation/MauiColorsViewModel.cs
similarity index 100%
rename from samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MauiColorsViewModel.cs
rename to samples/MauiEmbedding/MauiEmbedding/Presentation/MauiColorsViewModel.cs
diff --git a/samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MauiControlsPage.xaml b/samples/MauiEmbedding/MauiEmbedding/Presentation/MauiControlsPage.xaml
similarity index 100%
rename from samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MauiControlsPage.xaml
rename to samples/MauiEmbedding/MauiEmbedding/Presentation/MauiControlsPage.xaml
diff --git a/samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MauiControlsPage.xaml.cs b/samples/MauiEmbedding/MauiEmbedding/Presentation/MauiControlsPage.xaml.cs
similarity index 100%
rename from samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MauiControlsPage.xaml.cs
rename to samples/MauiEmbedding/MauiEmbedding/Presentation/MauiControlsPage.xaml.cs
diff --git a/samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MauiControlsViewModel.cs b/samples/MauiEmbedding/MauiEmbedding/Presentation/MauiControlsViewModel.cs
similarity index 100%
rename from samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MauiControlsViewModel.cs
rename to samples/MauiEmbedding/MauiEmbedding/Presentation/MauiControlsViewModel.cs
diff --git a/samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MauiEssentialsPage.xaml b/samples/MauiEmbedding/MauiEmbedding/Presentation/MauiEssentialsPage.xaml
similarity index 100%
rename from samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MauiEssentialsPage.xaml
rename to samples/MauiEmbedding/MauiEmbedding/Presentation/MauiEssentialsPage.xaml
diff --git a/samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MauiEssentialsPage.xaml.cs b/samples/MauiEmbedding/MauiEmbedding/Presentation/MauiEssentialsPage.xaml.cs
similarity index 100%
rename from samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MauiEssentialsPage.xaml.cs
rename to samples/MauiEmbedding/MauiEmbedding/Presentation/MauiEssentialsPage.xaml.cs
diff --git a/samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MauiEssentialsViewModel.cs b/samples/MauiEmbedding/MauiEmbedding/Presentation/MauiEssentialsViewModel.cs
similarity index 100%
rename from samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/MauiEssentialsViewModel.cs
rename to samples/MauiEmbedding/MauiEmbedding/Presentation/MauiEssentialsViewModel.cs
diff --git a/samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/TelerikControlsPage.xaml b/samples/MauiEmbedding/MauiEmbedding/Presentation/TelerikControlsPage.xaml
similarity index 100%
rename from samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/TelerikControlsPage.xaml
rename to samples/MauiEmbedding/MauiEmbedding/Presentation/TelerikControlsPage.xaml
diff --git a/samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/TelerikControlsPage.xaml.cs b/samples/MauiEmbedding/MauiEmbedding/Presentation/TelerikControlsPage.xaml.cs
similarity index 100%
rename from samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/TelerikControlsPage.xaml.cs
rename to samples/MauiEmbedding/MauiEmbedding/Presentation/TelerikControlsPage.xaml.cs
diff --git a/samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/TelerikControlsViewModel.cs b/samples/MauiEmbedding/MauiEmbedding/Presentation/TelerikControlsViewModel.cs
similarity index 100%
rename from samples/MauiEmbedding/MauiEmbedding/Presentation/Maui/TelerikControlsViewModel.cs
rename to samples/MauiEmbedding/MauiEmbedding/Presentation/TelerikControlsViewModel.cs

From 8ac4dab9ed4777e1720a8c48c2a60f30e3cbef93 Mon Sep 17 00:00:00 2001
From: Nick Randolph <nick@builttoroam.com>
Date: Fri, 28 Jul 2023 14:24:47 +1000
Subject: [PATCH 3/3] chore: Adding wasm target

---
 .../MauiEmbedding/Directory.Packages.props    |  5 ++
 .../MauiEmbedding.Mobile.csproj               |  4 +
 .../MauiEmbedding.Skia.Gtk.csproj             |  4 +
 .../MauiEmbedding.Wasm/LinkerConfig.xml       | 11 +++
 .../MauiEmbedding.Wasm.csproj                 | 75 ++++++++++++++++++
 .../MauiEmbedding.Wasm/Program.cs             | 13 ++++
 .../MauiEmbedding.Wasm/WasmCSS/Fonts.css      | 28 +++++++
 .../WasmScripts/AppManifest.js                |  3 +
 .../MauiEmbedding.Wasm/manifest.webmanifest   | 10 +++
 .../wwwroot/staticwebapp.config.json          | 30 +++++++
 .../MauiEmbedding.Wasm/wwwroot/web.config     | 78 +++++++++++++++++++
 samples/MauiEmbedding/MauiEmbedding.sln       | 31 ++++++++
 .../MauiEmbedding/MauiEmbedding.csproj        |  4 +-
 13 files changed, 294 insertions(+), 2 deletions(-)
 create mode 100644 samples/MauiEmbedding/MauiEmbedding.Wasm/LinkerConfig.xml
 create mode 100644 samples/MauiEmbedding/MauiEmbedding.Wasm/MauiEmbedding.Wasm.csproj
 create mode 100644 samples/MauiEmbedding/MauiEmbedding.Wasm/Program.cs
 create mode 100644 samples/MauiEmbedding/MauiEmbedding.Wasm/WasmCSS/Fonts.css
 create mode 100644 samples/MauiEmbedding/MauiEmbedding.Wasm/WasmScripts/AppManifest.js
 create mode 100644 samples/MauiEmbedding/MauiEmbedding.Wasm/manifest.webmanifest
 create mode 100644 samples/MauiEmbedding/MauiEmbedding.Wasm/wwwroot/staticwebapp.config.json
 create mode 100644 samples/MauiEmbedding/MauiEmbedding.Wasm/wwwroot/web.config

diff --git a/samples/MauiEmbedding/Directory.Packages.props b/samples/MauiEmbedding/Directory.Packages.props
index c53a1d5732..52d4140fb5 100644
--- a/samples/MauiEmbedding/Directory.Packages.props
+++ b/samples/MauiEmbedding/Directory.Packages.props
@@ -23,5 +23,10 @@
 		<PackageVersion Include="CommunityToolkit.Maui" Version="2.0.0" />
 		<PackageVersion Include="Telerik.UI.for.Maui" Version="5.1.0" Condition="$(_UseTelerik)" />
 		<PackageVersion Include="Esri.ArcGISRuntime.Maui" Version="200.1.0" />
+		<PackageVersion Include="Microsoft.Windows.Compatibility" Version="7.0.4" />
+		<PackageVersion Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.4.0" />
+		<PackageVersion Include="Uno.WinUI.WebAssembly" Version="5.0.0-dev.1610" />
+		<PackageVersion Include="Uno.Wasm.Bootstrap" Version="7.0.27" />
+		<PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="7.0.27" />
 	</ItemGroup>
 </Project>
diff --git a/samples/MauiEmbedding/MauiEmbedding.Mobile/MauiEmbedding.Mobile.csproj b/samples/MauiEmbedding/MauiEmbedding.Mobile/MauiEmbedding.Mobile.csproj
index 00b520193e..1ceb79e5a1 100644
--- a/samples/MauiEmbedding/MauiEmbedding.Mobile/MauiEmbedding.Mobile.csproj
+++ b/samples/MauiEmbedding/MauiEmbedding.Mobile/MauiEmbedding.Mobile.csproj
@@ -22,6 +22,10 @@
 		<!-- Required for C# Hot Reload -->
 		<UseInterpreter Condition="'$(Configuration)' == 'Debug' and $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) != 'maccatalyst'">True</UseInterpreter>
 		<IsUnoHead>true</IsUnoHead>
+		
+		<!-- TODO: Remove one issue fixed: https://github.com/unoplatform/uno.extensions-private/issues/78 -->
+		<!-- Note that the UnoDisableHotRestartHelperGeneration is inverted -->
+		<UnoDisableHotRestartHelperGeneration>false</UnoDisableHotRestartHelperGeneration>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/samples/MauiEmbedding/MauiEmbedding.Skia.Gtk/MauiEmbedding.Skia.Gtk.csproj b/samples/MauiEmbedding/MauiEmbedding.Skia.Gtk/MauiEmbedding.Skia.Gtk.csproj
index 76ef634c11..49eff4367b 100644
--- a/samples/MauiEmbedding/MauiEmbedding.Skia.Gtk/MauiEmbedding.Skia.Gtk.csproj
+++ b/samples/MauiEmbedding/MauiEmbedding.Skia.Gtk/MauiEmbedding.Skia.Gtk.csproj
@@ -1,4 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
+	<!-- This is only required because this project references Uno.Extensions.Maui.WinUI as a package reference (ie by source) -->
+	<Import Project="..\..\..\src\Uno.Extensions.Maui.UI\build\Package.props" />
+
 	<PropertyGroup>
 		<OutputType Condition="'$(Configuration)'=='Release'">WinExe</OutputType>
 		<OutputType Condition="'$(Configuration)'=='Debug'">Exe</OutputType>
@@ -22,4 +25,5 @@
 		<ProjectReference Include="..\MauiEmbedding\MauiEmbedding.csproj" />
 	</ItemGroup>
 	<Import Project="..\MauiEmbedding.Base\base.props" />
+	<Import Project="..\..\..\src\Uno.Extensions.Maui.UI\build\Package.targets" />
 </Project>
diff --git a/samples/MauiEmbedding/MauiEmbedding.Wasm/LinkerConfig.xml b/samples/MauiEmbedding/MauiEmbedding.Wasm/LinkerConfig.xml
new file mode 100644
index 0000000000..f5396732e4
--- /dev/null
+++ b/samples/MauiEmbedding/MauiEmbedding.Wasm/LinkerConfig.xml
@@ -0,0 +1,11 @@
+<linker>
+	<assembly fullname="MauiEmbedding" />
+	<assembly fullname="MauiEmbedding.Wasm" />
+
+	<!--
+  Uncomment this section when using JSON.NET
+  <assembly fullname="System.Core">
+	  <type fullname="System.Linq.Expressions*" />
+  </assembly>
+   -->
+</linker>
diff --git a/samples/MauiEmbedding/MauiEmbedding.Wasm/MauiEmbedding.Wasm.csproj b/samples/MauiEmbedding/MauiEmbedding.Wasm/MauiEmbedding.Wasm.csproj
new file mode 100644
index 0000000000..c8a36fe934
--- /dev/null
+++ b/samples/MauiEmbedding/MauiEmbedding.Wasm/MauiEmbedding.Wasm.csproj
@@ -0,0 +1,75 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+	<!-- This is only required because this project references Uno.Extensions.Maui.WinUI as a package reference (ie by source) -->
+	<Import Project="..\..\..\src\Uno.Extensions.Maui.UI\build\Package.props" />
+
+	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+		<TargetFramework>net7.0</TargetFramework>
+		<NoWarn>$(NoWarn);NU1504;NU1505;NU1701</NoWarn>
+		<!-- Disabled due to issue with Central Package Management with implicit using -->
+		<ImplicitUsings>disable</ImplicitUsings>
+		<WasmPWAManifestFile>manifest.webmanifest</WasmPWAManifestFile>
+		<AppDesignerFolder>Properties</AppDesignerFolder>
+		<!--
+			Supports Deep Linking Routes
+			https://aka.platform.uno/wasm-deeplink
+		-->
+		<WasmShellWebAppBasePath>/</WasmShellWebAppBasePath>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)'=='Debug'">
+		<MonoRuntimeDebuggerEnabled>true</MonoRuntimeDebuggerEnabled>
+		<DefineConstants>$(DefineConstants);TRACE;DEBUG</DefineConstants>
+		<DebugType>portable</DebugType>
+		<DebugSymbols>true</DebugSymbols>
+		<!--
+			IL Linking is disabled in Debug configuration.
+			When building in Release, see https://platform.uno/docs/articles/features/using-il-linker-WebAssembly.html
+		-->
+		<WasmShellILLinkerEnabled>false</WasmShellILLinkerEnabled>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)'=='Release'">
+		<!-- XAML Resource trimming https://aka.platform.uno/xaml-trimming -->
+		<!--<UnoXamlResourcesTrimming>true</UnoXamlResourcesTrimming>-->
+		<!-- Improve performance with AOT builds https://aka.platform.uno/wasm-aot -->
+		<!-- <WasmShellMonoRuntimeExecutionMode>InterpreterAndAOT</WasmShellMonoRuntimeExecutionMode> -->
+		<!-- Temporarily uncomment to generate an AOT profile https://aka.platform.uno/wasm-aot-profile -->
+		<!-- <WasmShellGenerateAOTProfile>true</WasmShellGenerateAOTProfile> -->
+	</PropertyGroup>
+	<ItemGroup>
+		<Content Include="manifest.webmanifest" />
+	</ItemGroup>
+	<ItemGroup>
+		<EmbeddedResource Include="WasmCSS\Fonts.css" />
+		<EmbeddedResource Include="WasmScripts\AppManifest.js" />
+	</ItemGroup>
+	<ItemGroup>
+		<LinkerDescriptor Include="LinkerConfig.xml" />
+	</ItemGroup>
+	<ItemGroup>
+		<!--
+		This item group is required by the project template because of the
+		new SDK-Style project, otherwise some files are not added automatically.
+
+		You can safely remove this ItemGroup completely.
+		-->
+		<None Include="Program.cs" />
+		<None Include="LinkerConfig.xml" />
+		<None Include="wwwroot\web.config" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Microsoft.Windows.Compatibility" />
+		<PackageReference Include="Uno.Wasm.Bootstrap" />
+		<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" />
+		<PackageReference Include="Uno.WinUI.WebAssembly" />
+		<PackageReference Include="Uno.WinUI.RemoteControl" Condition="'$(Configuration)'=='Debug'" />
+		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" />
+		<PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Console" />
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\MauiEmbedding\MauiEmbedding.csproj" />
+	</ItemGroup>
+	<Import Project="..\MauiEmbedding.Base\base.props" />
+	<Import Project="..\..\..\src\Uno.Extensions.Maui.UI\build\Package.targets" />
+</Project>
diff --git a/samples/MauiEmbedding/MauiEmbedding.Wasm/Program.cs b/samples/MauiEmbedding/MauiEmbedding.Wasm/Program.cs
new file mode 100644
index 0000000000..5c286eff0e
--- /dev/null
+++ b/samples/MauiEmbedding/MauiEmbedding.Wasm/Program.cs
@@ -0,0 +1,13 @@
+namespace MauiEmbedding.Wasm;
+
+public class Program
+{
+	private static App? _app;
+
+	public static int Main(string[] args)
+	{
+		Microsoft.UI.Xaml.Application.Start(_ => _app = new AppHead());
+
+		return 0;
+	}
+}
diff --git a/samples/MauiEmbedding/MauiEmbedding.Wasm/WasmCSS/Fonts.css b/samples/MauiEmbedding/MauiEmbedding.Wasm/WasmCSS/Fonts.css
new file mode 100644
index 0000000000..4fdd60555f
--- /dev/null
+++ b/samples/MauiEmbedding/MauiEmbedding.Wasm/WasmCSS/Fonts.css
@@ -0,0 +1,28 @@
+/**
+  When adding fonts here, make sure to add them using a base64 data uri, otherwise
+  fonts loading are delayed, and text may get displayed incorrectly.
+*/
+
+/* https://github.com/unoplatform/uno/issues/3954 */
+@font-face {
+  font-family: 'Segoe UI';
+  src: local('Segoe UI'), local('-apple-system'), local('BlinkMacSystemFont'), local('Inter'), local('Cantarell'), local('Ubuntu'), local('Roboto'), local('Open Sans'), local('Noto Sans'), local('Helvetica Neue'), local('sans-serif');
+}
+
+@font-face {
+  font-family: 'Roboto';
+  src: url(./Uno.Fonts.Roboto/Fonts/Roboto-Light.ttf) format('truetype');
+  font-weight: 300;
+}
+
+@font-face {
+  font-family: 'Roboto';
+  src: url(./Uno.Fonts.Roboto/Fonts/Roboto-Regular.ttf) format('truetype');
+  font-weight: 400;
+}
+
+@font-face {
+  font-family: 'Roboto';
+  src: url(./Uno.Fonts.Roboto/Fonts/Roboto-Medium.ttf) format('truetype');
+  font-weight: 500;
+}
diff --git a/samples/MauiEmbedding/MauiEmbedding.Wasm/WasmScripts/AppManifest.js b/samples/MauiEmbedding/MauiEmbedding.Wasm/WasmScripts/AppManifest.js
new file mode 100644
index 0000000000..480cdd2f2e
--- /dev/null
+++ b/samples/MauiEmbedding/MauiEmbedding.Wasm/WasmScripts/AppManifest.js
@@ -0,0 +1,3 @@
+var UnoAppManifest = {
+    displayName: "MauiEmbedding"
+}
diff --git a/samples/MauiEmbedding/MauiEmbedding.Wasm/manifest.webmanifest b/samples/MauiEmbedding/MauiEmbedding.Wasm/manifest.webmanifest
new file mode 100644
index 0000000000..eacf7b5d87
--- /dev/null
+++ b/samples/MauiEmbedding/MauiEmbedding.Wasm/manifest.webmanifest
@@ -0,0 +1,10 @@
+{
+  "background_color": "#ffffff",
+  "description": "MauiEmbedding",
+  "display": "standalone",
+  "name": "MauiEmbedding",
+  "short_name": "MauiEmbedding",
+  "start_url": "/index.html",
+  "theme_color": "#ffffff",
+  "scope": "/"
+}
diff --git a/samples/MauiEmbedding/MauiEmbedding.Wasm/wwwroot/staticwebapp.config.json b/samples/MauiEmbedding/MauiEmbedding.Wasm/wwwroot/staticwebapp.config.json
new file mode 100644
index 0000000000..79c1b17c4b
--- /dev/null
+++ b/samples/MauiEmbedding/MauiEmbedding.Wasm/wwwroot/staticwebapp.config.json
@@ -0,0 +1,30 @@
+{
+  "navigationFallback": {
+    "rewrite": "/index.html",
+    "exclude": [
+      "*.{css,js}",
+      "*.{png}",
+      "*.{c,h,wasm,clr,pdb,dat,txt}"
+    ]
+  },
+  "routes": [
+    {
+      "route": "/package_*",
+      "headers": {
+        "cache-control": "public, immutable, max-age=31536000"
+      }
+    },
+    {
+      "route": "/*.ttf",
+      "headers": {
+        "cache-control": "public, immutable, max-age=31536000"
+      }
+    },
+    {
+      "route": "/*",
+      "headers": {
+        "cache-control": "must-revalidate, max-age=3600"
+      }
+    }
+  ]
+}
diff --git a/samples/MauiEmbedding/MauiEmbedding.Wasm/wwwroot/web.config b/samples/MauiEmbedding/MauiEmbedding.Wasm/wwwroot/web.config
new file mode 100644
index 0000000000..8f5a860f5f
--- /dev/null
+++ b/samples/MauiEmbedding/MauiEmbedding.Wasm/wwwroot/web.config
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <system.web>
+    <customErrors mode="Off"/>
+  </system.web>
+
+  <system.webServer>
+
+    <!-- Disable compression as we're doing it through pre-compressed files -->
+    <urlCompression doStaticCompression="false" doDynamicCompression="false" dynamicCompressionBeforeCache="false" />
+
+    <staticContent>
+      <remove fileExtension=".dll" />
+      <remove fileExtension=".wasm" />
+      <remove fileExtension=".woff" />
+      <remove fileExtension=".woff2" />
+      <mimeMap fileExtension=".wasm" mimeType="application/wasm" />
+      <mimeMap fileExtension=".clr" mimeType="application/octet-stream" />
+      <mimeMap fileExtension=".pdb" mimeType="application/octet-stream" />
+      <mimeMap fileExtension=".woff" mimeType="application/font-woff" />
+      <mimeMap fileExtension=".woff2" mimeType="application/font-woff" />
+      <mimeMap fileExtension=".dat" mimeType="application/octet-stream" />
+      <!-- Required for PWAs -->
+      <mimeMap fileExtension=".json" mimeType="application/octet-stream" />
+    </staticContent>
+
+    <rewrite>
+      <rules>
+        <rule name="Lookup for pre-compressed brotli file" stopProcessing="true">
+          <match url="(.*)$"/>
+          <conditions>
+            <!-- Match brotli requests -->
+            <add input="{HTTP_ACCEPT_ENCODING}" pattern="br" />
+            
+            <!-- Match all but pre-compressed files -->
+            <add input="{REQUEST_URI}" pattern="^(?!/_compressed_br/)(.*)$" />
+
+            <!-- Check if the pre-compressed file exists on the disk -->
+            <add input="{DOCUMENT_ROOT}/_compressed_br/{C:0}" matchType="IsFile" negate="false" />
+          </conditions>
+          <action type="Rewrite" url="/_compressed_br{C:0}" />
+        </rule>
+
+        <rule name="Lookup for pre-compressed gzip file" stopProcessing="true">
+          <match url="(.*)$"/>
+          <conditions>
+            <!-- Match gzip requests -->
+            <add input="{HTTP_ACCEPT_ENCODING}" pattern="gzip" />
+            
+            <!-- Match all but pre-compressed files -->
+            <add input="{REQUEST_URI}" pattern="^(?!/_compressed_gz/)(.*)$" />
+            
+            <!-- Check if the pre-compressed file exists on the disk -->
+            <add input="{DOCUMENT_ROOT}/_compressed_gz/{C:0}" matchType="IsFile" negate="false" />
+          </conditions>
+          <action type="Rewrite" url="/_compressed_gz{C:0}" />
+        </rule>
+      </rules>
+
+      <outboundRules>
+        <rule name="Adjust content encoding for gzip pre-compressed files" enabled="true" stopProcessing="true">
+          <match serverVariable="RESPONSE_CONTENT_ENCODING" pattern="" />
+          <conditions>
+            <add input="{REQUEST_URI}" pattern="/_compressed_gz/.*$" />
+          </conditions>
+          <action type="Rewrite" value="gzip"/>
+        </rule>
+        <rule name="Adjust content encoding for brotli pre-compressed files" enabled="true" stopProcessing="true">
+          <match serverVariable="RESPONSE_CONTENT_ENCODING" pattern="" />
+          <conditions>
+            <add input="{REQUEST_URI}" pattern="/_compressed_br/.*$" />
+          </conditions>
+          <action type="Rewrite" value="br"/>
+        </rule>
+      </outboundRules>
+    </rewrite>
+  </system.webServer>
+</configuration>
diff --git a/samples/MauiEmbedding/MauiEmbedding.sln b/samples/MauiEmbedding/MauiEmbedding.sln
index 4cf09d3167..7e88176025 100644
--- a/samples/MauiEmbedding/MauiEmbedding.sln
+++ b/samples/MauiEmbedding/MauiEmbedding.sln
@@ -84,6 +84,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MauiApp1", "MauiProjects\Ma
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MauiEmbedding.Skia.Gtk", "MauiEmbedding.Skia.Gtk\MauiEmbedding.Skia.Gtk.csproj", "{00BAAAC1-9BA0-4F35-B7B6-5B4D64E45FAB}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MauiEmbedding.Wasm", "MauiEmbedding.Wasm\MauiEmbedding.Wasm.csproj", "{8BD5BF69-6C93-44BE-B31E-625636BD6423}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -906,6 +908,34 @@ Global
 		{00BAAAC1-9BA0-4F35-B7B6-5B4D64E45FAB}.Release|x64.Build.0 = Release|Any CPU
 		{00BAAAC1-9BA0-4F35-B7B6-5B4D64E45FAB}.Release|x86.ActiveCfg = Release|Any CPU
 		{00BAAAC1-9BA0-4F35-B7B6-5B4D64E45FAB}.Release|x86.Build.0 = Release|Any CPU
+		{8BD5BF69-6C93-44BE-B31E-625636BD6423}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8BD5BF69-6C93-44BE-B31E-625636BD6423}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8BD5BF69-6C93-44BE-B31E-625636BD6423}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{8BD5BF69-6C93-44BE-B31E-625636BD6423}.Debug|ARM.Build.0 = Debug|Any CPU
+		{8BD5BF69-6C93-44BE-B31E-625636BD6423}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{8BD5BF69-6C93-44BE-B31E-625636BD6423}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{8BD5BF69-6C93-44BE-B31E-625636BD6423}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{8BD5BF69-6C93-44BE-B31E-625636BD6423}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{8BD5BF69-6C93-44BE-B31E-625636BD6423}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{8BD5BF69-6C93-44BE-B31E-625636BD6423}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{8BD5BF69-6C93-44BE-B31E-625636BD6423}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8BD5BF69-6C93-44BE-B31E-625636BD6423}.Debug|x64.Build.0 = Debug|Any CPU
+		{8BD5BF69-6C93-44BE-B31E-625636BD6423}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8BD5BF69-6C93-44BE-B31E-625636BD6423}.Debug|x86.Build.0 = Debug|Any CPU
+		{8BD5BF69-6C93-44BE-B31E-625636BD6423}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8BD5BF69-6C93-44BE-B31E-625636BD6423}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8BD5BF69-6C93-44BE-B31E-625636BD6423}.Release|ARM.ActiveCfg = Release|Any CPU
+		{8BD5BF69-6C93-44BE-B31E-625636BD6423}.Release|ARM.Build.0 = Release|Any CPU
+		{8BD5BF69-6C93-44BE-B31E-625636BD6423}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{8BD5BF69-6C93-44BE-B31E-625636BD6423}.Release|ARM64.Build.0 = Release|Any CPU
+		{8BD5BF69-6C93-44BE-B31E-625636BD6423}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{8BD5BF69-6C93-44BE-B31E-625636BD6423}.Release|iPhone.Build.0 = Release|Any CPU
+		{8BD5BF69-6C93-44BE-B31E-625636BD6423}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{8BD5BF69-6C93-44BE-B31E-625636BD6423}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{8BD5BF69-6C93-44BE-B31E-625636BD6423}.Release|x64.ActiveCfg = Release|Any CPU
+		{8BD5BF69-6C93-44BE-B31E-625636BD6423}.Release|x64.Build.0 = Release|Any CPU
+		{8BD5BF69-6C93-44BE-B31E-625636BD6423}.Release|x86.ActiveCfg = Release|Any CPU
+		{8BD5BF69-6C93-44BE-B31E-625636BD6423}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -941,6 +971,7 @@ Global
 		{A158CC84-0219-4BE4-A3F2-7AB7F613855A} = {24511BF4-9869-4773-AF84-CC8F79AF5085}
 		{8577882E-DA52-4D27-A529-C70998034566} = {24511BF4-9869-4773-AF84-CC8F79AF5085}
 		{00BAAAC1-9BA0-4F35-B7B6-5B4D64E45FAB} = {1C130CF4-EEF4-44D9-9DEF-C037FE1C221B}
+		{8BD5BF69-6C93-44BE-B31E-625636BD6423} = {1C130CF4-EEF4-44D9-9DEF-C037FE1C221B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {584E156C-C094-4968-8A1F-3FB06081E34D}
diff --git a/samples/MauiEmbedding/MauiEmbedding/MauiEmbedding.csproj b/samples/MauiEmbedding/MauiEmbedding/MauiEmbedding.csproj
index 47c691cf6a..f92bf770c7 100644
--- a/samples/MauiEmbedding/MauiEmbedding/MauiEmbedding.csproj
+++ b/samples/MauiEmbedding/MauiEmbedding/MauiEmbedding.csproj
@@ -60,8 +60,8 @@
 	</Choose>
 
 	<ItemGroup Condition="!$(IsMauiEmbedding)">
-		<Compile Remove="Presentation\Maui\EsriMapsPage.xaml.cs"/>
-		<Page Remove="Presentation\Maui\EsriMapsPage.xaml"/>
+		<Compile Remove="Presentation\EsriMapsPage.xaml.cs"/>
+		<Page Remove="Presentation\EsriMapsPage.xaml"/>
 	</ItemGroup>
 
 	<ItemGroup>