I'm dumb and forgot to actually load the dependencies lol

BattleBit-Community-Servers · Sep 5, 2023 · 64bc39f · 64bc39f
1 parent 8fc95d0
commit 64bc39f
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/BattleBitAPIRunner/BattleBitAPIRunner.csproj b/BattleBitAPIRunner/BattleBitAPIRunner.csproj
@@ -5,7 +5,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <AssemblyVersion>0.4.12.2</AssemblyVersion>
+    <AssemblyVersion>0.4.12.3</AssemblyVersion>
     <FileVersion>$(AssemblyVersion)</FileVersion>
   </PropertyGroup>
 

diff --git a/BattleBitAPIRunner/Module.cs b/BattleBitAPIRunner/Module.cs
@@ -36,6 +36,14 @@ internal class Module
         private SyntaxTree syntaxTree;
         private string code;
 
+        public static void LoadDependencies(string[] dependencies)
+        {
+            foreach (string dependency in dependencies)
+            {
+                moduleContext.LoadFromAssemblyPath(Path.GetFullPath(dependency));
+            }
+        }
+
         public static void UnloadContext()
         {
             moduleContext.Unload();

diff --git a/BattleBitAPIRunner/Program.cs b/BattleBitAPIRunner/Program.cs
@@ -1,6 +1,7 @@
 using BattleBitAPI.Common;
 using BattleBitAPI.Server;
 using BBRAPIModules;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Operations;
 using Microsoft.Extensions.Configuration;
 using Newtonsoft.Json;
@@ -84,7 +85,7 @@ private void fileWatchers()
                                 try
                                 {
                                     changedModule = new(moduleFile);
-                                    changedModule.Compile();
+                                    changedModule.Compile(this.binaryDependencies);
                                 }
                                 catch (Exception ex)
                                 {
@@ -142,12 +143,20 @@ private void loadDependencies()
                 Directory.CreateDirectory(this.configuration.DependencyPath);
             }
 
+            List<PortableExecutableReference> binaryDependencies = new();
+
             foreach (string dependency in Directory.GetFiles(this.configuration.DependencyPath, "*.dll"))
             {
-                Assembly.LoadFrom(dependency);
+                binaryDependencies.Add(MetadataReference.CreateFromFile(dependency));
             }
+
+            this.binaryDependencies = binaryDependencies.ToArray();
+
+            Module.LoadDependencies(Directory.GetFiles(this.configuration.DependencyPath, "*.dll"));
         }
 
+        private PortableExecutableReference[] binaryDependencies = Array.Empty<PortableExecutableReference>();
+
         private void consoleCommandHandler()
         {
             if (Console.In is null)
@@ -230,7 +239,7 @@ private void consoleCommandHandler()
                         try
                         {
                             loadedModule = new(moduleToLoad.ModuleFilePath);
-                            loadedModule.Compile();
+                            loadedModule.Compile(this.binaryDependencies);
                         }
                         catch (Exception ex)
                         {
@@ -274,6 +283,7 @@ private void unloadModules()
             }
 
             Module.UnloadContext();
+            Module.LoadDependencies(Directory.GetFiles(this.configuration.DependencyPath, "*.dll"));
         }
 
         private void loadModules()
@@ -342,7 +352,7 @@ private void loadModules()
 
                     if (module.AssemblyBytes is null)
                     {
-                        module.Compile();
+                        module.Compile(this.binaryDependencies);
                         compiledModuleCount++;
                     }