From bb3c62ae1a8dd1407ffe359baf8926a77b42ef7f Mon Sep 17 00:00:00 2001
From: Anairkoen Schno <aaron.cirr.com@gmail.com>
Date: Thu, 11 Apr 2019 18:50:21 -0500
Subject: [PATCH] Bumped version Library loader now less strict about filenames

---
 IPA.Loader/Config/SelfConfig.cs |  2 +-
 IPA.Loader/Loader/LibLoader.cs  | 14 ++++++++++----
 IPA.Loader/Loader/manifest.json |  2 +-
 IPA/Program.cs                  |  2 +-
 appveyor.yml                    |  2 +-
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/IPA.Loader/Config/SelfConfig.cs b/IPA.Loader/Config/SelfConfig.cs
index c28f8c96..d070102c 100644
--- a/IPA.Loader/Config/SelfConfig.cs
+++ b/IPA.Loader/Config/SelfConfig.cs
@@ -33,7 +33,7 @@ namespace IPA.Config
         }
 
         internal const string IPAName = "Beat Saber IPA";
-        internal const string IPAVersion = "3.12.10"; 
+        internal const string IPAVersion = "3.12.11"; 
 		
         public bool Regenerate = true;
 
diff --git a/IPA.Loader/Loader/LibLoader.cs b/IPA.Loader/Loader/LibLoader.cs
index 3e2d3157..6b43d335 100644
--- a/IPA.Loader/Loader/LibLoader.cs
+++ b/IPA.Loader/Loader/LibLoader.cs
@@ -56,17 +56,23 @@ namespace IPA.Loader
             var testFile = $"{asmName.Name}.{asmName.Version}.dll";
             Log(Logger.Level.Debug, $"Looking for file {testFile}");
 
-            if (FilenameLocations.TryGetValue(testFile, out string path))
+            if (FilenameLocations.TryGetValue(testFile, out var path))
+            {
+                Log(Logger.Level.Debug, $"Found file {testFile} as {path}");
+                if (File.Exists(path))
+                    return Assembly.LoadFrom(path);
+
+                Log(Logger.Level.Critical, $"but {path} no longer exists!");
+            }
+            else if (FilenameLocations.TryGetValue(testFile = $"{asmName.Name}.dll", out path))
             {
                 Log(Logger.Level.Debug, $"Found file {testFile} as {path}");
                 if (File.Exists(path))
-                {
                     return Assembly.LoadFrom(path);
-                }
 
                 Log(Logger.Level.Critical, $"but {path} no longer exists!");
             }
-            
+
             Log(Logger.Level.Critical, $"No library {asmName} found");
 
             return null;
diff --git a/IPA.Loader/Loader/manifest.json b/IPA.Loader/Loader/manifest.json
index 985a963e..5ced70f9 100644
--- a/IPA.Loader/Loader/manifest.json
+++ b/IPA.Loader/Loader/manifest.json
@@ -5,7 +5,7 @@
   "gameVersion": "0.13.2",
   "id": "BSIPA",
   "name": "Beat Saber IPA",
-  "version": "3.12.10",
+  "version": "3.12.11",
   "features": [
     "define-feature(print, IPA.Loader.Features.PrintFeature)",
     "define-feature(debug, IPA.Loader.Features.DebugFeature)",
diff --git a/IPA/Program.cs b/IPA/Program.cs
index 75b3c3ad..45a5d9db 100644
--- a/IPA/Program.cs
+++ b/IPA/Program.cs
@@ -23,7 +23,7 @@ namespace IPA
             Unknown
         }
 
-        public const string FileVersion = "3.12.10";
+        public const string FileVersion = "3.12.11";
 
         public static Version Version => Assembly.GetEntryAssembly().GetName().Version;
 
diff --git a/appveyor.yml b/appveyor.yml
index 2f188f2d..2f9c0643 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,6 +1,6 @@
 version: 'BSIPA-{branch}-{build}'
 environment:
-  bsipa_version: '3.12.10'
+  bsipa_version: '3.12.11'
 pull_requests:
   do_not_increment_build_number: true
 install: