ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Re-include AssemblyInfo.cs in EmuHawk compilation and fix casing

This commit is contained in:
YoshiRulz 2020-03-20 09:03:21 +10:00
parent 32e632851e
commit 74620559ea
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
View File

@ -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" />

4
BizHawk.Client.EmuHawk/Program.cs
View File

@ -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)
{

4
BizHawk.Client.EmuHawk/Properties/AssemblyInfo.cs
View File

@ -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)]