Merge pull request #254 from LumpBloom7/Bump-osu-and-NET8

Update .NET and osu
LumpBloom7 · Feb 19, 2024 · 01a6cd8 · 01a6cd8
2 parents 44aeb05 + d119915
commit 01a6cd8
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 48 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -7,28 +7,16 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/osu.Game.Rulesets.Hishigata.Tests/bin/Debug/net6.0/osu.Game.Rulesets.Hishigata.Tests.dll"
+                "${workspaceRoot}/osu.Game.Rulesets.Hishigata.Tests/bin/Debug/net8.0/osu.Game.Rulesets.Hishigata.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
-            "preLaunchTask": "Build tests (Debug)",
+            "preLaunchTask": "Build tests",
             "console": "internalConsole",
             "justMyCode": false,
             "symbolOptions": {
                 "searchMicrosoftSymbolServer": true,
                 "searchNuGetOrgSymbolServer": true
             },
         },
-        {
-            "name": "hishigata for osu! (Tests, Release)",
-            "type": "coreclr",
-            "request": "launch",
-            "program": "dotnet",
-            "args": [
-                "${workspaceRoot}/osu.Game.Rulesets.Hishigata.Tests/bin/Release/net6.0/osu.Game.Rulesets.Hishigata.Tests.dll"
-            ],
-            "cwd": "${workspaceRoot}",
-            "preLaunchTask": "Build tests (Release)",
-            "console": "internalConsole"
-        },
     ]
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -2,7 +2,7 @@
     "version": "2.0.0",
     "tasks": [
         {
-            "label": "Build tests (Debug)",
+            "label": "Build tests",
             "type": "shell",
             "command": "dotnet",
             "args": [
@@ -16,25 +16,9 @@
             "group": "build",
             "problemMatcher": "$msCompile"
         },
-        {
-            "label": "Build tests (Release)",
-            "type": "shell",
-            "command": "dotnet",
-            "args": [
-                "build",
-                "--no-restore",
-                "osu.Game.Rulesets.Hishigata.Tests",
-                "/p:Configuration=Release",
-                "/p:GenerateFullPaths=true",
-                "/m",
-                "/verbosity:m"
-            ],
-            "group": "build",
-            "problemMatcher": "$msCompile"
-        },
         // Test Tasks
         {
-            "label": "Run tests (Debug)",
+            "label": "Run tests",
             "type": "shell",
             "command": "dotnet",
             "args": [
@@ -44,16 +28,5 @@
             "group": "test",
             "problemMatcher": "$msCompile"
         },
-        {
-            "label": "Run tests (Release)",
-            "type": "shell",
-            "command": "dotnet",
-            "args": [
-                "test",
-                "/p:Configuration=Release",
-            ],
-            "group": "test",
-            "problemMatcher": "$msCompile"
-        }
     ]
 }
diff --git a/osu.Game.Rulesets.Hishigata.Tests/osu.Game.Rulesets.Hishigata.Tests.csproj b/osu.Game.Rulesets.Hishigata.Tests/osu.Game.Rulesets.Hishigata.Tests.csproj
@@ -18,7 +18,7 @@
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>osu.Game.Rulesets.Hishigata.Tests</RootNamespace>
   </PropertyGroup>
 </Project>
diff --git a/osu.Game.Rulesets.Hishigata/Objects/Drawables/DrawableHishigataHitObject.cs b/osu.Game.Rulesets.Hishigata/Objects/Drawables/DrawableHishigataHitObject.cs
@@ -44,12 +44,12 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
             if (timeOffset >= 0 && timeOffset <= 32)
             {
                 if (CanBeHit?.Invoke(this) ?? false)
-                    ApplyResult(r => r.Type = r.Judgement.MaxResult);
+                    ApplyResult(Result.Judgement.MaxResult);
 
                 return;
             }
             if (timeOffset > 32)
-                ApplyResult(r => r.Type = r.Judgement.MinResult);
+                ApplyResult(Result.Judgement.MinResult);
         }
 
         protected override void UpdateInitialTransforms()

diff --git a/osu.Game.Rulesets.Hishigata/osu.Game.Rulesets.Hishigata.csproj b/osu.Game.Rulesets.Hishigata/osu.Game.Rulesets.Hishigata.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.Hishigata</AssemblyTitle>
     <OutputType>Library</OutputType>
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -10,6 +10,6 @@
     <AssemblyName>osu.Game.Rulesets.Hishigata</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game" Version="2024.130.2"/>
+    <PackageReference Include="ppy.osu.Game" Version="2024.219.0"/>
   </ItemGroup>
 </Project>