RPCS3/archived-discord-bot
1
0
Fork 0
mirror of https://github.com/RPCS3/discord-bot.git synced 2026-01-31 01:25:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

upgrade to net10.0

Browse Source
This commit is contained in:
13xforever
2025-11-15 12:10:06 +05:00
parent 186fda7958
commit 450ccf9442
22 changed files with 35 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/codeql-analysis.yml vendored
View File

@@ -54,9 +54,7 @@ jobs:
- name: Update dotnet - name: Update dotnet
uses: actions/setup-dotnet@v4 uses: actions/setup-dotnet@v4
with: with:
dotnet-version: | dotnet-version: 10.0.x
8.0.x
9.0.x
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v4 uses: actions/checkout@v4

12
.github/workflows/dotnet.yml vendored
View File

@@ -15,9 +15,7 @@ jobs:
- name: update dotnet core sdk - name: update dotnet core sdk
uses: actions/setup-dotnet@v4 uses: actions/setup-dotnet@v4
with: with:
dotnet-version: | dotnet-version: 10.0.x
8.0.x
9.0.x
- name: dotnet restore (first try) - name: dotnet restore (first try)
run: dotnet restore --ignore-failed-sources run: dotnet restore --ignore-failed-sources
- name: dotnet restore (second try) - name: dotnet restore (second try)
@@ -37,9 +35,7 @@ jobs:
- name: update dotnet core sdk - name: update dotnet core sdk
uses: actions/setup-dotnet@v4 uses: actions/setup-dotnet@v4
with: with:
dotnet-version: | dotnet-version: 10.0.x
8.0.x
9.0.x
- name: dotnet restore (first try) - name: dotnet restore (first try)
run: dotnet restore --ignore-failed-sources run: dotnet restore --ignore-failed-sources
- name: dotnet restore (second try) - name: dotnet restore (second try)
@@ -74,9 +70,7 @@ jobs:
- name: update dotnet core sdk - name: update dotnet core sdk
uses: actions/setup-dotnet@v4 uses: actions/setup-dotnet@v4
with: with:
dotnet-version: | dotnet-version: 10.0.x
8.0.x
9.0.x
- name: dotnet restore (first try) - name: dotnet restore (first try)
run: dotnet restore --ignore-failed-sources run: dotnet restore --ignore-failed-sources
- name: dotnet restore (second try) - name: dotnet restore (second try)

2
Clients/CirrusCiClient/CirrusCiClient.csproj
View File

@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net9.0</TargetFramework> <TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<EmitCompilerGeneratedFiles>false</EmitCompilerGeneratedFiles> <EmitCompilerGeneratedFiles>false</EmitCompilerGeneratedFiles>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>

2
Clients/CompatApiClient/CompatApiClient.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net9.0</TargetFramework> <TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
</PropertyGroup> </PropertyGroup>

2
Clients/GithubClient/Client.CI.cs
View File

@@ -328,7 +328,7 @@ public partial class Client
.ToList(); .ToList();
return await builds return await builds
.ToAsyncEnumerable() .ToAsyncEnumerable()
.SelectAwait(async b => await GetArtifactsInfoAsync(b.HeadSha, b, cancellationToken).ConfigureAwait(false)) .Select((b, ct) => GetArtifactsInfoAsync(b.HeadSha, b, ct))
.ToListAsync(cancellationToken: cancellationToken) .ToListAsync(cancellationToken: cancellationToken)
.ConfigureAwait(false); .ConfigureAwait(false);
} }

5
Clients/GithubClient/GithubClient.csproj
View File

@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net9.0</TargetFramework> <TargetFramework>net10.0</TargetFramework>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
</PropertyGroup> </PropertyGroup>
@@ -8,9 +8,8 @@
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.1" /> <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.1" />
<PackageReference Include="Octokit" Version="14.0.0" /> <PackageReference Include="Octokit" Version="14.0.0" />
<PackageReference Include="SharpCompress" Version="0.42.1" /> <PackageReference Include="SharpCompress" Version="0.42.1" />
<PackageReference Include="System.Linq.Async" Version="6.0.3" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\CompatApiClient\CompatApiClient.csproj" /> <ProjectReference Include="..\CompatApiClient\CompatApiClient.csproj" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
Clients/IrdLibraryClient/IrdLibraryClient.csproj
View File

@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net9.0</TargetFramework> <TargetFramework>net10.0</TargetFramework>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
</PropertyGroup> </PropertyGroup>

2
Clients/MediafireClient/MediafireClient.csproj
View File

@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net9.0</TargetFramework> <TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
</PropertyGroup> </PropertyGroup>

2
Clients/OneDriveClient/OneDriveClient.csproj
View File

@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net9.0</TargetFramework> <TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
</PropertyGroup> </PropertyGroup>

2
Clients/PsnClient/PsnClient.csproj
View File

@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net9.0</TargetFramework> <TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
</PropertyGroup> </PropertyGroup>

2
Clients/YandexDiskClient/YandexDiskClient.csproj
View File

@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net9.0</TargetFramework> <TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
</PropertyGroup> </PropertyGroup>

5
CompatBot/Commands/Sudo.Mod.cs
View File

@@ -1,4 +1,5 @@
using CompatBot.Database.Providers; using CompatBot.Database;
using CompatBot.Database.Providers;
namespace CompatBot.Commands; namespace CompatBot.Commands;
@@ -80,7 +81,7 @@ internal static partial class Sudo
var modList = ModProvider.Mods var modList = ModProvider.Mods
.Values .Values
.ToAsyncEnumerable() .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) .OrderByDescending(i => i.m.Sudoer)
.ThenBy(i => i.u.Username) .ThenBy(i => i.u.Username)
.ToList(); .ToList();

9
CompatBot/CompatBot.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework> <TargetFramework>net10.0</TargetFramework>
<TieredCompilation>true</TieredCompilation> <TieredCompilation>true</TieredCompilation>
<RootNamespace>CompatBot</RootNamespace> <RootNamespace>CompatBot</RootNamespace>
<UserSecretsId>c2e6548b-b215-4a18-a010-958ef294b310</UserSecretsId> <UserSecretsId>c2e6548b-b215-4a18-a010-958ef294b310</UserSecretsId>
@@ -55,12 +55,12 @@
<PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.23.0" /> <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.23.0" />
<PackageReference Include="Microsoft.ApplicationInsights.PerfCounterCollector" 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.Azure.CognitiveServices.Vision.ComputerVision" Version="7.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.11" /> <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.11"> <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.1">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.11" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.1" /> <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.1" /> <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.1" /> <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.1" />
@@ -75,7 +75,6 @@
<PackageReference Include="Result.Net" Version="1.7.0" /> <PackageReference Include="Result.Net" Version="1.7.0" />
<PackageReference Include="SharpCompress" Version="0.42.1" /> <PackageReference Include="SharpCompress" Version="0.42.1" />
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.7" /> <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" /> <PackageReference Include="TesseractCSharp" Version="1.0.5" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

1
CompatBot/Database/Providers/DiscLanguageProvider.cs
View File

@@ -146,6 +146,7 @@ public static partial class DiscLanguageProvider
["Italy"] = "🇮🇹", ["Italy"] = "🇮🇹",
["Japan"] = "🇯🇵", ["Japan"] = "🇯🇵",
["Korea"] = "🇰🇷", ["Korea"] = "🇰🇷",
["Latin America"] = "🇱🇽", // not a real code
["Mexico"] = "🇲🇽", ["Mexico"] = "🇲🇽",
["New Zealand"] = "🇳🇿", ["New Zealand"] = "🇳🇿",
["Poland"] = "🇵🇱", ["Poland"] = "🇵🇱",

4
CompatBot/EventHandlers/LogParsingHandler.cs
View File

@@ -84,7 +84,7 @@ public static class LogParsingHandler
DiscordMessage? botMsg = null; DiscordMessage? botMsg = null;
var possibleHandlers = SourceHandlers var possibleHandlers = SourceHandlers
.ToAsyncEnumerable() .ToAsyncEnumerable()
.SelectAwait(async h => await h.FindHandlerAsync(message, ArchiveHandlers).ConfigureAwait(false)) .Select(async (ISourceHandler h, CancellationToken _) => await h.FindHandlerAsync(message, ArchiveHandlers).ConfigureAwait(false))
.ToList(); .ToList();
using var source = possibleHandlers.FirstOrDefault(h => h.IsSuccess())?.Data; using var source = possibleHandlers.FirstOrDefault(h => h.IsSuccess())?.Data;
var fail = possibleHandlers.FirstOrDefault(h => h is {Message.Length: >0})?.Message; var fail = possibleHandlers.FirstOrDefault(h => h is {Message.Length: >0})?.Message;
@@ -446,4 +446,4 @@ public static class LogParsingHandler
Color = Config.Colors.LogUnknown, Color = Config.Colors.LogUnknown,
}; };
} }
} }

2
CompatBot/ThumbScrapper/PsnScraper.cs
View File

@@ -328,7 +328,7 @@ internal sealed partial class PsnScraper
.Select(sku => sku.Id) .Select(sku => sku.Id)
.Distinct() .Distinct()
.ToAsyncEnumerable() .ToAsyncEnumerable()
.WhereAwait(async id => ProductCodeLookup.Pattern().IsMatch(id) .Where(async (id, _) => ProductCodeLookup.Pattern().IsMatch(id)
&& await NeedLookupAsync(id).ConfigureAwait(false) && await NeedLookupAsync(id).ConfigureAwait(false)
).ToList(); ).ToList();
foreach (var relatedSku in relatedSkus) foreach (var relatedSku in relatedSkus)

2
CompatBot/Utils/Extensions/AzureDevOpsClientExtensions.cs
View File

@@ -124,7 +124,7 @@ internal static class AzureDevOpsClientExtensions
.ToList(); .ToList();
return await builds return await builds
.ToAsyncEnumerable() .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) .ToListAsync(cancellationToken: cancellationToken)
.ConfigureAwait(false); .ConfigureAwait(false);
} }

8
Dockerfile
View File

@@ -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 # Native libgdiplus dependencies
RUN apt-get update 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 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 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-6_amd64.deb RUN dpkg -i ./libtiff5_4.3.0-6ubuntu0.12_amd64.deb
RUN rm ./libtiff5_4.3.0-6_amd64.deb RUN rm ./libtiff5_4.3.0-6ubuntu0.12_amd64.deb
# Regular stuff # Regular stuff
#COPY packages /root/.nuget/packages/ #COPY packages /root/.nuget/packages/

2
HomoglyphConverter/HomoglyphConverter.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net9.0</TargetFramework> <TargetFramework>net10.0</TargetFramework>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<EmitCompilerGeneratedFiles>false</EmitCompilerGeneratedFiles> <EmitCompilerGeneratedFiles>false</EmitCompilerGeneratedFiles>

4
README.md
View File

@@ -9,7 +9,7 @@ You can read the design and implementation notes by visiting the folders in the
Development Requirements 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: * Any text editor, but here are some recommends:
* [Visual Studio](https://visualstudio.microsoft.com/) (Windows, has free Community edition) * [Visual Studio](https://visualstudio.microsoft.com/) (Windows, has free Community edition)
* [Visual Studio Code](https://code.visualstudio.com/) (cross-platform, free) * [Visual Studio Code](https://code.visualstudio.com/) (cross-platform, free)
@@ -17,7 +17,7 @@ Development Requirements
Runtime Requirements 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) * 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` * 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: * On Ubuntu 24.04 this is provided by the following packages:

2
SourceGenerators/SourceGenerators.csproj
View File

@@ -10,7 +10,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="4.14.0" PrivateAssets="all" /> <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="5.0.0" PrivateAssets="all" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
Tests/Tests.csproj
View File

@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net9.0</TargetFramework> <TargetFramework>net10.0</TargetFramework>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>