cleans up conditional compiles; tries to fix #533; refactors CodeMatc…

…h; adds IEnumerable<CodeInstruction>.Matches()
pardeike · Jun 17, 2023 · b9206db · b9206db
1 parent 41e9431
commit b9206db
Show file tree

Hide file tree

Showing 26 changed files with 136 additions and 152 deletions.
diff --git a/Harmony/Extras/DelegateTypeFactory.cs b/Harmony/Extras/DelegateTypeFactory.cs
@@ -44,7 +44,7 @@ public Type CreateDelegateType(MethodInfo method)
 			for (var i = 0; i < parameters.Length; i++)
 				invokeMethod.DefineParameter(i + 1, ParameterAttributes.None, parameters[i].Name);
 
-#if NETSTANDARD2_0
+#if NETSTANDARD
 			return typeBuilder.CreateTypeInfo().AsType();
 #else
 			return typeBuilder.CreateType();

diff --git a/Harmony/ForwardingAttributes/Mono.Cecil.Cil.cs b/Harmony/ForwardingAttributes/Mono.Cecil.Cil.cs
@@ -1,4 +1,4 @@
-#if NETFRAMEWORK || NETSTANDARD2_0
+#if NETFRAMEWORK || NETSTANDARD
 using System.Runtime.CompilerServices;
 
 [assembly: TypeForwardedTo(typeof(Mono.Cecil.Cil.Code))]

diff --git a/Harmony/ForwardingAttributes/Mono.Cecil.Mdb.cs b/Harmony/ForwardingAttributes/Mono.Cecil.Mdb.cs
@@ -1,4 +1,4 @@
-#if NETFRAMEWORK || NETSTANDARD2_0
+#if NETFRAMEWORK || NETSTANDARD
 using System.Runtime.CompilerServices;
 
 [assembly: TypeForwardedTo(typeof(Mono.Cecil.Mdb.MdbReader))]

diff --git a/Harmony/ForwardingAttributes/Mono.Cecil.Pdb.cs b/Harmony/ForwardingAttributes/Mono.Cecil.Pdb.cs
@@ -1,4 +1,4 @@
-#if NETFRAMEWORK || NETSTANDARD2_0
+#if NETFRAMEWORK || NETSTANDARD
 using System.Runtime.CompilerServices;
 
 [assembly: TypeForwardedTo(typeof(Mono.Cecil.Pdb.NativePdbReader))]

diff --git a/Harmony/ForwardingAttributes/Mono.Cecil.Rocks.cs b/Harmony/ForwardingAttributes/Mono.Cecil.Rocks.cs
@@ -1,4 +1,4 @@
-#if NETFRAMEWORK || NETSTANDARD2_0
+#if NETFRAMEWORK || NETSTANDARD
 using System.Runtime.CompilerServices;
 
 [assembly: TypeForwardedTo(typeof(Mono.Cecil.Rocks.IILVisitor))]

diff --git a/Harmony/ForwardingAttributes/Mono.Cecil.cs b/Harmony/ForwardingAttributes/Mono.Cecil.cs
@@ -1,4 +1,4 @@
-#if NETFRAMEWORK || NETSTANDARD2_0
+#if NETFRAMEWORK || NETSTANDARD
 using System.Runtime.CompilerServices;
 
 [assembly: TypeForwardedTo(typeof(Mono.Cecil.AssemblyAttributes))]

diff --git a/Harmony/ForwardingAttributes/Mono.Collections.Generic.cs b/Harmony/ForwardingAttributes/Mono.Collections.Generic.cs
@@ -1,4 +1,4 @@
-#if NETFRAMEWORK || NETSTANDARD2_0
+#if NETFRAMEWORK || NETSTANDARD
 using System.Runtime.CompilerServices;
 
 [assembly: TypeForwardedTo(typeof(Mono.Collections.Generic.Collection<>))]

diff --git a/Harmony/ForwardingAttributes/Mono.CompilerServices.SymbolWriter.cs b/Harmony/ForwardingAttributes/Mono.CompilerServices.SymbolWriter.cs
@@ -1,4 +1,4 @@
-#if NETFRAMEWORK || NETSTANDARD2_0
+#if NETFRAMEWORK || NETSTANDARD
 using System.Runtime.CompilerServices;
 
 [assembly: TypeForwardedTo(typeof(Mono.CompilerServices.SymbolWriter.AnonymousScopeEntry))]

diff --git a/Harmony/ForwardingAttributes/MonoMod.Utils.Cil.cs b/Harmony/ForwardingAttributes/MonoMod.Utils.Cil.cs
@@ -1,4 +1,4 @@
-#if NETFRAMEWORK || NETSTANDARD2_0
+#if NETFRAMEWORK || NETSTANDARD
 using System.Runtime.CompilerServices;
 
 [assembly: TypeForwardedTo(typeof(MonoMod.Utils.Cil.CecilILGenerator))]

diff --git a/Harmony/ForwardingAttributes/MonoMod.Utils.cs b/Harmony/ForwardingAttributes/MonoMod.Utils.cs
@@ -1,4 +1,4 @@
-#if NETFRAMEWORK || NETSTANDARD2_0
+#if NETFRAMEWORK || NETSTANDARD
 using System.Runtime.CompilerServices;
 
 [assembly: TypeForwardedTo(typeof(MonoMod.Utils.DMDEmitDynamicMethodGenerator))]

diff --git a/Harmony/Harmony.csproj b/Harmony/Harmony.csproj
@@ -84,10 +84,6 @@
 		<DebugSymbols>false</DebugSymbols>
 	</PropertyGroup>
 
-	<PropertyGroup Condition="$(IsNET5OrGreater)">
-		<DefineConstants>$(DefineConstants);NET50_OR_GREATER</DefineConstants>
-	</PropertyGroup>
-
 	<ItemGroup>
 		<PackageReference Include="MonoMod.Core" Version="$(MonoModCoreVersion)" />
 		<!-- Reference assemblies are needed for non-Windows .NET Framework targeting builds. -->

diff --git a/Harmony/Internal/Emitter.cs b/Harmony/Internal/Emitter.cs
@@ -356,16 +356,13 @@ internal void EmitCall(OpCode opcode, MethodInfo methodInfo, Type[] optionalPara
 			il.EmitCall(opcode, methodInfo, optionalParameterTypes);
 		}
 
-#if NETSTANDARD2_0 || NETCOREAPP2_0
-#else
 		internal void EmitCalli(OpCode opcode, CallingConvention unmanagedCallConv, Type returnType, Type[] parameterTypes)
 		{
 			instructions.Add(CurrentPos(), new CodeInstruction(opcode, unmanagedCallConv));
 			var extra = returnType.FullName + " " + parameterTypes.Description();
 			LogIL(opcode, unmanagedCallConv, extra);
 			il.EmitCalli(opcode, unmanagedCallConv, returnType, parameterTypes);
 		}
-#endif
 
 		internal void EmitCalli(OpCode opcode, CallingConventions callingConvention, Type returnType, Type[] parameterTypes, Type[] optionalParameterTypes)
 		{

diff --git a/Harmony/Internal/PatchTools.cs b/Harmony/Internal/PatchTools.cs
@@ -52,7 +52,7 @@ internal static MethodInfo GetPatchMethod(Type patchType, string attributeName)
 		internal static AssemblyBuilder DefineDynamicAssembly(string name)
 		{
 			var assemblyName = new AssemblyName(name);
-#if NETCOREAPP2_0 || NETCOREAPP3_0 || NETCOREAPP3_1 || NETSTANDARD2_0 || NET50_OR_GREATER
+#if NETCOREAPP || NETSTANDARD || NET5_0_OR_GREATER
 			return AssemblyBuilder.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.Run);
 #else
 			return AppDomain.CurrentDomain.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.Run);
@@ -102,7 +102,7 @@ internal static MethodBase GetOriginalMethod(this HarmonyMethod attr)
 						var enumMethod = AccessTools.DeclaredMethod(attr.declaringType, attr.methodName, attr.argumentTypes);
 						return AccessTools.EnumeratorMoveNext(enumMethod);
 
-#if NET45_OR_GREATER
+#if NET45_OR_GREATER || NETSTANDARD || NETCOREAPP
 					case MethodType.Async:
 						if (attr.methodName is null)
 							return null;

diff --git a/Harmony/Public/Attributes.cs b/Harmony/Public/Attributes.cs
@@ -19,7 +19,7 @@ public enum MethodType
 		StaticConstructor,
 		/// <summary>This targets the MoveNext method of the enumerator result, that actually contains the method's implementation</summary>
 		Enumerator,
-#if NET45_OR_GREATER
+#if NET45_OR_GREATER || NETSTANDARD || NETCOREAPP
 		/// <summary>This targets the MoveNext method of the async state machine, that actually contains the method's implementation</summary>
 		Async
 #endif

diff --git a/Harmony/Public/Harmony.cs b/Harmony/Public/Harmony.cs
@@ -47,7 +47,7 @@ public Harmony(string id)
 				var location = assembly.Location;
 				var environment = Environment.Version.ToString();
 				var platform = Environment.OSVersion.Platform.ToString();
-#if !NET50_OR_GREATER
+#if !NET5_0_OR_GREATER
 				if (string.IsNullOrEmpty(location)) location = new Uri(assembly.CodeBase).LocalPath;
 #endif
 				FileLog.Log($"### Harmony id={id}, version={version}, location={location}, env/clr={environment}, platform={platform}");
@@ -56,7 +56,7 @@ public Harmony(string id)
 				{
 					var callingAssembly = callingMethod.DeclaringType.Assembly;
 					location = callingAssembly.Location;
-#if !NET50_OR_GREATER
+#if !NET5_0_OR_GREATER
 					if (string.IsNullOrEmpty(location)) location = new Uri(callingAssembly.CodeBase).LocalPath;
 #endif
 					FileLog.Log($"### Started from {callingMethod.FullDescription()}, location {location}");

diff --git a/Harmony/Public/Patch.cs b/Harmony/Public/Patch.cs
@@ -5,7 +5,7 @@
 using System.Reflection.Emit;
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Formatters.Binary;
-#if NET50_OR_GREATER
+#if NET5_0_OR_GREATER
 using System.Text.Json;
 using System.Text.Json.Serialization;
 #endif
@@ -16,7 +16,7 @@ namespace HarmonyLib
 	///
 	internal static class PatchInfoSerialization
 	{
-#if NET50_OR_GREATER
+#if NET5_0_OR_GREATER
 		internal static bool? useBinaryFormatter = null;
 		internal static bool UseBinaryFormatter
 		{
@@ -68,14 +68,14 @@ public override Type BindToType(string assemblyName, string typeName)
 		///
 		internal static byte[] Serialize(this PatchInfo patchInfo)
 		{
-#if NET50_OR_GREATER
+#if NET5_0_OR_GREATER
 			if (UseBinaryFormatter)
 			{
 #endif
 			using var streamMemory = new MemoryStream();
 			binaryFormatter.Serialize(streamMemory, patchInfo);
 			return streamMemory.GetBuffer();
-#if NET50_OR_GREATER
+#if NET5_0_OR_GREATER
 			}
 			else
 				return JsonSerializer.SerializeToUtf8Bytes(patchInfo);
@@ -88,13 +88,13 @@ internal static byte[] Serialize(this PatchInfo patchInfo)
 		///
 		internal static PatchInfo Deserialize(byte[] bytes)
 		{
-#if NET50_OR_GREATER
+#if NET5_0_OR_GREATER
 			if (UseBinaryFormatter)
 			{
 #endif
 			using var streamMemory = new MemoryStream(bytes);
 			return (PatchInfo)binaryFormatter.Deserialize(streamMemory);
-#if NET50_OR_GREATER
+#if NET5_0_OR_GREATER
 			}
 			else
 			{
@@ -130,35 +130,35 @@ public class PatchInfo
 	{
 		/// <summary>Prefixes as an array of <see cref="Patch"/></summary>
 		///
-#if NET50_OR_GREATER
+#if NET5_0_OR_GREATER
 		[JsonInclude]
 #endif
 		public Patch[] prefixes = new Patch[0];
 
 		/// <summary>Postfixes as an array of <see cref="Patch"/></summary>
 		///
-#if NET50_OR_GREATER
+#if NET5_0_OR_GREATER
 		[JsonInclude]
 #endif
 		public Patch[] postfixes = new Patch[0];
 
 		/// <summary>Transpilers as an array of <see cref="Patch"/></summary>
 		///
-#if NET50_OR_GREATER
+#if NET5_0_OR_GREATER
 		[JsonInclude]
 #endif
 		public Patch[] transpilers = new Patch[0];
 
 		/// <summary>Finalizers as an array of <see cref="Patch"/></summary>
 		///
-#if NET50_OR_GREATER
+#if NET5_0_OR_GREATER
 		[JsonInclude]
 #endif
 		public Patch[] finalizers = new Patch[0];
 
 		/// <summary>Returns if any of the patches wants debugging turned on</summary>
 		///
-#if NET50_OR_GREATER
+#if NET5_0_OR_GREATER
 		[JsonIgnore]
 #endif
 		public bool Debugging => prefixes.Any(p => p.debug) || postfixes.Any(p => p.debug) || transpilers.Any(p => p.debug) || finalizers.Any(p => p.debug);
@@ -306,7 +306,7 @@ private static Patch[] Remove(string owner, Patch[] current)
 
 	/// <summary>A serializable patch</summary>
 	///
-#if NET50_OR_GREATER
+#if NET5_0_OR_GREATER
 	[JsonConverter(typeof(PatchJsonConverter))]
 #endif
 	[Serializable]
@@ -343,7 +343,7 @@ public class Patch : IComparable
 
 		/// <summary>The method of the static patch method</summary>
 		///
-#if NET50_OR_GREATER
+#if NET5_0_OR_GREATER
 		[JsonIgnore]
 #endif
 		public MethodInfo PatchMethod

diff --git a/Harmony/Public/PatchJsonConverter.cs b/Harmony/Public/PatchJsonConverter.cs
@@ -1,4 +1,4 @@
-#if NET50_OR_GREATER
+#if NET5_0_OR_GREATER
 using System;
 using System.Collections.Generic;
 using System.Text.Json;

diff --git a/Harmony/Tools/AccessTools.cs b/Harmony/Tools/AccessTools.cs
@@ -10,7 +10,7 @@
 using System.Runtime.Serialization;
 using System.Threading;
 
-#if NET45_OR_GREATER
+#if NET45_OR_GREATER || NETSTANDARD || NETCOREAPP
 using System.Runtime.CompilerServices;
 #endif
 
@@ -600,7 +600,7 @@ public static MethodInfo EnumeratorMoveNext(MethodBase method)
 			return Method(type, nameof(IEnumerator.MoveNext));
 		}
 
-#if NET45_OR_GREATER
+#if NET45_OR_GREATER || NETSTANDARD || NETCOREAPP
 		/// <summary>Gets the <see cref="IAsyncStateMachine.MoveNext"/> method of an async method's state machine</summary>
 		/// <param name="method">Async method that creates the state machine internally</param>
 		/// <returns>The internal <see cref="IAsyncStateMachine.MoveNext"/> method of the async state machine or <b>null</b> if no valid async method is detected</returns>