Update FishNet

2026-04-07 03:11:52 +07:00
parent 9675b7b31d
commit ba7513d478
869 changed files with 3675 additions and 2764 deletions
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Extension/FieldDefinitionExtensions.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Extension/FieldReferenceExtensions.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Extension/ILProcessorExtensions.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -111,18 +111,9 @@ namespace FishNet.CodeGenerating.Extension

            foreach (ParameterDefinition pd in otherMd.Parameters)
            {
-                session.ImportReference(pd.ParameterType.CachedResolve(session));
                int currentCount = thisMd.Parameters.Count;
                string name = pd.Name + currentCount;
-                ParameterDefinition parameterDef = new(name, pd.Attributes, pd.ParameterType);
-                // Set any default values.
-                parameterDef.Constant = pd.Constant;
-                parameterDef.IsReturnValue = pd.IsReturnValue;
-                parameterDef.IsOut = pd.IsOut;
-                foreach (CustomAttribute item in pd.CustomAttributes)
-                    parameterDef.CustomAttributes.Add(item);
-                parameterDef.HasConstant = pd.HasConstant;
-                parameterDef.HasDefault = pd.HasDefault;
+                ParameterDefinition parameterDef = pd.CloneImported(session, thisMd, name);

                if (parameterDef == null || thisMd.Parameters == null)
                {
@@ -156,17 +147,14 @@ namespace FishNet.CodeGenerating.Extension
                    DeclaringType = git,
                    CallingConvention = md.CallingConvention
                };
+
                foreach (ParameterDefinition pd in md.Parameters)
-                {
-                    session.ImportReference(pd.ParameterType);
-                    result.Parameters.Add(pd);
-                }
+                    result.Parameters.Add(pd.CloneImported(session, result));
+
                return result;
            }
-            else
-            {
-                return methodRef;
-            }
+
+            return methodRef;
        }

        /// <summary>
@@ -206,13 +194,13 @@ namespace FishNet.CodeGenerating.Extension

        public static MethodDefinition CreateCopy(this MethodDefinition copiedMd, CodegenSession session, string nameOverride = null, MethodAttributes? attributesOverride = null)
        {
-            session.ImportReference(copiedMd.ReturnType);
+            TypeReference returnType = session.ImportReference(copiedMd.ReturnType);

            MethodAttributes attr = attributesOverride.HasValue ? attributesOverride.Value : copiedMd.Attributes;
            string name = nameOverride == null ? copiedMd.Name : nameOverride;
-            MethodDefinition result = new(name, attr, copiedMd.ReturnType);
+            MethodDefinition result = new(name, attr, returnType);
            foreach (GenericParameter item in copiedMd.GenericParameters)
-                result.GenericParameters.Add(item);
+                result.GenericParameters.Add(new(item.Name, result) { Attributes = item.Attributes });

            result.CreateParameters(session, copiedMd);
            return result;
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Extension/MethodDefinitionExtensions.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -51,10 +51,7 @@ namespace FishNet.CodeGenerating.Extension
                    ExplicitThis = baseMd.ExplicitThis
                };
                foreach (ParameterDefinition pd in baseMd.Parameters)
-                {
-                    session.ImportReference(pd.ParameterType);
-                    baseMr.Parameters.Add(pd);
-                }
+                    baseMr.Parameters.Add(pd.CloneImported(session, baseMr));
            }
            else
            {
@@ -154,19 +151,15 @@ namespace FishNet.CodeGenerating.Extension
                };
                md.Body.InitLocals = methodTemplate.Body.InitLocals;

+                foreach (GenericParameter item in methodTemplate.GenericParameters)
+                {
+                    md.GenericParameters.Add(new(item.Name, md) { Attributes = item.Attributes });
+                }
+
                if (copyParameters)
                {
                    foreach (ParameterDefinition pd in methodTemplate.Parameters)
-                    {
-                        session.ImportReference(pd.ParameterType.CachedResolve(session));
-                        md.Parameters.Add(pd);
-                    }
-                }
-
-                foreach (GenericParameter item in methodTemplate.GenericParameters)
-                {
-                    session.ImportReference(item);
-                    md.GenericParameters.Add(item);
+                        md.Parameters.Add(pd.CloneImported(session, md));
                }

                td.Methods.Add(md);
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Extension/TypeDefinitionExtensions.cs
-  uploadId: 866910
+  uploadId: 892096
@@ -13,6 +13,6 @@ AssetOrigin:
  serializedVersion: 1
  productId: 207815
  packageName: 'FishNet: Networking Evolved'
-  packageVersion: 4.6.22R
+  packageVersion: 4.7.1R
  assetPath: Assets/FishNet/CodeGenerating/Extension/TypeReferenceExtensions.cs
-  uploadId: 866910
+  uploadId: 892096