Core - Add BrowserSubprocess.SelfHost.Main

Can be used to self host the browser SubProcess
Fixes build errors, the Net Core implementation is now renamed from MainNetCore to Main

Issue #3197

Author: amaitland

CefSharp.BrowserSubprocess.Core/BrowserSubprocessExecutable.h

@@ -41,7 +41,7 @@ namespace CefSharp
             /// with a value of -1. If called for a recognized secondary process it will block until the process should exit
             /// and then return the process exit code.
             /// </returns
-            static int MainNetCoreSelfHost(array<String^>^ args)
+            static int MainSelfHost(array<String^>^ args)
             {
                 auto subProcess = gcnew BrowserSubprocessExecutable();
                 return subProcess->Main(args, nullptr);

CefSharp.Core.RefAssembly/CefSharp.Core.cs

@@ -334,7 +334,7 @@ namespace CefSharp.BrowserSubprocess
     public partial class SelfHost
     {
         public SelfHost() { }
-        public static int MainNetCore(string[] args) { throw null; }
+        public static int Main(string[] args) { throw null; }
     }
 }
 namespace CefSharp.Internals

CefSharp.Core/BrowserSubprocess/SelfHost.cpp

@@ -7,14 +7,13 @@
 
 using namespace System;
 using namespace System::IO;
-using namespace System::Runtime::Loader;
 using namespace CefSharp;
 
 namespace CefSharp
 {
     namespace BrowserSubprocess
     {
-        int SelfHost::MainNetCore(array<String^>^ args)
+        int SelfHost::Main(array<String^>^ args)
         {
             auto type = CommandLineArgsParser::GetArgumentValue(args, CefSharpArguments::SubProcessTypeArgument);
 
@@ -27,11 +26,15 @@ namespace CefSharp
             }
 
             auto browserSubprocessDllPath = Path::Combine(Path::GetDirectoryName(SelfHost::typeid->Assembly->Location), "CefSharp.BrowserSubprocess.Core.dll");
-            auto browserSubprocessDll = AssemblyLoadContext::Default->LoadFromAssemblyPath(browserSubprocessDllPath);
+#ifdef NETCOREAPP
+            auto browserSubprocessDll = System::Runtime::Loader::AssemblyLoadContext::Default->LoadFromAssemblyPath(browserSubprocessDllPath);
+#else
+            auto browserSubprocessDll = System::Reflection::Assembly::LoadFrom(browserSubprocessDllPath);
+#endif
             auto browserSubprocessExecutableType = browserSubprocessDll->GetType("CefSharp.BrowserSubprocess.BrowserSubprocessExecutable");
             auto browserSubprocessExecutable = Activator::CreateInstance(browserSubprocessExecutableType);
 
-            auto mainMethod = browserSubprocessExecutableType->GetMethod("MainNetCoreSelfHost", System::Reflection::BindingFlags::Static | System::Reflection::BindingFlags::Public);
+            auto mainMethod = browserSubprocessExecutableType->GetMethod("MainSelfHost", System::Reflection::BindingFlags::Static | System::Reflection::BindingFlags::Public);
             auto argCount = mainMethod->GetParameters();
 
             auto methodArgs = gcnew array<Object^>(1);

CefSharp.Core/BrowserSubprocess/SelfHost.h

@@ -32,7 +32,7 @@ namespace CefSharp
             /// with a value of -1. If called for a recognized secondary process it will block until the process should exit
             /// and then return the process exit code.
             /// </returns
-            static int MainNetCore(array<String^>^ args);
+            static int Main(array<String^>^ args);
 
         };
     }

CefSharp.WinForms.Example/Program.cs

@@ -17,15 +17,15 @@ public class Program
         [STAThread]
         public static int Main(string[] args)
         {
-            const bool selfHostSubProcess = true;
+            const bool selfHostSubProcess = false;
 
             Cef.EnableHighDPISupport();
 
             //NOTE: Using a simple sub processes uses your existing application executable to spawn instances of the sub process.
             //Features like JSB, EvaluateScriptAsync, custom schemes require the CefSharp.BrowserSubprocess to function
             if (selfHostSubProcess)
             {
-                var exitCode = CefSharp.BrowserSubprocess.SelfHost.MainNetCore(args);
+                var exitCode = CefSharp.BrowserSubprocess.SelfHost.Main(args);
 
                 if (exitCode >= 0)
                 {