Skip to content

Added side-by-side VS 2017 build with NetStandard 1.5 support. #444

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 19 commits into from
Closed

Added side-by-side VS 2017 build with NetStandard 1.5 support. #444

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
8bbf07c
DotNet core migration first files.
Mar 28, 2017
d279a59
Net 4.0 compilation fixed. NetStandard 1.5 dependencies added.
Mar 28, 2017
c654771
Adoption for .Net Standard 1.5 completed, except ICustomMarshaler wor…
Mar 28, 2017
4e19934
Custom Marshaler workaround for NetStandard 1.5 implemented.
Mar 28, 2017
96f14f0
New .Net 4.5+ reflection API polyfill implemented.
Mar 28, 2017
c53c3e9
Migration issues resolved for Python3+Windows+x64. Compilable but not…
Mar 28, 2017
4875302
CHANGELOG edited.
Mar 28, 2017
e4ad620
ReflectionBridge extension sources injected. Build fix.
Mar 28, 2017
7fe824c
Merge
Mar 28, 2017
26966d3
Added embed_tests project to VS 2017 build. All tests are passed for …
Mar 28, 2017
36c2e85
DotNetCore + Windows x64 + Python 3.5 = all tests passed.
Mar 29, 2017
563a844
DotNetCore + Ubuntu 14.04 x64 + Python 3.5 = all tests passed.
Mar 29, 2017
9429512
Binary substitution of Python.Runtime.Dll becomes safe.
Apr 25, 2017
a2ff2d8
Merge
Apr 25, 2017
49edf48
Build fix, lost renames performed.
Apr 25, 2017
d2ebd3a
Merge
Apr 25, 2017
938030c
typo fix.
Apr 25, 2017
5ff01dc
Merge
Apr 25, 2017
45eaa72
Merge branch 'master' into coreclr
filmor Jul 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Custom Marshaler workaround for NetStandard 1.5 implemented.
  • Loading branch information
dse committed Mar 28, 2017
commit 4e19934d2499f0ce2bc011775194f40630aa3564
114 changes: 113 additions & 1 deletion src/runtime/runtime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,11 +632,33 @@ internal static unsafe long Refcount(IntPtr op)
internal static extern IntPtr PyGILState_GetThisThreadState();

#if PYTHON3
#if NETSTANDARD1_5
[DllImport(PythonDll)]
private static extern int Py_Main(
int argc,
IntPtr argv
);

public static int Py_Main(
int argc,
string[] argv
)
{
var marshaler = StrArrayMarshaler.GetInstance(string.Empty);
var unmanagedDataPtr = marshaler.MarshalManagedToNative(argv);

int result = Py_Main(argc, unmanagedDataPtr);

marshaler.CleanUpNativeData(unmanagedDataPtr);
return result;
}
#else
[DllImport(PythonDll)]
public static extern int Py_Main(
int argc,
[MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(StrArrayMarshaler))] string[] argv
);
#endif
#elif PYTHON2
[DllImport(PythonDll)]
public static extern int Py_Main(int argc, string[] argv);
Expand Down Expand Up @@ -1168,11 +1190,33 @@ internal static IntPtr PyBytes_AS_STRING(IntPtr ob)
return ob + BytesOffset.ob_sval;
}

#if NETSTANDARD1_5
[DllImport(PythonDll, EntryPoint = "PyUnicode_FromStringAndSize")]
private static extern IntPtr PyString_FromStringAndSize(
IntPtr value,
int size
);

internal static IntPtr PyString_FromStringAndSize(
string value,
int size
)
{
var marshaler = Utf8Marshaler.GetInstance(string.Empty);
var unmanagedDataPtr = marshaler.MarshalManagedToNative(value);

IntPtr result = PyString_FromStringAndSize(unmanagedDataPtr, size);

marshaler.CleanUpNativeData(unmanagedDataPtr);
return result;
}
#else
[DllImport(PythonDll, EntryPoint = "PyUnicode_FromStringAndSize")]
internal static extern IntPtr PyString_FromStringAndSize(
[MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(Utf8Marshaler))] string value,
int size
);
#endif

[DllImport(PythonDll)]
internal static extern IntPtr PyUnicode_FromStringAndSize(IntPtr value, int size);
Expand All @@ -1199,12 +1243,36 @@ internal static bool PyUnicode_Check(IntPtr ob)
[DllImport(PythonDll)]
internal static extern IntPtr PyUnicode_FromEncodedObject(IntPtr ob, IntPtr enc, IntPtr err);

#if NETSTANDARD1_5
[DllImport(PythonDll)]
private static extern IntPtr PyUnicode_FromKindAndData(
int kind,
IntPtr s,
int size
);

internal static IntPtr PyUnicode_FromKindAndData(
int kind,
string s,
int size
)
{
var marshaler = UcsMarshaler.GetInstance(string.Empty);
var unmanagedDataPtr = marshaler.MarshalManagedToNative(s);

IntPtr result = PyUnicode_FromKindAndData(kind, unmanagedDataPtr, size);

marshaler.CleanUpNativeData(unmanagedDataPtr);
return result;
}
#else
[DllImport(PythonDll)]
internal static extern IntPtr PyUnicode_FromKindAndData(
int kind,
[MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(UcsMarshaler))] string s,
int size
);
#endif

internal static IntPtr PyUnicode_FromUnicode(string s, int size)
{
Expand All @@ -1226,12 +1294,33 @@ internal static IntPtr PyUnicode_FromUnicode(string s, int size)
[DllImport(PythonDll, EntryPoint = PyUnicodeEntryPoint + "FromEncodedObject")]
internal static extern IntPtr PyUnicode_FromEncodedObject(IntPtr ob, IntPtr enc, IntPtr err);

#if NETSTANDARD1_5
[DllImport(PythonDll, EntryPoint = PyUnicodeEntryPoint + "FromUnicode")]
private static extern IntPtr PyUnicode_FromUnicode(
IntPtr s,
int size
);

internal static IntPtr PyUnicode_FromUnicode(
string s,
int size
)
{
var marshaler = UcsMarshaler.GetInstance(string.Empty);
var unmanagedDataPtr = marshaler.MarshalManagedToNative(s);

IntPtr result = PyUnicode_FromUnicode(unmanagedDataPtr, size);

marshaler.CleanUpNativeData(unmanagedDataPtr);
return result;
}
#else
[DllImport(PythonDll, EntryPoint = PyUnicodeEntryPoint + "FromUnicode")]
internal static extern IntPtr PyUnicode_FromUnicode(
[MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(UcsMarshaler))] string s,
int size
);

#endif
[DllImport(PythonDll, EntryPoint = PyUnicodeEntryPoint + "GetSize")]
internal static extern int PyUnicode_GetSize(IntPtr ob);

Expand Down Expand Up @@ -1469,12 +1558,35 @@ internal static bool PyIter_Check(IntPtr pointer)
internal static extern IntPtr PyImport_GetModuleDict();

#if PYTHON3
#if NETSTANDARD1_5
[DllImport(PythonDll)]
private static extern void PySys_SetArgvEx(
int argc,
IntPtr argv,
int updatepath
);

internal static void PySys_SetArgvEx(
int argc,
string[] argv,
int updatepath
)
{
var marshaler = StrArrayMarshaler.GetInstance(string.Empty);
var unmanagedDataPtr = marshaler.MarshalManagedToNative(argv);

PySys_SetArgvEx(argc, unmanagedDataPtr, updatepath);

marshaler.CleanUpNativeData(unmanagedDataPtr);
}
#else
[DllImport(PythonDll)]
internal static extern void PySys_SetArgvEx(
int argc,
[MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(StrArrayMarshaler))] string[] argv,
int updatepath
);
#endif
#elif PYTHON2
[DllImport(PythonDll)]
internal static extern void PySys_SetArgvEx(
Expand Down