From 63599940524a3b39cca4d7cb69ef843ea4137ab8 Mon Sep 17 00:00:00 2001 From: 13xforever Date: Fri, 24 May 2024 10:41:37 +0500 Subject: [PATCH 1/3] update windows builds --- CompatBot/Utils/ResultFormatters/LogParserResultFormatter.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.cs b/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.cs index 96209083..7253dd8c 100644 --- a/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.cs +++ b/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.cs @@ -962,7 +962,9 @@ select m < 24000 => "11 Dev Build " + windowsVersion.Build, // 23k series < 25000 => "11 ??? Build " + windowsVersion.Build, < 26052 => "11 Canary Build " + windowsVersion.Build, // 25k series - < 27000 => "11 Dev/Canary Build " + windowsVersion.Build, // dev/canary merge branch before 24H2 + 26100 => "11 24H2", + < 26120 => "11 Dev/Canary Build " + windowsVersion.Build, // dev/canary merge branch before 24H2 + <27000 => "11 Canary Build " + windowsVersion.Build, _ => "11 ??? Build " + windowsVersion.Build, }, _ => null, From a509f2388210aacf79d35dc13b238ac56b8615ed Mon Sep 17 00:00:00 2001 From: 13xforever Date: Fri, 24 May 2024 10:47:22 +0500 Subject: [PATCH 2/3] add macOS version check --- .../LogParserResultFormatter.GeneralNotesSection.cs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.GeneralNotesSection.cs b/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.GeneralNotesSection.cs index f06adcf3..bd31a2c0 100644 --- a/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.GeneralNotesSection.cs +++ b/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.GeneralNotesSection.cs @@ -262,10 +262,13 @@ private static async Task BuildNotesSectionAsync(DiscordEmbedBuilder builder, Lo && Version.TryParse(items["os_version"], out var winVersion) && (winVersion is { Major: < 10 } or { Build: < 19045 or (> 20000 and < 22621) })) notes.Add("⚠️ Please [upgrade your Windows](https://www.microsoft.com/en-us/software-download/windows11) to currently supported version"); - else if (items["os_type"] is "MacOS" - && Version.TryParse(items["os_version"], out var macVersion) - && macVersion is {Major: 14, Minor: >=0 and <=2}) - notes.Add("❌️ Please update your OS to version 14.3 or newer"); + if (items["os_type"] is "MacOS" && Version.TryParse(items["os_version"], out var macVersion)) + { + if (macVersion is {Major: < 12}) + notes.Add("⚠️ Please [upgrade your macOS](https://support.apple.com/en-us/109033#latest) to currently supported version"); + else if (macVersion is { Major: 14, Minor: >= 0 and <= 2 }) + notes.Add("❌️ Please update your OS to version 14.3 or newer"); + } var gpuInfo = items["gpu_info"] ?? items["discrete_gpu_info"]; if (supportedGpu && !string.IsNullOrEmpty(gpuInfo)) From 1969f985376a3b70f8cedf5788bd96b62f39df7b Mon Sep 17 00:00:00 2001 From: 13xforever Date: Fri, 24 May 2024 10:50:52 +0500 Subject: [PATCH 3/3] upgrade 3rd party deps --- CompatBot/CompatBot.csproj | 4 ++-- Tests/Tests.csproj | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CompatBot/CompatBot.csproj b/CompatBot/CompatBot.csproj index 12b4f951..453ce316 100644 --- a/CompatBot/CompatBot.csproj +++ b/CompatBot/CompatBot.csproj @@ -43,9 +43,9 @@ - + - + diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj index e114a568..6cfa63ac 100644 --- a/Tests/Tests.csproj +++ b/Tests/Tests.csproj @@ -6,7 +6,7 @@ - + all