From 7e7b2bb2d39fca95d6e6e8f7bf4989e74a392568 Mon Sep 17 00:00:00 2001
From: BlackShark <Bl4ckSh4rk@users.noreply.github.com>
Date: Tue, 28 Jun 2022 07:32:03 +0200
Subject: [PATCH] Improved IsOldPkhexCorePresent (#3541)

---
 PKHeX.Core/PKHeX.Core.csproj | 1 +
 PKHeX.WinForms/Program.cs    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/PKHeX.Core/PKHeX.Core.csproj b/PKHeX.Core/PKHeX.Core.csproj
index 9d095b279..6767b9d23 100644
--- a/PKHeX.Core/PKHeX.Core.csproj
+++ b/PKHeX.Core/PKHeX.Core.csproj
@@ -12,6 +12,7 @@
     <NeutralLanguage>en</NeutralLanguage>
     <Company>Project Pokémon</Company>
     <Copyright>Kaphotics</Copyright>
+    <Version>22.06.26</Version>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/PKHeX.WinForms/Program.cs b/PKHeX.WinForms/Program.cs
index 86777bcd9..dda9f56a9 100644
--- a/PKHeX.WinForms/Program.cs
+++ b/PKHeX.WinForms/Program.cs
@@ -130,7 +130,7 @@ namespace PKHeX.WinForms
 
         private static bool IsOldPkhexCorePresent(Exception? ex)
         {
-            return ex is MissingMethodException
+            return ex is MissingMethodException or TypeLoadException or TypeInitializationException
                 && File.Exists("PKHeX.Core.dll")
                 && AssemblyName.GetAssemblyName("PKHeX.Core.dll").Version < Assembly.GetExecutingAssembly().GetName().Version;
         }