refactor: Remove defines based on UTP version

com.unity.netcode.gameobjects/Editor/NetworkManagerRelayIntegration.cs

@@ -1,4 +1,4 @@
-#if UNITY_2022_3_OR_NEWER && (RELAY_SDK_INSTALLED && !UNITY_WEBGL ) || (RELAY_SDK_INSTALLED && UNITY_WEBGL && UTP_TRANSPORT_2_0_ABOVE)
+#if UNITY_2022_3_OR_NEWER && (RELAY_SDK_INSTALLED && !UNITY_WEBGL ) || (RELAY_SDK_INSTALLED && UNITY_WEBGL)
 using System;
 using System.Threading.Tasks;
 using Unity.Netcode.Transports.UTP;
@@ -109,9 +109,7 @@ private static UnityTransport GetUnityTransport(NetworkManager networkManager, s
             {
                 transport = networkManager.gameObject.AddComponent<UnityTransport>();
             }
-#if UTP_TRANSPORT_2_0_ABOVE
             transport.UseWebSockets = connectionType.StartsWith("ws"); // Probably should be part of SetRelayServerData, but not possible at this point
-#endif
             networkManager.NetworkConfig.NetworkTransport = transport; // Force using UnityTransport
             return transport;
         }

com.unity.netcode.gameobjects/Editor/com.unity.netcode.editor.asmdef

@@ -49,11 +49,6 @@
             "expression": "1.0",
             "define": "RELAY_SDK_INSTALLED"
         },
-        {
-            "name": "com.unity.transport",
-            "expression": "2.0",
-            "define": "UTP_TRANSPORT_2_0_ABOVE"
-        },
         {
             "name": "com.unity.services.multiplayer",
             "expression": "0.2.0",

com.unity.netcode.gameobjects/Runtime/Messaging/NetworkMessageManager.cs

@@ -808,11 +808,7 @@ internal unsafe int SendMessage<T>(ref T message, NetworkDelivery delivery, in N
         internal unsafe int SendMessage<T>(ref T message, NetworkDelivery delivery, in NativeList<ulong> clientIds)
             where T : INetworkMessage
         {
-#if UTP_TRANSPORT_2_0_ABOVE
             return SendMessage(ref message, delivery, new PointerListWrapper<ulong>(clientIds.GetUnsafePtr(), clientIds.Length));
-#else
-            return SendMessage(ref message, delivery, new PointerListWrapper<ulong>((ulong*)clientIds.GetUnsafePtr(), clientIds.Length));
-#endif
         }
 
         internal unsafe void ProcessSendQueues()

com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/CollectionSerializationUtility.cs

@@ -505,13 +505,8 @@ public static void WriteNativeListDelta<T>(FastBufferWriter writer, ref NativeLi
             writer.WriteValueSafe(changes);
             unsafe
             {
-#if UTP_TRANSPORT_2_0_ABOVE
                 var ptr = value.GetUnsafePtr();
                 var prevPtr = previousValue.GetUnsafePtr();
-#else
-                var ptr = (T*)value.GetUnsafePtr();
-                var prevPtr = (T*)previousValue.GetUnsafePtr();
-#endif
                 for (int i = 0; i < value.Length; ++i)
                 {
                     if (changes.IsSet(i))
@@ -554,11 +549,7 @@ public static void ReadNativeListDelta<T>(FastBufferReader reader, ref NativeLis
 
                 unsafe
                 {
-#if UTP_TRANSPORT_2_0_ABOVE
                     var ptr = value.GetUnsafePtr();
-#else
-                    var ptr = (T*)value.GetUnsafePtr();
-#endif
                     for (var i = 0; i < value.Length; ++i)
                     {
                         if (changes.IsSet(i))
@@ -601,11 +592,8 @@ public static unsafe void WriteNativeHashSetDelta<T>(FastBufferWriter writer, re
                     ++removedCount;
                 }
             }
-#if UTP_TRANSPORT_2_0_ABOVE
+
             if (addedCount + removedCount >= value.Count)
-#else
-            if (addedCount + removedCount >= value.Count())
-#endif
             {
                 writer.WriteByteSafe(1);
                 writer.WriteValueSafe(value);
@@ -655,15 +643,10 @@ public static unsafe void WriteNativeHashMapDelta<TKey, TVal>(FastBufferWriter w
             where TVal : unmanaged
         {
             // See WriteDictionary; this is the same algorithm, adjusted for the NativeHashMap API
-#if UTP_TRANSPORT_2_0_ABOVE
             var added = stackalloc KVPair<TKey, TVal>[value.Count];
             var changed = stackalloc KVPair<TKey, TVal>[value.Count];
             var removed = stackalloc KVPair<TKey, TVal>[previousValue.Count];
-#else
-            var added = stackalloc KeyValue<TKey, TVal>[value.Count()];
-            var changed = stackalloc KeyValue<TKey, TVal>[value.Count()];
-            var removed = stackalloc KeyValue<TKey, TVal>[previousValue.Count()];
-#endif
+
             var addedCount = 0;
             var changedCount = 0;
             var removedCount = 0;
@@ -692,11 +675,7 @@ public static unsafe void WriteNativeHashMapDelta<TKey, TVal>(FastBufferWriter w
                 }
             }
 
-#if UTP_TRANSPORT_2_0_ABOVE
             if (addedCount + removedCount + changedCount >= value.Count)
-#else
-            if (addedCount + removedCount + changedCount >= value.Count())
-#endif
             {
                 writer.WriteByteSafe(1);
                 writer.WriteValueSafe(value);

com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/NetworkVariableEquality.cs

@@ -42,13 +42,8 @@ internal static unsafe bool ValueEqualsList<TValueType>(ref NativeList<TValueTyp
                 return false;
             }
 
-#if UTP_TRANSPORT_2_0_ABOVE
             var aptr = a.GetUnsafePtr();
             var bptr = b.GetUnsafePtr();
-#else
-            var aptr = (TValueType*)a.GetUnsafePtr();
-            var bptr = (TValueType*)b.GetUnsafePtr();
-#endif
 
             return UnsafeUtility.MemCmp(aptr, bptr, sizeof(TValueType) * a.Length) == 0;
         }
@@ -216,13 +211,9 @@ internal static unsafe bool EqualityEqualsNativeList<TValueType>(ref NativeList<
                 return false;
             }
 
-#if UTP_TRANSPORT_2_0_ABOVE
             var aptr = a.GetUnsafePtr();
             var bptr = b.GetUnsafePtr();
-#else
-            var aptr = (TValueType*)a.GetUnsafePtr();
-            var bptr = (TValueType*)b.GetUnsafePtr();
-#endif
+
             for (var i = 0; i < a.Length; ++i)
             {
                 if (!EqualityEquals(ref aptr[i], ref bptr[i]))
@@ -246,11 +237,7 @@ internal static bool EqualityEqualsNativeHashSet<TValueType>(ref NativeHashSet<T
                 return true;
             }
 
-#if UTP_TRANSPORT_2_0_ABOVE
             if (a.Count != b.Count)
-#else
-            if (a.Count() != b.Count())
-#endif
             {
                 return false;
             }
@@ -333,11 +320,7 @@ internal static bool GenericEqualsNativeHashMap(ref NativeHashMap<TKey, TVal> a,
             return true;
         }
 
-#if UTP_TRANSPORT_2_0_ABOVE
         if (a.Count != b.Count)
-#else
-            if (a.Count() != b.Count())
-#endif
         {
             return false;
         }

com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/ResizableBitVector.cs

@@ -95,19 +95,11 @@ public unsafe void NetworkSerialize<T>(BufferSerializer<T> serializer) where T :
             {
                 if (serializer.IsReader)
                 {
-#if UTP_TRANSPORT_2_0_ABOVE
                     serializer.GetFastBufferReader().ReadBytesSafe(ptr, length);
-#else
-                    serializer.GetFastBufferReader().ReadBytesSafe((byte*)ptr, length);
-#endif
                 }
                 else
                 {
-#if UTP_TRANSPORT_2_0_ABOVE
                     serializer.GetFastBufferWriter().WriteBytesSafe(ptr, length);
-#else
-                    serializer.GetFastBufferWriter().WriteBytesSafe((byte*)ptr, length);
-#endif
                 }
             }
         }

com.unity.netcode.gameobjects/Runtime/Serialization/FastBufferWriter.cs

@@ -772,11 +772,7 @@ public unsafe void WriteBytes(NativeArray<byte> value, int size = -1, int offset
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public unsafe void WriteBytes(NativeList<byte> value, int size = -1, int offset = 0)
         {
-#if UTP_TRANSPORT_2_0_ABOVE
             byte* ptr = value.GetUnsafePtr();
-#else
-            byte* ptr = (byte*)value.GetUnsafePtr();
-#endif
             WriteBytes(ptr, size == -1 ? value.Length : size, offset);
         }
 
@@ -820,11 +816,7 @@ public unsafe void WriteBytesSafe(NativeArray<byte> value, int size = -1, int of
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public unsafe void WriteBytesSafe(NativeList<byte> value, int size = -1, int offset = 0)
         {
-#if UTP_TRANSPORT_2_0_ABOVE
             byte* ptr = value.GetUnsafePtr();
-#else
-            byte* ptr = (byte*)value.GetUnsafePtr();
-#endif
             WriteBytesSafe(ptr, size == -1 ? value.Length : size, offset);
         }
 
@@ -1015,11 +1007,7 @@ internal unsafe void WriteUnmanagedSafe<T>(NativeArray<T> value) where T : unman
         internal unsafe void WriteUnmanaged<T>(NativeList<T> value) where T : unmanaged
         {
             WriteLength(value.Length);
-#if UTP_TRANSPORT_2_0_ABOVE
             var ptr = value.GetUnsafePtr();
-#else
-            var ptr = (T*)value.GetUnsafePtr();
-#endif
             {
                 byte* bytes = (byte*)ptr;
                 WriteBytes(bytes, sizeof(T) * value.Length);
@@ -1029,11 +1017,7 @@ internal unsafe void WriteUnmanaged<T>(NativeList<T> value) where T : unmanaged
         internal unsafe void WriteUnmanagedSafe<T>(NativeList<T> value) where T : unmanaged
         {
             WriteLengthSafe(value.Length);
-#if UTP_TRANSPORT_2_0_ABOVE
             var ptr = value.GetUnsafePtr();
-#else
-            var ptr = (T*)value.GetUnsafePtr();
-#endif
             {
                 byte* bytes = (byte*)ptr;
                 WriteBytesSafe(bytes, sizeof(T) * value.Length);
@@ -1231,11 +1215,7 @@ public void WriteValue<T>(NativeList<T> value, ForGeneric unused = default) wher
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         internal void WriteValueSafe<T>(NativeHashSet<T> value) where T : unmanaged, IEquatable<T>
         {
-#if UTP_TRANSPORT_2_0_ABOVE
             WriteLengthSafe(value.Count);
-#else
-            WriteLengthSafe(value.Count());
-#endif
             foreach (var item in value)
             {
                 var iReffable = item;
@@ -1248,11 +1228,7 @@ internal void WriteValueSafe<TKey, TVal>(NativeHashMap<TKey, TVal> value)
             where TKey : unmanaged, IEquatable<TKey>
             where TVal : unmanaged
         {
-#if UTP_TRANSPORT_2_0_ABOVE
             WriteLengthSafe(value.Count);
-#else
-            WriteLengthSafe(value.Count());
-#endif
             foreach (var item in value)
             {
                 (var key, var val) = (item.Key, item.Value);

com.unity.netcode.gameobjects/Runtime/Transports/UTP/BatchedReceiveQueue.cs

@@ -1,9 +1,7 @@
 using System;
-using Unity.Networking.Transport;
-#if UTP_TRANSPORT_2_0_ABOVE
 using Unity.Collections;
 using Unity.Collections.LowLevel.Unsafe;
-#endif
+using Unity.Networking.Transport;
 
 namespace Unity.Netcode.Transports.UTP
 {
@@ -29,11 +27,7 @@ public BatchedReceiveQueue(DataStreamReader reader)
             {
                 fixed (byte* dataPtr = m_Data)
                 {
-#if UTP_TRANSPORT_2_0_ABOVE
                     reader.ReadBytesUnsafe(dataPtr, reader.Length);
-#else
-                    reader.ReadBytes(dataPtr, reader.Length);
-#endif
                 }
             }
 
@@ -70,11 +64,7 @@ public void PushReader(DataStreamReader reader)
             {
                 fixed (byte* dataPtr = m_Data)
                 {
-#if UTP_TRANSPORT_2_0_ABOVE
                     reader.ReadBytesUnsafe(dataPtr + m_Offset + m_Length, reader.Length);
-#else
-                    reader.ReadBytes(dataPtr + m_Offset + m_Length, reader.Length);
-#endif
                 }
             }
 

com.unity.netcode.gameobjects/Runtime/Transports/UTP/BatchedSendQueue.cs

@@ -94,23 +94,15 @@ public void Dispose()
         /// <summary>Write a raw buffer to a DataStreamWriter.</summary>
         private unsafe void WriteBytes(ref DataStreamWriter writer, byte* data, int length)
         {
-#if UTP_TRANSPORT_2_0_ABOVE
             writer.WriteBytesUnsafe(data, length);
-#else
-            writer.WriteBytes(data, length);
-#endif
         }
 
         /// <summary>Append data at the tail of the queue. No safety checks.</summary>
         private void AppendDataAtTail(ArraySegment<byte> data)
         {
             unsafe
             {
-#if UTP_TRANSPORT_2_0_ABOVE
                 var writer = new DataStreamWriter(m_Data.GetUnsafePtr() + TailIndex, Capacity - TailIndex);
-#else
-                var writer = new DataStreamWriter((byte*)m_Data.GetUnsafePtr() + TailIndex, Capacity - TailIndex);
-#endif
 
                 writer.WriteInt(data.Count);
 
@@ -149,11 +141,7 @@ public bool PushMessage(ArraySegment<byte> message)
             {
                 unsafe
                 {
-#if UTP_TRANSPORT_2_0_ABOVE
                     UnsafeUtility.MemMove(m_Data.GetUnsafePtr(), m_Data.GetUnsafePtr() + HeadIndex, Length);
-#else
-                    UnsafeUtility.MemMove(m_Data.GetUnsafePtr(), (byte*)m_Data.GetUnsafePtr() + HeadIndex, Length);
-#endif
                 }
 
                 TailIndex = Length;
@@ -239,11 +227,7 @@ public int FillWriterWithMessages(ref DataStreamWriter writer, int softMaxBytes
                 if (bytesToWrite > softMaxBytes && bytesToWrite <= writer.Capacity)
                 {
                     writer.WriteInt(messageLength);
-#if UTP_TRANSPORT_2_0_ABOVE
                     WriteBytes(ref writer, m_Data.GetUnsafePtr() + reader.GetBytesRead(), messageLength);
-#else
-                    WriteBytes(ref writer, (byte*)m_Data.GetUnsafePtr() + reader.GetBytesRead(), messageLength);
-#endif
 
                     return bytesToWrite;
                 }
@@ -260,11 +244,7 @@ public int FillWriterWithMessages(ref DataStreamWriter writer, int softMaxBytes
                         if (bytesWritten + bytesToWrite <= softMaxBytes)
                         {
                             writer.WriteInt(messageLength);
-#if UTP_TRANSPORT_2_0_ABOVE
                             WriteBytes(ref writer, m_Data.GetUnsafePtr() + reader.GetBytesRead(), messageLength);
-#else
-                            WriteBytes(ref writer, (byte*)m_Data.GetUnsafePtr() + reader.GetBytesRead(), messageLength);
-#endif
 
                             readerOffset += bytesToWrite;
                             bytesWritten += bytesToWrite;
@@ -308,11 +288,7 @@ public int FillWriterWithBytes(ref DataStreamWriter writer, int maxBytes = 0)
 
             unsafe
             {
-#if UTP_TRANSPORT_2_0_ABOVE
                 WriteBytes(ref writer, m_Data.GetUnsafePtr() + HeadIndex, copyLength);
-#else
-                WriteBytes(ref writer, (byte*)m_Data.GetUnsafePtr() + HeadIndex, copyLength);
-#endif
             }
 
             return copyLength;