Mono dependency removed from Linux build.

dmitriyse · dmitriyse · commit 0b988d2c9719 · 2017-01-07T13:36:27.000+04:00
diff --git a/src/Python.Runtime/Python.Runtime.xproj b/src/Python.Runtime/Python.Runtime.xproj
@@ -7,7 +7,7 @@
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>c41b9f67-571d-4852-b7c4-b54e84dcbcdc</ProjectGuid>
-    <RootNamespace>runtime.x</RootNamespace>
+    <RootNamespace>Python.Runtime</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
diff --git a/src/Python.Runtime/monosupport.cs b/src/Python.Runtime/monosupport.cs
diff --git a/src/Python.Runtime/runtime.cs b/src/Python.Runtime/runtime.cs
@@ -6,7 +6,6 @@
 
 #if (UCS4)
 using System.Text;
-using Mono.Unix;
 
 #endif
 
@@ -1766,10 +1765,32 @@ internal unsafe static extern IntPtr
         ExactSpelling = true)]
     internal unsafe static extern IntPtr
     PyUnicode_FromKindAndString(int kind,
-                                [MarshalAs (UnmanagedType.CustomMarshaler,
-                                 MarshalTypeRef=typeof(Utf32Marshaler))] string s,
+                                IntPtr s,
                                 int size);
 
+    internal static unsafe IntPtr PyUnicode_FromKindAndString(int kind,
+                            string s,
+                            int size)
+    {
+        var bufLength = Math.Max(s.Length, size) * 4;
+
+        IntPtr mem = Marshal.AllocHGlobal(bufLength);
+        try
+        {
+            fixed(char* ps = s)
+            {
+                Encoding.UTF32.GetBytes(ps, s.Length, (byte*)mem, bufLength);
+            }
+
+            var result = PyUnicode_FromKindAndString(kind, mem, bufLength);
+            return result;
+        }
+        finally
+        {
+            Marshal.FreeHGlobal(mem);
+        }
+    }
+
     internal static IntPtr PyUnicode_FromUnicode(string s, int size) {
         return PyUnicode_FromKindAndString(4, s, size);
     }
