Update to native Electron 11.1.1 - Fix breaking changes and refactoring.

Author: GregorBiswanger

Changelog.md

@@ -1,9 +1,10 @@
 # Not released
 
-# 9.31.3
+# 11.5.1
 
 ElectronNET.CLI:
 
+* New Feature: Added new build and start commandline options for single exe (thanks [nathanwienand](https://github.com/nathanwienand)) [\#506](https://github.com/ElectronNET/Electron.NET/pull/506)
 * New Feature: Set a description of the app in `electron.manifest.json` (thanks [BurtsevC](https://github.com/BurtsevC)) [\#433](https://github.com/ElectronNET/Electron.NET/pull/433)
 * New Feature: Set a target for the start command (thanks [gabecook](https://github.com/gabecook)) [\#463](https://github.com/ElectronNET/Electron.NET/pull/463)
 * New Feature: `electronize init` support for F# projects (thanks [kojo12228](https://github.com/kojo12228)) [\#457](https://github.com/ElectronNET/Electron.NET/pull/457)
@@ -12,7 +13,12 @@ ElectronNET.CLI:
 
 ElectronNET.API:
 
-* New Feature: Native Electron 9.2.0 support, but not all new features (we search contributors)
+* New Feature: Native Electron 11.1.1 support, but not all new features (we search contributors)
+* Breaking API Changes (from native Electron 11.0): - Removed: BrowserView.{destroy, fromId, fromWebContents, getAllViews} and id property of BrowserView
+* New Feature: Upgrade to .NET 5 (thanks [scottkuhl](https://github.com/scottkuhl)) [\#509](https://github.com/ElectronNET/Electron.NET/pull/509)
+* New Feature: Adding a configurable default electron port. (thanks [aarong-av](https://github.com/aarong-av)) [\#505](https://github.com/ElectronNET/Electron.NET/pull/505)
+* New Feature: Added support for launching the application with a file on MacOS (thanks [dlitty](https://github.com/dlitty)) [\#478](https://github.com/ElectronNET/Electron.NET/pull/478)
+* Improved: Avoid Blocking Calls in App and AutoUpdater (thanks [freosc](https://github.com/freosc)) [\#474](https://github.com/ElectronNET/Electron.NET/pull/474)
 * Fixed bug: Set default WebPreferences.DefaultFontSize (thanks [duncanawoods](https://github.com/duncanawoods)) [\#468](https://github.com/ElectronNET/Electron.NET/pull/468)
 
 # Released

ElectronNET.API/BrowserView.cs

@@ -2,9 +2,6 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Newtonsoft.Json.Serialization;
-using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace ElectronNET.API
@@ -29,30 +26,6 @@ public class BrowserView
         /// </summary>
         public WebContents WebContents { get; internal set; }
 
-        /// <summary>
-        /// Whether the view is destroyed.
-        /// </summary>
-        public Task<bool> IsDestroyedAsync
-        {
-            get
-            {
-                return Task.Run<bool>(() =>
-                {
-                    var taskCompletionSource = new TaskCompletionSource<bool>();
-
-                    BridgeConnector.Socket.On("browserView-isDestroyed-reply", (result) =>
-                    {
-                        BridgeConnector.Socket.Off("browserView-isDestroyed-reply");
-                        taskCompletionSource.SetResult((bool)result);
-                    });
-
-                    BridgeConnector.Socket.Emit("browserView-isDestroyed", Id);
-
-                    return taskCompletionSource.Task;
-                });
-            }
-        }
-
         /// <summary>
         /// Resizes and moves the view to the supplied bounds relative to the window.
         /// 
@@ -83,8 +56,6 @@ public Rectangle Bounds
             }
         }
 
-        internal Action<BrowserView> Destroyed;
-
         /// <summary>
         /// BrowserView
         /// </summary>
@@ -97,18 +68,6 @@ internal BrowserView(int id)
             WebContents = new WebContents(id + 1000);
         }
 
-        /// <summary>
-        /// Force closing the view, the `unload` and `beforeunload` events won't be emitted
-        /// for the web page.After you're done with a view, call this function in order to
-        /// free memory and other resources as soon as possible.
-        /// </summary>
-        public void Destroy()
-        {
-            BridgeConnector.Socket.Emit("browserView-destroy", Id);
-
-            Destroyed?.Invoke(this);
-        }
-
         /// <summary>
         /// (experimental)
         /// </summary>

ElectronNET.API/Entities/RemoveClientCertificate.cs

@@ -64,8 +64,7 @@ public Task ClearAuthCacheAsync(RemovePassword options)
         /// <summary>
         /// Clears the session’s HTTP authentication cache.
         /// </summary>
-        /// <param name="options"></param>
-        public Task ClearAuthCacheAsync(RemoveClientCertificate options)
+        public Task ClearAuthCacheAsync()
         {
             var taskCompletionSource = new TaskCompletionSource<object>();
             string guid = Guid.NewGuid().ToString();
@@ -76,7 +75,7 @@ public Task ClearAuthCacheAsync(RemoveClientCertificate options)
                 taskCompletionSource.SetResult(null);
             });
 
-            BridgeConnector.Socket.Emit("webContents-session-clearAuthCache", Id, JObject.FromObject(options, _jsonSerializer), guid);
+            BridgeConnector.Socket.Emit("webContents-session-clearAuthCache", Id, guid);
 
             return taskCompletionSource.Task;
         }

ElectronNET.API/Session.cs

@@ -192,7 +192,6 @@ public Task<BrowserView> CreateBrowserViewAsync(BrowserViewConstructorOptions op
 
                 string browserViewId = id.ToString();
                 BrowserView browserView = new BrowserView(int.Parse(browserViewId));
-                browserView.Destroyed += (b) => _browserViews.Remove(b);
 
                 _browserViews.Add(browserView);
 

ElectronNET.API/WindowManager.cs

@@ -197,7 +197,7 @@ public Task<bool> ExecuteAsync()
                 ProcessHelper.CmdExecute($"node build-helper.js " + manifestFileName, tempPath);
 
                 Console.WriteLine($"Package Electron App for Platform {platformInfo.ElectronPackerPlatform}...");
-                ProcessHelper.CmdExecute($"npx electron-builder --config=./bin/electron-builder.json --{platformInfo.ElectronPackerPlatform} --{electronArch} -c.electronVersion=9.2.0 {electronParams}", tempPath);
+                ProcessHelper.CmdExecute($"npx electron-builder --config=./bin/electron-builder.json --{platformInfo.ElectronPackerPlatform} --{electronArch} -c.electronVersion=11.1.1 {electronParams}", tempPath);
 
                 Console.WriteLine("... done");
 

ElectronNET.CLI/Commands/BuildCommand.cs

@@ -11,4 +11,3 @@ export class HookService extends Connector {
         // execute your own JavaScript Host logic here
     }
 }
-

ElectronNET.Host/ElectronHostHook/connector.js

@@ -13,7 +13,7 @@
   "author": "Gregor Biswanger",
   "license": "MIT",
   "devDependencies": {
-    "@types/socket.io": "^2.1.2",
-    "typescript": "^3.4.5"
+    "@types/socket.io": "^2.1.12",
+    "typescript": "^4.1.3"
   }
 }

ElectronNET.Host/ElectronHostHook/connector.js.map

@@ -103,25 +103,13 @@ export = (socket: SocketIO.Socket, app: Electron.App) => {
 
     socket.on('appSetAppLogsPath', (path) => {
         app.setAppLogsPath(path);
-    });    
+    });
 
     socket.on('appGetPath', (name) => {
         const path = app.getPath(name);
         electronSocket.emit('appGetPathCompleted', path);
     });
 
-    // const nativeImages = {};
-
-    // function addNativeImage(nativeImage: Electron.NativeImage) {
-
-    //     if(Object.keys(nativeImages).length === 0) {
-    //         nativeImage['1'] = nativeImage;
-    //     } else {
-    //         let indexCount = Object.keys(nativeImages).length + 1;
-    //         nativeImage[indexCount] = nativeImage;
-    //     }
-    // }
-
     socket.on('appGetFileIcon', async (path, options) => {
         let error = {};
 
@@ -222,7 +210,7 @@ export = (socket: SocketIO.Socket, app: Electron.App) => {
         const activityType = app.getCurrentActivityType();
         electronSocket.emit('appGetCurrentActivityTypeCompleted', activityType);
     });
-    
+
     socket.on('appInvalidateCurrentActivity', () => {
         app.invalidateCurrentActivity();
     });
@@ -290,7 +278,7 @@ export = (socket: SocketIO.Socket, app: Electron.App) => {
 
     socket.on('appSetAboutPanelOptions', (options) => {
         app.setAboutPanelOptions(options);
-    });    
+    });
 
     socket.on('appGetUserAgentFallback', () => {
         electronSocket.emit('appGetUserAgentFallbackCompleted', app.userAgentFallback);