Address review comments TODO cleanup

Author: noellie-velez

Examples/OverridingScenesAndPrefabs/Packages/manifest.json

@@ -15,7 +15,7 @@
     "com.unity.services.multiplayer": "1.2.0",
     "com.unity.test-framework": "1.6.0",
     "com.unity.timeline": "1.8.9",
-    "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.11",
+    "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.10",
     "com.unity.transport": "2.6.0",
     "com.unity.ugui": "2.0.0",
     "com.unity.visualscripting": "1.9.7",

Examples/OverridingScenesAndPrefabs/Packages/packages-lock.json

@@ -334,7 +334,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.toolchain.win-x86_64-linux-x86_64": {
-      "version": "2.0.11",
+      "version": "2.0.10",
       "depth": 0,
       "source": "registry",
       "dependencies": {

Examples/OverridingScenesAndPrefabs/ProjectSettings/ProjectSettings.asset

@@ -70,7 +70,6 @@ PlayerSettings:
   androidStartInFullscreen: 1
   androidRenderOutsideSafeArea: 1
   androidUseSwappy: 1
-  androidDisplayOptions: 1
   androidBlitType: 0
   androidResizeableActivity: 1
   androidDefaultWindowWidth: 1920
@@ -87,7 +86,6 @@ PlayerSettings:
   muteOtherAudioSources: 0
   Prepare IOS For Recording: 0
   Force IOS Speakers When Recording: 0
-  audioSpatialExperience: 0
   deferSystemGesturesMode: 0
   hideHomeButton: 0
   submitAnalytics: 1
@@ -273,9 +271,6 @@ PlayerSettings:
   AndroidBuildApkPerCpuArchitecture: 0
   AndroidTVCompatibility: 0
   AndroidIsGame: 1
-  androidAppCategory: 3
-  useAndroidAppCategory: 1
-  androidAppCategoryOther: 
   AndroidEnableTango: 0
   androidEnableBanner: 1
   androidUseLowAccuracyLocation: 0
@@ -403,7 +398,6 @@ PlayerSettings:
     iPhone: 1
     tvOS: 1
   m_BuildTargetGroupLightmapEncodingQuality: []
-  m_BuildTargetGroupHDRCubemapEncodingQuality: []
   m_BuildTargetGroupLightmapSettings: []
   m_BuildTargetGroupLoadStoreDebugModeSettings: []
   m_BuildTargetNormalMapEncoding: []

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

@@ -819,13 +819,13 @@ private string GetArg(string[] commandLineArgs, string arg)
             return null;
         }
 
-        private bool ParseCommandLineOptions(out int port)
+        private bool ParseCommandLineOptions(out ushort port)
         {
 #if UNITY_SERVER && UNITY_DEDICATED_SERVER_ARGUMENTS_PRESENT
 
             if (UnityEngine.DedicatedServer.Arguments.Port != null)
             {
-                port = UnityEngine.DedicatedServer.Arguments.Port.Value;
+                port = (ushort)UnityEngine.DedicatedServer.Arguments.Port;
                 return true;
             }
 
@@ -846,12 +846,13 @@ private bool ParseCommandLineOptions(out int port)
         /// <param name="ipv4Address">The remote IP address (despite the name, can be an IPv6 address or a domain name).</param>
         /// <param name="port">The remote port to connect to.</param>
         /// <param name="listenAddress">The address the server is going to listen on.</param>
-        /// <param name="forceOverrideCommandLineArgs">Should override port value</param>
+        /// <param name="forceOverrideCommandLineArgs">When true, any command line arguments will be ignored.</param>
         public void SetConnectionData(string ipv4Address, ushort port, string listenAddress = null, bool forceOverrideCommandLineArgs = false)
         {
-            if (!forceOverrideCommandLineArgs)
+            m_HasForcedConnectionData = forceOverrideCommandLineArgs;
+            if (!forceOverrideCommandLineArgs && ParseCommandLineOptions(out var commandLinePort))
             {
-                port = ParseCommandLineOptions(out var newPort) ? (ushort)newPort : ConnectionData.Port;
+                port = commandLinePort;
             }
 
             ConnectionData = new ConnectionAddressData
@@ -1607,7 +1608,9 @@ protected override string GetDisconnectEventMessage(DisconnectEvents disconnectE
             return m_UnityTransportNotificationHandler.GetDisconnectEventMessage(disconnectEvent);
         }
 
-
+        /// <summary>
+        /// This is set in <see cref="SetConnectionData(string, ushort, string, bool)"/>
+        /// </summary>
         private bool m_HasForcedConnectionData;
 
         /// <summary>
@@ -1626,7 +1629,7 @@ public override void Initialize(NetworkManager networkManager = null)
 
             m_NetworkManager = networkManager;
 
-            if (m_HasForcedConnectionData && ParseCommandLineOptions(out var port))
+            if (!m_HasForcedConnectionData && ParseCommandLineOptions(out var port))
             {
                 if (m_NetworkManager?.LogLevel <= LogLevel.Developer)
                 {

testproject/Assets/Scripts/ServerTest.cs

@@ -17,7 +17,7 @@ private void Start()
     {
         ushort port = 8889;
         Debug.Log("Start Server Port " + port);          // <---- Start Server Port 8888
-        m_Transport.SetConnectionData("0.0.0.0", port, forceOverrideCommandLineArgs: true);   // <----  Port set to 8888
+       // m_Transport.SetConnectionData("0.0.0.0", port, forceOverrideCommandLineArgs: false);   // <----  Port set to true 8888 false 9999
         m_Network.StartServer();
         Debug.Log("Server listening on port: " + m_Transport.ConnectionData.Port); // <---- Shows      Server listening on port: 7777
     }