From 7265825430fb8c57d97bdd60ac841d1b111f3376 Mon Sep 17 00:00:00 2001
From: andy840119 <andy840119@gmail.com>
Date: Wed, 10 Aug 2022 21:09:48 +0800
Subject: [PATCH 1/3] Update osu.game to the latest. Not really sure what is
 fixed but just upgrade.

---
 osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
index 9caf8a3a8..fec39e2d9 100644
--- a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
+++ b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
@@ -18,7 +18,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="ppy.osu.Game" Version="2022.810.0" />
+    <PackageReference Include="ppy.osu.Game" Version="2022.810.2" />
     <PackageReference Include="Lucene.Net" Version="4.8.0-beta00016" />
     <PackageReference Include="Lucene.Net.Analysis.Kuromoji" Version="4.8.0-beta00016" />
     <PackageReference Include="NicoKaraParser" Version="1.1.0" />

From 4b1e659d6de80496add6f36b512eef0db9b6cbe0 Mon Sep 17 00:00:00 2001
From: andy840119 <andy840119@gmail.com>
Date: Wed, 10 Aug 2022 21:13:16 +0800
Subject: [PATCH 2/3] Upgrade the Localization Analyser package to the latest.
 And remove the "CanBeNull" params because there's no need to fill this in the
 enable NTR file.

---
 .config/dotnet-tools.json                                     | 2 +-
 .../Edit/ChangeHandlers/Singers/SingersChangeHandler.cs       | 4 ++--
 osu.Game.Rulesets.Karaoke/Edit/Lyrics/LyricEditorClipboard.cs | 2 +-
 .../Skinning/Legacy/LegacyKaraokeElement.cs                   | 2 +-
 osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

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/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<Singer>, ISingersChangeHandler
     {
-        [Resolved(canBeNull: true)]
+        [Resolved]
         private BeatmapManager? beatmapManager { get; set; }
 
-        [Resolved(canBeNull: true)]
+        [Resolved]
         private IBindable<WorkingBeatmap>? working { get; set; }
 
         public BindableList<Singer> 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
     /// </summary>
     public class LegacyKaraokeElement : CompositeDrawable
     {
-        [Resolved(CanBeNull = true)]
+        [Resolved]
         protected KaraokePlayfield? Playfield { get; private set; }
 
         /// <summary>
diff --git a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
index fec39e2d9..f804069fe 100644
--- a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
+++ b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
@@ -14,7 +14,7 @@
     <PackageReference Include="Octokit" Version="1.0.0" />
     <PackageReference Include="osu.Framework.KaraokeFont" Version="2022.806.0" />
     <PackageReference Include="osu.Framework.Microphone" Version="2022.806.0" />
-    <PackageReference Include="ppy.LocalisationAnalyser" Version="2022.607.0">
+    <PackageReference Include="ppy.LocalisationAnalyser" Version="2022.809.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

From e7b1b42d3e3d3fcf559f88cee93e9cb5c20d8206 Mon Sep 17 00:00:00 2001
From: andy840119 <andy840119@gmail.com>
Date: Wed, 10 Aug 2022 21:14:27 +0800
Subject: [PATCH 3/3] Upgrade the remaining package to the latest.

---
 .../osu.Game.Rulesets.Karaoke.Tests.csproj                      | 2 +-
 osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 @@
   </PropertyGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
diff --git a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
index f804069fe..7841133da 100644
--- a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
+++ b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
@@ -11,7 +11,7 @@
     <PackageReference Include="osu.Game.Rulesets.Karaoke.Resources" Version="2022.611.0" />
     <PackageReference Include="LanguageDetection.karaoke-dev" Version="1.3.3-alpha" />
     <PackageReference Include="LrcParser" Version="2022.529.1" />
-    <PackageReference Include="Octokit" Version="1.0.0" />
+    <PackageReference Include="Octokit" Version="2.0.0" />
     <PackageReference Include="osu.Framework.KaraokeFont" Version="2022.806.0" />
     <PackageReference Include="osu.Framework.Microphone" Version="2022.806.0" />
     <PackageReference Include="ppy.LocalisationAnalyser" Version="2022.809.0">