Fix Xamarin.Jetbrains.Annotations
conflicting with Jetbrains.Annotations
#6279
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This conflict was most noticeable when using
[NotNull]
in osu! ppy/osu@9c22fa3.This doesn't fix the conflict in
osu.Framework.Android
, but it does fix it for downstream projects. If a fix is needed for o!f,PackageReference
Aliases
can be used.I've tested osu! with a local framework checkout and with a local package, and it works fine without the workaround.
Xamarin.Jetbrains.Annotations
namespace clash withJetBrains.Annotations
causes CS0433 build failure dotnet/android-libraries#885The namespace conflict can be tested with this diff (compile error on
master
, works fine with this PR):