code cleanup, net8.0, optional ret code for methods ending in throw

Harmony/Documentation/Documentation.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net35;net452;net472;net48;netcoreapp3.0;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
+		<TargetFrameworks>net35;net452;net472;net48;netcoreapp3.0;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
 		<LangVersion>preview</LangVersion>
 		<IsPackable>false</IsPackable>
 		<IntermediateOutputPath>obj</IntermediateOutputPath>

Harmony/Harmony.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.0;net35;net452;net472;net48;netcoreapp3.0;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
+		<TargetFrameworks>netstandard2.0;net35;net452;net472;net48;netcoreapp3.0;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Product>Harmony</Product>
 		<Company>Andreas Pardeike</Company>
@@ -35,7 +35,7 @@
 
 	<!-- In .NET 5.0 Binary Formatters are off by default.  Support is added for .NET 5.0+ for fallback JSON Serialization -->
 	<Choose>
-		<When Condition="'$(TargetFramework)'=='net5.0' Or '$(TargetFramework)'=='net6.0' Or '$(TargetFramework)'=='net7.0'">
+		<When Condition="'$(TargetFramework)'=='net5.0' Or '$(TargetFramework)'=='net6.0' Or '$(TargetFramework)'=='net7.0' Or '$(TargetFramework)'=='net8.0'">
 			<PropertyGroup>
 				<IsNET5OrGreater>true</IsNET5OrGreater>
 			</PropertyGroup>
@@ -122,6 +122,7 @@
 		<Compile Remove="**\*.net5.cs" />
 		<Compile Remove="**\*.net6.cs" />
 		<Compile Remove="**\*.net7.cs" />
+		<Compile Remove="**\*.net8.cs" />
 	</ItemGroup>
 
 	<Target Name="RemoveOldNuGetPackages" BeforeTargets="PreBuildEvent">

Harmony/Internal/AccessCache.cs

@@ -21,21 +21,21 @@ internal enum MemberType
 			{ MemberType.Static, BasicFlags | BindingFlags.Static }
 		};
 
-		readonly Dictionary<Type, Dictionary<string, FieldInfo>> declaredFields = new();
-		readonly Dictionary<Type, Dictionary<string, PropertyInfo>> declaredProperties = new();
-		readonly Dictionary<Type, Dictionary<string, Dictionary<int, MethodBase>>> declaredMethods = new();
+		readonly Dictionary<Type, Dictionary<string, FieldInfo>> declaredFields = [];
+		readonly Dictionary<Type, Dictionary<string, PropertyInfo>> declaredProperties = [];
+		readonly Dictionary<Type, Dictionary<string, Dictionary<int, MethodBase>>> declaredMethods = [];
 
-		readonly Dictionary<Type, Dictionary<string, FieldInfo>> inheritedFields = new();
-		readonly Dictionary<Type, Dictionary<string, PropertyInfo>> inheritedProperties = new();
-		readonly Dictionary<Type, Dictionary<string, Dictionary<int, MethodBase>>> inheritedMethods = new();
+		readonly Dictionary<Type, Dictionary<string, FieldInfo>> inheritedFields = [];
+		readonly Dictionary<Type, Dictionary<string, PropertyInfo>> inheritedProperties = [];
+		readonly Dictionary<Type, Dictionary<string, Dictionary<int, MethodBase>>> inheritedMethods = [];
 
 		static T Get<T>(Dictionary<Type, Dictionary<string, T>> dict, Type type, string name, Func<T> fetcher)
 		{
 			lock (dict)
 			{
 				if (dict.TryGetValue(type, out var valuesByName) is false)
 				{
-					valuesByName = new Dictionary<string, T>();
+					valuesByName = [];
 					dict[type] = valuesByName;
 				}
 				if (valuesByName.TryGetValue(name, out var value) is false)
@@ -53,12 +53,12 @@ static T Get<T>(Dictionary<Type, Dictionary<string, Dictionary<int, T>>> dict, T
 			{
 				if (dict.TryGetValue(type, out var valuesByName) is false)
 				{
-					valuesByName = new Dictionary<string, Dictionary<int, T>>();
+					valuesByName = [];
 					dict[type] = valuesByName;
 				}
 				if (valuesByName.TryGetValue(name, out var valuesByArgument) is false)
 				{
-					valuesByArgument = new Dictionary<int, T>();
+					valuesByArgument = [];
 					valuesByName[name] = valuesByArgument;
 				}
 				var argumentsHash = AccessTools.CombinedHashCode(arguments);

Harmony/Internal/CodeTranspiler.cs

@@ -10,7 +10,7 @@ namespace HarmonyLib
 	internal class CodeTranspiler
 	{
 		readonly IEnumerable<CodeInstruction> codeInstructions;
-		readonly List<MethodInfo> transpilers = new();
+		readonly List<MethodInfo> transpilers = [];
 
 		internal CodeTranspiler(List<ILInstruction> ilInstructions)
 		{
@@ -156,7 +156,7 @@ internal static IEnumerable ConvertInstructionsAndUnassignedValues(Type type, IE
 			var listType = enumerableAssembly.GetType(genericListTypeWithElement.FullName);
 			var list = Activator.CreateInstance(listType);
 			var listAdd = list.GetType().GetMethod("Add");
-			unassignedValues = new Dictionary<object, Dictionary<string, object>>();
+			unassignedValues = [];
 			foreach (var op in enumerable)
 			{
 				var elementTo = ConvertInstruction(elementType, op, out var unassigned);

Harmony/Internal/Emitter.cs

@@ -19,7 +19,7 @@ public override string ToString()
 	internal class Emitter
 	{
 		readonly CecilILGenerator il;
-		readonly Dictionary<int, CodeInstruction> instructions = new();
+		readonly Dictionary<int, CodeInstruction> instructions = [];
 		readonly bool debug;
 
 		internal Emitter(ILGenerator il, bool debug)

Harmony/Internal/HarmonySharedState.cs

@@ -65,7 +65,7 @@ static HarmonySharedState()
 			state = (Dictionary<MethodBase, byte[]>)stateField.GetValue(null);
 
 			// copy 'originals' over to our fields
-			originals = new Dictionary<MethodInfo, MethodBase>();
+			originals = [];
 			if (originalsField != null) // may not exist in older versions
 				originals = (Dictionary<MethodInfo, MethodBase>)originalsField.GetValue(null);
 		}

Harmony/Internal/ILInstruction.cs

@@ -11,8 +11,8 @@ internal class ILInstruction
 		internal object operand;
 		internal object argument;
 
-		internal List<Label> labels = new();
-		internal List<ExceptionBlock> blocks = new();
+		internal List<Label> labels = [];
+		internal List<ExceptionBlock> blocks = [];
 
 		internal ILInstruction(OpCode opcode, object operand = null)
 		{

Harmony/Internal/MethodCopier.cs

@@ -14,7 +14,7 @@ namespace HarmonyLib
 	internal class MethodCopier
 	{
 		readonly MethodBodyReader reader;
-		readonly List<MethodInfo> transpilers = new();
+		readonly List<MethodInfo> transpilers = [];
 
 		internal MethodCopier(MethodBase fromMethod, ILGenerator toILGenerator, LocalBuilder[] existingVariables = null)
 		{
@@ -98,7 +98,7 @@ internal MethodBodyReader(MethodBase method, ILGenerator generator)
 			if ((body?.GetILAsByteArray()?.Length ?? 0) == 0)
 			{
 				ilBytes = new ByteBuffer(new byte[0]);
-				ilInstructions = new List<ILInstruction>();
+				ilInstructions = [];
 			}
 			else
 			{
@@ -127,7 +127,7 @@ internal MethodBodyReader(MethodBase method, ILGenerator generator)
 				this_parameter = new ThisParameter(method);
 			parameters = method.GetParameters();
 
-			localVariables = body?.LocalVariables?.ToList() ?? new List<LocalVariableInfo>();
+			localVariables = body?.LocalVariables?.ToList() ?? [];
 			exceptions = body?.ExceptionHandlingClauses ?? new List<ExceptionHandlingClause>();
 		}
 

Harmony/Internal/MethodPatcher.cs

@@ -206,7 +206,8 @@ internal MethodInfo CreateReplacement(out Dictionary<int, CodeInstruction> final
 					emitter.Emit(OpCodes.Ldloc, resultVariable);
 			}
 
-			emitter.Emit(OpCodes.Ret);
+			if (endsInThrow == false || hasFinalizers) // methods ending in throw cannot have more code after the throw
+				emitter.Emit(OpCodes.Ret);
 
 			finalInstructions = emitter.GetInstructions();
 

Harmony/Internal/PatchModels.cs

@@ -14,10 +14,10 @@ internal class Job
 		{
 			internal MethodBase original;
 			internal T replacement;
-			internal List<HarmonyMethod> prefixes = new();
-			internal List<HarmonyMethod> postfixes = new();
-			internal List<HarmonyMethod> transpilers = new();
-			internal List<HarmonyMethod> finalizers = new();
+			internal List<HarmonyMethod> prefixes = [];
+			internal List<HarmonyMethod> postfixes = [];
+			internal List<HarmonyMethod> transpilers = [];
+			internal List<HarmonyMethod> finalizers = [];
 
 			internal void AddPatch(AttributePatch patch)
 			{
@@ -39,7 +39,7 @@ internal void AddPatch(AttributePatch patch)
 			}
 		}
 
-		internal Dictionary<MethodBase, Job> state = new();
+		internal Dictionary<MethodBase, Job> state = [];
 
 		internal Job GetJob(MethodBase method)
 		{

Harmony/Internal/PatchSorter.cs

@@ -44,8 +44,8 @@ internal List<MethodInfo> Sort(MethodBase original)
 			if (sortedPatchArray is not null) return sortedPatchArray.Select(x => x.GetMethod(original)).ToList();
 
 			// Initialize internal structures used for sorting.
-			handledPatches = new HashSet<PatchSortingWrapper>();
-			waitingList = new List<PatchSortingWrapper>();
+			handledPatches = [];
+			waitingList = [];
 			result = new List<PatchSortingWrapper>(patches.Count);
 			var queue = new Queue<PatchSortingWrapper>(patches);
 
@@ -165,8 +165,8 @@ class PatchSortingWrapper : IComparable
 			internal PatchSortingWrapper(Patch patch)
 			{
 				innerPatch = patch;
-				before = new HashSet<PatchSortingWrapper>();
-				after = new HashSet<PatchSortingWrapper>();
+				before = [];
+				after = [];
 			}
 
 			/// <summary>Determines how patches sort</summary>

Harmony/Internal/PatchTools.cs

@@ -11,7 +11,7 @@ namespace HarmonyLib
 {
 	internal static class PatchTools
 	{
-		private static readonly Dictionary<MethodBase, ICoreDetour> detours = new();
+		private static readonly Dictionary<MethodBase, ICoreDetour> detours = [];
 
 		internal static void DetourMethod(MethodBase method, MethodBase replacement)
 		{

Harmony/Public/CodeInstruction.cs

@@ -13,7 +13,7 @@ public class CodeInstruction
 	{
 		internal static class State
 		{
-			internal static readonly Dictionary<int, Delegate> closureCache = new();
+			internal static readonly Dictionary<int, Delegate> closureCache = [];
 		}
 
 		/// <summary>The opcode</summary>
@@ -26,11 +26,11 @@ internal static class State
 
 		/// <summary>All labels defined on this instruction</summary>
 		///
-		public List<Label> labels = new();
+		public List<Label> labels = [];
 
 		/// <summary>All exception block boundaries defined on this instruction</summary>
 		///
-		public List<ExceptionBlock> blocks = new();
+		public List<ExceptionBlock> blocks = [];
 
 		// Internal parameterless constructor that AccessTools.CreateInstance can use, ensuring that labels/blocks are initialized.
 		internal CodeInstruction()
@@ -67,8 +67,8 @@ public CodeInstruction Clone()
 		{
 			return new CodeInstruction(this)
 			{
-				labels = new List<Label>(),
-				blocks = new List<ExceptionBlock>()
+				labels = [],
+				blocks = []
 			};
 		}
 

Harmony/Public/InlineSignature.cs

@@ -27,7 +27,7 @@ internal class InlineSignature : ICallSiteGenerator
 
 		/// <summary>The list of all parameter types or function pointer signatures received by the call site</summary>
 		///
-		public List<object> Parameters { get; set; } = new List<object>();
+		public List<object> Parameters { get; set; } = [];
 
 		/// <summary>The return type or function pointer signature returned by the call site</summary>
 		///

Harmony/Public/PatchClassProcessor.cs

@@ -13,17 +13,17 @@ public class PatchClassProcessor
 
 		readonly Type containerType;
 		readonly HarmonyMethod containerAttributes;
-		readonly Dictionary<Type, MethodInfo> auxiliaryMethods;
+		readonly Dictionary<Type, MethodInfo> auxilaryMethods;
 
 		readonly List<AttributePatch> patchMethods;
 
-		static readonly List<Type> auxiliaryTypes = new()
-		{
+		static readonly List<Type> auxilaryTypes =
+		[
 			typeof(HarmonyPrepare),
 			typeof(HarmonyCleanup),
 			typeof(HarmonyTargetMethod),
 			typeof(HarmonyTargetMethods)
-		};
+		];
 
 		/// <summary name="Category">Name of the patch class's category</summary>
 		public string Category { get; set; }
@@ -51,11 +51,11 @@ public PatchClassProcessor(Harmony instance, Type type)
 
 			Category = containerAttributes.category;
 
-			auxiliaryMethods = new Dictionary<Type, MethodInfo>();
-			foreach (var auxType in auxiliaryTypes)
+			auxilaryMethods = [];
+			foreach (var auxType in auxilaryTypes)
 			{
 				var method = PatchTools.GetPatchMethod(containerType, auxType.FullName);
-				if (method is not null) auxiliaryMethods[auxType] = method;
+				if (method is not null) auxilaryMethods[auxType] = method;
 			}
 
 			patchMethods = PatchTools.GetPatchMethods(containerType);
@@ -82,7 +82,7 @@ public List<MethodInfo> Patch()
 			{
 				RunMethod<HarmonyCleanup>(ref exception);
 				ReportException(exception, null);
-				return new List<MethodInfo>();
+				return [];
 			}
 
 			var replacements = new List<MethodInfo>();
@@ -235,7 +235,7 @@ List<MethodBase> GetBulkMethods()
 				else if (result.Any(m => m is null)) error = "some element was null";
 				if (error != null)
 				{
-					if (auxiliaryMethods.TryGetValue(typeof(HarmonyTargetMethods), out var method))
+					if (auxilaryMethods.TryGetValue(typeof(HarmonyTargetMethods), out var method))
 						throw new Exception($"Method {method.FullDescription()} returned an unexpected result: {error}");
 					else
 						throw new Exception($"Some method returned an unexpected result: {error}");
@@ -276,7 +276,7 @@ void ReportException(Exception exception, MethodBase original)
 
 		T RunMethod<S, T>(T defaultIfNotExisting, T defaultIfFailing, Func<T, string> failOnResult = null, params object[] parameters)
 		{
-			if (auxiliaryMethods.TryGetValue(typeof(S), out var method))
+			if (auxilaryMethods.TryGetValue(typeof(S), out var method))
 			{
 				var input = (parameters ?? new object[0]).Union(new object[] { instance }).ToArray();
 				var actualParameters = AccessTools.ActualParameters(method, input);
@@ -314,7 +314,7 @@ T RunMethod<S, T>(T defaultIfNotExisting, T defaultIfFailing, Func<T, string> fa
 
 		void RunMethod<S>(ref Exception exception, params object[] parameters)
 		{
-			if (auxiliaryMethods.TryGetValue(typeof(S), out var method))
+			if (auxilaryMethods.TryGetValue(typeof(S), out var method))
 			{
 				var input = (parameters ?? new object[0]).Union(new object[] { instance }).ToArray();
 				var actualParameters = AccessTools.ActualParameters(method, input);