From cd4494bff1352e4c1dd544becb0fdc59830c7df5 Mon Sep 17 00:00:00 2001
From: GabrielDuf <gabrielduf@hotmail.com>
Date: Thu, 14 May 2026 09:51:38 -0400
Subject: [PATCH 1/4] potential fix for the crash

---
 src/UniGetUI.Avalonia/UniGetUI.Avalonia.csproj | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/UniGetUI.Avalonia/UniGetUI.Avalonia.csproj b/src/UniGetUI.Avalonia/UniGetUI.Avalonia.csproj
index f9341b591..8f85c776d 100644
--- a/src/UniGetUI.Avalonia/UniGetUI.Avalonia.csproj
+++ b/src/UniGetUI.Avalonia/UniGetUI.Avalonia.csproj
@@ -96,6 +96,10 @@
         <PackageReference Include="Tmds.DBus.Protocol" Version="0.92.0" />
         <PackageReference Include="Devolutions.Pinget.Cli.Rust" Version="0.4.2" GeneratePathProperty="true" ExcludeAssets="build;buildTransitive;native" />
     </ItemGroup>
+    <ItemGroup>
+        <TrimmerRootAssembly Include="Avalonia.Controls.WebView" />
+        <PublishReadyToRunExclude Include="Avalonia.Controls.WebView.dll" />
+    </ItemGroup>
 
     <ItemGroup>
         <ProjectReference Include="..\UniGetUI.Core.Data\UniGetUI.Core.Data.csproj" />

From ee6b62076980d948fbbc959fe84fda0be48f743f Mon Sep 17 00:00:00 2001
From: GabrielDuf <gabrielduf@hotmail.com>
Date: Thu, 14 May 2026 10:56:37 -0400
Subject: [PATCH 2/4] add rootMode all

---
 src/UniGetUI.Avalonia/UniGetUI.Avalonia.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/UniGetUI.Avalonia/UniGetUI.Avalonia.csproj b/src/UniGetUI.Avalonia/UniGetUI.Avalonia.csproj
index 8f85c776d..a78d55ebc 100644
--- a/src/UniGetUI.Avalonia/UniGetUI.Avalonia.csproj
+++ b/src/UniGetUI.Avalonia/UniGetUI.Avalonia.csproj
@@ -97,7 +97,7 @@
         <PackageReference Include="Devolutions.Pinget.Cli.Rust" Version="0.4.2" GeneratePathProperty="true" ExcludeAssets="build;buildTransitive;native" />
     </ItemGroup>
     <ItemGroup>
-        <TrimmerRootAssembly Include="Avalonia.Controls.WebView" />
+        <TrimmerRootAssembly Include="Avalonia.Controls.WebView" RootMode="all" />
         <PublishReadyToRunExclude Include="Avalonia.Controls.WebView.dll" />
     </ItemGroup>
 

From c344f7f14dd39ba26b7576402cce43e1aa3b5783 Mon Sep 17 00:00:00 2001
From: GabrielDuf <gabrielduf@hotmail.com>
Date: Thu, 14 May 2026 15:32:10 -0400
Subject: [PATCH 3/4] Change default location

---
 src/UniGetUI.Avalonia/App.axaml.cs               | 10 ++++++----
 .../Views/Controls/UniGetUiWebView.cs            | 16 ++++++++++++++++
 src/UniGetUI.Avalonia/Views/Pages/HelpPage.axaml |  3 +--
 .../Views/Pages/ReleaseNotesPage.axaml           |  4 ++--
 4 files changed, 25 insertions(+), 8 deletions(-)
 create mode 100644 src/UniGetUI.Avalonia/Views/Controls/UniGetUiWebView.cs

diff --git a/src/UniGetUI.Avalonia/App.axaml.cs b/src/UniGetUI.Avalonia/App.axaml.cs
index 052ee30bf..52ca50067 100644
--- a/src/UniGetUI.Avalonia/App.axaml.cs
+++ b/src/UniGetUI.Avalonia/App.axaml.cs
@@ -158,15 +158,17 @@ public static void ApplyTheme(string value)
         };
     }
 
+    public static string WebViewUserDataFolder { get; } =
+        Path.Join(Path.GetTempPath(), "UniGetUI", "WebView");
+
     private static void SetUpWebViewUserDataFolder()
     {
         try
         {
-            string webViewPath = Path.Join(Path.GetTempPath(), "UniGetUI", "WebView");
-            if (!Directory.Exists(webViewPath))
-                Directory.CreateDirectory(webViewPath);
+            if (!Directory.Exists(WebViewUserDataFolder))
+                Directory.CreateDirectory(WebViewUserDataFolder);
 
-            Environment.SetEnvironmentVariable("WEBVIEW2_USER_DATA_FOLDER", webViewPath);
+            Environment.SetEnvironmentVariable("WEBVIEW2_USER_DATA_FOLDER", WebViewUserDataFolder);
         }
         catch (Exception e)
         {
diff --git a/src/UniGetUI.Avalonia/Views/Controls/UniGetUiWebView.cs b/src/UniGetUI.Avalonia/Views/Controls/UniGetUiWebView.cs
new file mode 100644
index 000000000..e941423f6
--- /dev/null
+++ b/src/UniGetUI.Avalonia/Views/Controls/UniGetUiWebView.cs
@@ -0,0 +1,16 @@
+using Avalonia.Controls;
+using Avalonia.Platform;
+
+namespace UniGetUI.Avalonia.Views.Controls;
+
+public sealed class UniGetUiWebView : NativeWebView
+{
+    public UniGetUiWebView()
+    {
+        EnvironmentRequested += (_, args) =>
+        {
+            if (args is WindowsWebView2EnvironmentRequestedEventArgs winArgs)
+                winArgs.UserDataFolder = App.WebViewUserDataFolder;
+        };
+    }
+}
diff --git a/src/UniGetUI.Avalonia/Views/Pages/HelpPage.axaml b/src/UniGetUI.Avalonia/Views/Pages/HelpPage.axaml
index 43d37cd00..1d733313d 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/HelpPage.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/HelpPage.axaml
@@ -4,7 +4,6 @@
              xmlns:automation="clr-namespace:Avalonia.Automation;assembly=Avalonia.Controls"
              xmlns:vm="using:UniGetUI.Avalonia.ViewModels.Pages"
              xmlns:controls="using:UniGetUI.Avalonia.Views.Controls"
-             xmlns:wv="using:Avalonia.Controls"
              xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -75,7 +74,7 @@
 
         <!-- WebView -->
         <Border x:Name="WebViewBorder" Grid.Row="2" CornerRadius="6" ClipToBounds="True">
-            <wv:NativeWebView x:Name="WebViewControl"/>
+            <controls:UniGetUiWebView x:Name="WebViewControl"/>
         </Border>
 
         <!-- Linux fallback -->
diff --git a/src/UniGetUI.Avalonia/Views/Pages/ReleaseNotesPage.axaml b/src/UniGetUI.Avalonia/Views/Pages/ReleaseNotesPage.axaml
index 75437361b..29d190673 100644
--- a/src/UniGetUI.Avalonia/Views/Pages/ReleaseNotesPage.axaml
+++ b/src/UniGetUI.Avalonia/Views/Pages/ReleaseNotesPage.axaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:automation="clr-namespace:Avalonia.Automation;assembly=Avalonia.Controls"
              xmlns:vm="using:UniGetUI.Avalonia.ViewModels.Pages"
-             xmlns:wv="using:Avalonia.Controls"
+             xmlns:controls="using:UniGetUI.Avalonia.Views.Controls"
              xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -36,7 +36,7 @@
 
         <!-- WebView -->
         <Border x:Name="WebViewBorder" Grid.Row="2" CornerRadius="6" ClipToBounds="True">
-            <wv:NativeWebView x:Name="WebViewControl"/>
+            <controls:UniGetUiWebView x:Name="WebViewControl"/>
         </Border>
 
         <!-- Linux fallback -->

From 95206633225b0cd67b480faafd173c04703fc5b7 Mon Sep 17 00:00:00 2001
From: GabrielDuf <gabrielduf@hotmail.com>
Date: Thu, 14 May 2026 16:03:24 -0400
Subject: [PATCH 4/4] removed useless trim workaround

---
 src/UniGetUI.Avalonia/UniGetUI.Avalonia.csproj | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/UniGetUI.Avalonia/UniGetUI.Avalonia.csproj b/src/UniGetUI.Avalonia/UniGetUI.Avalonia.csproj
index a78d55ebc..f9341b591 100644
--- a/src/UniGetUI.Avalonia/UniGetUI.Avalonia.csproj
+++ b/src/UniGetUI.Avalonia/UniGetUI.Avalonia.csproj
@@ -96,10 +96,6 @@
         <PackageReference Include="Tmds.DBus.Protocol" Version="0.92.0" />
         <PackageReference Include="Devolutions.Pinget.Cli.Rust" Version="0.4.2" GeneratePathProperty="true" ExcludeAssets="build;buildTransitive;native" />
     </ItemGroup>
-    <ItemGroup>
-        <TrimmerRootAssembly Include="Avalonia.Controls.WebView" RootMode="all" />
-        <PublishReadyToRunExclude Include="Avalonia.Controls.WebView.dll" />
-    </ItemGroup>
 
     <ItemGroup>
         <ProjectReference Include="..\UniGetUI.Core.Data\UniGetUI.Core.Data.csproj" />