From 7191fbb6d615c327b3a67dfe3a871fa5d0ba8fbd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Aug 2022 16:40:07 +0900
Subject: [PATCH 1/5] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 247140ceef..74e5b49167 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,7 +52,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2022.810.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2022.810.2" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2022.816.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. -->
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index c17d45e84a..c3c9834724 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -36,7 +36,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="10.14.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2022.810.2" />
+    <PackageReference Include="ppy.osu.Framework" Version="2022.816.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2022.810.0" />
     <PackageReference Include="Sentry" Version="3.19.0" />
     <PackageReference Include="SharpCompress" Version="0.32.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 5bfb53bc9d..da48550efb 100644
--- 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.810.2" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2022.816.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2022.810.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net6.0) -->
@@ -84,7 +84,7 @@
     <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.810.2" />
+    <PackageReference Include="ppy.osu.Framework" Version="2022.816.0" />
     <PackageReference Include="SharpCompress" Version="0.32.1" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />

From a5ac69a5549a11c4d12f2614a7afe589e438a136 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Aug 2022 16:42:34 +0900
Subject: [PATCH 2/5] Update various dependencies

---
 .../osu.Game.Rulesets.Osu.Tests.csproj             |  2 +-
 osu.Game.Tests/osu.Game.Tests.csproj               |  2 +-
 osu.Game/osu.Game.csproj                           | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj b/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj
index 4349d25cb3..36c40c0fe2 100644
--- a/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj
+++ b/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj
@@ -2,7 +2,7 @@
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="Moq" Version="4.18.1" />
+    <PackageReference Include="Moq" Version="4.18.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index 7615b3e8be..65679deb01 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -7,7 +7,7 @@
     <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.18.1" />
+    <PackageReference Include="Moq" Version="4.18.2" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index c3c9834724..d67f8415e7 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -23,9 +23,9 @@
     <PackageReference Include="HtmlAgilityPack" Version="1.11.43" />
     <PackageReference Include="Humanizer" Version="2.14.1" />
     <PackageReference Include="MessagePack" Version="2.4.35" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="6.0.6" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="6.0.6" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="6.0.6" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="6.0.8" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="6.0.8" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="6.0.8" />
     <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" />
@@ -35,13 +35,13 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Realm" Version="10.14.0" />
+    <PackageReference Include="Realm" Version="10.15.1" />
     <PackageReference Include="ppy.osu.Framework" Version="2022.816.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2022.810.0" />
-    <PackageReference Include="Sentry" Version="3.19.0" />
-    <PackageReference Include="SharpCompress" Version="0.32.1" />
+    <PackageReference Include="Sentry" Version="3.20.1" />
+    <PackageReference Include="SharpCompress" Version="0.32.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
-    <PackageReference Include="TagLibSharp" Version="2.2.0" />
+    <PackageReference Include="TagLibSharp" Version="2.3.0" />
   </ItemGroup>
 </Project>

From 243fe56b1dc13987b12203537db12ab9a559ff3a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Aug 2022 17:11:17 +0900
Subject: [PATCH 3/5] Realm bump for props

---
 osu.Android.props | 2 +-
 osu.iOS.props     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 74e5b49167..6dbc6cc377 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -56,6 +56,6 @@
   </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.14.0" />
+    <PackageReference Include="Realm" Version="10.15.1" />
   </ItemGroup>
 </Project>
diff --git a/osu.iOS.props b/osu.iOS.props
index da48550efb..463af1143f 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -89,6 +89,6 @@
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
     <PackageReference Include="ppy.osu.Framework.NativeLibs" Version="2022.429.0" ExcludeAssets="all" />
-    <PackageReference Include="Realm" Version="10.14.0" />
+    <PackageReference Include="Realm" Version="10.15.1" />
   </ItemGroup>
 </Project>

From fca076b9886f8552797e24b23c9f52603c718e5f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Aug 2022 17:17:22 +0900
Subject: [PATCH 4/5] Fix edge case of realm backup cascading failure

---
 osu.Game/Database/RealmAccess.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index cdaf35a1fb..dd219cc1aa 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -902,7 +902,14 @@ namespace osu.Game.Database
                 {
                     using (var source = storage.GetStream(Filename, mode: FileMode.Open))
                     using (var destination = storage.GetStream(backupFilename, FileAccess.Write, FileMode.CreateNew))
+                    {
+                        // source may not exist.
+                        if (source == null)
+                            return;
+
                         source.CopyTo(destination);
+                    }
+
                     return;
                 }
                 catch (IOException)

From e1e6be039a234a3d0ba2cd44588a0cd0881dac0f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Aug 2022 18:20:47 +0900
Subject: [PATCH 5/5] Don't create destination stream if backup source doesn't
 exist

---
 osu.Game/Database/RealmAccess.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index dd219cc1aa..0f2e724567 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -901,13 +901,13 @@ namespace osu.Game.Database
                 try
                 {
                     using (var source = storage.GetStream(Filename, mode: FileMode.Open))
-                    using (var destination = storage.GetStream(backupFilename, FileAccess.Write, FileMode.CreateNew))
                     {
                         // source may not exist.
                         if (source == null)
                             return;
 
-                        source.CopyTo(destination);
+                        using (var destination = storage.GetStream(backupFilename, FileAccess.Write, FileMode.CreateNew))
+                            source.CopyTo(destination);
                     }
 
                     return;