fixes #444

pardeike · Jan 5, 2022 · cee4ece · cee4ece
1 parent 37d083f
commit cee4ece
Show file tree

Hide file tree

Showing 5 changed files with 92 additions and 91 deletions.
diff --git a/Harmony/Documentation/examples/patching-transpiler.cs b/Harmony/Documentation/examples/patching-transpiler.cs
@@ -30,7 +30,9 @@ static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> inst
 		}
 		// </typical>
 
+#pragma warning disable CS0649
 		class SomeType { public string someField; }
+#pragma warning restore CS0649
 
 		class Tools
 		{

diff --git a/Harmony/Public/Patch.cs b/Harmony/Public/Patch.cs
@@ -6,7 +6,6 @@
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Formatters.Binary;
 #if NET50_OR_GREATER
-using System.Runtime;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 #endif
@@ -23,11 +22,11 @@ static bool UseBinaryFormatter
 		{
 			get
 			{
-				if(!useBinaryFormatter.HasValue)
+				if (!useBinaryFormatter.HasValue)
 				{
 					// https://github.com/dotnet/runtime/blob/208e377a5329ad6eb1db5e5fb9d4590fa50beadd/src/libraries/System.Runtime.Serialization.Formatters/src/System/Runtime/Serialization/LocalAppContextSwitches.cs#L14
 					var hasSwitch = AppContext.TryGetSwitch("System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization", out var isEnabled);
-					if(hasSwitch)
+					if (hasSwitch)
 						useBinaryFormatter = isEnabled;
 					else
 					{
@@ -61,7 +60,7 @@ public override Type BindToType(string assemblyName, string typeName)
 				return typeToDeserialize;
 			}
 		}
-		internal static BinaryFormatter binaryFormatter = new BinaryFormatter { Binder = new Binder() };
+		internal static readonly BinaryFormatter binaryFormatter = new BinaryFormatter { Binder = new Binder() };
 
 		/// <summary>Serializes a patch info</summary>
 		/// <param name="patchInfo">The <see cref="PatchInfo"/></param>
@@ -70,16 +69,16 @@ public override Type BindToType(string assemblyName, string typeName)
 		internal static byte[] Serialize(this PatchInfo patchInfo)
 		{
 #if NET50_OR_GREATER
-			if(UseBinaryFormatter)
+			if (UseBinaryFormatter)
 			{
 #endif
-			using var streamMemory = new MemoryStream();
-			binaryFormatter.Serialize(streamMemory, patchInfo);
-			return streamMemory.GetBuffer();
+				using var streamMemory = new MemoryStream();
+				binaryFormatter.Serialize(streamMemory, patchInfo);
+				return streamMemory.GetBuffer();
 #if NET50_OR_GREATER
 			}
 			else
-				return JsonSerializer.SerializeToUtf8Bytes<PatchInfo>(patchInfo);
+				return JsonSerializer.SerializeToUtf8Bytes(patchInfo);
 #endif
 		}
 
@@ -90,11 +89,11 @@ internal static byte[] Serialize(this PatchInfo patchInfo)
 		internal static PatchInfo Deserialize(byte[] bytes)
 		{
 #if NET50_OR_GREATER
-			if(UseBinaryFormatter)
+			if (UseBinaryFormatter)
 			{
 #endif
-			using var streamMemory = new MemoryStream(bytes);
-			return (PatchInfo)binaryFormatter.Deserialize(streamMemory);
+				using var streamMemory = new MemoryStream(bytes);
+				return (PatchInfo)binaryFormatter.Deserialize(streamMemory);
 #if NET50_OR_GREATER
 			}
 			else

diff --git a/Harmony/Public/PatchJsonConverter.cs b/Harmony/Public/PatchJsonConverter.cs
@@ -0,0 +1,79 @@
+#if NET50_OR_GREATER
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace HarmonyLib
+{
+	internal class PatchJsonConverter : JsonConverter<Patch>
+	{
+		public override Patch Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+		{
+			_ = reader.Read(); // start object
+
+			_ = reader.Read(); // index
+			var index = reader.GetInt32();
+			_ = reader.Read();
+
+			_ = reader.Read(); // debug
+			var debug = reader.GetBoolean();
+			_ = reader.Read();
+
+			_ = reader.Read(); // owner
+			var owner = reader.GetString();
+			_ = reader.Read();
+
+			_ = reader.Read(); // priority
+			var priority = reader.GetInt32();
+			_ = reader.Read();
+
+			_ = reader.Read(); // methodToken
+			var methodToken = reader.GetInt32();
+			_ = reader.Read();
+
+			_ = reader.Read(); // moduleGUID
+			var moduleGUID = reader.GetString();
+			_ = reader.Read();
+
+			_ = reader.Read(); // after
+			var after = new List<string>();
+			while (reader.Read() && reader.TokenType != JsonTokenType.EndArray)
+				after.Add(reader.GetString());
+			_ = reader.Read();
+
+			_ = reader.Read(); // before
+			var before = new List<string>();
+			while (reader.Read() && reader.TokenType != JsonTokenType.EndArray)
+				before.Add(reader.GetString());
+			_ = reader.Read();
+
+			_ = reader.Read(); // end object
+
+			return new Patch(index, owner, priority, before.ToArray(), after.ToArray(), debug, methodToken, moduleGUID);
+		}
+
+		public override void Write(Utf8JsonWriter writer, Patch patchValue, JsonSerializerOptions options)
+		{
+			writer.WriteStartObject();
+			writer.WriteNumber("index", patchValue.index);
+			writer.WriteBoolean("debug", patchValue.debug);
+			writer.WriteString("owner", patchValue.owner);
+			writer.WriteNumber("priority", patchValue.priority);
+			writer.WriteNumber("methodToken", patchValue.PatchMethod.MetadataToken);
+			writer.WriteString("moduleGUID", patchValue.PatchMethod.Module.ModuleVersionId.ToString());
+			WriteStringArray(writer, "after", patchValue.after);
+			WriteStringArray(writer, "before", patchValue.before);
+			writer.WriteEndObject();
+		}
+
+		static void WriteStringArray(Utf8JsonWriter writer, string propertyName, IEnumerable<string> strings)
+		{
+			writer.WriteStartArray(propertyName);
+			foreach (var str in strings)
+				writer.WriteStringValue(str);
+			writer.WriteEndArray();
+		}
+	}
+}
+#endif
diff --git a/Harmony/Public/PatchJsonConverter.net5.cs b/Harmony/Public/PatchJsonConverter.net5.cs
diff --git a/Harmony/Public/UtfJsonReaderExtensions.net5.cs b/Harmony/Public/UtfJsonReaderExtensions.net5.cs