Merge branch 'harmony-2' into develop

1 files changed, 0 insertions, 26 deletions

diff --git a/src/SMAPI/Framework/Commands/HarmonySummaryCommand.cs b/src/SMAPI/Framework/Commands/HarmonySummaryCommand.cs
index f3731d16..45b34556 100644
--- a/src/SMAPI/Framework/Commands/HarmonySummaryCommand.cs
+++ b/src/SMAPI/Framework/Commands/HarmonySummaryCommand.cs
@@ -3,25 +3,13 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Text;
-#if HARMONY_2
 using HarmonyLib;
-#else
-using Harmony;
-#endif
 
 namespace StardewModdingAPI.Framework.Commands
 {
     /// <summary>The 'harmony_summary' SMAPI console command.</summary>
     internal class HarmonySummaryCommand : IInternalCommand
     {
-#if !HARMONY_2
-        /*********
-        ** Fields
-        *********/
-        /// <summary>The Harmony instance through which to fetch patch info.</summary>
-        private readonly HarmonyInstance HarmonyInstance = HarmonyInstance.Create($"SMAPI.{nameof(HarmonySummaryCommand)}");
-#endif
-
         /*********
         ** Accessors
         *********/
@@ -60,9 +48,7 @@ namespace StardewModdingAPI.Framework.Commands
                             {
                                 PatchType.Prefix => 0,
                                 PatchType.Postfix => 1,
-#if HARMONY_2
                                 PatchType.Finalizer => 2,
-#endif
                                 PatchType.Transpiler => 3,
                                 _ => 4
                             });
@@ -111,26 +97,16 @@ namespace StardewModdingAPI.Framework.Commands
         /// <summary>Get all current Harmony patches.</summary>
         private IEnumerable<SearchResult> GetAllPatches()
         {
-#if HARMONY_2
             foreach (MethodBase method in Harmony.GetAllPatchedMethods().ToArray())
-#else
-            foreach (MethodBase method in this.HarmonyInstance.GetPatchedMethods().ToArray())
-#endif
             {
                 // get metadata for method
-#if HARMONY_2
                 HarmonyLib.Patches patchInfo = Harmony.GetPatchInfo(method);
-#else
-                Harmony.Patches patchInfo = this.HarmonyInstance.GetPatchInfo(method);
-#endif
 
                 IDictionary<PatchType, IReadOnlyCollection<Patch>> patchGroups = new Dictionary<PatchType, IReadOnlyCollection<Patch>>
                 {
                     [PatchType.Prefix] = patchInfo.Prefixes,
                     [PatchType.Postfix] = patchInfo.Postfixes,
-#if HARMONY_2
                     [PatchType.Finalizer] = patchInfo.Finalizers,
-#endif
                     [PatchType.Transpiler] = patchInfo.Transpilers
                 };
 
@@ -160,10 +136,8 @@ namespace StardewModdingAPI.Framework.Commands
             /// <summary>A postfix patch.</summary>
             Postfix,
 
-#if HARMONY_2
             /// <summary>A finalizer patch.</summary>
             Finalizer,
-#endif
 
             /// <summary>A transpiler patch.</summary>
             Transpiler