From 131d5161a8c544dd59cbe1db38784da3a2484ace Mon Sep 17 00:00:00 2001
From: andy840119 <andy840119@gmail.com>
Date: Mon, 19 Feb 2024 22:59:50 +0800
Subject: [PATCH 1/8] Change the .net version to 8.0

---
 .../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 11222a504..b136d1103 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
@@ -27,6 +27,6 @@
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
     <RootNamespace>osu.Game.Rulesets.Karaoke.Tests</RootNamespace>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 </Project>
diff --git a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
index f8c98a18c..f0575119a 100644
--- a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
+++ b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup Label="Project">
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyTitle>osu.Game.Rulesets.Karaoke</AssemblyTitle>
     <OutputType>Library</OutputType>
     <PlatformTarget>AnyCPU</PlatformTarget>

From d13149a884c3f0474a655a560c9a1216a9f4ae6e Mon Sep 17 00:00:00 2001
From: andy840119 <andy840119@gmail.com>
Date: Mon, 19 Feb 2024 23:10:23 +0800
Subject: [PATCH 2/8] Upgrade the osu.game to the latest and fix the api
 breaking change caused in the https://github.com/ppy/osu/pull/26694

---
 osu.Game.Rulesets.Karaoke/Objects/Drawables/DrawableLyric.cs | 2 +-
 osu.Game.Rulesets.Karaoke/Objects/Drawables/DrawableNote.cs  | 4 ++--
 osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Karaoke/Objects/Drawables/DrawableLyric.cs b/osu.Game.Rulesets.Karaoke/Objects/Drawables/DrawableLyric.cs
index be9f72e8d..58a7be7f9 100644
--- a/osu.Game.Rulesets.Karaoke/Objects/Drawables/DrawableLyric.cs
+++ b/osu.Game.Rulesets.Karaoke/Objects/Drawables/DrawableLyric.cs
@@ -202,7 +202,7 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
             OnLyricEnd?.Invoke(this);
 
             // Apply end hit result
-            ApplyResult(r => { r.Type = KaraokeLyricHitWindows.DEFAULT_HIT_RESULT; });
+            ApplyResult(KaraokeLyricHitWindows.DEFAULT_HIT_RESULT);
         }
     }
 
diff --git a/osu.Game.Rulesets.Karaoke/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Karaoke/Objects/Drawables/DrawableNote.cs
index d7c085c91..0fd587855 100644
--- a/osu.Game.Rulesets.Karaoke/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Karaoke/Objects/Drawables/DrawableNote.cs
@@ -169,7 +169,7 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
         if (!userTriggered)
         {
             if (!HitObject.HitWindows.CanBeHit(timeOffset))
-                ApplyResult(r => r.Type = HitResult.Miss);
+                ApplyResult(HitResult.Miss);
             return;
         }
 
@@ -177,7 +177,7 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
         if (result == HitResult.None)
             return;
 
-        ApplyResult(r => r.Type = result);
+        ApplyResult(result);
     }
 
     public bool OnPressed(KeyBindingPressEvent<KaraokeScoringAction> e)
diff --git a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
index f0575119a..00742d740 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="2024.130.2" />
+    <PackageReference Include="ppy.osu.Game" Version="2024.219.0" />
     <PackageReference Include="Lucene.Net" Version="4.8.0-beta00016" />
     <PackageReference Include="Lucene.Net.Analysis.Kuromoji" Version="4.8.0-beta00016" />
     <PackageReference Include="SixLabors.Fonts" Version="2.0.1" />

From 9524ee6a833c02b161433f14893a32c04e25cc8c Mon Sep 17 00:00:00 2001
From: andy840119 <andy840119@gmail.com>
Date: Mon, 19 Feb 2024 23:18:33 +0800
Subject: [PATCH 3/8] Upgrade octokit.

---
 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 00742d740..ddff2bf9a 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="2023.524.0" />
-    <PackageReference Include="Octokit" Version="9.0.0" />
+    <PackageReference Include="Octokit" Version="9.1.2" />
     <PackageReference Include="osu.Framework.KaraokeFont" Version="2023.1214.0" />
     <PackageReference Include="osu.Framework.Microphone" Version="2023.627.0" />
     <PackageReference Include="ppy.LocalisationAnalyser" Version="2023.1117.0">

From f4dd3c49e9e62a6fad7febd84b10722b07d86288 Mon Sep 17 00:00:00 2001
From: andy840119 <andy840119@gmail.com>
Date: Mon, 19 Feb 2024 23:22:47 +0800
Subject: [PATCH 4/8] Upgrade the font-related package and seems there's no
 breaking change.

---
 osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
index ddff2bf9a..8561dace0 100644
--- a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
+++ b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
@@ -21,8 +21,8 @@
     <PackageReference Include="ppy.osu.Game" Version="2024.219.0" />
     <PackageReference Include="Lucene.Net" Version="4.8.0-beta00016" />
     <PackageReference Include="Lucene.Net.Analysis.Kuromoji" Version="4.8.0-beta00016" />
-    <PackageReference Include="SixLabors.Fonts" Version="2.0.1" />
-    <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.0.1" />
+    <PackageReference Include="SixLabors.Fonts" Version="2.0.2" />
+    <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.1" />
     <!--install because it might cause "Could not load file or assembly" error, might be removed eventually-->
     <PackageReference Include="System.Text.Encodings.Web" Version="7.0.0" />
     <PackageReference Include="WanaKanaSharp" Version="0.2.0" />

From 8393674fd3379fc6593f37c2ac485d4d375ca242 Mon Sep 17 00:00:00 2001
From: andy840119 <andy840119@gmail.com>
Date: Mon, 19 Feb 2024 23:23:30 +0800
Subject: [PATCH 5/8] Upgrade the test SDK.

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

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 b136d1103..c1d48f9af 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.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />

From 652e76288b140acf525e24dbb093baa530b1dfcd Mon Sep 17 00:00:00 2001
From: andy840119 <andy840119@gmail.com>
Date: Tue, 20 Feb 2024 00:53:26 +0800
Subject: [PATCH 6/8] Upgrade framework-related package to the latest.

---
 osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
index 8561dace0..c1a64f5c1 100644
--- a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
+++ b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
@@ -12,8 +12,8 @@
     <PackageReference Include="LanguageDetection.karaoke-dev" Version="1.3.3-alpha" />
     <PackageReference Include="LrcParser" Version="2023.524.0" />
     <PackageReference Include="Octokit" Version="9.1.2" />
-    <PackageReference Include="osu.Framework.KaraokeFont" Version="2023.1214.0" />
-    <PackageReference Include="osu.Framework.Microphone" Version="2023.627.0" />
+    <PackageReference Include="osu.Framework.KaraokeFont" Version="2024.219.0" />
+    <PackageReference Include="osu.Framework.Microphone" Version="2024.219.0" />
     <PackageReference Include="ppy.LocalisationAnalyser" Version="2023.1117.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

From 77483c45b8262932b7e8eadcbacfa03ae705d663 Mon Sep 17 00:00:00 2001
From: andy <andy840119@gmail.com>
Date: Tue, 20 Feb 2024 00:57:12 +0800
Subject: [PATCH 7/8] Update release.yml

Upgrade the .net version to 8.0
---
 .github/workflows/release.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 406e9a9cf..aadb2d6b3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,10 +11,10 @@ jobs:
     steps:
     - name: Checkout repository
       uses: actions/checkout@v2
-    - name: Setup dotnet version
-      uses: actions/setup-dotnet@v1
+    - name: Setup .NET 8.0.x
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '6.0.x' # SDK Version to use.
+        dotnet-version: "8.0.x"
     - name: Fetch all tags
       run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
     - name: Get current tag
@@ -34,15 +34,15 @@ jobs:
         release_name: ${{ github.ref }}
     - name: Zip the dlls
       run: |
-        cd osu.Game.Rulesets.Karaoke/bin/Release/net6.0/DLLs
+        cd osu.Game.Rulesets.Karaoke/bin/Release/net8.0/DLLs
         zip -r ../osu.Game.Rulesets.Karaoke.zip ./*
     - name: Upload Release Asset
       uses: softprops/action-gh-release@v1
       with:
         token: ${{ secrets.RELEASE_TOKEN }}
         files: |
-          osu.Game.Rulesets.Karaoke/bin/Release/net6.0/Packed/osu.Game.Rulesets.Karaoke.dll
-          osu.Game.Rulesets.Karaoke/bin/Release/net6.0/osu.Game.Rulesets.Karaoke.zip
+          osu.Game.Rulesets.Karaoke/bin/Release/net8.0/Packed/osu.Game.Rulesets.Karaoke.dll
+          osu.Game.Rulesets.Karaoke/bin/Release/net8.0/osu.Game.Rulesets.Karaoke.zip
         draft: true
         body: |
           Thank you for showing interest in this ruleset. This is a tagged release (${{ env.CURRENT_TAG }}).

From 9a8f1b8e456bea813c64641ed848d37756b3bfc8 Mon Sep 17 00:00:00 2001
From: andy840119 <andy840119@gmail.com>
Date: Tue, 20 Feb 2024 00:58:54 +0800
Subject: [PATCH 8/8] Upgrade the tool.

---
 .config/dotnet-tools.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 9d67ad071..a1736e4c7 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "ppy.localisationanalyser.tools": {
-      "version": "2022.809.0",
+      "version": "2023.1117.0",
       "commands": [
         "localisation"
       ]