Merge pull request #157 from winnerspiros/fix-android-trimming-warnings-5084491518400624570

Fix AOT compilation and silence trimming warnings

Author: winnerspiros

osu.Android/Linker.xml

@@ -1,5 +1,5 @@
 <linker>
   <assembly fullname="System.Private.CoreLib">
-    <type fullname="System.Collections.Generic.PriorityQueue'2" preserve="all" />
+    <type fullname="System.Collections.Generic.PriorityQueue`2" preserve="all" />
   </assembly>
 </linker>

osu.Game/Online/SignalRUnionWorkaroundResolver.cs

@@ -4,6 +4,7 @@
 #nullable disable
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Collections.Generic;
 using System.Linq;
 using MessagePack;
@@ -23,6 +24,7 @@ public class SignalRUnionWorkaroundResolver : IFormatterResolver
 
         private static readonly IReadOnlyDictionary<Type, IMessagePackFormatter> formatter_map = createFormatterMap();
 
+        [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "SignalR workarounds")]
         private static IReadOnlyDictionary<Type, IMessagePackFormatter> createFormatterMap()
         {
             IEnumerable<(Type derivedType, Type baseType)> baseMap = SignalRWorkaroundTypes.BASE_TYPE_MAPPING;

osu.Game/Rulesets/Mods/IMod.cs

@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
@@ -82,6 +83,7 @@ public interface IMod : IEquatable<IMod>
         /// <summary>
         /// Create a fresh <see cref="Mod"/> instance based on this mod.
         /// </summary>
+        [UnconditionalSuppressMessage("Trimming", "IL2072", Justification = "Mods are annotated at the class level.")]
         Mod CreateInstance() => (Mod)Activator.CreateInstance(GetType())!;
 
         /// <summary>

osu.Game/Rulesets/Mods/Mod.cs

@@ -146,6 +146,7 @@ protected virtual LocalisableString GetSettingTooltipText(IBindable bindable)
         /// <summary>
         /// Creates a copy of this <see cref="Mod"/> initialised to a default state.
         /// </summary>
+        [UnconditionalSuppressMessage("Trimming", "IL2072", Justification = "Mods are annotated at the class level.")]
         public virtual Mod DeepClone()
         {
             var result = (Mod)Activator.CreateInstance(GetType())!;
@@ -260,6 +261,7 @@ public override int GetHashCode()
         /// <summary>
         /// Reset all custom settings for this mod back to their defaults.
         /// </summary>
+        [UnconditionalSuppressMessage("Trimming", "IL2072", Justification = "Mods are annotated at the class level.")]
         public virtual void ResetSettingsToDefaults() => CopyFrom((Mod)Activator.CreateInstance(GetType())!);
 
         private class ModSettingsEqualityComparer : IEqualityComparer<IBindable>

osu.Game/Screens/ScreenWhiteBox.cs

@@ -17,6 +17,7 @@
 using osu.Game.Screens.Backgrounds;
 using osuTK;
 using osuTK.Graphics;
+using System.Diagnostics.CodeAnalysis;
 
 namespace osu.Game.Screens
 {
@@ -54,6 +55,7 @@ public override void OnResuming(ScreenTransitionEvent e)
             this.FadeIn(transition_time, Easing.OutExpo);
         }
 
+        [UnconditionalSuppressMessage("Trimming", "IL2072", Justification = "Screens are manually validated to have parameterless constructors.")]
         public ScreenWhiteBox()
         {
             FillFlowContainer childModeButtons;

osu.Game/Screens/Select/ModSpeedHotkeyHandler.cs

@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using System.Diagnostics.CodeAnalysis;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -45,6 +46,7 @@ private void storeLastActiveRateAdjustMod()
             lastActiveRateAdjustMod = (ModRateAdjust?)selectedMods.Value.OfType<ModRateAdjust>().SingleOrDefault()?.DeepClone() ?? lastActiveRateAdjustMod;
         }
 
+        [UnconditionalSuppressMessage("Trimming", "IL2075", Justification = "Rate adjust mods have known properties.")]
         public bool ChangeSpeed(double delta, IEnumerable<Mod> availableMods)
         {
             double targetSpeed = (selectedMods.Value.OfType<ModRateAdjust>().SingleOrDefault()?.SpeedChange.Value ?? 1) + delta;

osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs

@@ -8,6 +8,7 @@
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 using NUnit.Framework;
@@ -28,6 +29,9 @@
 namespace osu.Game.Tests.Beatmaps
 {
     [TestFixture]
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Test class")]
+    [UnconditionalSuppressMessage("Trimming", "IL2072", Justification = "Test class")]
+    [UnconditionalSuppressMessage("Trimming", "IL2075", Justification = "Test class")]
     public abstract class BeatmapConversionTest<TConvertMapping, TConvertValue>
         where TConvertMapping : ConvertMapping<TConvertValue>, IEquatable<TConvertMapping>, new()
         where TConvertValue : IEquatable<TConvertValue>
@@ -250,6 +254,9 @@ protected override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap, Ru
         }
     }
 
+    [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Test class")]
+    [UnconditionalSuppressMessage("Trimming", "IL2072", Justification = "Test class")]
+    [UnconditionalSuppressMessage("Trimming", "IL2075", Justification = "Test class")]
     public abstract class BeatmapConversionTest<TConvertValue> : BeatmapConversionTest<ConvertMapping<TConvertValue>, TConvertValue>
         where TConvertValue : IEquatable<TConvertValue>
     {

osu.Game/Utils/BindableValueAccessor.cs

@@ -10,6 +10,7 @@
 
 namespace osu.Game.Utils
 {
+    [UnconditionalSuppressMessage("Trimming", "IL2075", Justification = "Internal methods are safe.")]
     internal static class BindableValueAccessor
     {
         private static readonly MethodInfo get_method = typeof(BindableValueAccessor).GetMethod(nameof(getValue), BindingFlags.Static | BindingFlags.NonPublic)!;

osu.Game/osu.Game.csproj

@@ -17,7 +17,11 @@
       <PackagePath>icon.png</PackagePath>
     </None>
   </ItemGroup>
-  <ItemGroup Label="Package References">
+    <PropertyGroup Condition="'$(Configuration)' == 'Release'">
+    <SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
+  </PropertyGroup>
+
+<ItemGroup Label="Package References">
     <!-- Held back due to licencing change stupidness. Silenced vulnerability does not affect us. -->
     <PackageReference Include="AutoMapper" Version="16.1.1">
       <NoWarn>NU1903</NoWarn>