From 1f4c17b8f856a1d010fd2e45345d199c51dfba14 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 7 Apr 2021 21:20:44 +0900
Subject: [PATCH 1/3] Apply changes to AllowScreenSuspension bindable

---
 .../Screens/Play/ScreenSuspensionHandler.cs   | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Play/ScreenSuspensionHandler.cs b/osu.Game/Screens/Play/ScreenSuspensionHandler.cs
index 8585a5c30996..30ca15c311ae 100644
--- a/osu.Game/Screens/Play/ScreenSuspensionHandler.cs
+++ b/osu.Game/Screens/Play/ScreenSuspensionHandler.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Diagnostics;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -19,6 +18,8 @@ public class ScreenSuspensionHandler : Component
         private readonly GameplayClockContainer gameplayClockContainer;
         private Bindable<bool> isPaused;
 
+        private readonly Bindable<bool> disableSuspensionBindable = new Bindable<bool>();
+
         [Resolved]
         private GameHost host { get; set; }
 
@@ -31,12 +32,14 @@ protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            // This is the only usage game-wide of suspension changes.
-            // Assert to ensure we don't accidentally forget this in the future.
-            Debug.Assert(host.AllowScreenSuspension.Value);
-
             isPaused = gameplayClockContainer.IsPaused.GetBoundCopy();
-            isPaused.BindValueChanged(paused => host.AllowScreenSuspension.Value = paused.NewValue, true);
+            isPaused.BindValueChanged(paused =>
+            {
+                if (paused.NewValue)
+                    host.AllowScreenSuspension.RemoveSource(disableSuspensionBindable);
+                else
+                    host.AllowScreenSuspension.AddSource(disableSuspensionBindable);
+            }, true);
         }
 
         protected override void Dispose(bool isDisposing)
@@ -44,9 +47,7 @@ protected override void Dispose(bool isDisposing)
             base.Dispose(isDisposing);
 
             isPaused?.UnbindAll();
-
-            if (host != null)
-                host.AllowScreenSuspension.Value = true;
+            host?.AllowScreenSuspension.RemoveSource(disableSuspensionBindable);
         }
     }
 }

From 8cc1e8b8b0605e981b1d0be53cb9a0590383e532 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Apr 2021 23:11:01 +0900
Subject: [PATCH 2/3] Update framework

---
 .idea/.idea.osu.Desktop/.idea/indexLayout.xml | 2 +-
 osu.Android.props                             | 2 +-
 osu.Game/osu.Game.csproj                      | 2 +-
 osu.iOS.props                                 | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.idea/.idea.osu.Desktop/.idea/indexLayout.xml b/.idea/.idea.osu.Desktop/.idea/indexLayout.xml
index 27ba142e96c1..7b08163cebc5 100644
--- a/.idea/.idea.osu.Desktop/.idea/indexLayout.xml
+++ b/.idea/.idea.osu.Desktop/.idea/indexLayout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ContentModelUserStore">
+  <component name="UserContentModel">
     <attachedFolders />
     <explicitIncludes />
     <explicitExcludes />
diff --git a/osu.Android.props b/osu.Android.props
index 73ee1d9d10b4..cba397520971 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.402.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.407.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 931b55222ace..292e5b932f70 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NETCore.Targets" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.402.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.407.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
     <PackageReference Include="Sentry" Version="3.2.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 64e9a01a9201..36e581a80cec 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.402.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.407.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.211.1" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -93,7 +93,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.402.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.407.0" />
     <PackageReference Include="SharpCompress" Version="0.28.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 544fff5af6f9fa20e1aa04e5aaa0a5ea3865b220 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Apr 2021 23:18:45 +0900
Subject: [PATCH 3/3] Undo rider EAP changes for the time being

---
 .idea/.idea.osu.Desktop/.idea/indexLayout.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.idea/.idea.osu.Desktop/.idea/indexLayout.xml b/.idea/.idea.osu.Desktop/.idea/indexLayout.xml
index 7b08163cebc5..27ba142e96c1 100644
--- a/.idea/.idea.osu.Desktop/.idea/indexLayout.xml
+++ b/.idea/.idea.osu.Desktop/.idea/indexLayout.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="UserContentModel">
+  <component name="ContentModelUserStore">
     <attachedFolders />
     <explicitIncludes />
     <explicitExcludes />