Merge b5d0076bc2 into 6b5cb151c3

Merge branch 'GreemDev:master' into nuget-update
nuget: bump SkiaSharp and System groups, Microsoft.IdentityModel.JsonWebTokens
2024-12-22 03:46:39 +01:00 · 2024-12-01 11:32:52 +01:00 · 2024-11-26 18:08:23 -06:00 · 2024-11-25 15:31:41 -06:00 · 2024-11-25 15:31:41 -06:00 · 2024-11-25 15:31:41 -06:00
2 changed files with 17 additions and 17 deletions
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@ -3,18 +3,18 @@
    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
  </PropertyGroup>
  <ItemGroup>
-    <PackageVersion Include="Avalonia" Version="11.0.10" />
-    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.0.10" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.0.10" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="11.0.10" />
-    <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.0.10" />
-    <PackageVersion Include="Avalonia.Svg" Version="11.0.0.18" />
-    <PackageVersion Include="Avalonia.Svg.Skia" Version="11.0.0.18" />
+    <PackageVersion Include="Avalonia" Version="11.0.13" />
+    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.0.13" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.0.13" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.0.13" />
+    <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.0.13" />
+    <PackageVersion Include="Avalonia.Svg" Version="11.0.0.19" />
+    <PackageVersion Include="Avalonia.Svg.Skia" Version="11.0.0.19" />
    <PackageVersion Include="Projektanker.Icons.Avalonia" Version="9.4.0" />
    <PackageVersion Include="Projektanker.Icons.Avalonia.FontAwesome" Version="9.4.0"/>
    <PackageVersion Include="Projektanker.Icons.Avalonia.MaterialDesign" Version="9.4.0"/>
    <PackageVersion Include="CommandLineParser" Version="2.9.1" />
-    <PackageVersion Include="Concentus" Version="2.2.0" />
+    <PackageVersion Include="Concentus" Version="2.2.2" />
    <PackageVersion Include="DiscordRichPresence" Version="1.2.1.24" />
    <PackageVersion Include="DynamicData" Version="9.0.4" />
    <PackageVersion Include="FluentAvaloniaUI" Version="2.0.5" />
@ -22,7 +22,7 @@
    <PackageVersion Include="LibHac" Version="0.19.0" />
    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
-    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.1.2" />
+    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.2.1" />
    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
    <PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
    <PackageVersion Include="MsgPack.Cli" Version="1.0.1" />
@ -42,14 +42,14 @@
    <PackageVersion Include="securifybv.ShellLink" Version="0.1.0" />
    <PackageVersion Include="shaderc.net" Version="0.1.0" />
    <PackageVersion Include="SharpZipLib" Version="1.4.2" />
-    <PackageVersion Include="Silk.NET.Vulkan" Version="2.21.0" />
-    <PackageVersion Include="Silk.NET.Vulkan.Extensions.EXT" Version="2.21.0" />
-    <PackageVersion Include="Silk.NET.Vulkan.Extensions.KHR" Version="2.21.0" />
-    <PackageVersion Include="SkiaSharp" Version="2.88.7" />
-    <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.7" />
+    <PackageVersion Include="Silk.NET.Vulkan" Version="2.22.0" />
+    <PackageVersion Include="Silk.NET.Vulkan.Extensions.EXT" Version="2.22.0" />
+    <PackageVersion Include="Silk.NET.Vulkan.Extensions.KHR" Version="2.22.0" />
+    <PackageVersion Include="SkiaSharp" Version="2.88.9" />
+    <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.9" />
    <PackageVersion Include="SPB" Version="0.0.4-build32" />
-    <PackageVersion Include="System.IO.Hashing" Version="8.0.0" />
-    <PackageVersion Include="System.Management" Version="8.0.0" />
+    <PackageVersion Include="System.IO.Hashing" Version="9.0.0" />
+    <PackageVersion Include="System.Management" Version="9.0.0" />
    <PackageVersion Include="UnicornEngine.Unicorn" Version="2.0.2-rc1-fb78016" />
  </ItemGroup>
 </Project>
--- a/src/Ryujinx.Graphics.Vulkan/Vendor.cs
+++ b/src/Ryujinx.Graphics.Vulkan/Vendor.cs
@ -92,7 +92,7 @@ namespace Ryujinx.Graphics.Vulkan
                DriverId.MesaDozen => "Dozen",
                DriverId.MesaNvk => "NVK",
                DriverId.ImaginationOpenSourceMesa => "Imagination (Open)",
-                DriverId.MesaAgxv => "Honeykrisp",
+                DriverId.MesaHoneykrisp => "Honeykrisp",
                _ => id.ToString(),
            };
        }
Author	SHA1	Message	Date
Keaton	676c5e7f74	Merge `b5d0076bc2` into `6b5cb151c3`	2024-12-01 11:32:52 +01:00
Keaton	b5d0076bc2	Merge branch 'GreemDev:master' into nuget-update	2024-11-26 18:08:23 -06:00
KeatonTheBot	ec4794ad0c	nuget: bump SkiaSharp and System groups, Microsoft.IdentityModel.JsonWebTokens * Bump System group from 8.00 to 9.00 * Bump SkiaSharp group from 2.88.8 to 2.88.9 * Bump Microsoft.IdentityModel.JsonWebTokens from 8.2.0 to 8.2.1	2024-11-25 15:31:41 -06:00
KeatonTheBot	2c7ba85e6d	nuget: roll back Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK from 1.2.3 to 1.2.0	2024-11-25 15:31:41 -06:00
KeatonTheBot	7cbcf4c7bf	nuget: bump non-avalonia packages * Bump Concentus from 2.2.0 to 2.2.2 * Bump Microsoft.IdentityModel.JsonWebTokens from 8.1.2 to 8.2.0 * Bump Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK from 1.2.0 to 1.2.3 * Bump Silk.NET.Vulkan group with 3 updates (2.21.0 to 2.22.0) * Bump SkiaSharp group with 2 updates (2.88.7 to 2.88.8)	2024-11-25 15:31:41 -06:00
KeatonTheBot	abebe2f6b2	nuget: bump the avalonia group with 7 updates	2024-11-25 15:31:41 -06:00