From 6aaeded3543f3c81f9de0eda33cb18b4bbedceb9 Mon Sep 17 00:00:00 2001 From: RMBGAME Date: Fri, 26 Nov 2021 03:22:17 +0800 Subject: [PATCH] Fix --- SteamToolsV2+.Mac.slnf | 51 ++++---- SteamToolsV2+.sln | 109 +++++++++++++++++- .../Converters/StringFormatConverter.cs | 6 + 3 files changed, 142 insertions(+), 24 deletions(-) diff --git a/SteamToolsV2+.Mac.slnf b/SteamToolsV2+.Mac.slnf index 074ac2907..cb5c943ab 100644 --- a/SteamToolsV2+.Mac.slnf +++ b/SteamToolsV2+.Mac.slnf @@ -2,42 +2,47 @@ "solution": { "path": "SteamToolsV2+.sln", "projects": [ - "src\\Common.AreaLib\\Common.AreaLib.csproj", - "src\\Common.ClientLib\\Common.ClientLib.csproj", - "src\\Common.ClientLib.Droid\\Common.ClientLib.Droid.csproj", - "src\\Common.ClientLib.iOS\\Common.ClientLib.iOS.csproj", - "src\\Common.CoreLib\\Common.CoreLib.csproj", - "src\\Repositories.sqlite-net-pcl\\Repositories.sqlite-net-pcl.csproj", - "references\\WinAuth\\Authenticator\\Authenticator.csproj", + "references\\ArchiSteamFarm\\ArchiSteamFarm.Library\\ArchiSteamFarm.Library.csproj", "references\\AvaloniaGif\\AvaloniaGif\\AvaloniaGif.csproj", "references\\AvaloniaGif\\LibAPNG\\LibAPNG.csproj", - "references\\SteamAchievementManager\\SAM.API\\SAM.API.csproj", "references\\Steam4NET\\Steam4NET\\Steam4NET.csproj", + "references\\SteamAchievementManager\\SAM.API\\SAM.API.csproj", "references\\Titanium-Web-Proxy\\src\\Titanium.Web.Proxy\\Titanium.Web.Proxy.csproj", - "references\\ArchiSteamFarm\\ArchiSteamFarm.Library\\ArchiSteamFarm.Library.csproj", - "tests\\Common.UnitTest\\Common.UnitTest.csproj", - "tests\\Common.UnitTest.Droid\\Common.UnitTest.Droid.csproj", - "tests\\Common.UnitTest.Droid.App\\Common.UnitTest.Droid.App.csproj", - "tests\\ST.Client.UnitTest\\ST.Client.UnitTest.csproj", - "tests\\ST.Client.Desktop.UnitTest\\ST.Client.Desktop.UnitTest.csproj", - "src\\ST\\ST.csproj", - "src\\ST.Client\\ST.Client.csproj", + "references\\WinAuth\\Authenticator\\Authenticator.csproj", + "references\\reactive\\Rx.NET\\Source\\src\\System.Reactive\\System.Reactive.csproj", + "src\\Avalonia.Native\\Avalonia.Native.csproj", + "src\\Avalonia.Themes.Default\\Avalonia.Themes.Default.csproj", + "src\\Avalonia.Themes.Fluent\\Avalonia.Themes.Fluent.csproj", + "src\\Avalonia.Win32\\Avalonia.Win32.csproj", + "src\\Avalonia.X11\\Avalonia.X11.csproj", + "src\\Common.AreaLib\\Common.AreaLib.csproj", + "src\\Common.ClientLib.Droid\\Common.ClientLib.Droid.csproj", + "src\\Common.ClientLib.iOS\\Common.ClientLib.iOS.csproj", + "src\\Common.ClientLib\\Common.ClientLib.csproj", + "src\\Common.CoreLib\\Common.CoreLib.csproj", + "src\\Repositories.sqlite-net-pcl\\Repositories.sqlite-net-pcl.csproj", "src\\ST.Client.Android\\ST.Client.Android.csproj", - "src\\ST.Client.Desktop\\ST.Client.Desktop.csproj", + "src\\ST.Client.Desktop.Avalonia.App\\ST.Client.Avalonia.App.csproj", + "src\\ST.Client.Desktop.Avalonia\\ST.Client.Avalonia.csproj", + "src\\ST.Client.Desktop.Mac\\ST.Client.Mac.csproj", "src\\ST.Client.Mobile.Droid.App\\ST.Client.Android.App.csproj", - "src\\ST.Client.Desktop.Avalonia\\ST.Client.Desktop.Avalonia.csproj", - "src\\ST.Client.Desktop.Mac\\ST.Client.Desktop.Mac.csproj", - "src\\ST.Client.Mobile\\ST.Client.Mobile.csproj", - "src\\ST.Client.Mobile.Droid\\ST.Client.Mobile.Droid.csproj", - "src\\ST.Client.Mobile.iOS\\ST.Client.Mobile.iOS.csproj", + "src\\ST.Client.XamarinForms\\ST.Client.XamarinForms.csproj", + "src\\ST.Client.iOS\\ST.Client.iOS.csproj", + "src\\ST.Client\\ST.Client.csproj", "src\\ST.Services.CloudService.Models\\ST.Services.CloudService.Models.csproj", "src\\ST.Services.CloudService.ViewModels\\ST.Services.CloudService.ViewModels.csproj", "src\\ST.Services.CloudService\\ST.Services.CloudService.csproj", + "src\\ST.Tools.AndroidResourceLink\\ST.Tools.AndroidResourceLink.csproj", "src\\ST.Tools.AreaImport\\ST.Tools.AreaImport.csproj", "src\\ST.Tools.MinifyStaticSites\\ST.Tools.MinifyStaticSites.csproj", "src\\ST.Tools.OpenSourceLibraryList\\ST.Tools.OpenSourceLibraryList.csproj", "src\\ST.Tools.Translate\\ST.Tools.Translate.csproj", - "src\\ST.Tools.AndroidResourceLink\\ST.Tools.AndroidResourceLink.csproj" + "src\\ST\\ST.csproj", + "tests\\Common.UnitTest.Droid.App\\Common.UnitTest.Droid.App.csproj", + "tests\\Common.UnitTest.Droid\\Common.UnitTest.Droid.csproj", + "tests\\Common.UnitTest\\Common.UnitTest.csproj", + "tests\\ST.Client.Desktop.UnitTest\\ST.Client.Desktop.UnitTest.csproj", + "tests\\ST.Client.UnitTest\\ST.Client.UnitTest.csproj" ] } } \ No newline at end of file diff --git a/SteamToolsV2+.sln b/SteamToolsV2+.sln index 9b8f5e9ff..2eb4f468f 100644 --- a/SteamToolsV2+.sln +++ b/SteamToolsV2+.sln @@ -153,6 +153,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.ClientLib.Droid", "s EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.ClientLib.iOS", "src\Common.ClientLib.iOS\Common.ClientLib.iOS.csproj", "{4658B02A-CB1A-4561-AD9C-3B3FF969D7F0}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.UnitTest.Droid", "tests\Common.UnitTest.Droid\Common.UnitTest.Droid.csproj", "{80E6762E-AB43-41E2-BDB4-7A3E24713977}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common.UnitTest.Droid.App", "tests\Common.UnitTest.Droid.App\Common.UnitTest.Droid.App.csproj", "{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ST.Client.Desktop.UnitTest", "tests\ST.Client.Desktop.UnitTest\ST.Client.Desktop.UnitTest.csproj", "{5D9E0EAA-2419-426B-BAB4-EA496C1FF7E9}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -1627,6 +1633,104 @@ Global {4658B02A-CB1A-4561-AD9C-3B3FF969D7F0}.Release|x64.Build.0 = Release|Any CPU {4658B02A-CB1A-4561-AD9C-3B3FF969D7F0}.Release|x86.ActiveCfg = Release|Any CPU {4658B02A-CB1A-4561-AD9C-3B3FF969D7F0}.Release|x86.Build.0 = Release|Any CPU + {80E6762E-AB43-41E2-BDB4-7A3E24713977}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {80E6762E-AB43-41E2-BDB4-7A3E24713977}.Debug|Any CPU.Build.0 = Debug|Any CPU + {80E6762E-AB43-41E2-BDB4-7A3E24713977}.Debug|ARM.ActiveCfg = Debug|Any CPU + {80E6762E-AB43-41E2-BDB4-7A3E24713977}.Debug|ARM.Build.0 = Debug|Any CPU + {80E6762E-AB43-41E2-BDB4-7A3E24713977}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {80E6762E-AB43-41E2-BDB4-7A3E24713977}.Debug|ARM64.Build.0 = Debug|Any CPU + {80E6762E-AB43-41E2-BDB4-7A3E24713977}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {80E6762E-AB43-41E2-BDB4-7A3E24713977}.Debug|iPhone.Build.0 = Debug|Any CPU + {80E6762E-AB43-41E2-BDB4-7A3E24713977}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {80E6762E-AB43-41E2-BDB4-7A3E24713977}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {80E6762E-AB43-41E2-BDB4-7A3E24713977}.Debug|x64.ActiveCfg = Debug|Any CPU + {80E6762E-AB43-41E2-BDB4-7A3E24713977}.Debug|x64.Build.0 = Debug|Any CPU + {80E6762E-AB43-41E2-BDB4-7A3E24713977}.Debug|x86.ActiveCfg = Debug|Any CPU + {80E6762E-AB43-41E2-BDB4-7A3E24713977}.Debug|x86.Build.0 = Debug|Any CPU + {80E6762E-AB43-41E2-BDB4-7A3E24713977}.Release|Any CPU.ActiveCfg = Release|Any CPU + {80E6762E-AB43-41E2-BDB4-7A3E24713977}.Release|Any CPU.Build.0 = Release|Any CPU + {80E6762E-AB43-41E2-BDB4-7A3E24713977}.Release|ARM.ActiveCfg = Release|Any CPU + {80E6762E-AB43-41E2-BDB4-7A3E24713977}.Release|ARM.Build.0 = Release|Any CPU + {80E6762E-AB43-41E2-BDB4-7A3E24713977}.Release|ARM64.ActiveCfg = Release|Any CPU + {80E6762E-AB43-41E2-BDB4-7A3E24713977}.Release|ARM64.Build.0 = Release|Any CPU + {80E6762E-AB43-41E2-BDB4-7A3E24713977}.Release|iPhone.ActiveCfg = Release|Any CPU + {80E6762E-AB43-41E2-BDB4-7A3E24713977}.Release|iPhone.Build.0 = Release|Any CPU + {80E6762E-AB43-41E2-BDB4-7A3E24713977}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {80E6762E-AB43-41E2-BDB4-7A3E24713977}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {80E6762E-AB43-41E2-BDB4-7A3E24713977}.Release|x64.ActiveCfg = Release|Any CPU + {80E6762E-AB43-41E2-BDB4-7A3E24713977}.Release|x64.Build.0 = Release|Any CPU + {80E6762E-AB43-41E2-BDB4-7A3E24713977}.Release|x86.ActiveCfg = Release|Any CPU + {80E6762E-AB43-41E2-BDB4-7A3E24713977}.Release|x86.Build.0 = Release|Any CPU + {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Debug|ARM.ActiveCfg = Debug|Any CPU + {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Debug|ARM.Build.0 = Debug|Any CPU + {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Debug|ARM.Deploy.0 = Debug|Any CPU + {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Debug|ARM64.Build.0 = Debug|Any CPU + {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Debug|ARM64.Deploy.0 = Debug|Any CPU + {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Debug|iPhone.Build.0 = Debug|Any CPU + {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Debug|iPhone.Deploy.0 = Debug|Any CPU + {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU + {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Debug|x64.ActiveCfg = Debug|Any CPU + {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Debug|x64.Build.0 = Debug|Any CPU + {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Debug|x64.Deploy.0 = Debug|Any CPU + {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Debug|x86.ActiveCfg = Debug|Any CPU + {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Debug|x86.Build.0 = Debug|Any CPU + {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Debug|x86.Deploy.0 = Debug|Any CPU + {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Release|Any CPU.Build.0 = Release|Any CPU + {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Release|Any CPU.Deploy.0 = Release|Any CPU + {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Release|ARM.ActiveCfg = Release|Any CPU + {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Release|ARM.Build.0 = Release|Any CPU + {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Release|ARM.Deploy.0 = Release|Any CPU + {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Release|ARM64.ActiveCfg = Release|Any CPU + {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Release|ARM64.Build.0 = Release|Any CPU + {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Release|ARM64.Deploy.0 = Release|Any CPU + {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Release|iPhone.ActiveCfg = Release|Any CPU + {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Release|iPhone.Build.0 = Release|Any CPU + {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Release|iPhone.Deploy.0 = Release|Any CPU + {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU + {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Release|x64.ActiveCfg = Release|Any CPU + {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Release|x64.Build.0 = Release|Any CPU + {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Release|x64.Deploy.0 = Release|Any CPU + {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Release|x86.ActiveCfg = Release|Any CPU + {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Release|x86.Build.0 = Release|Any CPU + {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Release|x86.Deploy.0 = Release|Any CPU + {5D9E0EAA-2419-426B-BAB4-EA496C1FF7E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5D9E0EAA-2419-426B-BAB4-EA496C1FF7E9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5D9E0EAA-2419-426B-BAB4-EA496C1FF7E9}.Debug|ARM.ActiveCfg = Debug|Any CPU + {5D9E0EAA-2419-426B-BAB4-EA496C1FF7E9}.Debug|ARM.Build.0 = Debug|Any CPU + {5D9E0EAA-2419-426B-BAB4-EA496C1FF7E9}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {5D9E0EAA-2419-426B-BAB4-EA496C1FF7E9}.Debug|ARM64.Build.0 = Debug|Any CPU + {5D9E0EAA-2419-426B-BAB4-EA496C1FF7E9}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {5D9E0EAA-2419-426B-BAB4-EA496C1FF7E9}.Debug|iPhone.Build.0 = Debug|Any CPU + {5D9E0EAA-2419-426B-BAB4-EA496C1FF7E9}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {5D9E0EAA-2419-426B-BAB4-EA496C1FF7E9}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {5D9E0EAA-2419-426B-BAB4-EA496C1FF7E9}.Debug|x64.ActiveCfg = Debug|Any CPU + {5D9E0EAA-2419-426B-BAB4-EA496C1FF7E9}.Debug|x64.Build.0 = Debug|Any CPU + {5D9E0EAA-2419-426B-BAB4-EA496C1FF7E9}.Debug|x86.ActiveCfg = Debug|Any CPU + {5D9E0EAA-2419-426B-BAB4-EA496C1FF7E9}.Debug|x86.Build.0 = Debug|Any CPU + {5D9E0EAA-2419-426B-BAB4-EA496C1FF7E9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5D9E0EAA-2419-426B-BAB4-EA496C1FF7E9}.Release|Any CPU.Build.0 = Release|Any CPU + {5D9E0EAA-2419-426B-BAB4-EA496C1FF7E9}.Release|ARM.ActiveCfg = Release|Any CPU + {5D9E0EAA-2419-426B-BAB4-EA496C1FF7E9}.Release|ARM.Build.0 = Release|Any CPU + {5D9E0EAA-2419-426B-BAB4-EA496C1FF7E9}.Release|ARM64.ActiveCfg = Release|Any CPU + {5D9E0EAA-2419-426B-BAB4-EA496C1FF7E9}.Release|ARM64.Build.0 = Release|Any CPU + {5D9E0EAA-2419-426B-BAB4-EA496C1FF7E9}.Release|iPhone.ActiveCfg = Release|Any CPU + {5D9E0EAA-2419-426B-BAB4-EA496C1FF7E9}.Release|iPhone.Build.0 = Release|Any CPU + {5D9E0EAA-2419-426B-BAB4-EA496C1FF7E9}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {5D9E0EAA-2419-426B-BAB4-EA496C1FF7E9}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {5D9E0EAA-2419-426B-BAB4-EA496C1FF7E9}.Release|x64.ActiveCfg = Release|Any CPU + {5D9E0EAA-2419-426B-BAB4-EA496C1FF7E9}.Release|x64.Build.0 = Release|Any CPU + {5D9E0EAA-2419-426B-BAB4-EA496C1FF7E9}.Release|x86.ActiveCfg = Release|Any CPU + {5D9E0EAA-2419-426B-BAB4-EA496C1FF7E9}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1685,9 +1789,12 @@ Global {29DE5086-0690-4AE7-9BA9-840F54B249DC} = {E448F863-4C9D-47A4-BC4A-4A1381B54DA4} {3C7200C7-8C2D-46F0-BD7D-0A59D915B83C} = {83186945-EC14-4B3F-8C6F-B205AA184CA4} {4658B02A-CB1A-4561-AD9C-3B3FF969D7F0} = {83186945-EC14-4B3F-8C6F-B205AA184CA4} + {80E6762E-AB43-41E2-BDB4-7A3E24713977} = {CC46B486-00D7-49E6-ABA3-FDF8F4868D2B} + {AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA} = {CC46B486-00D7-49E6-ABA3-FDF8F4868D2B} + {5D9E0EAA-2419-426B-BAB4-EA496C1FF7E9} = {CC46B486-00D7-49E6-ABA3-FDF8F4868D2B} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - RESX_NeutralResourcesLanguage = zh-Hans SolutionGuid = {9313F2B4-10DA-43AA-A481-CAA7571C740C} + RESX_NeutralResourcesLanguage = zh-Hans EndGlobalSection EndGlobal diff --git a/src/ST.Client.Desktop.Avalonia/Application/Converters/StringFormatConverter.cs b/src/ST.Client.Desktop.Avalonia/Application/Converters/StringFormatConverter.cs index 9e9de5966..9976c5c08 100644 --- a/src/ST.Client.Desktop.Avalonia/Application/Converters/StringFormatConverter.cs +++ b/src/ST.Client.Desktop.Avalonia/Application/Converters/StringFormatConverter.cs @@ -55,6 +55,12 @@ namespace System.Application.Converters return Format(value, parameter, culture); } + public object? Convert(object[] values, Type targetType, object parameter, CultureInfo culture) + { + IList values_ = values; + return Convert(values_, targetType, parameter, culture); + } + public object? Convert(IList values, Type? targetType, object? parameter, CultureInfo? culture) { if (parameter is not null && values.Count >= 2)