From bef458bcdda81ea0fd955597be12b0966804f7ee Mon Sep 17 00:00:00 2001 From: Timerix22 Date: Fri, 18 Nov 2022 03:02:11 +0600 Subject: [PATCH] netstandard2.0 --- DTLib.Dtsod/DTLib.Dtsod.csproj | 6 +++++- DTLib.Logging/DTLib.Logging.csproj | 2 +- DTLib.Network/DTLib.Network.csproj | 2 +- DTLib.Tests/DTLib.Tests.csproj | 2 +- DTLib.Tests/Dtsod/TestPInvoke.cs | 4 ++-- DTLib/DTLib.csproj | 2 +- 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/DTLib.Dtsod/DTLib.Dtsod.csproj b/DTLib.Dtsod/DTLib.Dtsod.csproj index 7164021..239adbe 100644 --- a/DTLib.Dtsod/DTLib.Dtsod.csproj +++ b/DTLib.Dtsod/DTLib.Dtsod.csproj @@ -1,7 +1,7 @@ - net6.0;net48 + net6.0;net48;netstandard2.0 preview disable disable @@ -20,6 +20,10 @@ + + + + diff --git a/DTLib.Logging/DTLib.Logging.csproj b/DTLib.Logging/DTLib.Logging.csproj index ff0927c..e7735ff 100644 --- a/DTLib.Logging/DTLib.Logging.csproj +++ b/DTLib.Logging/DTLib.Logging.csproj @@ -1,7 +1,7 @@ - net6.0;net48 + net6.0;net48;netstandard2.0 10 disable disable diff --git a/DTLib.Network/DTLib.Network.csproj b/DTLib.Network/DTLib.Network.csproj index 13a015d..9b888be 100644 --- a/DTLib.Network/DTLib.Network.csproj +++ b/DTLib.Network/DTLib.Network.csproj @@ -1,7 +1,7 @@ - net6.0;net48 + net6.0;net48;netstandard2.0 preview disable disable diff --git a/DTLib.Tests/DTLib.Tests.csproj b/DTLib.Tests/DTLib.Tests.csproj index 240d82e..5b8c044 100644 --- a/DTLib.Tests/DTLib.Tests.csproj +++ b/DTLib.Tests/DTLib.Tests.csproj @@ -1,7 +1,7 @@  Exe - net6.0;net48 + net6.0;net48;netstandard2.0 10 false disable diff --git a/DTLib.Tests/Dtsod/TestPInvoke.cs b/DTLib.Tests/Dtsod/TestPInvoke.cs index 8c8caa8..7ca57d2 100644 --- a/DTLib.Tests/Dtsod/TestPInvoke.cs +++ b/DTLib.Tests/Dtsod/TestPInvoke.cs @@ -28,7 +28,7 @@ public static class TestPInvoke } [DllImport("kerep", CallingConvention = CallingConvention.Cdecl)] - static extern void pinvoke_print([MarshalAs(UnmanagedType.LPUTF8Str)] string msg); + static extern void pinvoke_print([MarshalAs(UnmanagedType.LPStr)] string msg); public static void TestPrintf() { @@ -38,7 +38,7 @@ public static class TestPInvoke } [DllImport("kerep", CallingConvention = CallingConvention.Cdecl)] - static extern unsafe void test_marshalling([MarshalAs(UnmanagedType.LPUTF8Str)] string text, out IntPtr kptr); + static extern unsafe void test_marshalling([MarshalAs(UnmanagedType.LPStr)] string text, out IntPtr kptr); public static unsafe void TestMarshalling() { diff --git a/DTLib/DTLib.csproj b/DTLib/DTLib.csproj index 970d5b0..288ef3e 100644 --- a/DTLib/DTLib.csproj +++ b/DTLib/DTLib.csproj @@ -1,6 +1,6 @@  - net6.0;net48 + net6.0;net48;netstandard2.0 preview disable disable