Merge pull request #361 from winnerspiros/copilot/merge-ppy-commit-fix-build-errors

fix: resolve three CI build/quality errors

Author: winnerspiros

.github/workflows/release.yml

@@ -598,8 +598,6 @@ jobs:
           -p:BuildIpa=false
           -p:CodesignKey=""
           -p:CodesignProvision=""
-          -p:ServerGarbageCollection=true
-          -p:ConcurrentGarbageCollection=true
 
       - name: Package iOS build
         run: |

osu.Desktop/DiscordRichPresence.cs

@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Text;
 using DiscordRPC;
 using DiscordRPC.Message;
@@ -27,6 +28,7 @@
 
 namespace osu.Desktop
 {
+    [RequiresUnreferencedCode("Newtonsoft.Json relies on reflection over types that may be removed when trimming.")]
     internal partial class DiscordRichPresence : Component
     {
         private const string client_id = "1216669957799018608";

osu.Desktop/LegacyIpc/LegacyTcpIpcProvider.cs

@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Newtonsoft.Json.Linq;
 using osu.Framework.Logging;
@@ -20,6 +21,7 @@ namespace osu.Desktop.LegacyIpc
     /// <summary>
     /// Provides IPC to legacy osu! clients.
     /// </summary>
+    [RequiresUnreferencedCode("Newtonsoft.Json relies on reflection over types that may be removed when trimming.")]
     public class LegacyTcpIpcProvider : TcpIpcProvider
     {
         private static readonly Logger logger = Logger.GetLogger("legacy-ipc");

osu.Desktop/MacOS/MacOSAppLocationChecker.cs

@@ -3,7 +3,6 @@
 
 using System;
 using System.IO;
-using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
@@ -26,7 +25,7 @@ protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            string assemblyPath = RuntimeInfo.EntryAssembly.Location;
+            string assemblyPath = AppContext.BaseDirectory;
 
             bool inRootApp = assemblyPath.StartsWith("/Applications/", StringComparison.Ordinal);
             bool inUserApp = assemblyPath.StartsWith(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Applications/"), StringComparison.Ordinal);

osu.Desktop/Windows/Icons.cs

@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.IO;
 
 namespace osu.Desktop.Windows
@@ -10,7 +11,7 @@ public static class Icons
         /// <summary>
         /// Fully qualified path to the directory that contains icons (in the installation folder).
         /// </summary>
-        private static readonly string icon_directory = Path.GetDirectoryName(typeof(Icons).Assembly.Location)!;
+        private static readonly string icon_directory = AppContext.BaseDirectory;
 
         public static string Lazer => Path.Join(icon_directory, "lazer.ico");
 

osu.Desktop/Windows/WindowsAssociationManager.cs

@@ -31,7 +31,7 @@ public static class WindowsAssociationManager
         /// </summary>
         internal const string SHELL_OPEN_COMMAND = @"Shell\Open\Command";
 
-        private static readonly string exe_path = Path.ChangeExtension(typeof(WindowsAssociationManager).Assembly.Location, ".exe").Replace('/', '\\');
+        private static readonly string exe_path = Path.Combine(AppContext.BaseDirectory, Path.ChangeExtension(AppDomain.CurrentDomain.FriendlyName, ".exe")).Replace('/', '\\');
 
         /// <summary>
         /// Program ID prefix used for file associations. Should be relatively short since the full program ID has a 39 character limit,

osu.Desktop/Windows/WindowsKey.cs

@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 
 // ReSharper disable IdentifierTypo
@@ -47,6 +48,7 @@ private static int lowLevelKeyboardProc(int nCode, int wParam, ref KdDllHookStru
             return callNextHookEx(0, nCode, wParam, ref lParam);
         }
 
+        [RequiresAssemblyFiles("Uses Marshal.GetHINSTANCE which requires the assembly to be loaded from disk.")]
         internal static void Disable()
         {
             if (keyHook != IntPtr.Zero || isBlocked)

osu.Game.Benchmarks/BenchmarkScoreMultiplierCalculator.cs

@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using BenchmarkDotNet.Attributes;
 using NUnit.Framework;
+using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
@@ -42,7 +43,7 @@ public record ModTestCase(string Description, IEnumerable<Mod> Mods)
         public override void SetUp()
         {
             base.SetUp();
-            calculator = new OsuRuleset().CreateScoreMultiplierCalculator(new ScoreMultiplierContext());
+            calculator = new OsuRuleset().CreateScoreMultiplierCalculator(new ScoreMultiplierContext(new BeatmapDifficulty()));
         }
 
         [Benchmark]

osu.Game.Rulesets.Mania.Tests/ManiaScoreMultiplierTest.cs

@@ -4,6 +4,7 @@
 using System;
 using NUnit.Framework;
 using osu.Framework.Utils;
+using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mania.Mods;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
@@ -212,7 +213,7 @@ [new DateTimeOffset(2026, 7, 18, 0, 20, 15, 0, TimeSpan.Zero), "2026.522.1-tachy
         [TestCaseSource(nameof(key_mod_multiplier_test_cases))]
         public void TestKeyModMultiplierCompatibility(DateTimeOffset endDate, string clientVersion, double expectedMultiplier)
         {
-            var calculator = Ruleset.CreateScoreMultiplierCalculator(new ScoreMultiplierContext(new ScoreInfo
+            var calculator = Ruleset.CreateScoreMultiplierCalculator(new ScoreMultiplierContext(new BeatmapDifficulty(), new ScoreInfo
             {
                 Date = endDate,
                 ClientVersion = clientVersion

osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModDoubleTime.cs

@@ -56,7 +56,7 @@ public void TestHitWindowWithDoubleTime()
                 Mod = doubleTime,
                 PassCondition = () => Player.ScoreProcessor.JudgedHits > 0
                                       && Player.ScoreProcessor.Accuracy.Value == 1
-                                      && Player.ScoreProcessor.TotalScore.Value == (long)(1_000_000 * new ManiaScoreMultiplierCalculator(new ScoreMultiplierContext()).CalculateFor([doubleTime])),
+                                      && Player.ScoreProcessor.TotalScore.Value == (long)(1_000_000 * new ManiaScoreMultiplierCalculator(new ScoreMultiplierContext(new BeatmapDifficulty())).CalculateFor([doubleTime])),
                 Autoplay = false,
                 CreateBeatmap = () => new Beatmap
                 {