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

Reinstate assembly version check 

made possible by #2697
This commit is contained in:
YoshiRulz 2021-04-04 12:17:15 +10:00
parent f204f4e367
commit 55bf1d5f56
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ExternalProjects/BizHawk.SrcGen.ReflectionCache/ReflectionCacheGenerator.cs
View File

@ -78,6 +78,8 @@ namespace {nSpace}
{{
private static readonly Assembly Asm = typeof({nSpace}.ReflectionCache).Assembly;
public static readonly Version AsmVersion = Asm.GetName().Version!;
private static readonly Lazy<Type[]> _types = new Lazy<Type[]>(() => Asm.GetTypesWithoutLoadErrors().ToArray());
public static Type[] Types => _types.Value;

36
src/BizHawk.Client.EmuHawk/Program.cs
View File

@ -87,21 +87,27 @@ namespace BizHawk.Client.EmuHawk
{
// this check has to be done VERY early. i stepped through a debug build with wrong .dll versions purposely used,
// and there was a TypeLoadException before the first line of SubMain was reached (some static ColorType init?)
// zero 25-dec-2012 - only do for public builds. its annoying during development
// and don't bother when installed from a package manager i.e. not Windows --yoshi
// commenting this out until I get it generated properly --yoshi
// 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;
//
// if (thisversion != utilversion || thisversion != emulversion)
// {
// MessageBox.Show("Conflicting revisions found! Don't mix .dll versions!");
// return -1;
// }
// }
var thisAsmVer = EmuHawk.ReflectionCache.AsmVersion;
foreach (var asmVer in new[]
{
BizInvoke.ReflectionCache.AsmVersion,
Bizware.BizwareGL.ReflectionCache.AsmVersion,
Bizware.DirectX.ReflectionCache.AsmVersion,
Bizware.OpenTK3.ReflectionCache.AsmVersion,
Client.Common.ReflectionCache.AsmVersion,
Common.ReflectionCache.AsmVersion,
Emulation.Common.ReflectionCache.AsmVersion,
Emulation.Cores.ReflectionCache.AsmVersion,
Emulation.DiscSystem.ReflectionCache.AsmVersion,
WinForms.Controls.ReflectionCache.AsmVersion,
})
{
if (asmVer != thisAsmVer)
{
MessageBox.Show("One or more of the BizHawk.* assemblies have the wrong version!\n(Did you attempt to update by overwriting an existing install?)");
return -1;
}
}
TempFileManager.Start();