Merge pull request #22 from Lordfirespeed/main

Move netcode patched attribute to the mainmodule

Author: Lordfirespeed

NetcodePatcher.MSBuild/NetcodePatcher.MSBuild.csproj

@@ -12,10 +12,10 @@
     <NoPackageAnalysis>true</NoPackageAnalysis>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
-  
+
   <!-- Development dependencies -->
   <ItemGroup>
-    
+
   </ItemGroup>
 
   <!-- Runtime dependencies -->
@@ -51,8 +51,9 @@
       <TaskDependencies Include="bin\$(Configuration)\*\UnityEngine.CoreModule.dll"/>
       <TaskDependencies Include="bin\$(Configuration)\*\SeriLog*.dll"/>
       <TaskDependencies Include="bin\$(Configuration)\*\System.Diagnostics*.dll"/>
+      <TaskDependencies Include="bin\$(Configuration)\*\Microsoft.DiaSymReader*.dll"/>
     </ItemGroup>
-    
+
     <ItemGroup>
       <_PackageFiles Include="@(TaskDependencies)">
         <PackagePath>lib/</PackagePath>
@@ -61,4 +62,4 @@
       </_PackageFiles>
     </ItemGroup>
   </Target>
-</Project>
+</Project>

NetcodePatcher/CodeGen/ApplyPatchedAttributeILPP.cs

@@ -62,18 +62,17 @@ public override bool WillProcess(ICompiledAssembly compiledAssembly)
             )
         );
         attr_AttributeUsage.ConstructorArguments.Add(
-            new CustomAttributeArgument(assemblyDefinition.MainModule.ImportReference(typeof(AttributeTargets)), 1)
+            new CustomAttributeArgument(assemblyDefinition.MainModule.ImportReference(typeof(AttributeTargets)), 2)
         );
         cls_NetcodePatchedAttribute.CustomAttributes.Add(attr_AttributeUsage);
 
         // Method : NetcodePatchedAttribute.ctor
         var ctor_NetcodePatchedAttribute = new MethodDefinition(
             ".ctor",
-            MethodAttributes.Assembly | MethodAttributes.RTSpecialName | MethodAttributes.SpecialName |
-            MethodAttributes.HideBySig, assemblyDefinition.MainModule.TypeSystem.Void
+            MethodAttributes.Public | MethodAttributes.RTSpecialName | MethodAttributes.SpecialName | MethodAttributes.HideBySig,
+            assemblyDefinition.MainModule.TypeSystem.Void
         );
         cls_NetcodePatchedAttribute.Methods.Add(ctor_NetcodePatchedAttribute);
-        ctor_NetcodePatchedAttribute.Body.InitLocals = true;
         var il_ctor_NetcodePatchedAttribute = ctor_NetcodePatchedAttribute.Body.GetILProcessor();
         il_ctor_NetcodePatchedAttribute.Emit(OpCodes.Ldarg_0);
         il_ctor_NetcodePatchedAttribute.Emit(
@@ -88,7 +87,7 @@ public override bool WillProcess(ICompiledAssembly compiledAssembly)
         var attribute = new CustomAttribute(
             assemblyDefinition.MainModule.ImportReference(TypeHelpers.DefaultCtorFor(cls_NetcodePatchedAttribute))
         );
-        assemblyDefinition.CustomAttributes.Add(attribute);
+        assemblyDefinition.MainModule.CustomAttributes.Add(attribute);
 
         // write
         var pe = new MemoryStream();

NetcodePatcher/CodeGen/NetcodeILPPApplicator.cs

@@ -36,7 +36,7 @@ public static bool HasNetcodePatchedAttribute(ICompiledAssembly assembly)
         var assemblyDefinition = CodeGenHelpers.AssemblyDefinitionFor(assembly, out _);
         if (assemblyDefinition is null) return false;
 
-        return assemblyDefinition.CustomAttributes.Any(
+        return assemblyDefinition.MainModule.CustomAttributes.Any(
             attribute => attribute.Constructor.DeclaringType.FullName.EndsWith(
                 $".{ApplyPatchedAttributeILPP.AttributeNamespaceSuffix}.{ApplyPatchedAttributeILPP.AttributeName}")
         );