From 5fee64af9d46c2a2d724b799c4b8cec3a365b6c1 Mon Sep 17 00:00:00 2001
From: Bagus Nur Listiyono <dzakibagus@gmail.com>
Date: Sat, 28 Oct 2023 15:18:31 +0700
Subject: [PATCH] Update dependencies and disable warned trimmings

- Updated CommunityToolkit to 8.2.2 also promoted .Common to main package
- Promoted SharpCompress to main and update to 0.34.1 (prev. 0.31.0)
---
 CollapseLauncher/CollapseLauncher.csproj | 13 +++-----
 CollapseLauncher/packages.lock.json      | 42 +++++++++++++-----------
 2 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/CollapseLauncher/CollapseLauncher.csproj b/CollapseLauncher/CollapseLauncher.csproj
index 40599b163..71c4ba1e2 100644
--- a/CollapseLauncher/CollapseLauncher.csproj
+++ b/CollapseLauncher/CollapseLauncher.csproj
@@ -70,7 +70,8 @@
 
 	<ItemGroup>
 		<PackageReference Include="Clowd.Squirrel" Version="2.9.42" />
-		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
+		<PackageReference Include="CommunityToolkit.Common" Version="8.2.2" />
+		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
 		<PackageReference Include="CommunityToolkit.WinUI.UI.Controls" Version="7.1.2" />
 		<PackageReference Include="GitInfo" Version="3.3.3">
 		  <PrivateAssets>all</PrivateAssets>
@@ -82,6 +83,7 @@
 		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
 		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231008000" />
 		<PackageReference Include="PhotoSauce.MagicScaler" Version="0.14.0" />
+		<PackageReference Include="SharpCompress" Version="0.34.1" />
 		<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
 		<PackageReference Include="System.CommandLine.NamingConventionBinder" Version="2.0.0-beta4.22272.1" />
 		<PackageReference Include="System.Drawing.Common" Version="8.0.0-rc.2.23479.14" />
@@ -124,20 +126,13 @@
 			<TrimmableAssembly Include="Hi3Helper.Http" />
 			<TrimmableAssembly Include="Hi3Helper.SharpHDiffPatch" />
 			<TrimmableAssembly Include="CommunityToolkit.Mvvm" />
-			<TrimmableAssembly Include="CommunityToolkit.WinUI" />
-			<TrimmableAssembly Include="CommunityToolkit.WinUI.UI.Controls.DataGrid" />
-			<TrimmableAssembly Include="CommunityToolkit.WinUI.UI.Controls.Input" />
-			<TrimmableAssembly Include="CommunityToolkit.WinUI.UI.Controls.Layout" />
-			<TrimmableAssembly Include="CommunityToolkit.WinUI.UI.Controls.Media" />
 			<TrimmableAssembly Include="CommunityToolkit.WinUI.UI.Controls.Primitives" />
-			<TrimmableAssembly Include="CommunityToolkit.WinUI.UI" />
 			<TrimmableAssembly Include="GitInfo" />
 			<TrimmableAssembly Include="Google.Protobuf" />
 			<TrimmableAssembly Include="H.NotifyIcon.WinUI" />
 			<TrimmableAssembly Include="Microsoft.Graphics.Canvas" />
 			<TrimmableAssembly Include="Microsoft.Graphics.Display" />
 			<TrimmableAssembly Include="Microsoft.InputStateManager" />
-			<TrimmableAssembly Include="Microsoft.Windows.SDK.NET" />
 			<TrimmableAssembly Include="Microsoft.WindowsAppSDK" />
 			<TrimmableAssembly Include="Microsoft.WindowsAppRuntime" />
 			<TrimmableAssembly Include="Microsoft.WinUI" />
@@ -154,7 +149,7 @@
 			<TrimmableAssembly Include="System.Runtime" />
 			<TrimmableAssembly Include="System.Runtime.Numerics" />
 			<TrimmableAssembly Include="System.Text.Encoding.CodePages" />
-			<TrimmableAssembly Include="System.Text.Encodings.Web"/>
+			<TrimmableAssembly Include="System.Text.Encodings.Web" />
 			<TrimmableAssembly Include="System.Text.Json" />
 			<TrimmableAssembly Include="System.Text.RegularExpression" />
 			<TrimmableAssembly Include="WinUIEdit" />
diff --git a/CollapseLauncher/packages.lock.json b/CollapseLauncher/packages.lock.json
index 3a857ae63..067f20356 100644
--- a/CollapseLauncher/packages.lock.json
+++ b/CollapseLauncher/packages.lock.json
@@ -11,11 +11,17 @@
           "SharpCompress": "0.31.0"
         }
       },
+      "CommunityToolkit.Common": {
+        "type": "Direct",
+        "requested": "[8.2.2, )",
+        "resolved": "8.2.2",
+        "contentHash": "8/enuV1R68d0hK66UO8/HQ3yEsMjxUqondiEXlA499XB3tYgIqhCM+ITe8fHfH3l4JN3gY6h21SvkJnxfaG3NQ=="
+      },
       "CommunityToolkit.Mvvm": {
         "type": "Direct",
-        "requested": "[8.2.1, )",
-        "resolved": "8.2.1",
-        "contentHash": "I24ofWVEdplxYjUez9/bljv/qb8r8Ccj6cvYXHexNBegLaD3iDy3QrzAAOYVMmfGWIXxlU1ZtECQNfU07+6hXQ=="
+        "requested": "[8.2.2, )",
+        "resolved": "8.2.2",
+        "contentHash": "r0g0k9tGYdrnz8R7T3x5UiokDffeevzK/2P/9SBL6fqLgN8B157MIi/bVUWI1KAz6ZorZrK9AdABCWUeXZZsvA=="
       },
       "CommunityToolkit.WinUI.UI.Controls": {
         "type": "Direct",
@@ -67,12 +73,6 @@
           "Microsoft.WindowsAppSDK": "1.4.230913002"
         }
       },
-      "Microsoft.NET.ILLink.Tasks": {
-        "type": "Direct",
-        "requested": "[8.0.0-rc.2.23479.6, )",
-        "resolved": "8.0.0-rc.2.23479.6",
-        "contentHash": "neRDuxVI/tdf5yz/rLyD1kP3DkWx8uHTvb1wcqbjDn4QQDHmYHwcuHBnVVPYtBzMFmlVNmJMa91weUEhHx2z5A=="
-      },
       "Microsoft.Windows.SDK.BuildTools": {
         "type": "Direct",
         "requested": "[10.0.22621.756, )",
@@ -94,6 +94,15 @@
         "resolved": "0.14.0",
         "contentHash": "JsPAREpPJCHBcL753YnGX132BemFM42NgnIQkwuwmb1n9qADrrBXhgkJNaCI+4TFbnMblRdF5K7OD0fe173cBA=="
       },
+      "SharpCompress": {
+        "type": "Direct",
+        "requested": "[0.34.1, )",
+        "resolved": "0.34.1",
+        "contentHash": "WttRM/J/ktUwM3hRPxRYux1AOT+TGLqab34ZNBGTZRChHtpkJXFGHJ/cZCyNOH0OqpCNDdOsHhzxOVYkx4WoGw==",
+        "dependencies": {
+          "ZstdSharp.Port": "0.7.2"
+        }
+      },
       "System.CommandLine": {
         "type": "Direct",
         "requested": "[2.0.0-beta4.22272.1, )",
@@ -187,11 +196,6 @@
           "Microsoft.WindowsAppSDK": "1.0.0"
         }
       },
-      "CommunityToolkit.Common": {
-        "type": "Transitive",
-        "resolved": "7.1.2",
-        "contentHash": "KnHnukN+Sc26YT98OWYTp8mvaYlLc61lzDh0RrVRNQXm01hZ+iXAjCgKM59vAojqxNVrlbcXj22LYOyXWDItgg=="
-      },
       "CommunityToolkit.WinUI": {
         "type": "Transitive",
         "resolved": "7.1.2",
@@ -486,11 +490,6 @@
         "resolved": "4.3.2",
         "contentHash": "leXiwfiIkW7Gmn7cgnNcdtNAU70SjmKW3jxGj1iKHOvdn0zRWsgv/l2OJUO5zdGdiv2VRFnAsxxhDgMzofPdWg=="
       },
-      "SharpCompress": {
-        "type": "Transitive",
-        "resolved": "0.31.0",
-        "contentHash": "wFf5N0ysnlKbG54beDDm4Z1uqM0EAKTupEkTxyG4EGVE1uZgTtohuBd2BhTHR2gNweJ6agxKbMFzmzk181qqjw=="
-      },
       "System.AppContext": {
         "type": "Transitive",
         "resolved": "4.3.0",
@@ -1184,6 +1183,11 @@
           "System.Threading.Tasks.Extensions": "4.5.4"
         }
       },
+      "ZstdSharp.Port": {
+        "type": "Transitive",
+        "resolved": "0.7.2",
+        "contentHash": "mT6Pb7qzDGapJ2ic4dAFqbzHpM+qgnasQIGR/Sofrk0fmKTQSTljG55OFXHbDJczLZWnUAFsg4bKR81uHiKzPg=="
+      },
       "colorthief": {
         "type": "Project",
         "dependencies": {