- Added the option to have in-memory compiled assembly to gain access…

… to internals.
MapleWheels · Oct 25, 2023 · 29338c9 · 29338c9
1 parent 46a2fe1
commit 29338c9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Plugins/CsPackageManager.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Plugins/CsPackageManager.cs
@@ -574,11 +574,13 @@ public AssemblyLoadingSuccessState LoadAssemblyPackages()
 
                 // try compile
                 successState = _assemblyManager.LoadAssemblyFromMemory(
-                    pair.Key.Name.Replace(" ",""), 
+                    pair.Value.config.UseInternalAssemblyName ? "CompiledAssembly" : pair.Key.Name.Replace(" ",""), 
                     syntaxTrees, 
                     null, 
                     CompilationOptions, 
-                     pair.Key.Name, ref id, pair.Value.config.UseNonPublicizedAssemblies ? null : publicizedAssemblies);
+                     pair.Key.Name, 
+                    ref id, 
+                    pair.Value.config.UseNonPublicizedAssemblies ? null : publicizedAssemblies);
 
                 if (successState is not AssemblyLoadingSuccessState.Success)
                 {

diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Plugins/MemoryFileAssemblyContextLoader.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Plugins/MemoryFileAssemblyContextLoader.cs
@@ -5,11 +5,14 @@
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Runtime.Loader;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 // ReSharper disable ConditionIsAlwaysTrueOrFalse
 
+[assembly: InternalsVisibleTo("CompiledAssembly")]
+
 namespace Barotrauma;
 
 /// <summary>

diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Plugins/RunConfig.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Plugins/RunConfig.cs
@@ -35,6 +35,13 @@ public sealed class RunConfig
     [XmlElement(ElementName = "UseNonPublicizedAssemblies")]
     public bool UseNonPublicizedAssemblies { get; set; }
 
+    /// <summary>
+    /// If the mod includes source files, the compiled assembly will be named "CompiledAssembly" and have the [InternalVisibleTo()] attribute applied to it.
+    /// </summary>
+    [XmlElement(ElementName = "UseInternalAssemblyName")]
+    [DefaultValue(false)]
+    public bool UseInternalAssemblyName { get; set; }
+
     [XmlElement(ElementName = "AutoGenerated")]
     public bool AutoGenerated { get; set; }