From 12c77cca26b66c70e8efb0ae8d9a594c62b27fb8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Dec 2022 15:44:10 +0900
Subject: [PATCH 1/6] Remove `rollForward` rule for now

---
 global.json | 6 ------
 osu.sln     | 1 -
 2 files changed, 7 deletions(-)
 delete mode 100644 global.json

diff --git a/global.json b/global.json
deleted file mode 100644
index f20ff84190..0000000000
--- a/global.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "sdk": {
-    "version": "6.0.300",
-    "rollForward": "major"
-  }
-}
diff --git a/osu.sln b/osu.sln
index 5b23ff9ae6..aeec0843be 100644
--- a/osu.sln
+++ b/osu.sln
@@ -63,7 +63,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		CodeAnalysis\osu.ruleset = CodeAnalysis\osu.ruleset
 		osu.sln.DotSettings = osu.sln.DotSettings
 		osu.TestProject.props = osu.TestProject.props
-		global.json = global.json
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "osu.Game.Benchmarks", "osu.Game.Benchmarks\osu.Game.Benchmarks.csproj", "{93632F2D-2BB4-46C1-A7B8-F8CF2FB27118}"

From 99ad78cdd631e5b999dd8ebcef6e978906fcb63c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Dec 2022 22:01:13 +0900
Subject: [PATCH 2/6] Remove no longer necessary workarounds from mobile props
 files

---
 osu.Android.props | 4 ----
 osu.iOS.props     | 9 ---------
 2 files changed, 13 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 5da7eae380..a0ad0cdcdc 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -12,10 +12,6 @@
   <ItemGroup>
     <PackageReference Include="ppy.osu.Framework.Android" Version="2022.1216.1" />
   </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.18.0" />
-  </ItemGroup>
   <ItemGroup>
     <LinkDescription Include="$(MSBuildThisFileDirectory)\osu.Android\Linker.xml"/>
   </ItemGroup>
diff --git a/osu.iOS.props b/osu.iOS.props
index 98d3e129d4..4dac17c024 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -15,15 +15,6 @@
   <PropertyGroup Condition="'$(Platform)' == 'iPhoneSimulator'">
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
-  <!-- Workaround to make SignalR 5.x work properly, avoiding a runtime error (https://github.com/mono/mono/issues/20805#issuecomment-791440473) -->
-  <ItemGroup>
-    <PackageReference Include="System.Memory" Version="4.5.4">
-      <IncludeAssets>none</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="System.Buffers" Version="4.5.1">
-      <IncludeAssets>none</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2022.1216.1" />
   </ItemGroup>

From ecac6299c6679d6c29133cb9fab88e53520b7104 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Dec 2022 22:01:20 +0900
Subject: [PATCH 3/6] Update framework

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

diff --git a/osu.Android.props b/osu.Android.props
index a0ad0cdcdc..31670bedb5 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -10,7 +10,7 @@
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2022.1216.1" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2022.1219.0" />
   </ItemGroup>
   <ItemGroup>
     <LinkDescription Include="$(MSBuildThisFileDirectory)\osu.Android\Linker.xml"/>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 8bb68faf7b..8b4fa2dc6b 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -35,7 +35,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="10.18.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2022.1216.1" />
+    <PackageReference Include="ppy.osu.Framework" Version="2022.1219.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2022.1207.0" />
     <PackageReference Include="Sentry" Version="3.23.1" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 4dac17c024..0ff4fafb31 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -16,7 +16,7 @@
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2022.1216.1" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2022.1219.0" />
   </ItemGroup>
   <!-- OpenTabletDriver contains P/Invokes to the "Quartz" framework for native macOS code.
        This leads iOS linker into attempting to include that framework, despite not existing on such platform.

From 396ac0436ce8489a4bdbab0705cf4d306e3dbe38 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 19 Dec 2022 18:24:46 +0300
Subject: [PATCH 4/6] Remove automatically provided workaround

---
 osu.iOS.props | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/osu.iOS.props b/osu.iOS.props
index 0ff4fafb31..b5f470eda1 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -18,12 +18,4 @@
   <ItemGroup>
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2022.1219.0" />
   </ItemGroup>
-  <!-- OpenTabletDriver contains P/Invokes to the "Quartz" framework for native macOS code.
-       This leads iOS linker into attempting to include that framework, despite not existing on such platform.
-       See: https://github.com/OpenTabletDriver/OpenTabletDriver/issues/2524 / https://github.com/xamarin/xamarin-macios/issues/15118#issuecomment-1141893683 -->
-  <Target Name="OsuFrameworkIOSRemoveQuartz" BeforeTargets="_ComputeLinkNativeExecutableInputs" AfterTargets="_LoadLinkerOutput">
-    <ItemGroup>
-      <_LinkerFrameworks Remove="Quartz"/>
-    </ItemGroup>
-  </Target>
 </Project>

From 2249c97a6f1232f9c626ff0648fbf2c43714281a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 19 Dec 2022 18:27:19 +0300
Subject: [PATCH 5/6] Pin certain system package versions to avoid downgrade
 errors

---
 osu.iOS.props | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.iOS.props b/osu.iOS.props
index b5f470eda1..c6798cd5e4 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -17,5 +17,10 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2022.1219.0" />
+
+    <!-- Required since Veldrid references a library that depends on Microsoft.DotNet.PlatformAbstractions (2.0.3), which doesn't play nice with Realm. -->
+    <PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
+    <PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
+    <PackageReference Include="System.Runtime.Handles" Version="4.3.0" />
   </ItemGroup>
 </Project>

From d47a8b2e26df2146e468e4606de0b3adf8690130 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Mon, 19 Dec 2022 18:42:51 +0300
Subject: [PATCH 6/6] Remove unnecessary discard

---
 osu.iOS/OsuGameIOS.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.iOS/OsuGameIOS.cs b/osu.iOS/OsuGameIOS.cs
index cb3b260033..3e79bc6ad6 100644
--- a/osu.iOS/OsuGameIOS.cs
+++ b/osu.iOS/OsuGameIOS.cs
@@ -33,7 +33,7 @@ namespace osu.iOS
         {
             switch (handler)
             {
-                case IOSMouseHandler _:
+                case IOSMouseHandler:
                     return new IOSMouseSettings();
 
                 default: