Unity-Technologies · 0xFA11 · Mar 18, 2021 · Mar 18, 2021 · 0xFA11 · Mar 18, 2021
diff --git a/.yamato/project.metafile b/.yamato/project.metafile
@@ -7,7 +7,6 @@ test_editors:
   - 2021.1
   - 2021.2
   - 2020.3
-  - 2019.4
   - trunk
 
 # Platforms that will be tested. The first entry in this array will also

diff --git a/com.unity.multiplayer.mlapi/CHANGELOG.md b/com.unity.multiplayer.mlapi/CHANGELOG.md
@@ -19,7 +19,7 @@ This is the initial experimental Unity MLAPI Package, v0.1.0.
 
 - Added message batching to handle consecutive RPC requests sent to the same client. `RpcBatcher` sends batches based on requests from the `RpcQueueProcessing`, by batch size threshold or immediately.
 - [GitHub 494](https://github.com/Unity-Technologies/com.unity.multiplayer.mlapi/pull/494): Added a constraint to allow one `NetworkObject` per `GameObject`, set through the `DisallowMultipleComponent` attribute.
-- Integrated MLAPI with the Unity Profiler for versions 2020.2 and later:
+- Integrated MLAPI with the Unity Profiler for versions 2020.3 and later:
 
   - Added new profiler modules for MLAPI that report important network data.
   - Attached the profiler to a remote player to view network data over the wire.
@@ -85,7 +85,7 @@ With a new release of MLAPI in Unity, some features have been removed:
     * Removed "hail handshake", including `NetworkManager` implementation and `NetworkConstants` entries.
     * Modified `RpcQueue` and `RpcBatcher` internals to remove encryption and authentication from reading and writing.
 
-* Removed the previous MLAPI Profiler editor window from Unity versions 2020.2 and later.
+* Removed the previous MLAPI Profiler editor window from Unity versions 2020.3 and later.
 * Removed previous MLAPI Convenience and Performance RPC APIs with the new standard RPC API. See [RFC #1](https://github.com/Unity-Technologies/com.unity.multiplayer.rfcs/blob/master/text/0001-std-rpc-api.md) for details.
 * [GitHub 520](https://github.com/Unity-Technologies/com.unity.multiplayer.mlapi/pull/520): Removed the MLAPI Installer.
 

diff --git a/com.unity.multiplayer.mlapi/Documentation~/Manual.md b/com.unity.multiplayer.mlapi/Documentation~/Manual.md
@@ -12,7 +12,7 @@ Unity MLAPI is a high level networking library built for the Unity game engine t
 
 This version of MLAPI is compatible with the following versions of the Unity Editor:
 
-* 2019.4 and later (recommended)
+* 2020.3 and later (recommended) See [Unity Upgrade Guides](https://docs.unity3d.com/Manual/UpgradeGuides.html) if you need to upgrade prior to installation.
 * Windows, Mac, Linux platforms are supported by MLAPI
 
 ## Document revision history

diff --git a/com.unity.multiplayer.mlapi/Editor/CodeGen/CodeGenHelpers.cs b/com.unity.multiplayer.mlapi/Editor/CodeGen/CodeGenHelpers.cs
@@ -12,8 +12,8 @@
 using Unity.CompilationPipeline.Common.ILPostProcessing;
 using UnityEngine;
 
-#if !UNITY_2019_4_OR_NEWER
-#error MLAPI requires Unity 2019.4 or newer
+#if !UNITY_2020_3_OR_NEWER
+#error MLAPI requires Unity 2020.3 or newer
 #endif
 
 namespace MLAPI.Editor.CodeGen

diff --git a/com.unity.multiplayer.mlapi/Editor/CodeGen/ILPostProcessCompiledAssembly.cs b/com.unity.multiplayer.mlapi/Editor/CodeGen/ILPostProcessCompiledAssembly.cs
@@ -1,4 +1,4 @@
-#if !UNITY_2020_2_OR_NEWER
+#if !UNITY_2020_3_OR_NEWER
 using System.IO;
 using Unity.CompilationPipeline.Common.ILPostProcessing;
 

diff --git a/com.unity.multiplayer.mlapi/Editor/CodeGen/ILPostProcessor.cs b/com.unity.multiplayer.mlapi/Editor/CodeGen/ILPostProcessor.cs
@@ -1,4 +1,4 @@
-#if !UNITY_2020_2_OR_NEWER
+#if !UNITY_2020_3_OR_NEWER
 using Unity.CompilationPipeline.Common.ILPostProcessing;
 
 namespace MLAPI.Editor.CodeGen

diff --git a/com.unity.multiplayer.mlapi/Editor/CodeGen/ILPostProcessorProgram.cs b/com.unity.multiplayer.mlapi/Editor/CodeGen/ILPostProcessorProgram.cs
@@ -1,4 +1,4 @@
-#if !UNITY_2020_2_OR_NEWER
+#if !UNITY_2020_3_OR_NEWER
 using System;
 using System.Collections.Generic;
 using System.IO;

diff --git a/com.unity.multiplayer.mlapi/Editor/CodeGen/NetworkBehaviourILPP.cs b/com.unity.multiplayer.mlapi/Editor/CodeGen/NetworkBehaviourILPP.cs
@@ -14,7 +14,7 @@
 using UnityEngine;
 using MethodAttributes = Mono.Cecil.MethodAttributes;
 using ParameterAttributes = Mono.Cecil.ParameterAttributes;
-#if UNITY_2020_2_OR_NEWER
+#if UNITY_2020_3_OR_NEWER
 using ILPPInterface = Unity.CompilationPipeline.Common.ILPostProcessing.ILPostProcessor;
 #else
 using ILPPInterface = MLAPI.Editor.CodeGen.ILPostProcessor;

diff --git a/com.unity.multiplayer.mlapi/Editor/CodeGen/RuntimeAccessModifiersILPP.cs b/com.unity.multiplayer.mlapi/Editor/CodeGen/RuntimeAccessModifiersILPP.cs
@@ -1,4 +1,4 @@
-#if UNITY_2020_2_OR_NEWER
+#if UNITY_2020_3_OR_NEWER
 using System.Collections.Generic;
 using System.IO;
 using Mono.Cecil;

diff --git a/com.unity.multiplayer.mlapi/Editor/MLAPIProfiler.cs b/com.unity.multiplayer.mlapi/Editor/MLAPIProfiler.cs
@@ -8,7 +8,7 @@ namespace UnityEditor
 {
     public class MLAPIProfiler : EditorWindow
     {
-#if !UNITY_2020_2_OR_NEWER
+#if !UNITY_2020_3_OR_NEWER
         [MenuItem("Window/MLAPI Profiler")]
         public static void ShowWindow()
         {

diff --git a/com.unity.multiplayer.mlapi/Editor/MLAPIProfilerModule.cs b/com.unity.multiplayer.mlapi/Editor/MLAPIProfilerModule.cs
@@ -10,7 +10,7 @@ namespace MLAPI
     [InitializeOnLoad]
     internal static class MLAPIProfilerModule
     {
-#if UNITY_2020_2_OR_NEWER && ENABLE_PROFILER
+#if UNITY_2020_3_OR_NEWER && ENABLE_PROFILER
         private const string k_RpcModuleName = "MLAPI RPCs";
         private const string k_OperationModuleName = "MLAPI Operations";
         private const string k_MessageModuleName = "MLAPI Messages";
@@ -95,7 +95,7 @@ private static bool CreateMLAPIDynamicModule(ref MLAPIModules mlapiModules, stri
 
         static MLAPIProfilerModule()
         {
-#if UNITY_2020_2_OR_NEWER && ENABLE_PROFILER
+#if UNITY_2020_3_OR_NEWER && ENABLE_PROFILER
             var dynamicModulesJson = EditorPrefs.GetString("ProfilerWindow.DynamicModules");
             var dynamicModules = JsonUtility.FromJson<MLAPIModules>(dynamicModulesJson);
 

diff --git a/com.unity.multiplayer.mlapi/Runtime/AssemblyInfo.cs b/com.unity.multiplayer.mlapi/Runtime/AssemblyInfo.cs
@@ -1,6 +1,6 @@
 using System.Runtime.CompilerServices;
 
-#if UNITY_2020_2_OR_NEWER && UNITY_EDITOR
+#if UNITY_2020_3_OR_NEWER && UNITY_EDITOR
 [assembly: InternalsVisibleTo("Unity.Multiplayer.MLAPI.Editor.CodeGen")]
 #endif
 

diff --git a/com.unity.multiplayer.mlapi/Runtime/Core/NetworkBehaviour.cs b/com.unity.multiplayer.mlapi/Runtime/Core/NetworkBehaviour.cs
@@ -27,7 +27,7 @@ public abstract class NetworkBehaviour : MonoBehaviour
     {
         [Browsable(false)]
         [EditorBrowsable(EditorBrowsableState.Never)]
-#if UNITY_2020_2_OR_NEWER
+#if UNITY_2020_3_OR_NEWER
         // RuntimeAccessModifiersILPP will make this `protected`
         internal enum __NExec
 #else
@@ -45,7 +45,7 @@ public enum __NExec
         [Browsable(false)]
         [EditorBrowsable(EditorBrowsableState.Never)]
         [DebuggerBrowsable(DebuggerBrowsableState.Never)]
-#if UNITY_2020_2_OR_NEWER
+#if UNITY_2020_3_OR_NEWER
         // RuntimeAccessModifiersILPP will make this `protected`
         internal __NExec __nexec = __NExec.None;
 #else
@@ -56,7 +56,7 @@ public enum __NExec
 
         [Browsable(false)]
         [EditorBrowsable(EditorBrowsableState.Never)]
-#if UNITY_2020_2_OR_NEWER
+#if UNITY_2020_3_OR_NEWER
         // RuntimeAccessModifiersILPP will make this `protected`
         internal NetworkSerializer __beginSendServerRpc(ServerRpcParams serverRpcParams, RpcDelivery rpcDelivery)
 #else
@@ -99,7 +99,7 @@ public NetworkSerializer __beginSendServerRpc(ServerRpcParams serverRpcParams, R
 
         [Browsable(false)]
         [EditorBrowsable(EditorBrowsableState.Never)]
-#if UNITY_2020_2_OR_NEWER
+#if UNITY_2020_3_OR_NEWER
         // RuntimeAccessModifiersILPP will make this `protected`
         internal void __endSendServerRpc(NetworkSerializer serializer, ServerRpcParams serverRpcParams, RpcDelivery rpcDelivery)
 #else
@@ -122,7 +122,7 @@ public void __endSendServerRpc(NetworkSerializer serializer, ServerRpcParams ser
 
         [Browsable(false)]
         [EditorBrowsable(EditorBrowsableState.Never)]
-#if UNITY_2020_2_OR_NEWER
+#if UNITY_2020_3_OR_NEWER
         // RuntimeAccessModifiersILPP will make this `protected`
         internal NetworkSerializer __beginSendClientRpc(ClientRpcParams clientRpcParams, RpcDelivery rpcDelivery)
 #else
@@ -197,7 +197,7 @@ public NetworkSerializer __beginSendClientRpc(ClientRpcParams clientRpcParams, R
 
         [Browsable(false)]
         [EditorBrowsable(EditorBrowsableState.Never)]
-#if UNITY_2020_2_OR_NEWER
+#if UNITY_2020_3_OR_NEWER
         // RuntimeAccessModifiersILPP will make this `protected`
         internal void __endSendClientRpc(NetworkSerializer serializer, ClientRpcParams clientRpcParams, RpcDelivery rpcDelivery)
 #else

diff --git a/com.unity.multiplayer.mlapi/Runtime/Core/NetworkManager.cs b/com.unity.multiplayer.mlapi/Runtime/Core/NetworkManager.cs
@@ -34,7 +34,7 @@ public class NetworkManager : MonoBehaviour, INetworkUpdateSystem
         [Browsable(false)]
         [EditorBrowsable(EditorBrowsableState.Never)]
         [DebuggerBrowsable(DebuggerBrowsableState.Never)]
-#if UNITY_2020_2_OR_NEWER
+#if UNITY_2020_3_OR_NEWER
         // RuntimeAccessModifiersILPP will make this `public`
         internal static readonly Dictionary<uint, Action<NetworkBehaviour, NetworkSerializer, __RpcParams>> __ntable = new Dictionary<uint, Action<NetworkBehaviour, NetworkSerializer, __RpcParams>>();
 #else
@@ -618,7 +618,7 @@ public void Shutdown()
                 NetworkTickSystem = null;
             }
 
-#if !UNITY_2020_2_OR_NEWER
+#if !UNITY_2020_3_OR_NEWER
             NetworkProfiler.Stop();
 #endif
             IsListening = false;
@@ -666,7 +666,7 @@ private void OnNetworkEarlyUpdate()
 #endif
                     var isLoopBack = false;
 
-#if !UNITY_2020_2_OR_NEWER
+#if !UNITY_2020_3_OR_NEWER
                     NetworkProfiler.StartTick(TickType.Receive);
 #endif
 
@@ -687,7 +687,7 @@ private void OnNetworkEarlyUpdate()
 
                     m_LastReceiveTickTime = NetworkTime;
 
-#if !UNITY_2020_2_OR_NEWER
+#if !UNITY_2020_3_OR_NEWER
                     NetworkProfiler.EndTick();
 #endif
 
@@ -707,7 +707,7 @@ private void OnNetworkPreUpdate()
 #if DEVELOPMENT_BUILD || UNITY_EDITOR
                     s_EventTick.Begin();
 #endif
-#if UNITY_EDITOR && !UNITY_2020_2_OR_NEWER
+#if UNITY_EDITOR && !UNITY_2020_3_OR_NEWER
                     NetworkProfiler.StartTick(TickType.Event);
 #endif
 
@@ -726,7 +726,7 @@ private void OnNetworkPreUpdate()
                     {
                         m_LastEventTickTime = NetworkTime;
                     }
-#if UNITY_EDITOR && !UNITY_2020_2_OR_NEWER
+#if UNITY_EDITOR && !UNITY_2020_3_OR_NEWER
                     NetworkProfiler.EndTick();
 #endif
 
@@ -737,12 +737,12 @@ private void OnNetworkPreUpdate()
 
                 if (IsServer && NetworkConfig.EnableTimeResync && NetworkTime - m_LastTimeSyncTime >= NetworkConfig.TimeResyncInterval)
                 {
-#if UNITY_EDITOR && !UNITY_2020_2_OR_NEWER
+#if UNITY_EDITOR && !UNITY_2020_3_OR_NEWER
                     NetworkProfiler.StartTick(TickType.Event);
 #endif
                     SyncTime();
                     m_LastTimeSyncTime = NetworkTime;
-#if UNITY_EDITOR && !UNITY_2020_2_OR_NEWER
+#if UNITY_EDITOR && !UNITY_2020_3_OR_NEWER
                     NetworkProfiler.EndTick();
 #endif
                 }
@@ -830,7 +830,7 @@ private void HandleRawTransportPoll(NetworkEvent networkEvent, ulong clientId, N
 #if DEVELOPMENT_BUILD || UNITY_EDITOR
                     s_TransportConnect.Begin();
 #endif
-#if !UNITY_2020_2_OR_NEWER
+#if !UNITY_2020_3_OR_NEWER
                     NetworkProfiler.StartEvent(TickType.Receive, (uint)payload.Count, networkChannel, "TRANSPORT_CONNECT");
 #endif
                     if (IsServer)
@@ -859,7 +859,7 @@ private void HandleRawTransportPoll(NetworkEvent networkEvent, ulong clientId, N
                         StartCoroutine(ApprovalTimeout(clientId));
                     }
 
-#if !UNITY_2020_2_OR_NEWER
+#if !UNITY_2020_3_OR_NEWER
                     NetworkProfiler.EndEvent();
 #endif
 #if DEVELOPMENT_BUILD || UNITY_EDITOR
@@ -880,7 +880,7 @@ private void HandleRawTransportPoll(NetworkEvent networkEvent, ulong clientId, N
 #if DEVELOPMENT_BUILD || UNITY_EDITOR
                     s_TransportDisconnect.Begin();
 #endif
-#if !UNITY_2020_2_OR_NEWER
+#if !UNITY_2020_3_OR_NEWER
                     NetworkProfiler.StartEvent(TickType.Receive, 0, NetworkChannel.Internal, "TRANSPORT_DISCONNECT");
 #endif
 
@@ -898,7 +898,7 @@ private void HandleRawTransportPoll(NetworkEvent networkEvent, ulong clientId, N
 
                     OnClientDisconnectCallback?.Invoke(clientId);
 
-#if !UNITY_2020_2_OR_NEWER
+#if !UNITY_2020_3_OR_NEWER
                     NetworkProfiler.EndEvent();
 #endif
 #if DEVELOPMENT_BUILD || UNITY_EDITOR
@@ -949,7 +949,7 @@ internal void HandleIncomingData(ulong clientId, NetworkChannel networkChannel,
 
                 uint headerByteSize = (uint)Arithmetic.VarIntSize(messageType);
 
-#if !UNITY_2020_2_OR_NEWER
+#if !UNITY_2020_3_OR_NEWER
                 NetworkProfiler.StartEvent(TickType.Receive, (uint)(data.Count - headerByteSize), networkChannel, messageType);
 #endif
 
@@ -1081,7 +1081,7 @@ internal void HandleIncomingData(ulong clientId, NetworkChannel networkChannel,
 
                 #endregion
 
-#if !UNITY_2020_2_OR_NEWER
+#if !UNITY_2020_3_OR_NEWER
                 NetworkProfiler.EndEvent();
 #endif
             }

diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/InternalMessageSender.cs b/com.unity.multiplayer.mlapi/Runtime/Messaging/InternalMessageSender.cs
@@ -24,7 +24,7 @@ internal static void Send(ulong clientId, byte messageType, NetworkChannel netwo
                 ProfilerStatManager.BytesSent.Record((int)buffer.Length);
                 PerformanceDataManager.Increment(ProfilerConstants.ByteSent, (int)buffer.Length);
 
-#if !UNITY_2020_2_OR_NEWER
+#if !UNITY_2020_3_OR_NEWER
                 NetworkProfiler.EndEvent();
 #endif
             }
@@ -36,7 +36,7 @@ internal static void Send(byte messageType, NetworkChannel networkChannel, Netwo
 
             using (var buffer = MessagePacker.WrapMessage(messageType, messageBuffer))
             {
-#if !UNITY_2020_2_OR_NEWER
+#if !UNITY_2020_3_OR_NEWER
                 NetworkProfiler.StartEvent(TickType.Send, (uint)buffer.Length, networkChannel, NetworkConstants.MESSAGE_NAMES[messageType]);
 #endif
 
@@ -49,7 +49,7 @@ internal static void Send(byte messageType, NetworkChannel networkChannel, Netwo
                     PerformanceDataManager.Increment(ProfilerConstants.ByteSent, (int)buffer.Length);
                 }
 
-#if !UNITY_2020_2_OR_NEWER
+#if !UNITY_2020_3_OR_NEWER
                 NetworkProfiler.EndEvent();
 #endif
             }
@@ -67,7 +67,7 @@ internal static void Send(byte messageType, NetworkChannel networkChannel, List<
 
             using (var buffer = MessagePacker.WrapMessage(messageType, messageBuffer))
             {
-#if !UNITY_2020_2_OR_NEWER
+#if !UNITY_2020_3_OR_NEWER
                 NetworkProfiler.StartEvent(TickType.Send, (uint)buffer.Length, networkChannel, NetworkConstants.MESSAGE_NAMES[messageType]);
 #endif
 
@@ -80,7 +80,7 @@ internal static void Send(byte messageType, NetworkChannel networkChannel, List<
                     PerformanceDataManager.Increment(ProfilerConstants.ByteSent, (int)buffer.Length);
                 }
 
-#if !UNITY_2020_2_OR_NEWER
+#if !UNITY_2020_3_OR_NEWER
                 NetworkProfiler.EndEvent();
 #endif
             }
@@ -92,7 +92,7 @@ internal static void Send(byte messageType, NetworkChannel networkChannel, ulong
 
             using (var buffer = MessagePacker.WrapMessage(messageType, messageBuffer))
             {
-#if !UNITY_2020_2_OR_NEWER
+#if !UNITY_2020_3_OR_NEWER
                 NetworkProfiler.StartEvent(TickType.Send, (uint)buffer.Length, networkChannel, NetworkConstants.MESSAGE_NAMES[messageType]);
 #endif
 
@@ -109,7 +109,7 @@ internal static void Send(byte messageType, NetworkChannel networkChannel, ulong
                     PerformanceDataManager.Increment(ProfilerConstants.ByteSent, (int)buffer.Length);
                 }
 
-#if !UNITY_2020_2_OR_NEWER
+#if !UNITY_2020_3_OR_NEWER
                 NetworkProfiler.EndEvent();
 #endif
             }

diff --git a/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcParams.cs b/com.unity.multiplayer.mlapi/Runtime/Messaging/RpcParams.cs
@@ -36,7 +36,7 @@ public struct ClientRpcParams
         public ClientRpcReceiveParams Receive;
     }
 
-#if UNITY_2020_2_OR_NEWER
+#if UNITY_2020_3_OR_NEWER
     // RuntimeAccessModifiersILPP will make this `public`
     internal struct __RpcParams
 #else

diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCounterUtility.cs b/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCounterUtility.cs
@@ -1,14 +1,14 @@
 using System;
 
-#if UNITY_2020_2_OR_NEWER
+#if UNITY_2020_3_OR_NEWER
 using Unity.Profiling.LowLevel;
 #endif
 
 namespace MLAPI.Profiling
 {
     internal struct ProfilerCounterUtility
     {
-#if UNITY_2020_2_OR_NEWER && ENABLE_PROFILER
+#if UNITY_2020_3_OR_NEWER && ENABLE_PROFILER
         public static byte GetProfilerMarkerDataType<T>()
         {
             switch (Type.GetTypeCode(typeof(T)))

diff --git a/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCounterValue.cs b/com.unity.multiplayer.mlapi/Runtime/Profiling/ProfilerCounterValue.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using Unity.Collections.LowLevel.Unsafe;
-#if UNITY_2020_2_OR_NEWER
+#if UNITY_2020_3_OR_NEWER
 using Unity.Profiling;
 using Unity.Profiling.LowLevel;
 using Unity.Profiling.LowLevel.Unsafe;
@@ -17,7 +17,7 @@ namespace MLAPI.Profiling
 #endif
     internal readonly struct ProfilerCounterValue<T> where T : unmanaged
     {
-#if UNITY_2020_2_OR_NEWER
+#if UNITY_2020_3_OR_NEWER
 #if ENABLE_PROFILER
         [NativeDisableUnsafePtrRestriction]
         [NonSerialized]
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,6 @@ test_editors: @@
       - 2021.1
       - 2021.2
       - 2020.3
-      - 2019.4
       - trunk
     # Platforms that will be tested. The first entry in this array will also
@@ Expand Down @@