diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 798813014..9d67ad071 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "ppy.localisationanalyser.tools": { - "version": "2022.607.0", + "version": "2022.809.0", "commands": [ "localisation" ] diff --git a/osu.Game.Rulesets.Karaoke.Tests/osu.Game.Rulesets.Karaoke.Tests.csproj b/osu.Game.Rulesets.Karaoke.Tests/osu.Game.Rulesets.Karaoke.Tests.csproj index 2436c15f6..2d55d75d6 100644 --- a/osu.Game.Rulesets.Karaoke.Tests/osu.Game.Rulesets.Karaoke.Tests.csproj +++ b/osu.Game.Rulesets.Karaoke.Tests/osu.Game.Rulesets.Karaoke.Tests.csproj @@ -13,7 +13,7 @@ - + diff --git a/osu.Game.Rulesets.Karaoke/Edit/ChangeHandlers/Singers/SingersChangeHandler.cs b/osu.Game.Rulesets.Karaoke/Edit/ChangeHandlers/Singers/SingersChangeHandler.cs index 8979d50c8..43c43e223 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/ChangeHandlers/Singers/SingersChangeHandler.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/ChangeHandlers/Singers/SingersChangeHandler.cs @@ -16,10 +16,10 @@ namespace osu.Game.Rulesets.Karaoke.Edit.ChangeHandlers.Singers { public class SingersChangeHandler : BeatmapPropertyChangeHandler, ISingersChangeHandler { - [Resolved(canBeNull: true)] + [Resolved] private BeatmapManager? beatmapManager { get; set; } - [Resolved(canBeNull: true)] + [Resolved] private IBindable? working { get; set; } public BindableList Singers => Items; diff --git a/osu.Game.Rulesets.Karaoke/Edit/Lyrics/LyricEditorClipboard.cs b/osu.Game.Rulesets.Karaoke/Edit/Lyrics/LyricEditorClipboard.cs index de1335c7a..3d20a9108 100644 --- a/osu.Game.Rulesets.Karaoke/Edit/Lyrics/LyricEditorClipboard.cs +++ b/osu.Game.Rulesets.Karaoke/Edit/Lyrics/LyricEditorClipboard.cs @@ -27,7 +27,7 @@ public class LyricEditorClipboard : Component, ILyricEditorClipboard [Resolved, AllowNull] private GameHost host { get; set; } - [Resolved(canBeNull: true)] + [Resolved] private OnScreenDisplay? onScreenDisplay { get; set; } [Resolved, AllowNull] diff --git a/osu.Game.Rulesets.Karaoke/Skinning/Legacy/LegacyKaraokeElement.cs b/osu.Game.Rulesets.Karaoke/Skinning/Legacy/LegacyKaraokeElement.cs index 0158e98cc..8a3f0e2e9 100644 --- a/osu.Game.Rulesets.Karaoke/Skinning/Legacy/LegacyKaraokeElement.cs +++ b/osu.Game.Rulesets.Karaoke/Skinning/Legacy/LegacyKaraokeElement.cs @@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Karaoke.Skinning.Legacy /// public class LegacyKaraokeElement : CompositeDrawable { - [Resolved(CanBeNull = true)] + [Resolved] protected KaraokePlayfield? Playfield { get; private set; } /// diff --git a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj index 9caf8a3a8..7841133da 100644 --- a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj +++ b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj @@ -11,14 +11,14 @@ - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - +