Skip to content

Commit

Permalink
Use NET8_0_OR_GREATER for LibraryImport
Browse files Browse the repository at this point in the history
  • Loading branch information
jmmorato committed Dec 18, 2024
1 parent 8fb010b commit 6a3f1f8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Native/CSharpCDRImplTemplate.txt
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
[SuppressUnmanagedCodeSecurity]
internal static partial class <%TYPE%>TypeSupportNative
{
#if NET7_0_OR_GREATER
#if NET8_0_OR_GREATER
[SuppressUnmanagedCodeSecurity]
[LibraryImport(<%TYPE%>.API_DLL, EntryPoint = "<%SCOPED_METHOD%>TypeSupport_new", StringMarshalling = StringMarshalling.Utf8)]
[UnmanagedCallConv(CallConvs = new[] { typeof(System.Runtime.CompilerServices.CallConvSuppressGCTransition) })]
Expand Down Expand Up @@ -1213,7 +1213,7 @@

internal static partial class <%TYPE%>DataReaderNative
{
#if NET7_0_OR_GREATER
#if NET8_0_OR_GREATER
[SuppressUnmanagedCodeSecurity]
[LibraryImport(<%TYPE%>.API_DLL, EntryPoint = "<%SCOPED_METHOD%>DataReader_Narrow")]
[UnmanagedCallConv(CallConvs = new[] { typeof(System.Runtime.CompilerServices.CallConvCdecl) })]
Expand Down
2 changes: 1 addition & 1 deletion Tests/OpenDDSharp.UnitTest/OpenDDSharp.UnitTest.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<IsLinux Condition="$([MSBuild]::IsOSPlatform('Linux'))">true</IsLinux>
<IsOSX Condition="$([MSBuild]::IsOSPlatform('OSX'))">true</IsOSX>
<RootNamespace>OpenDDSharp.UnitTest</RootNamespace>
<TargetFrameworks Condition="'$(IsARM64)' != 'true'">net7.0;net8.0;</TargetFrameworks>
<TargetFrameworks Condition="'$(IsARM64)' != 'true'">net462;net47;net471;net472;net48;net6.0;net7.0;net8.0;</TargetFrameworks>
<TargetFrameworks Condition="'$(IsARM64)' == 'true'">net6.0;net7.0;net8.0;</TargetFrameworks>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
Expand Down

0 comments on commit 6a3f1f8

Please sign in to comment.