From 113dac3c34fdd34419458f6de69d8badd6515231 Mon Sep 17 00:00:00 2001 From: Anairkoen Schno Date: Tue, 28 Jan 2020 21:47:29 -0600 Subject: [PATCH] Bumped version Removed version-postfixed libraries --- BSIPA-ModList/PostBuild.msbuild | 32 +++++++++++++-------------- IPA.Injector/PostBuild.msbuild | 2 +- IPA.Loader/Config/SelfConfig.cs | 2 +- IPA.Loader/Loader/LibLoader.cs | 16 ++++++++------ IPA.Loader/Loader/manifest.json | 2 +- IPA/Program.cs | 2 +- Refs/UnityEngine.CoreModule.Net4.dll | Bin 614400 -> 614400 bytes appveyor.yml | 2 +- 8 files changed, 30 insertions(+), 28 deletions(-) diff --git a/BSIPA-ModList/PostBuild.msbuild b/BSIPA-ModList/PostBuild.msbuild index d2016a49..7ad87ad6 100644 --- a/BSIPA-ModList/PostBuild.msbuild +++ b/BSIPA-ModList/PostBuild.msbuild @@ -1,17 +1,17 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/IPA.Injector/PostBuild.msbuild b/IPA.Injector/PostBuild.msbuild index 6380dfb3..ee4aef2d 100644 --- a/IPA.Injector/PostBuild.msbuild +++ b/IPA.Injector/PostBuild.msbuild @@ -34,6 +34,6 @@ - + \ No newline at end of file diff --git a/IPA.Loader/Config/SelfConfig.cs b/IPA.Loader/Config/SelfConfig.cs index 2a3afc09..b0933bbb 100644 --- a/IPA.Loader/Config/SelfConfig.cs +++ b/IPA.Loader/Config/SelfConfig.cs @@ -67,7 +67,7 @@ namespace IPA.Config } internal const string IPAName = "Beat Saber IPA"; - internal const string IPAVersion = "3.99.99.4"; + internal const string IPAVersion = "3.99.99.5"; // uses Updates.AutoUpdate, Updates.AutoCheckUpdates, YeetMods, Debug.ShowCallSource, Debug.ShowDebug, // Debug.CondenseModLogs diff --git a/IPA.Loader/Loader/LibLoader.cs b/IPA.Loader/Loader/LibLoader.cs index 3634b558..9d754927 100644 --- a/IPA.Loader/Loader/LibLoader.cs +++ b/IPA.Loader/Loader/LibLoader.cs @@ -30,17 +30,18 @@ namespace IPA.Loader if (name.Name == CurrentAssemblyName) return AssemblyDefinition.ReadAssembly(CurrentAssemblyPath, parameters); - if (LibLoader.FilenameLocations.TryGetValue($"{name.Name}.{name.Version}.dll", out var path)) + if (LibLoader.FilenameLocations.TryGetValue($"{name.Name}.dll", out var path)) { if (File.Exists(path)) return AssemblyDefinition.ReadAssembly(path, parameters); } - else if (LibLoader.FilenameLocations.TryGetValue($"{name.Name}.dll", out path)) + else if (LibLoader.FilenameLocations.TryGetValue($"{name.Name}.{name.Version}.dll", out path)) { if (File.Exists(path)) return AssemblyDefinition.ReadAssembly(path, parameters); } - + + return base.Resolve(name, parameters); } } @@ -120,9 +121,9 @@ namespace IPA.Loader SetupAssemblyFilenames(); var testFile = $"{asmName.Name}.{asmName.Version}.dll"; - Log(Logger.Level.Debug, $"Looking for file {testFile}"); - - if (FilenameLocations.TryGetValue(testFile, out var path)) + Log(Logger.Level.Debug, $"Looking for file {asmName.Name}.dll"); + + if (FilenameLocations.TryGetValue(testFile = $"{asmName.Name}.dll", out var path)) { Log(Logger.Level.Debug, $"Found file {testFile} as {path}"); if (File.Exists(path)) @@ -130,9 +131,10 @@ namespace IPA.Loader Log(Logger.Level.Critical, $"but {path} no longer exists!"); } - else if (FilenameLocations.TryGetValue(testFile = $"{asmName.Name}.dll", out path)) + else if (FilenameLocations.TryGetValue(testFile, out path)) { Log(Logger.Level.Debug, $"Found file {testFile} as {path}"); + Log(Logger.Level.Warning, $"File {testFile} should be renamed to just {asmName.Name}.dll"); if (File.Exists(path)) return Assembly.LoadFrom(path); diff --git a/IPA.Loader/Loader/manifest.json b/IPA.Loader/Loader/manifest.json index cd42bd19..368b6f55 100644 --- a/IPA.Loader/Loader/manifest.json +++ b/IPA.Loader/Loader/manifest.json @@ -8,7 +8,7 @@ "gameVersion": "1.6.2", "id": "BSIPA", "name": "Beat Saber IPA", - "version": "4.0.0-beta.4", + "version": "4.0.0-beta.5", "icon": "IPA.icon_white.png", "features": [ "define-feature(print, IPA.Loader.Features.PrintFeature)", diff --git a/IPA/Program.cs b/IPA/Program.cs index ea6302ae..0caeeeae 100644 --- a/IPA/Program.cs +++ b/IPA/Program.cs @@ -23,7 +23,7 @@ namespace IPA Unknown } - public const string FileVersion = "3.99.99.4"; + public const string FileVersion = "3.99.99.5"; public static Version Version => Assembly.GetEntryAssembly().GetName().Version; diff --git a/Refs/UnityEngine.CoreModule.Net4.dll b/Refs/UnityEngine.CoreModule.Net4.dll index 2fbda56981a71810cc93045912466881cb7d90e9..63f211ad863dfefbbd31de985a80008fb608048a 100644 GIT binary patch delta 43 scmZoTpxOXLEsQNpEzB(}TUdL-8ClwU!&!lt4T#x+m}7fyIA<{j09B6;>i_@% delta 43 scmZoTpxOXLEsQNpEzB(}TUdL-8JXLA!&!lt4T#x+m}7fyIA<{j09AMn>Hq)$ diff --git a/appveyor.yml b/appveyor.yml index b10a519c..6bdaa573 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,7 @@ version: 'BSIPA-{branch}-{build}' environment: - bsipa_version: '4.0.0-beta.4' + bsipa_version: '4.0.0-beta.5' gh_token: secure: E42gl/yepETuoLSwbJZ1GmEIPK6cCJu6zkd59NA21XiICtEV6COOLW7aehi1tcVU