Merge pull request #1124 from andy840119/update-nuget-package

Update nuget package
karaoke-dev · Feb 16, 2022 · 439a022 · 439a022
2 parents 4ce7e03 + d0f64ee
commit 439a022
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 14 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -15,7 +15,7 @@
   <ItemGroup Label="Code Analysis">
     <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.3" PrivateAssets="All" />
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)CodeAnalysis\BannedSymbols.txt" />
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.3" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0" PrivateAssets="All" />
   </ItemGroup>
   <PropertyGroup Label="Code Analysis">
     <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CodeAnalysis\osu.ruleset</CodeAnalysisRuleSet>

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,6 +1,6 @@
 clone_depth: 1
 version: '{branch}-{build}'
-image: Visual Studio 2019
+image: Visual Studio 2022
 branches:
   only:
     - master

diff --git a/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/CultureInfoConverterTest.cs b/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/CultureInfoConverterTest.cs
@@ -36,7 +36,7 @@ public void TestAllCultureInfo()
             foreach (var cultureInfo in cultureInfos)
             {
                 // this weird cultureInfo will let test case failed.
-                if (cultureInfo.LCID == 4096)
+                if (cultureInfo.LCID is 4096 or 4 or 31748)
                     continue;
 
                 string json = JsonConvert.SerializeObject(cultureInfo, CreateSettings());

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
@@ -27,6 +27,6 @@
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
     <RootNamespace>osu.Game.Rulesets.Karaoke.Tests</RootNamespace>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 </Project>
diff --git a/osu.Game.Rulesets.Karaoke/Mods/KaraokeModPractice.cs b/osu.Game.Rulesets.Karaoke/Mods/KaraokeModPractice.cs
@@ -59,7 +59,13 @@ public void ApplyToOverlay(ISettingHUDOverlay overlay)
             overlay.AddExtraOverlay(new PracticeOverlay(beatmap));
 
             // Add playback group into main overlay
-            overlay.AddSettingsGroup(new PlaybackSettings { Expanded = false });
+            overlay.AddSettingsGroup(new PlaybackSettings
+            {
+                Expanded =
+                {
+                    Value = false
+                }
+            });
         }
 
         private class PracticeOverlay : SettingOverlay
@@ -68,7 +74,10 @@ public PracticeOverlay(IBeatmap beatmap)
             {
                 Add(new PracticeSettings(beatmap)
                 {
-                    Expanded = true,
+                    Expanded =
+                    {
+                        Value = true
+                    },
                     Width = 400
                 });
             }

diff --git a/osu.Game.Rulesets.Karaoke/UI/HUD/GeneralSettingOverlay.cs b/osu.Game.Rulesets.Karaoke/UI/HUD/GeneralSettingOverlay.cs
@@ -23,13 +23,37 @@ public class GeneralSettingOverlay : SettingOverlay, IKeyBindingHandler<KaraokeA
         public GeneralSettingOverlay(IBeatmap beatmap)
         {
             // Add common group
-            Add(new VisualSettings { Expanded = false });
-            Add(new PitchSettings { Expanded = false });
-            Add(new RubyRomajiSettings { Expanded = false });
+            Add(new VisualSettings
+            {
+                Expanded =
+                {
+                    Value = false
+                }
+            });
+            Add(new PitchSettings
+            {
+                Expanded =
+                {
+                    Value = false
+                }
+            });
+            Add(new RubyRomajiSettings
+            {
+                Expanded =
+                {
+                    Value = false
+                }
+            });
 
             // Add translate group if this beatmap has translate
             if (beatmap.AnyTranslate())
-                Add(new TranslateSettings(beatmap.AvailableTranslates()) { Expanded = false });
+                Add(new TranslateSettings(beatmap.AvailableTranslates())
+                {
+                    Expanded =
+                    {
+                        Value = false
+                    }
+                });
         }
 
         public override SettingButton CreateToggleButton() => new()

diff --git a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
@@ -10,15 +10,15 @@
     <PackageReference Include="ILRepack.MSBuild.Task" Version="2.0.13" />
     <PackageReference Include="LanguageDetection.karaoke-dev" Version="1.3.3-alpha" />
     <PackageReference Include="Octokit" Version="0.50.0" />
-    <PackageReference Include="osu.Framework.KaraokeFont" Version="2022.118.0" />
-    <PackageReference Include="osu.Framework.Microphone" Version="2022.118.0" />
-    <PackageReference Include="ppy.osu.Game" Version="2022.205.0" />
+    <PackageReference Include="osu.Framework.KaraokeFont" Version="2022.214.0" />
+    <PackageReference Include="osu.Framework.Microphone" Version="2022.214.0" />
+    <PackageReference Include="ppy.osu.Game" Version="2022.216.0" />
     <PackageReference Include="LyricMaker" Version="1.1.1" />
     <PackageReference Include="NicoKaraParser" Version="1.1.0" />
     <PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta15" />
     <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta13" />
     <!--install because it might cause "Could not load file or assembly" error, might be removed eventually-->
-    <PackageReference Include="System.Text.Encodings.Web" Version="5.0.1" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="6.0.0" />
     <PackageReference Include="WanaKanaSharp" Version="0.2.0" />
     <PackageReference Include="Zipangu" Version="1.1.8" />
   </ItemGroup>