Last fixes

Author: noellie-velez

com.unity.netcode.gameobjects/Runtime/Configuration/CommandLineOptions.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using UnityEngine;
 
 namespace Unity.Netcode
 {
@@ -13,22 +12,33 @@ public class CommandLineOptions
         /// <summary>
         /// Command-line options singleton
         /// </summary>
-        public static CommandLineOptions Instance { get; private set; }
+        [Obsolete("Not used anymore replaced by TryGetArg")]
+        public static CommandLineOptions Instance
+        {
+            get
+            {
+                if (s_Instance == null)
+                {
+                    s_Instance = new CommandLineOptions();
+                }
+                return s_Instance;
+            }
+            private set
+            {
+                s_Instance = value;
+            }
+        }
+        private static CommandLineOptions s_Instance;
 
         // Contains the current application instance domain's command line arguments
         private static readonly List<string> k_CommandLineArguments = new List<string>(Environment.GetCommandLineArgs());
 
-        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
-        private static void InitializeOnLoad()
-        {
-            Instance = new CommandLineOptions();
-        }
-
         /// <summary>
         /// Returns the value of an argument or null if the argument is not present
         /// </summary>
         /// <param name="arg">The name of the argument</param>
         /// <returns><see cref="string"/>Value of the command line argument passed in.</returns>
+        [Obsolete("Not used anymore replaced by TryGetArg")]
         public string GetArg(string arg)
         {
             var argIndex = k_CommandLineArguments.IndexOf(arg);
@@ -38,5 +48,23 @@ public string GetArg(string arg)
             }
             return null;
         }
+
+        /// <summary>
+        /// Returns true if the argument was found.
+        /// </summary>
+        /// <param name="arg">The name of the argument to look up.</param>
+        /// <param name="argValue">The argument's value, or <see langword="null"/> if not found.</param>
+        /// <returns><c>true</c> if the argument was found; otherwise <c>false</c>.</returns>
+        public static bool TryGetArg(string arg, out string argValue)
+        {
+            var argIndex = k_CommandLineArguments.IndexOf(arg);
+            if (argIndex >= 0 && argIndex < k_CommandLineArguments.Count - 1)
+            {
+                argValue = k_CommandLineArguments[argIndex + 1];
+                return true;
+            }
+            argValue = null;
+            return false;
+        }
     }
 }

com.unity.netcode.gameobjects/Runtime/Metrics/NetworkMetrics.cs

@@ -12,11 +12,7 @@ internal class NetworkMetrics : INetworkMetrics
     {
         private const ulong k_MaxMetricsPerFrame = 1000L;
         private static readonly Dictionary<uint, string> k_SceneEventTypeNames;
-        private static ProfilerMarker s_FrameDispatch;
-#if UNITY_EDITOR
-        [UnityEngine.RuntimeInitializeOnLoadMethod(UnityEngine.RuntimeInitializeLoadType.SubsystemRegistration)]
-        private static void ResetStaticsOnLoad() => s_FrameDispatch = new ProfilerMarker($"{nameof(NetworkMetrics)}.DispatchFrame");
-#endif
+        private static readonly ProfilerMarker k_FrameDispatch;
 
         static NetworkMetrics()
         {
@@ -25,7 +21,7 @@ static NetworkMetrics()
             {
                 k_SceneEventTypeNames[(uint)type] = type.ToString();
             }
-            s_FrameDispatch = new ProfilerMarker($"{nameof(NetworkMetrics)}.DispatchFrame");
+            k_FrameDispatch = new ProfilerMarker($"{nameof(NetworkMetrics)}.DispatchFrame");
         }
 
         private static string GetSceneEventTypeName(uint typeCode)
@@ -511,9 +507,9 @@ public void UpdatePacketLoss(float packetLoss)
 
         public void DispatchFrame()
         {
-            s_FrameDispatch.Begin();
+            k_FrameDispatch.Begin();
             Dispatcher.Dispatch();
-            s_FrameDispatch.End();
+            k_FrameDispatch.End();
             m_NumberOfMetricsThisFrame = 0;
         }
 

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

@@ -869,7 +869,7 @@ private bool ParseCommandLineOptionsPort(out ushort port)
                 return true;
             }
 #else
-            if (CommandLineOptions.Instance.GetArg(k_OverridePortArg) is string argValue)
+            if (CommandLineOptions.TryGetArg(k_OverridePortArg, out var argValue))
             {
                 port = (ushort)Convert.ChangeType(argValue, typeof(ushort));
                 return true;
@@ -881,7 +881,7 @@ private bool ParseCommandLineOptionsPort(out ushort port)
 
         private bool ParseCommandLineOptionsAddress(out string ipValue)
         {
-            if (CommandLineOptions.Instance.GetArg(k_OverrideIpAddressArg) is string argValue)
+            if (CommandLineOptions.TryGetArg(k_OverrideIpAddressArg, out var argValue))
             {
                 ipValue = argValue;
                 return true;