diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 7a43303f..c53affa6 100644 --- 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: '5.0.x' + dotnet-version: '6.0.x' - name: Checkout repository uses: actions/checkout@v2 diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 1a68e8e5..72165aa2 100644 --- 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: 5.0.x + dotnet-version: 6.0.x - name: dotnet restore (first try) run: dotnet restore --ignore-failed-sources - name: dotnet restore (second try) @@ -41,7 +41,7 @@ jobs: - name: update dotnet core sdk uses: actions/setup-dotnet@v1 with: - dotnet-version: 5.0.x + dotnet-version: 6.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 index d281a3fe..7f0e683c 100644 --- a/Clients/CirrusCiClient/CirrusCiClient.csproj +++ b/Clients/CirrusCiClient/CirrusCiClient.csproj @@ -1,21 +1,20 @@ - - - net5.0 - enable - false - - - - - - - - - - - - - - - + + net6.0 + enable + true + + + + + + + + + + + + all + + + \ No newline at end of file diff --git a/Clients/CompatApiClient/CompatApiClient.csproj b/Clients/CompatApiClient/CompatApiClient.csproj index 8c677e54..9fe5222f 100644 --- a/Clients/CompatApiClient/CompatApiClient.csproj +++ b/Clients/CompatApiClient/CompatApiClient.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 enable @@ -15,9 +15,9 @@ - - - + + + diff --git a/Clients/GithubClient/GithubClient.csproj b/Clients/GithubClient/GithubClient.csproj index 48c5d189..b34c5e44 100644 --- a/Clients/GithubClient/GithubClient.csproj +++ b/Clients/GithubClient/GithubClient.csproj @@ -1,18 +1,17 @@ - - net5.0 + net6.0 latest enable - - + + + all + - - - + \ No newline at end of file diff --git a/Clients/IrdLibraryClient/IrdLibraryClient.csproj b/Clients/IrdLibraryClient/IrdLibraryClient.csproj index 990f625b..3ab0130d 100644 --- a/Clients/IrdLibraryClient/IrdLibraryClient.csproj +++ b/Clients/IrdLibraryClient/IrdLibraryClient.csproj @@ -1,20 +1,19 @@ - - net5.0 + net6.0 latest enable - - - - + + + + + all + - - - + \ No newline at end of file diff --git a/Clients/MediafireClient/MediafireClient.csproj b/Clients/MediafireClient/MediafireClient.csproj index b16a631e..cdc067ad 100644 --- a/Clients/MediafireClient/MediafireClient.csproj +++ b/Clients/MediafireClient/MediafireClient.csproj @@ -1,12 +1,14 @@ - - - net5.0 - enable - - - - - - - + + net6.0 + enable + + + + + + + all + + + \ No newline at end of file diff --git a/Clients/OneDriveClient/OneDriveClient.csproj b/Clients/OneDriveClient/OneDriveClient.csproj index b769db4c..cdc067ad 100644 --- a/Clients/OneDriveClient/OneDriveClient.csproj +++ b/Clients/OneDriveClient/OneDriveClient.csproj @@ -1,12 +1,14 @@ - - net5.0 + net6.0 enable - - - + + + all + + + \ No newline at end of file diff --git a/Clients/PsnClient/PsnClient.csproj b/Clients/PsnClient/PsnClient.csproj index 0fa241be..c4ed2dec 100644 --- a/Clients/PsnClient/PsnClient.csproj +++ b/Clients/PsnClient/PsnClient.csproj @@ -1,26 +1,23 @@  - - net5.0 + net6.0 enable - - - - - + + + + all + - - - + \ No newline at end of file diff --git a/Clients/YandexDiskClient/YandexDiskClient.csproj b/Clients/YandexDiskClient/YandexDiskClient.csproj index b16a631e..cdc067ad 100644 --- a/Clients/YandexDiskClient/YandexDiskClient.csproj +++ b/Clients/YandexDiskClient/YandexDiskClient.csproj @@ -1,12 +1,14 @@ - - - net5.0 - enable - - - - - - - + + net6.0 + enable + + + + + + + all + + + \ No newline at end of file diff --git a/CompatBot/Commands/BotStats.cs b/CompatBot/Commands/BotStats.cs index a81af70f..f57598ca 100644 --- a/CompatBot/Commands/BotStats.cs +++ b/CompatBot/Commands/BotStats.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; +using System.Runtime.InteropServices; using System.Text; using System.Threading.Tasks; using CompatApiClient; @@ -13,7 +14,6 @@ using CompatBot.Utils; using DSharpPlus.CommandsNext; using DSharpPlus.CommandsNext.Attributes; using DSharpPlus.Entities; -using Microsoft.DotNet.PlatformAbstractions; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Caching.Memory; @@ -44,7 +44,7 @@ namespace CompatBot.Commands .AddField(".NET Info", $"{System.Runtime.InteropServices.RuntimeInformation.FrameworkDescription}\n" + $"{(System.Runtime.GCSettings.IsServerGC ? "Server" : "Workstation")} GC Mode", true) .AddField("Runtime Info", $"Confinement: {SandboxDetector.Detect()}\n" + - $"OS: {RuntimeEnvironment.OperatingSystem} {RuntimeEnvironment.OperatingSystemVersion}\n" + + $"OS: {RuntimeInformation.OSDescription} {Environment.OSVersion}\n" + $"CPUs: {Environment.ProcessorCount}\n" + $"Time zones: {TimeParser.TimeZoneMap.Count} out of {TimeParser.TimeZoneAcronyms.Count} resolved, {TimeZoneInfo.GetSystemTimeZones().Count} total", true); AppendPiracyStats(embed); diff --git a/CompatBot/Commands/Misc.cs b/CompatBot/Commands/Misc.cs index 85f53674..19fe2403 100644 --- a/CompatBot/Commands/Misc.cs +++ b/CompatBot/Commands/Misc.cs @@ -136,6 +136,7 @@ namespace CompatBot.Commands public async Task About(CommandContext ctx) { var hcorion = ctx.Client.GetEmoji(":hcorion:", DiscordEmoji.FromUnicode("🍁")); + var clienthax = ctx.Client.GetEmoji(":gooseknife:", DiscordEmoji.FromUnicode("🐱")); var embed = new DiscordEmbedBuilder { Title = "RPCS3 Compatibility Bot", @@ -143,7 +144,9 @@ namespace CompatBot.Commands Color = DiscordColor.Purple, }.AddField("Made by", "💮 13xforever\n" + - "🇭🇷 Roberto Anić Banić aka nicba1010") + "🇭🇷 Roberto Anić Banić aka nicba1010\n" + + $"{clienthax} clienthax\n" + ) .AddField("People who ~~broke~~ helped test the bot", "🐱 Juhn\n" + $"{hcorion} hcorion\n" + diff --git a/CompatBot/CompatBot.csproj b/CompatBot/CompatBot.csproj index c324a8b1..640636cf 100644 --- a/CompatBot/CompatBot.csproj +++ b/CompatBot/CompatBot.csproj @@ -1,8 +1,7 @@  - Exe - net5.0 + net6.0 true CompatBot c2e6548b-b215-4a18-a010-958ef294b310 @@ -13,78 +12,65 @@ enable false - - - - Always - PreserveNewest - - - - - - + + + - - - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - + + + + + - - - - - + + + + - - + - - + + + all + - @@ -97,5 +83,4 @@ - - + \ No newline at end of file diff --git a/CompatBot/EventHandlers/LogParsing/SourceHandlers/MegaHandler.cs b/CompatBot/EventHandlers/LogParsing/SourceHandlers/MegaHandler.cs index 7374c320..1f72b1d4 100644 --- a/CompatBot/EventHandlers/LogParsing/SourceHandlers/MegaHandler.cs +++ b/CompatBot/EventHandlers/LogParsing/SourceHandlers/MegaHandler.cs @@ -74,7 +74,7 @@ namespace CompatBot.EventHandlers.LogParsing.SourceHandlers { private readonly IMegaApiClient client; private readonly Uri uri; - private readonly INodeInfo node; + private readonly INode node; private readonly IArchiveHandler handler; public string SourceType => "Mega"; @@ -83,7 +83,7 @@ namespace CompatBot.EventHandlers.LogParsing.SourceHandlers public long SourceFilePosition => handler.SourcePosition; public long LogFileSize => handler.LogSize; - internal MegaSource(IMegaApiClient client, Uri uri, INodeInfo node, IArchiveHandler handler) + internal MegaSource(IMegaApiClient client, Uri uri, INode node, IArchiveHandler handler) { this.client = client; this.uri = uri; diff --git a/CompatBot/Utils/Extensions/EnumerableExtensions.cs b/CompatBot/Utils/Extensions/EnumerableExtensions.cs index 93be3457..1a10efd5 100644 --- a/CompatBot/Utils/Extensions/EnumerableExtensions.cs +++ b/CompatBot/Utils/Extensions/EnumerableExtensions.cs @@ -56,7 +56,5 @@ namespace CompatBot.Utils .Select(g => g.Select(x => x.item)); } - public static IEnumerable DistinctBy(this IEnumerable items, Func property) - => items.GroupBy(property).Select(x => x.First()); } } diff --git a/CompatBot/Utils/OpenSslConfigurator.cs b/CompatBot/Utils/OpenSslConfigurator.cs index 1113891e..84dd2616 100644 --- a/CompatBot/Utils/OpenSslConfigurator.cs +++ b/CompatBot/Utils/OpenSslConfigurator.cs @@ -1,5 +1,6 @@ using System; using System.IO; +using System.Runtime.InteropServices; using System.Text; using System.Threading.Tasks; using Microsoft.DotNet.PlatformAbstractions; @@ -10,7 +11,7 @@ namespace CompatBot.Utils { public static async Task CheckAndFixSystemConfigAsync() { - if (RuntimeEnvironment.OperatingSystemPlatform != Platform.Linux) + if (!RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) return; try diff --git a/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.GeneralNotesSection.cs b/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.GeneralNotesSection.cs index 7d152a70..9361fbdd 100644 --- a/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.GeneralNotesSection.cs +++ b/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.GeneralNotesSection.cs @@ -5,6 +5,7 @@ using System.ComponentModel; using System.Globalization; using System.IO; using System.Linq; +using System.Runtime.InteropServices; using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; @@ -623,7 +624,7 @@ namespace CompatBot.Utils.ResultFormatters else notes.Add($"ℹ [Error 0x{code:x}]({link}): {error.description}"); } - else if (items["os_type"] == "Linux" && RuntimeEnvironment.OperatingSystemPlatform == Platform.Linux) + else if (items["os_type"] == "Linux" && RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) foreach (var code in win32ErrorCodes) { try diff --git a/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.cs b/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.cs index addf3c86..d09fb079 100644 --- a/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.cs +++ b/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Collections.Specialized; using System.Linq; +using System.Runtime.InteropServices; using System.Text.RegularExpressions; using System.Threading.Tasks; using CompatApiClient; @@ -319,7 +320,7 @@ namespace CompatBot.Utils.ResultFormatters { var items = state.CompletedCollection!; var multiItems = state.CompleteMultiValueCollection!; - if (RuntimeEnvironment.OperatingSystemPlatform == Platform.Linux) + if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) { var itemKeys = items.AllKeys; foreach (var key in itemKeys) diff --git a/Dockerfile b/Dockerfile index 4bd30c1b..91116e6a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:5.0-focal AS base +FROM mcr.microsoft.com/dotnet/sdk:6.0-focal AS base # Native libgdiplus dependencies RUN apt-get update diff --git a/HomoglyphConverter/HomoglyphConverter.csproj b/HomoglyphConverter/HomoglyphConverter.csproj index 537fa2bf..42039e39 100644 --- a/HomoglyphConverter/HomoglyphConverter.csproj +++ b/HomoglyphConverter/HomoglyphConverter.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 latest enable false diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj index 536ff9a5..0bba9f62 100644 --- a/Tests/Tests.csproj +++ b/Tests/Tests.csproj @@ -1,31 +1,28 @@  - - net5.0 - + net6.0 false - - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive + + all + - - Always - - + \ No newline at end of file diff --git a/discord-bot-net.sln b/discord-bot-net.sln index 1574bb75..5388d400 100644 --- a/discord-bot-net.sln +++ b/discord-bot-net.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.28917.181 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32014.148 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CompatBot", "CompatBot\CompatBot.csproj", "{6D9CA448-60C1-4D66-91D6-EC6C586508E6}" EndProject @@ -23,13 +23,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ProjectSection(SolutionItems) = preProject .cirrus.yml = .cirrus.yml azure-pipelines.yml = azure-pipelines.yml + .github\workflows\codeql-analysis.yml = .github\workflows\codeql-analysis.yml CONTRIBUTING.md = CONTRIBUTING.md docker-compose.example.yml = docker-compose.example.yml Dockerfile = Dockerfile nuget.config = nuget.config README.md = README.md SECURITY.md = SECURITY.md - .github\workflows\codeql-analysis.yml = .github\workflows\codeql-analysis.yml EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OneDriveClient", "Clients\OneDriveClient\OneDriveClient.csproj", "{5C4BCF33-2EC6-455F-B026-8A0001B7B7AD}"