Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Maintenance #957

Merged
merged 3 commits into from
May 24, 2024
Merged

Maintenance #957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6359994
update windows builds
13xforever May 24, 2024
a509f23
add macOS version check
13xforever May 24, 2024
1969f98
upgrade 3rd party deps
13xforever May 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CompatBot/CompatBot.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
<PackageReference Include="DSharpPlus.CommandsNext" Version="4.4.6" />
<PackageReference Include="DSharpPlus.Interactivity" Version="4.4.6" />
<PackageReference Include="DSharpPlus.SlashCommands" Version="4.4.6" />
<PackageReference Include="Google.Apis.Drive.v3" Version="1.68.0.3373" />
<PackageReference Include="Google.Apis.Drive.v3" Version="1.68.0.3416" />
<PackageReference Include="ksemenenko.ColorThief" Version="1.1.1.4" />
<PackageReference Include="MathParser.org-mXparser" Version="5.2.1" />
<PackageReference Include="MathParser.org-mXparser" Version="6.0.0" />
<PackageReference Include="MegaApiClient" Version="1.10.4" />
<PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.22.0" />
<PackageReference Include="Microsoft.ApplicationInsights.PerfCounterCollector" Version="2.22.0" />
Expand Down
11 changes: 7 additions & 4 deletions CompatBot/Utils/ResultFormatters/LogParserResultFormatter.GeneralNotesSection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
4 changes: 3 additions & 1 deletion CompatBot/Utils/ResultFormatters/LogParserResultFormatter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion Tests/Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<ItemGroup>
<PackageReference Include="DuoVia.FuzzyStrings" Version="2.1.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="NUnit" Version="4.1.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0">
<PrivateAssets>all</PrivateAssets>
Expand Down
Loading