Tweak project settings and fix warnings where possible

Author: Banane9

Directory.Build.props

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <LangVersion>13.0</LangVersion>
+    <LangVersion>14.0</LangVersion>
     <Nullable>enable</Nullable>
     <Deterministic>true</Deterministic>
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

MonkeyLoader.sln

@@ -13,6 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		Directory.Build.props = Directory.Build.props
 		docfx.json = docfx.json
+		nuget.config = nuget.config
 		README.md = README.md
 	EndProjectSection
 EndProject

MonkeyLoader/AnyMap.cs

@@ -11,7 +11,7 @@ namespace MonkeyLoader
     /// </summary>
     public sealed class AnyMap
     {
-        private readonly Dictionary<Type, object?> _dict = new();
+        private readonly Dictionary<Type, object?> _dict = [];
 
         /// <summary>
         /// Gets all <see cref="Type"/>s that have a set value in this AnyMap.

MonkeyLoader/AssemblyName.cs

@@ -27,7 +27,7 @@ public AssemblyName(string name, bool isPath = false)
             => string.Equals(left.Name, right.Name, StringComparison.InvariantCultureIgnoreCase);
 
         /// <inheritdoc/>
-        public override readonly bool Equals(object obj)
+        public override readonly bool Equals(object? obj)
             => obj is AssemblyName assemblyName && assemblyName == this;
 
         /// <inheritdoc/>

MonkeyLoader/AssemblyPool.cs

@@ -21,9 +21,9 @@ namespace MonkeyLoader
     /// </summary>
     public sealed class AssemblyPool : IAssemblyResolver
     {
-        private readonly Dictionary<AssemblyName, AssemblyEntry> _assemblies = new();
+        private readonly Dictionary<AssemblyName, AssemblyEntry> _assemblies = [];
         private readonly HashSet<string> _directories = new(StringComparer.OrdinalIgnoreCase);
-        private readonly HashSet<AssemblyPool> _fallbackPools = new();
+        private readonly HashSet<AssemblyPool> _fallbackPools = [];
         private readonly Func<string?>? _getPatchedAssemblyPath;
         private readonly Logger _logger;
 
@@ -39,6 +39,8 @@ public sealed class AssemblyPool : IAssemblyResolver
         /// <summary>
         /// Creates a new <see cref="AssemblyPool"/> instance, loading assemblies when asked to resolve them if desired.
         /// </summary>
+        /// <param name="loader">The mod loader that this pool belongs to.</param>
+        /// <param name="poolName">The name of this pool.</param>
         /// <param name="getPatchedAssemblyPath">Provides the path where to save patched assemblies. Return <c>null</c> to disable.</param>
         /// <param name="loadForResolve">Whether to load assemblies when asked to resolve them.</param>
         public AssemblyPool(MonkeyLoader loader, string poolName = "AssemblyPool", Func<string?>? getPatchedAssemblyPath = null, bool loadForResolve = true)
@@ -51,16 +53,14 @@ public AssemblyPool(MonkeyLoader loader, string poolName = "AssemblyPool", Func<
             AppDomain.CurrentDomain.AssemblyResolve += ResolveAssembly;
         }
 
-        public bool AddFallbackPool(AssemblyPool pool) => _fallbackPools.Add(pool);
+        public bool AddFallbackPool(AssemblyPool pool)
+            => _fallbackPools.Add(pool);
 
         public void AddSearchDirectory(string directory)
-        {
-            _directories.Add(directory);
-        }
+            => _directories.Add(directory);
 
         public void Dispose()
-        {
-        }
+        { }
 
         public IEnumerable<ILoadedNuGetPackage> GetAllAsLoadedPackages(string optionalPrefix)
         {
@@ -131,18 +131,6 @@ public void LoadAll(string path)
         /// <returns>The loaded <see cref="Assembly"/>.</returns>
         /// <exception cref="KeyNotFoundException">When the <paramref name="name"/> doesn't exist in this pool.</exception>
         public Assembly LoadAssembly(AssemblyName name) => GetEntry(name).LoadAssembly(_logger, PatchedAssemblyPath);
-        
-        public bool TryResolveAssembly(AssemblyName name, [NotNullWhen(true)] out Assembly? assembly)
-        {
-            if (TryGetEntry(name, out var entry))
-            {
-                assembly = entry.LoadAssembly(_logger, PatchedAssemblyPath);
-                return true;
-            }
-
-            assembly = null;
-            return false;
-        }
 
         public AssemblyDefinition LoadDefinition(string path, ReaderParameters? readerParameters = null)
         {
@@ -231,6 +219,18 @@ public bool TryResolve(AssemblyName name, [NotNullWhen(true)] out AssemblyDefini
             return false;
         }
 
+        public bool TryResolveAssembly(AssemblyName name, [NotNullWhen(true)] out Assembly? assembly)
+        {
+            if (TryGetEntry(name, out var entry))
+            {
+                assembly = entry.LoadAssembly(_logger, PatchedAssemblyPath);
+                return true;
+            }
+
+            assembly = null;
+            return false;
+        }
+
         /// <summary>
         /// Tries to wait until nothing else is modifying the <see cref="AssemblyDefinition"/> of an entry anymore,
         /// before making a snapshot and returning it. The definition has to be returned using
@@ -271,7 +271,7 @@ private AssemblyEntry GetEntry(AssemblyName name)
             return assemblyDefinition;
         }
 
-        private Assembly? ResolveAssembly(object sender, ResolveEventArgs args)
+        private Assembly? ResolveAssembly(object? sender, ResolveEventArgs args)
         {
             var name = new AssemblyName(AssemblyNameReference.Parse(args.Name).Name);
 
@@ -287,7 +287,7 @@ private AssemblyEntry GetEntry(AssemblyName name)
         private AssemblyDefinition? SearchDirectory(AssemblyNameReference name, ReaderParameters parameters)
         {
             parameters.AssemblyResolver ??= this;
-            var extensions = name.IsWindowsRuntime ? new[] { ".winmd", ".dll" } : new[] { ".exe", ".dll" };
+            string[] extensions = name.IsWindowsRuntime ? [".winmd", ".dll"] : [".exe", ".dll"];
 
             foreach (var directory in _directories)
             {
@@ -310,15 +310,15 @@ private AssemblyEntry GetEntry(AssemblyName name)
             return null;
         }
 
-        private bool TryGetEntry(AssemblyName name, out AssemblyEntry entry)
+        private bool TryGetEntry(AssemblyName name, [NotNullWhen(true)] out AssemblyEntry? entry)
             => _assemblies.TryGetValue(name, out entry);
 
         private sealed class AssemblyEntry : IDisposable
         {
             public readonly FileInfo? AssemblyFile;
             public readonly AssemblyName Name;
-            private AssemblyDefinition _definition;
             private readonly IAssemblyLoadStrategy _assemblyLoadStrategy;
+            private AssemblyDefinition _definition;
             private AutoResetEvent? _definitionLock;
             private MemoryStream? _definitionSnapshot;
             private bool _disposedValue = false;
@@ -361,7 +361,7 @@ public IEnumerable<AssemblyName> GetDependencies(HashSet<AssemblyName> alreadyLo
                     : _definition.GetAssemblyReferences()
                         .Select(reference => AssemblyNameReference.Parse(reference.Name).Name);
 
-                return fullNames.Select(name => new AssemblyName(name))
+                return fullNames.Select(name => new AssemblyName(name!))
                     .Where(name => !alreadyLoaded.Contains(name));
             }
 
@@ -387,7 +387,7 @@ public Assembly LoadAssembly(Logger logger, string? patchedAssemblyPath)
                         // so let's always load assemblies from files for now
                         if (saveAssemblies)
                         {
-                            var targetPath = Path.Combine(patchedAssemblyPath, $"{Name}.dll");
+                            var targetPath = Path.Combine(patchedAssemblyPath!, $"{Name}.dll");
 
                             try
                             {
@@ -398,7 +398,7 @@ public Assembly LoadAssembly(Logger logger, string? patchedAssemblyPath)
                             {
                                 logger.Warn(ex.LogFormat($"Exception while trying to save assembly to {targetPath}"));
                             }
-                            
+
                             _loadedAssembly = _assemblyLoadStrategy.LoadFile(Path.GetFullPath(targetPath));
                             logger.Trace(() => $"Loaded changed assembly definition [{Name}]");
                         }

MonkeyLoader/Configuration/ConfigKeyValidator.cs

@@ -11,15 +11,15 @@ public static class ConfigKeyValidator
         /// <summary>
         /// Gets a validator component that only accepts non-null non-whitespace strings.
         /// </summary>
-        public static IConfigKeyValidator<string> NotNullOrWhitespace { get; } = new ConfigKeyValidator<string>(value => !string.IsNullOrWhiteSpace(value));
+        public static IConfigKeyValidator<string> NotNullOrWhitespace { get; } = new ConfigKeyValidator<string>(static value => !string.IsNullOrWhiteSpace(value));
 
         /// <summary>
         /// Creates a new validator component that only accepts strings,
         /// where the given <paramref name="regex"/> has a match.
         /// </summary>
         /// <param name="regex">The regular expression that must have a match.</param>
         /// <returns>The validator component.</returns>
-        public static IConfigKeyValidator<string> Matching(Regex regex) => new ConfigKeyValidator<string>(regex.IsMatch);
+        public static IConfigKeyValidator<string> Matching(Regex regex) => new ConfigKeyValidator<string>(value => value is not null && regex.IsMatch(value));
     }
 
     /// <summary>

MonkeyLoader/Configuration/ConfigSection.cs

@@ -154,7 +154,7 @@ protected ConfigSection()
         /// </summary>
         /// <param name="obj">The other object.</param>
         /// <returns><c>true</c> if the other object is considered equal.</returns>
-        public override bool Equals(object obj)
+        public override bool Equals(object? obj)
             => obj is ConfigSection section && section == this;
 
         /// <summary>
@@ -302,7 +302,7 @@ internal void ResetHasChanges()
         /// <param name="key">The key to deserialize.</param>
         /// <param name="source">The <see cref="JObject"/> being deserialized from.</param>
         /// <param name="jsonSerializer">The <see cref="JsonSerializer"/> to deserialize objects with.</param>
-        protected void DeserializeKey(IDefiningConfigKey key, JObject source, JsonSerializer jsonSerializer)
+        protected static void DeserializeKey(IDefiningConfigKey key, JObject source, JsonSerializer jsonSerializer)
         {
             if (source[key.Id] is not JToken token)
                 return;
@@ -400,7 +400,7 @@ protected virtual void OnSave(JObject result, JsonSerializer jsonSerializer)
         /// <param name="key">The key to serialize.</param>
         /// <param name="result">The <see cref="JObject"/> being serialized to.</param>
         /// <param name="jsonSerializer">The <see cref="JsonSerializer"/> to serialize objects with.</param>
-        protected void SerializeKey(IDefiningConfigKey key, JObject result, JsonSerializer jsonSerializer)
+        protected static void SerializeKey(IDefiningConfigKey key, JObject result, JsonSerializer jsonSerializer)
         {
             if (!key.TryGetValue(out var value))
                 return;
@@ -415,7 +415,7 @@ protected void SerializeKey(IDefiningConfigKey key, JObject result, JsonSerializ
         /// <param name="key">The key that wasn't found.</param>
         /// <exception cref="KeyNotFoundException">Always.</exception>
         [DoesNotReturn]
-        protected void ThrowKeyNotFound(IConfigKey key)
+        protected static void ThrowKeyNotFound(IConfigKey key)
             => throw new KeyNotFoundException($"Key [{key.Id}] not found in this config section!");
 
         private static bool AreVersionsCompatible(Version serializedVersion, Version currentVersion)

MonkeyLoader/Configuration/DefiningConfigKey.cs

@@ -185,10 +185,12 @@ public DefiningConfigKey(string id, string? description = null, Func<T>? compute
         public static implicit operator T?(DefiningConfigKey<T> key) => key.GetValue();
 
         /// <inheritdoc/>
-        public bool Equals(IConfigKey other) => ConfigKey.EqualityComparer.Equals(this, other);
+        public bool Equals(IConfigKey? other)
+            => ConfigKey.EqualityComparer.Equals(this, other!);
 
         /// <inheritdoc/>
-        public override bool Equals(object obj) => obj is IConfigKey otherKey && Equals(otherKey);
+        public override bool Equals(object? obj)
+            => obj is IConfigKey otherKey && Equals(otherKey);
 
         /// <inheritdoc/>
         public IEnumerator<IComponent<IDefiningConfigKey>> GetEnumerator()
@@ -419,10 +421,10 @@ private void OnChanged(bool hadValue, T? oldValue, string? eventLabel, string? c
         private bool Validate(object? value)
             => (value is T || (value is null && Util.CanBeNull(ValueType))) && Validate((T)value!);
 
-        private void ValueCollectionChanged(object sender, NotifyCollectionChangedEventArgs eventArgs)
+        private void ValueCollectionChanged(object? sender, NotifyCollectionChangedEventArgs eventArgs)
             => OnChanged(true, _value, ConfigKey.CollectionChangedEventLabel, null, eventArgs);
 
-        private void ValuePropertyChanged(object sender, PropertyChangedEventArgs eventArgs)
+        private void ValuePropertyChanged(object? sender, PropertyChangedEventArgs eventArgs)
             => OnChanged(true, _value, ConfigKey.PropertyChangedEventLabel, eventArgs.PropertyName);
 
         /// <inheritdoc/>

MonkeyLoader/Configuration/ExpandoConfigSection.cs

@@ -119,7 +119,7 @@ protected override void OnLoad(JObject source, JsonSerializer jsonSerializer)
             base.OnLoad(source, jsonSerializer);
         }
 
-        private IDefiningConfigKey<T> AddDefiningKey<T>(string name, string? description, Func<T>? computeDefault, bool internalAccessOnly, Predicate<T?>? valueValidator)
+        private DefiningConfigKey<T> AddDefiningKey<T>(string name, string? description, Func<T>? computeDefault, bool internalAccessOnly, Predicate<T?>? valueValidator)
         {
             var definingKey = new DefiningConfigKey<T>(name, description, computeDefault, internalAccessOnly, valueValidator);
             definingKey.Section = this;

MonkeyLoader/Entrypoint.cs

@@ -24,8 +24,7 @@ public static void Start()
                 {
                     try
                     {
-                        if (Path.GetFileName(file).StartsWith("doorstop", StringComparison.OrdinalIgnoreCase)
-                            && Path.GetExtension(file).Equals(".log", StringComparison.OrdinalIgnoreCase))
+                        if (Path.GetFileName(file).StartsWith("doorstop", StringComparison.OrdinalIgnoreCase) && Path.GetExtension(file).Equals(".log", StringComparison.OrdinalIgnoreCase))
                             File.Delete(file);
                     }
                     catch