From cfa6d922e544e546285fef31d65442859dfcb921 Mon Sep 17 00:00:00 2001
From: Bagus Nur Listiyono <dzakibagus@gmail.com>
Date: Tue, 28 Nov 2023 09:37:51 +0700
Subject: [PATCH] Preserver COM Interop when trimming

---
 CollapseLauncher/CollapseLauncher.csproj | 1 +
 CollapseLauncher/TrimmerDescriptor.xml   | 9 +++++++++
 Hi3Helper.Core/packages.lock.json        | 9 +--------
 3 files changed, 11 insertions(+), 8 deletions(-)
 create mode 100644 CollapseLauncher/TrimmerDescriptor.xml

diff --git a/CollapseLauncher/CollapseLauncher.csproj b/CollapseLauncher/CollapseLauncher.csproj
index 40edb475b..5e6e3d951 100644
--- a/CollapseLauncher/CollapseLauncher.csproj
+++ b/CollapseLauncher/CollapseLauncher.csproj
@@ -176,6 +176,7 @@
 
 			<!-- Fix a crash due to property: PropertyPath went missing on ILTrimming -->
 			<TrimmerRootDescriptor Include="NonTrimmableRoots.xml" />
+			<TrimmerRootDescriptor Include="TrimmerDescriptor.xml" />
 
 			<!--
 			<TrimmerRootAssembly Include="CommunityToolkit.WinUI" />
diff --git a/CollapseLauncher/TrimmerDescriptor.xml b/CollapseLauncher/TrimmerDescriptor.xml
new file mode 100644
index 000000000..6cfcdeba3
--- /dev/null
+++ b/CollapseLauncher/TrimmerDescriptor.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<linker>
+  <assembly fullname="CollapseLauncher.dll">
+    <type fullname="CollapseLauncher.PInvoke">
+      <!-- Preserve COM Interop used in project code when trimming -->
+      <method signature="System.Object CoCreateInstance(System.Guid*, System.Object, CLSCTX, System.Guid*, out System.Object)" />
+    </type>
+  </assembly>
+</linker>
\ No newline at end of file
diff --git a/Hi3Helper.Core/packages.lock.json b/Hi3Helper.Core/packages.lock.json
index 08b95b25c..d060f7ea2 100644
--- a/Hi3Helper.Core/packages.lock.json
+++ b/Hi3Helper.Core/packages.lock.json
@@ -2,12 +2,6 @@
   "version": 1,
   "dependencies": {
     "net8.0": {
-      "Microsoft.NET.ILLink.Tasks": {
-        "type": "Direct",
-        "requested": "[8.0.0, )",
-        "resolved": "8.0.0",
-        "contentHash": "B3etT5XQ2nlWkZGO2m/ytDYrOmSsQG1XNBaM6ZYlX5Ch/tDrMFadr0/mK6gjZwaQc55g+5+WZMw4Cz3m8VEF7g=="
-      },
       "Google.Protobuf": {
         "type": "Transitive",
         "resolved": "3.25.1",
@@ -29,7 +23,6 @@
       "hi3helper.http": {
         "type": "Project"
       }
-    },
-    "net8.0/win-x64": {}
+    }
   }
 }
\ No newline at end of file