From dd3183650816f45aeb78e4372781ac86290367f4 Mon Sep 17 00:00:00 2001
From: Jerome Laban <jerome.laban@nventive.com>
Date: Thu, 9 Nov 2023 22:53:31 -0500
Subject: [PATCH 1/6] fix: Disable SIMD as a tentative workaround for arm64
 safari corruption

---
 Uno.Gallery/Uno.Gallery.Wasm/Uno.Gallery.Wasm.csproj | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Uno.Gallery/Uno.Gallery.Wasm/Uno.Gallery.Wasm.csproj b/Uno.Gallery/Uno.Gallery.Wasm/Uno.Gallery.Wasm.csproj
index d2b0dec8f..029b52c43 100644
--- a/Uno.Gallery/Uno.Gallery.Wasm/Uno.Gallery.Wasm.csproj
+++ b/Uno.Gallery/Uno.Gallery.Wasm/Uno.Gallery.Wasm.csproj
@@ -25,7 +25,10 @@
 		<WasmShellEmccLinkOptimization>false</WasmShellEmccLinkOptimization>
 		<WasmShellEnableEmccProfiling>true</WasmShellEnableEmccProfiling>
 		<UnoXamlResourcesTrimming>true</UnoXamlResourcesTrimming>
-		
+
+		<!-- Tentative disable SIMD for Safari corruption issue -->
+		<WasmShellEnableSimd>false</WasmShellEnableSimd>
+
 		<!--
 		Uncomment this block to generate a profile
 		<WasmShellGenerateAOTProfile>true</WasmShellGenerateAOTProfile>

From 65813955a9908d1ab7738ba261e5fc121e72c203 Mon Sep 17 00:00:00 2001
From: Jerome Laban <jerome.laban@nventive.com>
Date: Thu, 9 Nov 2023 23:33:22 -0500
Subject: [PATCH 2/6] chore: Adjust core loglevel

---
 Uno.Gallery/Uno.Gallery.Wasm/Uno.Gallery.Wasm.csproj | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/Uno.Gallery/Uno.Gallery.Wasm/Uno.Gallery.Wasm.csproj b/Uno.Gallery/Uno.Gallery.Wasm/Uno.Gallery.Wasm.csproj
index 029b52c43..df4a5cc30 100644
--- a/Uno.Gallery/Uno.Gallery.Wasm/Uno.Gallery.Wasm.csproj
+++ b/Uno.Gallery/Uno.Gallery.Wasm/Uno.Gallery.Wasm.csproj
@@ -37,7 +37,16 @@
 		<WasmShellEnableJiterpreter>false</WasmShellEnableJiterpreter>
 		-->
 	</PropertyGroup>
-	
+
+
+	<!-- REMOVE ME -->
+	<ItemGroup>
+		<WasmShellMonoEnvironment Include="MONO_GC_PARAMS" Value="soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep" />
+		<WasmShellMonoEnvironment Include="MONO_LOG_LEVEL" Value="debug" />
+		<WasmShellMonoEnvironment Include="MONO_LOG_MASK" Value="all" />
+	</ItemGroup>
+	<!-- REMOVE ME -->
+
 	<PropertyGroup>
 		<WasmShellAOTProfileExcludedMethods>System\.IO;AsyncTaskMethodBuilder;AsyncValueTaskMethodBuilder</WasmShellAOTProfileExcludedMethods>
 	</PropertyGroup>

From 2049bc2670676c5b0d5156607a06b04a73fa1fe7 Mon Sep 17 00:00:00 2001
From: Jerome Laban <jerome.laban@nventive.com>
Date: Fri, 10 Nov 2023 08:05:45 -0500
Subject: [PATCH 3/6] chore: Adjust AOT exclusions, bump bootstrapper

---
 .../Uno.Gallery.Wasm/Uno.Gallery.Wasm.csproj  | 39 ++-----------------
 1 file changed, 4 insertions(+), 35 deletions(-)

diff --git a/Uno.Gallery/Uno.Gallery.Wasm/Uno.Gallery.Wasm.csproj b/Uno.Gallery/Uno.Gallery.Wasm/Uno.Gallery.Wasm.csproj
index df4a5cc30..815baf1eb 100644
--- a/Uno.Gallery/Uno.Gallery.Wasm/Uno.Gallery.Wasm.csproj
+++ b/Uno.Gallery/Uno.Gallery.Wasm/Uno.Gallery.Wasm.csproj
@@ -7,9 +7,7 @@
 		<WasmHead>true</WasmHead>
 		<DefineConstants>__WASM__</DefineConstants>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-		
-		<UnoUIUseRoslynSourceGenerators>false</UnoUIUseRoslynSourceGenerators>
-  		<WasmShellWebAppBasePath>/</WasmShellWebAppBasePath>
+		<WasmShellWebAppBasePath>/</WasmShellWebAppBasePath>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)'=='Debug'">
@@ -27,7 +25,7 @@
 		<UnoXamlResourcesTrimming>true</UnoXamlResourcesTrimming>
 
 		<!-- Tentative disable SIMD for Safari corruption issue -->
-		<WasmShellEnableSimd>false</WasmShellEnableSimd>
+		<!--<WasmShellEnableSimd>false</WasmShellEnableSimd>-->
 
 		<!--
 		Uncomment this block to generate a profile
@@ -38,30 +36,11 @@
 		-->
 	</PropertyGroup>
 
-
-	<!-- REMOVE ME -->
-	<ItemGroup>
-		<WasmShellMonoEnvironment Include="MONO_GC_PARAMS" Value="soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep" />
-		<WasmShellMonoEnvironment Include="MONO_LOG_LEVEL" Value="debug" />
-		<WasmShellMonoEnvironment Include="MONO_LOG_MASK" Value="all" />
-	</ItemGroup>
-	<!-- REMOVE ME -->
-
-	<PropertyGroup>
-		<WasmShellAOTProfileExcludedMethods>System\.IO;AsyncTaskMethodBuilder;AsyncValueTaskMethodBuilder</WasmShellAOTProfileExcludedMethods>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<MonoRuntimeMixedModeExcludedAssembly Include="System.Private.Xml" />
-		<MonoRuntimeMixedModeExcludedAssembly Include="System.Linq.Expressions" />
-	</ItemGroup>
-
 	<PropertyGroup Condition="'$(Configuration)'=='Debug' or '$(IsUiAutomationMappingEnabled)'=='True'">
 		<IsUiAutomationMappingEnabled>True</IsUiAutomationMappingEnabled>
 		<DefineConstants>$(DefineConstants);USE_UITESTS</DefineConstants>
 	</PropertyGroup>
 
-
 	<ItemGroup Condition="'$(Configuration)'=='Release' and '$(WasmShellMonoRuntimeExecutionMode)'=='InterpreterAndAOT'">
 		<WasmShellEnableAotProfile Condition="'$(IsUiAutomationMappingEnabled)'==''" Include="aot.profile" />
 
@@ -71,16 +50,6 @@
 		<WasmShellEnableAotProfile Condition="'$(IsUiAutomationMappingEnabled)'=='True'" Include="aot-uitests.profile" />
 	</ItemGroup>
 
-	<PropertyGroup>
-		<WasmShellAOTProfileExcludedMethods>$(WasmShellAOTProfileExcludedMethods);System\.Reflection\.Assembly\.GetExecutingAssembly</WasmShellAOTProfileExcludedMethods>
-		<WasmShellAOTProfileExcludedMethods>$(WasmShellAOTProfileExcludedMethods);Dispose</WasmShellAOTProfileExcludedMethods>
-	</PropertyGroup>
-
-
-	<ItemGroup>
-		<MonoRuntimeMixedModeExcludedAssembly Include="System.Console" />
-	</ItemGroup>
-
 	<ItemGroup>
 		<Content Include="Assets\SplashScreen.png" />
 	</ItemGroup>
@@ -129,8 +98,8 @@
 		<PackageReference Include="Uno.WinUI.MediaPlayer.WebAssembly" Version="5.0.0-dev.2366" />
 		<PackageReference Include="Uno.WinUI.WebAssembly" Version="5.0.0-dev.2366" />
 		<PackageReference Include="Uno.WinUI.RemoteControl" Version="5.0.0-dev.2366" Condition="'$(Configuration)'=='Debug'" />
-		<PackageReference Include="Uno.Wasm.Bootstrap" Version="8.0.0-dev.252" />
-		<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="8.0.0-dev.252" />
+		<PackageReference Include="Uno.Wasm.Bootstrap" Version="8.0.0" />
+		<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="8.0.0" />
 		<PackageReference Include="Microsoft.TypeScript.Compiler" Version="3.1.5">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

From b409b697d474cbbfd5cb9771899d2dca8bed0e04 Mon Sep 17 00:00:00 2001
From: Jerome Laban <jerome.laban@nventive.com>
Date: Fri, 10 Nov 2023 08:51:56 -0500
Subject: [PATCH 4/6] chore: Adjust liner opts

---
 Uno.Gallery/Uno.Gallery.Wasm/Uno.Gallery.Wasm.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Uno.Gallery/Uno.Gallery.Wasm/Uno.Gallery.Wasm.csproj b/Uno.Gallery/Uno.Gallery.Wasm/Uno.Gallery.Wasm.csproj
index 815baf1eb..a9146d31f 100644
--- a/Uno.Gallery/Uno.Gallery.Wasm/Uno.Gallery.Wasm.csproj
+++ b/Uno.Gallery/Uno.Gallery.Wasm/Uno.Gallery.Wasm.csproj
@@ -20,7 +20,7 @@
 
 	<PropertyGroup Condition="'$(Configuration)'=='Release'">
 		<WasmShellMonoRuntimeExecutionMode>InterpreterAndAOT</WasmShellMonoRuntimeExecutionMode>
-		<WasmShellEmccLinkOptimization>false</WasmShellEmccLinkOptimization>
+		<WasmShellEmccLinkOptimization>true</WasmShellEmccLinkOptimization>
 		<WasmShellEnableEmccProfiling>true</WasmShellEnableEmccProfiling>
 		<UnoXamlResourcesTrimming>true</UnoXamlResourcesTrimming>
 

From 982d9181432c009383fb62a5103bbb5477408aca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= <jlaban@gmail.com>
Date: Fri, 10 Nov 2023 09:35:30 -0500
Subject: [PATCH 5/6] chore: Remove unused option

---
 Uno.Gallery/Uno.Gallery.Wasm/Uno.Gallery.Wasm.csproj | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Uno.Gallery/Uno.Gallery.Wasm/Uno.Gallery.Wasm.csproj b/Uno.Gallery/Uno.Gallery.Wasm/Uno.Gallery.Wasm.csproj
index a9146d31f..1548e778d 100644
--- a/Uno.Gallery/Uno.Gallery.Wasm/Uno.Gallery.Wasm.csproj
+++ b/Uno.Gallery/Uno.Gallery.Wasm/Uno.Gallery.Wasm.csproj
@@ -24,9 +24,6 @@
 		<WasmShellEnableEmccProfiling>true</WasmShellEnableEmccProfiling>
 		<UnoXamlResourcesTrimming>true</UnoXamlResourcesTrimming>
 
-		<!-- Tentative disable SIMD for Safari corruption issue -->
-		<!--<WasmShellEnableSimd>false</WasmShellEnableSimd>-->
-
 		<!--
 		Uncomment this block to generate a profile
 		<WasmShellGenerateAOTProfile>true</WasmShellGenerateAOTProfile>

From 4ff1e0b4a95ec7ca64713caf569cdaebcef7882e Mon Sep 17 00:00:00 2001
From: Jerome Laban <jerome.laban@nventive.com>
Date: Fri, 10 Nov 2023 09:42:18 -0500
Subject: [PATCH 6/6] chore: Adjust fluent AOT

---
 Uno.Gallery/Uno.Gallery.Wasm/Uno.Gallery.Wasm.csproj | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Uno.Gallery/Uno.Gallery.Wasm/Uno.Gallery.Wasm.csproj b/Uno.Gallery/Uno.Gallery.Wasm/Uno.Gallery.Wasm.csproj
index a9146d31f..942361d15 100644
--- a/Uno.Gallery/Uno.Gallery.Wasm/Uno.Gallery.Wasm.csproj
+++ b/Uno.Gallery/Uno.Gallery.Wasm/Uno.Gallery.Wasm.csproj
@@ -35,7 +35,13 @@
 		<WasmShellEnableJiterpreter>false</WasmShellEnableJiterpreter>
 		-->
 	</PropertyGroup>
-
+	
+	<ItemGroup>
+		<MonoRuntimeMixedModeExcludedAssembly Include="Uno.UI.FluentTheme" />
+		<MonoRuntimeMixedModeExcludedAssembly Include="Uno.UI.FluentTheme.v1" />
+		<MonoRuntimeMixedModeExcludedAssembly Include="Uno.UI.FluentTheme.v2" />
+	</ItemGroup>
+	
 	<PropertyGroup Condition="'$(Configuration)'=='Debug' or '$(IsUiAutomationMappingEnabled)'=='True'">
 		<IsUiAutomationMappingEnabled>True</IsUiAutomationMappingEnabled>
 		<DefineConstants>$(DefineConstants);USE_UITESTS</DefineConstants>