Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ jobs:
uses: actions/setup-dotnet@v4
with:
dotnet-version: "8.0.x"
cache: true

- name: Restore Tools
run: dotnet tool restore
Expand Down Expand Up @@ -79,7 +78,6 @@ jobs:
uses: actions/setup-dotnet@v4
with:
dotnet-version: "8.0.x"
cache: true

- name: Compile
run: dotnet build -c Debug -warnaserror osu.Desktop.slnf
Expand Down Expand Up @@ -129,7 +127,6 @@ jobs:
uses: actions/setup-dotnet@v4
with:
dotnet-version: "8.0.x"
cache: true

- name: Install .NET workloads
run: dotnet workload install android wasi-experimental
Expand All @@ -150,7 +147,6 @@ jobs:
uses: actions/setup-dotnet@v4
with:
dotnet-version: "8.0.x"
cache: true

- name: Install .NET Workloads
run: dotnet workload install ios
Expand Down
4 changes: 1 addition & 3 deletions osu.Game.Tests/Database/BackgroundDataStoreProcessorTests.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// 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.

#pragma warning disable IDE0005
using System;
using System.Linq;
using NUnit.Framework;
using osu.Framework.Allocation;
Expand Down Expand Up @@ -191,7 +189,7 @@ public partial class TestBackgroundDataStoreProcessor : BackgroundDataStoreProce
{
protected override int TimeToSleepDuringGameplay => 10;

protected override void backpopulateUserTags()
protected override void BackpopulateUserTags()
{
// no-op
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@
});
}


public override void SetUpSteps()

Check failure on line 73 in osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs

View workflow job for this annotation

GitHub Actions / Code Quality

Blank lines are redundant, expected maximum 1 instead of 2 in osu.Game.Tests\Visual\Multiplayer\TestSceneMultiplayerMatchSubScreen.cs on line 73

Check failure on line 73 in osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs

View workflow job for this annotation

GitHub Actions / Code Quality

Blank lines are redundant, expected maximum 1 instead of 2 in osu.Game.Tests\Visual\Multiplayer\TestSceneMultiplayerMatchSubScreen.cs on line 73
{
base.SetUpSteps();

Expand All @@ -93,7 +94,7 @@
// If OnLeaving wasn't called, it stays.
return false;
}
return true;

Check failure on line 97 in osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs

View workflow job for this annotation

GitHub Actions / Code Quality

Blank lines are missing, expected minimum 1 instead of 0 in osu.Game.Tests\Visual\Multiplayer\TestSceneMultiplayerMatchSubScreen.cs on line 97

Check failure on line 97 in osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerMatchSubScreen.cs

View workflow job for this annotation

GitHub Actions / Code Quality

Blank lines are missing, expected minimum 1 instead of 0 in osu.Game.Tests\Visual\Multiplayer\TestSceneMultiplayerMatchSubScreen.cs on line 97
});

AddStep("load match", () =>
Expand Down
21 changes: 17 additions & 4 deletions osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -219,17 +219,30 @@ private void setUpTaggingRequests(Func<BeatmapInfo> beatmap) =>
{
Tags =
[
new APITag { Id = 1, Name = "song representation/simple", Description = "Accessible and straightforward map design.", },
new APITag
{
Id = 2, Name = "style/clean",
Id = 1,
Name = "song representation/simple",
Description = "Accessible and straightforward map design.",
},
new APITag
{
Id = 2,
Name = "style/clean",
Description = "Visually uncluttered and organised patterns, often involving few overlaps and equal visual spacing between objects.",
},
new APITag
{
Id = 3, Name = "aim/aim control", Description = "Patterns with velocity or direction changes which strongly go against a player's natural movement pattern.",
Id = 3,
Name = "aim/aim control",
Description = "Patterns with velocity or direction changes which strongly go against a player's natural movement pattern.",
},
new APITag
{
Id = 4,
Name = "tap/bursts",
Description = "Patterns requiring continuous movement and alternating, typically 9 notes or less.",
},
new APITag { Id = 4, Name = "tap/bursts", Description = "Patterns requiring continuous movement and alternating, typically 9 notes or less.", },
]
}), 500);
return true;
Expand Down
36 changes: 30 additions & 6 deletions osu.Game.Tests/Visual/Ranking/TestSceneUserTagControl.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,19 +48,43 @@ public void SetUpSteps()
{
Tags =
[
new APITag { Id = 0, Name = "uncategorised tag", Description = "This probably isn't real but could be and should be handled.", },
new APITag { Id = 1, Name = "song representation/simple", Description = "Accessible and straightforward map design.", },
new APITag
{
Id = 2, Name = "style/clean",
Id = 0,
Name = "uncategorised tag",
Description = "This probably isn't real but could be and should be handled.",
},
new APITag
{
Id = 1,
Name = "song representation/simple",
Description = "Accessible and straightforward map design.",
},
new APITag
{
Id = 2,
Name = "style/clean",
Description = "Visually uncluttered and organised patterns, often involving few overlaps and equal visual spacing between objects.",
},
new APITag
{
Id = 3, Name = "aim/aim control", Description = "Patterns with velocity or direction changes which strongly go against a player's natural movement pattern.",
Id = 3,
Name = "aim/aim control",
Description = "Patterns with velocity or direction changes which strongly go against a player's natural movement pattern.",
},
new APITag
{
Id = 4,
Name = "tap/bursts",
Description = "Patterns requiring continuous movement and alternating, typically 9 notes or less.",
},
new APITag
{
Id = 5,
Name = "style/mono-heavy",
Description = "Features monos used in large amounts.",
RulesetId = 1,
},
new APITag { Id = 4, Name = "tap/bursts", Description = "Patterns requiring continuous movement and alternating, typically 9 notes or less.", },
new APITag { Id = 5, Name = "style/mono-heavy", Description = "Features monos used in large amounts.", RulesetId = 1, },
]
}), 500);
return true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ public async Task TestNoGrouping()

BeatmapInfo[] allBeatmaps =
[
..beatmap1.Beatmaps,
..beatmap2.Beatmaps,
..beatmap3.Beatmaps,
..beatmap4.Beatmaps
.. beatmap1.Beatmaps,
.. beatmap2.Beatmaps,
.. beatmap3.Beatmaps,
.. beatmap4.Beatmaps
];

var results = await runGrouping(GroupMode.None, beatmapSets);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,23 @@ public void SetUpSteps()
List<BeatmapCollection> collections =
[
new BeatmapCollection("collection one", [
..BeatmapSets[0].Beatmaps.Select(b => b.MD5Hash),
..BeatmapSets[1].Beatmaps.Select(b => b.MD5Hash),
..BeatmapSets[2].Beatmaps.Select(b => b.MD5Hash),
.. BeatmapSets[0].Beatmaps.Select(b => b.MD5Hash),
.. BeatmapSets[1].Beatmaps.Select(b => b.MD5Hash),
.. BeatmapSets[2].Beatmaps.Select(b => b.MD5Hash),
BeatmapSets[5].Beatmaps[1].MD5Hash,
BeatmapSets[8].Beatmaps[0].MD5Hash,
]),
new BeatmapCollection("collection two", [
BeatmapSets[0].Beatmaps[0].MD5Hash,
..BeatmapSets[1].Beatmaps.Select(b => b.MD5Hash),
..BeatmapSets[2].Beatmaps.Select(b => b.MD5Hash),
.. BeatmapSets[1].Beatmaps.Select(b => b.MD5Hash),
.. BeatmapSets[2].Beatmaps.Select(b => b.MD5Hash),
BeatmapSets[6].Beatmaps[2].MD5Hash,
BeatmapSets[8].Beatmaps[2].MD5Hash,
]),
new BeatmapCollection("collection one copy", [
..BeatmapSets[0].Beatmaps.Select(b => b.MD5Hash),
..BeatmapSets[1].Beatmaps.Select(b => b.MD5Hash),
..BeatmapSets[2].Beatmaps.Select(b => b.MD5Hash),
.. BeatmapSets[0].Beatmaps.Select(b => b.MD5Hash),
.. BeatmapSets[1].Beatmaps.Select(b => b.MD5Hash),
.. BeatmapSets[2].Beatmaps.Select(b => b.MD5Hash),
BeatmapSets[5].Beatmaps[1].MD5Hash,
BeatmapSets[8].Beatmaps[0].MD5Hash,
]),
Expand Down
2 changes: 1 addition & 1 deletion osu.Game/Database/BackgroundDataStoreProcessor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,7 @@ private void backpopulateMissingSubmissionAndRankDates()
completeNotification(notification, processedCount, beatmapSetIds.Count, failedCount);
}

protected virtual void backpopulateUserTags()
protected virtual void BackpopulateUserTags()
{
if (api is DummyAPIAccess)
return;
Expand Down
2 changes: 1 addition & 1 deletion osu.Game/Overlays/Rankings/Tables/RankingsTable.cs
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ protected sealed override Drawable CreateHeader(int index, TableColumn column)
Children =
[
new UpdateableFlag(GetCountryCode(item)) { Size = new Vector2(28, 20) },
..CreateFlagContent(item)
.. CreateFlagContent(item)
]
};

Expand Down
6 changes: 3 additions & 3 deletions osu.Game/Utils/SupportedExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ public static class SupportedExtensions

public static readonly string[] ALL_EXTENSIONS =
[
..VIDEO_EXTENSIONS,
..AUDIO_EXTENSIONS,
..IMAGE_EXTENSIONS
.. VIDEO_EXTENSIONS,
.. AUDIO_EXTENSIONS,
.. IMAGE_EXTENSIONS
];
}
}
Loading