diff --git a/Carbon.Core/Carbon.Components/Carbon.Bootstrap b/Carbon.Core/Carbon.Components/Carbon.Bootstrap index 8c91649bf..3af8b4209 160000 --- a/Carbon.Core/Carbon.Components/Carbon.Bootstrap +++ b/Carbon.Core/Carbon.Components/Carbon.Bootstrap @@ -1 +1 @@ -Subproject commit 8c91649bfef8273823a28fdd9620a084708548bd +Subproject commit 3af8b42097ea545d69dad3bfff7c72d76dbbb7c9 diff --git a/Carbon.Core/Carbon.Components/Carbon.Common b/Carbon.Core/Carbon.Components/Carbon.Common index 65116abf5..9b610504d 160000 --- a/Carbon.Core/Carbon.Components/Carbon.Common +++ b/Carbon.Core/Carbon.Components/Carbon.Common @@ -1 +1 @@ -Subproject commit 65116abf5eaaec53203ed7ad6448fe59a38896c3 +Subproject commit 9b610504df5a7b170e8ba9a7d8b0669937fba159 diff --git a/Carbon.Core/Carbon.Hooks/Carbon.Hooks.Base b/Carbon.Core/Carbon.Hooks/Carbon.Hooks.Base index 3b9f707bf..d950f3242 160000 --- a/Carbon.Core/Carbon.Hooks/Carbon.Hooks.Base +++ b/Carbon.Core/Carbon.Hooks/Carbon.Hooks.Base @@ -1 +1 @@ -Subproject commit 3b9f707bfaad2a22ab3fc0cfd2e5ffb4e365f8ea +Subproject commit d950f3242cc2023b3c768fecce6a9da4a6c0920d diff --git a/Carbon.Core/Carbon/src/Jobs/ScriptCompilationThread.cs b/Carbon.Core/Carbon/src/Jobs/ScriptCompilationThread.cs index 9dc2acb51..b3ea2bfa7 100644 --- a/Carbon.Core/Carbon/src/Jobs/ScriptCompilationThread.cs +++ b/Carbon.Core/Carbon/src/Jobs/ScriptCompilationThread.cs @@ -59,14 +59,14 @@ public class ScriptCompilationThread : BaseThreadedJob internal static ConcurrentDictionary _extensionCompilationCache = new(); internal static Dictionary _referenceCache = new(); internal static Dictionary _extensionReferenceCache = new(); - internal static readonly string[] _libraryDirectories = new[] - { + internal static readonly string[] _libraryDirectories = + [ Defines.GetLibFolder(), Defines.GetManagedFolder(), Defines.GetRustManagedFolder(), Defines.GetManagedModulesFolder(), Defines.GetExtensionsFolder() - }; + ]; internal static byte[] _getPlugin(string name) { @@ -147,12 +147,10 @@ internal void _injectReference(string id, string name, List r { foreach (var file in OsEx.Folder.GetFilesWithExtension(directory, "dll")) { - if (file.Contains(name)) - { - raw = OsEx.File.ReadBytes(file); - found = true; - break; - } + if (!file.Contains(name)) continue; + raw = OsEx.File.ReadBytes(file); + found = true; + break; } if (found) break; @@ -169,12 +167,11 @@ internal void _injectReference(string id, string name, List r var processedReference = MetadataReference.CreateFromStream(mem); references.Add(processedReference); - if (!_referenceCache.ContainsKey(name)) _referenceCache.Add(name, processedReference); - else _referenceCache[name] = processedReference; + _referenceCache[name] = processedReference; Logger.Debug(id, $"Added common reference '{name}'", 4); } } - internal void _injectExtensionReference(string id, string name, List references) + internal void _injectExtensionReference(string name, List references) { if (_extensionReferenceCache.TryGetValue(name, out var reference)) { @@ -233,7 +230,7 @@ internal List _addReferences() { try { - _injectExtensionReference(id, Path.GetFileName(item.Value.Key), references); + _injectExtensionReference(Path.GetFileName(item.Value.Key), references); } catch (System.Exception ex) { @@ -283,7 +280,7 @@ public override void Start() var extensionFile = Path.Combine(Defines.GetExtensionsFolder(), $"{reference}.dll"); if (OsEx.File.Exists(extensionFile)) { - _injectExtensionReference(reference, extensionFile, references); + _injectExtensionReference(extensionFile, references); continue; }