diff --git a/CollapseLauncher/Classes/GameManagement/GamePlaytime/Playtime.cs b/CollapseLauncher/Classes/GameManagement/GamePlaytime/Playtime.cs index 3e5038c25..8ba85da0b 100644 --- a/CollapseLauncher/Classes/GameManagement/GamePlaytime/Playtime.cs +++ b/CollapseLauncher/Classes/GameManagement/GamePlaytime/Playtime.cs @@ -7,6 +7,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; +using System.Threading.Tasks; using System.Timers; using static Hi3Helper.Logger; using static CollapseLauncher.Dialogs.SimpleDialogs; @@ -49,9 +50,9 @@ public Playtime(IGameVersionCheck gameVersionManager, IGameSettings gameSettings } #nullable disable - public async void CheckDb() + public async Task CheckDb(bool redirectThrow = false) { - var needUpdate = await _playtime.DbSync(); + var needUpdate = await _playtime.DbSync(redirectThrow); if (needUpdate is not { IsUpdated: true, PlaytimeData: not null }) return; _playtime = needUpdate.PlaytimeData; diff --git a/CollapseLauncher/Classes/GameManagement/GamePlaytime/RegistryClass/CollapsePlaytime.cs b/CollapseLauncher/Classes/GameManagement/GamePlaytime/RegistryClass/CollapsePlaytime.cs index 68809ba50..4e4228f4e 100644 --- a/CollapseLauncher/Classes/GameManagement/GamePlaytime/RegistryClass/CollapsePlaytime.cs +++ b/CollapseLauncher/Classes/GameManagement/GamePlaytime/RegistryClass/CollapsePlaytime.cs @@ -289,7 +289,7 @@ public void AddMinute() /// Sync from/to DB at init /// /// true if require refresh, false if dont. - public async ValueTask<(bool IsUpdated, CollapsePlaytime? PlaytimeData)> DbSync() + public async ValueTask<(bool IsUpdated, CollapsePlaytime? PlaytimeData)> DbSync(bool redirectThrow = false) { LogWriteLine("[CollapsePlaytime::DbSync] Starting sync operation...", LogType.Default, true); try @@ -354,6 +354,11 @@ public void AddMinute() await SentryHelper.ExceptionHandlerAsync(ex, SentryHelper.ExceptionType.UnhandledOther); LogWriteLine($"[CollapsePlaytime::DbSync] Failed when trying to do sync operation\r\n{ex}", LogType.Error, true); + if (redirectThrow) + { + throw; + } + return (false, null); } } diff --git a/CollapseLauncher/Classes/Helper/Database/DBHandler.cs b/CollapseLauncher/Classes/Helper/Database/DBHandler.cs index 0ece4c24e..dbee3ad10 100644 --- a/CollapseLauncher/Classes/Helper/Database/DBHandler.cs +++ b/CollapseLauncher/Classes/Helper/Database/DBHandler.cs @@ -160,6 +160,12 @@ public static async Task Init(bool redirectThrow = false, bool bypassEnableFlag } else LogWriteLine("[DbHandler::Init] Reinitializing database system..."); } + catch (DllNotFoundException e) + { + LogWriteLine("[DbHandler::Init] Error when connecting to database system! Probably missing Visual C/C++ redist!\r\n" + e, + LogType.Error, true); + if (redirectThrow) throw; + } // No need to handle all these error catcher with sentry // The error should be handled in the method caller instead catch (LibsqlException e) when (e.Message.Contains("`api error: `{\"error\":\"Unauthorized: `The JWT is invalid`\"}``", diff --git a/CollapseLauncher/Classes/Interfaces/IGamePlaytime.cs b/CollapseLauncher/Classes/Interfaces/IGamePlaytime.cs index b7bdcf236..8da09b0a0 100644 --- a/CollapseLauncher/Classes/Interfaces/IGamePlaytime.cs +++ b/CollapseLauncher/Classes/Interfaces/IGamePlaytime.cs @@ -1,6 +1,7 @@ using CollapseLauncher.GamePlaytime; using System; using System.Diagnostics; +using System.Threading.Tasks; namespace CollapseLauncher.Interfaces { @@ -12,6 +13,6 @@ internal interface IGamePlaytime : IDisposable void Reset(); void Update(TimeSpan timeSpan, bool forceUpdateDb = false); void StartSession(Process proc, DateTime? begin = null); - void CheckDb(); + Task CheckDb(bool redirectThrow = false); } } diff --git a/CollapseLauncher/Classes/RepairManagement/Genshin/Check.cs b/CollapseLauncher/Classes/RepairManagement/Genshin/Check.cs index a8d263e32..f880e53ac 100644 --- a/CollapseLauncher/Classes/RepairManagement/Genshin/Check.cs +++ b/CollapseLauncher/Classes/RepairManagement/Genshin/Check.cs @@ -155,9 +155,10 @@ private async ValueTask CheckAssetAllType(PkgVersionProperties asset, List AssetEntry.Add( new AssetProperty( - Path.GetFileName(UsePersistent ? asset.remoteNamePersistent : asset.remoteName), + Path.GetFileName(repairFile), RepairAssetType.Generic, - Path.GetDirectoryName(UsePersistent ? asset.remoteNamePersistent : asset.remoteName), + Path.GetDirectoryName(repairFile), asset.fileSize, null, HexTool.HexToBytesUnsafe(asset.md5) @@ -209,8 +214,7 @@ private async ValueTask CheckAssetAllType(PkgVersionProperties asset, List - + - - - - - - - - + + + + + + + + true + + + collapse + collapse-launcher + + true + + true + + --local + + false + + true \ No newline at end of file diff --git a/CollapseLauncher/Properties/PublishProfiles/Publish-StableReleaseAOT.pubxml b/CollapseLauncher/Properties/PublishProfiles/Publish-StableReleaseAOT.pubxml index 2abaaec29..dfa3cf3fd 100644 --- a/CollapseLauncher/Properties/PublishProfiles/Publish-StableReleaseAOT.pubxml +++ b/CollapseLauncher/Properties/PublishProfiles/Publish-StableReleaseAOT.pubxml @@ -59,5 +59,19 @@ https://go.microsoft.com/fwlink/?LinkID=208121. true + + + collapse + collapse-launcher + + true + + true + + --local + + false + + true \ No newline at end of file diff --git a/CollapseLauncher/XAMLs/MainApp/Pages/HomePage.xaml b/CollapseLauncher/XAMLs/MainApp/Pages/HomePage.xaml index d6e36415c..3d527b7e1 100644 --- a/CollapseLauncher/XAMLs/MainApp/Pages/HomePage.xaml +++ b/CollapseLauncher/XAMLs/MainApp/Pages/HomePage.xaml @@ -2468,12 +2468,14 @@ + { + ProcessStartInfo psi = new ProcessStartInfo + { + FileName = "explorer.exe", + Arguments = "https://aka.ms/vs/17/release/vc_redist.x64.exe", + UseShellExecute = true, + Verb = "runas" + }; + Process.Start(psi); + }); + } + else { await SentryHelper.ExceptionHandlerAsync(ex); } + } catch (Exception ex) { // Revert value if fail diff --git a/CollapseLauncher/packages.lock.json b/CollapseLauncher/packages.lock.json index 533de006e..c04f43b55 100644 --- a/CollapseLauncher/packages.lock.json +++ b/CollapseLauncher/packages.lock.json @@ -4,84 +4,78 @@ "net9.0-windows10.0.22621": { "CommunityToolkit.Common": { "type": "Direct", - "requested": "[8.4.0-preview1, )", - "resolved": "8.4.0-preview1", - "contentHash": "Qp1MYyV3xdLZ8vrgSQRkpHQf90sI8VSp6Ty5KMjqMgojFOrd4Gg/Uu8cvWCQwUgDOS1VhVtWRQwsWFVYgnBukw==" + "requested": "[8.4.0-preview2, )", + "resolved": "8.4.0-preview2", + "contentHash": "z+JeKDlXMA08pVA5gmwnSyEK2/CTMwmA5cIYzdOx6Y6k1xriBGnU9o0PLeOlCM+7vVFqWsUWonkvSLLriQShBQ==" }, "CommunityToolkit.Mvvm": { "type": "Direct", - "requested": "[8.4.0-preview1, )", - "resolved": "8.4.0-preview1", - "contentHash": "h5rKzgmLPu7fIbnytn5aCUsHVbNxRKYMr5h51COYYq99TkxwjQRWmGIoubVZ1c09qUtVpG9ChC0QsOB20ELtZA==" + "requested": "[8.4.0-preview2, )", + "resolved": "8.4.0-preview2", + "contentHash": "Bq2Z9uCw8PmmMUZ7ShwwOZLnCTmf48eGWtORAbrUMjXoKhjywbsxuzLwVSqVRTNXb9yUA6QSrYgr4Uiqz4O/OA==" }, "CommunityToolkit.WinUI.Behaviors": { "type": "Direct", - "requested": "[8.1.240916, )", - "resolved": "8.1.240916", - "contentHash": "HJ/fJmxXj/KmrPCtDUmkKUf0govYesCuYFEKtuTigzcFyAwiNIZzXRgNxMU5UBrdOYYt+9zFY7ScczEzj4FB9w==", + "requested": "[8.2.241112-preview1, )", + "resolved": "8.2.241112-preview1", + "contentHash": "vB7RvRuM2LrMQP/HCN6tlybrjSAcZtjQmiL9XUWSPqadKlxnIKs/0fMP2sthrcTy21Z/qQ7/P+/SSUFNRZ4XxA==", "dependencies": { - "CommunityToolkit.WinUI.Animations": "8.1.240916", - "CommunityToolkit.WinUI.Extensions": "8.1.240916", - "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756", - "Microsoft.WindowsAppSDK": "1.5.240311000", + "CommunityToolkit.WinUI.Animations": "8.2.241112-preview1", + "CommunityToolkit.WinUI.Extensions": "8.2.241112-preview1", + "Microsoft.WindowsAppSDK": "1.6.240923002", "Microsoft.Xaml.Behaviors.WinUI.Managed": "2.0.9" } }, "CommunityToolkit.WinUI.Controls.Primitives": { "type": "Direct", - "requested": "[8.1.240916, )", - "resolved": "8.1.240916", - "contentHash": "ULEQhMGFX9YEwq9lF7XdiWAPtrXntVFqvt7HdGfeYjU6+JdW4zO/38dCMCuKJES7cG5sWWNrsntsOWUONFfVaA==", + "requested": "[8.2.241112-preview1, )", + "resolved": "8.2.241112-preview1", + "contentHash": "Z5cJyrDHEVLEhoSJpa3Vj7fNYcEfCE/Mrus8zUX2oFD5BpkNqAaJwOEIwCMDyQ6aNNBEGt5f+qs0mTgJp1pXyQ==", "dependencies": { - "CommunityToolkit.WinUI.Extensions": "8.1.240916", - "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756", - "Microsoft.WindowsAppSDK": "1.5.240311000" + "CommunityToolkit.WinUI.Extensions": "8.2.241112-preview1", + "Microsoft.WindowsAppSDK": "1.6.240923002" } }, "CommunityToolkit.WinUI.Controls.Sizers": { "type": "Direct", - "requested": "[8.1.240916, )", - "resolved": "8.1.240916", - "contentHash": "FD6ccqMnQc1urdEmTupd59mGnTOxKqf9UvjF2dheHz61F5hlj3y+Ngq/H9jgWw5VwoDV+AV4J40d/BjmCvBLYQ==", + "requested": "[8.2.241112-preview1, )", + "resolved": "8.2.241112-preview1", + "contentHash": "nd+k1STegyftRR3MOS+XaLpcS0vKMl46z0TZNnUrSpMb/Wfeu0uFcqFU5vsf4JgKUXx2CNDsydmFWQ7VjVCaow==", "dependencies": { - "CommunityToolkit.WinUI.Extensions": "8.1.240916", - "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756", - "Microsoft.WindowsAppSDK": "1.5.240311000" + "CommunityToolkit.WinUI.Extensions": "8.2.241112-preview1", + "Microsoft.WindowsAppSDK": "1.6.240923002" } }, "CommunityToolkit.WinUI.Converters": { "type": "Direct", - "requested": "[8.1.240916, )", - "resolved": "8.1.240916", - "contentHash": "UELI/UNyc9lf8NqKfuBZJGnrpUgXqqRZ3L/fP8RTRP/t8DWDr9JTdhgPUbXaF/Z16DVPZRId9c+nRfVINbme4Q==", + "requested": "[8.2.241112-preview1, )", + "resolved": "8.2.241112-preview1", + "contentHash": "j/24+iBF7WFeciFsXcHWmMtzZFElwnI/CYa5TpVv7pR7jqk89L7RCg6BoSKl2I3zPyz6FLMc4NmrXSytG3fZ5g==", "dependencies": { "CommunityToolkit.Common": "8.2.1", - "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756", - "Microsoft.WindowsAppSDK": "1.5.240311000" + "Microsoft.WindowsAppSDK": "1.6.240923002" } }, "CommunityToolkit.WinUI.Extensions": { "type": "Direct", - "requested": "[8.1.240916, )", - "resolved": "8.1.240916", - "contentHash": "y8FEzoy5HF3dBkxe/pU87hlh0QACtGZhnv881x2SFq9fvDjukLQz6VpoOkjxSZjEILmYu1NoI/tYjqXlETRGlw==", + "requested": "[8.2.241112-preview1, )", + "resolved": "8.2.241112-preview1", + "contentHash": "e0fuTXaeGvOttazZDpwJ/avaK8Coax7Mk9HTYywF4T1fvXZCLpmVLRuftajFK2rhQ85qOYuUKbh2FeSkeli0cg==", "dependencies": { "CommunityToolkit.Common": "8.2.1", - "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756", - "Microsoft.WindowsAppSDK": "1.5.240311000" + "Microsoft.WindowsAppSDK": "1.6.240923002" } }, "CommunityToolkit.WinUI.Media": { "type": "Direct", - "requested": "[8.1.240916, )", - "resolved": "8.1.240916", - "contentHash": "ghd4u81dNf5F5knVkww9QDUy03L05TvMHPlUXKOVFER0bl8A3K6I0eYi0bUNtR8VTB7giPy8DFh50t3SJjswrA==", + "requested": "[8.2.241112-preview1, )", + "resolved": "8.2.241112-preview1", + "contentHash": "rncwi8UKkjVfpVU1ISJdomOF3vjkgiki2RRL4o0qk2mtEyjRl9EJckIak1ExOEjjLGNTKV5CfZcypUl0d9Xv4Q==", "dependencies": { - "CommunityToolkit.WinUI.Animations": "8.1.240916", - "CommunityToolkit.WinUI.Extensions": "8.1.240916", - "Microsoft.Graphics.Win2D": "1.1.1", - "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756", - "Microsoft.WindowsAppSDK": "1.5.240311000" + "CommunityToolkit.WinUI.Animations": "8.2.241112-preview1", + "CommunityToolkit.WinUI.Extensions": "8.2.241112-preview1", + "Microsoft.Graphics.Win2D": "1.3.0", + "Microsoft.WindowsAppSDK": "1.6.240923002" } }, "GitInfo": { @@ -149,9 +143,9 @@ }, "Microsoft.Web.WebView2": { "type": "Direct", - "requested": "[1.0.2895-prerelease, )", - "resolved": "1.0.2895-prerelease", - "contentHash": "SoSa4zHfLHjAQof3cLaXMrWscAZ/5og1Zlyfj5BWOGaDP/9q22xvVFpuKDV3cPFwu86bFbKUMCPZtIuxG3LBbA==" + "requested": "[1.0.2950-prerelease, )", + "resolved": "1.0.2950-prerelease", + "contentHash": "15GH8uTwpzNi8PH5MFS5cnjJj7LxCMJXD3gfMVEiTqniKrABb8u8B8d2fLXIvnl/YlATrtkX1M+fXF2wokIiUA==" }, "Microsoft.Windows.CsWinRT": { "type": "Direct", @@ -167,9 +161,9 @@ }, "Microsoft.WindowsAppSDK": { "type": "Direct", - "requested": "[1.6.240923002, )", - "resolved": "1.6.240923002", - "contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==", + "requested": "[1.6.241114003, )", + "resolved": "1.6.241114003", + "contentHash": "5XBNubjJi7+7DDI5lUXR3Jc0/memeFJyP6zmGTGgQcmTTbUf2T6U1f+qwcXHT+2yoXpaDuZCE86/aDLdU30e5A==", "dependencies": { "Microsoft.Web.WebView2": "1.0.2651.64", "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" @@ -271,42 +265,39 @@ }, "Velopack": { "type": "Direct", - "requested": "[0.0.869, )", - "resolved": "0.0.869", - "contentHash": "oGk+2xphxXDm2rsj4z5JTOnfE7CydgEmsbadubkJOUAbLcaAnuLZQF+3EgVZEiuEFLgtdtl7BBhZ8GrDs41l1g==", + "requested": "[0.0.942, )", + "resolved": "0.0.942", + "contentHash": "reyKfQK/d4WeFHjd9gi1tsWFh9X5JGGQ+PkvKFd9jKx5HocrFYF0bj1K8PgIk2GZezoadapFT36Fvv8/gCD5rA==", "dependencies": { "Microsoft.Extensions.Logging.Abstractions": "8.0.0", - "NuGet.Versioning": "6.11.1" + "NuGet.Versioning": "6.12.1" } }, "CommunityToolkit.WinUI.Animations": { "type": "Transitive", - "resolved": "8.1.240916", - "contentHash": "jHYltimsKSSrYAij1TJC4VXzWZ6RaKCOWzkdDPenkjAcvE6lhSdX68eH6nNRIwZZC9lMpDy2Fba4uAJ1vMt9Ew==", + "resolved": "8.2.241112-preview1", + "contentHash": "DXE3iLN7GItrXSuLEffnIN4NEooytXwkpeza0ghR9eh2F9c7K+cG+7WH4BK3TMkdIqNvE54l23Rx0K9glFdcyg==", "dependencies": { - "CommunityToolkit.WinUI.Extensions": "8.1.240916", - "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756", - "Microsoft.WindowsAppSDK": "1.5.240311000" + "CommunityToolkit.WinUI.Extensions": "8.2.241112-preview1", + "Microsoft.WindowsAppSDK": "1.6.240923002" } }, "CommunityToolkit.WinUI.Helpers": { "type": "Transitive", - "resolved": "8.1.240916", - "contentHash": "Q2eipdR9ntktYT1b3Dn927lZjdwQsmSU9cq6Pf2GwXW+R2IwkbGn7uYKJhmr5athOT6mnNgc7pMmfwFHIsFPLQ==", + "resolved": "8.2.241112-preview1", + "contentHash": "sSYI2RUIfDXG0yPbdtaMmhoNCKWCu+0/Ba7hUlqnCWvH8z1NwkjG735202JrrBSXE2P+E51WGSMY8PJ+lIIUow==", "dependencies": { - "CommunityToolkit.WinUI.Extensions": "8.1.240916", - "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756", - "Microsoft.WindowsAppSDK": "1.5.240311000" + "CommunityToolkit.WinUI.Extensions": "8.2.241112-preview1", + "Microsoft.WindowsAppSDK": "1.6.240923002" } }, "CommunityToolkit.WinUI.Triggers": { "type": "Transitive", - "resolved": "8.1.240916", - "contentHash": "4XUtIdhjTj9mTWgqUvnVIa3Ox+CW+fBks94DUOndAuxtHlDf9Oc8EguHXp4W8qxp7x4tUeYDoRPmcsnXgjt3Sw==", + "resolved": "8.2.241112-preview1", + "contentHash": "m2WuTUDrCvZql51LyeTAAl5XM5/ehwjNx3Da9pJsgTVXRCJTq5Ywd3qxH/O2PTqu703EdZNf6Cq5fke5X4c4dw==", "dependencies": { - "CommunityToolkit.WinUI.Helpers": "8.1.240916", - "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756", - "Microsoft.WindowsAppSDK": "1.5.240311000" + "CommunityToolkit.WinUI.Helpers": "8.2.241112-preview1", + "Microsoft.WindowsAppSDK": "1.6.240923002" } }, "Google.Protobuf": { @@ -331,8 +322,8 @@ }, "NuGet.Versioning": { "type": "Transitive", - "resolved": "6.11.1", - "contentHash": "YNn3BB71F+guJW42TbAhGcMh3gpyqFMZcPVD9pm5vcvGivTALtRely/VCPWQQ6JQ5PfwIrjPaJMO7VnqyeK3rg==" + "resolved": "6.12.1", + "contentHash": "fJ6rFYANDnohFsdpaY79FvrJxI6murmoOxXz6nZlf819F48+IBKMnAIg3oIBRtZq5y498ObMtKnro5IitvizUg==" }, "Sentry": { "type": "Transitive", @@ -398,10 +389,10 @@ "h.notifyicon.winui": { "type": "Project", "dependencies": { - "H.NotifyIcon": "[1.0.0, )", - "Microsoft.Web.WebView2": "[1.0.2895-prerelease, )", + "H.NotifyIcon": "[0.0.0, )", + "Microsoft.Web.WebView2": "[1.0.2950-prerelease, )", "Microsoft.Windows.SDK.BuildTools": "[10.0.26100.1742, )", - "Microsoft.WindowsAppSDK": "[1.6.240923002, )" + "Microsoft.WindowsAppSDK": "[1.6.241114003, )" } }, "hi3helper.core": { @@ -442,24 +433,24 @@ "ImageCropper": { "type": "Project", "dependencies": { - "CommunityToolkit.Common": "[8.4.0-preview1, )", - "CommunityToolkit.WinUI.Extensions": "[8.1.240916, )", - "CommunityToolkit.WinUI.Media": "[8.1.240916, )", + "CommunityToolkit.Common": "[8.4.0-preview2, )", + "CommunityToolkit.WinUI.Extensions": "[8.2.241112-preview1, )", + "CommunityToolkit.WinUI.Media": "[8.2.241112-preview1, )", "Microsoft.Graphics.Win2D": "[1.3.0, )", - "Microsoft.Web.WebView2": "[1.0.2895-prerelease, )", + "Microsoft.Web.WebView2": "[1.0.2950-prerelease, )", "Microsoft.Windows.CsWinRT": "[2.2.0, )", "Microsoft.Windows.SDK.BuildTools": "[10.0.26100.1742, )", - "Microsoft.WindowsAppSDK": "[1.6.240923002, )" + "Microsoft.WindowsAppSDK": "[1.6.241114003, )" } }, "imageex": { "type": "Project", "dependencies": { - "CommunityToolkit.Common": "[8.4.0-preview1, )", - "CommunityToolkit.WinUI.Extensions": "[8.1.240916, )", - "Microsoft.Web.WebView2": "[1.0.2895-prerelease, )", + "CommunityToolkit.Common": "[8.4.0-preview2, )", + "CommunityToolkit.WinUI.Extensions": "[8.2.241112-preview1, )", + "Microsoft.Web.WebView2": "[1.0.2950-prerelease, )", "Microsoft.Windows.SDK.BuildTools": "[10.0.26100.1742, )", - "Microsoft.WindowsAppSDK": "[1.6.240923002, )" + "Microsoft.WindowsAppSDK": "[1.6.241114003, )" } }, "innosetuphelper": { @@ -471,12 +462,12 @@ "SettingsControls": { "type": "Project", "dependencies": { - "CommunityToolkit.Common": "[8.4.0-preview1, )", - "CommunityToolkit.WinUI.Triggers": "[8.1.240916, )", - "Microsoft.Web.WebView2": "[1.0.2895-prerelease, )", + "CommunityToolkit.Common": "[8.4.0-preview2, )", + "CommunityToolkit.WinUI.Triggers": "[8.2.241112-preview1, )", + "Microsoft.Web.WebView2": "[1.0.2950-prerelease, )", "Microsoft.Windows.CsWinRT": "[2.2.0, )", "Microsoft.Windows.SDK.BuildTools": "[10.0.26100.1742, )", - "Microsoft.WindowsAppSDK": "[1.6.240923002, )" + "Microsoft.WindowsAppSDK": "[1.6.241114003, )" } }, "sevenzipextractor": { @@ -501,15 +492,15 @@ }, "Microsoft.Web.WebView2": { "type": "Direct", - "requested": "[1.0.2895-prerelease, )", - "resolved": "1.0.2895-prerelease", - "contentHash": "SoSa4zHfLHjAQof3cLaXMrWscAZ/5og1Zlyfj5BWOGaDP/9q22xvVFpuKDV3cPFwu86bFbKUMCPZtIuxG3LBbA==" + "requested": "[1.0.2950-prerelease, )", + "resolved": "1.0.2950-prerelease", + "contentHash": "15GH8uTwpzNi8PH5MFS5cnjJj7LxCMJXD3gfMVEiTqniKrABb8u8B8d2fLXIvnl/YlATrtkX1M+fXF2wokIiUA==" }, "Microsoft.WindowsAppSDK": { "type": "Direct", - "requested": "[1.6.240923002, )", - "resolved": "1.6.240923002", - "contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==", + "requested": "[1.6.241114003, )", + "resolved": "1.6.241114003", + "contentHash": "5XBNubjJi7+7DDI5lUXR3Jc0/memeFJyP6zmGTGgQcmTTbUf2T6U1f+qwcXHT+2yoXpaDuZCE86/aDLdU30e5A==", "dependencies": { "Microsoft.Web.WebView2": "1.0.2651.64", "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" diff --git a/H.NotifyIcon b/H.NotifyIcon index 8ae464206..9b3c318a5 160000 --- a/H.NotifyIcon +++ b/H.NotifyIcon @@ -1 +1 @@ -Subproject commit 8ae464206f5c633b2b7e5e7b81ff40df6a83d79a +Subproject commit 9b3c318a55521fc470d2f250f1a09e467a1443d4 diff --git a/Hi3Helper.CommunityToolkit/ImageCropper/Hi3Helper.CommunityToolkit.WinUI.Controls.ImageCropper.csproj b/Hi3Helper.CommunityToolkit/ImageCropper/Hi3Helper.CommunityToolkit.WinUI.Controls.ImageCropper.csproj index cb641a13e..46925d520 100644 --- a/Hi3Helper.CommunityToolkit/ImageCropper/Hi3Helper.CommunityToolkit.WinUI.Controls.ImageCropper.csproj +++ b/Hi3Helper.CommunityToolkit/ImageCropper/Hi3Helper.CommunityToolkit.WinUI.Controls.ImageCropper.csproj @@ -33,14 +33,14 @@ - + - + - + - - + + diff --git a/Hi3Helper.CommunityToolkit/ImageCropper/packages.lock.json b/Hi3Helper.CommunityToolkit/ImageCropper/packages.lock.json index 7c3ce5d29..fdcac2c44 100644 --- a/Hi3Helper.CommunityToolkit/ImageCropper/packages.lock.json +++ b/Hi3Helper.CommunityToolkit/ImageCropper/packages.lock.json @@ -4,32 +4,30 @@ "net9.0-windows10.0.22621": { "CommunityToolkit.Common": { "type": "Direct", - "requested": "[8.4.0-preview1, )", - "resolved": "8.4.0-preview1", - "contentHash": "Qp1MYyV3xdLZ8vrgSQRkpHQf90sI8VSp6Ty5KMjqMgojFOrd4Gg/Uu8cvWCQwUgDOS1VhVtWRQwsWFVYgnBukw==" + "requested": "[8.4.0-preview2, )", + "resolved": "8.4.0-preview2", + "contentHash": "z+JeKDlXMA08pVA5gmwnSyEK2/CTMwmA5cIYzdOx6Y6k1xriBGnU9o0PLeOlCM+7vVFqWsUWonkvSLLriQShBQ==" }, "CommunityToolkit.WinUI.Extensions": { "type": "Direct", - "requested": "[8.1.240916, )", - "resolved": "8.1.240916", - "contentHash": "y8FEzoy5HF3dBkxe/pU87hlh0QACtGZhnv881x2SFq9fvDjukLQz6VpoOkjxSZjEILmYu1NoI/tYjqXlETRGlw==", + "requested": "[8.2.241112-preview1, )", + "resolved": "8.2.241112-preview1", + "contentHash": "e0fuTXaeGvOttazZDpwJ/avaK8Coax7Mk9HTYywF4T1fvXZCLpmVLRuftajFK2rhQ85qOYuUKbh2FeSkeli0cg==", "dependencies": { "CommunityToolkit.Common": "8.2.1", - "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756", - "Microsoft.WindowsAppSDK": "1.5.240311000" + "Microsoft.WindowsAppSDK": "1.6.240923002" } }, "CommunityToolkit.WinUI.Media": { "type": "Direct", - "requested": "[8.1.240916, )", - "resolved": "8.1.240916", - "contentHash": "ghd4u81dNf5F5knVkww9QDUy03L05TvMHPlUXKOVFER0bl8A3K6I0eYi0bUNtR8VTB7giPy8DFh50t3SJjswrA==", + "requested": "[8.2.241112-preview1, )", + "resolved": "8.2.241112-preview1", + "contentHash": "rncwi8UKkjVfpVU1ISJdomOF3vjkgiki2RRL4o0qk2mtEyjRl9EJckIak1ExOEjjLGNTKV5CfZcypUl0d9Xv4Q==", "dependencies": { - "CommunityToolkit.WinUI.Animations": "8.1.240916", - "CommunityToolkit.WinUI.Extensions": "8.1.240916", - "Microsoft.Graphics.Win2D": "1.1.1", - "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756", - "Microsoft.WindowsAppSDK": "1.5.240311000" + "CommunityToolkit.WinUI.Animations": "8.2.241112-preview1", + "CommunityToolkit.WinUI.Extensions": "8.2.241112-preview1", + "Microsoft.Graphics.Win2D": "1.3.0", + "Microsoft.WindowsAppSDK": "1.6.240923002" } }, "Microsoft.Graphics.Win2D": { @@ -49,9 +47,9 @@ }, "Microsoft.Web.WebView2": { "type": "Direct", - "requested": "[1.0.2895-prerelease, )", - "resolved": "1.0.2895-prerelease", - "contentHash": "SoSa4zHfLHjAQof3cLaXMrWscAZ/5og1Zlyfj5BWOGaDP/9q22xvVFpuKDV3cPFwu86bFbKUMCPZtIuxG3LBbA==" + "requested": "[1.0.2950-prerelease, )", + "resolved": "1.0.2950-prerelease", + "contentHash": "15GH8uTwpzNi8PH5MFS5cnjJj7LxCMJXD3gfMVEiTqniKrABb8u8B8d2fLXIvnl/YlATrtkX1M+fXF2wokIiUA==" }, "Microsoft.Windows.CsWinRT": { "type": "Direct", @@ -67,9 +65,9 @@ }, "Microsoft.WindowsAppSDK": { "type": "Direct", - "requested": "[1.6.240923002, )", - "resolved": "1.6.240923002", - "contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==", + "requested": "[1.6.241114003, )", + "resolved": "1.6.241114003", + "contentHash": "5XBNubjJi7+7DDI5lUXR3Jc0/memeFJyP6zmGTGgQcmTTbUf2T6U1f+qwcXHT+2yoXpaDuZCE86/aDLdU30e5A==", "dependencies": { "Microsoft.Web.WebView2": "1.0.2651.64", "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" @@ -77,12 +75,11 @@ }, "CommunityToolkit.WinUI.Animations": { "type": "Transitive", - "resolved": "8.1.240916", - "contentHash": "jHYltimsKSSrYAij1TJC4VXzWZ6RaKCOWzkdDPenkjAcvE6lhSdX68eH6nNRIwZZC9lMpDy2Fba4uAJ1vMt9Ew==", + "resolved": "8.2.241112-preview1", + "contentHash": "DXE3iLN7GItrXSuLEffnIN4NEooytXwkpeza0ghR9eh2F9c7K+cG+7WH4BK3TMkdIqNvE54l23Rx0K9glFdcyg==", "dependencies": { - "CommunityToolkit.WinUI.Extensions": "8.1.240916", - "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756", - "Microsoft.WindowsAppSDK": "1.5.240311000" + "CommunityToolkit.WinUI.Extensions": "8.2.241112-preview1", + "Microsoft.WindowsAppSDK": "1.6.240923002" } } }, @@ -98,15 +95,15 @@ }, "Microsoft.Web.WebView2": { "type": "Direct", - "requested": "[1.0.2895-prerelease, )", - "resolved": "1.0.2895-prerelease", - "contentHash": "SoSa4zHfLHjAQof3cLaXMrWscAZ/5og1Zlyfj5BWOGaDP/9q22xvVFpuKDV3cPFwu86bFbKUMCPZtIuxG3LBbA==" + "requested": "[1.0.2950-prerelease, )", + "resolved": "1.0.2950-prerelease", + "contentHash": "15GH8uTwpzNi8PH5MFS5cnjJj7LxCMJXD3gfMVEiTqniKrABb8u8B8d2fLXIvnl/YlATrtkX1M+fXF2wokIiUA==" }, "Microsoft.WindowsAppSDK": { "type": "Direct", - "requested": "[1.6.240923002, )", - "resolved": "1.6.240923002", - "contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==", + "requested": "[1.6.241114003, )", + "resolved": "1.6.241114003", + "contentHash": "5XBNubjJi7+7DDI5lUXR3Jc0/memeFJyP6zmGTGgQcmTTbUf2T6U1f+qwcXHT+2yoXpaDuZCE86/aDLdU30e5A==", "dependencies": { "Microsoft.Web.WebView2": "1.0.2651.64", "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" diff --git a/Hi3Helper.CommunityToolkit/SettingsControls/Hi3Helper.CommunityToolkit.WinUI.Controls.SettingsControls.csproj b/Hi3Helper.CommunityToolkit/SettingsControls/Hi3Helper.CommunityToolkit.WinUI.Controls.SettingsControls.csproj index 9af10aaaf..3f267809b 100644 --- a/Hi3Helper.CommunityToolkit/SettingsControls/Hi3Helper.CommunityToolkit.WinUI.Controls.SettingsControls.csproj +++ b/Hi3Helper.CommunityToolkit/SettingsControls/Hi3Helper.CommunityToolkit.WinUI.Controls.SettingsControls.csproj @@ -33,11 +33,11 @@ - - - + + + - + diff --git a/Hi3Helper.CommunityToolkit/SettingsControls/packages.lock.json b/Hi3Helper.CommunityToolkit/SettingsControls/packages.lock.json index 7d4d6825b..65ad630ee 100644 --- a/Hi3Helper.CommunityToolkit/SettingsControls/packages.lock.json +++ b/Hi3Helper.CommunityToolkit/SettingsControls/packages.lock.json @@ -4,19 +4,18 @@ "net9.0-windows10.0.22621": { "CommunityToolkit.Common": { "type": "Direct", - "requested": "[8.4.0-preview1, )", - "resolved": "8.4.0-preview1", - "contentHash": "Qp1MYyV3xdLZ8vrgSQRkpHQf90sI8VSp6Ty5KMjqMgojFOrd4Gg/Uu8cvWCQwUgDOS1VhVtWRQwsWFVYgnBukw==" + "requested": "[8.4.0-preview2, )", + "resolved": "8.4.0-preview2", + "contentHash": "z+JeKDlXMA08pVA5gmwnSyEK2/CTMwmA5cIYzdOx6Y6k1xriBGnU9o0PLeOlCM+7vVFqWsUWonkvSLLriQShBQ==" }, "CommunityToolkit.WinUI.Triggers": { "type": "Direct", - "requested": "[8.1.240916, )", - "resolved": "8.1.240916", - "contentHash": "4XUtIdhjTj9mTWgqUvnVIa3Ox+CW+fBks94DUOndAuxtHlDf9Oc8EguHXp4W8qxp7x4tUeYDoRPmcsnXgjt3Sw==", + "requested": "[8.2.241112-preview1, )", + "resolved": "8.2.241112-preview1", + "contentHash": "m2WuTUDrCvZql51LyeTAAl5XM5/ehwjNx3Da9pJsgTVXRCJTq5Ywd3qxH/O2PTqu703EdZNf6Cq5fke5X4c4dw==", "dependencies": { - "CommunityToolkit.WinUI.Helpers": "8.1.240916", - "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756", - "Microsoft.WindowsAppSDK": "1.5.240311000" + "CommunityToolkit.WinUI.Helpers": "8.2.241112-preview1", + "Microsoft.WindowsAppSDK": "1.6.240923002" } }, "Microsoft.NET.ILLink.Tasks": { @@ -27,9 +26,9 @@ }, "Microsoft.Web.WebView2": { "type": "Direct", - "requested": "[1.0.2895-prerelease, )", - "resolved": "1.0.2895-prerelease", - "contentHash": "SoSa4zHfLHjAQof3cLaXMrWscAZ/5og1Zlyfj5BWOGaDP/9q22xvVFpuKDV3cPFwu86bFbKUMCPZtIuxG3LBbA==" + "requested": "[1.0.2950-prerelease, )", + "resolved": "1.0.2950-prerelease", + "contentHash": "15GH8uTwpzNi8PH5MFS5cnjJj7LxCMJXD3gfMVEiTqniKrABb8u8B8d2fLXIvnl/YlATrtkX1M+fXF2wokIiUA==" }, "Microsoft.Windows.CsWinRT": { "type": "Direct", @@ -45,9 +44,9 @@ }, "Microsoft.WindowsAppSDK": { "type": "Direct", - "requested": "[1.6.240923002, )", - "resolved": "1.6.240923002", - "contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==", + "requested": "[1.6.241114003, )", + "resolved": "1.6.241114003", + "contentHash": "5XBNubjJi7+7DDI5lUXR3Jc0/memeFJyP6zmGTGgQcmTTbUf2T6U1f+qwcXHT+2yoXpaDuZCE86/aDLdU30e5A==", "dependencies": { "Microsoft.Web.WebView2": "1.0.2651.64", "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" @@ -55,37 +54,35 @@ }, "CommunityToolkit.WinUI.Extensions": { "type": "Transitive", - "resolved": "8.1.240916", - "contentHash": "y8FEzoy5HF3dBkxe/pU87hlh0QACtGZhnv881x2SFq9fvDjukLQz6VpoOkjxSZjEILmYu1NoI/tYjqXlETRGlw==", + "resolved": "8.2.241112-preview1", + "contentHash": "e0fuTXaeGvOttazZDpwJ/avaK8Coax7Mk9HTYywF4T1fvXZCLpmVLRuftajFK2rhQ85qOYuUKbh2FeSkeli0cg==", "dependencies": { "CommunityToolkit.Common": "8.2.1", - "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756", - "Microsoft.WindowsAppSDK": "1.5.240311000" + "Microsoft.WindowsAppSDK": "1.6.240923002" } }, "CommunityToolkit.WinUI.Helpers": { "type": "Transitive", - "resolved": "8.1.240916", - "contentHash": "Q2eipdR9ntktYT1b3Dn927lZjdwQsmSU9cq6Pf2GwXW+R2IwkbGn7uYKJhmr5athOT6mnNgc7pMmfwFHIsFPLQ==", + "resolved": "8.2.241112-preview1", + "contentHash": "sSYI2RUIfDXG0yPbdtaMmhoNCKWCu+0/Ba7hUlqnCWvH8z1NwkjG735202JrrBSXE2P+E51WGSMY8PJ+lIIUow==", "dependencies": { - "CommunityToolkit.WinUI.Extensions": "8.1.240916", - "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756", - "Microsoft.WindowsAppSDK": "1.5.240311000" + "CommunityToolkit.WinUI.Extensions": "8.2.241112-preview1", + "Microsoft.WindowsAppSDK": "1.6.240923002" } } }, "net9.0-windows10.0.22621/win-x64": { "Microsoft.Web.WebView2": { "type": "Direct", - "requested": "[1.0.2895-prerelease, )", - "resolved": "1.0.2895-prerelease", - "contentHash": "SoSa4zHfLHjAQof3cLaXMrWscAZ/5og1Zlyfj5BWOGaDP/9q22xvVFpuKDV3cPFwu86bFbKUMCPZtIuxG3LBbA==" + "requested": "[1.0.2950-prerelease, )", + "resolved": "1.0.2950-prerelease", + "contentHash": "15GH8uTwpzNi8PH5MFS5cnjJj7LxCMJXD3gfMVEiTqniKrABb8u8B8d2fLXIvnl/YlATrtkX1M+fXF2wokIiUA==" }, "Microsoft.WindowsAppSDK": { "type": "Direct", - "requested": "[1.6.240923002, )", - "resolved": "1.6.240923002", - "contentHash": "7PfOz2scXU+AAM/GYge+f6s7k3DVI+R1P8MNPZQr56GOPCGw+csvcg3S5KZg47z/o04kNvWH3GKtWT1ML9tpZw==", + "requested": "[1.6.241114003, )", + "resolved": "1.6.241114003", + "contentHash": "5XBNubjJi7+7DDI5lUXR3Jc0/memeFJyP6zmGTGgQcmTTbUf2T6U1f+qwcXHT+2yoXpaDuZCE86/aDLdU30e5A==", "dependencies": { "Microsoft.Web.WebView2": "1.0.2651.64", "Microsoft.Windows.SDK.BuildTools": "10.0.22621.756" diff --git a/Hi3Helper.Core/Classes/SentryHelper/SentryHelper.cs b/Hi3Helper.Core/Classes/SentryHelper/SentryHelper.cs index 5a547b127..10c65deff 100644 --- a/Hi3Helper.Core/Classes/SentryHelper/SentryHelper.cs +++ b/Hi3Helper.Core/Classes/SentryHelper/SentryHelper.cs @@ -203,8 +203,6 @@ private static void AppDomain_UnhandledExceptionEvent(object sender, UnhandledEx ex.Data[Mechanism.HandledKey] = false; ex.Data[Mechanism.MechanismKey] = "Application.UnhandledException"; ExceptionHandler(ex, ExceptionType.UnhandledOther); - - throw ex; } private static void TaskScheduler_UnobservedTaskException(object? sender, UnobservedTaskExceptionEventArgs e) @@ -239,6 +237,13 @@ public static void ExceptionHandler(Exception ex, ExceptionType exT = ExceptionT public static async Task ExceptionHandlerAsync(Exception ex, ExceptionType exT = ExceptionType.Handled) { if (!IsEnabled) return; + if (ex is AggregateException && ex.InnerException != null) ex = ex.InnerException; + if (ex is TaskCanceledException or OperationCanceledException) + { + Logger.LogWriteLine($"Caught TCE/OCE exception from: {ex.Source}. Exception will not be uploaded!\r\n{ex}", + LogType.Sentry); + return; + } ExceptionHandler(ex, exT); await SentrySdk.FlushAsync(TimeSpan.FromSeconds(10)); diff --git a/Hi3Helper.Core/Lang/Locale/LangHomePage.cs b/Hi3Helper.Core/Lang/Locale/LangHomePage.cs index 87314aca9..97e6cdbe4 100644 --- a/Hi3Helper.Core/Lang/Locale/LangHomePage.cs +++ b/Hi3Helper.Core/Lang/Locale/LangHomePage.cs @@ -67,6 +67,7 @@ public sealed partial class LangHomePage public string GamePlaytime_Idle_ResetBtn { get; set; } = LangFallback?._HomePage.GamePlaytime_Idle_ResetBtn; public string GamePlaytime_Idle_ChangeBtn { get; set; } = LangFallback?._HomePage.GamePlaytime_Idle_ChangeBtn; public string GamePlaytime_Idle_SyncDb { get; set; } = LangFallback?._HomePage.GamePlaytime_Idle_SyncDb; + public string GamePlaytime_Idle_SyncDbSyncing { get; set; } = LangFallback?._HomePage.GamePlaytime_Idle_SyncDbSyncing; public string GamePlaytime_Running_Info1 { get; set; } = LangFallback?._HomePage.GamePlaytime_Running_Info1; public string GamePlaytime_Running_Info2 { get; set; } = LangFallback?._HomePage.GamePlaytime_Running_Info2; public string GamePlaytime_Display { get; set; } = LangFallback?._HomePage.GamePlaytime_Display; diff --git a/Hi3Helper.Core/Lang/Locale/LangMisc.cs b/Hi3Helper.Core/Lang/Locale/LangMisc.cs index 4b030fb5d..1f888b1f6 100644 --- a/Hi3Helper.Core/Lang/Locale/LangMisc.cs +++ b/Hi3Helper.Core/Lang/Locale/LangMisc.cs @@ -134,9 +134,11 @@ public sealed partial class LangMisc public string ImageCropperTitle { get; set; } = LangFallback?._Misc.ImageCropperTitle; - public string IsBytesMoreThanBytes { get; set; } = LangFallback?._Misc.IsBytesMoreThanBytes; - public string IsBytesUnlimited { get; set; } = LangFallback?._Misc.IsBytesUnlimited; - public string IsBytesNotANumber { get; set; } = LangFallback?._Misc.IsBytesNotANumber; + public string IsBytesMoreThanBytes { get; set; } = LangFallback?._Misc.IsBytesMoreThanBytes; + public string IsBytesUnlimited { get; set; } = LangFallback?._Misc.IsBytesUnlimited; + public string IsBytesNotANumber { get; set; } = LangFallback?._Misc.IsBytesNotANumber; + public string MissingVcRedist { get; set; } = LangFallback?._Misc.MissingVcRedist; + public string MissingVcRedistSubtitle { get; set; } = LangFallback?._Misc.MissingVcRedistSubtitle; } } #endregion diff --git a/Hi3Helper.Core/Lang/en_US.json b/Hi3Helper.Core/Lang/en_US.json index 06dccbcce..c44b2947c 100644 --- a/Hi3Helper.Core/Lang/en_US.json +++ b/Hi3Helper.Core/Lang/en_US.json @@ -167,6 +167,7 @@ "GamePlaytime_Idle_ResetBtn": "Reset", "GamePlaytime_Idle_ChangeBtn": "Change", "GamePlaytime_Idle_SyncDb": "Sync", + "GamePlaytime_Idle_SyncDbSyncing": "Syncing...", "GamePlaytime_Running_Info1": "An instance of this game is currently running, therefore playtime can't be edited.", "GamePlaytime_Running_Info2": "Please be aware that fully closing Collapse will stop playtime tracking (saving what was played until that point).", "GamePlaytime_Display": "{0}h {1}m", @@ -790,7 +791,10 @@ "IsBytesMoreThanBytes": "= {0} bytes (-/+ {1})", "IsBytesUnlimited": "= Unlimited", - "IsBytesNotANumber": "= NaN" + "IsBytesNotANumber": "= NaN", + + "MissingVcRedist": "Missing Visual C/C++ Redistributable", + "MissingVcRedistSubtitle": "You need to install the Visual C/C++ Redistributable to run this function. Do you want to download it now?\r\nNote: This will open a browser window and download a file from Microsoft. Please run the installer after downloading it then restart Collapse and try again.\r\nIf you have already installed it but the error remains, please send a issue ticket to us." }, "_BackgroundNotification": { diff --git a/Hi3Helper.Core/Lang/es_419.json b/Hi3Helper.Core/Lang/es_419.json index 611cf250a..f584f247c 100644 --- a/Hi3Helper.Core/Lang/es_419.json +++ b/Hi3Helper.Core/Lang/es_419.json @@ -790,7 +790,10 @@ "IsBytesMoreThanBytes": "= {0} bytes (-/+ {1})", "IsBytesUnlimited": "= Sin Límite", - "IsBytesNotANumber": "= NaN" + "IsBytesNotANumber": "= NaN", + + "MissingVcRedist": "Falta el Visual C/C++ Redistributable", + "MissingVcRedistSubtitle": "Necesitas instalar Visual C/C++ Redistributable para ejecutar esta función. ¿Quieres descargarlo ahora?\r\nNota: Se abrirá el navegador y se descargará un archivo desde Microsoft. Por favor, ejecuta el instalador después de descargarlo y luego reinicia Collapse e inténtalo de nuevo.\r\nSi ya fue instalado pero el error persiste, por favor envianos un ticket informando del problema." }, "_BackgroundNotification": { diff --git a/Hi3Helper.Core/Lang/id_ID.json b/Hi3Helper.Core/Lang/id_ID.json index 57f1e26c0..189527761 100644 --- a/Hi3Helper.Core/Lang/id_ID.json +++ b/Hi3Helper.Core/Lang/id_ID.json @@ -422,6 +422,8 @@ "Debug": "Pengaturan Tambahan", "Debug_Console": "Perlihatkan Konsol", "Debug_IncludeGameLogs": "Simpan catatan game ke Collapse (kemungkinan berisi data sensitif)", + "Debug_SendRemoteCrashData": "Memperbolehkan laporan crash dikirimkan kepada developer secara anonymous", + "Debug_SendRemoteCrashData_EnvVarDisablement": "Pengaturan ini dimatikan dikarenakan variable environment 'DISABLE_SENTRY' diset ke true.", "Debug_MultipleInstance": "Perbolehkan Multiple Instance", "ChangeRegionWarning_Toggle": "Tampilkan Peringatan Penggantian Region", diff --git a/Hi3Helper.Core/Lang/ja_JP.json b/Hi3Helper.Core/Lang/ja_JP.json index e64d24ad4..fef202fd3 100644 --- a/Hi3Helper.Core/Lang/ja_JP.json +++ b/Hi3Helper.Core/Lang/ja_JP.json @@ -422,6 +422,8 @@ "Debug": "その他の設定", "Debug_Console": "コンソールを表示", "Debug_IncludeGameLogs": "コンソールログにゲームのログも保存（アカウント情報も含まれる可能性有り）", + "Debug_SendRemoteCrashData": "匿名で開発者にクラッシュレポートを送る", + "Debug_SendRemoteCrashData_EnvVarDisablement": "環境変数'DISABLE_SENTRY'の値がtrueであるため、この設定は無効になっています。", "Debug_MultipleInstance": "Collapseの多重起動を許可する", "ChangeRegionWarning_Toggle": "ゲームの変更時に確認ダイアログを表示", @@ -788,7 +790,10 @@ "IsBytesMoreThanBytes": "= {0} バイト (-/+ {1})", "IsBytesUnlimited": "= 無制限", - "IsBytesNotANumber": "= 不正な数値" + "IsBytesNotANumber": "= 不正な数値", + + "MissingVcRedist": "Visual C/C++ 再頒布可能パッケージが見つかりません", + "MissingVcRedistSubtitle": "この関数を実行するには、Visual C/C++ 再頒布可能パッケージをインストールする必要があります。今すぐダウンロードしますか?\r\n注：ブラウザを起動してMicrosoftからパッケージをダウンロードします。ダウンロード後にインストーラーを実行し、Collapseを再起動してから再度お試しください。\nインストール済みなのにエラーが解決しない場合は、Githubでissueを送信してください。" }, "_BackgroundNotification": { diff --git a/Hi3Helper.Core/Lang/zh_CN.json b/Hi3Helper.Core/Lang/zh_CN.json index 23f1f9bf1..b881e2d7f 100644 --- a/Hi3Helper.Core/Lang/zh_CN.json +++ b/Hi3Helper.Core/Lang/zh_CN.json @@ -422,6 +422,8 @@ "Debug": "附加设置", "Debug_Console": "显示控制台", "Debug_IncludeGameLogs": "保存游戏日志到 Collapse（可能含有敏感数据）", + "Debug_SendRemoteCrashData": "向开发者发送匿名崩溃报告", + "Debug_SendRemoteCrashData_EnvVarDisablement": "由于环境变量“DISABLE_SENTRY”被设为 true，该设置已被禁用。", "Debug_MultipleInstance": "允许开启多个 Collapse", "ChangeRegionWarning_Toggle": "显示区服更改警告", @@ -788,7 +790,10 @@ "IsBytesMoreThanBytes": "= {0} 字节 (-/+ {1})", "IsBytesUnlimited": "= 无限制", - "IsBytesNotANumber": "= NaN" + "IsBytesNotANumber": "= NaN", + + "MissingVcRedist": "缺少 Visual C/C++ 可再发行程序包", + "MissingVcRedistSubtitle": "您需要安装 Visual C/C++ 可再发行程序包才能运行此功能。您现在要下载吗？\n注意：这将打开一个浏览器窗口，并从微软下载一个文件。请下载后运行安装程序，然后重新启动 Collapse 并重试。\n如果您已经安装过了但仍然报错，请在 GitHub 上给我们提交一个 issue。" }, "_BackgroundNotification": { diff --git a/ImageEx b/ImageEx index a0c67df66..bca25959f 160000 --- a/ImageEx +++ b/ImageEx @@ -1 +1 @@ -Subproject commit a0c67df66246385cb5b1a548c9fd5731a6467286 +Subproject commit bca25959fbe0035d001f9c905075e450962e4b72 diff --git a/PRIVACY.md b/PRIVACY.md index ebb903e1c..7f49e6e2b 100644 --- a/PRIVACY.md +++ b/PRIVACY.md @@ -1,6 +1,6 @@ # Privacy Policy for Collapse Launcher -_Last Updated: November 16th, 2024_ +_Last Updated: November 19th, 2024_ Thank you for using Collapse Launcher! This Privacy Policy outlines the information practices of Collapse Launcher and how any third-party services utilized may collect, use, and disclose data. @@ -42,6 +42,13 @@ While Collapse itself does not collect the information outlined above, we utiliz https://sentry.io/privacy/ - Opt-out: You can disable this feature by going to the application settings or setting system environment variable "DISABLE_SENTRY" to true. +#### Service Provider: Turso +- Purpose: Storing User Synchronization Data in user provided database account. +- Information collected: IP address, Geo-location data. +- Privacy policies: + https://turso.tech/privacy-policy +- Opt-out: Disabled by default, you can enable this feature by making an account in the website and providing your own database account to the app. Collapse developer has no access to the data stored in the database. + ## 3. Cookies @@ -57,6 +64,6 @@ Collapse Launcher reserves the right to update or modify this Privacy Policy at ## 6. Contact -Should you have any questions, concerns, or requests regarding this Privacy Policy, please contact us at collapse+bagusnl@protonmail.com. +Should you have any questions, concerns, or requests regarding this Privacy Policy, please contact us at bagusnl+collapse@protonmail.com. By using Collapse Launcher, you agree to the terms outlined in this Privacy Policy. diff --git a/README.md b/README.md index 109dd59ef..85d59a196 100644 --- a/README.md +++ b/README.md @@ -249,7 +249,7 @@ To view all releases, [**click here**](https://github.com/neon-nyan/CollapseLaun # Code Signing Policy > Free code signing provided by [SignPath.io], certificate by [SignPath Foundation] -- This program will not transfer any information to other networked systems. +- This program will only transfer user data to user configured database server. Exception data will be sent to [Sentry.io] for error tracking purposes (user are able to disable the behavior in App Settings). - Read our full [**Privacy Policy**](PRIVACY.md) - Also read our [**Third Party Notices**](THIRD_PARTY_NOTICES.md) for license used by third party libraries that we use. diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md index 108d7f4ab..cb9a85b4a 100644 --- a/THIRD_PARTY_NOTICES.md +++ b/THIRD_PARTY_NOTICES.md @@ -31,92 +31,81 @@ This project uses third-party libraries, each governed by their respective licen ## Third-party software list -This page lists the third-party software dependencies used in CollapseLauncher. Autogenerated by Qodana at Oct, 26th 2024. +This page lists the third-party software dependencies used in CollapseLauncher. Autogenerated by Qodana at Nov, 19th 2024. -| Dependency | Version | Licenses | -|------------------------------------------------------------------------------------------------------------------------------------|---------------------|--------------------------------------------------------------------------------------------------------| -| [CommunityToolkit.Common](https://github.com/CommunityToolkit/dotnet) | 8.2.1 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [CommunityToolkit.Common](https://github.com/CommunityToolkit/dotnet) | 8.3.2 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [CommunityToolkit.Mvvm](https://github.com/CommunityToolkit/dotnet) | 8.3.2 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [CommunityToolkit.WinUI.Animations](https://github.com/CommunityToolkit/Windows) | 8.1.240916 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [CommunityToolkit.WinUI.Controls.Primitives](https://github.com/CommunityToolkit/Windows) | 8.1.240916 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [CommunityToolkit.WinUI.Controls.Sizers](https://github.com/CommunityToolkit/Windows) | 8.1.240916 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [CommunityToolkit.WinUI.Converters](https://github.com/CommunityToolkit/Windows) | 8.1.240916 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [CommunityToolkit.WinUI.Extensions](https://github.com/CommunityToolkit/Windows) | 8.1.240916 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [CommunityToolkit.WinUI.Helpers](https://github.com/CommunityToolkit/Windows) | 8.1.240916 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [CommunityToolkit.WinUI.Media](https://github.com/CommunityToolkit/Windows) | 8.1.240916 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [CommunityToolkit.WinUI.Triggers](https://github.com/CommunityToolkit/Windows) | 8.1.240916 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [Costura.Fody](https://github.com/Fody/Costura) | 5.8.0-alpha0098 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [DotNet.ReproducibleBuilds](https://www.nuget.org/packages/DotNet.ReproducibleBuilds) | 1.2.25 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [EventGenerator.Generator](https://www.nuget.org/packages/EventGenerator.Generator) | 0.13.1 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [Fody](https://github.com/Fody/Fody) | 6.8.2 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [GitInfo](https://clarius.org/GitInfo) | 3.3.5 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [Google.Protobuf.Tools](https://github.com/protocolbuffers/protobuf) | 3.28.3 | PROTOBUF | -| [Google.Protobuf](https://github.com/protocolbuffers/protobuf) | 3.28.3 | [BSD-3-Clause](http://www.opensource.org/licenses/BSD-3-Clause) | -| [Hi3Helper.ZstdNet](https://github.com/CollapseLauncher/Hi3Helper.ZstdNet) | 1.6.3 | [BSD-3-Clause](http://www.opensource.org/licenses/BSD-3-Clause) | -| [HtmlAgilityPack](http://html-agility-pack.net/) | 1.11.70 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [Markdig.Signed](https://github.com/lunet-io/markdig) | 0.38.0 | [BSD-2-Clause](http://www.opensource.org/licenses/BSD-2-Clause) | -| [Microsoft.CSharp](https://github.com/dotnet/corefx) | 4.7.0 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [Microsoft.Extensions.Logging.Abstractions](https://asp.net/) | 2.2.0 | [Apache-2.0](http://www.apache.org/licenses/) | -| [Microsoft.Graphics.Win2D](http://go.microsoft.com/fwlink/?LinkID=519078) | 1.3.0 | [MS-ASP-NET-WEB-OPTIMIZATION](https://www.microsoft.com/web/webpi/eula/weboptimization_1_eula_enu.htm) | -| [Microsoft.NETCore.Platforms](https://dot.net/) | 1.1.0 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [Microsoft.NETFramework.ReferenceAssemblies.net462](https://github.com/Microsoft/dotnet/tree/master/releases/reference-assemblies) | 1.0.3 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [Microsoft.NETFramework.ReferenceAssemblies](https://github.com/Microsoft/dotnet/tree/master/releases/reference-assemblies) | 1.0.3 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [Microsoft.Web.WebView2](https://aka.ms/webview) | 1.0.2895-prerelease | [MIT](http://opensource.org/licenses/mit-license.php) | -| [Microsoft.Win32.Primitives](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [Microsoft.Windows.CsWin32](https://github.com/Microsoft/CsWin32) | 0.3.106 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [Microsoft.Windows.CsWinRT](https://github.com/microsoft/cswinrt) | 2.1.6 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [Microsoft.Windows.SDK.BuildTools](https://aka.ms/WinSDKProjectURL) | 10.0.26100.1742 | PROPRIETARY-LICENSE | -| [Microsoft.Windows.SDK.Win32Docs](https://github.com/microsoft/win32metadata) | 0.1.42-alpha | PROPRIETARY-LICENSE | -| [Microsoft.Windows.SDK.Win32Metadata](https://github.com/microsoft/win32metadata) | 60.0.34-preview | [MIT](http://opensource.org/licenses/mit-license.php) | -| [Microsoft.Windows.WDK.Win32Metadata](https://github.com/microsoft/wdkmetadata) | 0.11.4-experimental | [MIT](http://opensource.org/licenses/mit-license.php) | -| [Microsoft.WindowsAppSDK](https://github.com/microsoft/windowsappsdk) | 1.6.240923002 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [Microsoft.Xaml.Behaviors.WinUI.Managed](http://go.microsoft.com/fwlink/?LinkID=651678) | 2.0.9 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [MinVer](https://github.com/adamralph/minver) | 6.0.0 | [Apache-2.0](http://www.apache.org/licenses/) | -| [NETStandard.Library](https://dot.net/) | 1.6.1 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [Newtonsoft.Json](https://www.newtonsoft.com/json) | 13.0.1 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [NuGet.Versioning](https://aka.ms/nugetprj) | 6.10.1 | [Apache-2.0](http://www.apache.org/licenses/) | -| [PhotoSauce.MagicScaler](https://photosauce.net/) | 0.14.2 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [Roman-Numerals](https://github.com/picrap/RomanNumerals) | 2.0.1 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [SharpCompress](https://github.com/adamhathcock/sharpcompress) | 0.38.0 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [SharpHDiffPatch.Core](https://github.com/CollapseLauncher/SharpHDiffPatch.Core) | 2.2.8 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [System.AppContext](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [System.IO.Compression.ZipFile](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [System.IO.Compression](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [System.IO.FileSystem.Primitives](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [System.IO.FileSystem](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [System.IO](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [System.Linq.Expressions](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [System.Linq](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [System.Net.Http](https://dot.net/) | 4.3.4 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [System.Net.Primitives](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [System.Net.Sockets](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [System.ObjectModel](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [System.Reflection.Extensions](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [System.Reflection.Primitives](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [System.Reflection](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [System.Resources.ResourceManager](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [System.Runtime.Extensions](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [System.Runtime.Handles](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [System.Runtime.InteropServices.RuntimeInformation](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [System.Runtime.InteropServices](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [System.Runtime.Numerics](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [System.Runtime](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [System.Security.AccessControl](https://dot.net/) | 6.0.1 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [System.Security.Cryptography.Algorithms](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [System.Security.Cryptography.Encoding](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [System.Security.Cryptography.Primitives](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [System.Security.Cryptography.X509Certificates](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [System.Text.Encoding.Extensions](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [System.Text.Encoding](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [System.Text.RegularExpressions](https://dot.net/) | 4.3.1 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [System.Threading.Tasks.Extensions](https://dot.net/) | 4.5.4 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [System.Threading.Tasks](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [System.Threading.Timer](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [System.Threading](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [System.Xml.ReaderWriter](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [System.Xml.XDocument](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [TaskScheduler](https://github.com/dahall/taskscheduler) | 2.11.0 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [ThisAssembly.Constants](https://clarius.org/ThisAssembly) | 1.4.1 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [Velopack](https://github.com/velopack/velopack) | 0.0.626 | [MIT](http://opensource.org/licenses/mit-license.php) | -| [ZstdSharp.Port](https://github.com/oleg-st/ZstdSharp) | 0.8.1 | [MIT](http://opensource.org/licenses/mit-license.php) | \ No newline at end of file +| Dependency | Version | Licenses | +|----------------------------------------------------------------------------------------------------------------------------------------|-------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------| +| [CommunityToolkit.Common](https://github.com/CommunityToolkit/dotnet) | 8.4.0-preview1 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [CommunityToolkit.Mvvm](https://github.com/CommunityToolkit/dotnet) | 8.4.0-preview1 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [CommunityToolkit.WinUI.Animations](https://github.com/CommunityToolkit/Windows) | 8.1.240916 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [CommunityToolkit.WinUI.Behaviors](https://www.nuget.org/packages/CommunityToolkit.WinUI.Behaviors) | 8.1.240916 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [CommunityToolkit.WinUI.Controls.Primitives](https://github.com/CommunityToolkit/Windows) | 8.1.240916 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [CommunityToolkit.WinUI.Controls.Sizers](https://github.com/CommunityToolkit/Windows) | 8.1.240916 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [CommunityToolkit.WinUI.Converters](https://github.com/CommunityToolkit/Windows) | 8.1.240916 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [CommunityToolkit.WinUI.Extensions](https://github.com/CommunityToolkit/Windows) | 8.1.240916 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [CommunityToolkit.WinUI.Helpers](https://github.com/CommunityToolkit/Windows) | 8.1.240916 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [CommunityToolkit.WinUI.Media](https://github.com/CommunityToolkit/Windows) | 8.1.240916 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [CommunityToolkit.WinUI.Triggers](https://github.com/CommunityToolkit/Windows) | 8.1.240916 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [Costura.Fody](https://github.com/Fody/Costura) | 5.8.0-alpha0098 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [DotNet.ReproducibleBuilds](https://www.nuget.org/packages/DotNet.ReproducibleBuilds) | 1.2.25 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [EventGenerator.Generator](https://www.nuget.org/packages/EventGenerator.Generator) | 0.13.1 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [Fody](https://github.com/Fody/Fody) | 6.8.2 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [GitInfo](https://clarius.org/GitInfo) | 3.5.0 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [Google.Protobuf.Tools](https://github.com/protocolbuffers/protobuf) | 3.28.3 | PROTOBUF | +| [Google.Protobuf](https://github.com/protocolbuffers/protobuf) | 3.28.3 | [BSD-3-Clause](http://www.opensource.org/licenses/BSD-3-Clause) | +| [Hi3Helper.ZstdNet](https://github.com/CollapseLauncher/Hi3Helper.ZstdNet) | 1.6.3 | [BSD-3-Clause](http://www.opensource.org/licenses/BSD-3-Clause) | +| [HtmlAgilityPack](http://html-agility-pack.net/) | 1.11.71 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [Markdig.Signed](https://github.com/lunet-io/markdig) | 0.38.0 | [BSD-2-Clause](http://www.opensource.org/licenses/BSD-2-Clause) | +| [Microsoft.CSharp](https://github.com/dotnet/corefx) | 4.7.0 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [Microsoft.Extensions.DependencyInjection.Abstractions](https://dot.net/) | 9.0.0 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [Microsoft.Extensions.Logging.Abstractions](https://dot.net/) | 9.0.0 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [Microsoft.Graphics.Win2D](http://go.microsoft.com/fwlink/?LinkID=519078) | 1.3.0 | [MS-ASP-NET-WEB-OPTIMIZATION](https://www.microsoft.com/web/webpi/eula/weboptimization_1_eula_enu.htm) | +| [Microsoft.NET.ILLink.Tasks](https://dot.net/) | 9.0.0 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [Microsoft.NETCore.Platforms](https://dot.net/) | 1.1.0 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [Microsoft.NETCore.Targets](https://www.nuget.org/packages/Microsoft.NETCore.Targets) | 6.0.0-preview.4.21253.7 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [Microsoft.NETFramework.ReferenceAssemblies.net462](https://github.com/Microsoft/dotnet/tree/master/releases/reference-assemblies) | 1.0.3 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [Microsoft.NETFramework.ReferenceAssemblies](https://github.com/Microsoft/dotnet/tree/master/releases/reference-assemblies) | 1.0.3 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [Microsoft.Web.WebView2](https://aka.ms/webview) | 1.0.2895-prerelease | [BSD-3-Clause](http://www.opensource.org/licenses/BSD-3-Clause)
BSD-MYLEX | +| [Microsoft.Win32.Primitives](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [Microsoft.Win32.SystemEvents](https://dot.net/) | 9.0.0 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [Microsoft.Windows.CsWin32](https://github.com/Microsoft/CsWin32) | 0.3.106 | [Apache-2.0](http://www.apache.org/licenses/) | +| [Microsoft.Windows.CsWinRT](https://github.com/microsoft/cswinrt) | 2.2.0 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [Microsoft.Windows.SDK.BuildTools](https://aka.ms/WinSDKProjectURL) | 10.0.26100.1742 | PROPRIETARY-LICENSE | +| [Microsoft.Windows.SDK.Win32Docs](https://github.com/microsoft/win32metadata) | 0.1.42-alpha | PROPRIETARY-LICENSE | +| [Microsoft.Windows.SDK.Win32Metadata](https://github.com/microsoft/win32metadata) | 60.0.34-preview | [MIT](http://opensource.org/licenses/mit-license.php) | +| [Microsoft.Windows.WDK.Win32Metadata](https://github.com/microsoft/wdkmetadata) | 0.11.4-experimental | [MIT](http://opensource.org/licenses/mit-license.php) | +| [Microsoft.WindowsAppSDK](https://github.com/microsoft/windowsappsdk) | 1.6.240923002 | [MIT](http://opensource.org/licenses/mit-license.php)
[MS-DXSDK-D3DX-9.29.952.3](https://www.nuget.org/packages/Microsoft.DXSDK.D3DX/9.29.952.3/License) | +| [Microsoft.Xaml.Behaviors.WinUI.Managed](http://go.microsoft.com/fwlink/?LinkID=651678) | 2.0.9 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [MinVer](https://github.com/adamralph/minver) | 6.0.0 | [Apache-2.0](http://www.apache.org/licenses/) | +| [NETStandard.Library](https://dot.net/) | 1.6.1 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [NuGet.Versioning](https://aka.ms/nugetprj) | 6.11.1 | [Apache-2.0](http://www.apache.org/licenses/) | +| [PhotoSauce.MagicScaler](https://photosauce.net/) | 0.14.2 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [PhotoSauce.NativeCodecs.Libwebp](https://photosauce.net/) | 1.3.2-preview3 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [Roman-Numerals](https://github.com/picrap/RomanNumerals) | 2.0.1 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [Sentry](https://sentry.io/) | 4.13.0 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [SharpCompress](https://github.com/adamhathcock/sharpcompress) | 0.38.0 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [SharpHDiffPatch.Core](https://github.com/CollapseLauncher/SharpHDiffPatch.Core) | 2.2.8 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [System.AppContext](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [System.Collections.Concurrent](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [System.Collections](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [System.Console](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [System.Diagnostics.Debug](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [System.Diagnostics.Tools](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [System.Diagnostics.Tracing](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [System.Drawing.Common](https://github.com/dotnet/winforms) | 9.0.0 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [System.Globalization.Calendars](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [System.Globalization](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [System.IO.Compression.ZipFile](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [System.IO.Compression](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [System.IO.FileSystem.Primitives](https://dot.net/) | 4.3.0 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [System.IO.Hashing](https://dot.net/) | 9.0.0 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [System.Security.AccessControl](https://dot.net/) | 6.0.1 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [System.Security.Cryptography.ProtectedData](https://dot.net/) | 9.0.0 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [System.Text.Encoding.CodePages](https://dot.net/) | 9.0.0 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [System.Text.Json](https://dot.net/) | 9.0.0 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [System.Threading.Tasks.Extensions](https://dot.net/) | 4.5.4 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [TaskScheduler](https://github.com/dahall/taskscheduler) | 2.11.0 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [ThisAssembly.Constants](https://clarius.org/ThisAssembly) | 2.0.6 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [Velopack](https://github.com/velopack/velopack) | 0.0.869 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [ZstdSharp.Port](https://github.com/oleg-st/ZstdSharp) | 0.8.1 | [MIT](http://opensource.org/licenses/mit-license.php) | +| [runtime.win-x64.Microsoft.DotNet.ILCompiler](https://dot.net/) | 9.0.0 | [MIT](http://opensource.org/licenses/mit-license.php) | \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index 6e2cb641f..ab822a65c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -28,7 +28,7 @@ for: - cmd: >- echo Init submodules - git submodule update --init --force --depth=1 --recursive + git submodule update --init --force --depth=20 --recursive echo. @@ -161,7 +161,7 @@ for: - cmd: >- echo Init submodules - git submodule update --init --force --depth=1 --recursive + git submodule update --init --force --depth=20 --recursive echo. @@ -291,7 +291,7 @@ for: - cmd: >- echo Init submodules - git submodule update --init --force --depth=1 --recursive + git submodule update --init --force --depth=20 --recursive echo.