Merge pull request #1 from Artemis-chan/master

Cross-porting various fixes
Thesola10 · Apr 4, 2021 · 7d4e7cf · 7d4e7cf
2 parents 2def08b + a68cd60
commit 7d4e7cf
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 10 deletions.
diff --git a/osu.Game.Rulesets.Diva.Tests/osu.Game.Rulesets.Diva.Tests.csproj b/osu.Game.Rulesets.Diva.Tests/osu.Game.Rulesets.Diva.Tests.csproj
@@ -11,7 +11,7 @@
     <ItemGroup Label="Package References">
         <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
-        <PackageReference Include="NUnit" Version="3.12.0" />
+        <PackageReference Include="NUnit" Version="3.13.1" />
         <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
         <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
     </ItemGroup>
@@ -20,7 +20,7 @@
     </ItemGroup>
     <PropertyGroup Label="Project">
         <OutputType>WinExe</OutputType>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
         <RootNamespace>osu.Game.Rulesets.Diva.Tests</RootNamespace>
     </PropertyGroup>
 </Project>
diff --git a/osu.Game.Rulesets.Diva.sln b/osu.Game.Rulesets.Diva.sln
@@ -7,10 +7,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "osu.Game.Rulesets.Diva", "o
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "osu.Game.Rulesets.Diva.Tests", "osu.Game.Rulesets.Diva.Tests\osu.Game.Rulesets.Diva.Tests.csproj", "{B4577C85-CB83-462A-BCE3-22FFEB16311D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "osu.Game", "osu\osu.Game\osu.Game.csproj", "{5265E0F9-AC64-49A0-9A40-303CAAC0EC8E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "osu.Game.Rulesets.Osu", "osu\osu.Game.Rulesets.Osu\osu.Game.Rulesets.Osu.csproj", "{C52FD88E-E5D8-4093-9E9D-507FEACB58D6}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

diff --git a/osu.Game.Rulesets.Diva/Configuration/DivaRulesetConfigManager.cs b/osu.Game.Rulesets.Diva/Configuration/DivaRulesetConfigManager.cs
@@ -15,8 +15,8 @@ protected override void InitialiseDefaults()
         {
             base.InitialiseDefaults();
 
-            Set(DivaRulesetSettings.UseXBoxButtons, false);
-            Set(DivaRulesetSettings.EnableVisualBursts, true);
+            SetDefault(DivaRulesetSettings.UseXBoxButtons, false);
+            SetDefault(DivaRulesetSettings.EnableVisualBursts, true);
         }
     }
 

diff --git a/osu.Game.Rulesets.Diva/Mods/DivaModAutoplay.cs b/osu.Game.Rulesets.Diva/Mods/DivaModAutoplay.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Generic;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Diva.Objects;
@@ -12,7 +13,7 @@ namespace osu.Game.Rulesets.Diva.Mods
 {
     public class DivaModAutoplay : ModAutoplay<DivaHitObject>
     {
-        public override Score CreateReplayScore(IBeatmap beatmap) => new Score
+        public override Score CreateReplayScore(IBeatmap beatmap, IReadOnlyList<Mod> mods) => new Score
         {
             ScoreInfo = new ScoreInfo
             {

diff --git a/osu.Game.Rulesets.Diva/osu.Game.Rulesets.Diva.csproj b/osu.Game.Rulesets.Diva/osu.Game.Rulesets.Diva.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup Label="Project">
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <AssemblyTitle>osu.Game.Rulesets.Sample</AssemblyTitle>
     <OutputType>Library</OutputType>
     <PlatformTarget>AnyCPU</PlatformTarget>