From a082e14ede0b850f2cba4bb7700b8fc16e39c10e Mon Sep 17 00:00:00 2001 From: Mary Guillemard <mary@mary.zone> Date: Thu, 8 Feb 2024 22:14:30 +0100 Subject: [PATCH] Revert "Bump Ava (#6271)" This reverts commit dfc0819e7273e6887135546d32e2fed6e6d26073. X popup position broke entirely (my fault oops), waiting for next release with a fix (see https://github.com/AvaloniaUI/Avalonia/pull/14551) --- Directory.Packages.props | 11 ++++++----- src/Ryujinx.Ava/Ryujinx.Ava.csproj | 3 +++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 36db32d11..80fadfe41 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -3,11 +3,11 @@ <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally> </PropertyGroup> <ItemGroup> - <PackageVersion Include="Avalonia" Version="11.0.8" /> - <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.0.8" /> - <PackageVersion Include="Avalonia.Desktop" Version="11.0.8" /> - <PackageVersion Include="Avalonia.Diagnostics" Version="11.0.8" /> - <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.0.8" /> + <PackageVersion Include="Avalonia" Version="11.0.7" /> + <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.0.7" /> + <PackageVersion Include="Avalonia.Desktop" Version="11.0.7" /> + <PackageVersion Include="Avalonia.Diagnostics" Version="11.0.7" /> + <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.0.7" /> <PackageVersion Include="Avalonia.Svg" Version="11.0.0.13" /> <PackageVersion Include="Avalonia.Svg.Skia" Version="11.0.0.13" /> <PackageVersion Include="CommandLineParser" Version="2.9.1" /> @@ -45,6 +45,7 @@ <PackageVersion Include="SixLabors.ImageSharp" Version="1.0.4" /> <PackageVersion Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta11" /> <PackageVersion Include="SPB" Version="0.0.4-build32" /> + <PackageVersion Include="System.Drawing.Common" Version="8.0.1" /> <PackageVersion Include="System.IO.Hashing" Version="8.0.0" /> <PackageVersion Include="System.Management" Version="8.0.0" /> <PackageVersion Include="UnicornEngine.Unicorn" Version="2.0.2-rc1-fb78016" /> diff --git a/src/Ryujinx.Ava/Ryujinx.Ava.csproj b/src/Ryujinx.Ava/Ryujinx.Ava.csproj index 5d9767c8f..7f5224cfb 100644 --- a/src/Ryujinx.Ava/Ryujinx.Ava.csproj +++ b/src/Ryujinx.Ava/Ryujinx.Ava.csproj @@ -56,6 +56,9 @@ <PackageReference Include="SPB" /> <PackageReference Include="SharpZipLib" /> <PackageReference Include="SixLabors.ImageSharp" /> + + <!--NOTE: DO NOT REMOVE, THIS IS REQUIRED AS A RESULT OF A TRIMMING ISSUE IN AVALONIA --> + <PackageReference Include="System.Drawing.Common" /> </ItemGroup> <ItemGroup>