Merge pull request #165 from andy840119/update-pacakge

Update package and fix compile error.
karaoke-dev · Sep 11, 2020 · fba2779 · fba2779
2 parents 2f8769a + e1c1833
commit fba2779
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 12 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
@@ -14,7 +14,7 @@
   </PropertyGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />

diff --git a/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/PitchSettings.cs b/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/PitchSettings.cs
@@ -11,13 +11,12 @@ namespace osu.Game.Rulesets.Karaoke.UI.PlayerSettings
 {
     public class PitchSettings : PlayerSettingsGroup
     {
-        protected override string Title => "Pitch";
-
         private readonly ClickablePlayerSliderBar pitchSliderBar;
         private readonly ClickablePlayerSliderBar vocalPitchSliderBar;
         private readonly ClickablePlayerSliderBar saitenPitchSliderBar;
 
         public PitchSettings()
+            : base("Pitch")
         {
             Children = new Drawable[]
             {

diff --git a/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/PlaybackSettings.cs b/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/PlaybackSettings.cs
@@ -12,11 +12,10 @@ namespace osu.Game.Rulesets.Karaoke.UI.PlayerSettings
 {
     public class PlaybackSettings : PlayerSettingsGroup, IKeyBindingHandler<KaraokeAction>
     {
-        protected override string Title => "Playback";
-
         private readonly ClickablePlayerSliderBar playBackSliderBar;
 
         public PlaybackSettings()
+            : base("Playback")
         {
             Children = new Drawable[]
             {

diff --git a/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/PracticeSettings.cs b/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/PracticeSettings.cs
@@ -26,12 +26,11 @@ namespace osu.Game.Rulesets.Karaoke.UI.PlayerSettings
 {
     public class PracticeSettings : PlayerSettingsGroup, IKeyBindingHandler<KaraokeAction>
     {
-        protected override string Title => "Practice";
-
         private readonly PlayerSliderBar<double> preemptTimeSliderBar;
         private readonly LyricPreview lyricPreview;
 
         public PracticeSettings(IBeatmap beatmap)
+            : base("Practice")
         {
             var lyrics = beatmap.HitObjects.OfType<LyricLine>().ToList();
 

diff --git a/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/RubyRomajiSettings.cs b/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/RubyRomajiSettings.cs
@@ -10,12 +10,11 @@ namespace osu.Game.Rulesets.Karaoke.UI.PlayerSettings
 {
     public class RubyRomajiSettings : PlayerSettingsGroup
     {
-        protected override string Title => "Ruby/Romaji";
-
         private readonly PlayerCheckbox displayRubyCheckBox;
         private readonly PlayerCheckbox displayRomajiCheckBox;
 
         public RubyRomajiSettings()
+            : base("Ruby/Romaji")
         {
             Children = new Drawable[]
             {

diff --git a/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/TranslateSettings.cs b/osu.Game.Rulesets.Karaoke/UI/PlayerSettings/TranslateSettings.cs
@@ -13,13 +13,12 @@ namespace osu.Game.Rulesets.Karaoke.UI.PlayerSettings
 {
     public class TranslateSettings : PlayerSettingsGroup
     {
-        protected override string Title => "Translate";
-
         private readonly PlayerCheckbox translateCheckBox;
         private readonly OsuSpriteText translateText;
         private readonly OsuDropdown<string> translateDropDown;
 
         public TranslateSettings(PropertyDictionary dictionary)
+            : base("Translate")
         {
             Children = new Drawable[]
             {

diff --git a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
@@ -13,7 +13,7 @@
     <PackageReference Include="ILRepack.MSBuild.Task" Version="2.0.13" />
     <PackageReference Include="Octokit" Version="0.48.0" />
     <PackageReference Include="osu.Framework.Microphone" Version="1.0.10" />
-    <PackageReference Include="ppy.osu.Game" Version="2020.903.0" />
+    <PackageReference Include="ppy.osu.Game" Version="2020.910.0" />
     <PackageReference Include="LyricMaker" Version="1.1.1" />
     <PackageReference Include="NicoKaraParser" Version="1.1.0" />
     <PackageReference Include="osu.KaraokeFramework" Version="1.2.1" />