Merge pull request #2171 from andy840119/upgrade-package

Upgrade package to the latest.
karaoke-dev · Feb 19, 2024 · efa8e27 · efa8e27
2 parents 0a6d1b3 + 9a8f1b8
commit efa8e27
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 19 deletions.
diff --git 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"
       ]

diff --git 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 }}).

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
@@ -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" />
@@ -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/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
@@ -169,15 +169,15 @@ 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;
         }
 
         var result = HitObject.HitWindows.ResultFor(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
@@ -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>
@@ -11,18 +11,18 @@
     <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="osu.Framework.KaraokeFont" Version="2023.1214.0" />
-    <PackageReference Include="osu.Framework.Microphone" Version="2023.627.0" />
+    <PackageReference Include="Octokit" Version="9.1.2" />
+    <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>
     </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" />
-    <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" />