From aeb5850976ebd0ba1d395ff71cabff3c1e687f3b Mon Sep 17 00:00:00 2001 From: andy840119 Date: Mon, 3 Apr 2023 11:16:14 +0800 Subject: [PATCH 1/6] Upgrade osu.game to the latest. Seems some tests broken ;_; --- osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj index 2ba217d6f..e16227aae 100644 --- a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj +++ b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj @@ -18,7 +18,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + From 014376512d8eb956a01b88392b0b1dbced85a282 Mon Sep 17 00:00:00 2001 From: andy840119 Date: Mon, 3 Apr 2023 11:51:08 +0800 Subject: [PATCH 2/6] Upgrade the font and microphone package to the latest. Still have shader not found issue ;_; --- osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj index e16227aae..91f3eada6 100644 --- a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj +++ b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj @@ -12,8 +12,8 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive From f565e6badbdb25bbce223cab46bb0a0b734071fa Mon Sep 17 00:00:00 2001 From: andy840119 Date: Wed, 19 Apr 2023 23:00:04 +0800 Subject: [PATCH 3/6] Upgrade the osu.game to the latest again and seems all test case passed. Nice. --- osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj index 91f3eada6..885675400 100644 --- a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj +++ b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj @@ -18,7 +18,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + From 262ff735b90cedb52774abd8762929a297ff781b Mon Sep 17 00:00:00 2001 From: andy840119 Date: Wed, 19 Apr 2023 23:02:03 +0800 Subject: [PATCH 4/6] Man got no idea why use the wrong `resolved` before. --- .../Stages/Classic/Stage/Settings/StageEditorEditModeSection.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Stages/Classic/Stage/Settings/StageEditorEditModeSection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Stages/Classic/Stage/Settings/StageEditorEditModeSection.cs index b3dcfd188..1b3358cc4 100644 --- a/osu.Game.Rulesets.Karaoke/Screens/Edit/Stages/Classic/Stage/Settings/StageEditorEditModeSection.cs +++ b/osu.Game.Rulesets.Karaoke/Screens/Edit/Stages/Classic/Stage/Settings/StageEditorEditModeSection.cs @@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Karaoke.Screens.Edit.Stages.Classic.Stage.Settings; public partial class StageEditorEditModeSection : EditModeSection { - [OpenTabletDriver.Plugin.DependencyInjection.Resolved, AllowNull] + [Resolved, AllowNull] private IStageEditorStateProvider stageEditorStateProvider { get; set; } private readonly StageEditorEditCategory category; From 5ae2b1556791d85d029b671073381b1391d8caee Mon Sep 17 00:00:00 2001 From: andy840119 Date: Wed, 19 Apr 2023 23:03:53 +0800 Subject: [PATCH 5/6] Upgrade the octokit to the latest. --- osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj index 885675400..345318362 100644 --- a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj +++ b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj @@ -11,7 +11,7 @@ - + From 4558b28f4f80c0480f8c2bf1ad925b5a6357c870 Mon Sep 17 00:00:00 2001 From: andy840119 Date: Wed, 19 Apr 2023 23:04:26 +0800 Subject: [PATCH 6/6] Upgrade the font package to the latest. --- osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj index 345318362..1c9180c19 100644 --- a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj +++ b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj @@ -12,7 +12,7 @@ - + all