From 28abcac4636e6ee56d51d09f8a326057c6456952 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Tue, 27 Jul 2021 18:01:35 +1000
Subject: [PATCH] Use AssemblyBuilder from System.Reflection.Emit package in
 BizInvoke

---
 src/BizHawk.BizInvoke/BizExvoker.cs            | 2 +-
 src/BizHawk.BizInvoke/BizHawk.BizInvoke.csproj | 1 +
 src/BizHawk.BizInvoke/BizInvoker.cs            | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/BizHawk.BizInvoke/BizExvoker.cs b/src/BizHawk.BizInvoke/BizExvoker.cs
index 4495835497..4f4526b60d 100644
--- a/src/BizHawk.BizInvoke/BizExvoker.cs
+++ b/src/BizHawk.BizInvoke/BizExvoker.cs
@@ -23,7 +23,7 @@ namespace BizHawk.BizInvoke
 		static BizExvoker()
 		{
 			var aname = new AssemblyName("BizExvokeProxyAssembly");
-			ImplAssemblyBuilder = AppDomain.CurrentDomain.DefineDynamicAssembly(aname, AssemblyBuilderAccess.Run);
+			ImplAssemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(aname, AssemblyBuilderAccess.Run);
 			ImplModuleBuilder = ImplAssemblyBuilder.DefineDynamicModule("BizExvokerModule");
 		}
 
diff --git a/src/BizHawk.BizInvoke/BizHawk.BizInvoke.csproj b/src/BizHawk.BizInvoke/BizHawk.BizInvoke.csproj
index ae456e50b9..e82a84e91a 100644
--- a/src/BizHawk.BizInvoke/BizHawk.BizInvoke.csproj
+++ b/src/BizHawk.BizInvoke/BizHawk.BizInvoke.csproj
@@ -7,6 +7,7 @@
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 	</PropertyGroup>
 	<ItemGroup>
+		<PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
 		<ProjectReference Include="$(ProjectDir)../BizHawk.Common/BizHawk.Common.csproj" />
 	</ItemGroup>
 </Project>
diff --git a/src/BizHawk.BizInvoke/BizInvoker.cs b/src/BizHawk.BizInvoke/BizInvoker.cs
index c2aaaf4144..8adb181116 100644
--- a/src/BizHawk.BizInvoke/BizInvoker.cs
+++ b/src/BizHawk.BizInvoke/BizInvoker.cs
@@ -89,7 +89,7 @@ namespace BizHawk.BizInvoke
 		static BizInvoker()
 		{
 			var aname = new AssemblyName("BizInvokeProxyAssembly");
-			ImplAssemblyBuilder = AppDomain.CurrentDomain.DefineDynamicAssembly(aname, AssemblyBuilderAccess.Run);
+			ImplAssemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(aname, AssemblyBuilderAccess.Run);
 			ImplModuleBuilder = ImplAssemblyBuilder.DefineDynamicModule("BizInvokerModule");
 			ClassFieldOffset = BizInvokerUtilities.ComputeClassFirstFieldOffset();
 			StringOffset = BizInvokerUtilities.ComputeStringOffset();