From 375a879831c4f29c454835361fd647737dccfe73 Mon Sep 17 00:00:00 2001 From: Susko3 Date: Tue, 7 May 2024 03:33:13 +0200 Subject: [PATCH] Fix `Xamarin.Jetbrains.Annotations` conflicting with `Jetbrains.Annotations` This conflict was most noticeable when using `[NotNull]` in osu! https://github.com/ppy/osu/commit/9c22fa3a9fbae0fb568e5a7b36d4c688268add3a This doesn't fix the conflict in o!f.Android, but it does fix it for downstream projects. If a fix is needed for o!f, PackageReference Aliases can be used. More info: https://github.com/xamarin/AndroidX/issues/885 --- osu.Framework.Android/osu.Framework.Android.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Framework.Android/osu.Framework.Android.csproj b/osu.Framework.Android/osu.Framework.Android.csproj index cae14b3718..7b03812463 100644 --- a/osu.Framework.Android/osu.Framework.Android.csproj +++ b/osu.Framework.Android/osu.Framework.Android.csproj @@ -19,6 +19,6 @@ - +