From c9b96a18294b0143a38407951b15072a7cd8f9ff Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Nov 2020 15:52:57 +0900
Subject: [PATCH 1/6] Disable spectator streaming connection logic on iOS to
 avoid startup crash

Due to an [issue](https://github.com/dotnet/runtime/issues/35988) at
xamarin's end (which *should* have been fixed via [this
pr](https://github.com/xamarin/xamarin-macios/pull/8615) but still fails
on latest preview release) we can't support this just yet.
---
 osu.Game/Online/Spectator/SpectatorStreamingClient.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index cb170ad298..125831035a 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -10,6 +10,7 @@ using JetBrains.Annotations;
 using Microsoft.AspNetCore.SignalR.Client;
 using Microsoft.Extensions.DependencyInjection;
 using Newtonsoft.Json;
+using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -101,6 +102,10 @@ namespace osu.Game.Online.Spectator
 
         private async Task connect()
         {
+            if (RuntimeInfo.OS == RuntimeInfo.Platform.iOS)
+                // disabled for now (see https://github.com/dotnet/runtime/issues/35988)
+                return;
+
             if (connection != null)
                 return;
 

From 1d90f5fc082b636eb4f2a6466deada44bdd16d43 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Nov 2020 14:16:51 +0900
Subject: [PATCH 2/6] Revert "Disable spectator streaming connection logic on
 iOS to avoid startup crash"

This reverts commit c9b96a18294b0143a38407951b15072a7cd8f9ff.
---
 osu.Game/Online/Spectator/SpectatorStreamingClient.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
index 125831035a..cb170ad298 100644
--- a/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
+++ b/osu.Game/Online/Spectator/SpectatorStreamingClient.cs
@@ -10,7 +10,6 @@ using JetBrains.Annotations;
 using Microsoft.AspNetCore.SignalR.Client;
 using Microsoft.Extensions.DependencyInjection;
 using Newtonsoft.Json;
-using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -102,10 +101,6 @@ namespace osu.Game.Online.Spectator
 
         private async Task connect()
         {
-            if (RuntimeInfo.OS == RuntimeInfo.Platform.iOS)
-                // disabled for now (see https://github.com/dotnet/runtime/issues/35988)
-                return;
-
             if (connection != null)
                 return;
 

From 5316d4c3696d7939f47b5364286e3e9c0c463dd7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Nov 2020 14:16:34 +0900
Subject: [PATCH 3/6] Force using older signalr version for iOS

---
 osu.iOS/osu.iOS.csproj | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.iOS/osu.iOS.csproj b/osu.iOS/osu.iOS.csproj
index 1e9a21865d..2c6489a5d3 100644
--- a/osu.iOS/osu.iOS.csproj
+++ b/osu.iOS/osu.iOS.csproj
@@ -116,5 +116,9 @@
       <Visible>false</Visible>
     </ImageAsset>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.0.3" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.3" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
 </Project>

From 6c4acb4d11c404602085f5e9a4132da44ff37faf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Nov 2020 14:45:13 +0900
Subject: [PATCH 4/6] Move to props and ignore downgrade warning

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

diff --git a/osu.iOS.props b/osu.iOS.props
index 76c496cd2d..61bb690225 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -73,6 +73,14 @@
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.1029.1" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.1030.0" />
   </ItemGroup>
+  <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
+  <PropertyGroup>
+    <NoWarn>NU1605</NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.0.3" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.3" />
+  </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">
     <PackageReference Include="DiffPlex" Version="1.6.3" />

From d1829820e09559791f9436ac6c1c410faf47893c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Nov 2020 14:53:29 +0900
Subject: [PATCH 5/6] Remove local changes from csproj

---
 osu.iOS/osu.iOS.csproj | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/osu.iOS/osu.iOS.csproj b/osu.iOS/osu.iOS.csproj
index 2c6489a5d3..1e9a21865d 100644
--- a/osu.iOS/osu.iOS.csproj
+++ b/osu.iOS/osu.iOS.csproj
@@ -116,9 +116,5 @@
       <Visible>false</Visible>
     </ImageAsset>
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.0.3" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.3" />
-  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
 </Project>

From 7d0a7f170c388e90cf0f4f004fbd260e02499e92 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Nov 2020 14:57:47 +0900
Subject: [PATCH 6/6] Avoid overwriting inherited nowarns

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
---
 osu.iOS.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.iOS.props b/osu.iOS.props
index 61bb690225..40ecfffcca 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -75,7 +75,7 @@
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
   <PropertyGroup>
-    <NoWarn>NU1605</NoWarn>
+    <NoWarn>$(NoWarn);NU1605</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.0.3" />