DotNetCore + Windows x64 + Python 3.5 = all tests passed.

dse · dse · commit 36c2e85a9eea · 2017-03-29T04:07:48.000+04:00
diff --git a/src/embed_tests/Program.cs b/src/embed_tests/Program.cs
@@ -0,0 +1,21 @@
+﻿using System;
+using System.Reflection;
+using NUnit.Common;
+using NUnitLite;
+
+namespace Python.EmbeddingTest
+{
+    public class Program
+    {
+        public static int Main(string[] args)
+        {
+            ////var example = new TestExample();
+            ////example.SetUp();
+            ////example.TestReadme();
+            ////example.Dispose();
+            ////return 0;
+            return new AutoRun(typeof(Program).GetTypeInfo().Assembly)
+                .Execute(args, new ExtendedTextWrapper(Console.Out), Console.In);
+        }
+    }
+}
diff --git a/src/embed_tests/Properties/launchSettings.json b/src/embed_tests/Properties/launchSettings.json
@@ -0,0 +1,7 @@
+{
+  "profiles": {
+    "Python.EmbeddingTest.15": {
+      "commandName": "Project"
+    }
+  }
+}
diff --git a/src/embed_tests/Python.EmbeddingTest.15.csproj b/src/embed_tests/Python.EmbeddingTest.15.csproj
@@ -1,7 +1,8 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net40;netstandard1.6</TargetFrameworks>
-    <!--<PackageTargetFallback>net</PackageTarg0etFallback>-->
+    <OutputType>exe</OutputType>
+    <TargetFrameworks><!--net40;-->netcoreapp1.0</TargetFrameworks>
+    <RuntimeIdentifiers>win7-x64;ubuntu.16.04-x64</RuntimeIdentifiers>
     <RootNamespace>Python.EmbeddingTest</RootNamespace>
     <AssemblyName>Python.EmbeddingTest</AssemblyName>
     <PackageId>Python.EmbeddingTest</PackageId>
@@ -12,6 +13,7 @@
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <!--<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>-->
     <NetStandardImplicitPackageVersion>1.6.0</NetStandardImplicitPackageVersion>
+    <!--This is for NUnit Test Adaptor crash workaround.-->
     <DebugType>Full</DebugType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Platform)' == 'x86'">
@@ -25,9 +27,9 @@
 
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net40|x64'" />
 
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard1.6|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netcoreapp1.0|x64'" />
 
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard1.6|x64'" />
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netcoreapp1.0|x64'" />
 
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);XPLAT</DefineConstants>
@@ -37,6 +39,7 @@
     <PackageReference Include="NUnit">
       <Version>3.6.1</Version>
     </PackageReference>
+    <PackageReference Include="NUnitLite" Version="3.6.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/runtime/importhook.cs b/src/runtime/importhook.cs
@@ -1,4 +1,4 @@
-using System;
+﻿using System;
 using System.Runtime.InteropServices;
 
 namespace Python.Runtime
@@ -75,7 +75,10 @@ internal static void Shutdown()
             if (Runtime.Py_IsInitialized() != 0)
             {
                 Runtime.XDecref(py_clr_module);
+                // TODO: Very strange behavior under CoreCLR. System.ExecutionEngineException (Crash)
+#if !NETSTANDARD1_5
                 Runtime.XDecref(root.pyHandle);
+#endif
                 Runtime.XDecref(py_import);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using System;`
	`1`	`+using System;`
`2`	`2`	`using System.Runtime.InteropServices;`
`3`	`3`
`4`	`4`	`namespace Python.Runtime`
`@@ -75,7 +75,10 @@ internal static void Shutdown()`
`75`	`75`	`if (Runtime.Py_IsInitialized() != 0)`
`76`	`76`	`{`
`77`	`77`	`Runtime.XDecref(py_clr_module);`
	`78`	`+ // TODO: Very strange behavior under CoreCLR. System.ExecutionEngineException (Crash)`
	`79`	`+#if !NETSTANDARD1_5`
`78`	`80`	`Runtime.XDecref(root.pyHandle);`
	`81`	`+#endif`
`79`	`82`	`Runtime.XDecref(py_import);`
`80`	`83`	`}`
`81`	`84`	`}`