Skip to content

Commit 1a0642b

Browse files
尝试解决分支冲突
1 parent aa712fb commit 1a0642b

File tree

1 file changed

+8
-15
lines changed

1 file changed

+8
-15
lines changed

src/BD.WTTS.Client.Tools.Publish/Commands/IDotNetPublishCommand.cs

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using static BD.WTTS.Client.Tools.Publish.Helpers.DotNetCLIHelper;
66
using static BD.WTTS.GlobalDllImportResolver;
77
using JsonSerializer = System.Text.Json.JsonSerializer;
8+
using System.Runtime.InteropServices;
89

910
namespace BD.WTTS.Client.Tools.Publish.Commands;
1011

@@ -1125,19 +1126,9 @@ static void SetPublishCommandArgumentList(
11251126
argumentList.Add("-f");
11261127
argumentList.Add(arg.Framework);
11271128

1128-
if (arg.Architecture.HasValue && (Architecture.LoongArch64 | Architecture.RiscV64).HasFlag(arg.Architecture.Value))
1129-
{
1130-
argumentList.Add($"--arch");
1131-
argumentList.Add(ArchToString(arg.Architecture.Value));
1132-
argumentList.Add($"--os");
1133-
argumentList.Add("linux");
1134-
}
1135-
else
1136-
{
1137-
// 发布针对给定运行时的应用程序。 有关运行时标识符 (RID) 的列表,请参阅 RID 目录。
1138-
argumentList.Add("-r");
1139-
argumentList.Add(arg.RuntimeIdentifier);
1140-
}
1129+
// 发布针对给定运行时的应用程序。 有关运行时标识符 (RID) 的列表,请参阅 RID 目录。
1130+
argumentList.Add("-r");
1131+
argumentList.Add(arg.RuntimeIdentifier);
11411132

11421133
argumentList.Add("-v");
11431134
argumentList.Add("q");
@@ -1163,11 +1154,13 @@ static IEnumerable<string> GetPluginNames(Platform platform)
11631154
yield return AssemblyInfo.Accelerator;
11641155
yield return AssemblyInfo.GameAccount;
11651156
yield return AssemblyInfo.GameList;
1166-
yield return AssemblyInfo.ArchiSteamFarmPlus;
11671157
yield return AssemblyInfo.Authenticator;
1158+
yield return AssemblyInfo.SteamIdleCard;
11681159
if (platform == Platform.Windows)
1160+
{
1161+
yield return AssemblyInfo.ArchiSteamFarmPlus;
11691162
yield return AssemblyInfo.GameTools;
1170-
yield return AssemblyInfo.SteamIdleCard;
1163+
}
11711164
}
11721165

11731166
/// <summary>

0 commit comments

Comments
 (0)