Mono/C#: Add option to export assemblies outside of PCK

When using this options, assemblies will be saved in the Assemblies folder of the  data directory: 'data_AppName/Assemblies/'.

1 files changed, 26 insertions, 8 deletions

diff --git a/modules/mono/editor/GodotTools/GodotTools/Export/ExportPlugin.cs b/modules/mono/editor/GodotTools/GodotTools/Export/ExportPlugin.cs
index cf3823fd16..aed25f5ac5 100644
--- a/modules/mono/editor/GodotTools/GodotTools/Export/ExportPlugin.cs
+++ b/modules/mono/editor/GodotTools/GodotTools/Export/ExportPlugin.cs
@@ -22,6 +22,7 @@ namespace GodotTools.Export
             // TODO: These would be better as export preset options, but that doesn't seem to be supported yet
 
             GlobalDef("mono/export/include_scripts_content", false);
+            GlobalDef("mono/export/export_assemblies_inside_pck", true);
 
             GlobalDef("mono/export/aot/enabled", false);
             GlobalDef("mono/export/aot/full_aot", false);
@@ -130,21 +131,38 @@ namespace GodotTools.Export
                 internal_GetExportedAssemblyDependencies(projectDllName, projectDllSrcPath, buildConfig, platformBclDir, dependencies);
             }
 
+            string outputDataDir = null;
+
+            if (PlatformHasTemplateDir(platform))
+                outputDataDir = ExportDataDirectory(features, platform, isDebug, outputDir);
+
             string apiConfig = isDebug ? "Debug" : "Release";
             string resAssembliesDir = Path.Combine(GodotSharpDirs.ResAssembliesBaseDir, apiConfig);
 
-            foreach (var dependency in dependencies)
+            bool assembliesInsidePck = (bool) ProjectSettings.GetSetting("mono/export/export_assemblies_inside_pck") || outputDataDir == null;
+
+            if (!assembliesInsidePck)
             {
-                string dependSrcPath = dependency.Value;
-                string dependDstPath = Path.Combine(resAssembliesDir, dependSrcPath.GetFile());
-                AddFile(dependSrcPath, dependDstPath);
+                string outputDataGameAssembliesDir = Path.Combine(outputDataDir, "Assemblies");
+                if (!Directory.Exists(outputDataGameAssembliesDir))
+                    Directory.CreateDirectory(outputDataGameAssembliesDir);
             }
 
-            // Mono specific export template extras (data dir)
-            string outputDataDir = null;
+            foreach (var dependency in dependencies)
+            {
+                string dependSrcPath = dependency.Value;
 
-            if (PlatformHasTemplateDir(platform))
-                outputDataDir = ExportDataDirectory(features, platform, isDebug, outputDir);
+                if (assembliesInsidePck)
+                {
+                    string dependDstPath = Path.Combine(resAssembliesDir, dependSrcPath.GetFile());
+                    AddFile(dependSrcPath, dependDstPath);
+                }
+                else
+                {
+                    string dependDstPath = Path.Combine(outputDataDir, "Assemblies", dependSrcPath.GetFile());
+                    File.Copy(dependSrcPath, dependDstPath);
+                }
+            }
 
             // AOT