From b3ad3ce6bac537810e31471e22eab5f56be03dfb Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Mon, 1 May 2017 17:30:42 -0500
Subject: [PATCH] Move BizInvoke files from Emulation.Common to Common

---
 BizHawk.Common/BizHawk.Common.csproj                        | 2 ++
 .../BizInvoke/BizInvoker.cs                                 | 2 +-
 .../BizInvoke/DynamicLibraryImportResolver.cs               | 2 +-
 BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj    | 2 --
 .../Consoles/Nintendo/QuickNES/LibQuickNES.cs               | 6 ++----
 .../Consoles/Nintendo/QuickNES/QuickNES.cs                  | 2 +-
 BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.cs        | 5 ++---
 BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/LibGPGX.cs     | 6 ++----
 8 files changed, 11 insertions(+), 16 deletions(-)
 rename {BizHawk.Emulation.Common => BizHawk.Common}/BizInvoke/BizInvoker.cs (99%)
 rename {BizHawk.Emulation.Common => BizHawk.Common}/BizInvoke/DynamicLibraryImportResolver.cs (97%)

diff --git a/BizHawk.Common/BizHawk.Common.csproj b/BizHawk.Common/BizHawk.Common.csproj
index f737438886..cb5f4826e3 100644
--- a/BizHawk.Common/BizHawk.Common.csproj
+++ b/BizHawk.Common/BizHawk.Common.csproj
@@ -90,6 +90,8 @@
     <Compile Include="BinaryQuickSerializer.cs" />
     <Compile Include="Bit.cs" />
     <Compile Include="BitReverse.cs" />
+    <Compile Include="BizInvoke\BizInvoker.cs" />
+    <Compile Include="BizInvoke\DynamicLibraryImportResolver.cs" />
     <Compile Include="Buffer.cs" />
     <Compile Include="Colors.cs" />
     <Compile Include="CustomCollections.cs" />
diff --git a/BizHawk.Emulation.Common/BizInvoke/BizInvoker.cs b/BizHawk.Common/BizInvoke/BizInvoker.cs
similarity index 99%
rename from BizHawk.Emulation.Common/BizInvoke/BizInvoker.cs
rename to BizHawk.Common/BizInvoke/BizInvoker.cs
index 46c9affc04..5f7cfb7d1e 100644
--- a/BizHawk.Emulation.Common/BizInvoke/BizInvoker.cs
+++ b/BizHawk.Common/BizInvoke/BizInvoker.cs
@@ -7,7 +7,7 @@ using System.Runtime.InteropServices;
 
 using BizHawk.Common;
 
-namespace BizHawk.Emulation.Common.BizInvoke
+namespace BizHawk.Common.BizInvoke
 {
 	public static class BizInvoker
 	{
diff --git a/BizHawk.Emulation.Common/BizInvoke/DynamicLibraryImportResolver.cs b/BizHawk.Common/BizInvoke/DynamicLibraryImportResolver.cs
similarity index 97%
rename from BizHawk.Emulation.Common/BizInvoke/DynamicLibraryImportResolver.cs
rename to BizHawk.Common/BizInvoke/DynamicLibraryImportResolver.cs
index d0ca1f40c6..5749b6b362 100644
--- a/BizHawk.Emulation.Common/BizInvoke/DynamicLibraryImportResolver.cs
+++ b/BizHawk.Common/BizInvoke/DynamicLibraryImportResolver.cs
@@ -3,7 +3,7 @@ using System.Runtime.InteropServices;
 
 using BizHawk.Common;
 
-namespace BizHawk.Emulation.Common.BizInvoke
+namespace BizHawk.Common.BizInvoke
 {
 	public class DynamicLibraryImportResolver : IImportResolver, IDisposable
 	{
diff --git a/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj b/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
index fd8bcc4236..7d96a2d9e0 100644
--- a/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
+++ b/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
@@ -104,8 +104,6 @@
     <Compile Include="Base Implementations\NullVideo.cs" />
     <Compile Include="Base Implementations\SimpleSyncSoundProvider.cs" />
     <Compile Include="Base Implementations\TraceBuffer.cs" />
-    <Compile Include="BizInvoke\BizInvoker.cs" />
-    <Compile Include="BizInvoke\DynamicLibraryImportResolver.cs" />
     <Compile Include="Base Implementations\CodeDataLog.cs" />
     <Compile Include="ControllerDefinitionMerger.cs" />
     <Compile Include="CoreAttributes.cs" />
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/LibQuickNES.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/LibQuickNES.cs
index a805bfee98..edd891063b 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/LibQuickNES.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/LibQuickNES.cs
@@ -1,9 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Runtime.InteropServices;
-using BizHawk.Emulation.Common.BizInvoke;
+
+using BizHawk.Common.BizInvoke;
 
 namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES
 {
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs
index db5faa21fb..0e7543d50b 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Runtime.InteropServices;
 
 using BizHawk.Emulation.Common;
-using BizHawk.Emulation.Common.BizInvoke;
+using BizHawk.Common.BizInvoke;
 
 namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES
 {
diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.cs b/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.cs
index 647f335587..79c349d0c0 100644
--- a/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.cs
@@ -1,10 +1,9 @@
 using System;
+using System.IO;
 using System.Runtime.InteropServices;
 
+using BizHawk.Common.BizInvoke;
 using BizHawk.Emulation.Common;
-using BizHawk.Common;
-using System.IO;
-using BizHawk.Emulation.Common.BizInvoke;
 
 namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx64
 {
diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/LibGPGX.cs b/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/LibGPGX.cs
index b970d8ca08..49d9a514b0 100644
--- a/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/LibGPGX.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/LibGPGX.cs
@@ -1,9 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Runtime.InteropServices;
-using BizHawk.Emulation.Common.BizInvoke;
+
+using BizHawk.Common.BizInvoke;
 
 namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx64
 {