upgrade to net10.0

13xforever · 13xforever · commit ef5c6a3ad02d · 2025-11-20T16:50:56.000+05:00
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -54,9 +54,7 @@ jobs:
       - name: Update dotnet
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: |
-            8.0.x
-            9.0.x
+          dotnet-version: 10.0.x
 
       - name: Checkout repository
         uses: actions/checkout@v4
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -15,9 +15,7 @@ jobs:
     - name: update dotnet core sdk
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: |
-          8.0.x
-          9.0.x
+        dotnet-version: 10.0.x
     - name: dotnet restore (first try)
       run: dotnet restore --ignore-failed-sources
     - name: dotnet restore (second try)
@@ -37,9 +35,7 @@ jobs:
     - name: update dotnet core sdk
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: |
-          8.0.x
-          9.0.x
+        dotnet-version: 10.0.x
     - name: dotnet restore (first try)
       run: dotnet restore --ignore-failed-sources
     - name: dotnet restore (second try)
@@ -74,9 +70,7 @@ jobs:
     - name: update dotnet core sdk
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: |
-          8.0.x
-          9.0.x
+        dotnet-version: 10.0.x
     - name: dotnet restore (first try)
       run: dotnet restore --ignore-failed-sources
     - name: dotnet restore (second try)
diff --git a/Clients/CirrusCiClient/CirrusCiClient.csproj b/Clients/CirrusCiClient/CirrusCiClient.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <EmitCompilerGeneratedFiles>false</EmitCompilerGeneratedFiles>
     <LangVersion>latest</LangVersion>
diff --git a/Clients/CompatApiClient/CompatApiClient.csproj b/Clients/CompatApiClient/CompatApiClient.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
diff --git a/Clients/GithubClient/Client.CI.cs b/Clients/GithubClient/Client.CI.cs
@@ -328,7 +328,7 @@ public async Task<PipelineStats> GetPipelineDurationAsync(CancellationToken canc
             .ToList();
         return await builds
             .ToAsyncEnumerable()
-            .SelectAwait(async b => await GetArtifactsInfoAsync(b.HeadSha, b, cancellationToken).ConfigureAwait(false))
+            .Select((b, ct) => GetArtifactsInfoAsync(b.HeadSha, b, ct))
             .ToListAsync(cancellationToken: cancellationToken)
             .ConfigureAwait(false);
     }
diff --git a/Clients/GithubClient/GithubClient.csproj b/Clients/GithubClient/GithubClient.csproj
@@ -1,14 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0" />
     <PackageReference Include="Octokit" Version="14.0.0" />
     <PackageReference Include="SharpCompress" Version="0.41.0" />
-    <PackageReference Include="System.Linq.Async" Version="6.0.3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\CompatApiClient\CompatApiClient.csproj" />
diff --git a/Clients/IrdLibraryClient/IrdLibraryClient.csproj b/Clients/IrdLibraryClient/IrdLibraryClient.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/Clients/MediafireClient/MediafireClient.csproj b/Clients/MediafireClient/MediafireClient.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
diff --git a/Clients/OneDriveClient/OneDriveClient.csproj b/Clients/OneDriveClient/OneDriveClient.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
diff --git a/Clients/PsnClient/PsnClient.csproj b/Clients/PsnClient/PsnClient.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
diff --git a/Clients/YandexDiskClient/YandexDiskClient.csproj b/Clients/YandexDiskClient/YandexDiskClient.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
diff --git a/CompatBot/Commands/Sudo.Mod.cs b/CompatBot/Commands/Sudo.Mod.cs
@@ -1,4 +1,5 @@
-﻿using CompatBot.Database.Providers;
+﻿using CompatBot.Database;
+using CompatBot.Database.Providers;
 
 namespace CompatBot.Commands;
 
@@ -80,7 +81,7 @@ public static async ValueTask List(SlashCommandContext ctx)
             var modList = ModProvider.Mods
                 .Values
                 .ToAsyncEnumerable()
-                .SelectAwait(async m =>(m: m, u: await ctx.Client.GetUserAsync(m.DiscordId).ConfigureAwait(false)))
+                .Select(async (Moderator m, CancellationToken _) => (m: m, u: await ctx.Client.GetUserAsync(m.DiscordId).ConfigureAwait(false)))
                 .OrderByDescending(i => i.m.Sudoer)
                 .ThenBy(i => i.u.Username)
                 .ToList();
diff --git a/CompatBot/CompatBot.csproj b/CompatBot/CompatBot.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <TieredCompilation>true</TieredCompilation>
     <RootNamespace>CompatBot</RootNamespace>
     <UserSecretsId>c2e6548b-b215-4a18-a010-958ef294b310</UserSecretsId>
@@ -55,12 +55,12 @@
     <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.23.0" />
     <PackageReference Include="Microsoft.ApplicationInsights.PerfCounterCollector" Version="2.23.0" />
     <PackageReference Include="Microsoft.Azure.CognitiveServices.Vision.ComputerVision" Version="7.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.11" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.11">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.11" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.0" />
@@ -74,7 +74,6 @@
     <PackageReference Include="NReco.Text.AhoCorasickDoubleArrayTrie" Version="1.1.1" />
     <PackageReference Include="SharpCompress" Version="0.41.0" />
     <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.7" />
-    <PackageReference Include="System.Linq.Async" Version="6.0.3" />
     <PackageReference Include="TesseractCSharp" Version="1.0.5" />
   </ItemGroup>
   <ItemGroup>
@@ -89,4 +88,4 @@
     <ProjectReference Include="..\Clients\IrdLibraryClient\IrdLibraryClient.csproj" />
     <ProjectReference Include="..\Clients\PsnClient\PsnClient.csproj" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/CompatBot/Database/Providers/DiscLanguageProvider.cs b/CompatBot/Database/Providers/DiscLanguageProvider.cs
@@ -146,6 +146,7 @@ private static string MapLangToFlag(char region, string lang)
         ["Italy"] = "🇮🇹",
         ["Japan"] = "🇯🇵",
         ["Korea"] = "🇰🇷",
+        ["Latin America"] = "🇱🇽", // not a real code
         ["Mexico"] = "🇲🇽",
         ["New Zealand"] = "🇳🇿",
         ["Poland"] = "🇵🇱",
diff --git a/CompatBot/EventHandlers/LogParsingHandler.cs b/CompatBot/EventHandlers/LogParsingHandler.cs
@@ -83,10 +83,10 @@ public static async void EnqueueLogProcessing(DiscordClient client, DiscordChann
             DiscordMessage? botMsg = null;
             var possibleHandlers = SourceHandlers
                 .ToAsyncEnumerable()
-                .SelectAwait(async h => await h.FindHandlerAsync(message, ArchiveHandlers).ConfigureAwait(false))
+                .Select(async (ISourceHandler h, CancellationToken _) => await h.FindHandlerAsync(message, ArchiveHandlers).ConfigureAwait(false))
                 .ToList();
-            using var source = possibleHandlers.FirstOrDefault(h => h.source != null).source;
-            var fail = possibleHandlers.FirstOrDefault(h => !string.IsNullOrEmpty(h.failReason)).failReason;
+            using var source = possibleHandlers.FirstOrDefault(h => h.source is not null).source;
+            var fail = possibleHandlers.FirstOrDefault(h => h.failReason is {Length: >0}).failReason;
             foreach (var (s, _) in possibleHandlers)
             {
                 if (ReferenceEquals(s, source))
diff --git a/CompatBot/ThumbScrapper/PsnScraper.cs b/CompatBot/ThumbScrapper/PsnScraper.cs
@@ -328,7 +328,7 @@ private static async Task ProcessIncludedGamesAsync(string locale, Container con
                             .Select(sku => sku.Id)
                             .Distinct()
                             .ToAsyncEnumerable()
-                            .WhereAwait(async id => ProductCodeLookup.Pattern().IsMatch(id)
+                            .Where(async (id, _) => ProductCodeLookup.Pattern().IsMatch(id)
                                                     && await NeedLookupAsync(id).ConfigureAwait(false)
                             ).ToList();
                         foreach (var relatedSku in relatedSkus)
diff --git a/CompatBot/Utils/Extensions/AzureDevOpsClientExtensions.cs b/CompatBot/Utils/Extensions/AzureDevOpsClientExtensions.cs
@@ -124,7 +124,7 @@ public static async Task<PipelineStats> GetPipelineDurationAsync(this BuildHttpC
             .ToList();
         return await builds
             .ToAsyncEnumerable()
-            .SelectAwait(async b => await azureDevOpsClient.GetArtifactsInfoAsync(b.SourceVersion, b, cancellationToken).ConfigureAwait(false))
+            .Select((b, ct) => azureDevOpsClient.GetArtifactsInfoAsync(b.SourceVersion, b, ct))
             .ToListAsync(cancellationToken: cancellationToken)
             .ConfigureAwait(false);
     }
diff --git a/Dockerfile b/Dockerfile
@@ -1,11 +1,11 @@
-FROM mcr.microsoft.com/dotnet/sdk:9.0-noble AS base
+FROM mcr.microsoft.com/dotnet/sdk:10.0-noble AS base
 
 # Native libgdiplus dependencies
 RUN apt-get update
 RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install -y --allow-unauthenticated libc6-dev libgdiplus libx11-dev fonts-roboto tzdata libarchive13t64 liblept5
-RUN wget https://archive.ubuntu.com/ubuntu/pool/main/t/tiff/libtiff5_4.3.0-6_amd64.deb
-RUN dpkg -i ./libtiff5_4.3.0-6_amd64.deb
-RUN rm ./libtiff5_4.3.0-6_amd64.deb
+RUN wget https://archive.ubuntu.com/ubuntu/pool/main/t/tiff/libtiff5_4.3.0-6ubuntu0.12_amd64.deb
+RUN dpkg -i ./libtiff5_4.3.0-6ubuntu0.12_amd64.deb
+RUN rm ./libtiff5_4.3.0-6ubuntu0.12_amd64.deb
 
 # Regular stuff
 #COPY packages /root/.nuget/packages/
diff --git a/HomoglyphConverter/HomoglyphConverter.csproj b/HomoglyphConverter/HomoglyphConverter.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <EmitCompilerGeneratedFiles>false</EmitCompilerGeneratedFiles>
diff --git a/README.md b/README.md
@@ -9,15 +9,15 @@ You can read the design and implementation notes by visiting the folders in the
 
 Development Requirements
 ------------------------
-* [.NET 9.0 SDK](https://dotnet.microsoft.com/download) or newer
+* [.NET 10.0 SDK](https://dotnet.microsoft.com/download) or newer
 * Any text editor, but here are some recommends:
   * [Visual Studio](https://visualstudio.microsoft.com/) (Windows, has free Community edition)
   * [Visual Studio Code](https://code.visualstudio.com/) (cross-platform, free)
   * [JetBrains Rider](https://www.jetbrains.com/rider/) (cross-platform, free for Non-Commercial use)
 
 Runtime Requirements
 --------------------
-* [.NET 9.0 SDK](https://dotnet.microsoft.com/download) or newer to run from sources
+* [.NET 10.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)
   * OCR on Linux requires the following dependencies to be installed: `libarchive.so.13`, `liblept.so.5`, `libtiff.so.5`
     * On Ubuntu 24.04 this is provided by the following packages:
diff --git a/SourceGenerators/SourceGenerators.csproj b/SourceGenerators/SourceGenerators.csproj
@@ -10,7 +10,7 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="4.14.0" PrivateAssets="all" />
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" PrivateAssets="all" />
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" PrivateAssets="all" />
     </ItemGroup>
 
 </Project>
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>

Original file line number	Diff line number	Diff line change
`@@ -328,7 +328,7 @@ public async Task<PipelineStats> GetPipelineDurationAsync(CancellationToken canc`
`328`	`328`	`.ToList();`
`329`	`329`	`return await builds`
`330`	`330`	`.ToAsyncEnumerable()`
`331`		`- .SelectAwait(async b => await GetArtifactsInfoAsync(b.HeadSha, b, cancellationToken).ConfigureAwait(false))`
	`331`	`+ .Select((b, ct) => GetArtifactsInfoAsync(b.HeadSha, b, ct))`
`332`	`332`	`.ToListAsync(cancellationToken: cancellationToken)`
`333`	`333`	`.ConfigureAwait(false);`
`334`	`334`	`}`