Compare commits

..
7 changed files with 26 additions and 10 deletions
+1 -1
View File
@@ -21,7 +21,7 @@ public static partial class AssemblyInfo
/// <summary>
/// RC 版本号,范围 0~9,只增不减
/// </summary>
const string ver_for_rc = "14";
const string ver_for_rc = "15";
public const string FileVersion = $"{Version2}.{ver_for_rc}2{ver_for_preview}.0";
@@ -26,7 +26,7 @@ public sealed partial class IdleSteamLoginPageViewModel : WindowViewModel
{
IsLoading = true;
if (SteamLoginState.SteamId == 0)
if (!Requires2FA && !RequiresEmailAuth)
{
SteamLoginState.Username = UserNameText;
SteamLoginState.Password = PasswordText;
@@ -65,9 +65,10 @@ public sealed partial class IdleSteamLoginPageViewModel : WindowViewModel
}
else if (SteamLoginState.Message != null)
{
IsLoading = false;
Toast.Show(ToastIcon.Warning, SteamLoginState.Message);
}
IsLoading = false;
}
}
catch (Exception ex)
@@ -5,6 +5,7 @@ using System.Security.Policy;
using static BD.WTTS.Client.Tools.Publish.Helpers.DotNetCLIHelper;
using static BD.WTTS.GlobalDllImportResolver;
using JsonSerializer = System.Text.Json.JsonSerializer;
using System.Runtime.InteropServices;
namespace BD.WTTS.Client.Tools.Publish.Commands;
@@ -843,6 +844,7 @@ $"""
arg.ReadyToRun = false;
arg.Trimmed = false;
arg.SelfContained = false;
arg.Architecture = architecture;
// https://learn.microsoft.com/zh-cn/dotnet/core/tools/dotnet-run
// https://download.visualstudio.microsoft.com/download/pr/c1e2729e-ab96-4929-911d-bf0f24f06f47/1b2f39cbc4eb530e39cfe6f54ce78e45/aspnetcore-runtime-7.0.7-linux-x64.tar.gz
// dotnet "Steam++.dll" -clt devtools
@@ -889,7 +891,9 @@ $"""
bool? EnableMsixTooling = null,
bool? GenerateAppxPackageOnBuild = null,
bool? StripSymbols = null,
bool? CreatePackage = null)
bool? CreatePackage = null,
Architecture? Architecture = null
)
{
string? _Configuration;
@@ -1150,11 +1154,13 @@ publish -c {0} -p:OutputType={1} -p:PublishDir=bin\{0}\Publish\win-any -p:Publis
yield return AssemblyInfo.Accelerator;
yield return AssemblyInfo.GameAccount;
yield return AssemblyInfo.GameList;
yield return AssemblyInfo.ArchiSteamFarmPlus;
yield return AssemblyInfo.Authenticator;
if (platform == Platform.Windows)
yield return AssemblyInfo.GameTools;
yield return AssemblyInfo.SteamIdleCard;
if (platform == Platform.Windows)
{
yield return AssemblyInfo.ArchiSteamFarmPlus;
yield return AssemblyInfo.GameTools;
}
}
/// <summary>
@@ -25,7 +25,7 @@ interface Constants
static readonly string[] all_rids = new[] {
"win-x64", "win-x86", "win-arm64",
"osx-x64", "osx-arm64",
"linux-x64", "linux-arm64",
"linux-x64", "linux-arm64", "linux-loongarch64",
};
static readonly string[] ignoreDirNames = new[]
@@ -122,6 +122,7 @@ interface Constants
Architecture.Arm64 => "arm64",
Architecture.X64 => "x64",
Architecture.X86 => "x86",
Architecture.LoongArch64 => "loongarch64",
_ => throw new ArgumentOutOfRangeException(nameof(architecture), architecture, null),
};
@@ -160,6 +161,12 @@ interface Constants
case "arm64":
info.Architecture = Architecture.Arm64;
break;
case "loongarch64":
info.Architecture = Architecture.LoongArch64;
break;
case "riscv64":
info.Architecture = Architecture.RiscV64;
break;
}
}
return info;
@@ -43,6 +43,8 @@ public static partial class GlobalDllImportResolver
Architecture.Arm64 => "linux-arm64", // 在 64 位 ARM 上运行的 Linux 发行版本,如 Raspberry Pi Model 3 及更高版本上的 Ubuntu 服务器 64 位
Architecture.Arm => "linux-arm", // 在 ARM 上运行的 Linux 发行版本,如 Raspberry Pi Model 2 及更高版本上的 Raspbian
Architecture.Armv6 => "linux-armv6",
Architecture.LoongArch64 => "linux-loongarch64", // 在龙芯 LoongArch64 上运行的 Linux 发行版本
Architecture.RiscV64 => "linux-riscv64", // 在 RISC-V 64 位上运行的 Linux 发行版本
_ => throw new PlatformNotSupportedException(),
};
#else