diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md index 819d63fb8..bbb451463 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.md +++ b/.github/ISSUE_TEMPLATE/bug-report.md @@ -29,7 +29,7 @@ Clearly describe the reproduction steps so that others can see the problem ### 🚑 基本信息(Basic Information) - 程序版本(Program Version): -- 系统版本号(OS Version): +- 系统版本号(OS Version): - 是否为应用商店版本(Whether it is a Store version): ### 🖼 截图(Screenshots) diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md index cee758217..cf3be5442 100644 --- a/.github/ISSUE_TEMPLATE/question.md +++ b/.github/ISSUE_TEMPLATE/question.md @@ -22,5 +22,5 @@ Other information such as screenshots can be posted here --> - 程序版本(Program Version): -- 系统版本号(OS Version): +- 系统版本号(OS Version): - 是否为应用商店版本(Whether it is a Store version): \ No newline at end of file diff --git a/src/Common.CoreLib/Properties/ThisAssembly.DynamicVersion.cs b/src/Common.CoreLib/Properties/ThisAssembly.DynamicVersion.cs index 5235dd8f0..a28ac209b 100644 --- a/src/Common.CoreLib/Properties/ThisAssembly.DynamicVersion.cs +++ b/src/Common.CoreLib/Properties/ThisAssembly.DynamicVersion.cs @@ -13,7 +13,7 @@ namespace System.Properties { return Version + alpha; } - else if (OperatingSystem2.IsMacOS || (OperatingSystem2.IsWindows && DesktopBridge.IsRunningAsUwp)) + else if (OperatingSystem2.IsMacOS) { return Version + beta; } diff --git a/src/ST.Client/Services/IPlatformService.Linux.cs b/src/ST.Client/Services/IPlatformService.Linux.cs index 06d9371b3..0f8854b3f 100644 --- a/src/ST.Client/Services/IPlatformService.Linux.cs +++ b/src/ST.Client/Services/IPlatformService.Linux.cs @@ -1,6 +1,7 @@ using System.Diagnostics; using System.Runtime.Versioning; using System.IO; +using System.Linq; namespace System.Application.Services { @@ -13,7 +14,7 @@ namespace System.Application.Services var filePath = string.Format("{0}etc{0}issue", Path.DirectorySeparatorChar); if (File.Exists(filePath)) { - return File.ReadAllText(filePath).TrimEnd(@" \n \l"); + return File.ReadAllText(filePath).TrimEnd(" \\n \\l\n\n"); } } return string.Empty;