From 4fb8569d70fcf0ab2a15455831b7e1a0214fc03f Mon Sep 17 00:00:00 2001
From: Jerome Laban <jerome@platform.uno>
Date: Thu, 27 Jun 2024 23:31:14 -0400
Subject: [PATCH] wip skia+wasm

---
 Directory.Build.props                         |  27 ++--
 Directory.Packages.props                      |   6 +-
 ...s => FragmentNavigationHandler.Interop.cs} |   0
 .../WebAssembly/FragmentNavigationHandler.cs  |   6 +-
 .../Platforms/WebAssembly/LinkerConfig.xml    |   2 +-
 ... LocationHrefNavigationHandler.Interop.cs} |   2 +-
 Uno.Gallery/Platforms/WebAssembly/Program.cs  |  18 +--
 .../WebAssembly/WasmScripts/UnoGallery.d.ts   |  31 ----
 .../WebAssembly/WasmScripts/UnoGallery.js     | 146 ------------------
 .../WebAssembly/ts/FragmentNavigation.js      |  53 +++++++
 .../WebAssembly/ts/FragmentNavigation.js.map  |   1 +
 .../WebAssembly/ts/GoogleAnalytics.js         |  50 ++++++
 .../WebAssembly/ts/GoogleAnalytics.js.map     |   1 +
 .../WebAssembly/ts/LocationHrefNavigation.js  |  53 +++++++
 .../ts/LocationHrefNavigation.js.map          |   1 +
 Uno.Gallery/Uno.Gallery.csproj                |  34 ++--
 global.json                                   |   5 +-
 17 files changed, 209 insertions(+), 227 deletions(-)
 rename Uno.Gallery/Platforms/WebAssembly/{FragmentNavigationHandler.Interop.wasm.cs => FragmentNavigationHandler.Interop.cs} (100%)
 rename Uno.Gallery/Platforms/WebAssembly/{LocationHrefNavigationHandler.Interop.wasm.cs => LocationHrefNavigationHandler.Interop.cs} (99%)
 delete mode 100644 Uno.Gallery/Platforms/WebAssembly/WasmScripts/UnoGallery.d.ts
 delete mode 100644 Uno.Gallery/Platforms/WebAssembly/WasmScripts/UnoGallery.js
 create mode 100644 Uno.Gallery/Platforms/WebAssembly/ts/FragmentNavigation.js
 create mode 100644 Uno.Gallery/Platforms/WebAssembly/ts/FragmentNavigation.js.map
 create mode 100644 Uno.Gallery/Platforms/WebAssembly/ts/GoogleAnalytics.js
 create mode 100644 Uno.Gallery/Platforms/WebAssembly/ts/GoogleAnalytics.js.map
 create mode 100644 Uno.Gallery/Platforms/WebAssembly/ts/LocationHrefNavigation.js
 create mode 100644 Uno.Gallery/Platforms/WebAssembly/ts/LocationHrefNavigation.js.map

diff --git a/Directory.Build.props b/Directory.Build.props
index 9165be75..c41f3665 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,22 +1,23 @@
 <Project>
-  <PropertyGroup>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+	<PropertyGroup>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+		<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
 
-    <!--
+		<!--
       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>
-  </PropertyGroup>
+		<NoWarn>$(NoWarn);NU1507;NETSDK1201;PRI257</NoWarn>
+	</PropertyGroup>
 
-  <PropertyGroup>
-    <UnoExtensionsVersion>4.1.14</UnoExtensionsVersion>
-    <UnoToolkitVersion>6.0.18</UnoToolkitVersion>
-    <UnoThemesVersion>5.0.13</UnoThemesVersion>
-    <UnoCSharpMarkupVersion>5.2.13</UnoCSharpMarkupVersion>
-  </PropertyGroup>
+	<PropertyGroup>
+		<UnoExtensionsVersion>4.1.14</UnoExtensionsVersion>
+		<UnoToolkitVersion>6.0.18</UnoToolkitVersion>
+		<UnoThemesVersion>5.0.13</UnoThemesVersion>
+		<UnoCSharpMarkupVersion>5.2.13</UnoCSharpMarkupVersion>
+		<UnoWasmBootstrapVersion>9.0.0-dev.96</UnoWasmBootstrapVersion>
+	</PropertyGroup>
 </Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 29bd1f75..ad153e34 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -11,12 +11,12 @@
     <PackageVersion Include="NUnit" Version="4.1.0" />
     <PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageVersion Include="SkiaSharp.Skottie" Version="2.88.8" />
+    <PackageVersion Include="Uno.Core" Version="4.1.1" />
     <PackageVersion Include="Uno.UITest.Helpers" Version="1.1.0-dev.70" />
     <PackageVersion Include="Xamarin.UITest" Version="4.3.4" />
-
     <PackageVersion Include="Uno.ShowMeTheXAML" Version="2.0.0-dev0015" />
     <PackageVersion Include="Uno.ShowMeTheXAML.MSBuild" Version="2.0.0-dev0015" />
-
     <PackageVersion Include="Uno.CommunityToolkit.WinUI.UI.Controls" Version="7.1.200" />
     <PackageVersion Include="Uno.CommunityToolkit.WinUI.UI.Controls.DataGrid" Version="7.1.200" />
     <PackageVersion Include="CommunityToolkit.WinUI.Lottie" Version="8.0.280225" />
@@ -28,12 +28,10 @@
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.NET.ILLink.Tasks" Version="8.0.100-1.23067.1" />
     <PackageVersion Include="Microsoft.TypeScript.Compiler" Version="3.1.5" />
     <PackageVersion Include="Microsoft.TypeScript.MSBuild" Version="4.6.4" />
     <PackageVersion Include="NunitXml.TestLogger" Version="3.0.131" />
     <PackageVersion Include="nventive.Nimue.Application.Packaging" Version="0.1.0-alpha.58" />
     <PackageVersion Include="Xamarin.TestCloud.Agent" Version="0.23.2" />
-
   </ItemGroup>
 </Project>
diff --git a/Uno.Gallery/Platforms/WebAssembly/FragmentNavigationHandler.Interop.wasm.cs b/Uno.Gallery/Platforms/WebAssembly/FragmentNavigationHandler.Interop.cs
similarity index 100%
rename from Uno.Gallery/Platforms/WebAssembly/FragmentNavigationHandler.Interop.wasm.cs
rename to Uno.Gallery/Platforms/WebAssembly/FragmentNavigationHandler.Interop.cs
diff --git a/Uno.Gallery/Platforms/WebAssembly/FragmentNavigationHandler.cs b/Uno.Gallery/Platforms/WebAssembly/FragmentNavigationHandler.cs
index 69feed71..0d436098 100644
--- a/Uno.Gallery/Platforms/WebAssembly/FragmentNavigationHandler.cs
+++ b/Uno.Gallery/Platforms/WebAssembly/FragmentNavigationHandler.cs
@@ -8,13 +8,13 @@ public static string CurrentFragment
 		{
 			get
 			{
-				return NativeMethods.GetCurrentFragment();
+				return ""; // NativeMethods.GetCurrentFragment();
 			}
 
 			set
 			{
-				var escaped = WebAssemblyRuntime.EscapeJs(value);
-				NativeMethods.SetCurrentFragment(escaped);
+				//var escaped = WebAssemblyRuntime.EscapeJs(value);
+				//NativeMethods.SetCurrentFragment(escaped);
 			}
 		}
 	}
diff --git a/Uno.Gallery/Platforms/WebAssembly/LinkerConfig.xml b/Uno.Gallery/Platforms/WebAssembly/LinkerConfig.xml
index ecefdae4..8eb30cb6 100644
--- a/Uno.Gallery/Platforms/WebAssembly/LinkerConfig.xml
+++ b/Uno.Gallery/Platforms/WebAssembly/LinkerConfig.xml
@@ -1,5 +1,5 @@
 <linker>
-  <assembly fullname="Gallery" />
+  <assembly fullname="Uno.Gallery" />
 
   <!--
   Uncomment this section when using JSON.NET
diff --git a/Uno.Gallery/Platforms/WebAssembly/LocationHrefNavigationHandler.Interop.wasm.cs b/Uno.Gallery/Platforms/WebAssembly/LocationHrefNavigationHandler.Interop.cs
similarity index 99%
rename from Uno.Gallery/Platforms/WebAssembly/LocationHrefNavigationHandler.Interop.wasm.cs
rename to Uno.Gallery/Platforms/WebAssembly/LocationHrefNavigationHandler.Interop.cs
index 7fcfb7d4..0839fee5 100644
--- a/Uno.Gallery/Platforms/WebAssembly/LocationHrefNavigationHandler.Interop.wasm.cs
+++ b/Uno.Gallery/Platforms/WebAssembly/LocationHrefNavigationHandler.Interop.cs
@@ -13,6 +13,6 @@ internal static partial class NativeMethods
 
 			[JSImport($"{JsType}.setCurrentLocationHref")]
 			internal static partial string SetCurrentLocationHref(string locationHref);
-		}
+		}	
 	}
 }
diff --git a/Uno.Gallery/Platforms/WebAssembly/Program.cs b/Uno.Gallery/Platforms/WebAssembly/Program.cs
index e972ee2e..f8a47fcf 100644
--- a/Uno.Gallery/Platforms/WebAssembly/Program.cs
+++ b/Uno.Gallery/Platforms/WebAssembly/Program.cs
@@ -1,17 +1,13 @@
 namespace Uno.Gallery;
+
+using Uno.UI.Runtime.Skia.WebAssembly.Browser;
 using Uno.UI.Xaml.Media;
 
 public class Program
 {
-    private static App? _app;
-
-    public static int Main(string[] args)
-    {
-        // Ask the browser to preload these fonts to avoid relayouting content
-		FontFamilyHelper.PreloadAsync("Symbols");
-
-        Microsoft.UI.Xaml.Application.Start(_ => _app = new App());
-
-        return 0;
-    }
+	public static async Task Main(string[] args)
+	{
+		var host = new PlatformHost(() => new App());
+		await host.Run();
+	}
 }
diff --git a/Uno.Gallery/Platforms/WebAssembly/WasmScripts/UnoGallery.d.ts b/Uno.Gallery/Platforms/WebAssembly/WasmScripts/UnoGallery.d.ts
deleted file mode 100644
index fd22bc2d..00000000
--- a/Uno.Gallery/Platforms/WebAssembly/WasmScripts/UnoGallery.d.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-declare namespace Uno.Gallery.Wasm {
-    class FragmentNavigation {
-        private static currentFragment;
-        static getCurrentFragment(): string;
-        static setCurrentFragment(fragment: string): string;
-        private static subscribed;
-        static subscribeToFragmentChanged(): string;
-        private static notifyFragmentChangedMethod;
-        private static notifyFragmentChanged;
-        private static initializeMethods;
-    }
-}
-declare namespace Uno.UI.Demo {
-    class Analytics {
-        private static isLoaded;
-        static reportPageView(screenName: string, appName?: string): string;
-        private static init;
-    }
-}
-declare namespace Uno.Gallery.Wasm {
-    class LocationHrefNavigation {
-        private static currentLocationHref;
-        static getCurrentLocationHref(): string;
-        static setCurrentLocationHref(locationHref: string): string;
-        private static subscribed;
-        static subscribeToLocationHrefChanged(): string;
-        private static notifyLocationHrefChangedMethod;
-        private static notifyLocationHrefChanged;
-        private static initializeMethods;
-    }
-}
diff --git a/Uno.Gallery/Platforms/WebAssembly/WasmScripts/UnoGallery.js b/Uno.Gallery/Platforms/WebAssembly/WasmScripts/UnoGallery.js
deleted file mode 100644
index d969ec84..00000000
--- a/Uno.Gallery/Platforms/WebAssembly/WasmScripts/UnoGallery.js
+++ /dev/null
@@ -1,146 +0,0 @@
-var Uno;
-(function (Uno) {
-    var Gallery;
-    (function (Gallery) {
-        var Wasm;
-        (function (Wasm) {
-            class FragmentNavigation {
-                static getCurrentFragment() {
-                    return window.location.hash;
-                }
-                static setCurrentFragment(fragment) {
-                    window.location.hash = fragment;
-                    this.currentFragment = window.location.hash;
-                    return "ok";
-                }
-                static subscribeToFragmentChanged() {
-                    if (this.subscribed) {
-                        return "already subscribed";
-                    }
-                    this.subscribed = true;
-                    this.currentFragment = this.getCurrentFragment();
-                    window.addEventListener("hashchange", _ => this.notifyFragmentChanged(), false);
-                    return "ok";
-                }
-                static notifyFragmentChanged() {
-                    const newFragment = this.getCurrentFragment();
-                    if (newFragment === this.currentFragment) {
-                        return; // nothing to do
-                    }
-                    this.currentFragment = newFragment;
-                    this.initializeMethods();
-                    const newFragmentStr = MonoRuntime.mono_string(newFragment);
-                    MonoRuntime.call_method(this.notifyFragmentChangedMethod, null, [newFragmentStr]);
-                }
-                static initializeMethods() {
-                    if (this.notifyFragmentChangedMethod) {
-                        return; // already initialized.
-                    }
-                    const asm = MonoRuntime.assembly_load("Uno.Gallery.WASM");
-                    const handlerClass = MonoRuntime.find_class(asm, "Uno.Gallery.Wasm", "FragmentNavigation");
-                    this.notifyFragmentChangedMethod = MonoRuntime.find_method(handlerClass, "NotifyFragmentChanged", -1);
-                }
-            }
-            FragmentNavigation.subscribed = false;
-            Wasm.FragmentNavigation = FragmentNavigation;
-        })(Wasm = Gallery.Wasm || (Gallery.Wasm = {}));
-    })(Gallery = Uno.Gallery || (Uno.Gallery = {}));
-})(Uno || (Uno = {}));
-var Uno;
-(function (Uno) {
-    var UI;
-    (function (UI) {
-        var Demo;
-        (function (Demo) {
-            class Analytics {
-                static reportPageView(screenName, appName = "Uno.Gallery") {
-                    if (Analytics.init(screenName, appName)) {
-                        return "ok";
-                    }
-                    const gtag = window.gtag;
-                    if (gtag) {
-                        gtag("event", "screen_view", {
-                            screen_name: screenName,
-                            app_name: appName
-                        });
-                    }
-                    else {
-                        console.error(`Google Analytics not present, can't report page view for ${screenName}.`);
-                    }
-                    return "ok";
-                }
-                static init(screenName, appName) {
-                    if (Analytics.isLoaded) {
-                        return false;
-                    }
-                    const script = `
-	            window.dataLayer = window.dataLayer || [];
-	            function gtag() { dataLayer.push(arguments); }
-	            gtag('js', new Date());
-	            gtag('config', 'G-GTQK0EEP2J');
-	            gtag("event", "screen_view", {screen_name: \"${screenName}\", app_name: \"${appName}\"});`;
-                    const script1 = document.createElement("script");
-                    script1.type = "text/javascript";
-                    script1.src = "https://www.googletagmanager.com/gtag/js?id=G-GTQK0EEP2J";
-                    document.body.appendChild(script1);
-                    const script2 = document.createElement("script");
-                    script2.type = "text/javascript";
-                    script2.innerText = script;
-                    document.body.appendChild(script2);
-                    Analytics.isLoaded = true;
-                    return true;
-                }
-            }
-            Analytics.isLoaded = false;
-            Demo.Analytics = Analytics;
-        })(Demo = UI.Demo || (UI.Demo = {}));
-    })(UI = Uno.UI || (Uno.UI = {}));
-})(Uno || (Uno = {}));
-var Uno;
-(function (Uno) {
-    var Gallery;
-    (function (Gallery) {
-        var Wasm;
-        (function (Wasm) {
-            class LocationHrefNavigation {
-                static getCurrentLocationHref() {
-                    return window.location.href;
-                }
-                static setCurrentLocationHref(locationHref) {
-                    window.location.href = locationHref;
-                    this.currentLocationHref = window.location.href;
-                    return "ok";
-                }
-                static subscribeToLocationHrefChanged() {
-                    if (this.subscribed) {
-                        return "already subscribed";
-                    }
-                    this.subscribed = true;
-                    this.currentLocationHref = this.getCurrentLocationHref();
-                    window.addEventListener("hashchange", _ => this.notifyLocationHrefChanged(), false);
-                    return "ok";
-                }
-                static notifyLocationHrefChanged() {
-                    const newLocationHref = this.getCurrentLocationHref();
-                    if (newLocationHref === this.currentLocationHref) {
-                        return; // nothing to do
-                    }
-                    this.currentLocationHref = newLocationHref;
-                    this.initializeMethods();
-                    const newLocationHrefStr = MonoRuntime.mono_string(newLocationHref);
-                    MonoRuntime.call_method(this.notifyLocationHrefChangedMethod, null, [newLocationHrefStr]);
-                }
-                static initializeMethods() {
-                    if (this.notifyLocationHrefChangedMethod) {
-                        return; // already initialized.
-                    }
-                    const asm = MonoRuntime.assembly_load("Uno.Gallery.WASM");
-                    const handlerClass = MonoRuntime.find_class(asm, "Uno.Gallery.Wasm", "LocationHrefHavigation");
-                    this.notifyLocationHrefChangedMethod = MonoRuntime.find_method(handlerClass, "NotifyLocationHrefChanged", -1);
-                }
-            }
-            LocationHrefNavigation.subscribed = false;
-            Wasm.LocationHrefNavigation = LocationHrefNavigation;
-        })(Wasm = Gallery.Wasm || (Gallery.Wasm = {}));
-    })(Gallery = Uno.Gallery || (Uno.Gallery = {}));
-})(Uno || (Uno = {}));
diff --git a/Uno.Gallery/Platforms/WebAssembly/ts/FragmentNavigation.js b/Uno.Gallery/Platforms/WebAssembly/ts/FragmentNavigation.js
new file mode 100644
index 00000000..9aedb989
--- /dev/null
+++ b/Uno.Gallery/Platforms/WebAssembly/ts/FragmentNavigation.js
@@ -0,0 +1,53 @@
+var Uno;
+(function (Uno) {
+    var Gallery;
+    (function (Gallery) {
+        var Wasm;
+        (function (Wasm) {
+            var FragmentNavigation = /** @class */ (function () {
+                function FragmentNavigation() {
+                }
+                FragmentNavigation.getCurrentFragment = function () {
+                    return window.location.hash;
+                };
+                FragmentNavigation.setCurrentFragment = function (fragment) {
+                    window.location.hash = fragment;
+                    this.currentFragment = window.location.hash;
+                    return "ok";
+                };
+                FragmentNavigation.subscribeToFragmentChanged = function () {
+                    var _this = this;
+                    if (this.subscribed) {
+                        return "already subscribed";
+                    }
+                    this.subscribed = true;
+                    this.currentFragment = this.getCurrentFragment();
+                    window.addEventListener("hashchange", function (_) { return _this.notifyFragmentChanged(); }, false);
+                    return "ok";
+                };
+                FragmentNavigation.notifyFragmentChanged = function () {
+                    var newFragment = this.getCurrentFragment();
+                    if (newFragment === this.currentFragment) {
+                        return; // nothing to do
+                    }
+                    this.currentFragment = newFragment;
+                    this.initializeMethods();
+                    var newFragmentStr = MonoRuntime.mono_string(newFragment);
+                    MonoRuntime.call_method(this.notifyFragmentChangedMethod, null, [newFragmentStr]);
+                };
+                FragmentNavigation.initializeMethods = function () {
+                    if (this.notifyFragmentChangedMethod) {
+                        return; // already initialized.
+                    }
+                    var asm = MonoRuntime.assembly_load("Uno.Gallery.WASM");
+                    var handlerClass = MonoRuntime.find_class(asm, "Uno.Gallery.Wasm", "FragmentNavigation");
+                    this.notifyFragmentChangedMethod = MonoRuntime.find_method(handlerClass, "NotifyFragmentChanged", -1);
+                };
+                FragmentNavigation.subscribed = false;
+                return FragmentNavigation;
+            }());
+            Wasm.FragmentNavigation = FragmentNavigation;
+        })(Wasm = Gallery.Wasm || (Gallery.Wasm = {}));
+    })(Gallery = Uno.Gallery || (Uno.Gallery = {}));
+})(Uno || (Uno = {}));
+//# sourceMappingURL=FragmentNavigation.js.map
\ No newline at end of file
diff --git a/Uno.Gallery/Platforms/WebAssembly/ts/FragmentNavigation.js.map b/Uno.Gallery/Platforms/WebAssembly/ts/FragmentNavigation.js.map
new file mode 100644
index 00000000..8552b763
--- /dev/null
+++ b/Uno.Gallery/Platforms/WebAssembly/ts/FragmentNavigation.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"FragmentNavigation.js","sourceRoot":"","sources":["FragmentNavigation.ts"],"names":[],"mappings":"AAAA,IAAU,GAAG,CA+DZ;AA/DD,WAAU,GAAG;IAAC,IAAA,OAAO,CA+DpB;IA/Da,WAAA,OAAO;QAAC,IAAA,IAAI,CA+DzB;QA/DqB,WAAA,IAAI;YACzB;gBAAA;gBA2DA,CAAC;gBAvDc,qCAAkB,GAAhC;oBACC,OAAO,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;gBAC7B,CAAC;gBAEa,qCAAkB,GAAhC,UAAiC,QAAgB;oBAChD,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,QAAQ,CAAC;oBAChC,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;oBAE5C,OAAO,IAAI,CAAC;gBACb,CAAC;gBAIa,6CAA0B,GAAxC;oBAAA,iBAgBC;oBAdA,IAAI,IAAI,CAAC,UAAU,EAAE;wBACpB,OAAO,oBAAoB,CAAC;qBAC5B;oBAED,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;oBAEvB,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;oBAEjD,MAAM,CAAC,gBAAgB,CACtB,YAAY,EACZ,UAAA,CAAC,IAAI,OAAA,KAAI,CAAC,qBAAqB,EAAE,EAA5B,CAA4B,EACjC,KAAK,CAAC,CAAC;oBAER,OAAO,IAAI,CAAC;gBACb,CAAC;gBAIc,wCAAqB,GAApC;oBACC,IAAM,WAAW,GAAW,IAAI,CAAC,kBAAkB,EAAE,CAAC;oBACtD,IAAI,WAAW,KAAK,IAAI,CAAC,eAAe,EAAE;wBACzC,OAAO,CAAE,gBAAgB;qBACzB;oBAED,IAAI,CAAC,eAAe,GAAG,WAAW,CAAC;oBAEnC,IAAI,CAAC,iBAAiB,EAAE,CAAC;oBACzB,IAAM,cAAc,GAAG,WAAW,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;oBAC5D,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,2BAA2B,EAAE,IAAI,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC;gBACnF,CAAC;gBAEc,oCAAiB,GAAhC;oBACC,IAAI,IAAI,CAAC,2BAA2B,EAAE;wBACrC,OAAO,CAAC,uBAAuB;qBAC/B;oBAED,IAAM,GAAG,GAAG,WAAW,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAC;oBAC1D,IAAM,YAAY,GAAG,WAAW,CAAC,UAAU,CAAC,GAAG,EAAE,kBAAkB,EAAE,oBAAoB,CAAC,CAAC;oBAC3F,IAAI,CAAC,2BAA2B,GAAG,WAAW,CAAC,WAAW,CAAC,YAAY,EAAE,uBAAuB,EAAE,CAAC,CAAC,CAAC,CAAC;gBACvG,CAAC;gBA3Cc,6BAAU,GAAY,KAAK,CAAC;gBA4C5C,yBAAC;aAAA,AA3DD,IA2DC;YA3DY,uBAAkB,qBA2D9B,CAAA;QAGF,CAAC,EA/DqB,IAAI,GAAJ,YAAI,KAAJ,YAAI,QA+DzB;IAAD,CAAC,EA/Da,OAAO,GAAP,WAAO,KAAP,WAAO,QA+DpB;AAAD,CAAC,EA/DS,GAAG,KAAH,GAAG,QA+DZ"}
\ No newline at end of file
diff --git a/Uno.Gallery/Platforms/WebAssembly/ts/GoogleAnalytics.js b/Uno.Gallery/Platforms/WebAssembly/ts/GoogleAnalytics.js
new file mode 100644
index 00000000..c3d6ff89
--- /dev/null
+++ b/Uno.Gallery/Platforms/WebAssembly/ts/GoogleAnalytics.js
@@ -0,0 +1,50 @@
+var Uno;
+(function (Uno) {
+    var UI;
+    (function (UI) {
+        var Demo;
+        (function (Demo) {
+            var Analytics = /** @class */ (function () {
+                function Analytics() {
+                }
+                Analytics.reportPageView = function (screenName, appName) {
+                    if (appName === void 0) { appName = "Uno.Gallery"; }
+                    if (Analytics.init(screenName, appName)) {
+                        return "ok";
+                    }
+                    var gtag = window.gtag;
+                    if (gtag) {
+                        gtag("event", "screen_view", {
+                            screen_name: screenName,
+                            app_name: appName
+                        });
+                    }
+                    else {
+                        console.error("Google Analytics not present, can't report page view for ".concat(screenName, "."));
+                    }
+                    return "ok";
+                };
+                Analytics.init = function (screenName, appName) {
+                    if (Analytics.isLoaded) {
+                        return false;
+                    }
+                    var script = "\n\t            window.dataLayer = window.dataLayer || [];\n\t            function gtag() { dataLayer.push(arguments); }\n\t            gtag('js', new Date());\n\t            gtag('config', 'G-GTQK0EEP2J');\n\t            gtag(\"event\", \"screen_view\", {screen_name: \"".concat(screenName, "\", app_name: \"").concat(appName, "\"});");
+                    var script1 = document.createElement("script");
+                    script1.type = "text/javascript";
+                    script1.src = "https://www.googletagmanager.com/gtag/js?id=G-GTQK0EEP2J";
+                    document.body.appendChild(script1);
+                    var script2 = document.createElement("script");
+                    script2.type = "text/javascript";
+                    script2.innerText = script;
+                    document.body.appendChild(script2);
+                    Analytics.isLoaded = true;
+                    return true;
+                };
+                Analytics.isLoaded = false;
+                return Analytics;
+            }());
+            Demo.Analytics = Analytics;
+        })(Demo = UI.Demo || (UI.Demo = {}));
+    })(UI = Uno.UI || (Uno.UI = {}));
+})(Uno || (Uno = {}));
+//# sourceMappingURL=GoogleAnalytics.js.map
\ No newline at end of file
diff --git a/Uno.Gallery/Platforms/WebAssembly/ts/GoogleAnalytics.js.map b/Uno.Gallery/Platforms/WebAssembly/ts/GoogleAnalytics.js.map
new file mode 100644
index 00000000..cde1d29a
--- /dev/null
+++ b/Uno.Gallery/Platforms/WebAssembly/ts/GoogleAnalytics.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"GoogleAnalytics.js","sourceRoot":"","sources":["GoogleAnalytics.ts"],"names":[],"mappings":"AAAA,IAAU,GAAG,CAiDZ;AAjDD,WAAU,GAAG;IAAC,IAAA,EAAE,CAiDf;IAjDa,WAAA,EAAE;QAAC,IAAA,IAAI,CAiDpB;QAjDgB,WAAA,IAAI;YACpB;gBAAA;gBA+CA,CAAC;gBA5Cc,wBAAc,GAA5B,UAA6B,UAAkB,EAAE,OAA+B;oBAA/B,wBAAA,EAAA,uBAA+B;oBAE/E,IAAI,SAAS,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,EAAE;wBACxC,OAAO,IAAI,CAAC;qBACZ;oBAED,IAAM,IAAI,GAAI,MAAc,CAAC,IAAI,CAAC;oBAClC,IAAI,IAAI,EAAE;wBACT,IAAI,CAAC,OAAO,EAAE,aAAa,EAAE;4BAC5B,WAAW,EAAE,UAAU;4BACvB,QAAQ,EAAE,OAAO;yBACjB,CAAC,CAAC;qBACH;yBAAM;wBACN,OAAO,CAAC,KAAK,CAAC,mEAA4D,UAAU,MAAG,CAAC,CAAC;qBACzF;oBAED,OAAO,IAAI,CAAC;gBACb,CAAC;gBAEc,cAAI,GAAnB,UAAoB,UAAkB,EAAE,OAAe;oBACtD,IAAI,SAAS,CAAC,QAAQ,EAAE;wBACvB,OAAO,KAAK,CAAC;qBACb;oBAED,IAAM,MAAM,GAAG,yRAK0C,UAAU,6BAAmB,OAAO,UAAO,CAAC;oBAGrG,IAAM,OAAO,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;oBACjD,OAAO,CAAC,IAAI,GAAG,iBAAiB,CAAC;oBACjC,OAAO,CAAC,GAAG,GAAG,0DAA0D,CAAC;oBACzE,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;oBACnC,IAAM,OAAO,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;oBACjD,OAAO,CAAC,IAAI,GAAG,iBAAiB,CAAC;oBACjC,OAAO,CAAC,SAAS,GAAG,MAAM,CAAC;oBAC3B,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;oBAEnC,SAAS,CAAC,QAAQ,GAAG,IAAI,CAAC;oBAC1B,OAAO,IAAI,CAAC;gBACb,CAAC;gBA7Cc,kBAAQ,GAAY,KAAK,CAAC;gBA8C1C,gBAAC;aAAA,AA/CD,IA+CC;YA/CY,cAAS,YA+CrB,CAAA;QACF,CAAC,EAjDgB,IAAI,GAAJ,OAAI,KAAJ,OAAI,QAiDpB;IAAD,CAAC,EAjDa,EAAE,GAAF,MAAE,KAAF,MAAE,QAiDf;AAAD,CAAC,EAjDS,GAAG,KAAH,GAAG,QAiDZ"}
\ No newline at end of file
diff --git a/Uno.Gallery/Platforms/WebAssembly/ts/LocationHrefNavigation.js b/Uno.Gallery/Platforms/WebAssembly/ts/LocationHrefNavigation.js
new file mode 100644
index 00000000..babb4d9f
--- /dev/null
+++ b/Uno.Gallery/Platforms/WebAssembly/ts/LocationHrefNavigation.js
@@ -0,0 +1,53 @@
+var Uno;
+(function (Uno) {
+    var Gallery;
+    (function (Gallery) {
+        var Wasm;
+        (function (Wasm) {
+            var LocationHrefNavigation = /** @class */ (function () {
+                function LocationHrefNavigation() {
+                }
+                LocationHrefNavigation.getCurrentLocationHref = function () {
+                    return window.location.href;
+                };
+                LocationHrefNavigation.setCurrentLocationHref = function (locationHref) {
+                    window.location.href = locationHref;
+                    this.currentLocationHref = window.location.href;
+                    return "ok";
+                };
+                LocationHrefNavigation.subscribeToLocationHrefChanged = function () {
+                    var _this = this;
+                    if (this.subscribed) {
+                        return "already subscribed";
+                    }
+                    this.subscribed = true;
+                    this.currentLocationHref = this.getCurrentLocationHref();
+                    window.addEventListener("hashchange", function (_) { return _this.notifyLocationHrefChanged(); }, false);
+                    return "ok";
+                };
+                LocationHrefNavigation.notifyLocationHrefChanged = function () {
+                    var newLocationHref = this.getCurrentLocationHref();
+                    if (newLocationHref === this.currentLocationHref) {
+                        return; // nothing to do
+                    }
+                    this.currentLocationHref = newLocationHref;
+                    this.initializeMethods();
+                    var newLocationHrefStr = MonoRuntime.mono_string(newLocationHref);
+                    MonoRuntime.call_method(this.notifyLocationHrefChangedMethod, null, [newLocationHrefStr]);
+                };
+                LocationHrefNavigation.initializeMethods = function () {
+                    if (this.notifyLocationHrefChangedMethod) {
+                        return; // already initialized.
+                    }
+                    var asm = MonoRuntime.assembly_load("Uno.Gallery.WASM");
+                    var handlerClass = MonoRuntime.find_class(asm, "Uno.Gallery.Wasm", "LocationHrefHavigation");
+                    this.notifyLocationHrefChangedMethod = MonoRuntime.find_method(handlerClass, "NotifyLocationHrefChanged", -1);
+                };
+                LocationHrefNavigation.subscribed = false;
+                return LocationHrefNavigation;
+            }());
+            Wasm.LocationHrefNavigation = LocationHrefNavigation;
+        })(Wasm = Gallery.Wasm || (Gallery.Wasm = {}));
+    })(Gallery = Uno.Gallery || (Uno.Gallery = {}));
+})(Uno || (Uno = {}));
+//# sourceMappingURL=LocationHrefNavigation.js.map
\ No newline at end of file
diff --git a/Uno.Gallery/Platforms/WebAssembly/ts/LocationHrefNavigation.js.map b/Uno.Gallery/Platforms/WebAssembly/ts/LocationHrefNavigation.js.map
new file mode 100644
index 00000000..6609bef6
--- /dev/null
+++ b/Uno.Gallery/Platforms/WebAssembly/ts/LocationHrefNavigation.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"LocationHrefNavigation.js","sourceRoot":"","sources":["LocationHrefNavigation.ts"],"names":[],"mappings":"AAAA,IAAU,GAAG,CA+DZ;AA/DD,WAAU,GAAG;IAAC,IAAA,OAAO,CA+DpB;IA/Da,WAAA,OAAO;QAAC,IAAA,IAAI,CA+DzB;QA/DqB,WAAA,IAAI;YACzB;gBAAA;gBA2DA,CAAC;gBAvDc,6CAAsB,GAApC;oBACC,OAAO,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;gBAC7B,CAAC;gBAEa,6CAAsB,GAApC,UAAqC,YAAoB;oBACxD,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,YAAY,CAAC;oBACpC,IAAI,CAAC,mBAAmB,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;oBAEhD,OAAO,IAAI,CAAC;gBACb,CAAC;gBAIa,qDAA8B,GAA5C;oBAAA,iBAgBC;oBAdA,IAAI,IAAI,CAAC,UAAU,EAAE;wBACpB,OAAO,oBAAoB,CAAC;qBAC5B;oBAED,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;oBAEvB,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,sBAAsB,EAAE,CAAC;oBAEzD,MAAM,CAAC,gBAAgB,CACtB,YAAY,EACZ,UAAA,CAAC,IAAI,OAAA,KAAI,CAAC,yBAAyB,EAAE,EAAhC,CAAgC,EACrC,KAAK,CAAC,CAAC;oBAER,OAAO,IAAI,CAAC;gBACb,CAAC;gBAIc,gDAAyB,GAAxC;oBACC,IAAM,eAAe,GAAW,IAAI,CAAC,sBAAsB,EAAE,CAAC;oBAC9D,IAAI,eAAe,KAAK,IAAI,CAAC,mBAAmB,EAAE;wBACjD,OAAO,CAAE,gBAAgB;qBACzB;oBAED,IAAI,CAAC,mBAAmB,GAAG,eAAe,CAAC;oBAE3C,IAAI,CAAC,iBAAiB,EAAE,CAAC;oBACzB,IAAM,kBAAkB,GAAG,WAAW,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;oBACpE,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,+BAA+B,EAAE,IAAI,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC;gBAC3F,CAAC;gBAEc,wCAAiB,GAAhC;oBACC,IAAI,IAAI,CAAC,+BAA+B,EAAE;wBACzC,OAAO,CAAC,uBAAuB;qBAC/B;oBAED,IAAM,GAAG,GAAG,WAAW,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAC;oBAC1D,IAAM,YAAY,GAAG,WAAW,CAAC,UAAU,CAAC,GAAG,EAAE,kBAAkB,EAAE,wBAAwB,CAAC,CAAC;oBAC/F,IAAI,CAAC,+BAA+B,GAAG,WAAW,CAAC,WAAW,CAAC,YAAY,EAAE,2BAA2B,EAAE,CAAC,CAAC,CAAC,CAAC;gBAC/G,CAAC;gBA3Cc,iCAAU,GAAY,KAAK,CAAC;gBA4C5C,6BAAC;aAAA,AA3DD,IA2DC;YA3DY,2BAAsB,yBA2DlC,CAAA;QAGF,CAAC,EA/DqB,IAAI,GAAJ,YAAI,KAAJ,YAAI,QA+DzB;IAAD,CAAC,EA/Da,OAAO,GAAP,WAAO,KAAP,WAAO,QA+DpB;AAAD,CAAC,EA/DS,GAAG,KAAH,GAAG,QA+DZ"}
\ No newline at end of file
diff --git a/Uno.Gallery/Uno.Gallery.csproj b/Uno.Gallery/Uno.Gallery.csproj
index c736ad69..fdcee4e0 100644
--- a/Uno.Gallery/Uno.Gallery.csproj
+++ b/Uno.Gallery/Uno.Gallery.csproj
@@ -1,11 +1,11 @@
-<Project Sdk="Uno.Sdk">
+<Project Sdk="Uno.Sdk.Private">
   <PropertyGroup>
 	<TargetFrameworks>
-	  net8.0-android;
+	  <!--net8.0-android;
 	  net8.0-ios;
 	  net8.0-maccatalyst;
 	  net8.0-windows10.0.19041;
-	  net8.0-desktop;
+	  net8.0-desktop;-->
 	  net8.0-browserwasm;
 	</TargetFrameworks>
 
@@ -36,15 +36,13 @@
 	  https://aka.platform.uno/singleproject-features
 	-->
 	<UnoFeatures>
-	  Material;
-	  MediaElement;
-	  Toolkit;
-	  Cupertino;
-	  Lottie;
-	  Skia;
-	  Svg;
-	  Logging;
-	  Extensions;
+		Material;
+		Toolkit;
+		Cupertino;
+		Lottie;
+		Skia;
+		Svg;
+		WebAssemblySkiaRenderer;
 	</UnoFeatures>
 	<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
@@ -55,6 +53,8 @@
   </PropertyGroup>
 
   <ItemGroup>
+	<PackageReference Include="SkiaSharp.Skottie" />
+	<PackageReference Include="Uno.Core" />
 	<PackageReference Include="Uno.ShowMeTheXAML" />
 	<PackageReference Include="Uno.ShowMeTheXAML.MSBuild" />
 	<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" />
@@ -62,7 +62,6 @@
 	<PackageReference Include="Microsoft.Extensions.Logging" />
 	<PackageReference Include="Microsoft.Extensions.Logging.Console" />
 	<PackageReference Include="Microsoft.Extensions.Logging.Debug" />
-	<PackageReference Include="Microsoft.NET.ILLink.Tasks" />
 	<PackageReference Include="NunitXml.TestLogger" />
 	<PackageReference Include="nventive.Nimue.Application.Packaging" />
   </ItemGroup>
@@ -110,11 +109,14 @@
 		<ItemGroup>
 			<PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls" />
 			<PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls.DataGrid" />
-			<PackageReference Include="Microsoft.TypeScript.Compiler" />
+			<!--<PackageReference Include="Microsoft.TypeScript.Compiler" />
 			<PackageReference Include="Microsoft.TypeScript.MSBuild" />
-			<EmbeddedResource Include="$(WasmProjectFolder)WasmScripts\*.js" />
+			<EmbeddedResource Include="$(WasmProjectFolder)WasmScripts\*.js" />-->
 		</ItemGroup>
+		  <PropertyGroup>
+			  <IsUnoHead>true</IsUnoHead>
+		  </PropertyGroup>
 	  </When>
   </Choose>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/global.json b/global.json
index 1736a3fa..d9f749b5 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,9 @@
 {
   // To update the version of Uno please update the version of the Uno.Sdk here. See https://aka.platform.uno/upgrade-uno-packages for more information.
   "msbuild-sdks": {
-    "Uno.Sdk": "5.2.95"
+	"Uno.Sdk.Private": "5.2.0-feature.skia-everywhere.4681"
+  },
+  "sdk": {
+	"allowPrerelease": false
   }
 }