reverts some [] syntax so it compiles in all .net versions

pardeike · Feb 19, 2024 · 16f00a1 · 16f00a1
1 parent 9615407
commit 16f00a1
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/Harmony/Internal/HarmonySharedState.cs b/Harmony/Internal/HarmonySharedState.cs
@@ -3,6 +3,8 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using System.Reflection;
 
 namespace HarmonyLib
@@ -109,9 +111,11 @@ internal static PatchInfo GetPatchInfo(MethodBase method)
 			return PatchInfoSerialization.Deserialize(bytes);
 		}
 
+
+		[SuppressMessage("Style", "IDE0305")]
 		internal static IEnumerable<MethodBase> GetPatchedMethods()
 		{
-			lock (state) return [.. state.Keys];
+			lock (state) return state.Keys.ToArray();
 		}
 
 		internal static void UpdatePatchInfo(MethodBase original, MethodInfo replacement, PatchInfo patchInfo)

diff --git a/Harmony/Public/PatchClassProcessor.cs b/Harmony/Public/PatchClassProcessor.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Reflection;
 
@@ -274,11 +275,12 @@ void ReportException(Exception exception, MethodBase original)
 			throw new HarmonyException($"Patching exception in method {original.FullDescription()}", exception);
 		}
 
+		[SuppressMessage("Style", "IDE0300")]
 		T RunMethod<S, T>(T defaultIfNotExisting, T defaultIfFailing, Func<T, string> failOnResult = null, params object[] parameters)
 		{
 			if (auxilaryMethods.TryGetValue(typeof(S), out var method))
 			{
-				var input = (parameters ?? []).Union([instance]).ToArray();
+				var input = (parameters ?? []).Union(new object[] { instance }).ToArray();
 				var actualParameters = AccessTools.ActualParameters(method, input);
 
 				if (method.ReturnType != typeof(void) && typeof(T).IsAssignableFrom(method.ReturnType) is false)
@@ -312,11 +314,12 @@ T RunMethod<S, T>(T defaultIfNotExisting, T defaultIfFailing, Func<T, string> fa
 			return defaultIfNotExisting;
 		}
 
+		[SuppressMessage("Style", "IDE0300")]
 		void RunMethod<S>(ref Exception exception, params object[] parameters)
 		{
 			if (auxilaryMethods.TryGetValue(typeof(S), out var method))
 			{
-				var input = (parameters ?? []).Union([instance]).ToArray();
+				var input = (parameters ?? []).Union(new object[] { instance }).ToArray();
 				var actualParameters = AccessTools.ActualParameters(method, input);
 				try
 				{

diff --git a/Harmony/Tools/CodeMatcher.cs b/Harmony/Tools/CodeMatcher.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Reflection;
 using System.Reflection.Emit;
+using System.Diagnostics.CodeAnalysis;
 
 namespace HarmonyLib
 {
@@ -344,10 +345,11 @@ public CodeMatcher CreateLabel(out Label label)
 		/// <param name="label">[out] The new label</param>
 		/// <returns>The same code matcher</returns>
 		///
+		[SuppressMessage("Style", "IDE0300")]
 		public CodeMatcher CreateLabelAt(int position, out Label label)
 		{
 			label = generator.DefineLabel();
-			_ = AddLabelsAt(position, [label]);
+			_ = AddLabelsAt(position, new Label[] { label });
 			return this;
 		}
 
@@ -356,10 +358,12 @@ public CodeMatcher CreateLabelAt(int position, out Label label)
 		/// <param name="label">[out] The new label</param>
 		/// <returns>The same code matcher</returns>
 		///
+
+		[SuppressMessage("Style", "IDE0300")]
 		public CodeMatcher CreateLabelWithOffsets(int offset, out Label label)
 		{
 			label = generator.DefineLabel();
-			return AddLabelsAt(Pos + offset, [label]);
+			return AddLabelsAt(Pos + offset, new Label[] { label });
 		}
 
 		/// <summary>Adds an enumeration of labels to current position</summary>

diff --git a/Harmony/Tools/Extensions.cs b/Harmony/Tools/Extensions.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Reflection;
 using System.Reflection.Emit;
@@ -670,7 +671,8 @@ public static void Do<T>(this IEnumerable<T> sequence, Action<T> action)
 		/// <param name="item">The item to add</param>
 		/// <returns>The collection containing the item</returns>
 		///
-		public static IEnumerable<T> AddItem<T>(this IEnumerable<T> sequence, T item) => (sequence ?? []).Concat([item]);
+		[SuppressMessage("Style", "IDE0300")]
+		public static IEnumerable<T> AddItem<T>(this IEnumerable<T> sequence, T item) => (sequence ?? []).Concat(new T[] { item });
 
 		/// <summary>A helper to add an item to an array</summary>
 		/// <typeparam name="T">The inner type of the collection</typeparam>