Yet more changes to get it to load properly

BadSingleton · BadSingleton · commit 424f63c6d65a · 2020-09-21T16:02:12.000-04:00
diff --git a/src/runtime/Python.Runtime.15.csproj b/src/runtime/Python.Runtime.15.csproj
@@ -1,4 +1,4 @@
-<Project>
+﻿<Project>
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
   <PropertyGroup>
     <TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
@@ -84,7 +84,7 @@
     <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;$(Python2Version);$(PythonWinDefineConstants)</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWinPY3'">
-    <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;$(Python3Version);$(PythonWinDefineConstants)</DefineConstants>
+    <DefineConstants Condition="'$(CustomDefineConstants)' == ''">TRACE;XPLAT;;PYTHON3;PYTHON37;UCS2</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'DebugWin'">
     <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;$(Python2Version);$(PythonWinDefineConstants);FINALIZER_CHECK;TRACE;DEBUG</DefineConstants>
diff --git a/src/runtime/pythonengine.cs b/src/runtime/pythonengine.cs
@@ -167,22 +167,17 @@ public static void Initialize()
             Initialize(setSysArgv: true);
         }
 
-        public static void Initialize(bool setSysArgv = true, bool initSigs = false, ShutdownMode mode = ShutdownMode.Default, bool fromPython = false)
+        public static void Initialize(bool setSysArgv = true, bool initSigs = false, ShutdownMode mode = ShutdownMode.Reload, bool fromPython = false)
         {
             Initialize2(Enumerable.Empty<string>(), setSysArgv: setSysArgv, initSigs: initSigs, mode, fromPython: fromPython);
         }
 
-        public static void Initialize(IEnumerable<string> args, bool setSysArgv = true, bool initSigs = false, ShutdownMode mode = ShutdownMode.Default)
+        public static void Initialize(IEnumerable<string> args, bool setSysArgv = true, bool initSigs = false, ShutdownMode mode = ShutdownMode.Reload)
         {
             if (!initialized)
             {
                 InitializeLibrary();
-#if !NETSTANDARD
                 Initialize2(args,setSysArgv, initSigs, ShutdownMode.Reload);
-#else
-                Initialize2(args,setSysArgv, initSigs, ShutdownMode.Normal);
-#endif
-
             }
         }
 
@@ -196,7 +191,7 @@ public static void Initialize(IEnumerable<string> args, bool setSysArgv = true,
         /// interpreter lock (GIL) to call this method.
         /// initSigs can be set to 1 to do default python signal configuration. This will override the way signals are handled by the application.
         /// </remarks>
-        public static void Initialize2(IEnumerable<string> args, bool setSysArgv = true, bool initSigs = false, ShutdownMode mode = ShutdownMode.Default, bool fromPython = false)
+        public static void Initialize2(IEnumerable<string> args, bool setSysArgv = true, bool initSigs = false, ShutdownMode mode = ShutdownMode.Reload, bool fromPython = false)
         {
             if (initialized)
             {
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -81,11 +81,8 @@ public class Runtime
 
         public static readonly string PythonDLL = _PythonDll;
 
-#if PYTHON_WITHOUT_ENABLE_SHARED && !NETSTANDARD
         internal const string _PythonDll = "__Internal";
-#else
-        internal const string _PythonDll = dllBase + dllWithPyDebug + dllWithPyMalloc;
-#endif
+        // internal const string _PythonDll = dllBase + dllWithPyDebug + dllWithPyMalloc;
 #if MONO_LINUX
         internal const string dllDirectory = "Library/conda/lib/";
         internal const string pythonlib = "python3.7m";

Original file line number	Diff line number	Diff line change
`@@ -167,22 +167,17 @@ public static void Initialize()`
`167`	`167`	`Initialize(setSysArgv: true);`
`168`	`168`	`}`
`169`	`169`
`170`		`- public static void Initialize(bool setSysArgv = true, bool initSigs = false, ShutdownMode mode = ShutdownMode.Default, bool fromPython = false)`
	`170`	`+ public static void Initialize(bool setSysArgv = true, bool initSigs = false, ShutdownMode mode = ShutdownMode.Reload, bool fromPython = false)`
`171`	`171`	`{`
`172`	`172`	`Initialize2(Enumerable.Empty<string>(), setSysArgv: setSysArgv, initSigs: initSigs, mode, fromPython: fromPython);`
`173`	`173`	`}`
`174`	`174`
`175`		`- public static void Initialize(IEnumerable<string> args, bool setSysArgv = true, bool initSigs = false, ShutdownMode mode = ShutdownMode.Default)`
	`175`	`+ public static void Initialize(IEnumerable<string> args, bool setSysArgv = true, bool initSigs = false, ShutdownMode mode = ShutdownMode.Reload)`
`176`	`176`	`{`
`177`	`177`	`if (!initialized)`
`178`	`178`	`{`
`179`	`179`	`InitializeLibrary();`
`180`		`-#if !NETSTANDARD`
`181`	`180`	`Initialize2(args,setSysArgv, initSigs, ShutdownMode.Reload);`
`182`		`-#else`
`183`		`- Initialize2(args,setSysArgv, initSigs, ShutdownMode.Normal);`
`184`		`-#endif`
`185`		`-`
`186`	`181`	`}`
`187`	`182`	`}`
`188`	`183`
`@@ -196,7 +191,7 @@ public static void Initialize(IEnumerable<string> args, bool setSysArgv = true,`
`196`	`191`	`/// interpreter lock (GIL) to call this method.`
`197`	`192`	`/// initSigs can be set to 1 to do default python signal configuration. This will override the way signals are handled by the application.`
`198`	`193`	`/// </remarks>`
`199`		`- public static void Initialize2(IEnumerable<string> args, bool setSysArgv = true, bool initSigs = false, ShutdownMode mode = ShutdownMode.Default, bool fromPython = false)`
	`194`	`+ public static void Initialize2(IEnumerable<string> args, bool setSysArgv = true, bool initSigs = false, ShutdownMode mode = ShutdownMode.Reload, bool fromPython = false)`
`200`	`195`	`{`
`201`	`196`	`if (initialized)`
`202`	`197`	`{`