Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@ jobs:
dotnet-version: "10.0.x"

- name: Install .NET iOS workload
run: dotnet workload install ios
run: dotnet workload install ios --skip-manifest-update

- name: Authenticate to GitHub Packages
run: dotnet nuget update source winnerspiros-github --username ${{ github.actor }} --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text
Expand Down
3 changes: 3 additions & 0 deletions osu.Game.Tournament/Models/StableInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// See the LICENCE file in the repository root for full licence text.

using System;
using System.Diagnostics.CodeAnalysis;
using System.IO;
using Newtonsoft.Json;
using osu.Framework.Platform;
Expand Down Expand Up @@ -29,6 +30,7 @@ public class StableInfo

private readonly Storage configStorage;

[UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Tournament uses Newtonsoft.Json which is not subject to IL trimming in this context.")]
public StableInfo(TournamentStorage storage)
{
configStorage = storage.AllTournaments;
Expand All @@ -43,6 +45,7 @@ public StableInfo(TournamentStorage storage)
}
}

[UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Tournament uses Newtonsoft.Json which is not subject to IL trimming in this context.")]
public void SaveChanges()
{
using (var stream = configStorage.CreateFileSafely(config_path))
Expand Down
3 changes: 3 additions & 0 deletions osu.Game.Tournament/TournamentGameBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// See the LICENCE file in the repository root for full licence text.

using System;
using System.Diagnostics.CodeAnalysis;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
Expand Down Expand Up @@ -97,6 +98,7 @@ protected override void LoadComplete()
Task.Run(readBracket);
}

[UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Tournament uses Newtonsoft.Json which is not subject to IL trimming in this context.")]
private async Task readBracket()
{
try
Expand Down Expand Up @@ -348,6 +350,7 @@ private void saveChanges()
sw.Write(serialisedLadder);
}

[UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Tournament uses Newtonsoft.Json which is not subject to IL trimming in this context.")]
public string GetSerialisedLadder()
{
foreach (var r in ladder.Rounds)
Expand Down
2 changes: 2 additions & 0 deletions osu.Game/Overlays/WizardOverlay.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using osu.Framework.Allocation;
using osu.Framework.Extensions;
using osu.Framework.Graphics;
Expand Down Expand Up @@ -200,6 +201,7 @@ private void showFirstStep()
ShowNextStep();
}

[UnconditionalSuppressMessage("Trimming", "IL2072", Justification = "Step types are always WizardScreen subtypes with parameterless constructors.")]
protected virtual void ShowNextStep()
{
Debug.Assert(CurrentStepIndex != null);
Expand Down
2 changes: 2 additions & 0 deletions osu.Game/Rulesets/Mods/IMod.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 = "Concrete mod types always have parameterless constructors.")]
Mod CreateInstance() => (Mod)Activator.CreateInstance(GetType())!;

/// <summary>
Expand Down
2 changes: 2 additions & 0 deletions osu.Game/Rulesets/RealmRulesetStore.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using System.IO;
using System.Linq;
using osu.Framework.Extensions.ObjectExtensions;
Expand All @@ -29,6 +30,7 @@ public RealmRulesetStore(RealmAccess realmAccess, Storage? storage = null)
informUserAboutBrokenRulesets();
}

[UnconditionalSuppressMessage("Trimming", "IL2057", Justification = "InstantiationInfo is a trusted ruleset type name from loaded assemblies.")]
private void prepareDetachedRulesets()
{
realmAccess.Write(realm =>
Expand Down
2 changes: 2 additions & 0 deletions osu.Game/Rulesets/RulesetInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// See the LICENCE file in the repository root for full licence text.

using System;
using System.Diagnostics.CodeAnalysis;
using JetBrains.Annotations;
using osu.Game.Rulesets.Difficulty;
using Realms;
Expand Down Expand Up @@ -94,6 +95,7 @@ public override int GetHashCode()
LastAppliedDifficultyVersion = LastAppliedDifficultyVersion,
};

[UnconditionalSuppressMessage("Trimming", "IL2057", Justification = "InstantiationInfo is a trusted ruleset type name from loaded assemblies.")]
public Ruleset CreateInstance()
{
if (!Available)
Expand Down
2 changes: 2 additions & 0 deletions osu.Game/Screens/ScreenWhiteBox.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
Expand Down Expand Up @@ -52,6 +53,7 @@ public override void OnResuming(ScreenTransitionEvent e)
this.FadeIn(transition_time, Easing.OutExpo);
}

[UnconditionalSuppressMessage("Trimming", "IL2072", Justification = "PossibleChildren types always have parameterless constructors.")]
public ScreenWhiteBox()
{
FillFlowContainer childModeButtons;
Expand Down
2 changes: 2 additions & 0 deletions osu.Game/Screens/Select/ModSpeedHotkeyHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// See the LICENCE file in the repository root for full licence text.

using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
Expand Down Expand Up @@ -45,6 +46,7 @@ private void storeLastActiveRateAdjustMod()
lastActiveRateAdjustMod = (ModRateAdjust?)selectedMods.Value.OfType<ModRateAdjust>().SingleOrDefault()?.DeepClone() ?? lastActiveRateAdjustMod;
}

[UnconditionalSuppressMessage("Trimming", "IL2075", Justification = "ModRateAdjust property names are stable and will not be trimmed.")]
public bool ChangeSpeed(double delta, IEnumerable<Mod> availableMods)
{
double targetSpeed = (selectedMods.Value.OfType<ModRateAdjust>().SingleOrDefault()?.SpeedChange.Value ?? 1) + delta;
Expand Down
2 changes: 2 additions & 0 deletions osu.Game/Skinning/SerialisedDrawableInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using Newtonsoft.Json;
using osu.Framework.Bindables;
Expand All @@ -27,6 +28,7 @@ namespace osu.Game.Skinning
[Serializable]
public sealed class SerialisedDrawableInfo
{
[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]
public Type Type { get; set; } = null!;

public Vector2 Position { get; set; }
Expand Down
2 changes: 2 additions & 0 deletions osu.Game/Skinning/SkinInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using JetBrains.Annotations;
using Newtonsoft.Json;
using osu.Game.Database;
Expand Down Expand Up @@ -40,6 +41,7 @@ public class SkinInfo : RealmObject, IHasRealmFiles, IEquatable<SkinInfo>, IHasG

public bool Protected { get; set; }

[UnconditionalSuppressMessage("Trimming", "IL2057", Justification = "InstantiationInfo is a trusted skin type name set from known skin types.")]
public virtual Skin CreateInstance(IStorageResourceProvider resources)
{
var type = string.IsNullOrEmpty(InstantiationInfo)
Expand Down
Loading