Binary substitution of Python.Runtime.dll becomes safe. (#456)

dmitriyse · filmor · commit 25e66f018f7e · 2017-07-11T00:32:38.000+02:00
* Binary substitution of Python.Runtime.Dll becomes safe.
* Public constants replaced to static readonly fields. Relaxed platform binding.
* Static readonly fields (related to build depented values) replaced by properties.
diff --git a/src/embed_tests/TestPythonEngineProperties.cs b/src/embed_tests/TestPythonEngineProperties.cs
@@ -146,7 +146,7 @@ public void SetProgramName()
         [Test]
         public void SetPythonPath()
         {
-            if (Runtime.Runtime.pyversion == "2.7")
+            if (Runtime.Runtime._pyversion == "2.7")
             {
                 // Assert.Skip outputs as a warning (ie. pending to fix)
                 Assert.Pass();
@@ -166,7 +166,7 @@ public void SetPythonPath()
         [Test]
         public void SetPythonPathExceptionOn27()
         {
-            if (Runtime.Runtime.pyversion != "2.7")
+            if (Runtime.Runtime._pyversion != "2.7")
             {
                 Assert.Pass();
             }
diff --git a/src/runtime/CustomMarshaler.cs b/src/runtime/CustomMarshaler.cs
@@ -91,13 +91,13 @@ public static int GetUnicodeByteLength(IntPtr p)
             var len = 0;
             while (true)
             {
-                int c = Runtime.UCS == 2
+                int c = Runtime._UCS == 2
                     ? Marshal.ReadInt16(p, len * 2)
                     : Marshal.ReadInt32(p, len * 4);
 
                 if (c == 0)
                 {
-                    return len * Runtime.UCS;
+                    return len * Runtime._UCS;
                 }
                 checked
                 {
@@ -163,7 +163,7 @@ public override IntPtr MarshalManagedToNative(object managedObj)
             }
 
             int totalStrLength = argv.Sum(arg => arg.Length + 1);
-            int memSize = argv.Length * IntPtr.Size + totalStrLength * Runtime.UCS;
+            int memSize = argv.Length * IntPtr.Size + totalStrLength * Runtime._UCS;
 
             IntPtr mem = Marshal.AllocHGlobal(memSize);
             try
diff --git a/src/runtime/Python.Runtime.csproj b/src/runtime/Python.Runtime.csproj
@@ -20,12 +20,14 @@
     <SignAssembly>false</SignAssembly>
     <AssemblyOriginatorKeyFile>..\pythonnet.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Platform)' == 'x86'">
+  <!--We can relax binding to platform because code references no any platform dependent assemblies-->
+  <!--This will allows to use any build of this assebly as a compile ref assebly-->
+  <!--<PropertyGroup Condition=" '$(Platform)' == 'x86'">
     <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Platform)' == 'x64'">
     <PlatformTarget>x64</PlatformTarget>
-  </PropertyGroup>
+  </PropertyGroup>-->
   <PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMono'">
     <DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON2;PYTHON27;UCS4</DefineConstants>
     <Optimize>true</Optimize>
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ public void SetProgramName()`
`146`	`146`	`[Test]`
`147`	`147`	`public void SetPythonPath()`
`148`	`148`	`{`
`149`		`- if (Runtime.Runtime.pyversion == "2.7")`
	`149`	`+ if (Runtime.Runtime._pyversion == "2.7")`
`150`	`150`	`{`
`151`	`151`	`// Assert.Skip outputs as a warning (ie. pending to fix)`
`152`	`152`	`Assert.Pass();`
`@@ -166,7 +166,7 @@ public void SetPythonPath()`
`166`	`166`	`[Test]`
`167`	`167`	`public void SetPythonPathExceptionOn27()`
`168`	`168`	`{`
`169`		`- if (Runtime.Runtime.pyversion != "2.7")`
	`169`	`+ if (Runtime.Runtime._pyversion != "2.7")`
`170`	`170`	`{`
`171`	`171`	`Assert.Pass();`
`172`	`172`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,13 +91,13 @@ public static int GetUnicodeByteLength(IntPtr p)`
`91`	`91`	`var len = 0;`
`92`	`92`	`while (true)`
`93`	`93`	`{`
`94`		`- int c = Runtime.UCS == 2`
	`94`	`+ int c = Runtime._UCS == 2`
`95`	`95`	`? Marshal.ReadInt16(p, len * 2)`
`96`	`96`	`: Marshal.ReadInt32(p, len * 4);`
`97`	`97`
`98`	`98`	`if (c == 0)`
`99`	`99`	`{`
`100`		`- return len * Runtime.UCS;`
	`100`	`+ return len * Runtime._UCS;`
`101`	`101`	`}`
`102`	`102`	`checked`
`103`	`103`	`{`
`@@ -163,7 +163,7 @@ public override IntPtr MarshalManagedToNative(object managedObj)`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`int totalStrLength = argv.Sum(arg => arg.Length + 1);`
`166`		`- int memSize = argv.Length * IntPtr.Size + totalStrLength * Runtime.UCS;`
	`166`	`+ int memSize = argv.Length * IntPtr.Size + totalStrLength * Runtime._UCS;`
`167`	`167`
`168`	`168`	`IntPtr mem = Marshal.AllocHGlobal(memSize);`
`169`	`169`	`try`