Merge branch 'master' into sentry-more-context

2024-09-21 21:27:24 +08:00 · 2022-05-11 20:29:30 +03:00 · 2022-05-11 20:29:30 +03:00 · 2ddef0e46c
commit 2ddef0e46c
parent be09ec833e d4122f17a2
31 changed files with 129 additions and 62 deletions
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@ -3,7 +3,7 @@
  "isRoot": true,
  "tools": {
    "jetbrains.resharper.globaltools": {
-      "version": "2022.1.0-eap10",
+      "version": "2022.1.1",
      "commands": [
        "jb"
      ]
@ -27,4 +27,4 @@
      ]
    }
  }
-}
+}
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -31,7 +31,7 @@ jobs:
        uses: actions/cache@v3
        with:
          path: ${{ github.workspace }}/inspectcode
-          key: inspectcode-${{ hashFiles('.config/dotnet-tools.json') }}-${{ hashFiles('.github/workflows/ci.yml' ) }}
+          key: inspectcode-${{ hashFiles('.config/dotnet-tools.json', '.github/workflows/ci.yml', 'osu.sln*', '.editorconfig', '.globalconfig') }}

      - name: Dotnet code style
        run: dotnet build -c Debug -warnaserror osu.Desktop.slnf -p:EnforceCodeStyleInBuild=true
--- a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/osu.Game.Rulesets.EmptyFreeform.Tests.csproj
+++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/osu.Game.Rulesets.EmptyFreeform.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="17.0.0" />
-    <PackageReference Include="NUnit" Version="3.13.2" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
  </ItemGroup>
--- a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj
+++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.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="17.0.0" />
-    <PackageReference Include="NUnit" Version="3.13.2" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
  </ItemGroup>
--- a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/osu.Game.Rulesets.EmptyScrolling.Tests.csproj
+++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/osu.Game.Rulesets.EmptyScrolling.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="17.0.0" />
-    <PackageReference Include="NUnit" Version="3.13.2" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
  </ItemGroup>
--- a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj
+++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.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="17.0.0" />
-    <PackageReference Include="NUnit" Version="3.13.2" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
  </ItemGroup>
--- a/osu.Android.props
+++ b/osu.Android.props
@ -52,10 +52,10 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="ppy.osu.Game.Resources" Version="2022.422.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2022.509.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2022.511.0" />
  </ItemGroup>
  <ItemGroup Label="Transitive Dependencies">
    <!-- Realm needs to be directly referenced in all Xamarin projects, as it will not pull in its transitive dependencies otherwise. -->
-    <PackageReference Include="Realm" Version="10.10.0" />
+    <PackageReference Include="Realm" Version="10.12.0" />
  </ItemGroup>
 </Project>
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@ -24,7 +24,7 @@
    <ProjectReference Include="..\osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj" />
  </ItemGroup>
  <ItemGroup Label="Package References">
-    <PackageReference Include="Clowd.Squirrel" Version="2.9.23-gc8da1a" />
+    <PackageReference Include="Clowd.Squirrel" Version="2.9.40" />
    <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
    <PackageReference Include="System.IO.Packaging" Version="6.0.0" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.14" />
--- a/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
+++ b/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj
@ -8,7 +8,7 @@

  <ItemGroup>
    <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
-    <PackageReference Include="nunit" Version="3.13.2" />
+    <PackageReference Include="nunit" Version="3.13.3" />
    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
  </ItemGroup>

--- a/osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj
+++ b/osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj
@ -3,7 +3,7 @@
  <ItemGroup Label="Package References">
    <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="NUnit" Version="3.13.2" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
  </ItemGroup>
--- a/osu.Game.Rulesets.Mania.Tests/osu.Game.Rulesets.Mania.Tests.csproj
+++ b/osu.Game.Rulesets.Mania.Tests/osu.Game.Rulesets.Mania.Tests.csproj
@ -3,7 +3,7 @@
  <ItemGroup Label="Package References">
    <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="NUnit" Version="3.13.2" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
  </ItemGroup>
--- a/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj
+++ b/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj
@ -4,7 +4,7 @@
    <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
    <PackageReference Include="Moq" Version="4.17.2" />
-    <PackageReference Include="NUnit" Version="3.13.2" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
  </ItemGroup>
--- a/osu.Game.Rulesets.Taiko.Tests/osu.Game.Rulesets.Taiko.Tests.csproj
+++ b/osu.Game.Rulesets.Taiko.Tests/osu.Game.Rulesets.Taiko.Tests.csproj
@ -3,7 +3,7 @@
  <ItemGroup Label="Package References">
    <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="NUnit" Version="3.13.2" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
  </ItemGroup>
--- a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectDifficultyPointAdjustments.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectDifficultyPointAdjustments.cs
@ -7,6 +7,7 @@ using NUnit.Framework;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu;
@ -66,6 +67,13 @@ namespace osu.Game.Tests.Visual.Editing
            });
        }

+        [Test]
+        public void TestPopoverHasFocus()
+        {
+            clickDifficultyPiece(0);
+            velocityPopoverHasFocus();
+        }
+
        [Test]
        public void TestSingleSelection()
        {
@ -133,6 +141,15 @@ namespace osu.Game.Tests.Visual.Editing
            InputManager.Click(MouseButton.Left);
        });

+        private void velocityPopoverHasFocus() => AddUntilStep("velocity popover textbox focused", () =>
+        {
+            var popover = this.ChildrenOfType<DifficultyPointPiece.DifficultyEditPopover>().SingleOrDefault();
+            var slider = popover?.ChildrenOfType<IndeterminateSliderWithTextBoxInput<double>>().Single();
+            var textbox = slider?.ChildrenOfType<OsuTextBox>().Single();
+
+            return textbox?.HasFocus == true;
+        });
+
        private void velocityPopoverHasSingleValue(double velocity) => AddUntilStep($"velocity popover has {velocity}", () =>
        {
            var popover = this.ChildrenOfType<DifficultyPointPiece.DifficultyEditPopover>().SingleOrDefault();
@ -151,6 +168,7 @@ namespace osu.Game.Tests.Visual.Editing

        private void dismissPopover()
        {
+            AddStep("unfocus textbox", () => InputManager.Key(Key.Escape));
            AddStep("dismiss popover", () => InputManager.Key(Key.Escape));
            AddUntilStep("wait for dismiss", () => !this.ChildrenOfType<DifficultyPointPiece.DifficultyEditPopover>().Any(popover => popover.IsPresent));
        }
--- a/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSamplePointAdjustments.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneHitObjectSamplePointAdjustments.cs
@ -57,6 +57,13 @@ namespace osu.Game.Tests.Visual.Editing
            });
        }

+        [Test]
+        public void TestPopoverHasFocus()
+        {
+            clickSamplePiece(0);
+            samplePopoverHasFocus();
+        }
+
        [Test]
        public void TestSingleSelection()
        {
@ -173,14 +180,23 @@ namespace osu.Game.Tests.Visual.Editing
            samplePopoverHasSingleBank("normal");
        }

-        private void clickSamplePiece(int objectIndex) => AddStep($"click {objectIndex.ToOrdinalWords()} difficulty piece", () =>
+        private void clickSamplePiece(int objectIndex) => AddStep($"click {objectIndex.ToOrdinalWords()} sample piece", () =>
        {
-            var difficultyPiece = this.ChildrenOfType<SamplePointPiece>().Single(piece => piece.HitObject == EditorBeatmap.HitObjects.ElementAt(objectIndex));
+            var samplePiece = this.ChildrenOfType<SamplePointPiece>().Single(piece => piece.HitObject == EditorBeatmap.HitObjects.ElementAt(objectIndex));

-            InputManager.MoveMouseTo(difficultyPiece);
+            InputManager.MoveMouseTo(samplePiece);
            InputManager.Click(MouseButton.Left);
        });

+        private void samplePopoverHasFocus() => AddUntilStep("sample popover textbox focused", () =>
+        {
+            var popover = this.ChildrenOfType<SamplePointPiece.SampleEditPopover>().SingleOrDefault();
+            var slider = popover?.ChildrenOfType<IndeterminateSliderWithTextBoxInput<int>>().Single();
+            var textbox = slider?.ChildrenOfType<OsuTextBox>().Single();
+
+            return textbox?.HasFocus == true;
+        });
+
        private void samplePopoverHasSingleVolume(int volume) => AddUntilStep($"sample popover has volume {volume}", () =>
        {
            var popover = this.ChildrenOfType<SamplePointPiece.SampleEditPopover>().SingleOrDefault();
@ -215,8 +231,9 @@ namespace osu.Game.Tests.Visual.Editing

        private void dismissPopover()
        {
+            AddStep("unfocus textbox", () => InputManager.Key(Key.Escape));
            AddStep("dismiss popover", () => InputManager.Key(Key.Escape));
-            AddUntilStep("wait for dismiss", () => !this.ChildrenOfType<DifficultyPointPiece.DifficultyEditPopover>().Any(popover => popover.IsPresent));
+            AddUntilStep("wait for dismiss", () => !this.ChildrenOfType<SamplePointPiece.SampleEditPopover>().Any(popover => popover.IsPresent));
        }

        private void setVolumeViaPopover(int volume) => AddStep($"set volume {volume} via popover", () =>
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneFreeModSelectOverlay.cs
@ -17,7 +17,7 @@ using osuTK.Input;

 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneFreeModSelectScreen : MultiplayerTestScene
+    public class TestSceneFreeModSelectOverlay : MultiplayerTestScene
    {
        private FreeModSelectOverlay freeModSelectOverlay;
        private readonly Bindable<Dictionary<ModType, IReadOnlyList<Mod>>> availableMods = new Bindable<Dictionary<ModType, IReadOnlyList<Mod>>>();
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@ -24,7 +24,7 @@ using osuTK.Input;
 namespace osu.Game.Tests.Visual.UserInterface
 {
    [TestFixture]
-    public class TestSceneModSelectScreen : OsuManualInputManagerTestScene
+    public class TestSceneModSelectOverlay : OsuManualInputManagerTestScene
    {
        [Resolved]
        private RulesetStore rulesetStore { get; set; }
@ -222,7 +222,7 @@ namespace osu.Game.Tests.Visual.UserInterface
        public void TestSettingsNotCrossPolluting()
        {
            Bindable<IReadOnlyList<Mod>> selectedMods2 = null;
-            ModSelectOverlay modSelectScreen2 = null;
+            ModSelectOverlay modSelectOverlay2 = null;

            createScreen();
            AddStep("select diff adjust", () => SelectedMods.Value = new Mod[] { new OsuModDifficultyAdjust() });
@ -235,7 +235,7 @@ namespace osu.Game.Tests.Visual.UserInterface

            AddStep("create second overlay", () =>
            {
-                Add(modSelectScreen2 = new UserModSelectOverlay().With(d =>
+                Add(modSelectOverlay2 = new UserModSelectOverlay().With(d =>
                {
                    d.Origin = Anchor.TopCentre;
                    d.Anchor = Anchor.TopCentre;
@ -243,7 +243,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                }));
            });

-            AddStep("show", () => modSelectScreen2.Show());
+            AddStep("show", () => modSelectOverlay2.Show());

            AddAssert("ensure first is unchanged", () => SelectedMods.Value.OfType<OsuModDifficultyAdjust>().Single().CircleSize.Value == 8);
            AddAssert("ensure second is default", () => selectedMods2.Value.OfType<OsuModDifficultyAdjust>().Single().CircleSize.Value == null);
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@ -5,7 +5,7 @@
    <PackageReference Include="DeepEqual" Version="2.0.0" />
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
    <PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
-    <PackageReference Include="NUnit" Version="3.13.2" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
    <PackageReference Include="Moq" Version="4.17.2" />
--- a/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
+++ b/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
@ -6,7 +6,7 @@
  <ItemGroup Label="Package References">
    <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="NUnit" Version="3.13.2" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
  </ItemGroup>
  <PropertyGroup Label="Project">
--- a/osu.Game/Localisation/ModSelectOverlayStrings.cs
+++ b/osu.Game/Localisation/ModSelectOverlayStrings.cs
@ -5,9 +5,9 @@ using osu.Framework.Localisation;

 namespace osu.Game.Localisation
 {
-    public static class ModSelectScreenStrings
+    public static class ModSelectOverlayStrings
    {
-        private const string prefix = @"osu.Game.Resources.Localisation.ModSelectScreen";
+        private const string prefix = @"osu.Game.Resources.Localisation.ModSelectOverlay";

        /// <summary>
        /// "Mod Select"
@ -26,4 +26,4 @@ namespace osu.Game.Localisation

        private static string getKey(string key) => $@"{prefix}:{key}";
    }
-}
+}
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@ -86,6 +86,8 @@ namespace osu.Game

        public bool IsDeployedBuild => AssemblyVersion.Major > 0;

+        internal const string BUILD_SUFFIX = "lazer";
+
        public virtual string Version
        {
            get
@ -94,7 +96,7 @@ namespace osu.Game
                    return @"local " + (DebugUtils.IsDebugBuild ? @"debug" : @"release");

                var version = AssemblyVersion;
-                return $@"{version.Major}.{version.Minor}.{version.Build}-lazer";
+                return $@"{version.Major}.{version.Minor}.{version.Build}-{BUILD_SUFFIX}";
            }
        }

--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@ -84,8 +84,8 @@ namespace osu.Game.Overlays.Mods
        [BackgroundDependencyLoader]
        private void load(OsuColour colours)
        {
-            Header.Title = ModSelectScreenStrings.ModSelectTitle;
-            Header.Description = ModSelectScreenStrings.ModSelectDescription;
+            Header.Title = ModSelectOverlayStrings.ModSelectTitle;
+            Header.Description = ModSelectOverlayStrings.ModSelectDescription;

            AddRange(new Drawable[]
            {
@ -193,7 +193,7 @@ namespace osu.Game.Overlays.Mods
            State.BindValueChanged(_ => samplePlaybackDisabled.Value = State.Value == Visibility.Hidden, true);

            // This is an optimisation to prevent refreshing the available settings controls when it can be
-            // reasonably assumed that the settings panel is never to be displayed (e.g. FreeModSelectScreen).
+            // reasonably assumed that the settings panel is never to be displayed (e.g. FreeModSelectOverlay).
            if (customisationButton != null)
                ((IBindable<IReadOnlyList<Mod>>)modSettingsArea.SelectedMods).BindTo(SelectedMods);

@ -262,7 +262,7 @@ namespace osu.Game.Overlays.Mods
            {
                customisationButton = new ShearedToggleButton(BUTTON_WIDTH)
                {
-                    Text = ModSelectScreenStrings.ModCustomisation,
+                    Text = ModSelectOverlayStrings.ModCustomisation,
                    Active = { BindTarget = customisationVisible }
                },
                new ShearedButton(BUTTON_WIDTH)
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/DifficultyPointPiece.cs
@ -122,6 +122,12 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                    beatmap.EndChange();
                });
            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+                ScheduleAfterChildren(() => GetContainingInputManager().ChangeFocus(sliderVelocitySlider));
+            }
        }
    }
 }
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs
@ -126,6 +126,12 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                volume.Current.BindValueChanged(val => updateVolumeFor(relevantObjects, val.NewValue));
            }

+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+                ScheduleAfterChildren(() => GetContainingInputManager().ChangeFocus(volume));
+            }
+
            private static string? getCommonBank(SampleControlPoint[] relevantControlPoints) => relevantControlPoints.Select(point => point.SampleBank).Distinct().Count() == 1 ? relevantControlPoints.First().SampleBank : null;
            private static int? getCommonVolume(SampleControlPoint[] relevantControlPoints) => relevantControlPoints.Select(point => point.SampleVolume).Distinct().Count() == 1 ? (int?)relevantControlPoints.First().SampleVolume : null;

--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@ -270,12 +270,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
        protected override bool OnMouseDown(MouseDownEvent e)
        {
            if (base.OnMouseDown(e))
-            {
                beginUserDrag();
-                return true;
-            }

-            return false;
+            return true;
        }

        protected override void OnMouseUp(MouseUpEvent e)
--- a/osu.Game/Screens/Edit/Timing/IndeterminateSliderWithTextBoxInput.cs
+++ b/osu.Game/Screens/Edit/Timing/IndeterminateSliderWithTextBoxInput.cs
@ -7,6 +7,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
 using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Overlays.Settings;
@ -107,6 +108,14 @@ namespace osu.Game.Screens.Edit.Timing
            Current.BindValueChanged(_ => updateState(), true);
        }

+        public override bool AcceptsFocus => true;
+
+        protected override void OnFocus(FocusEvent e)
+        {
+            base.OnFocus(e);
+            GetContainingInputManager().ChangeFocus(textBox);
+        }
+
        private void updateState()
        {
            if (Current.Value is T nonNullValue)
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
@ -43,6 +43,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer

        private readonly MultiplayerRoomUser[] users;

+        private readonly Bindable<bool> leaderboardExpanded = new BindableBool();
+
        private LoadingLayer loadingDisplay;
        private FillFlowContainer leaderboardFlow;

@ -76,13 +78,16 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                Spacing = new Vector2(5)
            });

+            HUDOverlay.HoldingForHUD.BindValueChanged(_ => updateLeaderboardExpandedState());
+            LocalUserPlaying.BindValueChanged(_ => updateLeaderboardExpandedState(), true);
+
            // todo: this should be implemented via a custom HUD implementation, and correctly masked to the main content area.
            LoadComponentAsync(leaderboard = new MultiplayerGameplayLeaderboard(GameplayState.Ruleset.RulesetInfo, ScoreProcessor, users), l =>
            {
                if (!LoadedBeatmapSuccessfully)
                    return;

-                ((IBindable<bool>)leaderboard.Expanded).BindTo(HUDOverlay.ShowHud);
+                leaderboard.Expanded.BindTo(leaderboardExpanded);

                leaderboardFlow.Insert(0, l);

@ -99,7 +104,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer

            LoadComponentAsync(new GameplayChatDisplay(Room)
            {
-                Expanded = { BindTarget = HUDOverlay.ShowHud },
+                Expanded = { BindTarget = leaderboardExpanded },
            }, chat => leaderboardFlow.Insert(2, chat));

            HUDOverlay.Add(loadingDisplay = new LoadingLayer(true) { Depth = float.MaxValue });
@ -152,6 +157,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
            }
        }

+        private void updateLeaderboardExpandedState() =>
+            leaderboardExpanded.Value = !LocalUserPlaying.Value || HUDOverlay.HoldingForHUD.Value;
+
        private void failAndBail(string message = null)
        {
            if (!string.IsNullOrEmpty(message))
--- a/osu.Game/Screens/Play/HUDOverlay.cs
+++ b/osu.Game/Screens/Play/HUDOverlay.cs
@ -68,7 +68,9 @@ namespace osu.Game.Screens.Play

        internal readonly IBindable<bool> IsPlaying = new Bindable<bool>();

-        private bool holdingForHUD;
+        public IBindable<bool> HoldingForHUD => holdingForHUD;
+
+        private readonly BindableBool holdingForHUD = new BindableBool();

        private readonly SkinnableTargetContainer mainComponents;

@ -144,7 +146,8 @@ namespace osu.Game.Screens.Play
            hideTargets.ForEach(d => d.Hide());
        }

-        public override void Hide() => throw new InvalidOperationException($"{nameof(HUDOverlay)} should not be hidden as it will remove the ability of a user to quit. Use {nameof(ShowHud)} instead.");
+        public override void Hide() =>
+            throw new InvalidOperationException($"{nameof(HUDOverlay)} should not be hidden as it will remove the ability of a user to quit. Use {nameof(ShowHud)} instead.");

        protected override void LoadComplete()
        {
@ -152,6 +155,7 @@ namespace osu.Game.Screens.Play

            ShowHud.BindValueChanged(visible => hideTargets.ForEach(d => d.FadeTo(visible.NewValue ? 1 : 0, FADE_DURATION, FADE_EASING)));

+            holdingForHUD.BindValueChanged(_ => updateVisibility());
            IsPlaying.BindValueChanged(_ => updateVisibility());
            configVisibilityMode.BindValueChanged(_ => updateVisibility(), true);

@ -204,7 +208,7 @@ namespace osu.Game.Screens.Play
            if (ShowHud.Disabled)
                return;

-            if (holdingForHUD)
+            if (holdingForHUD.Value)
            {
                ShowHud.Value = true;
                return;
@ -287,8 +291,7 @@ namespace osu.Game.Screens.Play
            switch (e.Action)
            {
                case GlobalAction.HoldForHUD:
-                    holdingForHUD = true;
-                    updateVisibility();
+                    holdingForHUD.Value = true;
                    return true;

                case GlobalAction.ToggleInGameInterface:
@ -318,8 +321,7 @@ namespace osu.Game.Screens.Play
            switch (e.Action)
            {
                case GlobalAction.HoldForHUD:
-                    holdingForHUD = false;
-                    updateVisibility();
+                    holdingForHUD.Value = false;
                    break;
            }
        }
--- a/osu.Game/Utils/SentryLogger.cs
+++ b/osu.Game/Utils/SentryLogger.cs
@ -46,7 +46,9 @@ namespace osu.Game.Utils

                options.AutoSessionTracking = true;
                options.IsEnvironmentUser = false;
-                options.Release = game.Version;
+                // The reported release needs to match release tags on github in order for sentry
+                // to automatically associate and track against releases.
+                options.Release = game.Version.Replace($@"-{OsuGameBase.BUILD_SUFFIX}", string.Empty);
            });

            Logger.NewEntry += processLogEntry;
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@ -23,9 +23,9 @@
    <PackageReference Include="HtmlAgilityPack" Version="1.11.42" />
    <PackageReference Include="Humanizer" Version="2.14.1" />
    <PackageReference Include="MessagePack" Version="2.3.85" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="6.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="6.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="6.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="6.0.5" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="6.0.5" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="6.0.5" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.14" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="5.0.14" />
    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
@ -34,12 +34,12 @@
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
-    <PackageReference Include="Realm" Version="10.10.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2022.509.0" />
+    <PackageReference Include="Realm" Version="10.12.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2022.511.0" />
    <PackageReference Include="ppy.osu.Game.Resources" Version="2022.422.0" />
-    <PackageReference Include="Sentry" Version="3.14.1" />
-    <PackageReference Include="SharpCompress" Version="0.30.1" />
-    <PackageReference Include="NUnit" Version="3.13.2" />
+    <PackageReference Include="Sentry" Version="3.17.1" />
+    <PackageReference Include="SharpCompress" Version="0.31.0" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
    <PackageReference Include="TagLibSharp" Version="2.2.0" />
  </ItemGroup>
--- a/osu.iOS.props
+++ b/osu.iOS.props
@ -61,7 +61,7 @@
    <Reference Include="System.Net.Http" />
  </ItemGroup>
  <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2022.509.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2022.511.0" />
    <PackageReference Include="ppy.osu.Game.Resources" Version="2022.422.0" />
  </ItemGroup>
  <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net6.0) -->
@ -84,11 +84,11 @@
    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.14" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="5.0.14" />
    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2022.509.0" />
-    <PackageReference Include="SharpCompress" Version="0.30.1" />
-    <PackageReference Include="NUnit" Version="3.13.2" />
+    <PackageReference Include="ppy.osu.Framework" Version="2022.511.0" />
+    <PackageReference Include="SharpCompress" Version="0.31.0" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
-    <PackageReference Include="ppy.osu.Framework.NativeLibs" Version="2021.1221.0" ExcludeAssets="all" />
-    <PackageReference Include="Realm" Version="10.10.0" />
+    <PackageReference Include="ppy.osu.Framework.NativeLibs" Version="2022.429.0" ExcludeAssets="all" />
+    <PackageReference Include="Realm" Version="10.12.0" />
  </ItemGroup>
 </Project>