diff --git a/IPA.Loader/Loader/PluginLoader.cs b/IPA.Loader/Loader/PluginLoader.cs index 745e1ab7..e9993cf3 100644 --- a/IPA.Loader/Loader/PluginLoader.cs +++ b/IPA.Loader/Loader/PluginLoader.cs @@ -76,7 +76,7 @@ namespace IPA.Loader if (Directory.Exists(newPluginsName)) Directory.Move(newPluginsName, pluginDir); else - Directory.CreateDirectory(pluginDir); + _ = Directory.CreateDirectory(pluginDir); } } @@ -117,7 +117,7 @@ namespace IPA.Loader Logger.loader.Critical(e); } - var resolver = new CecilLibLoader(); + using var resolver = new CecilLibLoader(); resolver.AddSearchDirectory(UnityGame.LibraryPath); resolver.AddSearchDirectory(UnityGame.PluginsPath); foreach (var plugin in plugins) @@ -144,7 +144,7 @@ namespace IPA.Loader { const string manifestSuffix = ".manifest.json"; if (resource is not EmbeddedResource embedded || - !embedded.Name.EndsWith(manifestSuffix)) continue; + !embedded.Name.EndsWith(manifestSuffix, StringComparison.Ordinal)) continue; pluginNs = embedded.Name.Substring(0, embedded.Name.Length - manifestSuffix.Length); @@ -385,7 +385,7 @@ namespace IPA.Loader /// /// A structure describing the reason that a plugin was ignored. /// - public struct IgnoreReason + public struct IgnoreReason : IEquatable { /// /// Gets the ignore reason, as represented by the enum. @@ -1138,7 +1138,7 @@ namespace IPA.Loader return exec; } - internal static bool IsFirstLoadComplete { get; private set; } = false; + internal static bool IsFirstLoadComplete { get; private set; } internal static List LoadPlugins() { diff --git a/Net3-Proxy/Directory.cs b/Net3-Proxy/Directory.cs index 4329fed9..682b81df 100644 --- a/Net3-Proxy/Directory.cs +++ b/Net3-Proxy/Directory.cs @@ -1,29 +1,29 @@ -using System.Collections.Generic; -using System.IO; -using System.Security.AccessControl; -using OgDir = System.IO.Directory; - -namespace Net3_Proxy -{ - public static class Directory - { - public static void Move(string f, string t) => OgDir.Move(f, t); - public static string[] GetFiles(string d) => OgDir.GetFiles(d); - public static string[] GetFiles(string d, string s) => OgDir.GetFiles(d, s); - public static string[] GetFiles(string d, string s, SearchOption o) => OgDir.GetFiles(d, s, o); - public static string[] GetDirectories(string d) => OgDir.GetDirectories(d); - public static string[] GetDirectories(string d, string s) => OgDir.GetDirectories(d, s); - public static string[] GetDirectories(string d, string s, SearchOption o) => OgDir.GetDirectories(d, s, o); - public static bool Exists(string d) => OgDir.Exists(d); - public static void Delete(string d) => OgDir.Delete(d); - public static void Delete(string d, bool r) => OgDir.Delete(d, r); - public static void CreateDirectory(string d) => OgDir.CreateDirectory(d); - public static void CreateDirectory(string d, DirectorySecurity s) => OgDir.CreateDirectory(d, s); - public static IEnumerable EnumerateFiles(string d) => GetFiles(d); - public static IEnumerable EnumerateFiles(string d, string s) => GetFiles(d, s); - public static IEnumerable EnumerateFiles(string d, string s, SearchOption o) => GetFiles(d, s, o); - public static IEnumerable EnumerateDirectories(string d) => GetDirectories(d); - public static IEnumerable EnumerateDirectories(string d, string s) => GetDirectories(d, s); - public static IEnumerable EnumerateDirectories(string d, string s, SearchOption o) => GetDirectories(d, s, o); - } -} +using System.Collections.Generic; +using System.IO; +using System.Security.AccessControl; +using OgDir = System.IO.Directory; + +namespace Net3_Proxy +{ + public static class Directory + { + public static void Move(string f, string t) => OgDir.Move(f, t); + public static string[] GetFiles(string d) => OgDir.GetFiles(d); + public static string[] GetFiles(string d, string s) => OgDir.GetFiles(d, s); + public static string[] GetFiles(string d, string s, SearchOption o) => OgDir.GetFiles(d, s, o); + public static string[] GetDirectories(string d) => OgDir.GetDirectories(d); + public static string[] GetDirectories(string d, string s) => OgDir.GetDirectories(d, s); + public static string[] GetDirectories(string d, string s, SearchOption o) => OgDir.GetDirectories(d, s, o); + public static bool Exists(string d) => OgDir.Exists(d); + public static void Delete(string d) => OgDir.Delete(d); + public static void Delete(string d, bool r) => OgDir.Delete(d, r); + public static DirectoryInfo CreateDirectory(string d) => OgDir.CreateDirectory(d); + public static DirectoryInfo CreateDirectory(string d, DirectorySecurity s) => OgDir.CreateDirectory(d, s); + public static IEnumerable EnumerateFiles(string d) => GetFiles(d); + public static IEnumerable EnumerateFiles(string d, string s) => GetFiles(d, s); + public static IEnumerable EnumerateFiles(string d, string s, SearchOption o) => GetFiles(d, s, o); + public static IEnumerable EnumerateDirectories(string d) => GetDirectories(d); + public static IEnumerable EnumerateDirectories(string d, string s) => GetDirectories(d, s); + public static IEnumerable EnumerateDirectories(string d, string s, SearchOption o) => GetDirectories(d, s, o); + } +} diff --git a/Refs/UnityEngine.CoreModule.Net4.dll b/Refs/UnityEngine.CoreModule.Net4.dll index 7e2d6955..1effedfc 100644 Binary files a/Refs/UnityEngine.CoreModule.Net4.dll and b/Refs/UnityEngine.CoreModule.Net4.dll differ diff --git a/Refs/UnityEngine.Net4.dll b/Refs/UnityEngine.Net4.dll index 4c96d11a..071390ac 100644 Binary files a/Refs/UnityEngine.Net4.dll and b/Refs/UnityEngine.Net4.dll differ diff --git a/Refs/UnityEngine.UnityWebRequestModule.Net4.dll b/Refs/UnityEngine.UnityWebRequestModule.Net4.dll index 04407a0d..6a7c60cd 100644 Binary files a/Refs/UnityEngine.UnityWebRequestModule.Net4.dll and b/Refs/UnityEngine.UnityWebRequestModule.Net4.dll differ