Merge pull request #2149 from andy840119/upgrade-package-to-latest

Upgrade package to latest.
karaoke-dev · Nov 29, 2023 · 710199c · 710199c
2 parents e14f80c + d65ac80
commit 710199c
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 17 deletions.
diff --git a/osu.Game.Rulesets.Karaoke.Tests/Ranking/TestSceneHitEventTimingDistributionGraph.cs b/osu.Game.Rulesets.Karaoke.Tests/Ranking/TestSceneHitEventTimingDistributionGraph.cs
@@ -27,7 +27,7 @@ public void TestManyDistributedEvents()
     [Test]
     public void TestZeroTimeOffset()
     {
-        createTest(Enumerable.Range(0, 100).Select(_ => new HitEvent(0, HitResult.Perfect, new Note(), new Note(), null)).ToList());
+        createTest(Enumerable.Range(0, 100).Select(_ => new HitEvent(0, 1.0, HitResult.Perfect, new Note(), new Note(), null)).ToList());
     }
 
     [Test]
@@ -63,7 +63,7 @@ public static List<HitEvent> CreateDistributedHitEvents()
             int count = (int)Math.Pow(25 - Math.Abs(i - 25), 2);
 
             for (int j = 0; j < count; j++)
-                hitEvents.Add(new HitEvent(i - 25, HitResult.Perfect, new Note(), new Note(), null));
+                hitEvents.Add(new HitEvent(i - 25, 1.0, HitResult.Perfect, new Note(), new Note(), null));
         }
 
         return hitEvents;

diff --git a/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/TestSceneEditorMenuBar.cs b/osu.Game.Rulesets.Karaoke.Tests/Screens/Edit/Beatmap/TestSceneEditorMenuBar.cs
@@ -46,7 +46,7 @@ private void load()
                         {
                             new ImportLyricMenu(null, "Import from text", null!),
                             new ImportLyricMenu(null, "Import from .lrc file", null!),
-                            new EditorMenuItemSpacer(),
+                            new OsuMenuItemSpacer(),
                             new EditorMenuItem("Export to .lrc", MenuItemType.Standard, () => { }),
                             new EditorMenuItem("Export to text", MenuItemType.Standard, () => { }),
                             new EditorMenuItem("Export to json", MenuItemType.Destructive, () => { }),

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.7.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />

diff --git a/osu.Game.Rulesets.Karaoke/Overlays/Changelog/ChangeLogMarkdownContainer.cs b/osu.Game.Rulesets.Karaoke/Overlays/Changelog/ChangeLogMarkdownContainer.cs
@@ -9,7 +9,6 @@
 using Markdig.Syntax.Inlines;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers.Markdown;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Layout;
 using osu.Game.Graphics;
@@ -39,7 +38,7 @@ public ChangeLogMarkdownContainer(APIChangelogBuild build)
         }
     }
 
-    public override MarkdownTextFlowContainer CreateTextFlow() => new ChangeLogMarkdownTextFlowContainer();
+    public override OsuMarkdownTextFlowContainer CreateTextFlow() => new ChangeLogMarkdownTextFlowContainer();
 
     public override SpriteText CreateSpriteText() => base.CreateSpriteText().With(s =>
     {

diff --git a/osu.Game.Rulesets.Karaoke/Overlays/Changelog/ChangelogHeader.cs b/osu.Game.Rulesets.Karaoke/Overlays/Changelog/ChangelogHeader.cs
@@ -4,6 +4,7 @@
 using System;
 using osu.Framework.Bindables;
 using osu.Framework.Localisation;
+using osu.Game.Graphics;
 using osu.Game.Localisation;
 using osu.Game.Overlays;
 using osu.Game.Resources.Localisation.Web;
@@ -57,7 +58,7 @@ public ChangelogHeaderTitle()
         {
             Title = PageTitleStrings.MainChangelogControllerDefault;
             Description = NamedOverlayComponentStrings.ChangelogDescription;
-            IconTexture = "Icons/Hexacons/devtools";
+            Icon = HexaconsIcons.Devtools;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Karaoke/Replays/KaraokeAutoGeneratorBySinger.cs b/osu.Game.Rulesets.Karaoke/Replays/KaraokeAutoGeneratorBySinger.cs
@@ -51,11 +51,13 @@ public KaraokeAutoGeneratorBySinger(IBeatmap beatmap, Stream? data)
             long length = totalLength;
             long lengthSum = 0;
 
+            const int bytes_per_sample = 4;
+
             // Microphone at period 10
-            int bytesPerIteration = 3276 * info.Channels * TrackBass.BYTES_PER_SAMPLE;
+            int bytesPerIteration = 3276 * info.Channels * bytes_per_sample;
 
             var pitches = new Dictionary<double, float?>();
-            float[] sampleBuffer = new float[bytesPerIteration / TrackBass.BYTES_PER_SAMPLE];
+            float[] sampleBuffer = new float[bytesPerIteration / bytes_per_sample];
 
             // Read sample data
             while (length > 0)

diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/KaraokeBeatmapEditor.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/KaraokeBeatmapEditor.cs
@@ -95,7 +95,7 @@ protected override MenuItem[] GenerateMenuItems(KaraokeBeatmapEditorScreenMode s
                     {
                         new ImportLyricMenu(this, "Import from text", importBeatmapChangeHandler),
                         new ImportLyricMenu(this, "Import from .lrc file", importBeatmapChangeHandler),
-                        new EditorMenuItemSpacer(),
+                        new OsuMenuItemSpacer(),
                         new EditorMenuItem("Export to .lrc", MenuItemType.Standard, () => exportLyricManager.ExportToLrc()),
                         new EditorMenuItem("Export to text", MenuItemType.Standard, () => exportLyricManager.ExportToText()),
                         new EditorMenuItem("Export to json", MenuItemType.Destructive, () => exportLyricManager.ExportToJson()),

diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Pages/PageScreen.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Pages/PageScreen.cs
@@ -5,6 +5,7 @@
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Overlays;
 using osu.Game.Rulesets.Karaoke.Beatmaps.Metadatas;
@@ -119,7 +120,7 @@ public PageScreenTitle()
             {
                 Title = "page";
                 Description = "create page of your beatmap";
-                IconTexture = "Icons/Hexacons/social";
+                Icon = HexaconsIcons.Social;
             }
         }
     }

diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/SingerScreen.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/SingerScreen.cs
@@ -5,6 +5,7 @@
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Overlays;
 using osu.Game.Rulesets.Karaoke.Edit.ChangeHandlers.Beatmaps;
@@ -108,7 +109,7 @@ public SingerScreenTitle()
             {
                 Title = "singer";
                 Description = "create singer of your beatmap";
-                IconTexture = "Icons/Hexacons/social";
+                Icon = HexaconsIcons.Social;
             }
         }
     }

diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Translate/TranslateScreen.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Translate/TranslateScreen.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Overlays;
 using osu.Game.Rulesets.Karaoke.Edit.ChangeHandlers.Beatmaps;
@@ -54,7 +55,7 @@ public TranslateScreenTitle()
             {
                 Title = "translate";
                 Description = "create translation of your beatmap";
-                IconTexture = "Icons/Hexacons/social";
+                Icon = HexaconsIcons.Social;
             }
         }
     }

diff --git a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
@@ -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="8.1.1" />
+    <PackageReference Include="Octokit" Version="9.0.0" />
     <PackageReference Include="osu.Framework.KaraokeFont" Version="2023.1007.0" />
     <PackageReference Include="osu.Framework.Microphone" Version="2023.627.0" />
-    <PackageReference Include="ppy.LocalisationAnalyser" Version="2023.712.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="2023.1026.0" />
+    <PackageReference Include="ppy.osu.Game" Version="2023.1128.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.0" />
-    <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.0.0" />
+    <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.0.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" />