mirror of
https://github.com/godotengine/godot
synced 2024-09-05 21:39:38 +00:00
Merge pull request #71825 from RedworkDE/net6-roll-forward
C#: Allow use of .NET 7
This commit is contained in:
commit
2edef2a795
|
@ -8,6 +8,7 @@
|
|||
|
||||
<!-- To generate the .runtimeconfig.json file-->
|
||||
<EnableDynamicLoading>true</EnableDynamicLoading>
|
||||
<RollForward>LatestMajor</RollForward>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
@ -104,7 +104,7 @@ namespace Godot.NativeInterop
|
|||
}
|
||||
}
|
||||
|
||||
[StructLayout(LayoutKind.Explicit)]
|
||||
[StructLayout(LayoutKind.Sequential, Pack = 8)]
|
||||
// ReSharper disable once InconsistentNaming
|
||||
public ref struct godot_variant
|
||||
{
|
||||
|
@ -113,11 +113,11 @@ namespace Godot.NativeInterop
|
|||
=> (godot_variant*)Unsafe.AsPointer(ref Unsafe.AsRef(in _typeField));
|
||||
|
||||
// Variant.Type is generated as an enum of type long, so we can't use for the field as it must only take 32-bits.
|
||||
[FieldOffset(0)] private int _typeField;
|
||||
private int _typeField;
|
||||
|
||||
// There's padding here
|
||||
|
||||
[FieldOffset(8)] private godot_variant_data _data;
|
||||
private godot_variant_data _data;
|
||||
|
||||
[StructLayout(LayoutKind.Explicit)]
|
||||
// ReSharper disable once InconsistentNaming
|
||||
|
|
Loading…
Reference in a new issue