Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity

Add option to have custom managed assembly extension on specific platforms

Browse Source
This commit is contained in:
Wojciech Figat
2026-07-20 08:54:45 +02:00
parent da81d7251c
commit ac357fd2b9
3 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Engine/Scripting/Runtime/DotNet.cpp
+7
View File
@@ -2066,8 +2066,15 @@ static MonoAssembly* OnMonoAssemblyLoad(const char* aname)
LOG(Info, "Loading C# assembly {0}", name);
#endif
String fileName = name;
#ifdef USE_MONO_DLL_EXT
if (name.EndsWith(TEXT(".dll")))
fileName = fileName.Substring(fileName.Length() - 4);
if (!name.EndsWith(TEXT(USE_MONO_DLL_EXT)))
fileName += TEXT(USE_MONO_DLL_EXT);
#else
if (!name.EndsWith(TEXT(".dll")) && !name.EndsWith(TEXT(".exe")))
fileName += TEXT(".dll");
#endif
String path = Globals::ProjectFolder / fileName;
if (!FileSystem::FileExists(path))
{
Source/Tools/Flax.Build/Build/DotNet/DotNetAOT.cs
+26 -14
View File
@@ -360,18 +360,21 @@ namespace Flax.Build
// Run compilation
bool failed = false, validCache = true, coreLibDirty = false;
string platformToolsPath;
Toolchain.CSharpOptions baseOptions;
{
// Get platform tools
var options = new Toolchain.CSharpOptions
baseOptions = new Toolchain.CSharpOptions
{
Action = Toolchain.CSharpOptions.ActionTypes.GetPlatformTools,
AssembliesPath = aotAssembliesPath,
ManagedAssemblyExtension = ".dll",
ClassLibraryPath = dotnetLibPath,
EnableToolDebug = dotnetAotDebug,
};
buildToolchain.CompileCSharp(ref options);
platformToolsPath = options.PlatformToolsPath;
buildToolchain.CompileCSharp(ref baseOptions);
if (!Directory.Exists(baseOptions.PlatformToolsPath))
throw new Exception("Missing platform tools " + baseOptions.PlatformToolsPath);
Log.Info("Platform tools found in: " + baseOptions.PlatformToolsPath);
}
{
// Check if core library has been modified
@@ -382,16 +385,13 @@ namespace Flax.Build
OutputFiles = new List<string>(),
AssembliesPath = aotAssembliesPath,
ClassLibraryPath = dotnetLibPath,
PlatformToolsPath = platformToolsPath,
PlatformToolsPath = baseOptions.PlatformToolsPath,
EnableDebugSymbols = false,
EnableToolDebug = dotnetAotDebug,
};
buildToolchain.CompileCSharp(ref options);
coreLibDirty = File.GetLastWriteTime(options.InputFiles[0]) > File.GetLastWriteTime(options.OutputFiles[0]);
}
if (!Directory.Exists(platformToolsPath))
throw new Exception("Missing platform tools " + platformToolsPath);
Log.Info("Platform tools found in: " + platformToolsPath);
var compileAssembly = (string assemblyPath) =>
{
// Determinate whether use debug information for that assembly
@@ -410,7 +410,7 @@ namespace Flax.Build
OutputFiles = new List<string>(),
AssembliesPath = aotAssembliesPath,
ClassLibraryPath = dotnetLibPath,
PlatformToolsPath = platformToolsPath,
PlatformToolsPath = baseOptions.PlatformToolsPath,
EnableDebugSymbols = useDebug,
EnableToolDebug = dotnetAotDebug,
};
@@ -447,13 +447,24 @@ namespace Flax.Build
if (Utilities.NormalizePath(Path.GetDirectoryName(assemblyPath)) == Utilities.NormalizePath(aotAssembliesPath))
outputRoot = outputPath;
// Certain platforms prohibit using managed libraries in a game package (strict policy) so rename assemblies to avoid shipping them as .dll
var outputName = Path.GetFileNameWithoutExtension(assemblyFileName) + baseOptions.ManagedAssemblyExtension;
{
// Copy assembly
var outputFile = Path.Combine(outputRoot, assemblyFileName);
var deployedFilePath = Path.Combine(outputRoot, Path.GetFileName(outputFile));
if (!File.Exists(deployedFilePath) || File.GetLastWriteTime(outputFile) > File.GetLastWriteTime(deployedFilePath))
var deployedFilePath = Path.Combine(outputRoot, outputName);
deployedFilePath = Utilities.NormalizePath(deployedFilePath);
if (!File.Exists(deployedFilePath) || File.GetLastWriteTime(assemblyPath) > File.GetLastWriteTime(deployedFilePath))
{
Utilities.FileCopy(assemblyPath, outputFile);
Utilities.FileCopy(assemblyPath, deployedFilePath);
}
// Get rid of the original assembly in the destination folder to avoid shipping it if extension has to be different
var outputFile = Path.Combine(outputRoot, assemblyFileName);
outputFile = Utilities.NormalizePath(outputFile);
if (outputFile != deployedFilePath && File.Exists(outputFile))
{
File.Delete(outputFile);
}
}
@@ -462,6 +473,7 @@ namespace Flax.Build
{
// Skip if deployed file is already valid
var deployedFilePath = Path.Combine(outputRoot, Path.GetFileName(outputFile));
deployedFilePath = deployedFilePath.Replace(Path.GetFileNameWithoutExtension(outputFile), outputName);
if (!File.Exists(deployedFilePath) || File.GetLastWriteTime(outputFile) > File.GetLastWriteTime(deployedFilePath))
{
// Copy to the destination folder
@@ -502,7 +514,7 @@ namespace Flax.Build
OutputFiles = new List<string>() { outputAotLib },
AssembliesPath = aotAssembliesPath,
ClassLibraryPath = dotnetLibPath,
PlatformToolsPath = platformToolsPath,
PlatformToolsPath = baseOptions.ManagedAssemblyExtension,
EnableDebugSymbols = configuration != TargetConfiguration.Release,
EnableToolDebug = dotnetAotDebug,
};
Source/Tools/Flax.Build/Build/Toolchain.cs
+1
View File
@@ -164,6 +164,7 @@ namespace Flax.Build
public string AssembliesPath;
public string ClassLibraryPath;
public string PlatformToolsPath;
public string ManagedAssemblyExtension;
public bool EnableDebugSymbols;
public bool EnableToolDebug;
}