Merge pull request #934 from 13xforever/vnext

Maintenance
RPCS3 · Jun 14, 2023 · a2d4a6e · a2d4a6e
2 parents 0dbd833 + bf4578f
commit a2d4a6e
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 20 deletions.
diff --git a/Clients/CirrusCiClient/CirrusCiClient.csproj b/Clients/CirrusCiClient/CirrusCiClient.csproj
@@ -11,6 +11,6 @@
     <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.0.5" />
+    <PackageReference Include="StrawberryShake.Server" Version="13.2.1" />
   </ItemGroup>
 </Project>
diff --git a/Clients/CompatApiClient/CompatApiClient.csproj b/Clients/CompatApiClient/CompatApiClient.csproj
@@ -17,7 +17,7 @@
     <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.9" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
     <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.3.2" />
-    <PackageReference Include="NLog" Version="5.1.3" />
+    <PackageReference Include="NLog" Version="5.2.0" />
   </ItemGroup>
 
 </Project>
diff --git a/Clients/GithubClient/GithubClient.csproj b/Clients/GithubClient/GithubClient.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
-    <PackageReference Include="Octokit" Version="5.0.4" />
+    <PackageReference Include="Octokit" Version="6.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\CompatApiClient\CompatApiClient.csproj" />

diff --git a/CompatBot/CompatBot.csproj b/CompatBot/CompatBot.csproj
@@ -39,11 +39,11 @@
     <AdditionalFiles Include="..\win32_error_codes*.txt" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="DSharpPlus" Version="4.4.0" />
-    <PackageReference Include="DSharpPlus.CommandsNext" Version="4.4.0" />
-    <PackageReference Include="DSharpPlus.Interactivity" Version="4.4.0" />
-    <PackageReference Include="DSharpPlus.SlashCommands" Version="4.4.0" />
-    <PackageReference Include="Google.Apis.Drive.v3" Version="1.60.0.3024" />
+    <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.60.0.3075" />
     <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" />
@@ -62,9 +62,9 @@
     <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.18.1" />
-    <PackageReference Include="Nerdbank.Streams" Version="2.9.112" />
-    <PackageReference Include="NLog" Version="5.1.3" />
-    <PackageReference Include="NLog.Extensions.Logging" Version="5.2.3" />
+    <PackageReference Include="Nerdbank.Streams" Version="2.10.66" />
+    <PackageReference Include="NLog" Version="5.2.0" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="5.3.0" />
     <PackageReference Include="NReco.Text.AhoCorasickDoubleArrayTrie" Version="1.1.1" />
     <PackageReference Include="SharpCompress" Version="0.33.0" />
     <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta15" />

diff --git a/CompatBot/Utils/Extensions/StringUtils.cs b/CompatBot/Utils/Extensions/StringUtils.cs
@@ -205,17 +205,17 @@ public static string ToLatin8BitRegexPattern(this string regexPattern)
         var result = new StringBuilder(regexPattern.Length);
         while (!span.IsEmpty)
         {
-            var count = encoder.GetBytes(span.Slice(0, 1), tmp, false);
+            var count = encoder.GetBytes(span[..1], tmp, false);
             if (count == 1)
-                result.Append(Encoding.Latin1.GetString(tmp.Slice(0, count)));
+                result.Append(Encoding.Latin1.GetString(tmp[..count]));
             else if (count > 1)
             {
                 result.Append('(');
                 for (var i = 0; i < count; i++)
                     result.Append(@"\x").Append(Utf8ToLatin1RegexPatternEncoderFallback.CustomMapperFallbackBuffer.ByteToHex[tmp[i]]);
                 result.Append(')');
             }
-            span = span.Slice(1);
+            span = span[1..];
         }
         return result.ToString();
     }

diff --git a/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.GeneralNotesSection.cs b/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.GeneralNotesSection.cs
@@ -257,7 +257,7 @@ private static async Task BuildNotesSectionAsync(DiscordEmbedBuilder builder, Lo
 
         if (items["os_type"] == "Windows"
             && Version.TryParse(items["os_version"], out var winVersion)
-            && (winVersion is { Major: < 10 } or { Build: < 19044 or (> 20000 and < 22000) }))
+            && (winVersion is { Major: < 10 } or { Build: < 19045 or (> 20000 and < 22000) }))
             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"];

diff --git a/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.cs b/CompatBot/Utils/ResultFormatters/LogParserResultFormatter.cs
@@ -837,8 +837,8 @@ select m
                 < 19041 => "10 20H1 Build " + windowsVersion.Build,
                 19041 => "10 2004",
                 19042 => "10 20H2",
-                19043 => "10 21H1", // deprecated
-                19044 => "10 21H2",
+                19043 => "10 21H1",
+                19044 => "10 21H2", // deprecated
                 19045 => "10 22H2",
 
                 < 21390 => "10 Dev Build " + windowsVersion.Build,

diff --git a/SourceGenerators/SourceGenerators.csproj b/SourceGenerators/SourceGenerators.csproj
@@ -7,7 +7,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" PrivateAssets="all" />
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.6.0" PrivateAssets="all" />
         <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" PrivateAssets="all" />
     </ItemGroup>
 

diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
@@ -6,9 +6,9 @@
   <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.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.4.2">
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>