From 74620559ea474c664f265a66a702732ac68ef94a Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Fri, 20 Mar 2020 09:03:21 +1000
Subject: [PATCH] Re-include AssemblyInfo.cs in EmuHawk compilation and fix
 casing

---
 BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj | 1 -
 BizHawk.Client.EmuHawk/Program.cs                    | 4 ++--
 BizHawk.Client.EmuHawk/Properties/AssemblyInfo.cs    | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index 2728875c9e..2757cd2718 100644
--- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -171,7 +171,6 @@
 		<Compile Include="$(SolutionDir)BizHawk.Common/OSTailoredCode.cs" Link="OSTailoredCode.cs" />
 		<Compile Include="$(SolutionDir)Version/svnrev.cs" Link="svnrev.cs" />
 		<Compile Include="$(SolutionDir)Version/VersionInfo.cs" Link="VersionInfo.cs" />
-		<Compile Remove="Properties/AssemblyInfo.cs" />
 		<Compile Remove="Properties/Settings.Designer.cs" />
 		<Content Include="images/logo.ico" />
 		<EmbeddedResource Include="**/*.resx" />
diff --git a/BizHawk.Client.EmuHawk/Program.cs b/BizHawk.Client.EmuHawk/Program.cs
index f900e7313e..414786f27e 100644
--- a/BizHawk.Client.EmuHawk/Program.cs
+++ b/BizHawk.Client.EmuHawk/Program.cs
@@ -89,8 +89,8 @@ namespace BizHawk.Client.EmuHawk
 			if (!VersionInfo.DeveloperBuild && !OSTC.IsUnixHost)
 			{
 				var thisversion = typeof(Program).Assembly.GetName().Version;
-				var utilversion = Assembly.Load(new AssemblyName("Bizhawk.Client.Common")).GetName().Version;
-				var emulversion = Assembly.Load(new AssemblyName("Bizhawk.Emulation.Cores")).GetName().Version;
+				var utilversion = Assembly.Load(new AssemblyName("BizHawk.Client.Common")).GetName().Version;
+				var emulversion = Assembly.Load(new AssemblyName("BizHawk.Emulation.Cores")).GetName().Version;
 
 				if (thisversion != utilversion || thisversion != emulversion)
 				{
diff --git a/BizHawk.Client.EmuHawk/Properties/AssemblyInfo.cs b/BizHawk.Client.EmuHawk/Properties/AssemblyInfo.cs
index 1fa79bb7e3..85a553e247 100644
--- a/BizHawk.Client.EmuHawk/Properties/AssemblyInfo.cs
+++ b/BizHawk.Client.EmuHawk/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion(VersionInfo.Mainversion + "." + SubWCRev.SVN_REV)]
-[assembly: AssemblyFileVersion(VersionInfo.Mainversion + "." + SubWCRev.SVN_REV)]
+[assembly: AssemblyVersion(VersionInfo.MainVersion + "." + SubWCRev.SVN_REV)]
+[assembly: AssemblyFileVersion(VersionInfo.MainVersion + "." + SubWCRev.SVN_REV)]