GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix DisableRuntimeMarshalling attribute usage to be declared once per C# assembly

Browse Source
This commit is contained in:
Wojciech Figat
2022-12-29 14:11:22 +01:00
parent 9083f511b5
commit 28da925c52
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Source/Tools/Flax.Build/Bindings/BindingsGenerator.CSharp.cs
View File

@@ -17,7 +17,6 @@ namespace Flax.Build.Bindings
private static readonly List<string> CSharpUsedNamespacesSorted = new List<string>();
private static readonly List<string> CSharpAdditionalCode = new List<string>();
private static readonly Dictionary<string, string> CSharpAdditionalCodeCache = new Dictionary<string, string>();
private static string CSharpLastAssembly;
public static event Action<BuildData, ApiTypeInfo, StringBuilder, string> GenerateCSharpTypeInternals;
@@ -457,7 +456,7 @@ namespace Flax.Build.Bindings
if (CSharpAdditionalCode.Count != 0)
{
contents.AppendLine();
foreach(var e in CSharpAdditionalCode)
foreach (var e in CSharpAdditionalCode)
contents.Append(indent).AppendLine(e);
CSharpAdditionalCode.Clear();
CSharpAdditionalCodeCache.Clear();
@@ -1285,7 +1284,7 @@ namespace Flax.Build.Bindings
internal static IntPtr ToNative({{classInfo.Name}} managed) => GCHandleMarshaller.ToNative(managed);
#pragma warning restore 1591
}
""").Split(new char[] { '\n'})));
""").Split(new char[] { '\n' })));
}
#endif
// Namespace end
@@ -1995,16 +1994,10 @@ namespace Flax.Build.Bindings
CSharpUsedNamespaces.Add("System.Globalization");
CSharpUsedNamespaces.Add("System.Runtime.CompilerServices");
CSharpUsedNamespaces.Add("System.Runtime.InteropServices");
CSharpUsedNamespaces.Add("FlaxEngine");
#if USE_NETCORE
CSharpUsedNamespaces.Add("System.Runtime.InteropServices.Marshalling");
if (CSharpLastAssembly != moduleInfo.Name)
{
// Add custom assembly attributes here, once per assembly
contents.AppendLine("[assembly: DisableRuntimeMarshalling]");
CSharpLastAssembly = moduleInfo.Name;
}
#endif
CSharpUsedNamespaces.Add("FlaxEngine");
// Process all API types from the file
var useBindings = false;
@@ -2070,6 +2063,9 @@ namespace Flax.Build.Bindings
contents.AppendLine();
contents.AppendLine("using System.Reflection;");
contents.AppendLine("using System.Runtime.InteropServices;");
#if USE_NETCORE
contents.AppendLine("using System.Runtime.CompilerServices;");
#endif
contents.AppendLine();
contents.AppendLine($"[assembly: AssemblyTitle(\"{binaryModuleName}\")]");
contents.AppendLine("[assembly: AssemblyDescription(\"\")]");
@@ -2083,6 +2079,9 @@ namespace Flax.Build.Bindings
contents.AppendLine($"[assembly: Guid(\"{id:d}\")]");
contents.AppendLine($"[assembly: AssemblyVersion(\"{project.Version}\")]");
contents.AppendLine($"[assembly: AssemblyFileVersion(\"{project.Version}\")]");
#if USE_NETCORE
contents.AppendLine("[assembly: DisableRuntimeMarshalling]");
#endif
Utilities.WriteFileIfChanged(dstFilePath, contents.ToString());
}
}