diff --git a/IPA.Injector/Updates.cs b/IPA.Injector/Updates.cs index d66efedd..1862f889 100644 --- a/IPA.Injector/Updates.cs +++ b/IPA.Injector/Updates.cs @@ -11,13 +11,14 @@ using Net3_Proxy; using Path = Net3_Proxy.Path; using File = Net3_Proxy.File; using Directory = Net3_Proxy.Directory; +using Array = Net3_Proxy.Array; #endif namespace IPA.Injector { internal static class Updates { - private const string DeleteFileName = Updating.BeatMods.Updater.SpecialDeletionsFile; + private const string DeleteFileName = "$$delete"; public static void InstallPendingUpdates() { @@ -35,7 +36,7 @@ namespace IPA.Injector if (ipaVersion > selfVersion) { - Process.Start(new ProcessStartInfo + _ = Process.Start(new ProcessStartInfo { FileName = path, Arguments = $"\"-nw={Process.GetCurrentProcess().Id},s={string.Join(" ", Environment.GetCommandLineArgs().Skip(1).StrJP()).Replace("\\", "\\\\").Replace(",", "\\,")}\"", @@ -55,7 +56,7 @@ namespace IPA.Injector // there are pending updates, install updater.Info("Installing pending updates"); - var toDelete = new string[0]; + var toDelete = Array.Empty(); var delFn = Path.Combine(pendingDir, DeleteFileName); if (File.Exists(delFn)) { diff --git a/IPA.Loader/IPA.Loader.csproj b/IPA.Loader/IPA.Loader.csproj index 6621dee7..3cc88a4f 100644 --- a/IPA.Loader/IPA.Loader.csproj +++ b/IPA.Loader/IPA.Loader.csproj @@ -1,6 +1,6 @@  - + net461;net35 @@ -62,7 +62,13 @@ + + + + + + - + diff --git a/IPA.Loader/Loader/PluginComponent.cs b/IPA.Loader/Loader/PluginComponent.cs index d786b64f..362c7b53 100644 --- a/IPA.Loader/Loader/PluginComponent.cs +++ b/IPA.Loader/Loader/PluginComponent.cs @@ -39,9 +39,11 @@ namespace IPA.Loader ipaPlugins = new CompositeIPAPlugin(PluginManager.Plugins); #pragma warning restore 618 + /* #if BeatSaber // TODO: remove this gameObject.AddComponent(); #endif + */ bsPlugins.OnEnable(); ipaPlugins.OnApplicationStart();