From 3f7164d3afbe14d050b181418e8cbb23afafe247 Mon Sep 17 00:00:00 2001 From: Dan Balasescu Date: Sat, 3 Feb 2024 01:09:50 +0900 Subject: [PATCH 1/5] Update to .NET 8 --- PerformanceCalculator/PerformanceCalculator.csproj | 2 +- PerformanceCalculatorGUI/PerformanceCalculatorGUI.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PerformanceCalculator/PerformanceCalculator.csproj b/PerformanceCalculator/PerformanceCalculator.csproj index e6f518847..26ce15f1c 100644 --- a/PerformanceCalculator/PerformanceCalculator.csproj +++ b/PerformanceCalculator/PerformanceCalculator.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 diff --git a/PerformanceCalculatorGUI/PerformanceCalculatorGUI.csproj b/PerformanceCalculatorGUI/PerformanceCalculatorGUI.csproj index d524b9ff0..b38b52b88 100644 --- a/PerformanceCalculatorGUI/PerformanceCalculatorGUI.csproj +++ b/PerformanceCalculatorGUI/PerformanceCalculatorGUI.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 latest From 9001cd89256190ff9396a9c687b901a8c7ad1192 Mon Sep 17 00:00:00 2001 From: Dan Balasescu Date: Sat, 3 Feb 2024 01:12:09 +0900 Subject: [PATCH 2/5] Remove use of System.ComponentModel.DataAnnotations `[Argument]` implies use. Turns out the `System` namespace added a conflicting `[AllowedValues]` attribute that I don't want to deal with. --- PerformanceCalculator/Difficulty/DifficultyCommand.cs | 2 -- PerformanceCalculator/Difficulty/LegacyScoreCommand.cs | 2 -- PerformanceCalculator/Profile/ProfileCommand.cs | 2 -- 3 files changed, 6 deletions(-) diff --git a/PerformanceCalculator/Difficulty/DifficultyCommand.cs b/PerformanceCalculator/Difficulty/DifficultyCommand.cs index 22e15c19c..802cf32ff 100644 --- a/PerformanceCalculator/Difficulty/DifficultyCommand.cs +++ b/PerformanceCalculator/Difficulty/DifficultyCommand.cs @@ -3,7 +3,6 @@ using System; using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; using System.IO; using System.Linq; using Alba.CsConsoleFormat; @@ -23,7 +22,6 @@ namespace PerformanceCalculator.Difficulty public class DifficultyCommand : ProcessorCommand { [UsedImplicitly] - [Required] [Argument(0, Name = "path", Description = "Required. A beatmap file (.osu), beatmap ID, or a folder containing .osu files to compute the difficulty for.")] public string Path { get; } diff --git a/PerformanceCalculator/Difficulty/LegacyScoreCommand.cs b/PerformanceCalculator/Difficulty/LegacyScoreCommand.cs index d83a568a8..af77a9c0c 100644 --- a/PerformanceCalculator/Difficulty/LegacyScoreCommand.cs +++ b/PerformanceCalculator/Difficulty/LegacyScoreCommand.cs @@ -3,7 +3,6 @@ using System; using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; using System.IO; using System.Linq; using Alba.CsConsoleFormat; @@ -22,7 +21,6 @@ namespace PerformanceCalculator.Difficulty public class LegacyScoreCommand : ProcessorCommand { [UsedImplicitly] - [Required] [Argument(0, Name = "path", Description = "Required. A beatmap file (.osu), beatmap ID, or a folder containing .osu files to compute the difficulty for.")] public string Path { get; } diff --git a/PerformanceCalculator/Profile/ProfileCommand.cs b/PerformanceCalculator/Profile/ProfileCommand.cs index eb55e7b48..5f3aba99a 100644 --- a/PerformanceCalculator/Profile/ProfileCommand.cs +++ b/PerformanceCalculator/Profile/ProfileCommand.cs @@ -3,7 +3,6 @@ using System; using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; using System.IO; using System.Linq; using Alba.CsConsoleFormat; @@ -20,7 +19,6 @@ namespace PerformanceCalculator.Profile public class ProfileCommand : ApiCommand { [UsedImplicitly] - [Required] [Argument(0, Name = "user", Description = "User ID is preferred, but username should also work.")] public string ProfileName { get; } From 1a0016dbbecd0e04c00b2bf770b9fdc55f7fff76 Mon Sep 17 00:00:00 2001 From: Dan Balasescu Date: Sat, 3 Feb 2024 01:13:36 +0900 Subject: [PATCH 3/5] Adjust CI workflow + use R# 2023.3.3 --- .config/dotnet-tools.json | 6 +++--- .github/workflows/ci.yml | 4 ++-- osu.Tools.sln.DotSettings | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 7b39e985f..a4c24e485 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,13 +3,13 @@ "isRoot": true, "tools": { "CodeFileSanity": { - "version": "0.0.36", + "version": "0.0.37", "commands": [ "CodeFileSanity" ] }, "jetbrains.resharper.globaltools": { - "version": "2022.1.2", + "version": "2023.3.3", "commands": [ "jb" ] @@ -21,4 +21,4 @@ ] } } -} \ No newline at end of file +} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ad892d345..ed6884bb6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,10 +23,10 @@ jobs: with: dotnet-version: "3.1.x" - - name: Install .NET 6.0.x + - name: Install .NET 8.0.x uses: actions/setup-dotnet@v1 with: - dotnet-version: "6.0.x" + dotnet-version: "8.0.x" - name: Restore Tools run: dotnet tool restore diff --git a/osu.Tools.sln.DotSettings b/osu.Tools.sln.DotSettings index a55685873..df16bfa3c 100644 --- a/osu.Tools.sln.DotSettings +++ b/osu.Tools.sln.DotSettings @@ -824,6 +824,7 @@ See the LICENCE file in the repository root for full licence text. True True True + True True True True From a0cd2bf39519b82414be6e89c77a8af42b228b22 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Sun, 4 Feb 2024 11:54:50 +0800 Subject: [PATCH 4/5] Attempt to via nvika failure --- .github/workflows/ci.yml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ed6884bb6..6e30d3a22 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,17 +14,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 - - # FIXME: Tools won't run in .NET 6.0 unless you install 3.1.x LTS side by side. - # https://itnext.io/how-to-support-multiple-net-sdks-in-github-actions-workflows-b988daa884e - - name: Install .NET 3.1.x LTS - uses: actions/setup-dotnet@v1 - with: - dotnet-version: "3.1.x" + uses: actions/checkout@v3 - name: Install .NET 8.0.x - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v3 with: dotnet-version: "8.0.x" @@ -51,4 +44,4 @@ jobs: run: dotnet jb inspectcode $(pwd)/osu.Tools.sln --build --output="inspectcodereport.xml" --verbosity=WARN - name: NVika - run: dotnet nvika parsereport "${{github.workspace}}/inspectcodereport.xml" --treatwarningsaserrors \ No newline at end of file + run: dotnet nvika parsereport "${{github.workspace}}/inspectcodereport.xml" --treatwarningsaserrors From a096b827d96c9728b0d5b3e50710cb19989b91d0 Mon Sep 17 00:00:00 2001 From: Dan Balasescu Date: Sun, 4 Feb 2024 17:21:34 +0900 Subject: [PATCH 5/5] Fix inspection --- .../Screens/ObjectInspection/CatchObjectInspectorRuleset.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PerformanceCalculatorGUI/Screens/ObjectInspection/CatchObjectInspectorRuleset.cs b/PerformanceCalculatorGUI/Screens/ObjectInspection/CatchObjectInspectorRuleset.cs index e07bb4fd5..507993630 100644 --- a/PerformanceCalculatorGUI/Screens/ObjectInspection/CatchObjectInspectorRuleset.cs +++ b/PerformanceCalculatorGUI/Screens/ObjectInspection/CatchObjectInspectorRuleset.cs @@ -46,7 +46,7 @@ protected override void Update() private partial class CatchObjectInspectorPlayfield : CatchEditorPlayfield { - protected override GameplayCursorContainer CreateCursor() => null; + protected override GameplayCursorContainer CreateCursor() => null!; public CatchObjectInspectorPlayfield(IBeatmapDifficultyInfo difficulty) : base(difficulty)