feat: Drop uwp and switch to uno.sdk

2024-07-30 23:12:14 +10:00 · 2024-07-30 23:12:14 +10:00 · 2f03f61e2a
--- a/.github/workflows/azure-static-app.yml
+++ b/.github/workflows/azure-static-app.yml
@ -14,7 +14,7 @@ on:
 jobs:
  build_and_deploy_job:
    env:
-      DIST_PATH: testing/TestHarness/TestHarness.Wasm/bin/Release/net8.0/dist
+      DIST_PATH: testing/TestHarness/TestHarness/bin/Release/net8.0-browserwasm/dist

    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
    runs-on: ubuntu-latest
@ -44,8 +44,8 @@ jobs:
          dotnet-version: '7.0.x'

      - run: |
-          cd testing/TestHarness/TestHarness.Wasm
-          dotnet build -c Release "/p:Version=${{ steps.gitversion.outputs.fullSemVer }}" /p:UnoExtensionsDisableNet7=true /p:GeneratePackageOnBuild=false /detailedsummary
+          cd testing/TestHarness
+          dotnet build -c Release  /p:Build_Android=false /p:Build_iOS=false /p:Build_Windows=false /p:Build_Desktop=false "/p:Version=${{ steps.gitversion.outputs.fullSemVer }}" /p:GeneratePackageOnBuild=false /detailedsummary
      - uses: actions/upload-artifact@v3
        with:
          name: wasm-site
--- a/DebugPlatforms.props.sample
+++ b/DebugPlatforms.props.sample
@ -4,7 +4,9 @@
 	<PropertyGroup>
 		<!-- <Build_Android>false</Build_Android> -->
 		<!-- <Build_iOS>false</Build_iOS> -->
-		<!-- <Build_MacOS>false</Build_MacOS> -->
+		<!-- <Build_MacCatalyst>false</Build_MacCatalyst> -->
 		<!-- <Build_Windows>false</Build_Windows> -->
+		<!-- <Build_Desktop>false</Build_Desktop> -->
+		<!-- <Build_Web>false</Build_Web> -->
 	</PropertyGroup>
 </Project>
--- a/Directory.Build.props
+++ b/Directory.Build.props
@ -26,9 +26,11 @@
 	<PropertyGroup>
 		<Build_Android>true</Build_Android>
 		<Build_iOS>true</Build_iOS>
-		<Build_MacOS>true</Build_MacOS>
+		<Build_MacCatalyst>true</Build_MacCatalyst>
 		<Build_Windows  Condition="$([MSBuild]::IsOSPlatform('windows'))">true</Build_Windows>
 		<Build_Windows  Condition="!$([MSBuild]::IsOSPlatform('windows'))">false</Build_Windows>
+		<Build_Desktop>true</Build_Desktop>
+		<Build_Web>true</Build_Web>
 	</PropertyGroup>

 	<Import Project="DebugPlatforms.props" Condition="exists('DebugPlatforms.props')" />
@ -36,7 +38,7 @@
 	 <Target Name="Log disabled platforms" BeforeTargets="BeforeBuild">
        <Message Importance="high" Condition="!$(Build_Android)" Text="Android not included in build" />
        <Message Importance="high" Condition="!$(Build_iOS)" Text="iOS not included in build" />
-        <Message Importance="high" Condition="!$(Build_MacOS)" Text="MacOS not included in build" />
+        <Message Importance="high" Condition="!$(Build_MacCatalyst)" Text="MacOS not included in build" />
        <Message Importance="high" Condition="!$(Build_Windows)" Text="Windows not included in build" />
    </Target>
 </Project>
--- a/samples/MauiEmbedding/NuGet.config
+++ b/samples/MauiEmbedding/NuGet.config
--- a/build/ci/.azure-pipelines.yml
+++ b/build/ci/.azure-pipelines.yml
@ -45,14 +45,9 @@ stages:
  jobs:
  - template: stage-build-windows.yml
    parameters:
-      solution: testing/TestHarness/TestHarness-winui.slnf
+      solution: testing/TestHarness/TestHarness.sln
      solutionName: TestHarness_WinUI

-  - template: stage-build-windows.yml
-    parameters:
-      solution: testing/TestHarness/TestHarness-ui.slnf
-      solutionName: TestHarness_UI
-
  - template: stage-build-windows.yml
    parameters:
      solution: samples/Playground/Playground.sln
@ -71,5 +66,5 @@ stages:
  # Don't trigger this stage if only docs files are changed
  condition: ne(dependencies.Determine_Changes.outputs['evaluate_changes.DetermineChanges.docsOnly'], 'true')
  jobs:
-  - template: stage-build-uitests-wasm.yml
-  - template: stage-build-runtimetests-skia.yml
+  # - template: stage-build-uitests-wasm.yml
+  # - template: stage-build-runtimetests-skia.yml
--- a/build/ci/scripts/wasm-uitest-run.sh
+++ b/build/ci/scripts/wasm-uitest-run.sh
@ -11,17 +11,17 @@ export UNO_UITEST_PLATFORM=Browser
 export UNO_UITEST_CHROME_CONTAINER_MODE=true
 export UNO_UITEST_PROJECT=$BUILD_SOURCESDIRECTORY/testing/TestHarness/TestHarness.UITest
 export UNO_UITEST_LOGFILE=$BUILD_ARTIFACTSTAGINGDIRECTORY/screenshots/wasm/nunit-log.txt
-export UNO_UITEST_WASM_PROJECT=$BUILD_SOURCESDIRECTORY/testing/TestHarness/TestHarness.Wasm/TestHarness.Wasm.csproj
-export UNO_UITEST_WASM_OUTPUT_PATH=$BUILD_SOURCESDIRECTORY/testing/TestHarness/TestHarness.Wasm/bin/Release/net8.0/dist/
-export UNO_UITEST_WASM_PROJECT_BUILD_OPTIONS="/p:UnoExtensionsDisableNet7=true /p:GeneratePackageOnBuild=false"
+export UNO_UITEST_WASM_SOLUTION=$BUILD_SOURCESDIRECTORY/testing/TestHarness/TestHarness.sln
+export UNO_UITEST_WASM_PROJECT=$BUILD_SOURCESDIRECTORY/testing/TestHarness/TestHarness/TestHarness.csproj
+export UNO_UITEST_WASM_OUTPUT_PATH=$BUILD_SOURCESDIRECTORY/testing/TestHarness/TestHarness/bin/Release/net8.0-browserwasm/dist/
+export UNO_UITEST_WASM_PROJECT_BUILD_OPTIONS=" /p:Build_Android=false /p:Build_iOS=false /p:Build_Windows=false /p:Build_Desktop=false /p:GeneratePackageOnBuild=false"

 cd $BUILD_SOURCESDIRECTORY

-dotnet build -c Release $UNO_UITEST_PROJECT
-dotnet build -c Release $UNO_UITEST_WASM_PROJECT /p:IsUiAutomationMappingEnabled=True /p:UseWebAssemblyAOT=false /bl:$BIN_LOG_PATH $UNO_UITEST_WASM_PROJECT_BUILD_OPTIONS
+dotnet build -c Release $UNO_UITEST_WASM_SOLUTION /p:IsUiAutomationMappingEnabled=True /p:UseWebAssemblyAOT=false /p:Build_MacCatalyst=false /p:Build_Android=false /p:Build_iOS=false /p:Build_Windows=false /p:Build_Desktop=false /p:GeneratePackageOnBuild=false /bl:$BIN_LOG_PATH

 # Start the server
-dotnet run --project $UNO_UITEST_WASM_PROJECT -c Release --no-build &
+dotnet run --project $UNO_UITEST_WASM_PROJECT -f net8.0-browserwasm /p:Build_MacCatalyst=false /p:Build_Android=false /p:Build_iOS=false /p:Build_Windows=false /p:Build_Desktop=false  -c Release --no-build &

 cd $BUILD_SOURCESDIRECTORY/build

--- a/build/ci/stage-build-runtimetests-skia.yml
+++ b/build/ci/stage-build-runtimetests-skia.yml
@ -1,6 +1,6 @@
 jobs:
 - job: Skia_Tests
-  displayName: 'Runtime Tests - Skia GTK'
+  displayName: 'Runtime Tests - Skia Desktop'
  timeoutInMinutes: 60
  
  pool:
@ -8,9 +8,9 @@

  variables:
    NUGET_PACKAGES: $(build.sourcesdirectory)/.nuget
-    DotNetVersion: '8.0.100'
-    UnoCheck_Version: '1.17.0-dev.20'
-    UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/3b250f49b719d1cf5ab205f997c3959b5e9fed1d/manifests/uno.ui.manifest.json'
+    DotNetVersion: '8.0.301'
+    UnoCheck_Version: '1.23.0'
+    # UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/3b250f49b719d1cf5ab205f997c3959b5e9fed1d/manifests/uno.ui.manifest.json'

  steps:
  - checkout: self
@ -24,36 +24,36 @@
      
  - script: |
        dotnet tool install -g uno.check --version $(UnoCheck_Version) --add-source https://api.nuget.org/v3/index.json
-        uno-check --target skiagtk --fix --non-interactive --ci --manifest $(UnoCheck_Manifest)
+        uno-check --target skiagtk --fix --non-interactive --ci
    
    displayName: 'Run uno-check'    

-  - script: dotnet build Uno.Extensions.RuntimeTests.Skia.Gtk.csproj -c Debug -p:UnoTargetFrameworkOverride=net8.0 -p:GeneratePackageOnBuild=false -bl:$(Build.ArtifactStagingDirectory)/skia-gtk-runtime-test-build.binlog
-    displayName: 'Build Runtime Tests app (GTK)'
-    workingDirectory: $(Build.SourcesDirectory)/src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests.Skia.Gtk
+  - script: dotnet build Uno.Extensions-runtimetests.slnf /p:Build_Android=false /p:Build_iOS=false /p:Build_Windows=false /p:Build_MacCatalyst=false /p:Build_Web=false -c Debug -p:GeneratePackageOnBuild=false -bl:$(Build.ArtifactStagingDirectory)/skia-runtime-test-build.binlog
+    displayName: 'Build Runtime Tests app'
+    workingDirectory: $(Build.SourcesDirectory)/src

  - task: PublishBuildArtifacts@1
    displayName: Publish Build Logs
    retryCountOnTaskFailure: 3
    condition: always()
    inputs:
-      PathtoPublish: $(build.artifactstagingdirectory)/skia-gtk-runtime-test-build.binlog
+      PathtoPublish: $(build.artifactstagingdirectory)/skia-runtime-test-build.binlog
      ArtifactName: skia-runtime-test-build
      ArtifactType: Container

-  - script: xvfb-run --auto-servernum --server-args='-screen 0 1280x1024x24' dotnet Uno.Extensions.RuntimeTests.Skia.Gtk.dll
-    displayName: 'Run Runtime Tests (GTK)'
-    workingDirectory: $(Build.SourcesDirectory)/src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests.Skia.Gtk/bin/Debug/net8.0
+  - script: xvfb-run --auto-servernum --server-args='-screen 0 1280x1024x24' dotnet Uno.Extensions.RuntimeTests.dll
+    displayName: 'Run Runtime Tests'
+    workingDirectory: $(Build.SourcesDirectory)/src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests/bin/Debug/net8.0-desktop
    env:
      UNO_RUNTIME_TESTS_RUN_TESTS: '{}'
-      UNO_RUNTIME_TESTS_OUTPUT_PATH: '$(Common.TestResultsDirectory)/skia-gtk-runtime-tests-results.xml'
+      UNO_RUNTIME_TESTS_OUTPUT_PATH: '$(Common.TestResultsDirectory)/skia-runtime-tests-results.xml'

  - task: PublishTestResults@2
-    displayName: 'Publish GTK Runtime Tests Results'
+    displayName: 'Publish Runtime Tests Results'
    condition: always()
    retryCountOnTaskFailure: 3
    inputs:
-      testRunTitle: 'GTK Runtime Tests Run'
+      testRunTitle: 'Runtime Tests Run'
      testResultsFormat: 'NUnit'
-      testResultsFiles: '$(Common.TestResultsDirectory)/skia-gtk-runtime-tests-results.xml'
+      testResultsFiles: '$(Common.TestResultsDirectory)/skia-runtime-tests-results.xml'
      failTaskOnFailedTests: true 
--- a/build/ci/stage-build-wasm.yml
+++ b/build/ci/stage-build-wasm.yml
@ -25,12 +25,12 @@ jobs:
    displayName: Use GitVersion

  - script: |
-      dotnet build testing/TestHarness/TestHarness.Wasm/TestHarness.Wasm.csproj /p:Configuration=Release "/p:InformationalVersion=$(GITVERSION_InformationalVersion)" /p:UnoExtensionsDisableNet7=true /p:GeneratePackageOnBuild=false /detailedsummary /bl:$(build.artifactstagingdirectory)/testharness-wasm.binlog
+      dotnet build "testing/TestHarness/TestHarness.sln" /p:Build_Web=true /p:Build_Android=false /p:Build_MacCatalyst=false /p:Build_iOS=false /p:Build_Windows=false /p:Build_Desktop=false /p:Configuration=Release "/p:InformationalVersion=$(GITVERSION_InformationalVersion)" /p:GeneratePackageOnBuild=false /detailedsummary "/bl:$(build.artifactstagingdirectory)/testharness-wasm.binlog"

  - task: CopyFiles@2
    displayName: 'Publish Wasm Binaries'
    inputs:
-      SourceFolder: $(build.sourcesdirectory)/testing/TestHarness/TestHarness.Wasm/bin/Release/net8.0/dist
+      SourceFolder: $(build.sourcesdirectory)/testing/TestHarness/TestHarness/bin/Release/net8.0-browserwasm/dist
      Contents: '**/*.*'
      TargetFolder: $(build.artifactstagingdirectory)/Wasm
      CleanTargetFolder: false
--- a/build/ci/templates/dotnet-install-mac.yml
+++ b/build/ci/templates/dotnet-install-mac.yml
@ -1,7 +1,7 @@
 parameters:
-  DotNetVersion: '8.0.100'
-  UnoCheck_Version: '1.17.0-dev.20'
-  UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/3b250f49b719d1cf5ab205f997c3959b5e9fed1d/manifests/uno.ui.manifest.json'
+  DotNetVersion: '8.0.301'
+  UnoCheck_Version: '1.23.0'
+  # UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/3b250f49b719d1cf5ab205f997c3959b5e9fed1d/manifests/uno.ui.manifest.json'
  Dotnet_Root: '/usr/local/share/dotnet/'
  Dotnet_Tools: '~/.dotnet/tools'

@ -43,6 +43,6 @@ steps:

  - bash: |
      dotnet tool update --global uno.check --version ${{ parameters.UnoCheck_Version }} --add-source https://api.nuget.org/v3/index.json
-      uno-check --ci --non-interactive --fix --skip androidsdk --skip androidemulator --skip gtk3 --skip xcode --skip vswin --skip vsmac --manifest ${{ parameters.UnoCheck_Manifest }}
+      uno-check --ci --non-interactive --fix --skip androidsdk --skip androidemulator --skip gtk3 --skip xcode --skip vswin --skip vsmac
    displayName: Install .NET Workloads
    retryCountOnTaskFailure: 3
--- a/build/ci/templates/dotnet-install-windows.yml
+++ b/build/ci/templates/dotnet-install-windows.yml
@ -1,7 +1,7 @@
 parameters:
-  DotNetVersion: '8.0.100'
-  UnoCheck_Version: '1.17.0-dev.20'
-  UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/3b250f49b719d1cf5ab205f997c3959b5e9fed1d/manifests/uno.ui.manifest.json'
+  DotNetVersion: '8.0.301'
+  UnoCheck_Version: '1.23.0'
+  # UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/3b250f49b719d1cf5ab205f997c3959b5e9fed1d/manifests/uno.ui.manifest.json'

 steps:

@ -27,7 +27,7 @@ steps:

  - powershell: |
      & dotnet tool update --global uno.check --version ${{ parameters.UnoCheck_Version }} --add-source https://api.nuget.org/v3/index.json
-      & uno-check -v --ci --non-interactive --fix --skip xcode --skip gtk3 --skip vswin --skip vsmac --skip androidsdk --skip androidemulator --manifest ${{ parameters.UnoCheck_Manifest }}
+      & uno-check -v --ci --non-interactive --fix --skip xcode --skip gtk3 --skip vswin --skip vsmac --skip androidsdk --skip androidemulator
    displayName: Install .NET Workloads
    errorActionPreference: continue
    ignoreLASTEXITCODE: true
--- a/build/ci/templates/dotnet-install.yml
+++ b/build/ci/templates/dotnet-install.yml
@ -5,4 +5,4 @@ steps:
    retryCountOnTaskFailure: 3
    inputs:
      packageType: sdk
-      version: 8.0.100
+      version: 8.0.301
--- a/global.json
+++ b/global.json
@ -0,0 +1,6 @@
+{
+  "msbuild-sdks": {
+    "MSBuild.Sdk.Extras": "3.0.44",
+    "Uno.Sdk": "5.3.31"
+  }
+}
--- a/samples/MauiEmbedding/.vscode/launch.json
+++ b/samples/MauiEmbedding/.vscode/launch.json
@ -1,15 +0,0 @@
-{
-  // Use IntelliSense to find out which attributes exist for C# debugging
-  // Use hover for the description of the existing attributes
-  // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "name": "Uno Platform Mobile",
-      "type": "Uno",
-      "request": "launch",
-      // any Uno* task will do, this is simply to satisfy vscode requirement when a launch.json is present
-      "preLaunchTask": "Uno: android | Debug | android-x64"
-    },
-  ]
-}
--- a/samples/MauiEmbedding/Directory.Build.props
+++ b/samples/MauiEmbedding/Directory.Build.props
@ -1,60 +1,27 @@
 <Project>
-	<Import Project="../../src/maui-embedding.props" />
+	<Import Project="..\..\Directory.Build.props" />

-	<PropertyGroup>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
+  <PropertyGroup>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>

-		<DebugType>portable</DebugType>
-		<DebugSymbols>True</DebugSymbols>
+    <!--
+      Adding NoWarn to remove build warnings
+      NU1507: Warning when there are multiple package sources when using CPM with no source mapping
+      NETSDK1201: Warning that specifying RID won't create self containing app
+      PRI257: Ignore default language (en) not being one of the included resources (eg en-us, en-uk)
+    -->
+    <NoWarn>$(NoWarn);NU1507;NETSDK1201;PRI257</NoWarn>

-		<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-		<WarningsNotAsErrors>NU1009</WarningsNotAsErrors>
-		<NoWarn>$(NoWarn);CA1416;NU1507;NU1009</NoWarn>
+    <_UseTelerik>false</_UseTelerik>
+  </PropertyGroup>

-		<DefaultLanguage>en</DefaultLanguage>
-
-		<IsAndroid>false</IsAndroid>
-		<IsIOS>false</IsIOS>
-		<IsMac>false</IsMac>
-		<IsMacCatalyst>false</IsMacCatalyst>
-		<IsWinAppSdk>false</IsWinAppSdk>
-		<_UseTelerik>false</_UseTelerik>
-		<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-	</PropertyGroup>
-
-	<Choose>
-		<When Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
-			<PropertyGroup>
-				<IsAndroid>true</IsAndroid>
-				<SupportedOSPlatformVersion>21.0</SupportedOSPlatformVersion>
-			</PropertyGroup>
-		</When>
-		<When Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">
-			<PropertyGroup>
-				<IsIOS>true</IsIOS>
-				<SupportedOSPlatformVersion>14.2</SupportedOSPlatformVersion>
-			</PropertyGroup>
-		</When>
-		<When Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'macos'">
-			<PropertyGroup>
-				<IsMac>true</IsMac>
-				<SupportedOSPlatformVersion>10.14</SupportedOSPlatformVersion>
-			</PropertyGroup>
-		</When>
-		<When Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">
-			<PropertyGroup>
-				<IsMacCatalyst>true</IsMacCatalyst>
-				<SupportedOSPlatformVersion>14.0</SupportedOSPlatformVersion>
-			</PropertyGroup>
-		</When>
-		<When Condition="$(TargetFramework.Contains('windows10'))">
-			<PropertyGroup>
-				<IsWinAppSdk>true</IsWinAppSdk>
-				<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
-				<SupportedOSPlatformVersion>10.0.18362.0</SupportedOSPlatformVersion>
-				<TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
-			</PropertyGroup>
-		</When>
-	</Choose>
+  <!-- See https://aka.platform.uno/using-uno-sdk#implicit-packages for more information regarding the Implicit Packages version properties. -->
+  <!-- <PropertyGroup>
+    <UnoExtensionsVersion>4.1.24</UnoExtensionsVersion>
+    <UnoToolkitVersion>6.0.24</UnoToolkitVersion>
+    <UnoThemesVersion>5.0.13</UnoThemesVersion>
+    <UnoCSharpMarkupVersion>5.2.14</UnoCSharpMarkupVersion>
+  </PropertyGroup> -->
 </Project>
--- a/samples/MauiEmbedding/Directory.Build.targets
+++ b/samples/MauiEmbedding/Directory.Build.targets
@ -1,9 +1,2 @@
-<Project>
-	<ItemGroup>
-		<!-- Removes native usings to avoid Ambiguous reference -->
-		<Using Remove="@(Using->HasMetadata('Platform'))" />
-	</ItemGroup>
-
-	<Import Project="..\..\src\winappsdk-workaround.targets" Condition="exists('..\..\src\winappsdk-workaround.targets')" />
-
+<Project>
 </Project>
--- a/samples/MauiEmbedding/Directory.Packages.props
+++ b/samples/MauiEmbedding/Directory.Packages.props
@ -1,36 +1,53 @@
 <Project ToolsVersion="15.0">
-	<ItemGroup>
-		<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.2" />
-		<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
-		<PackageVersion Include="Microsoft.Maui.Controls" Version="8.0.3"/>
-		<PackageVersion Include="Microsoft.Maui.Controls.Compatibility"  Version="8.0.3"/>
-		<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" />
-		<PackageVersion Include="Microsoft.WindowsAppSDK" Version="$(WinAppSdkVersion)" />
-		<PackageVersion Include="SkiaSharp" Version="2.88.8" />
-		<PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.8" />
-		<PackageVersion Include="SkiaSharp.NativeAssets.iOS" Version="2.88.8" />
-		<PackageVersion Include="SkiaSharp.Skottie" Version="2.88.8" />
-		<PackageVersion Include="Syncfusion.Maui.Core" Version="22.2.9" />
-		<PackageVersion Include="Syncfusion.Maui.Charts" Version="22.2.9" />
-		<PackageVersion Include="Syncfusion.Maui.DataGrid" Version="22.2.9" />
-		<PackageVersion Include="Uno.Core.Extensions.Logging.Singleton" Version="4.1.1" />
-		<PackageVersion Include="Uno.Extensions.Logging.OSLog" Version="1.7.0" />
-		<PackageVersion Include="Uno.Material.WinUI" Version="5.0.13" />
+  <!--
+    To update the version of Uno, you should instead update the Sdk version in the global.json file.
+
+    See https://aka.platform.uno/using-uno-sdk for more information.
+  -->
+  <ItemGroup>
+    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.2" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
+    <!--<PackageVersion Include="Microsoft.Maui.Controls" Version="$(MauiVersion)"/>
+		<PackageVersion Include="Microsoft.Maui.Controls.Compatibility"  Version="$(MauiVersion)"/>-->
+    <!-- <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" />
+		<PackageVersion Include="Microsoft.WindowsAppSDK" Version="$(WinAppSdkVersion)" /> -->
+    <PackageVersion Include="SkiaSharp" Version="2.88.8" />
+    <PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.8" />
+    <PackageVersion Include="SkiaSharp.NativeAssets.iOS" Version="2.88.8" />
+    <PackageVersion Include="SkiaSharp.Skottie" Version="2.88.8" />
+    <PackageVersion Include="Syncfusion.Maui.Core" Version="22.2.9" />
+    <PackageVersion Include="Syncfusion.Maui.Charts" Version="22.2.9" />
+    <PackageVersion Include="Syncfusion.Maui.DataGrid" Version="22.2.9" />
+    <PackageVersion Include="Uno.Core.Extensions.Logging.Singleton" Version="4.1.1" />
+    <PackageVersion Include="Uno.Extensions.Logging.OSLog" Version="1.7.0" />
+    <!-- <PackageVersion Include="Uno.Material.WinUI" Version="5.0.13" />
 		<PackageVersion Include="Uno.Dsp.Tasks" Version="1.2.7" />
 		<PackageVersion Include="Uno.Toolkit.WinUI" Version="6.0.24" />
-		<PackageVersion Include="Uno.Toolkit.WinUI.Material" Version="6.0.24" />
-		<PackageVersion Include="Uno.Resizetizer" Version="1.2.0" />
-		<PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="$(UnoVersion)" />
-		<PackageVersion Include="Uno.UniversalImageLoader" Version="1.9.36" />
+		<PackageVersion Include="Uno.Toolkit.WinUI.Material" Version="6.0.24" />-->
+    <!--<PackageVersion Include="Uno.Resizetizer" Version="1.4.10" />-->
+    <PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="$(UnoVersion)" />
+    <!-- <PackageVersion Include="Uno.UniversalImageLoader" Version="1.9.36" />
 		<PackageVersion Include="Uno.WinUI" Version="$(UnoVersion)" />
 		<PackageVersion Include="Uno.WinUI.Skia.Gtk" Version="" />
-		<PackageVersion Include="Uno.WinUI.RemoteControl" Version="$(UnoVersion)" />
-		<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.7.0" />
-		<PackageVersion Include="Uno.WinUI.WebAssembly" Version="$(UnoVersion)" />
+		<PackageVersion Include="Uno.WinUI.RemoteControl" Version="$(UnoVersion)" /> -->
+    <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.7.0" />
+    <!-- <PackageVersion Include="Uno.WinUI.WebAssembly" Version="$(UnoVersion)" />
 		<PackageVersion Include="Uno.Wasm.Bootstrap" Version="8.0.16" />
-		<PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="8.0.16" />
-	</ItemGroup>
+		<PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="8.0.16" /> -->
+
+    <PackageVersion Include="Microsoft.Maui.Controls" Version="8.0.3" />
+    <PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.3" />
+    <PackageVersion Include="Microsoft.Maui.Graphics" Version="8.0.3"  />
+
+    <PackageVersion Include="Xamarin.AndroidX.Navigation.UI" Version="2.7.7.1" />
+    <PackageVersion Include="Xamarin.AndroidX.Navigation.Fragment" Version="2.7.7.1"/>
+    <PackageVersion Include="Xamarin.AndroidX.Navigation.Runtime" Version="2.7.7.1"/>
+    <PackageVersion Include="Xamarin.AndroidX.Navigation.Common" Version="2.7.7.1"/>
+    <PackageVersion Include="Xamarin.AndroidX.Collection" Version="1.4.0.1"/>
+    <PackageVersion Include="Xamarin.AndroidX.Collection.Ktx" Version="1.4.0.1" />
+    <PackageVersion Include="Xamarin.AndroidX.Collection.Jvm" Version="1.4.0.1" />
+  </ItemGroup>
 </Project>
--- a/samples/MauiEmbedding/MauiEmbedding.Base/AppHead.xaml
+++ b/samples/MauiEmbedding/MauiEmbedding.Base/AppHead.xaml
@ -1,17 +0,0 @@
-<local:App x:Class="MauiEmbedding.AppHead"
-			 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-			 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-			 xmlns:wasm="http://platform.uno/wasm"
-			 xmlns:local="using:MauiEmbedding"
-			 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-			 mc:Ignorable="wasm">
-
-	<local:App.Resources>
-		<ResourceDictionary>
-			<ResourceDictionary.MergedDictionaries>
-				<ResourceDictionary Source="ms-appx:///MauiEmbedding/AppResources.xaml" />
-			</ResourceDictionary.MergedDictionaries>
-		</ResourceDictionary>
-	</local:App.Resources>
-
-</local:App>
--- a/samples/MauiEmbedding/MauiEmbedding.Base/AppHead.xaml.cs
+++ b/samples/MauiEmbedding/MauiEmbedding.Base/AppHead.xaml.cs
@ -1,28 +0,0 @@
-using Microsoft.UI.Xaml;
-using Uno.Resizetizer;
-
-namespace MauiEmbedding;
-
-public sealed partial class AppHead : App
-{
-	/// <summary>
-	/// Initializes the singleton application object. This is the first line of authored code
-	/// executed, and as such is the logical equivalent of main() or WinMain().
-	/// </summary>
-	public AppHead()
-	{
-		this.InitializeComponent();
-	}
-
-	/// <summary>
-	/// Invoked when the application is launched normally by the end user.  Other entry points
-	/// will be used such as when the application is launched to open a specific file.
-	/// </summary>
-	/// <param name="args">Details about the launch request and process.</param>
-	protected override void OnLaunched(LaunchActivatedEventArgs args)
-	{
-		base.OnLaunched(args);
-
-		MainWindow.SetWindowIcon();
-	}
-}
--- a/samples/MauiEmbedding/MauiEmbedding.Base/base.props
+++ b/samples/MauiEmbedding/MauiEmbedding.Base/base.props
@ -1,26 +0,0 @@
-<Project>
-	<ItemGroup>
-		<PackageReference Include="Uno.Resizetizer" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<None Include="$(MSBuildThisFileDirectory)AppHead.xaml" />
-		<ApplicationDefinition Include="$(MSBuildThisFileDirectory)AppHead.xaml"
-								SubType="Designer"
-								XamlRuntime="WinUI"
-								Generator="MSBuild:Compile"
-								Link="AppHead.xaml" />
-		<Compile Include="$(MSBuildThisFileDirectory)AppHead.xaml.cs"
-				XamlRuntime="WinUI"
-				DependentUpon="AppHead.xaml"
-				Link="AppHead.xaml.cs" />
-		<UnoIcon Include="$(MSBuildThisFileDirectory)Icons\iconapp.svg"
-				ForegroundFile="$(MSBuildThisFileDirectory)Icons\appconfig.svg"
-				ForegroundScale="0.65"
-				Color="#00000000" />
-		<UnoSplashScreen
-			Include="$(MSBuildThisFileDirectory)Splash\splash_screen.svg"
-			BaseSize="128,128"
-			Color="#086AD1" />
-	</ItemGroup>
-</Project>
--- a/samples/MauiEmbedding/MauiEmbedding.MauiControls/MauiEmbedding.MauiControls.csproj
+++ b/samples/MauiEmbedding/MauiEmbedding.MauiControls/MauiEmbedding.MauiControls.csproj
@ -1,9 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="..\..\..\src\tfms-ui-maui.props" />
+  
 	<PropertyGroup>
-		<TargetFrameworks>net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
-		<UseMaui>true</UseMaui>
+
+    <UseMaui>true</UseMaui>
 		<SingleProject>true</SingleProject>
 		<ImplicitUsings>enable</ImplicitUsings>

--- a/samples/MauiEmbedding/MauiEmbedding.Mobile/Android/Main.Android.cs
+++ b/samples/MauiEmbedding/MauiEmbedding.Mobile/Android/Main.Android.cs
@ -1,45 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Android.App;
-using Android.Content;
-using Android.OS;
-using Android.Runtime;
-using Android.Views;
-using Android.Widget;
-using Com.Nostra13.Universalimageloader.Core;
-using Microsoft.UI.Xaml.Media;
-
-
-[assembly: Android.App.UsesPermission(Android.Manifest.Permission.BatteryStats)]
-namespace MauiEmbedding.Droid;
-
-[global::Android.App.ApplicationAttribute(
-	Label = "@string/ApplicationName",
-	Icon = "@mipmap/iconapp",
-	LargeHeap = true,
-	HardwareAccelerated = true,
-	Theme = "@style/AppTheme"
-)]
-public class Application : Microsoft.UI.Xaml.NativeApplication
-{
-	public Application(IntPtr javaReference, JniHandleOwnership transfer)
-		: base(() => new AppHead(), javaReference, transfer)
-	{
-		ConfigureUniversalImageLoader();
-	}
-
-	private static void ConfigureUniversalImageLoader()
-	{
-		// Create global configuration and initialize ImageLoader with this config
-		ImageLoaderConfiguration config = new ImageLoaderConfiguration
-			.Builder(Context)
-			.Build();
-
-		ImageLoader.Instance.Init(config);
-
-		ImageSource.DefaultImageLoader = ImageLoader.Instance.LoadImageAsync;
-	}
-}
-
--- a/samples/MauiEmbedding/MauiEmbedding.Mobile/MacCatalyst/Main.maccatalyst.cs
+++ b/samples/MauiEmbedding/MauiEmbedding.Mobile/MacCatalyst/Main.maccatalyst.cs
@ -1,14 +0,0 @@
-using UIKit;
-
-namespace MauiEmbedding.MacCatalyst;
-
-public class EntryPoint
-{
-	// This is the main entry point of the application.
-	public static void Main(string[] args)
-	{
-		// if you want to use a different Application Delegate class from "AppDelegate"
-		// you can specify it here.
-		UIApplication.Main(args, null, typeof(AppHead));
-	}
-}
--- a/samples/MauiEmbedding/MauiEmbedding.Mobile/MauiEmbedding.Mobile.csproj
+++ b/samples/MauiEmbedding/MauiEmbedding.Mobile/MauiEmbedding.Mobile.csproj
@ -1,90 +0,0 @@
-<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>
-		<TargetFrameworks>net8.0-ios;net8.0-android;net8.0-maccatalyst</TargetFrameworks>
-		<SingleProject>true</SingleProject>
-		<OutputType>Exe</OutputType>
-		<!-- Display name -->
-		<ApplicationTitle>MauiEmbedding</ApplicationTitle>
-		<!-- App Identifier -->
-		<ApplicationId>com.unoplatform.mauiembedding</ApplicationId>
-		<ApplicationIdGuid>58504DCB-2B66-4AAF-AE19-C19BB1292EC9</ApplicationIdGuid>
-		<!-- Versions -->
-		<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
-		<ApplicationVersion>1</ApplicationVersion>
-
-		<AndroidManifest>Android\AndroidManifest.xml</AndroidManifest>
-
-		<!-- Debugger workaround https://github.com/dotnet/maui-samples/blob/8aa6b8780b12e97b157514c3bdc54bb4a13001cd/HelloMacCatalyst/HelloMacCatalyst.csproj#L7 -->
-		<!-- <MtouchExtraArgs Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">$(MtouchExtraArgs) -setenv:MONO_THREADS_SUSPEND=preemptive</MtouchExtraArgs> -->
-		<!-- 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>
-		<PackageReference Include="Uno.WinUI" />
-		<PackageReference Include="CommunityToolkit.Mvvm" />
-		<PackageReference Include="Uno.Material.WinUI" />
-		<PackageReference Include="Uno.Toolkit.WinUI.Material" />
-		<PackageReference Include="Uno.Toolkit.WinUI" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Console" />
-		<PackageReference Include="Uno.Extensions.Logging.OSLog" />
-		<PackageReference Include="Telerik.UI.for.Maui" Condition="$(_UseTelerik)"/>
-		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" />
-		<!--<PackageReference Include="Uno.WinUI.RemoteControl" Condition="'$(Configuration)'=='Debug'" />-->
-	</ItemGroup>
-	<Choose>
-		<When Condition="$(IsAndroid)">
-			<ItemGroup>
-				<PackageReference Include="Uno.UniversalImageLoader" />
-			</ItemGroup>
-			<ItemGroup>
-				<AndroidEnvironment Include="Android/environment.conf" />
-			</ItemGroup>
-		</When>
-		<When Condition="$(IsIOS)">
-			<PropertyGroup>
-				<MtouchExtraArgs>$(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep</MtouchExtraArgs>
-				<!-- See https://github.com/unoplatform/uno/issues/9430 for more details. -->
-				<MtouchExtraArgs>$(MtouchExtraArgs) --registrar:static</MtouchExtraArgs>
-				<RuntimeIdentifier Condition="'$(RuntimeIdentifier)'==''">iossimulator-x64</RuntimeIdentifier>
-			</PropertyGroup>
-			<PropertyGroup Condition="'$(Configuration)'=='Release'">
-				<!-- https://github.com/xamarin/xamarin-macios/issues/14812 -->
-				<MtouchExtraArgs>$(MtouchExtraArgs) --marshal-objectivec-exceptions:disable</MtouchExtraArgs>
-			</PropertyGroup>
-			<ItemGroup>
-				<PackageReference Include="SkiaSharp" />
-				<PackageReference Include="SkiaSharp.Views.Uno.WinUI" />
-				<PackageReference Include="SkiaSharp.NativeAssets.iOS" />
-			</ItemGroup>
-		</When>
-		<When Condition="$(IsMacCatalyst)">
-			<PropertyGroup>
-				<!-- Configure the GC -->
-				<MtouchExtraArgs>$(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep</MtouchExtraArgs>
-				<!-- Required for unknown crash as of .NET 6 Mobile Preview 13 -->
-				<MtouchExtraArgs>$(MtouchExtraArgs) --registrar:static</MtouchExtraArgs>
-				<!-- Full globalization is required for Uno -->
-				<InvariantGlobalization>false</InvariantGlobalization>
-				<RuntimeIdentifier Condition="'$(RuntimeIdentifier)'==''">maccatalyst-x64</RuntimeIdentifier>
-			</PropertyGroup>
-			<PropertyGroup Condition="'$(Configuration)'=='Release'">
-				<!-- https://github.com/xamarin/xamarin-macios/issues/14812 -->
-				<MtouchExtraArgs>$(MtouchExtraArgs) --marshal-objectivec-exceptions:disable</MtouchExtraArgs>
-			</PropertyGroup>
-		</When>
-	</Choose>
-	<ItemGroup>
-		<ProjectReference Include="..\MauiEmbedding\MauiEmbedding.csproj" />
-	</ItemGroup>
-	<Import Project="..\MauiEmbedding.Base\base.props" />
-	<Import Project="..\..\..\src\Uno.Extensions.Maui.UI\build\Package.targets" />
-</Project>
--- a/samples/MauiEmbedding/MauiEmbedding.Mobile/iOS/Main.iOS.cs
+++ b/samples/MauiEmbedding/MauiEmbedding.Mobile/iOS/Main.iOS.cs
@ -1,14 +0,0 @@
-using UIKit;
-
-namespace MauiEmbedding.iOS;
-
-public class EntryPoint
-{
-	// This is the main entry point of the application.
-	public static void Main(string[] args)
-	{
-		// if you want to use a different Application Delegate class from "AppDelegate"
-		// you can specify it here.
-		UIApplication.Main(args, null, typeof(AppHead));
-	}
-}
--- a/samples/MauiEmbedding/MauiEmbedding.Windows/MauiEmbedding.Windows.csproj
+++ b/samples/MauiEmbedding/MauiEmbedding.Windows/MauiEmbedding.Windows.csproj
@ -1,83 +0,0 @@
-<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>WinExe</OutputType>
-		<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
-		<TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
-		<RootNamespace>MauiEmbedding.Windows</RootNamespace>
-		<ApplicationManifest>app.manifest</ApplicationManifest>
-		<Platforms>x86;x64;arm64</Platforms>
-		<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
-		<PublishProfile>win-$(Platform).pubxml</PublishProfile>
-		<UseWinUI>true</UseWinUI>
-		<EnableMsixTooling>true</EnableMsixTooling>
-		<!-- Uncomment for Unpackaged builds -->
-		<!-- <WindowsPackageType>None</WindowsPackageType> -->
-		<!-- For Unpackaged builds, change version of SDK to previous stable release https://github.com/microsoft/WindowsAppSDK/issues/3591 -->
-	</PropertyGroup>
-	<PropertyGroup>
-		<!-- Bundles the WinAppSDK binaries (Uncomment for unpackaged builds) -->
-		<!-- <WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained> -->
-		<!-- <SelfContained>true</SelfContained> -->
-	</PropertyGroup>
-
-	<ItemGroup>
-		<Content Include="Images\**" />
-		<Manifest Include="$(ApplicationManifest)" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<PackageReference Include="Uno.WinUI" />
-		<PackageReference Include="Microsoft.WindowsAppSDK" />
-		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
-		<PackageReference Include="CommunityToolkit.Mvvm" />
-		<PackageReference Include="Uno.Material.WinUI" />
-		<PackageReference Include="Uno.Toolkit.WinUI.Material" />
-		<PackageReference Include="Uno.Toolkit.WinUI" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Console" />
-		<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" />
-		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<!--
-		If you encounter this error message:
-
-			error NETSDK1148: A referenced assembly was compiled using a newer version of Microsoft.Windows.SDK.NET.dll.
-			Please update to a newer .NET SDK in order to reference this assembly.
-
-		This means that the two packages below must be aligned with the "build" version number of
-		the "Microsoft.Windows.SDK.BuildTools" package above, and the "revision" version number
-		must be the highest found in https://www.nuget.org/packages/Microsoft.Windows.SDK.NET.Ref.
-		-->
-		<!-- <FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.22621.28" />
-		<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.22621.28" /> -->
-	</ItemGroup>
-
-	<ItemGroup>
-		<ProjectReference Include="..\MauiEmbedding\MauiEmbedding.csproj" />
-	</ItemGroup>
-
-	<!--
-		Defining the "Msix" ProjectCapability here allows the Single-project MSIX Packaging
-		Tools extension to be activated for this project even if the Windows App SDK Nuget
-		package has not yet been restored.
-	-->
-	<ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
-		<ProjectCapability Include="Msix"/>
-	</ItemGroup>
-
-	<!--
-		Defining the "HasPackageAndPublishMenuAddedByProject" property here allows the Solution
-		Explorer "Package and Publish" context menu entry to be enabled for this project even if
-		the Windows App SDK Nuget package has not yet been restored.
-	-->
-	<PropertyGroup Condition="'$(DisableHasPackageAndPublishMenuAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
-		<HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>
-	</PropertyGroup>
-
-	<Import Project="..\MauiEmbedding.Base\base.props" />
-	<Import Project="..\..\..\src\Uno.Extensions.Maui.UI\build\Package.targets" />
-</Project>
--- a/samples/MauiEmbedding/MauiEmbedding.Windows/Package.appxmanifest
+++ b/samples/MauiEmbedding/MauiEmbedding.Windows/Package.appxmanifest
@ -1,43 +0,0 @@
-<?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=Uno Platform"
-		Version="1.0.0.0" />
-
-	<Properties>
-		<DisplayName>MauiEmbedding</DisplayName>
-		<PublisherDisplayName>Uno Platform</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>
--- a/samples/MauiEmbedding/MauiEmbedding.Windows/Properties/PublishProfiles/win-arm64.pubxml
+++ b/samples/MauiEmbedding/MauiEmbedding.Windows/Properties/PublishProfiles/win-arm64.pubxml
@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121.
-->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <PublishProtocol>FileSystem</PublishProtocol>
-    <Platform>arm64</Platform>
-    <RuntimeIdentifier>win-arm64</RuntimeIdentifier>
-    <PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
-    <SelfContained>true</SelfContained>
-    <PublishSingleFile>False</PublishSingleFile>
-    <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
-    <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
-   <!-- 
-    See https://github.com/microsoft/CsWinRT/issues/373
-    <PublishTrimmed>True</PublishTrimmed>
-    -->
-  </PropertyGroup>
-</Project>
--- a/samples/MauiEmbedding/MauiEmbedding.Windows/Properties/PublishProfiles/win-x64.pubxml
+++ b/samples/MauiEmbedding/MauiEmbedding.Windows/Properties/PublishProfiles/win-x64.pubxml
@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121.
-->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <PublishProtocol>FileSystem</PublishProtocol>
-    <Platform>x64</Platform>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-    <PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
-    <SelfContained>true</SelfContained>
-    <PublishSingleFile>False</PublishSingleFile>
-    <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
-    <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
-   <!-- 
-    See https://github.com/microsoft/CsWinRT/issues/373
-    <PublishTrimmed>True</PublishTrimmed>
-    -->
-  </PropertyGroup>
-</Project>
--- a/samples/MauiEmbedding/MauiEmbedding.Windows/Properties/PublishProfiles/win-x86.pubxml
+++ b/samples/MauiEmbedding/MauiEmbedding.Windows/Properties/PublishProfiles/win-x86.pubxml
@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121.
-->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <PublishProtocol>FileSystem</PublishProtocol>
-    <Platform>x86</Platform>
-    <RuntimeIdentifier>win-x86</RuntimeIdentifier>
-    <PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
-    <SelfContained>true</SelfContained>
-    <PublishSingleFile>False</PublishSingleFile>
-    <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
-    <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
-   <!-- 
-    See https://github.com/microsoft/CsWinRT/issues/373
-    <PublishTrimmed>True</PublishTrimmed>
-    -->
-  </PropertyGroup>
-</Project>
--- a/samples/MauiEmbedding/MauiEmbedding.Windows/Properties/launchSettings.json
+++ b/samples/MauiEmbedding/MauiEmbedding.Windows/Properties/launchSettings.json
@ -1,7 +0,0 @@
-{
-  "profiles": {
-    "MauiEmbedding.Windows (Package)": {
-      "commandName": "MsixPackage"
-    }
-  }
-}
--- a/samples/MauiEmbedding/MauiEmbedding.Windows/Resources.lang-en-us.resw
+++ b/samples/MauiEmbedding/MauiEmbedding.Windows/Resources.lang-en-us.resw
@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Placeholder" xml:space="preserve">
-    <value>Hello World!</value>
-  </data>
-</root>
--- a/samples/MauiEmbedding/MauiEmbedding.Windows/app.manifest
+++ b/samples/MauiEmbedding/MauiEmbedding.Windows/app.manifest
@ -1,25 +0,0 @@
-<?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.Windows.app"/>
-
-	<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-		<application>
-			<!--The ID below informs the system that this application is compatible with OS features first introduced in Windows 8. 
-      For more info see https://docs.microsoft.com/windows/win32/sysinfo/targeting-your-application-at-windows-8-1 
-      
-      It is also necessary to support features in unpackaged applications, for example the custom titlebar implementation.-->
-			<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />
-		</application>
-	</compatibility>
-
-	<application xmlns="urn:schemas-microsoft-com:asm.v3">
-		<windowsSettings>
-			<!-- The combination of below two tags have the following effect:
-           1) Per-Monitor for >= Windows 10 Anniversary Update
-           2) System < Windows 10 Anniversary Update
-      -->
-			<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>
-</assembly>
--- a/samples/MauiEmbedding/MauiEmbedding.sln
+++ b/samples/MauiEmbedding/MauiEmbedding.sln
@ -5,21 +5,13 @@ VisualStudioVersion = 17.2.32210.308
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Source", "Source", "{D958D411-DCBD-4FBF-828F-FDD7059862EA}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platforms", "Platforms", "{1C130CF4-EEF4-44D9-9DEF-C037FE1C221B}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MauiEmbedding", "MauiEmbedding\MauiEmbedding.csproj", "{9A77D6D1-608D-4409-A0D9-FDD8AEF3BCC5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MauiEmbedding.Mobile", "MauiEmbedding.Mobile\MauiEmbedding.Mobile.csproj", "{ECE58AAC-4F80-4C00-B700-232713088962}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MauiEmbedding.Windows", "MauiEmbedding.Windows\MauiEmbedding.Windows.csproj", "{DC95E667-9456-4F12-BE0C-2C7F601F7259}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BADA71DC-7FFD-4EDC-9F28-FB74AEADC713}"
 	ProjectSection(SolutionItems) = preProject
-		MauiEmbedding.Base\base.props = MauiEmbedding.Base\base.props
 		Directory.Build.props = Directory.Build.props
 		Directory.Build.targets = Directory.Build.targets
 		Directory.Packages.props = Directory.Packages.props
-		global.json = global.json
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{9B9F35D5-E6DD-4FC7-9198-F8246D3CE366}"
@ -58,19 +50,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Storage", ".
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Serialization", "..\..\src\Uno.Extensions.Serialization\Uno.Extensions.Serialization.csproj", "{55DB6D52-3E70-465E-86C4-EDD45E84149D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Logging.WinUI.Skia", "..\..\src\Uno.Extensions.Logging\Uno.Extensions.Logging.WinUI.Skia.csproj", "{521D1D95-8E04-4CE1-9941-31B8247CDFEF}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Logging.WinUI.Wasm", "..\..\src\Uno.Extensions.Logging\Uno.Extensions.Logging.WinUI.Wasm.csproj", "{353174B7-F26F-455B-9B42-DC750037315D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Hosting.WinUI.Skia", "..\..\src\Uno.Extensions.Hosting.UI\Uno.Extensions.Hosting.WinUI.Skia.csproj", "{32BD5829-65A9-406E-97D8-752556E23B2B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Hosting.WinUI.Wasm", "..\..\src\Uno.Extensions.Hosting.UI\Uno.Extensions.Hosting.WinUI.Wasm.csproj", "{8493BB1F-62E7-4E18-92A6-4DD5635DCA32}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions Items", "Extensions Items", "{9F4A5914-3D10-4CDE-829C-BE53A9E441DB}"
 	ProjectSection(SolutionItems) = preProject
 		..\..\src\Directory.Build.props = ..\..\src\Directory.Build.props
 		..\..\src\Directory.Build.targets = ..\..\src\Directory.Build.targets
 		..\..\src\Directory.Packages.props = ..\..\src\Directory.Packages.props
+		..\..\global.json = ..\..\global.json
+		..\..\NuGet.config = ..\..\NuGet.config
 		..\..\src\tfms-ui-maui.props = ..\..\src\tfms-ui-maui.props
 	EndProjectSection
 EndProject
@ -122,82 +108,6 @@ Global
 		{9A77D6D1-608D-4409-A0D9-FDD8AEF3BCC5}.Release|x64.Build.0 = Release|Any CPU
 		{9A77D6D1-608D-4409-A0D9-FDD8AEF3BCC5}.Release|x86.ActiveCfg = Release|Any CPU
 		{9A77D6D1-608D-4409-A0D9-FDD8AEF3BCC5}.Release|x86.Build.0 = Release|Any CPU
-		{ECE58AAC-4F80-4C00-B700-232713088962}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ECE58AAC-4F80-4C00-B700-232713088962}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ECE58AAC-4F80-4C00-B700-232713088962}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{ECE58AAC-4F80-4C00-B700-232713088962}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{ECE58AAC-4F80-4C00-B700-232713088962}.Debug|ARM.Build.0 = Debug|Any CPU
-		{ECE58AAC-4F80-4C00-B700-232713088962}.Debug|ARM.Deploy.0 = Debug|Any CPU
-		{ECE58AAC-4F80-4C00-B700-232713088962}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{ECE58AAC-4F80-4C00-B700-232713088962}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{ECE58AAC-4F80-4C00-B700-232713088962}.Debug|ARM64.Deploy.0 = Debug|Any CPU
-		{ECE58AAC-4F80-4C00-B700-232713088962}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{ECE58AAC-4F80-4C00-B700-232713088962}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{ECE58AAC-4F80-4C00-B700-232713088962}.Debug|iPhone.Deploy.0 = Debug|Any CPU
-		{ECE58AAC-4F80-4C00-B700-232713088962}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{ECE58AAC-4F80-4C00-B700-232713088962}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{ECE58AAC-4F80-4C00-B700-232713088962}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
-		{ECE58AAC-4F80-4C00-B700-232713088962}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{ECE58AAC-4F80-4C00-B700-232713088962}.Debug|x64.Build.0 = Debug|Any CPU
-		{ECE58AAC-4F80-4C00-B700-232713088962}.Debug|x64.Deploy.0 = Debug|Any CPU
-		{ECE58AAC-4F80-4C00-B700-232713088962}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{ECE58AAC-4F80-4C00-B700-232713088962}.Debug|x86.Build.0 = Debug|Any CPU
-		{ECE58AAC-4F80-4C00-B700-232713088962}.Debug|x86.Deploy.0 = Debug|Any CPU
-		{ECE58AAC-4F80-4C00-B700-232713088962}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ECE58AAC-4F80-4C00-B700-232713088962}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ECE58AAC-4F80-4C00-B700-232713088962}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{ECE58AAC-4F80-4C00-B700-232713088962}.Release|ARM.ActiveCfg = Release|Any CPU
-		{ECE58AAC-4F80-4C00-B700-232713088962}.Release|ARM.Build.0 = Release|Any CPU
-		{ECE58AAC-4F80-4C00-B700-232713088962}.Release|ARM.Deploy.0 = Release|Any CPU
-		{ECE58AAC-4F80-4C00-B700-232713088962}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{ECE58AAC-4F80-4C00-B700-232713088962}.Release|ARM64.Build.0 = Release|Any CPU
-		{ECE58AAC-4F80-4C00-B700-232713088962}.Release|ARM64.Deploy.0 = Release|Any CPU
-		{ECE58AAC-4F80-4C00-B700-232713088962}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{ECE58AAC-4F80-4C00-B700-232713088962}.Release|iPhone.Build.0 = Release|Any CPU
-		{ECE58AAC-4F80-4C00-B700-232713088962}.Release|iPhone.Deploy.0 = Release|Any CPU
-		{ECE58AAC-4F80-4C00-B700-232713088962}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{ECE58AAC-4F80-4C00-B700-232713088962}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{ECE58AAC-4F80-4C00-B700-232713088962}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
-		{ECE58AAC-4F80-4C00-B700-232713088962}.Release|x64.ActiveCfg = Release|Any CPU
-		{ECE58AAC-4F80-4C00-B700-232713088962}.Release|x64.Build.0 = Release|Any CPU
-		{ECE58AAC-4F80-4C00-B700-232713088962}.Release|x64.Deploy.0 = Release|Any CPU
-		{ECE58AAC-4F80-4C00-B700-232713088962}.Release|x86.ActiveCfg = Release|Any CPU
-		{ECE58AAC-4F80-4C00-B700-232713088962}.Release|x86.Build.0 = Release|Any CPU
-		{ECE58AAC-4F80-4C00-B700-232713088962}.Release|x86.Deploy.0 = Release|Any CPU
-		{DC95E667-9456-4F12-BE0C-2C7F601F7259}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{DC95E667-9456-4F12-BE0C-2C7F601F7259}.Debug|Any CPU.Build.0 = Debug|x64
-		{DC95E667-9456-4F12-BE0C-2C7F601F7259}.Debug|Any CPU.Deploy.0 = Debug|x64
-		{DC95E667-9456-4F12-BE0C-2C7F601F7259}.Debug|ARM.ActiveCfg = Debug|x64
-		{DC95E667-9456-4F12-BE0C-2C7F601F7259}.Debug|ARM.Build.0 = Debug|x64
-		{DC95E667-9456-4F12-BE0C-2C7F601F7259}.Debug|ARM.Deploy.0 = Debug|x64
-		{DC95E667-9456-4F12-BE0C-2C7F601F7259}.Debug|ARM64.ActiveCfg = Debug|arm64
-		{DC95E667-9456-4F12-BE0C-2C7F601F7259}.Debug|ARM64.Build.0 = Debug|arm64
-		{DC95E667-9456-4F12-BE0C-2C7F601F7259}.Debug|ARM64.Deploy.0 = Debug|arm64
-		{DC95E667-9456-4F12-BE0C-2C7F601F7259}.Debug|iPhone.ActiveCfg = Debug|x64
-		{DC95E667-9456-4F12-BE0C-2C7F601F7259}.Debug|iPhone.Build.0 = Debug|x64
-		{DC95E667-9456-4F12-BE0C-2C7F601F7259}.Debug|iPhone.Deploy.0 = Debug|x64
-		{DC95E667-9456-4F12-BE0C-2C7F601F7259}.Debug|iPhoneSimulator.ActiveCfg = Debug|x64
-		{DC95E667-9456-4F12-BE0C-2C7F601F7259}.Debug|iPhoneSimulator.Build.0 = Debug|x64
-		{DC95E667-9456-4F12-BE0C-2C7F601F7259}.Debug|iPhoneSimulator.Deploy.0 = Debug|x64
-		{DC95E667-9456-4F12-BE0C-2C7F601F7259}.Debug|x64.ActiveCfg = Debug|x64
-		{DC95E667-9456-4F12-BE0C-2C7F601F7259}.Debug|x64.Build.0 = Debug|x64
-		{DC95E667-9456-4F12-BE0C-2C7F601F7259}.Debug|x86.ActiveCfg = Debug|x86
-		{DC95E667-9456-4F12-BE0C-2C7F601F7259}.Debug|x86.Build.0 = Debug|x86
-		{DC95E667-9456-4F12-BE0C-2C7F601F7259}.Release|Any CPU.ActiveCfg = Release|x64
-		{DC95E667-9456-4F12-BE0C-2C7F601F7259}.Release|Any CPU.Build.0 = Release|x64
-		{DC95E667-9456-4F12-BE0C-2C7F601F7259}.Release|Any CPU.Deploy.0 = Release|x64
-		{DC95E667-9456-4F12-BE0C-2C7F601F7259}.Release|ARM.ActiveCfg = Release|x64
-		{DC95E667-9456-4F12-BE0C-2C7F601F7259}.Release|ARM.Build.0 = Release|x64
-		{DC95E667-9456-4F12-BE0C-2C7F601F7259}.Release|ARM64.ActiveCfg = Release|arm64
-		{DC95E667-9456-4F12-BE0C-2C7F601F7259}.Release|ARM64.Build.0 = Release|arm64
-		{DC95E667-9456-4F12-BE0C-2C7F601F7259}.Release|iPhone.ActiveCfg = Release|x64
-		{DC95E667-9456-4F12-BE0C-2C7F601F7259}.Release|iPhone.Build.0 = Release|x64
-		{DC95E667-9456-4F12-BE0C-2C7F601F7259}.Release|iPhoneSimulator.ActiveCfg = Release|x64
-		{DC95E667-9456-4F12-BE0C-2C7F601F7259}.Release|iPhoneSimulator.Build.0 = Release|x64
-		{DC95E667-9456-4F12-BE0C-2C7F601F7259}.Release|x64.ActiveCfg = Release|x64
-		{DC95E667-9456-4F12-BE0C-2C7F601F7259}.Release|x64.Build.0 = Release|x64
-		{DC95E667-9456-4F12-BE0C-2C7F601F7259}.Release|x86.ActiveCfg = Release|x86
-		{DC95E667-9456-4F12-BE0C-2C7F601F7259}.Release|x86.Build.0 = Release|x86
 		{E979B964-15B6-47A1-9ABC-7A2CAB2286E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E979B964-15B6-47A1-9ABC-7A2CAB2286E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E979B964-15B6-47A1-9ABC-7A2CAB2286E9}.Debug|ARM.ActiveCfg = Debug|Any CPU
@ -674,118 +584,6 @@ Global
 		{55DB6D52-3E70-465E-86C4-EDD45E84149D}.Release|x64.Build.0 = Release|Any CPU
 		{55DB6D52-3E70-465E-86C4-EDD45E84149D}.Release|x86.ActiveCfg = Release|Any CPU
 		{55DB6D52-3E70-465E-86C4-EDD45E84149D}.Release|x86.Build.0 = Release|Any CPU
-		{521D1D95-8E04-4CE1-9941-31B8247CDFEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{521D1D95-8E04-4CE1-9941-31B8247CDFEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{521D1D95-8E04-4CE1-9941-31B8247CDFEF}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{521D1D95-8E04-4CE1-9941-31B8247CDFEF}.Debug|ARM.Build.0 = Debug|Any CPU
-		{521D1D95-8E04-4CE1-9941-31B8247CDFEF}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{521D1D95-8E04-4CE1-9941-31B8247CDFEF}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{521D1D95-8E04-4CE1-9941-31B8247CDFEF}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{521D1D95-8E04-4CE1-9941-31B8247CDFEF}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{521D1D95-8E04-4CE1-9941-31B8247CDFEF}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{521D1D95-8E04-4CE1-9941-31B8247CDFEF}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{521D1D95-8E04-4CE1-9941-31B8247CDFEF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{521D1D95-8E04-4CE1-9941-31B8247CDFEF}.Debug|x64.Build.0 = Debug|Any CPU
-		{521D1D95-8E04-4CE1-9941-31B8247CDFEF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{521D1D95-8E04-4CE1-9941-31B8247CDFEF}.Debug|x86.Build.0 = Debug|Any CPU
-		{521D1D95-8E04-4CE1-9941-31B8247CDFEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{521D1D95-8E04-4CE1-9941-31B8247CDFEF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{521D1D95-8E04-4CE1-9941-31B8247CDFEF}.Release|ARM.ActiveCfg = Release|Any CPU
-		{521D1D95-8E04-4CE1-9941-31B8247CDFEF}.Release|ARM.Build.0 = Release|Any CPU
-		{521D1D95-8E04-4CE1-9941-31B8247CDFEF}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{521D1D95-8E04-4CE1-9941-31B8247CDFEF}.Release|ARM64.Build.0 = Release|Any CPU
-		{521D1D95-8E04-4CE1-9941-31B8247CDFEF}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{521D1D95-8E04-4CE1-9941-31B8247CDFEF}.Release|iPhone.Build.0 = Release|Any CPU
-		{521D1D95-8E04-4CE1-9941-31B8247CDFEF}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{521D1D95-8E04-4CE1-9941-31B8247CDFEF}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{521D1D95-8E04-4CE1-9941-31B8247CDFEF}.Release|x64.ActiveCfg = Release|Any CPU
-		{521D1D95-8E04-4CE1-9941-31B8247CDFEF}.Release|x64.Build.0 = Release|Any CPU
-		{521D1D95-8E04-4CE1-9941-31B8247CDFEF}.Release|x86.ActiveCfg = Release|Any CPU
-		{521D1D95-8E04-4CE1-9941-31B8247CDFEF}.Release|x86.Build.0 = Release|Any CPU
-		{353174B7-F26F-455B-9B42-DC750037315D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{353174B7-F26F-455B-9B42-DC750037315D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{353174B7-F26F-455B-9B42-DC750037315D}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{353174B7-F26F-455B-9B42-DC750037315D}.Debug|ARM.Build.0 = Debug|Any CPU
-		{353174B7-F26F-455B-9B42-DC750037315D}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{353174B7-F26F-455B-9B42-DC750037315D}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{353174B7-F26F-455B-9B42-DC750037315D}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{353174B7-F26F-455B-9B42-DC750037315D}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{353174B7-F26F-455B-9B42-DC750037315D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{353174B7-F26F-455B-9B42-DC750037315D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{353174B7-F26F-455B-9B42-DC750037315D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{353174B7-F26F-455B-9B42-DC750037315D}.Debug|x64.Build.0 = Debug|Any CPU
-		{353174B7-F26F-455B-9B42-DC750037315D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{353174B7-F26F-455B-9B42-DC750037315D}.Debug|x86.Build.0 = Debug|Any CPU
-		{353174B7-F26F-455B-9B42-DC750037315D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{353174B7-F26F-455B-9B42-DC750037315D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{353174B7-F26F-455B-9B42-DC750037315D}.Release|ARM.ActiveCfg = Release|Any CPU
-		{353174B7-F26F-455B-9B42-DC750037315D}.Release|ARM.Build.0 = Release|Any CPU
-		{353174B7-F26F-455B-9B42-DC750037315D}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{353174B7-F26F-455B-9B42-DC750037315D}.Release|ARM64.Build.0 = Release|Any CPU
-		{353174B7-F26F-455B-9B42-DC750037315D}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{353174B7-F26F-455B-9B42-DC750037315D}.Release|iPhone.Build.0 = Release|Any CPU
-		{353174B7-F26F-455B-9B42-DC750037315D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{353174B7-F26F-455B-9B42-DC750037315D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{353174B7-F26F-455B-9B42-DC750037315D}.Release|x64.ActiveCfg = Release|Any CPU
-		{353174B7-F26F-455B-9B42-DC750037315D}.Release|x64.Build.0 = Release|Any CPU
-		{353174B7-F26F-455B-9B42-DC750037315D}.Release|x86.ActiveCfg = Release|Any CPU
-		{353174B7-F26F-455B-9B42-DC750037315D}.Release|x86.Build.0 = Release|Any CPU
-		{32BD5829-65A9-406E-97D8-752556E23B2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{32BD5829-65A9-406E-97D8-752556E23B2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{32BD5829-65A9-406E-97D8-752556E23B2B}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{32BD5829-65A9-406E-97D8-752556E23B2B}.Debug|ARM.Build.0 = Debug|Any CPU
-		{32BD5829-65A9-406E-97D8-752556E23B2B}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{32BD5829-65A9-406E-97D8-752556E23B2B}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{32BD5829-65A9-406E-97D8-752556E23B2B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{32BD5829-65A9-406E-97D8-752556E23B2B}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{32BD5829-65A9-406E-97D8-752556E23B2B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{32BD5829-65A9-406E-97D8-752556E23B2B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{32BD5829-65A9-406E-97D8-752556E23B2B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{32BD5829-65A9-406E-97D8-752556E23B2B}.Debug|x64.Build.0 = Debug|Any CPU
-		{32BD5829-65A9-406E-97D8-752556E23B2B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{32BD5829-65A9-406E-97D8-752556E23B2B}.Debug|x86.Build.0 = Debug|Any CPU
-		{32BD5829-65A9-406E-97D8-752556E23B2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{32BD5829-65A9-406E-97D8-752556E23B2B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{32BD5829-65A9-406E-97D8-752556E23B2B}.Release|ARM.ActiveCfg = Release|Any CPU
-		{32BD5829-65A9-406E-97D8-752556E23B2B}.Release|ARM.Build.0 = Release|Any CPU
-		{32BD5829-65A9-406E-97D8-752556E23B2B}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{32BD5829-65A9-406E-97D8-752556E23B2B}.Release|ARM64.Build.0 = Release|Any CPU
-		{32BD5829-65A9-406E-97D8-752556E23B2B}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{32BD5829-65A9-406E-97D8-752556E23B2B}.Release|iPhone.Build.0 = Release|Any CPU
-		{32BD5829-65A9-406E-97D8-752556E23B2B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{32BD5829-65A9-406E-97D8-752556E23B2B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{32BD5829-65A9-406E-97D8-752556E23B2B}.Release|x64.ActiveCfg = Release|Any CPU
-		{32BD5829-65A9-406E-97D8-752556E23B2B}.Release|x64.Build.0 = Release|Any CPU
-		{32BD5829-65A9-406E-97D8-752556E23B2B}.Release|x86.ActiveCfg = Release|Any CPU
-		{32BD5829-65A9-406E-97D8-752556E23B2B}.Release|x86.Build.0 = Release|Any CPU
-		{8493BB1F-62E7-4E18-92A6-4DD5635DCA32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8493BB1F-62E7-4E18-92A6-4DD5635DCA32}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8493BB1F-62E7-4E18-92A6-4DD5635DCA32}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{8493BB1F-62E7-4E18-92A6-4DD5635DCA32}.Debug|ARM.Build.0 = Debug|Any CPU
-		{8493BB1F-62E7-4E18-92A6-4DD5635DCA32}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{8493BB1F-62E7-4E18-92A6-4DD5635DCA32}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{8493BB1F-62E7-4E18-92A6-4DD5635DCA32}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{8493BB1F-62E7-4E18-92A6-4DD5635DCA32}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{8493BB1F-62E7-4E18-92A6-4DD5635DCA32}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{8493BB1F-62E7-4E18-92A6-4DD5635DCA32}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{8493BB1F-62E7-4E18-92A6-4DD5635DCA32}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8493BB1F-62E7-4E18-92A6-4DD5635DCA32}.Debug|x64.Build.0 = Debug|Any CPU
-		{8493BB1F-62E7-4E18-92A6-4DD5635DCA32}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8493BB1F-62E7-4E18-92A6-4DD5635DCA32}.Debug|x86.Build.0 = Debug|Any CPU
-		{8493BB1F-62E7-4E18-92A6-4DD5635DCA32}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8493BB1F-62E7-4E18-92A6-4DD5635DCA32}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8493BB1F-62E7-4E18-92A6-4DD5635DCA32}.Release|ARM.ActiveCfg = Release|Any CPU
-		{8493BB1F-62E7-4E18-92A6-4DD5635DCA32}.Release|ARM.Build.0 = Release|Any CPU
-		{8493BB1F-62E7-4E18-92A6-4DD5635DCA32}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{8493BB1F-62E7-4E18-92A6-4DD5635DCA32}.Release|ARM64.Build.0 = Release|Any CPU
-		{8493BB1F-62E7-4E18-92A6-4DD5635DCA32}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{8493BB1F-62E7-4E18-92A6-4DD5635DCA32}.Release|iPhone.Build.0 = Release|Any CPU
-		{8493BB1F-62E7-4E18-92A6-4DD5635DCA32}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{8493BB1F-62E7-4E18-92A6-4DD5635DCA32}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{8493BB1F-62E7-4E18-92A6-4DD5635DCA32}.Release|x64.ActiveCfg = Release|Any CPU
-		{8493BB1F-62E7-4E18-92A6-4DD5635DCA32}.Release|x64.Build.0 = Release|Any CPU
-		{8493BB1F-62E7-4E18-92A6-4DD5635DCA32}.Release|x86.ActiveCfg = Release|Any CPU
-		{8493BB1F-62E7-4E18-92A6-4DD5635DCA32}.Release|x86.Build.0 = Release|Any CPU
 		{2608CAF0-E84A-4C35-9206-59906AE4E079}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2608CAF0-E84A-4C35-9206-59906AE4E079}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2608CAF0-E84A-4C35-9206-59906AE4E079}.Debug|ARM.ActiveCfg = Debug|Any CPU
@ -819,10 +617,7 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{1C130CF4-EEF4-44D9-9DEF-C037FE1C221B} = {D958D411-DCBD-4FBF-828F-FDD7059862EA}
 		{9A77D6D1-608D-4409-A0D9-FDD8AEF3BCC5} = {D958D411-DCBD-4FBF-828F-FDD7059862EA}
-		{ECE58AAC-4F80-4C00-B700-232713088962} = {1C130CF4-EEF4-44D9-9DEF-C037FE1C221B}
-		{DC95E667-9456-4F12-BE0C-2C7F601F7259} = {1C130CF4-EEF4-44D9-9DEF-C037FE1C221B}
 		{E979B964-15B6-47A1-9ABC-7A2CAB2286E9} = {9B9F35D5-E6DD-4FC7-9198-F8246D3CE366}
 		{73A0899C-7167-45A6-9A02-C258E731C63C} = {9B9F35D5-E6DD-4FC7-9198-F8246D3CE366}
 		{32584367-89CC-4AC8-A11B-11970D4ADC4D} = {9B9F35D5-E6DD-4FC7-9198-F8246D3CE366}
@ -840,10 +635,6 @@ Global
 		{3E84B7A1-D829-46AE-9E95-55E691FA7328} = {9B9F35D5-E6DD-4FC7-9198-F8246D3CE366}
 		{84B26485-ACDE-46A4-BA02-D50C51FA1C71} = {9B9F35D5-E6DD-4FC7-9198-F8246D3CE366}
 		{55DB6D52-3E70-465E-86C4-EDD45E84149D} = {9B9F35D5-E6DD-4FC7-9198-F8246D3CE366}
-		{521D1D95-8E04-4CE1-9941-31B8247CDFEF} = {9B9F35D5-E6DD-4FC7-9198-F8246D3CE366}
-		{353174B7-F26F-455B-9B42-DC750037315D} = {9B9F35D5-E6DD-4FC7-9198-F8246D3CE366}
-		{32BD5829-65A9-406E-97D8-752556E23B2B} = {9B9F35D5-E6DD-4FC7-9198-F8246D3CE366}
-		{8493BB1F-62E7-4E18-92A6-4DD5635DCA32} = {9B9F35D5-E6DD-4FC7-9198-F8246D3CE366}
 		{9F4A5914-3D10-4CDE-829C-BE53A9E441DB} = {9B9F35D5-E6DD-4FC7-9198-F8246D3CE366}
 		{2608CAF0-E84A-4C35-9206-59906AE4E079} = {D958D411-DCBD-4FBF-828F-FDD7059862EA}
 	EndGlobalSection
--- a/samples/MauiEmbedding/MauiEmbedding/App.cs
+++ b/samples/MauiEmbedding/MauiEmbedding/App.cs
@ -1,88 +0,0 @@
-using MauiEmbedding.MauiControls;
-
-namespace MauiEmbedding;
-
-public class App : Application
-{
-	protected Window? MainWindow { get; private set; }
-	protected IHost? Host { get; private set; }
-
-	protected async override void OnLaunched(LaunchActivatedEventArgs args)
-	{
-		var builder = this.CreateBuilder(args)
-			// Add navigation support for toolkit controls such as TabBar and NavigationView
-			.UseToolkitNavigation()
-			.UseMauiEmbedding<MauiControls.App>(maui => maui.UseCustomLibrary())
-			.Configure(host => host
-#if DEBUG
-				// Switch to Development environment when running in DEBUG
-				.UseEnvironment(Environments.Development)
-#endif
-				.UseLogging(configure: (context, logBuilder) =>
-				{
-					// Configure log levels for different categories of logging
-					logBuilder
-						.SetMinimumLevel(
-							context.HostingEnvironment.IsDevelopment() ?
-								LogLevel.Information :
-								LogLevel.Warning)
-
-						// Default filters for core Uno Platform namespaces
-						.CoreLogLevel(LogLevel.Warning);
-
-					// Uno Platform namespace filter groups
-					// Uncomment individual methods to see more detailed logging
-					//// Generic Xaml events
-					//logBuilder.XamlLogLevel(LogLevel.Debug);
-					//// Layouter specific messages
-					//logBuilder.XamlLayoutLogLevel(LogLevel.Debug);
-					//// Storage messages
-					//logBuilder.StorageLogLevel(LogLevel.Debug);
-					//// Binding related messages
-					//logBuilder.XamlBindingLogLevel(LogLevel.Debug);
-					//// Binder memory references tracking
-					//logBuilder.BinderMemoryReferenceLogLevel(LogLevel.Debug);
-					//// RemoteControl and HotReload related
-					//logBuilder.HotReloadCoreLogLevel(LogLevel.Information);
-					//// Debug JS interop
-					//logBuilder.WebAssemblyLogLevel(LogLevel.Debug);
-
-				}, enableUnoLogging: true)
-				.UseConfiguration(configure: configBuilder =>
-					configBuilder
-						.EmbeddedSource<App>()
-						.Section<AppConfig>()
-				)
-				// Enable localization (see appsettings.json for supported languages)
-				.UseLocalization()
-				.ConfigureServices((context, services) =>
-				{
-					// TODO: Register your services
-					//services.AddSingleton<IMyService, MyService>();
-				})
-				.UseNavigation(RegisterRoutes)
-			);
-		MainWindow = builder.Window;
-
-		Host = await builder.NavigateAsync<Shell>();
-
-		//MainWindow.Content = new MainPage();
-	}
-
-	private static void RegisterRoutes(IViewRegistry views, IRouteRegistry routes)
-	{
-		views.Register(
-			new ViewMap(ViewModel: typeof(ShellViewModel)),
-			new ViewMap<MainPage, MainViewModel>()
-		);
-
-		routes.Register(
-			new RouteMap("", View: views.FindByViewModel<ShellViewModel>(),
-				Nested: new RouteMap[]
-				{
-					new RouteMap("Main", View: views.FindByViewModel<MainViewModel>()),
-				}
-			)
-		);
-	}
-}
--- a/samples/MauiEmbedding/MauiEmbedding/App.xaml
+++ b/samples/MauiEmbedding/MauiEmbedding/App.xaml
@ -0,0 +1,19 @@
+<Application x:Class="MauiEmbedding.App"
+       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+       xmlns:utum="using:Uno.Toolkit.UI.Material">
+
+  <Application.Resources>
+    <ResourceDictionary>
+      <ResourceDictionary.MergedDictionaries>
+<!-- Load WinUI resources -->
+		<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
+		<MaterialToolkitTheme xmlns="using:Uno.Toolkit.UI.Material"
+			ColorOverrideSource="ms-appx:///Styles/ColorPaletteOverride.xaml"
+			FontOverrideSource="ms-appx:///Styles/MaterialFontsOverride.xaml" />
+      </ResourceDictionary.MergedDictionaries>
+    </ResourceDictionary>
+  </Application.Resources>
+  <!-- Add resources here -->
+
+</Application>
--- a/samples/MauiEmbedding/MauiEmbedding/App.xaml.cs
+++ b/samples/MauiEmbedding/MauiEmbedding/App.xaml.cs
@ -0,0 +1,97 @@
+using MauiEmbedding.MauiControls;
+
+namespace MauiEmbedding;
+public partial class App : Application
+{
+    /// <summary>
+    /// Initializes the singleton application object. This is the first line of authored code
+    /// executed, and as such is the logical equivalent of main() or WinMain().
+    /// </summary>
+    public App()
+    {
+        this.InitializeComponent();
+    }
+
+    protected Window? MainWindow { get; private set; }
+
+    protected IHost? Host { get; private set; }
+
+    protected async override void OnLaunched(LaunchActivatedEventArgs args)
+    {
+        var builder = this.CreateBuilder(args)
+            // Add navigation support for toolkit controls such as TabBar and NavigationView
+            .UseToolkitNavigation()
+            .UseMauiEmbedding<MauiControls.App>(maui => maui.UseCustomLibrary())
+            .Configure(host => host
+#if DEBUG
+                // Switch to Development environment when running in DEBUG
+                .UseEnvironment(Environments.Development)
+#endif
+                .UseLogging(configure: (context, logBuilder) =>
+                {
+                    // Configure log levels for different categories of logging
+                    logBuilder
+                        .SetMinimumLevel(
+                            context.HostingEnvironment.IsDevelopment() ?
+                                LogLevel.Information :
+                                LogLevel.Warning)
+
+                        // Default filters for core Uno Platform namespaces
+                        .CoreLogLevel(LogLevel.Warning);
+
+                    // Uno Platform namespace filter groups
+                    // Uncomment individual methods to see more detailed logging
+                    //// Generic Xaml events
+                    //logBuilder.XamlLogLevel(LogLevel.Debug);
+                    //// Layouter specific messages
+                    //logBuilder.XamlLayoutLogLevel(LogLevel.Debug);
+                    //// Storage messages
+                    //logBuilder.StorageLogLevel(LogLevel.Debug);
+                    //// Binding related messages
+                    //logBuilder.XamlBindingLogLevel(LogLevel.Debug);
+                    //// Binder memory references tracking
+                    //logBuilder.BinderMemoryReferenceLogLevel(LogLevel.Debug);
+                    //// RemoteControl and HotReload related
+                    //logBuilder.HotReloadCoreLogLevel(LogLevel.Information);
+                    //// Debug JS interop
+                    //logBuilder.WebAssemblyLogLevel(LogLevel.Debug);
+
+                }, enableUnoLogging: true)
+                .UseConfiguration(configure: configBuilder =>
+                    configBuilder
+                        .EmbeddedSource<App>()
+                        .Section<AppConfig>()
+                )
+                // Enable localization (see appsettings.json for supported languages)
+                .UseLocalization()
+                .ConfigureServices((context, services) =>
+                {
+                    // TODO: Register your services
+                    //services.AddSingleton<IMyService, MyService>();
+                })
+                .UseNavigation(RegisterRoutes)
+            );
+        MainWindow = builder.Window;
+
+        Host = await builder.NavigateAsync<Shell>();
+
+        //MainWindow.Content = new MainPage();
+    }
+
+    private static void RegisterRoutes(IViewRegistry views, IRouteRegistry routes)
+    {
+        views.Register(
+            new ViewMap(ViewModel: typeof(ShellViewModel)),
+            new ViewMap<MainPage, MainViewModel>()
+        );
+
+        routes.Register(
+            new RouteMap("", View: views.FindByViewModel<ShellViewModel>(),
+                Nested: new RouteMap[]
+                {
+                    new RouteMap("Main", View: views.FindByViewModel<MainViewModel>()),
+                }
+            )
+        );
+    }
+}
--- a/samples/MauiEmbedding/MauiEmbedding.Base/Icons/iconapp.svg
+++ b/samples/MauiEmbedding/MauiEmbedding.Base/Icons/iconapp.svg
@ -5,7 +5,7 @@
   viewBox="0 0 456 456"
   version="1.1"
   id="svg453"
-   sodipodi:docname="iconapp.old.svg"
+   sodipodi:docname="icon.svg"
   inkscape:version="1.2 (dc2aedaf03, 2022-05-15)"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
--- a/samples/MauiEmbedding/MauiEmbedding/Assets/Icons/icon_foreground.svg
+++ b/samples/MauiEmbedding/MauiEmbedding/Assets/Icons/icon_foreground.svg
@ -5,7 +5,7 @@
   viewBox="0 0 50.369617 49.826836"
   version="1.1"
   id="svg151"
-   sodipodi:docname="appconfig.svg"
+   sodipodi:docname="icon_foreground.svg"
   inkscape:version="1.2 (dc2aedaf03, 2022-05-15)"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
--- a/samples/MauiEmbedding/MauiEmbedding/Assets/Splash/splash_screen.svg
+++ b/samples/MauiEmbedding/MauiEmbedding/Assets/Splash/splash_screen.svg
@ -5,7 +5,7 @@
   viewBox="0 0 50.369617 49.826836"
   version="1.1"
   id="svg151"
-   sodipodi:docname="appconfig.svg"
+   sodipodi:docname="icon_foreground.svg"
   inkscape:version="1.2 (dc2aedaf03, 2022-05-15)"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
--- a/samples/MauiEmbedding/MauiEmbedding/MauiEmbedding.csproj
+++ b/samples/MauiEmbedding/MauiEmbedding/MauiEmbedding.csproj
@ -1,69 +1,51 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<!-- This is only included because the project references Uno.Extensions.Maui.UI as project reference -->
-	<Import Project="..\..\..\src\Uno.Extensions.Maui.UI\build\Package.props" />
+<Project Sdk="Uno.Sdk">
+	<Import Project="..\..\..\src\tfms-ui-maui.props" />

-	<PropertyGroup>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) or '$(EnableWindowsTargeting)' == 'true'">$(TargetFrameworks);net8.0-windows10.0.19041</TargetFrameworks>
-		<TargetFrameworks>$(TargetFrameworks);net8.0;net8.0-ios;net8.0-android;net8.0-maccatalyst</TargetFrameworks>
+  <PropertyGroup>
+  
+    <OutputType>Exe</OutputType>
+    <UnoSingleProject>true</UnoSingleProject>
+
+    <!-- Display name -->
+    <ApplicationTitle>MauiEmbedding</ApplicationTitle>
+    <!-- App Identifier -->
+    <ApplicationId>com.companyname.MauiEmbedding</ApplicationId>
+    <!-- Versions -->
+    <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
+    <ApplicationVersion>1</ApplicationVersion>
+    <!--
+      If you encounter this error message:
+
+        error NETSDK1148: A referenced assembly was compiled using a newer version of Microsoft.Windows.SDK.NET.dll.
+        Please update to a newer .NET SDK in order to reference this assembly.
+
+      This means that the two packages below must be aligned with the "build" version number of
+      the "Microsoft.Windows.SDK.BuildTools" package above, and the "revision" version number
+      must be the highest found in https://www.nuget.org/packages/Microsoft.Windows.SDK.NET.Ref.
+    -->
+    <!-- <WindowsSdkPackageVersion>10.0.22621.28</WindowsSdkPackageVersion> -->
+
+    <!--
+      UnoFeatures let's you quickly add and manage implicit package references based on the features you want to use.
+      https://aka.platform.uno/singleproject-features
+    -->
+    <UnoFeatures>
+      Material;
+      Dsp;
+      Toolkit;
+      Mvvm;
+      ThemeService;
+    </UnoFeatures>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Uno.Core.Extensions.Logging.Singleton"/>
+  </ItemGroup>

-		<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
-		<GenerateLibraryLayout>true</GenerateLibraryLayout>
-		<IsMauiEmbedding Condition="'$(IsMauiEmbedding)'==''">false</IsMauiEmbedding>
-	</PropertyGroup>

 	<ItemGroup>
-		<PackageReference Include="Uno.Dsp.Tasks" />
-		<PackageReference Include="Uno.WinUI" />
-		<PackageReference Include="Uno.Resizetizer" />
-		<PackageReference Include="CommunityToolkit.Mvvm" />
-		<PackageReference Include="Uno.Material.WinUI" />
-		<PackageReference Include="Uno.Toolkit.WinUI.Material" />
-		<PackageReference Include="Uno.Toolkit.WinUI" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Console" />
-	</ItemGroup>
-
-	<Choose>
-		<When Condition="$(IsWinAppSdk)">
-			<PropertyGroup>
-				<!--
-				If you encounter this error message:
-
-					error NETSDK1148: A referenced assembly was compiled using a newer version of Microsoft.Windows.SDK.NET.dll.
-					Please update to a newer .NET SDK in order to reference this assembly.
-
-				This means that the two packages below must be aligned with the "build" version number of
-				the "Microsoft.Windows.SDK.BuildTools" package above, and the "revision" version number
-				must be the highest found in https://www.nuget.org/packages/Microsoft.Windows.SDK.NET.Ref.
-				-->
-				<!-- <WindowsSdkPackageVersion>10.0.22621.28</WindowsSdkPackageVersion> -->
-			</PropertyGroup>
-			<ItemGroup>
-				<PackageReference Include="Microsoft.WindowsAppSDK" />
-				<PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
-			</ItemGroup>
-		</When>
-		<Otherwise>
-			<ItemGroup>
-				<Content Include="Assets\**" />
-				<Page Include="**\*.xaml" Exclude="bin\**\*.xaml;obj\**\*.xaml" />
-				<Compile Update="**\*.xaml.cs">
-					<DependentUpon>%(Filename)</DependentUpon>
-				</Compile>
-				<PRIResource Include="**\*.resw" />
-			</ItemGroup>
-		</Otherwise>
-	</Choose>
-
-	<ItemGroup>
-		<UnoDspImportColors Include="Styles\*.zip" Generator="Xaml" />
-		<UnoImage Include="Assets\**\*.svg" />
-		<EmbeddedResource Include="appsettings.json" />
-		<EmbeddedResource Include="appsettings.*.json" DependentUpon="appsettings.json" />
-		<UpToDateCheckInput Include="**\*.xaml" Exclude="bin\**\*.xaml;obj\**\*.xaml" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<ProjectReference Include="..\..\..\src\Uno.Extensions.Configuration\Uno.Extensions.Configuration.csproj" />
+    <ProjectReference Include="..\..\..\src\Uno.Extensions.Core.UI\Uno.Extensions.Core.WinUI.csproj" />
+    <ProjectReference Include="..\..\..\src\Uno.Extensions.Configuration\Uno.Extensions.Configuration.csproj" />
 		<ProjectReference Include="..\..\..\src\Uno.Extensions.Hosting.UI\Uno.Extensions.Hosting.WinUI.csproj" />
 		<ProjectReference Include="..\..\..\src\Uno.Extensions.Hosting\Uno.Extensions.Hosting.csproj" />
 		<ProjectReference Include="..\..\..\src\Uno.Extensions.Localization.UI\Uno.Extensions.Localization.WinUI.csproj" />
@ -86,4 +68,21 @@
 	<Import Project="..\..\..\src\Uno.Extensions.Navigation\build\Package.targets" />
 	<Import Project="..\..\..\src\Uno.Extensions.Navigation.UI\build\Package.targets" />

+
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Maui.Controls" />
+    <PackageReference Include="Microsoft.Maui.Controls.Compatibility"/>
+    <PackageReference Include="Microsoft.Maui.Graphics"  />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(IsAndroid)' == 'true'">
+    <PackageReference Include="Xamarin.AndroidX.Navigation.UI" />
+    <PackageReference Include="Xamarin.AndroidX.Navigation.Fragment" />
+    <PackageReference Include="Xamarin.AndroidX.Navigation.Runtime" />
+    <PackageReference Include="Xamarin.AndroidX.Navigation.Common" />
+    <PackageReference Include="Xamarin.AndroidX.Collection" />
+    <PackageReference Include="Xamarin.AndroidX.Collection.Jvm" />
+    <PackageReference Include="Xamarin.AndroidX.Collection.Ktx"  />
+  </ItemGroup>
 </Project>
--- a/testing/TestHarness/TestHarness.Windows/Package.appxmanifest
+++ b/testing/TestHarness/TestHarness.Windows/Package.appxmanifest
@ -7,19 +7,18 @@
  IgnorableNamespaces="uap rescap">

  <Identity
-    Name="5E560C41-9B2D-4E0D-85AD-F88AC0002C15"
-    Publisher="O=TestHarness"
+    Name="MauiEmbedding"
+    Publisher="O=NickRandolph"
    Version="1.0.0.0" />

  <Properties>
-	<DisplayName>TestHarness</DisplayName>
-	<PublisherDisplayName>TestHarness</PublisherDisplayName>
-	<Logo>Images\StoreLogo.png</Logo>
+    <DisplayName>MauiEmbedding</DisplayName>
+    <PublisherDisplayName>MauiEmbedding</PublisherDisplayName>
  </Properties>

  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.19041.0" MaxVersionTested="10.0.19041.0" />
-    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.19041.0" MaxVersionTested="10.0.19041.0" />
+    <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>
@ -31,21 +30,10 @@
      Executable="$targetnametoken$.exe"
      EntryPoint="$targetentrypoint$">
      <uap:VisualElements
-        DisplayName="TestHarness"
-        Description="TestHarness"
-        BackgroundColor="transparent"
-        Square150x150Logo="Images\Square150x150Logo.png"
-        Square44x44Logo="Images\Square44x44Logo.png">
-        <uap:DefaultTile Wide310x150Logo="Images\Wide310x150Logo.png" />
-        <uap:SplashScreen Image="Images\SplashScreen.png" />
+        DisplayName="MauiEmbedding"
+        Description="MauiEmbedding">
+        <uap:SplashScreen />
      </uap:VisualElements>
-		<Extensions>
-			<uap:Extension Category="windows.protocol">
-				<uap:Protocol Name="oidc-auth">
-					<uap:DisplayName>OidcSample</uap:DisplayName>
-				</uap:Protocol>
-			</uap:Extension>
-		</Extensions>
    </Application>
  </Applications>

--- a/samples/MauiEmbedding/MauiEmbedding/Platforms/Android/AndroidManifest.xml
+++ b/samples/MauiEmbedding/MauiEmbedding/Platforms/Android/AndroidManifest.xml
--- a/samples/MauiEmbedding/MauiEmbedding/Platforms/Android/Assets/AboutAssets.txt
+++ b/samples/MauiEmbedding/MauiEmbedding/Platforms/Android/Assets/AboutAssets.txt
--- a/samples/MauiEmbedding/MauiEmbedding/Platforms/Android/Main.Android.cs
+++ b/samples/MauiEmbedding/MauiEmbedding/Platforms/Android/Main.Android.cs
@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Android.App;
+using Android.Content;
+using Android.OS;
+using Android.Runtime;
+using Android.Views;
+using Android.Widget;
+using Com.Nostra13.Universalimageloader.Core;
+using Microsoft.UI.Xaml.Media;
+
+namespace MauiEmbedding.Droid;
+[global::Android.App.ApplicationAttribute(
+    Label = "@string/ApplicationName",
+    Icon = "@mipmap/icon",
+    LargeHeap = true,
+    HardwareAccelerated = true,
+    Theme = "@style/AppTheme"
+)]
+public class Application : Microsoft.UI.Xaml.NativeApplication
+{
+    public Application(IntPtr javaReference, JniHandleOwnership transfer)
+        : base(() => new App(), javaReference, transfer)
+    {
+        ConfigureUniversalImageLoader();
+    }
+
+    private static void ConfigureUniversalImageLoader()
+    {
+        // Create global configuration and initialize ImageLoader with this config
+        ImageLoaderConfiguration config = new ImageLoaderConfiguration
+            .Builder(Context)
+            .Build();
+
+        ImageLoader.Instance.Init(config);
+
+        ImageSource.DefaultImageLoader = ImageLoader.Instance.LoadImageAsync;
+    }
+}
+
--- a/samples/MauiEmbedding/MauiEmbedding/Platforms/Android/MainActivity.Android.cs
+++ b/samples/MauiEmbedding/MauiEmbedding/Platforms/Android/MainActivity.Android.cs
@ -1,16 +1,15 @@
 using Android.App;
-using Android.Widget;
-using Android.OS;
 using Android.Content.PM;
+using Android.OS;
 using Android.Views;
+using Android.Widget;

 namespace MauiEmbedding.Droid;
-
 [Activity(
-	MainLauncher = true,
-	ConfigurationChanges = global::Uno.UI.ActivityHelper.AllConfigChanges,
-	WindowSoftInputMode = SoftInput.AdjustNothing | SoftInput.StateHidden
+    MainLauncher = true,
+    ConfigurationChanges = global::Uno.UI.ActivityHelper.AllConfigChanges,
+    WindowSoftInputMode = SoftInput.AdjustNothing | SoftInput.StateHidden
 )]
 public class MainActivity : Microsoft.UI.Xaml.ApplicationActivity
 {
-}
+}
--- a/samples/MauiEmbedding/MauiEmbedding/Platforms/Android/Resources/AboutResources.txt
+++ b/samples/MauiEmbedding/MauiEmbedding/Platforms/Android/Resources/AboutResources.txt
--- a/samples/MauiEmbedding/MauiEmbedding/Platforms/Android/Resources/values/Strings.xml
+++ b/samples/MauiEmbedding/MauiEmbedding/Platforms/Android/Resources/values/Strings.xml
--- a/samples/MauiEmbedding/MauiEmbedding/Platforms/Android/Resources/values/Styles.xml
+++ b/samples/MauiEmbedding/MauiEmbedding/Platforms/Android/Resources/values/Styles.xml
--- a/samples/MauiEmbedding/MauiEmbedding/Platforms/Android/environment.conf
+++ b/samples/MauiEmbedding/MauiEmbedding/Platforms/Android/environment.conf
--- a/samples/MauiEmbedding/MauiEmbedding/Platforms/MacCatalyst/Entitlements.plist
+++ b/samples/MauiEmbedding/MauiEmbedding/Platforms/MacCatalyst/Entitlements.plist
--- a/samples/MauiEmbedding/MauiEmbedding/Platforms/MacCatalyst/Info.plist
+++ b/samples/MauiEmbedding/MauiEmbedding/Platforms/MacCatalyst/Info.plist
@ -15,7 +15,7 @@
 			<string>UIInterfaceOrientationLandscapeRight</string>
 		</array>
 		<key>XSAppIconAssets</key>
-		<string>Assets.xcassets/iconapp.appiconset</string>
+		<string>Assets.xcassets/icon.appiconset</string>

 		<!--
 		Adjust this to your application's encryption usage.
--- a/samples/MauiEmbedding/MauiEmbedding/Platforms/MacCatalyst/Main.maccatalyst.cs
+++ b/samples/MauiEmbedding/MauiEmbedding/Platforms/MacCatalyst/Main.maccatalyst.cs
@ -0,0 +1,13 @@
+using UIKit;
+
+namespace MauiEmbedding.MacCatalyst;
+public class EntryPoint
+{
+    // This is the main entry point of the application.
+    public static void Main(string[] args)
+    {
+        // if you want to use a different Application Delegate class from "AppDelegate"
+        // you can specify it here.
+        UIApplication.Main(args, null, typeof(App));
+    }
+}
--- a/samples/MauiEmbedding/MauiEmbedding/Platforms/MacCatalyst/Media.xcassets/LaunchImages.launchimage/Contents.json
+++ b/samples/MauiEmbedding/MauiEmbedding/Platforms/MacCatalyst/Media.xcassets/LaunchImages.launchimage/Contents.json
--- a/samples/MauiEmbedding/MauiEmbedding/Platforms/iOS/Entitlements.plist
+++ b/samples/MauiEmbedding/MauiEmbedding/Platforms/iOS/Entitlements.plist
--- a/samples/MauiEmbedding/MauiEmbedding/Platforms/iOS/Info.plist
+++ b/samples/MauiEmbedding/MauiEmbedding/Platforms/iOS/Info.plist
@ -30,7 +30,7 @@
 		<key>UIViewControllerBasedStatusBarAppearance</key>
 		<false/>
 		<key>XSAppIconAssets</key>
-		<string>Assets.xcassets/iconapp.appiconset</string>
+		<string>Assets.xcassets/icon.appiconset</string>
 		<key>UIApplicationSupportsIndirectInputEvents</key>
 		<true/>

--- a/samples/MauiEmbedding/MauiEmbedding/Platforms/iOS/Main.iOS.cs
+++ b/samples/MauiEmbedding/MauiEmbedding/Platforms/iOS/Main.iOS.cs
@ -0,0 +1,13 @@
+using UIKit;
+
+namespace MauiEmbedding.iOS;
+public class EntryPoint
+{
+    // This is the main entry point of the application.
+    public static void Main(string[] args)
+    {
+        // if you want to use a different Application Delegate class from "AppDelegate"
+        // you can specify it here.
+        UIApplication.Main(args, null, typeof(App));
+    }
+}
--- a/samples/MauiEmbedding/MauiEmbedding/Platforms/iOS/Media.xcassets/LaunchImages.launchimage/Contents.json
+++ b/samples/MauiEmbedding/MauiEmbedding/Platforms/iOS/Media.xcassets/LaunchImages.launchimage/Contents.json
--- a/samples/MauiEmbedding/MauiEmbedding/Platforms/iOS/PrivacyInfo.xcprivacy
+++ b/samples/MauiEmbedding/MauiEmbedding/Platforms/iOS/PrivacyInfo.xcprivacy
@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+	<!-- see https://aka.platform/uno/apple-privacy-manifest for more information -->
+	
+	<!-- .NET Runtime/BCL -->
+	<dict>
+		<key>NSPrivacyAccessedAPIType</key>
+		<string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
+		<key>NSPrivacyAccessedAPITypeReasons</key>
+		<array>
+			<string>C617.1</string>
+		</array>
+	</dict>
+	<dict>
+		<key>NSPrivacyAccessedAPIType</key>
+		<string>NSPrivacyAccessedAPICategorySystemBootTime</string>
+		<key>NSPrivacyAccessedAPITypeReasons</key>
+		<array>
+			<string>35F9.1</string>
+		</array>
+	</dict>
+	<dict>
+		<key>NSPrivacyAccessedAPIType</key>
+		<string>NSPrivacyAccessedAPICategoryDiskSpace</string>
+		<key>NSPrivacyAccessedAPITypeReasons</key>
+		<array>
+			<string>E174.1</string>
+		</array>
+	</dict>
+
+	<!-- NSUserDefaults -->
+	<dict>
+		<key>NSPrivacyAccessedAPIType</key>
+		<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
+		<key>NSPrivacyAccessedAPITypeReasons</key>
+		<array>
+			<string>CA92.1</string>
+		</array>
+	</dict>
+</plist>
--- a/samples/MauiEmbedding/MauiEmbedding/ReadMe.md
+++ b/samples/MauiEmbedding/MauiEmbedding/ReadMe.md
@ -0,0 +1,7 @@
+# Getting Started
+
+Welcome to the Uno Platform!
+
+To discover how to get started with your new app: https://aka.platform.uno/get-started
+
+For more information on how to use the Uno.Sdk or upgrade Uno Platform packages in your solution: https://aka.platform.uno/using-uno-sdk
--- a/samples/MauiEmbedding/MauiEmbedding/Styles/ColorPaletteOverride.json
+++ b/samples/MauiEmbedding/MauiEmbedding/Styles/ColorPaletteOverride.json
@ -0,0 +1,76 @@
+{
+    "description": "Default Uno Material colors",
+    "seed": "#5946d2",
+    "coreColors": {
+        "primary": "#5946d2",
+        "secondary": "#6b4ea2"
+    },
+    "extendedColors": [],
+    "schemes": {
+        "light": {
+            "primary": "#5946d2",
+            "surfaceTint": "#5946d2",
+            "onPrimary": "#ffffff",
+            "primaryContainer": "#e5deff",
+            "onPrimaryContainer": "#170065",
+            "secondary": "#6b4ea2",
+            "onSecondary": "#ffffff",
+            "secondaryContainer": "#ebddff",
+            "onSecondaryContainer": "#220555",
+            "tertiary": "#0061a4",
+            "onTertiary": "#ffffff",
+            "tertiaryContainer": "#cfe4ff",
+            "onTertiaryContainer": "#001d36",
+            "error": "#b3261e",
+            "onError": "#ffffff",
+            "errorContainer": "#f9dedc",
+            "onErrorContainer": "#410e0b",
+            "background": "#fcfbff",
+            "onBackground": "#1c1b1f",
+            "surface": "#ffffff",
+            "onSurface": "#1c1b1f",
+            "surfaceVariant": "#f2eff5",
+            "onSurfaceVariant": "#8b8494",
+            "outline": "#79747e",
+            "outlineVariant": "#c9c5d0",
+            "shadow": "#000000",
+            "scrim": "#000000",
+            "inverseSurface": "#e6e1e5",
+            "inverseOnSurface": "#1c1b1f",
+            "inversePrimary": "#2a009f"
+        },
+        "dark": {
+            "primary": "#c7bfff",
+            "surfaceTint": "#c7bfff",
+            "onPrimary": "#2a009f",
+            "primaryContainer": "#4129ba",
+            "onPrimaryContainer": "#e4dfff",
+            "secondary": "#cdc2dc",
+            "onSecondary": "#332d41",
+            "secondaryContainer": "#433c52",
+            "onSecondaryContainer": "#eddfff",
+            "tertiary": "#9fcaff",
+            "onTertiary": "#003258",
+            "tertiaryContainer": "#00497d",
+            "onTertiaryContainer": "#d1e4ff",
+            "error": "#ffb4ab",
+            "onError": "#690005",
+            "errorContainer": "#93000a",
+            "onErrorContainer": "#ffdad6",
+            "background": "#1c1b1f",
+            "onBackground": "#e5e1e6",
+            "surface": "#302d37",
+            "onSurface": "#e6e1e5",
+            "surfaceVariant": "#47464f",
+            "onSurfaceVariant": "#c9c5d0",
+            "outline": "#928f99",
+            "outlineVariant": "#57545d",
+            "shadow": "#000000",
+            "scrim": "#000000",
+            "inverseSurface": "#e6e1e5",
+            "inverseOnSurface": "#1c1b1f",
+            "inversePrimary": "#2a009f"
+        }
+    },
+    "palettes": {}
+}
--- a/samples/MauiEmbedding/MauiEmbedding/Styles/ColorPaletteOverride.xaml
+++ b/samples/MauiEmbedding/MauiEmbedding/Styles/ColorPaletteOverride.xaml
@ -1,65 +1,65 @@
-<!-- This file is generated by a tool from the file ColorPaletteOverride.zip - - YOU SHOULD NOT EDIT IT manually.-->
+<!-- This file is generated by a tool from the file ColorPaletteOverride.json - - YOU SHOULD NOT EDIT IT manually.-->
 <ResourceDictionary xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
  <ResourceDictionary.ThemeDictionaries>
    <ResourceDictionary x:Key="Light">
      <Color x:Key="PrimaryColor">#5946D2</Color>
+      <Color x:Key="SurfaceTintColor">#5946D2</Color>
      <Color x:Key="OnPrimaryColor">#FFFFFF</Color>
      <Color x:Key="PrimaryContainerColor">#E5DEFF</Color>
      <Color x:Key="OnPrimaryContainerColor">#170065</Color>
      <Color x:Key="SecondaryColor">#6B4EA2</Color>
      <Color x:Key="OnSecondaryColor">#FFFFFF</Color>
      <Color x:Key="SecondaryContainerColor">#EBDDFF</Color>
-      <Color x:Key="OnSecondaryContainerColor">#1F182B</Color>
+      <Color x:Key="OnSecondaryContainerColor">#220555</Color>
      <Color x:Key="TertiaryColor">#0061A4</Color>
      <Color x:Key="OnTertiaryColor">#FFFFFF</Color>
      <Color x:Key="TertiaryContainerColor">#CFE4FF</Color>
      <Color x:Key="OnTertiaryContainerColor">#001D36</Color>
      <Color x:Key="ErrorColor">#B3261E</Color>
-      <Color x:Key="ErrorContainerColor">#F9DEDC</Color>
      <Color x:Key="OnErrorColor">#FFFFFF</Color>
+      <Color x:Key="ErrorContainerColor">#F9DEDC</Color>
      <Color x:Key="OnErrorContainerColor">#410E0B</Color>
      <Color x:Key="BackgroundColor">#FCFBFF</Color>
      <Color x:Key="OnBackgroundColor">#1C1B1F</Color>
      <Color x:Key="SurfaceColor">#FFFFFF</Color>
      <Color x:Key="OnSurfaceColor">#1C1B1F</Color>
-      <Color x:Key="SurfaceVariantColor">#F3EFF5</Color>
+      <Color x:Key="SurfaceVariantColor">#F2EFF5</Color>
      <Color x:Key="OnSurfaceVariantColor">#8B8494</Color>
      <Color x:Key="OutlineColor">#79747E</Color>
-      <Color x:Key="OnSurfaceInverseColor">#F4EFF4</Color>
-      <Color x:Key="SurfaceInverseColor">#313033</Color>
-      <Color x:Key="PrimaryInverseColor">#C8BFFF</Color>
-      <Color x:Key="SurfaceTintColor">#5946D2</Color>
      <Color x:Key="OutlineVariantColor">#C9C5D0</Color>
+      <Color x:Key="SurfaceInverseColor">#E6E1E5</Color>
+      <Color x:Key="OnsurfaceInverseColor">#1C1B1F</Color>
+      <Color x:Key="PrimaryInverseColor">#2A009F</Color>
    </ResourceDictionary>
    <ResourceDictionary x:Key="Dark">
      <Color x:Key="PrimaryColor">#C7BFFF</Color>
+      <Color x:Key="SurfaceTintColor">#C7BFFF</Color>
      <Color x:Key="OnPrimaryColor">#2A009F</Color>
      <Color x:Key="PrimaryContainerColor">#4129BA</Color>
      <Color x:Key="OnPrimaryContainerColor">#E4DFFF</Color>
      <Color x:Key="SecondaryColor">#CDC2DC</Color>
      <Color x:Key="OnSecondaryColor">#332D41</Color>
      <Color x:Key="SecondaryContainerColor">#433C52</Color>
-      <Color x:Key="OnSecondaryContainerColor">#EBDDFF</Color>
+      <Color x:Key="OnSecondaryContainerColor">#EDDFFF</Color>
      <Color x:Key="TertiaryColor">#9FCAFF</Color>
      <Color x:Key="OnTertiaryColor">#003258</Color>
-      <Color x:Key="TertiaryContainerColor">#00497E</Color>
+      <Color x:Key="TertiaryContainerColor">#00497D</Color>
      <Color x:Key="OnTertiaryContainerColor">#D1E4FF</Color>
      <Color x:Key="ErrorColor">#FFB4AB</Color>
-      <Color x:Key="ErrorContainerColor">#93000A</Color>
      <Color x:Key="OnErrorColor">#690005</Color>
+      <Color x:Key="ErrorContainerColor">#93000A</Color>
      <Color x:Key="OnErrorContainerColor">#FFDAD6</Color>
      <Color x:Key="BackgroundColor">#1C1B1F</Color>
      <Color x:Key="OnBackgroundColor">#E5E1E6</Color>
-      <Color x:Key="SurfaceColor">#302D38</Color>
+      <Color x:Key="SurfaceColor">#302D37</Color>
      <Color x:Key="OnSurfaceColor">#E6E1E5</Color>
      <Color x:Key="SurfaceVariantColor">#47464F</Color>
      <Color x:Key="OnSurfaceVariantColor">#C9C5D0</Color>
      <Color x:Key="OutlineColor">#928F99</Color>
-      <Color x:Key="OnSurfaceInverseColor">#1C1B1F</Color>
-      <Color x:Key="SurfaceInverseColor">#E6E1E5</Color>
-      <Color x:Key="PrimaryInverseColor">#2A009F</Color>
-      <Color x:Key="SurfaceTintColor">#544794</Color>
      <Color x:Key="OutlineVariantColor">#57545D</Color>
+      <Color x:Key="SurfaceInverseColor">#E6E1E5</Color>
+      <Color x:Key="OnsurfaceInverseColor">#1C1B1F</Color>
+      <Color x:Key="PrimaryInverseColor">#2A009F</Color>
    </ResourceDictionary>
  </ResourceDictionary.ThemeDictionaries>
 </ResourceDictionary>
--- a/src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests.Windows/app.manifest
+++ b/src/Uno.Extensions.RuntimeTests/Uno.Extensions.RuntimeTests.Windows/app.manifest
@ -1,6 +1,16 @@
 <?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="UnoQuickStart.Windows.app"/>
+  <assemblyIdentity version="1.0.0.0" name="MauiEmbedding.Windows.app"/>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!--The ID below informs the system that this application is compatible with OS features first introduced in Windows 8.
+      For more info see https://docs.microsoft.com/windows/win32/sysinfo/targeting-your-application-at-windows-8-1
+
+      It is also necessary to support features in unpackaged applications, for example the custom titlebar implementation.-->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />
+    </application>
+  </compatibility>

  <application xmlns="urn:schemas-microsoft-com:asm.v3">
    <windowsSettings>
--- a/samples/MauiEmbedding/global.json
+++ b/samples/MauiEmbedding/global.json
@ -1,5 +0,0 @@
-{
-  "msbuild-sdks": {
-    "MSBuild.Sdk.Extras": "3.0.44"
-  }
-}
--- a/samples/Playground/.vsconfig
+++ b/samples/Playground/.vsconfig
@ -1,112 +0,0 @@
-{
-  "version": "1.0",
-  "components": [
-    "Microsoft.VisualStudio.Component.CoreEditor",
-    "Microsoft.VisualStudio.Workload.CoreEditor",
-    "Microsoft.NetCore.Component.Runtime.3.1",
-    "Microsoft.NetCore.Component.SDK",
-    "Microsoft.VisualStudio.Component.NuGet",
-    "Microsoft.Net.Component.4.6.1.TargetingPack",
-    "Microsoft.VisualStudio.Component.Roslyn.Compiler",
-    "Microsoft.VisualStudio.Component.Roslyn.LanguageServices",
-    "Microsoft.NetCore.Component.DevelopmentTools",
-    "Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions",
-    "Microsoft.VisualStudio.Component.DockerTools",
-    "Microsoft.NetCore.Component.Web",
-    "Microsoft.Net.Component.4.8.SDK",
-    "Microsoft.Net.Component.4.7.2.TargetingPack",
-    "Microsoft.Net.ComponentGroup.DevelopmentPrerequisites",
-    "Microsoft.VisualStudio.Component.TypeScript.4.0",
-    "Microsoft.VisualStudio.Component.JavaScript.TypeScript",
-    "Microsoft.VisualStudio.Component.JavaScript.Diagnostics",
-    "Microsoft.Component.MSBuild",
-    "Microsoft.VisualStudio.Component.TextTemplating",
-    "Component.Microsoft.VisualStudio.RazorExtension",
-    "Microsoft.VisualStudio.Component.IISExpress",
-    "Microsoft.VisualStudio.Component.SQL.ADAL",
-    "Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime",
-    "Microsoft.VisualStudio.Component.Common.Azure.Tools",
-    "Microsoft.VisualStudio.Component.SQL.CLR",
-    "Microsoft.VisualStudio.Component.MSODBC.SQL",
-    "Microsoft.VisualStudio.Component.MSSQL.CMDLnUtils",
-    "Microsoft.VisualStudio.Component.ManagedDesktop.Core",
-    "Microsoft.Net.Component.4.5.2.TargetingPack",
-    "Microsoft.Net.Component.4.5.TargetingPack",
-    "Microsoft.VisualStudio.Component.SQL.SSDT",
-    "Microsoft.VisualStudio.Component.SQL.DataSources",
-    "Component.Microsoft.Web.LibraryManager",
-    "Microsoft.VisualStudio.ComponentGroup.Web",
-    "Microsoft.VisualStudio.Component.Web",
-    "Microsoft.VisualStudio.Component.IntelliCode",
-    "Component.Microsoft.VisualStudio.LiveShare",
-    "Microsoft.VisualStudio.ComponentGroup.Web.Client",
-    "Microsoft.Net.Component.4.TargetingPack",
-    "Microsoft.Net.Component.4.5.1.TargetingPack",
-    "Microsoft.Net.Component.4.6.TargetingPack",
-    "Microsoft.Net.ComponentGroup.TargetingPacks.Common",
-    "Component.Microsoft.VisualStudio.Web.AzureFunctions",
-    "Microsoft.VisualStudio.ComponentGroup.AzureFunctions",
-    "Microsoft.VisualStudio.Component.Azure.Compute.Emulator",
-    "Microsoft.VisualStudio.Component.Azure.Storage.Emulator",
-    "Microsoft.VisualStudio.Component.Azure.ClientLibs",
-    "Microsoft.VisualStudio.Component.Azure.AuthoringTools",
-    "Microsoft.VisualStudio.Component.CloudExplorer",
-    "Microsoft.VisualStudio.ComponentGroup.Web.CloudTools",
-    "Microsoft.VisualStudio.Component.DiagnosticTools",
-    "Microsoft.VisualStudio.Component.EntityFramework",
-    "Microsoft.VisualStudio.Component.AspNet45",
-    "Microsoft.VisualStudio.Component.AppInsights.Tools",
-    "Microsoft.VisualStudio.Component.WebDeploy",
-    "Microsoft.VisualStudio.Component.Wcf.Tooling",
-    "Microsoft.Net.Component.4.6.2.TargetingPack",
-    "Microsoft.Net.Component.4.7.TargetingPack",
-    "Microsoft.Net.Component.4.7.1.TargetingPack",
-    "Microsoft.VisualStudio.Workload.NetWeb",
-    "Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites",
-    "Microsoft.VisualStudio.Component.Azure.Waverton.BuildTools",
-    "Microsoft.VisualStudio.Component.Azure.Waverton",
-    "Microsoft.Component.Azure.DataLake.Tools",
-    "Microsoft.VisualStudio.Component.Azure.Kubernetes.Tools",
-    "Microsoft.VisualStudio.Component.Azure.ResourceManager.Tools",
-    "Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools",
-    "Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices",
-    "Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools",
-    "Microsoft.VisualStudio.Workload.Azure",
-    "Microsoft.VisualStudio.Component.VC.CoreIde",
-    "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
-    "Microsoft.VisualStudio.Component.Graphics.Tools",
-    "Microsoft.VisualStudio.Component.Windows10SDK.19041",
-    "Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites",
-    "Microsoft.ComponentGroup.Blend",
-    "Microsoft.VisualStudio.Component.Debugger.JustInTime",
-    "Microsoft.VisualStudio.Component.PortableLibrary",
-    "Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging",
-    "Microsoft.VisualStudio.Workload.ManagedDesktop",
-    "Microsoft.VisualStudio.Component.Windows10SDK.19041",
-    "Microsoft.VisualStudio.Component.Windows10SDK.17763",
-    "Microsoft.Component.NetFX.Native",
-    "Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard",
-    "Microsoft.VisualStudio.Component.Graphics",
-    "Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin",
-    "Microsoft.VisualStudio.ComponentGroup.UWP.Support",
-    "Microsoft.VisualStudio.Component.VC.Tools.ARM64",
-    "Microsoft.VisualStudio.Component.UWP.VC.ARM64",
-    "Microsoft.VisualStudio.Component.VC.Tools.ARM",
-    "Microsoft.VisualStudio.ComponentGroup.UWP.VC",
-    "Microsoft.VisualStudio.Workload.Universal",
-    "Component.OpenJDK",
-    "Microsoft.VisualStudio.Component.MonoDebugger",
-    "Microsoft.VisualStudio.Component.Merq",
-    "Component.Xamarin.RemotedSimulator",
-    "Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine",
-    "Component.Xamarin",
-    "Component.Android.SDK28",
-    "Microsoft.VisualStudio.Workload.NetCrossPlat",
-    "Microsoft.VisualStudio.Workload.NetCoreTools",
-    "Microsoft.Net.Component.4.6.1.SDK",
-    "Microsoft.Net.Component.4.6.2.SDK",
-    "Microsoft.Net.Component.4.7.SDK",
-    "Microsoft.Net.Component.4.7.1.SDK",
-    "Microsoft.Net.Component.4.7.2.SDK"
-  ]
-}
--- a/samples/Playground/Directory.Build.props
+++ b/samples/Playground/Directory.Build.props
@ -1,21 +1,9 @@
-<Project ToolsVersion="15.0">
-  <!--
-    If working on a single target framework, copy solution-config.props.sample to solution-config.props
-    and uncomment the appropriate lines in solution-config.props to build for the desired platforms only.
+<Project>
+	<Import Project="..\..\Directory.Build.props" />

-    https://platform.uno/docs/articles/guides/solution-building-single-targetframework.html
-  -->
-  <Import Project="solution-config.props" Condition="exists('solution-config.props')" />
-
-
-	<PropertyGroup>
+  <PropertyGroup>
    <ImplicitUsings>enable</ImplicitUsings>
    <Nullable>enable</Nullable>
-	<LangVersion>latest</LangVersion>
-
-    <DebugType>portable</DebugType>
-    <DebugSymbols>True</DebugSymbols>
-
    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>

    <!--
@ -25,64 +13,13 @@
      PRI257: Ignore default language (en) not being one of the included resources (eg en-us, en-uk)
    -->
    <NoWarn>$(NoWarn);NU1507;NETSDK1201;PRI257</NoWarn>
+  </PropertyGroup>

-    <DefaultLanguage>en</DefaultLanguage>
-
-    <IsAndroid>false</IsAndroid>
-    <IsIOS>false</IsIOS>
-    <IsMac>false</IsMac>
-    <IsMacCatalyst>false</IsMacCatalyst>
-    <IsWinAppSdk>false</IsWinAppSdk>
-	
-		<WarningsAsErrors>enable</WarningsAsErrors>
-		<!-- <NoWarn>$(NoWarn);NU5104;CS1591;MSB3277;XA0101;CS8785;CS8669</NoWarn> -->
-		<UnoEnableXamlFuzzyMatching>false</UnoEnableXamlFuzzyMatching>
-	</PropertyGroup>
-
-
-  <Choose>
-    <When Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
-      <PropertyGroup>
-        <IsAndroid>true</IsAndroid>
-        <SupportedOSPlatformVersion>21.0</SupportedOSPlatformVersion>
-      </PropertyGroup>
-    </When>
-    <When Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">
-      <PropertyGroup>
-        <IsIOS>true</IsIOS>
-        <SupportedOSPlatformVersion>14.2</SupportedOSPlatformVersion>
-      </PropertyGroup>
-    </When>
-    <When Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'macos'">
-      <PropertyGroup>
-        <IsMac>true</IsMac>
-        <SupportedOSPlatformVersion>10.14</SupportedOSPlatformVersion>
-      </PropertyGroup>
-    </When>
-    <When Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">
-      <PropertyGroup>
-        <IsMacCatalyst>true</IsMacCatalyst>
-        <SupportedOSPlatformVersion>14.0</SupportedOSPlatformVersion>
-      </PropertyGroup>
-    </When>
-    <When Condition="$(TargetFramework.Contains('windows10'))">
-      <PropertyGroup>
-        <IsWinAppSdk>true</IsWinAppSdk>
-        <SupportedOSPlatformVersion>10.0.18362.0</SupportedOSPlatformVersion>
-        <TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
-        <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
-        <EnableCoreMrtTooling Condition=" '$(BuildingInsideVisualStudio)' != 'true' ">false</EnableCoreMrtTooling>
-      </PropertyGroup>
-    </When>
-  </Choose>
-
-
-	<ItemGroup>
-		<ProjectReference Include="$(MSBuildThisFileDirectory)..\..\src\Uno.Extensions.Core.Generators\Uno.Extensions.Core.Generators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-		<ProjectReference Include="$(MSBuildThisFileDirectory)..\..\src\Uno.Extensions.Navigation.Generators\Uno.Extensions.Navigation.Generators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-		<ProjectReference Include="$(MSBuildThisFileDirectory)..\..\src\Uno.Extensions.Reactive.Generator\Uno.Extensions.Reactive.Generator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-	</ItemGroup>
-
-	<!-- Reference generators props. This required only when referencing extensions project as source code (instead of packages) -->
-	<Import Project="$(MSBuildThisFileDirectory)..\..\src\Uno.Extensions.Core.Generators\buildTransitive\Uno.Extensions.Core.props" />
+  <!-- See https://aka.platform.uno/using-uno-sdk#implicit-packages for more information regarding the Implicit Packages version properties. -->
+  <!--<PropertyGroup>
+    <UnoExtensionsVersion>4.1.24</UnoExtensionsVersion>
+    <UnoToolkitVersion>6.1.7</UnoToolkitVersion>
+    <UnoThemesVersion>5.0.13</UnoThemesVersion>
+    <UnoCSharpMarkupVersion>5.2.14</UnoCSharpMarkupVersion>
+  </PropertyGroup>-->
 </Project>
--- a/samples/Playground/Directory.Build.targets
+++ b/samples/Playground/Directory.Build.targets
@ -1,61 +1,2 @@
-<Project ToolsVersion="15.0">
-  <ItemGroup>
-    <!-- Removes native usings to avoid Ambiguous reference -->
-    <Using Remove="@(Using->HasMetadata('Platform'))" />
-  </ItemGroup>
-
-
-  <PropertyGroup>
-    <!--
-      macOS needs an explicit override of the current compiler when running under mono.
-      On other targets, .NET 6.0's compiler takes precedence.
-      -->
-    <MicrosoftNetCompilerVersionOverride Condition="'$(MSBuildRuntimeType)'!='Core' and ($([MSBuild]::IsOSPlatform('OSX')) or '$(MSBuildVersion)' &lt; '17.0')">4.0.1</MicrosoftNetCompilerVersionOverride>
-  </PropertyGroup>
-
-  <!--
-  This file is imported from Directory.Build.props as the nuget tooling
-  in VS is skipping ItemGroup conditions for legacy projects (iOS, Android, ...).
-  -->
-  <Choose>
-    <When Condition="'$(MicrosoftNetCompilerVersionOverride)'!=''">
-      <PropertyGroup>
-        <!--
-          Disable shared compilation for the override to take place
-          https://github.com/dotnet/roslyn/blob/315c2e149ba7889b0937d872274c33fcbfe9af5f/src/NuGet/Microsoft.Net.Compilers/build/Microsoft.Net.Compilers.props#L36
-          -->
-        <UseSharedCompilation>false</UseSharedCompilation>
-      </PropertyGroup>
-      <ItemGroup>
-
-        <!--This override is used to validate the user of specific version of the C# Compiler-->
-        <PackageReference Include="Microsoft.Net.Compilers.Toolset" VersionOverride="$(MicrosoftNetCompilerVersionOverride)">
-          <PrivateAssets>all</PrivateAssets>
-          <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-        </PackageReference>
-      </ItemGroup>
-
-    </When>
-  </Choose>
-
-  <Import Project="..\..\src\xamarinmac-workaround.targets" Condition="exists('..\..\src\xamarinmac-workaround.targets') and $(TargetFramework.ToLower().StartsWith('xamarin')) and $(TargetFramework.ToLower().Contains('mac'))" />
-
-  <!-- Workaround to avoid including Uno.Toolkit.UI XBFs in the PRI file -->
-  <Target Name="AdjustGetPackagingOutput1" AfterTargets="GetMrtPackagingOutputs">
-    <Message Importance="high" Text="Applying NuGet packaging workaround for dependent PRI files exclusion" />
-    <ItemGroup>
-      <_OtherPriFiles Include="@(PackagingOutputs)" Condition="'%(Extension)' == '.pri' and ('%(PackagingOutputs.ReferenceSourceTarget)' == 'ProjectReference' or '%(PackagingOutputs.NugetSourceType)'=='Package')" />
-      <PackagingOutputs Remove="@(_OtherPriFiles)" />
-    </ItemGroup>
-  </Target>
-
-  <Target Name="AdjustGetPackagingOutput2" BeforeTargets="AddPriPayloadFilesToCopyToOutputDirectoryItems">
-    <Message Importance="high" Text="Applying NuGet packaging workaround for dependent PRI files exclusion" />
-    <ItemGroup>
-      <_OtherPriFiles1 Include="@(_ReferenceRelatedPaths)" Condition="'%(Extension)' == '.pri' and ('%(_ReferenceRelatedPaths.ReferenceSourceTarget)' == 'ProjectReference' or '%(_ReferenceRelatedPaths.NugetSourceType)'=='Package')" />
-      <_ReferenceRelatedPaths Remove="@(_OtherPriFiles1)" />
-      <_OtherPriFiles2 Include="@(ReferenceCopyLocalPaths)" Condition="'%(Extension)' == '.pri' and ('%(ReferenceCopyLocalPaths.ReferenceSourceTarget)' == 'ProjectReference' or '%(ReferenceCopyLocalPaths.NugetSourceType)'=='Package')" />
-      <ReferenceCopyLocalPaths Remove="@(_OtherPriFiles2)" />
-    </ItemGroup>
-  </Target>
+<Project>
 </Project>
--- a/samples/Playground/Directory.Packages.props
+++ b/samples/Playground/Directory.Packages.props
@ -10,11 +10,9 @@
 		you need to make sure that the version provided here matches https://github.com/novotnyllc/MSBuildSdkExtras/blob/main/Source/MSBuild.Sdk.Extras/DefaultItems/ImplicitPackages.targets#L11.
 		This is not an issue when libraries are referenced through nuget packages. See https://github.com/unoplatform/uno/issues/446 for more details.
 		-->
-		<PackageVersion Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.13" />
-		<PackageVersion Include="Microsoft.UI.Xaml" Version="2.7.1" />
 		<PackageVersion Include="Microsoft.Windows.Compatibility" Version="7.0.3" />
-		<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" />
-		<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.5.240311000" />
+		<!--<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" />
+		<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.5.240311000" />-->
 		<PackageVersion Include="Refit" Version="6.3.2" />
 		<PackageVersion Include="Refit.HttpClientFactory" Version="6.3.2" />
 		<PackageVersion Include="SkiaSharp.Views" Version="2.88.7" />
@ -25,20 +23,20 @@
 		<PackageVersion Include="Uno.Core.Extensions.Logging.Singleton" Version="4.1.1" />
 		<PackageVersion Include="Uno.Extensions.Logging.OSLog " Version="1.7.0" />
 		<PackageVersion Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.7.0" />
-		<PackageVersion Include="Uno.Material" Version="5.0.13" />
-		<PackageVersion Include="Uno.Material.WinUI" Version="5.0.13" />
-		<PackageVersion Include="Uno.Toolkit.WinUI" Version="6.0.24" />
-		<PackageVersion Include="Uno.Toolkit.WinUI.Material" Version="6.0.24" />
-		<PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.2.132" />
-		<PackageVersion Include="Uno.UniversalImageLoader" Version="1.9.36" />
-		<PackageVersion Include="Uno.Wasm.Bootstrap" Version="8.0.16" />
+		<!--<PackageVersion Include="Uno.Material" Version="5.0.13" />
+		<PackageVersion Include="Uno.Material.WinUI" Version="5.0.13" />-->
+		<!--<PackageVersion Include="Uno.Toolkit.WinUI" Version="6.1.17" />
+		<PackageVersion Include="Uno.Toolkit.WinUI.Material" Version="6.1.7" />-->
+		<PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="$(UnoVersion)" />
+		<!--<PackageVersion Include="Uno.UniversalImageLoader" Version="1.9.36" />-->
+		<!--<PackageVersion Include="Uno.Wasm.Bootstrap" Version="8.0.16" />
 		<PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="8.0.16" />
-		<PackageVersion Include="Uno.WinUI" Version="5.2.132" />
-		<PackageVersion Include="Uno.WinUI.WebAssembly" Version="5.2.132" />
-		<PackageVersion Include="Uno.WinUI.Skia.Gtk" Version="5.2.132" />
-		<PackageVersion Include="Uno.WinUI.DevServer" Version="5.2.132" />
-		<PackageVersion Include="Uno.Resizetizer" Version="1.2.0" />
-		<PackageVersion Include="Uno.WinUI.Lottie" Version="5.2.132" />
-		<PackageVersion Include="Xamarin.Google.Android.Material" Version="1.9.0.3"/>
+		<PackageVersion Include="Uno.WinUI" Version="$(UnoVersion)" />
+		<PackageVersion Include="Uno.WinUI.WebAssembly" Version="$(UnoVersion)" />
+		<PackageVersion Include="Uno.WinUI.Skia.Gtk" Version="$(UnoVersion)" />
+		<PackageVersion Include="Uno.WinUI.DevServer" Version="$(UnoVersion)" />-->
+		<!--<PackageVersion Include="Uno.Resizetizer" Version="1.2.0" />
+		<PackageVersion Include="Uno.WinUI.Lottie" Version="$(UnoVersion)" />-->
+		<!--<PackageVersion Include="Xamarin.Google.Android.Material" Version="1.9.0.3"/>-->
 	</ItemGroup>
 </Project>
--- a/samples/Playground/FixExtensionLibs.targets
+++ b/samples/Playground/FixExtensionLibs.targets
@ -1,17 +0,0 @@
-<Project ToolsVersion="15.0">
-	<Target Name="FixPlaygroundReferences" BeforeTargets="BuildDist">
-		<ItemGroup>
-			<PlaygroundPaths Include="@(ReferenceCopyLocalPaths)" Condition="'%(FileName)%(Extension)'=='Playground.dll'" />
-		</ItemGroup>
-		<PropertyGroup>
-			<PlaygroundLibs>%(PlaygroundPaths.RootDir)%(PlaygroundPaths.Directory)*.WinUI.dll</PlaygroundLibs>
-		</PropertyGroup>
-		<ItemGroup>
-			<FilesToDelete Include="$(PlaygroundLibs)"/>
-		</ItemGroup>
-		<Delete Files="@(FilesToDelete)" >
-			<Output TaskParameter="DeletedFiles" ItemName="DeletedList"/>
-		</Delete>
-		<Message Text="Deleted files: '@(DeletedList)'"/>
-	</Target>
-</Project>
--- a/samples/Playground/NuGet.config
+++ b/samples/Playground/NuGet.config
@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-	<packageSources>
-		<add key="NuGet official package source" value="https://api.nuget.org/v3/index.json" />
-		<add key="uno dev" value="https://pkgs.dev.azure.com/uno-platform/1dd81cbd-cb35-41de-a570-b0df3571a196/_packaging/unoplatformdev/nuget/v3/index.json" />
-	</packageSources>
-</configuration>
--- a/samples/Playground/Playground.Base/AppHead.xaml
+++ b/samples/Playground/Playground.Base/AppHead.xaml
@ -1,17 +0,0 @@
-<local:App x:Class="Playground.AppHead"
-       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-       xmlns:wasm="http://platform.uno/wasm"
-       xmlns:local="using:Playground"
-       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-       mc:Ignorable="wasm">
-
-  <local:App.Resources>
-    <ResourceDictionary>
-      <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="ms-appx:///Playground/AppResources.xaml" />
-      </ResourceDictionary.MergedDictionaries>
-    </ResourceDictionary>
-  </local:App.Resources>
-
-</local:App>
--- a/samples/Playground/Playground.Base/AppHead.xaml.cs
+++ b/samples/Playground/Playground.Base/AppHead.xaml.cs
@ -1,102 +0,0 @@
-using System;
-using Microsoft.Extensions.Logging;
-using Microsoft.UI.Xaml;
-using Uno.Resizetizer;
-
-namespace Playground;
-
-public sealed partial class AppHead : App
-{
-    //static AppHead() =>
-    //    InitializeLogging();
-
-    /// <summary>
-    /// Initializes the singleton application object. This is the first line of authored code
-    /// executed, and as such is the logical equivalent of main() or WinMain().
-    /// </summary>
-    public AppHead()
-    {
-        this.InitializeComponent();
-    }
-
-    /// <summary>
-    /// Invoked when the application is launched normally by the end user.  Other entry points
-    /// will be used such as when the application is launched to open a specific file.
-    /// </summary>
-    /// <param name="args">Details about the launch request and process.</param>
-    protected override void OnLaunched(LaunchActivatedEventArgs args)
-    {
-        base.OnLaunched(args);
-
-        Window.SetWindowIcon();
-    }
-
-//    /// <summary>
-//    /// Configures global Uno Platform logging
-//    /// </summary>
-//    private static void InitializeLogging()
-//    {
-//#if DEBUG
-//        // Logging is disabled by default for release builds, as it incurs a significant
-//        // initialization cost from Microsoft.Extensions.Logging setup. If startup performance
-//        // is a concern for your application, keep this disabled. If you're running on the web or
-//        // desktop targets, you can use URL or command line parameters to enable it.
-//        //
-//        // For more performance documentation: https://platform.uno/docs/articles/Uno-UI-Performance.html
-
-//        var factory = LoggerFactory.Create(builder =>
-//        {
-//#if __WASM__
-//            builder.AddProvider(new global::Uno.Extensions.Logging.WebAssembly.WebAssemblyConsoleLoggerProvider());
-//#elif __IOS__ || __MACCATALYST__
-//            builder.AddProvider(new global::Uno.Extensions.Logging.OSLogLoggerProvider());
-//#elif NETFX_CORE
-//            builder.AddDebug();
-//#else
-//            builder.AddConsole();
-//#endif
-
-//            // Exclude logs below this level
-//            builder.SetMinimumLevel(LogLevel.Information);
-
-//            // Default filters for Uno Platform namespaces
-//            builder.AddFilter("Uno", LogLevel.Warning);
-//            builder.AddFilter("Windows", LogLevel.Warning);
-//            builder.AddFilter("Microsoft", LogLevel.Warning);
-
-//            // Generic Xaml events
-//            // builder.AddFilter("Microsoft.UI.Xaml", LogLevel.Debug );
-//            // builder.AddFilter("Microsoft.UI.Xaml.VisualStateGroup", LogLevel.Debug );
-//            // builder.AddFilter("Microsoft.UI.Xaml.StateTriggerBase", LogLevel.Debug );
-//            // builder.AddFilter("Microsoft.UI.Xaml.UIElement", LogLevel.Debug );
-//            // builder.AddFilter("Microsoft.UI.Xaml.FrameworkElement", LogLevel.Trace );
-
-//            // Layouter specific messages
-//            // builder.AddFilter("Microsoft.UI.Xaml.Controls", LogLevel.Debug );
-//            // builder.AddFilter("Microsoft.UI.Xaml.Controls.Layouter", LogLevel.Debug );
-//            // builder.AddFilter("Microsoft.UI.Xaml.Controls.Panel", LogLevel.Debug );
-
-//            // builder.AddFilter("Windows.Storage", LogLevel.Debug );
-
-//            // Binding related messages
-//            // builder.AddFilter("Microsoft.UI.Xaml.Data", LogLevel.Debug );
-//            // builder.AddFilter("Microsoft.UI.Xaml.Data", LogLevel.Debug );
-
-//            // Binder memory references tracking
-//            // builder.AddFilter("Uno.UI.DataBinding.BinderReferenceHolder", LogLevel.Debug );
-
-//            // DevServer and HotReload related
-//            // builder.AddFilter("Uno.UI.RemoteControl", LogLevel.Information);
-
-//            // Debug JS interop
-//            // builder.AddFilter("Uno.Foundation.WebAssemblyRuntime", LogLevel.Debug );
-//        });
-
-//        global::Uno.Extensions.LogExtensionPoint.AmbientLoggerFactory = factory;
-
-//#if HAS_UNO
-//        global::Uno.UI.Adapter.Microsoft.Extensions.Logging.LoggingAdapter.Initialize();
-//#endif
-//#endif
-//    }
-}
--- a/samples/Playground/Playground.Base/Playground.Base.csproj
+++ b/samples/Playground/Playground.Base/Playground.Base.csproj
@ -1,12 +0,0 @@
-<Project Sdk="Microsoft.Build.NoTargets/3.7.0">
-  <PropertyGroup>
-    <!-- NOTE: The TargetFramework is required by MSBuild but not used as this project is not built. -->
-    <TargetFramework>net8.0</TargetFramework>
-    <EnableDefaultItems>false</EnableDefaultItems>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Include="**\*" Exclude="obj\**;bin\**;*.csproj" />
-    <None Update="AppHead.xaml.cs" DependentUpon="AppHead.xaml" />
-  </ItemGroup>
-</Project>
--- a/samples/Playground/Playground.Base/base.props
+++ b/samples/Playground/Playground.Base/base.props
@ -1,30 +0,0 @@
-<Project>
-  <ItemGroup>
-    <PackageReference Include="Uno.Resizetizer" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Include="$(MSBuildThisFileDirectory)AppHead.xaml" />
-    <ApplicationDefinition Include="$(MSBuildThisFileDirectory)AppHead.xaml"
-                SubType="Designer"
-                XamlRuntime="WinUI"
-                Generator="MSBuild:Compile"
-                Link="AppHead.xaml" />
-    <Compile Include="$(MSBuildThisFileDirectory)AppHead.xaml.cs"
-        XamlRuntime="WinUI"
-        DependentUpon="AppHead.xaml"
-        Link="AppHead.xaml.cs" />
-    <UnoIcon Include="$(MSBuildThisFileDirectory)Icons\iconapp.svg"
-        ForegroundFile="$(MSBuildThisFileDirectory)Icons\appconfig.svg"
-        ForegroundScale="0.65"
-        Color="#00000000" />
-    <UnoSplashScreen
-      Include="$(MSBuildThisFileDirectory)Splash\splash_screen.svg"
-      BaseSize="128,128"
-      Color="#FFFFFF" />
-    <!-- NOTE: Files explicitly linked to display in the head projects for clarity. -->
-    <None Include="$(MSBuildThisFileDirectory)Icons\iconapp.svg" Link="Icons\iconapp.svg" />
-    <None Include="$(MSBuildThisFileDirectory)Icons\appconfig.svg" Link="Icons\appconfig.svg" />
-    <None Include="$(MSBuildThisFileDirectory)Splash\splash_screen.svg" Link="Splash\splash_screen.svg" />
-  </ItemGroup>
-</Project>
--- a/samples/Playground/Playground.Mobile/Playground.Mobile.csproj
+++ b/samples/Playground/Playground.Mobile/Playground.Mobile.csproj
@ -1,75 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
-    <TargetFrameworks Condition="'$(OverrideTargetFrameworks)'!=''">$(OverrideTargetFrameworks)</TargetFrameworks>
-    <SingleProject>true</SingleProject>
-    <OutputType>Exe</OutputType>
-    <!-- Display name -->
-    <ApplicationTitle>Playground</ApplicationTitle>
-    <!-- App Identifier -->
-    <ApplicationId>com.companyname.playground</ApplicationId>
-    <ApplicationIdGuid>BBF94DC4-F02C-4EA7-A85B-781809BE53D7</ApplicationIdGuid>
-    <!-- Versions -->
-    <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
-    <ApplicationVersion>1</ApplicationVersion>
-
-    <AndroidManifest>Android\AndroidManifest.xml</AndroidManifest>
-
-    <!-- Debugger workaround https://github.com/dotnet/maui-samples/blob/8aa6b8780b12e97b157514c3bdc54bb4a13001cd/HelloMacCatalyst/HelloMacCatalyst.csproj#L7 -->
-    <!-- <MtouchExtraArgs Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">$(MtouchExtraArgs) -setenv:MONO_THREADS_SUSPEND=preemptive</MtouchExtraArgs> -->
-    <!-- Required for C# Hot Reload -->
-    <UseInterpreter Condition="'$(Configuration)' == 'Debug' and $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) != 'maccatalyst'">True</UseInterpreter>
-    <IsUnoHead>true</IsUnoHead>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Uno.WinUI" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" />
-    <PackageReference Include="Uno.Extensions.Logging.OSLog" />
-    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" />
-    <PackageReference Include="Uno.WinUI.DevServer" Condition="'$(Configuration)'=='Debug'" />
-  </ItemGroup>
-  <Choose>
-    <When Condition="$(IsAndroid)">
-      <ItemGroup>
-
-        <PackageReference Include="Xamarin.Google.Android.Material" />
-        <PackageReference Include="Uno.UniversalImageLoader" />
-      </ItemGroup>
-      <ItemGroup>
-        <AndroidEnvironment Include="Android/environment.conf" />
-      </ItemGroup>
-    </When>
-    <When Condition="$(IsIOS)">
-      <PropertyGroup>
-        <MtouchExtraArgs>$(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep</MtouchExtraArgs>
-        <!-- See https://github.com/unoplatform/uno/issues/9430 for more details. -->
-        <MtouchExtraArgs>$(MtouchExtraArgs) --registrar:static</MtouchExtraArgs>
-        <RuntimeIdentifier Condition="'$(RuntimeIdentifier)'==''">iossimulator-x64</RuntimeIdentifier>
-      </PropertyGroup>
-      <PropertyGroup Condition="'$(Configuration)'=='Release'">
-        <!-- https://github.com/xamarin/xamarin-macios/issues/14812 -->
-        <MtouchExtraArgs>$(MtouchExtraArgs) --marshal-objectivec-exceptions:disable</MtouchExtraArgs>
-      </PropertyGroup>
-    </When>
-    <When Condition="$(IsMacCatalyst)">
-      <PropertyGroup>
-        <!-- Configure the GC -->
-        <MtouchExtraArgs>$(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep</MtouchExtraArgs>
-        <!-- Required for unknown crash as of .NET 6 Mobile Preview 13 -->
-        <MtouchExtraArgs>$(MtouchExtraArgs) --registrar:static</MtouchExtraArgs>
-        <!-- Full globalization is required for Uno -->
-        <InvariantGlobalization>false</InvariantGlobalization>
-        <RuntimeIdentifier Condition="'$(RuntimeIdentifier)'==''">maccatalyst-x64</RuntimeIdentifier>
-      </PropertyGroup>
-      <PropertyGroup Condition="'$(Configuration)'=='Release'">
-        <!-- https://github.com/xamarin/xamarin-macios/issues/14812 -->
-        <MtouchExtraArgs>$(MtouchExtraArgs) --marshal-objectivec-exceptions:disable</MtouchExtraArgs>
-      </PropertyGroup>
-    </When>
-  </Choose>
-  <ItemGroup>
-    <ProjectReference Include="..\Playground\Playground.csproj" />
-  </ItemGroup>
-  <Import Project="..\Playground.Base\base.props" />
-</Project>
--- a/samples/Playground/Playground.Skia.Gtk/Playground.Skia.Gtk.csproj
+++ b/samples/Playground/Playground.Skia.Gtk/Playground.Skia.Gtk.csproj
@ -1,32 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType Condition="'$(Configuration)'=='Release'">WinExe</OutputType>
-    <OutputType Condition="'$(Configuration)'=='Debug'">Exe</OutputType>
-    <TargetFramework>net8.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.DevServer" Condition="'$(Configuration)'=='Debug'" />-->
-    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" />
-  </ItemGroup>
-
-	<ItemGroup>
-    <ProjectReference Include="..\Playground\Playground.csproj" />
-
-		<ProjectReference Include="..\..\..\src\Uno.Extensions.Hosting.UI\Uno.Extensions.Hosting.WinUI.Skia.csproj" />
-		<ProjectReference Include="..\..\..\src\Uno.Extensions.Logging\Uno.Extensions.Logging.WinUI.Skia.csproj" />
-	</ItemGroup>
-	
-  <Import Project="..\Playground.Base\base.props" />
-
-	<Import Project="..\FixExtensionLibs.targets" />
-</Project>
--- a/samples/Playground/Playground.Skia.Gtk/Program.cs
+++ b/samples/Playground/Playground.Skia.Gtk/Program.cs
@ -1,21 +0,0 @@
-using System;
-using GLib;
-using Uno.UI.Runtime.Skia.Gtk;
-
-namespace Playground.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();
-    }
-}
--- a/samples/Playground/Playground.Skia.Gtk/app.manifest
+++ b/samples/Playground/Playground.Skia.Gtk/app.manifest
@ -1,77 +0,0 @@
-<?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="Playground.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>
--- a/samples/Playground/Playground.Wasm/Playground.Wasm.csproj
+++ b/samples/Playground/Playground.Wasm/Playground.Wasm.csproj
@ -1,77 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-	<PropertyGroup>
-		<OutputType>Exe</OutputType>
-		<TargetFramework>net8.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>
-		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-	</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.DevServer" Condition="'$(Configuration)'=='Debug'" />
-		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" />
-		<PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<ProjectReference Include="..\Playground\Playground.csproj" />
-		<ProjectReference Include="..\..\..\src\Uno.Extensions.Hosting.UI\Uno.Extensions.Hosting.WinUI.Wasm.csproj" />
-		<ProjectReference Include="..\..\..\src\Uno.Extensions.Logging\Uno.Extensions.Logging.WinUI.Wasm.csproj" />
-	</ItemGroup>
-
-	<Import Project="..\Playground.Base\base.props" />
-
-	<Import Project="..\FixExtensionLibs.targets" />
-</Project>
--- a/samples/Playground/Playground.Windows/Playground.Windows.csproj
+++ b/samples/Playground/Playground.Windows/Playground.Windows.csproj
@ -1,78 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
-    <RootNamespace>Playground.Windows</RootNamespace>
-    <ApplicationManifest>app.manifest</ApplicationManifest>
-    <Platforms>x86;x64;arm64</Platforms>
-    <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
-    <PublishProfile>win-$(Platform).pubxml</PublishProfile>
-    <UseWinUI>true</UseWinUI>
-    <EnableMsixTooling>true</EnableMsixTooling>
-    <!-- Bundles the WinAppSDK binaries -->
-    <WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
-
-    <!-- <SelfContained>true</SelfContained> -->
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Content Include="Images\**" />
-    <Manifest Include="$(ApplicationManifest)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Uno.WinUI" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" />
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" />
-    <PackageReference Include="Uno.Core.Extensions.Logging.Singleton" />
-    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <!--
-    If you encounter this error message:
-
-      error NETSDK1148: A referenced assembly was compiled using a newer version of Microsoft.Windows.SDK.NET.dll.
-      Please update to a newer .NET SDK in order to reference this assembly.
-
-    This means that the two packages below must be aligned with the "build" version number of
-    the "Microsoft.Windows.SDK.BuildTools" package above, and the "revision" version number
-    must be the highest found in https://www.nuget.org/packages/Microsoft.Windows.SDK.NET.Ref.
-    -->
-    <!-- <FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.22621.28" />
-    <FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.22621.28" /> -->
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Playground\Playground.csproj" />
-  </ItemGroup>
-
-  <!--
-    Defining the "Msix" ProjectCapability here allows the Single-project MSIX Packaging
-    Tools extension to be activated for this project even if the Windows App SDK Nuget
-    package has not yet been restored.
-  -->
-  <ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
-    <ProjectCapability Include="Msix"/>
-  </ItemGroup>
-
-  <!--
-    Defining the "HasPackageAndPublishMenuAddedByProject" property here allows the Solution
-    Explorer "Package and Publish" context menu entry to be enabled for this project even if
-    the Windows App SDK Nuget package has not yet been restored.
-  -->
-  <PropertyGroup Condition="'$(DisableHasPackageAndPublishMenuAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
-    <HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>
-  </PropertyGroup>
-
-  <Import Project="..\Playground.Base\base.props" />
-
-	<Target Name="WorkaroundSkiaWasmTargets" AfterTargets="ResolveProjectReferences">
-		<ItemGroup>
-			<_ResolvedProjectReferencePathsToRemove Include="@(_ResolvedProjectReferencePaths)" Condition="'%(_ResolvedProjectReferencePaths.OriginalItemSpec)'=='Uno.Extensions.Hosting.WinUI.Skia.csproj' or '%(_ResolvedProjectReferencePaths.OriginalItemSpec)'=='Uno.Extensions.Hosting.WinUI.Wasm.csproj'" />
-			<_ResolvedProjectReferencePaths Remove="@(_ResolvedProjectReferencePathsToRemove)" />
-		</ItemGroup>
-		<Message Importance="high" Text="Removed incorrect references: @(_ResolvedProjectReferencePathsToRemove)" />
-	</Target>
-</Project>
--- a/samples/Playground/Playground.Windows/Properties/PublishProfiles/win-arm64.pubxml
+++ b/samples/Playground/Playground.Windows/Properties/PublishProfiles/win-arm64.pubxml
@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121.
-->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<PropertyGroup>
-		<PublishProtocol>FileSystem</PublishProtocol>
-		<Platform>arm64</Platform>
-		<RuntimeIdentifier>win-arm64</RuntimeIdentifier>
-		<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
-		<SelfContained>true</SelfContained>
-		<PublishSingleFile>False</PublishSingleFile>
-		<PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
-		<PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">False</PublishReadyToRun>
-		<!-- Note: Trimming disabled by default as there may still be an issues with PublishTrimmed support: https://github.com/microsoft/CsWinRT/issues/373 -->
-		<!-- 
-		<PublishTrimmed Condition="'$(Configuration)' != 'Debug'">True</PublishTrimmed>
-		<TrimMode>partial</TrimMode>
-		<SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings> 
-		-->
-	</PropertyGroup>
-</Project>
--- a/samples/Playground/Playground.Windows/Properties/PublishProfiles/win-x64.pubxml
+++ b/samples/Playground/Playground.Windows/Properties/PublishProfiles/win-x64.pubxml
@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121.
-->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<PropertyGroup>
-		<PublishProtocol>FileSystem</PublishProtocol>
-		<Platform>x64</Platform>
-		<RuntimeIdentifier>win-x64</RuntimeIdentifier>
-		<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
-		<SelfContained>true</SelfContained>
-		<PublishSingleFile>False</PublishSingleFile>
-		<PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
-		<PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">False</PublishReadyToRun>
-		<!-- Note: Trimming disabled by default as there may still be an issues with PublishTrimmed support: https://github.com/microsoft/CsWinRT/issues/373 -->
-		<!-- 
-		<PublishTrimmed Condition="'$(Configuration)' != 'Debug'">True</PublishTrimmed>
-		<TrimMode>partial</TrimMode>
-		<SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings> 
-		-->
-	</PropertyGroup>
-</Project>
--- a/samples/Playground/Playground.Windows/Properties/PublishProfiles/win-x86.pubxml
+++ b/samples/Playground/Playground.Windows/Properties/PublishProfiles/win-x86.pubxml
@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121.
-->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<PropertyGroup>
-		<PublishProtocol>FileSystem</PublishProtocol>
-		<Platform>x86</Platform>
-		<RuntimeIdentifier>win-x86</RuntimeIdentifier>
-		<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
-		<SelfContained>true</SelfContained>
-		<PublishSingleFile>False</PublishSingleFile>
-		<PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
-		<PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">False</PublishReadyToRun>
-		<!-- Note: Trimming disabled by default as there may still be an issues with PublishTrimmed support: https://github.com/microsoft/CsWinRT/issues/373 -->
-		<!-- 
-		<PublishTrimmed Condition="'$(Configuration)' != 'Debug'">True</PublishTrimmed>
-		<TrimMode>partial</TrimMode>
-		<SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings> 
-		-->
-	</PropertyGroup>
-</Project>
--- a/samples/Playground/Playground.Windows/Properties/launchSettings.json
+++ b/samples/Playground/Playground.Windows/Properties/launchSettings.json
@ -1,10 +0,0 @@
-{
-  "profiles": {
-	"Playground.Windows (Package)": {
-	  "commandName": "MsixPackage"
-	},
-	"Playground.Windows (Unpackaged)": {
-	  "commandName": "Project"
-	}
-  }
-}
--- a/samples/Playground/Playground.Windows/Resources.lang-en-us.resw
+++ b/samples/Playground/Playground.Windows/Resources.lang-en-us.resw
@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Placeholder" xml:space="preserve">
-    <value>Hello World!</value>
-  </data>
-</root>
--- a/samples/Playground/Playground.sln
+++ b/samples/Playground/Playground.sln
@ -3,12 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.1.31911.260
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platforms", "Platforms", "{DD8F5097-D88A-403A-A20C-B22242F46A2D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Playground.Wasm", "Playground.Wasm\Playground.Wasm.csproj", "{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Playground.Skia.Gtk", "Playground.Skia.Gtk\Playground.Skia.Gtk.csproj", "{7034CDEC-7056-4E65-A043-A380582CFBD0}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "App", "App", "{9FDE6A95-7086-43A9-A909-74C2FE64B509}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions", "Extensions", "{F9372730-80BC-47B6-9E23-B5F69E36768F}"
@ -65,16 +59,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Localization
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Reactive.WinUI", "..\..\src\Uno.Extensions.Reactive.UI\Uno.Extensions.Reactive.WinUI.csproj", "{150F3B28-7E00-4A65-AAD5-46506610DCF0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Playground.Windows", "Playground.Windows\Playground.Windows.csproj", "{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Hosting.WinUI.Skia", "..\..\src\Uno.Extensions.Hosting.UI\Uno.Extensions.Hosting.WinUI.Skia.csproj", "{1B8A646F-B5D9-4110-A481-7218585ACB21}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Hosting.WinUI.Wasm", "..\..\src\Uno.Extensions.Hosting.UI\Uno.Extensions.Hosting.WinUI.Wasm.csproj", "{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Logging.WinUI.Skia", "..\..\src\Uno.Extensions.Logging\Uno.Extensions.Logging.WinUI.Skia.csproj", "{629D3004-86DA-4F3C-B47A-8B90E9120422}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Logging.WinUI.Wasm", "..\..\src\Uno.Extensions.Logging\Uno.Extensions.Logging.WinUI.Wasm.csproj", "{73DBA5A0-72B7-4E28-B721-05734D47E9B0}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Storage", "Storage", "{35B2CF6C-0902-4B39-98AA-0A9F2DB0A5D2}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Storage", "..\..\src\Uno.Extensions.Storage\Uno.Extensions.Storage.csproj", "{2397A664-9140-45E6-BEC0-6E975FCC31D1}"
@ -90,8 +74,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Playground Items", "Playgro
 		Directory.Build.props = Directory.Build.props
 		Directory.Build.targets = Directory.Build.targets
 		Directory.Packages.props = Directory.Packages.props
-		FixExtensionLibs.targets = FixExtensionLibs.targets
-		global.json = global.json
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extension Items", "Extension Items", "{30438887-3F13-49ED-AA19-EBB0531C27E1}"
@ -116,12 +98,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Navigation.G
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Extensions.Http.WinUI", "..\..\src\Uno.Extensions.Http.UI\Uno.Extensions.Http.WinUI.csproj", "{743182C8-6956-4182-A868-DF7003B82032}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Playground.Base", "Playground.Base\Playground.Base.csproj", "{77081268-55C2-46C4-9CD3-5AE4A72A2F56}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Playground", "Playground\Playground.csproj", "{13C1A52F-E012-4052-AC85-FEAC1E76EB13}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Playground.Mobile", "Playground.Mobile\Playground.Mobile.csproj", "{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
@ -154,113 +132,6 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.Ad-Hoc|ARM64.ActiveCfg = Debug|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.Ad-Hoc|ARM64.Build.0 = Debug|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.AppStore|ARM.ActiveCfg = Debug|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.AppStore|ARM.Build.0 = Debug|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.AppStore|ARM64.ActiveCfg = Debug|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.AppStore|ARM64.Build.0 = Debug|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.AppStore|x64.ActiveCfg = Debug|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.AppStore|x64.Build.0 = Debug|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.AppStore|x86.ActiveCfg = Debug|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.AppStore|x86.Build.0 = Debug|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.Debug|ARM.Build.0 = Debug|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.Debug|x64.Build.0 = Debug|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.Debug|x86.Build.0 = Debug|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.Release|ARM.ActiveCfg = Release|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.Release|ARM.Build.0 = Release|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.Release|ARM64.Build.0 = Release|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.Release|iPhone.Build.0 = Release|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.Release|x64.ActiveCfg = Release|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.Release|x64.Build.0 = Release|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.Release|x86.ActiveCfg = Release|Any CPU
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9}.Release|x86.Build.0 = Release|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.Ad-Hoc|ARM64.ActiveCfg = Debug|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.Ad-Hoc|ARM64.Build.0 = Debug|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.AppStore|ARM.ActiveCfg = Debug|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.AppStore|ARM.Build.0 = Debug|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.AppStore|ARM64.ActiveCfg = Debug|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.AppStore|ARM64.Build.0 = Debug|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.AppStore|x64.ActiveCfg = Debug|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.AppStore|x64.Build.0 = Debug|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.AppStore|x86.ActiveCfg = Debug|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.AppStore|x86.Build.0 = Debug|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.Debug|ARM.Build.0 = Debug|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.Release|ARM.ActiveCfg = Release|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.Release|ARM.Build.0 = Release|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.Release|ARM64.Build.0 = Release|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.Release|iPhone.Build.0 = Release|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.Release|x64.ActiveCfg = Release|Any CPU
-		{7034CDEC-7056-4E65-A043-A380582CFBD0}.Release|x86.ActiveCfg = Release|Any CPU
 		{2D9A6E78-8BD9-4984-A7BC-A6AEC1858575}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
 		{2D9A6E78-8BD9-4984-A7BC-A6AEC1858575}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
 		{2D9A6E78-8BD9-4984-A7BC-A6AEC1858575}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
@ -1269,314 +1140,6 @@ Global
 		{150F3B28-7E00-4A65-AAD5-46506610DCF0}.Release|x64.Build.0 = Release|Any CPU
 		{150F3B28-7E00-4A65-AAD5-46506610DCF0}.Release|x86.ActiveCfg = Release|Any CPU
 		{150F3B28-7E00-4A65-AAD5-46506610DCF0}.Release|x86.Build.0 = Release|Any CPU
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Ad-Hoc|Any CPU.ActiveCfg = Debug|x86
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Ad-Hoc|Any CPU.Build.0 = Debug|x86
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Ad-Hoc|Any CPU.Deploy.0 = Debug|x86
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Ad-Hoc|ARM.ActiveCfg = Debug|x86
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Ad-Hoc|ARM.Build.0 = Debug|x86
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Ad-Hoc|ARM.Deploy.0 = Debug|x86
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Ad-Hoc|ARM64.ActiveCfg = Debug|arm64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Ad-Hoc|ARM64.Build.0 = Debug|arm64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Ad-Hoc|ARM64.Deploy.0 = Debug|arm64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Ad-Hoc|iPhone.ActiveCfg = Debug|x86
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Ad-Hoc|iPhone.Build.0 = Debug|x86
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Ad-Hoc|iPhone.Deploy.0 = Debug|x86
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|x86
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|x86
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Debug|x86
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Ad-Hoc|x64.ActiveCfg = Debug|x64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Ad-Hoc|x64.Build.0 = Debug|x64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Ad-Hoc|x64.Deploy.0 = Debug|x64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Ad-Hoc|x86.ActiveCfg = Debug|x86
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Ad-Hoc|x86.Build.0 = Debug|x86
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Ad-Hoc|x86.Deploy.0 = Debug|x86
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.AppStore|Any CPU.ActiveCfg = Debug|x86
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.AppStore|Any CPU.Build.0 = Debug|x86
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.AppStore|Any CPU.Deploy.0 = Debug|x86
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.AppStore|ARM.ActiveCfg = Debug|x86
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.AppStore|ARM.Build.0 = Debug|x86
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.AppStore|ARM.Deploy.0 = Debug|x86
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.AppStore|ARM64.ActiveCfg = Debug|arm64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.AppStore|ARM64.Build.0 = Debug|arm64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.AppStore|ARM64.Deploy.0 = Debug|arm64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.AppStore|iPhone.ActiveCfg = Debug|x86
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.AppStore|iPhone.Build.0 = Debug|x86
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.AppStore|iPhone.Deploy.0 = Debug|x86
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.AppStore|iPhoneSimulator.ActiveCfg = Debug|x86
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.AppStore|iPhoneSimulator.Build.0 = Debug|x86
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.AppStore|iPhoneSimulator.Deploy.0 = Debug|x86
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.AppStore|x64.ActiveCfg = Debug|x64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.AppStore|x64.Build.0 = Debug|x64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.AppStore|x64.Deploy.0 = Debug|x64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.AppStore|x86.ActiveCfg = Debug|x86
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.AppStore|x86.Build.0 = Debug|x86
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.AppStore|x86.Deploy.0 = Debug|x86
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Debug|Any CPU.Build.0 = Debug|x64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Debug|Any CPU.Deploy.0 = Debug|x64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Debug|ARM.ActiveCfg = Debug|x64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Debug|ARM.Build.0 = Debug|x64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Debug|ARM.Deploy.0 = Debug|x64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Debug|ARM64.ActiveCfg = Debug|arm64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Debug|ARM64.Build.0 = Debug|arm64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Debug|ARM64.Deploy.0 = Debug|arm64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Debug|iPhone.ActiveCfg = Debug|x64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Debug|iPhone.Build.0 = Debug|x64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Debug|iPhone.Deploy.0 = Debug|x64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Debug|iPhoneSimulator.ActiveCfg = Debug|x64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Debug|iPhoneSimulator.Build.0 = Debug|x64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Debug|iPhoneSimulator.Deploy.0 = Debug|x64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Debug|x64.ActiveCfg = Debug|x64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Debug|x64.Build.0 = Debug|x64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Debug|x64.Deploy.0 = Debug|x64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Debug|x86.ActiveCfg = Debug|x86
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Debug|x86.Build.0 = Debug|x86
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Debug|x86.Deploy.0 = Debug|x86
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Release|Any CPU.ActiveCfg = Release|x64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Release|Any CPU.Build.0 = Release|x64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Release|Any CPU.Deploy.0 = Release|x64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Release|ARM.ActiveCfg = Release|x64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Release|ARM.Build.0 = Release|x64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Release|ARM.Deploy.0 = Release|x64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Release|ARM64.ActiveCfg = Release|arm64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Release|ARM64.Build.0 = Release|arm64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Release|ARM64.Deploy.0 = Release|arm64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Release|iPhone.ActiveCfg = Release|x64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Release|iPhone.Build.0 = Release|x64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Release|iPhone.Deploy.0 = Release|x64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Release|iPhoneSimulator.ActiveCfg = Release|x64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Release|iPhoneSimulator.Build.0 = Release|x64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Release|iPhoneSimulator.Deploy.0 = Release|x64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Release|x64.ActiveCfg = Release|x64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Release|x64.Build.0 = Release|x64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Release|x64.Deploy.0 = Release|x64
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Release|x86.ActiveCfg = Release|x86
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Release|x86.Build.0 = Release|x86
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0}.Release|x86.Deploy.0 = Release|x86
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.Ad-Hoc|ARM64.ActiveCfg = Debug|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.Ad-Hoc|ARM64.Build.0 = Debug|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.AppStore|ARM.ActiveCfg = Debug|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.AppStore|ARM.Build.0 = Debug|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.AppStore|ARM64.ActiveCfg = Debug|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.AppStore|ARM64.Build.0 = Debug|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.AppStore|x64.ActiveCfg = Debug|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.AppStore|x64.Build.0 = Debug|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.AppStore|x86.ActiveCfg = Debug|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.AppStore|x86.Build.0 = Debug|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.Debug|ARM.Build.0 = Debug|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.Debug|x64.Build.0 = Debug|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.Debug|x86.Build.0 = Debug|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.Release|ARM.ActiveCfg = Release|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.Release|ARM.Build.0 = Release|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.Release|ARM64.Build.0 = Release|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.Release|iPhone.Build.0 = Release|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.Release|x64.ActiveCfg = Release|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.Release|x64.Build.0 = Release|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.Release|x86.ActiveCfg = Release|Any CPU
-		{1B8A646F-B5D9-4110-A481-7218585ACB21}.Release|x86.Build.0 = Release|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.Ad-Hoc|ARM64.ActiveCfg = Debug|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.Ad-Hoc|ARM64.Build.0 = Debug|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.AppStore|ARM.ActiveCfg = Debug|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.AppStore|ARM.Build.0 = Debug|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.AppStore|ARM64.ActiveCfg = Debug|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.AppStore|ARM64.Build.0 = Debug|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.AppStore|x64.ActiveCfg = Debug|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.AppStore|x64.Build.0 = Debug|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.AppStore|x86.ActiveCfg = Debug|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.AppStore|x86.Build.0 = Debug|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.Debug|ARM.Build.0 = Debug|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.Debug|x64.Build.0 = Debug|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.Debug|x86.Build.0 = Debug|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.Release|ARM.ActiveCfg = Release|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.Release|ARM.Build.0 = Release|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.Release|ARM64.Build.0 = Release|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.Release|iPhone.Build.0 = Release|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.Release|x64.ActiveCfg = Release|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.Release|x64.Build.0 = Release|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.Release|x86.ActiveCfg = Release|Any CPU
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD}.Release|x86.Build.0 = Release|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.Ad-Hoc|ARM64.ActiveCfg = Debug|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.Ad-Hoc|ARM64.Build.0 = Debug|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.AppStore|ARM.ActiveCfg = Debug|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.AppStore|ARM.Build.0 = Debug|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.AppStore|ARM64.ActiveCfg = Debug|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.AppStore|ARM64.Build.0 = Debug|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.AppStore|x64.ActiveCfg = Debug|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.AppStore|x64.Build.0 = Debug|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.AppStore|x86.ActiveCfg = Debug|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.AppStore|x86.Build.0 = Debug|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.Debug|ARM.Build.0 = Debug|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.Debug|x64.Build.0 = Debug|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.Debug|x86.Build.0 = Debug|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.Release|Any CPU.Build.0 = Release|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.Release|ARM.ActiveCfg = Release|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.Release|ARM.Build.0 = Release|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.Release|ARM64.Build.0 = Release|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.Release|iPhone.Build.0 = Release|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.Release|x64.ActiveCfg = Release|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.Release|x64.Build.0 = Release|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.Release|x86.ActiveCfg = Release|Any CPU
-		{629D3004-86DA-4F3C-B47A-8B90E9120422}.Release|x86.Build.0 = Release|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.Ad-Hoc|ARM64.ActiveCfg = Debug|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.Ad-Hoc|ARM64.Build.0 = Debug|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.AppStore|ARM.ActiveCfg = Debug|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.AppStore|ARM.Build.0 = Debug|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.AppStore|ARM64.ActiveCfg = Debug|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.AppStore|ARM64.Build.0 = Debug|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.AppStore|x64.ActiveCfg = Debug|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.AppStore|x64.Build.0 = Debug|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.AppStore|x86.ActiveCfg = Debug|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.AppStore|x86.Build.0 = Debug|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.Debug|ARM.Build.0 = Debug|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.Debug|x64.Build.0 = Debug|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.Debug|x86.Build.0 = Debug|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.Release|ARM.ActiveCfg = Release|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.Release|ARM.Build.0 = Release|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.Release|ARM64.Build.0 = Release|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.Release|iPhone.Build.0 = Release|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.Release|x64.ActiveCfg = Release|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.Release|x64.Build.0 = Release|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.Release|x86.ActiveCfg = Release|Any CPU
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0}.Release|x86.Build.0 = Release|Any CPU
 		{2397A664-9140-45E6-BEC0-6E975FCC31D1}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
 		{2397A664-9140-45E6-BEC0-6E975FCC31D1}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
 		{2397A664-9140-45E6-BEC0-6E975FCC31D1}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
@ -2081,62 +1644,6 @@ Global
 		{743182C8-6956-4182-A868-DF7003B82032}.Release|x64.Build.0 = Release|Any CPU
 		{743182C8-6956-4182-A868-DF7003B82032}.Release|x86.ActiveCfg = Release|Any CPU
 		{743182C8-6956-4182-A868-DF7003B82032}.Release|x86.Build.0 = Release|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.Ad-Hoc|ARM64.ActiveCfg = Debug|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.Ad-Hoc|ARM64.Build.0 = Debug|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.AppStore|ARM.ActiveCfg = Debug|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.AppStore|ARM.Build.0 = Debug|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.AppStore|ARM64.ActiveCfg = Debug|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.AppStore|ARM64.Build.0 = Debug|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.AppStore|x64.ActiveCfg = Debug|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.AppStore|x64.Build.0 = Debug|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.AppStore|x86.ActiveCfg = Debug|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.AppStore|x86.Build.0 = Debug|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.Debug|ARM.Build.0 = Debug|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.Debug|x64.Build.0 = Debug|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.Debug|x86.Build.0 = Debug|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.Release|Any CPU.Build.0 = Release|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.Release|ARM.ActiveCfg = Release|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.Release|ARM.Build.0 = Release|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.Release|ARM64.Build.0 = Release|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.Release|iPhone.Build.0 = Release|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.Release|x64.ActiveCfg = Release|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.Release|x64.Build.0 = Release|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.Release|x86.ActiveCfg = Release|Any CPU
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56}.Release|x86.Build.0 = Release|Any CPU
 		{13C1A52F-E012-4052-AC85-FEAC1E76EB13}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
 		{13C1A52F-E012-4052-AC85-FEAC1E76EB13}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
 		{13C1A52F-E012-4052-AC85-FEAC1E76EB13}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
@ -2193,70 +1700,11 @@ Global
 		{13C1A52F-E012-4052-AC85-FEAC1E76EB13}.Release|x64.Build.0 = Release|Any CPU
 		{13C1A52F-E012-4052-AC85-FEAC1E76EB13}.Release|x86.ActiveCfg = Release|Any CPU
 		{13C1A52F-E012-4052-AC85-FEAC1E76EB13}.Release|x86.Build.0 = Release|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.Ad-Hoc|ARM64.ActiveCfg = Debug|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.Ad-Hoc|ARM64.Build.0 = Debug|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.AppStore|ARM.ActiveCfg = Debug|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.AppStore|ARM.Build.0 = Debug|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.AppStore|ARM64.ActiveCfg = Debug|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.AppStore|ARM64.Build.0 = Debug|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.AppStore|x64.ActiveCfg = Debug|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.AppStore|x64.Build.0 = Debug|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.AppStore|x86.ActiveCfg = Debug|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.AppStore|x86.Build.0 = Debug|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.Debug|ARM.Build.0 = Debug|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.Debug|x64.Build.0 = Debug|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.Debug|x86.Build.0 = Debug|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.Release|ARM.ActiveCfg = Release|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.Release|ARM.Build.0 = Release|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.Release|ARM64.Build.0 = Release|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.Release|iPhone.Build.0 = Release|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.Release|x64.ActiveCfg = Release|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.Release|x64.Build.0 = Release|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.Release|x86.ActiveCfg = Release|Any CPU
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{DD8F5097-D88A-403A-A20C-B22242F46A2D} = {9FDE6A95-7086-43A9-A909-74C2FE64B509}
-		{0C7A4B61-D7C6-48F8-83B6-D7CFA896B8C9} = {DD8F5097-D88A-403A-A20C-B22242F46A2D}
-		{7034CDEC-7056-4E65-A043-A380582CFBD0} = {DD8F5097-D88A-403A-A20C-B22242F46A2D}
 		{2D9A6E78-8BD9-4984-A7BC-A6AEC1858575} = {F9372730-80BC-47B6-9E23-B5F69E36768F}
 		{CEB64E09-4FD8-4C4E-8D8E-28E15B21F907} = {F9372730-80BC-47B6-9E23-B5F69E36768F}
 		{5FCADC5A-D736-49DE-BE7E-387875A8A9A1} = {F9372730-80BC-47B6-9E23-B5F69E36768F}
@ -2283,11 +1731,6 @@ Global
 		{9A0928BA-4F74-4A38-B616-7C859C5AD7FC} = {A7450AE8-53E1-4AD2-8E3A-4BF626269DC0}
 		{71D7E1C9-892D-49E7-AAB8-F841C15A2B96} = {E8426A49-E2F8-4310-9C70-1DEC12D5F4AB}
 		{150F3B28-7E00-4A65-AAD5-46506610DCF0} = {1968095E-5A42-45DE-904F-31F13A19CB02}
-		{1EFB7B93-88D1-4F14-B335-BAB42A49FAF0} = {DD8F5097-D88A-403A-A20C-B22242F46A2D}
-		{1B8A646F-B5D9-4110-A481-7218585ACB21} = {5FCADC5A-D736-49DE-BE7E-387875A8A9A1}
-		{9ADF91EF-5C89-4BFD-825F-5AD8F484E3DD} = {5FCADC5A-D736-49DE-BE7E-387875A8A9A1}
-		{629D3004-86DA-4F3C-B47A-8B90E9120422} = {221EBB25-C407-4172-9696-9C389F259BED}
-		{73DBA5A0-72B7-4E28-B721-05734D47E9B0} = {221EBB25-C407-4172-9696-9C389F259BED}
 		{35B2CF6C-0902-4B39-98AA-0A9F2DB0A5D2} = {F9372730-80BC-47B6-9E23-B5F69E36768F}
 		{2397A664-9140-45E6-BEC0-6E975FCC31D1} = {35B2CF6C-0902-4B39-98AA-0A9F2DB0A5D2}
 		{AEE62EC1-6694-48FA-A770-BA103DC05865} = {35B2CF6C-0902-4B39-98AA-0A9F2DB0A5D2}
@ -2300,16 +1743,9 @@ Global
 		{0706A3E8-9DB3-4344-979B-376CD04D76B9} = {F9372730-80BC-47B6-9E23-B5F69E36768F}
 		{B4F14C65-EC7C-4641-81A6-576BA122E8C2} = {A7450AE8-53E1-4AD2-8E3A-4BF626269DC0}
 		{743182C8-6956-4182-A868-DF7003B82032} = {FA19ECB8-E725-4AFB-9DF8-E387B7AD12CE}
-		{77081268-55C2-46C4-9CD3-5AE4A72A2F56} = {DD8F5097-D88A-403A-A20C-B22242F46A2D}
 		{13C1A52F-E012-4052-AC85-FEAC1E76EB13} = {9FDE6A95-7086-43A9-A909-74C2FE64B509}
-		{2B47D53E-045E-4C51-A5C8-6BC8A81599A4} = {DD8F5097-D88A-403A-A20C-B22242F46A2D}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {1A645832-60E5-4DA0-9EE7-69F7E34333DC}
 	EndGlobalSection
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		Playground.Shared\Playground.Shared.projitems*{0c7a4b61-d7c6-48f8-83b6-d7cfa896b8c9}*SharedItemsImports = 5
-		Playground.Shared\Playground.Shared.projitems*{1efb7b93-88d1-4f14-b335-bab42a49faf0}*SharedItemsImports = 5
-		Playground.Shared\Playground.Shared.projitems*{7034cdec-7056-4e65-a043-a380582cfbd0}*SharedItemsImports = 5
-	EndGlobalSection
 EndGlobal
--- a/samples/Playground/Playground/App.cs
+++ b/samples/Playground/Playground/App.cs
@ -1,208 +0,0 @@
-using System.Runtime.InteropServices.JavaScript;
-
-namespace Playground;
-
-public partial class App : Application
-{
-	private Window? _window;
-	public Window? Window => _window;
-
-	/// <summary>
-	/// Invoked when the application is launched normally by the end user.  Other entry points
-	/// will be used such as when the application is launched to open a specific file.
-	/// </summary>
-	/// <param name="args">Details about the launch request and process.</param>
-	protected async override void OnLaunched(LaunchActivatedEventArgs args)
-	{
-#if DEBUG
-		if (System.Diagnostics.Debugger.IsAttached)
-		{
-			// this.DebugSettings.EnableFrameRateCounter = true;
-		}
-#endif
-
-		var appBuilder = this.CreateBuilder(args)
-			.ConfigureApp()
-			.UseToolkitNavigation();
-		_window = appBuilder.Window;
-
-		var hostingOption = InitOption.Splash;
-
-		switch (hostingOption)
-		{
-			case InitOption.AdHocHosting:
-				// Ad-hoc hosting of Navigation on a UI element with Region.Attached set
-
-
-				_host = appBuilder.Build();
-
-				// Create Frame and navigate to MainPage
-				// MainPage has a ContentControl with Region.Attached set
-				// which will host navigation
-				var f = new Frame();
-				_window.Content = f;
-				await _window.AttachServicesAsync(_host.Services);
-				f.Navigate(typeof(MainPage));
-
-				await Task.Run(() => _host.StartAsync());
-
-				// With this way there's no way to await for navigation to finish
-				// but it's useful if you want to attach navigation to a UI element
-				// in an existing application
-				break;
-
-			case InitOption.NavigationRoot:
-				// Explicitly create the navigation root to use
-
-				_host = appBuilder.Build();
-
-				var root = new ContentControl
-				{
-					HorizontalAlignment = HorizontalAlignment.Stretch,
-					VerticalAlignment = VerticalAlignment.Stretch,
-					HorizontalContentAlignment = HorizontalAlignment.Stretch,
-					VerticalContentAlignment = VerticalAlignment.Stretch
-				};
-				_window.Content = root;
-				var services = await _window.AttachServicesAsync(_host.Services);
-				var startup = root.HostAsync(services, initialRoute: "");
-
-				await Task.Run(() => _host.StartAsync());
-
-				// Wait for startup task to complete which will be the end of the
-				// first navigation
-				await startup;
-				break;
-
-			case InitOption.InitializeNavigation:
-				// InitializeNavigationAsync will create the navigation host (ContentControl),
-				// will invoke the host builder (host is returned) and awaits both start up
-				// tasks, as well as first navigation
-
-				_host = await _window.InitializeNavigationAsync(async () => appBuilder.Build(),
-							// Option 1: This requires Shell to be the first RouteMap - best for perf as no reflection required
-							// initialRoute: ""
-							// Option 2: Specify route name
-							// initialRoute: "Shell"
-							// Option 3: Specify the view model. To avoid reflection, you can still define a routemap
-							initialViewModel: typeof(ShellViewModel)
-						);
-				break;
-
-			case InitOption.Splash:
-				// InitializeNavigationAsync (Navigation.Toolkit) uses a LoadingView as navigation host,
-				// will invoke the host builder (host is returned) and awaits both start up
-				// tasks, as well as first navigation. In this case the navigation host is an ExtendedSplashScreen
-				// element, so will show the native splash screen until the first navigation is completed
-
-				var appRoot = new AppRoot();
-				appRoot.SplashScreen.Initialize(_window, args);
-				_window.Content = appRoot;
-
-				_host = await _window.InitializeNavigationAsync(
-							async () =>
-							{
-
-								// Uncomment to view splashscreen for longer
-								// await Task.Delay(5000);
-								return appBuilder.Build();
-							},
-							navigationRoot: appRoot.SplashScreen,
-							// Option 1: This requires Shell to be the first RouteMap - best for perf as no reflection required
-							// initialRoute: ""
-							// Option 2: Specify route name
-							// initialRoute: "Shell"
-							// Option 3: Specify the view model. To avoid reflection, you can still define a routemap
-							initialViewModel: typeof(HomeViewModel)
-						);
-				break;
-			case InitOption.AppBuilderShell:
-
-				_host = await appBuilder.NavigateAsync<AppRoot>();
-				break;
-
-			case InitOption.NoShellViewModel:
-				// InitializeNavigationAsync with splash screen and async callback to determine where
-				// initial navigation should go
-
-				var appRootNoShell = new AppRoot();
-				appRootNoShell.SplashScreen.Initialize(_window, args);
-
-				_window.Content = appRootNoShell;
-				_window.Activate();
-
-				_host = await _window.InitializeNavigationAsync(
-							async () =>
-							{
-								return appBuilder.Build();
-							},
-							navigationRoot: appRootNoShell.SplashScreen,
-							initialNavigate: async (sp, nav) =>
-							{
-								// Uncomment to view splashscreen for longer
-								await Task.Delay(5000);
-								await nav.NavigateViewAsync<HomePage>(this);
-							}
-				);
-				break;
-		}
-
-		var notif = _host!.Services.GetRequiredService<IRouteNotifier>();
-		notif.RouteChanged += RouteUpdated;
-
-
-		var logger = _host.Services.GetRequiredService<ILogger<App>>();
-		if (logger.IsEnabled(LogLevel.Trace)) logger.LogTraceMessage("LogLevel:Trace");
-		if (logger.IsEnabled(LogLevel.Debug)) logger.LogDebugMessage("LogLevel:Debug");
-		if (logger.IsEnabled(LogLevel.Information)) logger.LogInformationMessage("LogLevel:Information");
-		if (logger.IsEnabled(LogLevel.Warning)) logger.LogWarningMessage("LogLevel:Warning");
-		if (logger.IsEnabled(LogLevel.Error)) logger.LogErrorMessage("LogLevel:Error");
-		if (logger.IsEnabled(LogLevel.Critical)) logger.LogCriticalMessage("LogLevel:Critical");
-	}
-
-	private enum InitOption
-	{
-		AdHocHosting,
-		NavigationRoot,
-		InitializeNavigation,
-		Splash,
-		NoShellViewModel,
-		AppBuilderShell
-	}
-
-
-	public void RouteUpdated(object? sender, RouteChangedEventArgs? e)
-	{
-		try
-		{
-			var rootRegion = e?.Region.Root();
-			var route = rootRegion?.GetRoute();
-			if (route is null)
-			{
-				return;
-			}
-
-
-#if !__WASM__ && !WINUI
-			CoreApplication.MainView?.DispatcherQueue.TryEnqueue(() =>
-			{
-				var appTitle = ApplicationView.GetForCurrentView();
-				appTitle.Title = "Commerce: " + (route + "").Replace("+", "/");
-			});
-#endif
-
-		}
-		catch (Exception ex)
-		{
-			Console.WriteLine("Error: " + ex.Message);
-		}
-	}
-
-
-}
-
-public class LongStartHostedService : IHostedService
-{
-	public Task StartAsync(CancellationToken cancellationToken) => Task.Delay(2000, cancellationToken);
-	public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
-}
--- a/samples/Playground/Playground/App.xaml
+++ b/samples/Playground/Playground/App.xaml
@ -0,0 +1,40 @@
+<Application x:Class="Playground.App"
+       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:utum="using:Uno.Toolkit.UI.Material"
+             xmlns:utu="using:Uno.Toolkit.UI">
+
+  <Application.Resources>
+    <ResourceDictionary>
+      <ResourceDictionary.MergedDictionaries>
+        <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
+
+        <!-- Load the Material control resources -->
+        <MaterialResources xmlns="using:Uno.Material" />
+        <ToolkitResources xmlns="using:Uno.Toolkit.UI" />
+
+        <!-- Load Material Toolkit resources -->
+        <MaterialToolkitResources xmlns="using:Uno.Toolkit.UI.Material" />
+        <!-- Place resources here -->
+      </ResourceDictionary.MergedDictionaries>
+      <Style TargetType="utu:ExtendedSplashScreen"
+             BasedOn="{StaticResource DefaultExtendedSplashScreen}">
+        <Setter Property="LoadingContentTemplate">
+          <Setter.Value>
+            <DataTemplate>
+              <Grid>
+                <ProgressRing IsActive="true"
+                              VerticalAlignment="Bottom"
+                              HorizontalAlignment="Center"
+                              Margin="0,0,0,50" />
+              </Grid>
+            </DataTemplate>
+          </Setter.Value>
+        </Setter>
+      </Style>
+    </ResourceDictionary>
+  </Application.Resources>
+
+  <!-- Add resources here -->
+
+</Application>
--- a/samples/Playground/Playground/App.xaml.cs
+++ b/samples/Playground/Playground/App.xaml.cs
@ -0,0 +1,206 @@
+namespace Playground;
+public partial class App : Application
+{
+    /// <summary>
+    /// Initializes the singleton application object. This is the first line of authored code
+    /// executed, and as such is the logical equivalent of main() or WinMain().
+    /// </summary>
+    public App()
+    {
+        this.InitializeComponent();
+    }
+
+    protected Window? MainWindow { get; private set; }
+
+    protected async override void OnLaunched(LaunchActivatedEventArgs args)
+    {
+        MainWindow = new Window();
+#if DEBUG
+        MainWindow.EnableHotReload();
+#endif
+
+        var appBuilder = this.CreateBuilder(args)
+                    .ConfigureApp()
+                    .UseToolkitNavigation();
+        MainWindow = appBuilder.Window;
+
+        var hostingOption = InitOption.Splash;
+
+        switch (hostingOption)
+        {
+            case InitOption.AdHocHosting:
+                // Ad-hoc hosting of Navigation on a UI element with Region.Attached set
+
+
+                _host = appBuilder.Build();
+
+                // Create Frame and navigate to MainPage
+                // MainPage has a ContentControl with Region.Attached set
+                // which will host navigation
+                var f = new Frame();
+                MainWindow.Content = f;
+                await MainWindow.AttachServicesAsync(_host.Services);
+                f.Navigate(typeof(MainPage));
+
+                await Task.Run(() => _host.StartAsync());
+
+                // With this way there's no way to await for navigation to finish
+                // but it's useful if you want to attach navigation to a UI element
+                // in an existing application
+                break;
+
+            case InitOption.NavigationRoot:
+                // Explicitly create the navigation root to use
+
+                _host = appBuilder.Build();
+
+                var root = new ContentControl
+                {
+                    HorizontalAlignment = HorizontalAlignment.Stretch,
+                    VerticalAlignment = VerticalAlignment.Stretch,
+                    HorizontalContentAlignment = HorizontalAlignment.Stretch,
+                    VerticalContentAlignment = VerticalAlignment.Stretch
+                };
+                MainWindow.Content = root;
+                var services = await MainWindow.AttachServicesAsync(_host.Services);
+                var startup = root.HostAsync(services, initialRoute: "");
+
+                await Task.Run(() => _host.StartAsync());
+
+                // Wait for startup task to complete which will be the end of the
+                // first navigation
+                await startup;
+                break;
+
+            case InitOption.InitializeNavigation:
+                // InitializeNavigationAsync will create the navigation host (ContentControl),
+                // will invoke the host builder (host is returned) and awaits both start up
+                // tasks, as well as first navigation
+
+                _host = await MainWindow.InitializeNavigationAsync(async () => appBuilder.Build(),
+                            // Option 1: This requires Shell to be the first RouteMap - best for perf as no reflection required
+                            // initialRoute: ""
+                            // Option 2: Specify route name
+                            // initialRoute: "Shell"
+                            // Option 3: Specify the view model. To avoid reflection, you can still define a routemap
+                            initialViewModel: typeof(ShellViewModel)
+                        );
+                break;
+
+            case InitOption.Splash:
+                // InitializeNavigationAsync (Navigation.Toolkit) uses a LoadingView as navigation host,
+                // will invoke the host builder (host is returned) and awaits both start up
+                // tasks, as well as first navigation. In this case the navigation host is an ExtendedSplashScreen
+                // element, so will show the native splash screen until the first navigation is completed
+
+                var appRoot = new AppRoot();
+                appRoot.SplashScreen.Initialize(MainWindow, args);
+                MainWindow.Content = appRoot;
+
+                _host = await MainWindow.InitializeNavigationAsync(
+                            async () =>
+                            {
+
+                                // Uncomment to view splashscreen for longer
+                                // await Task.Delay(5000);
+                                return appBuilder.Build();
+                            },
+                            navigationRoot: appRoot.SplashScreen,
+                            // Option 1: This requires Shell to be the first RouteMap - best for perf as no reflection required
+                            // initialRoute: ""
+                            // Option 2: Specify route name
+                            // initialRoute: "Shell"
+                            // Option 3: Specify the view model. To avoid reflection, you can still define a routemap
+                            initialViewModel: typeof(HomeViewModel)
+                        );
+                break;
+            case InitOption.AppBuilderShell:
+
+                _host = await appBuilder.NavigateAsync<AppRoot>();
+                break;
+
+            case InitOption.NoShellViewModel:
+                // InitializeNavigationAsync with splash screen and async callback to determine where
+                // initial navigation should go
+
+                var appRootNoShell = new AppRoot();
+                appRootNoShell.SplashScreen.Initialize(MainWindow, args);
+
+                MainWindow.Content = appRootNoShell;
+                MainWindow.Activate();
+
+                _host = await MainWindow.InitializeNavigationAsync(
+                            async () =>
+                            {
+                                return appBuilder.Build();
+                            },
+                            navigationRoot: appRootNoShell.SplashScreen,
+                            initialNavigate: async (sp, nav) =>
+                            {
+                                // Uncomment to view splashscreen for longer
+                                await Task.Delay(5000);
+                                await nav.NavigateViewAsync<HomePage>(this);
+                            }
+                );
+                break;
+        }
+
+        var notif = _host!.Services.GetRequiredService<IRouteNotifier>();
+        notif.RouteChanged += RouteUpdated;
+
+
+        var logger = _host.Services.GetRequiredService<ILogger<App>>();
+        if (logger.IsEnabled(LogLevel.Trace)) logger.LogTraceMessage("LogLevel:Trace");
+        if (logger.IsEnabled(LogLevel.Debug)) logger.LogDebugMessage("LogLevel:Debug");
+        if (logger.IsEnabled(LogLevel.Information)) logger.LogInformationMessage("LogLevel:Information");
+        if (logger.IsEnabled(LogLevel.Warning)) logger.LogWarningMessage("LogLevel:Warning");
+        if (logger.IsEnabled(LogLevel.Error)) logger.LogErrorMessage("LogLevel:Error");
+        if (logger.IsEnabled(LogLevel.Critical)) logger.LogCriticalMessage("LogLevel:Critical");
+    }
+
+    private enum InitOption
+    {
+        AdHocHosting,
+        NavigationRoot,
+        InitializeNavigation,
+        Splash,
+        NoShellViewModel,
+        AppBuilderShell
+    }
+
+
+    public void RouteUpdated(object? sender, RouteChangedEventArgs? e)
+    {
+        try
+        {
+            var rootRegion = e?.Region.Root();
+            var route = rootRegion?.GetRoute();
+            if (route is null)
+            {
+                return;
+            }
+
+
+#if !__WASM__ && !WINUI
+			CoreApplication.MainView?.DispatcherQueue.TryEnqueue(() =>
+			{
+				var appTitle = ApplicationView.GetForCurrentView();
+				appTitle.Title = "Commerce: " + (route + "").Replace("+", "/");
+			});
+#endif
+
+        }
+        catch (Exception ex)
+        {
+            Console.WriteLine("Error: " + ex.Message);
+        }
+    }
+
+
+}
+
+public class LongStartHostedService : IHostedService
+{
+    public Task StartAsync(CancellationToken cancellationToken) => Task.Delay(2000, cancellationToken);
+    public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+}
--- a/samples/Playground/Playground.Base/Icons/iconapp.svg
+++ b/samples/Playground/Playground.Base/Icons/iconapp.svg
@ -5,7 +5,7 @@
   viewBox="0 0 456 456"
   version="1.1"
   id="svg453"
-   sodipodi:docname="iconapp.old.svg"
+   sodipodi:docname="icon.svg"
   inkscape:version="1.2 (dc2aedaf03, 2022-05-15)"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
--- a/samples/Playground/Playground/Assets/Icons/icon_foreground.svg
+++ b/samples/Playground/Playground/Assets/Icons/icon_foreground.svg
@ -5,7 +5,7 @@
   viewBox="0 0 50.369617 49.826836"
   version="1.1"
   id="svg151"
-   sodipodi:docname="appconfig.svg"
+   sodipodi:docname="icon_foreground.svg"
   inkscape:version="1.2 (dc2aedaf03, 2022-05-15)"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
--- a/samples/Playground/Playground/Assets/Splash/splash_screen.svg
+++ b/samples/Playground/Playground/Assets/Splash/splash_screen.svg
@ -5,7 +5,7 @@
   viewBox="0 0 50.369617 49.826836"
   version="1.1"
   id="svg151"
-   sodipodi:docname="appconfig.svg"
+   sodipodi:docname="icon_foreground.svg"
   inkscape:version="1.2 (dc2aedaf03, 2022-05-15)"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
--- a/samples/Playground/Playground/GlobalUsings.cs
+++ b/samples/Playground/Playground/GlobalUsings.cs
@ -1,4 +1,4 @@
-global using System;
+global using System;
 global using System.Collections.Generic;
 global using System.Linq;
 global using System.Net.Http;
@ -10,6 +10,10 @@ global using Microsoft.Extensions.DependencyInjection;
 global using Microsoft.Extensions.Hosting;
 global using Microsoft.Extensions.Logging;
 global using Microsoft.Extensions.Options;
+global using Microsoft.UI.Xaml;
+global using Microsoft.UI.Xaml.Controls;
+global using Microsoft.UI.Xaml.Data;
+global using Microsoft.UI.Xaml.Media;
 global using Playground.Models;
 global using Playground.Services;
 global using Playground.Services.Endpoints;
@ -23,19 +27,9 @@ global using Uno.Extensions.Http;
 global using Uno.Extensions.Localization;
 global using Uno.Extensions.Logging;
 global using Uno.Extensions.Navigation;
-global using Uno.Extensions.Toolkit;
 global using Uno.Extensions.Navigation.Regions;
 global using Uno.Extensions.Serialization;
+global using Uno.Extensions.Toolkit;
 global using Windows.ApplicationModel.Core;
 global using Windows.UI.ViewManagement;
-global using Uno.Extensions.Validation;
-
-global using Microsoft.UI.Dispatching;
-global using Microsoft.UI.Xaml;
-global using Microsoft.UI.Xaml.Controls;
-global using Microsoft.UI.Xaml.Controls.Primitives;
-global using Microsoft.UI.Xaml.Navigation;
-global using Microsoft.UI.Xaml.Markup;
-global using Microsoft.UI.Xaml.Data;
-global using Microsoft.UI.Xaml.Media;
 global using LaunchActivatedEventArgs = Microsoft.UI.Xaml.LaunchActivatedEventArgs;
--- a/samples/Playground/Playground.Skia.Gtk/Package.appxmanifest
+++ b/samples/Playground/Playground.Skia.Gtk/Package.appxmanifest
@ -8,7 +8,7 @@

  <Identity
    Name="Playground"
-    Publisher="O=Playground"
+    Publisher="O=NickRandolph"
    Version="1.0.0.0" />

  <Properties>
--- a/samples/Playground/Playground/Platforms/Android/AndroidManifest.xml
+++ b/samples/Playground/Playground/Platforms/Android/AndroidManifest.xml
--- a/samples/Playground/Playground/Platforms/Android/Assets/AboutAssets.txt
+++ b/samples/Playground/Playground/Platforms/Android/Assets/AboutAssets.txt
--- a/samples/Playground/Playground/Platforms/Android/Main.Android.cs
+++ b/samples/Playground/Playground/Platforms/Android/Main.Android.cs
@ -12,10 +12,9 @@ using Com.Nostra13.Universalimageloader.Core;
 using Microsoft.UI.Xaml.Media;

 namespace Playground.Droid;
-
 [global::Android.App.ApplicationAttribute(
    Label = "@string/ApplicationName",
-    Icon = "@mipmap/iconapp",
+    Icon = "@mipmap/icon",
    LargeHeap = true,
    HardwareAccelerated = true,
    Theme = "@style/AppTheme"
@ -23,7 +22,7 @@ namespace Playground.Droid;
 public class Application : Microsoft.UI.Xaml.NativeApplication
 {
    public Application(IntPtr javaReference, JniHandleOwnership transfer)
-        : base(() => new AppHead(), javaReference, transfer)
+        : base(() => new App(), javaReference, transfer)
    {
        ConfigureUniversalImageLoader();
    }
--- a/samples/Playground/Playground/Platforms/Android/MainActivity.Android.cs
+++ b/samples/Playground/Playground/Platforms/Android/MainActivity.Android.cs
@ -5,7 +5,6 @@ using Android.Views;
 using Android.Widget;

 namespace Playground.Droid;
-
 [Activity(
    MainLauncher = true,
    ConfigurationChanges = global::Uno.UI.ActivityHelper.AllConfigChanges,
--- a/samples/Playground/Playground/Platforms/Android/Resources/AboutResources.txt
+++ b/samples/Playground/Playground/Platforms/Android/Resources/AboutResources.txt
--- a/samples/Playground/Playground/Platforms/Android/Resources/values/Strings.xml
+++ b/samples/Playground/Playground/Platforms/Android/Resources/values/Strings.xml
--- a/samples/Playground/Playground/Platforms/Android/Resources/values/Styles.xml
+++ b/samples/Playground/Playground/Platforms/Android/Resources/values/Styles.xml
--- a/Показать больше
+++ b/Показать больше