Skip to content

Commit

Permalink
Fix Xamarin.Jetbrains.Annotations conflicting with `Jetbrains.Annot…
Browse files Browse the repository at this point in the history
…ations`

This conflict was most noticeable when using `[NotNull]` in osu!
ppy/osu@9c22fa3

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: xamarin/AndroidX#885
  • Loading branch information
Susko3 committed May 7, 2024
1 parent 267129d commit 375a879
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion osu.Framework.Android/osu.Framework.Android.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="ppy.SDL3-CS.Android" Version="2024.418.1" />
<PackageReference Include="Xamarin.AndroidX.Window" Version="1.2.0.1" />
<PackageReference Include="Xamarin.AndroidX.Window" Version="1.2.0.1" PrivateAssets="compile" />
</ItemGroup>
</Project>

0 comments on commit 375a879

Please sign in to comment.