asd

Author: softworkz

src/ElectronNET.API/Runtime/Controllers/RuntimeControllerDotNetFirst.cs

@@ -82,11 +82,11 @@ private void ElectronProcess_Stopped(object sender, EventArgs e)
 
         private void HandleStopped()
         {
-            if (this.socketBridge.State != LifetimeState.Stopped)
+            if (this.socketBridge != null && this.socketBridge.State != LifetimeState.Stopped)
             {
                 this.socketBridge.Stop();
             }
-            else if (this.electronProcess.State != LifetimeState.Stopped)
+            else if (this.electronProcess != null && this.electronProcess.State != LifetimeState.Stopped)
             {
                 this.electronProcess.Stop();
             }

src/ElectronNET.API/Runtime/StartupManager.cs

@@ -132,13 +132,19 @@ private BuildInfo GatherBuildInfo()
 
             if (electronAssembly == null)
             {
+                Console.WriteLine("GatherBuildInfo: Early exit");
                 return buildInfo;
             }
 
             if (electronAssembly.GetName().Name == "testhost" || electronAssembly.GetName().Name == "ReSharperTestRunner")
             {
+                Console.WriteLine("GatherBuildInfo: Detected testhost");
                 electronAssembly = AppDomain.CurrentDomain.GetData("ElectronTestAssembly") as Assembly ?? electronAssembly;
             }
+            else
+            {
+                Console.WriteLine("GatherBuildInfo: No testhost detected: " + electronAssembly.GetName().Name);
+            }
 
             var attributes = electronAssembly.GetCustomAttributes<AssemblyMetadataAttribute>().ToList();
 

src/ElectronNET.IntegrationTests/ElectronFixture.cs

@@ -11,21 +11,34 @@ public class ElectronFixture : IAsyncLifetime
 
         public async Task InitializeAsync()
         {
-            AppDomain.CurrentDomain.SetData("ElectronTestAssembly", Assembly.GetExecutingAssembly());
-            var runtimeController = ElectronNetRuntime.RuntimeController;
-            await runtimeController.Start();
-            await runtimeController.WaitReadyTask;
-
-            // create hidden window for tests (avoid showing UI)
-            this.MainWindow = await Electron.WindowManager.CreateWindowAsync(new BrowserWindowOptions
+            try
             {
-                Show = false,
-                Width = 800,
-                Height = 600,
-            }, "about:blank");
+                Console.Error.WriteLine("InitializeAsync");
+                AppDomain.CurrentDomain.SetData("ElectronTestAssembly", Assembly.GetExecutingAssembly());
+                Console.Error.WriteLine("InitializeAsync 1");
+                var runtimeController = ElectronNetRuntime.RuntimeController;
+                Console.Error.WriteLine("InitializeAsync 2");
+                await runtimeController.Start();
+                Console.Error.WriteLine("InitializeAsync 3");
+                await runtimeController.WaitReadyTask;
+                Console.Error.WriteLine("InitializeAsync 4");
 
-            // Clear potential cache side-effects
-            await this.MainWindow.WebContents.Session.ClearCacheAsync();
+                // create hidden window for tests (avoid showing UI)
+                this.MainWindow = await Electron.WindowManager.CreateWindowAsync(new BrowserWindowOptions
+                {
+                    Show = false,
+                    Width = 800,
+                    Height = 600,
+                }, "about:blank");
+
+                // Clear potential cache side-effects
+                await this.MainWindow.WebContents.Session.ClearCacheAsync();
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine(ex);
+                throw;
+            }
         }
 
         public async Task DisposeAsync()