Release 2.0.0.8

pardeike · Feb 29, 2020 · d227f8b · d227f8b
1 parent 2c3d2dd
commit d227f8b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/Harmony/Harmony.csproj b/Harmony/Harmony.csproj
@@ -11,13 +11,13 @@
 		<Authors>Andreas Pardeike</Authors>
 		<AssemblyName>0Harmony</AssemblyName>
 		<SignAssembly>true</SignAssembly>
-		<Version>2.0.0.7</Version>
+		<Version>2.0.0.8</Version>
 		<PackageLicenseFile>LICENSE</PackageLicenseFile>
 		<PackageProjectUrl>https://github.com/pardeike/Harmony</PackageProjectUrl>
 		<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
 		<PackageTags>Harmony,Mono,Patch,Patching,Runtime,Detour,Detours,Aspect,Aspects</PackageTags>
-		<AssemblyVersion>2.0.0.7</AssemblyVersion>
-		<FileVersion>2.0.0.7</FileVersion>
+		<AssemblyVersion>2.0.0.8</AssemblyVersion>
+		<FileVersion>2.0.0.8</FileVersion>
 		<PackageIcon>HarmonyLogo.png</PackageIcon>
 		<PackageIconUrl>https://raw.githubusercontent.com/pardeike/Harmony/master/HarmonyLogo.png</PackageIconUrl>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>

diff --git a/Harmony/Internal/Emitter.cs b/Harmony/Internal/Emitter.cs
@@ -1,3 +1,4 @@
+using MonoMod.Utils.Cil;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -17,13 +18,13 @@ public override string ToString()
 
 	internal class Emitter
 	{
-		readonly MonoMod.Utils.Cil.CecilILGenerator il;
+		readonly CecilILGenerator il;
 		readonly Dictionary<int, CodeInstruction> instructions = new Dictionary<int, CodeInstruction>();
 		readonly bool debug;
 
 		internal Emitter(ILGenerator il, bool debug)
 		{
-			this.il = Traverse.Create(il).Field("Target").GetValue<MonoMod.Utils.Cil.CecilILGenerator>();
+			this.il = il.GetProxiedShim<CecilILGenerator>();
 			this.debug = debug;
 		}
 
@@ -39,8 +40,7 @@ internal void AddInstruction(OpCode opcode, object operand)
 
 		internal int CurrentPos()
 		{
-			var cilInstructions = Traverse.Create(il).Field("IL").Field("instructions").GetValue<Mono.Collections.Generic.Collection<Mono.Cecil.Cil.Instruction>>();
-			return cilInstructions.Sum(instr => instr.GetSize());
+			return il.ILOffset;
 		}
 
 		internal static string CodePos(int offset)
@@ -86,8 +86,7 @@ internal void LogAllLocalVariables()
 			if (debug == false)
 				return;
 
-			var variables = Traverse.Create(il).Field("IL").Field("body").Field("variables").GetValue<Mono.Collections.Generic.Collection<Mono.Cecil.Cil.VariableDefinition>>();
-			variables.Do(v =>
+			il.IL.Body.Variables.Do(v =>
 			{
 				var str = string.Format("{0}Local var {1}: {2}{3}", CodePos(0), v.Index, v.VariableType.FullName, v.IsPinned ? "(pinned)" : "");
 				FileLog.LogBuffered(str);