chore: remove deprecated relay package (#3201)

NoelStephensUnity · web-flow · commit 248aa2145e86 · 2025-01-10T17:55:40.000-06:00
* update

updating the manifest to remove the deprecated relay package

* update

wrapping legacy code to prevent it from being compiled without the deprecated relay package.
(we might just remove all of this script eventually)

* update

updating the project version and settings as well as the default prefab list.

* style

Fixing import ordering.

* style

fixing the import order
diff --git a/testproject/Assets/DefaultNetworkPrefabs.asset b/testproject/Assets/DefaultNetworkPrefabs.asset
@@ -219,13 +219,7 @@ MonoBehaviour:
     SourceHashToOverride: 0
     OverridingTargetPrefab: {fileID: 0}
   - Override: 0
-    Prefab: {fileID: 8133991607019124060, guid: 421bcf732fe69486d8abecfa5eee63bb,
-      type: 3}
-    SourcePrefabToOverride: {fileID: 0}
-    SourceHashToOverride: 0
-    OverridingTargetPrefab: {fileID: 0}
-  - Override: 0
-    Prefab: {fileID: 3439633038736912633, guid: 398aad09d8b2a47eba664a076763cdcc,
+    Prefab: {fileID: 3830151999068797299, guid: 074ae41741b33f84ca886d5b8dc482d2,
       type: 3}
     SourcePrefabToOverride: {fileID: 0}
     SourceHashToOverride: 0
diff --git a/testproject/Assets/Scripts/ConnectionModeScript.cs b/testproject/Assets/Scripts/ConnectionModeScript.cs
@@ -1,13 +1,16 @@
+#if ENABLE_RELAY_SERVICE
+using System;
+#endif
 using System.Collections;
-using UnityEngine;
 using Unity.Netcode;
 using Unity.Netcode.Transports.UTP;
-using UnityEngine.SceneManagement;
 #if ENABLE_RELAY_SERVICE
-using System;
 using Unity.Services.Core;
 using Unity.Services.Authentication;
 #endif
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
 
 /// <summary>
 /// Used in tandem with the ConnectModeButtons prefab asset in test project
@@ -23,8 +26,10 @@ public class ConnectionModeScript : MonoBehaviour
     [SerializeField]
     private GameObject m_JoinCodeInput;
 
+#if ENABLE_RELAY_SERVICE
     [SerializeField]
     private int m_MaxConnections = 10;
+#endif
 
     [SerializeField]
     private LoadSceneMode m_ClientSynchronizationMode;
@@ -126,8 +131,10 @@ private void OnServicesInitialized()
         if (HasRelaySupport())
         {
             m_JoinCodeInput.SetActive(true);
+#if ENABLE_RELAY_SERVICE
             m_ConnectionModeButtons?.SetActive(false || AuthenticationService.Instance.IsSignedIn);
             m_AuthenticationButtons?.SetActive(NetworkManager.Singleton && !NetworkManager.Singleton.IsListening && !AuthenticationService.Instance.IsSignedIn);
+#endif
         }
     }
 
@@ -138,11 +145,13 @@ public void OnStartServerButton()
     {
         if (NetworkManager.Singleton && !NetworkManager.Singleton.IsListening && m_ConnectionModeButtons)
         {
+#if ENABLE_RELAY_SERVICE
             if (HasRelaySupport())
             {
                 StartCoroutine(StartRelayServer(StartServer));
             }
             else
+#endif
             {
                 StartServer();
             }
@@ -170,13 +179,13 @@ private void OnServerStopped(bool obj)
         }
     }
 
-
+#if ENABLE_RELAY_SERVICE
     /// <summary>
     /// Coroutine that handles starting MLAPI in server mode if Relay is enabled
     /// </summary>
     private IEnumerator StartRelayServer(Action postAllocationAction)
     {
-#if ENABLE_RELAY_SERVICE
+
         m_ConnectionModeButtons?.SetActive(false);
 
         var serverRelayUtilityTask = RelayUtility.AllocateRelayServerAndGetJoinCode(m_MaxConnections);
@@ -198,11 +207,8 @@ private IEnumerator StartRelayServer(Action postAllocationAction)
         NetworkManager.Singleton.GetComponent<UnityTransport>().SetRelayServerData(ipv4address, port, allocationIdBytes, key, connectionData);
 
         postAllocationAction();
-#else
-        yield return null;
-#endif
     }
-
+#endif
 
     /// <summary>
     /// Handles starting netcode in host mode
@@ -211,11 +217,13 @@ public void OnStartHostButton()
     {
         if (NetworkManager.Singleton && !NetworkManager.Singleton.IsListening && m_ConnectionModeButtons)
         {
+#if ENABLE_RELAY_SERVICE
             if (HasRelaySupport())
             {
                 StartCoroutine(StartRelayServer(StartHost));
             }
             else
+#endif
             {
                 StartHost();
             }
diff --git a/testproject/Assets/Scripts/RelayUtility.cs b/testproject/Assets/Scripts/RelayUtility.cs
@@ -1,3 +1,4 @@
+#if ENABLE_RELAY_SERVICE
 using System;
 using System.Threading.Tasks;
 using Unity.Services.Relay;
@@ -56,3 +57,4 @@ public class RelayUtility
         return (allocation.RelayServer.IpV4, (ushort)allocation.RelayServer.Port, allocation.AllocationIdBytes, allocation.ConnectionData, allocation.HostConnectionData, allocation.Key);
     }
 }
+#endif
diff --git a/testproject/Assets/Scripts/UIController.cs b/testproject/Assets/Scripts/UIController.cs
@@ -1,10 +1,11 @@
-using UnityEngine;
 using Unity.Netcode;
 using Unity.Netcode.Transports.UTP;
 #if ENABLE_RELAY_SERVICE
 using Unity.Services.Core;
 using Unity.Services.Authentication;
 #endif
+using UnityEngine;
+
 
 public class UIController : MonoBehaviour
 {
@@ -49,10 +50,10 @@ private void HideButtons()
         ButtonsRoot.SetActive(false);
     }
 
-
+#if ENABLE_RELAY_SERVICE
     public async void OnSignIn()
     {
-#if ENABLE_RELAY_SERVICE
+
         await UnityServices.InitializeAsync();
         Debug.Log("OnSignIn");
         await AuthenticationService.Instance.SignInAnonymouslyAsync();
@@ -64,6 +65,7 @@ public async void OnSignIn()
             JoinCode.SetActive(true);
             AuthButton.SetActive(false);
         }
-#endif
+
     }
+#endif
 }
diff --git a/testproject/Packages/manifest.json b/testproject/Packages/manifest.json
@@ -1,20 +1,19 @@
 {
   "dependencies": {
-    "com.unity.addressables": "2.1.0",
-    "com.unity.ai.navigation": "2.0.0",
-    "com.unity.collab-proxy": "2.4.3",
-    "com.unity.ide.rider": "3.0.28",
+    "com.unity.addressables": "2.2.2",
+    "com.unity.ai.navigation": "2.0.5",
+    "com.unity.collab-proxy": "2.6.0",
+    "com.unity.ide.rider": "3.0.31",
     "com.unity.ide.visualstudio": "2.0.22",
     "com.unity.mathematics": "1.3.2",
     "com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects",
     "com.unity.package-validation-suite": "0.49.0-preview",
-    "com.unity.services.authentication": "3.3.3",
-    "com.unity.services.core": "1.13.0",
-    "com.unity.services.relay": "1.0.5",
-    "com.unity.test-framework": "1.4.4",
+    "com.unity.services.authentication": "3.4.0",
+    "com.unity.services.core": "1.14.0",
+    "com.unity.test-framework": "1.4.5",
     "com.unity.test-framework.performance": "3.0.3",
     "com.unity.timeline": "1.8.7",
-    "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.9",
+    "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.10",
     "com.unity.ugui": "2.0.0",
     "com.unity.modules.accessibility": "1.0.0",
     "com.unity.modules.ai": "1.0.0",
diff --git a/testproject/ProjectSettings/ProjectSettings.asset b/testproject/ProjectSettings/ProjectSettings.asset
diff --git a/testproject/ProjectSettings/ProjectVersion.txt b/testproject/ProjectSettings/ProjectVersion.txt

Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,16 @@`
	`1`	`+#if ENABLE_RELAY_SERVICE`
	`2`	`+using System;`
	`3`	`+#endif`
`1`	`4`	`using System.Collections;`
`2`		`-using UnityEngine;`
`3`	`5`	`using Unity.Netcode;`
`4`	`6`	`using Unity.Netcode.Transports.UTP;`
`5`		`-using UnityEngine.SceneManagement;`
`6`	`7`	`#if ENABLE_RELAY_SERVICE`
`7`		`-using System;`
`8`	`8`	`using Unity.Services.Core;`
`9`	`9`	`using Unity.Services.Authentication;`
`10`	`10`	`#endif`
	`11`	`+using UnityEngine;`
	`12`	`+using UnityEngine.SceneManagement;`
	`13`	`+`
`11`	`14`
`12`	`15`	`/// <summary>`
`13`	`16`	`/// Used in tandem with the ConnectModeButtons prefab asset in test project`
`@@ -23,8 +26,10 @@ public class ConnectionModeScript : MonoBehaviour`
`23`	`26`	`[SerializeField]`
`24`	`27`	`private GameObject m_JoinCodeInput;`
`25`	`28`
	`29`	`+#if ENABLE_RELAY_SERVICE`
`26`	`30`	`[SerializeField]`
`27`	`31`	`private int m_MaxConnections = 10;`
	`32`	`+#endif`
`28`	`33`
`29`	`34`	`[SerializeField]`
`30`	`35`	`private LoadSceneMode m_ClientSynchronizationMode;`
`@@ -126,8 +131,10 @@ private void OnServicesInitialized()`
`126`	`131`	`if (HasRelaySupport())`
`127`	`132`	`{`
`128`	`133`	`m_JoinCodeInput.SetActive(true);`
	`134`	`+#if ENABLE_RELAY_SERVICE`
`129`	`135`	`m_ConnectionModeButtons?.SetActive(false \|\| AuthenticationService.Instance.IsSignedIn);`
`130`	`136`	`m_AuthenticationButtons?.SetActive(NetworkManager.Singleton && !NetworkManager.Singleton.IsListening && !AuthenticationService.Instance.IsSignedIn);`
	`137`	`+#endif`
`131`	`138`	`}`
`132`	`139`	`}`
`133`	`140`
`@@ -138,11 +145,13 @@ public void OnStartServerButton()`
`138`	`145`	`{`
`139`	`146`	`if (NetworkManager.Singleton && !NetworkManager.Singleton.IsListening && m_ConnectionModeButtons)`
`140`	`147`	`{`
	`148`	`+#if ENABLE_RELAY_SERVICE`
`141`	`149`	`if (HasRelaySupport())`
`142`	`150`	`{`
`143`	`151`	`StartCoroutine(StartRelayServer(StartServer));`
`144`	`152`	`}`
`145`	`153`	`else`
	`154`	`+#endif`
`146`	`155`	`{`
`147`	`156`	`StartServer();`
`148`	`157`	`}`
`@@ -170,13 +179,13 @@ private void OnServerStopped(bool obj)`
`170`	`179`	`}`
`171`	`180`	`}`
`172`	`181`
`173`		`-`
	`182`	`+#if ENABLE_RELAY_SERVICE`
`174`	`183`	`/// <summary>`
`175`	`184`	`/// Coroutine that handles starting MLAPI in server mode if Relay is enabled`
`176`	`185`	`/// </summary>`
`177`	`186`	`private IEnumerator StartRelayServer(Action postAllocationAction)`
`178`	`187`	`{`
`179`		`-#if ENABLE_RELAY_SERVICE`
	`188`	`+`
`180`	`189`	`m_ConnectionModeButtons?.SetActive(false);`
`181`	`190`
`182`	`191`	`var serverRelayUtilityTask = RelayUtility.AllocateRelayServerAndGetJoinCode(m_MaxConnections);`
`@@ -198,11 +207,8 @@ private IEnumerator StartRelayServer(Action postAllocationAction)`
`198`	`207`	`NetworkManager.Singleton.GetComponent<UnityTransport>().SetRelayServerData(ipv4address, port, allocationIdBytes, key, connectionData);`
`199`	`208`
`200`	`209`	`postAllocationAction();`
`201`		`-#else`
`202`		`- yield return null;`
`203`		`-#endif`
`204`	`210`	`}`
`205`		`-`
	`211`	`+#endif`
`206`	`212`
`207`	`213`	`/// <summary>`
`208`	`214`	`/// Handles starting netcode in host mode`
`@@ -211,11 +217,13 @@ public void OnStartHostButton()`
`211`	`217`	`{`
`212`	`218`	`if (NetworkManager.Singleton && !NetworkManager.Singleton.IsListening && m_ConnectionModeButtons)`
`213`	`219`	`{`
	`220`	`+#if ENABLE_RELAY_SERVICE`
`214`	`221`	`if (HasRelaySupport())`
`215`	`222`	`{`
`216`	`223`	`StartCoroutine(StartRelayServer(StartHost));`
`217`	`224`	`}`
`218`	`225`	`else`
	`226`	`+#endif`
`219`	`227`	`{`
`220`	`228`	`StartHost();`
`221`	`229`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#if ENABLE_RELAY_SERVICE`
`1`	`2`	`using System;`
`2`	`3`	`using System.Threading.Tasks;`
`3`	`4`	`using Unity.Services.Relay;`
`@@ -56,3 +57,4 @@ public class RelayUtility`
`56`	`57`	`return (allocation.RelayServer.IpV4, (ushort)allocation.RelayServer.Port, allocation.AllocationIdBytes, allocation.ConnectionData, allocation.HostConnectionData, allocation.Key);`
`57`	`58`	`}`
`58`	`59`	`}`
	`60`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,11 @@`
`1`		`-using UnityEngine;`
`2`	`1`	`using Unity.Netcode;`
`3`	`2`	`using Unity.Netcode.Transports.UTP;`
`4`	`3`	`#if ENABLE_RELAY_SERVICE`
`5`	`4`	`using Unity.Services.Core;`
`6`	`5`	`using Unity.Services.Authentication;`
`7`	`6`	`#endif`
	`7`	`+using UnityEngine;`
	`8`	`+`
`8`	`9`
`9`	`10`	`public class UIController : MonoBehaviour`
`10`	`11`	`{`
`@@ -49,10 +50,10 @@ private void HideButtons()`
`49`	`50`	`ButtonsRoot.SetActive(false);`
`50`	`51`	`}`
`51`	`52`
`52`		`-`
	`53`	`+#if ENABLE_RELAY_SERVICE`
`53`	`54`	`public async void OnSignIn()`
`54`	`55`	`{`
`55`		`-#if ENABLE_RELAY_SERVICE`
	`56`	`+`
`56`	`57`	`await UnityServices.InitializeAsync();`
`57`	`58`	`Debug.Log("OnSignIn");`
`58`	`59`	`await AuthenticationService.Instance.SignInAnonymouslyAsync();`
`@@ -64,6 +65,7 @@ public async void OnSignIn()`
`64`	`65`	`JoinCode.SetActive(true);`
`65`	`66`	`AuthButton.SetActive(false);`
`66`	`67`	`}`
`67`		`-#endif`
	`68`	`+`
`68`	`69`	`}`
	`70`	`+#endif`
`69`	`71`	`}`