4.0.4

- Fixed BadImageFormat regression from 3.11.8/4.0.3. - Fixed UpgradeFromV3ToV4Menu blocking builds due to incorrect end define placement.
FirstGearGames · Nov 24, 2023 · 47e4af5 · 47e4af5
1 parent 7f3d0f6
commit 47e4af5
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 18 deletions.
diff --git a/Assets/FishNet/CodeGenerating/Extension/TypeReferenceExtensions.cs b/Assets/FishNet/CodeGenerating/Extension/TypeReferenceExtensions.cs
@@ -33,20 +33,6 @@ public static string GetFullnameWithoutBrackets(this TypeReference tr)
             return str;
         }
 
-        /// <summary>
-        /// Returns a method in the next base class.
-        /// </summary>
-        public static MethodDefinition GetMethodInBase(this TypeReference tr, CodegenSession session, string methodName)
-        {
-            TypeDefinition td = tr.CachedResolve(session);
-            if (td.BaseType == null)
-                return null;
-
-            td = td.BaseType.CachedResolve(session);
-            return td.GetMethod(methodName);
-        }
-
-
 
         /// <summary>
         /// Makes a GenericInstanceType.

diff --git a/Assets/FishNet/CodeGenerating/Processing/NetworkBehaviourProcessor.cs b/Assets/FishNet/CodeGenerating/Processing/NetworkBehaviourProcessor.cs
@@ -221,7 +221,7 @@ private void CallBaseAwake(TypeDefinition td)
                 return;
 
             //Base Awake.
-            MethodReference baseAwakeMr = td.GetMethodInBase(base.Session, NetworkBehaviourHelper.AWAKE_METHOD_NAME);
+            MethodReference baseAwakeMr = td.GetMethodReferenceInBase(base.Session, NetworkBehaviourHelper.AWAKE_METHOD_NAME);
             //This Awake.
             MethodDefinition tdAwakeMd = td.GetMethod(NetworkBehaviourHelper.AWAKE_METHOD_NAME);
 

diff --git a/Assets/FishNet/Runtime/Editor/Upgrading/UpgradeFromV3ToV4Menu.cs b/Assets/FishNet/Runtime/Editor/Upgrading/UpgradeFromV3ToV4Menu.cs
@@ -68,5 +68,5 @@ private static bool RemoveOrAddDefine(string define, bool removeDefine)
 
 
     }
-#endif
 }
+#endif
diff --git a/Assets/FishNet/VERSION.txt b/Assets/FishNet/VERSION.txt
@@ -1 +1 @@
-4.0.3
+4.0.4
diff --git a/Assets/FishNet/package.json b/Assets/FishNet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.firstgeargames.fishnet",
-  "version": "4.0.3",
+  "version": "4.0.4",
   "displayName": "FishNet: Networking Evolved",
   "description": "A feature-rich Unity networking solution aimed towards reliability, ease of use, efficiency, and flexibility.",
   "unity": "2021.3",
-Original file line number
+Diff line change
@@ Expand Up @@
         }
-    #endif
     }
+    #endif