fix: removing warnings on project launch [MTT-9362] (#896)

* upgrade to 6000.0.32f1 & multiplayer services v1.1.0 bump * packages upgraded to recommended versions, cinemachine freelook camera updated to cinemachinecamera * merge conflicts on guids resolved, VContainer upgraded, rendergraph compatibility mode disabled * changelog cleanup, changelog addition * changelog addition * update to changelog * changelog addition * upgrading readme version badge * updating reamde netcode version badge
Unity-Technologies · Jan 16, 2025 · 4e8d8db · 4e8d8db
1 parent 93db2a7
commit 4e8d8db
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 18 deletions.
diff --git a/Assets/Models/Animated.meta b/Assets/Models/Animated.meta
diff --git a/Assets/Scripts/ConnectionManagement/ConnectionMethod.cs b/Assets/Scripts/ConnectionManagement/ConnectionMethod.cs
@@ -102,10 +102,10 @@ public override void SetupClientConnection()
             utp.SetConnectionData(m_Ipaddress, m_Port);
         }
 
-        public override async Task<(bool success, bool shouldTryAgain)> SetupClientReconnectionAsync()
+        public override Task<(bool success, bool shouldTryAgain)> SetupClientReconnectionAsync()
         {
             // Nothing to do here
-            return (true, true);
+            return Task.FromResult((true, true));
         }
 
         public override void SetupHostConnection()

diff --git a/Assets/Scripts/ConnectionManagement/ConnectionState/ClientConnectingState.cs b/Assets/Scripts/ConnectionManagement/ConnectionState/ClientConnectingState.cs
@@ -55,7 +55,7 @@ void StartingClientFailed()
             m_ConnectionManager.ChangeState(m_ConnectionManager.m_Offline);
         }
 
-        internal async Task ConnectClientAsync()
+        internal void ConnectClientAsync()
         {
             try
             {

diff --git a/Assets/Scripts/ConnectionManagement/ConnectionState/ClientReconnectingState.cs b/Assets/Scripts/ConnectionManagement/ConnectionState/ClientReconnectingState.cs
@@ -122,8 +122,7 @@ IEnumerator ReconnectCoroutine()
             if (!reconnectingSetupTask.IsFaulted && reconnectingSetupTask.Result.success)
             {
                 // If this fails, the OnClientDisconnect callback will be invoked by Netcode
-                var connectingTask = ConnectClientAsync();
-                yield return new WaitUntil(() => connectingTask.IsCompleted);
+                ConnectClientAsync();
             }
             else
             {

diff --git a/Assets/Textures/UI/button_Disabled.png.meta b/Assets/Textures/UI/button_Disabled.png.meta
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,9 +22,13 @@ Additional documentation and release notes are available at [Multiplayer Documen
   * com.unity.multiplayer.playmode from v1.3.2 to v1.3.3
   * com.unity.multiplayer.tools from v2.2.1 to v2.2.3
   * com.unity.netcode.gameobjects from v2.0.0 to v2.1.1
+* VContainer package upgraded from v1.11.0 to v1.14.0 (#896) This upgrade removes warning messages related to IL weaving as code gen is refactored in v1.14.0
 
 ### Cleanup
 * Removed ParrelSync from the project (#890)
+* Removed warnings on first project launch (#896) Included:
+  * Asset meta files with merge conflicts resolved
+  * RenderGraph compatibility mode disabled
 
 ### Fixed
 * Fix a Healer ability doesn't work (#893)

diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -23,7 +23,7 @@
     "com.unity.toolchain.macos-x86_64-linux-x86_64": "2.0.10",
     "com.unity.transport": "2.4.0",
     "com.unity.ugui": "2.0.0",
-    "jp.hadashikick.vcontainer": "1.11.0",
+    "jp.hadashikick.vcontainer": "1.14.0",
     "com.unity.modules.accessibility": "1.0.0",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",

diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
@@ -450,12 +450,10 @@
       }
     },
     "jp.hadashikick.vcontainer": {
-      "version": "1.11.0",
+      "version": "1.14.0",
       "depth": 0,
       "source": "registry",
-      "dependencies": {
-        "com.unity.nuget.mono-cecil": "1.10.1"
-      },
+      "dependencies": {},
       "url": "https://package.openupm.com"
     },
     "com.unity.modules.accessibility": {
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,7 +55,7 @@ void StartingClientFailed() @@
                 m_ConnectionManager.ChangeState(m_ConnectionManager.m_Offline);
             }
-            internal async Task ConnectClientAsync()
+            internal void ConnectClientAsync()
             {
                 try
                 {
@@ Expand Down @@