Merge pull request #246 from 0x0ade/dmd-ownertype

Set DynamicMethodDefinition.OwnerType
pardeike · Feb 3, 2020 · 24aa6e2 · 24aa6e2
2 parents 80e2225 + 3301b85
commit 24aa6e2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/Harmony/Harmony.csproj b/Harmony/Harmony.csproj
@@ -96,7 +96,7 @@
 
 	<ItemGroup>
 		<!-- https://dev.azure.com/MonoMod/MonoMod/_packaging?_a=feed&feed=DevBuilds -->
-		<PackageReference Include="MonoMod.Common" Version="20.2.1.1" PrivateAssets="All" />
+		<PackageReference Include="MonoMod.Common" Version="20.2.2.1" PrivateAssets="All" />
 		<PackageReference Include="ILRepack.MSBuild.Task" Version="2.0.13" PrivateAssets="All" />
 	</ItemGroup>
 

diff --git a/Harmony/Internal/MethodPatcher.cs b/Harmony/Internal/MethodPatcher.cs
@@ -236,7 +236,10 @@ internal static DynamicMethodDefinition CreateDynamicMethod(MethodBase original,
 				patchName,
 				returnType,
 				parameterTypes.ToArray()
-			);
+			)
+			{
+				OwnerType = original.DeclaringType
+			};
 
 #if NETSTANDARD2_0 || NETCOREAPP2_0
 #else

diff --git a/HarmonyTests/HarmonyTests.csproj b/HarmonyTests/HarmonyTests.csproj
@@ -61,7 +61,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="MonoMod.Common" Version="20.2.1.1" PrivateAssets="All" />
+		<PackageReference Include="MonoMod.Common" Version="20.2.2.1" PrivateAssets="All" />
 	</ItemGroup>
 
 	<Target Name="ChangeAliasesOfStrongNameAssemblies" BeforeTargets="FindReferenceAssembliesForReferences;ResolveReferences">