Merge branch 'master' of https://github.com/ElectronNET/Electron.NET

Author: GregorBiswanger

Changelog.md

@@ -1,5 +1,7 @@
 # Not released
 
+# Released
+
 # 9.31.1
 
 ElectronNET.CLI:
@@ -33,8 +35,6 @@ ElectronNET.WebApp (internal use):
 
 Thank you for donation [Phil Seeman](https://github.com/mpnow) ❤
 
-# Released
-
 # 8.31.2
 
 ElectronNET.CLI:

ElectronNET.API/HostHook.cs

@@ -72,13 +72,14 @@ public Task<T> CallAsync<T>(string socketEventName, params dynamic[] arguments)
             {
                 BridgeConnector.Socket.Off(socketEventName + "Error" + guid);
                 Electron.Dialog.ShowErrorBox("Host Hook Exception", result.ToString());
+                taskCompletionSource.SetException(new Exception($"Host Hook Exception {result}"));
             });
 
             BridgeConnector.Socket.On(socketEventName + "Complete" + guid, (result) =>
             {
                 BridgeConnector.Socket.Off(socketEventName + "Error" + guid);
                 BridgeConnector.Socket.Off(socketEventName + "Complete" + guid);
-                T data;
+                T data = default;
 
                 try
                 {
@@ -105,7 +106,8 @@ public Task<T> CallAsync<T>(string socketEventName, params dynamic[] arguments)
                 }
                 catch (Exception exception)
                 {
-                    throw new InvalidCastException("Return value does not match with the generic type.", exception);
+                    taskCompletionSource.SetException(exception);
+                    //throw new InvalidCastException("Return value does not match with the generic type.", exception);
                 }
 
                 taskCompletionSource.SetResult(data);

ElectronNET.API/Tray.cs

@@ -263,6 +263,15 @@ public void Show(string image, MenuItem[] menuItems)
             });
         }
 
+        /// <summary>
+        /// Shows the Traybar (empty).
+        /// </summary>
+        /// <param name="image">The image.</param>
+        public void Show(string image)
+        {
+            BridgeConnector.Socket.Emit("create-tray", image);
+        }
+
         /// <summary>
         /// Destroys the tray icon immediately.
         /// </summary>

ElectronNET.CLI/Commands/BuildCommand.cs

@@ -186,7 +186,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.0.3 {electronParams}", tempPath);
+                ProcessHelper.CmdExecute($"npx electron-builder --config=./bin/electron-builder.json --{platformInfo.ElectronPackerPlatform} --{electronArch} -c.electronVersion=9.0.3 {electronParams}", tempPath);
 
                 Console.WriteLine("... done");
 

ElectronNET.Host/api/tray.js

@@ -53,16 +53,18 @@ export = (socket: SocketIO.Socket) => {
     });
 
     socket.on('create-tray', (image, menuItems) => {
-        const menu = Menu.buildFromTemplate(menuItems);
-
-        addMenuItemClickConnector(menu.items, (id) => {
-            electronSocket.emit('trayMenuItemClicked', id);
-        });
-
         const trayIcon = nativeImage.createFromPath(image);
 
         tray = new Tray(trayIcon);
-        tray.setContextMenu(menu);
+
+        if (menuItems) {
+            const menu = Menu.buildFromTemplate(menuItems);
+    
+            addMenuItemClickConnector(menu.items, (id) => {
+                electronSocket.emit('trayMenuItemClicked', id);
+            });
+            tray.setContextMenu(menu);
+        }
     });
 
     socket.on('tray-destroy', () => {