Merge pull request #6279 from Susko3/fix-xamarin-jetbrains-annotation…

…s-conflicts Fix `Xamarin.Jetbrains.Annotations` conflicting with `Jetbrains.Annotations`
ppy · May 7, 2024 · 004fae4 · 004fae4
2 parents 267129d + 375a879
commit 004fae4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/osu.Framework.Android/osu.Framework.Android.csproj b/osu.Framework.Android/osu.Framework.Android.csproj
@@ -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>