Merge pull request #946 from 13xforever/vnext

Upgrade to .NET 8.0
2024-11-26 19:50:36 +00:00 · 2023-11-15 00:23:16 +00:00 · 2023-11-15 00:23:16 +00:00 · f4d42ab8e1
commit f4d42ab8e1
parent 07c654cd65 5a8f73aa21
22 changed files with 96 additions and 91 deletions
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@ -3,13 +3,13 @@
  "isRoot": true,
  "tools": {
    "strawberryshake.tools": {
-      "version": "13.4.0",
+      "version": "13.7.0",
      "commands": [
        "dotnet-graphql"
      ]
    },
    "dotnet-ef": {
-      "version": "7.0.9",
+      "version": "8.0.0",
      "commands": [
        "dotnet-ef"
      ]
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@ -32,7 +32,7 @@ jobs:
    - name: Update dotnet
      uses: actions/setup-dotnet@v1
      with:
-        dotnet-version: '7.0.x'
+        dotnet-version: '8.0.x'

    - name: Checkout repository
      uses: actions/checkout@v2
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@ -15,7 +15,7 @@ jobs:
    - name: update dotnet core sdk
      uses: actions/setup-dotnet@v1
      with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
    - name: dotnet restore (first try)
      run: dotnet restore --ignore-failed-sources
    - name: dotnet restore (second try)
@ -35,7 +35,7 @@ jobs:
    - name: update dotnet core sdk
      uses: actions/setup-dotnet@v1
      with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
    - name: dotnet restore (first try)
      run: dotnet restore --ignore-failed-sources
    - name: dotnet restore (second try)
@ -70,7 +70,7 @@ jobs:
    - name: update dotnet core sdk
      uses: actions/setup-dotnet@v1
      with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
    - name: dotnet restore (first try)
      run: dotnet restore --ignore-failed-sources
    - name: dotnet restore (second try)
--- a/Clients/CirrusCiClient/CirrusCiClient.csproj
+++ b/Clients/CirrusCiClient/CirrusCiClient.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
    <Nullable>enable</Nullable>
    <EmitCompilerGeneratedFiles>false</EmitCompilerGeneratedFiles>
  </PropertyGroup>
@ -8,9 +8,9 @@
    <ProjectReference Include="..\CompatApiClient\CompatApiClient.csproj" />
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
-    <PackageReference Include="StrawberryShake.Server" Version="13.5.1" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
+    <PackageReference Include="StrawberryShake.Server" Version="13.7.0" />
  </ItemGroup>
 </Project>
--- a/Clients/CompatApiClient/CompatApiClient.csproj
+++ b/Clients/CompatApiClient/CompatApiClient.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
    <Nullable>enable</Nullable>
  </PropertyGroup>

@ -14,10 +14,10 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.9" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
+    <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
    <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.3.2" />
-    <PackageReference Include="NLog" Version="5.2.4" />
+    <PackageReference Include="NLog" Version="5.2.5" />
  </ItemGroup>

 </Project>
--- a/Clients/GithubClient/GithubClient.csproj
+++ b/Clients/GithubClient/GithubClient.csproj
@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
    <LangVersion>latest</LangVersion>
    <Nullable>enable</Nullable>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
-    <PackageReference Include="Octokit" Version="7.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
+    <PackageReference Include="Octokit" Version="9.0.0" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\CompatApiClient\CompatApiClient.csproj" />
--- a/Clients/IrdLibraryClient/IrdLibraryClient.csproj
+++ b/Clients/IrdLibraryClient/IrdLibraryClient.csproj
@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
    <LangVersion>latest</LangVersion>
    <Nullable>enable</Nullable>
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="Crc32.NET" Version="1.2.0" />
    <PackageReference Include="DiscUtils.OpticalDisk" Version="0.16.13" />
-    <PackageReference Include="HtmlAgilityPack" Version="1.11.53" />
+    <PackageReference Include="HtmlAgilityPack" Version="1.11.54" />
    <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.3.2" />
  </ItemGroup>
  <ItemGroup>
--- a/Clients/MediafireClient/MediafireClient.csproj
+++ b/Clients/MediafireClient/MediafireClient.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
    <Nullable>enable</Nullable>
  </PropertyGroup>
  <ItemGroup>
--- a/Clients/OneDriveClient/OneDriveClient.csproj
+++ b/Clients/OneDriveClient/OneDriveClient.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
    <Nullable>enable</Nullable>
  </PropertyGroup>
  <ItemGroup>
--- a/Clients/PsnClient/PsnClient.csproj
+++ b/Clients/PsnClient/PsnClient.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
    <Nullable>enable</Nullable>
  </PropertyGroup>
  <ItemGroup>
@ -10,8 +10,8 @@
    <EmbeddedResource Include="certificates\*.cer" />
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.9" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
+    <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
    <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.3.2" />
  </ItemGroup>
  <ItemGroup>
--- a/Clients/YandexDiskClient/YandexDiskClient.csproj
+++ b/Clients/YandexDiskClient/YandexDiskClient.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
    <Nullable>enable</Nullable>
  </PropertyGroup>
  <ItemGroup>
--- a/CompatBot/Commands/Pr.cs
+++ b/CompatBot/Commands/Pr.cs
@ -2,7 +2,6 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using CirrusCiClient;
 using CompatApiClient.Utils;
 using CompatBot.Commands.Attributes;
 using CompatBot.Utils;
@ -12,7 +11,8 @@ using DSharpPlus;
 using DSharpPlus.CommandsNext;
 using DSharpPlus.CommandsNext.Attributes;
 using DSharpPlus.Entities;
-using TaskStatus = CirrusCiClient.Generated.TaskStatus;
+using Microsoft.TeamFoundation.Build.WebApi;
+using BuildStatus = Microsoft.TeamFoundation.Build.WebApi.BuildStatus;

 namespace CompatBot.Commands;

@ -134,13 +134,13 @@ internal sealed class Pr: BaseCommandModuleCustom
            string? macDownloadText = null;
            string? buildTime = null;

-            if (prInfo.Head?.Sha is string commit)
+            if (azureClient != null && prInfo.Head?.Sha is string commit)
                try
                {
                    windowsDownloadText = "⏳ Pending...";
                    linuxDownloadText = "⏳ Pending...";
                    macDownloadText = "⏳ Pending...";
-                    var latestBuild = await CirrusCi.GetPrBuildInfoAsync(commit, prInfo.MergedAt?.DateTime, pr, Config.Cts.Token).ConfigureAwait(false);
+                    var latestBuild = await azureClient.GetPrBuildInfoAsync(commit, prInfo.MergedAt?.DateTime, pr, Config.Cts.Token).ConfigureAwait(false);
                    if (latestBuild == null)
                    {
                        if (state == "Open")
@ -155,20 +155,23 @@ internal sealed class Pr: BaseCommandModuleCustom
                    {
                        bool shouldHaveArtifacts = false;

-                        if ((latestBuild.WindowsBuild?.Status is TaskStatus.Completed
-                             || latestBuild.LinuxBuild?.Status is TaskStatus.Completed
-                             || latestBuild.MacBuild?.Status is TaskStatus.Completed)
-                            && latestBuild.FinishTime.HasValue)
+                        if (latestBuild is
+                            {
+                                Status: BuildStatus.Completed,
+                                Result: BuildResult.Succeeded or BuildResult.PartiallySucceeded,
+                                FinishTime: not null
+                            })
                        {
                            buildTime = $"Built on {latestBuild.FinishTime:u} ({(DateTime.UtcNow - latestBuild.FinishTime.Value).AsTimeDeltaDescription()} ago)";
                            shouldHaveArtifacts = true;
                        }

                        // Check for subtask errors (win/lin/mac)
-                        if (latestBuild.WindowsBuild?.Status is TaskStatus.Aborted or TaskStatus.Failed or TaskStatus.Skipped)
+                        if (latestBuild.Result is BuildResult.Failed or BuildResult.Canceled)
                        {
-                            windowsDownloadText = $"❌ {latestBuild.WindowsBuild?.Status}";
+                            windowsDownloadText = $"❌ {latestBuild.Result}";
                        }
+                        /*
                        if (latestBuild.LinuxBuild?.Status is TaskStatus.Aborted or TaskStatus.Failed or TaskStatus.Skipped)
                        {
                            linuxDownloadText = $"❌ {latestBuild.LinuxBuild?.Status}";
@ -177,17 +180,20 @@ internal sealed class Pr: BaseCommandModuleCustom
                        {
                            macDownloadText = $"❌ {latestBuild.MacBuild?.Status}";
                        }
+                        */

                        // Check estimated time for pending builds
-                        if (latestBuild.WindowsBuild?.Status is TaskStatus.Executing
-                            || latestBuild.LinuxBuild?.Status is TaskStatus.Executing
-                            || latestBuild.MacBuild?.Status is TaskStatus.Executing)
+                        if (latestBuild is { Status: BuildStatus.InProgress, StartTime: not null })
                        {
-                            var estimatedCompletionTime = latestBuild.StartTime + (await CirrusCi.GetPipelineDurationAsync(Config.Cts.Token).ConfigureAwait(false)).Mean;
+                            var estimatedCompletionTime = latestBuild.StartTime.Value + (await azureClient.GetPipelineDurationAsync(Config.Cts.Token).ConfigureAwait(false)).Mean;
                            var estimatedTime = TimeSpan.FromMinutes(1);
                            if (estimatedCompletionTime > DateTime.UtcNow)
                                estimatedTime = estimatedCompletionTime - DateTime.UtcNow;
+                            windowsDownloadText = $"⏳ Pending in {estimatedTime.AsTimeDeltaDescription()}...";
+                            linuxDownloadText = windowsDownloadText;
+                            macDownloadText = windowsDownloadText;

+                            /*
                            if (latestBuild.WindowsBuild?.Status is TaskStatus.Executing)
                            {
                                windowsDownloadText = $"⏳ Pending in {estimatedTime.AsTimeDeltaDescription()}...";
@ -200,13 +206,14 @@ internal sealed class Pr: BaseCommandModuleCustom
                            {
                                macDownloadText = $"⏳ Pending in {estimatedTime.AsTimeDeltaDescription()}...";
                            }
+                        */
                        }

                        // windows build
-                        var name = latestBuild.WindowsBuild?.Filename ?? "Windows PR Build";
+                        var name = latestBuild.WindowsFilename ?? "Windows PR Build";
                        name = name.Replace("rpcs3-", "").Replace("_win64", "");
-                        if (!string.IsNullOrEmpty(latestBuild.WindowsBuild?.DownloadLink))
-                            windowsDownloadText = $"[⏬ {name}]({latestBuild.WindowsBuild?.DownloadLink})";
+                        if (!string.IsNullOrEmpty(latestBuild.WindowsBuildDownloadLink))
+                            windowsDownloadText = $"[⏬ {name}]({latestBuild.WindowsBuildDownloadLink})";
                        else if (shouldHaveArtifacts)
                        {
                            if (latestBuild.FinishTime.HasValue && (DateTime.UtcNow - latestBuild.FinishTime.Value).TotalDays > 30)
@ -214,10 +221,10 @@ internal sealed class Pr: BaseCommandModuleCustom
                        }

                        // linux build
-                        name = latestBuild.LinuxBuild?.Filename ?? "Linux PR Build";
+                        name = latestBuild.LinuxFilename ?? "Linux PR Build";
                        name = name.Replace("rpcs3-", "").Replace("_linux64", "");
-                        if (!string.IsNullOrEmpty(latestBuild.LinuxBuild?.DownloadLink))
-                            linuxDownloadText = $"[⏬ {name}]({latestBuild.LinuxBuild?.DownloadLink})";
+                        if (!string.IsNullOrEmpty(latestBuild.LinuxBuildDownloadLink))
+                            linuxDownloadText = $"[⏬ {name}]({latestBuild.LinuxBuildDownloadLink})";
                        else if (shouldHaveArtifacts)
                        {
                            if (latestBuild.FinishTime.HasValue && (DateTime.UtcNow - latestBuild.FinishTime.Value).TotalDays > 30)
@ -225,10 +232,10 @@ internal sealed class Pr: BaseCommandModuleCustom
                        }

                        // mac build
-                        name = latestBuild.MacBuild?.Filename ?? "Mac PR Build";
+                        name = latestBuild.MacFilename ?? "Mac PR Build";
                        name = name.Replace("rpcs3-", "").Replace("_macos", "");
-                        if (!string.IsNullOrEmpty(latestBuild.MacBuild?.DownloadLink))
-                            macDownloadText = $"[⏬ {name}]({latestBuild.MacBuild?.DownloadLink})";
+                        if (!string.IsNullOrEmpty(latestBuild.MacBuildDownloadLink))
+                            macDownloadText = $"[⏬ {name}]({latestBuild.MacBuildDownloadLink})";
                        else if (shouldHaveArtifacts)
                        {
                            if (latestBuild.FinishTime.HasValue && (DateTime.UtcNow - latestBuild.FinishTime.Value).TotalDays > 30)
@ -236,7 +243,7 @@ internal sealed class Pr: BaseCommandModuleCustom
                        }

                        // Neatify PR's with missing builders
-                        if (latestBuild.WindowsBuild?.Status is null)
+                        /*if (latestBuild.WindowsBuild?.Status is null)
                        {
                            windowsDownloadText = null;
                        }
@ -247,9 +254,7 @@ internal sealed class Pr: BaseCommandModuleCustom
                        if (latestBuild.MacBuild?.Status is null)
                        {
                            macDownloadText = null;
-                        }
-
-
+                        }*/
                    }
                }
                catch (Exception e)
--- a/CompatBot/Commands/Sudo.Bot.cs
+++ b/CompatBot/Commands/Sudo.Bot.cs
@ -87,7 +87,7 @@ internal partial class Sudo
            ).ConfigureAwait(false);
            Config.Log.Info($"Shutting down by request from {ctx.User.Username}#{ctx.User.Discriminator}");
            Config.InMemorySettings["shutdown"] = "true";
-            Config.Cts.Cancel();
+            await Config.Cts.CancelAsync().ConfigureAwait(false);
        }

        [Command("status")]
--- a/CompatBot/CompatBot.csproj
+++ b/CompatBot/CompatBot.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
    <TieredCompilation>true</TieredCompilation>
    <RootNamespace>CompatBot</RootNamespace>
    <UserSecretsId>c2e6548b-b215-4a18-a010-958ef294b310</UserSecretsId>
@ -39,36 +39,36 @@
    <AdditionalFiles Include="..\win32_error_codes*.txt" />
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="DSharpPlus" Version="4.4.2" />
-    <PackageReference Include="DSharpPlus.CommandsNext" Version="4.4.2" />
-    <PackageReference Include="DSharpPlus.Interactivity" Version="4.4.2" />
-    <PackageReference Include="DSharpPlus.SlashCommands" Version="4.4.2" />
-    <PackageReference Include="Google.Apis.Drive.v3" Version="1.62.0.3155" />
+    <PackageReference Include="DSharpPlus" Version="4.4.3" />
+    <PackageReference Include="DSharpPlus.CommandsNext" Version="4.4.3" />
+    <PackageReference Include="DSharpPlus.Interactivity" Version="4.4.3" />
+    <PackageReference Include="DSharpPlus.SlashCommands" Version="4.4.3" />
+    <PackageReference Include="Google.Apis.Drive.v3" Version="1.63.0.3155" />
    <PackageReference Include="ksemenenko.ColorThief" Version="1.1.1.4" />
    <PackageReference Include="MathParser.org-mXparser" Version="5.2.1" />
    <PackageReference Include="MegaApiClient" Version="1.10.3" />
    <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.21.0" />
    <PackageReference Include="Microsoft.ApplicationInsights.PerfCounterCollector" Version="2.21.0" />
    <PackageReference Include="Microsoft.Azure.CognitiveServices.Vision.ComputerVision" Version="7.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.11" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.11">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.11" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="7.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
    <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.3.2" />
    <PackageReference Include="Microsoft.TeamFoundationServer.Client" Version="16.205.1" />
    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
-    <PackageReference Include="Nerdbank.Streams" Version="2.10.69" />
-    <PackageReference Include="NLog" Version="5.2.4" />
-    <PackageReference Include="NLog.Extensions.Logging" Version="5.3.4" />
+    <PackageReference Include="Nerdbank.Streams" Version="2.10.72" />
+    <PackageReference Include="NLog" Version="5.2.5" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="5.3.5" />
    <PackageReference Include="NReco.Text.AhoCorasickDoubleArrayTrie" Version="1.1.1" />
-    <PackageReference Include="SharpCompress" Version="0.34.0" />
-    <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.0.0" />
-    <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
+    <PackageReference Include="SharpCompress" Version="0.34.1" />
+    <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.0.1" />
+    <PackageReference Include="System.Drawing.Common" Version="8.0.0" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\Clients\CirrusCiClient\CirrusCiClient.csproj" />
--- a/CompatBot/Program.cs
+++ b/CompatBot/Program.cs
@ -6,7 +6,6 @@ using System.Reflection;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using CirrusCiClient;
 using CompatBot.Commands;
 using CompatBot.Commands.Converters;
 using CompatBot.Database;
@ -122,7 +121,6 @@ internal static class Program
                CompatList.ImportCompatListAsync(),
                Config.GetAzureDevOpsClient().GetPipelineDurationAsync(Config.Cts.Token),
                Config.GetCurrentGitRevisionAsync(Config.Cts.Token),
-                CirrusCi.GetPipelineDurationAsync(Config.Cts.Token),
                Sudo.Bot.UpdateCheckScheduledAsync(Config.Cts.Token)
            );

--- a/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.GeneralNotesSection.cs
+++ b/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.GeneralNotesSection.cs
@ -255,7 +255,7 @@ internal static partial class LogParserResult

        if (items["os_type"] == "Windows"
            && Version.TryParse(items["os_version"], out var winVersion)
-            && (winVersion is { Major: < 10 } or { Build: < 19045 or (> 20000 and < 22000) }))
+            && (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");
            
        var gpuInfo = items["gpu_info"] ?? items["discrete_gpu_info"];
@ -265,12 +265,14 @@ internal static partial class LogParserResult
            {
                var family = intelMatch.Groups["gpu_family"].Value.TrimEnd();
                var modelNumber = intelMatch.Groups["gpu_model_number"].Value;
+                if (modelNumber is null or "" && family.Split(' ', 2, StringSplitOptions.TrimEntries) is [string fp, string mp])
+                    (family, modelNumber) = (fp, mp);
                if (!string.IsNullOrEmpty(modelNumber) && modelNumber.StartsWith('P'))
                    modelNumber = modelNumber[1..];
                _ = int.TryParse(modelNumber, out var modelNumberInt);
                if (family is "UHD" or "Iris Plus" or "Iris Xe" || modelNumberInt is > 500 and < 1000)
                    notes.Add("⚠️ Intel iGPUs are not officially supported; visual glitches are to be expected");
-                else
+                else if (family is not "Arc")
                {
                    notes.Add("⚠️ Intel iGPUs before Skylake do not fully comply with OpenGL 4.3");
                    supportedGpu = false;
--- a/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.cs
+++ b/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.cs
@ -958,7 +958,7 @@ internal static partial class LogParserResult
                < 21390 => "10 Dev Build " + windowsVersion.Build,
                21390 => "10 21H2 Insider",
                < 22000 => "11 Internal Build " + windowsVersion.Build,
-                22000 => "11 21H2",
+                22000 => "11 21H2", // deprecated
                < 22621 => "11 22H2 Insider Build " + windowsVersion.Build,
                22621 => "11 22H2",
                22631 => "11 23H2",
--- a/2
+++ b/2
@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:7.0-jammy AS base
+FROM mcr.microsoft.com/dotnet/sdk:8.0-jammy AS base

 # Native libgdiplus dependencies
 RUN apt-get update
--- a/HomoglyphConverter/HomoglyphConverter.csproj
+++ b/HomoglyphConverter/HomoglyphConverter.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
    <LangVersion>latest</LangVersion>
    <Nullable>enable</Nullable>
    <EmitCompilerGeneratedFiles>false</EmitCompilerGeneratedFiles>
--- a/HomoglyphConverter/confusables.txt
+++ b/HomoglyphConverter/confusables.txt
@ -1,11 +1,11 @@
 # confusables.txt
-# Date: 2022-08-26, 16:49:08 GMT
-# © 2022 Unicode®, Inc.
+# Date: 2023-08-11, 17:46:40 GMT
+# © 2023 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use, see https://www.unicode.org/terms_of_use.html
 #
 # Unicode Security Mechanisms for UTS #39
-# Version: 15.0.0
+# Version: 15.1.0
 #
 # For documentation and usage, see https://www.unicode.org/reports/tr39
 #
@ -349,8 +349,8 @@ A4FA ;	002E 002E ;	MA	# ( ꓺ → .. ) LISU LETTER TONE MYA CYA → FULL STOP, F

 A6F4 ;	A6F3 A6F3 ;	MA	#* ( ꛴ → ꛳꛳ ) BAMUM COLON → BAMUM FULL STOP, BAMUM FULL STOP	# 

-30FB ;	00B7 ;	MA	#* ( ・ → · ) KATAKANA MIDDLE DOT → MIDDLE DOT	# →•→
-FF65 ;	00B7 ;	MA	#* ( ･ → · ) HALFWIDTH KATAKANA MIDDLE DOT → MIDDLE DOT	# →•→
+30FB ;	00B7 ;	MA	# ( ・ → · ) KATAKANA MIDDLE DOT → MIDDLE DOT	# →•→
+FF65 ;	00B7 ;	MA	# ( ･ → · ) HALFWIDTH KATAKANA MIDDLE DOT → MIDDLE DOT	# →•→
 16EB ;	00B7 ;	MA	#* ( ᛫ → · ) RUNIC SINGLE PUNCTUATION → MIDDLE DOT	# 
 0387 ;	00B7 ;	MA	# ( · → · ) GREEK ANO TELEIA → MIDDLE DOT	# 
 2E31 ;	00B7 ;	MA	#* ( ⸱ → · ) WORD SEPARATOR MIDDLE DOT → MIDDLE DOT	# 
--- a/README.md
+++ b/README.md
@ -9,7 +9,7 @@ You can read the design and implementation notes by visiting the folders in the

 Development Requirements
 ------------------------
-* [.NET 7.0 SDK](https://dotnet.microsoft.com/download) or newer
+* [.NET 8.0 SDK](https://dotnet.microsoft.com/download) or newer
 * Any text editor, but here are some recommends:
  * [Visual Studio](https://visualstudio.microsoft.com/) (Windows and Mac only, has free Community edition)
  * [Visual Studio Code](https://code.visualstudio.com/) (cross-platform, free)
@ -17,7 +17,7 @@ Development Requirements

 Runtime Requirements
 --------------------
-* [.NET 7.0 SDK](https://dotnet.microsoft.com/download) or newer to run from sources
+* [.NET 8.0 SDK](https://dotnet.microsoft.com/download) or newer to run from sources
  * bot needs `dotnet` command to be available (i.e. alias for the Snap package)
 * Optionally Google API credentials to access Google Drive:
  * Create new project in the [Google Cloud Resource Manager](https://console.developers.google.com/cloud-resource-manager)
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
    <IsPackable>false</IsPackable>
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="DuoVia.FuzzyStrings" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
-    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="NUnit" Version="3.14.0" />
    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
-    <PackageReference Include="NUnit.Analyzers" Version="3.7.0">
+    <PackageReference Include="NUnit.Analyzers" Version="3.9.0">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>