From d44ccbaaab8a12afeee5c14ad46345523c08f092 Mon Sep 17 00:00:00 2001
From: Pilzinsel64 <pilzinsel64@gmx.de>
Date: Tue, 18 Nov 2025 06:53:23 +0100
Subject: [PATCH] enable trimming

---
 Directory.Build.props                              | 14 ++++++++++++++
 ModpackUpdater.Apps.Client.Gui/MainForm.axaml.cs   |  4 ++--
 .../ModpackUpdater.Apps.Client.Gui.csproj          |  9 ++++++++-
 ModpackUpdater.Apps.Client.Gui/app.pupnet.conf     |  2 +-
 .../ModpackUpdater.Apps.Client.csproj              |  7 +++++++
 ModpackUpdater.Apps.Client/app.pupnet.conf         |  2 +-
 .../ModpackUpdater.Apps.Manager.csproj             |  8 ++++++++
 ModpackUpdater.Apps.Manager/app.pupnet.conf        |  2 +-
 8 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index d2cac91..c56734d 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -5,6 +5,7 @@
     <LangVersion>latest</LangVersion>
     <ImplicitUsings>true</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <JsonSerializerIsReflectionEnabledByDefault>true</JsonSerializerIsReflectionEnabledByDefault>
   </PropertyGroup>
   
   <PropertyGroup>
@@ -19,5 +20,18 @@
     <DebugSymbols>False</DebugSymbols>
     <DebugType>None</DebugType>
   </PropertyGroup>
+
+  <ItemGroup>
+    <TrimmerRootAssembly Include="Newtonsoft.Json"/>
+    <TrimmerRootAssembly Include="Pilz"/>
+    <TrimmerRootAssembly Include="Pilz.Updating"/>
+    <TrimmerRootAssembly Include="Pilz.Updating.Client"/>
+    <TrimmerRootAssembly Include="Pilz.Configuration"/>
+    <TrimmerRootAssembly Include="Yggdrasil.Engine"/>
+    <TrimmerRootAssembly Include="Octokit"/>
+    <TrimmerRootAssembly Include="Modrinth.Net"/>
+    <TrimmerRootAssembly Include="CurseForge.APIClient"/>
+    <TrimmerRootAssembly Include="ExCSS"/>
+  </ItemGroup>
   
 </Project>
\ No newline at end of file
diff --git a/ModpackUpdater.Apps.Client.Gui/MainForm.axaml.cs b/ModpackUpdater.Apps.Client.Gui/MainForm.axaml.cs
index e6e280c..fe35501 100644
--- a/ModpackUpdater.Apps.Client.Gui/MainForm.axaml.cs
+++ b/ModpackUpdater.Apps.Client.Gui/MainForm.axaml.cs
@@ -189,7 +189,7 @@ public partial class MainForm : Window
             {
                 lastUpdateCheckResult = await updater.Check(updateOptions);
             }
-            catch (Exception)
+            catch
             {
                 error();
                 if (Debugger.IsAttached)
@@ -275,7 +275,7 @@ public partial class MainForm : Window
     private async void MainForm_Loaded(object? sender, RoutedEventArgs e)
     {
         var updates = new AppUpdates(Program.UpdateUrl, this);
-        updates.OnDownloadProgramUpdate += (o, args) => SetStatus(GeneralLangRes.DownloadProgramUpdate, AppGlobals.Symbols.GetImageSource(AppSymbols.software_installer)); 
+        updates.OnDownloadProgramUpdate += (o, _) => SetStatus(GeneralLangRes.DownloadProgramUpdate, AppGlobals.Symbols.GetImageSource(AppSymbols.software_installer)); 
         await updates.UpdateApp();
         ClearStatus();
         
diff --git a/ModpackUpdater.Apps.Client.Gui/ModpackUpdater.Apps.Client.Gui.csproj b/ModpackUpdater.Apps.Client.Gui/ModpackUpdater.Apps.Client.Gui.csproj
index 81cf05a..8a9ba54 100644
--- a/ModpackUpdater.Apps.Client.Gui/ModpackUpdater.Apps.Client.Gui.csproj
+++ b/ModpackUpdater.Apps.Client.Gui/ModpackUpdater.Apps.Client.Gui.csproj
@@ -8,6 +8,13 @@
     <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
   </PropertyGroup>
+  
+  <ItemGroup>
+    <TrimmerRootAssembly Include="MinecraftModpackUpdater"/>
+    <TrimmerRootAssembly Include="ModpackUpdater.Manager"/>
+    <TrimmerRootAssembly Include="ModpackUpdater.Apps"/>
+    <TrimmerRootAssembly Include="ModpackUpdater"/>
+  </ItemGroup>
 
   <ItemGroup>
     <Compile Include="..\Version.cs" />
@@ -49,7 +56,7 @@
       <LastGenOutput>MsgBoxLangRes.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
-  
+
   <ItemGroup>
     <PackageReference Include="Avalonia.BuildServices" Version="11.3.2">
       <PrivateAssets>all</PrivateAssets>
diff --git a/ModpackUpdater.Apps.Client.Gui/app.pupnet.conf b/ModpackUpdater.Apps.Client.Gui/app.pupnet.conf
index d5fdd10..dc67a86 100644
--- a/ModpackUpdater.Apps.Client.Gui/app.pupnet.conf
+++ b/ModpackUpdater.Apps.Client.Gui/app.pupnet.conf
@@ -36,7 +36,7 @@ IconFiles = """
 
 # DOTNET PUBLISH
 DotnetProjectPath = ModpackUpdater.Apps.Client.Gui.csproj
-DotnetPublishArgs = -p:Version=${APP_VERSION} --self-contained true -p:DebugType=None -p:DebugSymbols=false -p:PublishSingleFile=true -p:PublishTrimmed=false
+DotnetPublishArgs = -p:Version=${APP_VERSION} --self-contained true -p:DebugType=None -p:DebugSymbols=false -p:PublishSingleFile=true -p:PublishTrimmed=true
 DotnetPostPublish = 
 DotnetPostPublishOnWindows = 
 
diff --git a/ModpackUpdater.Apps.Client/ModpackUpdater.Apps.Client.csproj b/ModpackUpdater.Apps.Client/ModpackUpdater.Apps.Client.csproj
index 362b937..079b8de 100644
--- a/ModpackUpdater.Apps.Client/ModpackUpdater.Apps.Client.csproj
+++ b/ModpackUpdater.Apps.Client/ModpackUpdater.Apps.Client.csproj
@@ -6,6 +6,13 @@
     <AssemblyName>MinecraftModpackUpdaterCli</AssemblyName>
   </PropertyGroup>
 
+  <ItemGroup>
+    <TrimmerRootAssembly Include="MinecraftModpackUpdaterCli"/>
+    <TrimmerRootAssembly Include="ModpackUpdater.Manager"/>
+    <TrimmerRootAssembly Include="ModpackUpdater.Apps"/>
+    <TrimmerRootAssembly Include="ModpackUpdater"/>
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Include="..\Version.cs" />
   </ItemGroup>
diff --git a/ModpackUpdater.Apps.Client/app.pupnet.conf b/ModpackUpdater.Apps.Client/app.pupnet.conf
index 6864f57..4054a3f 100644
--- a/ModpackUpdater.Apps.Client/app.pupnet.conf
+++ b/ModpackUpdater.Apps.Client/app.pupnet.conf
@@ -34,7 +34,7 @@ IconFiles = """
 
 # DOTNET PUBLISH
 DotnetProjectPath = ModpackUpdater.Apps.Client.csproj
-DotnetPublishArgs = -p:Version=${APP_VERSION} --self-contained true -p:DebugType=None -p:DebugSymbols=false -p:PublishSingleFile=true -p:PublishTrimmed=false
+DotnetPublishArgs = -p:Version=${APP_VERSION} --self-contained true -p:DebugType=None -p:DebugSymbols=false -p:PublishSingleFile=true -p:PublishTrimmed=true
 DotnetPostPublish = 
 DotnetPostPublishOnWindows = 
 
diff --git a/ModpackUpdater.Apps.Manager/ModpackUpdater.Apps.Manager.csproj b/ModpackUpdater.Apps.Manager/ModpackUpdater.Apps.Manager.csproj
index 3b72e0b..1dbc536 100644
--- a/ModpackUpdater.Apps.Manager/ModpackUpdater.Apps.Manager.csproj
+++ b/ModpackUpdater.Apps.Manager/ModpackUpdater.Apps.Manager.csproj
@@ -9,6 +9,14 @@
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
   </PropertyGroup>
 
+  <ItemGroup>
+    <TrimmerRootAssembly Include="MinecraftModpackUpdateManager"/>
+    <TrimmerRootAssembly Include="ModpackUpdater.Manager"/>
+    <TrimmerRootAssembly Include="ModpackUpdater.Apps"/>
+    <TrimmerRootAssembly Include="ModpackUpdater"/>
+    <TrimmerRootAssembly Include="NGitLab"/>
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Include="..\Version.cs" />
     <Compile Update="LangRes\UpdateActionTypeLangRes.Designer.cs">
diff --git a/ModpackUpdater.Apps.Manager/app.pupnet.conf b/ModpackUpdater.Apps.Manager/app.pupnet.conf
index 6ef69f0..f724ac4 100644
--- a/ModpackUpdater.Apps.Manager/app.pupnet.conf
+++ b/ModpackUpdater.Apps.Manager/app.pupnet.conf
@@ -36,7 +36,7 @@ IconFiles = """
 
 # DOTNET PUBLISH
 DotnetProjectPath = ModpackUpdater.Apps.Manager.csproj
-DotnetPublishArgs = -p:Version=${APP_VERSION} --self-contained true -p:DebugType=None -p:DebugSymbols=false -p:PublishSingleFile=true -p:PublishTrimmed=false
+DotnetPublishArgs = -p:Version=${APP_VERSION} --self-contained true -p:DebugType=None -p:DebugSymbols=false -p:PublishSingleFile=true -p:PublishTrimmed=true
 DotnetPostPublish = 
 DotnetPostPublishOnWindows =